sea-chart 1.1.65 → 1.1.67

package/dist/settings/advance-bar-settings/style-settings.js

@@ -3,7 +3,7 @@ import _DTableRadioGroup from "dtable-ui-component/lib/DTableRadioGroup";
 import _DTableSwitch from "dtable-ui-component/lib/DTableSwitch";
 import React, { useCallback, useMemo, useState } from 'react';
 import { Label, Input, Row } from 'reactstrap';
-import { CellType } from 'dtable-ui-component/lib/constants';
+import { CellType } from 'dtable-utils';
 import Divider from '../widgets/divider';
 import MinMaxSetting from '../widgets/min-max-setting';
 import DisplayValuesSettings from '../widgets/display-values-settings';

package/dist/settings/pie-settings/style-settings.js

@@ -3,7 +3,7 @@ import _DTableSelect from "dtable-ui-component/lib/DTableSelect";
 import _DTableSwitch from "dtable-ui-component/lib/DTableSwitch";
 import React, { useCallback, useMemo } from 'react';
 import { Label, FormGroup } from 'reactstrap';
-import { CellType } from 'dtable-ui-component/lib/constants';
+import { CellType } from 'dtable-utils';
 import Divider from '../widgets/divider';
 import MiniNumSlicePercent from '../widgets/mininum-slice-percent';
 import { FontSizeSettings } from '../widgets/font-settings';

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

@@ -667,91 +667,114 @@ BaseUtils.formatPieChartData = (data, chart, tables, currentTheme, useColumnColo
 };
 // table
 // format SINGLE_SELECT, LAST_MODIFIER, CREATOR, COLLABORATOR, DATE, NUMBER
