@zgfe/business-lib 1.1.55 → 1.1.56-beta.1

package/es/addToPanel/components/styleList.js

@@ -57,7 +57,7 @@ var StyleList = function StyleList(props) {
       key: item.value,
       placement: "top",
       disabled: item.disabled || !item.children,
-      overlay: function overlay() {
+      dropdownRender: function dropdownRender() {
         return ChildList(item);
       }
     }, /*#__PURE__*/React.createElement("div", {

package/es/addToPanel/demo/index.js

@@ -15,6 +15,10 @@ var chartTypes = [{
   label: '汇总图',
   value: 'bar',
   icon: 'huizongtu'
+}, {
+  label: '占比图',
+  value: 'pie',
+  icon: 'huizongtu'
 }, {
   label: '地图',
   value: 'map',
@@ -32,6 +36,10 @@ var chartTypes = [{
     label: '汇总图',
     value: 'bar',
     icon: 'huizongtu'
+  }, {
+    label: '占比图',
+    value: 'pie',
+    icon: 'huizongtu'
   }]
 }, {
   label: '分数',

package/es/addToPanel/index.js

@@ -43,6 +43,7 @@ var BizAddToPanel = function BizAddToPanel(props) {
     router = _useContext.router,
     routes = _useContext.routes,
     isDemo = _useContext.isDemo;
+  var showTypes = ['line', 'bar', 'pie'];
   useEffect(function () {
     queryGroups();
   }, []);
@@ -166,8 +167,8 @@ var BizAddToPanel = function BizAddToPanel(props) {
   }
   return /*#__PURE__*/React.createElement(BizDialog, {
     open: true,
+    width: "auto",
     title: props.type === 'edit' ? '修改当前看板指标' : '向看板添加指标',
-    width: 503,
     maskClosable: false,
     onCancel: props.onCancel,
     onOk: onAdd,
@@ -249,7 +250,7 @@ var BizAddToPanel = function BizAddToPanel(props) {
   }, function (_ref) {
     var getFieldValue = _ref.getFieldValue;
     var type = getFieldValue('chartType');
-    return type === 'line' || type === 'bar' ? /*#__PURE__*/React.createElement(Form.Item, {
+    return showTypes.indexOf(type) > -1 ? /*#__PURE__*/React.createElement(Form.Item, {
       label: "\u663E\u793A",
       name: "showList",
       colon: false,

package/es/chart/demo/data/data.js

@@ -1,7 +1,7 @@
 export default {
   x_axis: ['2022-03-31', '2022-04-01', '2022-04-02', '2022-04-03', '2022-04-04', '2022-04-05', '2022-04-06', '2022-04-07', '2022-04-08', '2022-04-09', '2022-04-10', '2022-04-11', '2022-04-12', '2022-04-13'],
   series: [{
-    names: ['付款成功'],
+    names: ['付款成功付款成功付款成功付款成功付款成功付款成功付款成功付款成功付款成功付款成功付款成功付款成功付款成功付款成功'],
     values: [26, 27, 43, 44, 40, 34, 33, 33, 34, 24, 30, 31, 31, 38]
   }, {
     names: ['注册-发送手机验证码'],

package/es/chart/demo/pie.js

@@ -6,9 +6,7 @@ export default (function () {
     data: pieData,
     type: "pie",
     showAll: false,
-    legendPosition: "bottom",
-    legendOrient: "vertical",
-    colors: ['#1D9ED1', '#F383A2', '#9FB40F', '#FF6B3B', '#8C8C47'],
-    showList: ['付款成功', '搜索商品', '查看商品详情', 'click']
+    showList: ['搜索商品', '查看商品详情', 'pv', 'scroll'],
+    radius: ['30%', '75%']
   });
 });

package/es/chart/index.js

@@ -55,8 +55,8 @@ var BizChart = /*#__PURE__*/React.forwardRef(function (props, ref) {
     var eOption = {};
     if (!data) return eOption;
     if (type === 'pie') {
-      var rData = formatPieData(data, showAll, showList);
-      eOption = getPieOption(rData, legendPosition, legendOrient, tooltipFormatter);
+      var rData = formatPieData(data, showAll, showList, props.showOther);
+      eOption = getPieOption(rData, legendPosition, legendOrient, props.showLabel, props.radius, props.center, tooltipFormatter);
     } else if (type === 'line' || type === 'bar') {
       var _rData = formatChartData(data, showAll, showList, reverseXAxis, colors);
       eOption = getChartOption(type, _rData, legendPosition, legendOrient, valueUnit, xRotate, yRotate, tooltipFormatter, xAxisFormatter, yAxisFormatter, legendFormatter, reverseXAxis, seriesName);

package/es/chart/types.d.ts

@@ -29,6 +29,9 @@ export declare namespace ChartTypes {
         isCity?: boolean;
         userGroup?: string;
         colors?: string[];
+        showLabel?: boolean;
+        radius?: string | number | Array<string | number>;
+        center?: Array<string | number>;
         tooltipFormatter?: (param: any) => string;
         xAxisFormatter?: (param: any) => string;
         yAxisFormatter?: (param: any) => string;
@@ -40,6 +43,7 @@ export declare namespace ChartTypes {
         legendOrient?: 'horizontal' | 'vertical';
         showList?: Array<any>;
         showAll?: boolean;
+        showOther?: boolean;
         reverseXAxis?: boolean;
         seriesName?: string;
     }

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

@@ -17,7 +17,7 @@ export declare const xAxisConfig: XAXisOption;
 export declare const yAxisConfig: YAXisOption;
 export declare const tooltipConfig: TooltipComponentOption;
 export declare const getChartOption: (chartType: string, data: ChartTypes.Value, legendPosition?: 'top' | 'bottom' | 'middle', legendOrient?: 'horizontal' | 'vertical', unit?: string, xRotate?: number, yRotate?: number, tooltipFormatter?: ((value: any) => string) | undefined, xAxisFormatter?: ((value: any) => string) | undefined, yAxisFormatter?: ((value: any) => string) | undefined, legendFormatter?: ((value: any) => string) | undefined, reverseXAxis?: boolean, seriesName?: string) => EChartsOption;
-export declare const getPieOption: (seriesData?: object[], legendPosition?: 'top' | 'bottom' | 'middle', legendOrient?: 'horizontal' | 'vertical', tooltipFormatter?: ((value: any) => string) | undefined) => EChartsOption;
+export declare const getPieOption: (seriesData?: object[], legendPosition?: 'top' | 'bottom' | 'middle', legendOrient?: 'horizontal' | 'vertical', showLabel?: boolean, radius?: string | number | Array<string | number>, center?: Array<string | number>, tooltipFormatter?: ((value: any) => string) | undefined, legendFormatter?: ((value: any) => string) | undefined) => EChartsOption;
 export declare const getMapOption: (seriesData: object[] | undefined, maxMinValue: {
     min: number;
     max: number;

package/es/chart/util/chartOptionConfig.js

@@ -7,6 +7,7 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 import { tooltipFormatterDefault, xAxisFormatterDefault, yAxisFormatterDefault, mapTooltipFormatter, legendFormatterDefault } from './formatOption';
 import { chartColors } from './color';
 import '../styles/index.less';
+import { util } from '../../utils';
 export var baseConfig = {
   color: chartColors,
   backgroundColor: '#fff',
@@ -26,6 +27,7 @@ export var legendConfig = {
   itemHeight: 10,
   itemWidth: 10,
   itemGap: 21,
+  z: 10,
   textStyle: {
     color: '#5F6085',
     height: 10,
@@ -36,7 +38,6 @@ export var legendConfig = {
     }
   },
   formatter: ['{a|{name}}'].join('\n'),
-  pageIconSize: 10,
   pageTextStyle: {
     color: '#5F6085'
   },
@@ -200,12 +201,29 @@ export var getPieOption = function getPieOption() {
   var seriesData = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   var legendPosition = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'top';
   var legendOrient = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'horizontal';
-  var tooltipFormatter = arguments.length > 3 ? arguments[3] : undefined;
+  var showLabel = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
+  var radius = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : [0, '75%'];
+  var center = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : ['50%', '55%'];
+  var tooltipFormatter = arguments.length > 6 ? arguments[6] : undefined;
+  var legendFormatter = arguments.length > 7 ? arguments[7] : undefined;
   var series = [{
     type: 'pie',
     data: seriesData,
     label: {
-      show: false
+      show: showLabel,
+      color: 'inherit',
+      formatter: function formatter(params) {
+        return util.strMiddleSplit(params.name);
+      }
+    },
+    radius: radius,
+    center: center,
+    emphasis: {
+      itemStyle: {
+        shadowBlur: 10,
+        shadowOffsetX: 0,
+        shadowColor: 'rgba(0, 0, 0, 0.1)'
+      }
     }
   }];
   var tooltip = JSON.parse(JSON.stringify(tooltipConfig)),
@@ -220,6 +238,7 @@ export var getPieOption = function getPieOption() {
     legend.width = 50;
     grid.left = '10%';
   }
+  legend.formatter = legendFormatter ? legendFormatter : legendFormatterDefault;
   tooltip.trigger = 'item';
   if (tooltipFormatter) {
     tooltip.formatter = tooltipFormatter;
@@ -228,7 +247,7 @@ export var getPieOption = function getPieOption() {
       var name = params.name,
         value = params.value,
         color = params.color;
-      return "<div class=\"biz-chart-tooltip-item\">\n                <span class=\"biz-chart-tooltip-content\">\n                    <span class=\"biz-tooltip-marker\" style=\"background:".concat(color, "\"></span>").concat(name, "\n                </span> \n                <span class=\"biz-chart-tooltip-value\">").concat(value, "</span>\n              </div>");
+      return "<div class=\"biz-chart-tooltip-item\">\n                <div class=\"biz-chart-tooltip-content\">\n                    <span class=\"biz-tooltip-marker\" style=\"background:".concat(color, "\"></span>\n                    <div class=\"biz-tooltip-name\">").concat(name, "</div>\n                </div> \n                <span class=\"biz-chart-tooltip-value\">").concat(value, "(").concat(params.percent, "%)</span>\n              </div>");
     };
   }
   return _objectSpread(_objectSpread({}, baseConfig), {}, {

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

@@ -1,7 +1,10 @@
 import { ChartTypes } from '../types';
-export declare const formatPieData: (data: ChartTypes.Value, showAll?: boolean, showList?: Array<any>) => {
+export declare const formatPieData: (data: ChartTypes.Value, showAll?: boolean, showList?: Array<any>, showOther?: boolean) => {
     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

@@ -1,11 +1,14 @@
 import util from '../../utils/util';
 import { chartColors } from './color';
-export var formatPieData = function formatPieData(data, showAll, showList) {
+export var formatPieData = function formatPieData(data, showAll, showList, showOther) {
   var showMap = getShowMap(showList);
   var list = [];
   var other = {
     name: '其它',
-    value: 0
+    value: 0,
+    itemStyle: {
+      color: '#ccd0d4'
+    }
   };
   data.series.forEach(function (item) {
     var series = {
@@ -17,12 +20,12 @@ export var formatPieData = function formatPieData(data, showAll, showList) {
     } else {
       if (showList && showMap[series.name] || !showList && list.length < 10) {
         list.push(series);
-      } else {
+      } else if (showOther) {
         other.value += item.values[0];
       }
     }
   });
-  if (!showAll && other.value > 0) list.push(other);
+  if (showOther && !showAll && other.value > 0) list.push(other);
   return list;
 };
 export var formatChartData = function formatChartData(data, showAll, showList, reverseXAxis, color) {

package/es/chart/util/formatOption.js

@@ -22,6 +22,9 @@ var tooltipFormatterDefault = function tooltipFormatterDefault(params) {
       lineLabel = util.toThousands(lineLabel);
     }
     var name = item.seriesName.trim();
+    if (item.seriesType === 'bar' && params.length === 1 && !name) {
+      name = (item.data && item.data.label ? item.data.label : item.name).trim();
+    }
     htmlArray.push("<div class=\"biz-chart-tooltip-item\">\n          <div class=\"biz-chart-tooltip-content\">\n              <span class=\"biz-tooltip-marker\" style=\"background:".concat(item.color, "\"></span>\n              <div class=\"biz-tooltip-name\">").concat(name, "</div>\n          </div> \n          <span class=\"biz-chart-tooltip-value\">").concat(lineLabel, "</span>\n        </div>"));
   });
   return htmlArray.join('');

package/es/datePicker/datePicker.js

@@ -77,7 +77,7 @@ var BizDate = function BizDate(props) {
     value: moment(dateRange.begin, 'YYYY-MM-DD'),
     allowClear: false,
     inputReadOnly: true,
-    dropdownClassName: "".concat(classPrefix, "-drop"),
+    popupClassName: "".concat(classPrefix, "-drop"),
     locale: locale,
     showToday: false,
     disabledDate: disabledDate,
@@ -90,7 +90,7 @@ var BizDate = function BizDate(props) {
   }) : /*#__PURE__*/React.createElement(RangePicker, {
     value: [moment(dateRange.begin, 'YYYY-MM-DD'), moment(dateRange.end, 'YYYY-MM-DD')],
     allowClear: false,
-    dropdownClassName: "".concat(classPrefix, "-drop"),
+    popupClassName: "".concat(classPrefix, "-drop"),
     inputReadOnly: true,
     locale: locale,
     disabledDate: disabledDate,

package/es/demoWrapper/head.d.ts

@@ -4,5 +4,6 @@ declare const DemoHeader: React.FC<{
     defaultApp?: number;
     onChangeApp?: (app: AppInfoProps) => void;
     onLoading?: (loading: boolean) => void;
+    onLogin?: () => void;
 }>;
 export default DemoHeader;

package/es/demoWrapper/head.js

@@ -4,13 +4,14 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import { Select, Skeleton } from 'antd';
+import { Select, Skeleton, message } from 'antd';
 import React, { useEffect, useState } from 'react';
 import request from '../utils/ajax';
 var DemoHeader = function DemoHeader(_ref) {
   var defaultApp = _ref.defaultApp,
     onChangeApp = _ref.onChangeApp,
-    onLoading = _ref.onLoading;
+    onLoading = _ref.onLoading,
+    onLogin = _ref.onLogin;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     appList = _useState2[0],
@@ -28,6 +29,11 @@ var DemoHeader = function DemoHeader(_ref) {
   function queryAppList() {
     setLoading(true);
     request('/zg/web/v2/data/v2ajaxGetDataByApp').then(function (res) {
+      if (!res.data) {
+        message.error('获取应用列表失败，请重新登录');
+        onLogin && onLogin();
+        return;
+      }
       setAppList(res.data.appList);
       if (defaultApp) {
         _onChange(res.data.appList.find(function (item) {

package/es/demoWrapper/index.js

@@ -60,7 +60,10 @@ var DemoWrapper = function DemoWrapper(_ref) {
     title: /*#__PURE__*/React.createElement(DemoHeader, {
       defaultApp: defaultApp,
       onChangeApp: setApp,
-      onLoading: setAppListLoading
+      onLoading: setAppListLoading,
+      onLogin: function onLogin() {
+        return setNotLogin(true);
+      }
     }),
     className: className,
     bodyStyle: {

package/es/layout/optionTitle/demo/page.d.ts

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

package/es/layout/optionTitle/demo/page.js

@@ -0,0 +1,5 @@
+import React from 'react';
+import BizTargetFromPanel from '..';
+export default (function () {
+  return /*#__PURE__*/React.createElement(BizTargetFromPanel, null, /*#__PURE__*/React.createElement("div", null, "\u65E0\u64CD\u4F5C\u680F\u5C55\u793A"));
+});

package/es/layout/optionTitle/index.js

@@ -19,12 +19,12 @@ import Apis from '../../constants/apis';
 import { Spin, message } from 'antd';
 export var classPrefix = 'biz-layout-panel';
 var BizTargetFromPanel = function BizTargetFromPanel(props) {
-  var _props$value$target$p;
+  var _props$value, _props$value10, _props$value$target$p;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     options = _useState2[0],
     setOptions = _useState2[1];
-  var _useState3 = useState(props.value.target.name || '洞察'),
+  var _useState3 = useState(((_props$value = props.value) === null || _props$value === void 0 ? void 0 : _props$value.target.name) || '洞察'),
     _useState4 = _slicedToArray(_useState3, 2),
     title = _useState4[0],
     setTitle = _useState4[1];
@@ -42,11 +42,14 @@ var BizTargetFromPanel = function BizTargetFromPanel(props) {
     setLoading = _useState10[1];
   var titleRef = useRef(null);
   useEffect(function () {
-    setOptions(props.value.target.id ? panelBtn(onClick) : panelCreateBtn(onClick));
+    var _props$value2, _props$value3;
+    if (!((_props$value2 = props.value) === null || _props$value2 === void 0 ? void 0 : _props$value2.panelId)) return;
+    setOptions(((_props$value3 = props.value) === null || _props$value3 === void 0 ? void 0 : _props$value3.target.id) ? panelBtn(onClick) : panelCreateBtn(onClick));
   }, []);
   var onClick = function onClick(type) {
     if (type === BizOptionTitleProps.OptionTypes.CANCEL) {
-      var param = props.value.target.id ? {
+      var _props$value4;
+      var param = ((_props$value4 = props.value) === null || _props$value4 === void 0 ? void 0 : _props$value4.target.id) ? {
         panelId: props.value.panelId,
         elementId: props.value.target.id,
         name: title
@@ -62,12 +65,13 @@ var BizTargetFromPanel = function BizTargetFromPanel(props) {
     }
   };
   var onDelete = function onDelete() {
+    var _props$value5, _props$value6;
     setLoading(true);
     ajax(Apis.delPanelElement, {
       method: 'post',
       data: {
-        panelId: props.value.panelId,
-        elementId: props.value.target.id
+        panelId: (_props$value5 = props.value) === null || _props$value5 === void 0 ? void 0 : _props$value5.panelId,
+        elementId: (_props$value6 = props.value) === null || _props$value6 === void 0 ? void 0 : _props$value6.target.id
       }
     }).then(function (res) {
       if (!res) return;
@@ -80,6 +84,7 @@ var BizTargetFromPanel = function BizTargetFromPanel(props) {
     });
   };
   var onService = function onService(value, callback) {
+    var _props$value7, _props$value8;
     setTitle(value);
     setBtnOptions(!value);
     if (!value) return;
@@ -87,8 +92,8 @@ var BizTargetFromPanel = function BizTargetFromPanel(props) {
     ajax(Apis.updateElementName, {
       method: 'post',
       data: {
-        panelId: props.value.panelId,
-        elementId: props.value.target.id,
+        panelId: (_props$value7 = props.value) === null || _props$value7 === void 0 ? void 0 : _props$value7.panelId,
+        elementId: (_props$value8 = props.value) === null || _props$value8 === void 0 ? void 0 : _props$value8.target.id,
         name: value
       }
     }).then(function (res) {
@@ -112,20 +117,27 @@ var BizTargetFromPanel = function BizTargetFromPanel(props) {
   };
   var setBtnOptions = function setBtnOptions(disabled) {
     setOptions(function (option) {
+      var _props$value9;
       if (!option.length) return [];
       option[option.length - 1].disabled = disabled;
-      if (props.value.target.id) {
+      if ((_props$value9 = props.value) === null || _props$value9 === void 0 ? void 0 : _props$value9.target.id) {
         option[option.length - 2].disabled = disabled;
       }
       return _toConsumableArray(option);
     });
   };
+  if (!((_props$value10 = props.value) === null || _props$value10 === void 0 ? void 0 : _props$value10.panelId)) {
+    return /*#__PURE__*/React.createElement("div", {
+      className: "".concat(classPrefix, "-content")
+    }, props.children);
+  }
   return /*#__PURE__*/React.createElement(BizTargetFromPanelContext.Provider, {
     value: {
       handleSearch: setBtnOptions
     }
   }, /*#__PURE__*/React.createElement(Spin, {
-    spinning: loading
+    spinning: loading,
+    wrapperClassName: classPrefix
   }, /*#__PURE__*/React.createElement(BizOptionLayout, {
     ref: titleRef,
     value: title,
@@ -136,7 +148,9 @@ var BizTargetFromPanel = function BizTargetFromPanel(props) {
     onBack: function onBack() {
       return onClick(BizOptionTitleProps.OptionTypes.CANCEL);
     }
-  }, props.children, showDialog && /*#__PURE__*/React.createElement(BizAddToPanel, {
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, "-content ").concat(classPrefix, "-content2")
+  }, props.children), showDialog && /*#__PURE__*/React.createElement(BizAddToPanel, {
     defaultValue: {
       panel: {
         id: props.value.panelId

package/es/layout/optionTitle/layout.js

@@ -7,7 +7,7 @@ var BizOptionLayout = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var className = props.className;
   var classPrefix = 'biz-option-layout';
   return /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, " ").concat(className)
+    className: "".concat(classPrefix, " ").concat(className || '')
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-header")
   }, /*#__PURE__*/React.createElement("div", {

package/es/layout/optionTitle/styles/index.less

@@ -1,6 +1,11 @@
 @import '~@zgfe/business-lib/es/assets/styles/inner.less';
 
 .biz-layout-panel {
+  width: 100%;
+  height: 100%;
+  & > .ant-spin-container {
+    height: 100%;
+  }
   /*更多按钮*/
   &-btn-more {
     width: @height-base;
@@ -16,4 +21,13 @@
       .__default-hover();
     }
   }
+
+  &-content {
+    width: 100%;
+    height: 100%;
+    overflow: auto;
+  }
+  &-content2 {
+    height: calc(100% - 64px);
+  }
 }

package/es/layout/optionTitle/types.d.ts

@@ -2,8 +2,8 @@ import React from 'react';
 import AddToPanel from '../../addToPanel/types';
 export declare namespace BizOptionTitleProps {
     export interface Props {
-        value: Value;
-        styleOptions: AddToPanel.TabItem[];
+        value?: Value;
+        styleOptions?: AddToPanel.TabItem[];
         children: React.ReactNode;
         afterEditTarget?: (type: string, value?: any) => void;
     }

package/es/utils/ajax.js

@@ -77,10 +77,10 @@ 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 = '账户没有权限';
+    message.error('账户没有权限');
     flag = true;
   }
   if (!flag) {
@@ -140,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/ajax.js

@@ -1,7 +1,6 @@
 import { Button } from 'antd';
 import React from 'react';
-import { ajax } from '@zgfe/business-lib';
-import { DemoWrapper } from '@zgfe/business-lib';
+import { ajax, DemoWrapper } from '@zgfe/business-lib';
 export default (function () {
   var onDownload = function onDownload() {
     ajax('/zg/web/v2/openapi/label/excel/export', {

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",
+  "version": "1.1.56-beta.1",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -60,5 +60,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "8272e11129d54d9ed429143cedc497527511e81e"
+  "gitHead": "2050aad6d38725d5a4f608ede8f00d6950b75c87"
 }