From 0ce78d416e41e7816ce130c74f067df42a9a6964 Mon Sep 17 00:00:00 2001
From: cxc <quantulr@outlook.com>
Date: Thu, 22 Dec 2022 10:08:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../package/penal/task/ElementTask.vue        | 35 ++++++++++++-------
 .../penal/task/task-components/UserTask.vue   |  5 +++
 src/utils/generator/config.js                 |  4 +--
 src/utils/generator/slots/el-upload.jsx       | 11 ++++--
 4 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/src/plugins/package/penal/task/ElementTask.vue b/src/plugins/package/penal/task/ElementTask.vue
index 04c6cbe..5cf6c18 100644
--- a/src/plugins/package/penal/task/ElementTask.vue
+++ b/src/plugins/package/penal/task/ElementTask.vue
@@ -6,7 +6,7 @@
       <!--        <el-checkbox v-model="taskConfigForm.asyncAfter" label="异步后" @change="changeTaskAsync" />-->
       <!--        <el-checkbox v-model="taskConfigForm.exclusive" v-if="taskConfigForm.asyncAfter || taskConfigForm.asyncBefore" label="排除" @change="changeTaskAsync" />-->
       <!--      </el-form-item>-->
-      <component :is="witchTaskComponent" v-bind="$props" />
+      <component :is="witchTaskComponent" :key="id" v-bind="$props" />
     </el-form>
   </div>
 </template>
@@ -14,7 +14,7 @@
 import UserTask from "./task-components/UserTask";
 import ScriptTask from "./task-components/ScriptTask";
 import ReceiveTask from "./task-components/ReceiveTask";
-import { toRefs, ref } from "vue";
+import { toRefs, ref, shallowRef } from "vue";
 const props = defineProps({
   id: String,
   type: String,
@@ -26,17 +26,26 @@ const data = reactive({
     asyncBefore: false,
     exclusive: false,
   },
-  installedComponent: {
-    // 手工任务与普通任务一致，不需要其他配置
-    // 接收消息任务，需要在全局下插入新的消息实例，并在该节点下的 messageRef 属性绑定该实例
-    // 发送任务、服务任务、业务规则任务共用一个相同配置
-    UserTask: "UserTask", // 用户任务配置
-    ScriptTask: "ScriptTask", // 脚本任务配置
-    ReceiveTask: "ReceiveTask", // 消息接收任务
-  },
+  // installedComponent: {
+  //   // 手工任务与普通任务一致，不需要其他配置
+  //   // 接收消息任务，需要在全局下插入新的消息实例，并在该节点下的 messageRef 属性绑定该实例
+  //   // 发送任务、服务任务、业务规则任务共用一个相同配置
+  //   UserTask: UserTask, // 用户任务配置
+  //   ScriptTask: ScriptTask, // 脚本任务配置
+  //   ReceiveTask: ReceiveTask, // 消息接收任务
+  // },
 });
-const { taskConfigForm, installedComponent } = toRefs(data);
-const witchTaskComponent = ref("");
+
+const installedComponent = {
+  // 手工任务与普通任务一致，不需要其他配置
+  // 接收消息任务，需要在全局下插入新的消息实例，并在该节点下的 messageRef 属性绑定该实例
+  // 发送任务、服务任务、业务规则任务共用一个相同配置
+  UserTask: shallowRef(UserTask), // 用户任务配置
+  ScriptTask: shallowRef(ScriptTask), // 脚本任务配置
+  ReceiveTask: shallowRef(ReceiveTask), // 消息接收任务
+};
+const { taskConfigForm } = toRefs(data);
+const witchTaskComponent = shallowRef();
 let bpmnElement;
 watch(
   id,
@@ -51,7 +60,7 @@ watch(
 watch(
   type,
   (val) => {
-    witchTaskComponent.value = installedComponent.value[type.value];
+    witchTaskComponent.value = installedComponent[type.value].value;
   },
   { immediate: true }
 );
diff --git a/src/plugins/package/penal/task/task-components/UserTask.vue b/src/plugins/package/penal/task/task-components/UserTask.vue
index 720eae8..cdae6ea 100644
--- a/src/plugins/package/penal/task/task-components/UserTask.vue
+++ b/src/plugins/package/penal/task/task-components/UserTask.vue
@@ -169,6 +169,11 @@ const userTaskForm = {
   candidateGroups: "",
   text: "",
 };
+const props = defineProps({
+  id: String,
+  type: String,
+});
+const { id, type } = toRefs(props);
 const loading = ref(false);
 const dataType = ref("USERS");
 const userOpen = ref(false);
diff --git a/src/utils/generator/config.js b/src/utils/generator/config.js
index 959717f..c9f8629 100644
--- a/src/utils/generator/config.js
+++ b/src/utils/generator/config.js
@@ -515,7 +515,7 @@ export const selectComponents = [
     __slot__: {
       "list-type": true,
     },
-    action: import.meta.env.VUE_APP_BASE_API + "/system/oss/upload",
+    action: import.meta.env.VITE_APP_BASE_API + "/business/sysFile/upload",
     disabled: false,
     accept: "",
     name: "file",
@@ -629,7 +629,7 @@ export const layoutComponents = [
                   default: "主要按钮",
                 },
                 type: "primary",
-                icon: "el-icon-search",
+                icon: "search",
                 round: false,
                 size: "default",
               },
diff --git a/src/utils/generator/slots/el-upload.jsx b/src/utils/generator/slots/el-upload.jsx
index 1903d0c..0c31391 100644
--- a/src/utils/generator/slots/el-upload.jsx
+++ b/src/utils/generator/slots/el-upload.jsx
@@ -1,12 +1,19 @@
+import { Plus } from "@element-plus/icons-vue";
+import { ElIcon } from "element-plus";
+
 export default {
   "list-type": (conf, key) => {
     const list = [];
     const config = conf.__config__;
     if (conf["list-type"] === "picture-card") {
-      list.push(<i class="el-icon-plus"></i>);
+      list.push(
+        <ElIcon>
+          <Plus />
+        </ElIcon>
+      );
     } else {
       list.push(
-        <el-button size="small" type="primary" icon="el-icon-upload">
+        <el-button size="small" type="primary" icon="upload">
           {config.buttonText}
         </el-button>
       );