cnhis-design-vue 3.1.12-beta.3 → 3.1.12-beta.6

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

@@ -2563,14 +2563,6 @@ declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
             showInsertStatus?: boolean | undefined;
             showAsterisk?: boolean | undefined;
             autoClear?: boolean | undefined;
-            beforeEditMethod?: ((params: {
-                row: any;
-                rowIndex: number;
-                column: import("vxe-table").VxeTableDefines.ColumnInfo;
-                columnIndex: number;
-                $table: import("vxe-table").VxeTableConstructor & import("vxe-table").VxeTablePrivateMethods;
-                $grid: import("vxe-table").VxeGridConstructor | null | undefined;
-            }) => boolean) | undefined;
             activeMethod?: ((params: {
                 row: any;
                 rowIndex: number;

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

@@ -2562,14 +2562,6 @@ declare const _default: import("vue").DefineComponent<{
             showInsertStatus?: boolean | undefined;
             showAsterisk?: boolean | undefined;
             autoClear?: boolean | undefined;
-            beforeEditMethod?: ((params: {
-                row: any;
-                rowIndex: number;
-                column: import("vxe-table").VxeTableDefines.ColumnInfo;
-                columnIndex: number;
-                $table: import("vxe-table").VxeTableConstructor & import("vxe-table").VxeTablePrivateMethods;
-                $grid: import("vxe-table").VxeGridConstructor | null | undefined;
-            }) => boolean) | undefined;
             activeMethod?: ((params: {
                 row: any;
                 rowIndex: number;

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

@@ -46,7 +46,7 @@ const bigTableState = {
   originFormatList: [],
   isSaveForm: false,
   editConfig: {
-    trigger: "click",
+    trigger: "manual",
     mode: "cell",
     autoClear: false,
     showIcon: false,

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

@@ -14,3 +14,4 @@ export * from './radio';
 export * from './labelSelect';
 export * from './slider';
 export * from './complex';
+export * from './simpleComponent';

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

@@ -14,3 +14,4 @@ export { RADIO } from './radio.js';
 export { LABEL } from './labelSelect.js';
 export { SLIDER } from './slider.js';
 export { COMPLEX } from './complex.js';
+export { BUTTON, TEXT } from './simpleComponent.js';

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

@@ -58,7 +58,7 @@ const script = defineComponent({
       }) : createVNode("header", {
         "class": "form-render__linebarHeader",
         "onClick": toggleShow
-      }, [" ", props.title, " "]), createVNode(NCollapseTransition, {
+      }, [props.title]), createVNode(NCollapseTransition, {
         "class": "form-render__linebarItem",
         "show": _show.value
       }, slots)]);

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

@@ -0,0 +1,2 @@
+export declare const TEXT: (props: any) => JSX.Element;
+export declare const BUTTON: (props: any) => JSX.Element;

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

@@ -0,0 +1,65 @@
+import { createVNode, mergeProps, isVNode } from 'vue';
+import { connect, mapProps } from '@formily/vue';
+import { isObject, isFunction } from 'lodash-es';
+import { NButton } from 'naive-ui';
+
+function _isSlot(s) {
+  return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !isVNode(s);
+}
+function createPropFor(props) {
+  return (property) => {
+    var _a;
+    return (_a = props.fieldItem) == null ? void 0 : _a[property];
+  };
+}
+function createSlot(renderer, props) {
+  if (isObject(renderer)) {
+    const result = {};
+    Object.entries(renderer).forEach(([key, renderer2]) => {
+      isFunction(renderer2) && (result[key] = () => renderer2(props));
+    });
+    return result;
+  }
+  return {
+    default() {
+      return isFunction(renderer) ? renderer(props) : renderer;
+    }
+  };
+}
+const textScript = (props) => {
+  var _a, _b, _c;
+  const propFor = createPropFor(props);
+  return createVNode("div", (_a = propFor("componentProps")) != null ? _a : {}, [(_c = (_b = createSlot(props.content, props)).default) == null ? void 0 : _c.call(_b)]);
+};
+const TEXT = connect(textScript, mapProps((props) => {
+  var _a;
+  return {
+    ...props,
+    content: (_a = props.fieldItem) == null ? void 0 : _a.content
+  };
+}));
+const buttonScript = (props) => {
+  var _a;
+  let _slot;
+  const propFor = createPropFor(props);
+  function onClick() {
+    var _a2;
+    const cb = propFor("onClick") || ((_a2 = propFor("componentProps")) == null ? void 0 : _a2.onClick);
+    return () => isFunction(cb) && cb(props.fieldItem);
+  }
+  console.log(props.content);
+  return createVNode(NButton, mergeProps((_a = propFor("componentProps")) != null ? _a : {}, {
+    "onClick": onClick()
+  }), _isSlot(_slot = createSlot(props.content, props)) ? _slot : {
+    default: () => [_slot]
+  });
+};
+const BUTTON = connect(buttonScript, mapProps((props) => {
+  var _a;
+  return {
+    ...props,
+    content: (_a = props.fieldItem) == null ? void 0 : _a.content
+  };
+}));
+
+export { BUTTON, TEXT };

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

@@ -6,7 +6,7 @@ const SLIDER = connect(NSlider, mapProps((props, field) => {
   const _props = assignUpdateValue(props, field);
   if (Array.isArray(_props.option)) {
     _props.marks = _props.option.reduce((fin, option) => {
-      fin[option.value] = option.text;
+      fin[+option.value] = option.text;
       return fin;
     }, {});
   }

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

@@ -13,6 +13,7 @@ export declare enum FIELD_BUSINESS_TYPE {
     PASSWORD = "password",
     ID_CARD = "id_card",
     AGE = "age",
+    AGE_UNIT = "age_unit",
     MOBILE = "mobile",
     TELEPHONE = "telephone",
     EMAIL = "email",
@@ -28,3 +29,11 @@ export declare enum FIELD_SEX_VALUE {
     MALE = "1",
     FEMALE = "2"
 }
+export declare enum FIELD_AGE_UNIT {
+    DAY = "D",
+    MONTH = "M",
+    YEAR = "Y",
+    HOUR = "H",
+    WEEK = "W",
+    MINUTE = "N"
+}

package/es/packages/form-render/src/constants/index.js

@@ -9,6 +9,7 @@ var FIELD_BUSINESS_TYPE = /* @__PURE__ */ ((FIELD_BUSINESS_TYPE2) => {
   FIELD_BUSINESS_TYPE2["PASSWORD"] = "password";
   FIELD_BUSINESS_TYPE2["ID_CARD"] = "id_card";
   FIELD_BUSINESS_TYPE2["AGE"] = "age";
+  FIELD_BUSINESS_TYPE2["AGE_UNIT"] = "age_unit";
   FIELD_BUSINESS_TYPE2["MOBILE"] = "mobile";
   FIELD_BUSINESS_TYPE2["TELEPHONE"] = "telephone";
   FIELD_BUSINESS_TYPE2["EMAIL"] = "email";
@@ -26,5 +27,14 @@ var FIELD_SEX_VALUE = /* @__PURE__ */ ((FIELD_SEX_VALUE2) => {
   FIELD_SEX_VALUE2["FEMALE"] = "2";
   return FIELD_SEX_VALUE2;
 })(FIELD_SEX_VALUE || {});
+var FIELD_AGE_UNIT = /* @__PURE__ */ ((FIELD_AGE_UNIT2) => {
+  FIELD_AGE_UNIT2["DAY"] = "D";
+  FIELD_AGE_UNIT2["MONTH"] = "M";
+  FIELD_AGE_UNIT2["YEAR"] = "Y";
+  FIELD_AGE_UNIT2["HOUR"] = "H";
+  FIELD_AGE_UNIT2["WEEK"] = "W";
+  FIELD_AGE_UNIT2["MINUTE"] = "N";
+  return FIELD_AGE_UNIT2;
+})(FIELD_AGE_UNIT || {});
 
-export { FIELD_BUSINESS_TYPE, FIELD_SEX_VALUE, FormItemLineBarDepKeyPrepend, InjectAsyncQueue, InjectionBusinessCollector, InjectionChangeContextCollector, InjectionFormItemDepsCollector, InjectionFormUUID, InjectionSchemaField };
+export { FIELD_AGE_UNIT, FIELD_BUSINESS_TYPE, FIELD_SEX_VALUE, FormItemLineBarDepKeyPrepend, InjectAsyncQueue, InjectionBusinessCollector, InjectionChangeContextCollector, InjectionFormItemDepsCollector, InjectionFormUUID, InjectionSchemaField };

package/es/packages/form-render/src/hooks/useBusinessBinding.d.ts

@@ -9,6 +9,7 @@ export declare class BusinessCollector {
     collect(type: FIELD_BUSINESS_TYPE, fieldName: string): void;
     getField(type: FIELD_BUSINESS_TYPE): string[];
     getType(fieldName: string): FIELD_BUSINESS_TYPE | undefined;
+    private setAge;
     private handlerIdCardType;
     private handlerBirthdayType;
     handlerMap: Map<FIELD_BUSINESS_TYPE, (formModel: Form, value: unknown) => void>;

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

@@ -1,5 +1,5 @@
 import { isString } from '@vueuse/core';
-import { FIELD_BUSINESS_TYPE } from '../constants/index.js';
+import { FIELD_BUSINESS_TYPE, FIELD_AGE_UNIT } from '../constants/index.js';
 import { isIdCard, parseIdCard, parseBirthday } from '../utils/index.js';
 
 class BusinessCollector {
@@ -24,21 +24,36 @@ class BusinessCollector {
   getType(fieldName) {
     return this.fieldNameCollector.get(fieldName);
   }
-  handlerIdCardType(formModel, value) {
-    if (!value || !isString(value) || !isIdCard(value))
-      return;
-    const info = parseIdCard(value);
+  setAge(formModel, context) {
+    const value = context.day < 30 ? { ageUnit: FIELD_AGE_UNIT.DAY, age: context.day } : context.day < 365 ? { ageUnit: FIELD_AGE_UNIT.MONTH, age: context.month } : { ageUnit: FIELD_AGE_UNIT.YEAR, age: context.year };
+    const ageUnitFields = this.getField(FIELD_BUSINESS_TYPE.AGE_UNIT);
+    ageUnitFields.forEach((field) => {
+      formModel.setFieldState(field, (state) => {
+        state.value = this.valueFilter({
+          fieldKey: field,
+          value: value.ageUnit,
+          context,
+          type: FIELD_BUSINESS_TYPE.AGE_UNIT
+        });
+      });
+    });
     const ageFields = this.getField(FIELD_BUSINESS_TYPE.AGE);
     ageFields.forEach((field) => {
       formModel.setFieldState(field, (state) => {
         state.value = this.valueFilter({
           fieldKey: field,
-          value: info.age,
-          context: info,
+          value: ageUnitFields.length ? value.age : context.year,
+          context,
           type: FIELD_BUSINESS_TYPE.AGE
         });
       });
     });
+  }
+  handlerIdCardType(formModel, value) {
+    if (!value || !isString(value) || !isIdCard(value))
+      return;
+    const info = parseIdCard(value);
+    this.setAge(formModel, info);
     const sexFields = this.getField(FIELD_BUSINESS_TYPE.SEX);
     sexFields.forEach((field) => {
       formModel.setFieldState(field, (state) => {
@@ -55,18 +70,7 @@ class BusinessCollector {
   handlerBirthdayType(formModel, value) {
     if (!isString(value))
       return;
-    const ageFields = this.getField(FIELD_BUSINESS_TYPE.AGE);
-    ageFields.forEach((field) => {
-      const context = parseBirthday(value);
-      formModel.setFieldState(field, (state) => {
-        state.value = this.valueFilter({
-          fieldKey: field,
-          value: context.year,
-          context,
-          type: FIELD_BUSINESS_TYPE.AGE
-        });
-      });
-    });
+    this.setAge(formModel, parseBirthday(value));
   }
   trigger(formModel, fieldName, value) {
     const type = this.getType(fieldName);

package/es/packages/form-render/src/hooks/useFieldListAdaptor.d.ts

@@ -1,5 +1,5 @@
-import { FieldItem } from '../types';
 import { BusinessCollector } from '../../../../../es/packages/form-render';
+import { FieldItem } from '../types';
 /**
  * @description 胶水层, 将低代码平台中的fieldList转换为JSONSchema
  */

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

@@ -1,7 +1,7 @@
+import { isObject } from '@vueuse/core';
 import { isArray, pick } from 'lodash-es';
-import { arrayed, transformDateFormat } from '../utils/index.js';
 import { useFormValidator, useTypeNormalize } from '../../../../packages/form-render';
-import { isObject } from '@vueuse/core';
+import { arrayed, transformDateFormat } from '../utils/index.js';
 
 function useFieldListAdaptor(collector, uuid) {
   const { createValidatorSchema } = useFormValidator();
@@ -10,12 +10,6 @@ function useFieldListAdaptor(collector, uuid) {
       name: item.val_key,
       type: "string",
       title: item.alias || item.name,
-      "x-decorator": "FORM_ITEM",
-      "x-decorator-props": {
-        span: item.elem_width,
-        showLabel: item.hide_title !== "1",
-        id: `${uuid}-${item.val_key}`
-      },
       "x-component": item.html_type,
       "x-component-props": {
         placeholder: item.placeholder,
@@ -28,6 +22,17 @@ function useFieldListAdaptor(collector, uuid) {
     if (isObject(item.reactions)) {
       result["x-reactions"] = item.reactions;
     }
+    if (!item.noDecorator) {
+      Object.assign(result, {
+        "x-decorator": "FORM_ITEM",
+        "x-decorator-props": {
+          span: item.elem_width,
+          showLabel: item.hide_title !== "1",
+          id: `${uuid}-${item.val_key}`,
+          ...item.decoratorProps || {}
+        }
+      });
+    }
     const rules = createValidatorSchema(item);
     rules && (result["x-validator"] = rules);
     item.is_null === "0" && (result.required = true);
@@ -108,9 +113,9 @@ function useFieldListAdaptor(collector, uuid) {
   const createSliderSchema = (item) => {
     const schema = createStandardSchema(item);
     Object.assign(schema["x-component-props"], {
-      step: item.step_length,
-      max: item.max_length,
-      min: item.min_length,
+      step: +item.step_length,
+      max: +item.max_length,
+      min: +item.min_length,
       option: item.option
     });
     return schema;
@@ -183,22 +188,26 @@ function useFieldListAdaptor(collector, uuid) {
   const { normalize } = useTypeNormalize();
   function schemaAdaptor(fieldList) {
     let prevLinebar = null;
-    return fieldList.reduce((fin, cur) => {
+    return fieldList.reduce((fin, cur, idx) => {
       var _a;
       normalize(cur);
       const obj_type = (_a = cur.validate) == null ? void 0 : _a.obj_type;
       obj_type && collector.collect(obj_type, cur.val_key);
       if (cur.html_type === "LINEBAR") {
-        fin[createFieldName(cur)] = createLinebarSchema(cur);
+        fin[createFieldName(cur)] = bindIndex(createLinebarSchema(cur), idx);
         prevLinebar = fin[createFieldName(cur)].properties = {};
       } else if (prevLinebar) {
-        prevLinebar[createFieldName(cur)] = createWidgetSchema(cur);
+        prevLinebar[createFieldName(cur)] = bindIndex(createWidgetSchema(cur), idx);
       } else {
         prevLinebar = null;
-        fin[createFieldName(cur)] = createWidgetSchema(cur);
+        fin[createFieldName(cur)] = bindIndex(createWidgetSchema(cur), idx);
       }
       return fin;
     }, {});
+    function bindIndex(schema, idx) {
+      schema["x-index"] = idx;
+      return schema;
+    }
     function createFieldName(fieldItem) {
       if (isArray(fieldItem.suffixConfig)) {
         return [fieldItem.val_key, fieldItem.suffixConfig.map((f) => f.val_key)].join("-");

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

@@ -1,8 +1,11 @@
+import { FIELD_BUSINESS_TYPE } from '../../../../packages/form-render/src/constants';
+
 function useTypeNormalize() {
   function normalizeAgeField(item) {
     item.html_type = "INPUT_NUMBER";
     item.suffixConfig = [
       {
+        validate: { obj_type: FIELD_BUSINESS_TYPE.AGE_UNIT },
         val_key: item.val_key_unit,
         html_type: "SELECT",
         option: item.option

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

@@ -19,7 +19,8 @@ export interface FormAsyncQueueItem {
     params?: AnyObject;
 }
 export declare type FormAsyncQueue = AsyncQueue<FormAsyncQueueItem, any, AnyObject[]>;
-export declare type IdCardParseInfo = Record<'sex' | 'birthday', string> & Record<'age' | 'day' | 'month' | 'year', number>;
+export declare type AgeContext = Record<'age' | 'day' | 'month' | 'year', number>;
+export declare type IdCardParseInfo = Record<'sex' | 'birthday', string> & AgeContext;
 export declare type FormRenderExpose = {
     validate(path?: string): Promise<void>;
     getFormValues(): AnyObject;

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

@@ -2,7 +2,7 @@ import { AnyObject } from '../../../../../es/src/types';
 import { ISchema } from '@formily/json-schema/esm/types';
 import { GeneralField } from '@formily/core';
 import { InjectionKey } from 'vue';
-import { IdCardParseInfo } from '../types';
+import { AgeContext, IdCardParseInfo } from '../types';
 export declare function formRenderLog(message: string, type?: keyof Console): void;
 export declare function arrayed<T>(maybeArray: T): T extends Array<any> ? T : [T];
 export declare function assignUpdateValue(props: AnyObject, field: GeneralField): {
@@ -11,7 +11,7 @@ export declare function assignUpdateValue(props: AnyObject, field: GeneralField)
 export declare function transformDateFormat(format: string): "date" | "datetime";
 export declare function isIdCard(idCardNo: string): boolean;
 export declare function isMobile(mobile: string): boolean;
-export declare function parseBirthday(birthday: string): Record<string, any>;
+export declare function parseBirthday(birthday: string): AgeContext;
 export declare function parseIdCard(idCardNo: string): IdCardParseInfo;
 export declare function injectOrProvide<T>(key: InjectionKey<T>, creator: () => T): T;
 export declare function generateUrlParams(field: GeneralField, dependKeys?: string | string[]): AnyObject;

package/es/packages/form-render/src/utils/index.js

@@ -41,7 +41,7 @@ function parseBirthday(birthday) {
   const birthDate = new Date(birthday);
   result.day = differenceInDays(d, birthDate);
   result.month = differenceInMonths(d, birthDate);
-  result.year = differenceInYears(d, birthDate);
+  result.age = result.year = differenceInYears(d, birthDate);
   return result;
 }
 function parseIdCard(idCardNo) {

package/es/packages/index.css

@@ -1129,6 +1129,13 @@ body > .vxe-table--tooltip-wrapper {
 .n-dialog__title .svg-wrap {
   margin: 0 0 0 auto;
 }
+.n-dialog__title .svg-wrap .svg-icon {
+  width: 1em;
+  height: 1em;
+  vertical-align: -0.15em;
+  fill: currentColor;
+  overflow: hidden;
+}
 .n-dialog__title .svg-wrap svg {
   font-size: 14px;
   cursor: pointer;
@@ -1764,8 +1771,6 @@ body > .vxe-table--tooltip-wrapper {
 }
 .n-dialog.n-modal.c-evatip-dialog-wrap .n-base-icon {
   position: absolute;
-  right: 16px;
-  top: 16px;
   margin: 0;
   color: #666666;
 }

package/es/packages/scale-view/src/components/formitem/r-collection.d.ts

@@ -11,7 +11,7 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-}, () => JSX.Element | null, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, never[], never, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, never[], never, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     form: {
         type: ObjectConstructor;
         default: () => {};

package/es/packages/scale-view/src/components/formitem/r-collection.js

@@ -1,4 +1,4 @@
-import { defineComponent, computed, createVNode, resolveComponent, createTextVNode } from 'vue';
+import { defineComponent, computed, createVNode, withDirectives, vShow, resolveComponent, createTextVNode } from 'vue';
 import { NDivider, NIcon } from 'naive-ui';
 import { AlertCircleOutline } from '@vicons/ionicons5';
 
@@ -59,11 +59,9 @@ var RCollection = defineComponent({
       }, [describe])]);
     };
     const renderLinebar = () => {
-      if (!props.item.title)
-        return null;
       return createVNode("div", {
         "class": "linebar-div"
-      }, [createVNode("span", null, [props.item.title]), createVNode(resolveComponent("n-divider"), null, null)]);
+      }, [withDirectives(createVNode("span", null, [props.item.title]), [[vShow, props.item.title]]), createVNode(resolveComponent("n-divider"), null, null)]);
     };
     const renderPrompt = () => {
       return createVNode("div", {

package/es/packages/scale-view/src/hooks/scaleview-computed.js

@@ -32,7 +32,7 @@ const ScaleViewComputed = (props, state, config) => {
       XS: "extrasmall"
     };
     fontSize = keyValue[fontSize];
-    const scale = fontSize && state.fontSizeObj[fontSize] || 1;
+    const scale = fontSize && (props == null ? void 0 : props.fontSizeObj[fontSize]) || 1;
     const size = 1e4;
     const value = Math.floor(100 / scale * size) / size;
     return {

package/es/packages/scale-view/src/hooks/scaleview-init.js

@@ -197,6 +197,9 @@ const ScaleViewInit = (props, state, emit, config) => {
     var _a, _b;
     if (!list || !list.length)
       return;
+    let query = handleQueryParams();
+    if ((props == null ? void 0 : props.noBtn) || (query == null ? void 0 : query.noBtn))
+      return;
     let matchItem = list.find((item) => item.type === "FRONT_ADDRESS");
     if (!matchItem || !Object.keys(matchItem).length)
       return;
@@ -206,7 +209,6 @@ const ScaleViewInit = (props, state, emit, config) => {
     }
     if (!setting || !Object.keys(setting).length)
       return;
-    let query = handleQueryParams();
     if ((query == null ? void 0 : query.redirect) == 1 || ((_a = props.params) == null ? void 0 : _a.redirect) == 1 || query.isEdit == 3 || ((_b = props.params) == null ? void 0 : _b.isEdit) == 3)
       return;
     let { frontAddress } = setting;

package/es/packages/scale-view/src/hooks/use-component.d.ts

@@ -13,7 +13,7 @@ export declare const componentMap: {
             type: BooleanConstructor;
             default: boolean;
         };
-    }, () => JSX.Element | null, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, never[], never, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, never[], never, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
         form: {
             type: ObjectConstructor;
             default: () => {};
@@ -44,7 +44,7 @@ export declare const componentMap: {
             type: BooleanConstructor;
             default: boolean;
         };
-    }, () => JSX.Element | null, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, never[], never, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, never[], never, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
         form: {
             type: ObjectConstructor;
             default: () => {};
@@ -10190,7 +10190,7 @@ export declare const componentMap: {
             type: BooleanConstructor;
             default: boolean;
         };
-    }, () => JSX.Element | null, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, never[], never, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, never[], never, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
         form: {
             type: ObjectConstructor;
             default: () => {};
@@ -10221,7 +10221,7 @@ export declare const componentMap: {
             type: BooleanConstructor;
             default: boolean;
         };
-    }, () => JSX.Element | null, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, never[], never, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, never[], never, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
         form: {
             type: ObjectConstructor;
             default: () => {};
@@ -10252,7 +10252,7 @@ export declare const componentMap: {
             type: BooleanConstructor;
             default: boolean;
         };
-    }, () => JSX.Element | null, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, never[], never, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, never[], never, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
         form: {
             type: ObjectConstructor;
             default: () => {};

package/es/packages/scale-view/style/index.css

@@ -261,8 +261,6 @@
 }
 .n-dialog.n-modal.c-evatip-dialog-wrap .n-base-icon {
   position: absolute;
-  right: 16px;
-  top: 16px;
   margin: 0;
   color: #666666;
 }

package/es/packages/select-label/style/index.css

@@ -148,6 +148,13 @@
 .n-dialog__title .svg-wrap {
   margin: 0 0 0 auto;
 }
+.n-dialog__title .svg-wrap .svg-icon {
+  width: 1em;
+  height: 1em;
+  vertical-align: -0.15em;
+  fill: currentColor;
+  overflow: hidden;
+}
 .n-dialog__title .svg-wrap svg {
   font-size: 14px;
   cursor: pointer;

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "cnhis-design-vue",
 	"private": false,
-	"version": "3.1.12-beta.3",
+	"version": "3.1.12-beta.6",
 	"license": "ISC",
 	"module": "es/packages/index.js",
 	"main": "es/packages/index.js",
@@ -59,7 +59,7 @@
 		"vue": "^3.2.0",
 		"vue-simple-uploader": "^1.0.0-beta.5",
 		"vuedraggable": "4.1.0",
-		"vxe-table": "^4.2.5",
+		"vxe-table": "4.2.5",
 		"xe-utils": "^3.5.4"
 	},
 	"devDependencies": {