cnhis-design-vue 3.1.14-beta.14 → 3.1.14-beta.17

package/es/packages/big-table/src/bigTableProps.d.ts

@@ -7,6 +7,10 @@ declare const bigTableProps: {
         type: NumberConstructor;
         default: number;
     };
+    checkboxBindRowClick: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     showFooter: BooleanConstructor;
     sumData: {
         type: ObjectConstructor;

package/es/packages/big-table/src/bigTableProps.js

@@ -1,6 +1,7 @@
 const bigTableProps = {
   data: { type: Array, default: () => [] },
   maxCheckSize: { type: Number, default: 0 },
+  checkboxBindRowClick: { type: Boolean, default: true },
   showFooter: Boolean,
   sumData: { type: Object, default: () => ({}) },
   avgData: { type: Object, default: () => ({}) },

package/es/packages/big-table/src/components/edit-form/edit-date.js

@@ -1,4 +1,5 @@
 import { defineComponent, createVNode, mergeProps } from 'vue';
+import { isFunction } from 'lodash-es';
 import { NDatePicker } from 'naive-ui';
 
 var EditDate = defineComponent({
@@ -94,16 +95,23 @@ var EditDate = defineComponent({
         }
       };
     };
+    function customDateDisabledDecorator(customDateDisabled) {
+      if (!isFunction(customDateDisabled))
+        return null;
+      return (ts) => {
+        return customDateDisabled(ts, props.row);
+      };
+    }
     const config = {
-      type: props.col.type || "datetime",
+      type: props.col.type || props.col.dateType || "datetime",
       clearable: props.col.clearable || true,
       disabled: props.col.disabled || false,
       valueFormat: props.col.valueFormat || "yyyy-MM-dd HH:mm:ss",
-      isDateDisabled: props.col.isDateDisabled || isDateDisabled,
+      isDateDisabled: customDateDisabledDecorator(props.col.isDateDisabled) || isDateDisabled,
       placeholder: props.col.placeholder || "\u8BF7\u9009\u62E9"
     };
     if (config.type.includes("time")) {
-      config.isTimeDisabled = props.col.isTimeDisabled || isTimeDisabled;
+      config.isTimeDisabled = customDateDisabledDecorator(props.col.isTimeDisabled) || isTimeDisabled;
     }
     return () => createVNode(NDatePicker, mergeProps(attrs, config, {
       "onUpdateFormattedValue": onConfirm

package/es/packages/big-table/src/components/edit-form/edit-input.js

@@ -1,4 +1,4 @@
-import { defineComponent, createVNode, mergeProps } from 'vue';
+import { defineComponent, ref, createVNode, mergeProps } from 'vue';
 import { NInput, NInputNumber } from 'naive-ui';
 
 var EditInput = defineComponent({
@@ -29,9 +29,9 @@ var EditInput = defineComponent({
   emits: ["formChange"],
   setup(props, {
     attrs,
-    slots,
     emit
   }) {
+    const __value = ref(attrs.value);
     const onUpdateValue = (value) => {
       emit("formChange", {
         value,
@@ -40,11 +40,22 @@ var EditInput = defineComponent({
         index: props.index
       });
     };
+    function onBlur() {
+      emit("formChange", {
+        value: __value.value,
+        row: props.row,
+        column: props.col,
+        index: props.index
+      });
+    }
     const config = {
-      placeholder: props.col.placeholder || "\u8BF7\u8F93\u5165"
+      placeholder: props.col.placeholder || "\u8BF7\u8F93\u5165",
+      ...props.col.componentProps || {}
     };
     return () => props.type === "input" ? createVNode(NInput, mergeProps(attrs, config, {
-      "onUpdateValue": onUpdateValue
+      "value": __value.value,
+      "onUpdate:value": ($event) => __value.value = $event,
+      "onBlur": onBlur
     }), null) : createVNode(NInputNumber, mergeProps(attrs, config, {
       "onUpdateValue": onUpdateValue
     }), null);

package/es/packages/big-table/src/components/edit-form/edit-time.d.ts

@@ -0,0 +1,43 @@
+declare const _default: import("vue").DefineComponent<{
+    type: {
+        type: StringConstructor;
+        default: string;
+    };
+    col: {
+        type: ObjectConstructor;
+        default: () => {};
+    };
+    row: {
+        type: ObjectConstructor;
+        default: () => {};
+    };
+    index: {
+        type: (NumberConstructor | ObjectConstructor)[];
+        default: number;
+    };
+}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "formChange"[], "formChange", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    type: {
+        type: StringConstructor;
+        default: string;
+    };
+    col: {
+        type: ObjectConstructor;
+        default: () => {};
+    };
+    row: {
+        type: ObjectConstructor;
+        default: () => {};
+    };
+    index: {
+        type: (NumberConstructor | ObjectConstructor)[];
+        default: number;
+    };
+}>> & {
+    onFormChange?: ((...args: any[]) => any) | undefined;
+}, {
+    type: string;
+    col: Record<string, any>;
+    row: Record<string, any>;
+    index: number | Record<string, any>;
+}>;
+export default _default;

package/es/packages/big-table/src/components/edit-form/edit-time.js

@@ -0,0 +1,52 @@
+import { defineComponent, createVNode, mergeProps } from 'vue';
+import { NTimePicker } from 'naive-ui';
+
+var editTime = defineComponent({
+  name: "EditTime",
+  inheritAttrs: false,
+  components: {
+    NTimePicker
+  },
+  props: {
+    type: {
+      type: String,
+      default: "input"
+    },
+    col: {
+      type: Object,
+      default: () => ({})
+    },
+    row: {
+      type: Object,
+      default: () => ({})
+    },
+    index: {
+      type: [Number, Object],
+      default: 0
+    }
+  },
+  emits: ["formChange"],
+  setup(props, {
+    attrs,
+    emit
+  }) {
+    const onUpdateValue = (value) => {
+      emit("formChange", {
+        value,
+        row: props.row,
+        column: props.col,
+        index: props.index
+      });
+    };
+    const config = {
+      placeholder: props.col.placeholder || "\u8BF7\u9009\u62E9",
+      valueFormat: props.col.valueFormat || "HH:mm",
+      ...props.col.componentProps || {}
+    };
+    return () => createVNode(NTimePicker, mergeProps(attrs, config, {
+      "onUpdateValue": onUpdateValue
+    }), null);
+  }
+});
+
+export { editTime as default };

package/es/packages/big-table/src/hooks/useColumnConfigAdaptor.js

@@ -1,4 +1,5 @@
-import { isObject, cloneDeep, isString, isFunction, isArray } from 'lodash-es';
+import { cloneDeep, isString, isFunction, isArray } from 'lodash-es';
+import { isObject } from '@vue/shared';
 
 const REMOVE_PROPERTY = Symbol("remove property");
 function useColumnConfigAdaptor() {
@@ -23,21 +24,59 @@ function useColumnConfigAdaptor() {
         ["1", 1]
       ]);
       const htmlTypeValueMap = new Map([
-        ...["RADIO", "RADIO_BLOCK", "CHECKBOX", "CHECKBOX_BLOCK", "SELECT"].map((type) => [type, "select"]),
+        ...["RADIO", "RADIO_BLOCK", "CHECKBOX", "CHECKBOX_BLOCK", "SELECT", "SWITCH_COMPONENT"].map((type) => [
+          type,
+          "select"
+        ]),
         ...["INPUT"].map((type) => [type, "input"]),
         ...["DIGITAL"].map((type) => [type, "number"])
       ]);
-      const settingMap = /* @__PURE__ */ new Map([
-        ["multi_select_value", { property: "multiple", valueMap: multipleValueMap }],
-        [
-          "is_null",
-          (value, result, _fieldItem, _editRules) => {
-            if (value === "0")
-              return;
-            if (value === "1")
-              _editRules[_fieldItem.elementId] = [{ required: true, message: "\u5FC5\u586B" }];
+      const isNullHandler = (value, result, _fieldItem, _editRules) => {
+        if (value === "1")
+          return;
+        if (value === "0")
+          _editRules[_fieldItem.val_key] = [{ required: true, message: "\u5FC5\u586B" }];
+      };
+      const validateHandler = (value, result) => {
+        if (!isObject(value))
+          return;
+        result.componentProps = Object.assign({}, result.comonentProps, {
+          maxlength: value.max_length,
+          minlength: value.min_length,
+          max: value.max_value,
+          min: value.min_value,
+          precision: value.decimal_length
+        });
+      };
+      const dateRangeValidate = (value, result) => {
+        if (!isObject(value))
+          return;
+        result.isDateDisabled = (ts, row) => {
+          if (!isObject(row))
+            return;
+          const { startDate, endDate } = value;
+          let invalid = false;
+          if (startDate) {
+            invalid = new Date(row[startDate]).getTime() > ts;
           }
-        ],
+          if (endDate) {
+            invalid = invalid || new Date(row[endDate]).getTime() < ts;
+          }
+          return invalid;
+        };
+      };
+      const switchOptionHandler = (value, result) => {
+        if (!isObject(value))
+          return;
+        const option = { label: value.describe, ...value };
+        result.options = isArray(result.options) ? [...result.options, option] : [option];
+      };
+      const settingMap = new Map([
+        ["multi_select_value", { property: "multiple", valueMap: multipleValueMap }],
+        ["is_null", isNullHandler],
+        ["validate", validateHandler],
+        ["dateValidate", dateRangeValidate],
+        ...["open", "close"].map((key) => [key, switchOptionHandler]),
         ["is_edit", { property: "isEdit", valueMap: isEditValueMap }],
         ["html_type", { property: "formType", valueMap: htmlTypeValueMap }],
         ["option", { property: "options", fieldMap: /* @__PURE__ */ new Map([["text", "label"]]) }]

package/es/packages/big-table/src/hooks/useEdit.d.ts

@@ -150,6 +150,48 @@ export declare const comps: {
         row: Record<string, any>;
         index: number | Record<string, any>;
     }>;
+    time: import("vue").DefineComponent<{
+        type: {
+            type: StringConstructor;
+            default: string;
+        };
+        col: {
+            type: ObjectConstructor;
+            default: () => {};
+        };
+        row: {
+            type: ObjectConstructor;
+            default: () => {};
+        };
+        index: {
+            type: (NumberConstructor | ObjectConstructor)[];
+            default: number;
+        };
+    }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "formChange"[], "formChange", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+        type: {
+            type: StringConstructor;
+            default: string;
+        };
+        col: {
+            type: ObjectConstructor;
+            default: () => {};
+        };
+        row: {
+            type: ObjectConstructor;
+            default: () => {};
+        };
+        index: {
+            type: (NumberConstructor | ObjectConstructor)[];
+            default: number;
+        };
+    }>> & {
+        onFormChange?: ((...args: any[]) => any) | undefined;
+    }, {
+        type: string;
+        col: Record<string, any>;
+        row: Record<string, any>;
+        index: number | Record<string, any>;
+    }>;
     separate: import("vue").DefineComponent<{
         col: {
             type: import("vue").PropType<import("../../../../src/types").AnyObject>;

package/es/packages/big-table/src/hooks/useEdit.js

@@ -1,3 +1,4 @@
+import EditTime from '../../../../packages/big-table/src/components/edit-form/edit-time';
 import EditInput from '../components/edit-form/edit-input.js';
 import EditSelect from '../components/edit-form/edit-select.js';
 import EditDate from '../components/edit-form/edit-date.js';
@@ -8,6 +9,7 @@ const comps = {
   number: EditInput,
   select: EditSelect,
   date: EditDate,
+  time: EditTime,
   separate: EditSeparate
 };
 const useEdit = (props, state, emit, xGrid) => {

package/es/packages/big-table/src/hooks/useFormat.js

@@ -133,7 +133,14 @@ const useFormat = (state) => {
                 item[key] = temp.change_text;
               } else {
                 if (temp.background != "#ffffff") {
-                  item[key] = `<span class="field-span" style="color:${temp.background}"><span class="${temp.icon}"></span>${temp.change_text || ""}</span>`;
+                  const reg = /^#?([a-fA-F0-9]{6}|[a-fA-F0-9]{3})$/;
+                  let color = temp.background;
+                  let iconHtml = `<span class="${temp.icon}"></span>`;
+                  if (reg.test(temp.icon)) {
+                    color = temp.icon;
+                    iconHtml = `<span class="icon-dot-custom" style="--table-icon-color:${temp.icon};--table-icon-shadow:${temp.icon}80"></span>`;
+                  }
+                  item[key] = `<span class="field-span" style="color:${color}">${iconHtml}${temp.change_text || ""}</span>`;
                 } else {
                   item[key] = temp.change_text;
                 }

package/es/packages/big-table/src/utils.js

@@ -599,6 +599,7 @@ const setTableConfig = (config, state) => {
   state.openOnly = config.openOnly;
   state.isExpand = config.spreadAllBtn;
   state.levelLazyLoadSetting = Object.assign({}, config.levelLazyLoadSetting);
+  state.checkWidth = Object.assign({}, state.checkWidth, config.checkWidth);
 };
 const setTreeGroupTitle = (formatList, key, GROUP_TITLE_KEY) => {
   formatList.forEach((row) => {

package/es/packages/big-table/style/index.css

@@ -396,6 +396,17 @@ body > .vxe-table--tooltip-wrapper {
   height: var(--tableImageHeight);
   width: var(--tableImageWidth);
 }
+.custom-big-table .domPropsInnerHTML-span .icon-dot-custom {
+  width: 8px;
+  height: 8px;
+  -webkit-border-radius: 50%;
+  -moz-border-radius: 50%;
+  border-radius: 50%;
+  background: var(--table-icon-color);
+  display: inline-block;
+  margin-right: 6px;
+  box-shadow: 0px 2px 4px 0px var(--table-icon-shadow);
+}
 .custom-big-table .domPropsInnerHTML-span .icon-dot-red {
   width: 8px;
   height: 8px;

package/es/packages/button-print/src/utils/print.d.ts

@@ -3,7 +3,7 @@ export declare class Print {
     private readonly webview;
     private currentMessageHandler?;
     constructor();
-    private readonly messageHandlerStack;
+    private readonly messageHandlerQueue;
     private messageHandler;
     private postMessage;
     destroy(): void;

package/es/packages/button-print/src/utils/print.js

@@ -13,7 +13,7 @@ const testHttpFn = axios.create({
 const httpFn = axios.create({ withCredentials: false });
 class Print {
   constructor() {
-    this.messageHandlerStack = [];
+    this.messageHandlerQueue = [];
     var _a;
     const _window = window;
     this.webview = (_a = _window.chrome) == null ? void 0 : _a.webview;
@@ -23,13 +23,13 @@ class Print {
     this.webview.addEventListener("message", this.currentMessageHandler);
   }
   messageHandler(e) {
-    const handler = this.messageHandlerStack.pop();
+    const handler = this.messageHandlerQueue.pop();
     if (!handler)
       return console.log("\u5F53\u524D\u56DE\u6267", e, "\u6CA1\u6709\u53EF\u7528\u7684handler");
     const { resolve, reject } = handler;
     try {
       console.log(e);
-      resolve(JSON.parse(e.data));
+      resolve(JSON.parse(e.data.res));
     } catch (e2) {
       reject(e2);
     }
@@ -38,7 +38,7 @@ class Print {
     if (!this.webview)
       return Promise.reject();
     return new Promise((resolve, reject) => {
-      this.messageHandlerStack.push({ resolve, reject });
+      this.messageHandlerQueue.push({ resolve, reject });
       this.webview.postMessage(data);
     });
   }

package/es/packages/form-render/index.d.ts

@@ -408,7 +408,6 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
         title: string;
     }[]>;
     formHeight: import("vue").ComputedRef<any>;
-    scrollTo: (id: string) => Promise<void>;
     onScroll: () => void;
     queryWidget: (key: string, wrapperElement: HTMLElement, fieldList: import("./src/types").FieldItem[]) => Promise<{
         widgetElement: HTMLInputElement | null | undefined;

package/es/packages/form-render/src/FormRender.js

@@ -74,7 +74,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
       return { type: "object", properties: {} };
     });
-    const { currentAnchor, scrollbarRef, generateAnchorList, anchorIdList, formHeight, scrollTo, onScroll } = useAnchor(props, formItemDepsCollector);
+    const { currentAnchor, scrollbarRef, generateAnchorList, anchorIdList, formHeight, onScroll } = useAnchor(props, formItemDepsCollector);
     watch(parsedSchema, generateAnchorList, { immediate: true });
     async function queryWidget(key, wrapperElement, fieldList) {
       if (!scrollbarRef.value)
@@ -111,7 +111,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         formModel.setFieldState(path, handler);
       },
       resetFields(path = "*") {
-        formModel.setFieldState(path, async (field) => {
+        formModel.setFieldState(path, (field) => {
           var _a;
           if (isField(field)) {
             field.modified = false;

package/es/packages/form-render/src/FormRender.vue.d.ts

@@ -408,7 +408,6 @@ declare const _default: import("vue").DefineComponent<{
         title: string;
     }[]>;
     formHeight: import("vue").ComputedRef<any>;
-    scrollTo: (id: string) => Promise<void>;
     onScroll: () => void;
     queryWidget: (key: string, wrapperElement: HTMLElement, fieldList: FieldItem[]) => Promise<{
         widgetElement: HTMLInputElement | null | undefined;

package/es/packages/form-render/src/components/renderer/cascader.d.ts

@@ -6,11 +6,11 @@ declare type DependKeyObj = {
     paramValue: string;
 };
 declare type UrlConfig = {
-    method: FormRequestType;
-    nameKey: string;
-    dependKey: ArrayAble<string> | Record<string, string> | ArrayAble<DependKeyObj>;
+    method?: FormRequestType;
+    nameKey?: string;
+    valueKey?: string;
+    dependKey?: ArrayAble<string> | Record<string, string> | ArrayAble<DependKeyObj>;
     url: string;
-    valueKey: string;
 };
 export declare const SEARCH_CASCADE: import("vue").DefineComponent<{
     options: {

package/es/packages/form-render/src/components/renderer/cascader.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, inject, computed, watch, createVNode } from 'vue';
+import { defineComponent, ref, computed, inject, watch, createVNode } from 'vue';
 import { isField } from '@formily/core';
 import { isEqual } from 'lodash-es';
 import { InjectAsyncQueue } from '../../constants/index.js';
@@ -32,18 +32,43 @@ const script = defineComponent({
     slots,
     emit
   }) {
-    const remoteOptions = ref(null);
-    const asyncQueue = inject(InjectAsyncQueue);
+    const remoteOptions = ref();
     const {
       field,
       title
     } = useFormField();
+    const labelKey = computed(() => {
+      var _a, _b;
+      return (_b = (_a = props.urlConfig) == null ? void 0 : _a.nameKey) != null ? _b : "text";
+    });
+    const valueKey = computed(() => {
+      var _a, _b;
+      return (_b = (_a = props.urlConfig) == null ? void 0 : _a.valueKey) != null ? _b : "value";
+    });
+    const _value = computed(() => {
+      try {
+        const parsed = Array.isArray(props.value) ? props.value : JSON.parse(props.value || "");
+        if (!Array.isArray(parsed) || !parsed.length)
+          return null;
+        return parsed.map((option) => option[labelKey.value]).join(" / ");
+      } catch (e) {
+        return null;
+      }
+    });
+    function updateValue(_, __, options) {
+      emit("update:value", options.map(optionSimplify));
+      function optionSimplify(option) {
+        return {
+          ...option,
+          label: option[labelKey.value],
+          children: void 0,
+          parent: void 0
+        };
+      }
+    }
+    const asyncQueue = inject(InjectAsyncQueue);
     async function fetchData(option) {
-      if (!option && remoteOptions.value)
-        return;
-      if (!configFor(props))
-        return;
-      if (deepFor(option) + 1 >= deepFor(props))
+      if (notNeedToFetchData(props, option))
         return;
       const data = await asyncQueue.addAsync(createRequestParams(deepFor(option), configFor(props), title.value, option));
       if (!data.length && option) {
@@ -54,6 +79,9 @@ const script = defineComponent({
       }
       const result = data.map((item) => optionNormalize(item, deepFor(option)));
       option ? option.children = result : remoteOptions.value = result;
+      function notNeedToFetchData(props2, option2) {
+        return !configFor(props2) || !option2 && remoteOptions.value || deepFor(option2) >= deepFor(props2) - 1;
+      }
       function createRequestParams(deep, config, key, option2) {
         const params = {
           lvlnr: deep + 1 + ""
@@ -95,9 +123,6 @@ const script = defineComponent({
         return (_a = target == null ? void 0 : target.depth) != null ? _a : -1;
       }
     }
-    const parsedOptions = computed(() => {
-      return remoteOptions.value || props.options || [];
-    });
     watch(() => props.value, (n, o) => {
       var _a, _b;
       n != null && o == null && fetchData();
@@ -111,40 +136,14 @@ const script = defineComponent({
       remoteOptions.value = null;
       await fetchData();
     });
-    const labelKey = computed(() => {
-      var _a, _b;
-      return (_b = (_a = props.urlConfig) == null ? void 0 : _a.nameKey) != null ? _b : "text";
-    });
-    const valueKey = computed(() => {
-      var _a, _b;
-      return (_b = (_a = props.urlConfig) == null ? void 0 : _a.valueKey) != null ? _b : "value";
-    });
-    const _value = computed(() => {
-      try {
-        const parsed = Array.isArray(props.value) ? props.value : JSON.parse(props.value || "");
-        if (!Array.isArray(parsed) || !parsed.length)
-          return null;
-        return parsed.map((option) => option[labelKey.value]).join(" / ");
-      } catch (e) {
-        return null;
-      }
-    });
-    function updateValue(_, __, options) {
-      emit("update:value", options.map(optionSimplify));
-      function optionSimplify(option) {
-        return {
-          ...option,
-          label: option[labelKey.value],
-          children: void 0,
-          parent: void 0
-        };
-      }
-    }
     const show = ref(false);
     function updateShow(v) {
       show.value = !!v;
       v && fetchData();
     }
+    const parsedOptions = computed(() => {
+      return remoteOptions.value || props.options || [];
+    });
     function focusDecorator(onFocus) {
       return (...args) => {
         if (isField(field.value)) {
@@ -155,17 +154,17 @@ const script = defineComponent({
     }
     return () => {
       return createVNode(NCascader, {
-        "value": _value.value,
+        "remote": true,
+        "checkStrategy": "child",
         "show": !!show.value,
+        "onUpdate:show": updateShow,
+        "value": _value.value,
         "onUpdate:value": updateValue,
-        "remote": true,
         "labelField": labelKey.value,
         "valueField": valueKey.value,
         "options": parsedOptions.value,
-        "checkStrategy": "child",
         "onLoad": fetchData,
-        "onFocus": focusDecorator(props.onFocus),
-        "onUpdate:show": updateShow
+        "onFocus": focusDecorator(props.onFocus)
       }, slots);
     };
   }

package/es/packages/form-render/src/components/renderer/combination.d.ts

@@ -8,6 +8,9 @@ export declare const COMBINATION: import("vue").DefineComponent<{
     value: {
         type: StringConstructor;
     };
+    maxGroupNum: {
+        type: NumberConstructor;
+    };
     getProperties: {
         type: PropType<() => FieldItem[]>;
         default: () => never[];
@@ -20,6 +23,9 @@ export declare const COMBINATION: import("vue").DefineComponent<{
     value: {
         type: StringConstructor;
     };
+    maxGroupNum: {
+        type: NumberConstructor;
+    };
     getProperties: {
         type: PropType<() => FieldItem[]>;
         default: () => never[];