dtable-statistic 4.1.3 → 4.1.4

package/es/stat-editor/stat-settings/advance-chart-settings/map-settings.js

@@ -5,15 +5,12 @@ import _createSuper from "@babel/runtime/helpers/esm/createSuper";
 import React, { Component, Fragment } from 'react';
 import BaseSettings from '../public-setting/base-settings';
 import ColumnSettings from '../public-setting/column-settings';
-import GeoGranularitySettings from './geo-granularity-settings';
 import SummarySettings from './summary-settings';
 import MapStyleSetting from './style-setting/map-setting';
 import { isMapColumn } from '../../../utils/column-utils';
 import { GEOLOCATION_GRANULARITY } from '../../../constants';
 import MapLevelSettings from '../map/map-level';
 import MapProvinceCitySettings from '../map/map-province-city';
-import { MAP_LEVEL } from '../../../constants/map';
-import { fixGeoGranularity } from '../../../utils/map';
 var MapSettings = /*#__PURE__*/function (_Component) {
   _inherits(MapSettings, _Component);
   var _super = _createSuper(MapSettings);
@@ -27,58 +24,11 @@ var MapSettings = /*#__PURE__*/function (_Component) {
         return isMapColumn(column);
       });
     };
-    _this.generateGeoGranularityOptions = function () {
-      _this.provinceGranularityOption = {
-        label: /*#__PURE__*/React.createElement("span", {
-          className: "select-option-name"
-        }, '按省'),
-        value: GEOLOCATION_GRANULARITY.PROVINCE
-      };
-      _this.cityGranularityOption = {
-        label: /*#__PURE__*/React.createElement("span", {
-          className: "select-option-name"
-        }, '按市'),
-        value: GEOLOCATION_GRANULARITY.CITY
-      };
-      _this.districtGranularityOption = {
-        label: /*#__PURE__*/React.createElement("span", {
-          className: "select-option-name"
-        }, '按区/县'),
-        value: GEOLOCATION_GRANULARITY.DISTRICT
-      };
-    };
     _this.getSelectedGeoColumnOption = function () {
       return _this.geoColumnsOptions.find(function (option) {
         return option.value.key === _this.props.statItem.geo_column;
       });
     };
-    _this.getGeoGranularityOptions = function () {
-      var map_level = _this.props.statItem.map_level;
-      return _this.mapLevel2GeoGranularityOptions[map_level || MAP_LEVEL.COUNTRY];
-    };
-    _this.getSelectedGeoGranularityOption = function () {
-      var _this$props$statItem = _this.props.statItem,
-        map_level = _this$props$statItem.map_level,
-        map_location = _this$props$statItem.map_location;
-      var geoGranularity = fixGeoGranularity({
-        mapLevel: map_level,
-        mapLocation: map_location
-      });
-      switch (geoGranularity) {
-        case GEOLOCATION_GRANULARITY.CITY:
-          {
-            return _this.cityGranularityOption;
-          }
-        case GEOLOCATION_GRANULARITY.DISTRICT:
-          {
-            return _this.districtGranularityOption;
-          }
-        default:
-          {
-            return _this.provinceGranularityOption;
-          }
-      }
-    };
     _this.onSelectGeoColumn = function (option) {
       var geo_column = _this.props.statItem.geo_column;
       var new_geo_column = option.value.key;
@@ -88,14 +38,10 @@ var MapSettings = /*#__PURE__*/function (_Component) {
         geolocation_granularity: GEOLOCATION_GRANULARITY.PROVINCE
       }));
     };
-    _this.onSelectGeoGranularity = function (option) {
-      return;
-    };
     var _columns = props.columns,
       getColumnsOptions = props.getColumnsOptions;
     var geoColumns = _this.getColumns(_columns);
     _this.geoColumnsOptions = getColumnsOptions(geoColumns);
