@freelog/tools-lib 0.1.153 → 0.1.155

package/dist/utils/linkTo.d.ts

@@ -40,25 +40,33 @@ interface ResourceInfoParamsType {
     resourceID: string;
 }
 export declare function resourceInfo({ resourceID }: ResourceInfoParamsType): TReturnType;
-interface ResourceAuthParamsType {
+interface ResourcePolicyParamsType {
     resourceID: string;
 }
-export declare function resourceAuth({ resourceID }: ResourceAuthParamsType): TReturnType;
-interface ResourceCreateVersionParamsType {
+export declare function resourcePolicy({ resourceID }: ResourcePolicyParamsType): TReturnType;
+interface ResourceContractParamsType {
     resourceID: string;
 }
-export declare function resourceCreateVersion({ resourceID }: ResourceCreateVersionParamsType): TReturnType;
-interface ResourceVersionParamsType {
+export declare function resourceContract({ resourceID }: ResourceContractParamsType): TReturnType;
+interface ResourceDependencyParamsType {
+    resourceID: string;
+}
+export declare function resourceDependency({ resourceID }: ResourceDependencyParamsType): TReturnType;
+interface ResourceVersionCreatorParamsType {
     resourceID: string;
-    version: string;
 }
-export declare function resourceVersion({ resourceID, version }: ResourceVersionParamsType): TReturnType;
+export declare function resourceVersionCreator({ resourceID }: ResourceVersionCreatorParamsType): TReturnType;
+interface ResourceVersionInfoParamsType {
+    resourceID: string;
+    version?: string;
+}
+export declare function resourceVersionInfo({ resourceID, version }: ResourceVersionInfoParamsType): TReturnType;
 interface NodeCreatorParamsType {
 }
 export declare function nodeCreator({}?: NodeCreatorParamsType): TReturnType;
 interface NodeManagementParamsType {
     nodeID: number;
-    showPage?: 'exhibit' | 'theme' | 'mappingRule';
+    showPage?: 'exhibit' | 'theme' | 'contract' | 'setting';
 }
 export declare function nodeManagement({ nodeID, showPage, ...params }: NodeManagementParamsType): TReturnType;
 interface ExhibitManagementParamsType {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@freelog/tools-lib",
-  "version": "0.1.153",
+  "version": "0.1.155",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -59,6 +59,7 @@
     "@freelog/resource-policy-lang": "1.1.26",
     "axios": "^0.21.1",
     "crypto-js": "^4.0.0",
+    "html-react-parser": "^4.2.0",
     "i18next": "^21.8.10",
     "js-cookie": "^3.0.1",
     "moment": "^2.29.1",

package/src/i18n/I18nNext.ts

@@ -1,155 +1,162 @@
-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 ossJsonUrl_Test: string = 'https://freelog-i18n.oss-cn-shenzhen.aliyuncs.com/configs-test/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: '简体中文'},
-];
-
-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() {
-    this.ready();
-
-    this.ready = this.ready.bind(this);
-    this.t = this.t.bind(this);
-    this.changeLanguage = this.changeLanguage.bind(this);
-    this.getAllLanguage = this.getAllLanguage.bind(this);
-    this.getCurrentLanguage = this.getCurrentLanguage.bind(this);
-  }
-
-  async ready(this: I18nNext): Promise<void> {
-    const exc = () => {
-      while (this._taskQueue.length > 0) {
-        const task = this._taskQueue.shift();
-        task && task();
-      }
-    };
-    const handleTasks = async () => {
-      // console.log(this._loadingData, 'this._loadingData90iowejflksdfjlsdk');
-      if (this._loadingData === 'End') {
-        exc();
-        return;
-      }
-      if (this._loadingData === 'Start') {
-        return;
-      }
-
-      // NO_START
-      this._loadingData = 'Start';
-
-      await this._handleData();
-      // console.log('######');
-      exc();
-    };
-    const promise = new Promise<void>((resolve) => {
-      this._taskQueue.push(resolve);
-    });
-    handleTasks();
-    return promise;
-  }
-
-  t(this: I18nNext, key: string, options?: { [key: string]: any }): string {
-    return i18next.t(key.trim(), options);
-  }
-
-  changeLanguage(this: I18nNext, lng: LanguageKeyType): void {
-    // 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(this: I18nNext): typeof allLanguage {
-    return allLanguage;
-  }
-
-  getCurrentLanguage(this: I18nNext): LanguageKeyType {
-    return this._currentLanguage;
-  }
-
-  private async _handleData(this: I18nNext): Promise<void> {
-
-    const lng: string = this._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 this._fetchData();
-    } else {
-      this._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
-          prefix: '{',
-          suffix: '}',
-        },
-      });
-    this._loadingData = 'End';
-  }
-
-  private async _fetchData(this: I18nNext): Promise<Resource> {
-    const url: string = window.location.origin.includes('.freelog.com') ? ossJsonUrl : ossJsonUrl_Test;
-    const res: any = await axios.get(url + '?timestamp=' + Date.now(), {
-      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;
+import i18next, {Resource} from 'i18next';
+import axios from "axios";
+import Cookies from 'js-cookie';
+import FUtil from '../utils';
+// import * as React from 'react';
+import htmlReactParser from 'html-react-parser';
+
+type LanguageKeyType = 'zh_CN' | 'en_US';
+
+const ossJsonUrl: string = 'https://freelog-i18n.oss-cn-shenzhen.aliyuncs.com/configs/i18n.json';
+const ossJsonUrl_Test: string = 'https://freelog-i18n.oss-cn-shenzhen.aliyuncs.com/configs-test/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: '简体中文'},
+];
+
+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() {
+    this.ready();
+
+    this.ready = this.ready.bind(this);
+    this.t = this.t.bind(this);
+    this.changeLanguage = this.changeLanguage.bind(this);
+    this.getAllLanguage = this.getAllLanguage.bind(this);
+    this.getCurrentLanguage = this.getCurrentLanguage.bind(this);
+  }
+
+  async ready(this: I18nNext): Promise<void> {
+    const exc = () => {
+      while (this._taskQueue.length > 0) {
+        const task = this._taskQueue.shift();
+        task && task();
+      }
+    };
+    const handleTasks = async () => {
+      // console.log(this._loadingData, 'this._loadingData90iowejflksdfjlsdk');
+      if (this._loadingData === 'End') {
+        exc();
+        return;
+      }
+      if (this._loadingData === 'Start') {
+        return;
+      }
+
+      // NO_START
+      this._loadingData = 'Start';
+
+      await this._handleData();
+      // console.log('######');
+      exc();
+    };
+    const promise = new Promise<void>((resolve) => {
+      this._taskQueue.push(resolve);
+    });
+    handleTasks();
+    return promise;
+  }
+
+  t(this: I18nNext, key: string, options?: { [key: string]: any }): string {
+    return i18next.t(key.trim(), options);
+  }
+
+  tJSXElement(this: I18nNext, key: string, options?: { [key: string]: any }): string | JSX.Element | JSX.Element[] {
+    return htmlReactParser(i18next.t(key.trim(), options));
+  }
+
+
+  changeLanguage(this: I18nNext, lng: LanguageKeyType): void {
+    // 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(this: I18nNext): typeof allLanguage {
+    return allLanguage;
+  }
+
+  getCurrentLanguage(this: I18nNext): LanguageKeyType {
+    return this._currentLanguage;
+  }
+
+  private async _handleData(this: I18nNext): Promise<void> {
+
+    const lng: string = this._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 this._fetchData();
+    } else {
+      this._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
+          prefix: '{',
+          suffix: '}',
+        },
+      });
+    this._loadingData = 'End';
+  }
+
+  private async _fetchData(this: I18nNext): Promise<Resource> {
+    const url: string = window.location.origin.includes('.freelog.com') ? ossJsonUrl : ossJsonUrl_Test;
+    const res: any = await axios.get(url + '?timestamp=' + Date.now(), {
+      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/service-API/activities.ts

@@ -137,6 +137,7 @@ export function getRewardRecordInfo(params: GetRewardRecordInfoParamsType) {
 // 推送任务消息埋点
 interface PushMessageTaskParamsType {
   taskConfigCode: string;
+  meta?: any;
 }
 
 export function pushMessageTask(params: PushMessageTaskParamsType) {

package/src/service-API/collections.ts

@@ -1,80 +1,80 @@
-import FUtil from '../utils';
-
-// 收藏资源
-interface CollectResourceParamsType {
-  resourceId: string;
-}
-
-export function collectResource(params: CollectResourceParamsType) {
-  // return FUtil.Axios.post('/v2/collections/resources', params);
-  return FUtil.Request({
-    method: 'POST',
-    url: `/v2/collections/resources`,
-    data: params,
-  });
-}
-
-// 查看收藏的资源列表
-interface CollectionResourcesParamsType {
-  skip?: number;
-  limit?: number;
-  keywords?: string;
-  resourceType?: string;
-  resourceTypeCode?: string;
-  resourceTypeCategory?: 1 | 2;
-  omitResourceType?: string;
-  resourceStatus?: 0 | 1 | 2 | 4;
-}
-
-export function collectionResources(params: CollectionResourcesParamsType) {
-  return FUtil.Request({
-    method: 'GET',
-    url: `/v2/collections/resources`,
-    params: params,
-  });
-
-}
-
-// 删除收藏的资源
-interface DeleteCollectResourceParamsType {
-  resourceId: string;
-}
-
-export function deleteCollectResource({resourceId}: DeleteCollectResourceParamsType) {
-  // return FUtil.Axios.delete(`/v2/collections/resources/${resourceId}`);
-  return FUtil.Request({
-    method: 'DELETE',
-    url: `/v2/collections/resources/${resourceId}`,
-    // params: params,
-  });
-}
-
-// 批量查询资源是否收藏
-interface IsCollectedParamsType {
-  resourceIds: string;
-}
-
-export function isCollected(params: IsCollectedParamsType) {
-  // return FUtil.Axios.get('/v2/collections/resources/isCollected', {
-  //   params
-  // });
-  return FUtil.Request({
-    method: 'GET',
-    url: `/v2/collections/resources/isCollected`,
-    params: params,
-  });
-}
-
-// 查询资源总收藏数量
-interface CollectedCountParamsType {
-  resourceId: string;
-}
-
-export function collectedCount({resourceId}: CollectedCountParamsType) {
-  // return FUtil.Axios.get(`/v2/collections/resources/${resourceId}/count`);
-  return FUtil.Request({
-    method: 'GET',
-    url: `/v2/collections/resources/${resourceId}/count`,
-    // params: params,
-  });
-}
+import FUtil from '../utils';
+
+// 收藏资源
+interface CollectResourceParamsType {
+  resourceId: string;
+}
+
+export function collectResource(params: CollectResourceParamsType) {
+  // return FUtil.Axios.post('/v2/collections/resources', params);
+  return FUtil.Request({
+    method: 'POST',
+    url: `/v2/collections/resources`,
+    data: params,
+  });
+}
+
+// 查看收藏的资源列表
+interface CollectionResourcesParamsType {
+  skip?: number;
+  limit?: number;
+  keywords?: string;
+  resourceType?: string;
+  resourceTypeCode?: string;
+  resourceTypeCategory?: 1 | 2;
+  omitResourceType?: string;
+  resourceStatus?: 0 | 1 | 2 | 4;
+}
+
+export function collectionResources(params: CollectionResourcesParamsType) {
+  return FUtil.Request({
+    method: 'GET',
+    url: `/v2/collections/resources`,
+    params: params,
+  });
+
+}
+
+// 删除收藏的资源
+interface DeleteCollectResourceParamsType {
+  resourceId: string;
+}
+
+export function deleteCollectResource({resourceId}: DeleteCollectResourceParamsType) {
+  // return FUtil.Axios.delete(`/v2/collections/resources/${resourceId}`);
+  return FUtil.Request({
+    method: 'DELETE',
+    url: `/v2/collections/resources/${resourceId}`,
+    // params: params,
+  });
+}
+
+// 批量查询资源是否收藏
+interface IsCollectedParamsType {
+  resourceIds: string;
+}
+
+export function isCollected(params: IsCollectedParamsType) {
+  // return FUtil.Axios.get('/v2/collections/resources/isCollected', {
+  //   params
+  // });
+  return FUtil.Request({
+    method: 'GET',
+    url: `/v2/collections/resources/isCollected`,
+    params: params,
+  });
+}
+
+// 查询资源总收藏数量
+interface CollectedCountParamsType {
+  resourceId: string;
+}
+
+export function collectedCount({resourceId}: CollectedCountParamsType) {
+  // return FUtil.Axios.get(`/v2/collections/resources/${resourceId}/count`);
+  return FUtil.Request({
+    method: 'GET',
+    url: `/v2/collections/resources/${resourceId}/count`,
+    // params: params,
+  });
+}

package/src/service-API/resources.ts

@@ -54,6 +54,7 @@ export function create(params: CreateParamsType) {
 interface UpdateParamsType {
   resourceId: string;
   status?: 0 | 1;
+  resourceTitle?: string;
   intro?: string;
   tags?: string[];
   coverImages?: string[];
@@ -216,7 +217,7 @@ interface CreateVersionParamsType {
       policyId: string;
     }[];
   }[];
-  inputAttrs: {
+  inputAttrs?: {
     key: string;
     value: string;
   }[];

package/src/utils/hooks.ts

@@ -1,17 +1,17 @@
-import * as React from 'react';
-
-export function useGetState<T>(initVal: T): [T, (newVal: T) => void, () => T] {
-  const [state, setState] = React.useState<T>(initVal);
-  const ref = React.useRef<T>(initVal);
-
-  function setStateCopy(newVal: T): void {
-    ref.current = newVal;
-    setState(newVal);
-  }
-
-  function getState(): T {
-    return ref.current;
-  }
-
-  return [state, setStateCopy, getState];
-}
+import * as React from 'react';
+
+export function useGetState<T>(initVal: T): [T, (newVal: T) => void, () => T] {
+  const [state, setState] = React.useState<T>(initVal);
+  const ref = React.useRef<T>(initVal);
+
+  function setStateCopy(newVal: T): void {
+    ref.current = newVal;
+    setState(newVal);
+  }
+
+  function getState(): T {
+    return ref.current;
+  }
+
+  return [state, setStateCopy, getState];
+}

package/src/utils/index.ts

@@ -1,22 +1,22 @@
-import * as Format from './format';
-import * as Regexp from './regexp';
-import * as LinkTo from './linkTo';
-import * as Predefined from './predefined';
-import Axios, {request} from './axios';
-import * as Tool from './tools';
-import * as Hook from './hooks';
-// import I18n from '../i18n';
-
-const FUtil = {
-  Format,
-  Regexp,
-  LinkTo,
-  Predefined,
-  Axios,
-  Request: request,
-  Tool,
-  Hook,
-  // i18n: new I18n(),
-};
-
-export default FUtil;
+import * as Format from './format';
+import * as Regexp from './regexp';
+import * as LinkTo from './linkTo';
+import * as Predefined from './predefined';
+import Axios, {request} from './axios';
+import * as Tool from './tools';
+import * as Hook from './hooks';
+// import I18n from '../i18n';
+
+const FUtil = {
+  Format,
+  Regexp,
+  LinkTo,
+  Predefined,
+  Axios,
+  Request: request,
+  Tool,
+  Hook,
+  // i18n: new I18n(),
+};
+
+export default FUtil;