cnhis-design-vue 3.3.3-release.0 → 3.3.3-release.12

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/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

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

@@ -1,5 +1,5 @@
 import { arrayed, deepOmit } from '../../../../shared/utils/index.js';
-import { cloneDeep, castArray, pick } from 'lodash-es';
+import { cloneDeep, castArray, omit, pick } from 'lodash-es';
 import '../../index.js';
 import { isPositive, isNegative, isValidWidgetCombination, parseNumberFromMaybeString, formRenderLog } from '../utils/index.js';
 import { useFieldNormalize } from './useFieldNormalize.js';
@@ -318,7 +318,10 @@ function useFieldListAdaptor(collector, globProps) {
         hide_title: "1",
         is_show: isNegative(suffix.is_show) ? "0" : item.is_show
       };
-    })];
+    })].map((item2) => {
+      item2.decoratorProps = omit(item2.decoratorProps, ["onClickOutside"]);
+      return item2;
+    });
     const groupSpan = fieldList.reduce((res, item2) => {
       return res + +(item2.elem_width || 3) * 2;
     }, 0);

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

@@ -107,6 +107,7 @@ export declare function useFieldNormalize(): {
         feedbackType: "default" | "tooltip";
         fixMemoLeak: boolean;
         lazyRender: boolean;
+        linebreaksToTitle: boolean;
         dialogFn: any;
     }>], import("../../../../shared/utils/tapable").UnsetAdditionalOptions>;
     FieldListNormalizeWaterfallHook: SyncWaterfallHook<[FieldItem[], Partial<{
@@ -215,6 +216,7 @@ export declare function useFieldNormalize(): {
         feedbackType: "default" | "tooltip";
         fixMemoLeak: boolean;
         lazyRender: boolean;
+        linebreaksToTitle: boolean;
         dialogFn: any;
     }>], import("../../../../shared/utils/tapable").UnsetAdditionalOptions>;
 };

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

@@ -178,6 +178,21 @@ function useFieldNormalize() {
   }) => {
     return fieldList;
   });
+  FieldNormalizeWaterfallHook.tap("__linebreaksToTitle", (fieldItem, {
+    linebreaksToTitle
+  }) => {
+    if (linebreaksToTitle && fieldItem.html_type === "LINE_BREAKS") {
+      Object.assign(fieldItem, {
+        elem_width: 9999,
+        decoratorProps: {
+          showLabel: false
+        },
+        content: fieldItem.alias || fieldItem.name || fieldItem.val_key || "",
+        html_type: "TEXT"
+      });
+    }
+    return fieldItem;
+  });
   FieldListNormalizeWaterfallHook.tap("__prefix/suffix", (fieldList) => {
     const prefixOrSuffixItem = [];
     traverse(fieldList, (fieldItem) => {

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

@@ -41,7 +41,7 @@ function useFormContext(props, emit) {
     scope: Object.assign({}, usePresetScope(), props.scope)
   }).SchemaField;
   provide(InjectionSchemaField, SchemaField);
-  const businessCollector = useBusinessBinding().create(props.businessFormatter);
+  const businessCollector = useBusinessBinding().create(props);
   provide(InjectionBusinessCollector, businessCollector);
   const changeContextCollector = useChangeContext().create();
   provide(InjectionChangeContextCollector, changeContextCollector);

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

@@ -43,7 +43,14 @@ function useFormValidator() {
     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";
+    const message = regular_error_tip || (validate == null ? void 0 : validate.regular_error_tip) || (validate == null ? void 0 : validate.message) || function() {
+      var _a, _b, _c;
+      try {
+        return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.581")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.581")) || "\u683C\u5F0F\u9519\u8BEF";
+      } catch (e) {
+        return "\u683C\u5F0F\u9519\u8BEF";
+      }
+    }();
     return {
       pattern,
       message

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

@@ -29,7 +29,8 @@ function useLowCodeReactions(configListRef, formModel) {
       const targetConfig = (_a = config.setValueField) == null ? void 0 : _a.find((item) => item.field === field.path.toString());
       if (!targetConfig)
         return;
-      field.value = targetConfig.value;
+      const value = targetConfig.value === "null" ? null : targetConfig.value === "undefined" ? void 0 : targetConfig.value;
+      field.value = value;
     })
   };
   function createFieldHandler(cb) {

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

@@ -175,6 +175,7 @@ export type FormRenderProps = Partial<{
     feedbackType: 'tooltip' | 'default';
     fixMemoLeak: boolean;
     lazyRender: boolean;
+    linebreaksToTitle: boolean;
     dialogFn: any;
 }>;
 export type FormBusinessFormatter = (payload: {

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

@@ -7,7 +7,9 @@ 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 parseAgeFromContext(context: AgeContext): {
+export declare function parseAgeFromContext(context: AgeContext & {
+    birthday?: string;
+}, nominalAge?: boolean): {
     ageUnit: FIELD_AGE_UNIT;
     age: number;
 };

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

@@ -174,7 +174,13 @@ function parseAge2Birthday(age, ageUnit, formatter = "yyyy-MM-dd HH:mm") {
     return date;
   }
 }
-function parseAgeFromContext(context) {
+function parseAgeFromContext(context, nominalAge) {
+  if (nominalAge && context.birthday) {
+    return {
+      ageUnit: FIELD_AGE_UNIT.YEAR,
+      age: Math.max(new Date().getFullYear() - new Date(context.birthday).getFullYear(), 1)
+    };
+  }
   const result = context.minutes < 60 ? {
     ageUnit: FIELD_AGE_UNIT.MINUTE,
     age: context.minutes