@bit-sun/business-component 2.4.19 → 3.0.0-alpha.1

package/src/components/Solution/RuleComponent/services.ts

@@ -1,8 +1,8 @@
-import axios from 'axios';
+import request from '@/utils/request';
 
 // 查询规则对象属性thresholdList
 export async function getRegularThresholdRange(params: any) {
-  return axios({
+  return request({
     url:  `/basic/regularThresholdRange/getVals/${params.queryIdentify}`,
     method: 'POST',
     data: {

package/src/plugin/TableColumnSetting/index.tsx

@@ -1,7 +1,7 @@
 // @ts-nocheck
 import React from 'react';
 import { Table, message, Checkbox, Modal, Input, Button, Tooltip } from 'antd';
-import axios from 'axios';
+import request from '@/utils/request';
 // import { request } from 'umi';
 import {
   SortableContainer,
@@ -65,7 +65,7 @@ class TableColumnSetting extends React.Component<TableColumnSettingProps> {
       fixed: item.fixed
     }))
 
-    axios({
+    request({
       url: handleRequestUrl('/user','/appConfig/saveUserOrder',appRequestConfig),
       method:'POST',
       data: {

package/src/utils/request.ts

@@ -0,0 +1,53 @@
+// @ts-nocheck
+import request from "umi-request";
+
+const get = (url, params?: any) => {
+  return request.get(url, {
+    ...params,
+  }).then(handleResponseData);
+};
+
+const post = (url, data?: any) => {
+  return request.post(url, {
+    data,
+  }).then(handleResponseData);
+};
+
+const patch = (url, data?: any) => {
+  return request.patch(url, {
+    data,
+  }).then(handleResponseData);
+};
+
+const put = (url, data?: any) => {
+  return request.put(url, {
+    data,
+  }).then(handleResponseData);
+};
+
+const deleteS = (url, data?: any) => {
+  return request.delete(url, {
+    data,
+  }).then(handleResponseData);
+};
+
+const requestUtil: any = ({ url, ...parms }: { url: string; parms: any }) => {
+  return request(url, parms).then(handleResponseData);
+
+  
+};
+
+const handleResponseData = async (response: any) => {
+  return Promise.resolve({
+    data: response,
+    status: response.status
+  })
+}
+
+requestUtil.get = get;
+requestUtil.post = post;
+requestUtil.patch = patch;
+requestUtil.put = put;
+requestUtil.delete = deleteS;
+
+export default requestUtil;

package/src/utils/utils.ts

@@ -4,6 +4,7 @@ import { formatMessage, history } from 'umi';
 import isEqual from 'lodash/isEqual';
 import ENUM from './enumConfig';
 import {
+  authFn,
   handleTextDouble,
   handleTextLineFeed,
   handleTextOverflow,
@@ -77,34 +78,28 @@ export const handleBssulaColumnsSpecialParams = (col: any) => {
   if (col.timeRenderHour) {
     col.render = ({ text }: any) =>
       handleTooltipHours(text, col.timeRenderHour);
-  }
-  // 处理不显示 时分秒的时间
-  if (col.timeRender) {
+  } else if (col.timeRender) {
+    // 处理不显示 时分秒的时间
     col.render = ({ text }: any) => handleTooltip(text, col.timeRender);
-  }
-  // 处理文字太长
-  if (col.textOverflow) {
-    col.render = ({ text }: any) => handleTextOverflow(text,col.width);
-  }
-  if (col.images) {
+  } else if (col.textOverflow) {
+    // 处理文字太长
+    col.render = ({ text }: any) => handleTextOverflow(text, col.width);
+  } else if (col.images) {
     col.render = ({ text }: any) => tableColumnsImage(text);
-  }
-  if (col.double) {
+  } else if (col.double) {
     col.render = ({ record }: any) =>
       handleTextDouble(record[col.textOne], record[col.textTwo]);
-  }
-  if (col.lineFeed) {
+  } else if (col.lineFeed) {
     col.render = ({ text }: any) => handleTextLineFeed(text);
-  }
-
-  // 处理序号
-  if (col.indexNumber) {
+  } else if (col.indexNumber) {
+    // 处理序号
     col.render = ({ index }: any) => index + 1;
-  }
-  // 没有值默认显示 - -
-  if (!col.render) {
+  } else if (col.isPermissionColumn && Array.isArray(col?.render)) {
+    col.render = col.render.filter((item) => authFn(item.code));
+  } else if (!col.render) {
+    // 没有值默认显示 - -
     // col.render = ({ text }: any) => text || '- -';
-    col.render = ({ text }: any) => text || '--';
+    col.render = ({ text }: any) => text ?? '--';
   }
 };
 /**
@@ -193,3 +188,24 @@ export const judgeIsEmpty = (value: any) => {
   }
   return false;
 };
+
+/**
+ * 处理错误请求
+ * @param {*} response         返回结果
+ * @param {*} needBackError    是否需要将错误回传到页面单独处理
+ */
+export function handleError(response: object, needBackError?: boolean) {
+  // @ts-ignore
+  if (
+    !response ||
+    (response.code ? response.code !== '000000' : response.status !== '0')
+  ) {
+    if (response && !needBackError) {
+      // @ts-ignore
+      response.msg && message.error(response.msg);
+    }
+    return false;
+  }
+
+  return true;
+}