表单编辑新建流程，审核流程页面优化

src/components/FormViewer/index.vue

@@ -16,6 +16,7 @@
     formVerison: String,
     formRelationId: String,
     flowFormData: Object,
+    instanceInfo: String,
   });
   props.formConfig.forEach((element) => {
     element.componentProps.disabled = !element.disabled;
@@ -44,10 +45,11 @@
     }
   }
   async function getFormDetail() {
+    var instance = JSON.parse(props.instanceInfo);
     const querys = {
       id: props.formVerison,
       key: keyValue.value,
-      keyValue: props.processId,
+      keyValue: instance.pkeyValue,
     };
     const data = await functionGetFormDataFormScheme(querys);
     let obj = new Object();

src/views/demo/onlineform/formCall/CreateFlow.vue

@@ -180,7 +180,6 @@
       schemeId: designerData.formCurrentNode.formVerison,
       isUpdate: props.isUpdate,
       pkey: keyValue.value,
-      pkeyValue: processId,
     };
     // 有表单内容，先存表单信息
     if (formVisble.value) {
@@ -190,19 +189,31 @@
       formBoxRef.value
         .getForm()
         .then(async (res) => {
-          res[designerData.formCurrentNode.formRelationId] = processId;
+          if (!props.isUpdate) {
+            res[designerData.formCurrentNode.formRelationId] = processId;
+            querys.pkeyValue = processId;
+          }
           for (var item in res) {
+            console.log(res[item]);
             if (res[item] == undefined) {
               res[item] = '';
-              if (item.search('_input_guid') != -1) {
+              if (item.search('_input_guid') != -1 && !props.isUpdate) {
                 res[item] = buildGUID();
               }
+            } else {
+              if (props.isUpdate) {
+                if (item.search('_input_guid') != -1) {
+                  console.log(res[item]);
+                  querys.pkeyValue = res[item];
+                }
+              }
             }
           }
           querys.data = JSON.stringify(res);
+          console.log(querys);
           const formValue = await functionsaveForm(querys);
           if (formValue) {
-            handleCreateFlow(processId);
+            handleCreateFlow(processId, querys.pkeyValue);
           }
         })
         .catch((error) => {
@@ -214,12 +225,18 @@
       handleCreateFlow(processId);
     }
   }
-  async function handleCreateFlow(processId) {
+  async function handleCreateFlow(processId, pkeyValue) {
+    var commit = {
+      schemeId: designerData.formCurrentNode.formVerison,
+      pkey: keyValue.value,
+      pkeyValue: pkeyValue ? pkeyValue : processId,
+    };
     var querys = {
       schemeCode: designerData.isDraft ? '' : props.code,
       userId: formData.userId,
       title: formData.title,
       processId: processId,
+      InstanceInfo: JSON.stringify(commit),
     };
     if (!designerData.isDraft) {
       await saveDraft(querys);

src/views/demo/onlineform/formCall/index.vue

@@ -317,6 +317,7 @@
             btnList: btnList.value,
           });
         } else {
+          flowFormData.value = {};
           previewOpen.value = true;
           isUpdate.value = false;
         }

src/views/demo/workflow/create/preview.vue

@@ -166,11 +166,18 @@
     designerData.delegateUsers = data;
   }
   async function handleSaveDraft() {
+    var processId = buildGUID();
+    var commit = {
+      schemeId: designerData.formCurrentNode.formVerison,
+      pkey: keyValue.value,
+      pkeyValue: processId,
+    };
     var querys = {
       schemeCode: designerData.isDraft ? '' : props.code,
       userId: formData.userId,
       title: formData.title,
-      processId: buildGUID(),
+      processId: processId,
+      InstanceInfo: JSON.stringify(commit),
     };
     const data = await saveDraft(querys);
     querys.schemeCode = '';
@@ -184,6 +191,7 @@
   }
   function handleSubmit() {
     var processId = buildGUID();
+
     var querys = {
       schemeId: designerData.formCurrentNode.formVerison,
       isUpdate: false,
@@ -223,11 +231,17 @@
     }
   }
   async function handleCreateFlow(processId) {
+    var commit = {
+      schemeId: designerData.formCurrentNode.formVerison,
+      pkey: keyValue.value,
+      pkeyValue: processId,
+    };
     var querys = {
       schemeCode: designerData.isDraft ? '' : props.code,
       userId: formData.userId,
       title: formData.title,
       processId: processId,
+      InstanceInfo: JSON.stringify(commit),
     };
     if (!designerData.isDraft) {
       await saveDraft(querys);

src/views/demo/workflow/task/process/audit.vue

@@ -17,6 +17,7 @@
                 :processId="designerData.process.id"
                 :formVerison="designerData.formCurrentNode.formVerison"
                 :formRelationId="designerData.formCurrentNode.formRelationId"
+                :instanceInfo="designerData.process.instanceInfo"
                 v-if="formVisble"
               />
             </a-tab-pane>

src/views/demo/workflow/task/process/look.vue

@@ -20,6 +20,7 @@
                 :processId="designerData.process.id"
                 :formVerison="designerData.formCurrentNode.formVerison"
                 :formRelationId="designerData.formCurrentNode.formRelationId"
+                :instanceInfo="designerData.process.instanceInfo"
                 v-if="formVisble"
               />
             </a-tab-pane>

vite.config.ts.timestamp-1716167551492-2f8db6b83a5e2.mjs

@@ -0,0 +1,66 @@
+// vite.config.ts
+import { defineApplicationConfig } from "file:///E:/%E6%96%B0%E6%9E%B6%E6%9E%84%E9%A1%B9%E7%9B%AE/%E8%B4%A2%E6%BA%90%E4%B8%80%E4%BD%93%E5%8C%96/mian/CaiYuanYiTiHua/internal/vite-config/dist/index.mjs";
+var vite_config_default = defineApplicationConfig({
+  overrides: {
+    optimizeDeps: {
+      include: [
+        "echarts/core",
+        "echarts/charts",
+        "echarts/components",
+        "echarts/renderers",
+        "qrcode",
+        "@iconify/iconify",
+        "ant-design-vue/es/locale/zh_CN",
+        "ant-design-vue/es/locale/en_US",
+        "@/../lib/vform/designer.umd.js"
+      ]
+    },
+    build: {
+      /* 其他build生产打包配置省略 */
+      //...
+      target: "esnext",
+      commonjsOptions: {
+        include: /node_modules|lib/
+        //这里记得把lib目录加进来，否则生产打包会报错！！
+      }
+    },
+    server: {
+      proxy: {
+        "/basic-api": {
+          target: "http://localhost:3000",
+          changeOrigin: true,
+          ws: true,
+          rewrite: (path) => path.replace(new RegExp(`^/basic-api`), "")
+          // only https
+          // secure: false
+        },
+        "/upload": {
+          target: "http://localhost:3300/upload",
+          changeOrigin: true,
+          ws: true,
+          rewrite: (path) => path.replace(new RegExp(`^/upload`), "")
+        }
+      },
+      warmup: {
+        clientFiles: ["./index.html", "./src/{views,components}/*"]
+      }
+    },
+    define: {
+      "process.env": {
+        BASE_URL: "/"
+      }
+    },
+    css: {
+      preprocessorOptions: {
+        less: {
+          javascriptEnabled: true
+        }
+      }
+    },
+    plugins: []
+  }
+});
+export {
+  vite_config_default as default
+};
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsidml0ZS5jb25maWcudHMiXSwKICAic291cmNlc0NvbnRlbnQiOiBbImNvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9kaXJuYW1lID0gXCJFOlxcXFxcdTY1QjBcdTY3QjZcdTY3ODRcdTk4NzlcdTc2RUVcXFxcXHU4RDIyXHU2RTkwXHU0RTAwXHU0RjUzXHU1MzE2XFxcXG1pYW5cXFxcQ2FpWXVhbllpVGlIdWFcIjtjb25zdCBfX3ZpdGVfaW5qZWN0ZWRfb3JpZ2luYWxfZmlsZW5hbWUgPSBcIkU6XFxcXFx1NjVCMFx1NjdCNlx1Njc4NFx1OTg3OVx1NzZFRVxcXFxcdThEMjJcdTZFOTBcdTRFMDBcdTRGNTNcdTUzMTZcXFxcbWlhblxcXFxDYWlZdWFuWWlUaUh1YVxcXFx2aXRlLmNvbmZpZy50c1wiO2NvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9pbXBvcnRfbWV0YV91cmwgPSBcImZpbGU6Ly8vRTovJUU2JTk2JUIwJUU2JTlFJUI2JUU2JTlFJTg0JUU5JUExJUI5JUU3JTlCJUFFLyVFOCVCNCVBMiVFNiVCQSU5MCVFNCVCOCU4MCVFNCVCRCU5MyVFNSU4QyU5Ni9taWFuL0NhaVl1YW5ZaVRpSHVhL3ZpdGUuY29uZmlnLnRzXCI7aW1wb3J0IHsgZGVmaW5lQXBwbGljYXRpb25Db25maWcgfSBmcm9tICdAdmJlbi92aXRlLWNvbmZpZyc7XG5cbmV4cG9ydCBkZWZhdWx0IGRlZmluZUFwcGxpY2F0aW9uQ29uZmlnKHtcbiAgb3ZlcnJpZGVzOiB7XG4gICAgb3B0aW1pemVEZXBzOiB7XG4gICAgICBpbmNsdWRlOiBbXG4gICAgICAgICdlY2hhcnRzL2NvcmUnLFxuICAgICAgICAnZWNoYXJ0cy9jaGFydHMnLFxuICAgICAgICAnZWNoYXJ0cy9jb21wb25lbnRzJyxcbiAgICAgICAgJ2VjaGFydHMvcmVuZGVyZXJzJyxcbiAgICAgICAgJ3FyY29kZScsXG4gICAgICAgICdAaWNvbmlmeS9pY29uaWZ5JyxcbiAgICAgICAgJ2FudC1kZXNpZ24tdnVlL2VzL2xvY2FsZS96aF9DTicsXG4gICAgICAgICdhbnQtZGVzaWduLXZ1ZS9lcy9sb2NhbGUvZW5fVVMnLFxuICAgICAgICAnQC8uLi9saWIvdmZvcm0vZGVzaWduZXIudW1kLmpzJyxcbiAgICAgIF0sXG4gICAgfSxcbiAgICBidWlsZDoge1xuICAgICAgLyogXHU1MTc2XHU0RUQ2YnVpbGRcdTc1MUZcdTRFQTdcdTYyNTNcdTUzMDVcdTkxNERcdTdGNkVcdTc3MDFcdTc1NjUgKi9cbiAgICAgIC8vLi4uXG4gICAgICB0YXJnZXQ6ICdlc25leHQnLFxuICAgICAgY29tbW9uanNPcHRpb25zOiB7XG4gICAgICAgIGluY2x1ZGU6IC9ub2RlX21vZHVsZXN8bGliLywgLy9cdThGRDlcdTkxQ0NcdThCQjBcdTVGOTdcdTYyOEFsaWJcdTc2RUVcdTVGNTVcdTUyQTBcdThGREJcdTY3NjVcdUZGMENcdTU0MjZcdTUyMTlcdTc1MUZcdTRFQTdcdTYyNTNcdTUzMDVcdTRGMUFcdTYyQTVcdTk1MTlcdUZGMDFcdUZGMDFcbiAgICAgIH0sXG4gICAgfSxcbiAgICBzZXJ2ZXI6IHtcbiAgICAgIHByb3h5OiB7XG4gICAgICAgICcvYmFzaWMtYXBpJzoge1xuICAgICAgICAgIHRhcmdldDogJ2h0dHA6Ly9sb2NhbGhvc3Q6MzAwMCcsXG4gICAgICAgICAgY2hhbmdlT3JpZ2luOiB0cnVlLFxuICAgICAgICAgIHdzOiB0cnVlLFxuICAgICAgICAgIHJld3JpdGU6IChwYXRoKSA9PiBwYXRoLnJlcGxhY2UobmV3IFJlZ0V4cChgXi9iYXNpYy1hcGlgKSwgJycpLFxuICAgICAgICAgIC8vIG9ubHkgaHR0cHNcbiAgICAgICAgICAvLyBzZWN1cmU6IGZhbHNlXG4gICAgICAgIH0sXG4gICAgICAgICcvdXBsb2FkJzoge1xuICAgICAgICAgIHRhcmdldDogJ2h0dHA6Ly9sb2NhbGhvc3Q6MzMwMC91cGxvYWQnLFxuICAgICAgICAgIGNoYW5nZU9yaWdpbjogdHJ1ZSxcbiAgICAgICAgICB3czogdHJ1ZSxcbiAgICAgICAgICByZXdyaXRlOiAocGF0aCkgPT4gcGF0aC5yZXBsYWNlKG5ldyBSZWdFeHAoYF4vdXBsb2FkYCksICcnKSxcbiAgICAgICAgfSxcbiAgICAgIH0sXG4gICAgICB3YXJtdXA6IHtcbiAgICAgICAgY2xpZW50RmlsZXM6IFsnLi9pbmRleC5odG1sJywgJy4vc3JjL3t2aWV3cyxjb21wb25lbnRzfS8qJ10sXG4gICAgICB9LFxuICAgIH0sXG4gICAgZGVmaW5lOiB7XG4gICAgICAncHJvY2Vzcy5lbnYnOiB7XG4gICAgICAgIEJBU0VfVVJMOiAnLycsXG4gICAgICB9LFxuICAgIH0sXG4gICAgY3NzOiB7XG4gICAgICBwcmVwcm9jZXNzb3JPcHRpb25zOiB7XG4gICAgICAgIGxlc3M6IHtcbiAgICAgICAgICBqYXZhc2NyaXB0RW5hYmxlZDogdHJ1ZSxcbiAgICAgICAgfSxcbiAgICAgIH0sXG4gICAgfSxcbiAgICBwbHVnaW5zOiBbXSxcbiAgfSxcbn0pO1xuIl0sCiAgIm1hcHBpbmdzIjogIjtBQUFrWCxTQUFTLCtCQUErQjtBQUUxWixJQUFPLHNCQUFRLHdCQUF3QjtBQUFBLEVBQ3JDLFdBQVc7QUFBQSxJQUNULGNBQWM7QUFBQSxNQUNaLFNBQVM7QUFBQSxRQUNQO0FBQUEsUUFDQTtBQUFBLFFBQ0E7QUFBQSxRQUNBO0FBQUEsUUFDQTtBQUFBLFFBQ0E7QUFBQSxRQUNBO0FBQUEsUUFDQTtBQUFBLFFBQ0E7QUFBQSxNQUNGO0FBQUEsSUFDRjtBQUFBLElBQ0EsT0FBTztBQUFBO0FBQUE7QUFBQSxNQUdMLFFBQVE7QUFBQSxNQUNSLGlCQUFpQjtBQUFBLFFBQ2YsU0FBUztBQUFBO0FBQUEsTUFDWDtBQUFBLElBQ0Y7QUFBQSxJQUNBLFFBQVE7QUFBQSxNQUNOLE9BQU87QUFBQSxRQUNMLGNBQWM7QUFBQSxVQUNaLFFBQVE7QUFBQSxVQUNSLGNBQWM7QUFBQSxVQUNkLElBQUk7QUFBQSxVQUNKLFNBQVMsQ0FBQyxTQUFTLEtBQUssUUFBUSxJQUFJLE9BQU8sYUFBYSxHQUFHLEVBQUU7QUFBQTtBQUFBO0FBQUEsUUFHL0Q7QUFBQSxRQUNBLFdBQVc7QUFBQSxVQUNULFFBQVE7QUFBQSxVQUNSLGNBQWM7QUFBQSxVQUNkLElBQUk7QUFBQSxVQUNKLFNBQVMsQ0FBQyxTQUFTLEtBQUssUUFBUSxJQUFJLE9BQU8sVUFBVSxHQUFHLEVBQUU7QUFBQSxRQUM1RDtBQUFBLE1BQ0Y7QUFBQSxNQUNBLFFBQVE7QUFBQSxRQUNOLGFBQWEsQ0FBQyxnQkFBZ0IsNEJBQTRCO0FBQUEsTUFDNUQ7QUFBQSxJQUNGO0FBQUEsSUFDQSxRQUFRO0FBQUEsTUFDTixlQUFlO0FBQUEsUUFDYixVQUFVO0FBQUEsTUFDWjtBQUFBLElBQ0Y7QUFBQSxJQUNBLEtBQUs7QUFBQSxNQUNILHFCQUFxQjtBQUFBLFFBQ25CLE1BQU07QUFBQSxVQUNKLG1CQUFtQjtBQUFBLFFBQ3JCO0FBQUEsTUFDRjtBQUFBLElBQ0Y7QUFBQSxJQUNBLFNBQVMsQ0FBQztBQUFBLEVBQ1o7QUFDRixDQUFDOyIsCiAgIm5hbWVzIjogW10KfQo=