@zl-ui-kit/composables 0.5.1 → 0.6.1

package/README.md

@@ -5,14 +5,14 @@
 
 ZL UI 组合式函数库（TypeScript）：
 
-| 模块 | 说明 |
-| --- | --- |
-| `useRequest/useDataRequest/usePaginationRequest/usePageableRequest` | 请求体系（插件机制：loading/ready/refreshDeps/download，可 `defineUseRequestPlugin` 自定义） |
-| `useGlobalMessage` | **Element Plus 版** ElMessage/ElMessageBox/ElNotification 封装；`Modal.confirmPromise` 语义与参考实现一致 |
-| `useGlobalData` | 全局应用数据（locale / theme / token / 用户 / 权限 / config），纯 `localStorage` 持久化 |
-| `useDict/useDictStore/useDictProvider/setDictSource` | 字典（独立 Vue3 状态管理 store 缓存，不依赖全局数据；支持组件直传 / 局部 source / 全局 source 三级注入） |
-| `useLocale` | vue-i18n + 全局语言联动（`elLocaleMessages` 对接 EP locale） |
-| `useSash/useServiceType/useUKey/createCacheComputed` | 其他工具 hook |
+| 模块                                                                | 说明                                                                                                      |
+| ------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------- |
+| `useRequest/useDataRequest/usePaginationRequest/usePageableRequest` | 请求体系（插件机制：loading/ready/refreshDeps/download，可 `defineUseRequestPlugin` 自定义）              |
+| `useGlobalMessage`                                                  | **Element Plus 版** ElMessage/ElMessageBox/ElNotification 封装；`Modal.confirmPromise` 语义与参考实现一致 |
+| `useGlobalData`                                                     | 全局应用数据（locale / theme / token / 用户 / 权限 / config），纯 `localStorage` 持久化                   |
+| `useDict/useDictStore/useDictProvider/setDictSource`                | 字典（独立 Vue3 状态管理 store 缓存，不依赖全局数据；支持组件直传 / 局部 source / 全局 source 三级注入）  |
+| `useLocale`                                                         | vue-i18n + 全局语言联动（`elLocaleMessages` 对接 EP locale）                                              |
+| `useSash/useServiceType/useUKey/createCacheComputed`                | 其他工具 hook                                                                                             |
 
 ## 运行前提
 

package/dist/index.js

