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

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

@@ -0,0 +1,14 @@
+import { elementIdEscape } from '../../../../packages/form-render/src/utils/schema';
+
+function queryDecorator(key, wrapperElement, formUUID) {
+  return wrapperElement.querySelector(elementIdEscape(`#${formUUID}-${key}`));
+}
+function queryInput(decoratorElement) {
+  var _a;
+  return {
+    widgetElement: decoratorElement == null ? void 0 : decoratorElement.querySelector("input"),
+    widgetElementList: Array.from((_a = decoratorElement == null ? void 0 : decoratorElement.querySelectorAll("input")) != null ? _a : [])
+  };
+}
+
+export { queryDecorator, queryInput };

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

@@ -1,36 +1,16 @@
-import { AnyObject, ArrayAble, WithNull } from '../../../../../es/src/types';
-import { ISchema } from '@formily/json-schema/esm/types';
-import { GeneralField } from '@formily/core';
+import { AnyObject, ArrayAble } from '../../../../../es/src/types';
 import { FunctionalComponent, InjectionKey, VNode } from 'vue';
-import { AgeContext, DependKeyType, FieldItem, IdCardParseInfo } from '../types';
+import { FieldItem } from '../types';
+export * from './business';
+export * from './dom';
+export * from './schema';
 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): {
-    [x: string]: any;
-};
-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 mergeDeepProperties(target: AnyObject, fieldList: FieldItem[], traverseProperties?: string[], property?: string, targetProperty?: string): AnyObject;
-export declare function parseIdCard(idCardNo: string): IdCardParseInfo;
 export declare function injectOrProvide<T>(key: InjectionKey<T>, creator: () => T): T;
 export declare function parseNumberFromMaybeString(value: unknown): unknown;
-export declare function traverseDependKey(dependKeys: DependKeyType, handler: {
-    (dependKey: string, valueKey: string, required?: boolean): void;
-}): void;
-export declare function traverseSchema(schema: ISchema, handler: (_s: ISchema) => void): void;
 export declare function uuidGenerator(): string;
 export declare function createSlot(renderer: unknown, props: AnyObject): Record<string, () => ArrayAble<VNode>> | {
     default(): any;
 };
-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[];
-};
-export declare function getParentLinebar(key: string, fieldList: FieldItem[]): WithNull<string>;
-export declare function elementIdEscape(id: string): string;
-export declare function createLinebarId(id: string): string;
-export declare function fieldKeyEscape(fieldList: FieldItem[]): string;
 export declare function createInputSlot(props: AnyObject): import("vue").ComputedRef<Record<string, FunctionalComponent<{}, {}>>>;

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

@@ -1,9 +1,9 @@
 import { inject, provide, computed, createVNode, Fragment } from 'vue';
 import { isObject } from '@vue/shared';
