cnhis-design-vue 3.1.11 → 3.1.12-beta.2

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

@@ -2,8 +2,8 @@ import { provide } from 'vue';
 import { createSchemaField } from '@formily/vue';
 import { useAsyncQueue, useBusinessBinding, useChangeContext, useFormItemDeps } from '../../../../packages/form-render';
 import * as components from '../../../../packages/form-render/src/components/renderer';
-import { injectOrProvide } from '../../../../packages/form-render/src/utils';
-import { InjectAsyncQueue, InjectionSchemaField, InjectionBusinessCollector, InjectionChangeContextCollector, InjectionFormItemDepsCollector } from '../../../../packages/form-render/src/constants';
+import { injectOrProvide, uuidGenerator } from '../../../../packages/form-render/src/utils';
+import { InjectAsyncQueue, InjectionSchemaField, InjectionBusinessCollector, InjectionChangeContextCollector, InjectionFormItemDepsCollector, InjectionFormUUID } from '../../../../packages/form-render/src/constants';
 
 function useFormContext(props) {
   const asyncQueue = injectOrProvide(InjectAsyncQueue, () => useAsyncQueue().create(props.parallelism));
@@ -20,7 +20,16 @@ function useFormContext(props) {
   provide(InjectionChangeContextCollector, changeContextCollector);
   const formItemDepsCollector = useFormItemDeps().create();
   provide(InjectionFormItemDepsCollector, formItemDepsCollector);
-  return { asyncQueue, SchemaField, businessCollector, changeContextCollector, formItemDepsCollector };
+  const formUUID = props.uuid || uuidGenerator();
+  provide(InjectionFormUUID, formUUID);
+  return {
+    asyncQueue,
+    SchemaField,
+    businessCollector,
+    changeContextCollector,
+    formItemDepsCollector,
+    formUUID
+  };
 }
 
 export { useFormContext };

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

@@ -1,6 +1,7 @@
+import { Func } from '../../../../../es/src/types';
 export declare class FormItemDepsCollector {
     private readonly collector;
-    setDeps(key: string, dependKey: string | string[], callback: Function): void;
+    setDeps(key: string, dependKey: string | string[], callback: Func): void;
     trigger(dependKey: string, payload?: any): void;
 }
 export declare function useFormItemDeps(): {

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

@@ -1,4 +1,5 @@
-declare type RequestInstance = Record<string, Function>;
+import { Func } from '../../../../../es/src/types';
+declare type RequestInstance = Record<string, Func>;
 export declare function useFormRequest(): {
     getHttpInstance: () => RequestInstance | null;
     registGlobHttpInstance: (instance: RequestInstance) => void;

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

@@ -6,13 +6,7 @@ function useFormValidator() {
     ["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 }) => ({
-        pattern: /^\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}))$/,
-        message: (validate == null ? void 0 : validate.message) || "\u8BF7\u8F93\u5165\u5408\u6CD5\u7684\u8EAB\u4EFD\u8BC1\u53F7"
-      })
-    ],
+    ["id_card", ({ validate }) => ({ format: "idcard", message: validate == null ? void 0 : validate.message })],
     [
       "regular",
       (field) => {

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

@@ -1,7 +1,7 @@
 function useInitialData() {
   function assignInitialData(initialData, fieldList) {
     return Object.assign({}, initialData, fieldList == null ? void 0 : fieldList.reduce((fin, cur) => {
-      cur.default_val && (fin[cur.val_key] = cur.default_val);
+      cur.default_val != void 0 && (fin[cur.val_key] = cur.default_val);
       return fin;
     }, {}));
   }

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

@@ -13,7 +13,7 @@ export declare type ValidateItem = Partial<{
 }>;
 interface OptionItem {
     text: string;
-    value: string;
+    value: any;
     children?: OptionItem[];
 }
 export interface Ievent {
@@ -30,7 +30,7 @@ export declare type FieldItem = {
     is_null: string;
     name: string;
     alias: string;
-    default_val: string;
+    default_val: any;
     is_empty: string;
     group: string;
     hide_title: string;

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

@@ -20,7 +20,7 @@ export interface FormAsyncQueueItem {
 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 FormRenderExpose = {
-    validate(): Promise<void>;
+    validate(path?: string): Promise<void>;
     getFormValues(): AnyObject;
     setFieldState(path: string, setter: (field: Field) => void): void;
     resetFields(path?: string): void;

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

@@ -14,3 +14,4 @@ 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;
 export declare function traverseSchema(schema: ISchema, handler: (_s: ISchema) => void): void;
+export declare function uuidGenerator(): string;

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

@@ -3,6 +3,7 @@ import { FIELD_SEX_VALUE } from '../constants/index.js';
 import { isField } from '@formily/core';
 import differenceInDays from '../../../../node_modules/date-fns/esm/differenceInDays/index.js';
 import differenceInMonths from '../../../../node_modules/date-fns/esm/differenceInMonths/index.js';
+import '../../../../node_modules/date-fns/esm/parse/_lib/parsers/index.js';
 import { inject, provide } from 'vue';
 
 function formRenderLog(message, type = "log") {
@@ -76,5 +77,11 @@ function traverseSchema(schema, handler) {
     });
   }
 }
+function uuidGenerator() {
+  return "key" + "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);
+  });
+}
 
-export { arrayed, assignUpdateValue, formRenderLog, generateUrlParams, injectOrProvide, isIdCard, parseIdCard, transformDateFormat, traverseSchema };
+export { arrayed, assignUpdateValue, formRenderLog, generateUrlParams, injectOrProvide, isIdCard, parseIdCard, transformDateFormat, traverseSchema, uuidGenerator };

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

@@ -4346,11 +4346,11 @@ declare const FormTable: SFCWithInstall<import("vue").DefineComponent<{
             styleSetting: import("../../../es/src/types").AnyObject;
             userInfo: import("../../../es/src/types").AnyObject;
             defaultValue: import("../../../es/src/types").AnyObject;
-            cacheUniqueKey: import("../../../es/src/types").AnyObject;
             row: import("../../../es/src/types").AnyObject;
+            cacheUniqueKey: import("../../../es/src/types").AnyObject;
+            formType: import("../../../es/src/types").AnyObject;
             isDetail: boolean;
             item: import("../../../es/src/types").AnyObject;
-            formType: import("../../../es/src/types").AnyObject;
             mainForm: import("../../../es/src/types").AnyObject;
             defaultFieldList: any[];
         }>;
@@ -9657,11 +9657,11 @@ declare const FormTable: SFCWithInstall<import("vue").DefineComponent<{
             styleSetting: import("../../../es/src/types").AnyObject;
             userInfo: import("../../../es/src/types").AnyObject;
             defaultValue: import("../../../es/src/types").AnyObject;
-            cacheUniqueKey: import("../../../es/src/types").AnyObject;
             row: import("../../../es/src/types").AnyObject;
+            cacheUniqueKey: import("../../../es/src/types").AnyObject;
+            formType: import("../../../es/src/types").AnyObject;
             isDetail: boolean;
             item: import("../../../es/src/types").AnyObject;
-            formType: import("../../../es/src/types").AnyObject;
             mainForm: import("../../../es/src/types").AnyObject;
             defaultFieldList: any[];
         }>;
@@ -12574,11 +12574,11 @@ declare const FormTable: SFCWithInstall<import("vue").DefineComponent<{
             styleSetting: import("../../../es/src/types").AnyObject;
             userInfo: import("../../../es/src/types").AnyObject;
             defaultValue: import("../../../es/src/types").AnyObject;
-            cacheUniqueKey: import("../../../es/src/types").AnyObject;
             row: import("../../../es/src/types").AnyObject;
+            cacheUniqueKey: import("../../../es/src/types").AnyObject;
+            formType: import("../../../es/src/types").AnyObject;
             isDetail: boolean;
             item: import("../../../es/src/types").AnyObject;
-            formType: import("../../../es/src/types").AnyObject;
             mainForm: import("../../../es/src/types").AnyObject;
             defaultFieldList: any[];
         }>;
@@ -14156,11 +14156,11 @@ declare const FormTable: SFCWithInstall<import("vue").DefineComponent<{
             styleSetting: import("../../../es/src/types").AnyObject;
             userInfo: import("../../../es/src/types").AnyObject;
             defaultValue: import("../../../es/src/types").AnyObject;
-            cacheUniqueKey: import("../../../es/src/types").AnyObject;
             row: import("../../../es/src/types").AnyObject;
+            cacheUniqueKey: import("../../../es/src/types").AnyObject;
+            formType: import("../../../es/src/types").AnyObject;
             isDetail: boolean;
             item: import("../../../es/src/types").AnyObject;
-            formType: import("../../../es/src/types").AnyObject;
             mainForm: import("../../../es/src/types").AnyObject;
             defaultFieldList: any[];
         }>;
@@ -15781,11 +15781,11 @@ declare const FormTable: SFCWithInstall<import("vue").DefineComponent<{
             styleSetting: import("../../../es/src/types").AnyObject;
             userInfo: import("../../../es/src/types").AnyObject;
             defaultValue: import("../../../es/src/types").AnyObject;
-            cacheUniqueKey: import("../../../es/src/types").AnyObject;
             row: import("../../../es/src/types").AnyObject;
+            cacheUniqueKey: import("../../../es/src/types").AnyObject;
+            formType: import("../../../es/src/types").AnyObject;
             isDetail: boolean;
             item: import("../../../es/src/types").AnyObject;
-            formType: import("../../../es/src/types").AnyObject;
             mainForm: import("../../../es/src/types").AnyObject;
             defaultFieldList: any[];
         }>;
@@ -21035,11 +21035,11 @@ declare const FormTable: SFCWithInstall<import("vue").DefineComponent<{
             styleSetting: import("../../../es/src/types").AnyObject;
             userInfo: import("../../../es/src/types").AnyObject;
             defaultValue: import("../../../es/src/types").AnyObject;
-            cacheUniqueKey: import("../../../es/src/types").AnyObject;
             row: import("../../../es/src/types").AnyObject;
+            cacheUniqueKey: import("../../../es/src/types").AnyObject;
+            formType: import("../../../es/src/types").AnyObject;
             isDetail: boolean;
             item: import("../../../es/src/types").AnyObject;
-            formType: import("../../../es/src/types").AnyObject;
             mainForm: import("../../../es/src/types").AnyObject;
             defaultFieldList: any[];
         }>;
@@ -24151,11 +24151,11 @@ declare const FormTable: SFCWithInstall<import("vue").DefineComponent<{
             styleSetting: Record<string, any>;
             userInfo: Record<string, any>;
             defaultValue: Record<string, any>;
-            cacheUniqueKey: Record<string, any>;
             row: Record<string, any>;
+            cacheUniqueKey: Record<string, any>;
+            formType: Record<string, any>;
             isDetail: boolean;
             item: Record<string, any>;
-            formType: Record<string, any>;
             mainForm: Record<string, any>;
             defaultFieldList: unknown[];
         }>;
@@ -25941,11 +25941,11 @@ declare const FormTable: SFCWithInstall<import("vue").DefineComponent<{
             styleSetting: Record<string, any>;
             userInfo: Record<string, any>;
             defaultValue: Record<string, any>;
-            cacheUniqueKey: Record<string, any>;
             row: Record<string, any>;
+            cacheUniqueKey: Record<string, any>;
+            formType: Record<string, any>;
             isDetail: boolean;
             item: Record<string, any>;
-            formType: Record<string, any>;
             mainForm: Record<string, any>;
             defaultFieldList: unknown[];
         }>;
@@ -27503,11 +27503,11 @@ declare const FormTable: SFCWithInstall<import("vue").DefineComponent<{
             styleSetting: import("../../../es/src/types").AnyObject;
             userInfo: import("../../../es/src/types").AnyObject;
             defaultValue: import("../../../es/src/types").AnyObject;
-            cacheUniqueKey: import("../../../es/src/types").AnyObject;
             row: import("../../../es/src/types").AnyObject;
+            cacheUniqueKey: import("../../../es/src/types").AnyObject;
+            formType: import("../../../es/src/types").AnyObject;
             isDetail: boolean;
             item: import("../../../es/src/types").AnyObject;
-            formType: import("../../../es/src/types").AnyObject;
             mainForm: import("../../../es/src/types").AnyObject;
             defaultFieldList: any[];
         }>;
@@ -29066,11 +29066,11 @@ declare const FormTable: SFCWithInstall<import("vue").DefineComponent<{
             styleSetting: import("../../../es/src/types").AnyObject;
             userInfo: import("../../../es/src/types").AnyObject;
             defaultValue: import("../../../es/src/types").AnyObject;
-            cacheUniqueKey: import("../../../es/src/types").AnyObject;
             row: import("../../../es/src/types").AnyObject;
+            cacheUniqueKey: import("../../../es/src/types").AnyObject;
+            formType: import("../../../es/src/types").AnyObject;
             isDetail: boolean;
             item: import("../../../es/src/types").AnyObject;
-            formType: import("../../../es/src/types").AnyObject;
             mainForm: import("../../../es/src/types").AnyObject;
             defaultFieldList: any[];
         }>;
@@ -30707,11 +30707,11 @@ declare const FormTable: SFCWithInstall<import("vue").DefineComponent<{
             styleSetting: import("../../../es/src/types").AnyObject;
             userInfo: import("../../../es/src/types").AnyObject;
             defaultValue: import("../../../es/src/types").AnyObject;
-            cacheUniqueKey: import("../../../es/src/types").AnyObject;
             row: import("../../../es/src/types").AnyObject;
+            cacheUniqueKey: import("../../../es/src/types").AnyObject;
+            formType: import("../../../es/src/types").AnyObject;
             isDetail: boolean;
             item: import("../../../es/src/types").AnyObject;
-            formType: import("../../../es/src/types").AnyObject;
             mainForm: import("../../../es/src/types").AnyObject;
             defaultFieldList: any[];
         }>;
@@ -33377,11 +33377,11 @@ declare const FormTable: SFCWithInstall<import("vue").DefineComponent<{
             styleSetting: import("../../../es/src/types").AnyObject;
             userInfo: import("../../../es/src/types").AnyObject;
             defaultValue: import("../../../es/src/types").AnyObject;
-            cacheUniqueKey: import("../../../es/src/types").AnyObject;
             row: import("../../../es/src/types").AnyObject;
+            cacheUniqueKey: import("../../../es/src/types").AnyObject;
+            formType: import("../../../es/src/types").AnyObject;
             isDetail: boolean;
             item: import("../../../es/src/types").AnyObject;
-            formType: import("../../../es/src/types").AnyObject;
             mainForm: import("../../../es/src/types").AnyObject;
             defaultFieldList: any[];
         }>;
@@ -35270,11 +35270,11 @@ declare const FormTable: SFCWithInstall<import("vue").DefineComponent<{
             styleSetting: import("../../../es/src/types").AnyObject;
             userInfo: import("../../../es/src/types").AnyObject;
             defaultValue: import("../../../es/src/types").AnyObject;
-            cacheUniqueKey: import("../../../es/src/types").AnyObject;
             row: import("../../../es/src/types").AnyObject;
+            cacheUniqueKey: import("../../../es/src/types").AnyObject;
+            formType: import("../../../es/src/types").AnyObject;
             isDetail: boolean;
             item: import("../../../es/src/types").AnyObject;
-            formType: import("../../../es/src/types").AnyObject;
             mainForm: import("../../../es/src/types").AnyObject;
             defaultFieldList: any[];
         }>;
@@ -36016,9 +36016,9 @@ declare const FormTable: SFCWithInstall<import("vue").DefineComponent<{
     userInfo: Record<string, any>;
     defaultValue: unknown[];
     cacheUniqueKey: Record<string, any>;
+    formType: Record<string, any>;
     isDetail: boolean;
     isOnlyDisplay: boolean;
-    formType: Record<string, any>;
     formTableItem: Record<string, any>;
 }>>;
 export default FormTable;

package/es/packages/form-table/src/FormTable.vue.d.ts

@@ -4346,11 +4346,11 @@ declare const _default: import("vue").DefineComponent<{
             styleSetting: AnyObject;
             userInfo: AnyObject;
             defaultValue: AnyObject;
-            cacheUniqueKey: AnyObject;
             row: AnyObject;
+            cacheUniqueKey: AnyObject;
+            formType: AnyObject;
             isDetail: boolean;
             item: AnyObject;
-            formType: AnyObject;
             mainForm: AnyObject;
             defaultFieldList: any[];
         }>;
@@ -9657,11 +9657,11 @@ declare const _default: import("vue").DefineComponent<{
             styleSetting: AnyObject;
             userInfo: AnyObject;
             defaultValue: AnyObject;
-            cacheUniqueKey: AnyObject;
             row: AnyObject;
+            cacheUniqueKey: AnyObject;
+            formType: AnyObject;
             isDetail: boolean;
             item: AnyObject;
-            formType: AnyObject;
             mainForm: AnyObject;
             defaultFieldList: any[];
         }>;
@@ -12574,11 +12574,11 @@ declare const _default: import("vue").DefineComponent<{
             styleSetting: AnyObject;
             userInfo: AnyObject;
             defaultValue: AnyObject;
-            cacheUniqueKey: AnyObject;
             row: AnyObject;
+            cacheUniqueKey: AnyObject;
+            formType: AnyObject;
             isDetail: boolean;
             item: AnyObject;
-            formType: AnyObject;
             mainForm: AnyObject;
             defaultFieldList: any[];
         }>;
@@ -14156,11 +14156,11 @@ declare const _default: import("vue").DefineComponent<{
             styleSetting: AnyObject;
             userInfo: AnyObject;
             defaultValue: AnyObject;
-            cacheUniqueKey: AnyObject;
             row: AnyObject;
+            cacheUniqueKey: AnyObject;
+            formType: AnyObject;
             isDetail: boolean;
             item: AnyObject;
-            formType: AnyObject;
             mainForm: AnyObject;
             defaultFieldList: any[];
         }>;
@@ -15781,11 +15781,11 @@ declare const _default: import("vue").DefineComponent<{
             styleSetting: AnyObject;
             userInfo: AnyObject;
             defaultValue: AnyObject;
-            cacheUniqueKey: AnyObject;
             row: AnyObject;
+            cacheUniqueKey: AnyObject;
+            formType: AnyObject;
             isDetail: boolean;
             item: AnyObject;
-            formType: AnyObject;
             mainForm: AnyObject;
             defaultFieldList: any[];
         }>;
@@ -21035,11 +21035,11 @@ declare const _default: import("vue").DefineComponent<{
             styleSetting: AnyObject;
             userInfo: AnyObject;
             defaultValue: AnyObject;
-            cacheUniqueKey: AnyObject;
             row: AnyObject;
+            cacheUniqueKey: AnyObject;
+            formType: AnyObject;
             isDetail: boolean;
             item: AnyObject;
-            formType: AnyObject;
             mainForm: AnyObject;
             defaultFieldList: any[];
         }>;
@@ -24151,11 +24151,11 @@ declare const _default: import("vue").DefineComponent<{
             styleSetting: Record<string, any>;
             userInfo: Record<string, any>;
             defaultValue: Record<string, any>;
-            cacheUniqueKey: Record<string, any>;
             row: Record<string, any>;
+            cacheUniqueKey: Record<string, any>;
+            formType: Record<string, any>;
             isDetail: boolean;
             item: Record<string, any>;
-            formType: Record<string, any>;
             mainForm: Record<string, any>;
             defaultFieldList: unknown[];
         }>;
@@ -25941,11 +25941,11 @@ declare const _default: import("vue").DefineComponent<{
             styleSetting: Record<string, any>;
             userInfo: Record<string, any>;
             defaultValue: Record<string, any>;
-            cacheUniqueKey: Record<string, any>;
             row: Record<string, any>;
+            cacheUniqueKey: Record<string, any>;
+            formType: Record<string, any>;
             isDetail: boolean;
             item: Record<string, any>;
-            formType: Record<string, any>;
             mainForm: Record<string, any>;
             defaultFieldList: unknown[];
         }>;
@@ -27503,11 +27503,11 @@ declare const _default: import("vue").DefineComponent<{
             styleSetting: AnyObject;
             userInfo: AnyObject;
             defaultValue: AnyObject;
-            cacheUniqueKey: AnyObject;
             row: AnyObject;
+            cacheUniqueKey: AnyObject;
+            formType: AnyObject;
             isDetail: boolean;
             item: AnyObject;
-            formType: AnyObject;
             mainForm: AnyObject;
             defaultFieldList: any[];
         }>;
@@ -29066,11 +29066,11 @@ declare const _default: import("vue").DefineComponent<{
             styleSetting: AnyObject;
             userInfo: AnyObject;
             defaultValue: AnyObject;
-            cacheUniqueKey: AnyObject;
             row: AnyObject;
+            cacheUniqueKey: AnyObject;
+            formType: AnyObject;
             isDetail: boolean;
             item: AnyObject;
-            formType: AnyObject;
             mainForm: AnyObject;
             defaultFieldList: any[];
         }>;
@@ -30707,11 +30707,11 @@ declare const _default: import("vue").DefineComponent<{
             styleSetting: AnyObject;
             userInfo: AnyObject;
             defaultValue: AnyObject;
-            cacheUniqueKey: AnyObject;
             row: AnyObject;
+            cacheUniqueKey: AnyObject;
+            formType: AnyObject;
             isDetail: boolean;
             item: AnyObject;
-            formType: AnyObject;
             mainForm: AnyObject;
             defaultFieldList: any[];
         }>;
@@ -33377,11 +33377,11 @@ declare const _default: import("vue").DefineComponent<{
             styleSetting: AnyObject;
             userInfo: AnyObject;
             defaultValue: AnyObject;
-            cacheUniqueKey: AnyObject;
             row: AnyObject;
+            cacheUniqueKey: AnyObject;
+            formType: AnyObject;
             isDetail: boolean;
             item: AnyObject;
-            formType: AnyObject;
             mainForm: AnyObject;
             defaultFieldList: any[];
         }>;
@@ -35270,11 +35270,11 @@ declare const _default: import("vue").DefineComponent<{
             styleSetting: AnyObject;
             userInfo: AnyObject;
             defaultValue: AnyObject;
-            cacheUniqueKey: AnyObject;
             row: AnyObject;
+            cacheUniqueKey: AnyObject;
+            formType: AnyObject;
             isDetail: boolean;
             item: AnyObject;
-            formType: AnyObject;
             mainForm: AnyObject;
             defaultFieldList: any[];
         }>;
@@ -36016,9 +36016,9 @@ declare const _default: import("vue").DefineComponent<{
     userInfo: Record<string, any>;
     defaultValue: unknown[];
     cacheUniqueKey: Record<string, any>;
+    formType: Record<string, any>;
     isDetail: boolean;
     isOnlyDisplay: boolean;
-    formType: Record<string, any>;
     formTableItem: Record<string, any>;
 }>;
 export default _default;