-BaseUtils.updateTableViewListItemNameAndColor = (result, column, nameKey, colorKey, isScatterChart, isNameField) => {
-  let {
-    type: columnType,
-    data: columnData
-  } = column;
-  let name = result[nameKey];
-  if (columnType === CellType.SINGLE_SELECT || columnType === CellType.MULTIPLE_SELECT) {
-    const options = getColumnOptions(column);
-    let selectedOption = getOption(options, name);
+BaseUtils.updateTableViewListItemNameAndColor = async (result, column, nameKey, colorKey, isScatterChart, isNameField) => {
+  return new Promise((resolve, reject) => {
     let {
-      name: optionName,
-      color: optionColor,
-      id
-    } = selectedOption || {};
-    if (selectedOption) {
-      result[nameKey] = optionName;
-      result[colorKey] = optionColor;
-      isNameField && (result.original_name = id);
-    } else {
-      result[colorKey] = '#dbdbdb';
-    }
-  } else if (columnType === CellType.COLLABORATOR) {
-    getUsers(name, users => {
-      // if users not found , use name instead
-      if (!users.length) {
-        if (!Array.isArray(name)) {
-          name = [name];
-        }
-        result[nameKey] = name.join(', ');
-        return;
+      type: columnType,
+      data: columnData
+    } = column;
+    let name = result[nameKey];
+    if (columnType === CellType.SINGLE_SELECT || columnType === CellType.MULTIPLE_SELECT) {
+      const options = getColumnOptions(column);
+      let selectedOption = getOption(options, name);
+      let {
+        name: optionName,
+        color: optionColor,
+        id
+      } = selectedOption || {};
+      if (selectedOption) {
+        result[nameKey] = optionName;
+        result[colorKey] = optionColor;
+        isNameField && (result.original_name = id);
+      } else {
+        result[colorKey] = '#dbdbdb';
       }
-      result[nameKey] = users.map(user => user.name).join(', ');
-      isNameField && (result.original_name = users.map(user => user.email).join(', '));
-    });
-  } else if (columnType === CellType.CREATOR || columnType === CellType.LAST_MODIFIER) {
-    // move collaborators logic to collaborator-utils.js
-    getUsers(name, users => {
-      // if users not found , use name instead
-      if (!users.length) {
-        if (!Array.isArray(name)) {
-          name = [name];
-        }
-        result[nameKey] = name.join(', ');
-        return;
+    } else if (columnType === CellType.COLLABORATOR) {
+      const users = context.getCollaboratorsFromCache();
+      const user = users.find(user => user.email === name);
+      if (user) {
+        result[nameKey] = (user === null || user === void 0 ? void 0 : user.name) || name;
+        isNameField && (result.original_name = name);
+        resolve();
+      } else {
+        context.queryUsers([name], users => {
+          const userEmail = name;
+          const user = users[userEmail] || generateDefaultUser(userEmail);
+          const userName = user.name || userEmail;
+          result[nameKey] = userName;
+          isNameField && (result.original_name = userEmail);
+          user.loaded = true;
+          context.updateCollaboratorsCache(userEmail, user);
+          resolve();
+        });
       }
-      result[nameKey] = users.map(user => user.name).join(', ');
-      isNameField && (result.original_name = users.map(user => user.email).join(', '));
-    });
-  } else if (columnType === CellType.NUMBER) {
-    let valueNumber = parseFloat(name);
-    result[nameKey] = isNumber(valueNumber) ? getNumberDisplayString(valueNumber, columnData) : name;
-    isNameField && (result.original_name = name);
-  } else if (columnType === CellType.DATE) {
-    name = name + '';
-    if (name && name.split('-').length === 3) {
-      let format = getDateColumnFormat(column);
-      let spaceIndex = format.indexOf(' ');
-      if (spaceIndex > -1) {
-        format = format.slice(0, spaceIndex);
+      return;
+    } else if (columnType === CellType.CREATOR || columnType === CellType.LAST_MODIFIER) {
+      const users = context.getCollaboratorsFromCache();
+      const user = users.find(user => user.email === name);
+      if (user) {
+        result[nameKey] = (user === null || user === void 0 ? void 0 : user.name) || name;
+        isNameField && (result.original_name = name);
+        resolve();
+      } else {
+        context.queryUsers([name], users => {
+          const userEmail = name;
+          const user = users[userEmail] || generateDefaultUser(userEmail);
+          const userName = user.name || userEmail;
+          result[nameKey] = userName;
+          isNameField && (result.original_name = userEmail);
+          user.loaded = true;
+          context.updateCollaboratorsCache(userEmail, user);
+          resolve();
+        });
       }
-      result[nameKey] = dayjs(name).format(format);
-    }
-  } else if (columnType === CellType.LINK_FORMULA) {
-    // scatter only use number
-    if (isScatterChart) {
-      name.length && (name = name[0]);
+      return;
+    } else if (columnType === CellType.NUMBER) {
       let valueNumber = parseFloat(name);
       result[nameKey] = isNumber(valueNumber) ? getNumberDisplayString(valueNumber, columnData) : name;
+      isNameField && (result.original_name = name);
+    } else if (columnType === CellType.DATE) {
+      name = name + '';
+      if (name && name.split('-').length === 3) {
+        let format = getDateColumnFormat(column);
+        let spaceIndex = format.indexOf(' ');
+        if (spaceIndex > -1) {
+          format = format.slice(0, spaceIndex);
+        }
+        result[nameKey] = dayjs(name).format(format);
+      }
+    } else if (columnType === CellType.LINK_FORMULA) {
+      // scatter only use number
+      if (isScatterChart) {
+        name.length && (name = name[0]);
+        let valueNumber = parseFloat(name);
+        result[nameKey] = isNumber(valueNumber) ? getNumberDisplayString(valueNumber, columnData) : name;
+      }
+      const {
+        array_data,
+        array_type
+      } = columnData;
+      const linkedColumn = {
+        ...column,
+        type: array_type,
+        data: array_data
+      };
+      return _BaseUtils.updateTableViewListItemNameAndColor(result, linkedColumn, nameKey, colorKey, isScatterChart);
     }
-    const {
-      array_data,
-      array_type
-    } = columnData;
-    const linkedColumn = {
-      ...column,
-      type: array_type,
-      data: array_data
-    };
-    return _BaseUtils.updateTableViewListItemNameAndColor(result, linkedColumn, nameKey, colorKey, isScatterChart);
-  }
+    resolve();
+  });
 };
-BaseUtils.updateTableViewList = (result, column, nameKey, colorKey, isScatterChart, isNameField) => {
+BaseUtils.updateTableViewList = async (result, column, nameKey, colorKey, isScatterChart, isNameField) => {
+  const promises = [];
   result.forEach(result => {
-    _BaseUtils.updateTableViewListItemNameAndColor(result, column, nameKey, colorKey, isScatterChart, isNameField);
+    const promise = _BaseUtils.updateTableViewListItemNameAndColor(result, column, nameKey, colorKey, isScatterChart, isNameField);
+    promises.push(promise);
   });
+  try {
+    await Promise.all(promises);
+  } catch (e) {
+    console.error(e);
+  }
 };
 // sort chart
 BaseUtils.sortCharts = (charts, column, sortKey, isPivot) => {

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

@@ -724,7 +724,7 @@ SQLStatisticsUtils.basicChartSQLResult2JavaScript = async (chart, sqlRows, chart
     }
   }
   BaseUtils.sortCharts(result, groupbyColumn, 'name');
-  BaseUtils.updateTableViewList(result, groupbyColumn, 'name', 'color', false, true);
+  await BaseUtils.updateTableViewList(result, groupbyColumn, 'name', 'color', false, true);
   BaseUtils.updateSummaryValuePrecision(result, summaryColumn, 'value');
   if (SUPPORT_DATA_SORT_CHART_TYPES.includes(type) && sort_type) {
     BaseUtils.sortChartData(result, sort_type);
@@ -846,7 +846,7 @@ SQLStatisticsUtils.customChartSQLResult2JavaScript = async (chart, sqlRows, char
     result = assembled;
   }
   BaseUtils.sortCharts(result, groupbyColumn, 'name');
-  BaseUtils.updateTableViewList(result, groupbyColumn, 'name', '', false, true);
+  await BaseUtils.updateTableViewList(result, groupbyColumn, 'name', '', false, true);
   BaseUtils.updateSummaryValuePrecision(result, summaryColumn, 'value');
   return result;
 };
@@ -1182,7 +1182,7 @@ SQLStatisticsUtils.combinationSQLResult2Javascript = async (chart, sqlRows, char
       }
     }
   }
-  BaseUtils.updateTableViewList(result, groupbyColumn, 'name', '', false, true);
+  await BaseUtils.updateTableViewList(result, groupbyColumn, 'name', '', false, true);
   BaseUtils.sortCharts(result, groupbyColumn, 'name');
   BaseUtils.updateSummaryValuePrecision(result, summaryColumnLeft, 'value_left');
   BaseUtils.updateSummaryValuePrecision(result, summaryColumnRight, 'value_right');
@@ -1289,8 +1289,8 @@ SQLStatisticsUtils.groupingTwoDimensionChartSQLResult2JavaScript = async (chart,
     }
   }
   BaseUtils.sortCharts(result, groupbyColumn, 'name');
-  BaseUtils.updateTableViewList(result, groupbyColumn, 'name', 'color', false, true);
-  BaseUtils.updateTableViewList(result, columnGroupbyColumn, 'group_name', 'group_color', false, false);
+  await BaseUtils.updateTableViewList(result, groupbyColumn, 'name', 'color', false, true);
+  await BaseUtils.updateTableViewList(result, columnGroupbyColumn, 'group_name', 'group_color', false, false);
   BaseUtils.updateSummaryValuePrecision(result, summaryColumn, 'value');
   return result;
 };
@@ -1348,7 +1348,7 @@ SQLStatisticsUtils.groupingChartSQLResult2JavaScript = async (chart, sqlRows, ch
       }
     }
     BaseUtils.sortCharts(result, groupbyColumn, 'name');
