@freelog/tools-lib 0.1.105 → 0.1.108

package/dist/utils/format.d.ts

@@ -22,3 +22,8 @@ export declare function policyCodeTranslationToText(code: string, targetType: st
     error: string[] | null;
     text?: string;
 }>;
+/**
+ * 将资源类型关键字数组,转换成标准展示文字
+ * @param arr 关键字数组
+ */
+export declare function resourceTypeKeyArrToResourceType(arr: string[]): string;

package/package.json

@@ -1,65 +1,67 @@
-{
-  "name": "@freelog/tools-lib",
-  "version": "0.1.105",
-  "license": "MIT",
-  "main": "dist/index.js",
-  "typings": "dist/index.d.ts",
-  "files": [
-    "dist",
-    "src"
-  ],
-  "engines": {
-    "node": ">=10"
-  },
-  "scripts": {
-    "start": "tsdx watch",
-    "build": "tsdx build",
-    "test": "tsdx test",
-    "lint": "tsdx lint",
-    "prepare": "tsdx build",
-    "size": "size-limit",
-    "analyze": "size-limit --why",
-    "publish": "npm publish --access public"
-  },
-  "peerDependencies": {},
-  "husky": {
-    "hooks": {}
-  },
-  "prettier": {
-    "printWidth": 80,
-    "semi": true,
-    "singleQuote": true,
-    "trailingComma": "es5"
-  },
-  "author": "liu-kai-github",
-  "module": "dist/tools-lib.esm.js",
-  "size-limit": [
-    {
-      "path": "dist/tools-lib.cjs.production.min.js",
-      "limit": "10 KB"
-    },
-    {
-      "path": "dist/tools-lib.esm.js",
-      "limit": "10 KB"
-    }
-  ],
-  "devDependencies": {
-    "@size-limit/preset-small-lib": "^4.11.0",
-    "@types/crypto-js": "^4.0.1",
-    "@types/nprogress": "^0.2.0",
-    "husky": "^6.0.0",
-    "size-limit": "^4.11.0",
-    "tsdx": "^0.14.1",
-    "tslib": "^2.2.0",
-    "typescript": "^4.3.2"
-  },
-  "dependencies": {
-    "@freelog/resource-policy-lang": "1.1.26",
-    "@freelog/tools-lib": "^0.1.43",
-    "axios": "^0.21.1",
-    "crypto-js": "^4.0.0",
-    "i18next": "^21.8.10",
-    "moment": "^2.29.1",
-    "nprogress": "^0.2.0"
-  }
-}
+{
+  "name": "@freelog/tools-lib",
+  "version": "0.1.108",
+  "license": "MIT",
+  "main": "dist/index.js",
+  "typings": "dist/index.d.ts",
+  "files": [
+    "dist",
+    "src"
+  ],
+  "engines": {
+    "node": ">=10"
+  },
+  "scripts": {
+    "start": "tsdx watch",
+    "build": "tsdx build",
+    "test": "tsdx test",
+    "lint": "tsdx lint",
+    "prepare": "tsdx build",
+    "size": "size-limit",
+    "analyze": "size-limit --why",
+    "publish": "npm publish --access public"
+  },
+  "peerDependencies": {},
+  "husky": {
+    "hooks": {}
+  },
+  "prettier": {
+    "printWidth": 80,
+    "semi": true,
+    "singleQuote": true,
+    "trailingComma": "es5"
+  },
+  "author": "liu-kai-github",
+  "module": "dist/tools-lib.esm.js",
+  "size-limit": [
+    {
+      "path": "dist/tools-lib.cjs.production.min.js",
+      "limit": "10 KB"
+    },
+    {
+      "path": "dist/tools-lib.esm.js",
+      "limit": "10 KB"
+    }
+  ],
+  "devDependencies": {
+    "@size-limit/preset-small-lib": "^4.11.0",
+    "@types/crypto-js": "^4.0.1",
+    "@types/js-cookie": "^3.0.2",
+    "@types/nprogress": "^0.2.0",
+    "husky": "^6.0.0",
+    "size-limit": "^4.11.0",
+    "tsdx": "^0.14.1",
+    "tslib": "^2.2.0",
+    "typescript": "^4.3.2"
+  },
+  "dependencies": {
+    "@freelog/resource-policy-lang": "1.1.26",
+    "@freelog/tools-lib": "^0.1.43",
+    "axios": "^0.21.1",
+    "crypto-js": "^4.0.0",
+    "i18next": "^21.8.10",
+    "js-cookie": "^3.0.1",
+    "moment": "^2.29.1",
+    "nprogress": "^0.2.0"
+  }
+}

package/src/i18n/I18nNext.ts

