geekplus-digital-ui 0.2.4 → 0.2.6

package/components/index.js

@@ -8,9 +8,9 @@ import o from "./inline-edit/index.js";
 import s from "./upload/index.js";
 import c from "./search-form/index.js";
 import l from "./search-item/index.js";
-import u from "./table/index.js";
+import u, { DTableWrapper as d } from "./table/index.js";
 //#region packages/components/index.js
-var d = /* @__PURE__ */ e({
+var f = /* @__PURE__ */ e({
 	DCopy: () => t,
 	DEditor: () => n,
 	DFoldText: () => r,
@@ -20,7 +20,8 @@ var d = /* @__PURE__ */ e({
 	DSearchForm: () => c,
 	DSearchItem: () => l,
 	DTable: () => u,
+	DTableWrapper: () => d,
 	DUpload: () => s
 });
 //#endregion
-export { t as DCopy, n as DEditor, r as DFoldText, i as DIcon, a as DIconTip, o as DInlineEdit, c as DSearchForm, l as DSearchItem, u as DTable, s as DUpload, d as components_exports };
+export { t as DCopy, n as DEditor, r as DFoldText, i as DIcon, a as DIconTip, o as DInlineEdit, c as DSearchForm, l as DSearchItem, u as DTable, d as DTableWrapper, s as DUpload, f as components_exports };

package/components/table/index.d.ts

@@ -120,4 +120,5 @@ export const DTable: {
         pagination?(_: {}): any;
     };
 });
+export const DTableWrapper: import('vue').DefineComponent<{}, () => any, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 export default DTable;

package/components/table/index.js

@@ -1,5 +1,6 @@
-import e from "./src/table.vue.js";
+import e from "./src/table-wrapper.vue.js";
+import t from "./src/table.vue.js";
 //#region packages/components/table/index.js
-var t = e;
+var n = t, r = e;
 //#endregion
-export { t as default };
+export { r as DTableWrapper, n as default };

package/components/table/src/table-wrapper.vue.js

@@ -1,13 +1,34 @@
 import { Fragment as e, h as t, inject as n } from "vue";
 //#region packages/components/table/src/table-wrapper.vue
-var r = (e) => (e?.type?.name || e?.type?.__name) === "ElTableColumn", i = (t) => {
+var r = (e) => (e?.type?.name || e?.type?.__name) === "ElTableColumn", i = (e) => (e?.type?.name || e?.type?.__name) === "ElTable", a = (t) => {
 	let n = [];
 	for (let r of t) if (r.type === e) {
 		let e = Array.isArray(r.children) ? r.children : [];
-		n.push(...i(e));
+		n.push(...a(e));
 	} else n.push(r);
 	return n;
-}, a = (e) => {
+}, o = (t) => {
+	for (let n of t) {
+		if (i(n)) return n;
+		let t = null;
+		if (n.type === e ? t = Array.isArray(n.children) ? n.children : [] : typeof n.type == "string" && Array.isArray(n.children) && (t = n.children), t) {
+			let e = o(t);
+			if (e) return e;
+		}
+	}
+	return null;
+}, s = (n, r, i) => n.map((n) => {
+	if (n === r) return i;
+	if (n.type === e) {
+		let a = Array.isArray(n.children) ? n.children : [], o = s(a, r, i);
+		return o === a ? n : t(e, null, o);
+	}
+	if (typeof n.type == "string" && Array.isArray(n.children)) {
+		let e = s(n.children, r, i);
+		return e === n.children ? n : t(n.type, n.props, e);
+	}
+	return n;
+}), c = (e) => {
 	let t = [], n = [];
 	for (let i of e) {
 		if (!r(i)) continue;
@@ -18,45 +39,45 @@ var r = (e) => (e?.type?.name || e?.type?.__name) === "ElTableColumn", i = (t) =
 		controllable: t,
 		always: n
 	};
-}, o = (e, t, n) => n.length === 0 ? e : n.filter((e) => t.includes(e)).map((t) => e.find((e) => e.props?.prop === t)).filter(Boolean), s = {
+}, l = (e, t, n) => n.length === 0 ? e : n.filter((e) => t.includes(e)).map((t) => e.find((e) => e.props?.prop === t)).filter(Boolean), u = {
 	name: "DTableWrapper",
 	setup(e, { slots: r }) {
-		let s = n("dTableContext");
+		let i = n("dTableContext");
 		return () => {
-			if (!s) return r.default?.() ?? [];
-			let e = r.default?.() ?? [], n = i(e), c = n.find((e) => (e?.type?.name || e?.type?.__name) === "ElTable");
-			if (!c) return e;
-			let l = c.children?.default, { controllable: u, always: d } = a(i(typeof l == "function" ? l() : [])), f = u.map((e) => ({
+			if (!i) return r.default?.() ?? [];
+			let e = r.default?.() ?? [], n = o(e);
+			if (!n) return e;
+			let u = n.children?.default, { controllable: d, always: f } = c(a(typeof u == "function" ? u() : [])), p = d.map((e) => ({
 				prop: e.props.prop,
 				label: e.props.label || e.props.type || e.props.prop,
 				fixed: e.props.fixed === "right" ? "right" : e.props.fixed ? "left" : !1
 			}));
 			queueMicrotask(() => {
-				JSON.stringify(s.columnList.value) !== JSON.stringify(f) && (s.columnList.value = f);
+				JSON.stringify(i.columnList.value) !== JSON.stringify(p) && (i.columnList.value = p);
 			});
-			let p = o(u, s.checkedKeys.value, s.columnOrder.value), m = d.filter((e) => e.props?.type), h = d.filter((e) => !e.props?.type), g = s.columnFixed?.value ?? {}, _ = (e) => {
+			let m = l(d, i.checkedKeys.value, i.columnOrder.value), h = f.filter((e) => e.props?.type), g = f.filter((e) => !e.props?.type), _ = i.columnFixed?.value ?? {}, v = (e) => {
 				let n = e.props?.prop;
-				if (!n || !Object.prototype.hasOwnProperty.call(g, n)) return e;
-				let r = g[n], i = { ...e.props };
+				if (!n || !Object.prototype.hasOwnProperty.call(_, n)) return e;
+				let r = _[n], i = { ...e.props };
 				return r ? i.fixed = r : delete i.fixed, t(e.type, i, e.children);
-			}, v = [
-				...m,
-				...p.map(_),
-				...h
-			], y = Object.entries(g).map(([e, t]) => `${e}:${t}`).join(","), b = [
-				...s.checkedKeys.value,
-				...s.columnOrder.value,
-				y
-			].join(","), x = t(c.type, {
-				...c.props,
-				key: b
+			}, y = [
+				...h,
+				...m.map(v),
+				...g
+			], b = Object.entries(_).map(([e, t]) => `${e}:${t}`).join(","), x = [
+				...i.checkedKeys.value,
+				...i.columnOrder.value,
+				b
+			].join(",");
+			return s(e, n, t(n.type, {
+				...n.props,
+				key: x
 			}, {
-				...c.children,
-				default: () => v
-			});
-			return n.map((e) => e === c ? x : e);
+				...n.children,
+				default: () => y
+			}));
 		};
 	}
 };
 //#endregion
-export { s as default };
+export { u as default };

package/index.js

@@ -10,11 +10,11 @@ import s from "./components/inline-edit/index.js";
 import c from "./components/upload/index.js";
 import l from "./components/search-form/index.js";
 import u from "./components/search-item/index.js";
-import d from "./components/table/index.js";
+import d, { DTableWrapper as f } from "./components/table/index.js";
 import "./components/index.js";
-import { setComponentRegistry as f, setGlobalConfig as p } from "./config/index.js";
-import { install as m } from "./install.js";
+import { setComponentRegistry as p, setGlobalConfig as m } from "./config/index.js";
+import { install as h } from "./install.js";
 //#region packages/index.js
-var h = { install: m };
+var g = { install: h };
 //#endregion
-export { n as DCopy, r as DEditor, i as DFoldText, a as DIcon, o as DIconTip, s as DInlineEdit, l as DSearchForm, u as DSearchItem, d as DTable, c as DUpload, h as default, m as install, f as setComponentRegistry, p as setGlobalConfig, t as useActivated, e as useLocale };
+export { n as DCopy, r as DEditor, i as DFoldText, a as DIcon, o as DIconTip, s as DInlineEdit, l as DSearchForm, u as DSearchItem, d as DTable, f as DTableWrapper, c as DUpload, g as default, h as install, p as setComponentRegistry, m as setGlobalConfig, t as useActivated, e as useLocale };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geekplus-digital-ui",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "homepage": "https://ui.geekplus.cc/static/ui/",
   "type": "module",
   "main": "index.js",