@otwb/ui 2.0.15 → 2.0.16

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-Da6YLAnC.js → components-M__4fWLn.js}

@@ -107,16 +107,13 @@ const NCheckboxes = /* @__PURE__ */ defineComponent({
 }, e), [createVNode("path", {
 	fill: "currentColor",
 	d: "M11 18h2v-2h-2v2m1-16A10 10 0 0 0 2 12a10 10 0 0 0 10 10a10 10 0 0 0 10-10A10 10 0 0 0 12 2m0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8s8 3.59 8 8s-3.59 8-8 8m0-14a4 4 0 0 0-4 4h2a2 2 0 0 1 2-2a2 2 0 0 1 2 2c0 2-3 1.75-3 5h2c0-2.25 3-2.5 3-5a4 4 0 0 0-4-4Z"
-}, null)]), ICustom = (e) => createVNode("svg", mergeProps({
+}, null)]), IFilterCustom = (e) => createVNode("svg", {
 	xmlns: "http://www.w3.org/2000/svg",
 	"xmlns:xlink": "http://www.w3.org/1999/xlink",
-	role: "img",
-	width: "1em",
-	height: "1em",
 	viewBox: "0 0 1024 1024"
-}, e), [createVNode("path", {
-	fill: "currentColor",
-	d: "m924.8 625.7l-65.5-56c3.1-19 4.7-38.4 4.7-57.8s-1.6-38.8-4.7-57.8l65.5-56a32.03 32.03 0 0 0 9.3-35.2l-.9-2.6a443.74 443.74 0 0 0-79.7-137.9l-1.8-2.1a32.12 32.12 0 0 0-35.1-9.5l-81.3 28.9c-30-24.6-63.5-44-99.7-57.6l-15.7-85a32.05 32.05 0 0 0-25.8-25.7l-2.7-.5c-52.1-9.4-106.9-9.4-159 0l-2.7.5a32.05 32.05 0 0 0-25.8 25.7l-15.8 85.4a351.86 351.86 0 0 0-99 57.4l-81.9-29.1a32 32 0 0 0-35.1 9.5l-1.8 2.1a446.02 446.02 0 0 0-79.7 137.9l-.9 2.6c-4.5 12.5-.8 26.5 9.3 35.2l66.3 56.6c-3.1 18.8-4.6 38-4.6 57.1c0 19.2 1.5 38.4 4.6 57.1L99 625.5a32.03 32.03 0 0 0-9.3 35.2l.9 2.6c18.1 50.4 44.9 96.9 79.7 137.9l1.8 2.1a32.12 32.12 0 0 0 35.1 9.5l81.9-29.1c29.8 24.5 63.1 43.9 99 57.4l15.8 85.4a32.05 32.05 0 0 0 25.8 25.7l2.7.5a449.4 449.4 0 0 0 159 0l2.7-.5a32.05 32.05 0 0 0 25.8-25.7l15.7-85a350 350 0 0 0 99.7-57.6l81.3 28.9a32 32 0 0 0 35.1-9.5l1.8-2.1c34.8-41.1 61.6-87.5 79.7-137.9l.9-2.6c4.5-12.3.8-26.3-9.3-35zM788.3 465.9c2.5 15.1 3.8 30.6 3.8 46.1s-1.3 31-3.8 46.1l-6.6 40.1l74.7 63.9a370.03 370.03 0 0 1-42.6 73.6L721 702.8l-31.4 25.8c-23.9 19.6-50.5 35-79.3 45.8l-38.1 14.3l-17.9 97a377.5 377.5 0 0 1-85 0l-17.9-97.2l-37.8-14.5c-28.5-10.8-55-26.2-78.7-45.7l-31.4-25.9l-93.4 33.2c-17-22.9-31.2-47.6-42.6-73.6l75.5-64.5l-6.5-40c-2.4-14.9-3.7-30.3-3.7-45.5c0-15.3 1.2-30.6 3.7-45.5l6.5-40l-75.5-64.5c11.3-26.1 25.6-50.7 42.6-73.6l93.4 33.2l31.4-25.9c23.7-19.5 50.2-34.9 78.7-45.7l37.9-14.3l17.9-97.2c28.1-3.2 56.8-3.2 85 0l17.9 97l38.1 14.3c28.7 10.8 55.4 26.2 79.3 45.8l31.4 25.8l92.8-32.9c17 22.9 31.2 47.6 42.6 73.6L781.8 426l6.5 39.9zM512 326c-97.2 0-176 78.8-176 176s78.8 176 176 176s176-78.8 176-176s-78.8-176-176-176zm79.2 255.2A111.6 111.6 0 0 1 512 614c-29.9 0-58-11.7-79.2-32.8A111.6 111.6 0 0 1 400 502c0-29.9 11.7-58 32.8-79.2C454 401.6 482.1 390 512 390c29.9 0 58 11.6 79.2 32.8A111.6 111.6 0 0 1 624 502c0 29.9-11.7 58-32.8 79.2z"
+}, [createVNode("path", {
+	d: "M880.1 154H143.9c-24.5 0-39.8 26.7-27.5 48L349 597.4V838c0 17.7 14.2 32 31.8 32h262.4c17.6 0 31.8-14.3 31.8-32V597.4L907.7 202c12.2-21.3-3.1-48-27.6-48zM603.4 798H420.6V642h182.9v156zm9.6-236.6l-9.5 16.6h-183l-9.5-16.6L212.7 226h598.6L613 561.4z",
+	fill: "currentColor"
 }, null)]), IDrag = (e) => createVNode("svg", mergeProps({
 	xmlns: "http://www.w3.org/2000/svg",
 	"xmlns:xlink": "http://www.w3.org/1999/xlink",
@@ -433,7 +430,10 @@ const DataCustom = /* @__PURE__ */ defineComponent({
 			trigger: () => withDirectives(createVNode(NButton, {
 				text: !0,
 				type: x.type
-			}, { default: () => [createVNode(NIcon, { size: x.size }, { default: () => [createVNode(ICustom, null, null)] })] }), [[vTooltip, x.tooltip ?? C("common.page.custom.tooltip")]]),
+			}, { default: () => [createVNode(NIcon, {
+				size: x.size,
+				color: "#000"
+			}, { 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, {
@@ -457,6 +457,10 @@ const DataCustom = /* @__PURE__ */ defineComponent({
 		});
 	}
 });
+var DataForm_module_default = {
+	nformWrap: "_nformWrap_b73uh_1",
+	ngridWrap: "_ngridWrap_b73uh_17"
+};
 function _isSlot$5(e) {
 	return typeof e == "function" || Object.prototype.toString.call(e) === "[object Object]" && !isVNode(e);
 }
@@ -550,7 +554,7 @@ const DataForm = /* @__PURE__ */ defineComponent({
 		},
 		labelPlacement: {
 			type: String,
-			default: "left"
+			default: "top"
 		}
 	},
 	emits: [
@@ -576,6 +580,7 @@ const DataForm = /* @__PURE__ */ defineComponent({
 		}), () => {
 			let { items: e, loading: x, validation: j, showColon: N, showAction: P, actionAlign: F, submitText: I, submitDisabled: L, resetText: R, tooltipPlacement: B, showFeedback: V, labelWidth: H = "7.2em", labelAlign: U = b.labelPlacement === "top" ? "left" : "right", grid: W, succeeded: G, successText: K = I,...q } = b, J = !b.readonly && V !== !1;
 			return createVNode(NForm, mergeProps({
+				class: DataForm_module_default.nformWrap,
 				labelWidth: H,
 				labelAlign: U,
 				onReset: T,
@@ -584,7 +589,10 @@ const DataForm = /* @__PURE__ */ defineComponent({
 			}, q), { default: () => [createVNode(NGrid, mergeProps({
 				ref: k,
 				itemResponsive: !0
-			}, W, { yGap: J ? 0 : W?.yGap ?? 24 }), { default: () => {
+			}, W, {
+				class: DataForm_module_default.ngridWrap,
+				yGap: J ? 0 : W?.yGap ?? 24
+			}), { default: () => {
 				let w = 0;
 				return createVNode(Fragment, null, [e.map(({ hidden: e, name: x, render: S, label: C, showColon: T, span: E = 6, rowSpan: D, offset: k = 0, tooltip: A, tooltipPlacement: N = b.tooltipPlacement, validationStatus: P = j[x]?.errors?.some((e) => e !== void 0) ? "error" : j[x]?.warnings?.some((e) => e !== void 0) ? "warnings" : j[x] ? "success" : void 0, readonly: F = b.readonly, showRequireMark: I = !F, showTooltipWhenReadonly: L = !1,...R }) => {
 					if (e) return;
@@ -666,7 +674,12 @@ const DataForm = /* @__PURE__ */ defineComponent({
 			} })] });
 		};
 	}
-}), DataFilter = /* @__PURE__ */ defineComponent({
+});
+var DataFilter_module_default = {
+	submitWrap: "_submitWrap_kqtax_1",
+	collapsedBtn: "_collapsedBtn_kqtax_5"
+};
+const DataFilter = /* @__PURE__ */ defineComponent({
 	name: "DataFilter",
 	props: {
 		grid: {
@@ -680,7 +693,7 @@ const DataForm = /* @__PURE__ */ defineComponent({
 		},
 		labelPlacement: {
 			type: String,
-			default: "left"
+			default: "top"
 		},
 		items: {
 			type: Array,
@@ -742,9 +755,9 @@ const DataForm = /* @__PURE__ */ defineComponent({
 		return () => {
 			let { filterOnReset: e, filterText: x, resetText: A, customizable: j, defaultCollapsed: N, collapsible: P, grid: F,...I } = b;
 			return createVNode(DataForm, mergeProps({ grid: {
-				cols: "12 768:18 1280:24 1536:30",
-				yGap: 20,
-				xGap: 8,
+				cols: "12 768:18 1200:30 1536:30",
+				yGap: 16,
+				xGap: 12,
 				...F,
 				collapsed: E.value
 			} }, I, {
@@ -756,8 +769,17 @@ const DataForm = /* @__PURE__ */ defineComponent({
 				justify: k.suffix ? "end" : "start",
 				align: "center"
 			}, { default: () => [
+				P && k.suffix ? createVNode(NButton, {
+					class: DataFilter_module_default.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")]),
 				createVNode(NButton, {
+					class: DataFilter_module_default.submitWrap,
 					attrType: "submit",
 					type: "primary",
 					disabled: b.disabled,
@@ -772,16 +794,9 @@ const DataForm = /* @__PURE__ */ defineComponent({
 					showFixed: !1,
 					data: I.items,
 					onCustom: (e) => S("custom", e),
-					size: 18,
+					size: 16,
 					type: "primary"
-				}, null) : void 0,
-				P && k.suffix ? createVNode(NButton, {
-					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
+				}, null) : void 0
 			] })) });
 		};
 	}
@@ -1368,6 +1383,7 @@ const DtUserDept = /* @__PURE__ */ defineComponent({
 				checkable: b.multiple,
 				selectable: !b.multiple,
 				multiple: !1,
+				clearable: !0,
 				blockLine: !0,
 				checkOnClick: !0,
 				pattern: S,
@@ -1530,8 +1546,8 @@ const DtUserDept = /* @__PURE__ */ defineComponent({
 				options: e,
 				multiple: b.multiple,
 				size: b.size,
-				clearable: !0,
 				placeholder: b.placeholder,
+				clearable: !0,
 				disabled: b.disabled || void 0,
 				value: b.modelValue,
 				renderTag: b.multiple ? q : void 0,

package/dist/components.css

@@ -0,0 +1 @@
+._nformWrap_b73uh_1 .n-form-item{display:block!important}._nformWrap_b73uh_1 .n-form-item .n-input,._nformWrap_b73uh_1 .n-form-item .n-base-selection__border,._nformWrap_b73uh_1 .n-form-item .n-base-selection__state-border{border-radius:2px!important}._nformWrap_b73uh_1 .n-form-item .n-text{color:#000!important}._ngridWrap_b73uh_17>div:last-child{align-items:end;display:flex}._submitWrap_kqtax_1{background-color:#176bf8!important}._collapsedBtn_kqtax_5 .n-button__content{color:#000!important}._collapsedBtn_kqtax_5 .n-button__icon{color:#d9d9d9!important}

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