From 3a89de19fd14f2d05328f87ac80d2c0fc0ef651d Mon Sep 17 00:00:00 2001
From: wally <18603454788@163.com>
Date: Sun, 30 Jan 2022 08:49:59 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20APP=E6=B3=A8=E9=87=8A=E4=BA=86Rende?=
 =?UTF-8?q?r=20Component;=20render.vue=E6=8D=A2=E6=88=90vue2=E8=AF=AD?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                 |   3 +-
 components/Plugin/Plugin.vue |   2 +-
 components/Render/Render.vue | 100 +++++++++++++++++++----------------
 3 files changed, 57 insertions(+), 48 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d779c18..2512a39 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# 1.0.0 (2022-01-29)
+# 1.0.0 (2022-01-30)
 
 ### 🌟 新功能
 范围|描述|commitId
@@ -185,6 +185,7 @@
  - | 原有功能提交别的分支 | [eb02b72](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/eb02b72)
  - | 重构财务条组件；添加财务mock | [03a1cdb](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/03a1cdb)
  - | 重构project init 部分 | [c7bf2df](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/c7bf2df)
+ - | 重构render.vue | [fdd668f](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/fdd668f)
  api | 调整mock api放入mock.js下；main中加入环境变量的判断 | [053ac31](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/053ac31)
  - | deliver检查人重构；更新真实数据的检查人 | [ce808c4](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/ce808c4)
  - | project init 重构 | [2457a87](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/2457a87)
diff --git a/components/Plugin/Plugin.vue b/components/Plugin/Plugin.vue
index e933ebe..32797ab 100644
--- a/components/Plugin/Plugin.vue
+++ b/components/Plugin/Plugin.vue
@@ -28,6 +28,7 @@
     <p-domain-source-manage v-else-if="pluginId === '20'" class="p-2" />
     <p-project-version-management v-else-if="pluginId === '21'" class="p-2" />
 
+    <!-- #ifdef H5 -->
     <Render
       v-else
       :task="task"
@@ -37,7 +38,6 @@
       :businessPluginId="businessPluginId"
       :param="param"
     />
-    <!-- #ifdef H5 -->
     <!-- #endif -->
   </view>
 </template>
diff --git a/components/Render/Render.vue b/components/Render/Render.vue
index 6e968d5..d302884 100644
--- a/components/Render/Render.vue
+++ b/components/Render/Render.vue
@@ -20,56 +20,64 @@
   </view>
 </template>
 
-<script setup>
-import { computed, ref, onMounted } from 'vue';
-import { useStore } from 'vuex';
+<script>
+import { mapState, mapGetters } from 'vuex';
 
-const props = defineProps({
-  task: { default: () => {}, type: Object },
-  pluginId: { default: '1', type: String },
-  styleType: { default: 0, type: Number },
-  pluginTaskId: { default: '', type: String },
-  businessPluginId: { default: '', type: String },
-  param: { type: String, default: '' },
-});
-
-const store = useStore();
-const roleId = computed(() => store.state.role.roleId);
-const token = computed(() => store.state.user.token);
-const userId = computed(() => store.getters['user/userId']);
-const projectId = computed(() => store.getters['project/projectId']);
-const pluginInfo = ref(null); // 插件的具体数据
+export default {
+  name: 'RenderHtmlFragment',
+  props: {
+    task: { default: () => {}, type: Object },
+    pluginId: { default: '1', type: String },
+    styleType: { default: 0, type: Number },
+    pluginTaskId: { default: '', type: String },
+    businessPluginId: { default: '', type: String },
+    param: { type: String, default: '' },
+  },
+  data() {
+    return {
+      pluginInfo: null,
+    };
+  },
+  computed: {
+    ...mapState(['allPlugin']),
+    ...mapState('role', ['roleId']),
+    ...mapState('user', ['token']),
+    ...mapGetters('project', ['projectId']),
+    ...mapGetters('user', ['userId']),
+  },
 
-onMounted(() => {
-  getPlugin();
-});
-// 获取插件信息
-async function getPlugin() {
-  const allPlugin = uni.$storage.getStorageSync('allPlugin');
-  if (allPlugin && JSON.parse(allPlugin)) {
-    // 有本地数据
-    try {
-      const pluginLists = JSON.parse(allPlugin);
-      // pluginLists 肯能没有find方法,交给catch处理
-      const pluginTarget = pluginLists.find(item => item.id === props.pluginId);
-      pluginInfo.value = pluginTarget || null;
-    } catch (error) {
-      console.error('error: ', error);
-      pluginInfo.value = null;
-    }
-  } else {
-    // 没有本地数据 API 查询
-    const params = { businessPluginId: props.businessPluginId };
-    uni.$catchReq.getOtherPlugin(params, (err, res) => {
-      if (err) {
-        console.error('err: ', err);
-        pluginInfo.value = null;
+  mounted() {
+    this.getPlugin();
+  },
+  methods: {
+    getPlugin() {
+      const allPlugin = this.allPlugin || uni.$storage.getStorageSync('allPlugin');
+      if (allPlugin && JSON.parse(allPlugin)) {
+        // 有本地数据
+        try {
+          const pluginLists = JSON.parse(allPlugin);
+          // pluginLists 肯能没有find方法,交给catch处理
+          const pluginTarget = pluginLists.find(item => item.id === this.pluginId);
+          this.pluginInfo = pluginTarget || null;
+        } catch (error) {
+          console.error('error: ', error);
+          this.pluginInfo = null;
+        }
       } else {
-        pluginInfo.value = res || null;
+        // 没有本地数据 API 查询
+        const params = { businessPluginId: this.businessPluginId };
+        uni.$catchReq.getOtherPlugin(params, (err, res) => {
+          if (err) {
+            console.error('err: ', err);
+            this.pluginInfo = null;
+          } else {
+            this.pluginInfo = res || null;
+          }
+        });
       }
-    });
-  }
-}
+    },
+  },
+};
 </script>
 
 <script module="project" lang="renderjs">