sea-chart 0.0.10 → 0.0.12

package/dist/constants/type.js

@@ -58,7 +58,7 @@ export const CHART_TYPE_SHOW = {
   [CHART_TYPE.TREND]: 'Trend',
   [CHART_TYPE.DASHBOARD]: 'Gauge',
   [CHART_TYPE.TREE_MAP]: 'Tree_map',
-  [CHART_TYPE.TABLE]: 'Table'
+  [CHART_TYPE.TABLE]: 'Pivot_table'
 };
 export const CHART_TYPES = [{
   name: 'Histogram',
@@ -120,7 +120,7 @@ export const CHART_TYPES = [{
   icon: 'rectangular-tree-diagram',
   children: [CHART_TYPE.TREE_MAP]
 }, {
-  name: 'Pivot_table',
+  name: 'Table',
   icon: 'dtable-logo',
   children: [CHART_TYPE.TABLE]
 }];

package/dist/locale/lang/en.js

@@ -91,7 +91,6 @@ const en = {
   'Filters': 'filters',
   'Font_size': 'Font size',
   'Font_weight': 'Font weight',
-  'Table': 'Table',
   'Chart_type': 'Chart type',
   "Histogram": "Histogram",
   "Basic_histogram": "Basic histogram",

package/dist/locale/lang/zh_CN.js

@@ -91,7 +91,6 @@ const zh_CN = {
   "Filters": "个过滤条件",
   "Font_size": "字体大小",
   "Font_weight": "字体粗细",
-  'Table': '子表',
   'Chart_type': '图表类型',
   "Histogram": "柱状图",
   "Basic_histogram": "基础柱状图",
@@ -126,7 +125,6 @@ const zh_CN = {
   "Trend": "趋势图",
   "Gauge": "仪表盘",
   "Tree_map": "矩形树图",
-  "Pivot_table": "透视表 Pivot table",
   "Table": '表格',
   "Pivot_table": "透视表",
   "Title": "标题",

package/dist/settings/index.js

@@ -79,8 +79,9 @@ const Settings = _ref => {
     chart: chart,
     tables: tables,
     onChange: modifyStatistic
-  }), type === CHART_SETTINGS_TYPE.STYLE && /*#__PURE__*/React.createElement(StyleSettings, {
+  }), type === CHART_SETTINGS_TYPE.CHART_STYLE && /*#__PURE__*/React.createElement(StyleSettings, {
     chart: chart,
+    labelColorConfigs: labelColorConfigs,
     onChange: modifyStyle
   }), children && type === CHART_SETTINGS_TYPE.GENERAL_STYLE && /*#__PURE__*/React.createElement(React.Fragment, null, children))));
 };

package/dist/settings/widgets/color-settings/color-use-type-selector.js

