@unizhen/ui 0.1.69 → 0.1.70

package/lib/components/common.d.ts

@@ -16,7 +16,4 @@ export declare const fnThrottle: (fn: Fn, wait?: number) => Fn;
 export declare function fnFullScreen(element: any, callback?: Fn): void;
 export declare function fnFormatUnits(number: number, precision?: number): string;
 export declare function fnFilterByPinyinInitials(item: string, keyword: string): boolean;
-export declare function mergeColumns(firstList: ObjectKey[], secondList: ObjectKey[]): {
-    [x: string]: any;
-    [x: number]: any;
-}[];
+export declare function mergeColumns(firstList: ObjectKey[], secondList: ObjectKey[]): ObjectKey[];

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

@@ -8084,9 +8084,9 @@ declare const __VLS_export: DefineComponent<ExtractPropTypes<{
         };
     }>> & Readonly<{}>, {
         disabled: boolean;
+        item: IUzFormItem;
         clearable: boolean;
         status: number;
-        item: IUzFormItem;
         formValue: ObjectKey;
         itemIndex: number;
     }, {}, {

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

@@ -8084,9 +8084,9 @@ declare const __VLS_export: DefineComponent<ExtractPropTypes<{
         };
     }>> & Readonly<{}>, {
         disabled: boolean;
+        item: IUzFormItem;
         clearable: boolean;
         status: number;
-        item: IUzFormItem;
         formValue: ObjectKey;
         itemIndex: number;
     }, {}, {

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

@@ -105,9 +105,9 @@ declare const __VLS_export: DefineComponent<ExtractPropTypes<{
     };
 }>> & Readonly<{}>, {
     disabled: boolean;
+    item: IUzFormItem;
     clearable: boolean;
     status: number;
-    item: IUzFormItem;
     formValue: ObjectKey;
     itemIndex: number;
 }, {}, {

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

@@ -58,9 +58,9 @@ declare const __VLS_export: DefineComponent<ExtractPropTypes<{
 }>> & Readonly<{
     "onUpdate:value"?: ((...args: any[]) => any) | undefined;
 }>, {
+    item: IUzFormItemUpload;
     value: string | ObjectKey | null;
     status: number;
-    item: IUzFormItemUpload;
 }, {}, {
     NUpload: DefineComponent<ExtractPropTypes<{
         readonly name: {

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

@@ -3829,9 +3829,9 @@ declare const __VLS_export: DefineComponent<ExtractPropTypes<{
         };
     }>> & Readonly<{}>, {
         disabled: boolean;
+        item: IUzFormItem;
         clearable: boolean;
         status: number;
-        item: IUzFormItem;
         formValue: ObjectKey;
         itemIndex: number;
     }, {}, {

package/lib/components/searchBar/mobile.vue.d.ts

@@ -3995,9 +3995,9 @@ declare const __VLS_export: DefineComponent<ExtractPropTypes<{
         };
     }>> & Readonly<{}>, {
         disabled: boolean;
+        item: IUzFormItem;
         clearable: boolean;
         status: number;
-        item: IUzFormItem;
         formValue: ObjectKey;
         itemIndex: number;
     }, {}, {

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

@@ -60,9 +60,9 @@ declare const __VLS_export: DefineComponent<ExtractPropTypes<{
 }>> & Readonly<{
     "onUpdate:value"?: ((...args: any[]) => any) | undefined;
 }>, {
+    item: IUzFormItemSubTable;
     value: any[];
     status: number;
-    item: IUzFormItemSubTable;
 }, {}, {
     NSpin: DefineComponent<ExtractPropTypes<{
         strokeWidth: {

package/lib/ui.js

@@ -2349,15 +2349,15 @@ function vd(e, t) {
 	return n === "" || e.toLowerCase().includes(n) || _d(e).includes(n);
 }
 function yd(e, t) {
-	let n = new Map(e.map((e) => [e.key, e])), r = new Map(t.map((e) => [e.key, e])), i = r.get("action") || n.get("action"), a = t.filter((e) => e.key !== "action").map((e) => ({
-		...n.get(e.key) || {},
-		...e
-	})), o = e.filter((e) => !r.has(e.key) && e.key !== "action");
-	return [
-		...a,
-		...o.map((e) => ({ ...e })),
-		...i ? [{ ...i }] : []
-	];
+	e.forEach((e) => {
+		let n = t.find((t) => t.key === e.key);
+		n && (e.hide = n.hide, e.show = n.show, e.width = n.width);
+	});
+	let n = new Map(t.map((e, t) => [e.key, t])), r = (e) => e.type === "expand" ? -2 : e.key === "index" ? -1 : e.key === "action" ? 2 ** 53 - 1 : n.has(e.key) ? n.get(e.key) : 2 ** 53 - 1 - 1;
+	return e.map((e, t) => ({
+		item: e,
+		index: t
+	})).sort((e, t) => r(e.item) - r(t.item) || e.index - t.index).map(({ item: e }) => e);
 }
 //#endregion
 //#region components/fetch.ts
@@ -6114,8 +6114,8 @@ var Yp = /*#__PURE__*/ U(qp, [["render", Jp]]), Xp = d({
 			}
 		}, Se = async () => {
 			I.value = !1, Np();
-			let { tableColumns: t, search: n, subTableIds: r, subTableExpand: i } = await Up(A.value, e.child, 0, () => ({}), ie), s = 0;
-			!c.value && F.value.index && (t.unshift({
+			let { tableColumns: t, search: n, subTableIds: r, subTableExpand: i } = await Up(A.value, e.child, 0, () => ({}), ie);
+			!c.value && F.value.index && t.unshift({
 				title: "#",
 				key: "index",
 				align: "center",
@@ -6130,7 +6130,7 @@ var Yp = /*#__PURE__*/ U(qp, [["render", Jp]]), Xp = d({
 						return (e - 1) * n + (t + 1);
 					} });
 				}
-			}), s += 60), !c.value && (e.selection || F.value.selection !== 0) && (t.unshift({
+			}), !c.value && (e.selection || F.value.selection !== 0) && t.unshift({
 				type: "selection",
 				fixed: "left",
 				width: 60,
@@ -6138,8 +6138,8 @@ var Yp = /*#__PURE__*/ U(qp, [["render", Jp]]), Xp = d({
 				show: !0,
 				multiple: e.selection === 2 || F.value.selection === 2,
 				options: ["all", "none"]
-			}), s += 60);
-			let l = e.id || a.params.id;
+			});
+			let s = e.id || a.params.id;
 			if (!c.value && F.value.commonTime && t.push(..._e()), e.enableAction === !0 && M.value && M.value.length > 0) {
 				let e = H(M.value);
 				for (let t of e) t.type === "group" ? t.children.forEach((e) => {
@@ -6150,42 +6150,45 @@ var Yp = /*#__PURE__*/ U(qp, [["render", Jp]]), Xp = d({
 					key: "action",
 					align: "center",
 					fixed: "right",
-					width: F.value.actionWidth,
 					resizable: !1,
 					checked: !0,
 					show: !0,
 					hide: !0,
+					width: Number(typeof F.value.actionWidth == "string" ? F.value.actionWidth.replace("px", "") : F.value.actionWidth),
 					render(t) {
 						return Wd({
 							buttons: e,
 							rowData: t,
 							callback: R,
-							tableId: l
+							tableId: s
 						});
 					}
 				};
-				s += Number(typeof F.value.actionWidth == "string" ? F.value.actionWidth.replace("px", "") : F.value.actionWidth), t.push(n);
+				t.push(n);
 			}
-			let u = t;
-			if (l) {
-				let e = Y(`tables_filter_${l}`, !1);
+			let l = t;
+			if (s) {
+				let e = Y(`tables_filter_${s}`, !1);
 				if (e) try {
-					let n = await Id(l);
-					n && (e = JSON.parse(n), u = yd(t, e));
+					let n = await Id(s);
+					n && (e = JSON.parse(n), l = yd(t, e));
 				} catch {}
 			}
-			i.link && (u.unshift({
+			i.link && l.unshift({
 				type: "expand",
 				show: !0,
 				hide: !0,
+				width: 40,
 				fixed: "left",
 				renderExpand: (e) => f(Yp, {
 					data: i,
 					value: e
 				})
-			}), s += 40), u.forEach((e) => {
-				s += Number(e.width);
-			}), C.value = u, ee.value = n, E.value = s;
+			});
+			let u = 0;
+			l.forEach((e) => {
+				e.show && (u += Number(e.width || 140));
+			}), C.value = l, ee.value = n, E.value = u;
 		}, Ce = (e) => typeof e == "number" ? `${e}px` : e, we = () => {
 			if (e.height) {
 				let t = Ce(e.height);
@@ -6194,14 +6197,19 @@ var Yp = /*#__PURE__*/ U(qp, [["render", Jp]]), Xp = d({
 			}
 		}, Te = (t) => {
 			let n = e.id || a.params.id;
-			n && (J(`tables_filter_${n}`, t), Ld({
-				table_id: n,
-				data: JSON.stringify(t)
-			}).catch(() => null));
+			if (n) {
+				let e = 0;
+				C.value.forEach((t) => {
+					t.show && (e += Number(t.width || 140));
+				}), E.value = e, J(`tables_filter_${n}`, t.filter((e) => e.key)), Ld({
+					table_id: n,
+					data: JSON.stringify(t)
+				}).catch(() => null);
+			}
 		}, { run: Ee } = Tp(Te), { run: De } = Tp((e, t) => {
 			let n = [];
 			C.value.forEach((r) => {
-				(r.key !== "action" || r.type !== "expand") && n.push({
+				r.key !== "action" && r.key !== "index" && r.type !== "expand" && n.push({
 					key: r.key,
 					show: r.show,
 					hide: r.hide,
@@ -6212,7 +6220,7 @@ var Yp = /*#__PURE__*/ U(qp, [["render", Jp]]), Xp = d({
 		}), B = () => {
 			let e = [];
 			C.value.forEach((t) => {
-				(t.key !== "action" || t.type !== "expand") && e.push({
+				t.key !== "action" && t.key !== "index" && t.type !== "expand" && e.push({
 					key: t.key,
 					show: t.show,
 					hide: t.hide,
@@ -8521,7 +8529,7 @@ function qh(e, t, n) {
 }
 //#endregion
 //#region package.json
-var Jh = "0.1.69", Yh;
+var Jh = "0.1.70", Yh;
 async function Xh() {
 	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.69",
+  "version": "0.1.70",
   "author": {
     "name": "Donovan"
   },