cloud-web-corejs 1.0.54-dev.184 → 1.0.54-dev.185

package/package.json

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

package/src/components/xform/form-designer/form-widget/field-widget/fieldMixin.js

@@ -467,8 +467,8 @@ modules = {
           : delete this.refList[e];
       }
     },
-    getOptionKey(){
-      let key =  "optionItems-"+ this.field.options.name
+    getOptionKey() {
+      let key = "optionItems-" + this.field.options.name
       return key;
     },
     async initOptionItems(gloatFlag) {
@@ -540,13 +540,13 @@ modules = {
               );
             },
           });
-        }else{
-          if(tableParam){
+        } else {
+          if (tableParam) {
             // tableParam.column.params.optionItems
             // let key =  this.getOptionKey();
             // let optionItems = tableParam.column.params[key];
             let optionItems = this.getGloatOptionItems();
-            if(optionItems!==undefined){
+            if (optionItems !== undefined) {
               return
             }
             // tableParam.column.params[key] = this.$baseLodash.cloneDeep(this.field.options.optionItems);
@@ -772,7 +772,7 @@ modules = {
     },
     handleCustomClickEvent: function (flag) {
       let tableParam = this.tableParam;
-      let clickBindEvent = !flag ? this.field.options.clickBindEvent: this.field.options.widgetTextLinkConfig?.options?.clickBindEvent;
+      let clickBindEvent = !flag ? this.field.options.clickBindEvent : this.field.options.widgetTextLinkConfig?.options?.clickBindEvent;
       if (clickBindEvent == "1") {
         //打开选择弹框
         this.openSearchDialog(tableParam, flag);
@@ -782,7 +782,7 @@ modules = {
       }
     },
     handleAddTableDataEvent(flag) {
-      let optionModel = !flag? this.field.options : (this.field.options.widgetTextLinkConfig?.options || {});
+      let optionModel = !flag ? this.field.options : (this.field.options.widgetTextLinkConfig?.options || {});
 
       let addTableDataConfig = optionModel.addTableDataConfig || {};
       if (!addTableDataConfig.tableRef) return;
@@ -807,9 +807,9 @@ modules = {
         o.call(this, e, t, i, n);
       }
     },
-    handleButtonWidgetClick: function (event,flag) {
+    handleButtonWidgetClick: function (event, flag) {
       if (!this.designState) {
-        let onClick = !flag? this.field.options.onClick : this.field.options.widgetTextLinkConfig?.options?.onClick
+        let onClick = !flag ? this.field.options.onClick : this.field.options.widgetTextLinkConfig?.options?.onClick
         if (onClick) {
           let tableParam = this.tableParam;
           let eventParamNames = ["event"];
@@ -824,7 +824,7 @@ modules = {
             eventParamValues
           );
         } else {
-          if(!flag)this.dispatch("VFormRender", "buttonClick", [this]);
+          if (!flag) this.dispatch("VFormRender", "buttonClick", [this]);
         }
         this.handleCustomClickEvent(flag);
       }
@@ -833,8 +833,8 @@ modules = {
       let searchDialogConfig = this.field.options.searchDialogConfig || {};
       let tableData = searchDialogConfig.tableData || [];
     },
-    openSearchDialog(tableParam,flag) {
-      let optionModel = !flag? this.field.options : (this.field.options.widgetTextLinkConfig?.options || {});
+    openSearchDialog(tableParam, flag) {
+      let optionModel = !flag ? this.field.options : (this.field.options.widgetTextLinkConfig?.options || {});
       let searchDialogConfig = optionModel.searchDialogConfig || {};
       let formCode = searchDialogConfig.formCode;
       let tableData = searchDialogConfig.tableData || [];
@@ -861,7 +861,7 @@ modules = {
         rows,
         multiple: searchDialogConfig.multipleChoices || false,
         confirm: (rows) => {
-          this.handleConfirmSearchDialog(rows, false ,flag);
+          this.handleConfirmSearchDialog(rows, false, flag);
           /*if(rows.length){
             let row = rows[0];
             if(this.field.type == "vabsearch"){
@@ -909,9 +909,9 @@ modules = {
       let multipleChoices = this.field.options.multipleChoices;
       return multipleChoices;
     },
-    handleConfirmSearchDialog(rows, isClear,flag) {
+    handleConfirmSearchDialog(rows, isClear, flag) {
       if (!isClear && !rows.length) return;
-      let optionModel = !flag? this.field.options : (this.field.options.widgetTextLinkConfig?.options || {});
+      let optionModel = !flag ? this.field.options : (this.field.options.widgetTextLinkConfig?.options || {});
 
       let tableParam = this.tableParam;
       let searchDialogConfig = optionModel.searchDialogConfig || {};
@@ -928,7 +928,7 @@ modules = {
 
         if (tableParam) {
           let rowData = tableParam.row;
-          if (multipleChoices) {
+          if (this.getMultipleChoices()) {
             if (isClear) {
               rowData[fieldKeyName] = [];
             } else {
@@ -963,26 +963,44 @@ modules = {
             });
           }
         } else {
-          this.fieldModel = !isClear
-            ? row[searchDialogConfig.valueSourceField]
-            : null;
-          if (searchDialogConfig.labelSourceField) {
-            this.setShowValue(
-              !isClear ? row[searchDialogConfig.labelSourceField] : null
-            );
-          }
-          tableData.forEach((item) => {
-            // formModel[item.targetField] = row[item.sourceField]
-            let value = !isClear ? row[item.sourceField] ?? null : null;
-            if (item.targetField) {
-              this.getWidgetRef(item.targetField).setValue(value);
-            } else if (item.targetFormField) {
-              formModel[item.targetFormField] = value;
+          if (this.getMultipleChoices()) {
+            let rowData = [];
+            if (isClear) {
+              rowData = [];
+            } else {
+              rowData = rows.map((item) => {
+                let newData = {};
+                newData[valueField] =
+                  item[searchDialogConfig.valueSourceField] ?? null;
+                newData[vabSearchName] =
+                  item[searchDialogConfig.labelSourceField] ?? null;
+                tableData.forEach((item1) => {
+                  let targetFormField = item1.targetFormField || item1.targetField
+                  newData[targetFormField] = item[item1.sourceField];
+                });
+                return newData;
+              });
             }
-
-            // formModel[item.targetField] = value;
-          });
-          // this.$forceUpdate();
+            this.setValue(rowData);
+          } else {
+            this.fieldModel = !isClear
+              ? row[searchDialogConfig.valueSourceField]
+              : null;
+            if (searchDialogConfig.labelSourceField) {
+              this.setShowValue(
+                !isClear ? row[searchDialogConfig.labelSourceField] : null
+              );
+            }
+            tableData.forEach((item) => {
+              // formModel[item.targetField] = row[item.sourceField]
+              let value = !isClear ? row[item.sourceField] ?? null : null;
+              if (item.targetField) {
+                this.getWidgetRef(item.targetField).setValue(value);
+              } else if (item.targetFormField) {
+                formModel[item.targetFormField] = value;
+              }
+            });
+          }
         }
       } else {
         if (searchDialogConfig.tableEnabled) {
@@ -1131,7 +1149,7 @@ modules = {
       );
       this.field.options.optionItems = optionItems
     },
-    loadOptions: function (e,rowOptionFlag) {
+    loadOptions: function (e, rowOptionFlag) {
       let optionItems = baseRefUtil.translateOptionItems(
         e,
         this.field.type,
@@ -1146,12 +1164,12 @@ modules = {
       }*/
     },
     getGloatOptionItems: function (e, rowOptionFlag) {
-      let key =  this.getOptionKey()
+      let key = this.getOptionKey()
       return this.getGlobalParam(key);
     },
     setGloatOptionItems: function (optionItems) {
-      let key =  this.getOptionKey()
-      return this.setGlobalParam(key,optionItems);
+      let key = this.getOptionKey()
+      return this.setGlobalParam(key, optionItems);
     },
     reloadOptions: function (e) {
       let optionItems = baseRefUtil.translateOptionItems(
@@ -1162,7 +1180,7 @@ modules = {
       );
       this.field.options.optionItems = optionItems;
       let tableParam = this.tableParam;
-      if(tableParam){
+      if (tableParam) {
         // let key = this.getOptionKey();
         // tableParam.column.params[key] = optionItems;
         this.setGloatOptionItems(optionItems)
@@ -1314,19 +1332,19 @@ modules = {
       let name = this.parentWidget?.options?.name ?? null;
       return name ? this.getWidgetRef(name) : null;
     },
-    setWidgetTextFlag(val){
+    setWidgetTextFlag(val) {
       this.widgetTextFlag = val;
     },
-    showWidget(){
+    showWidget() {
       this.widgetTextFlag = 0;
     },
-    showText(){
+    showText() {
       this.widgetTextFlag = 1;
     },
-    showEncryptText(){
+    showEncryptText() {
       this.widgetTextFlag = 2;
     },
-    showAText(){
+    showAText() {
       this.widgetTextFlag = 3;
     },
   },