giime 0.0.13 → 0.0.15

package/lib/hooks/store/basic/index.js

@@ -0,0 +1,3 @@
+'use strict';
+
+//# sourceMappingURL=index.js.map

package/lib/hooks/store/basic/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;"}

package/lib/hooks/store/index.d.ts

@@ -1,3 +1,4 @@
+export * from './basic';
 export * from './useLangList';
 export * from './useLogin';
 export * from './useCustomSettings';

package/lib/hooks/store/index.js

@@ -1,5 +1,6 @@
 'use strict';
 
+require('./basic/index.js');
 var index = require('./useLangList/index.js');
 var index$1 = require('./useLogin/index.js');
 var index$2 = require('./useCustomSettings/index.js');

package/lib/hooks/store/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;"}

package/lib/hooks/store/useCustomSettings/index.d.ts

@@ -1,29 +1,34 @@
 /// <reference types="@vueuse/shared" />
 import { type AddListCustomParams } from '../../../api';
-import { type EventHookOn } from '@vueuse/core';
 interface CustomSettings {
-    [key: string]: any;
+    [key_word: string]: {
+        [type: string]: any;
+    };
 }
-interface CustomSettingsItem {
-    [key: string]: any[];
+export interface GetCustomSettingsParams {
+    key_word: string;
+    type: string;
 }
 export declare const useCustomSettingsStore: import("pinia").StoreDefinition<"gmCustomSettings", import("pinia")._UnwrapAll<Pick<{
-    addListCustomInfo: (params: AddListCustomParams) => Promise<true | undefined>;
-    getCustomPage: (key_word: string, type: string) => Promise<any>;
-    customSettings: import("vue").Ref<CustomSettings>;
-    /** 监听接口成功*/
-    onCustomResult: EventHookOn<CustomSettingsItem>;
+    addCustomSettings: (params: AddListCustomParams) => Promise<import("axios").AxiosResponse<any, any>>;
+    getCustomSettings: (params: GetCustomSettingsParams, options: {
+        defaultValue: any;
+    }) => Promise<any>;
+    syncRemoteSetting: (params: GetCustomSettingsParams) => Promise<void>;
+    customSettings: import("@vueuse/shared").RemovableRef<CustomSettings>;
 }, "customSettings">>, Pick<{
-    addListCustomInfo: (params: AddListCustomParams) => Promise<true | undefined>;
-    getCustomPage: (key_word: string, type: string) => Promise<any>;
-    customSettings: import("vue").Ref<CustomSettings>;
-    /** 监听接口成功*/
-    onCustomResult: EventHookOn<CustomSettingsItem>;
+    addCustomSettings: (params: AddListCustomParams) => Promise<import("axios").AxiosResponse<any, any>>;
+    getCustomSettings: (params: GetCustomSettingsParams, options: {
+        defaultValue: any;
+    }) => Promise<any>;
+    syncRemoteSetting: (params: GetCustomSettingsParams) => Promise<void>;
+    customSettings: import("@vueuse/shared").RemovableRef<CustomSettings>;
 }, never>, Pick<{
-    addListCustomInfo: (params: AddListCustomParams) => Promise<true | undefined>;
-    getCustomPage: (key_word: string, type: string) => Promise<any>;
-    customSettings: import("vue").Ref<CustomSettings>;
-    /** 监听接口成功*/
-    onCustomResult: EventHookOn<CustomSettingsItem>;
-}, "addListCustomInfo" | "getCustomPage" | "onCustomResult">>;
+    addCustomSettings: (params: AddListCustomParams) => Promise<import("axios").AxiosResponse<any, any>>;
+    getCustomSettings: (params: GetCustomSettingsParams, options: {
+        defaultValue: any;
+    }) => Promise<any>;
+    syncRemoteSetting: (params: GetCustomSettingsParams) => Promise<void>;
+    customSettings: import("@vueuse/shared").RemovableRef<CustomSettings>;
+}, "addCustomSettings" | "getCustomSettings" | "syncRemoteSetting">>;
 export {};

package/lib/hooks/store/useCustomSettings/index.js

@@ -4,58 +4,92 @@ var vue = require('vue');
 var pinia = require('pinia');
 require('../../../api/index.js');
 var core = require('@vueuse/core');
+var index = require('../../base/useIDBKeyval/index.js');
+var objects = require('../../../utils/src/objects.js');
+var addListCustom = require('../../../api/gatewayApi/cross/addListCustom.js');
 var getListCustom = require('../../../api/gatewayApi/cross/getListCustom.js');
 
