@freelog/tools-lib 0.1.152 → 0.1.154

package/dist/i18n/I18nNext.d.ts

@@ -8,10 +8,13 @@ declare class I18nNext {
     private _taskQueue;
     private _currentLanguage;
     constructor();
-    ready(this: I18nNext): Promise<unknown>;
+    ready(this: I18nNext): Promise<void>;
     t(this: I18nNext, key: string, options?: {
         [key: string]: any;
     }): string;
+    tJSXElement(this: I18nNext, key: string, options?: {
+        [key: string]: any;
+    }): string | JSX.Element | JSX.Element[];
     changeLanguage(this: I18nNext, lng: LanguageKeyType): void;
     getAllLanguage(this: I18nNext): typeof allLanguage;
     getCurrentLanguage(this: I18nNext): LanguageKeyType;

package/dist/service-API/collections.d.ts

@@ -8,6 +8,7 @@ interface CollectionResourcesParamsType {
     keywords?: string;
     resourceType?: string;
     resourceTypeCode?: string;
+    resourceTypeCategory?: 1 | 2;
     omitResourceType?: string;
     resourceStatus?: 0 | 1 | 2 | 4;
 }

package/dist/service-API/resources.d.ts

@@ -60,6 +60,7 @@ interface ListParamsType {
     keywords?: string;
     resourceType?: string;
     resourceTypeCode?: string;
+    resourceTypeCategory?: 1 | 2;
     omitResourceType?: string;
     isSelf?: 0 | 1;
     userId?: number;
@@ -140,6 +141,10 @@ interface CreateVersionParamsType {
             policyId: string;
         }[];
     }[];
+    inputAttrs: {
+        key: string;
+        value: string;
+    }[];
 }
 export declare function createVersion({ resourceId, ...params }: CreateVersionParamsType): Promise<any>;
 interface ResourceVersionInfo1ParamsType {
@@ -181,6 +186,10 @@ interface UpdateResourceVersionInfoParamsType {
             policyId: string;
         }[];
     }[];
