dtable-statistic 4.0.9 → 4.0.11

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

@@ -306,8 +306,7 @@ function getGroupbyNumericColumnsChartResults(rows, formulaRows, groupbyColumn,
   return getGroupChartStatResult(table, value, groupbyColumn, numericSummaryColumnKey, rows, formulaRows, includeEmpty, groupbyDateGranularity, groupbyGeolocationGranularity, columnGroupbyDateGranularity, columnGroupbyGeolocationGranularity, summaryColumn, summaryType, summaryMethod, columnGroupbyMultipleNumericColumn, yAxisType);
 }
 function calculateGeolocationBasicChart(chart, value, username, userId) {
-  var type = chart.type,
-    table_id = chart.table_id,
+  var table_id = chart.table_id,
     view_id = chart.view_id,
     geo_column = chart.geo_column,
     geolocation_granularity = chart.geolocation_granularity,
@@ -315,9 +314,6 @@ function calculateGeolocationBasicChart(chart, value, username, userId) {
     summary_column = chart.summary_column,
     summary_method = chart.summary_method;
   var geolocationGranularity = geolocation_granularity;
-  if (type === STAT_TYPE.WORLD_MAP || type === STAT_TYPE.WORLD_MAP_BUBBLE) {
-    geolocationGranularity = null;
-  }
   var table = TableUtils.getTableById(value.tables, table_id);
   var view = table && Views.getViewById(table.views, view_id);
   if (!view) {

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

@@ -86,7 +86,7 @@ var NewTableDialog = /*#__PURE__*/function (_React$Component) {
         autoFocus: false
       }, /*#__PURE__*/React.createElement(ModalHeader, {
         toggle: this.toggle
-      }, intl.get('New_Table')), /*#__PURE__*/React.createElement(ModalBody, null, /*#__PURE__*/React.createElement(Form, null, /*#__PURE__*/React.createElement(FormGroup, null, /*#__PURE__*/React.createElement(Label, {
+      }, intl.get('New_table')), /*#__PURE__*/React.createElement(ModalBody, null, /*#__PURE__*/React.createElement(Form, null, /*#__PURE__*/React.createElement(FormGroup, null, /*#__PURE__*/React.createElement(Label, {
         for: "tableName"
       }, intl.get('Name')), /*#__PURE__*/React.createElement(Input, {
         id: "tableName",

package/es/locale/lang/de.js

@@ -138,8 +138,8 @@ var de = {
   'Oct': 'Okt',
   'Nov': 'Nov',
   'Dec': 'Dez',
-  'Enter_date': 'Enter date',
-  'Please_select': 'Please select',
+  'Enter_date': 'Datum eingeben',
+  'Please_select': 'Bitte auswählen',
   'Total': 'Gesamt',
   'Amount': 'Menge',
   'Empty': 'Leer',
@@ -237,7 +237,9 @@ var de = {
   'Add_new_stack': 'Neuen Stapel hinzufügen',
   'Chart_type': 'Diagrammtyp',
   'Edit_type': 'Typ ändern',
-  'Update_to_a_table': 'Update to a table',
+  'New_table': 'New table',
+  'Select_table': 'Tabelle auswählen',
+  'Update_to_a_table': 'Aktualisierung in eine Tabelle',
   'Export_to_a_new_table': 'In neue Tabelle exportieren'
 };
 export default de;

package/es/locale/lang/en.js

@@ -237,6 +237,8 @@ var en = {
   'Add_new_stack': 'Add new stack',
   'Chart_type': 'Chart type',
   'Edit_type': 'Edit type',
+  'New_table': 'New table',
+  'Select_table': 'Select table',
   'Update_to_a_table': 'Update to a table',
   'Export_to_a_new_table': 'Export to a new table'
 };

package/es/locale/lang/fr.js

@@ -138,8 +138,8 @@ var fr = {
   'Oct': 'octobre',
   'Nov': 'novembre',
   'Dec': 'décembre',
-  'Enter_date': 'Enter date',
-  'Please_select': 'Please select',
+  'Enter_date': 'Entrer une date',
+  'Please_select': 'Veuillez sélectionner',
   'Total': 'Total',
   'Amount': 'Nombre',
   'Empty': 'Vide',
@@ -237,7 +237,9 @@ var fr = {
   'Add_new_stack': 'Ajouter une nouvelle pile',
   'Chart_type': 'Type de diagramme',
   'Edit_type': 'Modifier le type',
-  'Update_to_a_table': 'Update to a table',
+  'New_table': 'New table',
+  '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 default fr;

package/es/locale/lang/zh_CN.js

@@ -50,7 +50,7 @@ var zh_CN = {
   'Style_settings': '样式设置',
   'Untitled': '未命名',
   'Settings': '设置',
-  'Table': '表格',
+  'Table': '子表',
   'Views': '视图',
   'Display_title': '显示标题',
   'X-axis': 'X 轴',
@@ -237,6 +237,8 @@ var zh_CN = {
   'Add_new_stack': '添加新的堆叠',
   'Chart_type': '图表类型',
   'Edit_type': '编辑类型',
+  'New_table': '新建表',
+  'Select_table': '选择子表',
   'Update_to_a_table': '更新到子表',
   'Export_to_a_new_table': '导出到新的子表'
 };

package/es/service/dashboard-service.js

@@ -24,8 +24,14 @@ var DashBoardService = /*#__PURE__*/function () {
   _createClass(DashBoardService, [{
     key: "initStatistics",
     value: function initStatistics(value, updateStatistics, deletePluginSettings) {
-      this.statistics = value && value.statistics || [];
-      if (this.statistics.length === 0) {
+      var baseStatistics = value && value.statistics || [];
+      var advancedStatistics = this.getAdvancedStatistics(value);
+      var hasBaseStatistics = baseStatistics.length > 0;
+      var hasAdvancedStatistics = advancedStatistics.length > 0;
+      this.statistics = baseStatistics;
+
+      // init default dashboard if neither base-statistics nor advanced-statistics
+      if (!hasBaseStatistics && !hasAdvancedStatistics) {
         this.statistics = [new StatisticDashBoard({
           _id: generatorUniqueId([]),
           stat_items: [],
@@ -36,11 +42,15 @@ var DashBoardService = /*#__PURE__*/function () {
       this.needSave = false;
 
       // convert to advance-statistic
-      if (!hasOwnProperty(this.statistics[0], 'stat_items')) {
+      if (hasBaseStatistics && !hasOwnProperty(this.statistics[0], 'stat_items')) {
         this.needSave = true;
         this.convert2AdvanceStatistic();
       }
-      this.mergeAdvancedStatistics(value, deletePluginSettings);
+
+      // merge advanced statistics
+      if (hasAdvancedStatistics) {
+        this.mergeAdvancedStatistics(advancedStatistics, deletePluginSettings);
+      }
       this.filterInvalidCharts();
       if (this.needSave) {
         this.needSave = false;
@@ -148,12 +158,16 @@ var DashBoardService = /*#__PURE__*/function () {
       return this.chartService.generatorChart(convertedChart);
     }
   }, {
-    key: "mergeAdvancedStatistics",
-    value: function mergeAdvancedStatistics(value, deletePluginSettings) {
+    key: "getAdvancedStatistics",
+    value: function getAdvancedStatistics(value) {
       if (!value || !hasOwnProperty(value, 'plugin_settings') || !hasOwnProperty(value.plugin_settings, ADVANCED_STATISTICS_NAME)) {
-        return;
+        return [];
       }
-      var advancedStatistics = value.plugin_settings[ADVANCED_STATISTICS_NAME];
+      return value.plugin_settings[ADVANCED_STATISTICS_NAME] || [];
+    }
+  }, {
+    key: "mergeAdvancedStatistics",
+    value: function mergeAdvancedStatistics(advancedStatistics, deletePluginSettings) {
       if (!Array.isArray(advancedStatistics) || advancedStatistics.length === 0 || this.statistics.some(function (dashboard) {
         return dashboard.from_advanced;
       }) // already merged from advanced

package/es/stat-list/index.js

@@ -101,8 +101,7 @@ var StatList = /*#__PURE__*/function (_Component) {
         return;
       }
       var _exportStatisticToTab = exportStatisticToTable({
-          statisticalResult: _this.statisticalResult4Export,
-          t: intl
+          statisticalResult: _this.statisticalResult4Export
         }),
         columns = _exportStatisticToTab.columns,
         rows = _exportStatisticToTab.rows;
@@ -142,8 +141,7 @@ var StatList = /*#__PURE__*/function (_Component) {
       }
       var _updateStatisticToTab = updateStatisticToTable({
           updateTable: updateTable,
-          statisticalResult: _this.statisticalResult4Update,
-          t: intl
+          statisticalResult: _this.statisticalResult4Update
         }),
         newRows = _updateStatisticToTab.newRows,
         updatedRows = _updateStatisticToTab.updatedRows,

package/es/utils/export-table-utils.js

@@ -1,5 +1,6 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import dayjs from 'dayjs';
+import intl from 'react-intl-universal';
 import { getOption, getCollaborator, getNumberDisplayString, isNumber, CellType, FORMULA_RESULT_TYPE, FORMULA_COLUMN_TYPES, isDateColumn, TableUtils } from 'dtable-store';
 import { isCellValueChanged } from './cell-value';
 import { getSelectColumnOptions, getDateColumnFormat } from './column';
@@ -111,13 +112,13 @@ var getUpdatedOneDimensionStatisticTableResultToTable = function getUpdatedOneDi
 
   // one dimension table no summary columns
   if (pivot_columns.length < 2) {
-    columnMap['total'] = TableUtils.getTableColumnByName(updateTable, t('Total'));
+    columnMap['total'] = TableUtils.getTableColumnByName(updateTable, intl.get('Total'));
 
     // updated rows
     pivot_rows.forEach(function (item) {
       var name = item.name,
         total = item.total;
-      var groupName = name === null ? t(EMPTY_NAME) : getTableValueDisplayName(name, groupbyColumn);
+      var groupName = name === null ? intl.get(EMPTY_NAME) : getTableValueDisplayName(name, groupbyColumn);
       var row = tableRows.find(function (row) {
         return row[nameColumn.key] === groupName;
       });
@@ -171,7 +172,7 @@ var getUpdatedOneDimensionStatisticTableResultToTable = function getUpdatedOneDi
   pivot_rows.forEach(function (item) {
     var name = item.name,
       total = item.total;
-    var groupName = name === null ? t(EMPTY_NAME) : getTableValueDisplayName(name, groupbyColumn);
+    var groupName = name === null ? intl.get(EMPTY_NAME) : getTableValueDisplayName(name, groupbyColumn);
     var row = tableRows.find(function (row) {
       return row[nameColumnKey] === name;
     });
@@ -234,10 +235,10 @@ var getUpdatedTwoDimensionStatisticTableResultToTable = function getUpdatedTwoDi
   // updated columns
   Array.isArray(pivot_columns) && pivot_columns.forEach(function (item) {
     var key = item.key;
-    var columnName = key === null ? t(EMPTY_NAME) : getTableValueDisplayName(key, columnGroupbyColumn);
+    var columnName = key === null ? intl.get(EMPTY_NAME) : getTableValueDisplayName(key, columnGroupbyColumn);
     columnMap[columnName] = TableUtils.getTableColumnByName(updateTable, columnName);
   });
-  columnMap['total'] = TableUtils.getTableColumnByName(updateTable, t('Total'));
+  columnMap['total'] = TableUtils.getTableColumnByName(updateTable, intl.get('Total'));
 
   // updated rows
   var _loop = function _loop(i) {
@@ -245,7 +246,7 @@ var getUpdatedTwoDimensionStatisticTableResultToTable = function getUpdatedTwoDi
     var name = pivotRow.name,
       cells = pivotRow.cells,
       total = pivotRow.total;
-    name = name === null ? t(EMPTY_NAME) : getTableValueDisplayName(name, groupbyColumn);
+    name = name === null ? intl.get(EMPTY_NAME) : getTableValueDisplayName(name, groupbyColumn);
     var nameColumnKey = nameColumn.key;
     var row = tableRows.find(function (row) {
       return row[nameColumnKey] === name;
@@ -261,7 +262,7 @@ var getUpdatedTwoDimensionStatisticTableResultToTable = function getUpdatedTwoDi
         oldRow = row[totalColumn.key];
       }
       Object.keys(cells).forEach(function (key) {
-        var columnName = key === null ? t(EMPTY_NAME) : getTableValueDisplayName(key, columnGroupbyColumn);
+        var columnName = key === null ? intl.get(EMPTY_NAME) : getTableValueDisplayName(key, columnGroupbyColumn);
         var column = columnMap[columnName];
         var validCellValue = getValidValueForColumn(column, cells[key].total);
         if (column && isCellValueChanged(row[column.key], validCellValue, column.type)) {
@@ -283,7 +284,7 @@ var getUpdatedTwoDimensionStatisticTableResultToTable = function getUpdatedTwoDi
         newRow[totalColumn.key] = getValidValueForColumn(totalColumn, name);
       }
       Object.keys(cells).forEach(function (key) {
-        var columnName = key === null ? t(EMPTY_NAME) : getTableValueDisplayName(key, columnGroupbyColumn);
+        var columnName = key === null ? intl.get(EMPTY_NAME) : getTableValueDisplayName(key, columnGroupbyColumn);
         var column = columnMap[columnName];
         if (column) {
           newRow[column.key] = getValidValueForColumn(column, cells[key].total);
@@ -407,7 +408,7 @@ export var getOneDimensionStatisticTableResultToTable = function getOneDimension
     // total column
     var totalColumn = {
       type: _isDateSummaryColumn ? CellType.DATE : CellType.NUMBER,
-      name: t('Total'),
+      name: intl.get('Total'),
       data: columnData
     };
     columns.push(totalColumn);
@@ -417,12 +418,12 @@ export var getOneDimensionStatisticTableResultToTable = function getOneDimension
       var _newRow2;
       var name = item.name,
         total = item.total;
-      var groupName = name === null ? t(EMPTY_NAME) : getTableValueDisplayName(name, groupbyColumn);
+      var groupName = name === null ? intl.get(EMPTY_NAME) : getTableValueDisplayName(name, groupbyColumn);
       var cellValue = total.total;
       if (_isDateSummaryColumn && cellValue) {
         cellValue = isIncludeHour ? dayjs(cellValue).format('YYYY-MM-DD HH:mm') : dayjs(cellValue).format('YYYY-MM-DD');
       }
-      var newRow = (_newRow2 = {}, _defineProperty(_newRow2, groupbyColumn.name, groupName), _defineProperty(_newRow2, t('Total'), cellValue), _newRow2);
+      var newRow = (_newRow2 = {}, _defineProperty(_newRow2, groupbyColumn.name, groupName), _defineProperty(_newRow2, intl.get('Total'), cellValue), _newRow2);
       rows.push(newRow);
     });
     return {
@@ -482,7 +483,7 @@ export var getOneDimensionStatisticTableResultToTable = function getOneDimension
   pivot_rows.forEach(function (item) {
     var name = item.name,
       total = item.total;
-    var groupName = name === null ? t(EMPTY_NAME) : getTableValueDisplayName(name, groupbyColumn);
+    var groupName = name === null ? intl.get(EMPTY_NAME) : getTableValueDisplayName(name, groupbyColumn);
     var newRow = _defineProperty({}, groupbyColumn.name, groupName);
     Array.isArray(pivot_columns) && pivot_columns.forEach(function (item) {
       var key = item.key;
@@ -561,7 +562,7 @@ export var getTwoDimensionStatisticTableResultToTable = function getTwoDimension
   }
   Array.isArray(pivot_columns) && pivot_columns.forEach(function (item) {
     var key = item.key;
-    var columnName = key === null ? t(EMPTY_NAME) : getTableValueDisplayName(key, columnGroupbyColumn);
+    var columnName = key === null ? intl.get(EMPTY_NAME) : getTableValueDisplayName(key, columnGroupbyColumn);
     var newColumn = {
       type: _isDateSummaryColumn ? CellType.DATE : CellType.NUMBER,
       name: columnName,
@@ -574,7 +575,7 @@ export var getTwoDimensionStatisticTableResultToTable = function getTwoDimension
   // total column
   var totalColumn = {
     type: _isDateSummaryColumn ? CellType.DATE : CellType.NUMBER,
-    name: t('Total'),
+    name: intl.get('Total'),
     data: columnData
   };
   columns.push(totalColumn);
@@ -585,13 +586,13 @@ export var getTwoDimensionStatisticTableResultToTable = function getTwoDimension
     var name = item.name,
       cells = item.cells,
       total = item.total;
-    name = name === null ? t(EMPTY_NAME) : getTableValueDisplayName(name, groupbyColumn);
+    name = name === null ? intl.get(EMPTY_NAME) : getTableValueDisplayName(name, groupbyColumn);
     var newRow = _defineProperty({}, groupbyColumn.name, name);
     var cellValue = total;
     if (_isDateSummaryColumn && cellValue) {
       cellValue = dayjs(cellValue).format(dateFormat);
     }
-    newRow[t('Total')] = cellValue;
+    newRow[intl.get('Total')] = cellValue;
     Object.keys(cells).forEach(function (key) {
       var cellValue = cells[key].total;
       if (_isDateSummaryColumn) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-statistic",
-  "version": "4.0.9",
+  "version": "4.0.11",
   "description": "statistics",
   "main": "dist/dtable-statistic.js",
   "author": "seafile",
@@ -12,8 +12,8 @@
     "@seafile/seafile-calendar": "0.0.24",
     "comlink": "^4.3.1",
     "dayjs": "1.10.7",
-    "dtable-store": "4.0.2",
-    "dtable-web-api": "4.0.1",
+    "dtable-store": "4.0.6",
+    "dtable-web-api": "4.0.4",
     "glamor": "^2.20.40",
     "html2canvas": "^1.4.1",
     "rc-slider": "^9.7.4",