@zgfe/business-lib 1.0.25-layers.3 → 1.0.25-userGroupFix.0

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

@@ -1,584 +1,25 @@
 export default {
-  x_axis: ['2022-04-28|2022-05-04'],
+  x_axis: ['2022-08-25|2022-09-01'],
   series: [{
-    names: ['贵阳市'],
-    original_names: ['贵阳市'],
-    values: [3],
-    total: []
+    names: ['北京市', '所有用户', '加购商品'],
+    values: [1370]
   }, {
-    names: ['银川市'],
-    original_names: ['银川市'],
-    values: [1],
-    total: []
+    names: ['北京市', '洞察测试用户群二', '加购商品'],
+    values: [1370]
   }, {
-    names: ['长春市'],
-    original_names: ['长春市'],
-    values: [2],
-    total: []
+    names: ['北京市', '所有用户', '查看商品'],
+    values: [2000]
   }, {
-    names: ['苏州市'],
-    original_names: ['苏州市'],
-    values: [8],
-    total: []
+    names: ['北京市', '洞察测试用户群二', '查看商品'],
+    values: [2000]
   }, {
-    names: ['厦门市'],
-    original_names: ['厦门市'],
-    values: [5],
-    total: []
+    names: ['北京市', '所有用户', '评价商品'],
+    values: [380]
   }, {
-    names: ['阜阳市'],
-    original_names: ['阜阳市'],
-    values: [1],
-    total: []
+    names: ['北京市', '洞察测试用户群二', '评价商品'],
+    values: [380]
   }, {
-    names: ['常德市'],
-    original_names: ['常德市'],
-    values: [1],
-    total: []
-  }, {
-    names: ['昌吉回族自治州'],
-    original_names: ['昌吉回族自治州'],
-    values: [1],
-    total: []
-  }, {
-    names: ['Ryde'],
-    original_names: ['Ryde'],
-    values: [2],
-    total: []
-  }, {
-    names: ['Makati'],
-    original_names: ['Makati'],
-    values: [1],
-    total: []
-  }, {
-    names: ['安阳市'],
-    original_names: ['安阳市'],
-    values: [1],
-    total: []
-  }, {
-    names: ['湖州市'],
-    original_names: ['湖州市'],
-    values: [4],
-    total: []
-  }, {
-    names: ['Suwon'],
-    original_names: ['Suwon'],
-    values: [2],
-    total: []
-  }, {
-    names: ['沈阳市'],
-    original_names: ['沈阳市'],
-    values: [1],
-    total: []
-  }, {
-    names: ['武汉市'],
-    original_names: ['武汉市'],
-    values: [5],
-    total: []
-  }, {
-    names: ['台中市'],
-    original_names: ['台中市'],
-    values: [1],
-    total: []
-  }, {
-    names: ['昌都市'],
-    original_names: ['昌都市'],
-    values: [2],
-    total: []
-  }, {
-    names: ['Kanazawa'],
-    original_names: ['Kanazawa'],
-    values: [2],
-    total: []
-  }, {
-    names: ['Huntingwood'],
-    original_names: ['Huntingwood'],
-    values: [1],
-    total: []
-  }, {
-    names: ['洛阳市'],
-    original_names: ['洛阳市'],
-    values: [3],
-    total: []
-  }, {
-    names: ['金华市'],
-    original_names: ['金华市'],
-    values: [3],
-    total: []
-  }, {
-    names: ['濮阳市'],
-    original_names: ['濮阳市'],
-    values: [1],
-    total: []
-  }, {
-    names: ['廊坊市'],
-    original_names: ['廊坊市'],
-    values: [5],
-    total: []
-  }, {
-    names: ['-'],
-    original_names: ['-'],
-    values: [90],
-    total: []
-  }, {
-    names: ['泰安市'],
-    original_names: ['泰安市'],
-    values: [1],
-    total: []
-  }, {
-    names: ['南京市'],
-    original_names: ['南京市'],
-    values: [5],
-    total: []
-  }, {
-    names: ['Bangkok'],
-    original_names: ['Bangkok'],
-    values: [3],
-    total: []
-  }, {
-    names: ['伊春市'],
-    original_names: ['伊春市'],
-    values: [1],
-    total: []
-  }, {
-    names: ['Okayama'],
-    original_names: ['Okayama'],
-    values: [1],
-    total: []
-  }, {
-    names: ['成都市'],
-    original_names: ['成都市'],
-    values: [2],
-    total: []
-  }, {
-    names: ['London'],
-    original_names: ['London'],
-    values: [1],
-    total: []
-  }, {
-    names: ['天津市'],
-    original_names: ['天津市'],
-    values: [5],
-    total: []
-  }, {
-    names: ['Sydney'],
-    original_names: ['Sydney'],
-    values: [2],
-    total: []
-  }, {
-    names: ['Seri Kembangan'],
-    original_names: ['Seri Kembangan'],
-    values: [1],
-    total: []
-  }, {
-    names: ['深圳市'],
-    original_names: ['深圳市'],
-    values: [30],
-    total: []
-  }, {
-    names: ['Adelaide'],
-    original_names: ['Adelaide'],
-    values: [2],
-    total: []
-  }, {
-    names: ['南昌市'],
-    original_names: ['南昌市'],
-    values: [1],
-    total: []
-  }, {
-    names: ['曲靖市'],
-    original_names: ['曲靖市'],
-    values: [1],
-    total: []
-  }, {
-    names: ['陵水黎族自治县'],
-    original_names: ['陵水黎族自治县'],
-    values: [1],
-    total: []
-  }, {
-    names: ['Mumbai'],
-    original_names: ['Mumbai'],
-    values: [2],
-    total: []
-  }, {
-    names: ['合肥市'],
-    original_names: ['合肥市'],
-    values: [1],
-    total: []
-  }, {
-    names: ['Bangalore'],
-    original_names: ['Bangalore'],
-    values: [2],
-    total: []
-  }, {
-    names: ['通辽市'],
-    original_names: ['通辽市'],
-    values: [1],
-    total: []
-  }, {
-    names: ['Sai Mai'],
-    original_names: ['Sai Mai'],
-    values: [1],
-    total: []
-  }, {
-    names: ['西安市'],
-    original_names: ['西安市'],
-    values: [4],
-    total: []
-  }, {
-    names: ['大理白族自治州'],
-    original_names: ['大理白族自治州'],
-    values: [2],
-    total: []
-  }, {
-    names: ['吉林市'],
-    original_names: ['吉林市'],
-    values: [6],
-    total: []
-  }, {
-    names: ['玉溪市'],
-    original_names: ['玉溪市'],
-    values: [1],
-    total: []
-  }, {
-    names: ['郑州市'],
-    original_names: ['郑州市'],
-    values: [3],
-    total: []
-  }, {
-    names: ['平顶山市'],
-    original_names: ['平顶山市'],
-    values: [1],
-    total: []
-  }, {
-    names: ['锡林郭勒盟'],
-    original_names: ['锡林郭勒盟'],
-    values: [2],
-    total: []
-  }, {
-    names: ['福州市'],
-    original_names: ['福州市'],
-    values: [2],
-    total: []
-  }, {
-    names: ['苗栗县'],
-    original_names: ['苗栗县'],
-    values: [1],
-    total: []
-  }, {
-    names: ['沧州市'],
-    original_names: ['沧州市'],
-    values: [5],
-    total: []
-  }, {
-    names: ['北京市'],
-    original_names: ['北京市'],
-    values: [239],
-    total: []
-  }, {
-    names: ['Surabaya'],
-    original_names: ['Surabaya'],
-    values: [1],
-    total: []
-  }, {
-    names: ['枣庄市'],
-    original_names: ['枣庄市'],
-    values: [1],
-    total: []
-  }, {
-    names: ['无锡市'],
-    original_names: ['无锡市'],
-    values: [4],
-    total: []
-  }, {
-    names: ['东莞市'],
-    original_names: ['东莞市'],
-    values: [2],
-    total: []
-  }, {
-    names: ['长沙市'],
-    original_names: ['长沙市'],
-    values: [2],
-    total: []
-  }, {
-    names: ['宜昌市'],
-    original_names: ['宜昌市'],
-    values: [1],
-    total: []
-  }, {
-    names: ['佛山市'],
-    original_names: ['佛山市'],
-    values: [4],
-    total: []
-  }, {
-    names: ['南宁市'],
-    original_names: ['南宁市'],
-    values: [1],
-    total: []
-  }, {
-    names: ['大同市'],
-    original_names: ['大同市'],
-    values: [2],
-    total: []
-  }, {
-    names: ['昭通市'],
-    original_names: ['昭通市'],
-    values: [1],
-    total: []
-  }, {
-    names: ['柳州市'],
-    original_names: ['柳州市'],
-    values: [1],
-    total: []
-  }, {
-    names: ['阳泉市'],
-    original_names: ['阳泉市'],
-    values: [1],
-    total: []
-  }, {
-    names: ['台州市'],
-    original_names: ['台州市'],
-    values: [4],
-    total: []
-  }, {
-    names: ['九江市'],
-    original_names: ['九江市'],
-    values: [2],
-    total: []
-  }, {
-    names: ['Visakhapatnam'],
-    original_names: ['Visakhapatnam'],
-    values: [1],
-    total: []
-  }, {
-    names: ['Tokyo'],
-    original_names: ['Tokyo'],
-    values: [3],
-    total: []
-  }, {
-    names: ['凉山彝族自治州'],
-    original_names: ['凉山彝族自治州'],
-    values: [1],
-    total: []
-  }, {
-    names: ['哈尔滨市'],
-    original_names: ['哈尔滨市'],
-    values: [4],
-    total: []
-  }, {
-    names: ['杭州市'],
-    original_names: ['杭州市'],
-    values: [9],
-    total: []
-  }, {
-    names: ['淮北市'],
-    original_names: ['淮北市'],
-    values: [1],
-    total: []
-  }, {
-    names: ['盘锦市'],
-    original_names: ['盘锦市'],
-    values: [4],
-    total: []
-  }, {
-    names: ['德州市'],
-    original_names: ['德州市'],
-    values: [2],
-    total: []
-  }, {
-    names: ['潍坊市'],
-    original_names: ['潍坊市'],
-    values: [1],
-    total: []
-  }, {
-    names: ['中山市'],
-    original_names: ['中山市'],
-    values: [1],
-    total: []
-  }, {
-    names: ['昆明市'],
-    original_names: ['昆明市'],
-    values: [1],
-    total: []
-  }, {
-    names: ['惠州市'],
-    original_names: ['惠州市'],
-    values: [1],
-    total: []
-  }, {
-    names: ['东方市'],
-    original_names: ['东方市'],
-    values: [1],
-    total: []
-  }, {
-    names: ['太原市'],
-    original_names: ['太原市'],
-    values: [2],
-    total: []
-  }, {
-    names: ['宣城市'],
-    original_names: ['宣城市'],
-    values: [1],
-    total: []
-  }, {
-    names: ['咸阳市'],
-    original_names: ['咸阳市'],
-    values: [1],
-    total: []
-  }, {
-    names: ['永州市'],
-    original_names: ['永州市'],
-    values: [1],
-    total: []
-  }, {
-    names: ['汕头市'],
-    original_names: ['汕头市'],
-    values: [1],
-    total: []
-  }, {
-    names: ['Singapore'],
-    original_names: ['Singapore'],
-    values: [5],
-    total: []
-  }, {
-    names: ['中国香港'],
-    original_names: ['中国香港'],
-    values: [12],
-    total: []
-  }, {
-    names: ['宁波市'],
-    original_names: ['宁波市'],
-    values: [4],
-    total: []
-  }, {
-    names: ['Kagoshima'],
-    original_names: ['Kagoshima'],
-    values: [2],
-    total: []
-  }, {
-    names: ['清远市'],
-    original_names: ['清远市'],
-    values: [1],
-    total: []
-  }, {
-    names: ['辽源市'],
-    original_names: ['辽源市'],
-    values: [2],
-    total: []
-  }, {
-    names: ['上海市'],
-    original_names: ['上海市'],
-    values: [53],
-    total: []
-  }, {
-    names: ['临沂市'],
-    original_names: ['临沂市'],
-    values: [3],
-    total: []
-  }, {
-    names: ['邯郸市'],
-    original_names: ['邯郸市'],
-    values: [1],
-    total: []
-  }, {
-    names: ['Tsche-mul-p-ho'],
-    original_names: ['Tsche-mul-p-ho'],
-    values: [1],
-    total: []
-  }, {
-    names: ['泉州市'],
-    original_names: ['泉州市'],
-    values: [5],
-    total: []
-  }, {
-    names: ['Auckland'],
-    original_names: ['Auckland'],
-    values: [2],
-    total: []
-  }, {
-    names: ['广州市'],
-    original_names: ['广州市'],
-    values: [26],
-    total: []
-  }, {
-    names: ['滁州市'],
-    original_names: ['滁州市'],
-    values: [1],
-    total: []
-  }, {
-    names: ['松原市'],
-    original_names: ['松原市'],
-    values: [3],
-    total: []
-  }, {
-    names: ['驻马店市'],
-    original_names: ['驻马店市'],
-    values: [3],
-    total: []
-  }, {
-    names: ['Saitama'],
-    original_names: ['Saitama'],
-    values: [1],
-    total: []
-  }, {
-    names: ['青岛市'],
-    original_names: ['青岛市'],
-    values: [2],
-    total: []
-  }, {
-    names: ['呼和浩特市'],
-    original_names: ['呼和浩特市'],
-    values: [1],
-    total: []
-  }, {
-    names: ['舟山市'],
-    original_names: ['舟山市'],
-    values: [1],
-    total: []
-  }, {
-    names: ['重庆市'],
-    original_names: ['重庆市'],
-    values: [2],
-    total: []
-  }, {
-    names: ['安庆市'],
-    original_names: ['安庆市'],
-    values: [2],
-    total: []
-  }, {
-    names: ['固原市'],
-    original_names: ['固原市'],
-    values: [1],
-    total: []
-  }, {
-    names: ['信阳市'],
-    original_names: ['信阳市'],
-    values: [1],
-    total: []
-  }, {
-    names: ['芜湖市'],
-    original_names: ['芜湖市'],
-    values: [2],
-    total: []
-  }, {
-    names: ['南通市'],
-    original_names: ['南通市'],
-    values: [1],
-    total: []
-  }, {
-    names: ['大庆市'],
-    original_names: ['大庆市'],
-    values: [7],
-    total: []
-  }, {
-    names: ['乐东黎族自治县'],
-    original_names: ['乐东黎族自治县'],
-    values: [1],
-    total: []
-  }, {
-    names: ['济南市'],
-    original_names: ['济南市'],
-    values: [7],
-    total: []
+    names: ['武汉市', '所有用户', '加购商品'],
+    values: [130]
   }]
 };

