@freelog/tools-lib 0.1.64 → 0.1.68

package/dist/utils/linkTo.d.ts

@@ -62,15 +62,19 @@ interface ObjectDetailsParamsType {
     objectID: string;
 }
 export declare function objectDetails({ ...params }: ObjectDetailsParamsType): TReturnType;
-interface resourceCreateSuccessParamsType {
+interface ResourceCreateSuccessParamsType {
     resourceID: string;
 }
-export declare function resourceCreateSuccess({ resourceID }: resourceCreateSuccessParamsType): string;
-interface resourceVersionCreateSuccessParamsType {
+export declare function resourceCreateSuccess({ resourceID }: ResourceCreateSuccessParamsType): string;
+interface ResourceVersionCreateSuccessParamsType {
     resourceID: string;
     version: string;
 }
-export declare function resourceVersionCreateSuccess({ resourceID, version }: resourceVersionCreateSuccessParamsType): string;
+export declare function resourceVersionCreateSuccess({ resourceID, version }: ResourceVersionCreateSuccessParamsType): string;
+interface NodeCreateSuccessParamsType {
+    nodeID: number;
+}
+export declare function nodeCreateSuccess({ nodeID }: NodeCreateSuccessParamsType): string;
 interface Exception403ParamsType {
     from?: string;
 }

package/package.json

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

package/src/service-API/informalNodes.ts

@@ -199,7 +199,6 @@ interface RulesRematchParamsType {
 }
 
 export function rulesRematch({nodeId, ...params}: RulesRematchParamsType) {
-  // return FUtil.Axios.post(`/v2/testNodes/${nodeId}/rules/rematch`, params);
   return FUtil.Request({
     method: 'POST',
     url: `/v2/testNodes/${nodeId}/rules/rematch`,
@@ -207,6 +206,20 @@ export function rulesRematch({nodeId, ...params}: RulesRematchParamsType) {
   });
 }
 
+// 节点测试规则预执行(不存档)
+interface RulesPreExecutionParamsType {
+  nodeId: number;
+  testRuleText: string;
+}
+
+export function rulesPreExecution({nodeId, ...params}: RulesPreExecutionParamsType) {
+  return FUtil.Request({
+    method: 'PUT',
+    url: `/v2/testNodes/${nodeId}/rules/preExecution`,
+    data: params,
+  });
+}
+
 // 批量获取测试资源授权结果
 interface BatchGetAuthsParamsType {
   nodeId: number;
@@ -215,10 +228,8 @@ interface BatchGetAuthsParamsType {
 }
 
 export function batchGetAuths({nodeId, ...params}: BatchGetAuthsParamsType) {
-  // return FUtil.Axios.post(`/v2/testNodes/${nodeId}/rules/rematch`, params);
   return FUtil.Request({
     method: 'GET',
-    // url: `/v2/auths/testResources/nodes/${nodeId}/result`,
     url: `/v2/auths/exhibits/${nodeId}/test/batchAuth/results`,
     params: params,
   });

package/src/service-API/nodes.ts

@@ -1,65 +1,65 @@
-import FUtil from '../utils';
-
-// 创建节点
-export interface CreateParamsType {
-  nodeName: string;
-  nodeDomain: string;
-}
-
-export function create(params: CreateParamsType) {
-  // return FUtil.Axios.post('/v2/nodes', params);
-  return FUtil.Request({
-    method: 'POST',
-    url: `/v2/nodes`,
-    data: params,
-  });
-}
-
-// 查看节点详情
-interface NodeDetailParamsType1 {
-  nodeId: number;
-}
-
-interface NodeDetailParamsType2 {
-  nodeName?: string;
-  nodeDomain?: string;
-}
-
-export function details(params: NodeDetailParamsType1 | NodeDetailParamsType2) {
-  if ((params as NodeDetailParamsType1).nodeId) {
-    // return FUtil.Axios.get(`/v2/nodes/${(params as NodeDetailParamsType1).nodeId}`);
-    return FUtil.Request({
-      method: 'GET',
-      url: `/v2/nodes/${(params as NodeDetailParamsType1).nodeId}`,
-      params: params,
-    });
-  }
-  // return FUtil.Axios.get(`/v2/nodes/detail`, {
-  //   params,
-  // });
-  return FUtil.Request({
-    method: 'GET',
-    url: `/v2/nodes/detail`,
-    params: params,
-  });
-}
-
-// 查看节点列表
-interface NodesParamsType {
-  skip?: number;
-  limit?: number;
-  status?: 0 | 1 | 2; // 0:正常 1:未审核 2:冻结
-  projection?: string;
-}
-
-export function nodes(params: NodesParamsType) {
-  // return FUtil.Axios.get('/v2/nodes', {
-  //   params
-  // });
-  return FUtil.Request({
-    method: 'GET',
-    url: `/v2/nodes`,
-    params: params,
-  });
-}
-
+import FUtil from '../utils';
+
+// 创建节点
+export interface CreateParamsType {
+  nodeName: string;
+  nodeDomain: string;
+}
+
+export function create(params: CreateParamsType) {
+  // return FUtil.Axios.post('/v2/nodes', params);
+  return FUtil.Request({
+    method: 'POST',
+    url: `/v2/nodes`,
+    data: params,
+  });
+}
+
+// 查看节点详情
+interface NodeDetailParamsType1 {
+  nodeId: number;
+}
+
+interface NodeDetailParamsType2 {
+  nodeName?: string;
+  nodeDomain?: string;
+}
+
+export function details(params: NodeDetailParamsType1 | NodeDetailParamsType2) {
+  if ((params as NodeDetailParamsType1).nodeId) {
+    // return FUtil.Axios.get(`/v2/nodes/${(params as NodeDetailParamsType1).nodeId}`);
+    return FUtil.Request({
+      method: 'GET',
+      url: `/v2/nodes/${(params as NodeDetailParamsType1).nodeId}`,
+      // params: params,
+    });
+  }
+  // return FUtil.Axios.get(`/v2/nodes/detail`, {
+  //   params,
+  // });
+  return FUtil.Request({
+    method: 'GET',
+    url: `/v2/nodes/detail`,
+    params: params,
+  });
+}
+
+// 查看节点列表
+interface NodesParamsType {
+  skip?: number;
+  limit?: number;
+  status?: 0 | 1 | 2; // 0:正常 1:未审核 2:冻结
+  projection?: string;
+}
+
+export function nodes(params: NodesParamsType) {
+  // return FUtil.Axios.get('/v2/nodes', {
+  //   params
+  // });
+  return FUtil.Request({
+    method: 'GET',
+    url: `/v2/nodes`,
+    params: params,
+  });
+}
+

package/src/utils/linkTo.ts

@@ -18,7 +18,6 @@ interface ResourceDetailsParamsType {
 }
 
 export function resourceDetails({resourceID, ...params}: ResourceDetailsParamsType): TReturnType {
-  // return `/resource/${resourceID}`;
   return `/resource/details/${resourceID}${handleQuery(params)}`;
 }
 
@@ -153,24 +152,33 @@ export function objectDetails({...params}: ObjectDetailsParamsType): TReturnType
 }
 
 // 资源创建成功
-interface resourceCreateSuccessParamsType {
+interface ResourceCreateSuccessParamsType {
   resourceID: string;
 }
 
-export function resourceCreateSuccess({resourceID}: resourceCreateSuccessParamsType) {
+export function resourceCreateSuccess({resourceID}: ResourceCreateSuccessParamsType) {
   return `/result/resource/create/success/${resourceID}`;
 }
 
-// 资源创建成功
-interface resourceVersionCreateSuccessParamsType {
+// 资源版本创建成功
+interface ResourceVersionCreateSuccessParamsType {
   resourceID: string;
   version: string;
 }
 
-export function resourceVersionCreateSuccess({resourceID, version}: resourceVersionCreateSuccessParamsType) {
+export function resourceVersionCreateSuccess({resourceID, version}: ResourceVersionCreateSuccessParamsType) {
   return `/result/resource/version/create/success/${resourceID}/${version}`;
 }
 
+// 节点创建成功
+interface NodeCreateSuccessParamsType {
+  nodeID: number;
+}
+
+export function nodeCreateSuccess({nodeID}: NodeCreateSuccessParamsType) {
+  return `/result/node/create/success/${nodeID}`;
+}
+
 // 403
 interface Exception403ParamsType {
   from?: string;
@@ -178,16 +186,12 @@ interface Exception403ParamsType {
 
 export function exception403({...params}: Exception403ParamsType = {}) {
 
-  // console.log(from, 'exception403!!!!!!!!');
-
   let fromUrl: string = params.from || '';
   if (!fromUrl) {
     const {href, origin} = window.location;
     fromUrl = href.replace(origin, '');
   }
 
-  // console.log(fromUrl, 'fromUrl!!!!!!!!');
-
   return `/exception/403${handleQuery({
     from: fromUrl
   })}`;