-    _this.generateGeoGranularityOptions();
     return _this;
   }
   _createClass(MapSettings, [{
@@ -121,7 +67,6 @@ var MapSettings = /*#__PURE__*/function (_Component) {
         numericColumns = _this$props.numericColumns;
       var selectedViewId = statItem.view_id;
       var selectedGeoColumnOption = this.getSelectedGeoColumnOption();
-      var selectedGeoGranularityOption = this.getSelectedGeoGranularityOption();
       if (settingType === 'style') {
         return /*#__PURE__*/React.createElement(MapStyleSetting, {
           statItem: statItem,
@@ -154,12 +99,6 @@ var MapSettings = /*#__PURE__*/function (_Component) {
         columnsOptions: this.geoColumnsOptions,
         selectedColumnOption: selectedGeoColumnOption,
         onChangeSelectedColumn: this.onSelectGeoColumn
-      })), /*#__PURE__*/React.createElement("div", {
-        className: "statistic-chart-parameter-item"
-      }, /*#__PURE__*/React.createElement(GeoGranularitySettings, {
-        geoGranularityOptions: [selectedGeoGranularityOption],
-        selectedGeoGranularityOption: selectedGeoGranularityOption,
-        onChangeGeoGranularity: this.onSelectGeoGranularity
       })), /*#__PURE__*/React.createElement("div", {
         className: "statistic-chart-parameter-divider"
       }), /*#__PURE__*/React.createElement(SummarySettings, {

package/es/stat-view/map.js

@@ -11,8 +11,7 @@ import { Chart } from '../custom-g2';
 import { COLOR_OPTIONS, DEFAULT_NUMBER_FORMAT_OBJECT, SUMMARY_TYPE } from '../constants';
 import { MAP_LEVEL } from '../constants/map';
 import { shallowEqual } from '../utils/common-utils';
-var WIDTH = 798;
-var HEIGHT = 520;
+import { getRegionScaleOffsets } from '../utils/map';
 var Map = /*#__PURE__*/function (_BaseChart) {
   _inherits(Map, _BaseChart);
   var _super = _createSuper(Map);
@@ -28,10 +27,7 @@ var Map = /*#__PURE__*/function (_BaseChart) {
       return map_level !== preMapLevel || !shallowEqual(map_location, prevMapLocation);
     };
     _this.reCalculateChart = function (statItem) {
-      if (_this.chart) {
-        _this.chart.destroy();
-        _this.initStatisticContext(_this.geoData);
-      }
+      _this.rerenderChart();
       _this.props.chartCalculator.calculate(statItem).then(function (statData) {
         _this.calculateData = statData;
         _this.setState({
@@ -44,6 +40,11 @@ var Map = /*#__PURE__*/function (_BaseChart) {
         }
       });
     };
+    _this.rerenderChart = function () {
+      if (!_this.chart) return;
+      _this.chart.destroy();
+      _this.initStatisticContext(_this.geoData);
+    };
     _this.getMapLevel = function (statItem) {
       var map_level = statItem.map_level;
       return map_level || MAP_LEVEL.COUNTRY;
@@ -143,16 +144,14 @@ var Map = /*#__PURE__*/function (_BaseChart) {
             return _this.getNumberDisplayString(value, columnData, summary_method);
           }
         },
-        handler: {
-          style: {
-            'opacity': 0
-          }
-        }
+        slidable: false
       });
       _this.statisticView.interaction('element-active');
       _this.statisticView.render();
     };
     _this.updateStatisticData = function (data) {
+      _this.rerenderChart();
+
       // re-render statistic data view;
       if (_this.statisticView) {
         _this.statisticView.destroy();
@@ -195,6 +194,9 @@ var Map = /*#__PURE__*/function (_BaseChart) {
       }
       _this.statisticView = _this.chart.createView();
       _this.statisticView.data(userDv.rows);
+      _this.chart.theme({
+        defaultColor: statItem.bubble_color || '#2a67d1'
+      });
       _this.statisticView.point().position('longitude*latitude').size('value', function (value) {
         var percent = value / data.sum;
         var size = percent * 100;
@@ -239,23 +241,25 @@ var Map = /*#__PURE__*/function (_BaseChart) {
             return _this.getNumberDisplayString(value, columnData, summary_method);
           }
         },
-        handler: {
-          style: {
-            'opacity': 0
-          }
-        }
+        slidable: false
       });
       _this.statisticView.interaction('element-active');
       _this.statisticView.render();
     };
     _this.getCanvasSize = function () {
+      var statItem = _this.props.statItem;
+      var map_level = statItem.map_level,
+        map_location = statItem.map_location;
       var maxWidth = _this.container.clientWidth;
       var maxHeight = _this.container.clientHeight;
+      var _getRegionScaleOffset = getRegionScaleOffsets(map_level, map_location),
+        scale_w = _getRegionScaleOffset.scale_w,
+        scale_h = _getRegionScaleOffset.scale_h;
       var h = maxHeight;
-      var w = h * (WIDTH / HEIGHT);
+      var w = h * (scale_w / scale_h);
       if (w > maxWidth) {
         w = maxWidth;
-        h = w * (HEIGHT / WIDTH);
+        h = w * (scale_h / scale_w);
       }
       return {
         w: w,

package/es/stat-view/world-map.js

@@ -125,11 +125,7 @@ var WorldMap = /*#__PURE__*/function (_BaseChart) {
             return _this.getNumberDisplayString(value, summaryColumnData, summary_method);
           }
         },
-        handler: {
-          style: {
-            'opacity': 0
-          }
-        }
+        slidable: false
       });
       _this.statisticView.interaction('element-active');
       _this.statisticView.render();
@@ -158,6 +154,9 @@ var WorldMap = /*#__PURE__*/function (_BaseChart) {
       }
       _this.statisticView = _this.chart.createView();
       _this.statisticView.data(userDv.rows);
+      _this.chart.theme({
+        defaultColor: statItem.bubble_color || '#2a67d1'
+      });
       _this.statisticView.point().position('longitude*latitude').size('value', function (value) {
         var percent = value / data.sum;
         var size = percent * 100;
@@ -202,11 +201,7 @@ var WorldMap = /*#__PURE__*/function (_BaseChart) {
             return _this.getNumberDisplayString(value, summaryColumnData, summary_method);
           }
         },
-        handler: {
-          style: {
-            'opacity': 0
-          }
-        }
+        slidable: false
       });
       _this.statisticView.interaction('element-active');
       _this.statisticView.render();

package/es/utils/map.js

@@ -1,6 +1,8 @@
 import { GEOLOCATION_GRANULARITY, STAT_TYPE } from '../constants';
 import { MAP_LEVEL, MUNICIPALITIES } from '../constants/map';
 import { regions } from '../constants/regions';
+var COUNTY_SCALE_WIDTH = 5.95;
+var COUNTY_SCALE_HEIGHT = 4.37;
 export var getGeoGranularityByLevel = function getGeoGranularityByLevel(mapLevel) {
   switch (mapLevel) {
     case MAP_LEVEL.PROVINCE:
@@ -61,4 +63,46 @@ export var fixMapGeoGranularity = function fixMapGeoGranularity(chart) {
     mapLevel: map_level,
     mapLocation: map_location
   });
+};
+export var getRegionScaleOffsets = function getRegionScaleOffsets(mapLevel, mapLocation) {
+  var countryScaleOffsets = {
+    scale_w: COUNTY_SCALE_WIDTH,
+    scale_h: COUNTY_SCALE_HEIGHT
+  };
+  switch (mapLevel) {
+    case MAP_LEVEL.PROVINCE:
+      {
+        var provinceName = mapLocation && mapLocation.province;
+        var province = provinceName && regions.find(function (province) {
+          return province.name === provinceName;
+        });
+        if (!province) return countryScaleOffsets;
+        return {
+          scale_w: province.scale_w,
+          scale_h: province.scale_h
+        };
+      }
+    case MAP_LEVEL.CITY:
+      {
+        var _provinceName = mapLocation && mapLocation.province;
+        var _province = _provinceName && regions.find(function (province) {
+          return province.name === _provinceName;
+        });
+        var cities = _province && _province.cities;
+        var cityName = mapLocation.city;
+        var city = cityName && Array.isArray(cities) && cities.find(function (city) {
+          return city.name === cityName;
+        });
+        if (!city) return countryScaleOffsets;
+        return {
+          scale_w: city.scale_w,
+          scale_h: city.scale_h
+        };
+      }
+    default:
+      {
+        // default as 'country'
+        return countryScaleOffsets;
+      }
+  }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-statistic",
-  "version": "4.1.3",
+  "version": "4.1.4",
   "description": "statistics",
   "main": "dist/dtable-statistic.js",
   "author": "seafile",
@@ -12,7 +12,7 @@
     "@seafile/seafile-calendar": "0.0.24",
     "comlink": "^4.3.1",
     "dayjs": "1.10.7",
-    "dtable-store": "4.1.1",
+    "dtable-store": "4.1.2",
     "dtable-web-api": "4.0.11",
     "glamor": "^2.20.40",
     "html2canvas": "^1.4.1",