@ithinkdt/page 4.1.0 → 4.2.0-0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ithinkdt/page",
-  "version": "4.1.0",
+  "version": "4.2.0-0",
   "type": "module",
   "license": "MIT",
   "description": "iThinkDT Page",
@@ -40,8 +40,8 @@
   "sideEffects": false,
   "dependencies": {
     "@vueuse/core": "^14.3.0",
-    "nanoid": "^5.1.11",
-    "@ithinkdt/common": "^4.1.0"
+    "nanoid": "^5.1.16",
+    "@ithinkdt/common": "~4.2.0-0"
   },
   "peerDependencies": {
     "vue": ">=3.5",
@@ -49,8 +49,8 @@
   },
   "devDependencies": {
     "typescript": "~6.0.3",
-    "vite": "^8.0.16",
-    "vue": "^3.5.38",
+    "vite": "^8.1.4",
+    "vue": "^3.5.39",
     "vue-router": "^5.1.0"
   },
   "scripts": {

package/src/crud.js

@@ -70,10 +70,7 @@ function _useSimpleCrudModal(crudType, getItems, request, options) {
     const setModalType = (crudType) => {
         let type = options.modalType
         if (typeof type === 'function') {
-            type = type({
-                model: model.value,
-                type: crudType,
-            })
+            type = type(crudType)
         } else if (isRef(type)) {
             type = type.value
         }
@@ -123,6 +120,7 @@ function _useSimpleCrudModal(crudType, getItems, request, options) {
                 initial
                     .then((res) => {
                         model.value = res
+                        modal.reset(res)
                     }).finally(() => {
                         loading.value = false
                     })

package/src/data-source.js

@@ -1,4 +1,5 @@
 import { promiseTimeout, until, useAsyncState } from '@vueuse/core'
+import { nanoid } from 'nanoid'
 import { computed, hasInjectionContext, inject, nextTick, reactive, ref, shallowReactive, shallowRef, toRaw, watch } from 'vue'
 
 import { PAGE_INJECTION, pageInjection } from './plugin'
@@ -24,19 +25,17 @@ export function useDs(fetch, options = {}) {
         options,
     )
 
-    let lastReject
+    let lastId
     const { state, isLoading: loading, error, execute } = useAsyncState(
         async (...params) => {
-            if (lastReject) {
-                lastReject()
-            }
-            const { promise, resolve, reject } = Promise.withResolvers()
-            lastReject = reject
+            const currentId = lastId = nanoid()
+            const { promise, resolve } = Promise.withResolvers()
             let [res] = await Promise.all([
                 Promise.resolve(fetch(...params))
                     .finally (() => {
-                        resolve()
-                        lastReject = undefined
+                        if (currentId === lastId) {
+                            resolve()
+                        }
                     }),
                 promiseTimeout(200),
                 promise,

package/src/description.js

@@ -56,10 +56,10 @@ export function useDescriptionsHelper(
 
                 const bindings = { }
                 for (const k of Object.keys(options ?? {})) {
-                    if (k.length > render.length && k.startsWith(render)) {
-                        bindings[uncapitalize(k.slice(render.length))] = options[k]
-                        delete options[k]
-                    }
+                    if (!(k.length > render.length && k.startsWith(render))) continue
+
+                    bindings[uncapitalize(k.slice(render.length))] = options[k]
+                    delete options[k]
                 }
                 const bindings0 = computed(() => {
                     return Object.fromEntries(Object.entries(bindings)
@@ -114,7 +114,6 @@ export function useDescriptionsHelper(
         scope = effectScope()
         items0.length = 0
         scope.run(() => {
-            // eslint-disable-next-line unicorn/no-array-callback-reference
             items0.push(...items({ it, group, model }).filter(Boolean).map(reactive))
         })
     }

package/src/form.d.ts

@@ -198,6 +198,14 @@ export interface FilterHelper<Model extends {}> extends FormHelper<Model> {
     }): void
     custom(this: void, sort: string[]): void
     custom(this: void, reset: true): void
+    custom(this: void, batchs: Array<
+        | true
+        | string[]
+        | {
+            key: string
+            hidden?: boolean | undefined
+        }>
+    ): void
 }
 
 export declare function useFilterHelper<Model extends {}>(
@@ -255,6 +263,7 @@ export type FormModalOptions<Model extends {}> = FormModalOptionsBase & FormHelp
 export interface FormModal<Model extends {}> extends Omit<ModalReturns, 'open'> {
     open(this: void, model: MaybePromise<Model>, title?: VNodeChild | (() => VNodeChild)): PromiseLike<Model>
     reinit(this: void): void
+    reset(this: void, initial?: Partial<Model>, overwrite?: boolean, reinit?: boolean): Partial<Model>
 }
 export declare function useFormModal<Model extends {}>(options: FormModalOptions<Model>):
     FormModal<Model>

package/src/form.js

@@ -1,6 +1,6 @@
 import { StorageSerializers, toReactive, tryOnScopeDispose, useEventListener, useStorage } from '@vueuse/core'
 import { nanoid } from 'nanoid'
-import { computed, effectScope, h, hasInjectionContext, inject, reactive, readonly, ref, shallowReactive, shallowRef, toRaw, unref } from 'vue'
+import { computed, effectScope, h, hasInjectionContext, inject, nextTick, reactive, readonly, ref, shallowReactive, shallowRef, toRaw, unref } from 'vue'
 import { useRoute } from 'vue-router'
 
 import { copy, isNone } from '@ithinkdt/common/object'
@@ -61,10 +61,10 @@ export function useFormHelper(items, { initial: initial0, rules, onChange, inFil
                 }
                 const bindings = {}
                 for (const k of Object.keys(options)) {
-                    if (k.length > render.length && k.startsWith(render)) {
-                        bindings[uncapitalize(k.slice(render.length))] = options[k]
-                        delete options[k]
-                    }
+                    if (!(k.length > render.length && k.startsWith(render))) continue
+
+                    bindings[uncapitalize(k.slice(render.length))] = options[k]
+                    delete options[k]
                 }
                 const bindings0 = computed(() => {
                     return Object.fromEntries(Object.entries(bindings)
@@ -342,25 +342,35 @@ export function useFilterHelper(items, { customizable = false, cached, cacheVers
     })
 
     const items1 = shallowReactive([])
-
-    const custom = (params) => {
+    const _custom = (params, customs) => {
         if (typeof params === 'boolean') {
-            if (params) setCustoms(getDefaultCustom())
+            if (params) customs = getDefaultCustom()
         } else if (Array.isArray(params)) {
-            customs.value.sort = JSON.stringify(params) === JSON.stringify(returns.items.map(col => col.name))
+            customs.sort = JSON.stringify(params) === JSON.stringify(returns.items.map(col => col.name))
                 ? []
                 : params
-            setCustoms()
         } else {
-            customs.value.hidden[params.key] = 'hidden' in params ? params.hidden : customs.value.hidden[params.key]
-            if (!customs.value.hidden[params.key]) {
-                delete customs.value.hidden[params.key]
+            customs.hidden[params.key] = 'hidden' in params ? params.hidden : customs.hidden[params.key]
+            const item = returns.items.find(item => item.name === params.key)
+            if (item && customs.hidden[params.key] === item.hidden) {
+                delete customs.hidden[params.key]
             }
             if (params.hidden) {
                 returns.model[params.key] = undefined
             }
-            setCustoms()
         }
+        return customs
+    }
+    const custom = (params) => {
+        if (!Array.isArray(params) || typeof params[0] === 'string') {
+            params = [params]
+        }
+        let customs0 = customs.value
+        for (const params0 of params) {
+            customs0 = _custom(params0, customs0)
+        }
+        setCustoms(customs0)
+
         const _items = returns.items
             .map((item, i, arr) => {
                 const index = customs.value.sort.indexOf(item.name)
@@ -425,7 +435,7 @@ export function useFilterHelper(items, { customizable = false, cached, cacheVers
         } else {
             useEventListener(globalThis, 'storage', (event) => {
                 if (event.key !== key) return
-                Promise.resolve().then(() => read(event.newValue)).then(reinit)
+                nextTick().then(() => read(event.newValue)).then(reinit)
             }, { passive: true })
         }
 
@@ -439,9 +449,7 @@ export function useFilterHelper(items, { customizable = false, cached, cacheVers
             const raw = StorageSerializers.object.write([sort, hidden])
             return storage.setItem(key, raw)
         }
-    }
-
-    if (!customizable) {
+    } else {
         reinit()
     }
 
@@ -598,6 +606,7 @@ export function useFormModal({ initial, items, rules, onSubmit, submitText, canc
         ...modal,
         open,
         reinit: form.reinit,
+        reset: form.reset,
     })
     return returns
 }

package/src/modal.js

@@ -12,7 +12,7 @@ export const ModalProvider = defineComponent({
     },
 })
 
-const ModalInjectionKey = Symbol('modal')
+const ModalInjectionKey = Symbol('__MODAL__')
 
 export function useModal({ content, confirmText, confirmLoading, cancelText, cancelLoading, footer, onConfirm, onCancel, onClose, title, ...options }) {
     const { i18n: useI18n, getModalRenderer, addModal } = (hasInjectionContext() ? inject(PAGE_INJECTION, pageInjection) : pageInjection) ?? {}

package/src/plugin.js

@@ -1,6 +1,6 @@
 import { defineComponent, onErrorCaptured, renderSlot, shallowRef } from 'vue'
 
-export const PAGE_INJECTION = Symbol('page')
+export const PAGE_INJECTION = Symbol('__PAGE__')
 
 export class IgnoreRejectionError extends Error {}
 

package/src/rules.js

@@ -64,7 +64,7 @@ export const plateNo = (message, options) =>
 export const noChinese = (message, options) => pattern(/^[^\u{4E00}-\u{9FA5}]+$/u, message, options)
 export const chinese = (message, options) => pattern(/^[\u{4E00}-\u{9FA5}]+$/u, message, options)
 
-export const requiredRuleSymbol = Symbol('rule:required')
+export const requiredRuleSymbol = Symbol('__RULE_REQUIRED__')
 export function required(message, { required = true, trigger = ['input', 'blur', 'change'] } = {}) {
     return {
         [requiredRuleSymbol]: true,

package/src/table.d.ts

@@ -189,6 +189,17 @@ export interface TableHelper<Model extends {}> {
     }): void
     custom(this: void, sort: string[]): void
     custom(this: void, reset: true): void
+    custom(this: void, batchs: Array<
+        | true
+        | string[]
+        | {
+            key: string
+            hidden?: boolean | undefined
+            fixed?: false | 'left' | 'right' | undefined
+            width?: number | string | undefined
+        }>
+    ): void
+
     dataMode: Ref<'all' | 'selection'>
     reinit(this: void): void
 }

package/src/table.js

@@ -1,6 +1,6 @@
 import { StorageSerializers, tryOnScopeDispose, useEventListener } from '@vueuse/core'
 import { nanoid } from 'nanoid'
-import { computed, effectScope, hasInjectionContext, inject, reactive, ref, shallowReactive, shallowRef, toValue, unref } from 'vue'
+import { computed, effectScope, hasInjectionContext, inject, nextTick, reactive, ref, shallowReactive, shallowRef, toValue, unref } from 'vue'
 import { useRoute } from 'vue-router'
 
 import { isNone } from '@ithinkdt/common/object'
@@ -54,10 +54,10 @@ export function useTableHelper(columns, { customizable, actions, actionWidth, ac
                 }
                 const bindings = {}
                 for (const k of Object.keys(options)) {
-                    if (k.length > render.length && k.startsWith(render)) {
-                        bindings[uncapitalize(k.slice(render.length))] = options[k]
-                        delete options[k]
-                    }
+                    if (!(k.length > render.length && k.startsWith(render))) continue
+
+                    bindings[uncapitalize(k.slice(render.length))] = options[k]
+                    delete options[k]
                 }
                 const bindings0 = computed(() => {
                     return Object.fromEntries(Object.entries(bindings)
@@ -124,29 +124,43 @@ export function useTableHelper(columns, { customizable, actions, actionWidth, ac
     const columns0 = shallowRef([])
     const columns1 = shallowReactive([])
 
-    const custom = (params) => {
+    const _custom = (params, customs) => {
         if (typeof params === 'boolean') {
-            if (params) setCustoms(getDefaultCustom())
+            if (params) customs = getDefaultCustom()
         } else if (Array.isArray(params)) {
-            customs.value.sort = JSON.stringify(params) === JSON.stringify(columns0.value.map(col => col.key))
+            customs.sort = JSON.stringify(params) === JSON.stringify(columns0.value.map(col => col.key))
                 ? []
                 : params
-            setCustoms()
         } else {
-            customs.value.hidden[params.key] = 'hidden' in params ? params.hidden : customs.value.hidden[params.key]
-            customs.value.fixed[params.key] = 'fixed' in params ? params.fixed : customs.value.fixed[params.key]
-            customs.value.width[params.key] = 'width' in params ? params.width : customs.value.width[params.key]
-            if (!customs.value.hidden[params.key]) {
-                delete customs.value.hidden[params.key]
-            }
-            if (!customs.value.fixed[params.key]) {
-                delete customs.value.fixed[params.key]
-            }
-            if (!customs.value.width[params.key]) {
-                delete customs.value.width[params.key]
+            customs.hidden[params.key] = 'hidden' in params ? params.hidden : customs.hidden[params.key]
+            customs.fixed[params.key] = 'fixed' in params ? params.fixed : customs.fixed[params.key]
+            customs.width[params.key] = 'width' in params ? params.width : customs.width[params.key]
+            const col = columns0.value.find(col => col.key === params.key)
+            if (col) {
+                if (customs.hidden[params.key] === col.hidden) {
+                    delete customs.hidden[params.key]
+                }
+                if (customs.fixed[params.key] === col.fixed) {
+                    delete customs.fixed[params.key]
+                }
+                if (customs.width[params.key] === col.width) {
+                    delete customs.width[params.key]
+                }
             }
-            setCustoms()
         }
+        return customs
+    }
+
+    const custom = (params) => {
+        if (!Array.isArray(params) || typeof params[0] === 'string') {
+            params = [params]
+        }
+        let customs0 = customs.value
+        for (const params0 of params) {
+            customs0 = _custom(params0, customs0)
+        }
+        setCustoms(customs0)
+
         const columns2 = columns0.value.map((col, i, arr) => {
             const index = customs.value.sort.indexOf(col.key)
             return reactive({
@@ -344,7 +358,7 @@ export function useTableHelper(columns, { customizable, actions, actionWidth, ac
         } else {
             useEventListener(globalThis, 'storage', (event) => {
                 if (event.key !== key) return
-                Promise.resolve().then(() => read(event.newValue)).then(reinit)
+                nextTick().then(() => read(event.newValue)).then(reinit)
             }, { passive: true })
         }
 
@@ -360,9 +374,7 @@ export function useTableHelper(columns, { customizable, actions, actionWidth, ac
             const raw = StorageSerializers.object.write([sort, hidden, fixed, width])
             return storage.setItem(key, raw)
         }
-    }
-
-    if (!customizable) {
+    } else {
         reinit()
     }