sea-chart 1.1.25 → 1.1.26

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

@@ -74,13 +74,14 @@
 }
 
 .sea-chart-statistic-records-dialog .search-input-container .clear-search-text {
-  display: inline-block;
+  display: flex;
   position: absolute;
+  justify-content: center;
+  align-items: center;
   right: 30px;
-  top: 10px;
-  height: 12px;
-  width: 12px;
-  line-height: 12px;
+  top: 0px;
+  /* 2px border */
+  height: calc(100% - 2px);
   color: #ccc;
 }
 

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

@@ -1,3 +1,4 @@
+import _DTableEmptyTip from "dtable-ui-component/lib/DTableEmptyTip";
 import _toaster from "dtable-ui-component/lib/toaster";
 import React, { Fragment } from 'react';
 import { Modal, ModalBody } from 'reactstrap';
@@ -280,7 +281,12 @@ class StatisticRecordDialog extends React.Component {
         searchedRowsIds
       } = this.state;
       const searchedRows = this.getRowsByIds(searchedRowsIds);
-      if (searchedRows.length === 0) return null;
+      if (searchedRows.length === 0) return /*#__PURE__*/React.createElement("div", {
+        className: "w-100 h-100"
+      }, /*#__PURE__*/React.createElement(_DTableEmptyTip, {
+        src: "".concat(context.getSetting('mediaUrl'), "img/no-items-tip.png"),
+        text: intl.get('No_record')
+      }));
       const props = {
         table: this.table,
         renderedColumns: this.renderedColumns,

package/dist/constants/index.js

@@ -29,6 +29,7 @@ export const NUMBERIC_COLUMN_TYPE = [CellType.RATE, CellType.NUMBER];
 
 // chart supports groupby
 export const SUPPORT_GROUP_BY_CHART_TYPES = [CHART_TYPE.BAR_GROUP, CHART_TYPE.BAR_STACK, CHART_TYPE.AREA_GROUP, CHART_TYPE.LINE_GROUP, CHART_TYPE.COMPLETENESS_GROUP, CHART_TYPE.HORIZONTAL_GROUP_BAR, CHART_TYPE.STACKED_HORIZONTAL_BAR, CHART_TYPE.SCATTER];
+export const MAP_CHART_TYPES = [CHART_TYPE.MAP, CHART_TYPE.MAP_BUBBLE, CHART_TYPE.WORLD_MAP, CHART_TYPE.WORLD_MAP_BUBBLE];
 export const ZH_CN_SUPPORT_CHARTS = [CHART_TYPE.MAP, CHART_TYPE.MAP_BUBBLE];
 export const SUPPORT_DATA_SORT_CHART_TYPES = [CHART_TYPE.BAR, CHART_TYPE.BAR_STACK, CHART_TYPE.LINE, CHART_TYPE.PIE, CHART_TYPE.RING, CHART_TYPE.HORIZONTAL_BAR, CHART_TYPE.STACKED_HORIZONTAL_BAR, CHART_TYPE.AREA, CHART_TYPE.TREE_MAP];
 export const SUPPORT_STACK_VALUE_CHART_TYPES = [CHART_TYPE.BAR_STACK, CHART_TYPE.BAR_CUSTOM];

package/dist/locale/lang/de.js

@@ -252,7 +252,7 @@ const de = {
   "Use_default_color": "Standardfarbe verwenden",
   "Use_colors_in_single_select_solumn": "Verwenden Sie Farben in einer einzelnen Auswahlspalte",
   "Search_records": "Einträge suchen",
-  "Please_select_a_grouping_column": "Please select grouping column",
+  "Please_select_a_grouping_column": "Bitte Gruppierungsspalte auswählen",
   "View": "Sicht",
   "Funnel": "Trichterdiagramm",
   "All_charts": "Alle Diagramme",
@@ -264,6 +264,7 @@ const de = {
   "Outside": "Draußen",
   "Show_overall_rate": "Gesamtpreisbeschriftung anzeigen",
   "Percentage": "Prozentsatz",
-  "Number_and_percentage": "Anzahl und Prozentsatz"
+  "Number_and_percentage": "Anzahl und Prozentsatz",
+  "No_record": "Keine Aufzeichnung"
 };
 export default de;

package/dist/locale/lang/en.js

@@ -264,6 +264,7 @@ const en = {
   "Outside": "Outside",
   "Show_overall_rate": "Show overall rate",
   "Percentage": "Percentage",
-  "Number_and_percentage": "Number and percentage"
+  "Number_and_percentage": "Number and percentage",
+  "No_record": "No record"
 };
 export default en;

package/dist/locale/lang/es.js

@@ -264,6 +264,7 @@ const es = {
   "Outside": "Outside",
   "Show_overall_rate": "Show overall rate",
   "Percentage": "Percentage",
-  "Number_and_percentage": "Number and percentage"
+  "Number_and_percentage": "Number and percentage",
+  "No_record": "No record"
 };
 export default es;

package/dist/locale/lang/fr.js

@@ -252,7 +252,7 @@ const fr = {
   "Use_default_color": "Utiliser la couleur par défaut",
   "Use_colors_in_single_select_solumn": "Utiliser les couleurs dans une colonne de sélection unique",
   "Search_records": "Rechercher des enregistrements",
-  "Please_select_a_grouping_column": "Please select grouping column",
+  "Please_select_a_grouping_column": "Veuillez sélectionner la colonne de regroupement",
   "View": "Voir",
   "Funnel": "Entonnoir",
   "All_charts": "Tous les graphiques",
@@ -264,6 +264,7 @@ const fr = {
   "Outside": "Dehors",
   "Show_overall_rate": "Afficher le libellé du tarif global",
   "Percentage": "Couche d'entonnoir",
-  "Number_and_percentage": "Nombre et pourcentage"
+  "Number_and_percentage": "Nombre et pourcentage",
+  "No_record": "Aucun enregistrement"
 };
 export default fr;

package/dist/locale/lang/pt.js

@@ -264,6 +264,7 @@ const pt = {
   "Outside": "Outside",
   "Show_overall_rate": "Show overall rate",
   "Percentage": "Percentage",
-  "Number_and_percentage": "Number and percentage"
+  "Number_and_percentage": "Number and percentage",
+  "No_record": "No record"
 };
 export default pt;

package/dist/locale/lang/ru.js

@@ -264,6 +264,7 @@ const ru = {
   "Outside": "Outside",
   "Show_overall_rate": "Show overall rate",
   "Percentage": "Percentage",
-  "Number_and_percentage": "Number and percentage"
+  "Number_and_percentage": "Number and percentage",
+  "No_record": "No record"
 };
 export default ru;

package/dist/locale/lang/zh_CN.js

@@ -264,6 +264,7 @@ const zh_CN = {
   "Outside": "在图表外",
   "Show_overall_rate": "显示总转化率标签",
   "Percentage": "百分比",
-  "Number_and_percentage": "数值和百分比"
+  "Number_and_percentage": "数值和百分比",
+  "No_record": "没有记录"
 };
 export default zh_CN;

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

@@ -3,7 +3,7 @@ import dayjs from 'dayjs';
 import { CellType, MULTIPLE_CELL_VALUE_COLUMN_TYPE_MAP, getFormulaDisplayString, getPrecisionNumber, getTableById, getTableColumnByKey, isNumber, DateUtils } from 'dtable-utils';
 import { isObject } from 'lodash';
 import { cloneDeep } from 'lodash-es';
-import { CHART_SUMMARY_TYPE, CHART_TYPE, SUPPORT_DATA_SORT_CHART_TYPES, TABLE_DIMENSIONS, Y_AXIS_TYPE_PREFIX, STYLE_COLORS, TREND_TYPES, CHART_STYLE_COLORS } from '../../constants';
+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';
 import { column2SqlColumn } from '../sql/column-2-sql-column';
@@ -1415,6 +1415,7 @@ SQLStatisticsUtils.mirrorMapChartSQLResult2JavaScript = async (chart, sqlRows, c
       const equal2GroupData0 = groupData0.id === groupValue;
       const equal2GroupData1 = groupData1.id === groupValue;
       if (equal2GroupData0 || equal2GroupData1) {
+        var _groupData$, _groupData$2, _groupData$3, _groupData$4;
         let value = item[sqlSummaryColumnKey];
         let formattedValue = value;
         if (isAdvanced) {
@@ -1426,24 +1427,27 @@ SQLStatisticsUtils.mirrorMapChartSQLResult2JavaScript = async (chart, sqlRows, c
           original_name: item[column_key],
           value: equal2GroupData0 ? value : 0,
           formatted_value: equal2GroupData0 ? formattedValue : 0,
-          group_name: groupData[0].name,
-          color: groupData[0].color,
+          group_name: ((_groupData$ = groupData[0]) === null || _groupData$ === void 0 ? void 0 : _groupData$.name) || '',
+          color: ((_groupData$2 = groupData[0]) === null || _groupData$2 === void 0 ? void 0 : _groupData$2.color) || STYLE_COLORS[0].colors[0],
           rows: [item]
-        }, {
+        });
+        groupData[1] && newResult.push({
           name: label,
           original_name: item[column_key],
           value: equal2GroupData1 ? value : 0,
           formatted_value: equal2GroupData1 ? formattedValue : 0,
-          group_name: groupData[1].name,
-          color: groupData[1].color,
+          group_name: ((_groupData$3 = groupData[1]) === null || _groupData$3 === void 0 ? void 0 : _groupData$3.name) || '',
+          color: ((_groupData$4 = groupData[1]) === null || _groupData$4 === void 0 ? void 0 : _groupData$4.color) || STYLE_COLORS[0].colors[0],
           rows: [item]
         });
       }
     }
   }
+  const colorSet = [groupData[0] && groupData[0].color];
+  groupData[1] && groupData[1].color && colorSet.push(groupData[1].color);
   return {
     data: newResult,
-    colorSet: [groupData[0] && groupData[0].color, groupData[1] && groupData[1].color]
+    colorSet
   };
 };
 SQLStatisticsUtils.trendMapChartSQLResult2JavaScript = (chart, sqlRows, chartSQLMap, columnMap, tables) => {
@@ -2011,7 +2015,7 @@ SQLStatisticsUtils.calculateChart = async (chart, value, callback, sqlRows) => {
   }
 
   // map is special, still need to show map even data is empty
-  if (!Array.isArray(sqlRows) || sqlRows.length === 0 && !chartType.includes('map')) {
+  if (!Array.isArray(sqlRows) || sqlRows.length === 0 && !MAP_CHART_TYPES.includes(chartType)) {
     callback && callback('', tipMessage, null);
     return;
   }

package/dist/view/wrapper/world-map.js

@@ -29,13 +29,19 @@ const fixData = (statisticData, countryMap, chartType) => {
       }
       const value = item.value;
       if (name_cn && name) {
-        statisticNewData.push({
-          name_cn,
-          name,
-          nameType,
-          value: value || 0,
-          formatted_value: item.formatted_value
-        });
+        const existedData = statisticNewData.find(i => i.name === name);
+        if (existedData) {
+          existedData.value += value;
+          existedData.formatted_value = parseInt(existedData.formatted_value) + parseInt(item.formatted_value) + '';
+        } else {
+          statisticNewData.push({
+            name_cn,
+            name,
+            nameType,
+            value: value || 0,
+            formatted_value: item.formatted_value + ''
+          });
+        }
         if (chartType === CHART_TYPE.WORLD_MAP_BUBBLE) {
           sum += item.value;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sea-chart",
-  "version": "1.1.25",
+  "version": "1.1.26",
   "main": "./dist/index.js",
   "dependencies": {
     "@antv/data-set": "0.11.8",
@@ -26,7 +26,7 @@
   },
   "peerDependencies": {
     "@antv/scale": "0.3.14",
-    "dtable-ui-component": "^5.1.2",
+    "dtable-ui-component": "^5.1.10",
     "dtable-utils": "~5.0.*",
     "prop-types": "15.8.1",
     "react": "^17.0.0",