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

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

@@ -92,9 +92,6 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
         type: import("vue").PropType<Record<string, import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions> | import("vue").FunctionalComponent<{}, {}>>>;
         default: () => {};
     };
-    businessFilter: {
-        type: import("vue").PropType<import("./src/types").FormBusinessFilter>;
-    };
     scope: {
         type: import("vue").PropType<import("../../../es/src/types").AnyObject>;
         default: () => {};
@@ -207,9 +204,6 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
             type: import("vue").PropType<Record<string, import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions> | import("vue").FunctionalComponent<{}, {}>>>;
             default: () => {};
         };
-        businessFilter: {
-            type: import("vue").PropType<import("./src/types").FormBusinessFilter>;
-        };
         scope: {
             type: import("vue").PropType<import("../../../es/src/types").AnyObject>;
             default: () => {};
@@ -236,14 +230,14 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
     }>>;
     emit: (event: "formChange", ...args: any[]) => void;
     nuiThemeOverrides: import("naive-ui").GlobalThemeOverrides;
+    formModel: import("@formily/core").Form<{
+        [x: string]: any;
+    }>;
     SchemaField: import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>;
     businessCollector: import("./src/hooks").BusinessCollector;
     formItemDepsCollector: import("./src/hooks").FormItemDepsCollector;
     changeContextCollector: import("./src/hooks").ContextCollector;
     formUUID: string;
-    formModel: import("@formily/core").Form<{
-        [x: string]: any;
-    }>;
     scrollbarRef: import("vue").Ref<HTMLElement | undefined>;
     schemaAdaptor: (fieldList: import("./src/types").FieldItem[]) => Record<string, import("@formily/json-schema").Stringify<{
         [key: symbol]: any;
@@ -1709,9 +1703,6 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
         type: import("vue").PropType<Record<string, import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions> | import("vue").FunctionalComponent<{}, {}>>>;
         default: () => {};
     };
-    businessFilter: {
-        type: import("vue").PropType<import("./src/types").FormBusinessFilter>;
-    };
     scope: {
         type: import("vue").PropType<import("../../../es/src/types").AnyObject>;
         default: () => {};

package/es/packages/form-render/src/FormRender.js

@@ -8,8 +8,8 @@ import { useFormRenderLifeCycle } from '../../../packages/form-render/src/hooks/
 import { arrayed, queryDecorator, queryInput, getParentLinebar } from '../../../packages/form-render/src/utils';
 import { useNuiThemeOverrides } from '../../../packages/form-table/src/hooks/useNuiThemeOverrides';
 import _export_sfc from '../../../_virtual/plugin-vue_export-helper.js';
-import { useFormContext } from './hooks/useFormContext.js';
 import { useInitialData } from './hooks/useInitialData.js';
+import { useFormContext } from './hooks/useFormContext.js';
 import { useFieldListAdaptor } from './hooks/useFieldListAdaptor.js';
 import { useFieldVisitor } from './hooks/useFieldVisitor.js';
 import { useAnchor } from './hooks/useAnchor.js';
@@ -34,7 +34,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       type: Object,
       default: () => ({})
     },
-    businessFilter: { type: Function },
     scope: { type: Object, default: () => ({}) },
     annotation: { type: Object },
     consumer: { type: Boolean, default: false },
@@ -48,7 +47,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const props = __props;
     const { nuiThemeOverrides } = useNuiThemeOverrides();
     useFormRenderLifeCycle(props).callLifeCycle("onSetup");
-    const { SchemaField, businessCollector, formItemDepsCollector, changeContextCollector, formUUID } = useFormContext(props);
     const formModel = createForm({
       initialValues: useInitialData().assignInitialData(props.initialData, props.fieldList),
       effects() {
@@ -61,11 +59,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             value: field.value,
             context: changeContextCollector.getContext(fieldKey)
           });
-          businessCollector.trigger(formModel, fieldKey, field.value);
+          businessCollector.trigger(fieldKey);
           formItemDepsCollector.trigger(fieldKey);
         });
       }
     });
