@epxing/core 5.3.0-beta.2 → 5.3.0-beta.4

package/src/store/modules/list.js

@@ -1,10 +1,23 @@
 /**
  * 获取页面配置
  */
-import { markRaw } from 'vue'
+import { markRaw, reactive } from 'vue'
 import http from '@epxing/core/src/api'
 import { ADD_LIST, ADD_OBJECT, ADD_OBJECT_COUNT, ADD_TAG } from '../actions'
 import { prune, touch, touchKeys } from '@epxing/core/src/store/lru'
+const hasOwn = (obj, key) => Object.prototype.hasOwnProperty.call(obj, key)
+// 缓存逐 key 更新，getter 从当前 store 的 state 读取，兼容独立 store 和状态替换。
+const lists = reactive({})
+// 每个 key 一个响应式信号，读取方只订阅自己的 key
+const listSignals = new Map()
+const signalOf = (key) => {
+  let signal = listSignals.get(key)
+  if (!signal) {
+    signal = reactive({ version: 0 })
+    listSignals.set(key, signal)
+  }
+  return signal
+}
 
 const formatData = (array, values = [], list) => {
   return array.map(item => {
@@ -67,7 +80,7 @@ const markPayloadRaw = data => {
 
 export default {
   state: {
-    lists: {},
+    lists,
     treeList: {},
     objects: {},
     object_counts: {},
@@ -76,6 +89,9 @@ export default {
   },
   getters: {
     getCodeById: (state) => (id) => {
+      // 只订阅这一个 key 的信号，其它代码表的到达不会触发本组件重渲染
+      // eslint-disable-next-line no-unused-expressions
+      signalOf(id).version
       const list = state.lists[id]
       if (list) {
         touch('lists', id)
@@ -101,12 +117,23 @@ export default {
     getTagListByMetaId: (state) => (id) => state.tags[id]
   },
   mutations: {
+    // 逐 key 写入并只通知该 key 的信号，不整体替换 lists
     [ADD_LIST] (state, data) {
       touchKeys('lists', Object.keys(data))
-      state.lists = prune('lists', { ...state.lists, ...markPayloadRaw(data) }, LIMITS.lists)
+      const rawData = markPayloadRaw(data)
+      for (const key in rawData) {
+        state.lists[key] = rawData[key]
+        signalOf(key).version++
+      }
+      // 容量淘汰：先在副本上算出保留集合，再原地删除被淘汰的 key
+      const keep = prune('lists', { ...state.lists }, LIMITS.lists)
+      for (const key in state.lists) {
+        if (!hasOwn(keep, key)) delete state.lists[key]
+      }
     },
     'DELETE_LIST' (state, payload) {
       delete state.lists[payload.key]
+      signalOf(payload.key).version++
     },
     'ADD_TREE_LIST' (state, data) {
       touchKeys('treeList', Object.keys(data))

package/src/store/modules/locale.js

@@ -1,236 +1,236 @@
-import http from '@epxing/core/src/api'
-import util from '@epxing/core/src/runtime-utils/util'
-import storage from '@epxing/utils/src/storage'
-import { applyLibraryLocale } from '@epxing/core/src/plugins/library-locale'
-import {
-  configuredLocales,
-  createRuntimeMessages,
-  createUiMessageCatalog,
-  languagePreferenceKey,
-  resolveCurrentLocale
-} from '@epxing/utils/src/locale'
-
-const CACHE_PREFIX = 'epx-i18n-bundle'
-const UI_SCOPE = 'UI'
-
-function bundleCacheKey ({ clientCode, systemId, locale }) {
-  return [CACHE_PREFIX, clientCode, systemId, locale, UI_SCOPE].join(':')
-}
-
-function readBundleCache (context) {
-  try {
-    const value = storage.get(bundleCacheKey(context))
-    if (!value) return null
-    const bundle = JSON.parse(value)
-    if (!bundle || typeof bundle.content !== 'object' || Array.isArray(bundle.content)) return null
-    return bundle
-  } catch (error) {
-    return null
-  }
-}
-
-function writeBundleCache (context, bundle) {
-  try {
-    storage.set(bundleCacheKey(context), JSON.stringify({
-      etag: bundle.etag || '',
-      content: bundle.content || {}
-    }))
-  } catch (error) {
-    // 浏览器禁用或空间不足时退化为当前页面内存缓存。
-  }
-}
-
-function removeBundleCache (context) {
-  try {
-    storage.remove(bundleCacheKey(context))
-  } catch (error) {
-    // localStorage 不可用不影响语言回退。
-  }
-}
-
-function decodeMessages (data) {
-  return (data.entitys || []).map(item => {
-    if (data.encrypt !== '1') return item
-    return {
-      ...item,
-      NAME: util.utf8to16(window.atob(item.NAME)),
-      CONTENT: util.utf8to16(window.atob(item.CONTENT))
-    }
-  })
-}
-
-function loadSourceCatalog (systemId, defaultLocale) {
-  return http.list({
-    entityId: 'FM_MESSAGE',
-    scopeParams: JSON.stringify([
-      {
-        field: 'TYPE',
-        values: 'page'
-      },
-      {
-        lb: '(',
-        field: 'SCOPE',
-        values: 'frame',
-        link: 'or'
-      },
-      {
-        field: 'SYSTEM',
-        values: systemId,
-        rb: ')'
-      }
-    ])
-  }, {
-    headers: {
-      Language: defaultLocale
-    }
-  }).then(data => createUiMessageCatalog(decodeMessages(data), systemId))
-}
-
-function requestPublishedBundle (context, etag) {
-  return http.$request({
-    action: 'publishedTranslations',
-    entityId: 'FM_I18N_RESOURCE',
-    localeCode: context.locale,
-    scope: UI_SCOPE
-  }, {
-    method: 'get',
-    headers: etag ? { 'If-None-Match': etag } : {}
-  })
-}
-
-function acceptPublishedBundle (context, bundle) {
-  if (!bundle || !bundle.published) {
-    removeBundleCache(context)
-    return { published: false, etag: '', content: {} }
-  }
-  writeBundleCache(context, bundle)
-  return bundle
-}
-
-function loadPublishedBundle (context) {
-  const cached = readBundleCache(context)
-  return requestPublishedBundle(context, cached && cached.etag).then(bundle => {
-    if (!bundle || !bundle.notModified) return acceptPublishedBundle(context, bundle)
-    const content = cached && cached.content
-    if (content && Object.keys(content).length > 0) {
-      return { published: true, etag: cached.etag, content }
-    }
-    // 服务端确认未变更，但本地缓存已丢失或为空：丢掉 ETag 重新拉完整包，
-    // 否则会把空内容当成已发布语言包，整站文案回退默认语言。
-    removeBundleCache(context)
-    return requestPublishedBundle(context, null)
-      .then(full => acceptPublishedBundle(context, full))
-  })
-}
-
-function applyMessages (locale, messages, fallbackMessages) {
-  const libraryLocale = applyLibraryLocale(locale)
-  if (globalThis.i18n) {
-    globalThis.i18n.setLocale(locale)
-    globalThis.i18n.setMessage(messages, fallbackMessages)
-  }
-  return libraryLocale
-}
-
-export default {
-  state: {
-    enabled: false,
-    clientCode: '',
-    systemId: '',
-    currentLocale: 'zh-CN',
-    defaultLocale: 'zh-CN',
-    supportedLocales: ['zh-CN'],
-    libraryLocale: 'zh-CN',
-    messages: {},
-    fallbackMessages: {},
-    etag: '',
-    published: false,
-    loaded: false,
-    loading: false
-  },
-  mutations: {
-    SET_LOCALE_CONTEXT (state, context) {
-      Object.assign(state, context)
-    },
-    SET_LOCALE_LOADING (state, loading) {
-      state.loading = loading
-    },
-    SET_LOCALE_MESSAGES (state, payload) {
-      state.messages = payload.messages
-      state.fallbackMessages = payload.fallbackMessages
-      state.etag = payload.etag || ''
-      state.published = payload.published
-      state.libraryLocale = payload.libraryLocale
-      state.loaded = true
-      state.loading = false
-    }
-  },
-  actions: {
-    async INITIALIZE_LOCALE ({ state, commit, rootState }, payload = {}) {
-      const clientConfig = rootState.config.clientConfig || {}
-      const userInfo = rootState.user.userInfo || {}
-      const appConfig = rootState.config.appConfig || {}
-      const configuration = configuredLocales(clientConfig)
-      const clientCode = clientConfig.CODE || ''
-      const systemId = payload.systemId || appConfig['SYSTEM|ID'] || appConfig.SYSTEM || ''
-      const currentLocale = resolveCurrentLocale(clientConfig, userInfo)
-      const context = {
-        enabled: configuration.enabled,
-        clientCode,
-        systemId,
-        currentLocale,
-        defaultLocale: configuration.defaultLocale,
-        supportedLocales: configuration.supportedLocales
-      }
-      if (!payload.force && state.loaded && state.clientCode === clientCode && state.systemId === systemId && state.currentLocale === currentLocale) {
-        return state
-      }
-
-      commit('SET_LOCALE_CONTEXT', context)
-      commit('SET_LOCALE_LOADING', true)
-      let catalog = { fallbackMessages: {}, aliases: {} }
-      try {
-        catalog = await loadSourceCatalog(systemId, configuration.defaultLocale)
-      } catch (error) {
-        // 源消息失败时仍允许页面启动，$t 最终回退到调用方传入的 Key。
-      }
-
-      let publishedBundle = { published: false, etag: '', content: {} }
-      // 登录、注册页也要加载界面文案包：这些页面整页文案都走 $t，拿不到包就整页回退默认语言。
-      // 服务端对匿名请求只放行 UI 范围，配置资源包仍要求登录。
-      const usePublishedBundle = configuration.enabled && currentLocale !== configuration.defaultLocale
-      if (usePublishedBundle) {
-        try {
-          publishedBundle = await loadPublishedBundle({ clientCode, systemId, locale: currentLocale })
-        } catch (error) {
-          // 已发布包暂时不可用时回退默认语言，不让应用启动失败。
-        }
-      }
-
-      const messages = publishedBundle.published
-        ? createRuntimeMessages(publishedBundle.content, catalog)
-        : catalog.fallbackMessages
-      const libraryLocale = applyMessages(currentLocale, messages, catalog.fallbackMessages)
-      commit('SET_LOCALE_MESSAGES', {
-        messages,
-        fallbackMessages: catalog.fallbackMessages,
-        etag: publishedBundle.etag,
-        published: publishedBundle.published,
-        libraryLocale
-      })
-      return state
-    },
-    CHANGE_LOCALE ({ commit, rootState }, value) {
-      const locale = typeof value === 'string' ? value : value.locale
-      const clientConfig = rootState.config.clientConfig || {}
-      const configuration = configuredLocales(clientConfig)
-      const selected = configuration.supportedLocales.find(item => item.toLowerCase() === String(locale || '').toLowerCase())
-      if (!selected) throw new Error(`当前客户未启用语言：${locale}`)
-      const clientCode = clientConfig.CODE || ''
-      storage.set(languagePreferenceKey(clientCode), selected)
-      const libraryLocale = applyLibraryLocale(selected)
-      commit('SET_LOCALE_CONTEXT', { clientCode, currentLocale: selected, libraryLocale })
-      return selected
-    }
-  }
-}
+import http from '@epxing/core/src/api'
+import util from '@epxing/core/src/runtime-utils/util'
+import storage from '@epxing/utils/src/storage'
+import { applyLibraryLocale } from '@epxing/core/src/plugins/library-locale'
+import {
+  configuredLocales,
+  createRuntimeMessages,
+  createUiMessageCatalog,
+  languagePreferenceKey,
+  resolveCurrentLocale
+} from '@epxing/utils/src/locale'
+
+const CACHE_PREFIX = 'epx-i18n-bundle'
+const UI_SCOPE = 'UI'
+
+function bundleCacheKey ({ clientCode, systemId, locale }) {
+  return [CACHE_PREFIX, clientCode, systemId, locale, UI_SCOPE].join(':')
+}
+
+function readBundleCache (context) {
+  try {
+    const value = storage.get(bundleCacheKey(context))
+    if (!value) return null
+    const bundle = JSON.parse(value)
+    if (!bundle || typeof bundle.content !== 'object' || Array.isArray(bundle.content)) return null
+    return bundle
+  } catch (error) {
+    return null
+  }
+}
+
+function writeBundleCache (context, bundle) {
+  try {
+    storage.set(bundleCacheKey(context), JSON.stringify({
+      etag: bundle.etag || '',
+      content: bundle.content || {}
+    }))
+  } catch (error) {
+    // 浏览器禁用或空间不足时退化为当前页面内存缓存。
+  }
+}
+
+function removeBundleCache (context) {
+  try {
+    storage.remove(bundleCacheKey(context))
+  } catch (error) {
+    // localStorage 不可用不影响语言回退。
+  }
+}
+
+function decodeMessages (data) {
+  return (data.entitys || []).map(item => {
+    if (data.encrypt !== '1') return item
+    return {
+      ...item,
+      NAME: util.utf8to16(window.atob(item.NAME)),
+      CONTENT: util.utf8to16(window.atob(item.CONTENT))
+    }
+  })
+}
+
+function loadSourceCatalog (systemId, defaultLocale) {
+  return http.list({
+    entityId: 'FM_MESSAGE',
+    scopeParams: JSON.stringify([
+      {
+        field: 'TYPE',
+        values: 'page'
+      },
+      {
+        lb: '(',
+        field: 'SCOPE',
+        values: 'frame',
+        link: 'or'
+      },
+      {
+        field: 'SYSTEM',
+        values: systemId,
+        rb: ')'
+      }
+    ])
+  }, {
+    headers: {
+      Language: defaultLocale
+    }
+  }).then(data => createUiMessageCatalog(decodeMessages(data), systemId))
+}
+
+function requestPublishedBundle (context, etag) {
+  return http.$request({
+    action: 'publishedTranslations',
+    entityId: 'FM_I18N_RESOURCE',
+    localeCode: context.locale,
+    scope: UI_SCOPE
+  }, {
+    method: 'get',
+    headers: etag ? { 'If-None-Match': etag } : {}
+  })
+}
+
+function acceptPublishedBundle (context, bundle) {
+  if (!bundle || !bundle.published) {
+    removeBundleCache(context)
+    return { published: false, etag: '', content: {} }
+  }
+  writeBundleCache(context, bundle)
+  return bundle
+}
+
+function loadPublishedBundle (context) {
+  const cached = readBundleCache(context)
+  return requestPublishedBundle(context, cached && cached.etag).then(bundle => {
+    if (!bundle || !bundle.notModified) return acceptPublishedBundle(context, bundle)
+    const content = cached && cached.content
+    if (content && Object.keys(content).length > 0) {
+      return { published: true, etag: cached.etag, content }
+    }
+    // 服务端确认未变更，但本地缓存已丢失或为空：丢掉 ETag 重新拉完整包，
+    // 否则会把空内容当成已发布语言包，整站文案回退默认语言。
+    removeBundleCache(context)
+    return requestPublishedBundle(context, null)
+      .then(full => acceptPublishedBundle(context, full))
+  })
+}
+
+function applyMessages (locale, messages, fallbackMessages) {
+  const libraryLocale = applyLibraryLocale(locale)
+  if (globalThis.i18n) {
+    globalThis.i18n.setLocale(locale)
+    globalThis.i18n.setMessage(messages, fallbackMessages)
+  }
+  return libraryLocale
+}
+
+export default {
+  state: {
+    enabled: false,
+    clientCode: '',
+    systemId: '',
+    currentLocale: 'zh-CN',
+    defaultLocale: 'zh-CN',
+    supportedLocales: ['zh-CN'],
+    libraryLocale: 'zh-CN',
+    messages: {},
+    fallbackMessages: {},
+    etag: '',
+    published: false,
+    loaded: false,
+    loading: false
+  },
+  mutations: {
+    SET_LOCALE_CONTEXT (state, context) {
+      Object.assign(state, context)
+    },
+    SET_LOCALE_LOADING (state, loading) {
+      state.loading = loading
+    },
+    SET_LOCALE_MESSAGES (state, payload) {
+      state.messages = payload.messages
+      state.fallbackMessages = payload.fallbackMessages
+      state.etag = payload.etag || ''
+      state.published = payload.published
+      state.libraryLocale = payload.libraryLocale
+      state.loaded = true
+      state.loading = false
+    }
+  },
+  actions: {
+    async INITIALIZE_LOCALE ({ state, commit, rootState }, payload = {}) {
+      const clientConfig = rootState.config.clientConfig || {}
+      const userInfo = rootState.user.userInfo || {}
+      const appConfig = rootState.config.appConfig || {}
+      const configuration = configuredLocales(clientConfig)
+      const clientCode = clientConfig.CODE || ''
+      const systemId = payload.systemId || appConfig['SYSTEM|ID'] || appConfig.SYSTEM || ''
+      const currentLocale = resolveCurrentLocale(clientConfig, userInfo)
+      const context = {
+        enabled: configuration.enabled,
+        clientCode,
+        systemId,
+        currentLocale,
+        defaultLocale: configuration.defaultLocale,
+        supportedLocales: configuration.supportedLocales
+      }
+      if (!payload.force && state.loaded && state.clientCode === clientCode && state.systemId === systemId && state.currentLocale === currentLocale) {
+        return state
+      }
+
+      commit('SET_LOCALE_CONTEXT', context)
+      commit('SET_LOCALE_LOADING', true)
+      let catalog = { fallbackMessages: {}, aliases: {} }
+      try {
+        catalog = await loadSourceCatalog(systemId, configuration.defaultLocale)
+      } catch (error) {
+        // 源消息失败时仍允许页面启动，$t 最终回退到调用方传入的 Key。
+      }
+
+      let publishedBundle = { published: false, etag: '', content: {} }
+      // 登录、注册页也要加载界面文案包：这些页面整页文案都走 $t，拿不到包就整页回退默认语言。
+      // 服务端对匿名请求只放行 UI 范围，配置资源包仍要求登录。
+      const usePublishedBundle = configuration.enabled && currentLocale !== configuration.defaultLocale
+      if (usePublishedBundle) {
+        try {
+          publishedBundle = await loadPublishedBundle({ clientCode, systemId, locale: currentLocale })
+        } catch (error) {
+          // 已发布包暂时不可用时回退默认语言，不让应用启动失败。
+        }
+      }
+
+      const messages = publishedBundle.published
+        ? createRuntimeMessages(publishedBundle.content, catalog)
+        : catalog.fallbackMessages
+      const libraryLocale = applyMessages(currentLocale, messages, catalog.fallbackMessages)
+      commit('SET_LOCALE_MESSAGES', {
+        messages,
+        fallbackMessages: catalog.fallbackMessages,
+        etag: publishedBundle.etag,
+        published: publishedBundle.published,
+        libraryLocale
+      })
+      return state
+    },
+    CHANGE_LOCALE ({ commit, rootState }, value) {
+      const locale = typeof value === 'string' ? value : value.locale
+      const clientConfig = rootState.config.clientConfig || {}
+      const configuration = configuredLocales(clientConfig)
+      const selected = configuration.supportedLocales.find(item => item.toLowerCase() === String(locale || '').toLowerCase())
+      if (!selected) throw new Error(`当前客户未启用语言：${locale}`)
+      const clientCode = clientConfig.CODE || ''
+      storage.set(languagePreferenceKey(clientCode), selected)
+      const libraryLocale = applyLibraryLocale(selected)
+      commit('SET_LOCALE_CONTEXT', { clientCode, currentLocale: selected, libraryLocale })
+      return selected
+    }
+  }
+}