cloud-web-corejs 1.0.276 → 1.0.277

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

@@ -7,16 +7,27 @@ import {
   getReportGlobalMap,
   getAccessUrl,
   generateId,
-  trim
+  trim,
+  isArrayValueWidgetType,
+  isAttachmentWidgetType,
+  isEmptyArrayFieldValue,
 } from "../../../../../components/xform/utils/util";
-import FormValidators, {getRegExp} from "../../../../../components/xform/utils/validators";
+import FormValidators, {
+  getRegExp,
+} from "../../../../../components/xform/utils/validators";
+import {
+  CLICK_BIND,
+  getClickBindAction,
+} from "../../setting-panel/property-editor/field-button/clickBindActions";
 import scriptHttpMixin from "../../../../../components/xform/mixins/scriptHttp";
 import defaultHandleMixin from "../../../../../components/xform/mixins/defaultHandle";
 
 import {
-  fieldIsUsedInFormula, calculateFormula, recalculateFormulaOnSubFormRowDelete,
-} from '@base/components/xform/utils/formula-util'
-import * as formulajs from '@formulajs/formulajs'
+  fieldIsUsedInFormula,
+  calculateFormula,
+  recalculateFormulaOnSubFormRowDelete,
+} from "@base/components/xform/utils/formula-util";
+import * as formulajs from "@formulajs/formulajs";
 import settingConfig from "@/settings.js";
 
 let modules = {};
