cloud-web-corejs-haier 1.0.36 → 1.0.38

package/package.json

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

package/src/components/xform/form-designer/form-widget/dialog/searchFormDialog.vue

@@ -120,7 +120,9 @@ export default {
             let datas = $grid.getTableData().tableData;
             let fieldKey = this.fieldKey;
             this.checkRows.forEach((checkRow) => {
-              let row = datas.find((row) => row[fieldKey] == checkRow[fieldKey]);
+              let row = datas.find(
+                (row) => row[fieldKey] == checkRow[fieldKey]
+              );
               if (row) {
                 $grid.setCheckboxRow(row, true);
               }
@@ -168,7 +170,9 @@ export default {
         width: "1200px",
         fullscreen: this.option.fullscreen,
       };
-      config = Object.assign({}, config, this.option.dialogConfig, { customClass });
+      config = Object.assign({}, config, this.option.dialogConfig, {
+        customClass,
+      });
       config.title = this.$t1(config.title);
       return config;
     },
@@ -181,7 +185,9 @@ export default {
       if (this.option.showFooter == false) {
         classStr = classStr + " nfootBtn";
       }
-      config = Object.assign({}, config, this.option.bodyConfig, { class: classStr });
+      config = Object.assign({}, config, this.option.bodyConfig, {
+        class: classStr,
+      });
       return config;
     },
   },
@@ -233,7 +239,9 @@ export default {
             : {};
           this.layoutType = this.formJson.formConfig.layoutType;
           let formConfig = this.formJson.formConfig;
-          if (formConfig.searchDialogUniqueField) {
+          if (this.option.fieldKey) {
+            this.fieldKey = this.option.fieldKey;
+          } else if (formConfig.searchDialogUniqueField) {
             this.fieldKey = formConfig.searchDialogUniqueField;
           }
           /*this.$nextTick(() => {
@@ -268,7 +276,8 @@ export default {
       return this.$grid;
     },
     initShowFormField() {
-      let showFormField = this.formJson.formConfig.searchDialogNameField || null;
+      let showFormField =
+        this.formJson.formConfig.searchDialogNameField || null;
       if (!showFormField) {
         // let widgetList = this.formJson.widgetList;
         let dataTableWidget = this.getDataTableWidget();