geekplus-digital-ui 0.2.6 → 0.2.8

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

@@ -4,7 +4,7 @@ import t from "../../../_virtual/_plugin-vue_export-helper.js";
 import n from "../../icon/index.js";
 import r from "../../icons/filter-list-light.vue.js";
 import i from "../../icons/grip-dots-vertical-solid.vue.js";
-import './table-filter.vue_vue_type_style_index_0_scoped_93138aaa_lang.css';/* empty css                                                                  */
+import './table-filter.vue_vue_type_style_index_0_scoped_023a2c22_lang.css';/* empty css                                                                  */
 import "../../index.js";
 import { Fragment as a, computed as o, createBlock as s, createCommentVNode as c, createElementBlock as l, createElementVNode as u, createTextVNode as d, createVNode as f, inject as p, openBlock as m, ref as h, renderList as g, toDisplayString as _, unref as v, withCtx as y } from "vue";
 import { ElButton as b, ElCheckbox as x, ElPopover as S } from "element-plus";
@@ -16,50 +16,50 @@ var w = { class: "d-table-filter__header" }, T = { class: "d-table-filter__body"
 }, D = /* @__PURE__ */ t(/* @__PURE__ */ Object.assign({ name: "DTableFilter" }, {
 	__name: "table-filter",
 	setup(t) {
-		let { t: D } = e(), { columnList: O, checkedKeys: k, columnOrder: A, columnFixed: j, saveConfig: M } = p("dTableContext"), N = (e) => Object.prototype.hasOwnProperty.call(j.value, e) ? j.value[e] : O.value.find((t) => t.prop === e)?.fixed ?? !1, P = (e) => {
-			let t = A.value.map((t) => {
+		let { t: D } = e(), { columnList: O, checkedKeys: k, columnOrder: A, columnFixed: j, saveConfig: M } = p("dTableContext"), N = h(!1), P = h([]), F = h([]), I = h({}), L = (e) => Object.prototype.hasOwnProperty.call(I.value, e) ? I.value[e] : O.value.find((t) => t.prop === e)?.fixed ?? !1, R = (e) => {
+			let t = F.value.map((t) => {
 				let n = O.value.find((e) => e.prop === t);
-				return !n || N(t) !== e ? null : n;
-			}).filter(Boolean), n = O.value.filter((t) => N(t.prop) === e && !A.value.includes(t.prop));
+				return !n || L(t) !== e ? null : n;
+			}).filter(Boolean), n = O.value.filter((t) => L(t.prop) === e && !F.value.includes(t.prop));
 			return [...t, ...n];
-		}, F = o(() => ({
-			left: P("left"),
-			middle: P(!1),
-			right: P("right")
-		})), I = o(() => [
+		}, z = o(() => ({
+			left: R("left"),
+			middle: R(!1),
+			right: R("right")
+		})), B = o(() => [
 			{
 				key: "left",
 				labelKey: "d.table.fixedLeft",
-				items: F.value.left,
+				items: z.value.left,
 				showLabel: !0
 			},
 			{
 				key: "middle",
 				labelKey: "d.table.columns",
-				items: F.value.middle,
+				items: z.value.middle,
 				showLabel: !0
 			},
 			{
 				key: "right",
 				labelKey: "d.table.fixedRight",
-				items: F.value.right,
+				items: z.value.right,
 				showLabel: !0
 			}
-		]), L = {
+		]), V = {
 			left: h(null),
 			middle: h(null),
 			right: h(null)
-		}, R = (e, t) => {
-			L[t].value = e;
-		}, z = (e) => Object.keys(L).find((t) => L[t].value === e), B = {
+		}, H = (e, t) => {
+			V[t].value = e;
+		}, U = (e) => Object.keys(V).find((t) => V[t].value === e), W = {
 			left: "left",
 			middle: !1,
 			right: "right"
-		}, V = (e) => (t) => {
-			let { from: n, to: r, oldIndex: i, newIndex: a } = t, o = z(r) ?? e, s = {
-				left: [...F.value.left.map((e) => e.prop)],
-				middle: [...F.value.middle.map((e) => e.prop)],
-				right: [...F.value.right.map((e) => e.prop)]
+		}, G = (e) => (t) => {
+			let { from: n, to: r, oldIndex: i, newIndex: a } = t, o = U(r) ?? e, s = {
+				left: [...z.value.left.map((e) => e.prop)],
+				middle: [...z.value.middle.map((e) => e.prop)],
+				right: [...z.value.right.map((e) => e.prop)]
 			};
 			if (n === r) {
 				if (i === a) return;
@@ -68,17 +68,17 @@ var w = { class: "d-table-filter__header" }, T = { class: "d-table-filter__body"
 			} else {
 				let t = s[e][i];
 				if (!t) return;
-				s[e].splice(i, 1), s[o].splice(a, 0, t), j.value = {
-					...j.value,
-					[t]: B[o]
+				s[e].splice(i, 1), s[o].splice(a, 0, t), I.value = {
+					...I.value,
+					[t]: W[o]
 				};
 			}
-			A.value = [
+			F.value = [
 				...s.left,
 				...s.middle,
 				...s.right
-			], M();
-		}, H = (e) => ({
+			];
+		}, K = (e) => ({
 			handle: ".d-table-filter__handle",
 			animation: 150,
 			group: {
@@ -89,30 +89,38 @@ var w = { class: "d-table-filter__header" }, T = { class: "d-table-filter__body"
 			onUpdate: () => {},
 			onAdd: () => {},
 			onRemove: () => {},
-			onEnd: V(e)
-		}), U = {
-			left: C(L.left, o(() => F.value.left), H("left")),
-			middle: C(L.middle, o(() => F.value.middle), H("middle")),
-			right: C(L.right, o(() => F.value.right), H("right"))
-		}, W = () => {
-			Object.values(U).forEach((e) => {
+			onEnd: G(e)
+		}), q = {
+			left: C(V.left, o(() => z.value.left), K("left")),
+			middle: C(V.middle, o(() => z.value.middle), K("middle")),
+			right: C(V.right, o(() => z.value.right), K("right"))
+		}, J = () => {
+			Object.values(q).forEach((e) => {
 				e.stop(), e.start();
 			});
-		}, G = (e, t) => {
-			if (t) k.value.includes(e) || (k.value = [...k.value, e], M());
+		}, Y = () => {
+			P.value = [...k.value], F.value = [...A.value], I.value = { ...j.value }, J();
+		}, X = (e, t) => {
+			if (t) P.value.includes(e) || (P.value = [...P.value, e]);
 			else {
-				if (k.value.length <= 1) return;
-				k.value = k.value.filter((t) => t !== e), M();
+				if (P.value.length <= 1) return;
+				P.value = P.value.filter((t) => t !== e);
 			}
-		}, K = () => {
+		}, Z = () => {
 			let e = O.value.map((e) => e.prop);
-			k.value = e, A.value = e, j.value = {}, M();
+			P.value = e, F.value = e, I.value = {};
+		}, Q = () => {
+			k.value = [...P.value], A.value = [...F.value], j.value = { ...I.value }, M(), N.value = !1;
+		}, $ = () => {
+			N.value = !1;
 		};
 		return (e, t) => (m(), s(v(S), {
+			visible: N.value,
+			"onUpdate:visible": t[0] ||= (e) => N.value = e,
 			placement: "bottom-end",
 			width: "auto",
 			trigger: "click",
-			onShow: W
+			onShow: Y
 		}, {
 			reference: y(() => [f(v(b), {
 				link: "",
@@ -124,16 +132,33 @@ var w = { class: "d-table-filter__header" }, T = { class: "d-table-filter__body"
 				})]),
 				_: 1
 			})]),
-			default: y(() => [u("div", w, [f(v(b), {
-				link: "",
-				type: "primary",
-				onClick: K
-			}, {
-				default: y(() => [d(_(v(D)("d.table.reset")), 1)]),
-				_: 1
-			})]), u("div", T, [(m(!0), l(a, null, g(I.value, (e) => (m(), l(a, { key: e.key }, [e.showLabel ? (m(), l("div", E, _(v(D)(e.labelKey)), 1)) : c("", !0), u("ul", {
+			default: y(() => [u("div", w, [
+				f(v(b), {
+					link: "",
+					onClick: $
+				}, {
+					default: y(() => [d(_(v(D)("d.table.cancel")), 1)]),
+					_: 1
+				}),
+				f(v(b), {
+					link: "",
+					type: "primary",
+					onClick: Z
+				}, {
+					default: y(() => [d(_(v(D)("d.table.reset")), 1)]),
+					_: 1
+				}),
+				f(v(b), {
+					link: "",
+					type: "primary",
+					onClick: Q
+				}, {
+					default: y(() => [d(_(v(D)("d.table.confirm")), 1)]),
+					_: 1
+				})
+			]), u("div", T, [(m(!0), l(a, null, g(B.value, (e) => (m(), l(a, { key: e.key }, [e.showLabel ? (m(), l("div", E, _(v(D)(e.labelKey)), 1)) : c("", !0), u("ul", {
 				ref_for: !0,
-				ref: (t) => R(t, e.key),
+				ref: (t) => H(t, e.key),
 				class: "d-table-filter__list"
 			}, [(m(!0), l(a, null, g(e.items, (e) => (m(), l("li", {
 				key: e.prop,
@@ -142,9 +167,9 @@ var w = { class: "d-table-filter__header" }, T = { class: "d-table-filter__body"
 				default: y(() => [f(i)]),
 				_: 1
 			}), f(v(x), {
-				"model-value": v(k).includes(e.prop),
-				disabled: v(k).length <= 1 && v(k).includes(e.prop),
-				onChange: (t) => G(e.prop, t)
+				"model-value": P.value.includes(e.prop),
+				disabled: P.value.length <= 1 && P.value.includes(e.prop),
+				onChange: (t) => X(e.prop, t)
 			}, {
 				default: y(() => [d(_(e.label), 1)]),
 				_: 2
@@ -154,8 +179,8 @@ var w = { class: "d-table-filter__header" }, T = { class: "d-table-filter__body"
 				"onChange"
 			])]))), 128))], 512)], 64))), 128))])]),
 			_: 1
-		}));
+		}, 8, ["visible"]));
 	}
-}), [["__scopeId", "data-v-93138aaa"]]);
+}), [["__scopeId", "data-v-023a2c22"]]);
 //#endregion
 export { D as default };

package/components/table/src/table-filter.vue_vue_type_style_index_0_scoped_023a2c22_lang.css

@@ -0,0 +1 @@
+.d-table-filter__body[data-v-023a2c22]{max-height:400px;overflow-y:auto}.d-table-filter__list[data-v-023a2c22]{margin:0;padding:0;list-style:none}.d-table-filter__item[data-v-023a2c22]{align-items:center;gap:6px;display:flex}.d-table-filter__item[data-v-023a2c22] .el-checkbox{height:24px}.d-table-filter__header[data-v-023a2c22]{justify-content:flex-end;align-items:center;gap:8px;margin-bottom:4px;display:flex}.d-table-filter__header[data-v-023a2c22] .el-button{margin:0}.d-table-filter__group-label[data-v-023a2c22]{color:var(--el-text-color-secondary);padding:4px 0 2px;font-size:12px}.d-table-filter__handle[data-v-023a2c22]{color:var(--el-text-color-placeholder);cursor:grab;flex-shrink:0}.d-table-filter__handle[data-v-023a2c22]:active{cursor:grabbing}

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

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

package/locale/lang/en.d.ts

@@ -31,6 +31,8 @@ declare namespace _default {
             export let fixedRight: string;
             export let columns: string;
             export let scrollTip: string;
+            export let confirm: string;
+            export let cancel: string;
         }
         namespace upload {
             export let lessThan: string;

package/locale/lang/en.js

@@ -24,7 +24,9 @@ var e = {
 			fixedLeft: "Fixed Left",
 			fixedRight: "Fixed Right",
 			columns: "Columns",
-			scrollTip: "Horizontal scroll: Shift + scroll wheel"
+			scrollTip: "Horizontal scroll: Shift + scroll wheel",
+			confirm: "Confirm",
+			cancel: "Cancel"
 		},
 		upload: {
 			lessThan: "Less than {size}MB",

package/locale/lang/ja.d.ts

@@ -31,6 +31,8 @@ declare namespace _default {
             export let fixedRight: string;
             export let columns: string;
             export let scrollTip: string;
+            export let confirm: string;
+            export let cancel: string;
         }
         namespace upload {
             export let lessThan: string;

package/locale/lang/ja.js

@@ -24,7 +24,9 @@ var e = {
 			fixedLeft: "左に固定",
 			fixedRight: "右に固定",
 			columns: "通常列",
-			scrollTip: "横スクロール：Shift + スクロール"
+			scrollTip: "横スクロール：Shift + スクロール",
+			confirm: "確定",
+			cancel: "キャンセル"
 		},
 		upload: {
 			lessThan: "{size}MB 未満",

package/locale/lang/ko.d.ts

@@ -31,6 +31,8 @@ declare namespace _default {
             export let fixedRight: string;
             export let columns: string;
             export let scrollTip: string;
+            export let confirm: string;
+            export let cancel: string;
         }
         namespace upload {
             export let lessThan: string;

package/locale/lang/ko.js

@@ -24,7 +24,9 @@ var e = {
 			fixedLeft: "왼쪽 고정",
 			fixedRight: "오른쪽 고정",
 			columns: "일반 열",
-			scrollTip: "가로 스크롤：Shift + 스크롤"
+			scrollTip: "가로 스크롤：Shift + 스크롤",
+			confirm: "확인",
+			cancel: "취소"
 		},
 		upload: {
 			lessThan: "{size}MB 이하",

package/locale/lang/zh-cn.d.ts

@@ -31,6 +31,8 @@ declare namespace _default {
             export let fixedRight: string;
             export let columns: string;
             export let scrollTip: string;
+            export let confirm: string;
+            export let cancel: string;
         }
         namespace upload {
             export let lessThan: string;

package/locale/lang/zh-cn.js

@@ -24,7 +24,9 @@ var e = {
 			fixedLeft: "固定左侧",
 			fixedRight: "固定右侧",
 			columns: "普通列",
-			scrollTip: "横向滚动快捷方式：Shift + 滚轮滚动"
+			scrollTip: "横向滚动快捷方式：Shift + 滚轮滚动",
+			confirm: "确定",
+			cancel: "取消"
 		},
 		upload: {
 			lessThan: "小于 {size}MB",

package/locale/lang/zh-tw.d.ts

@@ -31,6 +31,8 @@ declare namespace _default {
             export let fixedRight: string;
             export let columns: string;
             export let scrollTip: string;
+            export let confirm: string;
+            export let cancel: string;
         }
         namespace upload {
             export let lessThan: string;

package/locale/lang/zh-tw.js

@@ -24,7 +24,9 @@ var e = {
 			fixedLeft: "固定左側",
 			fixedRight: "固定右側",
 			columns: "普通欄",
-			scrollTip: "橫向捲動快捷鍵：Shift + 滾輪"
+			scrollTip: "橫向捲動快捷鍵：Shift + 滾輪",
+			confirm: "確定",
+			cancel: "取消"
 		},
 		upload: {
 			lessThan: "小於 {size}MB",

package/package.json

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

package/components/table/src/table-filter.vue_vue_type_style_index_0_scoped_93138aaa_lang.css

@@ -1 +0,0 @@
-.d-table-filter__body[data-v-93138aaa]{max-height:400px;overflow-y:auto}.d-table-filter__list[data-v-93138aaa]{margin:0;padding:0;list-style:none}.d-table-filter__item[data-v-93138aaa]{align-items:center;gap:6px;display:flex}.d-table-filter__item[data-v-93138aaa] .el-checkbox{height:24px}.d-table-filter__header[data-v-93138aaa]{justify-content:flex-end;margin-bottom:4px;display:flex}.d-table-filter__group-label[data-v-93138aaa]{color:var(--el-text-color-secondary);padding:4px 0 2px;font-size:12px}.d-table-filter__handle[data-v-93138aaa]{color:var(--el-text-color-placeholder);cursor:grab;flex-shrink:0}.d-table-filter__handle[data-v-93138aaa]:active{cursor:grabbing}