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

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/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

@@ -5,10 +5,7 @@ export default (function () {
   return /*#__PURE__*/React.createElement(BizChart, {
     data: pieData,
     type: "pie",
-    showAll: false,
-    legendPosition: "bottom",
-    legendOrient: "vertical",
-    colors: ['#1D9ED1', '#F383A2', '#9FB40F', '#FF6B3B', '#8C8C47'],
-    showList: ['付款成功', '搜索商品', '查看商品详情', 'click']
+    showAll: true,
+    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/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/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/utils/ajax.js

@@ -80,6 +80,7 @@ export function responseErrorHandler(url, apiResult, errorTitle, notifyType) {
     msg = '账户未登录或登录已失效';
   } else if (new RegExp("".concat(ResponseStatus.noPermission)).test(apiResult.code)) {
     msg = '账户没有权限';
+    throw new Error(apiResult.msg);
   }
   if (!flag) {
     msg = apiResult.msg || msg;
@@ -88,6 +89,7 @@ export function responseErrorHandler(url, apiResult, errorTitle, notifyType) {
       description: msg
     });
     message.error(msg);
+    throw new Error(msg);
   }
   return apiResult;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.1.55-beta.0",
+  "version": "1.1.55-beta.2",
   "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": "cf0536417852436598e08a1bb2f79e8db51f422d"
 }