cloud-web-corejs 1.0.129 → 1.0.131

package/src/views/user/form/view/list.vue

@@ -1,30 +1,59 @@
 <template>
   <div id="containt">
-    <template v-if="layoutType=='PC'">
+    <template v-if="layoutType == 'PC'">
       <x-tabs ref="xTabs" v-model="activeName" class="tab-box">
         <el-tab-pane :label="$t2('常规')" name="first">
-          <vFormRender :formCode.sync="formCode1" :dataId.sync="dataId" :param="param" :formData="formData"
-                       v-if="showEdit" visible-key="showEdit" :parent-target="_self"
-                       @reload="reload" @openCopyEditTab="openCopyEditTab"></vFormRender>
+          <vFormRender
+            :formCode.sync="formCode1"
+            :dataId.sync="dataId"
+            :param="param"
+            :formData="formData"
+            v-if="showEdit"
+            visible-key="showEdit"
+            :parent-target="_self"
+            @reload="reload"
+            @openCopyEditTab="openCopyEditTab"
+          ></vFormRender>
         </el-tab-pane>
         <el-tab-pane :label="$t2('列表')" name="second">
           <div class="grid-height">
-            <vFormRender :formCode="formCode" style="height: 100%;"
-                         v-if="showRender" visible-key="showRender" :parent-target="_self"
-                         @reload="$reloadHandle" :openEditDialog="openEditDialog"></vFormRender>
+            <vFormRender
+              :formCode="formCode"
+              style="height: 100%"
+              v-if="showRender"
+              visible-key="showRender"
+              :parent-target="_self"
+              @reload="$reloadHandle"
+              :openEditDialog="openEditDialog"
+            ></vFormRender>
           </div>
         </el-tab-pane>
-        <template #editTab="{tab,index,reloadTabContent}">
-          <el-tab-pane :key="tab.data.id" :label="tab.data[multiTabLabelField]" :name="tab.data.id+''"
-                       :closable="true">
-            <vFormRender :formCode="formCode2" :dataId.sync="tab.dataId" :param="tab.param"
-                         v-if="tab.showContent" :parent-target="_self"
-                         @reload="(...args)=>{formData = {};reloadTabContent(...args)}" @openCopyEditTab="openCopyEditTab"></vFormRender>
+        <template #editTab="{ tab, index, reloadTabContent }">
+          <el-tab-pane
+            :key="tab.data.id"
+            :label="tab.data[multiTabLabelField]"
+            :name="tab.data.id + ''"
+            :closable="true"
+          >
+            <vFormRender
+              :formCode="tab.formCode"
+              :dataId.sync="tab.dataId"
+              :param="tab.param"
+              v-if="tab.showContent"
+              :parent-target="_self"
+              @reload="
+                (...args) => {
+                  formData = {};
+                  reloadTabContent(...args);
+                }
+              "
+              @openCopyEditTab="openCopyEditTab"
+            ></vFormRender>
           </el-tab-pane>
         </template>
       </x-tabs>
     </template>
-    <template v-else-if="layoutType=='H5'">
+    <template v-else-if="layoutType == 'H5'">
       <el-dialog
         :title="$t1('明细详情')"
         :modal-append-to-body="false"
@@ -38,29 +67,37 @@
         v-el-dialog-center
         :destroy-on-close="true"
       >
-        <div class="cont" style="height: calc(100vh - 73px);">
-          <vFormRender :formCode="formCode2" :dataId.sync="dataId"
-                       v-if="showEditDialog && showEdit" visible-key="showEdit" :parent-target="_self"
-                       @reload="$reloadHandle"></vFormRender>
+        <div class="cont" style="height: calc(100vh - 73px)">
+          <vFormRender
+            :formCode="formCode2"
+            :dataId.sync="dataId"
+            v-if="showEditDialog && showEdit"
+            visible-key="showEdit"
+            :parent-target="_self"
+            @reload="$reloadHandle"
+          ></vFormRender>
         </div>
       </el-dialog>
