@zgfe/business-lib 1.1.55-beta.2 → 1.1.55-beta.4

package/es/chart/demo/pie.js

@@ -5,7 +5,8 @@ export default (function () {
   return /*#__PURE__*/React.createElement(BizChart, {
     data: pieData,
     type: "pie",
-    showAll: true,
+    showAll: false,
+    showList: ['搜索商品', '查看商品详情', 'pv', 'scroll'],
     radius: ['30%', '75%']
   });
 });

package/es/chart/util/formatData.d.ts

@@ -2,6 +2,9 @@ import { ChartTypes } from '../types';
 export declare const formatPieData: (data: ChartTypes.Value, showAll?: boolean, showList?: Array<any>) => {
     name: string;
     value: number;
+    itemStyle: {
+        color: string;
+    };
 }[];
 export declare const formatChartData: (data: ChartTypes.Value, showAll?: boolean, showList?: Array<any>, reverseXAxis?: boolean, color?: string[]) => {
     x_axis: string[];

package/es/chart/util/formatData.js

@@ -5,7 +5,10 @@ export var formatPieData = function formatPieData(data, showAll, showList) {
   var list = [];
   var other = {
     name: '其它',
-    value: 0
+    value: 0,
+    itemStyle: {
+      color: '#ccd0d4'
+    }
   };
   data.series.forEach(function (item) {
     var series = {

package/es/utils/ajax.js

@@ -77,10 +77,11 @@ export function responseErrorHandler(url, apiResult, errorTitle, notifyType) {
   if (new RegExp("".concat(ResponseStatus.success, "$")).test(apiResult.code)) {
     flag = true;
   } else if (new RegExp("".concat(ResponseStatus.notLogin)).test(apiResult.code)) {
-    msg = '账户未登录或登录已失效';
+    message.error('账户未登录或登录已失效');
+    flag = true;
   } else if (new RegExp("".concat(ResponseStatus.noPermission)).test(apiResult.code)) {
-    msg = '账户没有权限';
-    throw new Error(apiResult.msg);
+    message.error('账户没有权限');
+    flag = true;
   }
   if (!flag) {
     msg = apiResult.msg || msg;
@@ -139,28 +140,40 @@ function _request() {
           return req(params.url, params.options);
         case 14:
           res = _context.sent;
+          if (res) {
+            _context.next = 17;
+            break;
+          }
+          throw new Error('Request Interruption');
+        case 17:
           if (!(((_params$options2 = params.options) === null || _params$options2 === void 0 ? void 0 : _params$options2.responseType) === 'blob')) {
-            _context.next = 21;
+            _context.next = 23;
             break;
           }
           if (!util.isBlob(res.data)) {
-            _context.next = 20;
+            _context.next = 22;
             break;
           }
           return _context.abrupt("return", downloadFile(res, params.options.fileName));
-        case 20:
+        case 22:
           res = res.data;
-        case 21:
+        case 23:
           return _context.abrupt("return", responseWrapper ? responseWrapper(url, responseErrorHandler(url, res, options === null || options === void 0 ? void 0 : options.errorTitle, options === null || options === void 0 ? void 0 : options.notifyType)) : responseErrorHandler(url, res, options === null || options === void 0 ? void 0 : options.errorTitle, options === null || options === void 0 ? void 0 : options.notifyType));
-        case 24:
-          _context.prev = 24;
+        case 26:
+          _context.prev = 26;
           _context.t0 = _context["catch"](0);
+          if (!(_context.t0.message === 'Request Interruption')) {
+            _context.next = 30;
+            break;
+          }
+          throw new Error('Request Interruption');
+        case 30:
           return _context.abrupt("return", null);
-        case 27:
+        case 31:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[0, 24]]);
+    }, _callee, null, [[0, 26]]);
   }));
   return _request.apply(this, arguments);
 }

package/es/utils/demo/interruption.d.ts

@@ -0,0 +1,2 @@
+declare const _default: () => JSX.Element;
+export default _default;

package/es/utils/demo/interruption.js

@@ -0,0 +1,38 @@
+import { Button, message } from 'antd';
+import React from 'react';
+import { ajax } from '@zgfe/business-lib';
+import Request from 'umi-request';
+var CancelToken = Request.CancelToken;
+var cancel;
+export default (function () {
+  var getPanels = function getPanels() {
+    if (typeof cancel === 'function') {
+      cancel();
+    }
+    ajax('/zg/web/v2/apppanel/panels', {
+      method: 'post',
+      data: {
+        appId: 501648,
+        platform: 0
+      },
+      cancelToken: new CancelToken(function executor(c) {
+        cancel = c;
+      }),
+      responseWrapper: function responseWrapper(_url, res) {
+        if (/07$/.test(res.code)) {
+          console.log('reLogin-----');
+          throw new Error('reLogin');
+        }
+        return res;
+      }
+    }).then(function (res) {
+      if (!res) return;
+      message.success('请求成功');
+    }).catch(function (e) {
+      console.log(e);
+    });
+  };
+  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Button, {
+    onClick: getPanels
+  }, "\u8BF7\u6C42\u63A5\u53E3"));
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.1.55-beta.2",
+  "version": "1.1.55-beta.4",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -60,5 +60,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "cf0536417852436598e08a1bb2f79e8db51f422d"
+  "gitHead": "f213f4bf925948491d308265aab6f69e8531d58d"
 }