cnhis-design-vue 3.3.3-beta.7 → 3.3.3-beta.70

package/es/components/form-config/src/hooks/useConfigurationField.js

@@ -1,5 +1,5 @@
-import { omit, pick } from 'lodash-es';
-import { EditAbleField, widgetWidthOptionConfig, isShowOptionConfig, isNotFoldOptionConfig, isEditOptionConfig, isNullOptionConfig, isVisibleOptionConfig, rowsOptionConfig } from '../constants/index.js';
+import { omit, pick, range } from 'lodash-es';
+import { EditAbleField, widgetWidthOptionConfig, isShowOptionConfig, isNotFoldOptionConfig, isEditOptionConfig, isNullOptionConfig, isVisibleOptionConfig, rowsOptionConfig, dateFormatOptionConfig, dateConditionOptionConfig, dateUnitOptionConfig } from '../constants/index.js';
 import { useFormConfigLocale } from './useLocale.js';
 import '../../../form-render/index.js';
 import { useFieldNormalize } from '../../../form-render/src/hooks/useFieldNormalize.js';
@@ -73,7 +73,7 @@ function useConfigurationField() {
     elem_width: 6,
     is_edit: (formConfigItem == null ? void 0 : formConfigItem.editableDisabled) ? "0" : "1",
     ...isEditOptionConfig()
-  })], [EditAbleField.CONFIRM, (formConfigItem) => ({
+  })], [EditAbleField.CONFIRM, () => ({
     alias: useFormConfigLocale("configArea.confirm"),
     html_type: "SWITCH",
     elem_width: 6,
@@ -117,7 +117,48 @@ function useConfigurationField() {
     elem_width: 6,
     default_val: false,
     html_type: "SWITCH"
-  })]]);
+  })], [EditAbleField.ALLOW_PARTIAL, () => ({
+    alias: useFormConfigLocale("configArea.allowPartial"),
+    elem_width: 6,
+    html_type: "SWITCH"
+  })], [EditAbleField.PARTIAL_LEVEL, (field) => {
+    var _a, _b;
+    return {
+      alias: useFormConfigLocale("configArea.partialLevel"),
+      elem_width: 6,
+      html_type: "SELECT",
+      componentProps: {
+        options: range((_b = (_a = field == null ? void 0 : field.elementExtraSetting) == null ? void 0 : _a.maxLevel) != null ? _b : 10).map((item) => ({
+          text: item + 1 + "",
+          value: item + 1
+        }))
+      }
+    };
+  }], [EditAbleField.DATE_FORMAT, () => ({
+    alias: useFormConfigLocale("configArea.dateFormat"),
+    elem_width: 6,
+    html_type: "SELECT",
+    ...dateFormatOptionConfig()
+  })], [EditAbleField.DATE_DEFAULT_VALUE_CONDITION, () => createDateField(EditAbleField.DATE_DEFAULT_VALUE_CONDITION, EditAbleField.DATE_DEFAULT_VALUE_UNIT, EditAbleField.DATE_DEFAULT_VALUE_VALUE, useFormConfigLocale("configArea.dateDefaultValue"))], [EditAbleField.DATE_MAX_VALUE_CONDITION, () => createDateField(EditAbleField.DATE_MAX_VALUE_CONDITION, EditAbleField.DATE_MAX_VALUE_UNIT, EditAbleField.DATE_MAX_VALUE_VALUE, useFormConfigLocale("configArea.dateMaxValue"))], [EditAbleField.DATE_MIN_VALUE_CONDITION, () => createDateField(EditAbleField.DATE_MIN_VALUE_CONDITION, EditAbleField.DATE_MIN_VALUE_UNIT, EditAbleField.DATE_MIN_VALUE_VALUE, useFormConfigLocale("configArea.dateMinValue"))]]);
+  function createDateField(conditionKey, unitKey, valueKey, alias) {
+    return {
+      val_key: conditionKey,
+      alias,
+      elem_width: 16,
+      html_type: "SELECT",
+      ...dateConditionOptionConfig(),
+      suffixConfig: [{
+        val_key: valueKey,
+        elem_width: 12,
+        html_type: "INPUT"
+      }, {
+        val_key: unitKey,
+        elem_width: 10,
+        html_type: "SELECT",
+        ...dateUnitOptionConfig()
+      }]
+    };
+  }
   function generateFieldListByKeys(keyList, formConfigItem, fieldItem) {
     return keyList.map((key) => {
       var _a, _b;
@@ -130,11 +171,17 @@ function useConfigurationField() {
   const htmlMap = new Map([["LINE_BAR", [EditAbleField.KEY, EditAbleField.NAME, EditAbleField.ALIAS, EditAbleField.LAYOUT_WIDTH_ENUM, EditAbleField.NOTES, EditAbleField.DEFAULT_EXPAND, EditAbleField.FOLD]], ["NEWLINE", [EditAbleField.KEY, EditAbleField.NAME, EditAbleField.ALIAS]], ...["COMPLEX", "COMBINATION"].map((key) => [key, [EditAbleField.KEY, EditAbleField.NAME, EditAbleField.ALIAS, EditAbleField.LAYOUT_WIDTH_ENUM]])]);
   const defaultItems = [EditAbleField.KEY, EditAbleField.NAME, EditAbleField.ALIAS, EditAbleField.DEFAULT_VALUE, EditAbleField.LAYOUT_WIDTH_ENUM, EditAbleField.DESC, EditAbleField.NOTES, EditAbleField.EDITABLE, EditAbleField.CONFIRM, EditAbleField.REQUIRED, EditAbleField.SHOW, EditAbleField.TITLE_RED];
   function generateFieldListByFormConfigItem(formConfigItem, fieldItem) {
-    var _a;
-    const keys = htmlMap.get(formConfigItem.type) || defaultItems;
+    var _a, _b, _c, _d, _e;
+    const keys = [...htmlMap.get(formConfigItem.type) || defaultItems];
     if ((fieldItem ? fieldItem.html_type : (_a = formConfigItem.originalSetting) == null ? void 0 : _a.html_type) === "TEXTAREA") {
       keys.splice(3, 0, EditAbleField.ROWS);
     }
+    if (["SEARCH_CASCADE", "LEVEL_SEARCH_CASCADE", "LEVEL_SEARCH_CASCADE2"].includes(fieldItem ? fieldItem.html_type : (_c = (_b = formConfigItem.originalSetting) == null ? void 0 : _b.html_type) != null ? _c : "")) {
+      keys.splice(9, 0, EditAbleField.ALLOW_PARTIAL, EditAbleField.PARTIAL_LEVEL);
+    }
+    if (["DATE"].includes(fieldItem ? fieldItem.html_type : (_e = (_d = formConfigItem.originalSetting) == null ? void 0 : _d.html_type) != null ? _e : "")) {
+      keys.splice(keys.indexOf(EditAbleField.DEFAULT_VALUE), 1, EditAbleField.DATE_FORMAT, EditAbleField.DATE_DEFAULT_VALUE_CONDITION, EditAbleField.DATE_MIN_VALUE_CONDITION, EditAbleField.DATE_MAX_VALUE_CONDITION);
+    }
     return generateFieldListByKeys(keys, formConfigItem, fieldItem);
   }
   return {

package/es/components/form-config/src/hooks/useLocale.d.ts

@@ -35,10 +35,16 @@ declare const formConfigLocale: {
         rowsTips: string;
         confirm: string;
         titleRed: string;
+        allowPartial: string;
+        partialLevel: string;
         positiveBtn: string;
         negativeBtn: string;
         fullLine: string;
         halfLine: string;
+        dateFormat: string;
+        dateDefaultValue: string;
+        dateMinValue: string;
+        dateMaxValue: string;
         toString: () => string;
     };
 };

package/es/components/form-config/src/hooks/useLocale.js

@@ -224,6 +224,8 @@ const formConfigLocale = reactive({
     }(),
     confirm: "\u662F\u5426\u5728\u4FEE\u6539\u503C\u540E\u5F39\u7A97\u63D0\u9192",
     titleRed: "\u6807\u9898\u663E\u793A\u7EA2\u8272",
+    allowPartial: "\u5141\u8BB8\u9009\u62E9\u4E2D\u95F4\u5C42\u7EA7",
+    partialLevel: "\u81F3\u5C11\u9009\u62E9\u591A\u5C11\u7EA7",
     positiveBtn: function() {
       var _a, _b, _c;
       try {
@@ -256,6 +258,38 @@ const formConfigLocale = reactive({
         return "\u534A\u884C";
       }
     }(),
+    dateFormat: function() {
+      var _a, _b, _c;
+      try {
+        return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.541")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.541")) || "\u65E5\u671F\u683C\u5F0F";
+      } catch (e) {
+        return "\u65E5\u671F\u683C\u5F0F";
+      }
+    }(),
+    dateDefaultValue: function() {
+      var _a, _b, _c;
+      try {
+        return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.12")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.12")) || "\u9ED8\u8BA4\u503C";
+      } catch (e) {
+        return "\u9ED8\u8BA4\u503C";
+      }
+    }(),
+    dateMinValue: function() {
+      var _a, _b, _c;
+      try {
+        return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.372")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.372")) || "\u6700\u5C0F\u503C";
+      } catch (e) {
+        return "\u6700\u5C0F\u503C";
+      }
+    }(),
+    dateMaxValue: function() {
+      var _a, _b, _c;
+      try {
+        return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.373")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.373")) || "\u6700\u5927\u503C";
+      } catch (e) {
+        return "\u6700\u5927\u503C";
+      }
+    }(),
     toString() {
       return this.areaName;
     }

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