-      <vFormRender :formCode="formCode" style="height: 100%;"
-                   v-if="showRender" visible-key="showRender" :parent-target="_self"
-                   @reload="$reloadHandle" :openEditDialog="openEditDialog"></vFormRender>
+      <vFormRender
+        :formCode="formCode"
+        style="height: 100%"
+        v-if="showRender"
+        visible-key="showRender"
+        :parent-target="_self"
+        @reload="$reloadHandle"
+        :openEditDialog="openEditDialog"
+      ></vFormRender>
     </template>
   </div>
 </template>
 
 <script>
-
-import vFormRender from '../../../../views/user/form/vform/render'
+import vFormRender from "../../../../views/user/form/vform/render";
 
 export default {
-  name: 'form_view:list',
-  components: {vFormRender},
-  mounted() {
-
-  },
+  name: "form_view:list",
+  components: { vFormRender },
+  mounted() {},
   data() {
     let that = this;
     return {
@@ -76,12 +113,12 @@ export default {
       formCode: null,
       formCode1: null,
       formCode2: null,
-      addFormCode:null,
+      addFormCode: null,
       dataId: null,
       showEditDialog: false,
       param: {},
-      multiTabLabelField:null,
-      formData:null
+      multiTabLabelField: null,
+      formData: null,
     };
   },
   created() {
@@ -91,7 +128,7 @@ export default {
   methods: {
     initParam() {
       let path = this.$route.path;
-      let param = path.split('/').reverse();
+      let param = path.split("/").reverse();
 
       this.formCode = this.$attrs.formCode || param[0];
       this.showRender = true;
@@ -101,82 +138,89 @@ export default {
         aes: true,
         url: USER_PREFIX + `/formTemplate/getByFormCode`,
         method: `post`,
-        data: {stringOne: this.formCode},
+        data: { stringOne: this.formCode },
         // isLoading: true,
         // loadingTarget: document.body,
         // modalStrictly: true,
-        success: async res => {
+        success: async (res) => {
           let formTemplate = res.objx || {};
           this.formTemplate = formTemplate;
-          let formJson = formTemplate.formViewContent ? JSON.parse(formTemplate.formViewContent) : {};
+          let formJson = formTemplate.formViewContent
+            ? JSON.parse(formTemplate.formViewContent)
+            : {};
           this.formJson = formJson;
-          this.layoutType = formJson.formConfig?.layoutType
+          this.layoutType = formJson.formConfig?.layoutType;
           let addFormCode = formJson.formConfig?.addFormCode ?? null;
           let formCode2 = formJson.formConfig?.editFormCode ?? null;
-          this.formCode2 = formCode2
-          if(!addFormCode) {
-            addFormCode = formCode2
+          this.formCode2 = formCode2;
+          if (!addFormCode) {
+            addFormCode = formCode2;
           }
           this.addFormCode = addFormCode;
-          this.multiTabLabelField = formJson.formConfig?.multiTabLabelField
-        }
+          this.multiTabLabelField = formJson.formConfig?.multiTabLabelField;
+        },
       });
     },
-    openEditDialog(row, param) {
+    openEditDialog(row, param, option) {
       if (this.layoutType == "H5") {
         this.openEditH5Dialog(row);
         return;
       }
-      let formConfig = this.formJson.formConfig
-      let multiTabEnabled = formConfig.multiTabEnabled && formConfig.multiTabLabelField
+      let formConfig = this.formJson.formConfig;
+      let multiTabEnabled = formConfig.multiTabEnabled && formConfig.multiTabLabelField;
       let dataId = row && row.id ? row.id : null;
-      this.dataId = dataId
-      if(!dataId){
-          this.formCode1 = this.addFormCode;
-      }else{
-        this.formCode1 = this.formCode2;
+      this.dataId = dataId;
+      let formCode = null;
+      if (!dataId) {
+        formCode = option?.formCode || this.addFormCode;
+      } else {
+        formCode = option?.formCode || this.formCode2;
       }
-      if(multiTabEnabled && dataId){
-        this.$refs.xTabs.openEditTab(row,param);
-      }else{
-        this.activeName = 'first';
+      if (multiTabEnabled && dataId) {
+        this.$refs.xTabs.openEditTab(row, param, {
+          tabParam: {
+            formCode,
+          },
+        });
+      } else {
+        this.formCode1 = formCode;
+        this.activeName = "first";
         this.showEdit = false;
         this.showEditDialog = true;
-        this.param = param
+        this.param = param;
         this.formData = null;
-        this.$openEditView('showEdit');
+        this.$openEditView("showEdit");
       }
-
     },
     openEditH5Dialog(row) {
       this.formCode1 = this.addFormCode;
       this.dataId = row && row.id ? row.id : null;
-      this.activeName = 'first';
+      this.activeName = "first";
       this.showEdit = false;
       this.showEditDialog = true;
       this.$nextTick(() => {
-        this.$openEditView('showEdit');
+        this.$openEditView("showEdit");
       });
     },
 
     openCopyEditTab(formData) {
-      this.dataId = null
+      this.dataId = null;
       this.formCode1 = this.addFormCode;
-      this.activeName = 'first';
+      this.activeName = "first";
       this.showEdit = false;
       this.showEditDialog = true;
       // this.param = param
       this.formData = formData;
-      this.$openEditView('showEdit');
+      this.$openEditView("showEdit");
     },
-    reload(...args){
+    reload(...args) {
       this.formData = {};
-      this.$reloadHandle(...args)
+      this.$reloadHandle(...args);
     },
-    reload2(){
+    reload2() {
       this.formData = {};
-      this.$reloadHandle(...arguments)
-    }
-  }
+      this.$reloadHandle(...arguments);
+    },
+  },
 };
 </script>

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

@@ -35,16 +35,18 @@ export default {
   data() {
     return {
       showWfDialog2: false,
-      wfUrl2: '',
+      wfUrl2: "",
       showWfContent: true,
       wfContent: null,
-      wfDataId: '',
+      wfDataId: "",
       param: {},
     };
   },
   methods: {
     getUrlParam(url) {
-      var reg = /([^?&=]+)=([^?&=]+)/g, obj = {}, str = url;
+      var reg = /([^?&=]+)=([^?&=]+)/g,
+        obj = {},
+        str = url;
       url.replace(reg, function () {
         obj[arguments[1]] = arguments[2];
       });
@@ -58,9 +60,9 @@ export default {
           data: [row.id],
           isLoading: true,
           loadingTarget: document.body,
-          success: res => {
+          success: (res) => {
             callback && callback();
-          }
+          },
         });
       } else {
         callback && callback();
@@ -72,38 +74,41 @@ export default {
         let wfUrl = turl.split("?")[0];
         let param = this.getUrlParam(turl);
         let wfDataId = param.dataId;
+        if (!wfDataId) {
+          wfDataId = 0;
+        } else if (!isNaN(wfDataId)) {
+          wfDataId = Number(wfDataId);
+        }
 
-        if (wfUrl == 'form') {
+        if (wfUrl == "form") {
           this.param = Object.assign(param, {
             formCode: param.objTypeCode.substr(9),
-            dataId: wfDataId
+            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 = wfUrl + '.vue';
+          let url = wfUrl + ".vue";
           let id = wfDataId;
-          this.wfDataId = !id || typeof id == 'object' ? 0 : id;
+          this.wfDataId = !id || typeof id == "object" ? 0 : id;
           // this.showWfDialog = true;
           this.showWfContent = true;
-          this.wfContent = require('@/views' + url).default;
-
-
+          this.wfContent = require("@/views" + url).default;
         }
         this.showWfDialog2 = true;
 
         callback && callback();
-      })
-    }
-  }
+      });
+    },
+  },
 };
 </script>
 
 <style scoped>
 .designer-dialog.indexUse #containt .detail-wrap .d-cont {
-  height: calc(100vh - 82px)
+  height: calc(100vh - 82px);
 }
 </style>