From 3e4a8f230f9385aab14a125667a8d147b91a1ab6 Mon Sep 17 00:00:00 2001
From: GitHub Actions Bot <xiaojunnuo@qq.com>
Date: Thu, 20 Apr 2023 19:24:50 +0000
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=B1:=20[client]=20sync=20upgrade=20wit?=
 =?UTF-8?q?h=204=20commits=20[trident-sync]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

refactor: 1.13.2
refactor: fs-bpmn 1.0.14
refactor: fs-bpmn 1.0.14
---
 packages/ui/certd-client/CHANGELOG.md         | 10 ++++++
 packages/ui/certd-client/package.json         | 12 +++----
 .../integration/bpmn/ElementUserAssign.vue    | 36 ++++++-------------
 packages/ui/certd-client/vite.config.ts       |  2 +-
 4 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/packages/ui/certd-client/CHANGELOG.md b/packages/ui/certd-client/CHANGELOG.md
index dc33674e..762fea02 100644
--- a/packages/ui/certd-client/CHANGELOG.md
+++ b/packages/ui/certd-client/CHANGELOG.md
@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.13.2](https://github.com/fast-crud/fast-crud/compare/v1.13.1...v1.13.2) (2023-04-20)
+
+### Bug Fixes
+
+* dict ts缺少cloneable参数 ([ab9528d](https://github.com/fast-crud/fast-crud/commit/ab9528d7ae2ab782cccc89d7530a22faa981ee74))
+
+### Performance Improvements
+
+* 优化fs-images-format 加载失败时的显示 ([7df6eab](https://github.com/fast-crud/fast-crud/commit/7df6eab4d653409de442eeef933177906a2ffc70))
+
 ## [1.13.1](https://github.com/fast-crud/fast-crud/compare/v1.13.0...v1.13.1) (2023-04-10)
 
 **Note:** Version bump only for package @fast-crud/fs-admin-antdv
diff --git a/packages/ui/certd-client/package.json b/packages/ui/certd-client/package.json
index 52340130..bb838f38 100644
--- a/packages/ui/certd-client/package.json
+++ b/packages/ui/certd-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@fast-crud/fs-admin-antdv",
-  "version": "1.13.1",
+  "version": "1.13.2",
   "private": true,
   "scripts": {
     "dev": "vite",
@@ -25,11 +25,11 @@
     "@ant-design/icons-vue": "^6.1.0",
     "@aws-sdk/client-s3": "^3.292.0",
     "@aws-sdk/s3-request-presigner": "^3.292.0",
-    "@fast-crud/fast-bpmn": "^1.0.10",
-    "@fast-crud/fast-crud": "^1.13.1",
-    "@fast-crud/fast-extends": "^1.13.1",
-    "@fast-crud/ui-antdv": "^1.13.1",
-    "@fast-crud/ui-interface": "^1.13.1",
+    "@fast-crud/fast-bpmn": "^1.0.14",
+    "@fast-crud/fast-crud": "^1.13.2",
+    "@fast-crud/fast-extends": "^1.13.2",
+    "@fast-crud/ui-antdv": "^1.13.2",
+    "@fast-crud/ui-interface": "^1.13.2",
     "@iconify/iconify": "^3.1.0",
     "@iconify/json": "^2.2.35",
     "@purge-icons/generated": "^0.9.0",
diff --git a/packages/ui/certd-client/src/views/integration/bpmn/ElementUserAssign.vue b/packages/ui/certd-client/src/views/integration/bpmn/ElementUserAssign.vue
index e779dafd..191db788 100644
--- a/packages/ui/certd-client/src/views/integration/bpmn/ElementUserAssign.vue
+++ b/packages/ui/certd-client/src/views/integration/bpmn/ElementUserAssign.vue
@@ -1,5 +1,5 @@
 <template>
-  <component :is="ui.collapseItem.name" name="element-documentations">
+  <component :is="ui.collapseItem.name" name="element-user-assign">
     <template #header>
       <collapse-title :title="$t('panel.userAssign')">
         <lucide-icon name="FileText" />
@@ -69,7 +69,7 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, Ref, ref } from "vue";
+import { computed, defineComponent, onMounted, onUnmounted, Ref, ref } from "vue";
 import { useUi } from "@fast-crud/ui-interface";
 import { useModelerStore, Base } from "@fast-crud/fast-bpmn";
 
@@ -77,7 +77,6 @@ export default defineComponent({
   name: "ElementUserAssign",
   setup() {
     const { ui } = useUi();
-
     const userTypeOptions = ref([
       { value: "assignUser", label: "直接指派" },
       { value: "candidateUsers", label: "候选人" },
@@ -94,34 +93,25 @@ export default defineComponent({
       { id: "3", name: "测试部" }
     ]);
 
-    // import { injectModelerStore } from '../lib/store/modeler'
-    // import { getProcessProperty, setProcessProperty } from '../lib/bo-utils/processUtil'
     const { injectModelerStore } = useModelerStore();
     const modelerStore = injectModelerStore();
 
     const getActive = computed(() => modelerStore!.getActive!);
-    // const getActiveId = computed(() => modelerStore!.getActiveId!)
-
-    const bpmnExpose = modelerStore.expose;
-    console.log("bpmnExpose", bpmnExpose);
-    const boUtils = bpmnExpose.boUtils;
-    const getProcessProperty = boUtils.processUtil.getProcessProperty;
-    const setProcessProperty = boUtils.processUtil.setProcessProperty;
+    const helper = modelerStore.helper;
 
     const formData: Ref = ref({});
 
-    function loadFromModel() {
+    function reload() {
+      let element = getActive.value as Base;
       formData.value = {
-        userType: getProcessProperty(getActive.value as Base, "userType"),
-        assignUser: getProcessProperty(getActive.value as Base, "assignUser"),
-        candidateUsers: getProcessProperty(getActive.value as Base, "candidateUsers"),
-        candidateGroups: getProcessProperty(getActive.value as Base, "candidateGroups")
+        userType: helper.getElementProperty(element, "userType"),
+        assignUser: helper.getElementProperty(element, "assignUser"),
+        candidateUsers: helper.getElementProperty(element, "candidateUsers"),
+        candidateGroups: helper.getElementProperty(element, "candidateGroups")
       };
     }
 
-    modelerStore.eventer.on("element-update", () => {
-      loadFromModel();
-    });
+    modelerStore.onElementUpdate(reload);
 
     function vModeler(key: string) {
       const valueKey = key ? "value." + key : "value";
@@ -129,15 +119,11 @@ export default defineComponent({
         ref: formData,
         key: valueKey,
         onChange: (value: any) => {
-          onPropertyChange(key, value);
+          helper.setElementProperty(getActive.value as Base, key, value);
         }
       };
     }
 
-    function onPropertyChange(key: string, value: any) {
-      setProcessProperty(modelerStore, getActive.value as Base, key, value);
-    }
-
     return { ui, userTypeOptions, vModeler, formData, userList, groupList };
   }
 });
diff --git a/packages/ui/certd-client/vite.config.ts b/packages/ui/certd-client/vite.config.ts
index ec18c9ae..0c67eb56 100644
--- a/packages/ui/certd-client/vite.config.ts
+++ b/packages/ui/certd-client/vite.config.ts
@@ -60,7 +60,7 @@ export default ({ command, mode }) => {
     ],
     esbuild: {
       drop: command === "build" ? ["debugger"] : [],
-      // pure: ["console.log", "debugger"],
+      pure: ["console.log", "debugger"],
       jsxFactory: "h",
       jsxFragment: "Fragment"
     },