-    BaseUtils.updateTableViewList(result, groupbyColumn, 'name', 'color', false, true);
+    await BaseUtils.updateTableViewList(result, groupbyColumn, 'name', 'color', false, true);
     const allSummaryColumns = [summaryColumn].concat(summaryColumnsWithMethod.map(item => item.column));
 
     // format precision of enabled precision columns
@@ -1618,7 +1618,7 @@ SQLStatisticsUtils.sqlResult2JavaScript = async (chart, sqlRows, chartSQLMap, co
     case CHART_TYPE.COMPLETENESS:
     case CHART_TYPE.COMPLETENESS_GROUP:
       {
-        const result = _SQLStatisticsUtils.completenessSQlResult(chart, sqlRows, chartSQLMap, tables);
+        const result = await _SQLStatisticsUtils.completenessSQlResult(chart, sqlRows, chartSQLMap, tables);
         return {
           result
         };
@@ -1649,7 +1649,7 @@ SQLStatisticsUtils.sqlResult2JavaScript = async (chart, sqlRows, chartSQLMap, co
     case CHART_TYPE.SCATTER:
       {
         return {
-          result: _SQLStatisticsUtils.scatterSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)
+          result: await _SQLStatisticsUtils.scatterSQLResult2JavaScript(chart, sqlRows, chartSQLMap, columnMap, tables)
         };
       }
     case CHART_TYPE.BAR_CUSTOM:
@@ -1703,7 +1703,7 @@ SQLStatisticsUtils._get_completeness_name = (row, column) => {
   }
   return value;
 };
-SQLStatisticsUtils.completenessSQlResult = (chart, sqlRows, chartSQLMap, tables) => {
+SQLStatisticsUtils.completenessSQlResult = async (chart, sqlRows, chartSQLMap, tables) => {
   const {
     config: {
       type
@@ -1833,8 +1833,8 @@ SQLStatisticsUtils.completenessSQlResult = (chart, sqlRows, chartSQLMap, tables)
   }
 
   // format the fetched value
-  BaseUtils.updateTableViewList(sqlRows, name_column, name_column.key, 'color', false, true);
-  if (sqlColumnGroupByColumnKey) BaseUtils.updateTableViewList(sqlRows, column_groupby_column, sqlColumnGroupByColumnKey, 'color', false, false);
+  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 => {
     const nameValue = row[name_column.key];
     let targetValue;
@@ -1888,7 +1888,7 @@ SQLStatisticsUtils.completenessSQlResult = (chart, sqlRows, chartSQLMap, tables)
   });
   return res;
 };
-SQLStatisticsUtils.scatterSQLResult2JavaScript = (chart, sqlRows, chartSQLMap, columnMap, tables) => {
+SQLStatisticsUtils.scatterSQLResult2JavaScript = async (chart, sqlRows, chartSQLMap, columnMap, tables) => {
   const {
     sqlXColumnKey,
     sqlYColumnKey,
@@ -1902,9 +1902,9 @@ SQLStatisticsUtils.scatterSQLResult2JavaScript = (chart, sqlRows, chartSQLMap, c
   // format sql rows
   const originalSqlRows = cloneDeep(sqlRows);
   const isScatter = true;
-  BaseUtils.updateTableViewList(sqlRows, groupbyColumn, groupbyColumn.key, 'color', isScatter, true);
-  BaseUtils.updateTableViewList(sqlRows, summaryColumn, summaryColumn.key, 'color', isScatter, true);
-  if (sqlColumnGroupbyColumnKey) BaseUtils.updateTableViewList(sqlRows, columnGroupbyColumn, sqlColumnGroupbyColumnKey, 'color', isScatter, false);
+  await BaseUtils.updateTableViewList(sqlRows, groupbyColumn, groupbyColumn.key, 'color', isScatter, true);
+  await BaseUtils.updateTableViewList(sqlRows, summaryColumn, summaryColumn.key, 'color', isScatter, true);
+  if (sqlColumnGroupbyColumnKey) await BaseUtils.updateTableViewList(sqlRows, columnGroupbyColumn, sqlColumnGroupbyColumnKey, 'color', isScatter, false);
   const res = [];
   sqlRows.forEach((row, index) => {
     const xValue = row[sqlXColumnKey] ? '' + row[sqlXColumnKey] : intl.get('Empty');

package/dist/view/wrapper/area.js

@@ -1,7 +1,7 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import classNames from 'classnames';
-import { CellType } from 'dtable-ui-component/lib/constants';
+import { CellType } from 'dtable-utils';
 import { CHART_LINE_TYPES, CHART_STYLE_COLORS, CHART_THEME_COLOR, CHART_TYPE, EMPTY_NAME, TYPE_COLOR_USING } from '../../constants';
 import intl from '../../intl';
 import { BaseUtils, isFunction } from '../../utils';

package/dist/view/wrapper/bar-group.js

@@ -4,7 +4,7 @@ import DataSet from '@antv/data-set';
 import { getNumberDisplayString } from 'dtable-utils';
 import { debounce, maxBy } from 'lodash-es';
 import classNames from 'classnames';
-import { CellType } from 'dtable-ui-component/lib/constants';
+import { CellType } from 'dtable-utils';
 import intl from '../../intl';
 import { sortDataByGroupSum } from '../../utils/column-utils';
 import { EMPTY_NAME, CHART_TYPE, CHART_SUMMARY_TYPE, DEFAULT_NUMBER_FORMAT_OBJECT, CHART_THEME_COLOR, CHART_STYLE_COLORS } from '../../constants';
@@ -96,7 +96,7 @@ class BarGroup extends ChartComponent {
       const useSingleSelectColumnColor = (column_groupby_column === null || column_groupby_column === void 0 ? void 0 : column_groupby_column.type) === CellType.SINGLE_SELECT && color_theme === SUPPORT_SINGLE_SELECT_THEMES_OPTIONS.SINGLE_SELECT_COLUMN_COLORS;
       let singleBarWidth, singleBarRadius;
       // y-axis label width：6 + 10
-      const chartWidth = this.chart.width - 6 - 10; // 10 is y-axis number width and 6 is gap between number and y axis line 
+      const chartWidth = this.chart.width - 6 - 10; // 10 is y-axis number width and 6 is gap between number and y axis line
       if (!isGroup) {
         singleBarWidth = Math.round(chartWidth / (2 * newData.length));
         this.markFirstOrLast(data, 'first');

package/dist/view/wrapper/horizontal-bar-group.js

@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { debounce, maxBy } from 'lodash-es';
 import classNames from 'classnames';
-import { CellType } from 'dtable-ui-component/lib/constants';
+import { CellType } from 'dtable-utils';
 import { CHART_TYPE, EMPTY_NAME, CHART_THEME_COLOR, CHART_STYLE_COLORS } from '../../constants';
 import { BaseUtils, isFunction } from '../../utils';
 import intl from '../../intl';

package/dist/view/wrapper/line-group.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
-import { CellType } from 'dtable-ui-component/lib/constants';
+import { CellType } from 'dtable-utils';
 import { BaseUtils, isFunction } from '../../utils';
 import intl from '../../intl';
 import { CHART_LINE_TYPES, CHART_THEME_COLOR, EMPTY_NAME } from '../../constants';

package/dist/view/wrapper/pie.js

@@ -1,6 +1,5 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { CellType } from 'dtable-ui-component/lib/constants';
 import { CHART_LABEL_POSITIONS, CHART_LABEL_FORMATS, CHART_THEME_COLOR } from '../../constants';
 import { BaseUtils, isFunction } from '../../utils';
 import intl from '../../intl';

package/dist/view/wrapper/table-element/index.js

@@ -22,8 +22,9 @@ export default class TableElement extends React.Component {
       };
     };
     this.queryUsers = emails => {
+      const currentEmails = context.getCollaboratorsFromCache().map(user => user.email);
       let queryEmails = emails.filter(email => {
-        return !this.relatedUserEmailMap[email];
+        return !currentEmails.includes(email);
       });
       if (queryEmails.length === 0) return;
       if (this.isQuerying) {
@@ -31,32 +32,26 @@ export default class TableElement extends React.Component {
         return;
       }
       this.isQuerying = true;
-      context.queryUsers(queryEmails, this.updateRelatedUser);
-    };
-    this.queryPendingUsers = () => {
-      if (this.pendingUserList.length === 0) {
-        this.isQuerying = false;
-        return;
-      }
-      let queryEmails = [...new Set(this.pendingUserList)];
-      this.pendingUserList = [];
-      context.queryUsers(queryEmails, this.updateRelatedUser);
+      setTimeout(() => {
+        context.queryUsers(queryEmails, this.updateRelatedUser);
+      }, 500);
     };
     this.updateRelatedUser = emailUserMap => {
-      let newUsers = [...this.state.relatedUserList];
+      this.isQuerying = false;
+      const currentEmails = context.getCollaboratorsFromCache().map(user => user.email);
       for (let email in emailUserMap) {
-        if (!this.relatedUserEmailMap[email]) {
-          this.relatedUserEmailMap[email] = true;
+        if (!currentEmails.includes(email)) {
           context.updateCollaboratorsCache(email, emailUserMap[email]);
-          newUsers.push(emailUserMap[email]);
         }
       }
-      if (this.state.relatedUserList.length !== newUsers.length) {
-        this.setState({
-          relatedUserList: newUsers
-        });
-      }
-      this.queryPendingUsers();
+      const newUsers = context.getCollaboratorsFromCache();
+      this.relatedUserEmailMap = {};
+      newUsers.forEach(u => {
+        this.relatedUserEmailMap[u.email] = true;
+      });
+      this.setState({
+        relatedUserList: newUsers
+      });
     };
     const {
       chart,

package/package.json

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