@freelog/tools-lib 0.1.152 → 0.1.154

package/dist/utils/hooks.d.ts

@@ -0,0 +1 @@
+export declare function useGetState<T>(initVal: T): [T, (newVal: T) => void, () => T];

package/dist/utils/index.d.ts

@@ -4,6 +4,7 @@ import * as LinkTo from './linkTo';
 import * as Predefined from './predefined';
 import { request } from './axios';
 import * as Tool from './tools';
+import * as Hook from './hooks';
 declare const FUtil: {
     Format: typeof Format;
     Regexp: typeof Regexp;
@@ -12,5 +13,6 @@ declare const FUtil: {
     Axios: import("axios").AxiosStatic;
     Request: typeof request;
     Tool: typeof Tool;
+    Hook: typeof Hook;
 };
 export default FUtil;

package/dist/utils/linkTo.d.ts

@@ -119,6 +119,10 @@ interface ResourceFreezeParamsType {
     resourceID: string;
 }
 export declare function resourceFreeze({ resourceID }: ResourceFreezeParamsType): string;
+interface GlobalSearchParamsType {
+    search: string;
+}
+export declare function globalSearch({ search }: GlobalSearchParamsType): string;
 /************** console End ******************************************************/
 /************** user Start ******************************************************/
 interface LoginParamsType {
@@ -130,6 +134,12 @@ interface LoginParamsType {
     invitationCode?: string;
 }
 export declare function logon({ goTo, ...params }?: LoginParamsType): string;
+interface LoginParamsType {
+    goTo?: string;
+    identityId?: string;
+    returnUrl?: string;
+}
+export declare function bind({ goTo, returnUrl, ...params }?: LoginParamsType): string;
 interface RetrieveUserPasswordParamsType {
     goTo?: string;
 }

package/dist/utils/regexp.d.ts

@@ -14,3 +14,5 @@ export declare const POSITIVE_INTEGER: RegExp;
 export declare const MAX_2_DECIMAL_POSITIVE_NUMBER: RegExp;
 export declare const BUCKET_NAME: RegExp;
 export declare const JS_VARIABLE_NAME: RegExp;
+export declare const DATE: RegExp;
+export declare const DATE_TIME: RegExp;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@freelog/tools-lib",
-  "version": "0.1.152",
+  "version": "0.1.154",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -48,6 +48,7 @@
     "@types/js-cookie": "^3.0.2",
     "@types/node": "^18.7.16",
     "@types/nprogress": "^0.2.0",
+    "@types/react": "^18.2.17",
     "husky": "^6.0.0",
     "size-limit": "^4.11.0",
     "tsdx": "^0.14.1",
@@ -58,9 +59,11 @@
     "@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",
-    "nprogress": "^0.2.0"
+    "nprogress": "^0.2.0",
+    "react": "^18.2.0"
   }
 }

package/src/i18n/I18nNext.ts

@@ -2,6 +2,8 @@ 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';
 
@@ -32,7 +34,7 @@ class I18nNext {
     this.getCurrentLanguage = this.getCurrentLanguage.bind(this);
   }
 
