@freelog/tools-lib 0.1.104 → 0.1.107

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,6 +1,6 @@
 {
   "name": "@freelog/tools-lib",
-  "version": "0.1.104",
+  "version": "0.1.107",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -46,6 +46,7 @@
   "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",
@@ -58,6 +59,8 @@
     "@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

@@ -0,0 +1,146 @@
+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

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

package/src/index.ts

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

package/src/service-API/i18n.ts

@@ -0,0 +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,
+//   });
+// }

package/src/service-API/index.ts

@@ -12,6 +12,7 @@ import * as Event from './events';
 import * as Activity from './activities';
 import * as TestQualification from './testQualifications';
 import * as Statistic from './statistics';
+import * as I18n from './i18n';
 
 const FServiceAPI = {
   Node,
@@ -28,6 +29,7 @@ const FServiceAPI = {
   Activity,
   TestQualification,
   Statistic,
+  I18n,
 };
 
 export default FServiceAPI;

package/src/service-API/resources.ts

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

package/src/service-API/storages.ts

@@ -272,13 +272,13 @@ interface UpdateObjectParamsType {
     type: string;
     versionRange?: string;
   }[];
-  resourceType?: string;
+  resourceType?: string[];
 }
 
 export function updateObject({objectIdOrName, ...params}: UpdateObjectParamsType) {
   return FUtil.Request({
     method: 'PUT',
-    url: `/v1/storages/objects/${objectIdOrName}`,
+    url: `/v2/storages/objects/${objectIdOrName}`,
     data: params,
   });
 }
@@ -301,7 +301,7 @@ export function batchObjectList(params: BatchObjectListParamsType) {
 // 根据sha1和类型获取文件属性
 interface FilePropertyParamsType {
   sha1: string;
-  resourceType: string;
+  // resourceType: string;
 }
 
 export function fileProperty({sha1, ...params}: FilePropertyParamsType) {

package/src/utils/format.ts

@@ -87,3 +87,12 @@ export async function policyCodeTranslationToText(code: string, targetType: stri
     };
   }
 }
+
+
+/**
+ * 将资源类型关键字数组,转换成标准展示文字
+ * @param arr 关键字数组
+ */
+export function resourceTypeKeyArrToResourceType(arr: string[]): string {
+  return arr.join(' / ');
+}

package/src/utils/index.ts

@@ -4,6 +4,7 @@ import * as LinkTo from './linkTo';
 import * as Predefined from './predefined';
 import Axios, {request} from './axios';
 import * as Tool from './tools';
+// import I18n from '../i18n';
 
 const FUtil = {
   Format,
@@ -13,6 +14,7 @@ const FUtil = {
   Axios,
   Request: request,
   Tool,
+  // i18n: new I18n(),
 };
 
 export default FUtil;