dtable-statistic 4.0.10 → 4.0.12

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/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,15 +1,21 @@
 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';
 import { getKnownCreatorByEmail } from './collaborator';
 import { EMPTY_NAME } from '../constants';
+var isEmptyName = function isEmptyName(title) {
+  return title === null || title === '';
+};
 var isSummaryDateColumn = function isSummaryDateColumn(summaryColumn) {
   if (!summaryColumn) return false;
   var type = summaryColumn.type;
   return type !== CellType.LINK && isDateColumn(summaryColumn);
 };
+
+// eslint-disable-next-line
 var getTableValueDisplayName = function getTableValueDisplayName(value, column) {
   var _ref = column || {},
     type = _ref.type,
@@ -92,8 +98,7 @@ var getValidValueForColumn = function getValidValueForColumn(column, value) {
 };
 var getUpdatedOneDimensionStatisticTableResultToTable = function getUpdatedOneDimensionStatisticTableResultToTable(_ref3) {
   var updateTable = _ref3.updateTable,
-    statisticalResult = _ref3.statisticalResult,
-    t = _ref3.t;
+    statisticalResult = _ref3.statisticalResult;
   var pivotResult = statisticalResult.pivotResult,
     groupbyColumn = statisticalResult.groupbyColumn,
     statisticTableColumns = statisticalResult.statisticTableColumns;
@@ -111,13 +116,14 @@ 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,
+        original_name = item.original_name,
         total = item.total;
-      var groupName = name === null ? t(EMPTY_NAME) : getTableValueDisplayName(name, groupbyColumn);
+      var groupName = isEmptyName(original_name) ? intl.get(EMPTY_NAME) : name;
       var row = tableRows.find(function (row) {
         return row[nameColumn.key] === groupName;
       });
@@ -170,10 +176,11 @@ var getUpdatedOneDimensionStatisticTableResultToTable = function getUpdatedOneDi
   var nameColumnKey = nameColumn.key;
   pivot_rows.forEach(function (item) {
     var name = item.name,
+      original_name = item.original_name,
       total = item.total;
-    var groupName = name === null ? t(EMPTY_NAME) : getTableValueDisplayName(name, groupbyColumn);
+    var groupName = isEmptyName(original_name) ? intl.get(EMPTY_NAME) : name;
     var row = tableRows.find(function (row) {
-      return row[nameColumnKey] === name;
+      return row[nameColumnKey] === groupName;
     });
     if (row) {
       var updateRow = {};
@@ -215,11 +222,9 @@ var getUpdatedOneDimensionStatisticTableResultToTable = function getUpdatedOneDi
 };
 var getUpdatedTwoDimensionStatisticTableResultToTable = function getUpdatedTwoDimensionStatisticTableResultToTable(_ref4) {
   var updateTable = _ref4.updateTable,
-    statisticalResult = _ref4.statisticalResult,
-    t = _ref4.t;
+    statisticalResult = _ref4.statisticalResult;
   var pivotResult = statisticalResult.pivotResult,
-    groupbyColumn = statisticalResult.groupbyColumn,
-    columnGroupbyColumn = statisticalResult.columnGroupbyColumn;
+    groupbyColumn = statisticalResult.groupbyColumn;
   var nameColumn = TableUtils.getTableColumnByName(updateTable, groupbyColumn.name);
   if (!nameColumn) return {};
   var pivot_rows = pivotResult.pivot_rows,
@@ -233,19 +238,23 @@ 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 key = item.key,
+      original_key = item.original_key;
+    var columnName = isEmptyName(original_key) ? intl.get(EMPTY_NAME) : key;
     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) {
     var pivotRow = pivot_rows[i];
     var name = pivotRow.name,
+      original_name = pivotRow.original_name,
       cells = pivotRow.cells,
       total = pivotRow.total;
-    name = name === null ? t(EMPTY_NAME) : getTableValueDisplayName(name, groupbyColumn);
+    if (isEmptyName(original_name)) {
+      name = intl.get(EMPTY_NAME);
+    }
     var nameColumnKey = nameColumn.key;
     var row = tableRows.find(function (row) {
       return row[nameColumnKey] === name;
@@ -258,15 +267,15 @@ var getUpdatedTwoDimensionStatisticTableResultToTable = function getUpdatedTwoDi
       var validTotalCellValue = getValidValueForColumn(totalColumn, total);
       if (totalColumn && isCellValueChanged(row[totalColumn.key], validTotalCellValue, totalColumn.type)) {
         updatedRow[totalColumn.key] = validTotalCellValue;
-        oldRow = row[totalColumn.key];
+        oldRow[totalColumn.key] = row[totalColumn.key];
       }
       Object.keys(cells).forEach(function (key) {
-        var columnName = key === null ? t(EMPTY_NAME) : getTableValueDisplayName(key, columnGroupbyColumn);
+        var columnName = isEmptyName(key) ? intl.get(EMPTY_NAME) : key;
         var column = columnMap[columnName];
         var validCellValue = getValidValueForColumn(column, cells[key].total);
         if (column && isCellValueChanged(row[column.key], validCellValue, column.type)) {
           updatedRow[column.key] = validCellValue;
-          oldRow = row[column.key];
+          oldRow[column.key] = row[column.key];
         }
       });
       if (Object.keys(updatedRow).length > 0) {
@@ -283,7 +292,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 = isEmptyName(key) ? intl.get(EMPTY_NAME) : key;
         var column = columnMap[columnName];
         if (column) {
           newRow[column.key] = getValidValueForColumn(column, cells[key].total);
@@ -306,6 +315,19 @@ var getUpdatedTwoDimensionStatisticTableResultToTable = function getUpdatedTwoDi
 };
 
 /**
+  * statisticalResult: {
+  *  columnGroupbyColumn: null,
+  *  groupbyColumn: null,
+  *  pivotResult: {
+  *    pivot_columns: [],
+  *    pivot_rows: [
+  *      { name: 'xxx', original_name: 'xxx', total }
+  *    ]
+  *  },
+  *  statisticTableColumns: null,
+  *  summaryColumn: null,
+  * }
+  *
   * @return {
   *   columns: [
   *      {
@@ -324,8 +346,7 @@ var getUpdatedTwoDimensionStatisticTableResultToTable = function getUpdatedTwoDi
   * }
   */
 export var exportStatisticToTable = function exportStatisticToTable(_ref5) {
-  var statisticalResult = _ref5.statisticalResult,
-    t = _ref5.t;
+  var statisticalResult = _ref5.statisticalResult;
   var pivotResult = statisticalResult.pivotResult,
     groupbyColumn = statisticalResult.groupbyColumn,
     columnGroupbyColumn = statisticalResult.columnGroupbyColumn;
@@ -335,19 +356,16 @@ export var exportStatisticToTable = function exportStatisticToTable(_ref5) {
   // two dimension table
   if (columnGroupbyColumn) {
     return getTwoDimensionStatisticTableResultToTable({
-      statisticalResult: statisticalResult,
-      t: t
+      statisticalResult: statisticalResult
     });
   }
   if (!Array.isArray(pivot_columns)) return {};
   return getOneDimensionStatisticTableResultToTable({
-    statisticalResult: statisticalResult,
-    t: t
+    statisticalResult: statisticalResult
   });
 };
 export var getOneDimensionStatisticTableResultToTable = function getOneDimensionStatisticTableResultToTable(_ref6) {
-  var statisticalResult = _ref6.statisticalResult,
-    t = _ref6.t;
+  var statisticalResult = _ref6.statisticalResult;
   var pivotResult = statisticalResult.pivotResult,
     groupbyColumn = statisticalResult.groupbyColumn,
     statisticTableColumns = statisticalResult.statisticTableColumns,
@@ -407,7 +425,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);
@@ -416,13 +434,14 @@ export var getOneDimensionStatisticTableResultToTable = function getOneDimension
     pivot_rows.forEach(function (item) {
       var _newRow2;
       var name = item.name,
+        original_name = item.original_name,
         total = item.total;
-      var groupName = name === null ? t(EMPTY_NAME) : getTableValueDisplayName(name, groupbyColumn);
+      var groupName = isEmptyName(original_name) ? intl.get(EMPTY_NAME) : name;
       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 {
@@ -481,8 +500,9 @@ export var getOneDimensionStatisticTableResultToTable = function getOneDimension
   // generator rows
   pivot_rows.forEach(function (item) {
     var name = item.name,
+      original_name = item.original_name,
       total = item.total;
-    var groupName = name === null ? t(EMPTY_NAME) : getTableValueDisplayName(name, groupbyColumn);
+    var groupName = isEmptyName(original_name) ? intl.get(EMPTY_NAME) : name;
     var newRow = _defineProperty({}, groupbyColumn.name, groupName);
     Array.isArray(pivot_columns) && pivot_columns.forEach(function (item) {
       var key = item.key;
@@ -505,11 +525,9 @@ export var getOneDimensionStatisticTableResultToTable = function getOneDimension
   };
 };
 export var getTwoDimensionStatisticTableResultToTable = function getTwoDimensionStatisticTableResultToTable(_ref11) {
-  var statisticalResult = _ref11.statisticalResult,
-    t = _ref11.t;
+  var statisticalResult = _ref11.statisticalResult;
   var pivotResult = statisticalResult.pivotResult,
     groupbyColumn = statisticalResult.groupbyColumn,
-    columnGroupbyColumn = statisticalResult.columnGroupbyColumn,
     summaryColumn = statisticalResult.summaryColumn;
   var pivot_rows = pivotResult.pivot_rows,
     pivot_columns = pivotResult.pivot_columns;
@@ -560,8 +578,9 @@ 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 key = item.key,
+      original_key = item.original_key;
+    var columnName = isEmptyName(original_key) ? intl.get(EMPTY_NAME) : key;
     var newColumn = {
       type: _isDateSummaryColumn ? CellType.DATE : CellType.NUMBER,
       name: columnName,
@@ -574,7 +593,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);
@@ -583,15 +602,18 @@ export var getTwoDimensionStatisticTableResultToTable = function getTwoDimension
   var dateFormat = isIncludeHour ? 'YYYY-MM-DD HH:mm' : 'YYYY-MM-DD';
   pivot_rows.forEach(function (item) {
     var name = item.name,
+      original_name = item.original_name,
       cells = item.cells,
       total = item.total;
-    name = name === null ? t(EMPTY_NAME) : getTableValueDisplayName(name, groupbyColumn);
+    if (isEmptyName(original_name)) {
+      name = intl.get(EMPTY_NAME);
+    }
     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) {
@@ -608,8 +630,7 @@ export var getTwoDimensionStatisticTableResultToTable = function getTwoDimension
 };
 export var updateStatisticToTable = function updateStatisticToTable(_ref14) {
   var updateTable = _ref14.updateTable,
-    statisticalResult = _ref14.statisticalResult,
-    t = _ref14.t;
+    statisticalResult = _ref14.statisticalResult;
   var groupbyColumn = statisticalResult.groupbyColumn,
     columnGroupbyColumn = statisticalResult.columnGroupbyColumn;
   if (!groupbyColumn) return {};
@@ -618,15 +639,13 @@ export var updateStatisticToTable = function updateStatisticToTable(_ref14) {
   if (columnGroupbyColumn) {
     return getUpdatedTwoDimensionStatisticTableResultToTable({
       updateTable: updateTable,
-      statisticalResult: statisticalResult,
-      t: t
+      statisticalResult: statisticalResult
     });
   }
 
   // one dimension table
   return getUpdatedOneDimensionStatisticTableResultToTable({
     updateTable: updateTable,
-    statisticalResult: statisticalResult,
-    t: t
+    statisticalResult: statisticalResult
   });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-statistic",
-  "version": "4.0.10",
+  "version": "4.0.12",
   "description": "statistics",
   "main": "dist/dtable-statistic.js",
   "author": "seafile",
@@ -13,7 +13,7 @@
     "comlink": "^4.3.1",
     "dayjs": "1.10.7",
     "dtable-store": "4.0.6",
-    "dtable-web-api": "4.0.1",
+    "dtable-web-api": "4.0.4",
     "glamor": "^2.20.40",
     "html2canvas": "^1.4.1",
     "rc-slider": "^9.7.4",