-  async ready(this: I18nNext) {
+  async ready(this: I18nNext): Promise<void> {
     const exc = () => {
       while (this._taskQueue.length > 0) {
         const task = this._taskQueue.shift();
@@ -56,18 +58,23 @@ class I18nNext {
       // console.log('######');
       exc();
     };
-    const promise = new Promise((resolve) => {
+    const promise = new Promise<void>((resolve) => {
       this._taskQueue.push(resolve);
     });
     handleTasks();
     return promise;
   }
 
-  t(this: I18nNext, key: string, options?: { [key: string]: any }) {
+  t(this: I18nNext, key: string, options?: { [key: string]: any }): string {
     return i18next.t(key.trim(), options);
   }
 
-  changeLanguage(this: I18nNext, lng: LanguageKeyType) {
+  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, {
@@ -84,7 +91,7 @@ class I18nNext {
     return this._currentLanguage;
   }
 
-  private async _handleData(this: I18nNext) {
+  private async _handleData(this: I18nNext): Promise<void> {
 
     const lng: string = this._currentLanguage;
     const resource: string | null = window.localStorage.getItem(localStorage_i18nextResources_key);

package/src/service-API/collections.ts

@@ -21,14 +21,12 @@ interface CollectionResourcesParamsType {
   keywords?: string;
   resourceType?: string;
   resourceTypeCode?: string;
+  resourceTypeCategory?: 1 | 2;
   omitResourceType?: string;
   resourceStatus?: 0 | 1 | 2 | 4;
 }
 
 export function collectionResources(params: CollectionResourcesParamsType) {
-  // return FUtil.Axios.get('/v2/collections/resources', {
-  //   params
-  // });
   return FUtil.Request({
     method: 'GET',
     url: `/v2/collections/resources`,

package/src/service-API/resources.ts

@@ -83,6 +83,7 @@ interface ListParamsType {
   keywords?: string;
   resourceType?: string;
   resourceTypeCode?: string;
+  resourceTypeCategory?: 1 | 2; // 资源类型分类，1：基础类型，2：自定义类型，其实只有2时生效，生效时，resourceTypeCode为父类类型
   omitResourceType?: string;
   isSelf?: 0 | 1;
   userId?: number;
@@ -215,6 +216,10 @@ interface CreateVersionParamsType {
       policyId: string;
     }[];
   }[];
+  inputAttrs: {
+    key: string;
+    value: string;
+  }[];
 }
 
 export function createVersion({resourceId, ...params}: CreateVersionParamsType) {
@@ -307,6 +312,10 @@ interface UpdateResourceVersionInfoParamsType {
       policyId: string;
     }[];
   }[];
+  inputAttrs: {
+    key: string;
+    value: string;
+  }[];
 }
 
 export function updateResourceVersionInfo(params: UpdateResourceVersionInfoParamsType) {
@@ -597,11 +606,11 @@ export function getResourceTypeInfoByCode({...params}: GetResourceTypeInfoByCode
 }
 
 //
-interface GetResourceAttrListSimple {
+interface GetResourceAttrListSimpleParamsType {
 
 }
 
-export function getResourceAttrListSimple({...params}: GetResourceAttrListSimple) {
+export function getResourceAttrListSimple({...params}: GetResourceAttrListSimpleParamsType) {
   return FUtil.Request({
     method: 'GET',
     url: `/v2/resources/attrs/listSimple`,
@@ -609,14 +618,27 @@ export function getResourceAttrListSimple({...params}: GetResourceAttrListSimple
   });
 }
 
-interface ListSimple4RecentlySimple {
+interface ListSimple4RecentlyParamsType {
 
 }
 
-export function listSimple4Recently({...params}: ListSimple4RecentlySimple = {}) {
+export function listSimple4Recently({...params}: ListSimple4RecentlyParamsType = {}) {
   return FUtil.Request({
     method: 'GET',
     url: `/v2/resources/types/listSimple4Recently`,
     params: params,
   });
 }
+
+// 通过key取资源属性
+interface GetAttrsInfoByKeyParamsType {
+  key: string;
+}
+
+export function getAttrsInfoByKey({...params}: GetAttrsInfoByKeyParamsType) {
+  return FUtil.Request({
+    method: 'GET',
+    url: `/v2/resources/attrs/getInfoByKey`,
+    params: params,
+  });
+}

package/src/utils/hooks.ts

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

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 * as Hook from './hooks';
 // import I18n from '../i18n';
 
 const FUtil = {
@@ -14,6 +15,7 @@ const FUtil = {
   Axios,
   Request: request,
   Tool,
+  Hook,
   // i18n: new I18n(),
 };
 

package/src/utils/linkTo.ts

@@ -290,6 +290,17 @@ export function resourceFreeze({resourceID}: ResourceFreezeParamsType) {
   return `/result/resource/freeze/${resourceID}`;
 }
 
+// 站内搜索
+interface GlobalSearchParamsType {
+  search: string;
+}
+
+export function globalSearch({search}: GlobalSearchParamsType) {
+  return `/search${handleQuery({
+    search,
+  })}`;
+}
+
 /************** console End ******************************************************/
 
 
@@ -318,6 +329,21 @@ export function logon({goTo, ...params}: LoginParamsType = {}) {
   })}`;
 }
 
+// 绑定账户
+interface LoginParamsType {
+  goTo?: string;
+  identityId?: string;
+  returnUrl?: string;
+}
+
+export function bind({goTo, returnUrl, ...params}: LoginParamsType = {}) {
+  return `/bind${handleQuery({
+    goTo: goTo ? encodeURIComponent(goTo) : undefined,
+    returnUrl: returnUrl ? encodeURIComponent(returnUrl) : undefined,
+    ...params,
+  })}`;
+}
+
 // 找回密码
 interface RetrieveUserPasswordParamsType {
   goTo?: string;
@@ -380,7 +406,7 @@ export function setting({}: SettingParamsType = {}) {
 }
 
 
-// 绑定成功
+// 绑定
 interface BindingParamsType {
 }
 

package/src/utils/regexp.ts

@@ -51,3 +51,10 @@ export const BUCKET_NAME: RegExp = new RegExp(/^([a-z0-9][a-z0-9-]{0,61})?[a-z0-
 
 // JS变量名称
 export const JS_VARIABLE_NAME: RegExp = new RegExp(/^[A-Za-z$_][\w$_]*$/);
+
+// 日期
+export const DATE: RegExp = new RegExp(/(([0-9]{3}[1-9]|[0-9]{2}[1-9][0-9]{1}|[0-9]{1}[1-9][0-9]{2}|[1-9][0-9]{3})-(((0[13578]|1[02])-(0[1-9]|[12][0-9]|3[01]))|((0[469]|11)-(0[1-9]|[12][0-9]|30))|(02-(0[1-9]|[1][0-9]|2[0-8]))))|((([0-9]{2})(0[48]|[2468][048]|[13579][26])|((0[48]|[2468][048]|[3579][26])00))-02-29)$/);
+
+// 日期时间
+export const DATE_TIME: RegExp = new RegExp(/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/);
+