cloud-web-corejs-haier 1.0.42 → 1.0.44

package/src/views/user/form/vform/formFieldMapping.js

@@ -129,10 +129,9 @@ export const formFieldMapping = {
   },
 
   'AreaSelect': {
-    type: 'cascader',
+    type: 'area-select',
     options: {
-      areaDataEnabled: true,  //是否加载省市区数据
-      areaDataType: 2, //0不开启，1加载省市数据，2加载省市区数据
+      areaDataType: 2,
     }
   },
 

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,8 +1,17 @@
 <template>
   <div id="containt">
     <template v-if="layoutType == 'PC'">
-      <x-tabs ref="xTabs" v-model="activeName" class="tab-box" :tabNameEnable="true">
-        <el-tab-pane :label="$t2('常规')" name="first">
+      <x-tabs
+        ref="xTabs"
+        v-model="activeName"
+        class="tab-box"
+        :tabNameEnable="true"
+      >
+        <el-tab-pane
+          v-if="!formConfig.hideNormalTab"
+          :label="$t2('常规')"
+          name="first"
+        >
           <vFormRender
             ref="edit"
             :formCode.sync="formCode1"
@@ -17,11 +26,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 +110,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 +122,7 @@
       </el-dialog>
       <vFormRender
         :formCode="formCode"
+        :param="param"
         style="height: 100%"
         v-if="showRender"
         visible-key="showRender"
@@ -159,7 +174,7 @@ export default {
         let num = Number(val.substring("otherTab".length));
         this.otherTabList[num].showContent = true;
       }
-      this.handleTabChange(val)
+      this.handleTabChange(val);
     },
   },
   created() {
@@ -172,19 +187,37 @@ export default {
     };
   },
   methods: {
-    handleTabChange(tabName){
-      if(tabName == "second"){
+    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();
+      } 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() {
@@ -220,7 +253,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
       );
@@ -236,21 +271,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;
         }
       }
@@ -284,9 +324,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;

package/src/views/user/groups/list.vue