@@ -5,7 +5,10 @@ function createCacheComputed(getter) {
   const cache = /* @__PURE__ */ new Map();
   const useComputed = (obj) => {
     if (!cache.has(obj)) {
-      cache.set(obj, computed(() => getter(obj)));
+      cache.set(
+        obj,
+        computed(() => getter(obj))
+      );
     }
     return cache.get(obj);
   };
@@ -31,8 +34,7 @@ function deepMerge(base, override) {
 function mergeMessages(base, ...overrides) {
   let result = { ...base ?? {} };
   for (const override of overrides) {
-    if (!override)
-      continue;
+    if (!override) continue;
     result = deepMerge(result, override);
   }
   return result;
@@ -142,8 +144,7 @@ var useGlobalData = createGlobalState2(() => {
   const globalData = ref2(createInitialState(storages));
   const waiters = /* @__PURE__ */ new Set();
   function updateBodyAttribute(key, value) {
-    if (typeof document === "undefined")
-      return;
+    if (typeof document === "undefined") return;
     document.body.setAttribute(key, String(value ?? ""));
   }
   updateBodyAttribute("data-theme", storages.theme.value);
@@ -153,38 +154,39 @@ var useGlobalData = createGlobalState2(() => {
     (values) => {
       values.forEach((value, index) => {
         const key = SYNC_KEYS[index];
-        if (storages[key].value === value)
-          return;
+        if (storages[key].value === value) return;
         storages[key].value = value;
-        if (key === "theme")
-          updateBodyAttribute("data-theme", value);
-        if (key === "locale")
-          updateBodyAttribute("data-locale", value);
+        if (key === "theme") updateBodyAttribute("data-theme", value);
+        if (key === "locale") updateBodyAttribute("data-locale", value);
       });
     }
   );
-  watch(globalData, () => {
-    waiters.forEach((fn) => fn());
-  }, { deep: true });
+  watch(
+    globalData,
+    () => {
+      waiters.forEach((fn) => fn());
+    },
+    { deep: true }
+  );
   function getConfig(key, defaultValue) {
     return globalData.value.config?.[key] ?? defaultValue;
   }
   function isConfig(key, compareValue = "true") {
     return globalData.value.config?.[key] === compareValue;
   }
-  async function setAndWaitUntil({ set, until }) {
-    if (!set && !isFunction(until))
-      return;
-    if (isPlainObject2(set))
-      globalData.value = { ...globalData.value, ...set };
+  async function setAndWaitUntil({
+    set,
+    until
+  }) {
+    if (!set && !isFunction(until)) return;
+    if (isPlainObject2(set)) globalData.value = { ...globalData.value, ...set };
     if (!isFunction(until)) {
       await nextTick();
       return;
     }
     const { resolve, promise } = withResolvers();
     const waiter = () => {
-      if (!until(globalData.value))
-        return;
+      if (!until(globalData.value)) return;
       waiters.delete(waiter);
       resolve();
     };
@@ -288,8 +290,7 @@ var elLocaleMessagesStore = {};
 function useLocale(options = {}, loader) {
   const { locale, localeMessages, elLocaleMessages, isI18nKeyVisible } = useGlobalData();
   function postTranslation(translated, key) {
-    if (isI18nKeyVisible.value)
-      return key;
+    if (isI18nKeyVisible.value) return key;
     return options.postTranslation ? options.postTranslation(translated, key) : translated;
   }
   const i18n = createI18n({
@@ -302,22 +303,25 @@ function useLocale(options = {}, loader) {
     localeMessages.value = options.messages;
   }
   const loadedLocale = [];
-  watch2(locale, async (value) => {
-    if (!value)
-      return;
-    i18n.global.locale.value = value;
-    if (loader) {
-      if (loadedLocale.includes(value)) {
-        elLocaleMessages.value = elLocaleMessagesStore[value];
-        return;
+  watch2(
+    locale,
+    async (value) => {
+      if (!value) return;
+      i18n.global.locale.value = value;
+      if (loader) {
+        if (loadedLocale.includes(value)) {
+          elLocaleMessages.value = elLocaleMessagesStore[value];
+          return;
+        }
+        const messages = await loader(value);
+        loadedLocale.push(value);
+        localeMessages.value = messages.localeMessages;
+        elLocaleMessages.value = messages.elLocaleMessages;
+        elLocaleMessagesStore[value] = messages.elLocaleMessages;
       }
-      const messages = await loader(value);
-      loadedLocale.push(value);
-      localeMessages.value = messages.localeMessages;
-      elLocaleMessages.value = messages.elLocaleMessages;
-      elLocaleMessagesStore[value] = messages.elLocaleMessages;
-    }
-  }, { immediate: true });
+    },
+    { immediate: true }
+  );
   let storeLocale;
   watch2(isI18nKeyVisible, (visible) => {
     const currentLocale = toValue(i18n.global.locale);
@@ -329,20 +333,21 @@ function useLocale(options = {}, loader) {
       storeLocale = void 0;
     }
   });
-  watch2(localeMessages, (messages) => {
-    if (!messages || typeof messages !== "object")
-      return;
-    if (!("locale" in messages)) {
-      for (const [loc2, msg] of Object.entries(messages)) {
-        if (msg && typeof msg === "object")
-          i18n.global.setLocaleMessage(loc2, msg);
+  watch2(
+    localeMessages,
+    (messages) => {
+      if (!messages || typeof messages !== "object") return;
+      if (!("locale" in messages)) {
+        for (const [loc2, msg] of Object.entries(messages)) {
+          if (msg && typeof msg === "object") i18n.global.setLocaleMessage(loc2, msg);
+        }
+        return;
       }
-      return;
-    }
-    const { locale: loc, ...rest } = messages;
-    if (loc)
-      i18n.global.setLocaleMessage(loc, rest);
-  }, { immediate: true });
+      const { locale: loc, ...rest } = messages;
+      if (loc) i18n.global.setLocaleMessage(loc, rest);
+    },
+    { immediate: true }
+  );
   return {
     i18n,
     isI18nKeyVisible,
@@ -546,18 +551,16 @@ var useLoadingPlugin_default = definePlugin((requestInstance, options = {}) => {
       };
     },
     onRequest(service) {
-      if (!toValue3(loadingKeep))
-        return () => service();
-      return () => Promise.allSettled([
-        service(),
-        promiseTimeout(toValue3(loadingDelay) + toValue3(loadingKeep))
-      ]).then(([res]) => {
-        if (res.status === "fulfilled") {
-          return res.value;
-        } else {
-          return Promise.reject(res.reason);
+      if (!toValue3(loadingKeep)) return () => service();
+      return () => Promise.allSettled([service(), promiseTimeout(toValue3(loadingDelay) + toValue3(loadingKeep))]).then(
+        ([res]) => {
+          if (res.status === "fulfilled") {
+            return res.value;
+          } else {
+            return Promise.reject(res.reason);
+          }
         }
-      });
+      );
     },
     onCancel() {
       stop();
@@ -573,9 +576,13 @@ import { whenever } from "@vueuse/core";
 import { ref as ref4, toValue as toValue4 } from "vue";
 var useReadyPlugin_default = definePlugin((requestInstance, options = {}) => {
   const { ready = ref4(true), defaultParams = [] } = options;
-  whenever(() => toValue4(ready), () => {
-    requestInstance.context.run(...defaultParams);
-  }, { flush: "sync" });
+  whenever(
+    () => toValue4(ready),
+    () => {
+      requestInstance.context.run(...defaultParams);
+    },
+    { flush: "sync" }
+  );
   return {
     onBefore() {
       if (!toValue4(ready)) {
@@ -613,7 +620,13 @@ function useRequestImpl(service, options = {}, plugins = []) {
   };
   const { manual = false, defaultParams = [] } = _options;
   const requestInstance = createRequest(service, _options);
-  requestInstance.plugins.value = [...plugins, useLoadingPlugin_default, useReadyPlugin_default, useRefreshDepsPlugin_default, useDownloadPlugin_default].map((plugin) => plugin(requestInstance, _options));
+  requestInstance.plugins.value = [
+    ...plugins,
+    useLoadingPlugin_default,
+    useReadyPlugin_default,
+    useRefreshDepsPlugin_default,
+    useDownloadPlugin_default
+  ].map((plugin) => plugin(requestInstance, _options));
   if (!manual) {
     const params = requestInstance.params.value || defaultParams;
     requestInstance.context.run(...params);
@@ -658,7 +671,13 @@ import { computed as computed5, inject as inject3 } from "vue";
 function usePaginationRequest(service, options, plugins) {
   const { pagination = {}, ...restOptions } = options || {};
   const injectedGlobalOptions = inject3(GLOBAL_OPTIONS_PROVIDER_KEY, {});
-  const { currentKey, pageSizeKey, totalKey, dataKey } = Object.assign({}, DEFAULT_PAGINATION_OPTIONS, getGlobalOptions().pagination, injectedGlobalOptions.pagination, pagination);
+  const { currentKey, pageSizeKey, totalKey, dataKey } = Object.assign(
+    {},
+    DEFAULT_PAGINATION_OPTIONS,
+    getGlobalOptions().pagination,
+    injectedGlobalOptions.pagination,
+    pagination
+  );
   const finalOptions = {
     defaultParams: [{ [currentKey]: 1, [pageSizeKey]: 30 }],
     ...restOptions

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zl-ui-kit/composables",
-  "version": "0.5.1",
+  "version": "0.6.1",
   "type": "module",
   "description": "ZL UI 组合式函数库：useRequest 请求体系、微前端通信层、全局消息、字典、国际化等",
   "license": "MIT",
@@ -19,7 +19,7 @@
   ],
   "sideEffects": false,
   "dependencies": {
-    "@zl-ui-kit/utils": "0.5.1"
+    "@zl-ui-kit/utils": "0.6.1"
   },
   "peerDependencies": {
     "@vueuse/core": "^12.3.0",
@@ -40,8 +40,8 @@
     "cross-env": "^7.0.3",
     "tsup": "^8.3.5",
     "typescript": "^5.7.3",
-    "@jichuang/eslint-config": "1.0.0",
-    "@jichuang/tsconfig": "1.0.0"
+    "@jichuang/tsconfig": "1.0.0",
+    "@jichuang/eslint-config": "1.0.0"
   },
   "repository": {
     "type": "git",