cloud-web-corejs 1.0.54-dev.687 → 1.0.54-dev.689

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

@@ -1,134 +1,186 @@
 <template>
-  <form-item-wrapper :designer="designer" :field="field" :rules="rules" :design-state="designState"
-                     :parent-widget="parentWidget" :parent-list="parentList" :index-of-parent-list="indexOfParentList"
-                     :sub-form-row-index="subFormRowIndex" :sub-form-col-index="subFormColIndex" :sub-form-row-id="subFormRowId">
-    <el-cascader ref="fieldEditor" :options="field.options.optionItems"
-                  v-model="fieldModel" class="full-width-input"
-                  v-show="!isReadMode"
-                 :disabled="field.options.disabled"
-                 :size="field.options.size"
-                 :clearable="field.options.clearable"
-                 :filterable="field.options.filterable"
-                 :props="{ checkStrictly: field.options.checkStrictly, multiple: field.options.multiple, expandTrigger: 'hover' }"
-                 @visible-change="hideDropDownOnClick" @expand-change="hideDropDownOnClick"
-                 :placeholder="getI18nLabel(field.options.placeholder || '请选择')"
-                 @focus="handleFocusCustomEvent" @blur="handleBlurCustomEvent"
-                 @change="handleChangeEvent">
+  <form-item-wrapper
+    :designer="designer"
+    :field="field"
+    :rules="rules"
+    :design-state="designState"
+    :parent-widget="parentWidget"
+    :parent-list="parentList"
+    :index-of-parent-list="indexOfParentList"
+    :sub-form-row-index="subFormRowIndex"
+    :sub-form-col-index="subFormColIndex"
+    :sub-form-row-id="subFormRowId"
+  >
+    <el-cascader
+      ref="fieldEditor"
+      :options="field.options.optionItems"
+      v-model="fieldModel"
+      v-show="!isReadMode"
+      class="full-width-input"
+      :disabled="field.options.disabled || isReadMode"
+      :clearable="field.options.clearable"
+      :filterable="field.options.filterable"
+      :placeholder="
+        field.options.placeholder || i18nt('render.hint.selectPlaceholder')
+      "
+      :show-all-levels="showFullPath"
+      :props="{
+        checkStrictly: field.options.checkStrictly,
+        multiple: field.options.multiple,
+        expandTrigger: 'hover',
+        value: valueKey,
+        label: labelKey,
+        children: childrenKey,
+      }"
+      @visible-change="hideDropDownOnClick"
+      @expand-change="hideDropDownOnClick"
+      @focus="handleFocusCustomEvent"
+      @blur="handleBlurCustomEvent"
+      @clear="handleClearEvent"
+      @change="onFieldChangeEvent"
+    >
     </el-cascader>
     <template v-if="isReadMode">
-      <span class="readonly-mode-field">{{contentForReadMode}}</span>
+      <span class="readonly-mode-field">{{ contentForReadMode }}</span>
     </template>
   </form-item-wrapper>
 </template>
 
 <script>
