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

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

@@ -2880,6 +2880,7 @@ declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
     separate: (data: import("../../../es/src/types").AnyObject[], rawData: import("../../../es/src/types").AnyObject[]) => Promise<import("../../../es/src/types").AnyObject[]>;
     onColumnResize: import("vxe-table").VxeTableEvents.ResizableChange;
     separateHandle: import("./src/hooks/useSeparateRow").SeparateHandle;
+    onResizableChange: (payload: any) => void;
     loadData: (data: any) => Promise<void>;
     setGroupTitleToFristColumnFieldData: (formatList: any) => void;
     setCurrentPageRowChecked: () => void;

package/es/packages/big-table/src/BigTable.vue.d.ts

@@ -1147,10 +1147,7 @@ declare const _default: import("vue").DefineComponent<{
                 borderError: string;
                 borderHoverError: string;
                 borderPressedError: string;
-                borderFocusError: string; /**
-                 * 单个form提交失败
-                 * @param {*} obj
-                 */
+                borderFocusError: string;
                 borderDisabledError: string;
                 rippleColorError: string;
                 waveOpacity: string;
@@ -2882,6 +2879,7 @@ declare const _default: import("vue").DefineComponent<{
     separate: (data: import("../../../src/types").AnyObject[], rawData: import("../../../src/types").AnyObject[]) => Promise<import("../../../src/types").AnyObject[]>;
     onColumnResize: import("vxe-table").VxeTableEvents.ResizableChange;
     separateHandle: import("../../../../es/packages/big-table/src/hooks/useSeparateRow").SeparateHandle;
+    onResizableChange: (payload: any) => void;
     loadData: (data: any) => Promise<void>;
     setGroupTitleToFristColumnFieldData: (formatList: any) => void;
     setCurrentPageRowChecked: () => void;

package/es/packages/big-table/src/BigTable.vue_vue_type_script_setup_true_lang.js

@@ -247,6 +247,10 @@ var script = /* @__PURE__ */ defineComponent({
       var _a, _b;
       return (_b = (_a = props.columnConfig) == null ? void 0 : _a.fieldList) != null ? _b : [];
     }, xGrid);
+    const onResizableChange = (payload) => {
+      onColumnResize(payload);
+      emit("resizableChange", payload);
+    };
     const loadData = async (data) => {
       state.isShowEmpty = !(data == null ? void 0 : data.length);
       const list = JSON.parse(JSON.stringify(data));
@@ -2220,10 +2224,9 @@ var script = /* @__PURE__ */ defineComponent({
         "show-footer-overflow": "title",
         "keep-source": "",
         resizable: "",
-        "auto-resize": ""
-      }, props.height ? {
-        height: "auto"
-      } : {}, {
+        "auto-resize": "",
+        height: props.height ? "auto" : void 0
+      }, _ctx.$attrs, {
         "seq-config": unref(handleSeqConfig),
         "tree-config": unref(treeConfig),
         "row-id": unref(handleRowId),
@@ -2282,7 +2285,7 @@ var script = /* @__PURE__ */ defineComponent({
         onCellMouseenter: handleCellMouseenter,
         onKeydown: unref(keyDown),
         onMenuClick: handleMenuClickEvent,
-        onResizableChange: unref(onColumnResize)
+        onResizableChange
       }), {
         empty: withCtx(() => [state.isShowEmpty ? renderSlot(_ctx.$slots, "empty", {
           key: 0
@@ -2337,7 +2340,7 @@ var script = /* @__PURE__ */ defineComponent({
           }
         })]),
         _: 3
-      }, 16, ["seq-config", "tree-config", "row-id", "cell-class-name", "row-config", "show-footer", "checkbox-config", "row-style", "edit-config", "expand-config", "keyboard-config", "edit-rules", "menu-config", "onScroll", "onKeydown", "onResizableChange"]), createCommentVNode(" `${refreshRow}\u6761\u66F4\u65B0` "), withDirectives(createElementVNode("div", {
+      }, 16, ["height", "seq-config", "tree-config", "row-id", "cell-class-name", "row-config", "show-footer", "checkbox-config", "row-style", "edit-config", "expand-config", "keyboard-config", "edit-rules", "menu-config", "onScroll", "onKeydown"]), createCommentVNode(" `${refreshRow}\u6761\u66F4\u65B0` "), withDirectives(createElementVNode("div", {
         class: "refresh",
         onClick: hanldeClickRefresh
       }, [createVNode(unref(NIcon), {

package/es/packages/big-table/src/bigTableEmits.js

@@ -45,7 +45,8 @@ const bigTableEmits = [
   "scroll",
   "keyboard",
   "checkboxChange",
-  "menuClick"
+  "menuClick",
+  "resizableChange"
 ];
 
 export { bigTableEmits as default };

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

@@ -666,6 +666,57 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
         readonly showFeedback: boolean;
         readonly showLabel: boolean | undefined;
     }>;
+    NTabPane: import("vue").DefineComponent<{
+        readonly tab: import("vue").PropType<string | number | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+            [key: string]: any;
+        }> | (() => import("vue").VNodeChild)>;
+        readonly name: {
+            readonly type: import("vue").PropType<string | number>;
+            readonly required: true;
+        };
+        readonly disabled: BooleanConstructor;
+        readonly displayDirective: {
+            readonly type: import("vue").PropType<"show" | "if" | "show:lazy">;
+            readonly default: "if";
+        };
+        readonly closable: {
+            readonly type: import("vue").PropType<boolean | undefined>;
+            readonly default: undefined;
+        };
+        readonly tabProps: import("vue").PropType<import("vue").HTMLAttributes>;
+        readonly label: import("vue").PropType<string | number | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+            [key: string]: any;
+        }> | (() => import("vue").VNodeChild)>;
+    }, {
+        style: import("vue").Ref<string | import("vue").CSSProperties | undefined>;
+        class: import("vue").Ref<string | undefined>;
+        mergedClsPrefix: import("vue").Ref<string>;
+    }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+        readonly tab: import("vue").PropType<string | number | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+            [key: string]: any;
+        }> | (() => import("vue").VNodeChild)>;
+        readonly name: {
+            readonly type: import("vue").PropType<string | number>;
+            readonly required: true;
+        };
+        readonly disabled: BooleanConstructor;
+        readonly displayDirective: {
+            readonly type: import("vue").PropType<"show" | "if" | "show:lazy">;
+            readonly default: "if";
+        };
+        readonly closable: {
+            readonly type: import("vue").PropType<boolean | undefined>;
+            readonly default: undefined;
+        };
+        readonly tabProps: import("vue").PropType<import("vue").HTMLAttributes>;
+        readonly label: import("vue").PropType<string | number | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+            [key: string]: any;
+        }> | (() => import("vue").VNodeChild)>;
+    }>>, {
+        readonly disabled: boolean;
+        readonly closable: boolean | undefined;
+        readonly displayDirective: "show" | "if" | "show:lazy";
+    }>;
     NTabs: import("vue").DefineComponent<{
         readonly value: import("vue").PropType<string | number>;
         readonly defaultValue: import("vue").PropType<string | number>;
@@ -1242,57 +1293,6 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
         readonly animated: boolean;
         readonly tabsPadding: number;
     }>;
-    NTabPane: import("vue").DefineComponent<{
-        readonly tab: import("vue").PropType<string | number | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
-            [key: string]: any;
-        }> | (() => import("vue").VNodeChild)>;
-        readonly name: {
-            readonly type: import("vue").PropType<string | number>;
-            readonly required: true;
-        };
-        readonly disabled: BooleanConstructor;
-        readonly displayDirective: {
-            readonly type: import("vue").PropType<"show" | "if" | "show:lazy">;
-            readonly default: "if";
-        };
-        readonly closable: {
-            readonly type: import("vue").PropType<boolean | undefined>;
-            readonly default: undefined;
-        };
-        readonly tabProps: import("vue").PropType<import("vue").HTMLAttributes>;
-        readonly label: import("vue").PropType<string | number | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
-            [key: string]: any;
-        }> | (() => import("vue").VNodeChild)>;
-    }, {
-        style: import("vue").Ref<string | import("vue").CSSProperties | undefined>;
-        class: import("vue").Ref<string | undefined>;
-        mergedClsPrefix: import("vue").Ref<string>;
-    }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
-        readonly tab: import("vue").PropType<string | number | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
-            [key: string]: any;
-        }> | (() => import("vue").VNodeChild)>;
-        readonly name: {
-            readonly type: import("vue").PropType<string | number>;
-            readonly required: true;
-        };
-        readonly disabled: BooleanConstructor;
-        readonly displayDirective: {
-            readonly type: import("vue").PropType<"show" | "if" | "show:lazy">;
-            readonly default: "if";
-        };
-        readonly closable: {
-            readonly type: import("vue").PropType<boolean | undefined>;
-            readonly default: undefined;
-        };
-        readonly tabProps: import("vue").PropType<import("vue").HTMLAttributes>;
-        readonly label: import("vue").PropType<string | number | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
-            [key: string]: any;
-        }> | (() => import("vue").VNodeChild)>;
-    }>>, {
-        readonly disabled: boolean;
-        readonly closable: boolean | undefined;
-        readonly displayDirective: "show" | "if" | "show:lazy";
-    }>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "formChange"[], "formChange", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     fieldList: {
         type: import("vue").PropType<import("./src/types").FieldItem[]>;

package/es/packages/form-render/src/FormRender.vue.d.ts

@@ -666,6 +666,57 @@ declare const _default: import("vue").DefineComponent<{
         readonly showFeedback: boolean;
         readonly showLabel: boolean | undefined;
     }>;
+    NTabPane: import("vue").DefineComponent<{
+        readonly tab: PropType<string | number | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+            [key: string]: any;
+        }> | (() => import("vue").VNodeChild)>;
+        readonly name: {
+            readonly type: PropType<string | number>;
+            readonly required: true;
+        };
+        readonly disabled: BooleanConstructor;
+        readonly displayDirective: {
+            readonly type: PropType<"show" | "if" | "show:lazy">;
+            readonly default: "if";
+        };
+        readonly closable: {
+            readonly type: PropType<boolean | undefined>;
+            readonly default: undefined;
+        };
+        readonly tabProps: PropType<import("vue").HTMLAttributes>;
+        readonly label: PropType<string | number | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+            [key: string]: any;
+        }> | (() => import("vue").VNodeChild)>;
+    }, {
+        style: import("vue").Ref<string | import("vue").CSSProperties | undefined>;
+        class: import("vue").Ref<string | undefined>;
+        mergedClsPrefix: import("vue").Ref<string>;
+    }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+        readonly tab: PropType<string | number | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+            [key: string]: any;
+        }> | (() => import("vue").VNodeChild)>;
+        readonly name: {
+            readonly type: PropType<string | number>;
+            readonly required: true;
+        };
+        readonly disabled: BooleanConstructor;
+        readonly displayDirective: {
+            readonly type: PropType<"show" | "if" | "show:lazy">;
+            readonly default: "if";
+        };
+        readonly closable: {
+            readonly type: PropType<boolean | undefined>;
+            readonly default: undefined;
+        };
+        readonly tabProps: PropType<import("vue").HTMLAttributes>;
+        readonly label: PropType<string | number | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+            [key: string]: any;
+        }> | (() => import("vue").VNodeChild)>;
+    }>>, {
+        readonly disabled: boolean;
+        readonly closable: boolean | undefined;
+        readonly displayDirective: "show" | "if" | "show:lazy";
+    }>;
     NTabs: import("vue").DefineComponent<{
         readonly value: PropType<string | number>;
         readonly defaultValue: PropType<string | number>;
@@ -1242,57 +1293,6 @@ declare const _default: import("vue").DefineComponent<{
         readonly animated: boolean;
         readonly tabsPadding: number;
     }>;
-    NTabPane: import("vue").DefineComponent<{
-        readonly tab: PropType<string | number | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
-            [key: string]: any;
-        }> | (() => import("vue").VNodeChild)>;
-        readonly name: {
-            readonly type: PropType<string | number>;
-            readonly required: true;
-        };
-        readonly disabled: BooleanConstructor;
-        readonly displayDirective: {
-            readonly type: PropType<"show" | "if" | "show:lazy">;
-            readonly default: "if";
-        };
-        readonly closable: {
-            readonly type: PropType<boolean | undefined>;
-            readonly default: undefined;
-        };
-        readonly tabProps: PropType<import("vue").HTMLAttributes>;
-        readonly label: PropType<string | number | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
-            [key: string]: any;
-        }> | (() => import("vue").VNodeChild)>;
-    }, {
-        style: import("vue").Ref<string | import("vue").CSSProperties | undefined>;
-        class: import("vue").Ref<string | undefined>;
-        mergedClsPrefix: import("vue").Ref<string>;
-    }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
-        readonly tab: PropType<string | number | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
-            [key: string]: any;
-        }> | (() => import("vue").VNodeChild)>;
-        readonly name: {
-            readonly type: PropType<string | number>;
-            readonly required: true;
-        };
-        readonly disabled: BooleanConstructor;
-        readonly displayDirective: {
-            readonly type: PropType<"show" | "if" | "show:lazy">;
-            readonly default: "if";
-        };
-        readonly closable: {
-            readonly type: PropType<boolean | undefined>;
-            readonly default: undefined;
-        };
-        readonly tabProps: PropType<import("vue").HTMLAttributes>;
-        readonly label: PropType<string | number | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
-            [key: string]: any;
-        }> | (() => import("vue").VNodeChild)>;
-    }>>, {
-        readonly disabled: boolean;
-        readonly closable: boolean | undefined;
-        readonly displayDirective: "show" | "if" | "show:lazy";
-    }>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "formChange"[], "formChange", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     fieldList: {
         type: PropType<FieldItem[]>;

package/es/packages/form-render/src/FormRender.vue_vue_type_script_setup_true_lang.js

@@ -63,9 +63,7 @@ var script = /* @__PURE__ */ defineComponent({
       }
       if (props.fieldList) {
         const _fieldList = useFieldVisitor().traverse(cloneDeep(props.fieldList), props.fieldVisitor);
-        const result = { type: "object", properties: schemaAdaptor(_fieldList) };
-        console.log(result);
-        return result;
+        return { type: "object", properties: schemaAdaptor(_fieldList) };
       }
       return { type: "object", properties: {} };
     });

