@ithinkdt/ui 4.0.0-40 → 4.0.0-400

package/esm/components.d.ts

@@ -1,5 +1,5 @@
 import {
-    CheckboxGroupProps, DataTableInst as NDataTableInst, DataTableProps as NDataTableProps,
+    CheckboxGroupProps, DataTableInst as NDataTableInst, DataTableProps as NDataTableProps, FlexProps,
     FormItemGiProps as NFormItemGiProps, FormProps as NFormProps, GridItemProps as NGridItemProps, GridProps as NGridProps,
     PopoverProps,
     RadioGroupProps, TransferProps,
@@ -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'
@@ -48,16 +54,9 @@ declare module '@ithinkdt/page' {
 
 }
 
-export type DataFormProps<Data extends {}> = Omit<NFormProps, 'model' | 'rules' | 'onSubmit' | 'validateMessages'> & {
-    items: FormItem<Data>[]
-    model: Data
-    readonly?: boolean | undefined
-    grid?: boolean | NGridProps | undefined
-    validation?: { [k in keyof Data]?: ValidationResults } | undefined
-    showColon?: boolean | undefined
-    loading?: boolean | undefined
-    showAction?: boolean | NGridItemProps & AllowedComponentProps | undefined
-    actionAlign?: 'start' | 'center' | 'end'
+export type DataFormActionsProps = Pick<FlexProps, 'align' | 'justify' | 'vertical' | 'reverse'> & {
+    size?: 'small' | 'medium' | 'large' | undefined
+    gap?: number | string | undefined
     submitText?: VNodeChild | undefined
     resetText?: VNodeChild | undefined
     cancelText?: VNodeChild | undefined
@@ -65,21 +64,61 @@ export type DataFormProps<Data extends {}> = Omit<NFormProps, 'model' | 'rules'
     showResetBtn?: boolean | undefined
     showCancelBtn?: boolean | undefined
     submitDisabled?: boolean | undefined
+    submitLoading?: boolean | undefined
     succeeded?: boolean | undefined
     successText?: VNodeChild | undefined
-
-    tooltipPlacement?: 'bottom' | 'icon' | undefined
-    onSubmit?: MaybeArray<(model: Data) => void> | undefined
+    failureText?: VNodeChild | undefined
+    onSubmit?: MaybeArray<() => void> | undefined
     onRest?: MaybeArray<() => void> | undefined
+    onCancel?: MaybeArray<() => void> | undefined
+    nativeButtonType?: boolean | undefined
+}
+
+export type DataFormActionsEmits = {
+    (e: 'submit'): void
+    (e: 'reset'): void
+    (e: 'cancel'): void
+}
+
+export type DataFormActionsSlots = {
+    prefix?: () => VNodeChild
+    suffix?: () => VNodeChild
 }
 
+export declare function DataFormActions(
+    props: DataFormActionsProps & PublicProps,
+    ctx?: Pick<GenericCtx<DataFormActionsProps, DataFormActionsEmits, DataFormActionsSlots>, 'attrs' | 'emit' | 'slots'>,
+    expose?: (exposed?: GenericExposed) => void,
+    setup?: GenericCtx<DataFormActionsProps, DataFormActionsEmits, DataFormActionsSlots>,
+): GenericReturn<DataFormActionsProps, DataFormActionsEmits, DataFormActionsSlots>
+
+export type DataFormProps<Data extends {}> = Omit<NFormProps, 'model' | 'rules' | 'onSubmit' | 'validateMessages'>
+    & Omit<DataFormActionsProps, 'onSubmit' | 'size' | 'gap' | 'justify' | 'direction' | 'submitloading'> & {
+        items: FormItem<Data>[]
+        model: Data
+        readonly?: boolean | undefined
+        grid?: boolean | NGridProps | undefined
+        validation?: { [k in keyof Data]?: ValidationResults } | undefined
+        showColon?: boolean | undefined
+        tooltipPlacement?: 'bottom' | 'icon' | undefined
+        loading?: boolean | undefined
+        showAction?: boolean | NGridItemProps & AllowedComponentProps | undefined
+        actionJustify?: DataFormActionsProps['justify']
+        actionAlign?: DataFormActionsProps['align']
+        actionGap?: DataFormActionsProps['gap']
+        onSubmit?: MaybeArray<(model: Data) => void> | undefined
+    }
+
 export type DataFormEmits<Data extends {}> = {
     (e: 'submit', model: Data): void
     (e: 'reset'): void
+    (e: 'cancel'): void
 }
 
 export type DataFormSlots<_Data extends {}> = {
     action?: (params: { cols: number, spans: number, overflow: boolean }) => VNodeChild
+    actionPrefix?: () => VNodeChild
+    actionSuffix?: () => VNodeChild
 }
 
 export type DataFormInst = {
@@ -367,6 +406,7 @@ export interface UserGroupOption {
     name: string
 }
 export interface DeptOption {
+    id?: string | undefined
     code: string
     name: string
     children?: DeptOption[]
@@ -382,7 +422,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/esm/use-style.js

@@ -1 +1 @@
-export * from '../dist/use-style.js'
+export { c, cB, cE, cM, default, useClsPrefix } from '../dist/use-style.js'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ithinkdt/ui",
-  "version": "4.0.0-40",
+  "version": "4.0.0-400",
   "type": "module",
   "license": "MIT",
   "description": "iThinkDT UI",
@@ -14,7 +14,7 @@
     "esm",
     "auto-imports.*",
     "locale.*",
-    "unocss.*"
+    "unocss*"
   ],
   "main": "./esm/index.js",
   "module": "./esm/index.js",
@@ -48,8 +48,8 @@
       "default": "./auto-imports.js"
     },
     "./unocss": {
-      "types": "./unocss.d.ts",
-      "default": "./unocss.js"
+      "types": "./unocss-preset.d.ts",
+      "default": "./unocss-preset.js"
     }
   },
   "publishConfig": {
@@ -62,9 +62,9 @@
     "date-fns": "^4.1.0",
     "vueuc": "^0.4.65",
     "sortablejs": "^1.15.6",
-    "@types/sortablejs": "^1.15.8",
+    "@types/sortablejs": "^1.15.9",
     "nanoid": "^5.1.6",
-    "@ithinkdt/common": "^4.0.0-40"
+    "@ithinkdt/common": "^4.0.0-400"
   },
   "peerDependencies": {
     "@ithinkdt/page": ">=4.0",
@@ -83,13 +83,13 @@
   },
   "devDependencies": {
     "@vitejs/plugin-vue-jsx": "^5.1.1",
-    "ithinkdt-ui": "^1.8.0",
+    "ithinkdt-ui": "^1.8.1",
     "typescript": "~5.9.3",
-    "unocss": ">=66.5.4",
-    "vite": "npm:rolldown-vite@^7.1.19",
-    "vue": "^3.5.22",
+    "unocss": ">=66.5.6",
+    "vite": "npm:rolldown-vite@^7.2.5",
+    "vue": "^3.5.24",
     "vue-router": "^4.6.3",
-    "@ithinkdt/page": "^4.0.0-40"
+    "@ithinkdt/page": "^4.0.0-400"
   },
   "scripts": {
     "dev": "vite build --watch",

package/unocss-preset.d.ts

@@ -0,0 +1,5 @@
+import { Preset, PresetWind4Theme } from 'unocss'
+
+declare const ithinkdt: (options?: { namespace?: string | undefined }) => Preset<PresetWind4Theme>[]
+
+export default ithinkdt

package/unocss-preset.js

@@ -0,0 +1,163 @@
+import { presetWind4, transformerDirectives, transformerVariantGroup } from 'unocss'
+
+const ithinkdt = (options = {}) => {
+    const { namespace: ns } = options
+
+    let wind4, postprocess
+    if (ns) {
+        wind4 = () => {
+            const plugin = presetWind4({
+                variablePrefix: `${ns}-`,
+                preflights: {
+                    reset: false,
+                    property: {
+                        selector: `.${ns} :where(*, ::before, ::after)`,
+                    },
+                },
+            })
+
+            return {
+                ...plugin,
+                preflights: plugin.preflights?.map((preflight) => {
+                    if (preflight.layer === 'theme') {
+                        return {
+                            ...preflight,
+                            async getCSS(ctx) {
+                                let result = await preflight.getCSS?.(ctx)
+                                if (result) {
+                                    result = result.replace(':root, :host', `.${ns}`)
+                                }
+                                return result
+                            },
+                        }
+                    } else if (preflight.layer === 'properties') {
+                        return {
+                            ...preflight,
+                            async getCSS(ctx) {
+                                let result = await preflight.getCSS?.(ctx)
+                                if (result) {
+                                    result = result
+                                        .replaceAll('--un-', `--${ns}-`)
+                                }
+                                return result
+                            },
+                        }
+                    }
+                    return preflight
+                }),
+            }
+        }
+        postprocess = [
+            (p) => {
+                if (p.selector.includes('--un-')) {
+                    p.selector = p.selector.replaceAll('--un-', `--${ns}-`)
+                } else if (p.selector.endsWith(String.raw`.\-`)) {
+                    if (p.selector.startsWith('.dark ')) {
+                        p.selector = `.dark & ${p.selector.slice(6)}`
+                    }
+                } else {
+                    p.selector = p.selector.startsWith('.dark ') ? `.dark .${ns} ${p.selector.slice(6)}` : `.${ns} ${p.selector}`
+                }
+            },
+        ]
+    } else { wind4 = presetWind4 }
+
+    const alphas = [50, 100, 200, 300, 400, 500, 600, 700, 800, 900, 950]
+    const ithinkdt = {
+        name: 'preset-ithinkdt',
+        options,
+        theme: {
+            colors: {
+                ...Object.fromEntries(
+                    ['primary', 'success', 'warning', 'danger'].map(name => [
+                        name,
+                        {
+                            DEFAULT: `var(--color-${name})`,
+                            ...Object.fromEntries(alphas.map(alpha => [`${alpha}`, `color-mix(in oklab, var(--color-${name}) ${alpha / 10}%, #fff ${(1000 - alpha) / 10}%)`])),
+                            ...Object.fromEntries(
+                                ['hover', 'active'].flatMap(level => [
+                                    [level, `var(--color-${name}-${level})`],
+                                    ...alphas.map(alpha => [`${level}-${alpha}`, `color-mix(in oklab, var(--color-${name}-${level}) ${alpha / 10}%, #fff ${(1000 - alpha) / 10}%)`]),
+                                ]),
+                            ),
+                        },
+                    ]),
+                ),
+                text: {
+                    DEFAULT: `var(--color-text)`,
+                    ...Object.fromEntries(alphas.map(alpha => [`${alpha}`, `color-mix(in oklab, var(--color-text) ${alpha / 10}%, #fff ${(1000 - alpha) / 10}%)`])),
+                },
+                base: { DEFAULT: `var(--color-base)` },
+            },
+            radius: Object.fromEntries(
+                ['xs', 'sm', 'md', 'lg'].map(size => [size, `var(--rounded-${size})`]),
+            ),
+        },
+        variants: [
+            // stuck:
+            (matcher) => {
+                const array = ['top', 'right', 'bottom', 'left']
+                const index = array.findIndex(it => matcher.startsWith(`stuck-${it}:`))
+                if (index === -1)
+                    return matcher
+                return {
+                    matcher: matcher.slice(7 + array[index].length),
+                    handle: (input, next) => next({
+                        ...input,
+                        parent: `${input.parent ? `${input.parent} $$ ` : ''} @container scroll-state(stuck: ${array[index]})`,
+                    }),
+                }
+            },
+        ],
+        rules: [
+            ['scroll-state', { 'container-type': 'scroll-state' }],
+            [
+                /^bg-img-(.*)$/,
+                ([_, r]) => {
+                    return {
+                        'background-image': r[0] === '[' && r.at(-1) === ']' ? r.slice(1, -1) : r,
+                    }
+                },
+            ],
+            [
+                /^mask-(.*)$/,
+                ([_, r]) => {
+                    const mask = `var(--un-icon) no-repeat`
+                    return {
+                        '--un-icon': r[0] === '[' && r.at(-1) === ']' ? r.slice(1, -1) : r,
+                        mask,
+                        'mask-size': '100% 100%',
+                    }
+                },
+            ],
+        ],
+        shortcuts: [
+            [
+                /^card-(.*)$/,
+                ([_, size]) => {
+                    const i = ['none', 'sm', 'md', 'lg'].indexOf(size)
+                    if (i === -1) return
+                    const p = [0, 2, 4, 5][i]
+                    return `rounded-${size} px-${p + 1} py-${p} bg-white dark:bg-dark ease-in-out transition-shadow 
+                       hover:shadow-[0_1px_2px_0_rgba(0_0_0_/_0.03),0_1px_6px_-1px_rgba(0_0_0_/_0.02),0_2px_4px_0_rgba(0_0_0_/_0.02)]`
+                },
+                { autocomplete: ['card-none', 'card-sm', 'card-md', 'card-lg'] },
+            ],
+            {
+                'ell': 'truncate',
+                'ell-2': 'line-clamp-2',
+                'ell-3': 'line-clamp-3',
+                'flex-center': 'flex justify-center items-center',
+                'card': `card-md`,
+            },
+        ],
+        transformers: [transformerDirectives(), transformerVariantGroup()],
+        postprocess: postprocess,
+    }
+    return [
+        wind4(),
+        ithinkdt,
+    ]
+}
+
+export default ithinkdt

package/unocss.d.ts

@@ -1,5 +0,0 @@
-import { PresetFactory, PresetUnoTheme } from 'unocss'
-
-declare const ithinkdt: PresetFactory<PresetUnoTheme, {}>
-
-export default ithinkdt

package/unocss.js

@@ -1,94 +0,0 @@
-const ithinkdt = () => {
-    return {
-        name: 'preset-ithinkdt',
-        theme: {
-            colors: {
-                ...Object.fromEntries(
-                    ['primary', 'success', 'warning', 'danger'].map(name => [
-                        name,
-                        {
-                            DEFAULT: `rgb(var(--color-${name}-rgb) / <alpha-value>)`,
-                            ...Object.fromEntries(
-                                ['hover', 'active'].map(level => [
-                                    level,
-                                    `rgb(var(--color-${name}-${level}-rgb) / <alpha-value>)`,
-                                ]),
-                            ),
-                        },
-                    ]),
-                ),
-                text: {
-                    DEFAULT: `rgb(var(--color-text-rgb))`,
-                },
-                base: {
-                    DEFAULT: `rgb(var(--color-base-rgb))`,
-                },
-            },
-            borderRadius: Object.fromEntries(
-                ['tiny', 'small', 'medium', 'large'].map(size => [size, `var(--rounded-${size})`]),
-            ),
-        },
-        variants: [
-            // stuck:
-            (matcher) => {
-                const array = ['top', 'right', 'bottom', 'left']
-                const index = array.findIndex(it => matcher.startsWith(`stuck-${it}:`))
-                if (index === -1)
-                    return matcher
-                return {
-                    matcher: matcher.slice(7 + array[index].length),
-                    handle: (input, next) => next({
-                        ...input,
-                        parent: `${input.parent ? `${input.parent} $$ ` : ''} @container scroll-state(stuck: ${array[index]})`,
-                    }),
-                }
-            },
-        ],
-        rules: [
-            ['scroll-state', { 'container-type': 'scroll-state' }],
-            [
-                /^bg-img-(.*)$/,
-                ([_, r]) => {
-                    return {
-                        'background-image': r[0] === '[' && r.at(-1) === ']' ? r.slice(1, -1) : r,
-                    }
-                },
-            ],
-            [
-                /^mask-(.*)$/,
-                ([_, r]) => {
-                    const mask = `var(--un-icon) no-repeat`
-                    return {
-                        '--un-icon': r[0] === '[' && r.at(-1) === ']' ? r.slice(1, -1) : r,
-                        mask,
-                        'mask-size': '100% 100%',
-                    }
-                },
-            ],
-        ],
-        shortcuts: [
-            [
-                /^card-(.*)$/,
-                ([_, size]) => {
-                    const i = ['none', 'small', 'medium', 'large'].indexOf(size)
-                    if (i === -1) return
-                    const p = [0, 2, 4, 5][i]
-                    return `rounded-${size} px-${p + 1} py-${p} bg-white dark:bg-dark ease-in-out transition-shadow 
-                       hover:shadow-[0_1px_2px_0_rgba(0_0_0_/_0.03),0_1px_6px_-1px_rgba(0_0_0_/_0.02),0_2px_4px_0_rgba(0_0_0_/_0.02)]`
-                },
-                { autocomplete: ['card-none', 'card-small', 'card-medium', 'card-large'] },
-            ],
-            {
-                'ell': 'truncate',
-                'ell-2': 'line-clamp-2',
-                'ell-3': 'line-clamp-3',
-                'flex-x-center': 'flex items-center',
-                'flex-y-center': 'flex justify-center',
-                'flex-center': 'flex justify-center items-center',
-                'card': `card-medium`,
-            },
-        ],
-    }
-}
-
-export default ithinkdt