@@ -21,6 +21,8 @@ export type FormConfigBeforeMovePayload = {
 export type FormConfigHooks = {
     beforeMove?: (payload: FormConfigBeforeMovePayload) => void | boolean;
 };
+type UnitType = 'HOUR' | 'DAY' | 'WEEK' | 'MONTH' | 'QUARTER' | 'YEAR' | '';
+type ConditionType = '0' | 'IN_THE_PAST' | 'IN_THE_FUTURE' | 'CURRENT_TIME';
 export type FormConfigWidth = 'ALL_LINE' | 'HALF_LINE' | 'FIVE_SIX' | 'TWO_THREE' | 'ONE_THREE' | 'THREE_FOUR' | 'ONE_FOUR' | 'ONE_SIX' | 'ONE_EIGHT';
 export type FormConfigItem = {
     key: string;
@@ -48,6 +50,16 @@ export type FormConfigItem = {
         text: string;
         value: string;
     }[];
+    elementExtraSetting: Partial<{
+        allowPartial: boolean;
+        partialLevel: number;
+        maxLevel: number;
+        dateFormat: string;
+    } & Record<'defaultValue' | 'minValue' | 'maxValue', {
+        condition: ConditionType;
+        unit: UnitType;
+        value: string;
+    }>>;
     __new: boolean;
     __isCombinationChild: boolean;
     __extra: boolean;

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

@@ -38,6 +38,10 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{}, {
         businessFormatter: {
             type: import("vue").PropType<import("./src/types").FormBusinessFormatter>;
         };
+        nominalAge: {
+            type: BooleanConstructor;
+            default: boolean;
+        };
         schema: {
             type: import("vue").PropType<import("@formily/json-schema").Stringify<{
                 [key: symbol]: any;
@@ -210,6 +214,7 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{}, {
             type: BooleanConstructor;
         };
         lazyRender: BooleanConstructor;
+        linebreaksToTitle: BooleanConstructor;
         dialogFn: {};
     }, {
         props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
@@ -242,6 +247,10 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{}, {
             businessFormatter: {
                 type: import("vue").PropType<import("./src/types").FormBusinessFormatter>;
             };
+            nominalAge: {
+                type: BooleanConstructor;
+                default: boolean;
+            };
             schema: {
                 type: import("vue").PropType<import("@formily/json-schema").Stringify<{
                     [key: symbol]: any;
@@ -414,6 +423,7 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{}, {
                 type: BooleanConstructor;
             };
             lazyRender: BooleanConstructor;
+            linebreaksToTitle: BooleanConstructor;
             dialogFn: {};
         }>> & {
             onFormChange?: ((...args: any[]) => any) | undefined;
@@ -591,6 +601,7 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{}, {
             feedbackType: "default" | "tooltip";
             fixMemoLeak: boolean;
             lazyRender: boolean;
+            linebreaksToTitle: boolean;
             dialogFn: any;
         }>) => Record<string, import("@formily/json-schema").Stringify<{
             [key: symbol]: any;
@@ -807,6 +818,10 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{}, {
         businessFormatter: {
             type: import("vue").PropType<import("./src/types").FormBusinessFormatter>;
         };
+        nominalAge: {
+            type: BooleanConstructor;
+            default: boolean;
+        };
         schema: {
             type: import("vue").PropType<import("@formily/json-schema").Stringify<{
                 [key: symbol]: any;
@@ -979,6 +994,7 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{}, {
             type: BooleanConstructor;
         };
         lazyRender: BooleanConstructor;
+        linebreaksToTitle: BooleanConstructor;
         dialogFn: {};
     }>> & {
         onFormChange?: ((...args: any[]) => any) | undefined;
@@ -1013,6 +1029,8 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{}, {
         feedbackType: "default" | "tooltip";
         fixMemoLeak: boolean;
         lazyRender: boolean;
+        linebreaksToTitle: boolean;
+        nominalAge: boolean;
         operationalFormInit: boolean;
         incrementalRender: boolean;
     }>;

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

@@ -33,6 +33,10 @@ declare const _default: import("vue").DefineComponent<{
     businessFormatter: {
         type: PropType<FormBusinessFormatter>;
     };
+    nominalAge: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     schema: {
         type: PropType<import("@formily/vue").Stringify<{
             [key: symbol]: any;
@@ -205,6 +209,7 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
     };
     lazyRender: BooleanConstructor;
+    linebreaksToTitle: BooleanConstructor;
     dialogFn: {};
 }, {
     props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
@@ -237,6 +242,10 @@ declare const _default: import("vue").DefineComponent<{
         businessFormatter: {
             type: PropType<FormBusinessFormatter>;
         };
+        nominalAge: {
+            type: BooleanConstructor;
+            default: boolean;
+        };
         schema: {
             type: PropType<import("@formily/vue").Stringify<{
                 [key: symbol]: any;
@@ -409,6 +418,7 @@ declare const _default: import("vue").DefineComponent<{
             type: BooleanConstructor;
         };
         lazyRender: BooleanConstructor;
+        linebreaksToTitle: BooleanConstructor;
         dialogFn: {};
     }>> & {
         onFormChange?: ((...args: any[]) => any) | undefined;
@@ -586,6 +596,7 @@ declare const _default: import("vue").DefineComponent<{
         feedbackType: "default" | "tooltip";
         fixMemoLeak: boolean;
         lazyRender: boolean;
+        linebreaksToTitle: boolean;
         dialogFn: any;
     }>) => Record<string, import("@formily/vue").Stringify<{
         [key: symbol]: any;
@@ -802,6 +813,10 @@ declare const _default: import("vue").DefineComponent<{
     businessFormatter: {
         type: PropType<FormBusinessFormatter>;
     };
+    nominalAge: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     schema: {
         type: PropType<import("@formily/vue").Stringify<{
             [key: symbol]: any;
@@ -974,6 +989,7 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
     };
     lazyRender: BooleanConstructor;
+    linebreaksToTitle: BooleanConstructor;
     dialogFn: {};
 }>> & {
     onFormChange?: ((...args: any[]) => any) | undefined;
@@ -1008,6 +1024,8 @@ declare const _default: import("vue").DefineComponent<{
     feedbackType: "default" | "tooltip";
     fixMemoLeak: boolean;
     lazyRender: boolean;
+    linebreaksToTitle: boolean;
+    nominalAge: boolean;
     operationalFormInit: boolean;
     incrementalRender: boolean;
 }>;

package/es/components/form-render/src/FormRender.vue2.js

@@ -89,6 +89,10 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     businessFormatter: {
       type: Function
     },
+    nominalAge: {
+      type: Boolean,
+      default: false
+    },
     schema: {
       type: Object
     },
@@ -193,6 +197,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       type: Boolean
     },
     lazyRender: Boolean,
+    linebreaksToTitle: Boolean,
     dialogFn: {}
   },
   emits: [

package/es/components/form-render/src/FormRenderWrapper.vue.d.ts

@@ -36,6 +36,10 @@ declare const _default: import("vue").DefineComponent<{}, {
         businessFormatter: {
             type: import("vue").PropType<import("../../../components/form-render").FormBusinessFormatter>;
         };
+        nominalAge: {
+            type: BooleanConstructor;
+            default: boolean;
+        };
         schema: {
             type: import("vue").PropType<import("@formily/json-schema").Stringify<{
                 [key: symbol]: any;
@@ -208,6 +212,7 @@ declare const _default: import("vue").DefineComponent<{}, {
             type: BooleanConstructor;
         };
         lazyRender: BooleanConstructor;
+        linebreaksToTitle: BooleanConstructor;
         dialogFn: {};
     }, {
         props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
@@ -240,6 +245,10 @@ declare const _default: import("vue").DefineComponent<{}, {
             businessFormatter: {
                 type: import("vue").PropType<import("../../../components/form-render").FormBusinessFormatter>;
             };
+            nominalAge: {
+                type: BooleanConstructor;
+                default: boolean;
+            };
             schema: {
                 type: import("vue").PropType<import("@formily/json-schema").Stringify<{
                     [key: symbol]: any;
@@ -412,6 +421,7 @@ declare const _default: import("vue").DefineComponent<{}, {
                 type: BooleanConstructor;
             };
             lazyRender: BooleanConstructor;
+            linebreaksToTitle: BooleanConstructor;
             dialogFn: {};
         }>> & {
             onFormChange?: ((...args: any[]) => any) | undefined;
@@ -589,6 +599,7 @@ declare const _default: import("vue").DefineComponent<{}, {
             feedbackType: "default" | "tooltip";
             fixMemoLeak: boolean;
             lazyRender: boolean;
+            linebreaksToTitle: boolean;
             dialogFn: any;
         }>) => Record<string, import("@formily/json-schema").Stringify<{
             [key: symbol]: any;
@@ -805,6 +816,10 @@ declare const _default: import("vue").DefineComponent<{}, {
         businessFormatter: {
             type: import("vue").PropType<import("../../../components/form-render").FormBusinessFormatter>;
         };
+        nominalAge: {
+            type: BooleanConstructor;
+            default: boolean;
+        };
         schema: {
             type: import("vue").PropType<import("@formily/json-schema").Stringify<{
                 [key: symbol]: any;
@@ -977,6 +992,7 @@ declare const _default: import("vue").DefineComponent<{}, {
             type: BooleanConstructor;
         };
         lazyRender: BooleanConstructor;
+        linebreaksToTitle: BooleanConstructor;
         dialogFn: {};
     }>> & {
         onFormChange?: ((...args: any[]) => any) | undefined;
@@ -1011,6 +1027,8 @@ declare const _default: import("vue").DefineComponent<{}, {
         feedbackType: "default" | "tooltip";
         fixMemoLeak: boolean;
         lazyRender: boolean;
+        linebreaksToTitle: boolean;
+        nominalAge: boolean;
         operationalFormInit: boolean;
         incrementalRender: boolean;
     }>;

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

@@ -27,6 +27,7 @@ export declare const FORM_ITEM: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
+    onClickOutside: PropType<(...args: any[]) => void>;
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     label: StringConstructor;
     propertyKey: StringConstructor;
@@ -54,6 +55,7 @@ export declare const FORM_ITEM: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
+    onClickOutside: PropType<(...args: any[]) => void>;
 }>>, {
     showFeedback: boolean;
     span: number;

package/es/components/form-render/src/components/renderer/formItem.js

@@ -3,7 +3,7 @@ import { arrayed, getStringWidth, widthAppend } from '../../../../../shared/util
 import { isVoidField } from '@formily/core';
 import { observe, autorun } from '@formily/reactive';
 import { connect, mapProps } from '@formily/vue';
-import { useDebounceFn } from '@vueuse/core';
+import { useDebounceFn, onClickOutside } from '@vueuse/core';
 import { isString, isArray, isObject, isNumber, isFunction, uniq } from 'lodash-es';
 import { NFormItem, NTooltip, NButton } from 'naive-ui';
 import Annotation from '../../../../annotation-edit/index.js';
@@ -43,7 +43,8 @@ const script = /* @__PURE__ */ defineComponent({
     showTooltipFeedback: {
       type: Boolean,
       default: true
-    }
+    },
+    onClickOutside: Function
   },
   setup(props, {
     slots,
@@ -133,7 +134,14 @@ const script = /* @__PURE__ */ defineComponent({
         }, {
           default: () => [createVNode("span", {
             "style": "display:inline-block;margin-left:4px"
-          }, [createTextVNode("\u63D0\u793A")])]
+          }, [createTextVNode(function() {
+            var _a, _b, _c;
+            try {
+              return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.589")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.589")) || "\u63D0\u793A";
+            } catch (e) {
+              return "\u63D0\u793A";
+            }
+          }())])]
         }),
         default: () => {
           var _a, _b;
@@ -319,8 +327,14 @@ const script = /* @__PURE__ */ defineComponent({
         return props.showFeedback;
       return !!props.feedback && props.feedback !== " " && props.showFeedback;
     });
+    const formItemRef = ref();
+    props.onClickOutside && onClickOutside(formItemRef, (event) => {
+      var _a;
+      return (_a = props.onClickOutside) == null ? void 0 : _a.call(props, event);
+    });
     return () => {
       return createVNode(NFormItem, mergeProps({
+        "ref": formItemRef,
         "class": ["form-render__formItem", {
           "form-render--no-border": !borderedRef.value,
           "form-render--underline": borderedRef.value === "underline",

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

@@ -112,8 +112,10 @@ const script = /* @__PURE__ */ defineComponent({
       if (!props.validateLastNode || !isField(field.value))
         return;
       const tempValidator = field.value.validator ? castArray(field.value.validator) : [];
-      if (tempValidator.some((item) => isObject(item) && item.isLastOptionValidator))
-        return;
+      const lastOptionValidatorIndex = tempValidator.findIndex((item) => isObject(item) && item.isLastOptionValidator);
+      if (lastOptionValidatorIndex !== -1) {
+        tempValidator.splice(lastOptionValidatorIndex, 1);
+      }
       field.value.validator = [{
         async validator() {
           var _a;

package/es/components/form-render/src/components/renderer/lineBar/FormCollapse.vue.d.ts

@@ -159,6 +159,7 @@ declare const _default: import("vue").DefineComponent<{
         feedbackType: "default" | "tooltip";
         fixMemoLeak: boolean;
         lazyRender: boolean;
+        linebreaksToTitle: boolean;
         dialogFn: any;
     }>>;
     isVerticalLinebar: import("vue").ComputedRef<boolean>;

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

@@ -158,6 +158,7 @@ export declare const LINEBAR: import("@vue/runtime-core").DefineComponent<{
         feedbackType: "default" | "tooltip";
         fixMemoLeak: boolean;
         lazyRender: boolean;
+        linebreaksToTitle: boolean;
         dialogFn: any;
     }>>;
     isVerticalLinebar: import("vue").ComputedRef<boolean>;

package/es/components/form-render/src/components/renderer/radio_checkbox.js

@@ -153,7 +153,8 @@ function createComponent(name, Wrapper, Item) {
         return createVNode(NCheckbox, {
           "checked": selectAllState.value,
           "onUpdate:checked": ($event) => selectAllState.value = $event,
-          "indeterminate": indeterminate.value
+          "indeterminate": indeterminate.value,
+          "disabled": attrs.disabled
         }, {
           default: () => function() {
             var _a, _b, _c;
@@ -168,7 +169,7 @@ function createComponent(name, Wrapper, Item) {
       const {
         getFieldItem
       } = useFormField();
-      function renderOption(option) {
+      function renderOption(option, index, options) {
         var _a;
         let _slot;
         const childInnerWidthMode = option.__spanPercent && props.childWidthMode === "inner";
@@ -176,6 +177,7 @@ function createComponent(name, Wrapper, Item) {
           display: "flex",
           alignItems: "center"
         };
+        const classList = [];
         if (childInnerWidthMode) {
           const percentWidth = `${option.__spanPercent}%`;
           style.maxWidth = percentWidth;
@@ -183,6 +185,9 @@ function createComponent(name, Wrapper, Item) {
             style.width = percentWidth;
           }
         }
+        if (index === options.length - 1) {
+          classList.push("form-render__lastOption");
+        }
         return createVNode(Item, {
           "key": option[valueKey.value],
           "value": option[valueKey.value],
@@ -191,7 +196,8 @@ function createComponent(name, Wrapper, Item) {
           "cancelable": props.clearable,
           "showType": ((_a = getFieldItem()) == null ? void 0 : _a.selected_style) === "CHECK_MARK" ? "checkbox" : "",
           "onCancel": onCancel,
-          "style": style
+          "style": style,
+          "class": classList
         }, _isSlot(_slot = renderComplexOption({
           value: valueRef.value,
           option,

package/es/components/form-render/src/components/renderer/searchCascade.js

@@ -253,6 +253,7 @@ const script = /* @__PURE__ */ defineComponent({
       target.dispatchEvent(new CustomEvent("scroll"));
     }
     function filterValue(pattern, option) {
+      var _a;
       if (!pattern || !option)
         return false;
       const {
@@ -260,6 +261,8 @@ const script = /* @__PURE__ */ defineComponent({
       } = option;
       if (props.checkStrategy.includes("child") && option.depth < maxDepthValue.value)
         return false;
+      if (!mergeItemValue)
+        return (_a = option[labelKey.value]) == null ? void 0 : _a.includes(pattern.trim());
       return mergeItemValue.length > 0 && mergeItemValue.some((item) => item.includes(pattern.trim()));
     }
     const {

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

@@ -2,12 +2,18 @@ import { Form } from '@formily/core';
 import { FieldItem, FormBusinessFormatter } from '../../../../components/form-render';
 import { FIELD_BUSINESS_TYPE } from '../constants';
 export declare class BusinessCollector {
-    private businessFormatter?;
+    options: {
+        businessFormatter?: FormBusinessFormatter;
+        nominalAge?: boolean;
+    };
     triggerDisabled: boolean | string;
     private readonly typeLockMap;
     private readonly typeCollector;
     private readonly fieldNameCollector;
-    constructor(businessFormatter?: FormBusinessFormatter | undefined);
+    constructor(options: {
+        businessFormatter?: FormBusinessFormatter;
+        nominalAge?: boolean;
+    });
     private formatter;
     collect(type: FIELD_BUSINESS_TYPE, fieldItem: FieldItem): void;
     getField(type: FIELD_BUSINESS_TYPE): FieldItem | undefined;
@@ -21,5 +27,8 @@ export declare class BusinessCollector {
     trigger(formModel: Form, fieldName: string, triggerType?: 'change' | 'blur'): Map<FIELD_BUSINESS_TYPE, number> | undefined;
 }
 export declare function useBusinessBinding(): {
-    create: (formatter?: FormBusinessFormatter) => BusinessCollector;
+    create: (options: {
+        businessFormatter?: FormBusinessFormatter;
+        nominalAge?: boolean;
+    }) => BusinessCollector;
 };

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

@@ -14,8 +14,8 @@ import { isIdCard, parseIdCard, parseAgeFromContext, parseBirthday, parseAge2Bir
 import '../../index.js';
 
 class BusinessCollector {
-  constructor(businessFormatter) {
-    this.businessFormatter = businessFormatter;
+  constructor(options) {
+    this.options = options;
     this.triggerDisabled = false;
     this.typeLockMap = /* @__PURE__ */ new Map();
     this.typeCollector = /* @__PURE__ */ new Map();
@@ -23,7 +23,7 @@ class BusinessCollector {
     this.changeHandlerMap = /* @__PURE__ */ new Map([]);
   }
   formatter(...args) {
-    return isFunction(this.businessFormatter) ? this.businessFormatter(...args) : args[0].value;
+    return isFunction(this.options.businessFormatter) ? this.options.businessFormatter(...args) : args[0].value;
   }
   collect(type, fieldItem) {
     this.typeCollector.set(type, fieldItem);
@@ -99,7 +99,7 @@ function useBusinessBinding() {
     const {
       age,
       ageUnit
-    } = parseAgeFromContext(info);
+    } = parseAgeFromContext(info, this.options.nominalAge);
     ageUnit != null && this.setValueByType(formModel, FIELD_BUSINESS_TYPE.AGE_UNIT, ageUnit, FIELD_BUSINESS_TYPE.ID_CARD);
     age != null && this.setValueByType(formModel, FIELD_BUSINESS_TYPE.AGE, age, FIELD_BUSINESS_TYPE.ID_CARD);
     info.sex != null && this.setValueByType(formModel, FIELD_BUSINESS_TYPE.SEX, info.sex, FIELD_BUSINESS_TYPE.ID_CARD);
@@ -112,7 +112,7 @@ function useBusinessBinding() {
     const {
       age,
       ageUnit
-    } = parseAgeFromContext(parseBirthday(birthday));
+    } = parseAgeFromContext(parseBirthday(birthday), this.options.nominalAge);
     this.setValueByType(formModel, FIELD_BUSINESS_TYPE.AGE_UNIT, ageUnit, FIELD_BUSINESS_TYPE.BIRTHDAY);
     this.setValueByType(formModel, FIELD_BUSINESS_TYPE.AGE, age, FIELD_BUSINESS_TYPE.BIRTHDAY);
   }
@@ -127,8 +127,8 @@ function useBusinessBinding() {
       this.setValueByType(formModel, FIELD_BUSINESS_TYPE.BIRTHDAY, parseAge2Birthday(+age, ageUnit, getBirthdayFormat.call(this)), from);
     };
   }
-  function create(formatter) {
-    return new BusinessCollector(formatter).registerChangeBusiness(FIELD_BUSINESS_TYPE.ID_CARD, handlerIdCardType).registerChangeBusiness(FIELD_BUSINESS_TYPE.AGE_UNIT, createHandlerAgeType(FIELD_BUSINESS_TYPE.AGE_UNIT)).registerChangeBusiness(FIELD_BUSINESS_TYPE.AGE, createHandlerAgeType(FIELD_BUSINESS_TYPE.AGE)).registerChangeBusiness(FIELD_BUSINESS_TYPE.BIRTHDAY, handlerBirthdayType);
+  function create(options) {
+    return new BusinessCollector(options).registerChangeBusiness(FIELD_BUSINESS_TYPE.ID_CARD, handlerIdCardType).registerChangeBusiness(FIELD_BUSINESS_TYPE.AGE_UNIT, createHandlerAgeType(FIELD_BUSINESS_TYPE.AGE_UNIT)).registerChangeBusiness(FIELD_BUSINESS_TYPE.AGE, createHandlerAgeType(FIELD_BUSINESS_TYPE.AGE)).registerChangeBusiness(FIELD_BUSINESS_TYPE.BIRTHDAY, handlerBirthdayType);
   }
   return {
     create