cnhis-design-vue 3.1.16-beta.1 → 3.1.16-beta.12

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

@@ -1,7 +1,9 @@
 import { isObject } from '@vueuse/core';
 import { pick } from 'lodash-es';
 import { useFormValidator, useTypeNormalize } from '../../../../packages/form-render';
-import { fieldKeyEscape, arrayed, createLinebarId, elementIdEscape, parseNumberFromMaybeString, transformDateFormat } from '../utils/index.js';
+import { arrayed, parseNumberFromMaybeString, formRenderLog } from '../utils/index.js';
+import { fieldKeyEscape, createLinebarId, elementIdEscape } from '../utils/schema.js';
+import { transformDateFormat } from '../utils/business.js';
 
 function useFieldListAdaptor(collector, uuid) {
   const { createValidatorSchema } = useFormValidator();
@@ -15,7 +17,12 @@ function useFieldListAdaptor(collector, uuid) {
       "x-component-props": {
         placeholder: item.placeholder,
         clearable: item.is_empty === "0",
-        ...item.componentProps || {}
+        ...item.componentProps || {},
+        onBlur(...args) {
+          var _a2;
+          collector.trigger(item.val_key, "blur");
+          (_a2 = item.componentProps) == null ? void 0 : _a2.onBlur(...args);
+        }
       },
       "x-display": item.is_show === "0" ? "hidden" : "visible",
       "x-pattern": item.is_edit === "0" ? "disabled" : "editable"
@@ -121,9 +128,9 @@ function useFieldListAdaptor(collector, uuid) {
   const createSliderSchema = (item) => {
     const schema = createStandardSchema(item);
     Object.assign(schema["x-component-props"], {
-      step: Number(item.step_length),
-      max: +item.max_length,
-      min: +item.min_length,
+      step: parseNumberFromMaybeString(item.step_length),
+      max: parseNumberFromMaybeString(item.max_length),
+      min: parseNumberFromMaybeString(item.min_length),
       option: item.option
     });
     return schema;
@@ -145,13 +152,16 @@ function useFieldListAdaptor(collector, uuid) {
         line: item.__line,
         disabled: item.is_not_fold === "1",
         id: createLinebarId(item.val_key),
-        show: !!item.is_show
+        show: item.is_show !== "0"
       }
     };
   };
   const createComplexSchema = (item) => {
     const schema = createStandardSchema(item);
-    const properties = Array.isArray(item.properties) ? schemaAdaptor(item.properties) : {};
+    if (Array.isArray(item.properties)) {
+      formRenderLog("COMPLEX\u63A7\u4EF6\u7684properties\u5C5E\u6027\u5DF2\u7ECF\u5E9F\u5F03, \u8BF7\u4F7F\u7528children\u4F5C\u4E3A\u66FF\u4EE3, \u5728\u4E4B\u540E\u7684\u7248\u672C\u4E2Dproperties\u5C5E\u6027\u5C06\u4E0D\u518D\u652F\u6301", "warn");
+    }
+    const properties = Array.isArray(item.properties || item.children) ? schemaAdaptor(item.properties || item.children) : {};
     schema.type = item.fieldType || "void";
     schema.properties = properties;
     Object.assign(schema["x-decorator-props"], { showFeedback: false });

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

@@ -1,6 +1,7 @@
+import { Form } from '@formily/core';
 import { ShallowReactive } from 'vue';
 import { FormRenderProps } from '../../../../../es/packages/form-render';
-export declare function useFormContext(props: ShallowReactive<FormRenderProps>): {
+export declare function useFormContext(props: ShallowReactive<FormRenderProps>, formModel: Form): {
     asyncQueue: import("../../../../../es/packages/form-render").FormAsyncQueue;
     SchemaField: import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>;
     businessCollector: import("../../../../../es/packages/form-render").BusinessCollector;

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

@@ -9,7 +9,7 @@ import { usePresetScope } from '../../../../packages/form-render/src/hooks/usePr
 import { injectOrProvide, uuidGenerator } from '../../../../packages/form-render/src/utils';
 import { InjectAsyncQueue, InjectionSchemaField, InjectionBusinessCollector, InjectionChangeContextCollector, InjectionFormItemDepsCollector, InjectionFormUUID, InjectionAnnotation } from '../../../../packages/form-render/src/constants';
 
-function useFormContext(props) {
+function useFormContext(props, formModel) {
   const { callLifeCycle } = useFormRenderLifeCycle(props);
   const asyncQueue = injectOrProvide(InjectAsyncQueue, () => useAsyncQueue().create(props.parallelism, {
     beforeRequest(...args) {
@@ -34,7 +34,7 @@ function useFormContext(props) {
     },
     scope: Object.assign({}, usePresetScope(), props.scope)
   }).SchemaField);
-  const businessCollector = useBusinessBinding().create(props.businessFilter);
+  const businessCollector = useBusinessBinding().create(formModel, props.businessFormatter);
   provide(InjectionBusinessCollector, businessCollector);
   const changeContextCollector = useChangeContext().create();
   provide(InjectionChangeContextCollector, changeContextCollector);

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

@@ -1,16 +1,26 @@
+import { isString } from 'lodash-es';
 import { arrayed } from '../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 }) => ({ format: "idcard", message: validate == null ? void 0 : validate.message })],
+    [
+      "id_card",
+      ({ validate }) => ({
+        validator(value) {
+          var _a;
+          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",
-      (field) => {
-        const { validate, regular_expression, regular_error_tip } = field;
+      ({ 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 };

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

@@ -1,5 +1,5 @@
 import { AnyObject } from '../../../../../es/src/types';
 import { FieldItem } from '../types';
 export declare function useInitialData(): {
-    assignInitialData: (initialData?: AnyObject, fieldList?: FieldItem[]) => AnyObject;
+    assignInitialData: (initialData?: AnyObject, fieldList?: FieldItem[]) => any;
 };

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

@@ -1,9 +1,14 @@
+import { Path } from '@formily/path';
+import { mergeWith } from 'lodash-es';
+import { traverseFieldList } from '../../../../packages/form-render/src/utils';
+
 function useInitialData() {
   function assignInitialData(initialData, fieldList) {
-    return Object.assign({}, initialData, fieldList == null ? void 0 : fieldList.reduce((fin, cur) => {
-      cur.default_val != void 0 && (fin[cur.val_key] = cur.default_val);
-      return fin;
-    }, {}));
+    const defaultVal = {};
+    fieldList && traverseFieldList(fieldList, (field) => {
+      field.default_val != void 0 && Path.setIn(defaultVal, field.val_key, field.default_val);
+    });
+    return mergeWith({}, initialData, defaultVal);
   }
   return { assignInitialData };
 }

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

@@ -8,7 +8,8 @@ function useTypeNormalize() {
         validate: { obj_type: FIELD_BUSINESS_TYPE.AGE_UNIT },
         val_key: item.val_key_unit,
         html_type: "SELECT",
-        option: item.option
+        option: item.option,
+        urlConfig: item.urlConfig
       }
     ];
   }
@@ -24,7 +25,7 @@ function useTypeNormalize() {
   ];
   function normalize(item) {
     const type = item.html_type;
-    if (["CHECK_BLOCK", "RADIO_BLOCK"].includes(type)) {
+    if (["CHECKBOX_BLOCK", "RADIO_BLOCK"].includes(type)) {
       item.__vertical = true;
     }
     if (["LINE_BREAKS"].includes(type)) {

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

@@ -1,7 +1,7 @@
 import { AnyObject, ArrayAble } from '../../../../../es/src/types';
 import { SchemaTypes } from '@formily/vue';
 import { CSSProperties, VNode } from 'vue';
-import { DependKeyType, FormCommonState } from '../../../../../es/packages/form-render';
+import { DependKeyType, FormCommonState, FormRequestType } from '../../../../../es/packages/form-render';
 declare type FieldBusinessType = 'password' | 'id_card' | 'age' | 'age_unit' | 'mobile' | 'telephone' | 'email' | 'sex' | 'birthday' | 'bank_card' | 'website' | 'gestational_weeks' | 'gestational_stage' | 'customer_name';
 export declare type ValidateItem = Partial<{
     /**
@@ -36,6 +36,15 @@ interface FormRendererPayload {
 export interface FormRenderer {
     (payload: FormRendererPayload): ArrayAble<VNode> | any;
 }
+export declare type UrlConfig = {
+    url: string;
+} & Partial<{
+    method?: FormRequestType;
+    nameKey?: string;
+    valueKey?: string;
+    params?: AnyObject;
+    dependKey?: DependKeyType;
+}>;
 interface SwitchProperty {
     value?: any;
     describe?: string;
@@ -141,17 +150,7 @@ export declare type FieldItem = {
      * slider控件间距
      */
     step_length: string | number;
-    urlConfig: Partial<{
-        url: string;
-        method: 'post' | 'get' | 'put' | 'patch' | 'delete';
-        /**
-         * 请求参数依赖关系
-         */
-        dependKey: DependKeyType;
-        params: AnyObject;
-        nameKey: string;
-        valueKey: string;
-    }>;
+    urlConfig: UrlConfig;
     /**
      * 控件组
      */

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

@@ -25,7 +25,7 @@ export declare type FormAsyncQueue = AsyncQueue<FormAsyncQueueItem, any, AnyObje
 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>;
+    validate(path?: string): Promise<unknown>;
     getFormValues(): AnyObject;
     setFieldState(path: string, setter: (field: Field) => void): void;
     resetFields(path?: string): void;
@@ -45,12 +45,6 @@ export declare type FormChangePayload = {
     fieldInstance: DataField;
     context: FormChangeContext;
 };
-export declare type FormBusinessFilter = (payload: {
-    fieldKey: string;
-    value: unknown;
-    type: FIELD_BUSINESS_TYPE;
-    context?: any;
-}) => unknown;
 export declare type DependKeyType = string | Record<string, string> | Array<{
     paramName: string;
     paramValue?: string;
@@ -71,10 +65,15 @@ export declare type FormRenderProps = Partial<{
     parallelism: number;
     schema: ISchema;
     components: Record<string, Component | FunctionalComponent>;
-    businessFilter: FormBusinessFilter;
     scope: AnyObject;
     annotation: AnyObject;
     consumer: boolean;
     uuid: string;
     lifeCycle: FormRenderLifeCycle;
+    businessFormatter: FormBusinessFormatter;
 }>;
+export declare type FormBusinessFormatter = (payload: {
+    fieldKey: string;
+    value: unknown;
+    type: FIELD_BUSINESS_TYPE;
+}) => unknown;

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

@@ -0,0 +1,12 @@
+import { AgeContext, IdCardParseInfo } from '../../../../../es/packages/form-render';
+import { FIELD_AGE_UNIT } from '../../../../../es/packages/form-render/src/constants';
+export declare function parseIdCard(idCardNo: string): IdCardParseInfo;
+export declare function transformDateFormat(format?: string): "date" | "datetime" | "month";
+export declare function isIdCard(idCardNo: string): boolean;
+export declare function isMobile(mobile: string): boolean;
+export declare function parseBirthday(birthday: string): AgeContext;
+export declare function parseAge2Birthday(age: number, ageUnit: string, formatter?: string): string;
+export declare function parseAge2FromContext(context: AgeContext): {
+    ageUnit: FIELD_AGE_UNIT;
+    age: number;
+};

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

@@ -0,0 +1,78 @@
+import { differenceInDays, differenceInMonths, differenceInYears, format } from 'date-fns';
+import { FIELD_AGE_UNIT, FIELD_SEX_VALUE } from '../../../../packages/form-render/src/constants';
+
+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/packages/form-render/src/utils/dom.d.ts

@@ -0,0 +1,6 @@
+import { WithNull } from '../../../../../es/src/types';
+export declare function queryDecorator(key: string, wrapperElement: HTMLElement, formUUID: string): HTMLElement | null;
+export declare function queryInput(decoratorElement?: WithNull<HTMLElement>): {
+    widgetElement: HTMLInputElement | null | undefined;
+    widgetElementList: HTMLInputElement[];
+};

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

@@ -0,0 +1,14 @@
+import { elementIdEscape } from '../../../../packages/form-render/src/utils/schema';
+
+function queryDecorator(key, wrapperElement, formUUID) {
+  return wrapperElement.querySelector(elementIdEscape(`#${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/packages/form-render/src/utils/index.d.ts

@@ -1,36 +1,16 @@
-import { AnyObject, ArrayAble, WithNull } from '../../../../../es/src/types';
-import { ISchema } from '@formily/json-schema/esm/types';
-import { GeneralField } from '@formily/core';
+import { AnyObject, ArrayAble } from '../../../../../es/src/types';
 import { FunctionalComponent, InjectionKey, VNode } from 'vue';
-import { AgeContext, DependKeyType, FieldItem, IdCardParseInfo } from '../types';
+import { FieldItem } from '../types';
+export * from './business';
+export * from './dom';
+export * from './schema';
 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): {
-    [x: string]: any;
-};
-export declare function transformDateFormat(format?: string): "date" | "datetime" | "month";
-export declare function isIdCard(idCardNo: string): boolean;
-export declare function isMobile(mobile: string): boolean;
-export declare function parseBirthday(birthday: string): AgeContext;
 export declare function mergeDeepProperties(target: AnyObject, fieldList: FieldItem[], traverseProperties?: string[], property?: string, targetProperty?: string): AnyObject;
-export declare function parseIdCard(idCardNo: string): IdCardParseInfo;
 export declare function injectOrProvide<T>(key: InjectionKey<T>, creator: () => T): T;
-export declare function parseNumberFromMaybeString(value: unknown): unknown;
-export declare function traverseDependKey(dependKeys: DependKeyType, handler: {
-    (dependKey: string, valueKey: string, required?: boolean): void;
-}): void;
-export declare function traverseSchema(schema: ISchema, handler: (_s: ISchema) => void): void;
+export declare function parseNumberFromMaybeString<T>(value: T): T extends number | string ? number : T;
 export declare function uuidGenerator(): string;
 export declare function createSlot(renderer: unknown, props: AnyObject): Record<string, () => ArrayAble<VNode>> | {
     default(): any;
 };
-export declare function queryDecorator(key: string, wrapperElement: HTMLElement, formUUID: string): HTMLElement | null;
-export declare function queryInput(decoratorElement?: WithNull<HTMLElement>): {
-    widgetElement: HTMLInputElement | null | undefined;
-    widgetElementList: HTMLInputElement[];
-};
-export declare function getParentLinebar(key: string, fieldList: FieldItem[]): WithNull<string>;
-export declare function elementIdEscape(id: string): string;
-export declare function createLinebarId(id: string): string;
-export declare function fieldKeyEscape(fieldList: FieldItem[]): string;
 export declare function createInputSlot(props: AnyObject): import("vue").ComputedRef<Record<string, FunctionalComponent<{}, {}>>>;

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

@@ -1,9 +1,9 @@
 import { inject, provide, computed, createVNode, Fragment } from 'vue';
 import { isObject } from '@vue/shared';
-import { isNumber, isString, isArray, isFunction } from 'lodash-es';
-import { FIELD_SEX_VALUE } from '../constants/index.js';
-import { isField } from '@formily/core';
-import { differenceInDays, differenceInMonths, differenceInYears } from 'date-fns';
+import { isNumber, isString, isFunction } from 'lodash-es';
+export { isIdCard, isMobile, parseAge2Birthday, parseAge2FromContext, parseBirthday, parseIdCard, transformDateFormat } from './business.js';
+export { queryDecorator, queryInput } from './dom.js';
+export { assignUpdateValue, createLinebarId, elementIdEscape, fieldKeyEscape, getParentLinebar, traverseDependKey, traverseFieldList, traverseSchema } from './schema.js';
 
 function formRenderLog(message, type = "log") {
   console[type](`[FormRender]: ${message}`);
@@ -13,42 +13,6 @@ function arrayed(maybeArray) {
     return maybeArray;
   return [maybeArray];
 }
-function assignUpdateValue(props, field) {
-  const _props = {
-    ...props
-  };
-  if (isField(field)) {
-    Object.assign(_props, {
-      "onUpdate:value"(value) {
-        field.setValue(value);
-      }
-    });
-  }
-  return _props;
-}
-function isMonthType(format) {
-  return format && format.replace(/yyyy-MM/gi, "YYYY-MM") === "YYYY-MM";
-}
-function transformDateFormat(format = "") {
-  if (isMonthType(format))
-    return "month";
-  return format.includes("HH") ? "datetime" : "date";
-}
-function isIdCard(idCardNo) {
-  return /^\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}))$/.test(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 mergeDeepProperties(target, fieldList, traverseProperties = ["children", "properties", "suffixConfig"], property = "val_key", targetProperty = "default_val") {
   function traverse(_target, _fieldList) {
     _fieldList.forEach((field) => {
@@ -76,23 +40,6 @@ function mergeDeepProperties(target, fieldList, traverseProperties = ["children"
     return field[targetProperty];
   }
 }
-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;
-    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 injectOrProvide(key, creator) {
   let injected = inject(key, null);
   if (!injected) {
@@ -108,54 +55,14 @@ function parseNumberFromMaybeString(value) {
     return +value;
   return value;
 }
-function traverseDependKey(dependKeys, handler) {
-  if (!dependKeys)
-    return;
-  createDependKeyMap().forEach((valueKey, dependKey) => {
-    if (isString(valueKey))
-      return handler(dependKey, valueKey);
-    handler(dependKey, valueKey.key, valueKey.required);
-  });
-  Object.entries(createDependKeyMap()).forEach(([dependKey, valueKey]) => {
-    handler(dependKey, valueKey);
-  });
-  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.paramName) != null ? _a : k.paramValue,
-            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 traverseSchema(schema, handler) {
-  handler(schema);
-  if (isObject(schema.properties)) {
-    Object.values(schema.properties).forEach((_s) => {
-      traverseSchema(_s, handler);
-    });
-  }
-}
 function uuidGenerator() {
-  return "key" + "xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(c) {
+  if (window.isSecureContext && window.crypto)
+    return `key${window.crypto.randomUUID()}`;
+  const uuid = "xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(c) {
     const r = Math.random() * 16 | 0, v = c == "x" ? r : r & 3 | 8;
     return v.toString(16);
   });
+  return `key${uuid}`;
 }
 function createSlot(renderer, props) {
   if (isObject(renderer) && !isFunction(renderer)) {
@@ -171,42 +78,6 @@ function createSlot(renderer, props) {
     }
   };
 }
-function queryDecorator(key, wrapperElement, formUUID) {
-  return wrapperElement.querySelector(elementIdEscape(`#${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 : [])
-  };
-}
-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 elementIdEscape(id) {
-  return id.replace(".", "-");
-}
-function createLinebarId(id) {
-  return elementIdEscape(`id-${id}`);
-}
-function fieldKeyEscape(fieldList) {
-  return fieldList.map((f) => f.val_key).join("-").replace(/[.]/g, "_");
-}
 function createInputSlot(props) {
   return computed(() => {
     const res = {};
@@ -220,4 +91,4 @@ function createInputSlot(props) {
   });
 }
 
-export { arrayed, assignUpdateValue, createInputSlot, createLinebarId, createSlot, elementIdEscape, fieldKeyEscape, formRenderLog, getParentLinebar, injectOrProvide, isIdCard, isMobile, mergeDeepProperties, parseBirthday, parseIdCard, parseNumberFromMaybeString, queryDecorator, queryInput, transformDateFormat, traverseDependKey, traverseSchema, uuidGenerator };
+export { arrayed, createInputSlot, createSlot, formRenderLog, injectOrProvide, mergeDeepProperties, parseNumberFromMaybeString, uuidGenerator };

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

@@ -0,0 +1,16 @@
+import { AnyObject, WithNull } from '../../../../../es/src/types';
+import { GeneralField } from '@formily/core';
+import { ISchema } from '@formily/json-schema/esm/types';
+import { DependKeyType, FieldItem } from '../../../../../es/packages/form-render';
+export declare function traverseSchema(schema: ISchema, handler: (_s: ISchema) => void): void;
+export declare function fieldKeyEscape(fieldList: FieldItem[]): string;
+export declare function elementIdEscape(id: string): string;
+export declare function createLinebarId(id: string): string;
+export declare function traverseDependKey(dependKeys: DependKeyType, handler: {
+    (dependKey: string, valueKey: string, required?: boolean): void;
+}): void;
+export declare function getParentLinebar(key: string, fieldList: FieldItem[]): WithNull<string>;
+export declare function assignUpdateValue(props: AnyObject, field: GeneralField): {
+    [x: string]: any;
+};
+export declare function traverseFieldList(fieldList: FieldItem[], handler: (field: FieldItem) => void): void;