cnhis-design-vue 3.1.17-beta.6 → 3.1.17-beta.7

package/es/packages/big-table/index.d.ts

@@ -2941,6 +2941,12 @@ declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
         } | null;
         showOverflow: boolean;
     })[];
+    getRowData: (row: import("../../../es/src/types").AnyObject) => {
+        separateData: Record<string, string>;
+        index: number;
+        rawRow: import("../../../es/src/types").AnyObject;
+        row: import("../../../es/src/types").AnyObject;
+    } | undefined;
     formatterEdit: (params: any, col: any) => any;
     getEditBtn: (row: any, col: any, index: any) => any;
     formatter: (params: any, col: any, _isEdit: any) => any;

package/es/packages/big-table/src/BigTable.vue.d.ts

@@ -1126,12 +1126,7 @@ declare const _default: import("vue").DefineComponent<{
                 textColorGhostHoverWarning: string;
                 textColorGhostPressedWarning: string;
                 textColorGhostFocusWarning: string;
-                textColorGhostDisabledWarning: string; /**
-                 * 判断是否渲染EditForm
-                 * @param {*} row
-                 * @param {*} column
-                 * @returns
-                 */
+                textColorGhostDisabledWarning: string;
                 borderWarning: string;
                 borderHoverWarning: string;
                 borderPressedWarning: string;
@@ -1158,7 +1153,14 @@ declare const _default: import("vue").DefineComponent<{
                 textColorGhostPressedError: string;
                 textColorGhostFocusError: string;
                 textColorGhostDisabledError: string;
-                borderError: string;
+                borderError: string; /**
+                 * 初始化props
+                 * @param {*} unionItem
+                 * @param {*} row
+                 * @param {*} column
+                 * @param {*} $rowIndex
+                 * @returns
+                 */
                 borderHoverError: string;
                 borderPressedError: string;
                 borderFocusError: string;
@@ -1210,6 +1212,10 @@ declare const _default: import("vue").DefineComponent<{
                 colorTertiaryPressed: string;
                 colorQuaternary: string;
                 colorQuaternaryHover: string;
+                /**
+                 * 单个form提交成功数据
+                 * @param {*} obj formData
+                 */
                 colorQuaternaryPressed: string;
                 color: string;
                 colorHover: string;
@@ -2945,6 +2951,12 @@ declare const _default: import("vue").DefineComponent<{
         } | null;
         showOverflow: boolean;
     })[];
+    getRowData: (row: import("../../../src/types").AnyObject) => {
+        separateData: Record<string, string>;
+        index: number;
+        rawRow: import("../../../src/types").AnyObject;
+        row: import("../../../src/types").AnyObject;
+    } | undefined;
     formatterEdit: (params: any, col: any) => any;
     getEditBtn: (row: any, col: any, index: any) => any;
     formatter: (params: any, col: any, _isEdit: any) => any;
@@ -3287,7 +3299,22 @@ declare const _default: import("vue").DefineComponent<{
                 errorColor: string;
                 errorColorHover: string;
                 errorColorPressed: string;
-                errorColorSuppl: string;
+                errorColorSuppl: string; /**
+                 * 针对 bigTable 的设置列
+                 * type: 列的类型
+                 * field: 列字段名（注：属性层级越深，渲染性能将直线下降）
+                 * title: 列标题（支持开启国际化）
+                 * width: 列宽度（如果为空则均匀分配剩余宽度，如果全部列固定了，可能会存在宽屏下不会铺满，可以配合 "%" 或者 "min-width" 布局）
+                 * minWidth: 最小列宽度；会自动将剩余空间按比例分配
+                 * resizable: 列是否允许拖动列宽调整大小
+                 * visible: 列是否显示
+                 * fixed: 将列固定在左侧或者右侧（注意：固定列应该放在左右两侧的位置）
+                 * align: 列对齐方式
+                 * headerAlign: 表头列的对齐方式
+                 * footerAlign: 表尾列的对齐方式
+                 * formatter: 格式化显示内容 Function({cellValue, row, column})
+                 * sortable: 是否允许列排序
+                 */
                 textColorBase: string;
                 textColor1: string;
                 textColor2: string;

package/es/packages/big-table/src/BigTable.vue_vue_type_script_setup_true_lang.js

@@ -19,7 +19,7 @@ import { useBatchEditing } from './hooks/useBatchEditing.js';
 import { useNestTable } from './hooks/useNestTable.js';
 import { useAnchor } from './hooks/useAnchor.js';
 import { useEvent } from './hooks/useEvent.js';
-import { useSeparateRow } from './hooks/useSeparateRow.js';
+import { useSeparateRow, useSeparateMap } from './hooks/useSeparateRow.js';
 import { useFormat } from './hooks/useFormat.js';
 import { useTableParse } from './hooks/useTableParse.js';
 import { useEdit, comps } from './hooks/useEdit.js';
@@ -506,7 +506,11 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       state.columnLen = currentColumns.filter((item) => item.visible).length;
       return columns;
     };
+    const {
+      getRowData
+    } = useSeparateMap();
     const formatterEdit = (params, col) => {
+      var _a, _b;
       let {
         row,
         column,
@@ -526,7 +530,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       const propsData = {
         col,
         row,
-        index: $rowIndex,
+        index: (_b = (_a = getRowData(row)) == null ? void 0 : _a.index) != null ? _b : $rowIndex,
         type: formType,
         ...col.componentProps || {},
         onFormChange,

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

@@ -24,32 +24,33 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     watch(show, updateShow);
     const editContent = ref();
     const { getRowData } = useSeparateMap();
-    async function updateShow(show2) {
+    async function onShow(target) {
       var _a;
-      const target = getRowData(props.row);
       if (!target)
         return;
-      if (show2) {
-        editContent.value = cloneDeep(target.row[props.col.field]);
-        await new Promise((resolve) => setTimeout(resolve));
-        (_a = popoverRef.value) == null ? void 0 : _a.syncPosition();
-        return;
-      }
-      const old = target.row[props.col.field];
+      editContent.value = cloneDeep(target.row[props.col.field]);
+      await new Promise((resolve) => setTimeout(resolve));
+      (_a = popoverRef.value) == null ? void 0 : _a.syncPosition();
+      return;
+    }
+    async function onClose(target) {
       if (!target)
         return;
+      const old = target.row[props.col.field];
       if (!isObject(editContent.value) && !isArray(editContent.value)) {
         if (old === editContent.value)
           return;
       }
-      target.rawRow[props.col.field] = editContent.value;
       emit("formChange", {
         value: editContent.value,
-        row: target.row,
+        row: props.row,
         column: props.col,
         index: target.index
       });
     }
+    function updateShow(show2) {
+      show2 ? onShow(getRowData(props.row)) : onClose(getRowData(props.row));
+    }
     const style = {
       border: "1px solid #f5f5f5",
       padding: "4px 0 4px 4px",

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

@@ -41,7 +41,19 @@ declare const _default: import("vue").DefineComponent<{
         rawRow: AnyObject;
         row: AnyObject;
     } | undefined;
-    updateShow: (show: boolean) => Promise<void>;
+    onShow: (target: {
+        separateData: Record<string, string>;
+        index: number;
+        rawRow: AnyObject;
+        row: AnyObject;
+    } | undefined) => Promise<void>;
+    onClose: (target: {
+        separateData: Record<string, string>;
+        index: number;
+        rawRow: AnyObject;
+        row: AnyObject;
+    } | undefined) => Promise<void>;
+    updateShow: (show: boolean) => void;
     style: CSSProperties;
     SlotRender: import("vue").DefineComponent<{
         renderer: {

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

@@ -233,7 +233,19 @@ export declare const comps: {
             rawRow: import("../../../../src/types").AnyObject;
             row: import("../../../../src/types").AnyObject;
         } | undefined;
-        updateShow: (show: boolean) => Promise<void>;
+        onShow: (target: {
+            separateData: Record<string, string>;
+            index: number;
+            rawRow: import("../../../../src/types").AnyObject;
+            row: import("../../../../src/types").AnyObject;
+        } | undefined) => Promise<void>;
+        onClose: (target: {
+            separateData: Record<string, string>;
+            index: number;
+            rawRow: import("../../../../src/types").AnyObject;
+            row: import("../../../../src/types").AnyObject;
+        } | undefined) => Promise<void>;
+        updateShow: (show: boolean) => void;
         style: import("vue").CSSProperties;
         SlotRender: import("vue").DefineComponent<{
             renderer: {

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

@@ -1,5 +1,13 @@
+import { Func } from '../../../../../../es/src/types';
+import { PropType } from 'vue';
 export declare const INPUT_NUMBER: import("vue").DefineComponent<{
-    onChange: {};
+    value: {
+        type: (NumberConstructor | StringConstructor)[];
+    };
+    onChange: {
+        type: PropType<Func<any[], any>>;
+        required: true;
+    };
     prefix: {
         type: StringConstructor;
     };
@@ -7,7 +15,13 @@ export declare const INPUT_NUMBER: import("vue").DefineComponent<{
         type: StringConstructor;
     };
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
-    onChange: {};
+    value: {
+        type: (NumberConstructor | StringConstructor)[];
+    };
+    onChange: {
+        type: PropType<Func<any[], any>>;
+        required: true;
+    };
     prefix: {
         type: StringConstructor;
     };

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

@@ -1,12 +1,20 @@
-import { defineComponent, createVNode } from 'vue';
-import { createInputSlot } from '../../utils/index.js';
+import { defineComponent, watch, computed, createVNode } from 'vue';
+import { isString, isNumber } from 'lodash-es';
+import { useCommonInjection } from '../../../../../packages/form-render/src/hooks/useCommonInjection';
+import { createInputSlot, parseNumberFromMaybeString } from '../../utils/index.js';
 import { connect, mapProps } from '@formily/vue';
 import { NInputNumber } from 'naive-ui';
 import { assignUpdateValue } from '../../utils/schema.js';
 
 const script = defineComponent({
   props: {
-    onChange: {},
+    value: {
+      type: [Number, String]
+    },
+    onChange: {
+      type: Function,
+      required: true
+    },
     prefix: {
       type: String
     },
@@ -16,8 +24,27 @@ const script = defineComponent({
   },
   setup(props) {
     const _slots = createInputSlot(props);
+    useCommonInjection().injectValueValidate(() => props.value);
+    watch(() => props.value, (value) => {
+      if (value == null)
+        return;
+      if (!isString(value) && !isNumber(value) || Number.isNaN(+value))
+        return props.onChange(null);
+      props.onChange(+value);
+    });
+    const valueRef = computed({
+      get: () => parseNumberFromMaybeString(props.value),
+      set: (v) => {
+        var _a;
+        return (_a = props.onChange) == null ? void 0 : _a.call(props, v);
+      }
+    });
     return () => {
-      return createVNode(NInputNumber, null, _slots.value);
+      return createVNode(NInputNumber, {
+        "value": valueRef.value,
+        "onUpdate:value": ($event) => valueRef.value = $event,
+        "show-button": false
+      }, _slots.value);
     };
   }
 });

package/es/packages/form-render/src/hooks/useCommonInjection.js

@@ -7,7 +7,10 @@ function useCommonInjection() {
     const { field } = useFormField();
     watch(traverser, () => {
       var _a, _b;
-      return isField(field.value) && field.value.visited && ((_b = (_a = field.value).validate) == null ? void 0 : _b.call(_a));
+      try {
+        isField(field.value) && field.value.visited && ((_b = (_a = field.value).validate) == null ? void 0 : _b.call(_a));
+      } catch (e) {
+      }
     });
   }
   function injectValueWatchFromEmpty(traverser, trigger) {

package/es/packages/form-render/src/hooks/useFieldListAdaptor.js

@@ -20,9 +20,9 @@ function useFieldListAdaptor(collector) {
         clearable: item.is_empty === "0",
         ...item.componentProps || {},
         onBlur(...args) {
-          var _a2;
+          var _a2, _b;
           collector.trigger(item.val_key, "blur");
-          (_a2 = item.componentProps) == null ? void 0 : _a2.onBlur(...args);
+          (_b = (_a2 = item.componentProps) == null ? void 0 : _a2.onBlur) == null ? void 0 : _b.call(_a2, ...args);
         }
       },
       "x-display": item.is_show === "0" ? "hidden" : "visible",
@@ -122,8 +122,6 @@ function useFieldListAdaptor(collector) {
     const { decimal_length, validate } = item;
     Object.assign(schema["x-component-props"], {
       precision: decimal_length || (validate == null ? void 0 : validate.decimal_length),
-      max: validate == null ? void 0 : validate.max_value,
-      min: validate == null ? void 0 : validate.min_value,
       prefix: item.prefix,
       suffix: item.suffix
     });

package/es/packages/form-render/src/hooks/useFormValidator.js

@@ -13,6 +13,8 @@ function useFormValidator() {
       ({ validate }) => ({
         validator(value) {
           var _a;
+          if (value == null)
+            return;
           if (!isString(value) || !isIdCard(value))
             return (_a = validate == null ? void 0 : validate.message) != null ? _a : "\u8BE5\u5B57\u6BB5\u4E0D\u662F\u5408\u6CD5\u7684\u8EAB\u4EFD\u8BC1\u683C\u5F0F";
         }
@@ -28,20 +30,33 @@ function useFormValidator() {
     ]
   ]);
   const commonValidateConfig = { triggerType: "onBlur" };
+  const createDecimalValidator = (decimal, message) => {
+    const errorMessage = message != null ? message : `\u5C0F\u6570\u4F4D\u6570\u6700\u591A${decimal}\u4F4D`;
+    return {
+      validator(value) {
+        var _a;
+        return ((_a = String(value).split(".")[1]) == null ? void 0 : _a.length) > decimal ? errorMessage : "";
+      }
+    };
+  };
   function createValidatorSchema(fieldItem) {
     const rules = [];
-    const { validate: { vali_obj, max_length, message } = {}, validator } = fieldItem;
+    const { validate: { vali_obj, max_length, message, max_value, min_value, decimal_length } = {}, validator } = fieldItem;
     if (validator) {
-      const _validator = arrayed(validator);
-      _validator.forEach((f) => {
+      arrayed(validator).forEach((f) => {
         if (!isFunction(f))
           return;
         rules.push({ validator: (value) => f(value, fieldItem) });
       });
     }
-    if (max_length) {
+    if (max_length)
       rules.push({ max: max_length, message });
-    }
+    if (max_value)
+      rules.push({ maximum: max_value, message });
+    if (min_value)
+      rules.push({ minimum: min_value, message });
+    if (decimal_length != null)
+      rules.push(createDecimalValidator(+decimal_length, message));
     const ruleCreator = vali_obj && validateMap.get(vali_obj);
     ruleCreator && rules.push(Object.assign({}, commonValidateConfig, ruleCreator(fieldItem)));
     return rules;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cnhis-design-vue",
   "private": false,
-  "version": "3.1.17-beta.6",
+  "version": "3.1.17-beta.7",
   "license": "ISC",
   "module": "es/packages/index.js",
   "main": "es/packages/index.js",
@@ -56,6 +56,7 @@
     "min-dom": "^3.2.1",
     "moment": "^2.29.1",
     "naive-ui": "^2.29.0",
+    "ramda": "^0.28.0",
     "rimraf": "^3.0.2",
     "spark-md5": "^3.0.2",
     "tiny-svg": "^2.2.4",
@@ -89,6 +90,7 @@
     "@types/lodash-es": "^4.17.6",
     "@types/markdown-it": "^12.2.3",
     "@types/node": "^17.0.38",
+    "@types/ramda": "^0.28.15",
     "@types/replacestream": "^4.0.1",
     "@types/sortablejs": "^1.13.0",
     "@types/vue-router": "^2.0.0",