dtable-statistic 4.1.7 → 4.1.9

package/es/components/dialog/new-table-dialog.js

@@ -25,7 +25,8 @@ var NewTableDialog = /*#__PURE__*/function (_React$Component) {
         return;
       }
       _this.setState({
-        tableName: value
+        tableName: value,
+        errMessage: ''
       });
     };
     _this.toggle = function () {
@@ -58,12 +59,22 @@ var NewTableDialog = /*#__PURE__*/function (_React$Component) {
         });
         return;
       }
+      var isExist = _this.tables.find(function (item) {
+        return item.name === tableName;
+      });
+      if (isExist) {
+        _this.setState({
+          errMessage: 'Table_xxx_exist'
+        });
+        return;
+      }
       _this.props.onNewTableConfirm(tableName);
     };
     _this.state = {
       tableName: props.tableName,
       errMessage: ''
     };
+    _this.tables = props.getTables();
     return _this;
   }
   _createClass(NewTableDialog, [{
@@ -79,7 +90,8 @@ var NewTableDialog = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "render",
     value: function render() {
-      var _this2 = this;
+      var _this2 = this,
+        _this$state$tableName;
       return /*#__PURE__*/React.createElement(Modal, {
         isOpen: true,
         toggle: this.toggle,
@@ -99,7 +111,9 @@ var NewTableDialog = /*#__PURE__*/function (_React$Component) {
       }))), this.state.errMessage && /*#__PURE__*/React.createElement(Alert, {
         color: "danger",
         className: "mt-2"
-      }, intl.get(this.state.errMessage))), /*#__PURE__*/React.createElement(ModalFooter, null, /*#__PURE__*/React.createElement(Button, {
+      }, intl.get(this.state.errMessage, {
+        name: (_this$state$tableName = this.state.tableName) === null || _this$state$tableName === void 0 ? void 0 : _this$state$tableName.trim()
+      }))), /*#__PURE__*/React.createElement(ModalFooter, null, /*#__PURE__*/React.createElement(Button, {
         color: "secondary",
         onClick: this.toggle
       }, intl.get('Cancel')), /*#__PURE__*/React.createElement(Button, {

package/es/locale/lang/de.js

@@ -12,6 +12,9 @@ var de = {
   'Submit': 'Einreichen',
   'Cancel': 'Abbrechen',
   'Name_is_required': 'Der Name ist erforderlich.',
+  'Name_cannot_contain_backtick': 'Name cannot contain backtick.',
+  'Name_cannot_contain_slash': 'Der Name darf keinen Schrägstrich ( / ) enthalten.',
+  'Name_cannot_contain_backslash': 'Der Name darf keinen Backslash ( \\ ) enthalten.',
   'Rename_dashboard': 'Dashboard umbenennen',
   'Rename': 'Umbenennen',
   'Delete': 'Löschen',
@@ -237,9 +240,11 @@ var de = {
   'Add_new_stack': 'Neuen Stapel hinzufügen',
   'Chart_type': 'Diagrammtyp',
   'Edit_type': 'Typ ändern',
-  'New_table': 'New table',
+  'New_table': 'Neue Tabelle',
   'Select_table': 'Tabelle auswählen',
   'Update_to_a_table': 'Aktualisierung in eine Tabelle',
-  'Export_to_a_new_table': 'In neue Tabelle exportieren'
+  'Export_to_a_new_table': 'In neue Tabelle exportieren',
+  'Move_to': 'Move to...',
+  'Table_xxx_exist': 'Table {name} exist'
 };
 export default de;

package/es/locale/lang/en.js

@@ -12,6 +12,9 @@ var en = {
   'Submit': 'Submit',
   'Cancel': 'Cancel',
   'Name_is_required': 'Name is required',
+  'Name_cannot_contain_backtick': 'Name cannot contain backtick.',
+  'Name_cannot_contain_slash': 'Name cannot contain slash',
+  'Name_cannot_contain_backslash': 'Name cannot contain backslash',
   'Rename_dashboard': 'Rename dashboard',
   'Rename': 'Rename',
   'Delete': 'Delete',
@@ -241,6 +244,7 @@ var en = {
   'Select_table': 'Select table',
   'Update_to_a_table': 'Update to a table',
   'Export_to_a_new_table': 'Export to a new table',
-  "Move_to": "Move to..."
+  'Move_to': 'Move to...',
+  'Table_xxx_exist': 'Table {name} exist'
 };
 export default en;

package/es/locale/lang/fr.js

@@ -12,6 +12,9 @@ var fr = {
   'Submit': 'Soumettre',
   'Cancel': 'Annuler',
   'Name_is_required': 'Le nom est nécessaire.',
+  'Name_cannot_contain_backtick': 'Name cannot contain backtick.',
+  'Name_cannot_contain_slash': 'Le nom ne doit pas contenir de barre oblique ( / ).',
+  'Name_cannot_contain_backslash': 'Le nom ne doit pas contenir de barre oblique inverse ( \\ ).',
   'Rename_dashboard': 'Renommer le tableau de bord',
   'Rename': 'Renommer',
   'Delete': 'Supprimer',
@@ -25,7 +28,7 @@ var fr = {
   'Grouped_histogram': 'Histogramme groupé',
   'Stacked_histogram': 'Histogramme empilé',
   'Time_comparison_histogram': 'Histogramme comparaison de temps',
-  'Custom_histogram': 'Historgramme personnalisé',
+  'Custom_histogram': 'Histogramme personnalisé',
   'Bar_chart': 'Graphique à barres',
   'Basic_bar_chart': 'Graphique à barres simple',
   'Grouped_bar_chart': 'Graphique à barres groupé',
@@ -237,9 +240,11 @@ var fr = {
   'Add_new_stack': 'Ajouter une nouvelle pile',
   'Chart_type': 'Type de diagramme',
   'Edit_type': 'Modifier le type',
-  'New_table': 'New table',
+  'New_table': 'Nouveau tableau',
   'Select_table': 'Sélectionner un tableau',
   'Update_to_a_table': 'Mettre à jour vers un tableau',
-  'Export_to_a_new_table': 'Exporter dans un nouveau tableau'
+  'Export_to_a_new_table': 'Exporter dans un nouveau tableau',
+  'Move_to': 'Move to...',
+  'Table_xxx_exist': 'Table {name} exist'
 };
 export default fr;

package/es/locale/lang/zh_CN.js

@@ -12,6 +12,9 @@ var zh_CN = {
   'Submit': '提交',
   'Cancel': '取消',
   'Name_is_required': '名称为必填项',
+  'Name_cannot_contain_backtick': '名称不能包含反引号。',
+  'Name_cannot_contain_slash': '名称不能包含斜杠',
+  'Name_cannot_contain_backslash': '名称不能包含反斜杠',
   'Rename_dashboard': '重命名仪表盘',
   'Rename': '重命名',
   'Delete': '删除',
@@ -241,6 +244,7 @@ var zh_CN = {
   'Select_table': '选择子表',
   'Update_to_a_table': '更新到子表',
   'Export_to_a_new_table': '导出到新的子表',
-  "Move_to": "移动到..."
+  'Move_to': '移动到...',
+  'Table_xxx_exist': '子表 { name } 已存在'
 };
 export default zh_CN;

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

@@ -34,6 +34,8 @@ var ChartPreview = /*#__PURE__*/function (_Component) {
       var id = statItem._id;
       var originalElement = document.querySelector("#stat-item-".concat(id, " .statistic-chart-container > div"));
       if (originalElement) {
+        originalElement.style.width = "".concat(window.innerWidth, "px");
+        originalElement.style.height = "".concat(window.innerHeight, "px");
         var containerWidth = originalElement.scrollWidth + 15 * 2;
         var containerHeight = originalElement.scrollHeight + 15 * 2;
         exportContainer.setAttribute('style', "width: ".concat(containerWidth, "px; height: ").concat(containerHeight, "px;"));
@@ -52,6 +54,10 @@ var ChartPreview = /*#__PURE__*/function (_Component) {
           eleA.download = "".concat(statItem.name || 'image', ".png");
           eleA.click();
           document.body.removeChild(exportContainer);
+          if (originalElement) {
+            originalElement.style.width = 'unset';
+            originalElement.style.height = 'unset';
+          }
         });
       }, 1000);
     };

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
@@ -268,6 +236,7 @@ var StatList = /*#__PURE__*/function (_Component) {
         onToggleShowEnlarged: this.closeEnlargedChart,
         toggleStatisticRecordsDialog: this.props.toggleStatisticRecordsDialog
       }), chartExport2Table && /*#__PURE__*/React.createElement(NewTableDialog, {
+        getTables: this.props.getTables,
         tableName: chartExport2Table.name,
         onNewTableConfirm: function onNewTableConfirm(tableName) {
           return _this2.exportChart2Table(tableName, chartExport2Table);

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.7",
+  "version": "4.1.9",
   "description": "statistics",
   "main": "dist/dtable-statistic.js",
   "author": "seafile",