sea-chart 1.1.89 → 1.1.91

package/dist/api/index.js

@@ -17,42 +17,16 @@ class SeaChartAPI {
       });
     };
     this.getBaseData = () => {
-      const {
-        dtableServer,
-        dtableUuid,
-        accessToken
-      } = this;
-      const url = dtableServer + 'dtables/' + dtableUuid;
-      const headers = {
-        'Authorization': 'Token ' + accessToken
-      };
-      return axios.get(url, {
-        headers
-      });
+      const url = `/api/v2/dtables/${this.dtableUuid}/`;
+      return this.req.get(url);
     };
     this.getBaseMetaData = () => {
-      const {
-        dtableServer,
-        dtableUuid,
-        accessToken
-      } = this;
-      const url = dtableServer + 'api/v1/dtables/' + dtableUuid + '/metadata';
-      const headers = {
-        'Authorization': 'Token ' + accessToken
-      };
-      return axios.get(url, {
-        headers
-      });
+      const url = `/api/v2/dtables/${this.dtableUuid}/metadata/`;
+      return this.req.get(url);
     };
     this.sqlQuery = function (sql, parameters) {
       let convert_keys = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-      const {
-        dtableServer,
-        dtableUuid,
-        accessToken
-      } = _this;
-      const apiGatewayUrl = (dtableServer || '').replace(/\/*$/, '') + '/api-gateway/';
-      const url = `${apiGatewayUrl}api/v2/dtables/${dtableUuid}/sql/`;
+      const url = `/api/v2/dtables/${_this.dtableUuid}/sql/`;
       const data = {
         sql,
         convert_keys,
@@ -60,20 +34,16 @@ class SeaChartAPI {
           parameters: parameters
         })
       };
-      const headers = {
-        'Authorization': 'Token ' + accessToken
-      };
-      return axios.post(url, data, {
-        headers
-      });
+      return _this.req.post(url, data);
     };
     this.config = config;
+    const {
+      server: _server
+    } = config;
     this.instance = null;
     this.appName = '';
-    this.accessToken = '';
     this.dtableUuid = '';
-    this.dtableServer = '';
-    this.dtableSocket = '';
+    this.baseURL = _server[_server.length - 1] === '/' ? `${_server}api-gateway` : `${_server}/api-gateway`;
   }
   static getInstance(config) {
     if (this.instance) return this.instance;
@@ -85,27 +55,16 @@ class SeaChartAPI {
     const {
       app_name,
       access_token,
-      dtable_uuid,
-      dtable_server,
-      dtable_socket,
-      dtable_db
+      dtable_uuid
     } = accessTokenRes.data;
     this.appName = app_name;
-    this.accessToken = access_token;
     this.dtableUuid = dtable_uuid;
-    this.dtableServer = dtable_server.replace(/\/+$/, '') + '/';
-    this.dtableSocket = dtable_socket.replace(/\/+$/, '') + '/';
+    this.req = axios.create({
+      baseURL: this.baseURL,
+      headers: {
+        'Authorization': 'Token ' + access_token
+      }
+    });
   }
-
-  // queryUsers(userIdList) {
-  //   const { dtableServer, accessToken } = this;
-  //   const url =  dtableServer + 'api/v2.1/user-list';
-  //   let operation = { user_id_list: userIdList };
-  //   const headers = {
-  //     'Content-type': 'application/json',
-  //     'Authorization': 'Token ' +  accessToken
-  //   };
-  //   return axios.post(url, operation, { headers });
-  // }
 }
 export default SeaChartAPI;

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

@@ -1,7 +1,8 @@
 var _SQLStatisticsUtils;
 import dayjs from 'dayjs';
 import { CellType, MULTIPLE_CELL_VALUE_COLUMN_TYPE_MAP, getFormulaDisplayString, getPrecisionNumber, getTableById, getTableColumnByKey, isNumber, DateUtils } from 'dtable-utils';
-import { isObject, cloneDeep } from 'lodash';
+import { isObject } from 'lodash';
+import deepCopy from 'deep-copy';
 import { CHART_SUMMARY_TYPE, CHART_TYPE, SUPPORT_DATA_SORT_CHART_TYPES, TABLE_DIMENSIONS, Y_AXIS_TYPE_PREFIX, STYLE_COLORS, TREND_TYPES, CHART_STYLE_COLORS, MAP_CHART_TYPES } from '../../constants';
 import { chartColumn2SqlColumn, summaryMethodColumn2SqlColumn } from '../sql';
 import { getClientLinkDisplayString } from '../cell-format-utils';
@@ -1724,23 +1725,10 @@ SQLStatisticsUtils.sqlResult2JavaScript = async (chart, sqlRows, chartSQLMap, co
       }
   }
 };
-SQLStatisticsUtils._get_completeness_name = (row, column) => {
-  let value = row[column.key];
-  if (Array.isArray(value)) {
-    value = value.join('、');
-  }
-  return value;
-};
 SQLStatisticsUtils.completenessSQlResult = async (chart, sqlRows, chartSQLMap, tables) => {
-  const {
-    config: {
-      type
-    }
-  } = chart;
-  const isGroup = type === CHART_TYPE.COMPLETENESS_GROUP;
   const {
     sqlColumns,
-    sqlColumnGroupByColumnKey
+    sqlColumnGroupbyColumnKey
   } = chartSQLMap;
   const {
     name_column,
@@ -1748,134 +1736,23 @@ SQLStatisticsUtils.completenessSQlResult = async (chart, sqlRows, chartSQLMap, t
     target_column,
     column_groupby_column
   } = sqlColumns;
-  const res = [];
-  let summedSqlRows;
   const nameColumnDataAsAnArray = findIfColumnDataIsArray(name_column);
-  if (!isGroup) {
-    if (nameColumnDataAsAnArray) {
-      const sumSqlRows = sqlRows.reduce((acc, row) => {
-        const names = row[name_column.key];
-        if (!names) {
-          row[name_column.key] = intl.get('Empty');
-          acc[intl.get('Empty')] = row;
-          return acc;
-        }
-        names.forEach(name => {
-          if (!acc[name]) {
-            row[name_column.key] = name;
-            acc[name] = row;
-          } else {
-            const accRow = acc[name];
-            Object.keys(row).forEach(key => {
-              if (key === completed_column.key || key === target_column.key) {
-                // in case of null
-                if (!row[key]) {
-                  row[key] = 0;
-                }
-                if (!accRow[key]) {
-                  accRow[key] = 0;
-                }
-                accRow[key] = accRow[key] + row[key];
-              }
-            });
-          }
-        });
-        return acc;
-      }, {});
-      summedSqlRows = Object.values(sumSqlRows);
-    } else {
-      const sumSqlRows = sqlRows.reduce((acc, row) => {
-        const nameValue = row[name_column.key];
-        if (!nameValue) {
-          row[name_column.key] = intl.get('Empty');
-          acc[intl.get('Empty')] = row;
-          return acc;
-        }
-        if (!acc[nameValue]) {
-          acc[nameValue] = row;
-        } else {
-          const accRow = acc[nameValue];
-          Object.keys(row).forEach(key => {
-            if (key === completed_column.key || key === target_column.key) {
-              accRow[key] = accRow[key] + row[key];
-            }
-          });
-        }
-        return acc;
-      }, {});
-      summedSqlRows = Object.values(sumSqlRows);
-    }
-  } else {
-    if (nameColumnDataAsAnArray) {
-      const sumSqlRows = sqlRows.reduce((acc, row) => {
-        const groupby = row[sqlColumnGroupByColumnKey];
-        const names = row[name_column.key];
-        if (!names) {
-          const key = `empty_${groupby}`;
-          row[name_column.key] = intl.get('Empty');
-          acc[key] = row;
-          return acc;
-        }
-        names.forEach(name => {
-          const key = `${name}_${groupby}`;
-          if (!acc[key]) {
-            row[name_column.key] = name;
-            acc[key] = row;
-          } else {
-            const accRow = acc[key];
-            Object.keys(row).forEach(k => {
-              if (key === completed_column.key || key === target_column.key) {
-                accRow[key] = accRow[key] + row[key];
-              }
-            });
-          }
-        });
-        return acc;
-      }, {});
-      summedSqlRows = Object.values(sumSqlRows);
-    } else {
-      const sumSqlRows = sqlRows.reduce((acc, row) => {
-        const nameValue = row[name_column.key];
-        const groupby = row[sqlColumnGroupByColumnKey];
-        if (!nameValue) {
-          const key = `empty_${groupby}`;
-          row[name_column.key] = intl.get('Empty');
-          acc[key] = row;
-          return acc;
-        }
-        const key = `${nameValue}_${groupby}`;
-        if (!acc[key]) {
-          acc[key] = row;
-        } else {
-          const accRow = acc[key];
-          Object.keys(row).forEach(key => {
-            if (key === completed_column.key || key === target_column.key) {
-              accRow[key] = accRow[key] + row[key];
-            }
-          });
-        }
-        return acc;
-      }, {});
-      summedSqlRows = Object.values(sumSqlRows);
-    }
+  // group by name_column, so it can only have one value
+  let originalSqlRows = deepCopy(sqlRows);
+  if (nameColumnDataAsAnArray) {
+    sqlRows.forEach(row => {
+      var _row$name_column$key;
+      row[name_column.key] = (_row$name_column$key = row[name_column.key]) === null || _row$name_column$key === void 0 ? void 0 : _row$name_column$key[0];
+    });
   }
-
-  // format the fetched value
   await BaseUtils.updateTableViewList(sqlRows, name_column, name_column.key, 'color', false, true);
-  if (sqlColumnGroupByColumnKey) await BaseUtils.updateTableViewList(sqlRows, column_groupby_column, sqlColumnGroupByColumnKey, 'color', false, false);
-  summedSqlRows.forEach(row => {
+  if (sqlColumnGroupbyColumnKey) await BaseUtils.updateTableViewList(sqlRows, column_groupby_column, sqlColumnGroupbyColumnKey, 'color', false, false);
+  const res = [];
+  sqlRows.forEach((row, index) => {
     const nameValue = row[name_column.key];
-    let targetValue;
-    let completedValue;
-    let groupby;
-    if (sqlColumnGroupByColumnKey) {
-      targetValue = row[`SUM(${target_column.name})`];
-      completedValue = row[`SUM(${completed_column.name})`];
-      groupby = row[sqlColumnGroupByColumnKey] || intl.get('Empty');
-    } else {
-      completedValue = _SQLStatisticsUtils._get_completeness_name(row, completed_column);
-      targetValue = _SQLStatisticsUtils._get_completeness_name(row, target_column);
-    }
+    const targetValue = row[`SUM(${target_column.name})`];
+    const completedValue = row[`SUM(${completed_column.name})`];
+    const groupby = row[sqlColumnGroupbyColumnKey] || intl.get('Empty');
     let completedRate;
     if (!targetValue && completedValue) {
       completedRate = 100;
@@ -1893,7 +1770,8 @@ SQLStatisticsUtils.completenessSQlResult = async (chart, sqlRows, chartSQLMap, t
       group_name: 'completed',
       groupby,
       color: row.color || CHART_STYLE_COLORS[0],
-      value: completedValue
+      value: completedValue,
+      rows: [originalSqlRows[index]]
     });
     res.push({
       name: nameValue,
@@ -1902,7 +1780,8 @@ SQLStatisticsUtils.completenessSQlResult = async (chart, sqlRows, chartSQLMap, t
       value: Math.max(targetValue - completedValue, 0),
       groupby,
       color: '#bdbdbd',
-      completedRate
+      completedRate,
+      rows: [originalSqlRows[index]]
     });
   });
 

package/dist/utils/row-record-utils.js

@@ -611,12 +611,18 @@ export const getFilterConditions = (statisticRecord, chart, table) => {
   const groupColumnKey = groupAxisMap[type];
   chart.config = BaseUtils.convertConfig(config);
   const chartSQLMap = chartColumn2SqlColumn(chart, table);
-  const {
+  let {
     sqlColumnGroupbyColumnKey,
     sqlGroupbyColumnKey,
     sqlXColumnKey,
     sqlYColumnKey
   } = chartSQLMap;
+  if (type === CHART_TYPE.COMPLETENESS_GROUP || type === CHART_TYPE.COMPLETENESS) {
+    const {
+      sqlColumns
+    } = chartSQLMap;
+    sqlGroupbyColumnKey = sqlColumns.name_column.key;
+  }
   if (isPivot && rows.length) {
     const xValueList = [];
     const yValueList = [];

package/dist/utils/sql/column-2-sql-column.js

@@ -796,12 +796,12 @@ const chartColumn2SqlColumn = (chartElement, table) => {
     case CHART_TYPE.COMPLETENESS_GROUP:
       {
         const sqlColumns = getCompletenessSettingColumn(chart, table);
-        const sqlColumnGroupByColumnKey = completenessColumn2SqlColumn(chart, table);
-        // only has columnGroupByColumn key need maped to sql key
+        const sqlColumnGroupbyColumnKey = completenessColumn2SqlColumn(chart, table);
+        // only has columnGroupbyColumn key need maped to sql key
         // for example: 'xxx' => 'ISODATE(xxxx)'
         return {
           sqlColumns,
-          sqlColumnGroupByColumnKey
+          sqlColumnGroupbyColumnKey
         };
       }
     case CHART_TYPE.SCATTER:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sea-chart",
-  "version": "1.1.89",
+  "version": "1.1.91",
   "main": "./dist/index.js",
   "dependencies": {
     "@antv/data-set": "0.11.8",
@@ -23,7 +23,7 @@
   },
   "peerDependencies": {
     "@antv/scale": "0.3.14",
-    "dtable-ui-component": "^6.0.27",
+    "dtable-ui-component": "^6.0.37",
     "dtable-utils": "~5.0.*",
     "prop-types": "15.8.1",
     "react": "^18.3.1",