@freelog/tools-lib 0.1.65 → 0.1.69

package/dist/utils/axios.d.ts

@@ -1,8 +1,5 @@
 import axios, { AxiosRequestConfig } from 'axios';
 import "nprogress/nprogress.css";
-/**
- * 配置request请求时的默认参数
- */
 export default axios;
 interface RequestParamsType {
     noRedirect?: boolean;

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.65",
+  "version": "0.1.69",
   "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: 'POST',
+    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/utils/axios.ts

@@ -1,149 +1,132 @@
-import axios, {AxiosRequestConfig} from 'axios';
-import NProgress from 'nprogress';
-import "nprogress/nprogress.css";
-import {completeUrlByDomain} from "./format";
-import * as LinkTo from './linkTo';
-
-// const codeMessage: any = {
-//   200: '服务器成功返回请求的数据。',
-//   201: '新建或修改数据成功。',
-//   202: '一个请求已经进入后台排队（异步任务）。',
-//   204: '删除数据成功。',
-//   400: '发出的请求有错误，服务器没有进行新建或修改数据的操作。',
-//   401: '用户没有权限（令牌、用户名、密码错误）。',
-//   403: '用户得到授权，但是访问是被禁止的。',
-//   404: '发出的请求针对的是不存在的记录，服务器没有进行操作。',
-//   406: '请求的格式不可得。',
-//   410: '请求的资源被永久删除，且不会再得到的。',
-//   422: '当创建一个对象时，发生一个验证错误。',
-//   500: '服务器发生错误，请检查服务器。',
-//   502: '网关错误。',
-//   503: '服务不可用，服务器暂时过载或维护。',
-//   504: '网关超时。',
-// };
-
-// export let apiHost: string = '';
-if (window.location.hostname.includes('.com')) {
-  // apiHost = `${window.location.protocol}//qi.${(window.location.host.match(/(?<=\.).*/) || [''])[0]}`;
-  // apiHost = window.location.origin.replace('console', 'qi');
-  axios.defaults.withCredentials = true;
-  axios.defaults.baseURL = completeUrlByDomain('qi');
-}
-
-/**
- * 异常处理程序
- */
-// const errorHandler = (error: { response: Response }): Response => {
-//   const {response} = error;
-//   if (response && response.status) {
-//     const errorText = codeMessage[response.status] || response.statusText;
-//     const {status, url} = response;
-//
-//     // notification.error({
-//     //   message: `请求错误 ${status}: ${url}`,
-//     //   description: errorText,
-//     // });
-//   } else if (!response) {
-//     // notification.error({
-//     //   description: '您的网络发生异常，无法连接服务器',
-//     //   message: '网络异常',
-//     // });
-//   }
-//   return response;
-// };
-//
-// // Add a request interceptor
-// axios.interceptors.request.use(function (config) {
-//   // Do something before request is sent
-//   NProgress.start();
-//   return config;
-// }, function (error) {
-//   // Do something with request error
-//   NProgress.done();
-//   return Promise.reject(error);
-// });
-
-axios.interceptors.request.use(config => {
-    NProgress.inc();
-    return config;
-  }, error => {
-    NProgress.done();
-    return Promise.reject(error)
-  }
-)
-axios.interceptors.response.use(res => {
-    NProgress.done();
-    return res;
-  }, error => {
-    NProgress.done();
-    return Promise.reject(error)
-  }
-)
-
-/**
- * 配置request请求时的默认参数
- */
-// axios.interceptors.response.use(function (response) {
-//   // Do something with response data
-//   // console.log(response, 'response!!!!!!');
-//   NProgress.done();
-//   if (response.status !== 200) {
-//
-//     const error = {
-//       description: codeMessage[response.status],
-//       message: response.status,
-//     };
-//
-//     // notification.error(error);
-//     throw new Error(JSON.stringify(error));
-//   }
-//   const {data, headers} = response;
-//   if (headers['content-disposition']?.includes('attachment;')) {
-//     // downloadFile(response);
-//     return;
-//   }
-//
-//   // console.log(data, 'data2390jasdflkf');
-//
-//
-//   // if ((data.errcode === undefined
-//   //   ? (data.errCode !== 0 && data.errCode !== 2)
-//   //   : (data.errcode !== 0 && data.errcode !== 2))
-//   //   || data.ret !== 0) {
-//   //
-//   //   // notification.error({
-//   //   //   message: data.msg,
-//   //   // });
-//   //   throw new Error(JSON.stringify(data));
-//   // }
-//   return data;
-// }, function (error) {
-//   // Do something with response error
-//   NProgress.done();
-//   return Promise.reject(error);
-// });
-
-export default axios;
-
-interface RequestParamsType {
-  noRedirect?: boolean;
-}
-
-export async function request(config: AxiosRequestConfig, {noRedirect = false}: RequestParamsType = {}) {
-  const result: any = await axios.request(config);
-  // console.log(result, 'response');
-  // const {data} = response;
-
-  if ((result.errCode === 30 || result.errcode === 30) && !noRedirect) {
-    return window.location.replace(`${completeUrlByDomain('user')}${LinkTo.login({goTo: window.location.href})}`);
-  }
-  return result;
-}
-
-// export function downloadFile(res: AxiosResponse) {
-//   const {data, headers} = res;
-//   // const fileName = headers['content-disposition'].replace(/attachment; filename="(.*)"/, '$1');
-//   const fileName = headers['content-disposition'].replace(/attachment; filename="(.*)"/, '$1');
-//   const blob = new Blob([data], {});
-//   FileSaver.saveAs(blob, fileName);
-// }
+import axios, {AxiosRequestConfig} from 'axios';
+import NProgress from 'nprogress';
+import "nprogress/nprogress.css";
+import {completeUrlByDomain} from "./format";
+import * as LinkTo from './linkTo';
+
+const codeMessage: any = {
+  200: '服务器成功返回请求的数据。',
+  201: '新建或修改数据成功。',
+  202: '一个请求已经进入后台排队（异步任务）。',
+  204: '删除数据成功。',
+  400: '发出的请求有错误，服务器没有进行新建或修改数据的操作。',
+  401: '用户没有权限（令牌、用户名、密码错误）。',
+  403: '用户得到授权，但是访问是被禁止的。',
+  404: '发出的请求针对的是不存在的记录，服务器没有进行操作。',
+  406: '请求的格式不可得。',
+  410: '请求的资源被永久删除，且不会再得到的。',
+  422: '当创建一个对象时，发生一个验证错误。',
+  500: '服务器发生错误，请检查服务器。',
+  502: '网关错误。',
+  503: '服务不可用，服务器暂时过载或维护。',
+  504: '网关超时。',
+};
+
+// export let apiHost: string = '';
+if (window.location.hostname.includes('.com')) {
+  // apiHost = `${window.location.protocol}//qi.${(window.location.host.match(/(?<=\.).*/) || [''])[0]}`;
+  // apiHost = window.location.origin.replace('console', 'qi');
+  axios.defaults.withCredentials = true;
+  axios.defaults.baseURL = completeUrlByDomain('qi');
+}
+
+/**
+ * 异常处理程序
+ */
+// const errorHandler = (error: { response: Response }): Response => {
+//   const {response} = error;
+//   if (response && response.status) {
+//     const errorText = codeMessage[response.status] || response.statusText;
+//     const {status, url} = response;
+//
+//     // notification.error({
+//     //   message: `请求错误 ${status}: ${url}`,
+//     //   description: errorText,
+//     // });
+//   } else if (!response) {
+//     // notification.error({
+//     //   description: '您的网络发生异常，无法连接服务器',
+//     //   message: '网络异常',
+//     // });
+//   }
+//   return response;
+// };
+//
+// // Add a request interceptor
+axios.interceptors.request.use(function (config) {
+  // Do something before request is sent
+  NProgress.start();
+  return config;
+}, function (error) {
+  // Do something with request error
+  NProgress.done();
+  return Promise.reject(error);
+});
+
+/**
+ * 配置request请求时的默认参数
+ */
+axios.interceptors.response.use(function (response) {
+  // Do something with response data
+  // console.log(response, 'response!!!!!!');
+  NProgress.done();
+  if (response.status !== 200) {
+
+    const error = {
+      description: codeMessage[response.status],
+      message: response.status,
+    };
+
+    // notification.error(error);
+    throw new Error(JSON.stringify(error));
+  }
+  const {data, headers} = response;
+  if (headers['content-disposition']?.includes('attachment;')) {
+    // downloadFile(response);
+    return;
+  }
+
+  // console.log(data, 'data2390jasdflkf');
+
+
+  // if ((data.errcode === undefined
+  //   ? (data.errCode !== 0 && data.errCode !== 2)
+  //   : (data.errcode !== 0 && data.errcode !== 2))
+  //   || data.ret !== 0) {
+  //
+  //   // notification.error({
+  //   //   message: data.msg,
+  //   // });
+  //   throw new Error(JSON.stringify(data));
+  // }
+  return data;
+}, function (error) {
+  // Do something with response error
+  NProgress.done();
+  return Promise.reject(error);
+});
+
+export default axios;
+
+interface RequestParamsType {
+  noRedirect?: boolean;
+}
+
+export async function request(config: AxiosRequestConfig, {noRedirect = false}: RequestParamsType = {}) {
+  const result: any = await axios.request(config);
+  // console.log(result, 'response');
+  // const {data} = response;
+
+  if ((result.errCode === 30 || result.errcode === 30) && !noRedirect) {
+    return window.location.replace(`${completeUrlByDomain('user')}${LinkTo.login({goTo: window.location.href})}`);
+  }
+  return result;
+}
+
+// export function downloadFile(res: AxiosResponse) {
+//   const {data, headers} = res;
+//   // const fileName = headers['content-disposition'].replace(/attachment; filename="(.*)"/, '$1');
+//   const fileName = headers['content-disposition'].replace(/attachment; filename="(.*)"/, '$1');
+//   const blob = new Blob([data], {});
+//   FileSaver.saveAs(blob, fileName);
+// }

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
   })}`;