cnhis-design-vue 3.1.23-beta.9 → 3.1.24-beta.0

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

@@ -1 +1,70 @@
-export { useFormValidator } from './useFormValidator2.js';
+import { arrayed } from '../../../../shared/utils/index.js';
+import { isString } from 'lodash-es';
+import '../utils/index.js';
+import { isFunction } from '@vueuse/core';
+import { isIdCard } from '../utils/business.js';
+
+function useFormValidator() {
+  const validateMap = /* @__PURE__ */ new Map([
+    ["mobile", ({ validate }) => ({ format: "phone", message: validate == null ? void 0 : validate.message })],
+    ["integer", ({ validate }) => ({ format: "integer", message: validate == null ? void 0 : validate.message })],
+    ["number", ({ validate }) => ({ format: "number", message: validate == null ? void 0 : validate.message })],
+    [
+      "id_card",
+      ({ 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";
+        }
+      })
+    ],
+    [
+      "regular",
+      ({ validate, regular_expression, regular_error_tip }) => {
+        const pattern = regular_expression || (validate == null ? void 0 : validate.regular_expression) || "";
+        const message = regular_error_tip || (validate == null ? void 0 : validate.regular_error_tip) || (validate == null ? void 0 : validate.message) || "\u683C\u5F0F\u9519\u8BEF";
+        return { pattern, message };
+      }
+    ]
+  ]);
+  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, max_value, min_value, decimal_length } = {}, validator } = fieldItem;
+    if (validator) {
+      arrayed(validator).forEach((f) => {
+        if (!isFunction(f))
+          return;
+        rules.push({ validator: (value) => f(value, fieldItem) });
+      });
+    }
+    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));
+    if (vali_obj) {
+      const ruleCreator = validateMap.get(vali_obj) || (({ validate }) => ({ format: vali_obj, message: validate == null ? void 0 : validate.message }));
+      rules.push(Object.assign({}, commonValidateConfig, ruleCreator(fieldItem)));
+    }
+    return rules;
+  }
+  return { createValidatorSchema };
+}
+
+export { useFormValidator };

package/es/components/form-render/src/hooks/useNuiThemeOverrides.js

@@ -1 +1,18 @@
-export { useNuiThemeOverrides } from './useNuiThemeOverrides2.js';
+function useNuiThemeOverrides() {
+  const nuiThemeOverrides = {
+    Input: { paddingMedium: "8px", paddingSmall: "8px", paddingLarge: "8px", paddingTiny: "8px" },
+    InternalSelection: { paddingSingle: "8px", paddingMultiple: "2px" },
+    Form: {
+      feedbackHeightMedium: "16px",
+      feedbackHeightLarge: "16px",
+      feedbackHeightSmall: "16px",
+      feedbackFontSizeLarge: "12px",
+      feedbackFontSizeMedium: "12px",
+      feedbackFontSizeSmall: "12px",
+      feedbackPadding: "0px"
+    }
+  };
+  return { nuiThemeOverrides };
+}
+
+export { useNuiThemeOverrides };

package/es/components/form-render/src/hooks/usePresetScope.js

@@ -1 +1,22 @@
-export { usePresetScope } from './usePresetScope2.js';
+import { isString } from 'lodash-es';
+import '../utils/index.js';
+import { isIdCard, isMobile } from '../utils/business.js';
+
+function usePresetScope() {
+  return {
+    isIdCard(value) {
+      return isString(value) && isIdCard(value);
+    },
+    isMobile(value) {
+      return isString(value) && isMobile(value);
+    },
+    isEmail(value) {
+      return isString(value) && /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/.test(value);
+    },
+    isNumber(value) {
+      return isString(value) && /\d+/.test(value);
+    }
+  };
+}
+
+export { usePresetScope };

package/es/components/form-render/src/types/fieldItem.d.ts