-const useCustomSettingsStore = pinia.defineStore(
-  "gmCustomSettings",
-  () => {
-    const customSettings = vue.ref({});
-    const isLoading = vue.ref(false);
-    const customResult = core.createEventHook();
-    const addListCustomInfo = async (params) => {
+const useCustomSettingsStore = pinia.defineStore("gmCustomSettings", () => {
+  const { data: customSettings, initIndexedDBComplete } = index.useIDBKeyval("gmCustomSettingsStore", {}, { deep: true });
+  const customResult = core.createEventHook();
+  const isLoadingKeyWords = vue.ref(/* @__PURE__ */ new Set());
+  const addCustomSettings = async (params) => {
+    const res = await addListCustom.addListCustom(params);
+    if (res.data.code === 0) {
+      if (!customSettings.value[params.key_word]) {
+        customSettings.value[params.key_word] = {};
+      }
+      let value = params.value;
       try {
-        localStorage.setItem(params.type, params.value);
-        return true;
-      } catch (e) {
-        console.error(e);
+        value = JSON.parse(params.value);
+      } catch {
       }
-    };
-    const getCustomList = async (params) => {
-      isLoading.value = true;
-      const { data } = await getListCustom.getListCustom(params);
-      isLoading.value = false;
-      if (data.code === 0) {
+      customSettings.value[params.key_word][params.type] = value;
+    }
+    return res;
+  };
+  const syncRemoteSetting = async (params) => {
+    const { key_word, type } = params;
+    isLoadingKeyWords.value.add(key_word);
+    try {
+      const { data } = await getListCustom.getListCustom({ key_word });
+      if (data.code !== 0) {
+        isLoadingKeyWords.value.delete(key_word);
+        customResult.trigger({ key_word, type });
+        return;
       }
-      return data;
-    };
-    const getCustomPage = async (key_word, type) => {
-      const result = localStorage.getItem(type);
-      if (!customSettings.value[key_word]) {
-        customSettings.value[key_word] = {};
+      for (const key in data.data) {
+        if (objects.hasOwn(data.data, key)) {
+          const value = data.data[key];
+          try {
+            data.data[key] = JSON.parse(value);
+          } catch {
+            data.data[key] = value;
+          }
+        }
       }
-      customSettings.value[key_word][type] = JSON.parse(result || "[]");
-      if (isLoading.value)
-        return customSettings.value[key_word][type];
-      if (!result) {
-        await getCustomList({ key_word });
+      customSettings.value[key_word] = Array.isArray(data.data) ? {} : data.data;
+      isLoadingKeyWords.value.delete(key_word);
+      customResult.trigger({ key_word, type });
+    } catch {
+      isLoadingKeyWords.value.delete(key_word);
+      customResult.trigger({ key_word, type });
+    }
+  };
+  const getCustomList = async (params) => {
+    const { key_word, type } = params;
+    await initIndexedDBComplete();
+    if (customSettings.value[key_word] && objects.hasOwn(customSettings.value[key_word], type)) {
+      customResult.trigger({ key_word, type });
+      return;
+    }
+    if (isLoadingKeyWords.value.has(key_word)) {
+      await onCustomResultPromise({ key_word, type });
+      return;
+    }
+    await syncRemoteSetting(params);
+  };
+  const onCustomResultPromise = (params) => new Promise((resolve) => {
+    customResult.on((value) => {
+      if (params.key_word === value.key_word) {
+        resolve(value);
       }
-      customResult.trigger(customSettings.value);
-      return customSettings.value[key_word][type];
-    };
-    return {
-      addListCustomInfo,
-      getCustomPage,
-      customSettings,
-      /** 监听接口成功*/
-      onCustomResult: customResult.on
-    };
-  },
-  {
-    // persist: {
-    //   storage: sessionStorage,
-    // },
-  }
-);
+    });
+  });
+  const getCustomSettings = async (params, options) => {
+    await getCustomList(params);
+    if (!objects.hasOwn(customSettings.value[params.key_word], params.type)) {
+      customSettings.value[params.key_word][params.type] = options.defaultValue;
+    }
+    return customSettings.value[params.key_word][params.type];
+  };
+  return {
+    addCustomSettings,
+    getCustomSettings,
+    syncRemoteSetting,
+    customSettings
+  };
+});
 
 exports.useCustomSettingsStore = useCustomSettingsStore;
 //# sourceMappingURL=index.js.map

package/lib/hooks/store/useCustomSettings/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../../../../../packages/hooks/store/useCustomSettings/index.ts"],"sourcesContent":["import { ref } from 'vue';\r\nimport { defineStore } from 'pinia';\r\nimport { type AddListCustomParams, type GetListCustomParams, addListCustom, getListCustom } from '@giime/api';\r\n// eslint-disable-next-line @typescript-eslint/no-unused-vars\r\nimport { type EventHookOn, type EventHookTrigger, createEventHook } from '@vueuse/core';\r\n\r\ninterface CustomSettings {\r\n  [key: string]: any;\r\n}\r\n\r\ninterface CustomSettingsItem {\r\n  [key: string]: any[];\r\n}\r\n\r\nexport const useCustomSettingsStore = defineStore(\r\n  'gmCustomSettings',\r\n  () => {\r\n    const customSettings = ref<CustomSettings>({});\r\n    const isLoading = ref(false);\r\n    const customResult = createEventHook<CustomSettingsItem>();\r\n\r\n    // 添加自定义设置\r\n    const addListCustomInfo = async (params: AddListCustomParams) => {\r\n      try {\r\n        // const { data } = await addListCustom(params);\r\n        // if (data.code === 0) {\r\n        localStorage.setItem(params.type, params.value);\r\n        // return data;\r\n        return true;\r\n        // }\r\n      } catch (e) {\r\n        console.error(e);\r\n      }\r\n    };\r\n\r\n    // 获取自定义设置\r\n    const getCustomList = async (params: GetListCustomParams) => {\r\n      isLoading.value = true;\r\n      const { data } = await getListCustom(params);\r\n      isLoading.value = false;\r\n      if (data.code === 0) {\r\n        // const obj: CustomSettingsItem = {};\r\n        // Object.entries(data.data).forEach(([key, value]) => {\r\n        //   const result = value && typeof value === 'string' ? value : '[]';\r\n        //   localStorage.setItem(key, result);\r\n        //   obj[key] = JSON.parse(result);\r\n        // });\r\n        // customSettings.value[params.key_word] = obj;\r\n      }\r\n      return data;\r\n    };\r\n\r\n    const getCustomPage = async (key_word: string, type: string) => {\r\n      const result = localStorage.getItem(type);\r\n\r\n      if (!customSettings.value[key_word]) {\r\n        customSettings.value[key_word] = {};\r\n      }\r\n      customSettings.value[key_word][type] = JSON.parse(result || '[]');\r\n\r\n      if (isLoading.value) return customSettings.value[key_word][type];\r\n\r\n      if (!result) {\r\n        await getCustomList({ key_word });\r\n      }\r\n\r\n      customResult.trigger(customSettings.value);\r\n      return customSettings.value[key_word][type];\r\n    };\r\n\r\n    return {\r\n      addListCustomInfo,\r\n      getCustomPage,\r\n      customSettings,\r\n      /** 监听接口成功*/\r\n      onCustomResult: customResult.on,\r\n    };\r\n  },\r\n  {\r\n    // persist: {\r\n    //   storage: sessionStorage,\r\n    // },\r\n  },\r\n);\r\n"],"names":["defineStore","ref","createEventHook","getListCustom"],"mappings":";;;;;;;;AAcO,MAAM,sBAAyB,GAAAA,iBAAA;AAAA,EACpC,kBAAA;AAAA,EACA,MAAM;AACJ,IAAM,MAAA,cAAA,GAAiBC,OAAoB,CAAA,EAAE,CAAA,CAAA;AAC7C,IAAM,MAAA,SAAA,GAAYA,QAAI,KAAK,CAAA,CAAA;AAC3B,IAAA,MAAM,eAAeC,oBAAoC,EAAA,CAAA;AAGzD,IAAM,MAAA,iBAAA,GAAoB,OAAO,MAAgC,KAAA;AAC/D,MAAI,IAAA;AAGF,QAAA,YAAA,CAAa,OAAQ,CAAA,MAAA,CAAO,IAAM,EAAA,MAAA,CAAO,KAAK,CAAA,CAAA;AAE9C,QAAO,OAAA,IAAA,CAAA;AAAA,eAEA,CAAG,EAAA;AACV,QAAA,OAAA,CAAQ,MAAM,CAAC,CAAA,CAAA;AAAA,OACjB;AAAA,KACF,CAAA;AAGA,IAAM,MAAA,aAAA,GAAgB,OAAO,MAAgC,KAAA;AAC3D,MAAA,SAAA,CAAU,KAAQ,GAAA,IAAA,CAAA;AAClB,MAAA,MAAM,EAAE,IAAA,EAAS,GAAA,MAAMC,4BAAc,MAAM,CAAA,CAAA;AAC3C,MAAA,SAAA,CAAU,KAAQ,GAAA,KAAA,CAAA;AAClB,MAAI,IAAA,IAAA,CAAK,SAAS,CAAG,EAAA;AAAA,OAQrB;AACA,MAAO,OAAA,IAAA,CAAA;AAAA,KACT,CAAA;AAEA,IAAM,MAAA,aAAA,GAAgB,OAAO,QAAA,EAAkB,IAAiB,KAAA;AAC9D,MAAM,MAAA,MAAA,GAAS,YAAa,CAAA,OAAA,CAAQ,IAAI,CAAA,CAAA;AAExC,MAAA,IAAI,CAAC,cAAA,CAAe,KAAM,CAAA,QAAQ,CAAG,EAAA;AACnC,QAAe,cAAA,CAAA,KAAA,CAAM,QAAQ,CAAA,GAAI,EAAC,CAAA;AAAA,OACpC;AACA,MAAe,cAAA,CAAA,KAAA,CAAM,QAAQ,CAAE,CAAA,IAAI,IAAI,IAAK,CAAA,KAAA,CAAM,UAAU,IAAI,CAAA,CAAA;AAEhE,MAAA,IAAI,SAAU,CAAA,KAAA;AAAO,QAAA,OAAO,cAAe,CAAA,KAAA,CAAM,QAAQ,CAAA,CAAE,IAAI,CAAA,CAAA;AAE/D,MAAA,IAAI,CAAC,MAAQ,EAAA;AACX,QAAM,MAAA,aAAA,CAAc,EAAE,QAAA,EAAU,CAAA,CAAA;AAAA,OAClC;AAEA,MAAa,YAAA,CAAA,OAAA,CAAQ,eAAe,KAAK,CAAA,CAAA;AACzC,MAAA,OAAO,cAAe,CAAA,KAAA,CAAM,QAAQ,CAAA,CAAE,IAAI,CAAA,CAAA;AAAA,KAC5C,CAAA;AAEA,IAAO,OAAA;AAAA,MACL,iBAAA;AAAA,MACA,aAAA;AAAA,MACA,cAAA;AAAA;AAAA,MAEA,gBAAgB,YAAa,CAAA,EAAA;AAAA,KAC/B,CAAA;AAAA,GACF;AAAA,EACA;AAAA;AAAA;AAAA;AAAA,GAIA;AACF;;;;"}
+{"version":3,"file":"index.js","sources":["../../../../../../packages/hooks/store/useCustomSettings/index.ts"],"sourcesContent":["import { ref } from 'vue';\r\nimport { defineStore } from 'pinia';\r\nimport { type AddListCustomParams, addListCustom, getListCustom } from '@giime/api';\r\n// eslint-disable-next-line @typescript-eslint/no-unused-vars\r\nimport { type EventHookOn, type EventHookTrigger, createEventHook } from '@vueuse/core';\r\nimport { useIDBKeyval } from '@giime/hooks/base/useIDBKeyval';\r\nimport { hasOwn } from '@giime/utils/src/objects';\r\n\r\ninterface CustomSettings {\r\n  [key_word: string]: {\r\n    [type: string]: any;\r\n  };\r\n}\r\n\r\nexport interface GetCustomSettingsParams {\r\n  key_word: string;\r\n  type: string;\r\n}\r\n\r\nexport const useCustomSettingsStore = defineStore('gmCustomSettings', () => {\r\n  // const customSettings = ref<CustomSettings>({});\r\n  const { data: customSettings, initIndexedDBComplete } = useIDBKeyval<CustomSettings>('gmCustomSettingsStore', {}, { deep: true });\r\n  const customResult = createEventHook<GetCustomSettingsParams>();\r\n  /**\r\n   * 正在loading的key_word\r\n   */\r\n  const isLoadingKeyWords = ref(new Set<string>());\r\n\r\n  // 添加自定义设置\r\n  const addCustomSettings = async (params: AddListCustomParams) => {\r\n    const res = await addListCustom(params);\r\n    if (res.data.code === 0) {\r\n      if (!customSettings.value[params.key_word]) {\r\n        customSettings.value[params.key_word] = {};\r\n      }\r\n      let value = params.value;\r\n      try {\r\n        value = JSON.parse(params.value);\r\n      } catch {}\r\n      customSettings.value[params.key_word][params.type] = value;\r\n    }\r\n    return res;\r\n  };\r\n  /**\r\n   * 同步远程数据到本地\r\n   */\r\n  const syncRemoteSetting = async (params: GetCustomSettingsParams) => {\r\n    const { key_word, type } = params;\r\n    isLoadingKeyWords.value.add(key_word);\r\n    try {\r\n      const { data } = await getListCustom({ key_word });\r\n      if (data.code !== 0) {\r\n        isLoadingKeyWords.value.delete(key_word);\r\n        customResult.trigger({ key_word, type });\r\n        return;\r\n      }\r\n      // 将json字符串转成对象\r\n      for (const key in data.data) {\r\n        if (hasOwn(data.data, key)) {\r\n          const value = data.data[key];\r\n          try {\r\n            data.data[key] = JSON.parse(value);\r\n          } catch {\r\n            data.data[key] = value;\r\n          }\r\n        }\r\n      }\r\n      customSettings.value[key_word] = Array.isArray(data.data) ? {} : data.data;\r\n      isLoadingKeyWords.value.delete(key_word);\r\n      customResult.trigger({ key_word, type });\r\n    } catch {\r\n      isLoadingKeyWords.value.delete(key_word);\r\n      customResult.trigger({ key_word, type });\r\n    }\r\n  };\r\n  // 获取自定义设置\r\n  const getCustomList = async (params: GetCustomSettingsParams) => {\r\n    const { key_word, type } = params;\r\n    // 等待indexedDB 初始化完成\r\n    await initIndexedDBComplete();\r\n    // 如果已存在\r\n    if (customSettings.value[key_word] && hasOwn(customSettings.value[key_word], type)) {\r\n      customResult.trigger({ key_word, type });\r\n      return;\r\n    }\r\n    // 如果正在loading，则 等待之前请求的结果\r\n    if (isLoadingKeyWords.value.has(key_word)) {\r\n      await onCustomResultPromise({ key_word, type });\r\n      return;\r\n    }\r\n    await syncRemoteSetting(params);\r\n  };\r\n  /**监听 已请求列表  promise版 */\r\n  const onCustomResultPromise = (params: GetCustomSettingsParams) =>\r\n    new Promise<GetCustomSettingsParams>(resolve => {\r\n      customResult.on(value => {\r\n        if (params.key_word === value.key_word) {\r\n          resolve(value);\r\n        }\r\n      });\r\n    });\r\n  const getCustomSettings = async (params: GetCustomSettingsParams, options: { defaultValue: any }) => {\r\n    await getCustomList(params);\r\n    if (!hasOwn(customSettings.value[params.key_word], params.type)) {\r\n      customSettings.value[params.key_word][params.type] = options.defaultValue;\r\n    }\r\n    return customSettings.value[params.key_word][params.type];\r\n  };\r\n\r\n  return {\r\n    addCustomSettings,\r\n    getCustomSettings,\r\n    syncRemoteSetting,\r\n    customSettings,\r\n  };\r\n});\r\n"],"names":["defineStore","useIDBKeyval","createEventHook","ref","addListCustom","getListCustom","hasOwn"],"mappings":"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"}

package/lib/index.css

@@ -1,3 +1,37 @@
+[data-v-512cf874] .gmSearchForm .el-form-item {
+  margin-right: 8px;
+  margin-bottom: 8px;
+}
+.gm-flex-center[data-v-d1c6dac0] {
+  align-items: center;
+}
+
+.gm-flex-justify-between[data-v-d1c6dac0] {
+  justify-content: space-between;
+}
+[data-v-b5c784b0] .gmTableNoBorder .el-table__body .el-table__cell {
+  border-right: none;
+}
+
+[data-v-b5c784b0] .gmTableNoBorder .el-table__inner-wrapper:before {
+  height: 0;
+}
+
+[data-v-b5c784b0] .gmTableNoBorder.el-table--border .el-table__inner-wrapper:after {
+  height: 0;
+}
+
+[data-v-b5c784b0] .gmTableNoBorder.el-table--border:after {
+  height: 0;
+}
+
+[data-v-b5c784b0] .gmTableNoBorder.el-table--border:before {
+  height: 0;
+}
+
+[data-v-b5c784b0] .gmTableNoBorder .el-table__border-left-patch {
+  height: 0;
+}
 /*
 ! tailwindcss v3.4.1 | MIT License | https://tailwindcss.com
 *//*
@@ -492,13 +526,12 @@ video {
 .gm-collapse {
   visibility: collapse;
 }
-.gm-my-4 {
-  margin-top: 1rem;
-  margin-bottom: 1rem;
-}
 .gm-mb-2 {
   margin-bottom: 0.5rem;
 }
+.gm-mb-4 {
+  margin-bottom: 1rem;
+}
 .gm-ml-2 {
   margin-left: 0.5rem;
 }
@@ -508,9 +541,6 @@ video {
 .gm-mr-2 {
   margin-right: 0.5rem;
 }
-.gm-mt-2 {
-  margin-top: 0.5rem;
-}
 .gm-inline-block {
   display: inline-block;
 }
@@ -532,15 +562,6 @@ video {
 .gm-w-1 {
   width: 0.25rem;
 }
-.gm-w-24 {
-  width: 6rem;
-}
-.gm-w-32 {
-  width: 8rem;
-}
-.gm-w-40 {
-  width: 10rem;
-}
 .gm-w-\[120px\] {
   width: 120px;
 }
@@ -553,12 +574,12 @@ video {
 .gm-flex-1 {
   flex: 1 1 0%;
 }
+.gm-flex-wrap {
+  flex-wrap: wrap;
+}
 .gm-items-center {
   align-items: center;
 }
-.gm-justify-end {
-  justify-content: flex-end;
-}
 .gm-justify-center {
   justify-content: center;
 }
@@ -577,43 +598,22 @@ video {
 .gm-border {
   border-width: 1px;
 }
-.gm-border-r {
-  border-right-width: 1px;
-}
-.gm-border-t {
-  border-top-width: 1px;
-}
-.gm-border-t-2 {
-  border-top-width: 2px;
-}
-.gm-border-\[\#f2f2f2\] {
-  --tw-border-opacity: 1;
-  border-color: rgb(242 242 242 / var(--tw-border-opacity));
-}
 .gm-border-cyan-300 {
   --tw-border-opacity: 1;
   border-color: rgb(103 232 249 / var(--tw-border-opacity));
 }
-.gm-border-gray-200 {
-  --tw-border-opacity: 1;
-  border-color: rgb(229 231 235 / var(--tw-border-opacity));
-}
-.gm-border-white {
-  --tw-border-opacity: 1;
-  border-color: rgb(255 255 255 / var(--tw-border-opacity));
-}
 .gm-bg-cyan-50 {
   --tw-bg-opacity: 1;
   background-color: rgb(236 254 255 / var(--tw-bg-opacity));
 }
-.gm-bg-gray-100 {
-  --tw-bg-opacity: 1;
-  background-color: rgb(243 244 246 / var(--tw-bg-opacity));
-}
 .gm-px-4 {
   padding-left: 1rem;
   padding-right: 1rem;
 }
+.gm-py-3 {
+  padding-top: 0.75rem;
+  padding-bottom: 0.75rem;
+}
 .gm-text-center {
   text-align: center;
 }
@@ -624,118 +624,18 @@ video {
   font-size: 0.875rem;
   line-height: 1.25rem;
 }
-.gm-text-xs {
-  font-size: 0.75rem;
-  line-height: 1rem;
-}
-.gm-font-bold {
-  font-weight: 700;
-}
 .gm-leading-\[40px\] {
   line-height: 40px;
 }
-.gm-leading-\[43px\] {
-  line-height: 43px;
-}
 .gm-text-\[\#777\] {
   --tw-text-opacity: 1;
   color: rgb(119 119 119 / var(--tw-text-opacity));
 }
-.gm-text-black {
-  --tw-text-opacity: 1;
-  color: rgb(0 0 0 / var(--tw-text-opacity));
-}
 .gm-text-cyan-500 {
   --tw-text-opacity: 1;
   color: rgb(6 182 212 / var(--tw-text-opacity));
 }
-.gm-text-gray-500 {
-  --tw-text-opacity: 1;
-  color: rgb(107 114 128 / var(--tw-text-opacity));
-}
-.gm-text-gray-800 {
-  --tw-text-opacity: 1;
-  color: rgb(31 41 55 / var(--tw-text-opacity));
-}
 .gm-text-orange-400 {
   --tw-text-opacity: 1;
   color: rgb(251 146 60 / var(--tw-text-opacity));
-}
-#table-page[data-v-4cbe9348] [data-v-4cbe9348] .cell {
-  white-space: pre-line !important;
-}
-#table-page[data-v-4cbe9348] [data-v-4cbe9348] .el-tooltip {
-  white-space: nowrap !important;
-}
-#table-page[data-v-4cbe9348] [data-v-4cbe9348] .el-scrollbar__bar.is-horizontal {
-  height: 12px;
-  border-radius: 12px;
-}
-#table-page[data-v-4cbe9348] .operate-wrap[data-v-4cbe9348] {
-  text-align: center;
-}
-#table-page[data-v-4cbe9348] .el-button[data-v-4cbe9348] {
-  margin: 0 3px !important;
-}
-@charset "UTF-8";
-.drawer-title[data-v-05e98ace] {
-  font-size: 14px;
-  border-bottom: 2px solid #f2f2f2;
-  margin: 0 -20px;
-  padding: 0 20px 20px;
-}
-
-#column-group[data-v-05e98ace] {
-  height: calc(100vh - 265px);
-  overflow-y: auto;
-}
-#column-group[data-v-05e98ace][data-v-05e98ace]::-webkit-scrollbar {
-  /*滚动条整体样式*/
-  width: 4px;
-  /*高宽分别对应横竖滚动条的尺寸*/
-  height: 1px;
-}
-#column-group[data-v-05e98ace][data-v-05e98ace]::-webkit-scrollbar-thumb {
-  /*滚动条里面小方块*/
-  border-radius: 10px;
-  box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.1);
-  background: #999;
-}
-#column-group[data-v-05e98ace][data-v-05e98ace]::-webkit-scrollbar-track {
-  /*滚动条里面轨道*/
-  box-shadow: inset 0 0 3px rgba(0, 0, 0, 0.1);
-  border-radius: 10px;
-  background: #eee;
-}
-#column-group[data-v-05e98ace] .column-checked[data-v-05e98ace] {
-  margin-left: -36px;
-}
-#column-group[data-v-05e98ace] [data-v-05e98ace] .el-input__wrapper {
-  box-shadow: none;
-}
-#column-group[data-v-05e98ace] ul[data-v-05e98ace]:last-child {
-  border-bottom: 1px solid #e5e7eb;
-}
-
-.column-class[data-v-05e98ace] > ul[data-v-05e98ace]:first-child {
-  padding-right: 4px;
-}
-.column-class[data-v-05e98ace] #column-group[data-v-05e98ace] ul[data-v-05e98ace]:last-child {
-  border-bottom: none;
-}
-
-.drawer-footer-btn[data-v-05e98ace] {
-  margin: 15px -20px -20px;
-  padding: 15px 20px;
-}
-.gm-flex-center[data-v-e26ef660] {
-  align-items: center;
-}
-
-.gm-flex-justify-between[data-v-e26ef660] {
-  justify-content: space-between;
-}
-[data-v-512cf874] .gmSearchForm .el-form-item {
-  margin-right: 8px;
-  margin-bottom: 8px;
 }

