dtable-statistic 4.1.1 → 4.1.3

package/es/assets/css/dashboard.css

@@ -581,3 +581,61 @@
 .statistic-chart-container .collaborators-formatter .collaborator {
   margin-right: 0 !important;
 }
+
+.btn-move-to-statistic-view {
+  display: flex;
+  align-items: center;
+}
+
+.statistic-views-dropdown {
+  width: 100%;
+}
+
+.statistic-views-dropdown-toggle {
+  display: flex;
+  align-items: center;
+}
+
+.statistic-views-dropdown .item-text {
+  flex: 1;
+}
+
+.statistic-views-dropdown .icon-dropdown-toggle {
+  display: inline-flex;
+  align-items: center;
+  width: 12px;
+  height: 12px;
+  margin-right: 12px;
+}
+
+.move-to-statistic-views-toggle {
+  opacity: 0;
+  width: 0;
+  min-width: 0;
+  margin-left: -12px;
+  padding: 0;
+}
+
+.dropdown-item .statistic-views-dropdown .item-icon.dtable-icon-right-slide {
+  display: inline-flex;
+  font-size: 12px;
+  -webkit-transform: scale(.8);
+  transform: scale(.8);
+}
+
+.statistic-views-dropdown-menu {
+  margin-top: -16px !important;
+  margin-left: -12px !important;
+}
+
+.statistic-views-dropdown-menu .dropdown-item {
+  display: flex;
+  align-items: center;
+  min-height: 32px;
+  padding: 3px 12px;
+}
+
+.statistic-views-dropdown-menu .statistic-view-name {
+  display: inline-block;
+  width: 100%;
+}

package/es/assets/icons/move-to.svg

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32 32" style="enable-background:new 0 0 32 32;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#949494;}
+</style>
+<title>move-to</title>
+<g id="move-to-">
+	<g id="export" transform="translate(2.000000, 3.000000)">
+		<path id="形状结合" fill="currentColor" class="st0" d="M10.7,0c0.4,0,0.8,0.1,1.4,0.4c0.7,0.3,1.1,0.7,1.5,1s0.6,0.7,0.8,1
+			c0.2,0.3,0.3,0.5,0.6,0.6c0.2,0.1,0.5,0.2,0.9,0.2h8.5c1,0,1.9,0.3,2.5,0.9C27.5,4.8,28,5.5,28,6.4v16.3c0,1-0.4,1.7-1.1,2.3
+			S25.4,26,24.4,26H3.5c-1.1,0-1.8-0.2-2.5-1c-0.7-0.8-1-1.4-1-2.3l0-10.3c0-0.1,0-0.2,0-0.4l0-8.8l0,0c0-1,0.5-1.6,1.1-2.2
+			C1.8,0.3,2.4,0,3.1,0H10.7z M17.4,9.6c-0.8-0.8-1.6-0.8-2.4,0l0,0l-0.1,0.1c-0.7,0.8-0.6,1.5,0.1,2.3l0,0l1.1,1.1l-8.4,0
+			c-1.1,0-1.7,0.6-1.7,1.7l0,0L6,15c0.1,1,0.6,1.5,1.7,1.5l0,0l8.3,0l-1.1,1.1c-0.8,0.8-0.8,1.6,0,2.4l0,0l0.1,0.1
+			c0.8,0.7,1.5,0.6,2.3-0.1l0,0l3.6-3.6c0.1-0.1,0.3-0.2,0.4-0.3l0,0l0.1-0.1c0.6-0.7,0.6-1.4,0.1-2c-0.1-0.1-0.2-0.2-0.3-0.3l0,0
+			l-0.1-0.1l0,0l0,0L17.4,9.6z"/>
+	</g>
+</g>
+</svg>

package/es/calculator/map-calculator.js

@@ -9,6 +9,8 @@ import BaseCalculator from './base-calculator';
 import { formatNumericValue, getSummaryColumnMethod } from '../utils/common-utils';
 import { getSqlGroup } from '../utils/sql-utils';
 import { DTABLE_DB_SUMMARY_METHOD } from '../constants';