+    const { SchemaField, businessCollector, formItemDepsCollector, changeContextCollector, formUUID } = useFormContext(props, formModel);
     const scrollbarRef = ref();
     const { schemaAdaptor } = useFieldListAdaptor(businessCollector, formUUID);
     const parsedSchema = computed(() => {

package/es/packages/form-render/src/FormRender.vue.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="lodash" />
 import { AnyObject } from '../../../../es/src/types';
 import { Component, FunctionalComponent, nextTick, PropType } from 'vue';
-import { FieldItem, FieldVisitor, FormBusinessFilter } from './types';
+import { FieldItem, FieldVisitor } from './types';
 declare const _default: import("vue").DefineComponent<{
     fieldList: {
         type: PropType<FieldItem[]>;
@@ -92,9 +92,6 @@ declare const _default: import("vue").DefineComponent<{
         type: PropType<Record<string, Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions> | FunctionalComponent<{}, {}>>>;
         default: () => {};
     };
-    businessFilter: {
-        type: PropType<FormBusinessFilter>;
-    };
     scope: {
         type: PropType<AnyObject>;
         default: () => {};
@@ -207,9 +204,6 @@ declare const _default: import("vue").DefineComponent<{
             type: PropType<Record<string, Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions> | FunctionalComponent<{}, {}>>>;
             default: () => {};
         };
-        businessFilter: {
-            type: PropType<FormBusinessFilter>;
-        };
         scope: {
             type: PropType<AnyObject>;
             default: () => {};
@@ -236,14 +230,14 @@ declare const _default: import("vue").DefineComponent<{
     }>>;
     emit: (event: "formChange", ...args: any[]) => void;
     nuiThemeOverrides: import("naive-ui").GlobalThemeOverrides;
+    formModel: import("@formily/core").Form<{
+        [x: string]: any;
+    }>;
     SchemaField: Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>;
     businessCollector: import("./hooks").BusinessCollector;
     formItemDepsCollector: import("./hooks").FormItemDepsCollector;
     changeContextCollector: import("./hooks").ContextCollector;
     formUUID: string;
-    formModel: import("@formily/core").Form<{
-        [x: string]: any;
-    }>;
     scrollbarRef: import("vue").Ref<HTMLElement | undefined>;
     schemaAdaptor: (fieldList: FieldItem[]) => Record<string, import("@formily/vue").Stringify<{
         [key: symbol]: any;
@@ -1709,9 +1703,6 @@ declare const _default: import("vue").DefineComponent<{
         type: PropType<Record<string, Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions> | FunctionalComponent<{}, {}>>>;
         default: () => {};
     };
-    businessFilter: {
-        type: PropType<FormBusinessFilter>;
-    };
     scope: {
         type: PropType<AnyObject>;
         default: () => {};

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

@@ -3,10 +3,10 @@ import { isField } from '@formily/core';
 import { isEqual } from 'lodash-es';
 import { useCommonInjection } from '../../../../../packages/form-render/src/hooks/useCommonInjection';
 import { InjectAsyncQueue } from '../../constants/index.js';
-import { assignUpdateValue, traverseDependKey } from '../../utils/index.js';
 import { connect, mapProps } from '@formily/vue';
 import { NCascader } from 'naive-ui';
 import { useFormField } from '../../hooks/useFormField.js';
+import { assignUpdateValue, traverseDependKey } from '../../utils/schema.js';
 
 const script = defineComponent({
   name: "FormCascader",

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

@@ -1,7 +1,7 @@
 import { defineComponent, createVNode } from 'vue';
-import { assignUpdateValue } from '../../utils/index.js';
 import { connect, mapProps } from '@formily/vue';
 import { NCheckboxGroup, NSpace, NCheckbox } from 'naive-ui';
+import { assignUpdateValue } from '../../utils/schema.js';
 
 const script = defineComponent({
   name: "FormCheckbox",

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

@@ -3,11 +3,12 @@ import { isField } from '@formily/core';
 import { Path } from '@formily/path';
 import { isNumber, isEqual } from 'lodash-es';
 import { useDeepValidate } from '../../../../../../packages/form-render/src/components/renderer/combination/hooks/useDeepValidate';
-import { assignUpdateValue, mergeDeepProperties, formRenderLog } from '../../../utils/index.js';
+import { mergeDeepProperties, formRenderLog } from '../../../utils/index.js';
 import { connect, mapProps } from '@formily/vue';
 import { useDebounceFn, isObject } from '@vueuse/core';
 import { NButton } from 'naive-ui';
 import FormRender from '../../../FormRender.js';
+import { assignUpdateValue } from '../../../utils/schema.js';
 
 const script = defineComponent({
   name: "FormCombination",

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

@@ -1,6 +1,6 @@
 import { defineComponent, createVNode } from 'vue';
 import { connect, mapProps } from '@formily/vue';
-import { assignUpdateValue } from '../../utils/index.js';
+import { assignUpdateValue } from '../../utils/schema.js';
 
 const script = defineComponent({
   props: {

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

@@ -1,7 +1,8 @@
 import { defineComponent, createVNode } from 'vue';
-import { createInputSlot, assignUpdateValue } from '../../utils/index.js';
+import { createInputSlot } from '../../utils/index.js';
 import { connect, mapProps } from '@formily/vue';
 import { NInput } from 'naive-ui';
+import { assignUpdateValue } from '../../utils/schema.js';
 
 const script = defineComponent({
   name: "FormInput",

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

@@ -1,7 +1,8 @@
 import { defineComponent, createVNode } from 'vue';
-import { createInputSlot, assignUpdateValue } from '../../utils/index.js';
+import { createInputSlot } 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: {

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

@@ -2,7 +2,7 @@ import { defineComponent, computed, createVNode } from 'vue';
 import { connect, mapProps } from '@formily/vue';
 import { isNumber } from 'lodash-es';
 import { NRadioGroup, NSpace, NRadio } from 'naive-ui';
-import { assignUpdateValue } from '../../utils/index.js';
+import { assignUpdateValue } from '../../utils/schema.js';
 
 const script = defineComponent({
   props: {

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

@@ -3,10 +3,10 @@ import { isField } from '@formily/core';
 import { isEqual, cloneDeep } from 'lodash-es';
 import { useCommonInjection } from '../../../../../packages/form-render/src/hooks/useCommonInjection';
 import { InjectionChangeContextCollector, InjectAsyncQueue, InjectionFormItemDepsCollector } from '../../constants/index.js';
-import { assignUpdateValue, traverseDependKey } from '../../utils/index.js';
 import { connect, mapProps } from '@formily/vue';
 import { NSelect } from 'naive-ui';
 import { useFormField } from '../../hooks/useFormField.js';
+import { assignUpdateValue, traverseDependKey } from '../../utils/schema.js';
 
 const script = defineComponent({
   name: "FormSelect",

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

@@ -1,6 +1,6 @@
 import { connect, mapProps } from '@formily/vue';
 import { NSlider } from 'naive-ui';
-import { assignUpdateValue } from '../../utils/index.js';
+import { assignUpdateValue } from '../../utils/schema.js';
 
 const SLIDER = connect(NSlider, mapProps((props, field) => {
   const _props = assignUpdateValue(props, field);

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

@@ -1,7 +1,7 @@
 import { defineComponent, computed, createVNode, createTextVNode } from 'vue';
 import { NSwitch } from 'naive-ui';
-import { assignUpdateValue } from '../../utils/index.js';
 import { connect, mapProps } from '@formily/vue';
+import { assignUpdateValue } from '../../utils/schema.js';
 
 const script = defineComponent({
   name: "FormSwitch",

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

@@ -1,6 +1,6 @@
-import { assignUpdateValue } from '../../utils/index.js';
 import { connect, mapProps } from '@formily/vue';
 import { NInput } from 'naive-ui';
+import { assignUpdateValue } from '../../utils/schema.js';
 
 const TEXTAREA = connect(NInput, mapProps((props, field) => {
   const _props = assignUpdateValue(props, field);

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

@@ -1,20 +1,23 @@
 import { Form } from '@formily/core';
-import { FormBusinessFilter } from '../../../../../es/packages/form-render';
 import { FIELD_BUSINESS_TYPE } from '../constants';
 export declare class BusinessCollector {
+    private formModel;
     private readonly typeCollector;
     private readonly fieldNameCollector;
-    private readonly valueFilter;
-    constructor(valueFilter?: FormBusinessFilter);
+    constructor(formModel: Form);
     collect(type: FIELD_BUSINESS_TYPE, fieldName: string): void;
-    getField(type: FIELD_BUSINESS_TYPE): string[];
-    getType(fieldName: string): FIELD_BUSINESS_TYPE | undefined;
-    private setAge;
+    private getField;
+    private getType;
+    private getValueByField;
+    private getValueByType;
+    private setValueByType;
     private handlerIdCardType;
     private handlerBirthdayType;
-    handlerMap: Map<FIELD_BUSINESS_TYPE, (formModel: Form, value: unknown) => void>;
-    trigger(formModel: Form, fieldName: string, value: unknown): void;
+    private handlerAgeType;
+    private handlerChangeMap;
+    private blurHandlerMap;
+    trigger(fieldName: string, triggerType?: 'change' | 'blur'): void;
 }
 export declare function useBusinessBinding(): {
-    create: (valueFilter?: FormBusinessFilter) => BusinessCollector;
+    create: (formModel: Form) => BusinessCollector;
 };

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

@@ -1,87 +1,87 @@
+import { isField } from '@formily/core';
 import { isString } from '@vueuse/core';
-import { FIELD_BUSINESS_TYPE, FIELD_AGE_UNIT } from '../constants/index.js';
-import { isIdCard, parseIdCard, parseBirthday } from '../utils/index.js';
+import { isNumber } from 'lodash-es';
+import { FIELD_BUSINESS_TYPE } from '../constants/index.js';
+import { isIdCard, parseIdCard, parseAge2FromContext, parseBirthday, parseAge2Birthday } from '../utils/business.js';
 
 class BusinessCollector {
-  constructor(valueFilter = ({ value }) => value) {
+  constructor(formModel) {
+    this.formModel = formModel;
     this.typeCollector = /* @__PURE__ */ new Map();
     this.fieldNameCollector = /* @__PURE__ */ new Map();
-    this.handlerMap = /* @__PURE__ */ new Map([
+    this.handlerChangeMap = /* @__PURE__ */ new Map([
       [FIELD_BUSINESS_TYPE.ID_CARD, this.handlerIdCardType.bind(this)],
-      [FIELD_BUSINESS_TYPE.BIRTHDAY, this.handlerBirthdayType.bind(this)]
+      [FIELD_BUSINESS_TYPE.AGE_UNIT, this.handlerAgeType.bind(this)]
+    ]);
+    this.blurHandlerMap = /* @__PURE__ */ new Map([
+      [FIELD_BUSINESS_TYPE.BIRTHDAY, this.handlerBirthdayType.bind(this)],
+      [FIELD_BUSINESS_TYPE.AGE, this.handlerAgeType.bind(this)]
     ]);
-    this.valueFilter = valueFilter;
   }
   collect(type, fieldName) {
-    const set = this.typeCollector.get(type) || /* @__PURE__ */ new Set();
-    set.add(fieldName);
-    this.typeCollector.set(type, set);
+    this.typeCollector.set(type, fieldName);
     this.fieldNameCollector.set(fieldName, type);
   }
   getField(type) {
-    return [...this.typeCollector.get(type) || /* @__PURE__ */ new Set()];
+    return this.typeCollector.get(type);
   }
   getType(fieldName) {
     return this.fieldNameCollector.get(fieldName);
   }
-  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: ageUnitFields.length ? value.age : context.year,
-          context,
-          type: FIELD_BUSINESS_TYPE.AGE
-        });
-      });
+  getValueByField(fieldName) {
+    const _field = this.formModel.query(fieldName).take();
+    return isField(_field) ? _field.value : null;
+  }
+  getValueByType(type) {
+    const field = this.getField(type);
+    return field ? this.getValueByField(field) : null;
+  }
+  setValueByType(type, value, force = true) {
+    const field = this.getField(type);
+    field && this.formModel.setFieldState(field, (state) => {
+      if (!force && state.value)
+        return;
+      state.value = value;
     });
   }
-  handlerIdCardType(formModel, value) {
-    if (!value || !isString(value) || !isIdCard(value))
+  handlerIdCardType() {
+    const idCard = this.getValueByType(FIELD_BUSINESS_TYPE.ID_CARD);
+    if (!idCard || !isString(idCard) || !isIdCard(idCard))
       return;
-    const info = parseIdCard(value);
-    this.setAge(formModel, info);
-    const sexFields = this.getField(FIELD_BUSINESS_TYPE.SEX);
-    sexFields.forEach((field) => {
-      formModel.setFieldState(field, (state) => {
-        state.value = this.valueFilter({ fieldKey: field, value: info.sex, type: FIELD_BUSINESS_TYPE.SEX });
-      });
-    });
-    const birthdayFields = this.getField(FIELD_BUSINESS_TYPE.BIRTHDAY);
-    birthdayFields.forEach((field) => {
-      formModel.setFieldState(field, (state) => {
-        state.value = this.valueFilter({ fieldKey: field, value: info.birthday, type: FIELD_BUSINESS_TYPE.BIRTHDAY });
-      });
-    });
+    const info = parseIdCard(idCard);
+    const { age, ageUnit } = parseAge2FromContext(info);
+    this.setValueByType(FIELD_BUSINESS_TYPE.AGE_UNIT, ageUnit);
+    this.setValueByType(FIELD_BUSINESS_TYPE.AGE, age);
+    this.setValueByType(FIELD_BUSINESS_TYPE.SEX, info.sex);
+    this.setValueByType(FIELD_BUSINESS_TYPE.BIRTHDAY, info.birthday);
   }
-  handlerBirthdayType(formModel, value) {
-    if (!isString(value))
+  handlerBirthdayType() {
+    const birthday = this.getValueByType(FIELD_BUSINESS_TYPE.BIRTHDAY);
+    if (!isString(birthday))
       return;
-    this.setAge(formModel, parseBirthday(value));
+    const { age, ageUnit } = parseAge2FromContext(parseBirthday(birthday));
+    this.setValueByType(FIELD_BUSINESS_TYPE.AGE_UNIT, ageUnit);
+    this.setValueByType(FIELD_BUSINESS_TYPE.AGE, age);
   }
-  trigger(formModel, fieldName, value) {
-    const type = this.getType(fieldName);
-    if (!type || !this.handlerMap.has(type))
+  handlerAgeType() {
+    const age = this.getValueByType(FIELD_BUSINESS_TYPE.AGE);
+    const ageUnit = this.getValueByType(FIELD_BUSINESS_TYPE.AGE_UNIT);
+    if (!isString(age) && !isNumber(age) || age === "")
+      return;
+    if (!isString(ageUnit) || ageUnit === "")
       return;
-    this.handlerMap.get(type)(formModel, value);
+    this.setValueByType(FIELD_BUSINESS_TYPE.BIRTHDAY, parseAge2Birthday(+age, ageUnit), false);
+  }
+  trigger(fieldName, triggerType = "change") {
+    var _a;
+    const type = this.getType(fieldName);
+    const handler = triggerType === "change" ? this.handlerChangeMap : triggerType === "blur" ? this.blurHandlerMap : null;
+    type && ((_a = handler == null ? void 0 : handler.get(type)) == null ? void 0 : _a());
   }
 }
 function useBusinessBinding() {
-  function create(valueFilter) {
-    return new BusinessCollector(valueFilter);
+  function create(formModel) {
+    return new BusinessCollector(formModel);
   }
   return { create };
 }

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 } 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"
@@ -202,14 +209,13 @@ function useFieldListAdaptor(collector, uuid) {
       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)] = bindIndex(createLinebarSchema(cur), idx);
-        prevLinebar = fin[createFieldName(cur)].properties = {};
-      } else if (prevLinebar) {
+      if (prevLinebar) {
         prevLinebar[createFieldName(cur)] = bindIndex(createWidgetSchema(cur), idx);
       } else {
-        prevLinebar = null;
-        fin[createFieldName(cur)] = bindIndex(createWidgetSchema(cur), idx);
+        fin[createFieldName(cur)] = bindIndex(createLinebarSchema(cur), idx);
+        if (cur.html_type === "LINEBAR") {
+          prevLinebar = fin[createFieldName(cur)].properties = {};
+        }
       }
       return fin;
     }, {});

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);
   provide(InjectionBusinessCollector, businessCollector);
   const changeContextCollector = useChangeContext().create();
   provide(InjectionChangeContextCollector, changeContextCollector);

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

@@ -2,7 +2,6 @@ import { AnyObject, WithUndefined } from '../../../../../es/src/types';
 import { DataField, Field } from '@formily/core';
 import { ISchema } from '@formily/json-schema/esm/types';
 import { Component, FunctionalComponent } from 'vue';
-import { FIELD_BUSINESS_TYPE } from '../../../../../es/packages/form-render/src/constants';
 import { FieldItem } from '../types';
 import { AsyncQueue } from '../hooks';
 export * from './fieldItem';
@@ -45,12 +44,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,7 +64,6 @@ export declare type FormRenderProps = Partial<{
     parallelism: number;
     schema: ISchema;
     components: Record<string, Component | FunctionalComponent>;
-    businessFilter: FormBusinessFilter;
     scope: AnyObject;
     annotation: AnyObject;
     consumer: boolean;

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,65 @@
+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;
+    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 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 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[];
+};