cloud-web-corejs 1.0.280 → 1.1.0-dev.4

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

@@ -1,178 +1,178 @@
-/* 日期组件的最小日期支持配置为「当前时间」，此处统一解析。
-   默认值（含「当前时间」与相对偏移）已收敛到 relative-default-mixin，不在此处理。 */
-export const DATE_VALUE_TYPE_NOW = "now";
-
-export default {
-  methods: {
-    getDateLimitOptions() {
-      return this.field.options || {};
-    },
-    isNowDateValueType(valueType) {
-      return valueType === DATE_VALUE_TYPE_NOW;
-    },
-    /* 最小日期：固定日期或当前时间 */
-    getDateLimitMinValue() {
-      const options = this.getDateLimitOptions();
-      if (this.isNowDateValueType(options.minDateType)) {
-        return new Date();
-      }
-      return options.minDate;
-    },
-    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;
-      }
-      if (val instanceof Date) {
-        return isNaN(val.getTime()) ? null : val.getTime();
-      }
-      if (typeof val === "number") {
-        return isNaN(val) ? null : val;
-      }
-      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(this.getDateLimitMinValue());
-      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(this.getDateLimitMinValue());
-      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 "日期超出允许范围";
-    },
-  },
-};
+/* 日期组件的最小日期支持配置为「当前时间」，此处统一解析。
+   默认值（含「当前时间」与相对偏移）已收敛到 relative-default-mixin，不在此处理。 */
+export const DATE_VALUE_TYPE_NOW = "now";
+
+export default {
+  methods: {
+    getDateLimitOptions() {
+      return this.field.options || {};
+    },
+    isNowDateValueType(valueType) {
+      return valueType === DATE_VALUE_TYPE_NOW;
+    },
+    /* 最小日期：固定日期或当前时间 */
+    getDateLimitMinValue() {
+      const options = this.getDateLimitOptions();
+      if (this.isNowDateValueType(options.minDateType)) {
+        return new Date();
+      }
+      return options.minDate;
+    },
+    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;
+      }
+      if (val instanceof Date) {
+        return isNaN(val.getTime()) ? null : val.getTime();
+      }
+      if (typeof val === "number") {
+        return isNaN(val) ? null : val;
+      }
+      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(this.getDateLimitMinValue());
+      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(this.getDateLimitMinValue());
+      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/form-widget/field-widget/mixins/time-limit-mixin.js

@@ -1,77 +1,77 @@
-/* 时间组件的最小时间支持配置为「当前时间」，此处统一解析。
-   默认值（含「当前时间」与相对偏移）已收敛到 relative-default-mixin，不在此处理。 */
-export const TIME_VALUE_TYPE_NOW = "now";
-
-const MAX_TIME_VALUE = "23:59:59";
-
-export default {
-  methods: {
-    getTimeLimitOptions() {
-      return this.field.options || {};
-    },
-    isNowTimeValueType(valueType) {
-      return valueType === TIME_VALUE_TYPE_NOW;
-    },
-    getNowTimeValue() {
-      const now = new Date();
-      const pad = (val) => (val < 10 ? "0" + val : String(val));
-      return `${pad(now.getHours())}:${pad(now.getMinutes())}:${pad(
-        now.getSeconds()
-      )}`;
-    },
-    normalizeTimeValue(val) {
-      if (val === null || val === undefined || val === "") {
-        return null;
-      }
-      const matched = /^(\d{1,2}):(\d{1,2})(?::(\d{1,2}))?$/.exec(String(val).trim());
-      if (!matched) {
-        return null;
-      }
-      const hour = Number(matched[1]);
-      const minute = Number(matched[2]);
-      const second = Number(matched[3] || 0);
-      if (hour > 23 || minute > 59 || second > 59) {
-        return null;
-      }
-      const pad = (v) => (v < 10 ? "0" + v : String(v));
-      return `${pad(hour)}:${pad(minute)}:${pad(second)}`;
-    },
-    parseTimeLimitValue(val) {
-      const normalized = this.normalizeTimeValue(val);
-      if (normalized === null) {
-        return null;
-      }
-      const parts = normalized.split(":");
-      return Number(parts[0]) * 3600 + Number(parts[1]) * 60 + Number(parts[2]);
-    },
-    /* 最小时间：固定时间或当前时间 */
-    getTimeLimitMinValue() {
-      const options = this.getTimeLimitOptions();
-      if (this.isNowTimeValueType(options.minTimeType)) {
-        return this.getNowTimeValue();
-      }
-      return this.normalizeTimeValue(options.minTime);
-    },
-    initTimeLimitPickerOptions() {
-      const pickerOptions = { ...(this.pickerOptions || {}) };
-      const minTime = this.getTimeLimitMinValue();
-      if (minTime === null) {
-        delete pickerOptions.selectableRange;
-      } else {
-        pickerOptions.selectableRange = `${minTime} - ${MAX_TIME_VALUE}`;
-      }
-      this.pickerOptions = pickerOptions;
-    },
-    isTimeLimitViolated(value) {
-      const currentTime = this.parseTimeLimitValue(value);
-      if (currentTime === null) {
-        return false;
-      }
-      const minTime = this.parseTimeLimitValue(this.getTimeLimitMinValue());
-      return minTime !== null && currentTime < minTime;
-    },
-    getTimeLimitViolationMessage() {
-      return `时间不能小于${this.getTimeLimitMinValue()}`;
-    },
-  },
-};
+/* 时间组件的最小时间支持配置为「当前时间」，此处统一解析。
+   默认值（含「当前时间」与相对偏移）已收敛到 relative-default-mixin，不在此处理。 */
+export const TIME_VALUE_TYPE_NOW = "now";
+
+const MAX_TIME_VALUE = "23:59:59";
+
+export default {
+  methods: {
+    getTimeLimitOptions() {
+      return this.field.options || {};
+    },
+    isNowTimeValueType(valueType) {
+      return valueType === TIME_VALUE_TYPE_NOW;
+    },
+    getNowTimeValue() {
+      const now = new Date();
+      const pad = (val) => (val < 10 ? "0" + val : String(val));
+      return `${pad(now.getHours())}:${pad(now.getMinutes())}:${pad(
+        now.getSeconds()
+      )}`;
+    },
+    normalizeTimeValue(val) {
+      if (val === null || val === undefined || val === "") {
+        return null;
+      }
+      const matched = /^(\d{1,2}):(\d{1,2})(?::(\d{1,2}))?$/.exec(String(val).trim());
+      if (!matched) {
+        return null;
+      }
+      const hour = Number(matched[1]);
+      const minute = Number(matched[2]);
+      const second = Number(matched[3] || 0);
+      if (hour > 23 || minute > 59 || second > 59) {
+        return null;
+      }
+      const pad = (v) => (v < 10 ? "0" + v : String(v));
+      return `${pad(hour)}:${pad(minute)}:${pad(second)}`;
+    },
+    parseTimeLimitValue(val) {
+      const normalized = this.normalizeTimeValue(val);
+      if (normalized === null) {
+        return null;
+      }
+      const parts = normalized.split(":");
+      return Number(parts[0]) * 3600 + Number(parts[1]) * 60 + Number(parts[2]);
+    },
+    /* 最小时间：固定时间或当前时间 */
+    getTimeLimitMinValue() {
+      const options = this.getTimeLimitOptions();
+      if (this.isNowTimeValueType(options.minTimeType)) {
+        return this.getNowTimeValue();
+      }
+      return this.normalizeTimeValue(options.minTime);
+    },
+    initTimeLimitPickerOptions() {
+      const pickerOptions = { ...(this.pickerOptions || {}) };
+      const minTime = this.getTimeLimitMinValue();
+      if (minTime === null) {
+        delete pickerOptions.selectableRange;
+      } else {
+        pickerOptions.selectableRange = `${minTime} - ${MAX_TIME_VALUE}`;
+      }
+      this.pickerOptions = pickerOptions;
+    },
+    isTimeLimitViolated(value) {
+      const currentTime = this.parseTimeLimitValue(value);
+      if (currentTime === null) {
+        return false;
+      }
+      const minTime = this.parseTimeLimitValue(this.getTimeLimitMinValue());
+      return minTime !== null && currentTime < minTime;
+    },
+    getTimeLimitViolationMessage() {
+      return `时间不能小于${this.getTimeLimitMinValue()}`;
+    },
+  },
+};

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

@@ -103,6 +103,12 @@ export default {
         targetRef: this.field.options.tableRef || null,
         pageSize: this.field.options.exportPageSize || null,
         showImageAtTable: this.field.options.showImageAtTable || null,
+        // 明细导出的列 / 脚本编码 / 取数参数三项各自独立：按钮上维护了哪项就以哪项为准，
+        // 留空的那项沿用数据表格属性上那套。参数脚本原样下发，由数据表格求值（this 是
+        // 表格组件，与配在表格属性上时同义）
+        exportItemColumns: this.field.options.exportItemColumns || null,
+        exportItemScriptCode: this.field.options.exportItemScriptCode || null,
+        exportItemParam: this.field.options.exportItemParam || null,
       };
       let tableExportParam = this.handleCustomEvent(this.field.options.tableExportParam);
       let options = { ...opt, ...tableExportParam, type: type };