cloud-web-corejs 1.0.54-dev.669 → 1.0.54-dev.671

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.669",
+  "version": "1.0.54-dev.671",
   "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

@@ -30,6 +30,7 @@
             <vFormRender
               ref="list"
               :formCode="formCode"
+              :param="param"
               style="height: 100%"
               v-if="showRender"
               visible-key="showRender"
@@ -107,6 +108,7 @@
           <vFormRender
             :formCode="formCode1"
             :dataId.sync="dataId"
+            :param="param"
             v-if="showEditDialog && showEdit"
             visible-key="showEdit"
             :parent-target="_self"
@@ -116,6 +118,7 @@
       </el-dialog>
       <vFormRender
         :formCode="formCode"
+        :param="param"
         style="height: 100%"
         v-if="showRender"
         visible-key="showRender"
@@ -189,11 +192,28 @@ export default {
           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() {
@@ -253,7 +273,7 @@ export default {
         return;
       }
       if (this.layoutType == "H5") {
-        this.openEditH5Dialog(row);
+        this.openEditH5Dialog(row, param);
         return;
       }
       let formConfig = this.formJson.formConfig;
@@ -300,10 +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;