package/lib/utils/index.js

@@ -37,6 +37,7 @@ exports.isPositive = is.isPositive;
 exports.isString = is.isString;
 exports.isSymbol = is.isSymbol;
 exports.isUndefined = is.isUndefined;
+exports.hasOwn = objects.hasOwn;
 exports.keysOf = objects.keysOf;
 exports.withInstall = install.withInstall;
 exports.withInstallDirective = install.withInstallDirective;

package/lib/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/lib/utils/src/general.d.ts

@@ -0,0 +1,4 @@
+/**
+ * 删除数组中的元素
+ */
+export declare const remove: <T>(arr: T[], el: T) => void;

package/lib/utils/src/general.js

@@ -0,0 +1,11 @@
+'use strict';
+
+const remove = (arr, el) => {
+  const i = arr.indexOf(el);
+  if (i > -1) {
+    arr.splice(i, 1);
+  }
+};
+
+exports.remove = remove;
+//# sourceMappingURL=general.js.map

package/lib/utils/src/general.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"general.js","sources":["../../../../../packages/utils/src/general.ts"],"sourcesContent":["/**\r\n * 删除数组中的元素\r\n */\r\nexport const remove = <T>(arr: T[], el: T) => {\r\n  const i = arr.indexOf(el);\r\n  if (i > -1) {\r\n    arr.splice(i, 1);\r\n  }\r\n};\r\n"],"names":[],"mappings":";;AAGa,MAAA,MAAA,GAAS,CAAI,GAAA,EAAU,EAAU,KAAA;AAC5C,EAAM,MAAA,CAAA,GAAI,GAAI,CAAA,OAAA,CAAQ,EAAE,CAAA,CAAA;AACxB,EAAA,IAAI,IAAI,CAAI,CAAA,EAAA;AACV,IAAI,GAAA,CAAA,MAAA,CAAO,GAAG,CAAC,CAAA,CAAA;AAAA,GACjB;AACF;;;;"}

