sea-chart 0.0.67-alpha.1 → 0.0.67-alpha.2

package/dist/components/color-popover/color-rules-popover.css

@@ -18,7 +18,7 @@
   color: #999;
 }
 
-.statistic-color-rules-popover .statistic-add-item-btn {
+.statistic-color-rules-popover .add-item-btn {
   display: flex;
   align-items: center;
   height: 40px;
@@ -32,7 +32,7 @@
   position: relative;
 }
 
-.statistic-color-rules-popover .statistic-add-item-btn .dtable-icon-add-table {
+.statistic-color-rules-popover .add-item-btn .dtable-icon-add-table {
   margin-right: 10px;
   font-size: 12px;
   font-weight: 600;
@@ -145,7 +145,7 @@
   color: #999;
 }
 
-.statistic-add-item-btn.statistic-btn-add-color-rule-filter {
+.add-item-btn.statistic-btn-add-color-rule-filter {
   border-top: unset;
   background-color: #f5f5f5;
   padding-left: 27px;

package/dist/components/common-add-tool/index.css

@@ -1,4 +1,4 @@
-.statistic-add-item-btn {
+.add-item-btn {
   display: flex;
   align-items: center;
   height: 40px;
@@ -12,7 +12,7 @@
   position: relative;
 }
 
-.statistic-add-item-btn .dtable-icon-add-table {
+.add-item-btn .dtable-icon-add-table {
   margin-right: 10px;
   font-size: 12px;
   font-weight: 600;

package/dist/components/common-add-tool/index.js

@@ -8,7 +8,7 @@ function CommonAddTool(props) {
     addIconClassName
   } = props;
   return /*#__PURE__*/React.createElement("div", {
-    className: "statistic-add-item-btn ".concat(className ? className : ''),
+    className: "add-item-btn ".concat(className ? className : ''),
     onClick: e => {
       callBack(e);
     }

package/dist/components/statistic-record-dialog/index.js

@@ -40,12 +40,11 @@ class StatisticRecordDialog extends React.Component {
       }
       this.unShowColumnKeyList = this.getUnShowColumnKeyList(this.view);
       this.renderedColumns = this.getRenderedColumns(this.table);
-      if (this.isArchiveView || !isCalculateByView || statisticRecord.isQueryBySql) {
+      if (this.isArchiveView || !isCalculateByView || (rows === null || rows === void 0 ? void 0 : rows.length) === 0) {
         var _context$api;
         const chartDataSQL = new ChartDataSQL({
           table: this.table,
-          chart,
-          view: this.view
+          chart
         });
         const sqlString = chartDataSQL.get_statistic_record_sql(chart, statisticRecord, {
           isColumn,

package/dist/utils/chart-utils/base-utils.js

@@ -1372,6 +1372,8 @@ BaseUtils.mergePivotTableSameCollaborator = pivot_rows => {
       new_pivot_rows.push({
         ...item
       });
+    } else {
+      new_pivot_rows.push(item);
     }
   });
   return new_pivot_rows;

package/dist/utils/chart-utils/sql-statistics-utils.js

@@ -646,7 +646,9 @@ SQLStatisticsUtils.twoDimensionTableSQLResult2JavaScript = (chart, sqlRows, char
   pivot_table_total, chart);
   BaseUtils.sortCharts(pivot_rows, groupbyColumn, 'name');
   BaseUtils.sortCharts(pivot_columns, columnGroupbyColumn, 'key');
-  pivot_rows = BaseUtils.mergePivotTableSameCollaborator(pivot_rows);
+  if ((groupbyColumn === null || groupbyColumn === void 0 ? void 0 : groupbyColumn.type) === CellType.COLLABORATOR) {
+    pivot_rows = BaseUtils.mergePivotTableSameCollaborator(pivot_rows);
+  }
   const summary_columns = [summaryColumn, ...summaryColumnsWithMethod.map(item => item.column)];
   return {
     summary_columns,

package/dist/utils/sql/chart-data-sql.js

@@ -13,7 +13,6 @@ class ChartDataSQL {
     var _chart$config;
     let {
       table,
-      view,
       chart,
       username,
       userId,
@@ -1060,7 +1059,6 @@ class ChartDataSQL {
     };
     this.error = '';
     this.table = table;
-    this.view = view;
     this.chart = (chart === null || chart === void 0 ? void 0 : chart.config) || {};
     this.username = username;
     const table_name = (table === null || table === void 0 ? void 0 : table.name) || '';
@@ -1074,7 +1072,7 @@ class ChartDataSQL {
     Array.isArray(table.columns) && table.columns.forEach(column => {
       this.column_key_map[column.key] = column;
     });
-    this.filter_sql = filter2SqlCondition(table, view, username, userId, userDepartmentIdsMap);
+    this.filter_sql = filter2SqlCondition(table, chart, username, userId, userDepartmentIdsMap);
   }
 }
 export default ChartDataSQL;

package/dist/view/wrapper/combination.js

@@ -305,10 +305,7 @@ class Combination extends ChartComponent {
         }, 100));
       }
       this.chart.on('element:click', e => {
-        this.props.toggleRecords({
-          ...e.data.data,
-          isQueryBySql: true
-        });
+        this.props.toggleRecords(e.data.data);
       });
       this.chart.on('interval:mouseenter', e => {
         if (this.isInsideInterval) return;

package/dist/view/wrapper/table/index.css

@@ -147,8 +147,7 @@
   padding: 0;
 }
 
-.sea-chart-pivot-table .pivot-table-header-summary-columns-container,
-.sea-chart-pivot-table .pivot-cells-container  {
+.sea-chart-pivot-table .pivot-table-header-summary-columns-container {
   height: 100%;
   width: 100%;
   overflow: hidden;
@@ -156,6 +155,14 @@
   justify-content: space-between;
 }
 
+.sea-chart-pivot-table .pivot-cells-container  {
+  height: 100%;
+  width: 100%;
+  overflow: hidden;
+  display: flex;
+  justify-content: center;
+}
+
 .sea-chart-pivot-table .pivot-table-header-summary-columns-container > div,
 .sea-chart-pivot-table .pivot-cells-container > div {
   flex:1;

package/dist/view/wrapper/table/one-dimension-table-with-numeric-columns.js

@@ -153,7 +153,6 @@ class OneDimensionTableWithNumericColumns extends PureComponent {
             key: "table-cell-".concat(cellIdx),
             onClick: () => this.toggleRecords({
               rows,
-              name: rowItem === null || rowItem === void 0 ? void 0 : rowItem.name,
               total: total[key]
             }, {
               rowIdx,

package/dist/view/wrapper/table/two-dimension-table.js

@@ -126,6 +126,24 @@ class TwoDimensionTable extends PureComponent {
         total
       }, selectedCell);
     };
+    this.renderEmptyCell = (summary_columns, cellIdx) => {
+      if ((summary_columns === null || summary_columns === void 0 ? void 0 : summary_columns.length) !== 0) {
+        return summary_columns.map(() => {
+          return /*#__PURE__*/React.createElement("div", {
+            key: "table-cell-".concat(cellIdx),
+            className: classnames('pivot-cell', {
+              'pivot-empty-cell': true
+            })
+          }, /*#__PURE__*/React.createElement("i", null));
+        });
+      }
+      return /*#__PURE__*/React.createElement("div", {
+        key: "table-cell-".concat(cellIdx),
+        className: classnames('pivot-cell', {
+          'pivot-empty-cell': true
+        })
+      }, /*#__PURE__*/React.createElement("i", null));
+    };
     this.renderRows = () => {
       const {
         result,
@@ -214,10 +232,7 @@ class TwoDimensionTable extends PureComponent {
                 'selected-pivot-cell-left': isSelectedCellLeft
               }),
               key: "table-cell-".concat(cellIdx),
-              onClick: () => this.toggleRecords({
-                ...c,
-                name: rowItem === null || rowItem === void 0 ? void 0 : rowItem.name
-              }, {
+              onClick: () => this.toggleRecords(c, {
                 rowIdx,
                 cellIdx
               }),
@@ -251,14 +266,7 @@ class TwoDimensionTable extends PureComponent {
                 'selected-pivot-cell-border': isSelectedCell
               })
             }));
-          }), !total && (summary_columns === null || summary_columns === void 0 ? void 0 : summary_columns.map(() => {
-            return /*#__PURE__*/React.createElement("div", {
-              key: "table-cell-".concat(cellIdx),
-              className: classnames('pivot-cell', {
-                'pivot-empty-cell': true
-              })
-            }, /*#__PURE__*/React.createElement("i", null));
-          }))));
+          }), !total && this.renderEmptyCell(summary_columns, cellIdx)));
         }), display_total && /*#__PURE__*/React.createElement("td", {
           className: classnames('pivot-cell', {
             'pivot-empty-cell': !isValidSummaryDisplayValue,
@@ -268,8 +276,7 @@ class TwoDimensionTable extends PureComponent {
           }),
           onClick: () => this.toggleRecords({
             rows: Array.isArray(cells) && cells.length > 0 ? pivotRowCells : rowItem.rows,
-            total: total,
-            name: rowItem === null || rowItem === void 0 ? void 0 : rowItem.name
+            total: total
           }, {
             rowIdx,
             cellIdx: cells.length

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sea-chart",
-  "version": "0.0.67-alpha.1",
+  "version": "0.0.67-alpha.2",
   "main": "./dist/index.js",
   "dependencies": {
     "@antv/data-set": "0.11.8",