@otwb/ui 2.0.36 → 2.0.37

package/dist/{components-CkECmA7m.js → components-BM8_ejhG.js}

@@ -8,10 +8,10 @@ import { useRoute } from "vue-router";
 import { VOverflow, VResizeObserver } from "vueuc";
 import { Sortable } from "sortablejs/modular/sortable.core.esm.js";
 import { request } from "@otwb/common/request";
+import { useApp } from "@otwb/app/use-app";
 import { pickProps } from "@otwb/common/object";
 import { PAGE_INJECTION, useFormModal } from "@otwb/page";
 import { Sortable as Sortable$1 } from "sortablejs";
-import "lg.table-plus";
 import useLocale from "ithinkdt-ui/es/_mixins/use-locale.mjs";
 import { flattenTree, walkTree } from "@otwb/common";
 const NCheckboxes = /* @__PURE__ */ defineComponent({
@@ -408,27 +408,30 @@ const DataCustom = /* @__PURE__ */ defineComponent({
 		save: ""
 	},
 	setup(x, { emit: S }) {
-		let { t: C } = useI18n(), w = useRoute(), T = useMessage();
-		function E() {
+		let { t: C } = useI18n(), w = useRoute(), T = useMessage(), E = useApp();
+		function D() {
 			if (x.showFixed) {
 				w.name + "";
 				let e = w.name + "__table";
 				request.post("/api/v1/otwb-cloud-uc/cli/module/custom-config/save", {
 					__table: localStorage.getItem(e),
 					url: w.name
-				}, { requestType: "json" }).then((e) => {
+				}, {
+					requestType: "json",
+					headers: { Authorization: `Bearer ${E.auth.token}` }
+				}).then((e) => {
 					T.success("配置保存成功！");
 				});
 			} else S("save");
 		}
-		function D(e, b, C) {
+		function k(e, b, C) {
 			S("custom", {
 				key: e[x.keyField],
 				[b]: C
 			});
 		}
-		let k = ref();
-		return watch(k, (e) => {
+		let A = ref();
+		return watch(A, (e) => {
 			e.$el && Sortable.create(e.$el, {
 				animation: 150,
 				ghostClass: "ghost",
@@ -460,14 +463,14 @@ const DataCustom = /* @__PURE__ */ defineComponent({
 					text: !0,
 					type: "primary",
 					size: "small",
-					onClick: () => E()
+					onClick: () => D()
 				}, { 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: k,
+					ref: A,
 					vertical: !0
 				}, _isSlot$6(b = x.data.filter((e) => e[x.visiblityField] !== !1).map((e) => createVNode(DataCustomItem, {
 					key: e[x.keyField],
@@ -475,8 +478,8 @@ const DataCustom = /* @__PURE__ */ defineComponent({
 					hidden: e[x.hiddenField],
 					fixed: e[x.fixedField],
 					showFixed: x.showFixed,
-					onUpdateHidden: (b) => D(e, "hidden", b),
-					onUpdateFixed: (b) => D(e, "fixed", b)
+					onUpdateHidden: (b) => k(e, "hidden", b),
+					onUpdateFixed: (b) => k(e, "fixed", b)
 				}, null))) ? b : { default: () => [b] })] });
 			}
 		});
@@ -752,69 +755,72 @@ const DataForm = /* @__PURE__ */ defineComponent({
 		"collapse"
 	],
 	setup(b, { expose: x, emit: S }) {
-		let C = useRoute(), w = useMessage(), T = () => {
+		let C = useRoute(), w = useMessage(), T = useApp(), E = () => {
 			let e = C.name + "__form";
 			C.name + "", request.post("/api/v1/otwb-cloud-uc/cli/module/custom-config/save", {
 				__form: localStorage.getItem(e),
 				url: C.name
-			}, { requestType: "json" }).then((e) => {
+			}, {
+				requestType: "json",
+				headers: { Authorization: `Bearer ${T.auth.token}` }
+			}).then((e) => {
 				w.success("配置保存成功！");
 			});
-		}, { t: E } = useI18n(), D = (e) => {
+		}, { t: D } = useI18n(), k = (e) => {
 			S("filter", b.model, e);
-		}, k = (e) => {
+		}, A = (e) => {
 			S("reset", e), b.filterOnReset && S("filter", b.model, e);
-		}, A = ref(b.defaultCollapsed), j = (e) => {
-			A.value = e;
+		}, j = ref(b.defaultCollapsed), N = (e) => {
+			j.value = e;
 		};
-		x({ collapse: j });
-		let N = reactive({
+		x({ collapse: N });
+		let I = reactive({
 			span: 6,
 			suffix: !0
 		});
 		return () => {
-			let { filterOnReset: e, filterText: x, resetText: C, customizable: w, defaultCollapsed: P, collapsible: F, grid: I,...L } = b;
+			let { filterOnReset: e, filterText: x, resetText: C, customizable: w, defaultCollapsed: T, collapsible: P, grid: F,...L } = b;
 			return createVNode(DataForm, mergeProps({ grid: {
 				cols: "12 768:18 1200:30 1536:30",
 				yGap: 16,
 				xGap: 12,
-				...I,
-				collapsed: A.value
+				...F,
+				collapsed: j.value
 			} }, L, {
 				showFeedback: !1,
-				showAction: N,
-				onSubmit: D,
-				onReset: k
-			}), { action: ({ cols: e, spans: D }) => (N.suffix = e < D + N.span, createVNode(NFlex, {
-				justify: N.suffix ? "end" : "start",
+				showAction: I,
+				onSubmit: k,
+				onReset: A
+			}), { action: ({ cols: e, spans: T }) => (I.suffix = e < T + I.span, createVNode(NFlex, {
+				justify: I.suffix ? "end" : "start",
 				align: "center"
 			}, { default: () => [
-				F && N.suffix ? createVNode(NButton, {
+				P && I.suffix ? createVNode(NButton, {
 					class: "collapsedBtn",
 					text: !0,
 					type: "primary",
 					iconPlacement: "right",
-					renderIcon: A.value ? IDown : IUp,
-					onClick: () => j(!A.value)
-				}, { default: () => [A.value ? E("common.page.filter.expand") : E("common.page.filter.collapse")] }) : void 0,
-				N.suffix ? void 0 : createVNode("span", null, [createTextVNode("\xA0\xA0\xA0\xA0")]),
+					renderIcon: j.value ? IDown : IUp,
+					onClick: () => N(!j.value)
+				}, { default: () => [j.value ? D("common.page.filter.expand") : D("common.page.filter.collapse")] }) : void 0,
+				I.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 || E("common.page.filter.submitText")] }),
+				}, { default: () => [x || D("common.page.filter.submitText")] }),
 				createVNode(NButton, {
 					attrType: "reset",
 					disabled: b.disabled || b.loading
-				}, { default: () => [C || E("common.page.form.resetText")] }),
+				}, { default: () => [C || D("common.page.form.resetText")] }),
 				w ? createVNode(DataCustom, {
 					isFilter: !0,
 					keyField: "name",
 					showFixed: !1,
 					data: L.items,
-					onSave: T,
+					onSave: E,
 					onCustom: (e) => S("custom", e),
 					size: 16,
 					type: "primary"
@@ -938,27 +944,30 @@ const DataLocaleInput = /* @__PURE__ */ defineComponent({
 	},
 	emits: { change: () => !0 },
 	setup(b, { emit: x }) {
-		let { t: S } = useI18n(), C = useRoute(), w = (e) => x("change", {
+		let { t: S } = useI18n(), C = useRoute(), w = useApp(), T = (e) => x("change", {
 			pageSize: b.pageSize ?? b.page?.pageSize ?? 0,
 			currentPage: e
-		}), T = (e) => {
+		}), E = (e) => {
 			let S = C.name + "__page";
 			request.post("/api/v1/otwb-cloud-uc/cli/module/custom-config/save", {
 				__page: e,
 				url: C.name
-			}, { requestType: "json" }).then((b) => {
+			}, {
+				requestType: "json",
+				headers: { Authorization: `Bearer ${w.auth.token}` }
+			}).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, {
+		}, D = C.name + "__page";
+		return localStorage.getItem(D) && (b.page.pageSize = localStorage.getItem(D)), () => createVNode(NPagination, {
 			page: b.currentPage ?? b.page?.currentPage,
 			itemCount: b.total,
 			pageSize: b.pageSize ?? b.page?.pageSize,
-			onUpdatePage: w,
-			onUpdatePageSize: T,
+			onUpdatePage: T,
+			onUpdatePageSize: E,
 			pageSizes: b.pageSizes,
 			showQuickJumper: !0,
 			showSizePicker: !0,
@@ -1174,7 +1183,6 @@ const DataTable = /* @__PURE__ */ defineComponent({
 			});
 		};
 		return () => createVNode(NDataTable, {
-			id: "table-wrap",
 			class: O,
 			data: e.data,
 			columns: L.value,

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-CkECmA7m.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-BM8_ejhG.js";
 export { DataActions, DataCustom, DataFilter, DataForm, DataLocaleInput, DataPagination, DataSelection, DataTable, DtDeptRender, DtUserDept, DtUserRender, NCheckboxes, NRadios, renderUsers, useDataTableDrag, useLocaleEdit };

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-CkECmA7m.js";
+import { a as NRadios, g as NCheckboxes, n as DtUserDept, p as DataForm, r as DtUserRender, t as DtDeptRender } from "./components-BM8_ejhG.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.36",
+  "version": "2.0.37",
   "type": "module",
   "license": "MIT",
   "description": "otwb UI",
@@ -62,11 +62,11 @@
     "@vicons/antd": "^0.13.0",
     "@vueuse/core": "^14.0.0",
     "date-fns": "^4.1.0",
-    "lg.table-plus": "^0.0.2",
     "nanoid": "^5.1.6",
     "sortablejs": "^1.15.6",
     "vueuc": "^0.4.65",
-    "@otwb/common": "^2.0.7"
+    "@otwb/common": "^2.0.7",
+    "@otwb/app": "^2.0.2"
   },
   "peerDependencies": {
     "@otwb/page": ">=4.0",