cloud-web-corejs 1.0.54-dev.651 → 1.0.54-dev.653

package/package.json

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

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

@@ -10,7 +10,7 @@
                     :format="field.options.format" :value-format="field.options.valueFormat"
                     :placeholder="getI18nLabel(field.options.placeholder || '选择日期')"
                     @focus="handleFocusCustomEvent" @blur="handleBlurCustomEvent"
-                    @change="handleChangeEvent"
+                    @change="handleDateChangeEvent"
                     :picker-options="pickerOptions"
     >
     </el-date-picker>
@@ -25,11 +25,12 @@ 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";
+import dateLimitMixin from "../../../../../components/xform/form-designer/form-widget/field-widget/mixins/date-limit-mixin";
 
 export default {
   name: "date-widget",
   componentName: 'FieldWidget',  //必须固定为FieldWidget，用于接收父级组件的broadcast事件
-  mixins: [emitter, fieldMixin, i18n],
+  mixins: [emitter, fieldMixin, i18n, dateLimitMixin],
   props: {
     field: Object,
     parentWidget: Object,
@@ -73,6 +74,20 @@ export default {
       return this.fieldModel ? this.fieldModel : ''
     },
   },
+  watch: {
+    "field.options.limitStartField"() {
+      this.initDateLimitPickerOptions();
+    },
+    "field.options.limitEndField"() {
+      this.initDateLimitPickerOptions();
+    },
+    "field.options.minDate"() {
+      this.initDateLimitPickerOptions();
+    },
+    "field.options.maxDate"() {
+      this.initDateLimitPickerOptions();
+    },
+  },
   beforeCreate() {
     /* 这里不能访问方法和属性！！ */
   },
@@ -86,19 +101,12 @@ export default {
     this.buildFieldRules()
 
     this.handleOnCreated()
-
-    if(['year','month','date'].includes(this.field.options.type)){
-      this.pickerOptions.shortcuts = [{
-        text: this.$t1('此刻'),
-        onClick(picker) {
-          picker.$emit('pick', new Date());
-        }
-      }]
-    }
+    this.initDateLimitPickerOptions()
   },
 
   mounted() {
     this.handleOnMounted()
+    this.initDateLimitWatch()
   },
 
   beforeDestroy() {
@@ -106,11 +114,16 @@ export default {
   },
 
   methods: {
+    handleDateChangeEvent(value) {
+      if (this.isDateLimitViolated(value)) {
+        this.$message.warning(this.getDateLimitViolationMessage());
+        this.fieldModel = this.oldFieldValue;
+        return;
+      }
+      this.handleChangeEvent(value);
+    },
     setNow() {
       this.$refs.fieldEditor.panel.changeToNow()
-      /*this.selectedDate = new Date();
-      // 可选：点击后自动关闭弹窗
-      this.$refs.datePicker.pickerVisible = false;*/
     }
   }
 }

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

@@ -22,20 +22,33 @@
           </template>
           <template
             v-else-if="
-              field.options.widgetTextFlag === 3 && field.options.widgetTextLinkConfig
+              field.options.widgetTextFlag === 3 &&
+              field.options.widgetTextLinkConfig
             "
           >
             <div class="ellipsis">
-              <a class="a-link" :class="getWidgetClass()" @click.native="handleClick">
+              <a
+                class="a-link"
+                :class="getWidgetClass()"
+                @click.native="handleClick"
+              >
                 <span>
                   <i
-                    :class="field.options.widgetTextLinkConfig.options.prefixIcon"
-                    v-if="!!field.options.widgetTextLinkConfig.options.prefixIcon"
+                    :class="
+                      field.options.widgetTextLinkConfig.options.prefixIcon
+                    "
+                    v-if="
+                      !!field.options.widgetTextLinkConfig.options.prefixIcon
+                    "
                   ></i>
                   <span>{{ getWidgetValue() }}</span>
                   <i
-                    :class="field.options.widgetTextLinkConfig.options.suffixIcon"
-                    v-if="!!field.options.widgetTextLinkConfig.options.suffixIcon"
+                    :class="
+                      field.options.widgetTextLinkConfig.options.suffixIcon
+                    "
+                    v-if="
+                      !!field.options.widgetTextLinkConfig.options.suffixIcon
+                    "
                   ></i>
                 </span>
               </a>
@@ -48,10 +61,12 @@
       </template>
       <template v-else>
         <el-form-item
-          v-if="!!field.formItemFlag && (!field.options.hidden || designState === true)"
+          v-if="
+            !!field.formItemFlag &&
+            (!field.options.hidden || designState === true)
+          "
           :label="label"
           :label-width="labelWidth"
-          :title="field.options.labelTooltip"
           :rules="getRules()"
           :prop="getPropName()"
           :class="[
@@ -66,31 +81,46 @@
             v-if="!!field.options.labelIconClass"
             slot="label"
             class="custom-label"
-            :style="{ color: field.options.labelColor }"
           >
             <template v-if="field.options.labelIconPosition === 'front'">
               <template v-if="!!field.options.labelTooltip">
-                <el-tooltip :content="field.options.labelTooltip" effect="light">
+                <el-tooltip
+                  :content="field.options.labelTooltip"
+                  effect="light"
+                >
                   <i :class="field.options.labelIconClass"></i></el-tooltip
-                >{{ label }}</template
+                ><span :style="{ color: field.options.labelColor }">{{
+                  label
+                }}</span></template
               >
               <template v-else>
-                <i :class="field.options.labelIconClass"></i>{{ label }}</template
+                <i :class="field.options.labelIconClass"></i
+                ><span :style="{ color: field.options.labelColor }">{{
+                  label
+                }}</span></template
               >
             </template>
             <template v-else-if="field.options.labelIconPosition === 'rear'">
               <template v-if="!!field.options.labelTooltip">
-                {{ label
-                }}<el-tooltip :content="field.options.labelTooltip" effect="light">
+                <span :style="{ color: field.options.labelColor }">{{
+                  label
+                }}</span
+                ><el-tooltip
+                  :content="field.options.labelTooltip"
+                  effect="light"
+                >
                   <i :class="field.options.labelIconClass"></i></el-tooltip
               ></template>
               <template v-else>
-                {{ label }}<i :class="field.options.labelIconClass"></i
+                <span :style="{ color: field.options.labelColor }">{{
+                  label
+                }}</span
+                ><i :class="field.options.labelIconClass"></i
               ></template>
             </template>
           </span>
           <span
-            v-if="!!field.options.labelColor"
+            v-else-if="!!field.options.labelColor"
             slot="label"
             :style="{ color: field.options.labelColor }"
           >
@@ -101,20 +131,29 @@
           </template>
           <template
             v-else-if="
-              field.options.widgetTextFlag === 3 && field.options.widgetTextLinkConfig
+              field.options.widgetTextFlag === 3 &&
+              field.options.widgetTextLinkConfig
             "
           >
             <div class="ellipsis">
               <a class="a-link" :class="getWidgetClass()" @click="handleClick">
                 <span>
                   <i
-                    :class="field.options.widgetTextLinkConfig.options.prefixIcon"
-                    v-if="!!field.options.widgetTextLinkConfig.options.prefixIcon"
+                    :class="
+                      field.options.widgetTextLinkConfig.options.prefixIcon
+                    "
+                    v-if="
+                      !!field.options.widgetTextLinkConfig.options.prefixIcon
+                    "
                   ></i>
                   <span>{{ getWidgetValue() }}</span>
                   <i
-                    :class="field.options.widgetTextLinkConfig.options.suffixIcon"
-                    v-if="!!field.options.widgetTextLinkConfig.options.suffixIcon"
+                    :class="
+                      field.options.widgetTextLinkConfig.options.suffixIcon
+                    "
+                    v-if="
+                      !!field.options.widgetTextLinkConfig.options.suffixIcon
+                    "
                   ></i>
                 </span>
               </a>
@@ -330,7 +369,10 @@ export default {
         }
 
         this.$nextTick(() => {
-          const l = getSubFormNameByFieldId(this.designer.widgetList, selectedId);
+          const l = getSubFormNameByFieldId(
+            this.designer.widgetList,
+            selectedId
+          );
           this.parentList.splice(this.indexOfParentList, 1);
           //if (!!nextSelected) {
           this.designer.setSelected(nextSelected);
@@ -342,7 +384,9 @@ export default {
       }
     },
     getIsFormItemUnabled() {
-      return this.field.type == "vabUpload" || this.field.type == "baseAttachment";
+      return (
+        this.field.type == "vabUpload" || this.field.type == "baseAttachment"
+      );
     },
     getRules() {
       if (this.getIsFormItemUnabled()) {
@@ -351,15 +395,26 @@ export default {
       return this.rules;
     },
     getPropName() {
-      if (this.getIsFormItemUnabled()) {
+      if (this.formItemProp === "false" || this.getIsFormItemUnabled()) {
         return null;
       }
-      if (this.formItemProp) {
-        return this.formItemProp;
+      // if (this.formItemProp) {
+      //   return this.formItemProp;
+      // }
+      if (this.tableParam && !this.tableParam.$table?.$parent?.$parent) {
+        if (this.formItemProp) {
+          return this.formItemProp;
+        }
+        return null;
+      }
+      if (this.tableParam && !!this.tableParam.$table?.$parent?.$parent) {
+        return this.getColumnProp(this.field, this.tableParam);
       }
       let o = this.field.options.name;
       let propName =
-        ((o = (this.field.options.keyNameEnabled && this.field.options.keyName) || o),
+        ((o =
+          (this.field.options.keyNameEnabled && this.field.options.keyName) ||
+          o),
         this.subFormItemFlag && !this.designState
           ? this.subFormName + "." + this.subFormRowIndex + "." + o
           : this.getObjectFieldFlag() && !this.designState
@@ -368,6 +423,46 @@ export default {
 
       return propName;
     },
+    getFieldKeyName(widget) {
+      let o = widget.options.name;
+      return (widget.options.keyNameEnabled && widget.options.keyName) || o;
+    },
+    isVabsearchFlagWidget(widget) {
+      let type = widget?.type;
+      return (
+        type === "vabsearch" ||
+        type === "singerSearch" ||
+        type === "multiSearch"
+      );
+    },
+    getColumnProp(rowWidget, obj) {
+      let required = rowWidget.options.required || false;
+
+      let tableRef = obj.$table.$parent.$parent;
+      let tableWidget = tableRef.widget;
+      let fieldKeyName = this.getFieldKeyName(tableWidget);
+      let property = this.getFieldKeyName(rowWidget);
+      if (this.isVabsearchFlagWidget(rowWidget)) {
+        property = rowWidget.options.vabSearchName || property;
+      }
+      let rowIndex = Math.max(obj.rowIndex, 0);
+
+      let isTreeTable = tableWidget.options.isTreeTable || false;
+      if (isTreeTable) {
+        rowIndex = tableRef
+          .getValue()
+          .findIndex((item) => item._X_ROW_KEY === obj.row._X_ROW_KEY);
+        if (rowIndex < 0) {
+          return "false";
+        }
+      }
+
+      let propName = fieldKeyName + "." + rowIndex + "." + property;
+      if (!required) {
+        propName = "false";
+      }
+      return propName;
+    },
     getI18nLabel(label, path, param) {
       return !this.designState && label ? this.$t2(label, path, param) : label;
     },
@@ -509,7 +604,8 @@ export default {
               : [];
 
             let flag1 = !item.serveName || item.serveName == bdService;
-            let flag2 = !companyCodes.length || companyCodes.includes(companyCode);
+            let flag2 =
+              !companyCodes.length || companyCodes.includes(companyCode);
             // let flag3 = !loginAccounts.length || loginAccounts.includes(loginAccount)
             // let flag4 = this.compareToList(saleOrgCodes, saleOrgCodeList)
             if (flag1 && flag2) {
@@ -543,13 +639,16 @@ export default {
     isShowWidget() {
       let widgetTextFlag = this.field.options.widgetTextFlag;
       return (
-        widgetTextFlag === undefined || widgetTextFlag === null || widgetTextFlag === 0
+        widgetTextFlag === undefined ||
+        widgetTextFlag === null ||
+        widgetTextFlag === 0
       );
     },
     getShowValue() {
       let widgetTextFlag = this.field.options.widgetTextFlag;
       let fieldModel = this.$parent.fieldModel;
-      if (this.$parent.fieldModelLabel) fieldModel = this.$parent.fieldModelLabel();
+      if (this.$parent.fieldModelLabel)
+        fieldModel = this.$parent.fieldModelLabel();
       let showValue = fieldModel;
       if (widgetTextFlag == 2) {
         showValue = this.getProcessText(showValue, this.encryptFormula);
@@ -568,13 +667,17 @@ export default {
     handleClick(event) {
       if (this.field.options.disabled) return;
       this.$parent.handleButtonWidgetClick(event, true);
-      if (!this.designState && this.field.options.widgetTextLinkConfig?.options.href) {
+      if (
+        !this.designState &&
+        this.field.options.widgetTextLinkConfig?.options.href
+      ) {
         window.open(this.field.options.widgetTextLinkConfig?.options.href);
       }
     },
     getWidgetValue() {
       let fieldModel = this.$parent.fieldModel;
-      if (this.$parent.fieldModelLabel) fieldModel = this.$parent.fieldModelLabel();
+      if (this.$parent.fieldModelLabel)
+        fieldModel = this.$parent.fieldModelLabel();
       return fieldModel;
     },
   },

package/src/components/xform/form-designer/form-widget/field-widget/mixins/date-limit-mixin.js

@@ -0,0 +1,157 @@
+export default {
+  methods: {
+    getDateLimitOptions() {
+      return this.field.options || {};
+    },
+    initDateLimitPickerOptions() {
+      const pickerOptions = { ...(this.pickerOptions || {}) };
+      if (["year", "month", "date", "datetime"].includes(this.field.options.type)) {
+        if (!pickerOptions.shortcuts) {
+          pickerOptions.shortcuts = [
+            {
+              text: this.$t1("此刻"),
+              onClick(picker) {
+                picker.$emit("pick", new Date());
+              },
+            },
+          ];
+        }
+      }
+      pickerOptions.disabledDate = (time) => this.isDateLimitDisabled(time);
+      this.pickerOptions = pickerOptions;
+    },
+    initDateLimitWatch() {
+      if (this.designState) {
+        return;
+      }
+      const { limitStartField, limitEndField } = this.getDateLimitOptions();
+      if (limitStartField) {
+        this.$watch(
+          () => this.getDateLimitLinkedValue(limitStartField),
+          () => {
+            this.initDateLimitPickerOptions();
+          }
+        );
+      }
+      if (limitEndField) {
+        this.$watch(
+          () => this.getDateLimitLinkedValue(limitEndField),
+          () => {
+            this.initDateLimitPickerOptions();
+          }
+        );
+      }
+    },
+    getDateLimitDataSource() {
+      return this.tableParam && this.tableParam.row
+        ? this.tableParam.row
+        : this.formModel;
+    },
+    getDateLimitLinkedValue(fieldName) {
+      if (!fieldName) {
+        return null;
+      }
+      const dataSource = this.getDateLimitDataSource();
+      return dataSource ? dataSource[fieldName] : null;
+    },
+    parseDateLimitValue(val) {
+      if (val === null || val === undefined || val === "") {
+        return null;
+      }
+      const date = new Date(String(val).replace(/-/g, "/"));
+      return isNaN(date.getTime()) ? null : date.getTime();
+    },
+    normalizeDateLimitDayTime(time, isEnd) {
+      const date = new Date(time);
+      if (this.field.options.type === "datetime") {
+        return date.getTime();
+      }
+      date.setHours(isEnd ? 23 : 0, isEnd ? 59 : 0, isEnd ? 59 : 0, isEnd ? 999 : 0);
+      return date.getTime();
+    },
+    isDateLimitDisabled(time) {
+      const options = this.getDateLimitOptions();
+      const currentTime = time.getTime();
+
+      const minDate = this.parseDateLimitValue(options.minDate);
+      if (minDate !== null && currentTime < this.normalizeDateLimitDayTime(minDate, false)) {
+        return true;
+      }
+
+      const maxDate = this.parseDateLimitValue(options.maxDate);
+      if (maxDate !== null && currentTime > this.normalizeDateLimitDayTime(maxDate, true)) {
+        return true;
+      }
+
+      if (options.limitStartField) {
+        const startTime = this.parseDateLimitValue(
+          this.getDateLimitLinkedValue(options.limitStartField)
+        );
+        if (startTime !== null && currentTime < this.normalizeDateLimitDayTime(startTime, false)) {
+          return true;
+        }
+      }
+
+      if (options.limitEndField) {
+        const endTime = this.parseDateLimitValue(
+          this.getDateLimitLinkedValue(options.limitEndField)
+        );
+        if (endTime !== null && currentTime > this.normalizeDateLimitDayTime(endTime, true)) {
+          return true;
+        }
+      }
+
+      return false;
+    },
+    isDateLimitViolated(value) {
+      if (value === null || value === undefined || value === "") {
+        return false;
+      }
+      const currentTime = this.parseDateLimitValue(value);
+      if (currentTime === null) {
+        return false;
+      }
+
+      const options = this.getDateLimitOptions();
+      const minDate = this.parseDateLimitValue(options.minDate);
+      if (minDate !== null && currentTime < this.normalizeDateLimitDayTime(minDate, false)) {
+        return true;
+      }
+
+      const maxDate = this.parseDateLimitValue(options.maxDate);
+      if (maxDate !== null && currentTime > this.normalizeDateLimitDayTime(maxDate, true)) {
+        return true;
+      }
+
+      if (options.limitStartField) {
+        const startTime = this.parseDateLimitValue(
+          this.getDateLimitLinkedValue(options.limitStartField)
+        );
+        if (startTime !== null && currentTime < this.normalizeDateLimitDayTime(startTime, false)) {
+          return true;
+        }
+      }
+
+      if (options.limitEndField) {
+        const endTime = this.parseDateLimitValue(
+          this.getDateLimitLinkedValue(options.limitEndField)
+        );
+        if (endTime !== null && currentTime > this.normalizeDateLimitDayTime(endTime, true)) {
+          return true;
+        }
+      }
+
+      return false;
+    },
+    getDateLimitViolationMessage() {
+      const options = this.getDateLimitOptions();
+      if (options.limitEndField && !options.limitStartField) {
+        return "开始时间不能大于结束时间";
+      }
+      if (options.limitStartField && !options.limitEndField) {
+        return "结束时间不能小于开始时间";
+      }
+      return "日期超出允许范围";
+    },
+  },
+};

package/src/components/xform/form-designer/setting-panel/property-editor/buttonIcon-editor.vue

@@ -1,23 +1,22 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.appendButtonIcon')">
-    <el-input type="text" v-model="optionModel.buttonIcon"></el-input>
+    <icon-picker v-model="optionModel.buttonIcon"></icon-picker>
   </el-form-item>
 </template>
 
 <script>
-  import i18n from "../../../../../components/xform/utils/i18n"
-
-  export default {
-    name: "buttonIcon-editor",
-    mixins: [i18n],
-    props: {
-      designer: Object,
-      selectedWidget: Object,
-      optionModel: Object,
-    },
-  }
+import i18n from "@base/components/xform/utils/i18n";
+import IconPicker from "@base/components/xform/icon-picker/index.vue";
+export default {
+  name: "buttonIcon-editor",
+  components: { IconPicker },
+  mixins: [i18n],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+};
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>

package/src/components/xform/form-designer/setting-panel/property-editor/container-data-table/data-table-editor.vue

@@ -834,6 +834,7 @@ export default {
       this.openWidgetPropertyDialog({
         row: row,
         columnSelectedWidget: selectedWidget,
+        tableColumns: this.optionModel.tableColumns,
         index: index,
         columnEditFields: columnEditFields,
         callback: (columnOption) => {

package/src/components/xform/form-designer/setting-panel/property-editor/container-data-table/edit-tree-button-group-config-dialog.vue

@@ -13,7 +13,7 @@
     @close="handleClose"
   >
     <div class="cont">
-      <el-form label-width="150px" class="edit-tree-button-group-form">
+      <el-form label-width="166px" class="edit-tree-button-group-form">
         <el-form-item label="新增按钮唯一名称">
           <el-input
             v-model="row.rowAddAuthName"

package/src/components/xform/form-designer/setting-panel/property-editor/field-button/icon-editor.vue

@@ -1,23 +1,22 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.buttonIcon')">
-    <el-input type="text" v-model="optionModel.icon"></el-input>
+    <icon-picker v-model="optionModel.icon"></icon-picker>
   </el-form-item>
 </template>
 
 <script>
-  import i18n from "../../../../../../components/xform/utils/i18n"
-
-  export default {
-    name: "icon-editor",
-    mixins: [i18n],
-    props: {
-      designer: Object,
-      selectedWidget: Object,
-      optionModel: Object,
-    },
-  }
+import i18n from "@base/components/xform/utils/i18n";
+import IconPicker from "@base/components/xform/icon-picker/index.vue";
+export default {
+  name: "icon-editor",
+  components: { IconPicker },
+  mixins: [i18n],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+};
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>