@@ -1,134 +1,146 @@
-import i18next, {Resource} from 'i18next';
-import axios from "axios";
-
-type LanguageKeyType = 'zh_CN' | 'en_US';
-
-const ossJsonUrl: string = 'https://freelog-i18n.oss-cn-shenzhen.aliyuncs.com/configs/i18n.json';
-const localStorage_i18nextLng_key: string = 'i18nextLng';
-const localStorage_i18nextResources_key: string = 'i18nextResources';
-
-const allLanguage = [
-  {value: 'en_US', label: 'English'},
-  {value: 'zh_CN', label: '简体中文'},
-];
-
-let self: I18nNext;
-
-class I18nNext {
-
-  private _loadingData: 'NotStart' | 'Start' | 'End' = 'NotStart';
-  private _taskQueue: Function[] = [];
-  private _currentLanguage: LanguageKeyType = window.localStorage.getItem(localStorage_i18nextLng_key) as null || 'zh_CN';
-
-  constructor() {
-    self = this;
-    self.ready();
-  }
-
-  async ready() {
-    const exc = () => {
-      while (self._taskQueue.length > 0) {
-        const task = self._taskQueue.shift();
-        task && task();
-      }
-    };
-    const handleTasks = async () => {
-      if (self._loadingData === 'End') {
-        exc();
-        return;
-      }
-      if (self._loadingData === 'Start') {
-        return;
-      }
-
-      // NO_START
-      self._loadingData = 'Start';
-
-      await self._handleData();
-      // console.log('######');
-      exc();
-    };
-    const promise = new Promise((resolve) => {
-      self._taskQueue.push(resolve);
-    });
-    handleTasks();
-    return promise;
-  }
-
-  t(key: string, options?: { [key: string]: any }) {
-    return i18next.t(key, options);
-  }
-
-  changeLanguage(lng: LanguageKeyType) {
-    // return i18next.changeLanguage(lng);
-    window.localStorage.setItem(localStorage_i18nextLng_key, lng)
-  }
-
-  getAllLanguage(): typeof allLanguage {
-    return allLanguage;
-  }
-
-  getCurrentLanguage(): LanguageKeyType {
-    return self._currentLanguage;
-  }
-
-  private async _handleData() {
-
-    const lng: string = self._currentLanguage;
-    const resource: string | null = window.localStorage.getItem(localStorage_i18nextResources_key);
-    let i18nextResources: Resource | null = resource ? JSON.parse(resource) : null;
-
-    if (!i18nextResources) {
-      // console.log('######892io3jlkl')
-      i18nextResources = await self._fetchData();
-    } else {
-      self._fetchData();
-    }
-
-    await i18next
-      .init({
-        // the translations
-        // (tip move them in a JSON file and import them,
-        // or even better, manage them via a UI: https://react.i18next.com/guides/multiple-translation-files#manage-your-translations-with-a-management-gui)
-        resources: i18nextResources,
-        lng: lng, // if you're using a language detector, do not define the lng option
-        fallbackLng: 'zh_CN',
-
-        interpolation: {
-          escapeValue: false, // react already safes from xss => https://www.i18next.com/translation-function/interpolation#unescape
-        },
-      });
-  }
-
-  private async _fetchData(): Promise<Resource> {
-    const res: any = await axios.get(ossJsonUrl, {
-      withCredentials: false,
-    });
-    // console.log(res, 'data09oiw3qjelsfkdfjlsdkfjl');
-
-    const en_US: { [key: string]: string } = {};
-    const zh_CN: { [key: string]: string } = {};
-
-    for (const [key, value] of Object.entries(res)) {
-      // console.log(key, value, 'key, value90iowsldfjlsdkj');
-      en_US[key] = (value as any)['en_US'];
-      zh_CN[key] = (value as any)['zh_CN'];
-    }
-
-    const result: Resource = {
-      en_US: {
-        translation: en_US,
-      },
-      zh_CN: {
-        translation: zh_CN,
-      },
-    };
-
-    // console.log(result, 'result093sdolkfjlsdkjl');
-    window.localStorage.setItem(localStorage_i18nextResources_key, JSON.stringify(result));
-
-    return result;
-  }
-}
-
-export default I18nNext;
+import i18next, {Resource} from 'i18next';
+import axios from "axios";
+import Cookies from 'js-cookie';
+import FUtil from '../utils';
+
+type LanguageKeyType = 'zh_CN' | 'en_US';
+
+const ossJsonUrl: string = 'https://freelog-i18n.oss-cn-shenzhen.aliyuncs.com/configs/i18n.json';
+const localStorage_i18nextLng_key: string = 'locale';
+const localStorage_i18nextResources_key: string = 'i18nextResources';
+
+const allLanguage = [
+  {value: 'en_US', label: 'English'},
+  {value: 'zh_CN', label: '简体中文'},
+];
+
+let self: I18nNext;
+
+class I18nNext {
+
+  private _loadingData: 'NotStart' | 'Start' | 'End' = 'NotStart';
+  private _taskQueue: Function[] = [];
+  // private _currentLanguage: LanguageKeyType = window.localStorage.getItem(localStorage_i18nextLng_key) as null || 'zh_CN';
+  private _currentLanguage: LanguageKeyType = Cookies.get(localStorage_i18nextLng_key) as undefined || 'zh_CN';
+
+  constructor() {
+    self = this;
+    self.ready();
+  }
+
+  async ready() {
+    const exc = () => {
+      while (self._taskQueue.length > 0) {
+        const task = self._taskQueue.shift();
+        task && task();
+      }
+    };
+    const handleTasks = async () => {
+      if (self._loadingData === 'End') {
+        exc();
+        return;
+      }
+      if (self._loadingData === 'Start') {
+        return;
+      }
+
+      // NO_START
+      self._loadingData = 'Start';
+
+      await self._handleData();
+      // console.log('######');
+      exc();
+    };
+    const promise = new Promise((resolve) => {
+      self._taskQueue.push(resolve);
+    });
+    handleTasks();
+    return promise;
+  }
+
+  t(key: string, options?: { [key: string]: any }) {
+    return i18next.t(key, options);
+  }
+
+  changeLanguage(lng: LanguageKeyType) {
+    // return i18next.changeLanguage(lng);
+    // window.localStorage.setItem(localStorage_i18nextLng_key, lng)
+    Cookies.set(localStorage_i18nextLng_key, lng, {
+      expires: 36525,
+      domain: FUtil.Format.completeUrlByDomain('').replace(/http(s)?:\/\//, ''),
+    });
+  }
+
+  getAllLanguage(): typeof allLanguage {
+    return allLanguage;
+  }
+
+  getCurrentLanguage(): LanguageKeyType {
+    return self._currentLanguage;
+  }
+
+  private async _handleData() {
+
+    const lng: string = self._currentLanguage;
+    const resource: string | null = window.localStorage.getItem(localStorage_i18nextResources_key);
+    // const resource: string | undefined = Cookies.get(decodeURIComponent(localStorage_i18nextResources_key));
+    let i18nextResources: Resource | null = resource ? JSON.parse(resource) : null;
+
+    if (!i18nextResources) {
+      // console.log('######892io3jlkl')
+      i18nextResources = await self._fetchData();
+    } else {
+      self._fetchData();
+    }
+
+    await i18next
+      .init({
+        // the translations
+        // (tip move them in a JSON file and import them,
+        // or even better, manage them via a UI: https://react.i18next.com/guides/multiple-translation-files#manage-your-translations-with-a-management-gui)
+        resources: i18nextResources,
+        lng: lng, // if you're using a language detector, do not define the lng option
+        fallbackLng: 'zh_CN',
+
+        interpolation: {
+          escapeValue: false, // react already safes from xss => https://www.i18next.com/translation-function/interpolation#unescape
+        },
+      });
+  }
+
+  private async _fetchData(): Promise<Resource> {
+    const res: any = await axios.get(ossJsonUrl, {
+      withCredentials: false,
+    });
+    // console.log(res, 'data09oiw3qjelsfkdfjlsdkfjl');
+
+    const en_US: { [key: string]: string } = {};
+    const zh_CN: { [key: string]: string } = {};
+
+    for (const [key, value] of Object.entries(res)) {
+      // console.log(key, value, 'key, value90iowsldfjlsdkj');
+      en_US[key] = (value as any)['en_US'];
+      zh_CN[key] = (value as any)['zh_CN'];
+    }
+
+    const result: Resource = {
+      en_US: {
+        translation: en_US,
+      },
+      zh_CN: {
+        translation: zh_CN,
+      },
+    };
+
+    // console.log(result, 'result093sdolkfjlsdkjl');
+    window.localStorage.setItem(localStorage_i18nextResources_key, JSON.stringify(result));
+    // Cookies.set(localStorage_i18nextResources_key, encodeURIComponent(JSON.stringify(result)), {
+    //   expires: 36525,
+    //   domain: FUtil.Format.completeUrlByDomain('').replace(/http(s)?:\/\//, ''),
+    // });
+
+    return result;
+  }
+}
+
+export default I18nNext;

package/src/i18n/index.ts

@@ -1,7 +1,7 @@
-import I18nNext from './I18nNext';
-
-const FI18n = {
-  i18nNext: new I18nNext(),
-};
-
-export default FI18n;
+import I18nNext from './I18nNext';
+
+const FI18n = {
+  i18nNext: new I18nNext(),
+};
+
+export default FI18n;

package/src/index.ts

@@ -1,9 +1,9 @@
-import FUtil from './utils';
-import FServiceAPI from './service-API';
-import FI18n from './i18n';
-
-export {
-  FUtil,
-  FServiceAPI,
-  FI18n,
-};
+import FUtil from './utils';
+import FServiceAPI from './service-API';
+import FI18n from './i18n';
+
+export {
+  FUtil,
+  FServiceAPI,
+  FI18n,
+};

package/src/service-API/combinations/index.ts

@@ -0,0 +1,27 @@
+import * as Storage from '../storages';
+
+interface FileInfo {
+  sha1: string;
+  state: 'success' | 'fail' | 'nonentity';
+  dataSource: {
+    [key: string]: any;
+  }
+}
+
+interface GetFileInfosBySha1Params {
+  sha1: string[];
+  cdPartiallySuccess?: (s: any[]) => void;
+  cdPartiallyFail?: (f: any[]) => void;
+}
+
+export async function getFilesSha1Info({sha1, cdPartiallySuccess, cdPartiallyFail}: GetFileInfosBySha1Params) {
+  const {data} = await Storage.filesListInfo({
+    sha1: sha1,
+  });
+
+  const all: FileInfo[] = [];
+  const success: any = [];
+  const fail: any = [];
+
+  console.log(data, all, success, fail, cdPartiallySuccess, cdPartiallyFail, '093oijsdlkfsjdl')
+}

package/src/service-API/i18n.ts

@@ -1,35 +1,35 @@
-import FUtil from '../utils';
-
-// 列出翻译
-interface ConfigsListParamsType {
-  key: string;
-  content: string;
-  tagIds: string[];
-  status: 0 | 1 | 2 | 3; // 0：全部 1：待翻译 2：待发布 3：已发布
-}
-
-export function configsList(params: ConfigsListParamsType) {
-  // console.log('####@30984i2o3jdsjflfkjsdl')
-  return FUtil.Request({
-    method: 'POST',
-    url: `/v2/i18n/configs/list`,
-    data: params,
-  });
-}
-
-// oss保存的翻译
-// interface ConfigsListParamsType {
-//   key: string;
-//   content: string;
-//   tagIds: string[];
-//   status: 0 | 1 | 2 | 3; // 0：全部 1：待翻译 2：待发布 3：已发布
-// }
-//
-// export function configsList(params: ConfigsListParamsType) {
-//   // console.log('####@30984i2o3jdsjflfkjsdl')
-//   return FUtil.Request({
-//     method: 'POST',
-//     url: `/v2/i18n/configs/list`,
-//     data: params,
-//   });
-// }
+import FUtil from '../utils';
+
+// 列出翻译
+interface ConfigsListParamsType {
+  key: string;
+  content: string;
+  tagIds: string[];
+  status: 0 | 1 | 2 | 3; // 0：全部 1：待翻译 2：待发布 3：已发布
+}
+
+export function configsList(params: ConfigsListParamsType) {
+  // console.log('####@30984i2o3jdsjflfkjsdl')
+  return FUtil.Request({
+    method: 'POST',
+    url: `/v2/i18n/configs/list`,
+    data: params,
+  });
+}
+
+// oss保存的翻译
+// interface ConfigsListParamsType {
+//   key: string;
+//   content: string;
+//   tagIds: string[];
+//   status: 0 | 1 | 2 | 3; // 0：全部 1：待翻译 2：待发布 3：已发布
+// }
+//
+// export function configsList(params: ConfigsListParamsType) {
+//   // console.log('####@30984i2o3jdsjflfkjsdl')
+//   return FUtil.Request({
+//     method: 'POST',
+//     url: `/v2/i18n/configs/list`,
+//     data: params,
+//   });
+// }

package/src/service-API/index.ts

@@ -13,6 +13,7 @@ import * as Activity from './activities';
 import * as TestQualification from './testQualifications';
 import * as Statistic from './statistics';
 import * as I18n from './i18n';
+import * as C from './combinations';
 
 const FServiceAPI = {
   Node,
@@ -30,6 +31,7 @@ const FServiceAPI = {
   TestQualification,
   Statistic,
   I18n,
+  C,
 };
 
 export default FServiceAPI;

package/src/service-API/resources.ts

@@ -17,7 +17,7 @@ interface IResourceInfo {
   }[];
   resourceId: string;
   resourceName: string;
-  resourceType: string;
+  resourceType: string[];
   resourceVersions: {
     createDate: string;
     version: string;
@@ -33,7 +33,7 @@ interface IResourceInfo {
 // 创建资源
 export interface CreateParamsType {
   name: string;
-  resourceType: string;
+  resourceType: string[]
   policies?: any[];
   coverImages?: string[];
   intro?: string;