@@ -50,12 +50,13 @@ class ColorUseTypeSelector extends Component {
         case CHART_TYPE.STACKED_HORIZONTAL_BAR:
         case CHART_TYPE.PIE:
         case CHART_TYPE.RING:
-        case CHART_TYPE.GROUP_LINE:
-        case CHART_TYPE.AREA_GROUP_CHART:
+        case CHART_TYPE.LINE_GROUP:
+        case CHART_TYPE.AREA_GROUP:
           {
             return [TYPE_COLOR_USING.USE_DEFAULT, TYPE_COLOR_USING.USE_COLUMN_COLORS];
           }
         case CHART_TYPE.BAR:
+        case CHART_TYPE.LINE:
         case CHART_TYPE.HORIZONTAL_BAR:
           {
             return [TYPE_COLOR_USING.USE_DEFAULT, TYPE_COLOR_USING.USE_SPECIFIC_COLORS, TYPE_COLOR_USING.USE_RULES];
@@ -92,6 +93,7 @@ class ColorUseTypeSelector extends Component {
         type
       } = chart;
       switch (type) {
+        case CHART_TYPE.LINE:
         case CHART_TYPE.BAR:
           {
             const {

package/dist/settings/widgets/group-by.js

@@ -71,9 +71,7 @@ class GroupBy extends Component {
     };
     this.getColumnOptions = columns => {
       const {
-        chart: {
-          config
-        }
+        chart
       } = this.props;
       const newColumns = columns.map(column => {
         return {
@@ -87,7 +85,7 @@ class GroupBy extends Component {
           }, column.name))
         };
       });
-      if (config.type === CHART_TYPE.TABLE) {
+      if ((chart === null || chart === void 0 ? void 0 : chart.config.type) === CHART_TYPE.TABLE) {
         newColumns.unshift({
           value: {
             key: '',

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

@@ -9,7 +9,6 @@ ChartUtils.calculateChart = (chart, value, callback) => {
     tables: value.tables,
     onSuccess: function (res) {
       let dataSources = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : SQLStatisticsUtils.dataSources;
-      console.log('res1', res);
       // Custom Bar
       if (Array.isArray(res)) {
         if (dataSources === OriginalDataUtils.dataSources) {

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

@@ -84,28 +84,103 @@ SQLStatisticsUtils.getGroupLabelFromDB = (cellValue, column, tables) => {
   }
 };
 SQLStatisticsUtils.formatedTableSqlRows = (chart, sqlRows, chartSQLMap, columnMap, tables) => {
-  // Split multiple collaborators in a row
+  const {
+    config
+  } = chart;
   const {
     sqlGroupbyColumnKey,
-    sqlSummaryColumnKey
+    sqlSummaryColumnKey,
+    summarySQLColumnName2ColumnKey
   } = chartSQLMap;
-  const newSqlRows = sqlRows.slice(0);
-  sqlRows.forEach((item, index) => {
-    if (item[sqlGroupbyColumnKey].length > 1) {
-      newSqlRows.splice(index, 1);
-      item[sqlGroupbyColumnKey].forEach(jtem => {
-        const rowIndex = newSqlRows.findIndex(rows => rows[sqlGroupbyColumnKey][0] === jtem);
-        if (rowIndex !== -1) {
-          newSqlRows[rowIndex][sqlSummaryColumnKey] = newSqlRows[rowIndex][sqlSummaryColumnKey] + 1;
-        } else {
-          newSqlRows.push({
-            [sqlGroupbyColumnKey]: [jtem],
-            [sqlSummaryColumnKey]: 1
-          });
+  const newSqlRows = JSON.parse(JSON.stringify(sqlRows));
+  if (config.summary_type === CHART_SUMMARY_TYPE.COUNT) {
+    sqlRows.forEach((item, index) => {
+      const collaborators = item[sqlGroupbyColumnKey];
+      // Multiple collaborators
+      if (collaborators.length > 1) {
+        newSqlRows.splice(index, 1);
+        collaborators.forEach(jtem => {
+          const rowIndex = newSqlRows.findIndex(rows => rows[sqlGroupbyColumnKey][0] === jtem);
+          if (rowIndex !== -1) {
+            if (newSqlRows[rowIndex][sqlSummaryColumnKey]) {
+              newSqlRows[rowIndex][sqlSummaryColumnKey] = newSqlRows[rowIndex][sqlSummaryColumnKey] + 1;
+            }
+          } else {
+            const obj = {};
+            if (sqlGroupbyColumnKey) {
+              obj[sqlGroupbyColumnKey] = [jtem];
+            }
+            if (sqlSummaryColumnKey) {
+              obj[sqlSummaryColumnKey] = 1;
+            }
+            newSqlRows.push({
+              ...item,
+              ...obj
+            });
+          }
+        });
+      }
+    });
+  }
+  if (config.summary_type === CHART_SUMMARY_TYPE.ADVANCED) {
+    const summarySQLColumnName2ColumnKeys = Object.keys(summarySQLColumnName2ColumnKey);
+    sqlRows.forEach((item, index) => {
+      const collaborators = item[sqlGroupbyColumnKey];
+      // Multiple collaborators
+      if (collaborators.length > 1) {
+        newSqlRows.splice(index, 1);
+        collaborators.forEach(collaborator => {
+          const rowIndex = newSqlRows.findIndex(rows => rows[sqlGroupbyColumnKey][0] === collaborator);
+          if (rowIndex !== -1) {
+            summarySQLColumnName2ColumnKeys.forEach(key => {
+              let newKey = key;
+              // The avg is calculated by sum column
+              if (key.startsWith('AVG')) {
+                newKey = 'SUM' + key.slice(3);
+              }
+              // Update sum and count
+              if (newKey.startsWith('SUM') && newSqlRows[rowIndex][newKey]) {
+                newSqlRows[rowIndex][newKey] = newSqlRows[rowIndex][newKey] + item[newKey];
+              }
+              if (newSqlRows[rowIndex]['COUNT(*)']) {
+                newSqlRows[rowIndex]['COUNT(*)'] = newSqlRows[rowIndex]['COUNT(*)'] + 1;
+              }
+            });
+          } else {
+            const obj = {};
+            if (sqlGroupbyColumnKey) {
+              obj[sqlGroupbyColumnKey] = [collaborator];
+            }
+            summarySQLColumnName2ColumnKeys.forEach(key => {
+              let newKey = key;
+              // The avg is calculated by sum column
+              if (key.startsWith('AVG')) {
+                newKey = 'SUM' + key.slice(3);
+              }
+              // Update sum and count
+              if (newKey.startsWith('SUM')) {
+                obj[newKey] = item[newKey];
+              }
+              obj['COUNT(*)'] = 1;
+            });
+            newSqlRows.push({
+              ...item,
+              ...obj
+            });
+          }
+        });
+      }
+    });
+    newSqlRows.forEach(item => {
+      summarySQLColumnName2ColumnKeys.forEach(key => {
+        // Update avg
+        if (key.startsWith('AVG')) {
+          const newKey = 'SUM' + key.slice(3);
+          item[key] = item[newKey] / item['COUNT(*)'];
         }
       });
-    }
-  });
+    });
+  }
   return newSqlRows;
 };
 SQLStatisticsUtils.oneDimensionTableSQLResult2JavaScript = (chart, sqlRows, chartSQLMap, columnMap, tables) => {
@@ -122,7 +197,10 @@ SQLStatisticsUtils.oneDimensionTableSQLResult2JavaScript = (chart, sqlRows, char
   let pivot_columns = [];
   let pivot_rows = [];
   const isCount = summary_type === CHART_SUMMARY_TYPE.COUNT;
-  const newSqlRows = _class.formatedTableSqlRows(chart, sqlRows, chartSQLMap, columnMap, tables);
+  let newSqlRows = sqlRows;
+  if (groupbyColumn.type === CellType.COLLABORATOR) {
+    newSqlRows = _class.formatedTableSqlRows(chart, sqlRows, chartSQLMap, columnMap, tables);
+  }
   if (isCount) {
     let allTotal = 0;
     newSqlRows.forEach(row => {
@@ -342,7 +420,6 @@ SQLStatisticsUtils.getAndUpdateTwoDimensionTotal = (pivot_columns_total, pivot_c
   return pivot_table_total;
 };
 SQLStatisticsUtils.twoDimensionTableSQLResult2JavaScript = (chart, sqlRows, chartSQLMap, columnMap, tables) => {
-  const newSqlRows = _class.formatedTableSqlRows(chart, sqlRows, chartSQLMap, columnMap, tables);
   const {
     groupbyColumn,
     columnGroupbyColumn,
@@ -359,6 +436,10 @@ SQLStatisticsUtils.twoDimensionTableSQLResult2JavaScript = (chart, sqlRows, char
   } = chartSQLMap;
   if (!sqlColumnGroupbyColumnKey) return _class.oneDimensionTableSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables);
   const summaryMethod = (summary_method || 'sum').toUpperCase();
+  let newSqlRows = sqlRows;
+  if (groupbyColumn.type === CellType.COLLABORATOR) {
+    newSqlRows = _class.formatedTableSqlRows(chart, sqlRows, chartSQLMap, columnMap, tables);
+  }
   let pivot_columns = [];
   let pivot_rows = [];
   let pivot_columns_total = {};

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

@@ -457,6 +457,16 @@ class ChartDataSQL {
             summary_column_names.push(column_name);
           }
         });
+
+        // groupby_column is COLLABORATOR , replace AVG with SUM, and add 'COUNT(*)'
+        if (groupby_column.type === CellType.COLLABORATOR) {
+          summary_column_names.forEach((item, index) => {
+            if (item.startsWith('AVG')) {
+              summary_column_names[index] = 'SUM' + item.slice(3);
+            }
+          });
+          summary_column_names.push('COUNT(*)');
+        }
         let summary_column_names_str = summary_column_names.join(', ');
         if (summary_column_names_str) {
           summary_column_names_str = ", ".concat(summary_column_names_str);

package/package.json

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