@@ -72,6 +72,7 @@ export declare type FormWordbook = Partial<{
     name: string;
     render_key: string[];
     search_key: string[];
+    primary_key: string;
     type: string;
     value_key: string;
     level_key: string;
@@ -185,9 +186,13 @@ export declare type FieldItem = {
      */
     content: string | FormRenderer | Record<string, FormRenderer>;
     /**
-     * 假使控件需要发送请求, 用于控制是否只在需要的时候发送请求
+     * 用于控制是否启用请求的懒执行
      */
     lazyRequest: boolean;
+    /**
+     * 用于控制请求是否开启缓存
+     */
+    requestCache: boolean;
     /**
      * COMBINATION控件最大表单组数量
      */

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

@@ -17,6 +17,7 @@ export declare type FieldVisitor = Record<string, (context: FieldVisitorContext)
 export declare type FormRequestType = 'post' | 'get' | 'patch' | 'delete' | 'put';
 export interface FormAsyncQueueItem {
     key: any;
+    cache?: boolean;
     url: string;
     method?: FormRequestType;
     params?: AnyObject;

package/es/components/form-render/src/utils/business.js

@@ -1 +1,78 @@
-export { isIdCard, isMobile, parseAge2Birthday, parseAge2FromContext, parseBirthday, parseIdCard, transformDateFormat } from './business2.js';
+import { differenceInDays, differenceInMonths, differenceInYears, format } from 'date-fns';
+import { FIELD_AGE_UNIT, FIELD_SEX_VALUE } from '../constants/index.js';
+
+function parseIdCard(idCardNo) {
+  const parseInner = (certificateNo, idxSexStart, birthYearSpan) => {
+    const res = {};
+    const idxSex = 1 - certificateNo.substr(idxSexStart, 1) % 2;
+    res.sex = idxSex === 1 ? FIELD_SEX_VALUE.FEMALE : FIELD_SEX_VALUE.MALE;
+    const year = (birthYearSpan == 2 ? "19" : "") + certificateNo.substr(6, birthYearSpan);
+    const month = certificateNo.substr(6 + birthYearSpan, 2);
+    const day = certificateNo.substr(8 + birthYearSpan, 2);
+    res.birthday = year + "-" + month + "-" + day + " 00:00:00";
+    const d = new Date();
+    const monthFloor = d.getMonth() + 1 < parseInt(month, 10) || d.getMonth() + 1 == parseInt(month, 10) && d.getDate() < parseInt(day, 10) ? 1 : 0;
+    Object.assign(res, parseBirthday(res.birthday));
+    res.age = res.year = d.getFullYear() - parseInt(year, 10) - monthFloor;
+    return res;
+  };
+  return parseInner(idCardNo, idCardNo.length == 15 ? 14 : 16, idCardNo.length == 15 ? 2 : 4);
+}
+function isMonthType(format2) {
+  return format2 && format2.replace(/yyyy-MM/gi, "YYYY-MM") === "YYYY-MM";
+}
+function transformDateFormat(format2 = "") {
+  if (isMonthType(format2))
+    return "month";
+  return format2.includes("HH") ? "datetime" : "date";
+}
+function validIdCard(cardNo) {
+  if (!cardNo || cardNo.length !== 18) {
+    return false;
+  }
+  const w = [7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2];
+  const v = ["1", "0", "X", "9", "8", "7", "6", "5", "4", "3", "2"];
+  let sum = 0;
+  for (let i = 0; i < 17; i++) {
+    sum += +cardNo[i] * w[i];
+  }
+  return cardNo.charAt(17).toUpperCase() === v[sum % 11];
+}
+const idcardMatcher = /^\d{6}(((19|20)\d{2}(0[1-9]|1[0-2])(0[1-9]|[1-2]\d|3[0-1])\d{3}(\d|x|X))|(\d{2}(0[1-9]|1[0-2])(0[1-9]|[1-2]\d|3[0-1])\d{3}))$/;
+function isIdCard(idCardNo) {
+  return idcardMatcher.test(idCardNo) && validIdCard(idCardNo);
+}
+function isMobile(mobile) {
+  return /^1(3\d|4[5-9]|5[0-35-9]|6[2567]|7[0-8]|8\d|9[0-35-9])\d{8}$/.test(mobile);
+}
+function parseBirthday(birthday) {
+  const result = {};
+  const d = new Date();
+  const birthDate = new Date(birthday);
+  result.day = differenceInDays(d, birthDate);
+  result.month = differenceInMonths(d, birthDate);
+  result.age = result.year = differenceInYears(d, birthDate);
+  return result;
+}
+function parseAge2Birthday(age, ageUnit, formatter = "yyyy-MM-dd") {
+  var _a;
+  const result = new Date();
+  const handlerMap = {
+    [FIELD_AGE_UNIT.MINUTE]: () => decreaseDate(result, "Minute", age),
+    [FIELD_AGE_UNIT.HOUR]: () => decreaseDate(result, "Hour", age),
+    [FIELD_AGE_UNIT.DAY]: () => decreaseDate(result, "Date", age),
+    [FIELD_AGE_UNIT.WEEK]: () => decreaseDate(result, "Date", age * 7),
+    [FIELD_AGE_UNIT.MONTH]: () => decreaseDate(result, "Month", age),
+    [FIELD_AGE_UNIT.YEAR]: () => decreaseDate(result, "FullYear", age)
+  };
+  (_a = handlerMap[ageUnit]) == null ? void 0 : _a.call(handlerMap);
+  return format(result, formatter);
+  function decreaseDate(date, type, num) {
+    date[`set${type}`](date[`get${type}`]() - num);
+  }
+}
+function parseAge2FromContext(context) {
+  return 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 };
+}
+
+export { isIdCard, isMobile, parseAge2Birthday, parseAge2FromContext, parseBirthday, parseIdCard, transformDateFormat };

package/es/components/form-render/src/utils/dom.js

@@ -1 +1,14 @@
-export { queryDecorator, queryInput } from './dom2.js';
+import { dotEscape } from './schema.js';
+
+function queryDecorator(key, wrapperElement, formUUID) {
+  return wrapperElement.querySelector(dotEscape(`#${formUUID}-${key}`));
+}
+function queryInput(decoratorElement) {
+  var _a;
+  return {
+    widgetElement: decoratorElement == null ? void 0 : decoratorElement.querySelector("input"),
+    widgetElementList: Array.from((_a = decoratorElement == null ? void 0 : decoratorElement.querySelectorAll("input")) != null ? _a : [])
+  };
+}
+
+export { queryDecorator, queryInput };

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

@@ -8,10 +8,10 @@ export declare function formRenderLog(message: string): void;
 export declare function mergeDeepProperties(target: AnyObject, fieldList: FieldItem[], traverseProperties?: string[], property?: string, targetProperty?: string): AnyObject;
 export declare function injectOrProvide<T>(key: InjectionKey<T>, creator: () => T): T;
 export declare function parseNumberFromMaybeString<T>(value: T): T extends number | string ? number : T;
-export declare function createSlot(renderer: unknown, props: AnyObject): Record<string, () => ArrayAble<VNode>> | {
+export declare function createSlot(renderer: unknown, props: AnyObject, defaultRenderer?: (v: unknown) => unknown[]): Record<string, () => ArrayAble<VNode>> | {
     default(): any;
 };
-export declare function createInputSlot(props: AnyObject): import("vue").ComputedRef<Record<string, FunctionalComponent<{}, {}>>>;
+export declare function createInputSlot(props: AnyObject, defaultRenderer: (v: unknown) => unknown[]): import("vue").ComputedRef<Record<string, FunctionalComponent<{}, {}>>>;
 export declare function presetRequestHandler(res: unknown): any;
 export declare function optionMatcher(options: AnyObject[], input: Nullable<string>, key: string, matcherOption?: {
     keyword?: string;

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

@@ -1,5 +1,5 @@
 import { computed, createVNode, Fragment, inject, provide } from 'vue';
-import { arrayed } from '../../../../shared/utils/index2.js';
+import { arrayed } from '../../../../shared/utils/index.js';
 import { Path } from '@formily/path';
 import { isObject } from '@vue/shared';
 import { useMemoize } from '@vueuse/core';
@@ -50,7 +50,7 @@ function parseNumberFromMaybeString(value) {
     return +value;
   return value;
 }
-function createSlot(renderer, props) {
+function createSlot(renderer, props, defaultRenderer) {
   if (isObject(renderer) && !isFunction(renderer)) {
     const result = {};
     Object.entries(renderer).forEach(([key, renderer2]) => {
@@ -60,18 +60,18 @@ function createSlot(renderer, props) {
   }
   return {
     default() {
-      return isFunction(renderer) ? renderer(props) : renderer;
+      return isFunction(renderer) ? renderer(props) : defaultRenderer ? defaultRenderer(renderer) : [renderer];
     }
   };
 }
-function createInputSlot(props) {
+function createInputSlot(props, defaultRenderer) {
   return computed(() => {
     const res = {};
     if (props.prefix) {
-      res.prefix = () => createVNode(Fragment, null, [createSlot(props.prefix, props).default()]);
+      res.prefix = () => createVNode(Fragment, null, [createSlot(props.prefix, props, defaultRenderer).default()]);
     }
     if (props.suffix) {
-      res.suffix = () => createVNode(Fragment, null, [createSlot(props.suffix, props).default()]);
+      res.suffix = () => createVNode(Fragment, null, [createSlot(props.suffix, props, defaultRenderer).default()]);
     }
     return res;
   });

package/es/components/form-render/src/utils/schema.js

@@ -1 +1,105 @@
-export { assignClearBindVisited, assignUpdateValue, assignValueBindKey, createLinebarId, createObjSchema, dotEscape, fieldKeyEscape, getParentLinebar, traverseDependKey, traverseSchema, visitedDecorator } from './schema2.js';
+import { isField } from '@formily/core';
+import { isObject } from '@vue/shared';
+import { isString, isArray } from 'lodash-es';
+
+function traverseSchema(schema, handler) {
+  handler(schema);
+  if (isObject(schema.properties)) {
+    Object.values(schema.properties).forEach((_s) => {
+      traverseSchema(_s, handler);
+    });
+  }
+}
+function fieldKeyEscape(fieldList) {
+  return dotEscape(fieldList.map((f) => f.val_key).join("-"));
+}
+function dotEscape(id) {
+  return id.replace(/[.]/g, "-");
+}
+function createLinebarId(id) {
+  return dotEscape(`id-${id}`);
+}
+function traverseDependKey(dependKeys, handler) {
+  if (!dependKeys)
+    return;
+  createDependKeyMap().forEach((valueKey, dependKey) => {
+    if (isString(valueKey))
+      return handler(dependKey, valueKey);
+    handler(dependKey, valueKey.key, valueKey.required);
+  });
+  function createDependKeyMap() {
+    const result = /* @__PURE__ */ new Map();
+    if (isArray(dependKeys)) {
+      dependKeys.forEach((k) => {
+        var _a;
+        if (isObject(k)) {
+          result.set(k.paramName, { key: (_a = k.paramValue) != null ? _a : k.paramName, required: k.required });
+        } else {
+          result.set(k, k);
+        }
+      });
+    } else if (isObject(dependKeys)) {
+      Object.entries(dependKeys).forEach(([k, v]) => {
+        result.set(k, v);
+      });
+    } else if (isString(dependKeys)) {
+      result.set(dependKeys, dependKeys);
+    }
+    return result;
+  }
+}
+function getParentLinebar(key, fieldList) {
+  let result = null;
+  for (const fieldItem of fieldList) {
+    if (fieldItem.val_key === key) {
+      if (isLinebar(fieldItem))
+        result = null;
+      break;
+    }
+    if (isLinebar(fieldItem)) {
+      result = fieldItem.val_key;
+    }
+  }
+  return result;
+  function isLinebar(field) {
+    return field.html_type === "LINEBAR";
+  }
+}
+function assignUpdateValue(props, field) {
+  const _props = { ...props };
+  if (isField(field)) {
+    Object.assign(_props, {
+      "onUpdate:value"(value) {
+        field.setValue(value);
+      }
+    });
+  }
+  return _props;
+}
+function assignValueBindKey(props, field) {
+  const _props = { ...props };
+  if (isField(field)) {
+    _props.key = _props.value === void 0 ? 0 : 1;
+  }
+  return _props;
+}
+function assignClearBindVisited(props, field) {
+  const _props = { ...props };
+  if (isField(field)) {
+    _props.onClear = () => field.visited = true;
+  }
+  return _props;
+}
+function createObjSchema(properties) {
+  return { type: "object", properties };
+}
+function visitedDecorator(field, onFocus) {
+  return (...args) => {
+    if (isField(field.value)) {
+      field.value.visited = true;
+    }
+    return onFocus == null ? void 0 : onFocus(...args);
+  };
+}
+
+export { assignClearBindVisited, assignUpdateValue, assignValueBindKey, createLinebarId, createObjSchema, dotEscape, fieldKeyEscape, getParentLinebar, traverseDependKey, traverseSchema, visitedDecorator };

package/es/components/form-render/style/index.css

@@ -1 +1 @@
-.annotation-edit{align-items:center;color:#0067ee;cursor:pointer;display:inline-flex;font-size:16px;user-select:none}.annotation-edit.is-active{color:#ff9828}.annotation-edit__icon{align-items:center;display:inline-flex}.form-render__wrapper{align-items:start;display:grid!important;gap:0 16px;grid-template-columns:repeat(var(--column),minmax(0,1fr));max-height:var(--form-height);overflow-y:auto;position:relative}.form-render__formItem{grid-column:span min(var(--column),var(--form-item-column)) /span min(var(--column),var(--form-item-column))}.form-render__formItem .n-date-picker,.form-render__formItem .n-input-number{width:100%}.form-render__formItemLabel{align-items:center;display:flex;position:relative}.form-render__formItemLabel--text.has-annotation{margin-right:15px}.form-render__formItemLabel--annotation{position:absolute;right:calc(var(--icon-right)*1px);top:50%;transform:translateY(-50%)}.form-render__formItem .n-form-item-label{display:inline-flex}.form-render__formItem .n-form-item-label [annotation-hover-show=true]{visibility:hidden}.form-render__formItem .n-form-item-label:hover [annotation-hover-show=true]{visibility:visible}.form-render__linebar{grid-column:span min(var(--column),var(--column)) /span min(var(--column),var(--column))}.form-render__linebarHeader{align-items:center;background:#f2f2f2;border-radius:4px;cursor:pointer;display:flex;font-size:16px;font-weight:500;height:40px;margin-bottom:8px;padding:0 16px}.form-render__linebarItem{align-items:start;display:grid!important;gap:0 16px;grid-template-columns:repeat(var(--column),minmax(0,1fr))}.form-render__linebreaks{grid-column:span min(var(--column),var(--form-item-column)) /span min(var(--column),var(--form-item-column))}.form-render__inputGroup{align-items:flex-start;display:flex;grid-column:span min(var(--column),var(--column)) /span min(var(--column),var(--column))}.form-render__inputGroup>div{flex:1}.form-render__inputGroup>div:not(:last-of-type) .n-base-selection__border,.form-render__inputGroup>div:not(:last-of-type) .n-input__border{border-bottom-right-radius:0;border-right:0;border-top-right-radius:0}.form-render__inputGroup>div:last-of-type .n-base-selection__border,.form-render__inputGroup>div:last-of-type .n-input__border{border-bottom-left-radius:0;border-top-left-radius:0}.form-render__combination{width:100%}.form-render__combinationHeader{display:flex;gap:12px}.form-render__combinationHeader>h3{font-size:16px;font-weight:700;margin:0;padding:0}.form-render__combinationHeader .n-button__icon{font-size:14px;margin:0 2px 0 0}.form-render__combinationHeaderText{font-size:16px;font-weight:500}.form-render__combinationClose{font-size:16px;height:14px;position:absolute;right:5px;top:5px;width:14px}.form-render__combinationContentJson{position:relative}.form-render__combinationContent{align-items:start;display:grid!important;gap:0 16px;grid-template-columns:repeat(var(--column),minmax(0,1fr));position:relative}.form-render__complex{width:100%}.form-render__complexContent--grid{align-items:start;display:grid!important;gap:0 16px;grid-template-columns:repeat(var(--column),minmax(0,1fr))}.form-render__complexContent--flex{display:flex!important;gap:0 8px}
+.annotation-edit{align-items:center;color:#0067ee;cursor:pointer;display:inline-flex;font-size:16px;user-select:none}.annotation-edit.is-active{color:#ff9828}.annotation-edit__icon{align-items:center;display:inline-flex}.form-render__wrapper{align-items:start;display:grid!important;gap:0 16px;grid-template-columns:repeat(var(--column),minmax(0,1fr));max-height:var(--form-height);overflow-y:auto;position:relative}.form-render__formItem{grid-column:span min(var(--column),var(--form-item-column)) /span min(var(--column),var(--form-item-column))}.form-render__formItem .n-date-picker,.form-render__formItem .n-input-number{width:100%}.form-render__formItemLabel{align-items:center;display:flex;position:relative}.form-render__formItemLabel--text.has-annotation{margin-right:15px}.form-render__formItemLabel--annotation{position:absolute;right:calc(var(--icon-right)*1px);top:50%;transform:translateY(-50%)}.form-render__formItem .n-form-item-label{display:inline-flex}.form-render__formItem .n-form-item-label [annotation-hover-show=true]{visibility:hidden}.form-render__formItem .n-form-item-label:hover [annotation-hover-show=true]{visibility:visible}.form-render__linebar{grid-column:span min(var(--column),var(--column)) /span min(var(--column),var(--column))}.form-render__linebarHeader{align-items:center;background:#f2f2f2;border-radius:4px;cursor:pointer;display:flex;font-size:14px;font-weight:500;height:32px;justify-content:space-between;margin-bottom:8px;padding:0 16px}.form-render__linebarHeader svg{color:rgba(33,33,33,.4);width:14px}.form-render__linebarItem{align-items:start;display:grid!important;gap:0 16px;grid-template-columns:repeat(var(--column),minmax(0,1fr))}.form-render__linebreaks{grid-column:span min(var(--column),var(--form-item-column)) /span min(var(--column),var(--form-item-column))}.form-render__inputGroup{align-items:flex-start;display:flex;grid-column:span min(var(--column),var(--column)) /span min(var(--column),var(--column))}.form-render__inputGroup>div{flex:1}.form-render__inputGroup>div:not(:last-of-type) .n-base-selection__border,.form-render__inputGroup>div:not(:last-of-type) .n-input__border{border-bottom-right-radius:0;border-right:0;border-top-right-radius:0}.form-render__inputGroup>div:last-of-type .n-base-selection__border,.form-render__inputGroup>div:last-of-type .n-input__border{border-bottom-left-radius:0;border-top-left-radius:0}.form-render__combination{width:100%}.form-render__combinationHeader{display:flex;gap:12px}.form-render__combinationHeader>h3{font-size:16px;font-weight:700;margin:0;padding:0}.form-render__combinationHeader .n-button__icon{font-size:14px;margin:0 2px 0 0}.form-render__combinationHeaderText{font-size:16px;font-weight:500}.form-render__combinationClose{font-size:16px;height:14px;position:absolute;right:5px;top:5px;width:14px}.form-render__combinationContentJson{position:relative}.form-render__combinationContent{align-items:start;display:grid!important;gap:0 16px;grid-template-columns:repeat(var(--column),minmax(0,1fr));position:relative}.form-render__complex{width:100%}.form-render__complexContent--grid{align-items:start;display:grid!important;gap:0 16px;grid-template-columns:repeat(var(--column),minmax(0,1fr))}.form-render__complexContent--flex{display:flex!important;gap:0 8px}

package/es/components/grid/index.d.ts

@@ -1,3 +1,3 @@
 import { SFCWithInstall } from '../../../es/shared/types';
-declare const Grid: SFCWithInstall<import("vue").DefineComponent<{}, any, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>>;
+declare const Grid: SFCWithInstall<import("vue").DefineComponent<{}, any, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>>;
 export default Grid;

package/es/components/grid/index.js

@@ -1 +1,11 @@
-export { default } from './index2.js';
+import { COMPONENT_NAMESPACE } from '../../shared/global/variable.js';
+import { safeComponentRegister } from '../../shared/utils/index.js';
+import '../../shared/utils/utilExpand.js';
+import script from './src/Grid.js';
+
+const Grid = script;
+Grid.install = function(app) {
+  safeComponentRegister(app, Grid, COMPONENT_NAMESPACE + "Grid");
+};
+
+export { Grid as default };

package/es/components/grid/src/Grid.d.ts

@@ -1,2 +1,2 @@
-declare const _default: import("vue").DefineComponent<{}, any, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
+declare const _default: import("vue").DefineComponent<{}, any, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
 export default _default;

package/es/components/grid/src/Grid.js

@@ -1,5 +1,5 @@
 import { defineComponent, createVNode, resolveComponent, mergeProps, isVNode } from 'vue';
-import { useMethods } from './hooks2.js';
+import { useMethods } from './hooks.js';
 
 function _isSlot(s) {
   return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !isVNode(s);

package/es/components/grid/src/hooks.js

@@ -1 +1,167 @@
-export { useMethods } from './hooks2.js';
+import { ref } from 'vue';
+
+const useMethods = () => {
+  const xGrid = ref({});
+  const methodKeys = [
+    "loadData",
+    "reloadData",
+    "updateData",
+    "reloadRow",
+    "reloadExpandContent",
+    "reloadTreeChilds",
+    "loadColumn",
+    "reloadColumn",
+    "refreshColumn",
+    "createRow",
+    "createData",
+    "insert",
+    "insertAt",
+    "revertData",
+    "remove",
+    "removeCheckboxRow",
+    "removeRadioRow",
+    "removeCurrentRow",
+    "removeMergeCells",
+    "removeMergeFooterItems",
+    "getRowIndex",
+    "getVTRowIndex",
+    "getVMRowIndex",
+    "getRowNode",
+    "getColumns",
+    "getColid",
+    "getColumnById",
+    "getColumnByField",
+    "getTableColumn",
+    "getColumnIndex",
+    "getVMColumnIndex",
+    "getVTColumnIndex",
+    "getColumnNode",
+    "getSortColumns",
+    "getCheckedFilters",
+    "getTableData",
+    "getRowById",
+    "getRowid",
+    "getData",
+    "getRecordset",
+    "getInsertRecords",
+    "getRemoveRecords",
+    "getUpdateRecords",
+    "getMergeCells",
+    "getMergeFooterItems",
+    "getCurrentColumn",
+    "getCurrentRecord",
+    "getRadioRecord",
+    "getRadioReserveRecord",
+    "getCheckboxRecords",
+    "getCheckboxReserveRecords",
+    "getCheckboxIndeterminateRecords",
+    "getRowExpandRecords",
+    "getTreeExpandRecords",
+    "getActiveRecord",
+    "getSelectedCell",
+    "getScroll",
+    "isActiveByRow",
+    "isInsertByRow",
+    "isUpdateByRow",
+    "isAllCheckboxChecked",
+    "isAllCheckboxIndeterminate",
+    "isCheckedByCheckboxRow",
+    "isIndeterminateByCheckboxRow",
+    "isCheckedByRadioRow",
+    "isExpandByRow",
+    "isRowExpandLoaded",
+    "isTreeExpandByRow",
+    "isTreeExpandLoaded",
+    "isFilter",
+    "setFilter",
+    "setActiveRow",
+    "setActiveCell",
+    "setSelectCell",
+    "setMergeCells",
+    "setMergeFooterItems",
+    "setRowExpand",
+    "setAllRowExpand",
+    "setTreeExpand",
+    "setAllTreeExpand",
+    "setCurrentRow",
+    "setCurrentColumn",
+    "setRadioRow",
+    "setCheckboxRow",
+    "setAllCheckboxRow",
+    "setEditCell",
+    "toggleCheckboxRow",
+    "toggleAllCheckboxRow",
+    "toggleRowExpand",
+    "toggleTreeExpand",
+    "clearMergeCells",
+    "clearMergeFooterItems",
+    "clearCurrentRow",
+    "clearCurrentColumn",
+    "clearRadioRow",
+    "clearRadioReserve",
+    "clearCheckboxRow",
+    "clearCheckboxReserve",
+    "clearRowExpand",
+    "clearRowExpandLoaded",
+    "clearTreeExpand",
+    "clearTreeExpandLoaded",
+    "clearSort",
+    "clearFilter",
+    "clearSelected",
+    "clearActived",
+    "clearData",
+    "clearScroll",
+    "clearValidate",
+    "clearAll",
+    "clearEdit",
+    "resetColumn",
+    "closeFilter",
+    "closeTooltip",
+    "closeMenu",
+    "updateFooter",
+    "updateStatus",
+    "hideColumn",
+    "showColumn",
+    "scrollTo",
+    "scrollToRow",
+    "scrollToColumn",
+    "sort",
+    "isSort",
+    "recalculate",
+    "refreshScroll",
+    "validate",
+    "fullValidate",
+    "exportData",
+    "openExport",
+    "importData",
+    "openImport",
+    "print",
+    "openPrint",
+    "saveFile",
+    "readFile",
+    "openTooltip",
+    "connect",
+    "focus",
+    "blur",
+    "commitProxy",
+    "zoom",
+    "isMaximized",
+    "maximize",
+    "revert",
+    "getFormItems",
+    "getPendingRecords",
+    "getProxyInfo"
+  ];
+  const funcs = {};
+  methodKeys.forEach((name) => {
+    funcs[name] = (...args) => {
+      return xGrid.value && xGrid.value[name](...args);
+    };
+  });
+  return {
+    xGrid,
+    ...funcs
+  };
+};
+
+export { useMethods };

package/es/components/iho-table/index.d.ts

@@ -4389,7 +4389,7 @@ declare const IhoTable: SFCWithInstall<import("vue").DefineComponent<{
             type: import("vue").PropType<import("../../../es/components/iho-table/src/types").IhoTableFieldItem>;
             required: true;
         };
-    }, () => 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<{
+    }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
         field: {
             type: import("vue").PropType<import("../../../es/components/iho-table/src/types").IhoTableFieldItem>;
             required: true;