+import { fixMapGeoGranularity } from '../utils/map';
+import StatUtils from '../utils/stat-utils';
 var MapCalculator = /*#__PURE__*/function (_BaseCalculator) {
   _inherits(MapCalculator, _BaseCalculator);
   var _super = _createSuper(MapCalculator);
@@ -87,12 +89,12 @@ var MapCalculator = /*#__PURE__*/function (_BaseCalculator) {
     key: "queryDb",
     value: function () {
       var _queryDb = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(chart) {
-        var table_id, view_id, geo_column, summary_type, summary_method, summary_column, geolocation_granularity, selectedTable, selectedView, column, columnName, isAdvanced, method, sqlCondition, groupName, sqlString, summaryColumn, summaryColumnName, summaryColumnMethod, result, data, newResult, _summaryColumnMethod, valueKey;
+        var table_id, view_id, geo_column, summary_type, summary_method, summary_column, selectedTable, selectedView, column, columnName, isAdvanced, geoGranularity, method, sqlCondition, groupName, sqlString, summaryColumn, summaryColumnName, summaryColumnMethod, result, data, newResult, _summaryColumnMethod, valueKey;
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
-                table_id = chart.table_id, view_id = chart.view_id, geo_column = chart.geo_column, summary_type = chart.summary_type, summary_method = chart.summary_method, summary_column = chart.summary_column, geolocation_granularity = chart.geolocation_granularity;
+                table_id = chart.table_id, view_id = chart.view_id, geo_column = chart.geo_column, summary_type = chart.summary_type, summary_method = chart.summary_method, summary_column = chart.summary_column;
                 selectedTable = this.getTableById(table_id);
                 selectedView = this.getViewById(view_id, selectedTable);
                 column = TableUtils.getTableColumnByKey(selectedTable, geo_column);
@@ -104,65 +106,69 @@ var MapCalculator = /*#__PURE__*/function (_BaseCalculator) {
               case 6:
                 columnName = column.name;
                 isAdvanced = summary_type === 'advanced';
+                geoGranularity = fixMapGeoGranularity(chart);
                 method = isAdvanced ? DTABLE_DB_SUMMARY_METHOD[summary_method] : 'COUNT';
                 sqlCondition = filter2SqlCondition(selectedTable, selectedView);
-                groupName = getSqlGroup(geolocation_granularity, column);
+                groupName = getSqlGroup(geoGranularity, column);
                 sqlString = '';
                 summaryColumnName = '';
                 if (!isAdvanced) {
-                  _context2.next = 22;
+                  _context2.next = 23;
                   break;
                 }
                 summaryColumn = TableUtils.getTableColumnByKey(selectedTable, summary_column);
                 if (summaryColumn) {
-                  _context2.next = 17;
+                  _context2.next = 18;
                   break;
                 }
                 return _context2.abrupt("return", []);
-              case 17:
+              case 18:
                 summaryColumnName = summaryColumn.name;
                 summaryColumnMethod = getSummaryColumnMethod(method, summaryColumnName);
                 sqlString = "select ".concat(groupName, ", ").concat(summaryColumnMethod, " from `").concat(selectedTable.name, "` ").concat(sqlCondition, " group by ").concat(groupName, " limit 5000");
-                _context2.next = 23;
+                _context2.next = 24;
                 break;
-              case 22:
-                sqlString = "select ".concat(groupName, ", ").concat(method, "(`").concat(columnName, "`) from `").concat(selectedTable.name, "` ").concat(sqlCondition, " group by ").concat(groupName, " limit 5000");
               case 23:
-                _context2.next = 25;
+                sqlString = "select ".concat(groupName, ", ").concat(method, "(`").concat(columnName, "`) from `").concat(selectedTable.name, "` ").concat(sqlCondition, " group by ").concat(groupName, " limit 5000");
+              case 24:
+                _context2.next = 26;
                 return this.sqlQuery(sqlString);
-              case 25:
+              case 26:
                 result = _context2.sent;
                 if (!(result.status === 200 && result.data.success)) {
-                  _context2.next = 35;
+                  _context2.next = 36;
                   break;
                 }
                 data = result.data;
                 if (data.results) {
-                  _context2.next = 30;
+                  _context2.next = 31;
                   break;
                 }
                 return _context2.abrupt("return", []);
-              case 30:
+              case 31:
                 newResult = [];
                 _summaryColumnMethod = getSummaryColumnMethod(method, summaryColumnName);
                 valueKey = isAdvanced ? "".concat(_summaryColumnMethod) : "".concat(method, "(").concat(columnName, ")");
                 data.results.forEach(function (item) {
                   var currentValue = item[groupName];
                   var value = item[valueKey];
+                  var formatted_value = value;
                   if (isAdvanced) {
                     value = formatNumericValue(value, summaryColumn);
+                    formatted_value = StatUtils.getFormattedValue(value, summaryColumn, method);
                   }
                   if (currentValue) {
                     newResult.push({
                       name: currentValue,
-                      value: value
+                      value: value,
+                      formatted_value: formatted_value
                     });
                   }
                 });
                 return _context2.abrupt("return", newResult);
-              case 35:
-                return _context2.abrupt("return", []);
               case 36:
+                return _context2.abrupt("return", []);
+              case 37:
               case "end":
                 return _context2.stop();
             }

package/es/calculator/workers/basic-chart-calculator-worker.js

@@ -6,6 +6,7 @@ import { getColorFromSingleSelectColumn } from '../../utils/column-utils';
 import { isArrayCellValue } from '../../utils/common-utils';
 import { getFormattedLabel, isValidRow } from '../../utils/row-utils';
 import StatUtils from '../../utils/stat-utils';
+import { fixMapGeoGranularity } from '../../utils/map';
 var MAP_CHART_TYPES = [STAT_TYPE.MAP, STAT_TYPE.WORLD_MAP, STAT_TYPE.MAP_BUBBLE, STAT_TYPE.WORLD_MAP_BUBBLE];
 function calculateChart(chart, value, username, userId) {
   var type = chart.type;
@@ -309,11 +310,10 @@ function calculateGeolocationBasicChart(chart, value, username, userId) {
   var table_id = chart.table_id,
     view_id = chart.view_id,
     geo_column = chart.geo_column,
-    geolocation_granularity = chart.geolocation_granularity,
     summary_type = chart.summary_type,
     summary_column = chart.summary_column,
     summary_method = chart.summary_method;
-  var geolocationGranularity = geolocation_granularity;
+  var geolocationGranularity = fixMapGeoGranularity(chart);
   var table = TableUtils.getTableById(value.tables, table_id);
   var view = table && Views.getViewById(table.views, view_id);
   if (!view) {

package/es/components/dialog/chart-addition-edit-dialog.js

@@ -77,6 +77,7 @@ var ChartAdditionEditDialog = /*#__PURE__*/function (_Component) {
         getTables: this.props.getTables,
         getViews: this.props.getViews,
         getTableById: getTableById,
+        queryMapJson: this.props.queryMapJson,
         getConvertedChart: this.props.getConvertedChart,
         modifyChartName: this.modifyChartName,
         modifyChart: this.modifyChart,

package/es/components/dialog/enlarged-chart-dialog.js

@@ -41,6 +41,7 @@ var EnlargeChartDialog = /*#__PURE__*/function (_Component) {
         eventBus: eventBus,
         chartCalculator: chartCalculator,
         getTableById: getTableById,
+        queryMapJson: _this.props.queryMapJson,
         toggleStatisticRecordsDialog: toggleStatisticRecordsDialog
       };
       return /*#__PURE__*/React.createElement("div", {

package/es/components/dropdown-menu/statistic-dropdown-menu.js

@@ -6,6 +6,7 @@ import React, { Fragment } from 'react';
 import intl from 'react-intl-universal';
 import { Dropdown, DropdownToggle, DropdownMenu, DropdownItem } from 'reactstrap';
 import { STAT_TYPE } from '../../constants';
+import Icon from '../icon';
 var StatisticDropdownMenu = /*#__PURE__*/function (_React$Component) {
   _inherits(StatisticDropdownMenu, _React$Component);
   var _super = _createSuper(StatisticDropdownMenu);
@@ -14,6 +15,9 @@ var StatisticDropdownMenu = /*#__PURE__*/function (_React$Component) {
     _classCallCheck(this, StatisticDropdownMenu);
     _this = _super.call(this, props);
     _this.onDropdownToggleClick = function (e) {
+      if (e.target && _this.viewsDropdownToggle && _this.viewsDropdownToggle.contains(e.target)) {
+        return;
+      }
       e.preventDefault();
       e.stopPropagation();
       _this.setState({
@@ -26,17 +30,39 @@ var StatisticDropdownMenu = /*#__PURE__*/function (_React$Component) {
     _this.editStatItem = function () {
       _this.props.editStatItem();
     };
+    _this.onShowViewsMenu = function () {
+      _this.setState({
+        isShowViewsMenu: true
+      });
+    };
+    _this.onHideViewsMenu = function () {
+      _this.setState({
+        isShowViewsMenu: false
+      });
+    };
+    _this.onToggleViewsMenu = function () {
+      _this.setState({
+        isShowViewsMenu: !_this.state.isShowViewsMenu
+      });
+    };
+    _this.onMoveChartToView = function (viewId) {
+      _this.props.moveChartToView(viewId);
+    };
     _this.state = {
-      isItemMenuShow: false
+      isItemMenuShow: false,
+      isShowViewsMenu: false
     };
     return _this;
   }
   _createClass(StatisticDropdownMenu, [{
     key: "render",
     value: function render() {
+      var _this2 = this;
       var _this$props = this.props,
         isTableReadOnly = _this$props.isTableReadOnly,
         chartType = _this$props.chartType;
+      var otherViews = this.props.getOtherStatistics();
+      var hasOtherViews = otherViews && otherViews.length > 0;
       return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(Dropdown, {
         isOpen: this.state.isItemMenuShow,
         toggle: this.onDropdownToggleClick,
@@ -80,13 +106,63 @@ var StatisticDropdownMenu = /*#__PURE__*/function (_React$Component) {
         className: "item-icon dtable-font dtable-icon-download"
       }), /*#__PURE__*/React.createElement("span", {
         className: "item-text"
-      }, intl.get('Export_as_picture'))), !isTableReadOnly && /*#__PURE__*/React.createElement(DropdownItem, {
+      }, intl.get('Export_as_picture'))), !isTableReadOnly && /*#__PURE__*/React.createElement(Fragment, null, hasOtherViews && /*#__PURE__*/React.createElement(DropdownItem, {
+        className: "pr-2 btn-move-to-statistic-view",
+        tag: "div",
+        onClick: function onClick(evt) {
+          evt.stopPropagation();
+          evt.nativeEvent.stopImmediatePropagation();
+          _this2.onShowViewsMenu();
+        },
+        onMouseEnter: this.onShowViewsMenu,
+        onMouseLeave: this.onHideViewsMenu
+      }, /*#__PURE__*/React.createElement(Dropdown, {
+        className: "statistic-views-dropdown",
+        direction: "right",
+        isOpen: this.state.isShowViewsMenu,
+        toggle: this.onToggleViewsMenu
+      }, /*#__PURE__*/React.createElement("div", {
+        className: "statistic-views-dropdown-toggle",
+        ref: function ref(_ref) {
+          return _this2.viewsDropdownToggle = _ref;
+        }
+      }, /*#__PURE__*/React.createElement(Icon, {
+        symbol: "move-to",
+        className: "statistic-type-move-to item-icon"
+      }), /*#__PURE__*/React.createElement("span", {
+        className: "item-text"
+      }, intl.get('Move_to')), /*#__PURE__*/React.createElement("span", {
+        className: "icon-dropdown-toggle"
+      }, /*#__PURE__*/React.createElement("i", {
+        className: "item-icon dtable-font dtable-icon-right-slide"
+      })), /*#__PURE__*/React.createElement(DropdownToggle, {
+        className: "move-to-statistic-views-toggle"
+      })), this.state.isShowViewsMenu && /*#__PURE__*/React.createElement(DropdownMenu, {
+        className: "statistic-views-dropdown-menu",
+        flip: false,
+        positionFixed: true,
+        modifiers: {
+          preventOverflow: {
+            boundariesElement: document.body
+          }
+        }
+      }, otherViews.map(function (view) {
+        var _id = view._id,
+          name = view.name;
+        return /*#__PURE__*/React.createElement(DropdownItem, {
+          key: "move-to-statistic-view-".concat(_id),
+          onClick: _this2.onMoveChartToView.bind(_this2, _id)
+        }, /*#__PURE__*/React.createElement("span", {
+          className: "statistic-view-name text-truncate",
+          title: name
+        }, name));
+      })))), /*#__PURE__*/React.createElement(DropdownItem, {
         onMouseDown: this.deleteStatItem
       }, /*#__PURE__*/React.createElement("i", {
         className: "item-icon dtable-font dtable-icon-delete"
       }), /*#__PURE__*/React.createElement("span", {
         className: "item-text"
-      }, intl.get('Delete'))))));
+      }, intl.get('Delete')))))));
     }
   }]);
   return StatisticDropdownMenu;

package/es/constants/index.js

@@ -15,6 +15,7 @@ export var DASHBOARD_ACTION_TYPE = {
   MODIFY_DASHBOARD_LAYOUT: 'modify_dashboard_layout',
   ADD_CHART: 'add_chart',
   MODIFY_CHART: 'modify_chart',
+  MOVE_CHART_TO_VIEW: 'move_chart_to_view',
   DELETE_CHART: 'delete_chart'
 };
 export var STAT_TYPE = {

package/es/constants/map.js

@@ -0,0 +1,7 @@
+export var MAP_LEVEL = {
+  WORLD: 'world',
+  COUNTRY: 'country',
+  PROVINCE: 'province',
+  CITY: 'city'
+};
+export var MUNICIPALITIES = ['北京市', '天津市', '上海市', '重庆市'];