@@ -45,7 +56,7 @@ modules = {
     formItemProp: {
       type: String,
       default: null,
-    }
+    },
   },
   provide() {
     return {
@@ -67,6 +78,8 @@ modules = {
     "getReportTemplate",
     "getObjectFieldFlag",
     "getObjectName",
+    "setCETriggerFlag",
+    "clearCETriggerFlag",
   ],
   data: function () {
     return {
@@ -77,7 +90,7 @@ modules = {
 
       disabled: false,
       hidden: false,
-      readonly: false
+      readonly: false,
     };
   },
   beforeDestroy() {
@@ -105,8 +118,7 @@ modules = {
       }
     }
   },
-  mounted() {
-  },
+  mounted() {},
   /*watch: {
     currentValue(val) {
       this.initFieldModel(true);
@@ -162,44 +174,141 @@ modules = {
       let currentValue = currentData[this.fieldKeyName];
       return currentValue;
     },
-    setFormScriptEnabled(value){
-      this.field.options.formScriptEnabled = value || false
+    setFormScriptEnabled(value) {
+      this.field.options.formScriptEnabled = value || false;
     },
-    getOptionLabel(){
+    getOptionLabel() {
       if (this.fieldModel === null) {
-        return null
-      } else {
-        let resultList = []
-        let labelField = this.getOptionItemLabelKey();
-        let valueField = this.getOptionItemValueKey();
-        this.field.options.optionItems.forEach(oItem => {
-          if ((oItem[valueField] === this.fieldModel) || (this.findInArray(this.fieldModel, oItem[valueField])) !== -1) {
-            resultList.push(this.$t1(oItem[labelField]))
-            // resultContent = resultContent === '--' ? oItem.label : resultContent + ' ' + oItem.label
-          }
-        })
-        return resultList.join(",")
+        return null;
+      }
+      const selectedItems = this.getSelectedOptionItems();
+      const items =
+        selectedItems == null
+          ? []
+          : Array.isArray(selectedItems)
+          ? selectedItems
+          : [selectedItems];
+      const labelField = this.getOptionItemLabelKey();
+      return items.map((item) => this.$t1(item[labelField])).join(",");
+    },
+    getSelectedOptionItems() {
+      const fieldType = this.field.type;
+      const isOptionField =
+        fieldType === "select" ||
+        fieldType === "radio" ||
+        fieldType === "checkbox";
+      if (!isOptionField) {
+        return null;
+      }
+      const isMultiple =
+        fieldType === "checkbox" ||
+        (fieldType === "select" && this.field.options.multiple);
+      if (
+        this.fieldModel === null ||
+        this.fieldModel === undefined ||
+        this.fieldModel === ""
+      ) {
+        return isMultiple ? [] : null;
+      }
+      let resultList = [];
+      let valueField = this.getOptionItemValueKey();
+      this.field.options.optionItems.forEach((oItem) => {
+        if (
+          oItem[valueField] === this.fieldModel ||
+          this.findInArray(this.fieldModel, oItem[valueField]) !== -1
+        ) {
+          resultList.push(oItem);
+        }
+      });
+      return isMultiple
+        ? resultList
+        : resultList.length > 0
+        ? resultList[0]
+        : null;
+    },
+    // ===================== 表单对比：差异判定与展示 =====================
+    /**
+     * 差异判定：用「原始存储值」比较（下拉/关联按 code/id 比），可被具体 widget override。
+     */
+    compareEquals: function (a, b) {
+      const isEmpty = (v) =>
+        v === null ||
+        v === undefined ||
+        v === "" ||
+        (Array.isArray(v) && v.length === 0);
+      if (isEmpty(a) && isEmpty(b)) return true;
+      if (isEmpty(a) || isEmpty(b)) return false;
+      if (Array.isArray(a) && Array.isArray(b)) {
+        if (a.length !== b.length) return false;
+        const sa = a.map((x) => String(x)).sort();
+        const sb = b.map((x) => String(x)).sort();
+        return sa.every((x, i) => x === sb[i]);
+      }
+      if (typeof a === "object" || typeof b === "object") {
+        try {
+          return JSON.stringify(a) === JSON.stringify(b);
+        } catch (e) {
+          return a === b;
+        }
       }
+      return String(a) === String(b);
+    },
+    /**
+     * 把「任意原始值」解析成展示文本(label)，用于对比 popover 展示旧值。
+     * 下拉/单选/多选按 optionItems 解析 code→label；其它类型返回原值。
+     */
+    resolveDisplayValue: function (rawValue) {
+      if (rawValue === null || rawValue === undefined || rawValue === "") {
+        return rawValue;
+      }
+      // 凡是有 optionItems 的映射组件（select/radio/checkbox/status/dropdown 等）
+      // 统一按 optionItems 做 code→label；关联/switch/cascader 等在各自 widget override。
+      let optionItems = this.field.options.optionItems;
+      if (Array.isArray(optionItems) && optionItems.length) {
+        const labelField = this.getOptionItemLabelKey();
+        const valueField = this.getOptionItemValueKey();
+        const values = Array.isArray(rawValue) ? rawValue : [rawValue];
+        const labels = values.map((val) => {
+          const item = optionItems.find((o) => o[valueField] === val);
+          return item ? this.$t1(item[labelField]) : val;
+        });
+        return labels.join(",");
+      }
+      return rawValue;
+    },
+    /**
+     * 对比「变更前」展示值：给出原单的行/主表对象，返回该字段应展示的旧 label。
+     * 默认按本字段存储键取原始值再 resolveDisplayValue；关联搜索类组件（值存 id、
+     * label 存在同行的伴随字段）在各自 mixin override，从 oldRow 里取伴随 label 字段。
+     * @param {Object} oldRow 原单主表对象或子表行对象
+     */
+    resolveCompareOldDisplay: function (oldRow) {
+      let raw = oldRow ? oldRow[this.fieldKeyName] : undefined;
+      return this.resolveDisplayValue(raw);
     },
     initValueWatchEvent() {
       if (!this.designer) {
-        this.$watch(() => {
-          let currentData = this.tableParam && this.tableParam.row
-            ? this.tableParam.row
-            : this.formModel;
-          let currentValue = currentData[this.fieldKeyName];
-          return currentValue;
-        }, (newValue, oldValue) => {
-          if (oldValue !== undefined) {
-            this.initFieldModel(true);
+        this.$watch(
+          () => {
+            let currentData =
+              this.tableParam && this.tableParam.row
+                ? this.tableParam.row
+                : this.formModel;
+            let currentValue = currentData[this.fieldKeyName];
+            return currentValue;
+          },
+          (newValue, oldValue) => {
+            if (oldValue !== undefined) {
+              this.initFieldModel(true);
+            }
           }
-        })
+        );
       }
     },
     initFieldAttrs() {
-      this.setDisabled(this.field.options.disabled)
-      this.setHidden(this.field.options.hidden)
-      this.setReadonly(this.field.options.readonly)
+      this.setDisabled(this.field.options.disabled);
+      this.setHidden(this.field.options.hidden);
+      this.setReadonly(this.field.options.readonly);
     },
     initConfig() {
       /*if (this.designState) {
@@ -220,7 +329,6 @@ modules = {
         }
 
       }*/
-
       /*this.field.options = Object.assign(
         {},
         config.options,
@@ -234,7 +342,7 @@ modules = {
         e.forEach(function (e, n) {
           e === t && (i = n);
         }),
-          i
+        i
       );
     },
     getPropName: function () {
@@ -243,13 +351,13 @@ modules = {
       } else {
         return this.subFormItemFlag && !this.designState
           ? this.subFormName +
-          "." +
-          this.subFormRowIndex +
-          "." +
-          this.fieldKeyName
+              "." +
+              this.subFormRowIndex +
+              "." +
+              this.fieldKeyName
           : this.getObjectFieldFlag() && !this.designState
-            ? this.getObjectName() + "." + this.fieldKeyName
-            : this.fieldKeyName;
+          ? this.getObjectName() + "." + this.fieldKeyName
+          : this.fieldKeyName;
       }
     },
     initFieldModel: function (flag) {
@@ -283,30 +391,57 @@ modules = {
         let widgetType = this.field.type;
         if (widgetType === "number") {
           nullValue = undefined;
-        } else if (widgetType === 'checkbox' || (widgetType === 'select' && this.field.options.multiple)) {
+        } else if (
+          widgetType === "checkbox" ||
+          (widgetType === "select" && this.field.options.multiple) ||
+          isAttachmentWidgetType(widgetType)
+        ) {
           nullValue = [];
-        } else if (widgetType === "time-range" || widgetType === "date-range" || (widgetType === 'date' && this.field.options.type === "dates")) {
+        } else if (
+          widgetType === "time-range" ||
+          widgetType === "date-range" ||
+          (widgetType === "date" && this.field.options.type === "dates")
+        ) {
           nullValue = [];
         }
         if (void 0 === currentData[this.fieldKeyName]) {
           this.$set(currentData, this.fieldKeyName, nullValue);
         }
+        if (
+          widgetType === "number" &&
+          currentData[this.fieldKeyName] === null
+        ) {
+          this.$set(currentData, this.fieldKeyName, undefined);
+        }
         if (flag) {
           this.fieldModel = currentData[this.fieldKeyName];
-        } else if (currentData[this.fieldKeyName] !== null) {
+        } else if (
+          currentData[this.fieldKeyName] !== null &&
+          currentData[this.fieldKeyName] !== undefined
+        ) {
           this.fieldModel = currentData[this.fieldKeyName];
         } else {
+          if (widgetType === "number") {
+            this.fieldModel = undefined;
+          }
           if (!dataId) {
             //新增
-            if (!this.designState && this.hasVabsearchFlag() && !this.field.options.multipleChoices) {
-              let searchDialogConfig = this.field.options.searchDialogConfig || {};
+            if (
+              !this.designState &&
+              this.hasVabsearchFlag() &&
+              !this.field.options.multipleChoices
+            ) {
+              let searchDialogConfig =
+                this.field.options.searchDialogConfig || {};
               if (this.field.options.userDefaultVabSearch) {
                 let userInfo = this.getFormRef().getUserInfo();
                 let valueSourceField = "id";
                 let labelSourceField = "nick_name";
                 if (this.field.options.clickBindEvent === "1") {
-                  if (searchDialogConfig.valueSourceField) valueSourceField = searchDialogConfig.valueSourceField
-                  if (searchDialogConfig.labelSourceField) labelSourceField = searchDialogConfig.labelSourceField
+                  if (searchDialogConfig.valueSourceField)
+                    valueSourceField = searchDialogConfig.valueSourceField;
+                  if (searchDialogConfig.labelSourceField)
+                    labelSourceField = searchDialogConfig.labelSourceField;
                 }
                 this.initValue(userInfo[valueSourceField] ?? null);
                 this.setShowValue(userInfo[labelSourceField] ?? null);
@@ -316,8 +451,10 @@ modules = {
                   let valueSourceField = "id";
                   let labelSourceField = "name";
                   if (this.field.options.clickBindEvent === "1") {
-                    if (searchDialogConfig.valueSourceField) valueSourceField = searchDialogConfig.valueSourceField
-                    if (searchDialogConfig.labelSourceField) labelSourceField = searchDialogConfig.labelSourceField
+                    if (searchDialogConfig.valueSourceField)
+                      valueSourceField = searchDialogConfig.valueSourceField;
+                    if (searchDialogConfig.labelSourceField)
+                      labelSourceField = searchDialogConfig.labelSourceField;
                   }
                   this.initValue(saleOrgDTO[valueSourceField] ?? null);
                   this.setShowValue(saleOrgDTO[labelSourceField] ?? null);
@@ -365,23 +502,23 @@ modules = {
     initFileList: function () {
       ("picture-upload" !== this.field.type &&
         "file-upload" !== this.field.type) ||
-      !0 === this.designState ||
-      (this.fieldModel &&
-        (Array.isArray(this.fieldModel)
-          ? (this.fileList = baseRefUtil.deepClone(this.fieldModel))
-          : this.fileList.splice(
-            0,
-            0,
-            baseRefUtil.deepClone(this.fieldModel)
-          )));
+        !0 === this.designState ||
+        (this.fieldModel &&
+          (Array.isArray(this.fieldModel)
+            ? (this.fileList = baseRefUtil.deepClone(this.fieldModel))
+            : this.fileList.splice(
+                0,
+                0,
+                baseRefUtil.deepClone(this.fieldModel)
+              )));
     },
     handleCreatedEnterEvent() {
       this.handleCustomEvent(this.field.options.onCreatedEnter);
     },
     initEventHandler() {
       this.designState ||
-      (this.$on("setFormData", (o) => {
-        /*if (!this.subFormItemFlag)
+        (this.$on("setFormData", (o) => {
+          /*if (!this.subFormItemFlag)
         if (
           !!this.getObjectFieldFlag()
           && !this.designState
@@ -393,8 +530,8 @@ modules = {
               : e[this.fieldKeyName]
           );
         } else this.setValue(o[this.fieldKeyName]);*/
-        this.subFormItemFlag || this.setValue(o[this.fieldKeyName]);
-      }),
+          this.subFormItemFlag || this.setValue(o[this.fieldKeyName]);
+        }),
         this.$on("field-value-changed", (o) => {
           if (this.subFormItemFlag) {
             let e = this.formModel[this.subFormName];
@@ -426,44 +563,73 @@ modules = {
           !this.subFormName && !s
             ? this.setValue(u, !0)
             : this.subFormName === s &&
-            this.subFormRowId === c &&
-            this.setValue(u, !0);
+              this.subFormRowId === c &&
+              this.setValue(u, !0);
         }),
-
         /* 执行计算公式运算 */
-        this.$on('calculate-formula', (newValue, sourceWidget) => {
-          if (!!this.field.options.formulaEnabled && !!this.field.options.formula) {
-            let changedFieldRef = sourceWidget
-            const changedFieldName = sourceWidget.field.options.name
+        this.$on("calculate-formula", (newValue, sourceWidget) => {
+          if (
+            !!this.field.options.formulaEnabled &&
+            !!this.field.options.formula
+          ) {
+            let changedFieldRef = sourceWidget;
+            const changedFieldName = sourceWidget.field.options.name;
             //检查计算公式是否包含当前修改字段
-            if (fieldIsUsedInFormula(changedFieldName, this.field.options.formula, this.getFormRef(), this)) {
-
+            if (
+              fieldIsUsedInFormula(
+                changedFieldName,
+                this.field.options.formula,
+                this.getFormRef(),
+                this
+              )
+            ) {
               /* 计算公式的计算改成延时执行，否则当子表单开启默认创建新行后，子表单字段的计算公式中使用到主表单字段则会出现计算错误！！ */
               //calculateFormula(this.getFormRef(), this.getGlobalDsv(), formulajs, this, changedFieldRef)
 
               setTimeout(() => {
-                calculateFormula(this.getFormRef(), this.getGlobalDsv(), formulajs, this, changedFieldRef)
-              }, 200)
+                calculateFormula(
+                  this.getFormRef(),
+                  this.getGlobalDsv(),
+                  formulajs,
+                  this,
+                  changedFieldRef
+                );
+              }, 200);
             }
           }
         }),
-
         /* 删除子表单行后重新执行计算公式运算 */
-        this.$on('calculate-formula-sfRowDeleted', (newValue, deletedFieldName) => {
-          if (!!this.field.options.formulaEnabled && !!this.field.options.formula) {
-            //检查计算公式是否包含当前修改字段
-            if (fieldIsUsedInFormula(deletedFieldName, this.field.options.formula, this.getFormRef())) {
-              recalculateFormulaOnSubFormRowDelete(this.getFormRef(), this.getGlobalDsv(), formulajs, this)
+        this.$on(
+          "calculate-formula-sfRowDeleted",
+          (newValue, deletedFieldName) => {
+            if (
+              !!this.field.options.formulaEnabled &&
+              !!this.field.options.formula
+            ) {
+              //检查计算公式是否包含当前修改字段
+              if (
+                fieldIsUsedInFormula(
+                  deletedFieldName,
+                  this.field.options.formula,
+                  this.getFormRef()
+                )
+              ) {
+                recalculateFormulaOnSubFormRowDelete(
+                  this.getFormRef(),
+                  this.getGlobalDsv(),
+                  formulajs,
+                  this
+                );
+              }
             }
           }
-        }),
-
+        ),
         this.$on("loadOptionItemsFromDataSet", (o) => {
           this.loadOptionItemsFromDataSet(o), (this.dataSetLoadedFlag = !0);
         }),
         this.$on("reloadOptionItems", (o) => {
           (o.length === 0 || o.indexOf(this.field.options.name) > -1) &&
-          this.initOptionItems(!0);
+            this.initOptionItems(!0);
         }));
     },
     getEventParam() {
@@ -484,20 +650,20 @@ modules = {
           funtionStr
         );
         let that = this;
-        try{
+        try {
           return e.call(
             this,
             ...eventParam.eventParamValues,
             ...eventParamValues
           );
-        }catch(error){
-          if(settingConfig.fontErrorTipEnabled){
+        } catch (error) {
+          if (settingConfig.fontErrorTipEnabled) {
             that.$errorMsg({
               rmid: that.$t1("前端脚本异常"),
               content: error.message,
-              type: 'error',
-              _errorMsg: error.stack
-            })
+              type: "error",
+              _errorMsg: error.stack,
+            });
           }
           throw error;
         }
@@ -508,7 +674,6 @@ modules = {
     },
     handleOnMounted: function () {
       this.handleCustomEvent(this.field.options.onMounted);
-      this.autoExcScript();
     },
     registerToRefList: function (e) {
       /* null !== this.refList && this.field.options.name && (this.tableParam && !this.designState ? (e
@@ -520,7 +685,7 @@ modules = {
         if (this.tableParam && !this.designState) {
           let row = this.tableParam.row;
           if (!row._X_ROW_KEY) {
-            row._X_ROW_KEY = "row_" + generateId()
+            row._X_ROW_KEY = "row_" + generateId();
           }
           let keyVal = row._X_ROW_KEY;
           e && delete this.refList[e + "_" + keyVal];
@@ -536,21 +701,25 @@ modules = {
           this.refList[this.field.options.name] = this;
           if (this.widgetKeyNameMap) {
             if (!this.widgetKeyNameMap[this.fieldKeyName]) {
-              this.widgetKeyNameMap[this.fieldKeyName] = [this.field.options.name]
+              this.widgetKeyNameMap[this.fieldKeyName] = [
+                this.field.options.name,
+              ];
             } else {
-              this.widgetKeyNameMap[this.fieldKeyName].push(this.field.options.name);
+              this.widgetKeyNameMap[this.fieldKeyName].push(
+                this.field.options.name
+              );
             }
           }
         }
       }
     },
     getTableRef() {
-      let tableRef = this.getWidgetRef(this.parentWidget.options.name)
+      let tableRef = this.getWidgetRef(this.parentWidget.options.name);
       return tableRef;
     },
     getWidgetRefByTableRow(index, name) {
       let tableRef = this.getTableRef();
-      return tableRef.getWidgetRefByTableRow(index, name)
+      return tableRef.getWidgetRefByTableRow(index, name);
     },
     getWidgetRefByTableParam(param) {
       let tableParam = param || this.tableParam;
@@ -560,19 +729,25 @@ modules = {
     unregisterFromRefList: function () {
       if (null !== this.refList && this.field.options.name) {
         let e = this.field.options.name;
-        this.tableParam && !this.designState
-          ? delete this.refList[e + "@row" + this.tableParam.rowIndex]
-          : delete this.refList[e];
+        // 注销 key 必须与 registerToRefList 对齐：行内组件用 name + "_" + row._X_ROW_KEY，
+        // 否则行组件销毁时删不掉引用，widgetRefList 里会残留指向旧行的“幽灵”组件，
+        // 导致数组必填等校验读到旧空行而误报。
+        let key =
+          this.tableParam && !this.designState
+            ? e + "_" + this.tableParam.row._X_ROW_KEY
+            : e;
+        // 仅当该 key 仍指向当前实例时才删除，避免同 key 重建时误删新注册的实例。
+        if (this.refList[key] === this) {
+          delete this.refList[key];
+        }
       }
     },
     initOptionItemsHandle() {
-      if(this.tableParam){
-        if(this.field._syncInited){
-          this.handleCustomEvent(
-            this.field.options.formScriptSuccess
-          );
+      if (this.tableParam) {
+        if (this.field._syncInited) {
+          this.handleCustomEvent(this.field.options.formScriptSuccess);
         }
-        return
+        return;
       }
       this.initGloatOptionItems(true);
     },
@@ -602,25 +777,18 @@ modules = {
         let tableParam = this.tableParam;
         if (formScriptEnabled) {
           if (initFlag && tableParam) {
-            let optionItems = this.getOptionItemsFlag()
+            let optionItems = this.getOptionItemsFlag();
             if (optionItems !== undefined) {
-              return
+              return;
             }
-            this.setOptionItemsFlag(null)
+            this.setOptionItemsFlag(null);
           }
           let accessParam = this.handleCustomEvent(
             this.field.options.formScriptParam
           );
           return this.formHttp({
             scriptCode: scriptCode,
-            data: {
-              formCode: formCode,
-              formVersion: reportTemplate.formVersion,
-              taBm: this.fieldKeyName,
-              data: {
-                ...accessParam,
-              },
-            },
+            data: this.buildFormScriptData(reportTemplate, { ...accessParam }),
             callback: (res) => {
               let rows = res.objx?.records || res.objx || [];
               this.loadGloatOptions(rows, initFlag);
@@ -637,19 +805,19 @@ modules = {
           if (initFlag && tableParam) {
             let optionItems = this.getOptionItemsFlag();
             if (optionItems !== undefined) {
-              return
+              return;
             }
-            this.setOptionItemsFlag(null)
+            this.setOptionItemsFlag(null);
           }
           let accessParam = this.handleCustomEvent(
             this.field.options.formScriptParam
           );
           this.$getBaseDicts({
             code: commonAttributeCode,
-            data:{
-              ...accessParam
+            data: {
+              ...accessParam,
             },
-            success: ({dicts, dictMap}) => {
+            success: ({ dicts, dictMap }) => {
               this.loadGloatOptions(dicts, initFlag);
               this.handleCustomEvent(
                 this.field.options.formScriptSuccess,
@@ -685,21 +853,21 @@ modules = {
         this.getOptionItemValueKey()
       );
       // this.field.options.optionItems = optionItems
-      this.setOptionItems(optionItems)
+      this.setOptionItems(optionItems);
       let tableParam = this.tableParam;
       if (tableParam) {
         if (initFlag) {
-          this.setOptionItemsFlag(true)
+          this.setOptionItemsFlag(true);
         }
-        this.loadTableOtions(optionItems)
+        this.loadTableOtions(optionItems);
       }
     },
-    setOptionItems(rows){
-      let formScriptEnabledTypes = ['select', 'checkbox', 'radio',"cascader"]
+    setOptionItems(rows) {
+      let formScriptEnabledTypes = ["select", "checkbox", "radio", "cascader"];
       let widgetType = this.field.type;
-      if(formScriptEnabledTypes.includes(widgetType)){
+      if (formScriptEnabledTypes.includes(widgetType)) {
         this.field.options.optionItems = rows || [];
-      }else if(widgetType=="status"){
+      } else if (widgetType == "status") {
         this.field.options.statusParam = rows || [];
       }
     },
@@ -713,31 +881,37 @@ modules = {
           this.getOptionItemValueKey()
         );
         let widgetName = this.field.options.name;
-        let tableWidgetName = tableParam.column.params.tableWidgetName
+        let tableWidgetName = tableParam.column.params.tableWidgetName;
         let tableTarget = this.getWidgetRef(tableWidgetName);
-        tableTarget.loopHandleWidgetByName(widgetName, (row, widget, target) => {
-          widget.options.optionItems = optionItems
-        })
+        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
+            tableParam.column.params.widget.options.optionItems = optionItems;
           }
-
         }
         if (tableParam.column.params.editWidget) {
           if (tableParam.column.params.editWidget.options.name === widgetName) {
-            tableParam.column.params.editWidget.options.optionItems = optionItems
+            tableParam.column.params.editWidget.options.optionItems =
+              optionItems;
           }
         }
         if (tableParam.column.params.widgetList?.length) {
-          this.loopHandleWidget(tableParam.column.params.widgetList, (item1) => {
-            if (item1.options.name === widgetName) {
-              item1.options.optionItems = optionItems
+          this.loopHandleWidget(
+            tableParam.column.params.widgetList,
+            (item1) => {
+              if (item1.options.name === widgetName) {
+                item1.options.optionItems = optionItems;
+              }
             }
-          });
+          );
         }
 
-        delete tableParam.column.params[widgetName]
+        delete tableParam.column.params[widgetName];
       }
     },
     async initOptionItems(gloatFlag) {
@@ -763,14 +937,7 @@ modules = {
           );
           return this.formHttp({
             scriptCode: scriptCode,
-            data: {
-              formCode: formCode,
-              formVersion: reportTemplate.formVersion,
-              taBm: this.fieldKeyName,
-              data: {
-                ...accessParam,
-              },
-            },
+            data: this.buildFormScriptData(reportTemplate, { ...accessParam }),
             callback: (res) => {
               let rows = res.objx || [];
               this.loadOptions(rows);
@@ -786,7 +953,7 @@ modules = {
           if (!commonAttributeCode) return;
           this.$getBaseDicts({
             code: commonAttributeCode,
-            success: ({dicts, dictMap}) => {
+            success: ({ dicts, dictMap }) => {
               this.loadOptions(dicts);
               this.handleCustomEvent(
                 this.field.options.formScriptSuccess,
@@ -802,16 +969,16 @@ modules = {
     },
     refreshDefaultValue: function () {
       !0 === this.designState &&
-      void 0 !== this.field.options.defaultValue &&
-      (this.fieldModel = this.field.options.defaultValue);
+        void 0 !== this.field.options.defaultValue &&
+        (this.fieldModel = this.field.options.defaultValue);
     },
 
     clearFieldRules() {
       if (!this.field.formItemFlag) {
-        return
+        return;
       }
 
-      this.rules && this.rules.splice(0, this.rules.length)  //清空已有
+      this.rules && this.rules.splice(0, this.rules.length); //清空已有
     },
 
     getValidateDefaultMsg(labelCode, vldName) {
@@ -826,78 +993,129 @@ modules = {
         chinese: "[{label}]只能输入中文字符",
         email: "[{label}]邮箱格式有误",
         url: "[{label}]URL格式有误",
-        required: "[{label}]不能为空"
-      }
-      let result = null
-      let value = map[vldName]
+        required: "[{label}]不能为空",
+      };
+      let result = null;
+      let value = map[vldName];
       if (!value) {
-        value = "[{label}]invalid value"
+        value = "[{label}]invalid value";
       }
-      result = this.$t1(value, {label});
-      return result
+      result = this.$t1(value, { label });
+      return result;
+    },
+    resolveFieldValidateLabelCode() {
+      if (this.field.options.label) {
+        return this.field.options.label;
+      }
+      const columnConfig =
+        this.columnConfig || this.tableParam?.column?.params?.columnConfig;
+      if (columnConfig?.label) {
+        return columnConfig.label;
+      }
+      return (
+        (this.field.options.keyNameEnabled && this.field.options.keyName) ||
+        this.field.options.name ||
+        ""
+      );
     },
     getValidationHintMsg() {
-      let vldName = this.field.options.validation
+      let vldName = this.field.options.validation;
       if (this.field.options.validationHint) {
-        return this.$t1(this.field.options.validationHint)
+        return this.$t1(this.field.options.validationHint);
       } else {
-        return this.getValidateDefaultMsg(this.field.options.label, vldName)
+        return this.getValidateDefaultMsg(
+          this.resolveFieldValidateLabelCode(),
+          vldName
+        );
       }
     },
     getRequiredHintMsg() {
       if (this.field.options.requiredHint) {
-        return this.$t1(this.field.options.requiredHint)
+        return this.$t1(this.field.options.requiredHint);
       } else {
-        return this.getValidateDefaultMsg(this.field.options.label, "required")
+        return this.getValidateDefaultMsg(
+          this.resolveFieldValidateLabelCode(),
+          "required"
+        );
       }
     },
     buildFieldRules() {
       if (!this.field.formItemFlag || this.field.options.hidden) {
-        return
+        return;
       }
 
-      this.rules.splice(0, this.rules.length)  //清空已有
+      this.rules.splice(0, this.rules.length); //清空已有
       if (!!this.field.options.required) {
-        this.rules.push({
-          required: true,
-          //trigger: ['blur', 'change'],
-          trigger: ['blur'],  /* 去掉change事件触发校验，change事件触发时formModel数据尚未更新，导致radio/checkbox必填校验出错！！ */
-          message: this.getRequiredHintMsg()
-        })
+        if (isArrayValueWidgetType(this.field.type, this.field.options)) {
+          this.rules.push({
+            validator: (rule, value, callback) => {
+              const actualValue =
+                typeof this.getCurrentValue === "function"
+                  ? this.getCurrentValue()
+                  : value;
+              if (
+                isEmptyArrayFieldValue(
+                  actualValue,
+                  this.field.type,
+                  this.field.options
+                )
+              ) {
+                callback(new Error(this.getRequiredHintMsg()));
+              } else {
+                callback();
+              }
+            },
+            trigger: ["change", "blur"],
+          });
+        } else {
+          this.rules.push({
+            required: true,
+            //trigger: ['blur', 'change'],
+            trigger: [
+              "blur",
+            ] /* 去掉change事件触发校验，change事件触发时formModel数据尚未更新，导致radio/checkbox必填校验出错！！ */,
+            message: this.getRequiredHintMsg(),
+          });
+        }
       }
 
       if (!!this.field.options.validation) {
-        let vldName = this.field.options.validation
+        let vldName = this.field.options.validation;
         if (!!FormValidators[vldName]) {
           this.rules.push({
             validator: FormValidators[vldName],
-            trigger: ['blur', 'change'],
+            trigger: ["blur", "change"],
             label: this.field.options.label,
             // errorMsg: this.field.options.validationHint
-            errorMsg: this.getValidationHintMsg()
-          })
+            errorMsg: this.getValidationHintMsg(),
+          });
         } else {
           this.rules.push({
-            validator: FormValidators['regExp'],
-            trigger: ['blur', 'change'],
+            validator: FormValidators["regExp"],
+            trigger: ["blur", "change"],
             regExp: vldName,
             label: this.field.options.label,
             // errorMsg: this.field.options.validationHint
-            errorMsg: this.getValidationHintMsg()
-          })
+            errorMsg: this.getValidationHintMsg(),
+          });
         }
       }
 
       if (!!this.field.options.onValidate) {
         let customFn = (rule, value, callback) => {
-          let tmpFunc = new Function('rule', 'value', 'callback', this.field.options.onValidate)
-          return tmpFunc.call(this, rule, value, callback)
-        }
+          let tmpFunc = new Function(
+            "rule",
+            "value",
+            "callback",
+            this.field.options.onValidate
+          );
+          return tmpFunc.call(this, rule, value, callback);
+        };
         this.rules.push({
           validator: customFn,
-          trigger: ['blur', 'change'],
-          label: this.field.options.label
-        })
+          trigger: ["blur", "change"],
+          label: this.field.options.label,
+        });
       }
     },
 