+    inputAttrs: {
+        key: string;
+        value: string;
+    }[];
 }
 export declare function updateResourceVersionInfo(params: UpdateResourceVersionInfoParamsType): Promise<any>;
 interface SaveVersionsDraftParamsType {
@@ -294,10 +303,14 @@ interface GetResourceTypeInfoByCodeParamsType {
     code: string;
 }
 export declare function getResourceTypeInfoByCode({ ...params }: GetResourceTypeInfoByCodeParamsType): Promise<any>;
-interface GetResourceAttrListSimple {
+interface GetResourceAttrListSimpleParamsType {
+}
+export declare function getResourceAttrListSimple({ ...params }: GetResourceAttrListSimpleParamsType): Promise<any>;
+interface ListSimple4RecentlyParamsType {
 }
-export declare function getResourceAttrListSimple({ ...params }: GetResourceAttrListSimple): Promise<any>;
-interface ListSimple4RecentlySimple {
+export declare function listSimple4Recently({ ...params }?: ListSimple4RecentlyParamsType): Promise<any>;
+interface GetAttrsInfoByKeyParamsType {
+    key: string;
 }
-export declare function listSimple4Recently({ ...params }?: ListSimple4RecentlySimple): Promise<any>;
+export declare function getAttrsInfoByKey({ ...params }: GetAttrsInfoByKeyParamsType): Promise<any>;
 export {};

package/dist/tools-lib.cjs.development.js

@@ -8,8 +8,10 @@ var moment = _interopDefault(require('moment'));
 var querystring = require('querystring');
 var axios = _interopDefault(require('axios'));
 var CryptoJS = require('crypto-js');
+var React = require('react');
 var i18next = _interopDefault(require('i18next'));
 var Cookies = _interopDefault(require('js-cookie'));
+var htmlReactParser = _interopDefault(require('html-react-parser'));
 
 // import {ContractEntity} from '@freelog/resource-policy-lang/dist/tools/ContractTool';
 // const {compile} = require('@freelog/resource-policy-lang');
@@ -158,7 +160,11 @@ var MAX_2_DECIMAL_POSITIVE_NUMBER = /*#__PURE__*/new RegExp(/^\d+(\.\d{0,2})?$/)
 
 var BUCKET_NAME = /*#__PURE__*/new RegExp(/^([a-z0-9][a-z0-9-]{0,61})?[a-z0-9]$/); // JS变量名称
 
-var JS_VARIABLE_NAME = /*#__PURE__*/new RegExp(/^[A-Za-z$_][\w$_]*$/);
+var JS_VARIABLE_NAME = /*#__PURE__*/new RegExp(/^[A-Za-z$_][\w$_]*$/); // 日期
+
+var DATE = /*#__PURE__*/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)$/); // 日期时间
+
+var DATE_TIME = /*#__PURE__*/new RegExp(/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/);
 
 var Regexp = {
   __proto__: null,
@@ -177,7 +183,9 @@ var Regexp = {
   POSITIVE_INTEGER: POSITIVE_INTEGER,
   MAX_2_DECIMAL_POSITIVE_NUMBER: MAX_2_DECIMAL_POSITIVE_NUMBER,
   BUCKET_NAME: BUCKET_NAME,
-  JS_VARIABLE_NAME: JS_VARIABLE_NAME
+  JS_VARIABLE_NAME: JS_VARIABLE_NAME,
+  DATE: DATE,
+  DATE_TIME: DATE_TIME
 };
 
 function _regeneratorRuntime() {
@@ -601,7 +609,8 @@ var _excluded = ["resourceID"],
     _excluded2 = ["nodeID", "showPage"],
     _excluded3 = ["nodeID", "showPage"],
     _excluded4 = ["goTo"],
-    _excluded5 = ["goTo"];
+    _excluded5 = ["goTo"],
+    _excluded6 = ["goTo", "returnUrl"];
 function home(_temp) {
   var _ref = _temp === void 0 ? {} : _temp;
 
@@ -783,84 +792,101 @@ function resourceFreeze(_ref29) {
   var resourceID = _ref29.resourceID;
   return "/result/resource/freeze/" + resourceID;
 }
+function globalSearch(_ref30) {
+  var search = _ref30.search;
+  return "/search" + handleQuery({
+    search: search
+  });
+}
 function login(_temp13) {
-  var _ref30 = _temp13 === void 0 ? {} : _temp13,
-      goTo = _ref30.goTo;
+  var _ref31 = _temp13 === void 0 ? {} : _temp13,
+      goTo = _ref31.goTo;
 
   return "/login" + handleQuery({
     goTo: goTo ? encodeURIComponent(goTo) : undefined
   });
 }
 function logon(_temp14) {
-  var _ref31 = _temp14 === void 0 ? {} : _temp14,
-      goTo = _ref31.goTo,
-      params = _objectWithoutPropertiesLoose(_ref31, _excluded5);
+  var _ref32 = _temp14 === void 0 ? {} : _temp14,
+      goTo = _ref32.goTo,
+      params = _objectWithoutPropertiesLoose(_ref32, _excluded5);
 
   return "/logon" + handleQuery(_extends({
     goTo: goTo ? encodeURIComponent(goTo) : undefined
   }, params));
 }
-function retrieveUserPassword(_temp15) {
-  var _ref32 = _temp15 === void 0 ? {} : _temp15,
-      goTo = _ref32.goTo;
+function bind(_temp15) {
+  var _ref33 = _temp15 === void 0 ? {} : _temp15,
+      goTo = _ref33.goTo,
+      returnUrl = _ref33.returnUrl,
+      params = _objectWithoutPropertiesLoose(_ref33, _excluded6);
+
+  return "/bind" + handleQuery(_extends({
+    goTo: goTo ? encodeURIComponent(goTo) : undefined,
+    returnUrl: returnUrl ? encodeURIComponent(returnUrl) : undefined
+  }, params));
+}
+function retrieveUserPassword(_temp16) {
+  var _ref34 = _temp16 === void 0 ? {} : _temp16,
+      goTo = _ref34.goTo;
 
   return "/retrieve" + handleQuery({
     goTo: goTo ? encodeURIComponent(goTo) : undefined
   });
 }
-function retrievePayPassword(_temp16) {
-  var _ref33 = _temp16 === void 0 ? {} : _temp16;
+function retrievePayPassword(_temp17) {
+  var _ref35 = _temp17 === void 0 ? {} : _temp17;
 
-  _objectDestructuringEmpty(_ref33);
+  _objectDestructuringEmpty(_ref35);
 
   return "/retrievePayPassword";
 }
-function userFreeze(_temp17) {
-  var _ref34 = _temp17 === void 0 ? {} : _temp17;
+function userFreeze(_temp18) {
+  var _ref36 = _temp18 === void 0 ? {} : _temp18;
 
-  _objectDestructuringEmpty(_ref34);
+  _objectDestructuringEmpty(_ref36);
 
   return "/freeze";
 }
-function wallet(_temp18) {
-  var _ref35 = _temp18 === void 0 ? {} : _temp18;
+function wallet(_temp19) {
+  var _ref37 = _temp19 === void 0 ? {} : _temp19;
 
-  _objectDestructuringEmpty(_ref35);
+  _objectDestructuringEmpty(_ref37);
 
   return "/logged/wallet";
 }
-function reward(_temp19) {
-  var _ref36 = _temp19 === void 0 ? {} : _temp19;
+function reward(_temp20) {
+  var _ref38 = _temp20 === void 0 ? {} : _temp20;
 
-  _objectDestructuringEmpty(_ref36);
+  _objectDestructuringEmpty(_ref38);
 
   return "/logged/reward";
 }
-function contract(_temp20) {
-  var _ref37 = _temp20 === void 0 ? {} : _temp20;
+function contract(_temp21) {
+  var _ref39 = _temp21 === void 0 ? {} : _temp21;
 
-  _objectDestructuringEmpty(_ref37);
+  _objectDestructuringEmpty(_ref39);
 
   return "/logged/contract";
 }
-function setting(_temp21) {
-  var _ref38 = _temp21 === void 0 ? {} : _temp21;
+function setting(_temp22) {
+  var _ref40 = _temp22 === void 0 ? {} : _temp22;
 
-  _objectDestructuringEmpty(_ref38);
+  _objectDestructuringEmpty(_ref40);
 
   return "/logged/setting";
 }
-function binding(_temp22) {
-  var _ref39 = _temp22 === void 0 ? {} : _temp22;
+function binding(_temp23) {
+  var _ref41 = _temp23 === void 0 ? {} : _temp23;
 
-  _objectDestructuringEmpty(_ref39);
+  _objectDestructuringEmpty(_ref41);
 
   return "/logged/binding";
 }
-function resultBindingSuccess(_temp23) {
-  var _ref40 = _temp23 === void 0 ? {} : _temp23;
+function resultBindingSuccess(_temp24) {
+  var _ref42 = _temp24 === void 0 ? {} : _temp24;
 
-  _objectDestructuringEmpty(_ref40);
+  _objectDestructuringEmpty(_ref42);
 
   return "/result/binding";
 }
@@ -914,8 +940,10 @@ var LinkTo = {
   exception403: exception403,
   nodeFreeze: nodeFreeze,
   resourceFreeze: resourceFreeze,
+  globalSearch: globalSearch,
   login: login,
   logon: logon,
+  bind: bind,
   retrieveUserPassword: retrieveUserPassword,
   retrievePayPassword: retrievePayPassword,
   userFreeze: userFreeze,
@@ -1030,7 +1058,7 @@ var _excluded$1 = ["presentableId"],
     _excluded3$1 = ["presentableId"],
     _excluded4$1 = ["presentableId"],
     _excluded5$1 = ["presentableId"],
-    _excluded6 = ["presentableId"],
+    _excluded6$1 = ["presentableId"],
     _excluded7 = ["presentableId"],
     _excluded8 = ["presentableId"],
     _excluded9 = ["nodeId"],
@@ -1127,7 +1155,7 @@ function relationTree(_ref4) {
 }
 function authTree(_ref5) {
   var presentableId = _ref5.presentableId,
-      params = _objectWithoutPropertiesLoose(_ref5, _excluded6);
+      params = _objectWithoutPropertiesLoose(_ref5, _excluded6$1);
 
   // return FUtil.Axios.get(`/v2/presentables/${presentableId}/authTree`, {params});
   return FUtil.Request({
@@ -1462,9 +1490,6 @@ function collectResource(params) {
   });
 }
 function collectionResources(params) {
-  // return FUtil.Axios.get('/v2/collections/resources', {
-  //   params
-  // });
   return FUtil.Request({
     method: 'GET',
     url: "/v2/collections/resources",
@@ -1512,7 +1537,7 @@ var _excluded$3 = ["resourceIdOrName"],
     _excluded3$3 = ["resourceId"],
     _excluded4$3 = ["resourceId"],
     _excluded5$3 = ["resourceId", "version"],
-    _excluded6$1 = ["fileSha1"],
+    _excluded6$2 = ["fileSha1"],
     _excluded7$1 = ["fileSha1"],
     _excluded8$1 = ["resourceId"],
     _excluded9$1 = ["resourceId"],
@@ -1611,7 +1636,7 @@ function resourceVersionInfo2(params) {
 }
 function getResourceVersionBySha1(_ref6) {
   var fileSha1 = _ref6.fileSha1,
-      params = _objectWithoutPropertiesLoose(_ref6, _excluded6$1);
+      params = _objectWithoutPropertiesLoose(_ref6, _excluded6$2);
 
   // return FUtil.Axios.get(`/v2/resources/files/${fileSha1}/versions`, {
   //   params,
@@ -1822,6 +1847,15 @@ function listSimple4Recently(_temp2) {
     params: params
   });
 }
+function getAttrsInfoByKey(_ref22) {
+  var params = _extends({}, _ref22);
+
+  return FUtil.Request({
+    method: 'GET',
+    url: "/v2/resources/attrs/getInfoByKey",
+    params: params
+  });
+}
 
 var Resource = {
   __proto__: null,
@@ -1856,7 +1890,8 @@ var Resource = {
   ListSimpleByParentCode: ListSimpleByParentCode,
   getResourceTypeInfoByCode: getResourceTypeInfoByCode,
   getResourceAttrListSimple: getResourceAttrListSimple,
-  listSimple4Recently: listSimple4Recently
+  listSimple4Recently: listSimple4Recently,
+  getAttrsInfoByKey: getAttrsInfoByKey
 };
 
 var _excluded$4 = ["loginName"];
@@ -2069,7 +2104,7 @@ var _excluded$5 = ["nodeId"],
     _excluded3$4 = ["nodeId"],
     _excluded4$4 = ["nodeId"],
     _excluded5$4 = ["nodeId"],
-    _excluded6$2 = ["testResourceId"],
+    _excluded6$3 = ["testResourceId"],
     _excluded7$2 = ["testResourceId"],
     _excluded8$2 = ["nodeId"],
     _excluded9$2 = ["nodeId"],
@@ -2134,7 +2169,7 @@ function testNodeRules(_ref6) {
 }
 function updateTestResourceContracts(_ref7) {
   var testResourceId = _ref7.testResourceId,
-      params = _objectWithoutPropertiesLoose(_ref7, _excluded6$2);
+      params = _objectWithoutPropertiesLoose(_ref7, _excluded6$3);
 
   // return FUtil.Axios.put(`/v2/testNodes/testResources/${testResourceId}`, params);
   return FUtil.Request({
@@ -3227,6 +3262,30 @@ function _request() {
   return _request.apply(this, arguments);
 }
 
+function useGetState(initVal) {
+  var _React$useState = React.useState(initVal),
+      state = _React$useState[0],
+      setState = _React$useState[1];
+
+  var ref = React.useRef(initVal);
+
+  function setStateCopy(newVal) {
+    ref.current = newVal;
+    setState(newVal);
+  }
+
+  function getState() {
+    return ref.current;
+  }
+
+  return [state, setStateCopy, getState];
+}
+
+var Hook = {
+  __proto__: null,
+  useGetState: useGetState
+};
+
 var FUtil = {
   Format: Format,
   Regexp: Regexp,
@@ -3234,7 +3293,8 @@ var FUtil = {
   Predefined: Predefined,
   Axios: axios,
   Request: request,
-  Tool: Tool
+  Tool: Tool,
+  Hook: Hook
 };
 
 var ossJsonUrl = 'https://freelog-i18n.oss-cn-shenzhen.aliyuncs.com/configs/i18n.json';
@@ -3352,6 +3412,10 @@ var I18nNext = /*#__PURE__*/function () {
     return i18next.t(key.trim(), options);
   };
 
+  _proto.tJSXElement = function tJSXElement(key, options) {
+    return htmlReactParser(i18next.t(key.trim(), options));
+  };
+
   _proto.changeLanguage = function changeLanguage(lng) {
     // return i18next.changeLanguage(lng);
     // window.localStorage.setItem(localStorage_i18nextLng_key, lng)