@otwb/ui 2.1.0 → 2.1.2

package/README.md

@@ -1 +1 @@
-# @otwb/ui
+# @otwb/ui

package/auto-imports.d.ts

@@ -1,15 +1,15 @@
-export declare const UIDirectives: {
-    type: 'directive'
-    resolve: (name: string) => string | undefined
-}[]
-
-export declare const UIComponents: {
-    type: 'component'
-    resolve: (name: string) => string | undefined
-}[]
-
-export declare const UI: {
-    from: string
-    imports: (string | { name: string, type: boolean })[]
-}[]
-export default UI
+export declare const UIDirectives: {
+    type: 'directive'
+    resolve: (name: string) => string | undefined
+}[]
+
+export declare const UIComponents: {
+    type: 'component'
+    resolve: (name: string) => string | undefined
+}[]
+
+export declare const UI: {
+    from: string
+    imports: (string | { name: string, type: boolean })[]
+}[]
+export default UI

package/auto-imports.js

@@ -1,34 +1,34 @@
-export const UIDirectives = [
-    {
-        type: 'directive',
-        resolve(name) {
-            return ['Spin', 'Tooltip'].includes(name)
-                ? { name: `v${name}`, from: '@otwb/ui/directives' }
-                : undefined
-        },
-    },
-]
-
-export const UIComponents = [
-    {
-        type: 'component',
-        resolve(name) {
-            return ['DataTable', 'DataForm', 'DataCustom', 'DataFilter', 'DataSelection', 'DataPagination'].includes(name)
-                ? { name, from: '@otwb/ui/components' }
-                : undefined
-        },
-    },
-]
-
-export const UI = [
-    {
-        from: '@otwb/ui/directives',
-        imports: ['vSpin', 'vTooltip'],
-    },
-    {
-        from: '@otwb/ui/components',
-        imports: ['DataTable', 'DataForm', 'DataCustom', 'DataFilter', 'DataSelection', 'DataPagination'],
-    },
-]
-
-export default UI
+export const UIDirectives = [
+    {
+        type: 'directive',
+        resolve(name) {
+            return ['Spin', 'Tooltip'].includes(name)
+                ? { name: `v${name}`, from: '@otwb/ui/directives' }
+                : undefined
+        },
+    },
+]
+
+export const UIComponents = [
+    {
+        type: 'component',
+        resolve(name) {
+            return ['DataTable', 'DataForm', 'DataCustom', 'DataFilter', 'DataSelection', 'DataPagination'].includes(name)
+                ? { name, from: '@otwb/ui/components' }
+                : undefined
+        },
+    },
+]
+
+export const UI = [
+    {
+        from: '@otwb/ui/directives',
+        imports: ['vSpin', 'vTooltip'],
+    },
+    {
+        from: '@otwb/ui/components',
+        imports: ['DataTable', 'DataForm', 'DataCustom', 'DataFilter', 'DataSelection', 'DataPagination'],
+    },
+]
+
+export default UI

package/dist/{components-CjltPCgl.js → components-DAuJ0NEP.js}

@@ -755,7 +755,7 @@ const DataForm = /* @__PURE__ */ defineComponent({
 		"collapse"
 	],
 	setup(b, { expose: x, emit: S }) {
-		let C = useRoute(), w = useMessage(), T = useApp(), E = () => {
+		let C = useRoute(), w = useMessage(), T = useApp(), E = T.appCode, D = () => {
 			let e = C.name + "__form";
 			C.name + "", request.post("/api/v1/otwb-cloud-uc/cli/module/custom-config/save", {
 				__form: localStorage.getItem(e),
@@ -766,61 +766,62 @@ const DataForm = /* @__PURE__ */ defineComponent({
 			}).then((e) => {
 				w.success("配置保存成功！");
 			});
-		}, { t: D } = useI18n(), k = (e) => {
+		}, { t: k } = useI18n(), A = (e) => {
 			S("filter", b.model, e);
-		}, A = (e) => {
+		}, j = (e) => {
 			S("reset", e), b.filterOnReset && S("filter", b.model, e);
-		}, j = ref(b.defaultCollapsed), N = (e) => {
-			j.value = e;
+		}, N = ref(b.defaultCollapsed), I = (e) => {
+			N.value = e;
 		};
-		x({ collapse: N });
-		let I = reactive({
+		x({ collapse: I });
+		let L = reactive({
 			span: 6,
 			suffix: !0
 		});
 		return () => {
-			let { filterOnReset: e, filterText: x, resetText: C, customizable: w, defaultCollapsed: T, collapsible: P, grid: F,...L } = b;
+			let { filterOnReset: e, filterText: x, resetText: C, customizable: w, defaultCollapsed: T, collapsible: P, grid: F,...R } = b;
 			return createVNode(DataForm, mergeProps({ grid: {
 				cols: "12 768:18 1200:30 1536:30",
 				yGap: 16,
 				xGap: 12,
 				...F,
-				collapsed: j.value
-			} }, L, {
+				collapsedRows: E === "OMS" ? 2 : 1,
+				collapsed: N.value
+			} }, R, {
 				showFeedback: !1,
-				showAction: I,
-				onSubmit: k,
-				onReset: A
-			}), { action: ({ cols: e, spans: T }) => (I.suffix = e < T + I.span, createVNode(NFlex, {
-				justify: I.suffix ? "end" : "start",
+				showAction: L,
+				onSubmit: A,
+				onReset: j
+			}), { action: ({ cols: e, spans: T }) => (L.suffix = e < T + L.span, createVNode(NFlex, {
+				justify: L.suffix ? "end" : "start",
 				align: "center"
 			}, { default: () => [
-				P && I.suffix ? createVNode(NButton, {
+				P && L.suffix ? createVNode(NButton, {
 					class: "collapsedBtn",
 					text: !0,
 					type: "primary",
 					iconPlacement: "right",
-					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")]),
+					renderIcon: N.value ? IDown : IUp,
+					onClick: () => I(!N.value)
+				}, { default: () => [N.value ? k("common.page.filter.expand") : k("common.page.filter.collapse")] }) : void 0,
+				L.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 || D("common.page.filter.submitText")] }),
+				}, { default: () => [x || k("common.page.filter.submitText")] }),
 				createVNode(NButton, {
 					attrType: "reset",
 					disabled: b.disabled || b.loading
-				}, { default: () => [C || D("common.page.form.resetText")] }),
+				}, { default: () => [C || k("common.page.form.resetText")] }),
 				w ? createVNode(DataCustom, {
 					isFilter: !0,
 					keyField: "name",
 					showFixed: !1,
-					data: L.items,
-					onSave: E,
+					data: R.items,
+					onSave: D,
 					onCustom: (e) => S("custom", e),
 					size: 16,
 					type: "primary"

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

package/dist/index.js

@@ -945,10 +945,7 @@ const AppMultiTabs = /* @__PURE__ */ defineComponent({
 				closable: z.closable,
 				dark: d.dark,
 				onClick: () => {
-					if (!G) {
-						let d = new URL(z.href, window.location.origin);
-						H.push(`${d.pathname}${d.search}${d.hash}`);
-					}
+					G || H.push(z.fullPath);
 				},
 				onContextmenu: (d) => W(d, z)
 			}, { default: () => [B.name ? B.name({

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-CjltPCgl.js";
+import { a as NRadios, g as NCheckboxes, n as DtUserDept, p as DataForm, r as DtUserRender, t as DtDeptRender } from "./components-DAuJ0NEP.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";