dtable-statistic 5.3.50 → 5.3.51

package/es/setting.local.js

@@ -4,44 +4,48 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-/**
- * local development settings
- */
-var _default = exports.default = {
-  username: '7355da59470c4402884fa1b21a10cd06@auth.local',
+let config = {
+  username: 'cffbc4dbc6364befbdccb8623842a8ed@auth.local',
   password: '123456',
-  token: "2a06aeb633ffb5bb1937aed421e8043210959652",
-  // dtable api token (required)
-  APIToken: 'b48e52714601c464ca4bf2fa3d10daea095ef070',
-  // server URL of the dtable of the plugin (required)
+  dtableUuid: '842e9c84-8311-432d-b818-27012c807b13',
+  // required
+  APIToken: '83a5ec5848242d4da6c086acabd8e3a6e2fefa10',
+  // required
   server: 'https://dev.seatable.cn',
-  // id of the workspace with the dtable of the plugin (required, workspace must exist)
-  workspaceID: '169',
-  // name of the dtable to add the plugin to (required, dtable must exist under this name)
-  fileName: 'Coll',
-  // default language ('en' or 'zh-cn' are common, see "src/locale/index.js" for all lang keys)
-  lang: 'zh-cn',
-  permission: 'rw',
-  dtableUuid: '8e905209-b306-4aa8-a082-8046801ba94c',
-  // media URL of the dtable of the plugin (required)
-  mediaUrl: 'https://dev.seatable.cn/media/',
-  isAdmin: true
-}; // export default {
-//   username: '8e6fd68ab7764dd2b01c2f2a17b7d991@auth.local',
-//   password: '1',
-//   token: "2a06aeb633ffb5bb1937aed421e8043210959652",
-//   // dtable api token (required)
-//   APIToken: '89d80ccbba8c1033264ba02df4441de2e5f2c394',
-//   // server URL of the dtable of the plugin (required)
-//   server: 'http://127.0.0.1:80',
-//   // id of the workspace with the dtable of the plugin (required, workspace must exist)
-//   workspaceID: '1',
-//   // name of the dtable to add the plugin to (required, dtable must exist under this name)
-//   fileName: '页面设计测试',
-//   // default language ('en' or 'zh-cn' are common, see "src/locale/index.js" for all lang keys)
-//   lang: 'en',
-//   permission: 'rw',
-//   // media URL of the dtable of the plugin (required)
-//   mediaUrl: '/media/',
-//   isAdmin: false,
-// };
+  mediaUrl: '/media/',
+  // required
+  dtableBaiduMapKey: '1qRjaf9gprzfG6Kykg54jSzAEZZI0NZV',
+  // required
+  dtableMineMapKey: '57bccfdf646e4118aa68accfa1f256a5',
+  // optional
+  dtableGoogleMapKey: 'AIzaSyC0K2fPe31FfLm3fyoPT5YXQcqO-GrSTi8',
+  workspaceID: '291',
+  // optional
+  fileName: '通用应用表格测试',
+  // optional
+  lang: 'en' // optional
+  // lang:'en'
+};
+let config2 = {
+  username: 'cffbc4dbc6364befbdccb8623842a8ed@auth.local',
+  password: '123456',
+  dtableUuid: '90048f2f-a397-4739-8049-29c97eb5c0c2',
+  // required
+  APIToken: '7abd6e329205b9c63190429a716e5d15f682a817',
+  // required
+  server: 'https://dev.seatable.cn',
+  mediaUrl: '/media/',
+  // required
+  dtableBaiduMapKey: '1qRjaf9gprzfG6Kykg54jSzAEZZI0NZV',
+  // required
+  dtableMineMapKey: '57bccfdf646e4118aa68accfa1f256a5',
+  // optional
+  dtableGoogleMapKey: 'AIzaSyC0K2fPe31FfLm3fyoPT5YXQcqO-GrSTi8',
+  workspaceID: '291',
+  // optional
+  fileName: '实验动物笼位统计表',
+  // optional
+  lang: 'en' // optional
+  // lang:'en'
+};
+var _default = exports.default = config2;

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

