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

package/package.json

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

package/src/components/xform/form-designer/form-widget/field-widget/checkbox-widget.vue

@@ -87,7 +87,7 @@
          需要在父组件created中初始化！！ */
       this.handleCreatedEnterEvent();
       this.initFieldModel()
-      this.initOptionItems()
+      this.initOptionItemsHandle()
       this.registerToRefList()
       this.initEventHandler()
       this.buildFieldRules()

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

@@ -467,11 +467,10 @@ modules = {
           : delete this.refList[e];
       }
     },
-    getOptionKey() {
-      let key = "optionItems-" + this.field.options.name
-      return key;
+    initOptionItemsHandle() {
+      this.initGloatOptionItems(true);
     },
-    async initOptionItems(gloatFlag) {
+    initGloatOptionItems(initFlag) {
       var t = this;
       if (this.designState) {
         return;
@@ -489,13 +488,13 @@ modules = {
         let scriptCode = this.field.options.formScriptCode || "getList";
         let tableParam = this.tableParam;
         if (formScriptEnabled) {
-          /*if(tableParam){
-            let optionItems = this.getGloatOptionItems()
-            if(optionItems!==undefined){
+          if (initFlag && tableParam) {
+            let optionItems = this.getOptionItemsFlag()
+            if (optionItems !== undefined) {
               return
             }
-            this.setGloatOptionItems(null)
-          }*/
+            this.setOptionItemsFlag(null)
+          }
           let accessParam = this.handleCustomEvent(
             this.field.options.formScriptParam
           );
@@ -511,7 +510,7 @@ modules = {
             },
             callback: (res) => {
               let rows = res.objx || [];
-              this.loadOptions(rows);
+              this.loadGloatOptions(rows, initFlag);
               this.handleCustomEvent(
                 this.field.options.formScriptSuccess,
                 ["res"],
@@ -522,17 +521,17 @@ modules = {
         } else if (this.field.options.commonAttributeEnabled) {
           let commonAttributeCode = this.field.options.commonAttributeCode;
           if (!commonAttributeCode) return;
-          /*if(tableParam){
-            let optionItems = this.getGloatOptionItems();
-            if(optionItems!==undefined){
+          if (initFlag && tableParam) {
+            let optionItems = this.getOptionItemsFlag();
+            if (optionItems !== undefined) {
               return
             }
-            this.setGloatOptionItems(null)
-          }*/
+            this.setOptionItemsFlag(null)
+          }
           this.$getBaseDicts({
             code: commonAttributeCode,
             success: ({dicts, dictMap}) => {
-              this.loadOptions(dicts);
+              this.loadGloatOptions(dicts, initFlag);
               this.handleCustomEvent(
                 this.field.options.formScriptSuccess,
                 ["res"],
@@ -540,63 +539,116 @@ modules = {
               );
             },
           });
-        } else {
-          if (tableParam) {
-            // tableParam.column.params.optionItems
-            // let key =  this.getOptionKey();
-            // let optionItems = tableParam.column.params[key];
-            let optionItems = this.getGloatOptionItems();
-            if (optionItems !== undefined) {
-              return
-            }
-            // tableParam.column.params[key] = this.$baseLodash.cloneDeep(this.field.options.optionItems);
-            this.setGloatOptionItems(this.$baseLodash.cloneDeep(this.field.options.optionItems));
-          }
         }
 
         return;
-        /*if (t.field.options.isLoadDataByAccess && t.field.options.scriptUuid) {
-          this.scriptHttp(
-            {
-              options: t.field.options,
-              params: {},
-              callback: (res) => {
-                let rows = res && res.objx ? res.objx : [];
-                t.loadOptions(rows);
-              }
-            });
-        } else if (!t.field.options.dsEnabled) {
-          /!* 异步更新option-data之后globalOptionData不能获取到最新值，改用provide的getOptionData()方法 *!/
-          const newOptionItems = this.getOptionData();
-          if (!!newOptionItems && newOptionItems.hasOwnProperty(this.fieldKeyName)) {
-            if (!!keepSelected) {
-              this.reloadOptions(newOptionItems[this.fieldKeyName]);
-            } else {
-              this.loadOptions(newOptionItems[this.fieldKeyName]);
-            }
+      }
+    },
+    loadGloatOptions: function (e, initFlag) {
+      let optionItems = baseRefUtil.translateOptionItems(
+        e,
+        this.field.type,
+        this.field.options.labelKey || "label",
+        this.field.options.valueKey || "value"
+      );
+      this.field.options.optionItems = optionItems
+      let tableParam = this.tableParam;
+      if (tableParam) {
+        if (initFlag) {
+          this.setOptionItemsFlag(true)
+        }
+        this.loadTableOtions(e)
+      }
+    },
+    loadTableOtions(optionItems) {
+      let tableParam = this.tableParam;
+      if (tableParam) {
+        let widgetName = this.field.options.name;
+        let tableWidgetName = tableParam.column.params.tableWidgetName
+        let tableTarget = this.getWidgetRef(tableWidgetName);
+        tableTarget.loopHandleWidgetByName(widgetName, (row, widget, target) => {
+          widget.options.optionItems = optionItems
+        })
+        if (tableParam.column.params.widget) {
+          if (tableParam.column.params.widget.options.name == widgetName) {
+            tableParam.column.params.widget.options.optionItems = optionItems
           }
-        } else {
-          var n, a, l, s, r, d;
 
-          await this.initAccess();
-
-          let requestAccess = this.requestAccess;
-          if (!requestAccess) {
-            return;
+        }
+        if (tableParam.column.params.editWidget) {
+          if (tableParam.column.params.editWidget.options.name == widgetName) {
+            tableParam.column.params.editWidget.options.optionItems = optionItems
           }
-          return l = t.getGlobalDsv() || {},
-            s = new Object({}),
-            baseRefUtil.overwriteObj(s, l),
-            s["widgetName"] = t.field.options.name,
-            s.widgetKeyName = this.fieldKeyName,
-            s["requestAccess"] = requestAccess,
-            a = requestAccess.dsModel,
-            // r = i.sent,
-            baseRefUtil.runDataSourceRequest(a, s, t.getFormRef(), !1, t
-              .$message).then(res => {
-              t.loadOptions(res || []);
-            });
-        }*/
+        }
+        if (tableParam.column.params.widgetList?.length) {
+          this.loopHandleWidget(tableParam.column.params.widgetList, (item1) => {
+            if (item1.options.name == widgetName) {
+              item1.options.optionItems = optionItems
+            }
+          });
+        }
+
+        delete tableParam.column.params[widgetName]
+      }
+    },
+    async initOptionItems(gloatFlag) {
+      var t = this;
+      if (this.designState) {
+        return;
+      }
+
+      if (
+        this.field.type === "radio" ||
+        this.field.type === "checkbox" ||
+        this.field.type === "select" ||
+        this.field.type === "cascader"
+      ) {
+        let reportTemplate = this.getFormRef().reportTemplate;
+        let formCode = reportTemplate.formCode;
+        let formScriptEnabled = this.field.options.formScriptEnabled || false;
+        let scriptCode = this.field.options.formScriptCode || "getList";
+        let tableParam = this.tableParam;
+        if (formScriptEnabled) {
+          let accessParam = this.handleCustomEvent(
+            this.field.options.formScriptParam
+          );
+          return this.formHttp({
+            scriptCode: scriptCode,
+            data: {
+              formCode: formCode,
+              formVersion: reportTemplate.formVersion,
+              taBm: this.fieldKeyName,
+              data: {
+                ...accessParam,
+              },
+            },
+            callback: (res) => {
+              let rows = res.objx || [];
+              this.loadOptions(rows);
+              this.handleCustomEvent(
+                this.field.options.formScriptSuccess,
+                ["res"],
+                [res]
+              );
+            },
+          });
+        } else if (this.field.options.commonAttributeEnabled) {
+          let commonAttributeCode = this.field.options.commonAttributeCode;
+          if (!commonAttributeCode) return;
+          this.$getBaseDicts({
+            code: commonAttributeCode,
+            success: ({dicts, dictMap}) => {
+              this.loadOptions(dicts);
+              this.handleCustomEvent(
+                this.field.options.formScriptSuccess,
+                ["res"],
+                [dicts]
+              );
+            },
+          });
+        }
+
+        return;
       }
     },
     refreshDefaultValue: function () {
@@ -1157,19 +1209,18 @@ modules = {
         this.field.options.valueKey || "value"
       );
       this.field.options.optionItems = optionItems
-      /*let tableParam = this.tableParam;
-      if(tableParam){
-        this.setGloatOptionItems(optionItems)
-        tableParam.column.params.rowOptionFlag = rowOptionFlag
-      }*/
     },
-    getGloatOptionItems: function (e, rowOptionFlag) {
+    getOptionKey() {
+      let key = "optionItems-" + this.field.options.name
+      return key;
+    },
+    getOptionItemsFlag: function () {
       let key = this.getOptionKey()
       return this.getGlobalParam(key);
     },
-    setGloatOptionItems: function (optionItems) {
+    setOptionItemsFlag: function (flag) {
       let key = this.getOptionKey()
-      return this.setGlobalParam(key, optionItems);
+      return this.setGlobalParam(key, flag);
     },
     reloadOptions: function (e) {
       let optionItems = baseRefUtil.translateOptionItems(
@@ -1179,13 +1230,6 @@ modules = {
         this.field.options.valueKey || "value"
       );
       this.field.options.optionItems = optionItems;
-      let tableParam = this.tableParam;
-      if (tableParam) {
-        // let key = this.getOptionKey();
-        // tableParam.column.params[key] = optionItems;
-        this.setGloatOptionItems(optionItems)
-        // tableParam.column.params.optionItems = optionItems;
-      }
     },
     getOptions: function () {
       return this.getOptionItems();
@@ -1197,15 +1241,7 @@ modules = {
       this.enableOptionOfList(this.getOptionItems(), e);
     },
     getOptionItems: function () {
-      // return this.field.options.optionItems;
-      let tableParam = this.tableParam;
       let optionItems = this.field.options.optionItems;
-      /*if(tableParam){
-        let rows = this.getGloatOptionItems()
-        if(!tableParam.column.params.rowOptionFlag && rows!==undefined){
-          optionItems = rows || []
-        }
-      }*/
       return optionItems;
     },
     setUploadHeader: function (e, t) {

package/src/components/xform/form-designer/form-widget/field-widget/radio-widget.vue

@@ -87,7 +87,7 @@
          需要在父组件created中初始化！！ */
       this.handleCreatedEnterEvent();
       this.initFieldModel()
-      this.initOptionItems()
+      this.initOptionItemsHandle()
       this.registerToRefList()
       this.initEventHandler()
       this.buildFieldRules()

package/src/components/xform/form-designer/form-widget/field-widget/select-widget.vue

@@ -108,7 +108,7 @@ export default {
     this.buildFieldRules()
 
     this.handleOnCreated()
-    this.initOptionItems()
+    this.initOptionItemsHandle()
   },
 
   mounted() {

package/src/components/xform/form-designer/form-widget/field-widget/vabUpload-widget.vue

@@ -12,8 +12,8 @@
     </div>
     <baseUpload accept="file" :file.sync="fieldModel" :hidePasteArea.sync="isH5"
                 :uploadDialogCustomClass="isH5?'dialog-upload-h5':null" :pickPrivateProfile="false"
-                :multi.sync="multi"
-                :limit.sync="limit"
+                :multi="field.options.limit!==1"
+                :limit="field.options.limit"
                 resultType="Array"
                 :edit="!field.options.disabled"
                 @callback="submitFile"
@@ -83,12 +83,6 @@ export default {
     formDataId() {
       let formRef = this.getFormRef();
       return formRef.dataId;
-    },
-    limit() {
-      return this.field.options.limit ? this.field.options.limit : null;
-    },
-    multi() {
-      return this.limit !== 1;
     }
   },
   beforeCreate() {

package/src/components/xform/form-render/container-item/data-table-mixin.js

@@ -213,8 +213,10 @@ modules = {
       let rows = this.getValue();
       rows.forEach((row, index) => {
         let target = this.getWidgetRefByTableRow(index, name)
-        let widget = target.field || target.widget;
-        callback(row, widget, target)
+        if (target) {
+          let widget = target.field || target.widget;
+          callback(row, widget, target)
+        }
       })
     },
     getRowWidgetOption(rowParam, fieldWidget) {