sea-chart 1.1.112-alpha.2 → 1.1.112-oad2.1

package/dist/services/map-json.js

@@ -32,11 +32,11 @@ function getMapJsonQueryUrl(mapLevel, mapLocation) {
   switch (mapLevel) {
     case MAP_LEVEL.WORLD:
       {
-        return 'world';
+        return 'world-old-version';
       }
     case MAP_LEVEL.COUNTRY:
       {
-        return 'china';
+        return 'china-old-version';
       }
     case MAP_LEVEL.PROVINCE:
       {

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

@@ -9,7 +9,7 @@ import OriginalDataUtils from './original-data-utils';
 class ChartUtils {}
 ChartUtils.calculateChart = async (chart, value, callback) => {
   if (!BaseUtils.isValidExistChart(value.tables, chart)) {
-    const tip_message = 'Please_complete_the_chart_configuration_first';
+    const tip_message = 'Please_complete_the_chart_configuration_first11111';
     return callback && callback('', tip_message, null);
   }
   const id = uniqueId();
@@ -49,7 +49,7 @@ ChartUtils.calculateChart = async (chart, value, callback) => {
 };
 ChartUtils.calculateStaticChart = (chart, value, statisticalResult, callback) => {
   if (!BaseUtils.isValidExistChart(value.tables, chart)) {
-    const tip_message = 'Please_complete_the_chart_configuration_first';
+    const tip_message = 'Please_complete_the_chart_configuration_first22222';
     return callback && callback('', tip_message, null);
   }
   if (!statisticalResult) {

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

@@ -52,7 +52,7 @@ OriginalDataUtils.isValidExistChart = (tables, chart) => {
 };
 OriginalDataUtils.calculateChart = async (chart, value, callback, refreshCache) => {
   if (!_OriginalDataUtils.isValidExistChart((value === null || value === void 0 ? void 0 : value.tables) || [], chart)) {
-    const tip_message = 'Please_complete_the_chart_configuration_first';
+    const tip_message = 'Please_complete_the_chart_configuration_first44444';
     return callback && callback('', tip_message, null);
   }
   try {

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

@@ -1,6 +1,6 @@
 var _SQLStatisticsUtils;
 import dayjs from 'dayjs';
-import { CellType, MULTIPLE_CELL_VALUE_COLUMN_TYPE_MAP, getFormulaDisplayString, getPrecisionNumber, getTableById, getTableColumnByKey, isNumber, DateUtils } from 'dtable-utils';
+import { CellType, MULTIPLE_CELL_VALUE_COLUMN_TYPE_MAP, getFormulaDisplayString, getPrecisionNumber, getTableById, getTableColumnByKey, isNumber } from 'dtable-utils';
 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';
@@ -16,7 +16,6 @@ class SQLStatisticsUtils {}
 _SQLStatisticsUtils = SQLStatisticsUtils;
 SQLStatisticsUtils.DATA_SOURCE = 'sql_statistics';
 SQLStatisticsUtils.getGroupLabelFromDB = async (cellValue, column, chart, isPivot) => {
-  const dateGranularity = BaseUtils.getDateGranularityByType(chart);
   const {
     type,
     data
@@ -1316,6 +1315,69 @@ SQLStatisticsUtils.groupingTwoDimensionChartSQLResult2JavaScript = async (chart,
       }
     }
   }
+
+  // fill empty group name with value 0
+  const allGroupNames = new Set();
+  const nameGroupMap = new Map();
+  result.forEach(item => {
+    const {
+      name,
+      group_name: groupName
+    } = item;
+    allGroupNames.add(groupName);
+    if (!nameGroupMap.has(name)) {
+      nameGroupMap.set(name, new Set());
+    }
+    nameGroupMap.get(name).add(groupName);
+  });
+  const isEmptyGroupName = groupName => groupName === undefined || groupName === null || groupName === '';
+  const groupNameList = Array.from(allGroupNames).sort((a, b) => {
+    const aEmpty = isEmptyGroupName(a);
+    const bEmpty = isEmptyGroupName(b);
+    if (aEmpty && !bEmpty) return 1;
+    if (!aEmpty && bEmpty) return -1;
+    return `${a !== null && a !== void 0 ? a : ''}`.localeCompare(`${b !== null && b !== void 0 ? b : ''}`);
+  });
+  nameGroupMap.forEach((groupSet, name) => {
+    groupNameList.forEach(groupName => {
+      if (!groupSet.has(groupName)) {
+        result.push({
+          name,
+          rows: [],
+          group_name: groupName,
+          value: 0
+        });
+      }
+    });
+  });
+
+  // ensure each name keeps original order while its group_name entries follow the normalized group order
+  const groupOrder = new Map(groupNameList.map((groupName, index) => [groupName, index]));
+  const nameOrder = [];
+  const seenNames = new Set();
+  const nameBuckets = new Map();
+  result.forEach(item => {
+    if (!seenNames.has(item.name)) {
+      seenNames.add(item.name);
+      nameOrder.push(item.name);
+    }
+    if (!nameBuckets.has(item.name)) {
+      nameBuckets.set(item.name, []);
+    }
+    nameBuckets.get(item.name).push(item);
+  });
+  const orderedResult = [];
+  nameOrder.forEach(name => {
+    const items = nameBuckets.get(name).sort((a, b) => {
+      var _a$group_name, _b$group_name;
+      const aOrder = groupOrder.has(a.group_name) ? groupOrder.get(a.group_name) : Number.MAX_SAFE_INTEGER;
+      const bOrder = groupOrder.has(b.group_name) ? groupOrder.get(b.group_name) : Number.MAX_SAFE_INTEGER;
+      if (aOrder !== bOrder) return aOrder - bOrder;
+      return `${(_a$group_name = a.group_name) !== null && _a$group_name !== void 0 ? _a$group_name : ''}`.localeCompare(`${(_b$group_name = b.group_name) !== null && _b$group_name !== void 0 ? _b$group_name : ''}`);
+    });
+    orderedResult.push(...items);
+  });
+  result.splice(0, result.length, ...orderedResult);
   BaseUtils.sortCharts(result, groupbyColumn, 'name');
   await BaseUtils.updateTableViewList(result, groupbyColumn, 'name', 'color', false, true);
   await BaseUtils.updateTableViewList(result, columnGroupbyColumn, 'group_name', 'group_color', false, false);
@@ -1967,7 +2029,7 @@ SQLStatisticsUtils.calculateChart = async (chart, value, callback, sqlRows) => {
     tables
   } = value;
   if (!BaseUtils.isValidExistChart(tables, chart)) {
-    const tip_message = 'Please_complete_the_chart_configuration_first';
+    const tip_message = 'Please_complete_the_chart_configuration_first33333';
     return callback && callback('', tip_message, null);
   }
   const {

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

@@ -502,7 +502,8 @@ const filterPredicateMap = {
   [CellType.URL]: 'is',
   [CellType.STRING]: 'is',
   [CellType.BOOL]: 'is',
-  [CellType.LINK_FORMULA]: 'has_any_of'
+  [CellType.LINK_FORMULA]: 'is',
+  [CellType.LINK]: 'is'
 };
 const USE_OPTION_ID_CELL_TYPES = [CellType.SINGLE_SELECT, CellType.MULTIPLE_SELECT];
 const getFilterByColumnTypeForPivot = (columnKey, columns, value, rows) => {
@@ -516,11 +517,28 @@ const getFilterByColumnTypeForPivot = (columnKey, columns, value, rows) => {
   }
   let type = column.type;
   const columnType = column.type;
-  if (type === CellType.FORMULA) {
+  if (columnType === CellType.FORMULA) {
     type = column.data.result_type;
   }
-  if (type === CellType.LINK_FORMULA) {
+  if (columnType === CellType.LINK_FORMULA) {
     type = column.data.array_type;
+    // extract display_value from link formula column value
+    if (Array.isArray(value) && value.length > 0) {
+      value = value[0];
+    }
+  }
+
+  // handle link column based on array_type
+  if (columnType === CellType.LINK) {
+    var _column$data, _value$;
+    const arrayType = (_column$data = column.data) === null || _column$data === void 0 ? void 0 : _column$data.array_type;
+    if (arrayType) {
+      type = arrayType;
+    }
+    // extract display_value from link column value
+    if (Array.isArray(value) && value.length > 0 && ((_value$ = value[0]) === null || _value$ === void 0 ? void 0 : _value$.display_value) !== undefined) {
+      value = value[0].display_value;
+    }
   }
   if (column && [CellType.GEOLOCATION, CellType.DATE, CellType.MTIME, CellType.CTIME].includes(type)) {
     filter['value'] = value;
@@ -540,8 +558,8 @@ const getFilterByColumnTypeForPivot = (columnKey, columns, value, rows) => {
     filter['filter_term'] = value;
   }
 
-  // link_formula use has_any_of
-  if (columnType === CellType.LINK_FORMULA) {
+  // link_formula and link use is
+  if ([CellType.LINK_FORMULA, CellType.LINK].includes(columnType)) {
     filter['filter_predicate'] = filterPredicateMap[columnType];
   } else {
     filter['filter_predicate'] = filterPredicateMap[type];
@@ -566,11 +584,28 @@ const getFilterByColumnType = (columnKey, columns, rows, sqlColumnKey) => {
   let columnType = column.type;
   const correctRow = rows.find(r => sqlColumnKey in r);
   value = correctRow && correctRow[sqlColumnKey];
-  if (type === CellType.FORMULA) {
+  if (columnType === CellType.FORMULA) {
     type = column.data.result_type;
   }
-  if (type === CellType.LINK_FORMULA) {
+  if (columnType === CellType.LINK_FORMULA) {
     type = column.data.array_type;
+    // extract display_value from link formula column value
+    if (Array.isArray(value) && value.length > 0) {
+      value = value[0];
+    }
+  }
+
+  // handle link column based on array_type
+  if (columnType === CellType.LINK) {
+    var _column$data2, _value$2;
+    const arrayType = (_column$data2 = column.data) === null || _column$data2 === void 0 ? void 0 : _column$data2.array_type;
+    if (arrayType) {
+      type = arrayType;
+    }
+    // extract display_value from link column value
+    if (Array.isArray(value) && value.length > 0 && ((_value$2 = value[0]) === null || _value$2 === void 0 ? void 0 : _value$2.display_value) !== undefined) {
+      value = value[0].display_value;
+    }
   }
   if (column && [CellType.GEOLOCATION, CellType.DATE, CellType.MTIME, CellType.CTIME].includes(type)) {
     // link_formula result is an array, but can't pass the value directly as an array here
@@ -585,8 +620,8 @@ const getFilterByColumnType = (columnKey, columns, rows, sqlColumnKey) => {
   }
   filter['filter_term'] = value;
 
-  // link_formula use has_any_of
-  if (columnType === CellType.LINK_FORMULA) {
+  // link_formula and link use is
+  if ([CellType.LINK_FORMULA, CellType.LINK].includes(columnType)) {
     filter['filter_predicate'] = filterPredicateMap[columnType];
   } else {
     filter['filter_predicate'] = filterPredicateMap[type];

package/package.json

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