@@ -1,158 +1,158 @@
-<template>
-  <div id="containt">
-    <el-tabs v-model="activeName" class="tab-box">
-      <el-tab-pane :label="$t1('常规')" name="first">
-        <editView v-if="showEdit" visible-key="showEdit" :_dataId.sync="dataId" :parent-target="_self"
-                  @reload="$reloadHandle"></editView>
-      </el-tab-pane>
-      <el-tab-pane :label="$t1('列表')" name="second">
-        <div class="grid-height">
-          <vxe-grid ref="table-m1" v-bind="vxeOption" @resizable-change="$vxeTableUtil.onColumnWitchChange"
-                    @custom="$vxeTableUtil.customHandle">
-            <template #form>
-              <div class="clearfix screen-btns">
-                <div class="fl">
-                  <vxe-button status="primary" class="button-sty" icon="el-icon-plus" @click="openEditDialog">
-                    {{ $t1('新增') }}
-                  </vxe-button>
-                  <base-table-export :option="{ title: $t1('用户组导出'), targetRef: 'table-m1'}"
-                                     :parent-target="_self"/>
-                  <!-- <vxe-button status="primary" class="button-sty" icon="el-icon-download" @click="importExcel">导入</vxe-button> -->
-                </div>
-                <div class="fr">
-                  <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
-                              plain>{{ $t1('重置') }}
-                  </vxe-button>
-                  <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">
-                    {{ $t1('搜索') }}
-                  </vxe-button>
-                </div>
-              </div>
-              <vxe-form ref="form" class="screen-box" title-width="92px" title-align="right" :data="formData"
-                        @submit="searchEvent" @reset="searchEvent">
-                <vxe-form-item :title="$t1('用户组名称')+':'" field="groupName">
-                  <template v-slot>
-                    <el-input v-model="formData.groupName" size="small" clearable/>
-                  </template>
-                </vxe-form-item>
-                <vxe-form-item :title="$t1('用户组编码')+':'" field="groupCode">
-                  <template v-slot>
-                    <el-input v-model="formData.groupCode" size="small" clearable/>
-                  </template>
-                </vxe-form-item>
-              </vxe-form>
-            </template>
-          </vxe-grid>
-        </div>
-      </el-tab-pane>
-    </el-tabs>
-  </div>
-</template>
-
-<script>
-import editView from './edit.vue';
-
-export default {
-  name: 'groups:list',
-  components: {editView},
-  data() {
-    return {
-      activeName: 'second',
-      dataId: 0,
-      showEdit: false,
-      vxeOption: {},
-      formData: {}
-    };
-  },
-  mounted() {
-    this.initTableList();
-  },
-  methods: {
-    searchEvent() {
-      this.$refs['table-m1'].commitProxy('reload');
-    },
-    resetEvent() {
-      this.formData = {};
-      this.$refs['table-m1'].commitProxy('reload');
-    },
-    openEditDialog(id) {
-      this.dataId = !id || typeof id == 'object' ? 0 : id;
-      this.activeName = 'first';
-      this.$openEditView('showEdit');
-    },
-    initTableList() {
-      let that = this;
-      let tableOption = {
-        vue: this,
-        tableRef: 'table-m1',
-        tableName: 'user_groups_list-m1',
-        aes: true,
-        path: USER_PREFIX + '/groups/listPage',
-        param: () => {
-          return this.formData;
-        },
-        columns: [
-          {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
-          {
-            title: this.$t1('用户组名称'),
-            field: 'groupName',
-            width: 150,
-            fixed: 'left'
-          },
-          {
-            field: 'groupCode',
-            title: this.$t1('用户组编码'),
-            width: 250
-          },
-          {
-            field: 'createDate',
-            title: this.$t1('创建时间'),
-            width: 150
-          },
-          {
-            width: 47,
-            fixed: 'right',
-            title: '',
-            sortable: false,
-            slots: {
-              default: ({row}) => {
-                return [
-                  <div>
-                    <a
-                      href="javascript:void(0);"
-                      class="a-link"
-                      onclick={() => {
-                        this.openEditDialog(row.id);
-                      }}
-                    >
-                      <el-tooltip enterable={false} effect="dark" content={this.$t1('查看')} placement="top"
-                                  popper-class="tooltip-skin">
-                        <i class="el-icon-edit"/>
-                      </el-tooltip>
-                    </a>
-                  </div>
-                ];
-              }
-            }
-          }
-        ]
-      };
-      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
-        this.vxeOption = opts;
-      });
-    },
-    importExcel() {
-      let that = this;
-      that.$excelImport({
-        prefix: USER_PREFIX,
-        excel: USER_PREFIX + '/excelTemplate/groups/groups.xlsx',
-        multi: false,
-        saveUrl: USER_PREFIX + '/groups/save',
-        callback: () => {
-          that.searchEvent();
-        }
-      });
-    }
-  }
-};
-</script>
+<template>
+  <div id="containt">
+    <el-tabs v-model="activeName" class="tab-box">
+      <el-tab-pane :label="$t1('常规')" name="first">
+        <editView v-if="showEdit" visible-key="showEdit" :_dataId.sync="dataId" :parent-target="_self"
+                  @reload="$reloadHandle"></editView>
+      </el-tab-pane>
+      <el-tab-pane :label="$t1('列表')" name="second">
+        <div class="grid-height">
+          <vxe-grid ref="table-m1" v-bind="vxeOption" @resizable-change="$vxeTableUtil.onColumnWitchChange"
+                    @custom="$vxeTableUtil.customHandle">
+            <template #form>
+              <div class="clearfix screen-btns">
+                <div class="fl">
+                  <vxe-button status="primary" class="button-sty" icon="el-icon-plus" @click="openEditDialog">
+                    {{ $t1('新增') }}
+                  </vxe-button>
+                  <base-table-export :option="{ title: $t1('用户组导出'), targetRef: 'table-m1'}"
+                                     :parent-target="_self"/>
+                  <!-- <vxe-button status="primary" class="button-sty" icon="el-icon-download" @click="importExcel">导入</vxe-button> -->
+                </div>
+                <div class="fr">
+                  <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
+                              plain>{{ $t1('重置') }}
+                  </vxe-button>
+                  <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">
+                    {{ $t1('搜索') }}
+                  </vxe-button>
+                </div>
+              </div>
+              <vxe-form ref="form" class="screen-box" title-width="92px" title-align="right" :data="formData"
+                        @submit="searchEvent" @reset="searchEvent">
+                <vxe-form-item :title="$t1('用户组名称')+':'" field="groupName">
+                  <template v-slot>
+                    <el-input v-model="formData.groupName" size="small" clearable/>
+                  </template>
+                </vxe-form-item>
+                <vxe-form-item :title="$t1('用户组编码')+':'" field="groupCode">
+                  <template v-slot>
+                    <el-input v-model="formData.groupCode" size="small" clearable/>
+                  </template>
+                </vxe-form-item>
+              </vxe-form>
+            </template>
+          </vxe-grid>
+        </div>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import editView from './edit.vue';
+
+export default {
+  name: 'groups:list',
+  components: {editView},
+  data() {
+    return {
+      activeName: 'second',
+      dataId: 0,
+      showEdit: false,
+      vxeOption: {},
+      formData: {}
+    };
+  },
+  mounted() {
+    this.initTableList();
+  },
+  methods: {
+    searchEvent() {
+      this.$refs['table-m1'].commitProxy('reload');
+    },
+    resetEvent() {
+      this.formData = {};
+      this.$refs['table-m1'].commitProxy('reload');
+    },
+    openEditDialog(id) {
+      this.dataId = !id || typeof id == 'object' ? 0 : id;
+      this.activeName = 'first';
+      this.$openEditView('showEdit');
+    },
+    initTableList() {
+      let that = this;
+      let tableOption = {
+        vue: this,
+        tableRef: 'table-m1',
+        tableName: 'user_groups_list-m1',
+        aes: true,
+        path: USER_PREFIX + '/groups/listPage',
+        param: () => {
+          return this.formData;
+        },
+        columns: [
+          {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
+          {
+            title: this.$t1('用户组名称'),
+            field: 'groupName',
+            width: 150,
+            fixed: 'left'
+          },
+          {
+            field: 'groupCode',
+            title: this.$t1('用户组编码'),
+            width: 250
+          },
+          {
+            field: 'createDate',
+            title: this.$t1('创建时间'),
+            width: 150
+          },
+          {
+            width: 47,
+            fixed: 'right',
+            title: '',
+            sortable: false,
+            slots: {
+              default: ({row}) => {
+                return [
+                  <div>
+                    <a
+                      href="javascript:void(0);"
+                      class="a-link"
+                      onclick={() => {
+                        this.openEditDialog(row.id);
+                      }}
+                    >
+                      <el-tooltip enterable={false} effect="dark" content={this.$t1('查看')} placement="top"
+                                  popper-class="tooltip-skin">
+                        <i class="el-icon-edit"/>
+                      </el-tooltip>
+                    </a>
+                  </div>
+                ];
+              }
+            }
+          }
+        ]
+      };
+      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
+        this.vxeOption = opts;
+      });
+    },
+    importExcel() {
+      let that = this;
+      that.$excelImport({
+        prefix: USER_PREFIX,
+        excel: USER_PREFIX + '/excelTemplate/groups/groups.xlsx',
+        multi: false,
+        saveUrl: USER_PREFIX + '/groups/save',
+        callback: () => {
+          that.searchEvent();
+        }
+      });
+    }
+  }
+};
+</script>