package/es/packages/form-render/src/components/renderer/radio.d.ts

@@ -1,6 +1,7 @@
 import { AnyObject } from '../../../../../../es/src/types';
 import { PropType } from 'vue';
 export declare const RADIO: import("vue").DefineComponent<{
+    value: {};
     options: {
         type: PropType<AnyObject[]>;
         default: () => never[];
@@ -10,6 +11,7 @@ export declare const RADIO: import("vue").DefineComponent<{
         default: boolean;
     };
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    value: {};
     options: {
         type: PropType<AnyObject[]>;
         default: () => never[];

package/es/packages/form-render/src/components/renderer/radio.js

@@ -5,6 +5,7 @@ import { assignUpdateValue } from '../../utils/index.js';
 
 const script = defineComponent({
   props: {
+    value: {},
     options: {
       type: Array,
       default: () => []
@@ -14,11 +15,11 @@ const script = defineComponent({
       default: false
     }
   },
-  setup(props, {
-    attrs
-  }) {
+  setup(props) {
     return () => {
-      return createVNode(NRadioGroup, attrs, {
+      return createVNode(NRadioGroup, {
+        "value": props.value
+      }, {
         default: () => [createVNode(NSpace, {
           "vertical": props.vertical
         }, {

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/utils/index.js

@@ -78,7 +78,7 @@ function traverseSchema(schema, handler) {
   }
 }
 function uuidGenerator() {
-  return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(c) {
+  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);
   });

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "cnhis-design-vue",
 	"private": false,
-	"version": "3.1.12-beta.1",
+	"version": "3.1.12-beta.2",
 	"license": "ISC",
 	"module": "es/packages/index.js",
 	"main": "es/packages/index.js",
@@ -59,8 +59,8 @@
 		"vue": "^3.2.0",
 		"vue-simple-uploader": "^1.0.0-beta.5",
 		"vuedraggable": "4.1.0",
-      "vxe-table": "^4.2.5",
-      "xe-utils": "^3.5.4"
+		"vxe-table": "^4.2.5",
+		"xe-utils": "^3.5.4"
 	},
 	"devDependencies": {
 		"@babel/cli": "^7.17.10",