package/es/chart/demo/map.js

@@ -5,7 +5,6 @@ export default (function () {
   return /*#__PURE__*/React.createElement(BizChart, {
     data: chartData,
     type: "map",
-    isCity: false,
-    useGroup: "1"
+    isCity: true
   });
 });

package/es/chart/index.js

@@ -72,10 +72,10 @@ var BizChart = /*#__PURE__*/React.forwardRef(function (props, ref) {
 
       eOption = getChartOption(type, _rData, legendPosition, legendOrient, valueUnit, xRotate, yRotate, tooltipFormatter, xAxisFormatter, yAxisFormatter, legendFormatter, reverseXAxis, seriesName);
     } else if (type === 'map') {
-      var series = isCity ? citySeries(data, !!userGroup) : provinceSeries(data, !!userGroup);
+      var series = isCity ? citySeries(data) : provinceSeries(data);
       var maxMin = maxMinValue(series[0]);
       var showVisualMap = !(userGroup && userGroup.split(',').length > 1);
-      eOption = getMapOption(series, maxMin, showVisualMap, tooltipFormatter);
+      eOption = getMapOption(series, maxMin, showVisualMap, tooltipFormatter, isCity);
     }
 
     if (colors) {

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

@@ -21,57 +21,4 @@ export declare const getPieOption: (seriesData?: object[], legendPosition?: 'top
 export declare const getMapOption: (seriesData: object[] | undefined, maxMinValue: {
     min: number;
     max: number;
-}, showVisualMap?: boolean, tooltipFormat?: ((value: any) => string) | undefined) => {
-    geo: {
-        map: string;
-        roam: boolean;
-        layoutCenter: string[];
-        top: number;
-        bottom: number;
-    };
-    backgroundColor: string;
-    tooltip: {
-        trigger: string;
-        textStyle: {
-            fontSize: number;
-        };
-        backgroundColor: string;
-        borderColor: string;
-        padding: number;
-        extraCssText: string;
-        className: string;
-        confine: boolean;
-        formatter: (params: any) => string | undefined;
-    };
-    legend: {
-        show: boolean;
-    };
-    visualMap: {
-        type: string;
-        min: number;
-        max: number;
-        left: string;
-        top: string;
-        text: string[];
-        realtime: boolean;
-        calculable: boolean;
-        seriesIndex: number;
-        inRange: {
-            color: string[];
-        };
-        show: boolean;
-    };
-    toolbox: {
-        show: boolean;
-        orient: string;
-        right: string;
-        bottom: string;
-        feature: {
-            saveAsImage: {
-                show: boolean;
-                title: string;
-            };
-        };
-    };
-    series: object[];
-};
+}, showVisualMap?: boolean, tooltipFormat?: ((value: any) => string) | undefined, isCity?: boolean | undefined) => any;

package/es/chart/util/chartOptionConfig.js

@@ -9,6 +9,7 @@ import { chartColors } from './color';
 import '../styles/index.less';
 export var baseConfig = {
   color: chartColors,
+  backgroundColor: '#fff',
   textStyle: {
     color: '#5F6085'
   },
@@ -258,14 +259,8 @@ export var getMapOption = function getMapOption() {
   var maxMinValue = arguments.length > 1 ? arguments[1] : undefined;
   var showVisualMap = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
   var tooltipFormat = arguments.length > 3 ? arguments[3] : undefined;
+  var isCity = arguments.length > 4 ? arguments[4] : undefined;
   var option = {
-    geo: {
-      map: 'china',
-      roam: false,
-      layoutCenter: ['30%', '30%'],
-      top: 20,
-      bottom: 20
-    },
     backgroundColor: '#fff',
     tooltip: {
       trigger: 'item',
@@ -312,5 +307,16 @@ export var getMapOption = function getMapOption() {
     },
     series: seriesData
   };
+
+  if (isCity) {
+    option.geo = {
+      map: 'china',
+      roam: false,
+      layoutCenter: ['30%', '30%'],
+      top: 0,
+      bottom: 0
+    };
+  }
+
   return option;
 };