@ithinkdt/page 4.0.22 → 4.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ithinkdt/page",
-  "version": "4.0.22",
+  "version": "4.1.1",
   "type": "module",
   "license": "MIT",
   "description": "iThinkDT Page",
@@ -40,17 +40,17 @@
   "sideEffects": false,
   "dependencies": {
     "@vueuse/core": "^14.3.0",
-    "nanoid": "^5.1.11",
-    "@ithinkdt/common": "^4.0.10"
+    "nanoid": "^5.1.15",
+    "@ithinkdt/common": "^4.1.1"
   },
   "peerDependencies": {
     "vue": ">=3.5",
-    "vue-router": ">=4.5"
+    "vue-router": ">=5.1"
   },
   "devDependencies": {
     "typescript": "~6.0.3",
     "vite": "^8.0.16",
-    "vue": "^3.5.35",
+    "vue": "^3.5.38",
     "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,14 +120,14 @@ function _useSimpleCrudModal(crudType, getItems, request, options) {
                 initial
                     .then((res) => {
                         model.value = res
+                        modal.reset(res)
                     }).finally(() => {
                         loading.value = false
                     })
             }
             setModalType(crudType)
             const $open = modal.open(model.value, title)
-            if (crudType == 'view') return
-            return $open
+            if (crudType !== 'view') return $open
         },
     }
 }

package/src/data-source.js

@@ -142,7 +142,7 @@ export function useDs(fetch, options = {}) {
         if (
             pagination === true
             && getOriData().length > 0
-            && !['filter', 'sortField', 'sortOrder'].some(it => it in params2)
+            && ['filter', 'sortField', 'sortOrder'].every(it => !(it in params2))
         ) {
             Object.assign(params, params2)
             await nextTick()

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)

package/src/form.d.ts

@@ -255,6 +255,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

@@ -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)
@@ -131,23 +131,22 @@ export function useFormHelper(items, { initial: initial0, rules, onChange, inFil
             }
 
             return [invalid.value, _mergeValidation(result, result2 ?? {})]
-        } else {
-            restoreValidation(prop)
-            const it = items0.value.find(it => it.name === prop && unref(it.hidden) != true)
-            const result = { errors: [], warnings: [] }
-            await Promise.allSettled(
-                rules[it.__key]
-                    ?.map(r => r.validator(r, model[prop])
-                        .then((ret) => {
-                            if (ret) {
-                                result[r.level === 'warning' ? 'warnings' : 'errors'].push(ret)
-                            }
-                        }),
-                    ) ?? [],
-            )
-
-            return [_checkInvalid(result.errors), result]
         }
+        restoreValidation(prop)
+        const it = items0.value.find(it => it.name === prop && unref(it.hidden) != true)
+        const result = { errors: [], warnings: [] }
+        await Promise.allSettled(
+            rules[it.__key]
+                ?.map(r => r.validator(r, model[prop])
+                    .then((ret) => {
+                        if (ret) {
+                            result[r.level === 'warning' ? 'warnings' : 'errors'].push(ret)
+                        }
+                    }),
+                ) ?? [],
+        )
+
+        return [_checkInvalid(result.errors), result]
     }
     const restoreValidation = (props) => {
         if (!props) {
@@ -191,20 +190,19 @@ export function useFormHelper(items, { initial: initial0, rules, onChange, inFil
                 ),
             )
             return [invalid.value, result]
-        } else {
-            const it = items0.value.find(it => it.name === prop && unref(it.hidden) != true)
-            const result = { errors: [], warnings: [] }
-            await Promise.resolve(
-                it.beforeSubmit?.(model[prop], model))
-                .then((ret) => {
-                    if (typeof ret === 'string') {
-                        validation[prop].errors.push(ret)
-                        result.errors.push(ret)
-                    }
-                })
-
-            return [_checkInvalid(result.errors), result]
         }
+        const it = items0.value.find(it => it.name === prop && unref(it.hidden) != true)
+        const result = { errors: [], warnings: [] }
+        await Promise.resolve(
+            it.beforeSubmit?.(model[prop], model))
+            .then((ret) => {
+                if (typeof ret !== 'string') return
+
+                validation[prop].errors.push(ret)
+                result.errors.push(ret)
+            })
+
+        return [_checkInvalid(result.errors), result]
     }
 
     const returns = {
@@ -277,7 +275,7 @@ export function useFormHelper(items, { initial: initial0, rules, onChange, inFil
             }
 
             const rule = item.rule ? [item.rule].flat() : []
-            if (item.required && !rule.some(r => isRequiredRule(r))) {
+            if (item.required && rule.every(r => !isRequiredRule(r))) {
                 rule.push(required(() => t('common.page.form.validate.requiredMessage'), { required: item.required }))
             }
             if (rule.length > 0) {
@@ -441,9 +439,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()
     }
 
@@ -600,6 +596,7 @@ export function useFormModal({ initial, items, rules, onSubmit, submitText, canc
         ...modal,
         open,
         reinit: form.reinit,
+        reset: form.reset,
     })
     return returns
 }

package/src/list.js

@@ -161,7 +161,7 @@ export function useListPageCustomization({
     })
 
     function removeProfile(key) {
-        const removeProfile = config.value.profiles.find(profile => profile.key === key)
+        const removeProfile = config.value.profiles.some(profile => profile.key === key)
 
         let newProfiles = config.value.profiles
         if (removeProfile) {

package/src/plugin.js

@@ -27,7 +27,7 @@ export function plugin(app, options) {
     pageInjection = { keyField: 'key', ...options }
     app.provide(PAGE_INJECTION, pageInjection)
 
-    globalThis.addEventListener('unhandledrejection', (ev) => {
+    addEventListener('unhandledrejection', (ev) => {
         if (!ev?.reason) return
         if (ev.reason instanceof IgnoreRejectionError) {
             ev.preventDefault()

package/src/rules.js

@@ -61,8 +61,8 @@ export const plateNo = (message, options) =>
         message,
         options,
     )
-export const noChinese = (message, options) => pattern(/^[^\u4E00-\u9FA5]+$/, message, options)
-export const chinese = (message, options) => pattern(/^[\u4E00-\u9FA5]+$/, 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 function required(message, { required = true, trigger = ['input', 'blur', 'change'] } = {}) {

package/src/table.js

@@ -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)
@@ -360,9 +360,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()
     }