cloud-web-corejs 1.0.54-dev.532 → 1.0.54-dev.535

package/src/router/modules/customer.js

@@ -20,6 +20,14 @@ export const constantRoutes = [
         },
         hidden: true
     },
+    {
+        path: '/test_univer',
+        component: () => import('@/views/test/test_univer.vue'),
+        meta: {
+            checkToken: false,
+        },
+        hidden: true
+    },
   {
     path: "",
     component: () => import("@/layout/index"),

package/src/views/user/home/default.vue

@@ -393,7 +393,8 @@ export default {
       this.wfContentOption = {
         objId: row.objId,
         url: row.url,
-        objTypeCode: row.objTypeCode
+        objTypeCode: row.objTypeCode,
+        formCode: row.formCode
       };
       this.showWfDialog = true;
     },

package/src/views/user/notify_message/dialog.vue

@@ -81,8 +81,14 @@ export default {
         }
 
         if (wfUrl == "form") {
+          let formCode = null;
+          if (param.formCode) {
+            formCode = param.formCode;
+          } else {
+            formCode = param.objTypeCode.substr(9);
+          }
           this.param = Object.assign(param, {
-            formCode: param.objTypeCode.substr(9),
+            formCode: formCode,
             dataId: wfDataId,
           });
           let url = "/user/form/vform/render.vue";

package/src/views/user/wf/wfReport/index.vue

@@ -297,6 +297,7 @@ export default {
         objId: row.obj_id,
         url: row.url,
         objTypeCode: row.obj_type_code,
+        formCode: row.formCode,
       };
       this.showWfDialog = true;
     },

package/src/views/user/wf/wf_manage/list.vue

@@ -475,9 +475,16 @@ export default {
 
       let id = row.objId;
       let wfDataId = !id || typeof id == "object" ? 0 : Number(id);
+
       if (row.url == "form") {
+        let formCode = null;
+        if (row.formCode) {
+          formCode = row.formCode;
+        } else {
+          formCode = row.objTypeCode.substr(9);
+        }
         this.param = {
-          formCode: row.objTypeCode.substr(9),
+          formCode: formCode,
           dataId: wfDataId,
         };
         let url = "/user/form/vform/render.vue";

package/src/views/user/wf/wf_manage/wfContentDialog.vue

@@ -31,14 +31,13 @@
 </template>
 
 <script>
-
 export default {
   name: "wfContentDialog",
   props: {
     option: {
       type: Object,
-      default: {}
-    }
+      default: {},
+    },
   },
   components: {},
   data() {
@@ -46,7 +45,7 @@ export default {
       param: {},
       wfContent: null,
       showWfContent: false,
-      showWfDialog: true
+      showWfDialog: true,
     };
   },
   created() {
@@ -58,7 +57,7 @@ export default {
         this.$http({
           url: USER_PREFIX + "/wf_diy_attribute/getValue",
           method: `post`,
-          data: {attributeKey: "param4"},
+          data: { attributeKey: "param4" },
           isLoading: true,
           success: (res) => {
             let val = res.objx || false;
@@ -66,7 +65,7 @@ export default {
             if (val === true) {
               this.wfClose();
             }
-          }
+          },
         });
       } else {
         this.option._handleCallback && this.option._handleCallback(flag);
@@ -74,33 +73,37 @@ export default {
     },
     wfClose() {
       this.showWfDialog = false;
-      this.$emit('update:visible', false);
-      this.$emit('close');
+      this.$emit("update:visible", false);
+      this.$emit("close");
     },
     openWfDialog() {
       let id = this.option.objId;
-      let wfDataId = !id || typeof id == 'object' ? 0 : Number(id);
+      let wfDataId = !id || typeof id == "object" ? 0 : Number(id);
       let param = this.option.param || {};
-      if (this.option.url == 'form') {
+      if (this.option.url == "form") {
+        let formCode = null;
+        if (this.option.formCode) {
+          formCode = this.option.formCode;
+        } else {
+          formCode = this.option.objTypeCode.substr(9);
+        }
         this.param = Object.assign(param, {
-          formCode: this.option.objTypeCode.substr(9),
-          dataId: wfDataId
+          formCode: formCode,
+          dataId: wfDataId,
         });
-        let url = '/user/form/vform/render.vue';
-        this.wfContent = require('@base/views' + url).default;
+        let url = "/user/form/vform/render.vue";
+        this.wfContent = require("@base/views" + url).default;
       } else {
         this.param = Object.assign(param, {
-          _dataId: wfDataId
+          _dataId: wfDataId,
         });
-        let url = this.option.url + '.vue';
-        this.wfContent = require('@/views' + url).default;
+        let url = this.option.url + ".vue";
+        this.wfContent = require("@/views" + url).default;
       }
       this.showWfContent = true;
     },
-  }
-}
+  },
+};
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>