@ithinkdt/ui 4.0.0-50 → 4.0.0-52

package/dist/components.js

@@ -1,5 +1,5 @@
 import "./use-i18n-Dx7V4KrY.js";
 import "./directives-DUuJW647.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-BC8oa62b.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-CTdt73l6.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-DUuJW647.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-BC8oa62b.js";
+import { a as NRadios, g as NCheckboxes, n as DtUserDept, p as DataForm, r as DtUserRender, t as DtDeptRender } from "./components-CTdt73l6.js";
 import { computed, createVNode, defineComponent, h, isVNode, mergeProps, 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";
@@ -86,7 +86,7 @@ var mapProps = (n) => Object.fromEntries(Object.entries(n || {}).map(([n, c]) =>
 		};
 	}
 });
-function createPageFormHelper({ getUserGroups: n, getUsersByGroup: d, getUsersByDept: p, getUsersByUsername: m, uploadFile: g, getFileInfos: v }) {
+function createPageFormHelper({ getUserGroups: n, getUsersByGroup: d, getDeptsByCode: p, getUsersByDept: m, getUsersByUsername: g, uploadFile: v, getFileInfos: y }) {
 	return {
 		input: () => ({ slots: n, props: c }, { modelValue: l, "onUpdate:modelValue": u, required: d, readonly: f,...p }) => f ? createVNode(NText, {
 			depth: 2,
@@ -231,7 +231,7 @@ function createPageFormHelper({ getUserGroups: n, getUsersByGroup: d, getUsersBy
 				...c,
 				...p,
 				defaultUpload: !1,
-				uploadFile: g,
+				uploadFile: v,
 				fileList: l,
 				onUpdateFileList: u
 			}, n);
@@ -241,7 +241,7 @@ function createPageFormHelper({ getUserGroups: n, getUsersByGroup: d, getUsersBy
 				let c = ++d;
 				u.value = n.map((n) => l.get(n)).filter(Boolean);
 				let f = n.filter((n) => !l.has(n));
-				Promise.resolve(f.length > 0 ? v(f) : []).then((f) => {
+				Promise.resolve(f.length > 0 ? y(f) : []).then((f) => {
 					if (c === d) {
 						u.value = n.map((n) => l.get(n) || f.find((c) => c.id === n)), l.clear();
 						for (let n of u.value) l.set(n.id, n);
@@ -249,9 +249,9 @@ function createPageFormHelper({ getUserGroups: n, getUsersByGroup: d, getUsersBy
 				});
 			}, p;
 			return {
-				renderer: ({ slots: d, props: m }, { modelValue: v, "onUpdate:modelValue": y, required: b, readonly: S,...C }) => {
+				renderer: ({ slots: d, props: m }, { modelValue: g, "onUpdate:modelValue": y, required: b, readonly: S,...C }) => {
 					let w = mapProps(m);
-					if (p = w.ref ??= shallowRef(), n !== v && (n = v, f(v?.split(",") ?? [])), S) {
+					if (p = w.ref ??= shallowRef(), n !== g && (n = g, f(g?.split(",") ?? [])), S) {
 						let n;
 						return u.value.length === 0 ? void 0 : createVNode(NFlex, {
 							gap: "8",
@@ -270,7 +270,7 @@ function createPageFormHelper({ getUserGroups: n, getUsersByGroup: d, getUsersBy
 					return h(SimpleUpload, {
 						...w,
 						...C,
-						uploadFile: g,
+						uploadFile: v,
 						fileList: u.value,
 						onUpdateFileList: (n = []) => {
 							l.clear();
@@ -285,31 +285,31 @@ function createPageFormHelper({ getUserGroups: n, getUsersByGroup: d, getUsersBy
 			};
 		},
 		user: () => {
-			let c;
-			return ({ slots: l, props: g }, { modelValue: v, "onUpdate:modelValue": y, required: b, readonly: S,...C }) => {
-				let w = mapProps(g);
-				return c || (c = shallowRef([]), m().then((n) => {
+			let c, l, v;
+			return ({ slots: y, props: b }, { modelValue: S, "onUpdate:modelValue": C, required: w, readonly: T,...E }) => {
+				let D = mapProps(b);
+				return c || (c = shallowRef([]), l = shallowRef([]), v = shallowRef([]), g().then((n) => {
 					c.value = n;
 				}), n().then((n) => {
-					(void 0).value = n;
-				}), getDeptsByCode().then((n) => {
-					(void 0).value = n;
-				})), S ? createVNode(DtUserRender, {
-					value: v,
-					multiple: w.multiple,
-					getUsersByUsername: m
+					l.value = n;
+				}), p().then((n) => {
+					v.value = n;
+				})), T ? createVNode(DtUserRender, {
+					value: S,
+					multiple: D.multiple,
+					getUsersByUsername: g
 				}, null) : h(DtUserDept, {
 					type: "user",
 					users: c.value,
-					depts: (void 0).value,
-					groups: (void 0).value,
-					getUsersByDept: p,
+					depts: v.value,
+					groups: l.value,
+					getUsersByDept: m,
 					getUsersByGroup: d,
-					...w,
-					...C,
-					modelValue: v,
-					"onUpdate:modelValue": y
-				}, l);
+					...D,
+					...E,
+					modelValue: S,
+					"onUpdate:modelValue": C
+				}, y);
 			};
 		}
 	};
@@ -420,12 +420,18 @@ function createPageTableHelper({ getDeptsByCode: n, getUsersByUsername: c, getFi
 	};
 }
 function createFormHelper() {
-	return () => ({ items: n, model: c, handleSubmit: l, reset: u, validation: f, readonly: p, inModal: m, showColon: g }) => createVNode(DataForm, {
+	return () => ({ items: n, model: c, handleSubmit: l, reset: u, validation: f, readonly: p, inModal: m, showFeedback: g, showColon: _, labelWidth: v, labelAlign: y, labelPlacement: b, showRequireMark: x, requireMarkPlacement: C }) => createVNode(DataForm, {
 		readonly: p,
 		model: c,
 		items: n,
 		validation: f,
-		showColon: unref(g) ?? !0,
+		showColon: unref(_) ?? !0,
+		labelWidth: unref(v),
+		labelAlign: unref(y),
+		labelPlacement: unref(b),
+		showRequireMark: unref(x),
+		requireMarkPlacement: unref(C),
+		showFeedback: unref(g) ?? !0,
 		showAction: !1,
 		onSubmit: l,
 		onRest: u,

package/esm/components.d.ts

@@ -16,6 +16,12 @@ declare module '@ithinkdt/page' {
 
     interface FormRenderExtraOptions {
         showColon?: MaybeRef<boolean | undefined>
+        labelWidth?: MaybeRef<string | number | undefined>
+        labelAlign?: MaybeRef<'left' | 'right' | 'center' | undefined>
+        labelPlacement?: MaybeRef<'left' | 'top' | undefined>
+        showRequireMark?: MaybeRef<boolean | undefined>
+        requireMarkPlacement?: MaybeRef<'left' | 'right' | 'right-hanging' | undefined>
+        showFeedback?: MaybeRef<boolean | undefined>
     }
 
     type FormItemOptionKeys = 'size' | 'showLabel' | 'labelWidth' | 'labelStyle' | 'labelAlign' | 'labelPlacement' | 'labelProps'
@@ -367,6 +373,7 @@ export interface UserGroupOption {
     name: string
 }
 export interface DeptOption {
+    id?: string | undefined
     code: string
     name: string
     children?: DeptOption[]
@@ -382,7 +389,8 @@ interface UserDeptProps<Multiple extends boolean> {
     'filterable'?: boolean | undefined
     'disabled'?: boolean | undefined
     'size'?: TransferProps['size'] | undefined
-    'users'?: { username: string, nickname: string }[] | undefined
+    'valueField'?: 'id' | 'username' | 'code' | undefined
+    'users'?: { id?: string | undefined, username: string, nickname: string }[] | undefined
     'groups'?: UserGroupOption[] | undefined
     'depts'?: DeptOption[] | undefined
     'getUsersByGroup'?: ((code: string) => Promise<{ username: string, nickname: string }[]>) | undefined

package/esm/page.d.ts

@@ -98,9 +98,9 @@ declare module '@ithinkdt/page' {
         }
 
         user: {
-            uploadProps?: ShallowMaybeRef<Omit<UserDeptProps<boolean>, 'modelValue' | 'onUpdate:modelValue' | 'disabled'
+            userProps?: ShallowMaybeRef<Omit<UserDeptProps<boolean>, 'modelValue' | 'onUpdate:modelValue' | 'disabled'
             | 'users' | 'groups' | 'depts' | 'getUsersByGroup' | 'getUsersByDept'>> & PublicProps
-            uploadSlots?: {}
+            userSlots?: {}
         }
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ithinkdt/ui",
-  "version": "4.0.0-50",
+  "version": "4.0.0-52",
   "type": "module",
   "license": "MIT",
   "description": "iThinkDT UI",