@otwb/ui 2.0.23 → 2.0.25

package/dist/{components-C3FvQCdL.js → components-BMteXZVn.js}

@@ -333,6 +333,7 @@ var DataCustomItem = /* @__PURE__ */ defineComponent({
 				wrap: !1,
 				size: "small"
 			}, { default: () => [
+				e.showFixed,
 				createVNode(NButton, {
 					type: "primary",
 					text: !0,
@@ -399,17 +400,32 @@ const DataCustom = /* @__PURE__ */ defineComponent({
 		},
 		type: { type: String }
 	},
-	emits: { custom: () => !0 },
+	emits: {
+		custom: () => !0,
+		save: ""
+	},
 	setup(x, { emit: S }) {
-		let { t: C } = useI18n();
-		function w(e, b, C) {
+		let { t: C } = useI18n(), w = useRoute();
+		function T() {
+			if (x.showFixed) {
+				w.name + "";
+				let e = w.name + "__table";
+				$fetch.post(`${SERVER_CTX.SYS}/cli/module/custom-config/save`, {
+					__table: localStorage.getItem(e),
+					url: w.name
+				}, { requestType: "json" }).then((e) => {
+					$msg.success("配置保存成功！");
+				});
+			} else S("save");
+		}
+		function E(e, b, C) {
 			S("custom", {
 				key: e[x.keyField],
 				[b]: C
 			});
 		}
-		let T = ref();
-		return watch(T, (e) => {
+		let D = ref();
+		return watch(D, (e) => {
 			e.$el && Sortable.create(e.$el, {
 				animation: 150,
 				ghostClass: "ghost",
@@ -436,13 +452,19 @@ const DataCustom = /* @__PURE__ */ defineComponent({
 			}, { default: () => [createVNode(IFilterCustom, null, null)] })] }), [[vTooltip, x.tooltip ?? C("common.page.custom.tooltip")]]),
 			default: () => {
 				let e, b;
-				return createVNode(NFlex, { vertical: !0 }, { default: () => [createVNode(NFlex, { justify: "space-between" }, { default: () => [createVNode("div", { style: "font-weight: bold" }, [x.tooltip ?? C("common.page.custom.tooltip")]), createVNode(NButton, {
+				return createVNode(NFlex, { vertical: !0 }, { default: () => [createVNode(NFlex, { justify: "space-between" }, { default: () => [createVNode("div", { style: "font-weight: bold" }, [x.tooltip ?? C("common.page.custom.tooltip")]), createVNode("div", null, [createVNode(NButton, {
+					class: "mr-10px",
+					text: !0,
+					type: "primary",
+					size: "small",
+					onClick: () => T()
+				}, { default: () => [createTextVNode("保存")] }), createVNode(NButton, {
 					text: !0,
 					type: "primary",
 					size: "small",
 					onClick: () => S("custom", !0)
-				}, _isSlot$6(e = C("common.page.custom.reset")) ? e : { default: () => [e] })] }), createVNode(NFlex, {
-					ref: T,
+				}, _isSlot$6(e = C("common.page.custom.reset")) ? e : { default: () => [e] })])] }), createVNode(NFlex, {
+					ref: D,
 					vertical: !0
 				}, _isSlot$6(b = x.data.filter((e) => e[x.visiblityField] !== !1).map((e) => createVNode(DataCustomItem, {
 					key: e[x.keyField],
@@ -450,8 +472,8 @@ const DataCustom = /* @__PURE__ */ defineComponent({
 					hidden: e[x.hiddenField],
 					fixed: e[x.fixedField],
 					showFixed: x.showFixed,
-					onUpdateHidden: (b) => w(e, "hidden", b),
-					onUpdateFixed: (b) => w(e, "fixed", b)
+					onUpdateHidden: (b) => E(e, "hidden", b),
+					onUpdateFixed: (b) => E(e, "fixed", b)
 				}, null))) ? b : { default: () => [b] })] });
 			}
 		});
@@ -727,59 +749,69 @@ const DataForm = /* @__PURE__ */ defineComponent({
 		"collapse"
 	],
 	setup(b, { expose: x, emit: S }) {
-		let { t: C } = useI18n(), w = (e) => {
+		let C = useRoute(), w = () => {
+			let e = C.name + "__form";
+			C.name + "", $fetch.post(`${SERVER_CTX.SYS}/cli/module/custom-config/save`, {
+				__form: localStorage.getItem(e),
+				url: C.name
+			}, { requestType: "json" }).then((e) => {
+				$msg.success("配置保存成功！");
+			});
+		}, { t: T } = useI18n(), E = (e) => {
 			S("filter", b.model, e);
-		}, T = (e) => {
+		}, D = (e) => {
 			S("reset", e), b.filterOnReset && S("filter", b.model, e);
-		}, E = ref(b.defaultCollapsed), D = (e) => {
-			E.value = e;
+		}, k = ref(b.defaultCollapsed), A = (e) => {
+			k.value = e;
 		};
-		x({ collapse: D });
-		let k = reactive({
+		x({ collapse: A });
+		let j = reactive({
 			span: 6,
 			suffix: !0
 		});
 		return () => {
-			let { filterOnReset: e, filterText: x, resetText: A, customizable: j, defaultCollapsed: N, collapsible: P, grid: F,...I } = b;
+			let { filterOnReset: e, filterText: x, resetText: C, customizable: N, defaultCollapsed: P, collapsible: F, grid: I,...L } = b;
 			return createVNode(DataForm, mergeProps({ grid: {
 				cols: "12 768:18 1200:30 1536:30",
 				yGap: 16,
 				xGap: 12,
-				...F,
-				collapsed: E.value
-			} }, I, {
+				...I,
+				collapsed: k.value
+			} }, L, {
 				showFeedback: !1,
-				showAction: k,
-				onSubmit: w,
-				onReset: T
-			}), { action: ({ cols: e, spans: w }) => (k.suffix = e < w + k.span, createVNode(NFlex, {
-				justify: k.suffix ? "end" : "start",
+				showAction: j,
+				onSubmit: E,
+				onReset: D
+			}), { action: ({ cols: e, spans: E }) => (j.suffix = e < E + j.span, createVNode(NFlex, {
+				justify: j.suffix ? "end" : "start",
 				align: "center"
 			}, { default: () => [
-				P && k.suffix ? createVNode(NButton, {
+				F && j.suffix ? createVNode(NButton, {
 					class: "collapsedBtn",
 					text: !0,
 					type: "primary",
 					iconPlacement: "right",
-					renderIcon: E.value ? IDown : IUp,
-					onClick: () => D(!E.value)
-				}, { default: () => [E.value ? C("common.page.filter.expand") : C("common.page.filter.collapse")] }) : void 0,
-				k.suffix ? void 0 : createVNode("span", null, [createTextVNode("\xA0\xA0\xA0\xA0")]),
+					renderIcon: k.value ? IDown : IUp,
+					onClick: () => A(!k.value)
+				}, { default: () => [k.value ? T("common.page.filter.expand") : T("common.page.filter.collapse")] }) : void 0,
+				j.suffix ? void 0 : createVNode("span", null, [createTextVNode("\xA0\xA0\xA0\xA0")]),
 				createVNode(NButton, {
 					class: "submitWrap",
 					attrType: "submit",
 					type: "primary",
 					disabled: b.disabled,
 					loading: b.loading
-				}, { default: () => [x || C("common.page.filter.submitText")] }),
+				}, { default: () => [x || T("common.page.filter.submitText")] }),
 				createVNode(NButton, {
 					attrType: "reset",
 					disabled: b.disabled || b.loading
-				}, { default: () => [A || C("common.page.form.resetText")] }),
-				j ? createVNode(DataCustom, {
+				}, { default: () => [C || T("common.page.form.resetText")] }),
+				N ? createVNode(DataCustom, {
+					isFilter: !0,
 					keyField: "name",
 					showFixed: !1,
-					data: I.items,
+					data: L.items,
+					onSave: w,
 					onCustom: (e) => S("custom", e),
 					size: 16,
 					type: "primary"
@@ -902,19 +934,27 @@ const DataLocaleInput = /* @__PURE__ */ defineComponent({
 	},
 	emits: { change: () => !0 },
 	setup(b, { emit: x }) {
-		let { t: S } = useI18n(), C = (e) => x("change", {
+		let { t: S } = useI18n(), C = useRoute(), w = (e) => x("change", {
 			pageSize: b.pageSize ?? b.page?.pageSize ?? 0,
 			currentPage: e
-		}), w = (e) => x("change", {
-			pageSize: e,
-			currentPage: b.currentPage ?? b.page?.currentPage ?? 0
-		});
-		return () => createVNode(NPagination, {
+		}), T = (e) => {
+			let S = C.name + "__page";
+			$fetch.post(`${SERVER_CTX.SYS}/cli/module/custom-config/save`, {
+				__page: e,
+				url: C.name
+			}, { requestType: "json" }).then((b) => {
+				localStorage.setItem(S, e);
+			}), x("change", {
+				pageSize: e,
+				currentPage: b.currentPage ?? b.page?.currentPage ?? 0
+			});
+		}, E = C.name + "__page";
+		return localStorage.getItem(E) && (b.page.pageSize = localStorage.getItem(E)), () => createVNode(NPagination, {
 			page: b.currentPage ?? b.page?.currentPage,
 			itemCount: b.total,
 			pageSize: b.pageSize ?? b.page?.pageSize,
-			onUpdatePage: C,
-			onUpdatePageSize: w,
+			onUpdatePage: w,
+			onUpdatePageSize: T,
 			pageSizes: b.pageSizes,
 			showQuickJumper: !0,
 			showSizePicker: !0,

package/dist/components.js

@@ -1,5 +1,5 @@
 import "./use-i18n-Dx7V4KrY.js";
 import "./directives-CRvPGywW.js";
 import "./use-style-DcT-1dj4.js";
-import { a as NRadios, c as DataSelection, d as useLocaleEdit, f as DataFilter, g as NCheckboxes, h as DataActions, i as renderUsers, l as DataPagination, m as DataCustom, n as DtUserDept, o as DataTable, p as DataForm, r as DtUserRender, s as useDataTableDrag, t as DtDeptRender, u as DataLocaleInput } from "./components-C3FvQCdL.js";
+import { a as NRadios, c as DataSelection, d as useLocaleEdit, f as DataFilter, g as NCheckboxes, h as DataActions, i as renderUsers, l as DataPagination, m as DataCustom, n as DtUserDept, o as DataTable, p as DataForm, r as DtUserRender, s as useDataTableDrag, t as DtDeptRender, u as DataLocaleInput } from "./components-BMteXZVn.js";
 export { DataActions, DataCustom, DataFilter, DataForm, DataLocaleInput, DataPagination, DataSelection, DataTable, DtDeptRender, DtUserDept, DtUserRender, NCheckboxes, NRadios, renderUsers, useDataTableDrag, useLocaleEdit };

package/dist/index.js

@@ -3,7 +3,7 @@ import { i as vTooltip, n as vSpin, r as TooltipDirectiveProvider, t as SpinDire
 import { g as useStyle, i as cM, n as cB, r as cE, t as c } from "./use-style-DcT-1dj4.js";
 import { Fragment, computed, createVNode, defineComponent, inject, isVNode, mergeProps, provide, reactive, ref, renderSlot, shallowRef, toRef, toValue, unref, useTemplateRef, watch, withDirectives } from "vue";
 import { computedAsync, promiseTimeout, useElementHover, useElementSize, useEventListener, useFullscreen, watchDebounced } from "@vueuse/core";
-import { NAvatar, NBadge, NBreadcrumb, NBreadcrumbItem, NButton, NDrawer, NDrawerContent, NDropdown, NEmpty, NIcon, NList, NListItem, NMenu, NPagination, NPopover, NScrollbar, NTabPane, NTabs, NText, NThing, useThemeVars } from "ithinkdt-ui";
+import { NAvatar, NBadge, NBreadcrumb, NBreadcrumbItem, NButton, NDrawer, NDrawerContent, NDropdown, NEmpty, NIcon, NList, NListItem, NMenu, NPagination, NPopover, NScrollbar, NTabPane, NTabs, NText, NThing, NTooltip, useThemeVars } from "ithinkdt-ui";
 import { useAtomicBroadcast } from "@otwb/common/composables";
 import { RouterLink, useRouter } from "vue-router";
 import { walkTree } from "@otwb/common/tree";
@@ -550,6 +550,9 @@ const AppMenu = /* @__PURE__ */ defineComponent({
 	},
 	setup(d) {
 		let z = shallowRef([]);
+		function V(d, z) {
+			return d.length > 7;
+		}
 		watch([() => d.menus, () => d.single], ([B, V]) => {
 			if (z.value = [], !B?.length) return;
 			let H = (z, B = 0) => {
@@ -573,19 +576,44 @@ const AppMenu = /* @__PURE__ */ defineComponent({
 		}, { immediate: !0 }), watch([useTemplateRef("menu"), () => d.current], ([d, z]) => {
 			d?.showOption(z);
 		}, { immediate: !0 });
-		let V = inject(COLLAPSED_INJECTION_KEY, !1), H = (z) => {
-			let H = d.collapsed ?? unref(V), U;
-			if (z._.type === "view") if (z.isExternal && z.externalEmbed) U = createVNode("a", {
+		let H = inject(COLLAPSED_INJECTION_KEY, !1), U = (z) => {
+			let U = d.collapsed ?? unref(H), W;
+			if (z._.type === "view") if (z.isExternal && z.externalEmbed) W = createVNode("a", {
 				href: z.externalLink,
 				target: "_blank",
 				onClick: (d) => d.stopPropagation()
 			}, [z.label()]);
-			else {
+			else if (U) {
 				let d;
-				U = createVNode(RouterLink, { to: z.path }, _isSlot$1(d = z.label()) ? d : { default: () => [d] });
+				W = createVNode(RouterLink, { to: z.path }, _isSlot$1(d = z.label()) ? d : { default: () => [d] });
+			} else {
+				let d, B = createVNode(RouterLink, { to: z.path }, _isSlot$1(d = z.label()) ? d : { default: () => [d] }), H = createVNode("span", null, [z.label()]);
+				W = createVNode(NTooltip, {
+					placement: "top",
+					trigger: "hover",
+					showArrow: !0,
+					delay: 300,
+					disabled: !V(z.label(), z)
+				}, {
+					default: () => H,
+					trigger: () => B
+				});
 			}
-			else U = createVNode("span", null, [z.label()]);
-			return U.key = `${z.key}:${H ? 1 : 0}`, z.depth === 0 && !H && (U = withDirectives(U, [[
+			else if (U) W = createVNode("span", null, [z.label()]);
+			else {
+				let d = createVNode("span", null, [z.label()]);
+				W = createVNode(NTooltip, {
+					placement: "top",
+					trigger: "hover",
+					showArrow: !0,
+					delay: 300,
+					disabled: !V(z.label(), z)
+				}, {
+					default: () => d,
+					trigger: () => d
+				});
+			}
+			return W.key = `${z.key}:${U ? 1 : 0}`, z.depth === 0 && !U && (W = withDirectives(W, [[
 				vTooltip,
 				z.label(),
 				void 0,
@@ -593,7 +621,7 @@ const AppMenu = /* @__PURE__ */ defineComponent({
 					auto: !0,
 					right: !0
 				}
-			]])), z.isNew && (U = createVNode("div", { style: "display: flex; width: 100%" }, [createVNode("span", { style: "flex: 0 1 auto; overflow: hidden; text-overflow: ellipsis" }, [U]), createVNode("svg", {
+			]])), z.isNew && (W = createVNode("div", { style: "display: flex; width: 100%" }, [createVNode("span", { style: "flex: 0 1 auto; overflow: hidden; text-overflow: ellipsis" }, [W]), createVNode("svg", {
 				xmlns: "http://www.w3.org/2000/svg",
 				width: "24",
 				height: "24",
@@ -602,7 +630,7 @@ const AppMenu = /* @__PURE__ */ defineComponent({
 			}, [createVNode("path", {
 				d: "M245.76 286.72h552.96c124.928 0 225.28 100.352 225.28 225.28s-100.352 225.28-225.28 225.28H0V532.48c0-135.168 110.592-245.76 245.76-245.76z m133.12 348.16V401.408H348.16v178.176l-112.64-178.176H204.8V634.88h30.72v-178.176L348.16 634.88h30.72z m182.272-108.544v-24.576h-96.256v-75.776h110.592v-24.576h-141.312V634.88h143.36v-24.576h-112.64v-83.968h96.256z m100.352 28.672l-34.816-151.552h-34.816l55.296 233.472H675.84l47.104-161.792 4.096-20.48 4.096 20.48 47.104 161.792h28.672l57.344-233.472h-34.816l-32.768 151.552-4.096 30.72-6.144-30.72-40.96-151.552h-30.72l-40.96 151.552-6.144 30.72-6.144-30.72z",
 				fill: "var(--color-danger)"
-			}, null)])])), U;
+			}, null)])])), W;
 		};
 		return () => {
 			let B = createVNode(NMenu, {
@@ -610,11 +638,11 @@ const AppMenu = /* @__PURE__ */ defineComponent({
 				options: z.value,
 				rootIndent: 16,
 				accordion: d.accordion,
-				collapsed: d.collapsed ?? unref(V),
+				collapsed: d.collapsed ?? unref(H),
 				dropdownProps: { showArrow: !0 },
 				mode: d.horizontal ? "horizontal" : "vertical",
 				value: d.current ?? null,
-				renderLabel: H,
+				renderLabel: U,
 				responsive: !0,
 				collapsedWidth: d.collapsedWidth,
 				width: d.width

package/dist/page.js

@@ -1,7 +1,7 @@
 import { n as useI18n } from "./use-i18n-Dx7V4KrY.js";
 import "./directives-CRvPGywW.js";
 import "./use-style-DcT-1dj4.js";
-import { a as NRadios, g as NCheckboxes, n as DtUserDept, p as DataForm, r as DtUserRender, t as DtDeptRender } from "./components-C3FvQCdL.js";
+import { a as NRadios, g as NCheckboxes, n as DtUserDept, p as DataForm, r as DtUserRender, t as DtDeptRender } from "./components-BMteXZVn.js";
 import { computed, createVNode, defineComponent, h, isVNode, mergeProps, nextTick, ref, shallowRef, unref } from "vue";
 import { until } from "@vueuse/core";
 import { NButton, NCheckbox, NColorPicker, NDatePicker, NDrawer, NDrawerContent, NFlex, NInput, NInputNumber, NModal, NScrollbar, NSelect, NText, NUpload, useMessage } from "ithinkdt-ui";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@otwb/ui",
-  "version": "2.0.23",
+  "version": "2.0.25",
   "type": "module",
   "license": "MIT",
   "description": "otwb UI",
@@ -90,7 +90,7 @@
     "vite": "npm:rolldown-vite@^7.1.20",
     "vue": "^3.5.22",
     "vue-router": "^4.6.3",
-    "@otwb/page": "^2.0.2"
+    "@otwb/page": "^2.0.5"
   },
   "scripts": {
     "dev": "vite build --watch",