@freelog/tools-lib 0.1.132 → 0.1.135

package/src/utils/axios.ts

@@ -1,145 +1,145 @@
-import axios, {AxiosRequestConfig} from 'axios';
-import NProgress from 'nprogress';
-import "nprogress/nprogress.css";
-import {completeUrlByDomain} from "./format";
-import * as LinkTo from './linkTo';
-// import {CommonReturn, RequestParamsType} from "../service-API/tools";
-import FServiceAPI from "../service-API";
-// import  from '../service-API';
-
-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;
-
-
-export async function request(config: AxiosRequestConfig, {
-// export async function request(config: any, {
-  noRedirect = false,
-  noErrorAlert = false,
-// }: RequestParamsType = {}): Promise<CommonReturn & { data: any } | void> {
-}: any = {}): Promise<any> {
-  const result: any = await axios.request(config);
-  // console.log(result, 'response');
-  // const {data} = response;
-  // console.log(result, 'result90iowjksdfjlsdkj')
-  if (result.ret === 0 && result.errCode === 30 && !noRedirect) {
-    await FServiceAPI.User.logout();
-    window.location.replace(`${completeUrlByDomain('user')}${LinkTo.login({goTo: window.location.href})}`);
-  }
-  if (result.ret === 4 && result.errCode === 10 && !noRedirect) {
-    window.location.replace(`${completeUrlByDomain('user')}${LinkTo.userFreeze({goTo: window.location.href})}`);
-  }
-  if ((result.errcode !== 0 || result.errCode !== 0) && !noErrorAlert) {
-    // window.alert(result.msg);
-    // return;
-  }
-  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';
+// import {CommonReturn, RequestParamsType} from "../service-API/tools";
+import FServiceAPI from "../service-API";
+// import  from '../service-API';
+
+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;
+
+
+export async function request(config: AxiosRequestConfig, {
+// export async function request(config: any, {
+  noRedirect = false,
+  noErrorAlert = false,
+// }: RequestParamsType = {}): Promise<CommonReturn & { data: any } | void> {
+}: any = {}): Promise<any> {
+  const result: any = await axios.request(config);
+  // console.log(result, 'response');
+  // const {data} = response;
+  // console.log(result, 'result90iowjksdfjlsdkj')
+  if (result.ret === 0 && result.errCode === 30 && !noRedirect) {
+    await FServiceAPI.User.logout();
+    window.location.replace(`${completeUrlByDomain('user')}${LinkTo.login({goTo: window.location.href})}`);
+  }
+  if (result.ret === 4 && result.errCode === 10 && !noRedirect) {
+    window.location.replace(`${completeUrlByDomain('user')}${LinkTo.userFreeze({goTo: window.location.href})}`);
+  }
+  if ((result.errcode !== 0 || result.errCode !== 0) && !noErrorAlert) {
+    // window.alert(result.msg);
+    // return;
+  }
+  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/format.ts

@@ -1,98 +1,98 @@
-import moment from 'moment';
-import {report} from '@freelog/resource-policy-lang/dist';
-import {ContractEntity} from '@freelog/resource-policy-lang/dist/tools/ContractTool';
-
-const {compile} = require('@freelog/resource-policy-lang');
-
-/**
- * 将对应的字节数，转换为易读单位数量
- * @param bytes
- * @return {string}
- */
-export function humanizeSize(bytes: number): string {
-  // console.log('dddhumanizeSizesdfsd');
-  if (bytes <= 0) {
-    return '0 B';
-  }
-  const unitArr = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
-  const index = Math.floor(Math.log(bytes) / Math.log(1024));
-  const size = Math.round((bytes / Math.pow(1024, index)) * 100) / 100; //保留的小数位数
-  return size + ' ' + unitArr[index];
-}
-
-/**
- * 格式化日期时间
- */
-export function formatDateTime(date: string, showTime: boolean = false) {
-  return moment(date).format('YYYY/MM/DD' + (showTime ? ' HH:mm' : ''));
-}
-
-/**
- * 根据传入的子域名拼合成完整的适合的url
- * @param domain 要组合的三级域名
- */
-export function completeUrlByDomain(domain: string): string {
-  let origin: string = `http://${domain}.testfreelog.com`;
-
-  if (window.location.origin.includes('.freelog.com')) {
-    origin = `https://${domain}.freelog.com`;
-  }
-
-  return origin;
-}
-
-/**
- * 根据策略代码和标的物类型，生成对应的翻译
- * @param code 策略代码
- * @param targetType 标的物类型
- */
-export async function policyCodeTranslationToText(code: string, targetType: string): Promise<{
-  error: string[] | null;
-  text?: string;
-}> {
-  try {
-    const result = await compile(
-      code,
-      targetType,
-      completeUrlByDomain('qi'),
-      window.location.origin.endsWith('.freelog.com') ? 'prod' : 'dev',
-    );
-    const contract: ContractEntity = {
-      audiences: result.state_machine.audiences,
-      fsmStates: Object.entries<any>(result.state_machine.states)
-        .map((st) => {
-          return {
-            name: st[0],
-            serviceStates: st[1].serviceStates,
-            events: st[1].transitions.map((ts: any) => {
-
-              return {
-                id: ts.code,
-                name: ts.name,
-                args: ts.args,
-                state: ts.toState,
-              };
-            }),
-          };
-        }),
-    };
-    const rrr = report(contract);
-    return {
-      error: null,
-      text: rrr.audienceInfos[0].content + rrr.content,
-    };
-  } catch (err) {
-    return {
-      error: [err.message],
-    };
-  }
-}
-
-
-/**
- * 将资源类型关键字数组,转换成标准展示文字
- * @param arr 关键字数组
- */
-export function resourceTypeKeyArrToResourceType(arr: string[]): string {
-  return arr.join(' / ');
-}
+import moment from 'moment';
+// import {report} from '@freelog/resource-policy-lang/dist';
+// import {ContractEntity} from '@freelog/resource-policy-lang/dist/tools/ContractTool';
+
+// const {compile} = require('@freelog/resource-policy-lang');
+
+/**
+ * 将对应的字节数，转换为易读单位数量
+ * @param bytes
+ * @return {string}
+ */
+export function humanizeSize(bytes: number): string {
+  // console.log('dddhumanizeSizesdfsd');
+  if (bytes <= 0) {
+    return '0 B';
+  }
+  const unitArr = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
+  const index = Math.floor(Math.log(bytes) / Math.log(1024));
+  const size = Math.round((bytes / Math.pow(1024, index)) * 100) / 100; //保留的小数位数
+  return size + ' ' + unitArr[index];
+}
+
+/**
+ * 格式化日期时间
+ */
+export function formatDateTime(date: string, showTime: boolean = false) {
+  return moment(date).format('YYYY/MM/DD' + (showTime ? ' HH:mm' : ''));
+}
+
+/**
+ * 根据传入的子域名拼合成完整的适合的url
+ * @param domain 要组合的三级域名
+ */
+export function completeUrlByDomain(domain: string): string {
+  let origin: string = `http://${domain}.testfreelog.com`;
+
+  if (window.location.origin.includes('.freelog.com')) {
+    origin = `https://${domain}.freelog.com`;
+  }
+
+  return origin;
+}
+
+/**
+ * 根据策略代码和标的物类型，生成对应的翻译
+ * @param code 策略代码
+ * @param targetType 标的物类型
+ */
+// export async function policyCodeTranslationToText(code: string, targetType: string): Promise<{
+//   error: string[] | null;
+//   text?: string;
+// }> {
+//   try {
+//     const result = await compile(
+//       code,
+//       targetType,
+//       completeUrlByDomain('qi'),
+//       window.location.origin.endsWith('.freelog.com') ? 'prod' : 'dev',
+//     );
+//     const contract: ContractEntity = {
+//       audiences: result.state_machine.audiences,
+//       fsmStates: Object.entries<any>(result.state_machine.states)
+//         .map((st) => {
+//           return {
+//             name: st[0],
+//             serviceStates: st[1].serviceStates,
+//             events: st[1].transitions.map((ts: any) => {
+//
+//               return {
+//                 id: ts.code,
+//                 name: ts.name,
+//                 args: ts.args,
+//                 state: ts.toState,
+//               };
+//             }),
+//           };
+//         }),
+//     };
+//     const rrr = report(contract);
+//     return {
+//       error: null,
+//       text: rrr.audienceInfos[0].content + rrr.content,
+//     };
+//   } catch (err) {
+//     return {
+//       error: [err.message],
+//     };
+//   }
+// }
+
+
+/**
+ * 将资源类型关键字数组,转换成标准展示文字
+ * @param arr 关键字数组
+ */
+export function resourceTypeKeyArrToResourceType(arr: string[]): string {
+  return arr.join(' / ');
+}

package/src/utils/index.ts

@@ -1,20 +1,20 @@
-import * as Format from './format';
-import * as Regexp from './regexp';
-import * as LinkTo from './linkTo';
-import * as Predefined from './predefined';
-import Axios, {request} from './axios';
-import * as Tool from './tools';
-// import I18n from '../i18n';
-
-const FUtil = {
-  Format,
-  Regexp,
-  LinkTo,
-  Predefined,
-  Axios,
-  Request: request,
-  Tool,
-  // i18n: new I18n(),
-};
-
-export default FUtil;
+import * as Format from './format';
+import * as Regexp from './regexp';
+import * as LinkTo from './linkTo';
+import * as Predefined from './predefined';
+import Axios, {request} from './axios';
+import * as Tool from './tools';
+// import I18n from '../i18n';
+
+const FUtil = {
+  Format,
+  Regexp,
+  LinkTo,
+  Predefined,
+  Axios,
+  Request: request,
+  Tool,
+  // i18n: new I18n(),
+};
+
+export default FUtil;