@ithinkdt/page 4.0.20 → 4.0.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ithinkdt/page",
-  "version": "4.0.20",
+  "version": "4.0.22",
   "type": "module",
   "license": "MIT",
   "description": "iThinkDT Page",
@@ -41,7 +41,7 @@
   "dependencies": {
     "@vueuse/core": "^14.3.0",
     "nanoid": "^5.1.11",
-    "@ithinkdt/common": "^4.0.9"
+    "@ithinkdt/common": "^4.0.10"
   },
   "peerDependencies": {
     "vue": ">=3.5",
@@ -49,9 +49,9 @@
   },
   "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.35",
+    "vue-router": "^5.1.0"
   },
   "scripts": {
     "release": "pnpm publish --no-git-checks"

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'

package/src/list.js

@@ -71,17 +71,17 @@ export function useListPageCustomization({
 
     const getDefaultName = (i, namePrefix = t('common.page.custom.profile')) => {
         const name = `${namePrefix}${i}`
-        if (config.value.profiles.some(profile => profile.name === name)) return getDefaultName(i + 1, namePrefix)
+        if (profiles.value.some(profile => profile.name === name)) return getDefaultName(i + 1, namePrefix)
         return name
     }
 
     const onSet = async (newValue, storage) => {
-        const profile = config.value.profiles.find(profile => profile.key === storage.profile)
+        const profile = profiles.value.find(profile => profile.key === storage.profile)
         if (profile?.locked) {
             const profileName = getDefaultName(1, profile.key === 'default' ? undefined : profile?.name)
             const profileKey = nanoid()
-            const index = config.value.profiles.findIndex(profile => profile.key === storage.profile)
-            config.value.profiles.splice(index + 1, 0, { key: profileKey, name: profileName })
+            const index = profiles.value.findIndex(profile => profile.key === storage.profile)
+            config.value.profiles.splice(index, 0, { key: profileKey, name: profileName })
             await switchProfile(profileKey, false)
         }
         changing.value = true
@@ -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'
@@ -126,9 +126,7 @@ export function useListPageCustomization({
         {
             latest: 'default',
             preference: undefined,
-            profiles: [
-                { key: 'default', locked: true },
-            ],
+            profiles: [],
         },
         storage,
         {
@@ -137,7 +135,6 @@ export function useListPageCustomization({
             onReady() {
                 resolve()
                 nextTick(() => {
-                    config.value.profiles[0].name = t('common.page.custom.profileDefault')
                     const key = route.params[routeParamName]
                     switchProfile(key)
                 })
@@ -145,6 +142,11 @@ export function useListPageCustomization({
         },
     )
 
+    const profiles = computed(() => [
+        { key: 'default', name: t('common.page.custom.profileDefault'), locked: true },
+        ...config.value.profiles,
+    ])
+
     const profile = computed({
         get: () => config.value.latest ?? 'default',
         set: (key) => {
@@ -189,7 +191,7 @@ export function useListPageCustomization({
             key = name.key
         }
         key ??= config.value.latest
-        const profile = config.value.profiles.find(profile => profile.key === key)
+        const profile = profiles.value.find(profile => profile.key === key)
         if (!profile) {
             console.debug(`[customizer] profile not found: ${key}`)
             return
@@ -198,13 +200,13 @@ export function useListPageCustomization({
     }
 
     async function copyProfile(key, name) {
-        const index = config.value.profiles.findIndex(profile => profile.key === key)
+        const index = profiles.value.findIndex(profile => profile.key === key)
         if (index === -1) {
             console.debug(`[customizer] profile not found: ${key}`)
             return
         }
-        const newProfile = { key: nanoid(), name: name ?? getDefaultName(1, config.value.profiles[index].name) }
-        config.value.profiles.splice(index + 1, 0, newProfile)
+        const newProfile = { key: nanoid(), name: name ?? getDefaultName(1, profiles.value[index].name) }
+        config.value.profiles.splice(index, 0, newProfile)
         await Promise.all([
             storage.setItem(
                 `customization#${filterStorage.key}~${newProfile.key}#${filterStorage.type}`,
@@ -224,7 +226,7 @@ export function useListPageCustomization({
             key = key.key
             locked = key.locked
         }
-        const profile = config.value.profiles.find(profile => profile.key === key)
+        const profile = profiles.value.find(profile => profile.key === key)
         if (!profile) {
             console.debug(`[customizer] profile not found: ${key}`)
             return
@@ -233,7 +235,7 @@ export function useListPageCustomization({
     }
 
     const returns = {
-        profiles: computed(() => config.value.profiles),
+        profiles,
         profile,
         preference,
         changing,