@freelog/tools-lib 0.1.78 → 0.1.80

package/dist/utils/regexp.d.ts

@@ -10,5 +10,7 @@ export declare const EMAIL_ADDRESS: RegExp;
 export declare const USERNAME: RegExp;
 export declare const PASSWORD: RegExp;
 export declare const NATURAL_NUMBER: RegExp;
+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;

package/dist/utils/tools.d.ts

@@ -12,3 +12,12 @@ export declare function generateRandomCode(strLen?: number): string;
  * 通过读取 cookies 获取用户 ID
  */
 export declare function getUserIDByCookies(): number;
+/**
+ * 将服务端的合约状态转换成前端需要的状态
+ */
+interface TransformServerAPIContractStateParams {
+    status: 0 | 1 | 2;
+    authStatus: 1 | 2 | 128 | number;
+}
+export declare function transformServerAPIContractState({ status, authStatus, }: TransformServerAPIContractStateParams): 'active' | 'testActive' | 'inactive' | 'terminal' | 'exception';
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@freelog/tools-lib",
-  "version": "0.1.78",
+  "version": "0.1.80",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

package/src/utils/linkTo.ts

@@ -239,7 +239,7 @@ export function retrievePayPassword() {
   return `/retrievePayPassword`;
 }
 
-// 钱包
+// 我的钱包
 // interface WalletParamsType {
 // }
 
@@ -247,6 +247,7 @@ export function wallet() {
   return `/logged/wallet`;
 }
 
+// 我的合约
 // interface ContractParamsType {
 // }
 
@@ -254,9 +255,9 @@ export function contract() {
   return `/logged/contract`;
 }
 
+// 个人设置
 // interface SettingParamsType {
 // }
-
 export function setting() {
   return `/logged/setting`;
 }
@@ -273,3 +274,4 @@ function handleQuery(query: object): string {
 }
 
 
+

package/src/utils/regexp.ts

