@zgfe/business-lib 1.1.55-beta.0 → 1.1.55-beta.10

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,6 +167,7 @@ var BizAddToPanel = function BizAddToPanel(props) {
   }
   return /*#__PURE__*/React.createElement(BizDialog, {
     open: true,
+    width: "auto",
     title: props.type === 'edit' ? '修改当前看板指标' : '向看板添加指标',
     maskClosable: false,
     onCancel: props.onCancel,
@@ -248,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/assets/demo/picker.d.ts

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

package/es/assets/demo/picker.js

@@ -0,0 +1,22 @@
+import { Card, DatePicker, Space } from 'antd';
+import React from 'react';
+import AssetsDemo from '.';
+var RangePicker = DatePicker.RangePicker;
+export default (function () {
+  return /*#__PURE__*/React.createElement(AssetsDemo, null, /*#__PURE__*/React.createElement(Card, {
+    title: "Input"
+  }, /*#__PURE__*/React.createElement(Space, {
+    direction: "vertical",
+    size: 12
+  }, /*#__PURE__*/React.createElement(RangePicker, null), /*#__PURE__*/React.createElement(RangePicker, {
+    showTime: true
+  }), /*#__PURE__*/React.createElement(RangePicker, {
+    picker: "week"
+  }), /*#__PURE__*/React.createElement(RangePicker, {
+    picker: "month"
+  }), /*#__PURE__*/React.createElement(RangePicker, {
+    picker: "quarter"
+  }), /*#__PURE__*/React.createElement(RangePicker, {
+    picker: "year"
+  }))));
+});

package/es/assets/styles/chunks.less

@@ -25,10 +25,15 @@
 
 // 下拉组件操作栏样式
 .__select-handle {
-  padding: @padding-xss;
-  border: 1px solid @border-color-base;
+  // padding: @padding-xss;
+  // border: 1px solid @border-color-base;
+  background: @custom-background;
+  border: 1px solid @custom-background;
   border-radius: @border-radius-small;
   cursor: pointer;
+  &:hover {
+    border: 1px solid @primary-color;
+  }
 }
 
 // 下拉组件展开panel样式
@@ -118,7 +123,7 @@
   .__default-overflow();
 
   &:hover:not(.disable) {
-    background-color: @background-color-base;
+    // background-color: @background-color-base;
     border-color: @primary-color;
     box-shadow: none;
   }
@@ -132,14 +137,14 @@
 
 // 下拉框常用样式
 .__select-normal-secondary {
-  background-color: @white;
+  // background-color: @white;
   border: 1px solid @border-color-base;
   border-radius: @border-radius-small;
 
   &:not(.disable) {
     &:hover,
     &.active {
-      .__default-hover();
+      // .__default-hover();
       border-color: @border-color-base;
       box-shadow: none;
     }

package/es/assets/styles/resetAntd.less

@@ -162,14 +162,7 @@
 
   &:hover:not(.ant-picker-disabled),
   &.ant-picker-focused {
-    .__default-hover() !important;
-    border-color: @border-color-base!important;
-    box-shadow: none !important;
-
-    span,
-    input {
-      color: @primary-color!important;
-    }
+    border-color: @primary-color!important;
   }
 
   .ant-picker-active-bar {

package/es/assets/styles/variable.less

@@ -12,3 +12,6 @@
 @box-shadow-small: 0px 1px 2px @shadow-color-light;
 @primary-color-hover: color(~`colorPalette('@{primary-color}', 0.1) `);
 @box-shadow-form: 0 0 0 4px @primary-color-hover;
+@custom-background: #fafafb;
+@custom-focus: #f0f7ff;
+@primary-color: '#165dff';

package/es/attrCondition/styles/index.less

@@ -13,7 +13,6 @@
   .biz-attr-select-handle {
     width: 184px;
     padding: 0;
-    border: none;
   }
   .ant-space-item:nth-of-type(3) {
     min-width: 184px;

package/es/attrConditions/styles/index.less

@@ -2,9 +2,9 @@
 
 /* 筛选条件 */
 .biz-condition-item {
-  &.border {
-    .__select-handle();
-  }
+  // &.border {
+  //   .__select-handle();
+  // }
   &-panel {
     display: flex;
     width: 100%;
@@ -19,8 +19,6 @@
   .biz-attr-select-handle {
     margin-bottom: 2px;
     padding: 0;
-    border: none;
-    border-radius: 0;
   }
 
   .ant-input {

package/es/attributeSelector/index.js

@@ -83,7 +83,7 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
     setVisible(flag);
   };
   return /*#__PURE__*/React.createElement("div", {
-    className: classPrefix
+    className: "".concat(classPrefix, " ").concat(visible ? 'focus' : '')
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-handle")
   }, /*#__PURE__*/React.createElement(Dropdown, {

package/es/attributeSelector/styles/index.less

@@ -1,6 +1,10 @@
 @import '../../assets/styles/inner.less';
 
 .biz-attr-select {
+  border-radius: 4px;
+  &.focus {
+    box-shadow: 0 0 0 4px @custom-focus;
+  }
   &-handle {
     display: flex;
     flex-direction: row;

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

@@ -56,7 +56,7 @@ var BizChart = /*#__PURE__*/React.forwardRef(function (props, ref) {
     if (!data) return eOption;
     if (type === 'pie') {
       var rData = formatPieData(data, showAll, showList);
-      eOption = getPieOption(rData, legendPosition, legendOrient, tooltipFormatter);
+      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;

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, "</span>\n              </div>");
     };
   }
   return _objectSpread(_objectSpread({}, baseConfig), {}, {

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/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/demoWrapper/index.js

@@ -11,6 +11,7 @@ import request from '../utils/ajax';
 import DemoContent from './content';
 import DemoHeader from './head';
 import './index.less';
+import { ResponseStatus } from '../utils/type';
 var DemoWrapper = function DemoWrapper(_ref) {
   var children = _ref.children,
     className = _ref.className,
@@ -38,8 +39,7 @@ var DemoWrapper = function DemoWrapper(_ref) {
   }, []);
   function getCurrentUser() {
     request('/zg/web/v2/user/getUserInfo').then(function (res) {
-      var _res$data;
-      if (res === null || (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.ret) === '-1') setNotLogin(true);
+      if (!res || new RegExp("".concat(ResponseStatus.notLogin)).test(res.code)) setNotLogin(true);
     }).catch(function (err) {
       console.error('获取用户信息失败', err);
     }).finally(function () {

package/es/eventSelector/demo/index.js

@@ -25,12 +25,7 @@ var EventDemo = function EventDemo() {
   var onChange = function onChange(data) {
     setValue(data);
   };
-  return /*#__PURE__*/React.createElement("div", {
-    style: {
-      height: '500px',
-      overflow: 'auto'
-    }
-  }, /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
     style: {
       height: '700px'
     }

package/es/eventSelector/index.js

@@ -100,7 +100,7 @@ var BizEventSelector = function BizEventSelector(props) {
     setVisible(flag);
   };
   return /*#__PURE__*/React.createElement("div", {
-    className: [classPrefix, border ? 'border' : ''].join(' ')
+    className: [classPrefix, border ? 'border' : '', visible ? 'focus' : ''].join(' ')
   }, /*#__PURE__*/React.createElement(Dropdown, {
     dropdownRender: function dropdownRender() {
       return /*#__PURE__*/React.createElement(EventListPanel, {

package/es/eventSelector/styles/index.less

@@ -1,12 +1,16 @@
 @import '../../assets/styles/inner.less';
 
 .biz-event-select {
+  position: relative;
+  border-radius: 4px;
+  &.focus {
+    box-shadow: 0 0 0 4px @custom-focus;
+  }
   &.border {
     .biz-event-select-handle {
       .__select-handle();
     }
   }
-  position: relative;
   &-list-panel {
     display: flex;
     flex-direction: row;

package/es/index.d.ts

@@ -8,6 +8,7 @@ import BizTargetCondition from './targetConditionGroup';
 import BizConditionItem from './attrConditions';
 import BizConditionGroup from './attrConditions/group';
 import BizDatePicker from './datePicker';
+import BizQuickDatePicker from './quickDatePicker';
 import BizSelect from './select';
 import BizDialog from './dialog';
 import BizChart from './chart';
@@ -34,7 +35,7 @@ import BizAttrCondition from './attrCondition';
 import BizAttrConditionGroup from './attrCondition/group';
 import BizTargetFromPanel from './layout/optionTitle';
 import { BizTargetFromPanelContext } from './layout/optionTitle/types';
-export { BizTargetFromPanel, BizSearchInput, BizSelect, BizDialog, BizChart, BizTable, BizAnalysisLayout, BizDetailLayout, BizUserGroup, IconFont, ColorIcon, BizTargetSelector, BizEventSelector, BizAttributeSelector, BizGlobalDataContext, BizTargetFromPanelContext, BizTargetCondition, BizDatePicker, BizConditionItem, BizConditionGroup, BizAttrCondition, BizAttrConditionGroup, BizUserCondition, BizAddToScene, BizAddToPanel, BizCycleTime, BizDnd, BizLoginForm, DemoWrapper, SocketClient, ajax, util, theme, convertAttributeData, BizUserTagsSelect, setGlobalConfig, };
+export { BizTargetFromPanel, BizSearchInput, BizSelect, BizDialog, BizChart, BizTable, BizAnalysisLayout, BizDetailLayout, BizUserGroup, IconFont, ColorIcon, BizTargetSelector, BizEventSelector, BizAttributeSelector, BizGlobalDataContext, BizTargetFromPanelContext, BizTargetCondition, BizDatePicker, BizQuickDatePicker, BizConditionItem, BizConditionGroup, BizAttrCondition, BizAttrConditionGroup, BizUserCondition, BizAddToScene, BizAddToPanel, BizCycleTime, BizDnd, BizLoginForm, DemoWrapper, SocketClient, ajax, util, theme, convertAttributeData, BizUserTagsSelect, setGlobalConfig, };
 export type { UserGroupTypes } from './userGroup/types';
 export type { BizSelectTypes } from './select/types';
 export type { AttributeSelect } from './attributeSelector/types';

package/es/index.js

@@ -7,6 +7,7 @@ import BizTargetCondition from './targetConditionGroup';
 import BizConditionItem from './attrConditions';
 import BizConditionGroup from './attrConditions/group';
 import BizDatePicker from './datePicker';
+import BizQuickDatePicker from './quickDatePicker';
 import BizSelect from './select';
 import BizDialog from './dialog';
 import BizChart from './chart';
@@ -33,4 +34,4 @@ import BizAttrCondition from './attrCondition';
 import BizAttrConditionGroup from './attrCondition/group';
 import BizTargetFromPanel from './layout/optionTitle';
 import { BizTargetFromPanelContext } from './layout/optionTitle/types';
-export { BizTargetFromPanel, BizSearchInput, BizSelect, BizDialog, BizChart, BizTable, BizAnalysisLayout, BizDetailLayout, BizUserGroup, IconFont, ColorIcon, BizTargetSelector, BizEventSelector, BizAttributeSelector, BizGlobalDataContext, BizTargetFromPanelContext, BizTargetCondition, BizDatePicker, BizConditionItem, BizConditionGroup, BizAttrCondition, BizAttrConditionGroup, BizUserCondition, BizAddToScene, BizAddToPanel, BizCycleTime, BizDnd, BizLoginForm, DemoWrapper, SocketClient, ajax, util, theme, convertAttributeData, BizUserTagsSelect, setGlobalConfig };
+export { BizTargetFromPanel, BizSearchInput, BizSelect, BizDialog, BizChart, BizTable, BizAnalysisLayout, BizDetailLayout, BizUserGroup, IconFont, ColorIcon, BizTargetSelector, BizEventSelector, BizAttributeSelector, BizGlobalDataContext, BizTargetFromPanelContext, BizTargetCondition, BizDatePicker, BizQuickDatePicker, BizConditionItem, BizConditionGroup, BizAttrCondition, BizAttrConditionGroup, BizUserCondition, BizAddToScene, BizAddToPanel, BizCycleTime, BizDnd, BizLoginForm, DemoWrapper, SocketClient, ajax, util, theme, convertAttributeData, BizUserTagsSelect, setGlobalConfig };

package/es/layout/optionTitle/index.js

@@ -127,14 +127,17 @@ var BizTargetFromPanel = function BizTargetFromPanel(props) {
     });
   };
   if (!((_props$value10 = props.value) === null || _props$value10 === void 0 ? void 0 : _props$value10.panelId)) {
-    return /*#__PURE__*/React.createElement(React.Fragment, null, props.children);
+    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,
@@ -145,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/quickDatePicker/demo/index.d.ts

@@ -0,0 +1,3 @@
+import '@zgfe/business-lib/es/assets/styles/resetAntd.less';
+declare const _default: () => JSX.Element;
+export default _default;

package/es/quickDatePicker/demo/index.js

@@ -0,0 +1,36 @@
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+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 { BizQuickDatePicker } from '@zgfe/business-lib';
+import React, { useState } from 'react';
+import '@zgfe/business-lib/es/assets/styles/resetAntd.less';
+export default (function () {
+  var _useState = useState({
+      unit: 'day',
+      begin: '2023-06-23',
+      end: '2023-06-30',
+      relative: 7
+    }),
+    _useState2 = _slicedToArray(_useState, 2),
+    time = _useState2[0],
+    setTime = _useState2[1];
+  var onChange = function onChange(data) {
+    console.log('777', data);
+    setTime(data);
+  };
+  return /*#__PURE__*/React.createElement("div", {
+    style: {
+      display: 'flex'
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      lineHeight: '32px'
+    }
+  }, "\u9009\u62E9\u65F6\u95F4\uFF1A"), /*#__PURE__*/React.createElement(BizQuickDatePicker, {
+    defaultValue: time,
+    onChange: onChange
+  }));
+});

package/es/quickDatePicker/index.d.ts

@@ -0,0 +1,6 @@
+import React from 'react';
+import './styles/index.less';
+import { QuickDatePickerTypes } from './types';
+export declare const classPrefix = "biz-quick-date-picker-wrap";
+declare const BizQuickDatePicker: React.FC<QuickDatePickerTypes.Props>;
+export default BizQuickDatePicker;

package/es/quickDatePicker/index.js

@@ -0,0 +1,153 @@
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+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 React, { useEffect, useState } from 'react';
+import './styles/index.less';
+import moment from 'moment';
+import { quickModuleOneOptions, quickModuleTwoOptions } from './utils';
+import IconFont from '../icon/iconFont';
+import { DatePicker } from 'antd';
+var RangePicker = DatePicker.RangePicker;
+export var classPrefix = 'biz-quick-date-picker-wrap';
+var changeCount = 0;
+var BizQuickDatePicker = function BizQuickDatePicker(props) {
+  var defaultValue = props.defaultValue;
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    show = _useState2[0],
+    setShow = _useState2[1];
+  var _useState3 = useState(-1),
+    _useState4 = _slicedToArray(_useState3, 2),
+    relative = _useState4[0],
+    setRelative = _useState4[1];
+  var _useState5 = useState('day'),
+    _useState6 = _slicedToArray(_useState5, 2),
+    unit = _useState6[0],
+    setUnit = _useState6[1];
+  var _useState7 = useState([moment().subtract(6, 'day'), moment()]),
+    _useState8 = _slicedToArray(_useState7, 2),
+    value = _useState8[0],
+    setValue = _useState8[1];
+  var _useState9 = useState('过去7天'),
+    _useState10 = _slicedToArray(_useState9, 2),
+    showText = _useState10[0],
+    setShowText = _useState10[1];
+  useEffect(function () {
+    var _value = defaultValue || props.value;
+    if (_value) {
+      setValue([moment(_value.begin), moment(_value.end)]);
+      _value.relative && setRelative(_value.relative);
+      _value.unit && setUnit(_value.unit);
+    }
+  }, [defaultValue, props.value]);
+  var onChange = function onChange(date, dateString) {
+    changeCount++;
+    setValue(date);
+    setShowText('自定义');
+    setRelative(-1);
+    if (changeCount >= 2) {
+      setShow(false);
+      var changeValue = {
+        unit: 'day',
+        begin: dateString[0],
+        end: dateString[1],
+        relative: -1
+      };
+      props.onChange && props.onChange(changeValue);
+    }
+  };
+  useEffect(function () {
+    if (!show) changeCount = 0;
+  }, [show]);
+  var onBlur = function onBlur() {
+    setShow(false);
+  };
+  var onClick = function onClick() {
+    setShow(true);
+  };
+  var disabledDate = function disabledDate(current) {
+    return current && current > moment().endOf('month');
+  };
+  var quickModuleHandle = function quickModuleHandle(item) {
+    var _value;
+    if (item.type === 'week' || item.type === 'month') {
+      switch (Number(item.value)) {
+        case 1:
+          _value = [moment().weekday(1), moment().weekday(7)];
+          break;
+        case 2:
+          _value = [moment().weekday(1).subtract(1, 'week'), moment().weekday(7).subtract(1, 'week')];
+          break;
+        case 3:
+          _value = [moment().startOf('month'), moment().endOf('month')];
+          break;
+        case 4:
+          _value = [moment().startOf('month').subtract(1, 'month'), moment().endOf('month').subtract(1, 'month')];
+          break;
+      }
+    } else {
+      _value = [moment().subtract(Number(item.value) - 1, 'day'), moment()];
+    }
+    setRelative(item.value);
+    setUnit(item.type);
+    setShowText(item.label);
+    setValue(_value);
+    setShow(false);
+    if (_value) {
+      var changeValue = {
+        unit: item.type,
+        begin: _value[0].format('YYYY-MM-DD'),
+        end: _value[1].format('YYYY-MM-DD'),
+        relative: item.value
+      };
+      props.onChange && props.onChange(changeValue);
+    }
+  };
+  var renderExtraFooter = function renderExtraFooter() {
+    return /*#__PURE__*/React.createElement("div", {
+      className: "".concat(classPrefix, "-content-options")
+    }, /*#__PURE__*/React.createElement("ol", null, quickModuleOneOptions.map(function (item) {
+      return /*#__PURE__*/React.createElement("li", {
+        className: "".concat(item.type === unit && item.value === relative ? 'active' : ''),
+        key: item.label,
+        onClick: function onClick() {
+          return quickModuleHandle(item);
+        }
+      }, item.label);
+    })), /*#__PURE__*/React.createElement("ol", null, quickModuleTwoOptions.map(function (item) {
+      return /*#__PURE__*/React.createElement("li", {
+        className: "".concat(item.type === unit && item.value === relative ? 'active' : ''),
+        key: item.label,
+        onClick: function onClick() {
+          return quickModuleHandle(item);
+        }
+      }, item.label);
+    })), /*#__PURE__*/React.createElement("div", {
+      className: "".concat(relative === -1 ? 'active' : '')
+    }, "\u81EA\u5B9A\u4E49\u65F6\u95F4", /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(IconFont, {
+      type: "fanhuiicon"
+    }))));
+  };
+  return /*#__PURE__*/React.createElement("div", {
+    className: "".concat(classPrefix, " clearfix ").concat(show ? 'focus' : ''),
+    tabIndex: 1
+  }, /*#__PURE__*/React.createElement("div", {
+    onClick: function onClick() {
+      setShow(true);
+    }
+  }, showText), /*#__PURE__*/React.createElement(RangePicker, {
+    popupClassName: "".concat(classPrefix, "-content"),
+    separator: '至',
+    value: value,
+    onBlur: onBlur,
+    open: show,
+    onClick: onClick,
+    disabledDate: disabledDate,
+    onChange: onChange,
+    renderExtraFooter: renderExtraFooter
+  }));
+};
+export default BizQuickDatePicker;

package/es/quickDatePicker/styles/index.less

@@ -0,0 +1,124 @@
+@import '../../assets/styles/inner.less';
+
+.biz-quick-date-picker-wrap {
+  display: inline-block;
+  height: 34px;
+  padding: 4px 8px;
+  background: #fafafb;
+  border: 1px solid #fafafb;
+  border-radius: 4px;
+  .ant-picker-focused {
+    box-shadow: none !important;
+  }
+  > :nth-child(1) {
+    float: left;
+    height: 24px;
+    margin-right: 8px;
+    padding: 2px 8px;
+    color: #165dff;
+    vertical-align: middle;
+    background: #e8efff;
+  }
+  .ant-picker {
+    padding: 0;
+    vertical-align: middle;
+    border: none;
+    border-radius: 0 !important;
+    .ant-picker-clear {
+      right: 0;
+    }
+  }
+  .ant-picker:hover {
+    .ant-picker-input > input,
+    .ant-picker-range-separator {
+      color: #021429 !important;
+    }
+  }
+  &-content {
+    float: left;
+    .ant-picker-panel-container {
+      display: flex;
+      flex-direction: row-reverse;
+      .ant-picker-footer {
+        width: auto;
+        min-width: auto;
+        border-bottom: 1px solid #e8efff;
+        box-shadow: 0px 4px 10px 0px rgba(0, 0, 0, 0.1);
+      }
+    }
+    &-options {
+      width: 170px;
+      padding-bottom: 25px;
+      color: #67727f;
+      ol,
+      li {
+        margin: 0;
+        padding: 0;
+        list-style: none;
+        list-style-type: none;
+      }
+      > :nth-child(1),
+      > :nth-child(2) {
+        display: flex;
+        flex-wrap: wrap;
+        justify-content: space-between;
+        margin-top: 8px;
+        padding-bottom: 4px;
+        border-bottom: 1px solid #ecedf0;
+        li {
+          width: 81px;
+          height: 24px;
+          margin-bottom: 8px;
+          line-height: 24px;
+          text-align: center;
+          background: #fafafb;
+          border-radius: 24px;
+          cursor: pointer;
+        }
+      }
+      > :nth-child(2) {
+        margin-top: 14px;
+        li {
+          border-radius: 0;
+        }
+      }
+      > :nth-child(3) {
+        display: flex;
+        justify-content: space-between;
+        width: 100%;
+        height: 32px;
+        margin-top: 12px;
+        padding: 0 12px;
+        line-height: 32px;
+        background: #fafafb;
+        > :first-child {
+          transform: rotate(180deg);
+        }
+      }
+      .active,
+      li.active {
+        color: #165dff;
+        background: #e8efff;
+      }
+    }
+  }
+}
+
+.biz-quick-date-picker-wrap:hover {
+  border: 1px solid #165dff;
+}
+.biz-quick-date-picker-wrap.focus {
+  box-shadow: 0 0 0 4px #f0f7ff;
+}
+
+.clearfix:after {
+  display: block;
+  clear: both;
+  height: 0;
+  content: '';
+}
+
+.clearfix {
+  /* 触发 hasLayout */
+  zoom: 1;
+}

package/es/quickDatePicker/types.d.ts

@@ -0,0 +1,24 @@
+export declare namespace QuickDatePickerTypes {
+    interface Options {
+        label: string;
+        value: number;
+        type: 'week' | 'month' | 'day';
+    }
+    interface Range {
+        begin: string;
+        end: string;
+    }
+    interface Value extends Range {
+        unit: 'day' | 'week' | 'month';
+        relative?: number;
+    }
+    interface Props {
+        defaultValue?: Value;
+        value?: Value;
+        onChange?: (data: Value) => void;
+    }
+    interface ListOption {
+        count: number;
+        value: string;
+    }
+}

package/es/quickDatePicker/types.js

@@ -0,0 +1 @@
+export {};

package/es/quickDatePicker/utils.d.ts

@@ -0,0 +1,10 @@
+export declare const quickModuleOneOptions: {
+    label: string;
+    value: number;
+    type: 'week' | 'month' | 'day';
+}[];
+export declare const quickModuleTwoOptions: {
+    label: string;
+    value: number;
+    type: 'week' | 'month' | 'day';
+}[];

package/es/quickDatePicker/utils.js

@@ -0,0 +1,42 @@
+export var quickModuleOneOptions = [{
+  label: '本周',
+  value: 1,
+  type: 'week'
+}, {
+  label: '上周',
+  value: 2,
+  type: 'week'
+}, {
+  label: '本月',
+  value: 3,
+  type: 'month'
+}, {
+  label: '上月',
+  value: 4,
+  type: 'month'
+}];
+export var quickModuleTwoOptions = [{
+  label: '过去5天',
+  value: 5,
+  type: 'day'
+}, {
+  label: '过去7天',
+  value: 7,
+  type: 'day'
+}, {
+  label: '过去14天',
+  value: 14,
+  type: 'day'
+}, {
+  label: '过去30天',
+  value: 30,
+  type: 'day'
+}, {
+  label: '过去60天',
+  value: 60,
+  type: 'day'
+}, {
+  label: '过去180天',
+  value: 180,
+  type: 'day'
+}];

package/es/targetConditionGroup/styles/index.less

@@ -22,4 +22,7 @@
   &-submenu {
     width: 120px;
   }
+  .biz-event-select.focus {
+    box-shadow: none;
+  }
 }

package/es/targetSelector/styles/index.less

@@ -9,6 +9,9 @@
     flex: 1;
     width: 0;
   }
+  .biz-event-select.focus {
+    box-shadow: none;
+  }
 
   .biz-event-select-handle {
     flex: none;

package/es/userGroup/index.js

@@ -40,8 +40,15 @@ var BizUserGroup = function BizUserGroup(props) {
     setCurrent(value);
     if (props.onChange) props.onChange(value);
   };
+  var _useState5 = useState(false),
+    _useState6 = _slicedToArray(_useState5, 2),
+    focus = _useState6[0],
+    setFocus = _useState6[1];
+  var onVisibleChange = function onVisibleChange(visible) {
+    setFocus(visible);
+  };
   return /*#__PURE__*/React.createElement("div", {
-    className: classPrefix
+    className: "".concat(classPrefix, " ").concat(focus ? 'focus' : '')
   }, /*#__PURE__*/React.createElement(Skeleton, {
     loading: loading,
     active: true,
@@ -57,7 +64,8 @@ var BizUserGroup = function BizUserGroup(props) {
     border: false,
     disableItemList: props.disableItemList,
     onChange: onChange,
-    minDropdownWidth: 284
+    minDropdownWidth: 284,
+    onVisibleChange: onVisibleChange
   }), /*#__PURE__*/React.createElement(BizTargetOptionIcon, {
     name: "delete",
     icon: "qingchu",

package/es/userGroup/styles/index.less

@@ -4,7 +4,9 @@
   position: relative;
   display: flex;
   .__select-handle();
-
+  &.focus {
+    box-shadow: 0 0 0 4px @custom-focus;
+  }
   .biz-select-handle {
     flex: 1;
     width: 100%;

package/es/utils/ajax.js

@@ -78,8 +78,10 @@ export function responseErrorHandler(url, apiResult, errorTitle, notifyType) {
     flag = true;
   } else if (new RegExp("".concat(ResponseStatus.notLogin)).test(apiResult.code)) {
     msg = '账户未登录或登录已失效';
+    flag = true;
   } else if (new RegExp("".concat(ResponseStatus.noPermission)).test(apiResult.code)) {
     msg = '账户没有权限';
+    flag = true;
   }
   if (!flag) {
     msg = apiResult.msg || msg;
@@ -88,6 +90,7 @@ export function responseErrorHandler(url, apiResult, errorTitle, notifyType) {
       description: msg
     });
     message.error(msg);
+    throw new Error(msg);
   }
   return apiResult;
 }
@@ -137,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.0",
+  "version": "1.1.55-beta.10",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -60,5 +60,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "d43bbb8c72bb0da5995f873be7dc97bd009afbc3"
+  "gitHead": "bddf2a9466460102f38498748c4eff5bcdb9dad9"
 }