cnhis-design-vue 3.1.12-beta.3 → 3.1.12-beta.4

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

@@ -13,6 +13,7 @@ export declare enum FIELD_BUSINESS_TYPE {
     PASSWORD = "password",
     ID_CARD = "id_card",
     AGE = "age",
+    AGE_UNIT = "age_unit",
     MOBILE = "mobile",
     TELEPHONE = "telephone",
     EMAIL = "email",
@@ -28,3 +29,11 @@ export declare enum FIELD_SEX_VALUE {
     MALE = "1",
     FEMALE = "2"
 }
+export declare enum FIELD_AGE_UNIT {
+    DAY = "D",
+    MONTH = "M",
+    YEAR = "Y",
+    HOUR = "H",
+    WEEK = "W",
+    MINUTE = "N"
+}

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

@@ -9,6 +9,7 @@ var FIELD_BUSINESS_TYPE = /* @__PURE__ */ ((FIELD_BUSINESS_TYPE2) => {
   FIELD_BUSINESS_TYPE2["PASSWORD"] = "password";
   FIELD_BUSINESS_TYPE2["ID_CARD"] = "id_card";
   FIELD_BUSINESS_TYPE2["AGE"] = "age";
+  FIELD_BUSINESS_TYPE2["AGE_UNIT"] = "age_unit";
   FIELD_BUSINESS_TYPE2["MOBILE"] = "mobile";
   FIELD_BUSINESS_TYPE2["TELEPHONE"] = "telephone";
   FIELD_BUSINESS_TYPE2["EMAIL"] = "email";
@@ -26,5 +27,14 @@ var FIELD_SEX_VALUE = /* @__PURE__ */ ((FIELD_SEX_VALUE2) => {
   FIELD_SEX_VALUE2["FEMALE"] = "2";
   return FIELD_SEX_VALUE2;
 })(FIELD_SEX_VALUE || {});
+var FIELD_AGE_UNIT = /* @__PURE__ */ ((FIELD_AGE_UNIT2) => {
+  FIELD_AGE_UNIT2["DAY"] = "D";
+  FIELD_AGE_UNIT2["MONTH"] = "M";
+  FIELD_AGE_UNIT2["YEAR"] = "Y";
+  FIELD_AGE_UNIT2["HOUR"] = "H";
+  FIELD_AGE_UNIT2["WEEK"] = "W";
+  FIELD_AGE_UNIT2["MINUTE"] = "N";
+  return FIELD_AGE_UNIT2;
+})(FIELD_AGE_UNIT || {});
 
-export { FIELD_BUSINESS_TYPE, FIELD_SEX_VALUE, FormItemLineBarDepKeyPrepend, InjectAsyncQueue, InjectionBusinessCollector, InjectionChangeContextCollector, InjectionFormItemDepsCollector, InjectionFormUUID, InjectionSchemaField };
+export { FIELD_AGE_UNIT, FIELD_BUSINESS_TYPE, FIELD_SEX_VALUE, FormItemLineBarDepKeyPrepend, InjectAsyncQueue, InjectionBusinessCollector, InjectionChangeContextCollector, InjectionFormItemDepsCollector, InjectionFormUUID, InjectionSchemaField };

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

@@ -9,6 +9,7 @@ export declare class BusinessCollector {
     collect(type: FIELD_BUSINESS_TYPE, fieldName: string): void;
     getField(type: FIELD_BUSINESS_TYPE): string[];
     getType(fieldName: string): FIELD_BUSINESS_TYPE | undefined;
+    private setAge;
     private handlerIdCardType;
     private handlerBirthdayType;
     handlerMap: Map<FIELD_BUSINESS_TYPE, (formModel: Form, value: unknown) => void>;

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

@@ -1,5 +1,5 @@
 import { isString } from '@vueuse/core';
-import { FIELD_BUSINESS_TYPE } from '../constants/index.js';
+import { FIELD_BUSINESS_TYPE, FIELD_AGE_UNIT } from '../constants/index.js';
 import { isIdCard, parseIdCard, parseBirthday } from '../utils/index.js';
 
 class BusinessCollector {
@@ -24,21 +24,36 @@ class BusinessCollector {
   getType(fieldName) {
     return this.fieldNameCollector.get(fieldName);
   }
-  handlerIdCardType(formModel, value) {
-    if (!value || !isString(value) || !isIdCard(value))
-      return;
-    const info = parseIdCard(value);
+  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: info.age,
-          context: info,
+          value: ageUnitFields.length ? value.age : context.year,
+          context,
           type: FIELD_BUSINESS_TYPE.AGE
         });
       });
     });
+  }
+  handlerIdCardType(formModel, value) {
+    if (!value || !isString(value) || !isIdCard(value))
+      return;
+    const info = parseIdCard(value);
+    this.setAge(formModel, info);
     const sexFields = this.getField(FIELD_BUSINESS_TYPE.SEX);
     sexFields.forEach((field) => {
       formModel.setFieldState(field, (state) => {
@@ -55,18 +70,7 @@ class BusinessCollector {
   handlerBirthdayType(formModel, value) {
     if (!isString(value))
       return;
-    const ageFields = this.getField(FIELD_BUSINESS_TYPE.AGE);
-    ageFields.forEach((field) => {
-      const context = parseBirthday(value);
-      formModel.setFieldState(field, (state) => {
-        state.value = this.valueFilter({
-          fieldKey: field,
-          value: context.year,
-          context,
-          type: FIELD_BUSINESS_TYPE.AGE
-        });
-      });
-    });
+    this.setAge(formModel, parseBirthday(value));
   }
   trigger(formModel, fieldName, value) {
     const type = this.getType(fieldName);

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

@@ -1,8 +1,11 @@
+import { FIELD_BUSINESS_TYPE } from '../../../../packages/form-render/src/constants';
+
 function useTypeNormalize() {
   function normalizeAgeField(item) {
     item.html_type = "INPUT_NUMBER";
     item.suffixConfig = [
       {
+        validate: { obj_type: FIELD_BUSINESS_TYPE.AGE_UNIT },
         val_key: item.val_key_unit,
         html_type: "SELECT",
         option: item.option

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

@@ -19,7 +19,8 @@ export interface FormAsyncQueueItem {
     params?: AnyObject;
 }
 export declare type FormAsyncQueue = AsyncQueue<FormAsyncQueueItem, any, AnyObject[]>;
-export declare type IdCardParseInfo = Record<'sex' | 'birthday', string> & Record<'age' | 'day' | 'month' | 'year', number>;
+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>;
     getFormValues(): AnyObject;

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

@@ -2,7 +2,7 @@ import { AnyObject } from '../../../../../es/src/types';
 import { ISchema } from '@formily/json-schema/esm/types';
 import { GeneralField } from '@formily/core';
 import { InjectionKey } from 'vue';
-import { IdCardParseInfo } from '../types';
+import { AgeContext, IdCardParseInfo } from '../types';
 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): {
@@ -11,7 +11,7 @@ export declare function assignUpdateValue(props: AnyObject, field: GeneralField)
 export declare function transformDateFormat(format: string): "date" | "datetime";
 export declare function isIdCard(idCardNo: string): boolean;
 export declare function isMobile(mobile: string): boolean;
-export declare function parseBirthday(birthday: string): Record<string, any>;
+export declare function parseBirthday(birthday: string): AgeContext;
 export declare function parseIdCard(idCardNo: string): IdCardParseInfo;
 export declare function injectOrProvide<T>(key: InjectionKey<T>, creator: () => T): T;
 export declare function generateUrlParams(field: GeneralField, dependKeys?: string | string[]): AnyObject;

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

@@ -41,7 +41,7 @@ function parseBirthday(birthday) {
   const birthDate = new Date(birthday);
   result.day = differenceInDays(d, birthDate);
   result.month = differenceInMonths(d, birthDate);
-  result.year = differenceInYears(d, birthDate);
+  result.age = result.year = differenceInYears(d, birthDate);
   return result;
 }
 function parseIdCard(idCardNo) {

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "cnhis-design-vue",
 	"private": false,
-	"version": "3.1.12-beta.3",
+	"version": "3.1.12-beta.4",
 	"license": "ISC",
 	"module": "es/packages/index.js",
 	"main": "es/packages/index.js",