cnhis-design-vue 3.1.17-beta.4 → 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/button-print/index.d.ts

@@ -133,8 +133,8 @@ declare const ButtonPrint: SFCWithInstall<import("vue").DefineComponent<{
     }[];
     currentFormatItem: import("vue").ComputedRef<{} | undefined>;
     formatTitle: import("vue").ComputedRef<any>;
+    getTemplateIdByFormatId: import("vue").ComputedRef<any>;
     renderLabel: (option: any) => any;
-    getTemplateIdByFormatId: (id: any) => any;
     callLocalServicesSuccessCb: (res: any, type: any) => void;
     callLocalServicesErrorCb: (res: any) => void;
     prevFnError: () => void;

package/es/packages/button-print/src/ButtonPrint.vue.d.ts

@@ -137,8 +137,8 @@ declare const _default: import("vue").DefineComponent<{
     }[];
     currentFormatItem: import("vue").ComputedRef<{} | undefined>;
     formatTitle: import("vue").ComputedRef<any>;
+    getTemplateIdByFormatId: import("vue").ComputedRef<any>;
     renderLabel: (option: any) => any;
-    getTemplateIdByFormatId: (id: any) => any;
     callLocalServicesSuccessCb: (res: any, type: any) => void;
     callLocalServicesErrorCb: (res: any) => void;
     prevFnError: () => void;

package/es/packages/button-print/src/ButtonPrint.vue_vue_type_script_setup_true_lang.js

@@ -102,6 +102,10 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       return state.formatList.find((item) => item.id === id);
     });
     const formatTitle = computed(() => currentFormatItem.value.name || "\u683C\u5F0F\u9009\u62E9");
+    const getTemplateIdByFormatId = computed(() => {
+      let find = state.formatList.find((item) => item.id === state.currentFormatId);
+      return find == null ? void 0 : find.templateId;
+    });
     const renderLabel = (option) => {
       return createVNode("span", {
         "class": {
@@ -109,15 +113,11 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         }
       }, [option.label]);
     };
-    const getTemplateIdByFormatId = (id) => {
-      let find = state.formatList.find((item) => item.id === id);
-      return find.templateId;
-    };
     const callLocalServicesSuccessCb = (res, type) => {
       let info = {
         type,
         formatId: state.currentFormatId,
-        templateId: getTemplateIdByFormatId(state.currentFormatId)
+        templateId: getTemplateIdByFormatId.value
       };
       emit("success", res, info);
     };
