@ithinkdt/page 4.0.21 → 4.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ithinkdt/page",
-  "version": "4.0.21",
+  "version": "4.1.0",
   "type": "module",
   "license": "MIT",
   "description": "iThinkDT Page",
@@ -41,17 +41,17 @@
   "dependencies": {
     "@vueuse/core": "^14.3.0",
     "nanoid": "^5.1.11",
-    "@ithinkdt/common": "^4.0.9"
+    "@ithinkdt/common": "^4.1.0"
   },
   "peerDependencies": {
     "vue": ">=3.5",
-    "vue-router": ">=4.5"
+    "vue-router": ">=5.1"
   },
   "devDependencies": {
     "typescript": "~6.0.3",
-    "vite": "^8.0.14",
-    "vue": "^3.5.34",
-    "vue-router": "^5.0.7"
+    "vite": "^8.0.16",
+    "vue": "^3.5.38",
+    "vue-router": "^5.1.0"
   },
   "scripts": {
     "release": "pnpm publish --no-git-checks"

package/src/crud.js

@@ -129,8 +129,7 @@ function _useSimpleCrudModal(crudType, getItems, request, options) {
             }
             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/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, watch } from 'vue'
+import { computed, effectScope, h, hasInjectionContext, inject, reactive, readonly, ref, shallowReactive, shallowRef, toRaw, unref } from 'vue'
 import { useRoute } from 'vue-router'
 
 import { copy, isNone } from '@ithinkdt/common/object'
@@ -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) {

package/src/list.js

@@ -91,8 +91,8 @@ export function useListPageCustomization({
     const filterStorage = new CustomStorage('filter-form', storage, key, 'default', { onSet })
     const tableStorage = new CustomStorage('table-column', storage, key, 'default', { onSet })
     tryOnScopeDispose(() => {
-        filterStorage.$event.clear()
-        tableStorage.$event.clear()
+        filterStorage.$change.clear()
+        tableStorage.$change.clear()
     })
 
     let laskKey = 'default'
@@ -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'] } = {}) {