@@ -1,46 +1,52 @@
-// 展品名称
-export const EXHIBIT_NAME: RegExp = new RegExp(/^(?!.*(\\|\/|:|\*|\?|"|<|>|\||\s|@|\$|#)).{1,60}$/);
-
-// 资源名称
-export const RESOURCE_NAME: RegExp = new RegExp(/^(?!.*(\\|\/|:|\*|\?|"|<|>|\||\s|@|\$|#)).{1,60}$/);
-
-// 资源类型
-// export const RESOURCE_TYPE: RegExp = new RegExp(/^(?!_)[a-z0-9_]{3,20}(?<!_)$/);
-export const RESOURCE_TYPE: RegExp = new RegExp(/^[a-z0-9][a-z0-9_]{1,18}[a-z0-9]$/);
-
-// 自定义属性键
-export const CUSTOM_KEY: RegExp = new RegExp(/^[a-zA-Z0-9_]{1,20}$/);
-
-// 节点名称
-export const NODE_NAME: RegExp = new RegExp(/^[\u4E00-\u9FA5|a-zA-Z0-9]{2,24}$/);
-
-// 节点地址
-// export const NODE_DOMAIN: RegExp = new RegExp(/^(?!-)[a-z0-9-]{4,24}(?<!-)$/);
-export const NODE_DOMAIN: RegExp = new RegExp(/^[a-z0-9][a-z0-9-]{2,22}[a-z0-9]$/);
-
-// 支付密码
-export const PAY_PASSWORD: RegExp = new RegExp(/^\d{6}$/);
-
-// 手机号码
-export const MOBILE_PHONE_NUMBER = new RegExp(/^1[345789]\d{9}$/);
-// export const TELEPHONE_NUMBER = /^((13[0-9])|(14[5-9])|(15([0-3]|[5-9]))|(16[6-7])|(17[1-8])|(18[0-9])|(19[1|3])|(19[5|6])|(19[8|9]))\d{8}$/
-
-// 邮箱地址
-export const EMAIL_ADDRESS: RegExp = new RegExp(/^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/);
-
-// 用户名
-// export const USERNAME: RegExp = new RegExp(/^(?!-)[A-Za-z0-9-]{1,30}(?<!-)$/);
-export const USERNAME: RegExp = new RegExp(/^([A-Za-z0-9][A-Za-z0-9-]{0,28})?[A-Za-z0-9]$/);
-
-// 用户密码
-// export const PASSWORD = /^(?=.*[a-zA-Z])(?=.*[0-9]).{6,24}$/;
-export const PASSWORD: RegExp = new RegExp(/^(?=.*[0-9])(?=.*[a-zA-Z])(.{6,24})$/);
-
-// 自然数
-export const NATURAL_NUMBER: RegExp = new RegExp(/^[0-9]*$/);
-
-// 对象的Bucket名称
-export const BUCKET_NAME: RegExp = new RegExp(/^([a-z0-9][a-z0-9-]{0,61})?[a-z0-9]$/);
-
-// JS变量名称
-export const JS_VARIABLE_NAME: RegExp = new RegExp(/^[A-Za-z$_][\w$_]*$/);
+// 展品名称
+export const EXHIBIT_NAME: RegExp = new RegExp(/^(?!.*(\\|\/|:|\*|\?|"|<|>|\||\s|@|\$|#)).{1,60}$/);
+
+// 资源名称
+export const RESOURCE_NAME: RegExp = new RegExp(/^(?!.*(\\|\/|:|\*|\?|"|<|>|\||\s|@|\$|#)).{1,60}$/);
+
+// 资源类型
+// export const RESOURCE_TYPE: RegExp = new RegExp(/^(?!_)[a-z0-9_]{3,20}(?<!_)$/);
+export const RESOURCE_TYPE: RegExp = new RegExp(/^[a-z0-9][a-z0-9_]{1,18}[a-z0-9]$/);
+
+// 自定义属性键
+export const CUSTOM_KEY: RegExp = new RegExp(/^[a-zA-Z0-9_]{1,20}$/);
+
+// 节点名称
+export const NODE_NAME: RegExp = new RegExp(/^[\u4E00-\u9FA5|a-zA-Z0-9]{2,24}$/);
+
+// 节点地址
+// export const NODE_DOMAIN: RegExp = new RegExp(/^(?!-)[a-z0-9-]{4,24}(?<!-)$/);
+export const NODE_DOMAIN: RegExp = new RegExp(/^[a-z0-9][a-z0-9-]{2,22}[a-z0-9]$/);
+
+// 支付密码
+export const PAY_PASSWORD: RegExp = new RegExp(/^\d{6}$/);
+
+// 手机号码
+export const MOBILE_PHONE_NUMBER = new RegExp(/^1[345789]\d{9}$/);
+// export const TELEPHONE_NUMBER = /^((13[0-9])|(14[5-9])|(15([0-3]|[5-9]))|(16[6-7])|(17[1-8])|(18[0-9])|(19[1|3])|(19[5|6])|(19[8|9]))\d{8}$/
+
+// 邮箱地址
+export const EMAIL_ADDRESS: RegExp = new RegExp(/^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/);
+
+// 用户名
+// export const USERNAME: RegExp = new RegExp(/^(?!-)[A-Za-z0-9-]{1,30}(?<!-)$/);
+export const USERNAME: RegExp = new RegExp(/^([A-Za-z0-9][A-Za-z0-9-]{0,28})?[A-Za-z0-9]$/);
+
+// 用户密码
+// export const PASSWORD = /^(?=.*[a-zA-Z])(?=.*[0-9]).{6,24}$/;
+export const PASSWORD: RegExp = new RegExp(/^(?=.*[0-9])(?=.*[a-zA-Z])(.{6,24})$/);
+
+// 自然数
+export const NATURAL_NUMBER: RegExp = new RegExp(/^[0-9]*$/);
+
+// 正整数
+export const POSITIVE_INTEGER = new RegExp(/^[1-9]\d*$/);
+
+// 最多两位小数的正数
+export const MAX_2_DECIMAL_POSITIVE_NUMBER = new RegExp(/^\d+(.\d{1,2})?$/);
+
+// 对象的Bucket名称
+export const BUCKET_NAME: RegExp = new RegExp(/^([a-z0-9][a-z0-9-]{0,61})?[a-z0-9]$/);
+
+// JS变量名称
+export const JS_VARIABLE_NAME: RegExp = new RegExp(/^[A-Za-z$_][\w$_]*$/);

package/src/utils/tools.ts

@@ -39,3 +39,34 @@ export function getUserIDByCookies(): number {
   }
   return Number(uid.replace('uid=', ''));
 }
+
+
+/**
+ * 将服务端的合约状态转换成前端需要的状态
+ */
+interface TransformServerAPIContractStateParams {
+  status: 0 | 1 | 2; // 合同综合状态: 0:正常 1:已终止(不接受任何事件,也不给授权,事实上无效的合约) 2:异常
+  authStatus: 1 | 2 | 128 | number; // 合同授权状态 1:正式授权 2:测试授权 128:未获得授权
+}
+
+export function transformServerAPIContractState({
+                                           status,
+                                           authStatus,
+                                         }: TransformServerAPIContractStateParams): 'active' | 'testActive' | 'inactive' | 'terminal' | 'exception' {
+  if (status === 0) {
+    if (authStatus === 1 || authStatus === 3) {
+      return 'active';
+    }
+    if (authStatus === 2) {
+      return 'testActive';
+    }
+    if (authStatus === 128) {
+      return 'inactive';
+    }
+  }
+
+  if (status === 1) {
+    return 'terminal';
+  }
+  return 'exception';
+}