dtable-statistic 4.2.2 → 4.3.0

package/es/service/map-json.js

@@ -1,154 +1,134 @@
-import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
-import _createClass from "@babel/runtime/helpers/esm/createClass";
 import { MAP_LEVEL } from '../constants/map';
 import { regions } from '../constants/regions';
-var MapJsonService = /*#__PURE__*/function () {
-  function MapJsonService(_ref) {
-    var mediaUrl = _ref.mediaUrl;
-    _classCallCheck(this, MapJsonService);
+class MapJsonService {
+  constructor(_ref) {
+    let {
+      mediaUrl
+    } = _ref;
     this.mediaUrl = mediaUrl;
     this.urlMapJsonQuerying = {};
     this.urlWaitingExecCallbacks = {};
     this.urlMapJson = {};
   }
-  _createClass(MapJsonService, [{
-    key: "getNameEnByMapLocation",
-    value: function getNameEnByMapLocation(mapLocation) {
-      var provinceName = mapLocation && mapLocation.province;
-      var province = provinceName && regions.find(function (province) {
-        return province.name === provinceName;
-      });
-      if (!province) return null;
-      var nameEN = {
-        province_name_en: province.name_en
-      };
-      var cityName = mapLocation.city;
-      var cities = province.cities;
-      var city = cityName && Array.isArray(cities) && cities.find(function (city) {
-        return city.name === cityName;
-      });
-      if (!city) {
-        return nameEN;
-      }
-      nameEN.city_name_en = city.name_en;
+  getNameEnByMapLocation(mapLocation) {
+    const provinceName = mapLocation && mapLocation.province;
+    const province = provinceName && regions.find(province => province.name === provinceName);
+    if (!province) return null;
+    let nameEN = {
+      province_name_en: province.name_en
+    };
+    const cityName = mapLocation.city;
+    const cities = province.cities;
+    const city = cityName && Array.isArray(cities) && cities.find(city => city.name === cityName);
+    if (!city) {
       return nameEN;
     }
+    nameEN.city_name_en = city.name_en;
+    return nameEN;
+  }
 
-    /**
-     * @param {string} mapLevel
-     * @param {object} mapLocation: province, city
-     * @returns part url for query map-json
-     */
-  }, {
-    key: "getMapJsonQueryUrl",
-    value: function getMapJsonQueryUrl(mapLevel, mapLocation) {
-      switch (mapLevel) {
-        case MAP_LEVEL.WORLD:
-          {
-            return 'world';
-          }
-        case MAP_LEVEL.COUNTRY:
-          {
-            return 'china';
+  /**
+   * @param {string} mapLevel
+   * @param {object} mapLocation: province, city
+   * @returns part url for query map-json
+   */
+  getMapJsonQueryUrl(mapLevel, mapLocation) {
+    switch (mapLevel) {
+      case MAP_LEVEL.WORLD:
+        {
+          return 'world';
+        }
+      case MAP_LEVEL.COUNTRY:
+        {
+          return 'china';
+        }
+      case MAP_LEVEL.PROVINCE:
+        {
+          const nameEn = this.getNameEnByMapLocation(mapLocation);
+          const provinceNameEn = nameEn && nameEn.province_name_en;
+          if (!provinceNameEn) {
+            return null;
           }
-        case MAP_LEVEL.PROVINCE:
-          {
-            var nameEn = this.getNameEnByMapLocation(mapLocation);
-            var provinceNameEn = nameEn && nameEn.province_name_en;
-            if (!provinceNameEn) {
-              return null;
-            }
-            return "region-mapjson/".concat(provinceNameEn, "/").concat(provinceNameEn);
+          return "region-mapjson/".concat(provinceNameEn, "/").concat(provinceNameEn);
+        }
+      case MAP_LEVEL.CITY:
+        {
+          const nameEn = this.getNameEnByMapLocation(mapLocation);
+          const provinceNameEn = nameEn && nameEn.province_name_en;
+          const cityNameEn = nameEn && nameEn.city_name_en;
+          if (!provinceNameEn || !cityNameEn) {
+            return null;
           }
-        case MAP_LEVEL.CITY:
-          {
-            var _nameEn = this.getNameEnByMapLocation(mapLocation);
-            var _provinceNameEn = _nameEn && _nameEn.province_name_en;
-            var cityNameEn = _nameEn && _nameEn.city_name_en;
-            if (!_provinceNameEn || !cityNameEn) {
-              return null;
-            }
 
-            // e.g. 北京市/北京市
-            if (_provinceNameEn === cityNameEn) {
-              return "region-mapjson/".concat(_provinceNameEn, "/").concat(_provinceNameEn);
-            }
-            return "region-mapjson/".concat(_provinceNameEn, "/").concat(_provinceNameEn, "_").concat(cityNameEn);
-          }
-        default:
-          {
-            return null;
+          // e.g. 北京市/北京市
+          if (provinceNameEn === cityNameEn) {
+            return "region-mapjson/".concat(provinceNameEn, "/").concat(provinceNameEn);
           }
-      }
+          return "region-mapjson/".concat(provinceNameEn, "/").concat(provinceNameEn, "_").concat(cityNameEn);
+        }
+      default:
+        {
+          return null;
+        }
     }
-  }, {
-    key: "getMapJson",
-    value: function getMapJson(url) {
-      return this.urlMapJson[url];
+  }
+  getMapJson(url) {
+    return this.urlMapJson[url];
+  }
+  setMapJson(url, json) {
+    this.urlMapJson[url] = json;
+  }
+  queryMapJson(_ref2, callback) {
+    let {
+      map_level,
+      map_location
+    } = _ref2;
+    const url = this.getMapJsonQueryUrl(map_level, map_location);
+    if (!url) {
+      callback && callback();
+      return;
     }
-  }, {
-    key: "setMapJson",
-    value: function setMapJson(url, json) {
-      this.urlMapJson[url] = json;
+    const existMapJson = this.getMapJson(url);
+    if (existMapJson) {
+      callback && callback(existMapJson);
+      return;
+    }
+    if (this.urlWaitingExecCallbacks[url]) {
+      this.urlWaitingExecCallbacks[url].push(callback);
+    } else {
+      this.urlWaitingExecCallbacks[url] = [callback];
     }
-  }, {
-    key: "queryMapJson",
-    value: function queryMapJson(_ref2, callback) {
-      var map_level = _ref2.map_level,
-        map_location = _ref2.map_location;
-      var url = this.getMapJsonQueryUrl(map_level, map_location);
-      if (!url) {
-        callback && callback();
-        return;
-      }
-      var existMapJson = this.getMapJson(url);
-      if (existMapJson) {
-        callback && callback(existMapJson);
-        return;
-      }
-      if (this.urlWaitingExecCallbacks[url]) {
-        this.urlWaitingExecCallbacks[url].push(callback);
-      } else {
-        this.urlWaitingExecCallbacks[url] = [callback];
-      }
 
-      // the target map-json is being querying
-      if (this.urlMapJsonQuerying[url]) {
-        return;
-      }
-      this.urlMapJsonQuerying[url] = true;
-      this.startQuery(url);
+    // the target map-json is being querying
+    if (this.urlMapJsonQuerying[url]) {
+      return;
     }
-  }, {
-    key: "startQuery",
-    value: function startQuery(url) {
-      var _this = this;
-      fetch("".concat(this.mediaUrl, "dtable-statistic/geolocation/").concat(url, ".json")).then(function (res) {
-        return res && res.json();
-      }).then(function (mapJson) {
-        _this.handleLoadedMapJson(url, mapJson);
-      }).catch(function (err) {
-        // eslint-disable-next-line
-        console.log(err);
-      });
+    this.urlMapJsonQuerying[url] = true;
+    this.startQuery(url);
+  }
+  startQuery(url) {
+    fetch("".concat(this.mediaUrl, "dtable-statistic/geolocation/").concat(url, ".json")).then(res => {
+      return res && res.json();
+    }).then(mapJson => {
+      this.handleLoadedMapJson(url, mapJson);
+    }).catch(err => {
+      // eslint-disable-next-line
+      console.log(err);
+    });
+  }
+  handleLoadedMapJson(url, mapJson) {
+    const isValid = mapJson && !mapJson.features;
+    if (isValid) {
+      this.setMapJson(url, mapJson);
     }
-  }, {
-    key: "handleLoadedMapJson",
-    value: function handleLoadedMapJson(url, mapJson) {
-      var isValid = mapJson && !mapJson.features;
-      if (isValid) {
-        this.setMapJson(url, mapJson);
-      }
-      var callbacks = this.urlWaitingExecCallbacks[url];
-      if (Array.isArray(callbacks) && callbacks.length > 0) {
-        callbacks.forEach(function (callback) {
-          callback && callback(mapJson);
-        });
-      }
-      delete this.urlWaitingExecCallbacks[url];
-      delete this.urlMapJsonQuerying[url];
+    const callbacks = this.urlWaitingExecCallbacks[url];
+    if (Array.isArray(callbacks) && callbacks.length > 0) {
+      callbacks.forEach(callback => {
+        callback && callback(mapJson);
+      });
     }
-  }]);
-  return MapJsonService;
-}();
+    delete this.urlWaitingExecCallbacks[url];
+    delete this.urlMapJsonQuerying[url];
+  }
+}
 export { MapJsonService };

package/es/stat-editor/chart-name-editor.js

@@ -1,75 +1,61 @@
-import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
-import _createClass from "@babel/runtime/helpers/esm/createClass";
-import _inherits from "@babel/runtime/helpers/esm/inherits";
-import _createSuper from "@babel/runtime/helpers/esm/createSuper";
 import React, { Component, Fragment } from 'react';
 import { Input } from 'reactstrap';
-var ChartNameEditor = /*#__PURE__*/function (_Component) {
-  _inherits(ChartNameEditor, _Component);
-  var _super = _createSuper(ChartNameEditor);
-  function ChartNameEditor(props) {
-    var _this;
-    _classCallCheck(this, ChartNameEditor);
-    _this = _super.call(this, props);
-    _this.onRenameToggle = function () {
-      _this.setState({
-        editable: !_this.state.editable
+class ChartNameEditor extends Component {
+  constructor(props) {
+    super(props);
+    this.onRenameToggle = () => {
+      this.setState({
+        editable: !this.state.editable
       });
     };
-    _this.onChange = function (evt) {
-      _this.setState({
+    this.onChange = evt => {
+      this.setState({
         name: evt.target.value
       });
     };
-    _this.updateStatName = function (evt) {
-      _this.onRenameToggle();
-      var newName = evt.target.value.trim();
-      if (newName === _this.props.name) return;
-      _this.props.updateStatName(newName);
+    this.updateStatName = evt => {
+      this.onRenameToggle();
+      const newName = evt.target.value.trim();
+      if (newName === this.props.name) return;
+      this.props.updateStatName(newName);
     };
-    _this.onKeyDown = function (evt) {
+    this.onKeyDown = evt => {
       if (evt.keyCode === 13) {
-        _this.updateStatName(evt);
+        this.updateStatName(evt);
       }
     };
-    _this.state = {
+    this.state = {
       name: props.name || '',
       editable: false
     };
-    return _this;
   }
-  _createClass(ChartNameEditor, [{
-    key: "componentDidUpdate",
-    value: function componentDidUpdate(prevProps) {
-      if (prevProps.name !== this.props.name) {
-        this.setState({
-          name: this.props.name
-        });
-      }
-    }
-  }, {
-    key: "render",
-    value: function render() {
-      var _this$state = this.state,
-        name = _this$state.name,
-        editable = _this$state.editable;
-      return /*#__PURE__*/React.createElement("div", {
-        className: "statistic-chart-editing-name"
-      }, editable ? /*#__PURE__*/React.createElement(Input, {
-        defaultValue: name,
-        className: "statistic-rename",
-        onBlur: this.updateStatName,
-        autoFocus: true,
-        onChange: this.onChange,
-        onKeyDown: this.onKeyDown
-      }) : /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement("span", {
-        className: "statistic-table-title-name"
-      }, name), /*#__PURE__*/React.createElement("span", {
-        className: "dtable-font dtable-icon-rename",
-        onClick: this.onRenameToggle
-      })));
+  componentDidUpdate(prevProps) {
+    if (prevProps.name !== this.props.name) {
+      this.setState({
+        name: this.props.name
+      });
     }
-  }]);
-  return ChartNameEditor;
-}(Component);
+  }
+  render() {
+    const {
+      name,
+      editable
+    } = this.state;
+    return /*#__PURE__*/React.createElement("div", {
+      className: "statistic-chart-editing-name"
+    }, editable ? /*#__PURE__*/React.createElement(Input, {
+      defaultValue: name,
+      className: "statistic-rename",
+      onBlur: this.updateStatName,
+      autoFocus: true,
+      onChange: this.onChange,
+      onKeyDown: this.onKeyDown
+    }) : /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement("span", {
+      className: "statistic-table-title-name"
+    }, name), /*#__PURE__*/React.createElement("span", {
+      className: "dtable-font dtable-icon-rename",
+      onClick: this.onRenameToggle
+    })));
+  }
+}
 export default ChartNameEditor;

package/es/stat-editor/index.js

@@ -1,78 +1,67 @@
-import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
-import _createClass from "@babel/runtime/helpers/esm/createClass";
-import _inherits from "@babel/runtime/helpers/esm/inherits";
-import _createSuper from "@babel/runtime/helpers/esm/createSuper";
 import React, { Component } from 'react';
 import ChartNameEditor from './chart-name-editor';
 import StatView from '../stat-view';
 import BasicChartSettings from './stat-settings/basic-chart-settings';
 import AdvancedChartSettings from './stat-settings/advance-chart-settings';
 import { BASIC_STAT_TYPES, STAT_TYPE } from '../constants';
-var StatEditor = /*#__PURE__*/function (_Component) {
-  _inherits(StatEditor, _Component);
-  var _super = _createSuper(StatEditor);
-  function StatEditor() {
-    _classCallCheck(this, StatEditor);
-    return _super.apply(this, arguments);
+class StatEditor extends Component {
+  render() {
+    const {
+      getTables,
+      getViews,
+      getTableById,
+      colorThemeName,
+      statItem,
+      labelColorConfigs,
+      chartCalculator,
+      eventBus
+    } = this.props;
+    const {
+      type
+    } = statItem;
+    const showStatName = !(type === STAT_TYPE.BASIC_NUMBER_CARD || type === STAT_TYPE.DASHBOARD);
+    return /*#__PURE__*/React.createElement("div", {
+      className: "statistic-chart-edit-container"
+    }, /*#__PURE__*/React.createElement("div", {
+      className: "statistic-stat-wrapper"
+    }, showStatName && /*#__PURE__*/React.createElement(ChartNameEditor, {
+      name: statItem.name,
+      updateStatName: this.props.modifyChartName
+    }), /*#__PURE__*/React.createElement("div", {
+      className: "statistic-chart-view-container"
+    }, /*#__PURE__*/React.createElement(StatView, {
+      isEdit: true,
+      isPreview: false,
+      isEnlarge: false,
+      dtableChangedTime: this.props.dtableChangedTime,
+      colorThemeName: colorThemeName,
+      statItem: statItem,
+      labelColorConfigs: labelColorConfigs,
+      chartCalculator: chartCalculator,
+      eventBus: eventBus,
+      getTableById: getTableById,
+      queryMapJson: this.props.queryMapJson,
+      updateStatItem: this.props.modifyChart,
+      toggleStatisticRecordsDialog: this.props.toggleStatisticRecordsDialog
+    }))), BASIC_STAT_TYPES.includes(statItem.type) ? /*#__PURE__*/React.createElement(BasicChartSettings, {
+      statItem: statItem,
+      labelColorConfigs: labelColorConfigs,
+      eventBus: eventBus,
+      getTables: getTables,
+      getViews: getViews,
+      getTableById: getTableById,
+      getConvertedChart: this.props.getConvertedChart,
+      updateStatItem: this.props.modifyChart
+    }) : /*#__PURE__*/React.createElement(AdvancedChartSettings, {
+      statItem: statItem,
+      labelColorConfigs: labelColorConfigs,
+      eventBus: eventBus,
+      getTables: getTables,
+      getViews: getViews,
+      getTableById: getTableById,
+      getConvertedChart: this.props.getConvertedChart,
+      updateStatItem: this.props.modifyChart
+    }));
   }
-  _createClass(StatEditor, [{
-    key: "render",
-    value: function render() {
-      var _this$props = this.props,
-        getTables = _this$props.getTables,
-        getViews = _this$props.getViews,
-        getTableById = _this$props.getTableById,
-        colorThemeName = _this$props.colorThemeName,
-        statItem = _this$props.statItem,
-        labelColorConfigs = _this$props.labelColorConfigs,
-        chartCalculator = _this$props.chartCalculator,
-        eventBus = _this$props.eventBus;
-      var type = statItem.type;
-      var showStatName = !(type === STAT_TYPE.BASIC_NUMBER_CARD || type === STAT_TYPE.DASHBOARD);
-      return /*#__PURE__*/React.createElement("div", {
-        className: "statistic-chart-edit-container"
-      }, /*#__PURE__*/React.createElement("div", {
-        className: "statistic-stat-wrapper"
-      }, showStatName && /*#__PURE__*/React.createElement(ChartNameEditor, {
-        name: statItem.name,
-        updateStatName: this.props.modifyChartName
-      }), /*#__PURE__*/React.createElement("div", {
-        className: "statistic-chart-view-container"
-      }, /*#__PURE__*/React.createElement(StatView, {
-        isEdit: true,
-        isPreview: false,
-        isEnlarge: false,
-        dtableChangedTime: this.props.dtableChangedTime,
-        colorThemeName: colorThemeName,
-        statItem: statItem,
-        labelColorConfigs: labelColorConfigs,
-        chartCalculator: chartCalculator,
-        eventBus: eventBus,
-        getTableById: getTableById,
-        queryMapJson: this.props.queryMapJson,
-        updateStatItem: this.props.modifyChart,
-        toggleStatisticRecordsDialog: this.props.toggleStatisticRecordsDialog
-      }))), BASIC_STAT_TYPES.includes(statItem.type) ? /*#__PURE__*/React.createElement(BasicChartSettings, {
-        statItem: statItem,
-        labelColorConfigs: labelColorConfigs,
-        eventBus: eventBus,
-        getTables: getTables,
-        getViews: getViews,
-        getTableById: getTableById,
-        getConvertedChart: this.props.getConvertedChart,
-        updateStatItem: this.props.modifyChart
-      }) : /*#__PURE__*/React.createElement(AdvancedChartSettings, {
-        statItem: statItem,
-        labelColorConfigs: labelColorConfigs,
-        eventBus: eventBus,
-        getTables: getTables,
-        getViews: getViews,
-        getTableById: getTableById,
-        getConvertedChart: this.props.getConvertedChart,
-        updateStatItem: this.props.modifyChart
-      }));
-    }
-  }]);
-  return StatEditor;
-}(Component);
+}
 export default StatEditor;