@ithinkdt/ui 4.0.0-12 → 4.0.0-121

package/{src → esm}/page.d.ts

@@ -1,44 +1,46 @@
 import {
-    CheckboxProps, DatePickerProps, DatePickerSlots,
+    CheckboxProps,
+    DatePickerProps, DatePickerSlots,
     DrawerContentProps, DrawerProps,
     InputNumberProps, InputNumberSlots, InputProps, InputSlots,
     ModalOptions,
     SelectGroupOption, SelectOption, SelectProps, SelectSlots,
-    UploadFileInfo,
+    UploadFileInfo, UploadProps,
 } from 'ithinkdt-ui'
-import { MaybeRef, VNode, VNodeProps } from 'vue'
+import { MaybeRef, VNode } from 'vue'
 
+import { PublicProps } from '@ithinkdt/common'
 import { DictItem, DictTypeKey } from '@ithinkdt/common/dict'
 import { PageOptions } from '@ithinkdt/page'
 
 import { CheckboxesProps, RadiosProps, UserDeptProps, UserGroupOption } from './components'
 
-type DeepMaybeRef<T extends {}> = {
+type ShallowMaybeRef<T extends {}> = {
     [Key in (keyof T)]: MaybeRef<T[Key]>
 }
 
 declare module '@ithinkdt/page' {
     interface FormComponentPresets {
         input: {
-            props?: DeepMaybeRef<Omit<InputProps, 'value' | 'onUpdate:value' | 'disabled'>> & VNodeProps
-            slots?: InputSlots
+            inputProps?: ShallowMaybeRef<Omit<InputProps, 'value' | 'onUpdate:value' | 'disabled'>> & PublicProps
+            inputSlots?: InputSlots
         }
         number: {
-            props?: DeepMaybeRef<Omit<InputNumberProps, 'value' | 'onUpdate:value' | 'disabled'>> & VNodeProps
-            slots?: InputNumberSlots
+            numberProps?: ShallowMaybeRef<Omit<InputNumberProps, 'value' | 'onUpdate:value' | 'disabled'>> & PublicProps
+            numberSlots?: InputNumberSlots
         }
         select: {
-            props?: DeepMaybeRef<Omit<SelectProps, 'options' | 'value' | 'onUpdate:value' | 'disabled'> & VNodeProps
+            selectProps?: ShallowMaybeRef<Omit<SelectProps, 'options' | 'value' | 'onUpdate:value' | 'disabled'> & PublicProps
             & {
                 dictType?: DictTypeKey | undefined
                 options?: DictItem[] | (SelectOption | SelectGroupOption)[] | undefined
             }>
-            slots?: SelectSlots
+            selectSlots?: SelectSlots
         }
 
         checkbox: {
-            props?: DeepMaybeRef<Omit<CheckboxProps, 'checked' | 'onUpdate:checked' | 'disabled'>> & VNodeProps
-            slots?: {
+            checkboxProps?: ShallowMaybeRef<Omit<CheckboxProps, 'checked' | 'onUpdate:checked' | 'disabled'>> & PublicProps
+            checkboxSlots?: {
                 default?: (() => VNode[]) | undefined
                 checked?: (() => VNode[]) | undefined
                 unchecked?: (() => VNode[]) | undefined
@@ -46,45 +48,59 @@ declare module '@ithinkdt/page' {
         }
 
         checkboxes: {
-            props?: DeepMaybeRef<Omit<CheckboxesProps, 'disabled'> & VNodeProps
+            checkboxesProps?: ShallowMaybeRef<Omit<CheckboxesProps, 'disabled'> & PublicProps
             & {
                 dictType?: DictTypeKey | undefined
                 options?: DictItem[] | undefined
             }>
-            slots?: { }
+            checkboxesSlots?: { }
         }
 
         radios: {
-            props?: DeepMaybeRef<Omit<RadiosProps, 'disabled'> & VNodeProps
+            radiosProps?: ShallowMaybeRef<Omit<RadiosProps, 'disabled'> & PublicProps
             & {
                 dictType?: DictTypeKey | undefined
                 options?: DictItem[] | undefined
             }>
-            slots?: { }
+            radiosSlots?: { }
         }
 
         datepicker: {
-            props?: DeepMaybeRef<Omit<DatePickerProps, 'value' | 'onUpdate:value' | 'disabled'>> & VNodeProps
-            slots?: DatePickerSlots
+            datepickerProps?: ShallowMaybeRef<Omit<DatePickerProps, 'value' | 'onUpdate:value' | 'disabled'>> & PublicProps
+            datepickerSlots?: DatePickerSlots
         }
 
         file: {
-            props?: DeepMaybeRef<{
+            fileProps?: ShallowMaybeRef<{
                 type?: 'file' | 'image' | undefined
                 multiple?: boolean | undefined
                 max?: number | undefined
                 accept?: string | undefined
                 maxSize?: number | undefined
-            } & VNodeProps>
-            slots?: {
+                onBeforeUpload?: UploadProps['onBeforeUpload']
+            } & PublicProps>
+            fileSlots?: {
+                default?: (() => VNode[]) | undefined
+            }
+        }
+        upload: {
+            uploadProps?: ShallowMaybeRef<{
+                type?: 'file' | 'image' | undefined
+                multiple?: boolean | undefined
+                max?: number | undefined
+                accept?: string | undefined
+                maxSize?: number | undefined
+                onBeforeUpload?: UploadProps['onBeforeUpload']
+            } & PublicProps>
+            uploadSlots?: {
                 default?: (() => VNode[]) | undefined
             }
         }
 
         user: {
-            props?: DeepMaybeRef<Omit<UserDeptProps<boolean>, 'modelValue' | 'onUpdate:modelValue' | 'disabled'
-            | 'users' | 'groups' | 'depts' | 'getUsersByGroup' | 'getUsersByDept'>> & VNodeProps
-            slots?: {}
+            userProps?: ShallowMaybeRef<Omit<UserDeptProps<boolean>, 'modelValue' | 'onUpdate:modelValue' | 'disabled'
+            | 'users' | 'groups' | 'depts' | 'getUsersByGroup' | 'getUsersByDept'>> & PublicProps
+            userSlots?: {}
         }
     }
 
@@ -128,9 +144,9 @@ declare module '@ithinkdt/page' {
     }
 
     type ModalOptionsKey = 'type' | keyof import('@ithinkdt/page').ModalOptions
-    interface ModalDrawerOptions extends DeepMaybeRef<Omit<DrawerContentProps, ModalOptionsKey>>, DeepMaybeRef<Omit<DrawerProps, ModalOptionsKey>> { }
+    interface ModalDrawerOptions extends ShallowMaybeRef<Omit<DrawerContentProps, ModalOptionsKey>>, ShallowMaybeRef<Omit<DrawerProps, ModalOptionsKey>> { }
 
-    interface ModalDialogOptions extends DeepMaybeRef<Omit<ModalOptions, ModalOptionsKey>> {}
+    interface ModalDialogOptions extends ShallowMaybeRef<Omit<ModalOptions, ModalOptionsKey>> {}
 }
 
 export declare function createPageFormHelper(options?: {
@@ -142,6 +158,7 @@ export declare function createPageFormHelper(options?: {
     uploadFile?: (file: File, options?: {
         onProgress?: ((percent: number) => void) | undefined
     }) => Promise<string>
+    getFileInfos?: (files: string[]) => Promise<UploadFileInfo[]>
 }): PageOptions['getFormItemRenderer']
 export declare function createPageTableHelper(options?: {
     getUsersByUsername?: (usernames: string[]) => Promise<{ username: string, nickname: string }[]>

package/esm/page.js

@@ -0,0 +1 @@
+export * from '../dist/page.js'

package/esm/use-style.js

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

package/locale.d.ts

@@ -29,6 +29,7 @@ export interface UILocale {
     account: {
         logout: string
         changePwd: string
+        changeTenant: string
     }
     notification: {
         tip: (params: { count?: number | null }) => string
@@ -61,6 +62,9 @@ export interface UILocale {
             resetText: string
             cancelText: string
             selectFileText: string
+            validate: {
+                fileErrorMessage: string
+            }
         }
         filter: {
             submitText: string

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ithinkdt/ui",
-  "version": "4.0.0-12",
+  "version": "4.0.0-121",
   "type": "module",
   "license": "MIT",
   "description": "iThinkDT UI",
@@ -10,34 +10,35 @@
     "ui"
   ],
   "files": [
-    "src",
+    "dist",
+    "esm",
     "auto-imports.*",
     "locale.*",
-    "unocss.*"
+    "unocss*"
   ],
-  "main": "./src/index.js",
-  "module": "./src/index.js",
-  "types": "./src/index.d.ts",
+  "main": "./esm/index.js",
+  "module": "./esm/index.js",
+  "types": "./esm/index.d.ts",
   "exports": {
     ".": {
-      "types": "./src/index.d.ts",
-      "default": "./src/index.js"
+      "types": "./esm/index.d.ts",
+      "default": "./esm/index.js"
     },
     "./directives": {
-      "types": "./src/directives.d.ts",
-      "default": "./src/directives/index.js"
+      "types": "./esm/directives.d.ts",
+      "default": "./esm/directives.js"
     },
     "./components": {
-      "types": "./src/components.d.ts",
-      "default": "./src/components/index.js"
+      "types": "./esm/components.d.ts",
+      "default": "./esm/components.js"
     },
     "./use-style": {
-      "types": "./src/use-style.d.ts",
-      "default": "./src/use-style.js"
+      "types": "./esm/use-style.d.ts",
+      "default": "./esm/use-style.js"
     },
     "./page": {
-      "types": "./src/page.d.ts",
-      "default": "./src/page.jsx"
+      "types": "./esm/page.d.ts",
+      "default": "./esm/page.js"
     },
     "./package.json": {
       "default": "./package.json"
@@ -47,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": {
@@ -57,13 +58,13 @@
   },
   "sideEffects": false,
   "dependencies": {
-    "@vueuse/core": "^13.9.0",
+    "@vueuse/core": "^14.0.0",
     "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-11"
+    "@ithinkdt/common": "^4.0.0-101"
   },
   "peerDependencies": {
     "@ithinkdt/page": ">=4.0",
@@ -82,15 +83,17 @@
   },
   "devDependencies": {
     "@vitejs/plugin-vue-jsx": "^5.1.1",
-    "ithinkdt-ui": "^1.7.3",
+    "ithinkdt-ui": "^1.8.0",
     "typescript": "~5.9.3",
-    "unocss": ">=66.5.3",
-    "vite": "npm:rolldown-vite@^7.1.16",
-    "vue": "^3.5.22",
-    "vue-router": "^4.5.1",
-    "@ithinkdt/page": "^4.0.0-11"
+    "unocss": ">=66.5.5",
+    "vite": "npm:rolldown-vite@^7.2.3",
+    "vue": "^3.5.24",
+    "vue-router": "^4.6.3",
+    "@ithinkdt/page": "^4.0.0-100"
   },
   "scripts": {
-    "release": "pnpm publish --no-git-checks"
+    "dev": "vite build --watch",
+    "build": "vite build",
+    "release": "pnpm run build && pnpm publish --no-git-checks"
   }
 }

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/src/components/Checkboxes.jsx

@@ -1,128 +0,0 @@
-import { NCheckbox, NCheckboxGroup, NFlex } from 'ithinkdt-ui'
-import { computed, defineComponent, ref, watch } from 'vue'
-
-import { useI18n } from '../use-i18n.js'
-
-export const NCheckboxes = defineComponent({
-    name: 'Checkboxes',
-    inheritAttrs: false,
-    props: {
-        options: {
-            type: Array,
-            default: () => [],
-        },
-        vertical: {
-            type: Boolean,
-            default: false,
-        },
-        default: {
-            type: [Boolean, String, Object],
-            default: false,
-        },
-        gap: {
-            type: [Number, String, Array],
-            default: undefined,
-        },
-        value: {
-            type: Array,
-            default: undefined,
-        },
-        labelPadding: {
-            type: String,
-            default: undefined,
-        },
-        labelField: {
-            type: String,
-            default: 'label',
-        },
-        valueField: {
-            type: String,
-            default: 'value',
-        },
-        disabledField: {
-            type: String,
-            default: 'disabled',
-        },
-    },
-    emits: {
-        'update:value': () => true,
-    },
-
-    setup(props, { emit, attrs }) {
-        const { t } = useI18n()
-        const defaultLabel = computed(() => {
-            if (!props.default) return ''
-            if (props.default === true) return t('common.all')
-            if (typeof props.default === 'string') return props.default
-            return props.default?.[props.labelField] ?? t('common.all')
-        })
-        const checked = ref([])
-
-        watch(
-            () => props.value,
-            v => (checked.value = v),
-            { immediate: true },
-        )
-
-        const emitValue = (v) => {
-            emit('update:value', v)
-        }
-        const onAll = () => {
-            emitValue(
-                checked.value?.length === props.options.length ? [] : props.options.map(it => it[props.valueField]),
-            )
-        }
-        const indeterminate = computed(() => props.options.length > checked.value?.length && checked.value?.length > 0)
-
-        const style = computed(() => {
-            return {
-                '--n-label-padding': props.labelPadding,
-            }
-        })
-        return () => {
-            const group = (
-                <NCheckboxGroup {...attrs} value={checked.value} onUpdateValue={emitValue}>
-                    <NFlex
-                        size={props.gap ?? (props.vertical ? undefined : 'small')}
-                        vertical={props.vertical}
-                        style={!props.default && props.vertical ? { padding: '6px 0 0' } : {}}
-                    >
-                        {props.options?.map(op => (
-                            <NCheckbox
-                                value={op[props.valueField]}
-                                disabled={op[props.disabledField]}
-                                style={style.value}
-                            >
-                                {op[props.labelField]}
-                            </NCheckbox>
-                        ))}
-                    </NFlex>
-                </NCheckboxGroup>
-            )
-
-            return props.default
-                ? (
-                        <NFlex
-                            size={props.gap ?? (props.vertical ? undefined : 'small')}
-                            vertical={props.vertical}
-                            style={props.vertical ? { padding: '6px 0 0' } : {}}
-                        >
-                            <span>
-                                <NCheckbox
-                                    indeterminate={indeterminate.value}
-                                    checked={checked.value?.length > 0}
-                                    onUpdateChecked={onAll}
-                                    style={style.value}
-                                >
-                                    {defaultLabel.value}
-                                </NCheckbox>
-                            </span>
-                            {group}
-                        </NFlex>
-                    )
-                : (
-                        group
-                    )
-        }
-    },
-})