dtable-statistic 4.1.8 → 4.2.0

package/es/assets/css/dashboard.css

@@ -429,6 +429,16 @@
   display: flex;
   overflow: auto;
   height: 100%;
+  width: 100%;
+}
+
+#exported-chart-container .statistic-chart-container.map {
+  padding: 20px;
+}
+
+#exported-chart-container .statistic-chart-container > div {
+  height: 100%;
+  width: 100%;
 }
 
 /* specific color */

package/es/service/map-json.js

@@ -89,7 +89,7 @@ var MapJsonService = /*#__PURE__*/function () {
   }, {
     key: "setMapJson",
     value: function setMapJson(url, json) {
-      this.urlMapJsonMap[url] = json;
+      this.urlMapJson[url] = json;
     }
   }, {
     key: "queryMapJson",

package/es/stat-list/chart-preview.js

@@ -29,17 +29,12 @@ var ChartPreview = /*#__PURE__*/function (_Component) {
       var exportContainerID = 'exported-chart-container';
       var exportContainer = document.createElement('div');
       exportContainer.setAttribute('id', exportContainerID);
-
-      // for charts rendered with `<canvas>`
-      var id = statItem._id;
-      var originalElement = document.querySelector("#stat-item-".concat(id, " .statistic-chart-container > div"));
-      if (originalElement) {
-        var containerWidth = originalElement.scrollWidth + 15 * 2;
-        var containerHeight = originalElement.scrollHeight + 15 * 2;
-        exportContainer.setAttribute('style', "width: ".concat(containerWidth, "px; height: ").concat(containerHeight, "px;"));
-      }
+      exportContainer.setAttribute('style', "width: ".concat(window.innerWidth, "px; height: ").concat(window.innerHeight, "px;"));
       document.body.appendChild(exportContainer);
-      ReactDOM.render(_this.renderChart(statItem), exportContainer);
+      ReactDOM.render(_this.renderChart(statItem, {
+        isPreview: false,
+        isEnlarge: true
+      }), exportContainer);
       setTimeout(function () {
         var ele = document.querySelector("#".concat(exportContainerID, " .statistic-chart-container"));
         if (!ele) return;
@@ -67,7 +62,11 @@ var ChartPreview = /*#__PURE__*/function (_Component) {
         statisticalResult: statisticalResult
       });
     };
-    _this.renderChart = function (statItem) {
+    _this.renderChart = function (statItem, _ref) {
+      var _ref$isPreview = _ref.isPreview,
+        isPreview = _ref$isPreview === void 0 ? true : _ref$isPreview,
+        _ref$isEnlarge = _ref.isEnlarge,
+        isEnlarge = _ref$isEnlarge === void 0 ? false : _ref$isEnlarge;
       var _this$props = _this.props,
         dtableChangedTime = _this$props.dtableChangedTime,
         chartCalculator = _this$props.chartCalculator,
@@ -75,12 +74,12 @@ var ChartPreview = /*#__PURE__*/function (_Component) {
         colorThemeName = _this$props.colorThemeName,
         eventBus = _this$props.eventBus;
       return /*#__PURE__*/React.createElement(StatView, {
-        ref: function ref(_ref) {
-          return _this.chartView = _ref;
+        ref: function ref(_ref2) {
+          return _this.chartView = _ref2;
         },
-        isPreview: true,
+        isPreview: isPreview,
+        isEnlarge: isEnlarge,
         dtableChangedTime: dtableChangedTime,
-        isEnlarge: false,
         theme: theme,
         colorThemeName: colorThemeName,
         statItem: statItem,
@@ -135,7 +134,10 @@ var ChartPreview = /*#__PURE__*/function (_Component) {
       }))), /*#__PURE__*/React.createElement("div", {
         id: "stat-item-".concat(statItem._id),
         className: "statistic-chart-preview-container"
-      }, this.renderChart(statItem)), /*#__PURE__*/React.createElement("div", {
+      }, this.renderChart(statItem, {
+        isPreview: true,
+        isEnlarge: false
+      })), /*#__PURE__*/React.createElement("div", {
         className: "statistic-chart-preview-container-resize"
       }));
     }

package/es/stat-list/index.js

@@ -4,9 +4,7 @@ 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 ReactDOM from 'react-dom';
 import GridLayout, { WidthProvider } from 'react-grid-layout';
-import html2canvas from 'html2canvas';
 import intl from 'react-intl-universal';
 import ChartPreview from './chart-preview';
 import { NewTableDialog, toaster } from '../components';
@@ -39,36 +37,6 @@ var StatList = /*#__PURE__*/function (_Component) {
     _this.onLayoutChange = function (layout) {
       _this.props.modifyDashboardLayout(layout);
     };
-    _this.onExportChart = function (statItem) {
-      var exportContainerID = 'exported-statistic-chart-container';
-      var exportContainer = document.createElement('div');
-      exportContainer.setAttribute('id', exportContainerID);
-
-      // for charts rendered with `<canvas>`
-      var id = statItem._id;
-      var originalElement = document.querySelector("#stat-item-".concat(id, " .statistic-chart-container > div"));
-      if (originalElement) {
-        var containerWidth = originalElement.scrollWidth + 15 * 2;
-        var containerHeight = originalElement.scrollHeight + 15 * 2;
-        exportContainer.setAttribute('style', "width: ".concat(containerWidth, "px; height: ").concat(containerHeight, "px;"));
-      }
-      document.body.appendChild(exportContainer);
-      ReactDOM.render(_this.renderView(statItem), exportContainer);
-      setTimeout(function () {
-        var ele = document.querySelector("#".concat(exportContainerID, " .statistic-chart-container"));
-        if (!ele) return;
-        html2canvas(ele, {
-          windowWidth: ele.scrollWidth,
-          windowHeight: ele.scrollHeight
-        }).then(function (canvas) {
-          var eleA = document.createElement('a');
-          eleA.href = canvas.toDataURL('image/png');
-          eleA.download = "".concat(statItem.name || 'image', ".png");
-          eleA.click();
-          document.body.removeChild(exportContainer);
-        });
-      }, 1000);
-    };
     _this.enlargeChart = function (chartIndex) {
       _this.setState({
         enlargedChartIndex: chartIndex

package/es/stat-view/treemap-chart.js

@@ -299,7 +299,7 @@ var TreemapChart = /*#__PURE__*/function (_BaseChart) {
         ref: function ref(_ref3) {
           return _this2.container = _ref3;
         },
-        className: "statistic-chart-loading-container ".concat(chartStyles['statistic-treemap-chart-container'])
+        className: "statistic-chart-container ".concat(chartStyles['statistic-treemap-chart-container'])
       }));
     }
   }]);

package/es/utils/column-utils.js

@@ -1,4 +1,4 @@
-import { CellType, isDateColumn, FORMULA_RESULT_TYPE, FORMULA_COLUMN_TYPES, Views } from 'dtable-store';
+import { CellType, isDateColumn, FORMULA_RESULT_TYPE, FORMULA_COLUMN_TYPES } from 'dtable-store';
 import { MIRROR_COLUMN_LIST } from '../constants';
 export function getColorFromSingleSelectColumn(column, target) {
   var columnType = column.type,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-statistic",
-  "version": "4.1.8",
+  "version": "4.2.0",
   "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.5",
+    "dtable-store": "4.2.3",
     "dtable-web-api": "4.0.11",
     "glamor": "^2.20.40",
     "html2canvas": "^1.4.1",