cloud-web-corejs 1.0.235 → 1.0.236

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.235",
+  "version": "1.0.236",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

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

@@ -1,5 +1,5 @@
 <template>
-  <vFormRender :formCode="formCode" :dataId.sync="dataId"
+  <vFormRender :formCode="formCode" :dataId.sync="dataId" :param="param"
                v-if="showEdit" visible-key="showEdit" :parent-target="_self"
                @reload="$reloadHandle"></vFormRender>
 </template>
@@ -14,15 +14,33 @@ export default {
       formCode: null,
       dataId: null,
       showEdit: false,
+      param: {},
     }
   },
   created() {
     this.init()
   },
   methods: {
+    parseViewParam() {
+      let param = {};
+      let rawParam = this.$attrs.param ?? this.$route.query.param;
+      if (rawParam) {
+        if (typeof rawParam === "string") {
+          try {
+            param = JSON.parse(rawParam) || {};
+          } catch (e) {
+            param = {};
+          }
+        } else if (typeof rawParam === "object") {
+          param = { ...rawParam };
+        }
+      }
+      return param;
+    },
     init() {
       let formCode = this.$route.query.formCode || this.$attrs.formCode;
       let dataId = this.$route.query.dataId || this.$attrs.dataId || this.$attrs._dataId;
+      this.param = this.parseViewParam();
 
       if (dataId && formCode) {
         this.formCode = formCode;

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

@@ -1,7 +1,12 @@
 <template>
   <div id="containt">
     <template v-if="layoutType == 'PC'">
-      <x-tabs ref="xTabs" v-model="activeName" class="tab-box" :tabNameEnable="true">
+      <x-tabs
+        ref="xTabs"
+        v-model="activeName"
+        class="tab-box"
+        :tabNameEnable="true"
+      >
         <el-tab-pane :label="$t2('常规')" name="first">
           <vFormRender
             ref="edit"
@@ -17,11 +22,15 @@
             @openCopyEditTab="openCopyEditTab"
           ></vFormRender>
         </el-tab-pane>
-        <el-tab-pane :label="$t2(formConfig.customListTabLabel || '列表')" name="second">
+        <el-tab-pane
+          :label="$t2(formConfig.customListTabLabel || '列表')"
+          name="second"
+        >
           <div class="grid-height">
             <vFormRender
               ref="list"
               :formCode="formCode"
+              :param="param"
               style="height: 100%"
               v-if="showRender"
               visible-key="showRender"
@@ -97,8 +106,9 @@
       >
         <div class="cont" style="height: calc(100vh - 73px)">
           <vFormRender
-            :formCode="formCode2"
+            :formCode="formCode1"
             :dataId.sync="dataId"
+            :param="param"
             v-if="showEditDialog && showEdit"
             visible-key="showEdit"
             :parent-target="_self"
@@ -108,6 +118,7 @@
       </el-dialog>
       <vFormRender
         :formCode="formCode"
+        :param="param"
         style="height: 100%"
         v-if="showRender"
         visible-key="showRender"
@@ -159,6 +170,7 @@ export default {
         let num = Number(val.substring("otherTab".length));
         this.otherTabList[num].showContent = true;
       }
+      this.handleTabChange(val);
     },
   },
   created() {
@@ -171,11 +183,37 @@ export default {
     };
   },
   methods: {
+    handleTabChange(tabName) {
+      if (tabName == "second") {
+        this.$refs.list.dataTableSearch();
+      } else if (tabName.startsWith("otherTab")) {
+        let refName = tabName.replace("otherTab", "list");
+        if (this.$refs[refName]?.length)
+          this.$refs[refName][0].dataTableSearch();
+      }
+    },
+    parseViewParam() {
+      let param = {};
+      let rawParam = this.$attrs.param ?? this.$route.query.param;
+      if (rawParam) {
+        if (typeof rawParam === "string") {
+          try {
+            param = JSON.parse(rawParam) || {};
+          } catch (e) {
+            param = {};
+          }
+        } else if (typeof rawParam === "object") {
+          param = { ...rawParam };
+        }
+      }
+      return param;
+    },
     initParam() {
       let path = this.$route.path;
-      let param = path.split("/").reverse();
+      let pathSegments = path.split("/").reverse();
 
-      this.formCode = this.$attrs.formCode || param[0];
+      this.formCode = this.$attrs.formCode || pathSegments[0];
+      this.param = this.parseViewParam();
       this.showRender = true;
     },
     getReportTemplate() {
@@ -211,7 +249,9 @@ export default {
     openOtherTab(row, param, option) {
       let dataId = row && row.id ? row.id : null;
       let formCode = option.formCode;
-      let otherTab = this.otherTabList.find((item) => item.formCode == formCode);
+      let otherTab = this.otherTabList.find(
+        (item) => item.formCode == formCode
+      );
       let otherTabIndex = this.otherTabList.findIndex(
         (item) => item.formCode == formCode
       );
@@ -227,21 +267,26 @@ export default {
       });
     },
     openEditDialog(row, param, option) {
+      debugger;
       if (option?.otherTab) {
         this.openOtherTab(row, param, option);
         return;
       }
       if (this.layoutType == "H5") {
-        this.openEditH5Dialog(row);
+        this.openEditH5Dialog(row, param);
         return;
       }
       let formConfig = this.formJson.formConfig;
-      let tabLabelField = option?.multiTabLabelField || formConfig.multiTabLabelField;
+      let tabLabelField =
+        option?.multiTabLabelField || formConfig.multiTabLabelField;
       let multiTabEnabled = false;
       if (tabLabelField) {
         if (option?.multiTabEnabled) {
           multiTabEnabled = true;
-        } else if (formConfig.multiTabEnabled && option?.multiTabEnabled !== false) {
+        } else if (
+          formConfig.multiTabEnabled &&
+          option?.multiTabEnabled !== false
+        ) {
           multiTabEnabled = true;
         }
       }
@@ -275,9 +320,11 @@ export default {
     openEditDialog1(row, param, option) {
       this.openEditDialog(row, param, { multiTabEnabled: false, ...option });
     },
-    openEditH5Dialog(row) {
+    openEditH5Dialog(row, param) {
+      debugger;
       this.formCode1 = this.addFormCode;
       this.dataId = row && row.id ? row.id : null;
+      this.param = param;
       this.activeName = "first";
       this.showEdit = false;
       this.showEditDialog = true;