-  import FormItemWrapper from './form-item-wrapper'
-  import emitter from '../../../../../components/xform/utils/emitter'
-  import i18n from "../../../../../components/xform/utils/i18n";
-  import fieldMixin from "../../../../../components/xform/form-designer/form-widget/field-widget/fieldMixin";
-
-  export default {
-    name: "cascader-widget",
-    componentName: 'FieldWidget',  //必须固定为FieldWidget，用于接收父级组件的broadcast事件
-    mixins: [emitter, fieldMixin, i18n],
-    props: {
-      field: Object,
-      parentWidget: Object,
-      parentList: Array,
-      indexOfParentList: Number,
-      designer: Object,
-
-      designState: {
-        type: Boolean,
-        default: false
-      },
-
-      subFormRowIndex: { /* 子表单组件行索引，从0开始计数 */
-        type: Number,
-        default: -1
-      },
-      subFormColIndex: { /* 子表单组件列索引，从0开始计数 */
-        type: Number,
-        default: -1
-      },
-      subFormRowId: { /* 子表单组件行Id，唯一id且不可变 */
-        type: String,
-        default: ''
-      },
+import FormItemWrapper from "./form-item-wrapper";
+import emitter from "../../../../../components/xform/utils/emitter";
+import i18n from "../../../../../components/xform/utils/i18n";
+import fieldMixin from "../../../../../components/xform/form-designer/form-widget/field-widget/fieldMixin";
 
+export default {
+  name: "cascader-widget",
+  componentName: "FieldWidget", //必须固定为FieldWidget，用于接收父级组件的broadcast事件
+  mixins: [emitter, fieldMixin, i18n],
+  props: {
+    field: Object,
+    parentWidget: Object,
+    parentList: Array,
+    indexOfParentList: Number,
+    designer: Object,
+
+    designState: {
+      type: Boolean,
+      default: false,
     },
-    components: {
-      FormItemWrapper,
+
+    subFormRowIndex: {
+      /* 子表单组件行索引，从0开始计数 */ type: Number,
+      default: -1,
     },
-    inject: ['refList', 'globalOptionData', 'globalModel'],
-    data() {
-      return {
-        oldFieldValue: null, //field组件change之前的值
-        fieldModel: null,
-        rules: [],
-      }
+    subFormColIndex: {
+      /* 子表单组件列索引，从0开始计数 */ type: Number,
+      default: -1,
     },
-    computed: {
-
+    subFormRowId: {
+      /* 子表单组件行Id，唯一id且不可变 */ type: String,
+      default: "",
     },
-    beforeCreate() {
-      /* 这里不能访问方法和属性！！ */
+  },
+  components: {
+    FormItemWrapper,
+  },
+  inject: ["refList", "globalOptionData", "globalModel"],
+  data() {
+    return {
+      oldFieldValue: null, //field组件change之前的值
+      fieldModel: null,
+      rules: [],
+    };
+  },
+  computed: {
+    labelKey() {
+      return this.field.options.labelKey || "label";
     },
 
-    created() {
-      /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
-         需要在父组件created中初始化！！ */
-      this.initOptionItems()
-      this.initFieldModel()
-      this.registerToRefList()
-      this.initEventHandler()
-      this.buildFieldRules()
-
-      this.handleOnCreated()
+    valueKey() {
+      return this.field.options.valueKey || "value";
     },
 
-    mounted() {
-      this.handleOnMounted()
+    childrenKey() {
+      return this.field.options.childrenKey || "children";
     },
 
-    beforeDestroy() {
-      this.unregisterFromRefList()
+    showFullPath() {
+      return (
+        this.field.options.showAllLevels === undefined ||
+        !!this.field.options.showAllLevels
+      );
     },
 
-    methods: {
-      /* 开启任意级节点可选后，点击radio隐藏下拉框 */
-      hideDropDownOnClick() {
-        setTimeout(() => {
-          document.querySelectorAll(".el-cascader-panel .el-radio").forEach((el) => {
-            el.onclick = () => {
-              this.$refs.fieldEditor.dropDownVisible = false  //单选框部分点击隐藏下拉框
-            }
-          })
-        }, 100)
-      },
-      contentForReadMode() {
-        if (!!this.field.options.multiple) {
-          //console.log('test======', this.$refs.fieldEditor.presentTags)
-          const curTags = this.$refs.fieldEditor.presentTags
-          if (!curTags || (curTags.length <= 0)) {
-            return '--'
-          } else {
-            return curTags.map(tagItem => tagItem.text).join(', ')
-          }
+    contentForReadMode() {
+      if (!!this.field.options.multiple) {
+        //console.log('test======', this.$refs.fieldEditor.presentTags)
+        const curTags = this.$refs.fieldEditor.presentTags;
+        if (!curTags || curTags.length <= 0) {
+          return "--";
         } else {
-          return this.$refs.fieldEditor.presentText || '--'
+          return curTags.map((tagItem) => tagItem.text).join(", ");
         }
-      },
+      } else {
+        return this.$refs.fieldEditor.presentText || "--";
+      }
+    },
+  },
+  beforeCreate() {
+    /* 这里不能访问方法和属性！！ */
+  },
+
+  created() {
+    /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
+         需要在父组件created中初始化！！ */
+    this.registerToRefList();
+    this.initOptionItems();
+    this.initFieldModel();
+    this.initEventHandler();
+    this.buildFieldRules();
 
-    }
-  }
+    this.handleOnCreated();
+  },
+
+  mounted() {
+    this.handleOnMounted();
+  },
+
+  beforeDestroy() {
+    this.unregisterFromRefList();
+  },
+
+  methods: {
+    /* 开启任意级节点可选后，点击radio隐藏下拉框 */
+    hideDropDownOnClick() {
+      setTimeout(() => {
+        document
+          .querySelectorAll(".el-cascader-panel .el-radio")
+          .forEach((el) => {
+            el.onclick = () => {
+              this.$refs.fieldEditor.dropDownVisible = false; //单选框部分点击隐藏下拉框
+            };
+          });
+      }, 100);
+    },
+
+    handleClearEvent() {
+      if (!!this.designState) {
+        //设计状态不触发事件
+        return;
+      }
+
+      this.fieldModel = null;
+      this.onFieldChangeEvent(null);
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-  @import "~@/styles/global.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
-
-  .full-width-input {
-    width: 100% !important;
-  }
+@import "~@/styles/global.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
 
+.full-width-input {
+  width: 100% !important;
+}
 </style>

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

@@ -8,6 +8,9 @@ import {
   getAccessUrl,
   generateId,
   trim,
+  isArrayValueWidgetType,
+  isAttachmentWidgetType,
+  isEmptyArrayFieldValue,
 } from "../../../../../components/xform/utils/util";
 import FormValidators, {
   getRegExp,
@@ -71,6 +74,8 @@ modules = {
     "getReportTemplate",
     "getObjectFieldFlag",
     "getObjectName",
+    "setCETriggerFlag",
+    "clearCETriggerFlag",
   ],
   data: function () {
     return {
@@ -177,8 +182,8 @@ modules = {
         selectedItems == null
           ? []
           : Array.isArray(selectedItems)
-            ? selectedItems
-            : [selectedItems];
+          ? selectedItems
+          : [selectedItems];
       const labelField = this.getOptionItemLabelKey();
       return items.map((item) => this.$t1(item[labelField])).join(",");
     },
@@ -214,8 +219,8 @@ modules = {
       return isMultiple
         ? resultList
         : resultList.length > 0
-          ? resultList[0]
-          : null;
+        ? resultList[0]
+        : null;
     },
     initValueWatchEvent() {
       if (!this.designer) {
@@ -324,7 +329,8 @@ modules = {
           nullValue = undefined;
         } else if (
           widgetType === "checkbox" ||
-          (widgetType === "select" && this.field.options.multiple)
+          (widgetType === "select" && this.field.options.multiple) ||
+          isAttachmentWidgetType(widgetType)
         ) {
           nullValue = [];
         } else if (
@@ -337,11 +343,23 @@ modules = {
         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 (
@@ -914,19 +932,40 @@ modules = {
       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;
       if (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);
       } else {
-        return this.getValidateDefaultMsg(this.field.options.label, "required");
+        return this.getValidateDefaultMsg(
+          this.resolveFieldValidateLabelCode(),
+          "required"
+        );
       }
     },
     buildFieldRules() {
@@ -936,14 +975,37 @@ modules = {
 
       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) {
@@ -1100,6 +1162,18 @@ 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") {
@@ -1108,8 +1182,8 @@ modules = {
           this.fieldModel = e;
         }
       } else if (widgetType === "number") {
-        if (e === undefined) {
-          e = null;
+        if (e === undefined || e === null) {
+          e = undefined;
           this.fieldModel = e;
         }
       }
@@ -1578,9 +1652,15 @@ modules = {
           : (this.fieldModel = ""));
     },
     getOptionItemValueKey() {
+      if (this.field.options.commonAttributeEnabled) {
+        return this.field.options.valueKey || "sn";
+      }
       return this.field.options.valueKey || "value";
     },
     getOptionItemLabelKey() {
+      if (this.field.options.commonAttributeEnabled) {
+        return this.field.options.labelKey || "value";
+      }
       return this.field.options.labelKey || "label";
     },
     loadRowGloatOptions: function (e) {

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

@@ -207,7 +207,10 @@
 
 <script>
 import i18n from "../../../../../components/xform/utils/i18n";
-import { getSubFormNameByFieldId } from "../../../../../components/xform/utils/util";
+import {
+  getSubFormNameByFieldId,
+  isVabsearchMultiWidget,
+} from "../../../../../components/xform/utils/util";
 
 export default {
   name: "form-item-wrapper",
@@ -261,7 +264,7 @@ export default {
     },
 
     label() {
-      if (!!this.field.options.labelHidden) {
+      if (this.shouldHideFieldLabel()) {
         return "";
       }
       return this.getI18nLabel(this.field.options.label);
@@ -270,7 +273,7 @@ export default {
     },
 
     labelWidth() {
-      if (!!this.field.options.labelHidden) {
+      if (this.shouldHideFieldLabel()) {
         return (!!this.designState ? 5 : 0) + "px"; //设计期间标签最小宽度5像素，以便于鼠标点击可选中组件！！
       }
 
@@ -322,6 +325,13 @@ export default {
     this.initShowType();
   },
   methods: {
+    shouldHideFieldLabel() {
+      if (!!this.field.options.labelHidden) {
+        return true;
+      }
+      // 数据表格列内字段：表头已展示列名，隐藏 form-item 标签
+      return this.isSubFormItem();
+    },
     isSubFormItem() {
       return !!this.tableParam;
     },
@@ -380,19 +390,11 @@ export default {
         });
       }
     },
-    getIsFormItemUnabled() {
-      return (
-        this.field.type == "vabUpload" || this.field.type == "baseAttachment"
-      );
-    },
     getRules() {
-      if (this.getIsFormItemUnabled()) {
-        return null;
-      }
       return this.rules;
     },
     getPropName() {
-      if (this.formItemProp === "false" || this.getIsFormItemUnabled()) {
+      if (this.formItemProp === "false") {
         return null;
       }
       // if (this.formItemProp) {
@@ -439,7 +441,10 @@ export default {
       let tableWidget = tableRef.widget;
       let fieldKeyName = this.getFieldKeyName(tableWidget);
       let property = this.getFieldKeyName(rowWidget);
-      if (this.isVabsearchFlagWidget(rowWidget)) {
+      if (
+        this.isVabsearchFlagWidget(rowWidget) &&
+        !isVabsearchMultiWidget(rowWidget)
+      ) {
         property = rowWidget.options.vabSearchName || property;
       }
       let rowIndex = Math.max(obj.rowIndex, 0);

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

@@ -85,16 +85,19 @@ export default {
   computed: {
     numberValue: {
       get() {
-        let fieldModel = this.fieldModel;
-        return fieldModel === null ? undefined : fieldModel;
+        const fieldModel = this.fieldModel;
+        if (fieldModel === null || fieldModel === undefined) {
+          return undefined;
+        }
+        return fieldModel;
       },
       set(val) {
-        let newValue = val === undefined ? null : val;
-        this.fieldModel = newValue
-        let currentData =
-        this.tableParam && this.tableParam.row
-          ? this.tableParam.row
-          : this.formModel;
+        const newValue = val === undefined || val === null ? undefined : val;
+        this.fieldModel = newValue;
+        const currentData =
+          this.tableParam && this.tableParam.row
+            ? this.tableParam.row
+            : this.formModel;
         currentData[this.fieldKeyName] = newValue;
       },
     },