@@ -223,11 +223,7 @@ const exportOneDimensionToTable = _ref => {
     type: _dtableUtils.CellType.NUMBER,
     name: _reactIntlUniversal.default.get('Total'),
     data: {
-      decimal: 'dot',
-      enable_precision: false,
-      format: 'yuan',
-      precision: 2,
-      thousands: 'no'
+      format: 'number'
     }
   };
   columnMap['total'] = totalColumn;
@@ -650,18 +646,24 @@ const updatedOneDimensionToTable = _ref5 => {
       let newRow = {
         [nameColumn.key]: groupName
       };
+      let rowTotal = 0;
       Array.isArray(pivot_columns) && pivot_columns.forEach(item => {
         const {
-          key,
-          method
+          key
         } = item;
-        const cellValueKey = key + method;
+        const cellValueKey = key;
         const column = columnMap[key];
         if (column) {
           const totalCellValue = getValidValueForColumn(column, total[cellValueKey]);
           newRow[column.key] = totalCellValue;
+          rowTotal = rowTotal + Number(totalCellValue);
         }
       });
+      // total column
+      const totalColumn = columnMap['total'];
+      if (totalColumn) {
+        newRow[totalColumn.key] = rowTotal;
+      }
       newRows.push(newRow);
     }
   });
@@ -773,7 +775,7 @@ const updateTwoDimensionToTable = _ref6 => {
       let newRow = {};
       newRow[nameColumnKey] = name;
       if (totalColumn) {
-        newRow[totalColumn.key] = getValidValueForColumn(totalColumn, name);
+        newRow[totalColumn.key] = getValidValueForColumn(totalColumn, total);
       }
       Object.keys(cells).forEach(key => {
         const columnName = isEmptyName(key) ? _reactIntlUniversal.default.get(_constants.EMPTY_NAME) : key;
@@ -846,7 +848,13 @@ const updateTwoDimensionWithSummaryColumnsToTable = _ref7 => {
           name: tableColumnName
         } = tableColumn;
         const existCellValue = existRow[tableColumnKey];
-        const exportingCellValue = exportingRow[tableColumnName];
+        let exportingCellValue = exportingRow[tableColumnName];
+        if (exportingCellValue === undefined) {
+          const matchedKey = Object.keys(exportingRow).find(key => key.includes(`（${tableColumnName}）`));
+          if (matchedKey !== undefined) {
+            exportingCellValue = exportingRow[matchedKey];
+          }
+        }
         if (tableColumn && (0, _cellValue.isCellValueChanged)(existCellValue, exportingCellValue, tableColumnType)) {
           exportingRowData[tableColumnKey] = exportingCellValue;
           existRowData[tableColumnKey] = existCellValue;
@@ -859,8 +867,24 @@ const updateTwoDimensionWithSummaryColumnsToTable = _ref7 => {
         oldRows[rowId] = existRowData;
       }
     } else {
-      // create new row which not exist
-      newRows.push(exportingRow);
+      let newRowData = {};
+      tableColumns.forEach(tableColumn => {
+        const {
+          key: tableColumnKey,
+          name: tableColumnName
+        } = tableColumn;
+        let exportingCellValue = exportingRow[tableColumnName];
+        if (exportingCellValue === undefined) {
+          const matchedKey = Object.keys(exportingRow).find(key => key.includes(`（${tableColumnName}）`));
+          if (matchedKey !== undefined) {
+            exportingCellValue = exportingRow[matchedKey];
+          }
+        }
+        if (exportingCellValue !== undefined && exportingCellValue !== null) {
+          newRowData[tableColumnKey] = exportingCellValue;
+        }
+      });
+      newRows.push(newRowData);
     }
   });
   return {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "5.3.50",
+  "version": "5.3.51",
   "name": "dtable-statistic",
   "description": "statistics",
   "main": "dist/dtable-statistic.js",
@@ -16,7 +16,7 @@
     "react-grid-layout": "^1.2.5",
     "react-intl-universal": "^2.4.8",
     "reactstrap": "9.2.3",
-    "sea-chart": "^1.1.133"
+    "sea-chart": "^1.1.134"
   },
   "peerDependencies": {
     "dtable-ui-component": "~6.0.*",