@@ -180,7 +180,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           for (let i = 0; i < state.printParams.length; i++) {
             const queryParams = {
               formatId: state.currentFormatId,
-              templateId: getTemplateIdByFormatId(state.currentFormatId),
+              templateId: getTemplateIdByFormatId.value,
               params: getPrintParams(i)
             };
             printInstance.printDirect(queryParams, callLocalServicesSuccessCbTmp, callLocalServicesErrorCb);
@@ -188,7 +188,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         } else {
           const queryParams = {
             formatId: state.currentFormatId,
-            templateId: getTemplateIdByFormatId(state.currentFormatId),
+            templateId: getTemplateIdByFormatId.value,
             params: getOnceParams()
           };
           printInstance.printDirect(queryParams, (res) => {
@@ -207,7 +207,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         const params = props.strategy === "MULTI" ? getPrintParams() : getOnceParams();
         const queryParams = {
           formatId: state.currentFormatId,
-          templateId: getTemplateIdByFormatId(state.currentFormatId),
+          templateId: getTemplateIdByFormatId.value,
           params
         };
         printInstance.preview(queryParams, (res) => {
@@ -225,7 +225,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         const params = props.strategy === "MULTI" ? getPrintParams() : getOnceParams();
         const queryParams = {
           formatId: state.currentFormatId,
-          templateId: getTemplateIdByFormatId(state.currentFormatId),
+          templateId: getTemplateIdByFormatId.value,
           print: {
             print: "1",
             type: "1",
@@ -357,7 +357,6 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     };
     const initCRM = async (formatListResult) => {
       var _a;
-      console.log("formatListResult", formatListResult);
       state.formatList = formatListResult ? formatFormatList(formatListResult.obj) : [];
       state.currentFormatId = getDefaultFormatId(state.formatList, "defaultFlag");
       if (!state.currentFormatId) {
@@ -365,14 +364,11 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         return requestError();
       }
       setOptions();
-      if (!state.currentFormatId) {
-        requestError();
-        return;
-      }
-      let templateParamsResult = ((_a = await props.queryTemplateParams()) == null ? void 0 : _a.obj) || {};
-      if (templateParamsResult) {
+      let templateParamsResult = (_a = await props.queryTemplateParams()) == null ? void 0 : _a.obj;
+      if (templateParamsResult && getTemplateIdByFormatId.value) {
         state.templateParams = templateParamsResult;
       } else {
+        $message.error("\u83B7\u53D6\u6253\u5370\u6A21\u677F\u5931\u8D25\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\uFF01");
         return requestError();
       }
       state.printParams = formatParams(state.templateParams, props.params);
@@ -420,7 +416,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       state.identityVerification.visible = false;
       const queryParams = {
         formatId: state.currentFormatId,
-        templateId: getTemplateIdByFormatId(state.currentFormatId),
+        templateId: getTemplateIdByFormatId.value,
         params: getPrintParams(),
         token
       };

package/es/packages/fabric-chart/src/hooks/useLeft.js

@@ -261,10 +261,12 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
     nextTick(() => {
       var _a;
       iconsWidth && drawIcons();
-      const yScaleValueList = left.yScaleValue.filter((v) => v.layout === "left" || v.type === "pain");
+      const yScaleValueList = left.yScaleValue.filter((v) => v.layout === "left" && v.type !== "pain");
       if ((right == null ? void 0 : right.width) && ((_a = right == null ? void 0 : right.yScaleValue) == null ? void 0 : _a.layout) === "left") {
         yScaleValueList.push(getRightInfo);
       }
+      painIndex == 0 && yScaleValueList.unshift(left.yScaleValue[painIndex]);
+      painIndex == left.yScaleValue.length - 1 && yScaleValueList.push(left.yScaleValue[painIndex]);
       drawScaleValue(yScaleValueList);
       canvas.value.renderAll();
     });

package/es/packages/fabric-chart/src/hooks/useRight.js

@@ -3,15 +3,21 @@ import { fabric } from '../utils/index.js';
 import { defaultBorderStyle } from './useDraw.js';
 
 function useRight(canvas, propItems, drawScaleValue) {
-  const { left, right, getRightInfo, canvasWidth, endY } = propItems;
+  const { left, right, getRightInfo, canvasWidth, endY, endX, originY } = propItems;
   onMounted(() => {
     nextTick(() => {
       var _a;
       const yScaleValueList = left.yScaleValue.filter((v) => v.layout === "right");
       if ((right == null ? void 0 : right.width) && ((_a = right == null ? void 0 : right.yScaleValue) == null ? void 0 : _a.layout) === "right") {
         yScaleValueList.push(getRightInfo);
+      }
+      if ((right == null ? void 0 : right.width) || yScaleValueList.length > 0) {
         const rightBorderLine = new fabric.Line([canvasWidth - 1, 0, canvasWidth - 1, endY], defaultBorderStyle);
-        canvas.value.add(rightBorderLine);
+        const rightBorderLine2 = new fabric.Line([endX + 1, originY, canvasWidth - 1, originY], {
+          ...defaultBorderStyle,
+          stroke: "#fff"
+        });
+        canvas.value.add(rightBorderLine, rightBorderLine2);
       }
       drawScaleValue(yScaleValueList);
     });

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

@@ -1,5 +1,5 @@
 import { isObject } from '@vueuse/core';
-import { cloneDeep, pick } from 'lodash-es';
+import { cloneDeep, omit, pick } from 'lodash-es';
 import { useFormValidator, useFieldNormalize } from '../../../../packages/form-render';
 import { arrayed, parseNumberFromMaybeString, formRenderLog } from '../utils/index.js';
 import { fieldKeyEscape, createLinebarId } from '../utils/schema.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
     });
@@ -142,7 +140,7 @@ function useFieldListAdaptor(collector) {
   const createCustomSchema = (item) => {
     const schema = createStandardSchema(item);
     Object.assign(schema["x-component-props"], {
-      fieldItem: item
+      fieldItem: omit(item, ["reactions"])
     });
     return schema;
   };

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/es/packages/form-render/style/index.css

@@ -115,7 +115,7 @@
 }
 .form-render__combinationClose {
   position: absolute;
-  right: 0;
+  right: 5px;
   top: 5px;
   width: 14px;
   height: 14px;

package/es/packages/index.css

@@ -2936,7 +2936,7 @@ body > .vxe-table--tooltip-wrapper {
 }
 .form-render__combinationClose {
   position: absolute;
-  right: 0;
+  right: 5px;
   top: 5px;
   width: 14px;
   height: 14px;

package/es/src/utils/colorLog.d.ts

@@ -0,0 +1,31 @@
+export declare enum LogsType {
+    DEFAULT = "default",
+    PRIMARY = "primary",
+    SUCCESS = "success",
+    WARNING = "warning",
+    DANGER = "danger"
+}
+declare class Log {
+    /**
+     * @description 打印一个 [ title | text ] 样式的信息
+     * @param {String} title title text
+     * @param {String} info info text
+     * @param {String} type style
+     * @param {any[]} appendInfo
+     */
+    capsule(title: string, info: any, type?: LogsType, ...appendInfo: any[]): void;
+    /**
+     * @description 打印彩色文字
+     */
+    colorful(textArr: {
+        text: any;
+        type: LogsType;
+    }[]): void;
+    text(text: any): void;
+    primary(text: any): void;
+    success(text: any): void;
+    warning(text: any): void;
+    danger(text: any): void;
+}
+declare const log: Log;
+export default log;

package/es/src/utils/colorLog.js

@@ -0,0 +1,44 @@
+var LogsType = /* @__PURE__ */ ((LogsType2) => {
+  LogsType2["DEFAULT"] = "default";
+  LogsType2["PRIMARY"] = "primary";
+  LogsType2["SUCCESS"] = "success";
+  LogsType2["WARNING"] = "warning";
+  LogsType2["DANGER"] = "danger";
+  return LogsType2;
+})(LogsType || {});
+function typeColor(type = "primary" /* PRIMARY */) {
+  const colorMap = {
+    ["default" /* DEFAULT */]: "#f5f5f5",
+    ["primary" /* PRIMARY */]: "#409EFF",
+    ["success" /* SUCCESS */]: "#67C23A",
+    ["warning" /* WARNING */]: "#E6A23C",
+    ["danger" /* DANGER */]: "#F56C6C"
+  };
+  return colorMap[type];
+}
+class Log {
+  capsule(title, info, type = "primary" /* PRIMARY */, ...appendInfo) {
+    console.log(`%c ${title} %c ${info} %c`, "background:#35495E; padding: 1px; border-radius: 3px 0 0 3px; color: #fff;", `background:${typeColor(type)}; padding: 1px; border-radius: 0 3px 3px 0;  color: #fff;`, "background:transparent", ...appendInfo);
+  }
+  colorful(textArr) {
+    console.log(`%c${textArr.map((t) => t.text || "").join("%c")}`, ...textArr.map((t) => `color: ${typeColor(t.type)};`));
+  }
+  text(text) {
+    this.colorful([{ text, type: "default" /* DEFAULT */ }]);
+  }
+  primary(text) {
+    this.colorful([{ text, type: "primary" /* PRIMARY */ }]);
+  }
+  success(text) {
+    this.colorful([{ text, type: "success" /* SUCCESS */ }]);
+  }
+  warning(text) {
+    this.colorful([{ text, type: "warning" /* WARNING */ }]);
+  }
+  danger(text) {
+    this.colorful([{ text, type: "danger" /* DANGER */ }]);
+  }
+}
+const log = new Log();
+
+export { LogsType, log as default };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cnhis-design-vue",
   "private": false,
-  "version": "3.1.17-beta.4",
+  "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",