@unizhen/ui 0.1.136 → 0.1.138

package/lib/components/bom/index.vue.d.ts

@@ -32,7 +32,6 @@ declare const __VLS_export: DefineComponent<ExtractPropTypes<{
         default: () => never[];
     };
     item: {
-        required: true;
         type: PropType<IUzFormItemSubTable>;
         default: () => {};
     };
@@ -44,6 +43,10 @@ declare const __VLS_export: DefineComponent<ExtractPropTypes<{
         type: PropType<number>;
         default: number;
     };
+    expand: {
+        type: PropType<boolean>;
+        default: boolean;
+    };
 }>, {
     t: ComposerTranslation<{
         [x: string]: LocaleMessage<VueMessageType>;
@@ -114,7 +117,6 @@ declare const __VLS_export: DefineComponent<ExtractPropTypes<{
         default: () => never[];
     };
     item: {
-        required: true;
         type: PropType<IUzFormItemSubTable>;
         default: () => {};
     };
@@ -126,10 +128,15 @@ declare const __VLS_export: DefineComponent<ExtractPropTypes<{
         type: PropType<number>;
         default: number;
     };
+    expand: {
+        type: PropType<boolean>;
+        default: boolean;
+    };
 }>> & Readonly<{
     "onUpdate:value"?: ((...args: any[]) => any) | undefined;
 }>, {
     item: IUzFormItemSubTable;
+    expand: boolean;
     status: number;
     value: BomRow[] | null;
     height: string | number | undefined;

package/lib/components/form/draggable.vue.d.ts

@@ -1353,6 +1353,7 @@ declare const __VLS_export: DefineComponent<ExtractPropTypes<{
                     options?: string | undefined;
                     summary?: string | ((pageData: any) => any) | undefined;
                     merge?: string | ((pageData: any) => any) | undefined;
+                    expandableFn?: string | ((rowData: any) => boolean) | undefined;
                     deleteFn?: string | undefined;
                 };
                 label: string | (() => string);
@@ -1536,6 +1537,8 @@ declare const __VLS_export: DefineComponent<ExtractPropTypes<{
                     placeholder: string;
                     clearable: boolean;
                     expandable: boolean;
+                    merge?: string | ((pageData: any) => any) | undefined;
+                    expandableFn?: string | ((rowData: any) => boolean) | undefined;
                 };
                 label: string | (() => string);
                 key: string;
@@ -2953,6 +2956,7 @@ declare const __VLS_export: DefineComponent<ExtractPropTypes<{
             options?: string | undefined;
             summary?: string | ((pageData: any) => any) | undefined;
             merge?: string | ((pageData: any) => any) | undefined;
+            expandableFn?: string | ((rowData: any) => boolean) | undefined;
             deleteFn?: string | undefined;
         };
         label: string | (() => string);
@@ -3136,6 +3140,8 @@ declare const __VLS_export: DefineComponent<ExtractPropTypes<{
             placeholder: string;
             clearable: boolean;
             expandable: boolean;
+            merge?: string | ((pageData: any) => any) | undefined;
+            expandableFn?: string | ((rowData: any) => boolean) | undefined;
         };
         label: string | (() => string);
         key: string;
@@ -4477,6 +4483,7 @@ declare const __VLS_export: DefineComponent<ExtractPropTypes<{
                     options?: string | undefined;
                     summary?: string | ((pageData: any) => any) | undefined;
                     merge?: string | ((pageData: any) => any) | undefined;
+                    expandableFn?: string | ((rowData: any) => boolean) | undefined;
                     deleteFn?: string | undefined;
                 };
                 label: string | (() => string);
@@ -4660,6 +4667,8 @@ declare const __VLS_export: DefineComponent<ExtractPropTypes<{
                     placeholder: string;
                     clearable: boolean;
                     expandable: boolean;
+                    merge?: string | ((pageData: any) => any) | undefined;
+                    expandableFn?: string | ((rowData: any) => boolean) | undefined;
                 };
                 label: string | (() => string);
                 key: string;
@@ -6077,6 +6086,7 @@ declare const __VLS_export: DefineComponent<ExtractPropTypes<{
             options?: string | undefined;
             summary?: string | ((pageData: any) => any) | undefined;
             merge?: string | ((pageData: any) => any) | undefined;
+            expandableFn?: string | ((rowData: any) => boolean) | undefined;
             deleteFn?: string | undefined;
         };
         label: string | (() => string);
@@ -6260,6 +6270,8 @@ declare const __VLS_export: DefineComponent<ExtractPropTypes<{
             placeholder: string;
             clearable: boolean;
             expandable: boolean;
+            merge?: string | ((pageData: any) => any) | undefined;
+            expandableFn?: string | ((rowData: any) => boolean) | undefined;
         };
         label: string | (() => string);
         key: string;

package/lib/components/form/index.vue.d.ts

@@ -1355,6 +1355,7 @@ declare const __VLS_export: DefineComponent<ExtractPropTypes<{
                     options?: string | undefined;
                     summary?: string | ((pageData: any) => any) | undefined;
                     merge?: string | ((pageData: any) => any) | undefined;
+                    expandableFn?: string | ((rowData: any) => boolean) | undefined;
                     deleteFn?: string | undefined;
                 };
                 label: string | (() => string);
@@ -1538,6 +1539,8 @@ declare const __VLS_export: DefineComponent<ExtractPropTypes<{
                     placeholder: string;
                     clearable: boolean;
                     expandable: boolean;
+                    merge?: string | ((pageData: any) => any) | undefined;
+                    expandableFn?: string | ((rowData: any) => boolean) | undefined;
                 };
                 label: string | (() => string);
                 key: string;
@@ -2955,6 +2958,7 @@ declare const __VLS_export: DefineComponent<ExtractPropTypes<{
             options?: string | undefined;
             summary?: string | ((pageData: any) => any) | undefined;
             merge?: string | ((pageData: any) => any) | undefined;
+            expandableFn?: string | ((rowData: any) => boolean) | undefined;
             deleteFn?: string | undefined;
         };
         label: string | (() => string);
@@ -3138,6 +3142,8 @@ declare const __VLS_export: DefineComponent<ExtractPropTypes<{
             placeholder: string;
             clearable: boolean;
             expandable: boolean;
+            merge?: string | ((pageData: any) => any) | undefined;
+            expandableFn?: string | ((rowData: any) => boolean) | undefined;
         };
         label: string | (() => string);
         key: string;
@@ -4479,6 +4485,7 @@ declare const __VLS_export: DefineComponent<ExtractPropTypes<{
                     options?: string | undefined;
                     summary?: string | ((pageData: any) => any) | undefined;
                     merge?: string | ((pageData: any) => any) | undefined;
+                    expandableFn?: string | ((rowData: any) => boolean) | undefined;
                     deleteFn?: string | undefined;
                 };
                 label: string | (() => string);
@@ -4662,6 +4669,8 @@ declare const __VLS_export: DefineComponent<ExtractPropTypes<{
                     placeholder: string;
                     clearable: boolean;
                     expandable: boolean;
+                    merge?: string | ((pageData: any) => any) | undefined;
+                    expandableFn?: string | ((rowData: any) => boolean) | undefined;
                 };
                 label: string | (() => string);
                 key: string;
@@ -6079,6 +6088,7 @@ declare const __VLS_export: DefineComponent<ExtractPropTypes<{
             options?: string | undefined;
             summary?: string | ((pageData: any) => any) | undefined;
             merge?: string | ((pageData: any) => any) | undefined;
+            expandableFn?: string | ((rowData: any) => boolean) | undefined;
             deleteFn?: string | undefined;
         };
         label: string | (() => string);
@@ -6262,6 +6272,8 @@ declare const __VLS_export: DefineComponent<ExtractPropTypes<{
             placeholder: string;
             clearable: boolean;
             expandable: boolean;
+            merge?: string | ((pageData: any) => any) | undefined;
+            expandableFn?: string | ((rowData: any) => boolean) | undefined;
         };
         label: string | (() => string);
         key: string;

package/lib/components/form/interface.d.ts

@@ -312,6 +312,8 @@ export interface IUzFormItemBom extends IUzFormItemBase {
         placeholder: string;
         clearable: boolean;
         expandable: boolean;
+        merge?: string | ((pageData: any) => any);
+        expandableFn?: string | ((rowData: any) => boolean);
     };
 }
 export interface IUzFormItemSubTable extends IUzFormItemBase {
@@ -339,6 +341,7 @@ export interface IUzFormItemSubTable extends IUzFormItemBase {
         options?: string;
         summary?: string | ((pageData: any) => any);
         merge?: string | ((pageData: any) => any);
+        expandableFn?: string | ((rowData: any) => boolean);
         deleteFn?: string;
     };
 }

package/lib/components/table/components/expand.vue.d.ts

@@ -42,6 +42,7 @@ declare const __VLS_export: DefineComponent<ExtractPropTypes<{
     columns: Ref<any[], any[]>;
     columnsData: Ref<never[], never[]>;
     tableScrollX: Ref<number, number>;
+    tableType: Ref<number, number>;
 }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly< ExtractPropTypes<{
     data: {
         required: true;

package/lib/components/table/factory.d.ts

@@ -274,6 +274,8 @@ export declare function fnPrepareTableData(items: IUzFormItems, child?: boolean,
             _asyncFn?: () => Promise<any[]>;
             clearable: boolean;
             expandable: boolean;
+            merge?: string | ((pageData: any) => any);
+            expandableFn?: string | ((rowData: any) => boolean);
         };
         form: {
             show: boolean;
@@ -285,6 +287,7 @@ export declare function fnPrepareTableData(items: IUzFormItems, child?: boolean,
         key: string;
         link: string;
         merge: string;
+        expandableFn: string;
     };
     tableWidth: number;
 }>;

package/lib/components/table/index.vue.d.ts

@@ -2998,6 +2998,7 @@ declare const __VLS_export: DefineComponent<ExtractPropTypes<{
         columns: Ref<any[], any[]>;
         columnsData: Ref<never[], never[]>;
         tableScrollX: Ref<number, number>;
+        tableType: Ref<number, number>;
     }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly< ExtractPropTypes<{
         data: {
             required: true;

package/lib/ui.js

@@ -2899,7 +2899,7 @@ async function _i(e) {
 }
 var vi = (e) => e.map((e) => {
 	let t = {};
-	return t.z = e.params.placeholder, e.input === "group" ? t.n = e.params.children : t.c = +!!e.params.clearable, e.input === "input" && (e.params.type && (t.t = e.params.type), e.params.minlength && (t.i = e.params.minlength), e.params.maxlength && (t.a = e.params.maxlength), e.params.rows && (t.r = e.params.rows), e.params.prefix && (t.e = e.params.prefix), e.params.suffix && (t.s = e.params.suffix)), e.input === "auto" && (t.o = e.params.options, e.params.prefix && (t.e = e.params.prefix), e.params.suffix && (t.s = e.params.suffix)), e.input === "number" && (t.b = +!!e.params.showButton, e.params.min && (t.i = e.params.min), e.params.max && (t.a = e.params.max), e.params.minKey && (t.x = e.params.minKey), e.params.maxKey && (t.y = e.params.maxKey), e.params.step && (t.t = e.params.step), e.params.precision && (t.p = e.params.precision), e.params.prefix && (t.e = e.params.prefix), e.params.suffix && (t.s = e.params.suffix)), e.input === "date" && (t.y = e.params.type, e.params.format && (t.f = e.params.format), e.params.isDateDisabled && (t.d = e.params.isDateDisabled), e.params.timePickerProps && (t.t = e.params.timePickerProps)), e.input === "select" && (t.o = e.params.options, t.y = e.params.immediately, t.f = +!!e.params.filterable, t.m = +!!e.params.multiple, t.t = +!!e.params.tag, t.l = (e.params.labelKeys || "").replace(/\s*/g, ""), t.v = (e.params.valueKey || "").replace(/\s*/g, ""), t.r = e.params.renderLabel, t.g = e.params.renderTag), e.input === "cascader" && (t.o = e.params.options, t.y = e.params.immediately, t.f = +!!e.params.filterable, t.m = +!!e.params.multiple), e.input === "checkbox" && (t.o = e.params.options), e.input === "time" && (t.f = e.params.format), e.input === "upload" && (t.s = +!!e.params.small, t.a = e.params.accept, t.m = e.params.max), e.input === "switch" && (t.h = e.params.checked, t.u = e.params.unchecked), e.input === "divider" && (t.p = e.params.placement), e.input === "filling" && (t.k = e.params.parentKey), e.input === "bom" && (t.x = +!!e.params.expandable), e.input === "subTable" && (t.i = +!!e.params.init, t.q = +!!e.params.quest, t.k = e.params.searchKey, t.l = e.params.link, t.c = e.params.columns, t.a = e.params.actions, t.b = +!!e.params.addButton, t.g = +!!e.params.draggable, t.h = +!!e.params.childActions, t.x = +!!e.params.expandable, t.n = +!!e.params.showActions, t.d = +!!e.params.showDelete, e.params.optionsType && (t.t = e.params.optionsType), e.params.optionsSource && (t.u = e.params.optionsSource), e.params.options && (t.o = e.params.options), e.params.summary && (t.s = e.params.summary), e.params.merge && (t.m = e.params.merge), e.params.deleteFn && (t.f = e.params.deleteFn)), {
+	return t.z = e.params.placeholder, e.input === "group" ? t.n = e.params.children : t.c = +!!e.params.clearable, e.input === "input" && (e.params.type && (t.t = e.params.type), e.params.minlength && (t.i = e.params.minlength), e.params.maxlength && (t.a = e.params.maxlength), e.params.rows && (t.r = e.params.rows), e.params.prefix && (t.e = e.params.prefix), e.params.suffix && (t.s = e.params.suffix)), e.input === "auto" && (t.o = e.params.options, e.params.prefix && (t.e = e.params.prefix), e.params.suffix && (t.s = e.params.suffix)), e.input === "number" && (t.b = +!!e.params.showButton, e.params.min && (t.i = e.params.min), e.params.max && (t.a = e.params.max), e.params.minKey && (t.x = e.params.minKey), e.params.maxKey && (t.y = e.params.maxKey), e.params.step && (t.t = e.params.step), e.params.precision && (t.p = e.params.precision), e.params.prefix && (t.e = e.params.prefix), e.params.suffix && (t.s = e.params.suffix)), e.input === "date" && (t.y = e.params.type, e.params.format && (t.f = e.params.format), e.params.isDateDisabled && (t.d = e.params.isDateDisabled), e.params.timePickerProps && (t.t = e.params.timePickerProps)), e.input === "select" && (t.o = e.params.options, t.y = e.params.immediately, t.f = +!!e.params.filterable, t.m = +!!e.params.multiple, t.t = +!!e.params.tag, t.l = (e.params.labelKeys || "").replace(/\s*/g, ""), t.v = (e.params.valueKey || "").replace(/\s*/g, ""), t.r = e.params.renderLabel, t.g = e.params.renderTag), e.input === "cascader" && (t.o = e.params.options, t.y = e.params.immediately, t.f = +!!e.params.filterable, t.m = +!!e.params.multiple), e.input === "checkbox" && (t.o = e.params.options), e.input === "time" && (t.f = e.params.format), e.input === "upload" && (t.s = +!!e.params.small, t.a = e.params.accept, t.m = e.params.max), e.input === "switch" && (t.h = e.params.checked, t.u = e.params.unchecked), e.input === "divider" && (t.p = e.params.placement), e.input === "filling" && (t.k = e.params.parentKey), e.input === "bom" && (t.x = +!!e.params.expandable, e.params.merge && (t.m = e.params.merge), e.params.expandableFn && (t.e = e.params.expandableFn)), e.input === "subTable" && (t.i = +!!e.params.init, t.q = +!!e.params.quest, t.k = e.params.searchKey, t.l = e.params.link, t.c = e.params.columns, t.a = e.params.actions, t.b = +!!e.params.addButton, t.g = +!!e.params.draggable, t.h = +!!e.params.childActions, t.x = +!!e.params.expandable, t.n = +!!e.params.showActions, t.d = +!!e.params.showDelete, e.params.optionsType && (t.t = e.params.optionsType), e.params.optionsSource && (t.u = e.params.optionsSource), e.params.options && (t.o = e.params.options), e.params.summary && (t.s = e.params.summary), e.params.merge && (t.m = e.params.merge), e.params.expandableFn && (t.e = e.params.expandableFn), e.params.deleteFn && (t.f = e.params.deleteFn)), {
 		i: e.input,
 		l: e.label ? encodeURIComponent(e.label) : "",
 		k: e.key.replace(/\s*/g, ""),
@@ -2974,7 +2974,7 @@ var vi = (e) => e.map((e) => {
 	};
 }), yi = (e) => !e[0] || e[0] && e[0].input ? e : e.map((e) => {
 	let t = {};
-	return t.placeholder = e.p.z, e.i === "group" ? t.children = e.p.n : t.clearable = !!e.p.c, e.i === "input" && (e.p.t && (t.type = e.p.t), e.p.i && (t.minlength = e.p.i), e.p.a && (t.maxlength = e.p.a), e.p.r && (t.rows = e.p.r), e.p.e && (t.prefix = e.p.e), e.p.s && (t.suffix = e.p.s)), e.i === "auto" && (t.options = e.p.o, e.p.e && (t.prefix = e.p.e), e.p.s && (t.suffix = e.p.s)), e.i === "number" && (t.showButton = !!e.p.b, e.p.i && (t.min = e.p.i), e.p.a && (t.max = e.p.a), e.p.x && (t.minKey = e.p.x), e.p.y && (t.maxKey = e.p.y), e.p.t && (t.step = e.p.t), e.p.p && (t.precision = e.p.p), e.p.e && (t.prefix = e.p.e), e.p.s && (t.suffix = e.p.s)), e.i === "date" && (t.type = e.p.y, e.p.f && (t.format = e.p.f), e.p.d && (t.isDateDisabled = e.p.d), e.p.t && (t.timePickerProps = e.p.t)), e.i === "select" && (t.options = e.p.o, t.immediately = e.p.y, t.filterable = !!e.p.f, t.multiple = !!e.p.m, t.tag = !!e.p.t, t.labelKeys = e.p.l, t.valueKey = e.p.v, t.renderLabel = e.p.r, t.renderTag = e.p.g), e.i === "cascader" && (t.options = e.p.o, t.immediately = e.p.y, t.filterable = !!e.p.f, t.multiple = !!e.p.m), e.i === "checkbox" && (t.options = e.p.o), e.i === "time" && (t.format = e.p.f), e.i === "upload" && (t.small = !!e.p.s, t.accept = e.p.a, t.max = e.p.m), e.i === "switch" && (t.checked = e.p.h, t.unchecked = e.p.u), e.i === "divider" && (t.placement = e.p.p), e.i === "filling" && (t.parentKey = e.p.k), e.i === "bom" && (t.expandable = !!e.p.x), e.i === "subTable" && (t.init = !!e.p.i, t.quest = !!e.p.q, t.searchKey = e.p.k, t.link = e.p.l, t.columns = e.p.c, t.actions = e.p.a, t.addButton = !!e.p.b, t.draggable = !!e.p.g, t.childActions = !!e.p.h, t.showActions = !!e.p.n, t.showDelete = !!(e.p.d ?? !0), t.expandable = !!e.p.x, e.p.t && (t.optionsType = e.p.t), e.p.u && (t.optionsSource = e.p.u), e.p.o && (t.options = e.p.o), e.p.s && (t.summary = e.p.s), e.p.m && (t.merge = e.p.m), e.p.f && (t.deleteFn = e.p.f)), {
+	return t.placeholder = e.p.z, e.i === "group" ? t.children = e.p.n : t.clearable = !!e.p.c, e.i === "input" && (e.p.t && (t.type = e.p.t), e.p.i && (t.minlength = e.p.i), e.p.a && (t.maxlength = e.p.a), e.p.r && (t.rows = e.p.r), e.p.e && (t.prefix = e.p.e), e.p.s && (t.suffix = e.p.s)), e.i === "auto" && (t.options = e.p.o, e.p.e && (t.prefix = e.p.e), e.p.s && (t.suffix = e.p.s)), e.i === "number" && (t.showButton = !!e.p.b, e.p.i && (t.min = e.p.i), e.p.a && (t.max = e.p.a), e.p.x && (t.minKey = e.p.x), e.p.y && (t.maxKey = e.p.y), e.p.t && (t.step = e.p.t), e.p.p && (t.precision = e.p.p), e.p.e && (t.prefix = e.p.e), e.p.s && (t.suffix = e.p.s)), e.i === "date" && (t.type = e.p.y, e.p.f && (t.format = e.p.f), e.p.d && (t.isDateDisabled = e.p.d), e.p.t && (t.timePickerProps = e.p.t)), e.i === "select" && (t.options = e.p.o, t.immediately = e.p.y, t.filterable = !!e.p.f, t.multiple = !!e.p.m, t.tag = !!e.p.t, t.labelKeys = e.p.l, t.valueKey = e.p.v, t.renderLabel = e.p.r, t.renderTag = e.p.g), e.i === "cascader" && (t.options = e.p.o, t.immediately = e.p.y, t.filterable = !!e.p.f, t.multiple = !!e.p.m), e.i === "checkbox" && (t.options = e.p.o), e.i === "time" && (t.format = e.p.f), e.i === "upload" && (t.small = !!e.p.s, t.accept = e.p.a, t.max = e.p.m), e.i === "switch" && (t.checked = e.p.h, t.unchecked = e.p.u), e.i === "divider" && (t.placement = e.p.p), e.i === "filling" && (t.parentKey = e.p.k), e.i === "bom" && (t.expandable = !!e.p.x, e.p.m && (t.merge = e.p.m), e.p.e && (t.expandableFn = e.p.e)), e.i === "subTable" && (t.init = !!e.p.i, t.quest = !!e.p.q, t.searchKey = e.p.k, t.link = e.p.l, t.columns = e.p.c, t.actions = e.p.a, t.addButton = !!e.p.b, t.draggable = !!e.p.g, t.childActions = !!e.p.h, t.showActions = !!e.p.n, t.showDelete = !!(e.p.d ?? !0), t.expandable = !!e.p.x, e.p.t && (t.optionsType = e.p.t), e.p.u && (t.optionsSource = e.p.u), e.p.o && (t.options = e.p.o), e.p.s && (t.summary = e.p.s), e.p.m && (t.merge = e.p.m), e.p.e && (t.expandableFn = e.p.e), e.p.f && (t.deleteFn = e.p.f)), {
 		input: e.i,
 		label: e.l ? decodeURIComponent(e.l) : "",
 		key: e.k,
@@ -3245,7 +3245,8 @@ async function Ti(e, t = !1, n = 0, r = () => {}, i = {}, a = !1, o = !1) {
 	let s = 0, c = [], l = [], u = {
 		key: "",
 		link: "",
-		merge: ""
+		merge: "",
+		expandableFn: ""
 	}, d = [], p = G(e), m = [], h = [];
 	for (let e of p) e.input === "group" ? (m.push(...e.params.children), h.push({
 		title: e.label,
@@ -3379,12 +3380,14 @@ async function Ti(e, t = !1, n = 0, r = () => {}, i = {}, a = !1, o = !1) {
 		}
 		s.input === "bom" && s.params.expandable && (u = {
 			key: s.key,
-			link: "",
-			merge: ""
+			link: "bom",
+			merge: s.params.merge,
+			expandableFn: s.params.expandableFn
 		}), s.input === "subTable" && s.params.link && !s.params.quest && (l.push(s.params.link), s.params.expandable && (u = {
 			key: s.key,
 			link: s.params.link,
-			merge: s.params.merge
+			merge: s.params.merge,
+			expandableFn: s.params.expandableFn
 		}));
 	}
 	let g = [];
@@ -3434,7 +3437,6 @@ var Ei = (e) => e.key === "product_no" || e.key === "product_name" || typeof e.t
 			default: () => []
 		},
 		item: {
-			required: !0,
 			type: Object,
 			default: () => ({})
 		},
@@ -3445,6 +3447,10 @@ var Ei = (e) => e.key === "product_no" || e.key === "product_name" || typeof e.t
 		status: {
 			type: Number,
 			default: 1
+		},
+		expand: {
+			type: Boolean,
+			default: !1
 		}
 	},
 	emits: ["update:value"],
@@ -3720,50 +3726,46 @@ var Ei = (e) => e.key === "product_no" || e.key === "product_name" || typeof e.t
 	key: 0,
 	class: "uz-table-asterisk"
 };
-function Ni(e, t, n, s, u, d) {
-	let f = D("NDataTable"), p = D("NForm");
-	return x(), a("div", ki, [o("div", Ai, [
-		o("div", ji, [c(A(e.item.label) + " ", 1), e.item.form?.rule.required ? (x(), a("span", Mi, " \xA0* ")) : i("", !0)]),
-		t[0] ||= o("div", { class: "uz-br" }, null, -1),
-		l(p, {
-			ref: "formRef",
-			model: { child: e.innerData }
+function Ni(t, n, s, u, d, f) {
+	let p = D("NDataTable"), m = D("NForm");
+	return x(), a("div", ki, [o("div", Ai, [t.expand ? i("", !0) : (x(), a(e, { key: 0 }, [o("div", ji, [c(A(t.item.label) + " ", 1), t.item.form?.rule.required ? (x(), a("span", Mi, " \xA0* ")) : i("", !0)]), n[0] ||= o("div", { class: "uz-br" }, null, -1)], 64)), l(m, {
+		ref: "formRef",
+		model: { child: t.innerData }
+	}, {
+		default: P(() => [(x(), r(p, {
+			key: t.tableVersion,
+			ref: "tableRef",
+			columns: t.displayedTableCols,
+			data: t.innerData,
+			"row-props": t.getRowProps,
+			"row-key": t.getRowKey,
+			"children-key": "children",
+			indent: 0,
+			"expanded-row-keys": t.innerExpandedRowKeys,
+			"min-height": t.height,
+			"max-height": t.height,
+			"scroll-x": t.displayedScrollX,
+			pagination: !1,
+			size: "small",
+			"onUpdate:expandedRowKeys": t.handleExpandedRowKeysChange,
+			"scrollbar-props": { trigger: "none" },
+			remote: ""
 		}, {
-			default: P(() => [(x(), r(f, {
-				key: e.tableVersion,
-				ref: "tableRef",
-				columns: e.displayedTableCols,
-				data: e.innerData,
-				"row-props": e.getRowProps,
-				"row-key": e.getRowKey,
-				"children-key": "children",
-				indent: 0,
-				"expanded-row-keys": e.innerExpandedRowKeys,
-				"min-height": e.height,
-				"max-height": e.height,
-				"scroll-x": e.displayedScrollX,
-				pagination: !1,
-				size: "small",
-				"onUpdate:expandedRowKeys": e.handleExpandedRowKeysChange,
-				"scrollbar-props": { trigger: "none" },
-				remote: ""
-			}, {
-				empty: P(() => [E(e.$slots, "empty", {}, () => [c(A(e.t("BOM.empty")), 1)])]),
-				_: 3
-			}, 8, [
-				"columns",
-				"data",
-				"row-props",
-				"row-key",
-				"expanded-row-keys",
-				"min-height",
-				"max-height",
-				"scroll-x",
-				"onUpdate:expandedRowKeys"
-			]))]),
+			empty: P(() => [E(t.$slots, "empty", {}, () => [c(A(t.t("BOM.empty")), 1)])]),
 			_: 3
-		}, 8, ["model"])
-	])]);
+		}, 8, [
+			"columns",
+			"data",
+			"row-props",
+			"row-key",
+			"expanded-row-keys",
+			"min-height",
+			"max-height",
+			"scroll-x",
+			"onUpdate:expandedRowKeys"
+		]))]),
+		_: 3
+	}, 8, ["model"])])]);
 }
 var Pi = /*#__PURE__*/ Q(Oi, [["render", Ni]]), Fi = 46, Ii = 8, Li = 2 * Math.PI * Fi, Ri = Ii, zi = 19, Bi = 69, Vi = 52, Hi = 8, Ui = 135, Wi = 270, Gi = 2 * Math.PI * Vi, Ki = Wi / 360 * Gi, qi = 11, Ji = `rotate(${Ui} 60 ${Bi})`, Yi = (e, t, n, r) => {
 	let i = r * Math.PI / 180;
@@ -4806,39 +4808,51 @@ var Wa = /*#__PURE__*/ Q(Ha, [["render", Ua]]), Ga = d({
 		}
 	},
 	setup(e) {
-		let t = w(!0), n = w([]), r = w([]), i = w(0);
+		let t = w(!0), n = w([]), r = w([]), i = w(0), a = w(0);
 		return y(async () => {
-			if (e.data.merge) try {
-				let t = e.data.merge, n = Function("formValue", "mainFormValue", "POST", t);
-				r.value = await n(e.value[`sub_${e.data.key}`], { value: () => e.value }, Z);
-			} catch (e) {
-				q(e);
+			if (e.data.link === "bom") {
+				if (e.data.merge) try {
+					let t = e.data.merge, n = Function("formValue", "mainFormValue", "POST", t);
+					r.value = await n(e.value, { value: () => e.value }, Z);
+				} catch (e) {
+					q(e);
+				}
+				a.value = 1;
+			} else {
+				if (e.data.merge) try {
+					let t = e.data.merge, n = Function("formValue", "mainFormValue", "POST", t);
+					r.value = await n(e.value[`sub_${e.data.key}`], { value: () => e.value }, Z);
+				} catch (e) {
+					q(e);
+				}
+				_i(e.data.link).then(async (e) => {
+					let { tableColumns: r } = await Ti(yi(et.parse(e.viewJson).table), !0, 2, () => {}, {}, !1, !0), a = 0, o = r.map((e) => ({
+						...e,
+						sorter: !1,
+						resizable: !1
+					})).filter((e) => e.show);
+					o.forEach((e) => {
+						a += e.width;
+					}), n.value = o, i.value = a, t.value = !1;
+				}).catch(() => {
+					t.value = !1;
+				});
 			}
-			_i(e.data.link).then(async (e) => {
-				let { tableColumns: r } = await Ti(yi(et.parse(e.viewJson).table), !0, 2, () => {}, {}, !1, !0), a = 0, o = r.map((e) => ({
-					...e,
-					sorter: !1,
-					resizable: !1
-				})).filter((e) => e.show);
-				o.forEach((e) => {
-					a += e.width;
-				}), n.value = o, i.value = a, t.value = !1;
-			}).catch((e) => {
-				t.value = !1;
-			});
 		}), {
 			loading: t,
 			columns: n,
 			columnsData: r,
-			tableScrollX: i
+			tableScrollX: i,
+			tableType: a
 		};
 	}
 });
 //#endregion
 //#region components/table/components/expand.vue
 function Ka(e, t, n, i, a, o) {
-	let s = D("NDataTable");
-	return x(), r(s, {
+	let s = D("NDataTable"), c = D("UzBom");
+	return e.tableType === 0 ? (x(), r(s, {
+		key: 0,
 		columns: e.columns,
 		data: e.columnsData,
 		pagination: !1,
@@ -4853,7 +4867,12 @@ function Ka(e, t, n, i, a, o) {
 		"data",
 		"loading",
 		"scroll-x"
-	]);
+	])) : (x(), r(c, {
+		key: 1,
+		value: e.columnsData,
+		status: 2,
+		expand: !0
+	}, null, 8, ["value"]));
 }
 var qa = /*#__PURE__*/ Q(Ga, [["render", Ka]]), Ja = d({
 	components: { NSkeleton: ke },
@@ -5391,6 +5410,13 @@ var $a = d({
 				fixed: "left",
 				filter: "default",
 				filterOptionValue: null,
+				expandable: a.expandableFn ? (e) => {
+					try {
+						return Function("rowData", a.expandableFn)(e);
+					} catch {
+						return !1;
+					}
+				} : !0,
 				renderFilterMenu: () => f("div", { class: "uz-table-filter" }, [f(L, { onClick: Re }, { default: () => s("Common.expand") }), f(L, { onClick: ze }, { default: () => s("Common.contract") })]),
 				renderExpand: (e) => f(qa, {
 					data: a,
@@ -7850,7 +7876,7 @@ function ac(e, t, n) {
 }
 //#endregion
 //#region package.json
-var oc = "0.1.136", sc;
+var oc = "0.1.138", sc;
 async function cc() {
 	let e = await fetch(`${window.location.protocol}//${window.location.host}`, {
 		method: "HEAD",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unizhen/ui",
-  "version": "0.1.136",
+  "version": "0.1.138",
   "author": {
     "name": "Donovan"
   },