package/lib/utils/src/http/createAxios.js

@@ -49,7 +49,7 @@ const createAxios = (config) => {
         return res2;
       } else if (res.code !== successCode && res.errCode !== successCode) {
         elementPlus.ElMessage({
-          message: res.comment ?? res.message ?? res.errMsg,
+          message: res.comment ?? res.message ?? res.errMsg ?? res.msg,
           type: "error",
           grouping: true,
           duration: 5 * 1e3

package/lib/utils/src/http/createAxios.js.map

@@ -1 +1 @@
-{"version":3,"file":"createAxios.js","sources":["../../../../../../packages/utils/src/http/createAxios.ts"],"sourcesContent":["import axios from 'axios';\r\nimport { ElMessage } from 'element-plus';\r\nimport Cookies from 'js-cookie';\r\nimport { res401Interceptors } from './interceptors';\r\nimport { responseErrorMessage } from './errorMessage';\r\nimport type { AxiosError, CreateAxiosDefaults } from 'axios';\r\nexport interface CreateAxiosConfig extends CreateAxiosDefaults {\r\n  baseURL: string;\r\n  /**服务器调用成功的code 一般是 0 或 200 */\r\n  successCode: number;\r\n}\r\n\r\nexport const createAxios = (config: CreateAxiosConfig) => {\r\n  const successCode = config.successCode ?? 0;\r\n  const service = axios.create({\r\n    withCredentials: true, // send cookies when cross-domain requests\r\n    timeout: 120_000,\r\n    headers: {\r\n      'content-type': 'application/json',\r\n      Accept: '*/*',\r\n    },\r\n    ...config,\r\n  });\r\n\r\n  // 请求拦截器\r\n  service.interceptors.request.use(\r\n    config => {\r\n      const _token = Cookies.get('token');\r\n      const _user = Cookies.get('sso_user_id');\r\n      if (!config.params) {\r\n        config.params = {};\r\n      }\r\n      config.params = {\r\n        ...config.params,\r\n        _token,\r\n        _user,\r\n      };\r\n      config.headers.Authorization = `Bearer ${_token}`;\r\n      return config;\r\n    },\r\n    error => {\r\n      console.error('请求错误', error); // for debug\r\n      return Promise.reject(error);\r\n    },\r\n  );\r\n  // 添加响应拦截器\r\n  service.interceptors.response.use(\r\n    async response => {\r\n      // 对响应数据做点什么\r\n      const res = response.data;\r\n      if (!res?.code) {\r\n        return response;\r\n      }\r\n      if (res.code === 401) {\r\n        const res = await res401Interceptors(service, response.config);\r\n        return res;\r\n      } else if (res.code !== successCode && res.errCode !== successCode) {\r\n        ElMessage({\r\n          message: res.comment ?? res.message ?? res.errMsg,\r\n          type: 'error',\r\n          grouping: true,\r\n          duration: 5 * 1000,\r\n        });\r\n      }\r\n      return response;\r\n    },\r\n    async (err: AxiosError) => {\r\n      console.error(err.config);\r\n      if (err?.response?.status === 401 && !err.message.includes('timeout')) {\r\n        const res = await res401Interceptors(service, err.config!);\r\n        return res;\r\n      } else {\r\n        // 对响应错误做点什么\r\n        responseErrorMessage(err);\r\n        return Promise.reject(err);\r\n      }\r\n    },\r\n  );\r\n\r\n  return {\r\n    service,\r\n  };\r\n};\r\n"],"names":["config","res","res401Interceptors","ElMessage","responseErrorMessage"],"mappings":"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"}
+{"version":3,"file":"createAxios.js","sources":["../../../../../../packages/utils/src/http/createAxios.ts"],"sourcesContent":["import axios from 'axios';\r\nimport { ElMessage } from 'element-plus';\r\nimport Cookies from 'js-cookie';\r\nimport { res401Interceptors } from './interceptors';\r\nimport { responseErrorMessage } from './errorMessage';\r\nimport type { AxiosError, CreateAxiosDefaults } from 'axios';\r\nexport interface CreateAxiosConfig extends CreateAxiosDefaults {\r\n  baseURL: string;\r\n  /**服务器调用成功的code 一般是 0 或 200 */\r\n  successCode: number;\r\n}\r\n\r\nexport const createAxios = (config: CreateAxiosConfig) => {\r\n  const successCode = config.successCode ?? 0;\r\n  const service = axios.create({\r\n    withCredentials: true, // send cookies when cross-domain requests\r\n    timeout: 120_000,\r\n    headers: {\r\n      'content-type': 'application/json',\r\n      Accept: '*/*',\r\n    },\r\n    ...config,\r\n  });\r\n\r\n  // 请求拦截器\r\n  service.interceptors.request.use(\r\n    config => {\r\n      const _token = Cookies.get('token');\r\n      const _user = Cookies.get('sso_user_id');\r\n      if (!config.params) {\r\n        config.params = {};\r\n      }\r\n      config.params = {\r\n        ...config.params,\r\n        _token,\r\n        _user,\r\n      };\r\n      config.headers.Authorization = `Bearer ${_token}`;\r\n      return config;\r\n    },\r\n    error => {\r\n      console.error('请求错误', error); // for debug\r\n      return Promise.reject(error);\r\n    },\r\n  );\r\n  // 添加响应拦截器\r\n  service.interceptors.response.use(\r\n    async response => {\r\n      // 对响应数据做点什么\r\n      const res = response.data;\r\n      if (!res?.code) {\r\n        return response;\r\n      }\r\n      if (res.code === 401) {\r\n        const res = await res401Interceptors(service, response.config);\r\n        return res;\r\n      } else if (res.code !== successCode && res.errCode !== successCode) {\r\n        ElMessage({\r\n          message: res.comment ?? res.message ?? res.errMsg ?? res.msg,\r\n          type: 'error',\r\n          grouping: true,\r\n          duration: 5 * 1000,\r\n        });\r\n      }\r\n      return response;\r\n    },\r\n    async (err: AxiosError) => {\r\n      console.error(err.config);\r\n      if (err?.response?.status === 401 && !err.message.includes('timeout')) {\r\n        const res = await res401Interceptors(service, err.config!);\r\n        return res;\r\n      } else {\r\n        // 对响应错误做点什么\r\n        responseErrorMessage(err);\r\n        return Promise.reject(err);\r\n      }\r\n    },\r\n  );\r\n\r\n  return {\r\n    service,\r\n  };\r\n};\r\n"],"names":["config","res","res401Interceptors","ElMessage","responseErrorMessage"],"mappings":"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"}

package/lib/utils/src/http/devProxy.js

@@ -26,6 +26,11 @@ const giimeDevProxy = {
     target: "https://third-gw.giimall.net/",
     changeOrigin: true,
     rewrite: (p) => p.replace(/^\/third-api/, "")
+  },
+  "/basic-api": {
+    target: "http://192.168.4.171:9501/",
+    changeOrigin: true,
+    rewrite: (p) => p.replace(/^\/basic-api/, "")
   }
 };
 

package/lib/utils/src/http/devProxy.js.map

@@ -1 +1 @@
-{"version":3,"file":"devProxy.js","sources":["../../../../../../packages/utils/src/http/devProxy.ts"],"sourcesContent":["import type { ProxyOptions } from 'vite';\r\n\r\nexport const giimeDevProxy: Record<string, string | ProxyOptions> = {\r\n  // https://cn.vitejs.dev/config/#server-proxy\r\n  '/gstore-api': {\r\n    target: 'http://192.168.4.125:10086/gstore/',\r\n    changeOrigin: true,\r\n    rewrite: p => p.replace(/^\\/gstore-api/, ''),\r\n  },\r\n  '/material-api': {\r\n    target: 'http://192.168.4.130:8002',\r\n    changeOrigin: true,\r\n    rewrite: p => p.replace(/^\\/material-api/, ''),\r\n  },\r\n  '/shop-admin-api': {\r\n    target: 'http://192.168.4.130:8001',\r\n    changeOrigin: true,\r\n    rewrite: p => p.replace(/^\\/shop-admin-api/, ''),\r\n  },\r\n  '/gateway-api': {\r\n    target: 'http://192.168.1.115:8082/',\r\n    changeOrigin: true,\r\n    rewrite: p => p.replace(/^\\/gateway-api/, ''),\r\n  },\r\n  '/third-api': {\r\n    target: 'https://third-gw.giimall.net/',\r\n    changeOrigin: true,\r\n    rewrite: p => p.replace(/^\\/third-api/, ''),\r\n  },\r\n};\r\n"],"names":[],"mappings":";;AAEO,MAAM,aAAuD,GAAA;AAAA;AAAA,EAElE,aAAe,EAAA;AAAA,IACb,MAAQ,EAAA,oCAAA;AAAA,IACR,YAAc,EAAA,IAAA;AAAA,IACd,OAAS,EAAA,CAAA,CAAA,KAAK,CAAE,CAAA,OAAA,CAAQ,iBAAiB,EAAE,CAAA;AAAA,GAC7C;AAAA,EACA,eAAiB,EAAA;AAAA,IACf,MAAQ,EAAA,2BAAA;AAAA,IACR,YAAc,EAAA,IAAA;AAAA,IACd,OAAS,EAAA,CAAA,CAAA,KAAK,CAAE,CAAA,OAAA,CAAQ,mBAAmB,EAAE,CAAA;AAAA,GAC/C;AAAA,EACA,iBAAmB,EAAA;AAAA,IACjB,MAAQ,EAAA,2BAAA;AAAA,IACR,YAAc,EAAA,IAAA;AAAA,IACd,OAAS,EAAA,CAAA,CAAA,KAAK,CAAE,CAAA,OAAA,CAAQ,qBAAqB,EAAE,CAAA;AAAA,GACjD;AAAA,EACA,cAAgB,EAAA;AAAA,IACd,MAAQ,EAAA,4BAAA;AAAA,IACR,YAAc,EAAA,IAAA;AAAA,IACd,OAAS,EAAA,CAAA,CAAA,KAAK,CAAE,CAAA,OAAA,CAAQ,kBAAkB,EAAE,CAAA;AAAA,GAC9C;AAAA,EACA,YAAc,EAAA;AAAA,IACZ,MAAQ,EAAA,+BAAA;AAAA,IACR,YAAc,EAAA,IAAA;AAAA,IACd,OAAS,EAAA,CAAA,CAAA,KAAK,CAAE,CAAA,OAAA,CAAQ,gBAAgB,EAAE,CAAA;AAAA,GAC5C;AACF;;;;"}
+{"version":3,"file":"devProxy.js","sources":["../../../../../../packages/utils/src/http/devProxy.ts"],"sourcesContent":["import type { ProxyOptions } from 'vite';\r\n\r\nexport const giimeDevProxy: Record<string, string | ProxyOptions> = {\r\n  // https://cn.vitejs.dev/config/#server-proxy\r\n  '/gstore-api': {\r\n    target: 'http://192.168.4.125:10086/gstore/',\r\n    changeOrigin: true,\r\n    rewrite: p => p.replace(/^\\/gstore-api/, ''),\r\n  },\r\n  '/material-api': {\r\n    target: 'http://192.168.4.130:8002',\r\n    changeOrigin: true,\r\n    rewrite: p => p.replace(/^\\/material-api/, ''),\r\n  },\r\n  '/shop-admin-api': {\r\n    target: 'http://192.168.4.130:8001',\r\n    changeOrigin: true,\r\n    rewrite: p => p.replace(/^\\/shop-admin-api/, ''),\r\n  },\r\n  '/gateway-api': {\r\n    target: 'http://192.168.1.115:8082/',\r\n    changeOrigin: true,\r\n    rewrite: p => p.replace(/^\\/gateway-api/, ''),\r\n  },\r\n  '/third-api': {\r\n    target: 'https://third-gw.giimall.net/',\r\n    changeOrigin: true,\r\n    rewrite: p => p.replace(/^\\/third-api/, ''),\r\n  },\r\n  '/basic-api': {\r\n    target: 'http://192.168.4.171:9501/',\r\n    changeOrigin: true,\r\n    rewrite: p => p.replace(/^\\/basic-api/, ''),\r\n  },\r\n};\r\n"],"names":[],"mappings":";;AAEO,MAAM,aAAuD,GAAA;AAAA;AAAA,EAElE,aAAe,EAAA;AAAA,IACb,MAAQ,EAAA,oCAAA;AAAA,IACR,YAAc,EAAA,IAAA;AAAA,IACd,OAAS,EAAA,CAAA,CAAA,KAAK,CAAE,CAAA,OAAA,CAAQ,iBAAiB,EAAE,CAAA;AAAA,GAC7C;AAAA,EACA,eAAiB,EAAA;AAAA,IACf,MAAQ,EAAA,2BAAA;AAAA,IACR,YAAc,EAAA,IAAA;AAAA,IACd,OAAS,EAAA,CAAA,CAAA,KAAK,CAAE,CAAA,OAAA,CAAQ,mBAAmB,EAAE,CAAA;AAAA,GAC/C;AAAA,EACA,iBAAmB,EAAA;AAAA,IACjB,MAAQ,EAAA,2BAAA;AAAA,IACR,YAAc,EAAA,IAAA;AAAA,IACd,OAAS,EAAA,CAAA,CAAA,KAAK,CAAE,CAAA,OAAA,CAAQ,qBAAqB,EAAE,CAAA;AAAA,GACjD;AAAA,EACA,cAAgB,EAAA;AAAA,IACd,MAAQ,EAAA,4BAAA;AAAA,IACR,YAAc,EAAA,IAAA;AAAA,IACd,OAAS,EAAA,CAAA,CAAA,KAAK,CAAE,CAAA,OAAA,CAAQ,kBAAkB,EAAE,CAAA;AAAA,GAC9C;AAAA,EACA,YAAc,EAAA;AAAA,IACZ,MAAQ,EAAA,+BAAA;AAAA,IACR,YAAc,EAAA,IAAA;AAAA,IACd,OAAS,EAAA,CAAA,CAAA,KAAK,CAAE,CAAA,OAAA,CAAQ,gBAAgB,EAAE,CAAA;AAAA,GAC5C;AAAA,EACA,YAAc,EAAA;AAAA,IACZ,MAAQ,EAAA,4BAAA;AAAA,IACR,YAAc,EAAA,IAAA;AAAA,IACd,OAAS,EAAA,CAAA,CAAA,KAAK,CAAE,CAAA,OAAA,CAAQ,gBAAgB,EAAE,CAAA;AAAA,GAC5C;AACF;;;;"}

package/lib/utils/src/http/errorMessage.js

@@ -16,7 +16,7 @@ const responseErrorMessage = (error) => {
   if (error.code === "ERR_CANCELED") {
     return Promise.reject(error);
   }
-  const serviceMessage = (error?.response?.data?.message || error?.response?.data?.comment) ?? "";
+  const serviceMessage = (error?.response?.data?.message || error?.response?.data?.comment || error?.response?.data?.msg || error?.response?.data?.errMsg) ?? "";
   switch (error.response?.status) {
     case 400:
       return errorMessage({