@@ -906,14 +1124,14 @@ modules = {
      */
     disableChangeValidate() {
       if (!this.rules) {
-        return
+        return;
       }
 
-      this.rules.forEach(rule => {
+      this.rules.forEach((rule) => {
         if (!!rule.trigger) {
-          rule.trigger.splice(0, rule.trigger.length)
+          rule.trigger.splice(0, rule.trigger.length);
         }
-      })
+      });
     },
 
     /**
@@ -921,72 +1139,89 @@ modules = {
      */
     enableChangeValidate() {
       if (!this.rules) {
-        return
+        return;
       }
 
-      this.rules.forEach(rule => {
+      this.rules.forEach((rule) => {
         if (!!rule.trigger) {
-          rule.trigger.push('blur')
-          rule.trigger.push('change')
+          rule.trigger.push("blur");
+          rule.trigger.push("change");
         }
-      })
+      });
     },
 
     disableOptionOfList(optionList, optionValue) {
-      if (!!optionList && (optionList.length > 0)) {
+      if (!!optionList && optionList.length > 0) {
         let valueKey = this.getOptionItemValueKey();
-        optionList.forEach(opt => {
+        optionList.forEach((opt) => {
           if (opt[valueKey] === optionValue) {
-            opt.disabled = true
+            opt.disabled = true;
           }
 
           if (opt.children && Array.isArray(opt.children)) {
-            this.disableOptionOfList(opt.children, optionValue)
+            this.disableOptionOfList(opt.children, optionValue);
           }
-        })
-        this.$forceUpdate()
+        });
+        this.$forceUpdate();
       }
     },
 
     enableOptionOfList(optionList, optionValue) {
-      if (!!optionList && (optionList.length > 0)) {
+      if (!!optionList && optionList.length > 0) {
         let valueKey = this.getOptionItemValueKey();
-        optionList.forEach(opt => {
+        optionList.forEach((opt) => {
           if (opt[valueKey] === optionValue) {
-            opt.disabled = false
+            opt.disabled = false;
           }
 
           if (opt.children && Array.isArray(opt.children)) {
-            this.enableOptionOfList(opt.children, optionValue)
+            this.enableOptionOfList(opt.children, optionValue);
           }
-        })
-        this.$forceUpdate()
+        });
+        this.$forceUpdate();
       }
     },
 
-
     emitFieldDataChange(newValue, oldValue) {
-      if (this.designState) return
-      this.$emit('field-value-changed', [newValue, oldValue])
+      if (this.designState) return;
+      this.$emit("field-value-changed", [newValue, oldValue]);
 
       /* 同步更新keyName属性一致的字段组件值！！ */
       if (this.field.options.keyNameEnabled) {
-        this.getFormRef().broadcast('FieldWidget', 'sync-field-value',
-          [this.field.options.name, this.field.options.keyName, this.subFormName, this.subFormRowId,
-            newValue, this.getObjectName()])
+        this.getFormRef().broadcast("FieldWidget", "sync-field-value", [
+          this.field.options.name,
+          this.field.options.keyName,
+          this.subFormName,
+          this.subFormRowId,
+          newValue,
+          this.getObjectName(),
+        ]);
       } else {
-        this.getFormRef().broadcast('FieldWidget', 'sync-field-value',
-          [this.field.options.name, this.field.options.name, this.subFormName, this.subFormRowId,
-            newValue, this.getObjectName()])
+        this.getFormRef().broadcast("FieldWidget", "sync-field-value", [
+          this.field.options.name,
+          this.field.options.name,
+          this.subFormName,
+          this.subFormRowId,
+          newValue,
+          this.getObjectName(),
+        ]);
       }
 
-      if (this.field.type === 'number') {
-        this.getFormRef().broadcast('FieldWidget', 'calculate-formula', [newValue, this])  //触发计算公式计算
+      if (this.field.type === "number") {
+        this.getFormRef().broadcast("FieldWidget", "calculate-formula", [
+          newValue,
+          this,
+        ]); //触发计算公式计算
       }
 
       /* 必须用dispatch向指定父组件派发消息！！ */
-      this.dispatch('VFormRender', 'fieldChange',
-        [this.field.options.name, newValue, oldValue, this.subFormName, this.subFormRowIndex])
+      this.dispatch("VFormRender", "fieldChange", [
+        this.field.options.name,
+        newValue,
+        oldValue,
+        this.subFormName,
+        this.subFormRowIndex,
+      ]);
     },
     syncUpdateFormModel: function (e) {
       if (!this.designState)
@@ -998,17 +1233,31 @@ modules = {
           i[this.fieldKeyName] = e;
         } else this.formModel[this.fieldKeyName] = e;
     },
+    onFieldChangeEvent(value) {
+      if (!!this.designState) {
+        //设计状态不触发事件
+        return;
+      }
+
+      this.setCETriggerFlag(); //设置用户触发事件标志
+      this.handleChangeEvent(value);
+      setTimeout(() => {
+        this.clearCETriggerFlag(); //复位用户触发事件标志
+      }, 200);
+    },
     handleChangeEvent: function (e) {
       let widgetType = this.field.type;
-      if(widgetType === "select"){
-        if(e===""){
-           e = this.field.options.multiple? [] : null;
-           this.fieldModel = e;
+      if (widgetType === "select") {
+        if (e === "") {
+          e = this.field.options.multiple ? [] : null;
+          this.fieldModel = e;
         }
-      }else if(widgetType === "number"){
-        if(e===undefined){
-           e = null;
-           this.fieldModel = e;
+      } else if (widgetType === "number") {
+        if (e === undefined || e === null) {
+          // 清空存 null：undefined 会被 JSON.stringify 丢弃，字段不进请求体，
+          // 后台按“未传即不更新”处理导致清空无法落库；null 可序列化并被后台置空。
+          e = null;
+          this.fieldModel = e;
         }
       }
 
@@ -1020,7 +1269,7 @@ modules = {
     handleFocusCustomEvent: function (e) {
       if (
         ((this.oldFieldValue = baseRefUtil.deepClone(this.fieldModel)),
-          this.field.options.onFocus)
+        this.field.options.onFocus)
       ) {
         let t = new Function("event", this.field.options.onFocus);
         t.call(this, e);
@@ -1035,8 +1284,8 @@ modules = {
     handleInputCustomEvent: function (e) {
       if (
         (this.syncUpdateFormModel(e),
-          this.dispatch("VFormRender", "fieldValidation", [this.getPropName()]),
-          this.field.options.onInput)
+        this.dispatch("VFormRender", "fieldValidation", [this.getPropName()]),
+        this.field.options.onInput)
       ) {
         let t = new Function("value", this.field.options.onInput);
         t.call(this, e);
@@ -1066,29 +1315,57 @@ modules = {
         this.handleCustomClickEvent();
       }
     },
+    /**
+     * 点击绑定事件的上下文。链接模式（flag=true）下所有配置统一从
+     * widgetTextLinkConfig.options 读，不再出现「动作取链接的、前置脚本取主控件的」分裂。
+     */
+    getClickBindContext(flag) {
+      let linkOptions = this.field.options.widgetTextLinkConfig?.options;
+      let optionModel = flag ? linkOptions || {} : this.field.options;
+      return {
+        vm: this,
+        flag: !!flag,
+        field: this.field,
+        widgetType: this.field.type,
+        optionModel,
+        tableParam: this.tableParam,
+        rowData: this.tableParam?.row || null,
+        formRef: this.getFormRef(),
+        actionValue: optionModel.clickBindEvent,
+        // 链接模式优先用自己的前置脚本，未配则回落主控件（保持存量行为）
+        beforeScript:
+          optionModel.onBeforeClickButton
+          ?? this.field.options.onBeforeClickButton,
+      };
+    },
     handleCustomClickEvent: function (flag) {
-      let tableParam = this.tableParam;
-      let clickBindEvent = !flag ? this.field.options.clickBindEvent : this.field.options.widgetTextLinkConfig?.options?.clickBindEvent;
+      let ctx = this.getClickBindContext(flag);
+      let action = getClickBindAction(ctx.actionValue);
+      if (!action) return;
 
+      // done 幂等：脚本里调了 done() 又没 return false，也只执行一次
+      let fired = false;
       const done = () => {
-        if (clickBindEvent === "1") {
-          //打开选择弹框
-          this.openSearchDialog(tableParam, flag);
-        } else if (clickBindEvent === "2") {
-          //列表插入数据
-          this.handleAddTableDataEvent(flag);
-        }
-      }
-      if (clickBindEvent && this.field.options.onBeforeClickButton) {
-        if (this.handleCustomEvent(this.field.options.onBeforeClickButton, ["done"], [done]) !== false) {
-          done();
-        }
-      } else {
-        done();
+        if (fired) return;
+        fired = true;
+        action.run(ctx);
+      };
+
+      if (!ctx.beforeScript) return done();
+      let ret = this.handleCustomEvent(ctx.beforeScript, ["done"], [done]);
+      if (ret === false) return; // 脚本显式接管
+      if (ret && typeof ret.then === "function") {
+        ret.then((result) => {
+          if (result !== false) done();
+        });
+        return;
       }
+      done();
     },
     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;
@@ -1115,7 +1392,9 @@ modules = {
     },
     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"];
@@ -1124,11 +1403,7 @@ modules = {
             eventParamNames = ["row", "rowIndex", "event"];
             eventParamValues = [tableParam.row, tableParam.rowIndex, event];
           }
-          this.handleCustomEvent(
-            onClick,
-            eventParamNames,
-            eventParamValues
-          );
+          this.handleCustomEvent(onClick, eventParamNames, eventParamValues);
         } else {
           if (!flag) this.dispatch("VFormRender", "buttonClick", [this]);
         }
@@ -1140,7 +1415,9 @@ modules = {
       let tableData = searchDialogConfig.tableData || [];
     },
     openSearchDialog(tableParam, flag) {
-      let optionModel = !flag ? this.field.options : (this.field.options.widgetTextLinkConfig?.options || {});
+      let optionModel = !flag
+        ? this.field.options
+        : this.field.options.widgetTextLinkConfig?.options || {};
       let searchDialogConfig = optionModel.searchDialogConfig || {};
       let formCode = searchDialogConfig.formCode;
       let tableData = searchDialogConfig.tableData || [];
@@ -1148,12 +1425,14 @@ modules = {
 
       let rows = [];
       if (this.hasVabsearchFlag()) {
-        if (this.field.options.multipleChoices) {
+        if (this.getMultipleChoices(flag)) {
           let fieldKeyName = this.fieldKeyName;
           let valueField = trim(this.field.options.valueField || fieldKeyName);
-          let vabSearchName = trim(this.field.options.vabSearchName || fieldKeyName);
-          let valueSourceField = trim(searchDialogConfig.valueSourceField)
-          let labelSourceField = trim(searchDialogConfig.labelSourceField)
+          let vabSearchName = trim(
+            this.field.options.vabSearchName || fieldKeyName
+          );
+          let valueSourceField = trim(searchDialogConfig.valueSourceField);
+          let labelSourceField = trim(searchDialogConfig.labelSourceField);
 
           rows = (this.fieldModel || []).map((row) => {
             return {
@@ -1167,39 +1446,65 @@ modules = {
       // dialogQueryParam.
       let queryParam = null;
       if (searchDialogConfig.dialogQueryParam) {
-        queryParam = this.handleCustomEvent(searchDialogConfig.dialogQueryParam)
+        queryParam = this.handleCustomEvent(
+          searchDialogConfig.dialogQueryParam
+        );
       }
       let dialogCustomParam = {};
       if (searchDialogConfig.dialogCustomParam) {
-        dialogCustomParam = this.handleCustomEvent(searchDialogConfig.dialogCustomParam) || {}
-      }
-      let dialogParam = Object.assign({
-        formCode: formCode,
-        rows,
-        queryParam,
-        multiple: searchDialogConfig.multipleChoices || false,
-        confirm: (rows) => {
-          this.handleConfirmSearchDialog(rows, false, flag);
+        dialogCustomParam =
+          this.handleCustomEvent(searchDialogConfig.dialogCustomParam) || {};
+      }
+      let dialogParam = Object.assign(
+        {
+          formCode: formCode,
+          rows,
+          queryParam,
+          multiple: this.getMultipleChoices(flag),
+          confirm: (rows) => {
+            this.handleConfirmSearchDialog(rows, false, flag);
+          },
         },
-      },dialogCustomParam)
+        dialogCustomParam
+      );
       this.getFormRef().openSearchDialog(dialogParam);
     },
     handleClearSearchDialog() {
+      // 清除入口只存在于 vabsearch 主控件（onSearchClear），链接模式没有清除按钮
       let clickBindEvent = this.field.options.clickBindEvent;
-      if (clickBindEvent === "1") {
+      if (clickBindEvent === CLICK_BIND.SEARCH_DIALOG) {
         this.handleConfirmSearchDialog(null, true);
       }
     },
-    getMultipleChoices() {
-      let multipleChoices = this.field.options.multipleChoices;
-      return multipleChoices;
+    /**
+     * 「是否多选」唯一读取口径。
+     * 搜索类控件（vabsearch/singerSearch/multiSearch）的 multipleChoices 是结构性的
+     * ——它决定字段值是数组还是标量——所以以控件自身的为准；其它控件读选择弹框配置。
+     * 此前开弹框读 searchDialogConfig、回填读 field.options，两个开关不一致时会出现
+     * 「弹框能多选、回填只落一条」。
+     */
+    getMultipleChoices(flag) {
+      let optionModel = !flag
+        ? this.field.options
+        : this.field.options.widgetTextLinkConfig?.options || {};
+      return (
+        this.field.options.multipleChoices
+        ?? optionModel.searchDialogConfig?.multipleChoices
+        ?? false
+      );
     },
     hasVabsearchFlag() {
-      return this.field.type === "vabsearch" || this.field.type === "singerSearch" || this.field.type === "multiSearch"
+      return (
+        this.field.type === "vabsearch" ||
+        this.field.type === "singerSearch" ||
+        this.field.type === "multiSearch"
+      );
     },
     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 || {};
@@ -1207,15 +1512,16 @@ modules = {
       let tableData = searchDialogConfig.tableData || [];
       let formModel = this.formModel;
       let row = rows && rows.length ? rows[0] : null;
-      let multipleChoices =
-        optionModel.searchDialogConfig.multipleChoices || false;
+      let multipleChoices = searchDialogConfig.multipleChoices || false;
 
-      let valueSourceField = trim(searchDialogConfig.valueSourceField)
-      let labelSourceField = trim(searchDialogConfig.labelSourceField)
+      let valueSourceField = trim(searchDialogConfig.valueSourceField);
+      let labelSourceField = trim(searchDialogConfig.labelSourceField);
       if (this.hasVabsearchFlag()) {
         let fieldKeyName = this.fieldKeyName;
         let valueField = trim(this.field.options.valueField || fieldKeyName);
-        let vabSearchName = trim(this.field.options.vabSearchName || fieldKeyName);
+        let vabSearchName = trim(
+          this.field.options.vabSearchName || fieldKeyName
+        );
         if (tableParam) {
           let rowData = tableParam.row;
           if (this.getMultipleChoices()) {
@@ -1224,29 +1530,27 @@ modules = {
             } else {
               rowData[fieldKeyName] = rows.map((item) => {
                 let newData = {};
-                newData[valueField] =
-                  item[valueSourceField] ?? null;
-                newData[vabSearchName] =
-                  item[labelSourceField] ?? null;
+                newData[valueField] = item[valueSourceField] ?? null;
+                newData[vabSearchName] = item[labelSourceField] ?? null;
                 tableData.forEach((item1) => {
-                  let targetFormField = trim(item1.targetFormField || item1.targetField)
-                  let sourceField = trim(item1.sourceField)
+                  let targetFormField = trim(
+                    item1.targetFormField || item1.targetField
+                  );
+                  let sourceField = trim(item1.sourceField);
                   newData[targetFormField] = item[sourceField];
                 });
                 return newData;
               });
             }
           } else {
-            rowData[fieldKeyName] = !isClear
-              ? row[valueSourceField]
-              : null;
+            rowData[fieldKeyName] = !isClear ? row[valueSourceField] : null;
             if (labelSourceField)
-              rowData[vabSearchName] = !isClear
-                ? row[labelSourceField]
-                : null;
+              rowData[vabSearchName] = !isClear ? row[labelSourceField] : null;
             tableData.forEach((item) => {
-              let targetFormField = trim(item.targetFormField || item.targetField);
-              let sourceField = trim(item.sourceField)
+              let targetFormField = trim(
+                item.targetFormField || item.targetField
+              );
+              let sourceField = trim(item.sourceField);
               if (!isClear) {
                 rowData[targetFormField] = row[sourceField];
               } else {
@@ -1262,13 +1566,13 @@ modules = {
             } else {
               rowData = rows.map((item) => {
                 let newData = {};
-                newData[valueField] =
-                  item[valueSourceField] ?? null;
-                newData[vabSearchName] =
-                  item[labelSourceField] ?? null;
+                newData[valueField] = item[valueSourceField] ?? null;
+                newData[vabSearchName] = item[labelSourceField] ?? null;
                 tableData.forEach((item1) => {
-                  let targetFormField = trim(item1.targetFormField || item1.targetField)
-                  let sourceField = trim(item1.sourceField)
+                  let targetFormField = trim(
+                    item1.targetFormField || item1.targetField
+                  );
+                  let sourceField = trim(item1.sourceField);
                   newData[targetFormField] = item[sourceField];
                 });
                 return newData;
@@ -1279,20 +1583,16 @@ modules = {
             /* this.fieldModel = !isClear
               ? row[valueSourceField]
               : null; */
-            let value = !isClear
-                ? row[valueSourceField]
-                : null
-            this.setValue(value)
+            let value = !isClear ? row[valueSourceField] : null;
+            this.setValue(value);
             if (labelSourceField) {
-              this.setShowValue(
-                !isClear ? row[labelSourceField] : null
-              );
+              this.setShowValue(!isClear ? row[labelSourceField] : null);
             }
             tableData.forEach((item) => {
               // formModel[item.targetField] = row[item.sourceField]
               let value = !isClear ? row[item.sourceField] ?? null : null;
-              let targetField = trim(item.targetField)
-              let targetFormField = trim(item.targetFormField)
+              let targetField = trim(item.targetField);
+              let targetFormField = trim(item.targetFormField);
               if (targetField) {
                 this.getWidgetRef(targetField).setValue(value);
               } else if (targetFormField) {
@@ -1307,8 +1607,10 @@ modules = {
           let addRows = rows.map((rowData) => {
             let itemData = {};
             tableData.forEach((item) => {
-              let targetFormField = trim(item.targetFormField || item.targetField);
-              let sourceField = trim(item.sourceField)
+              let targetFormField = trim(
+                item.targetFormField || item.targetField
+              );
+              let sourceField = trim(item.sourceField);
               itemData[targetFormField] = rowData[sourceField];
             });
             return itemData;
@@ -1320,18 +1622,16 @@ modules = {
           );
         } else if (!multipleChoices) {
           tableData.forEach((item) => {
-            let value = row[item.sourceField] ?? null;
+            let value = !isClear && row ? row[item.sourceField] ?? null : null;
             // formModel[item.targetField] = value
             // this.getWidgetRef(item.targetField).setValue(value);
-            let targetField = trim(item.targetField)
-            let targetFormField = trim(item.targetFormField)
+            let targetField = trim(item.targetField);
+            let targetFormField = trim(item.targetFormField);
             if (targetField) {
               this.getWidgetRef(targetField).setValue(value);
             } else if (targetFormField) {
               formModel[targetFormField] = value;
             }
-
-
           });
           // this.$forceUpdate();
         }
@@ -1360,26 +1660,26 @@ modules = {
       let i = this.refList[e];
       return (
         !i &&
-        t &&
-        this.$message.error(this.i18nt("render.hint.refNotFound") + e),
-          i
+          t &&
+          this.$message.error(this.i18nt("render.hint.refNotFound") + e),
+        i
       );
     },
     getFieldEditor: function () {
       return this.$refs["fieldEditor"];
     },
     initValue: function (e) {
-        let value = e ?? null;
-        let currentData =
-          this.tableParam && this.tableParam.row
-            ? this.tableParam.row
-            : this.formModel;
-        if (void 0 === currentData[this.fieldKeyName]) {
-          this.$set(currentData, this.fieldKeyName, null);
-        }
-        this.fieldModel = value;
-        this.initFileList();
-        this.syncUpdateFormModel(value);
+      let value = e ?? null;
+      let currentData =
+        this.tableParam && this.tableParam.row
+          ? this.tableParam.row
+          : this.formModel;
+      if (void 0 === currentData[this.fieldKeyName]) {
+        this.$set(currentData, this.fieldKeyName, null);
+      }
+      this.fieldModel = value;
+      this.initFileList();
+      this.syncUpdateFormModel(value);
     },
     setValue: function (e) {
       if (this.field.formItemFlag) {
@@ -1407,10 +1707,10 @@ modules = {
       if (!this.subFormItemFlag) {
         let e = this.field.options.defaultValue;
         this.setValue(e),
-        ("picture-upload" !== this.field.type &&
-          "file-upload" !== this.field.type) ||
-        (this.$refs["fieldEditor"].clearFiles(),
-          this.fileList.splice(0, this.fileList.length));
+          ("picture-upload" !== this.field.type &&
+            "file-upload" !== this.field.type) ||
+            (this.$refs["fieldEditor"].clearFiles(),
+            this.fileList.splice(0, this.fileList.length));
       }
     },
     setWidgetOption: function (e, t) {
@@ -1443,23 +1743,29 @@ modules = {
     },
     focus: function () {
       this.getFieldEditor() &&
-      this.getFieldEditor().focus &&
-      this.getFieldEditor().focus();
+        this.getFieldEditor().focus &&
+        this.getFieldEditor().focus();
     },
     clearSelectedOptions: function () {
       ("checkbox" !== this.field.type &&
         "radio" !== this.field.type &&
         "select" !== this.field.type) ||
-      ("checkbox" === this.field.type ||
-      ("select" === this.field.type && this.field.options.multiple)
-        ? (this.fieldModel = [])
-        : (this.fieldModel = ""));
-    },
-    getOptionItemValueKey(){
-      return this.field.options.valueKey || "value"
+        ("checkbox" === this.field.type ||
+        ("select" === this.field.type && this.field.options.multiple)
+          ? (this.fieldModel = [])
+          : (this.fieldModel = ""));
+    },
+    getOptionItemValueKey() {
+      if (this.field.options.commonAttributeEnabled) {
+        return this.field.options.valueKey || "sn";
+      }
+      return this.field.options.valueKey || "value";
     },
-    getOptionItemLabelKey(){
-      return this.field.options.labelKey || "label"
+    getOptionItemLabelKey() {
+      if (this.field.options.commonAttributeEnabled) {
+        return this.field.options.labelKey || "value";
+      }
+      return this.field.options.labelKey || "label";
     },
     loadRowGloatOptions: function (e) {
       let optionItems = baseRefUtil.translateOptionItems(
@@ -1469,10 +1775,9 @@ modules = {
         this.getOptionItemValueKey()
       );
       // this.field.options.optionItems = optionItems
-      this.setOptionItems(optionItems)
+      this.setOptionItems(optionItems);
     },
     loadOptions: function (e, rowOptionFlag) {
-      debugger
       let optionItems = baseRefUtil.translateOptionItems(
         e,
         this.field.type,
@@ -1480,18 +1785,18 @@ modules = {
         this.getOptionItemValueKey()
       );
       // this.field.options.optionItems = optionItems
-      this.setOptionItems(optionItems)
+      this.setOptionItems(optionItems);
     },
     getOptionKey() {
-      let key = "optionItems-" + this.field.options.name
+      let key = "optionItems-" + this.field.options.name;
       return key;
     },
     getOptionItemsFlag: function () {
-      let key = this.getOptionKey()
+      let key = this.getOptionKey();
       return this.getGlobalParam(key);
     },
     setOptionItemsFlag: function (flag) {
-      let key = this.getOptionKey()
+      let key = this.getOptionKey();
       return this.setGlobalParam(key, flag);
     },
     reloadOptions: function (e) {
@@ -1502,7 +1807,7 @@ modules = {
         this.getOptionItemValueKey()
       );
       // this.field.options.optionItems = optionItems;
-      this.setOptionItems(optionItems)
+      this.setOptionItems(optionItems);
     },
     getOptions: function () {
       return this.getOptionItems();
@@ -1548,7 +1853,7 @@ modules = {
         this.field.options.customClass.map(function (i, n) {
           i === e && (t = n);
         }),
-        t > -1 && this.field.options.customClass.splice(t, 1);
+          t > -1 && this.field.options.customClass.splice(t, 1);
       }
     },
     async initAccess() {
@@ -1571,10 +1876,21 @@ modules = {
             if (!dsModel.headers) dsModel.headers = [];
             if (!dsModel.params) dsModel.params = [];
             if (!dsModel.data) dsModel.data = [];
-            if (dsModel.dataHandlerCode === null || dsModel.dataHandlerCode === undefined) dsModel.dataHandlerCode = "";
-            if (dsModel.configHandlerCode === null || dsModel.configHandlerCode === undefined)
+            if (
+              dsModel.dataHandlerCode === null ||
+              dsModel.dataHandlerCode === undefined
+            )
+              dsModel.dataHandlerCode = "";
+            if (
+              dsModel.configHandlerCode === null ||
+              dsModel.configHandlerCode === undefined
+            )
               dsModel.configHandlerCode = "";
-            if (dsModel.errorHandlerCode === null || dsModel.errorHandlerCode === undefined) dsModel.errorHandlerCode = "";
+            if (
+              dsModel.errorHandlerCode === null ||
+              dsModel.errorHandlerCode === undefined
+            )
+              dsModel.errorHandlerCode = "";
 
             requestAccess.dsModel = dsModel;
             this.requestAccess = requestAccess;
@@ -1614,13 +1930,6 @@ modules = {
         },
       });
     },
-    autoExcScript() {
-      if (!this.designState && this.field.options.accessAutoExc) {
-        this.scriptHttp({
-          options: this.field.options,
-        });
-      }
-    },
     addInterval(handler, timeout) {
       let timer = setInterval(handler, timeout);
       this.timerMap[timer] = timer;
@@ -1656,13 +1965,12 @@ modules = {
     showAText() {
       this.widgetTextFlag = 3;
     },
-    getAuthCode(){
+    getAuthCode() {
       let formRef = this.getFormRef();
-      if(formRef){
+      if (formRef) {
         return formRef.reportTemplate.formCode + ":" + this.field.options.name;
       }
-
-    }
+    },
   },
 };