-import { isNumber, isString, isArray, isFunction } from 'lodash-es';
-import { FIELD_SEX_VALUE } from '../constants/index.js';
-import { isField } from '@formily/core';
-import { differenceInDays, differenceInMonths, differenceInYears } from 'date-fns';
+import { isNumber, isString, isFunction } from 'lodash-es';
+export { isIdCard, isMobile, parseAge2Birthday, parseAge2FromContext, parseBirthday, parseIdCard, transformDateFormat } from './business.js';
+export { queryDecorator, queryInput } from './dom.js';
+export { assignUpdateValue, createLinebarId, elementIdEscape, fieldKeyEscape, getParentLinebar, traverseDependKey, traverseSchema } from './schema.js';
 
 function formRenderLog(message, type = "log") {
   console[type](`[FormRender]: ${message}`);
@@ -13,42 +13,6 @@ function arrayed(maybeArray) {
     return maybeArray;
   return [maybeArray];
 }
-function assignUpdateValue(props, field) {
-  const _props = {
-    ...props
-  };
-  if (isField(field)) {
-    Object.assign(_props, {
-      "onUpdate:value"(value) {
-        field.setValue(value);
-      }
-    });
-  }
-  return _props;
-}
-function isMonthType(format) {
-  return format && format.replace(/yyyy-MM/gi, "YYYY-MM") === "YYYY-MM";
-}
-function transformDateFormat(format = "") {
-  if (isMonthType(format))
-    return "month";
-  return format.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 mergeDeepProperties(target, fieldList, traverseProperties = ["children", "properties", "suffixConfig"], property = "val_key", targetProperty = "default_val") {
   function traverse(_target, _fieldList) {
     _fieldList.forEach((field) => {
@@ -76,23 +40,6 @@ function mergeDeepProperties(target, fieldList, traverseProperties = ["children"
     return field[targetProperty];
   }
 }
-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 injectOrProvide(key, creator) {
   let injected = inject(key, null);
   if (!injected) {
@@ -108,49 +55,6 @@ function parseNumberFromMaybeString(value) {
     return +value;
   return value;
 }
-function traverseDependKey(dependKeys, handler) {
-  if (!dependKeys)
-    return;
-  createDependKeyMap().forEach((valueKey, dependKey) => {
-    if (isString(valueKey))
-      return handler(dependKey, valueKey);
-    handler(dependKey, valueKey.key, valueKey.required);
-  });
-  Object.entries(createDependKeyMap()).forEach(([dependKey, valueKey]) => {
-    handler(dependKey, valueKey);
-  });
-  function createDependKeyMap() {
-    const result = /* @__PURE__ */ new Map();
-    if (isArray(dependKeys)) {
-      dependKeys.forEach((k) => {
-        var _a;
-        if (isObject(k)) {
-          result.set(k.paramName, {
-            key: (_a = k.paramName) != null ? _a : k.paramValue,
-            required: k.required
-          });
-        } else {
-          result.set(k, k);
-        }
-      });
-    } else if (isObject(dependKeys)) {
-      Object.entries(dependKeys).forEach(([k, v]) => {
-        result.set(k, v);
-      });
-    } else if (isString(dependKeys)) {
-      result.set(dependKeys, dependKeys);
-    }
-    return result;
-  }
-}
-function traverseSchema(schema, handler) {
-  handler(schema);
-  if (isObject(schema.properties)) {
-    Object.values(schema.properties).forEach((_s) => {
-      traverseSchema(_s, 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;
@@ -171,42 +75,6 @@ function createSlot(renderer, props) {
     }
   };
 }
-function queryDecorator(key, wrapperElement, formUUID) {
-  return wrapperElement.querySelector(elementIdEscape(`#${formUUID}-${key}`));
-}
-function queryInput(decoratorElement) {
-  var _a;
-  return {
-    widgetElement: decoratorElement == null ? void 0 : decoratorElement.querySelector("input"),
-    widgetElementList: Array.from((_a = decoratorElement == null ? void 0 : decoratorElement.querySelectorAll("input")) != null ? _a : [])
-  };
-}
-function getParentLinebar(key, fieldList) {
-  let result = null;
-  for (const fieldItem of fieldList) {
-    if (fieldItem.val_key === key) {
-      if (isLinebar(fieldItem))
-        result = null;
-      break;
-    }
-    if (isLinebar(fieldItem)) {
-      result = fieldItem.val_key;
-    }
-  }
-  return result;
-  function isLinebar(field) {
-    return field.html_type === "LINEBAR";
-  }
-}
-function elementIdEscape(id) {
-  return id.replace(".", "-");
-}
-function createLinebarId(id) {
-  return elementIdEscape(`id-${id}`);
-}
-function fieldKeyEscape(fieldList) {
-  return fieldList.map((f) => f.val_key).join("-").replace(/[.]/g, "_");
-}
 function createInputSlot(props) {
   return computed(() => {
     const res = {};
@@ -220,4 +88,4 @@ function createInputSlot(props) {
   });
 }
 
-export { arrayed, assignUpdateValue, createInputSlot, createLinebarId, createSlot, elementIdEscape, fieldKeyEscape, formRenderLog, getParentLinebar, injectOrProvide, isIdCard, isMobile, mergeDeepProperties, parseBirthday, parseIdCard, parseNumberFromMaybeString, queryDecorator, queryInput, transformDateFormat, traverseDependKey, traverseSchema, uuidGenerator };
+export { arrayed, createInputSlot, createSlot, formRenderLog, injectOrProvide, mergeDeepProperties, parseNumberFromMaybeString, uuidGenerator };

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

@@ -0,0 +1,15 @@
+import { AnyObject, WithNull } from '../../../../../es/src/types';
+import { GeneralField } from '@formily/core';
+import { ISchema } from '@formily/json-schema/esm/types';
+import { DependKeyType, FieldItem } from '../../../../../es/packages/form-render';
+export declare function traverseSchema(schema: ISchema, handler: (_s: ISchema) => void): void;
+export declare function fieldKeyEscape(fieldList: FieldItem[]): string;
+export declare function elementIdEscape(id: string): string;
+export declare function createLinebarId(id: string): string;
+export declare function traverseDependKey(dependKeys: DependKeyType, handler: {
+    (dependKey: string, valueKey: string, required?: boolean): void;
+}): void;
+export declare function getParentLinebar(key: string, fieldList: FieldItem[]): WithNull<string>;
+export declare function assignUpdateValue(props: AnyObject, field: GeneralField): {
+    [x: string]: any;
+};

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

@@ -0,0 +1,83 @@
+import { isField } from '@formily/core';
+import { isObject } from '@vue/shared';
+import { isString, isArray } from 'lodash-es';
+
+function traverseSchema(schema, handler) {
+  handler(schema);
+  if (isObject(schema.properties)) {
+    Object.values(schema.properties).forEach((_s) => {
+      traverseSchema(_s, handler);
+    });
+  }
+}
+function fieldKeyEscape(fieldList) {
+  return fieldList.map((f) => f.val_key).join("-").replace(/[.]/g, "_");
+}
+function elementIdEscape(id) {
+  return id.replace(".", "-");
+}
+function createLinebarId(id) {
+  return elementIdEscape(`id-${id}`);
+}
+function traverseDependKey(dependKeys, handler) {
+  if (!dependKeys)
+    return;
+  createDependKeyMap().forEach((valueKey, dependKey) => {
+    if (isString(valueKey))
+      return handler(dependKey, valueKey);
+    handler(dependKey, valueKey.key, valueKey.required);
+  });
+  Object.entries(createDependKeyMap()).forEach(([dependKey, valueKey]) => {
+    handler(dependKey, valueKey);
+  });
+  function createDependKeyMap() {
+    const result = /* @__PURE__ */ new Map();
+    if (isArray(dependKeys)) {
+      dependKeys.forEach((k) => {
+        var _a;
+        if (isObject(k)) {
+          result.set(k.paramName, { key: (_a = k.paramName) != null ? _a : k.paramValue, required: k.required });
+        } else {
+          result.set(k, k);
+        }
+      });
+    } else if (isObject(dependKeys)) {
+      Object.entries(dependKeys).forEach(([k, v]) => {
+        result.set(k, v);
+      });
+    } else if (isString(dependKeys)) {
+      result.set(dependKeys, dependKeys);
+    }
+    return result;
+  }
+}
+function getParentLinebar(key, fieldList) {
+  let result = null;
+  for (const fieldItem of fieldList) {
+    if (fieldItem.val_key === key) {
+      if (isLinebar(fieldItem))
+        result = null;
+      break;
+    }
+    if (isLinebar(fieldItem)) {
+      result = fieldItem.val_key;
+    }
+  }
+  return result;
+  function isLinebar(field) {
+    return field.html_type === "LINEBAR";
+  }
+}
+function assignUpdateValue(props, field) {
+  const _props = { ...props };
+  if (isField(field)) {
+    Object.assign(_props, {
+      "onUpdate:value"(value) {
+        field.setValue(value);
+      }
+    });
+  }
+  return _props;
+}
+
+export { assignUpdateValue, createLinebarId, elementIdEscape, fieldKeyEscape, getParentLinebar, traverseDependKey, traverseSchema };

package/es/packages/shortcut-setter/index.d.ts

@@ -1787,9 +1787,6 @@ declare const ShortcutSetter: 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("..").FormBusinessFilter>;
-        };
         scope: {
             type: import("vue").PropType<import("../../../es/src/types").AnyObject>;
             default: () => {};
@@ -1902,9 +1899,6 @@ declare const ShortcutSetter: 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("..").FormBusinessFilter>;
-            };
             scope: {
                 type: import("vue").PropType<import("../../../es/src/types").AnyObject>;
                 default: () => {};
@@ -1931,14 +1925,14 @@ declare const ShortcutSetter: 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("..").BusinessCollector;
         formItemDepsCollector: import("..").FormItemDepsCollector;
         changeContextCollector: import("..").ContextCollector;
         formUUID: string;
-        formModel: import("@formily/core").Form<{
-            [x: string]: any;
-        }>;
         scrollbarRef: import("vue").Ref<HTMLElement | undefined>;
         schemaAdaptor: (fieldList: import("..").FieldItem[]) => Record<string, import("@formily/json-schema").Stringify<{
             [key: symbol]: any;
@@ -3404,9 +3398,6 @@ declare const ShortcutSetter: 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("..").FormBusinessFilter>;
-        };
         scope: {
             type: import("vue").PropType<import("../../../es/src/types").AnyObject>;
             default: () => {};

package/es/packages/shortcut-setter/src/ShortcutSetter.vue.d.ts

@@ -1789,9 +1789,6 @@ declare const _default: import("vue").DefineComponent<{
             type: import("vue").PropType<Record<string, Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions> | import("vue").FunctionalComponent<{}, {}>>>;
             default: () => {};
         };
-        businessFilter: {
-            type: import("vue").PropType<import("../../../../es/packages/form-render").FormBusinessFilter>;
-        };
         scope: {
             type: import("vue").PropType<import("../../../../es/src/types").AnyObject>;
             default: () => {};
@@ -1904,9 +1901,6 @@ declare const _default: import("vue").DefineComponent<{
                 type: import("vue").PropType<Record<string, Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions> | import("vue").FunctionalComponent<{}, {}>>>;
                 default: () => {};
             };
-            businessFilter: {
-                type: import("vue").PropType<import("../../../../es/packages/form-render").FormBusinessFilter>;
-            };
             scope: {
                 type: import("vue").PropType<import("../../../../es/src/types").AnyObject>;
                 default: () => {};
@@ -1933,14 +1927,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("../../../../es/packages/form-render").BusinessCollector;
         formItemDepsCollector: import("../../../../es/packages/form-render").FormItemDepsCollector;
         changeContextCollector: import("../../../../es/packages/form-render").ContextCollector;
         formUUID: string;
-        formModel: import("@formily/core").Form<{
-            [x: string]: any;
-        }>;
         scrollbarRef: import("vue").Ref<HTMLElement | undefined>;
         schemaAdaptor: (fieldList: FieldItem[]) => Record<string, import("@formily/json-schema").Stringify<{
             [key: symbol]: any;
@@ -3406,9 +3400,6 @@ declare const _default: import("vue").DefineComponent<{
             type: import("vue").PropType<Record<string, Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions> | import("vue").FunctionalComponent<{}, {}>>>;
             default: () => {};
         };
-        businessFilter: {
-            type: import("vue").PropType<import("../../../../es/packages/form-render").FormBusinessFilter>;
-        };
         scope: {
             type: import("vue").PropType<import("../../../../es/src/types").AnyObject>;
             default: () => {};

package/package.json

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