cnhis-design-vue 3.1.16-beta.3 → 3.1.16-beta.6

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

@@ -128,9 +128,9 @@ function useFieldListAdaptor(collector, uuid) {
   const createSliderSchema = (item) => {
     const schema = createStandardSchema(item);
     Object.assign(schema["x-component-props"], {
-      step: Number(item.step_length),
-      max: +item.max_length,
-      min: +item.min_length,
+      step: parseNumberFromMaybeString(item.step_length),
+      max: parseNumberFromMaybeString(item.max_length),
+      min: parseNumberFromMaybeString(item.min_length),
       option: item.option
     });
     return schema;
@@ -152,7 +152,7 @@ function useFieldListAdaptor(collector, uuid) {
         line: item.__line,
         disabled: item.is_not_fold === "1",
         id: createLinebarId(item.val_key),
-        show: !!item.is_show
+        show: item.is_show !== "0"
       }
     };
   };

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

@@ -1,16 +1,26 @@
+import { isString } from 'lodash-es';
 import { arrayed } from '../utils/index.js';
 import { isFunction } from '@vueuse/core';
+import { isIdCard } from '../utils/business.js';
 
 function useFormValidator() {
   const validateMap = /* @__PURE__ */ new Map([
     ["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 }) => ({ format: "idcard", message: validate == null ? void 0 : validate.message })],
+    [
+      "id_card",
+      ({ validate }) => ({
+        validator(value) {
+          var _a;
+          if (!isString(value) || !isIdCard(value))
+            return (_a = validate == null ? void 0 : validate.message) != null ? _a : "\u8BE5\u5B57\u6BB5\u4E0D\u662F\u5408\u6CD5\u7684\u8EAB\u4EFD\u8BC1\u683C\u5F0F";
+        }
+      })
+    ],
     [
       "regular",
-      (field) => {
-        const { validate, regular_expression, regular_error_tip } = field;
+      ({ validate, regular_expression, 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";
         return { pattern, message };

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

@@ -1,5 +1,5 @@
 import { AnyObject } from '../../../../../es/src/types';
 import { FieldItem } from '../types';
 export declare function useInitialData(): {
-    assignInitialData: (initialData?: AnyObject, fieldList?: FieldItem[]) => AnyObject;
+    assignInitialData: (initialData?: AnyObject, fieldList?: FieldItem[]) => any;
 };

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

@@ -1,9 +1,14 @@
+import { Path } from '@formily/path';
+import { mergeWith } from 'lodash-es';
+import { traverseFieldList } from '../../../../packages/form-render/src/utils';
+
 function useInitialData() {
   function assignInitialData(initialData, fieldList) {
-    return Object.assign({}, initialData, fieldList == null ? void 0 : fieldList.reduce((fin, cur) => {
-      cur.default_val != void 0 && (fin[cur.val_key] = cur.default_val);
-      return fin;
-    }, {}));
+    const defaultVal = {};
+    fieldList && traverseFieldList(fieldList, (field) => {
+      field.default_val != void 0 && Path.setIn(defaultVal, field.val_key, field.default_val);
+    });
+    return mergeWith({}, initialData, defaultVal);
   }
   return { assignInitialData };
 }

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

@@ -9,7 +9,7 @@ function parseIdCard(idCardNo) {
     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;
+    res.birthday = year + "-" + month + "-" + day + " 00:00:00";
     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));
@@ -26,8 +26,21 @@ function transformDateFormat(format2 = "") {
     return "month";
   return format2.includes("HH") ? "datetime" : "date";
 }
+function validIdCard(cardNo) {
+  if (!cardNo || cardNo.length !== 18) {
+    return false;
+  }
+  const w = [7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2];
+  const v = ["1", "0", "X", "9", "8", "7", "6", "5", "4", "3", "2"];
+  let sum = 0;
+  for (let i = 0; i < 17; i++) {
+    sum += +cardNo[i] * w[i];
+  }
+  return cardNo.charAt(17).toUpperCase() === v[sum % 11];
+}
+const idcardMatcher = /^\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}))$/;
 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);
+  return idcardMatcher.test(idCardNo) && validIdCard(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);

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

@@ -8,7 +8,7 @@ export declare function formRenderLog(message: string, type?: keyof Console): vo
 export declare function arrayed<T>(maybeArray: T): T extends Array<any> ? T : [T];
 export declare function mergeDeepProperties(target: AnyObject, fieldList: FieldItem[], traverseProperties?: string[], property?: string, targetProperty?: string): AnyObject;
 export declare function injectOrProvide<T>(key: InjectionKey<T>, creator: () => T): T;
-export declare function parseNumberFromMaybeString(value: unknown): unknown;
+export declare function parseNumberFromMaybeString<T>(value: T): T extends number | string ? number : T;
 export declare function uuidGenerator(): string;
 export declare function createSlot(renderer: unknown, props: AnyObject): Record<string, () => ArrayAble<VNode>> | {
     default(): any;

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

@@ -3,7 +3,7 @@ import { isObject } from '@vue/shared';
 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';
+export { assignUpdateValue, createLinebarId, elementIdEscape, fieldKeyEscape, getParentLinebar, traverseDependKey, traverseFieldList, traverseSchema } from './schema.js';
 
 function formRenderLog(message, type = "log") {
   console[type](`[FormRender]: ${message}`);
@@ -56,10 +56,13 @@ function parseNumberFromMaybeString(value) {
   return value;
 }
 function uuidGenerator() {
-  return "key" + "xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(c) {
+  if (window.isSecureContext && window.crypto)
+    return `key${window.crypto.randomUUID()}`;
+  const uuid = "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);
   });
+  return `key${uuid}`;
 }
 function createSlot(renderer, props) {
   if (isObject(renderer) && !isFunction(renderer)) {

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

@@ -13,3 +13,4 @@ export declare function getParentLinebar(key: string, fieldList: FieldItem[]): W
 export declare function assignUpdateValue(props: AnyObject, field: GeneralField): {
     [x: string]: any;
 };
+export declare function traverseFieldList(fieldList: FieldItem[], handler: (field: FieldItem) => void): void;

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

@@ -79,5 +79,16 @@ function assignUpdateValue(props, field) {
   }
   return _props;
 }
+function traverseFieldList(fieldList, handler) {
+  function traverse(fieldList2) {
+    if (!isArray(fieldList2))
+      return;
+    fieldList2.forEach((field) => {
+      handler(field);
+      traverse(field.properties);
+    });
+  }
+  traverse(fieldList);
+}
 
-export { assignUpdateValue, createLinebarId, elementIdEscape, fieldKeyEscape, getParentLinebar, traverseDependKey, traverseSchema };
+export { assignUpdateValue, createLinebarId, elementIdEscape, fieldKeyEscape, getParentLinebar, traverseDependKey, traverseFieldList, traverseSchema };

package/es/packages/index.css

@@ -282,7 +282,7 @@ body > .vxe-table--tooltip-wrapper {
   height: 30px;
   line-height: 30px;
 }
-.custom-big-table .vxe-table .vxe-cell--checkbox.is--disabled .vxe-checkbox--icon {
+.custom-big-table .vxe-table .vxe-cell--checkbox .vxe-checkbox--label {
   display: none;
 }
 .custom-big-table .filter-box {
@@ -307,7 +307,6 @@ body > .vxe-table--tooltip-wrapper {
 }
 .custom-big-table .disabled-checked-tips {
   position: absolute;
-  left: 6px;
   top: 50%;
   bottom: 0;
   right: 0;

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

@@ -1925,9 +1925,7 @@ 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;
-        }>;
+        formModel: import("@formily/core").Form<any>;
         SchemaField: import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>;
         businessCollector: import("..").BusinessCollector;
         formItemDepsCollector: import("..").FormItemDepsCollector;

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

@@ -1927,9 +1927,7 @@ 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;
-        }>;
+        formModel: import("@formily/core").Form<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;

package/package.json

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