sea-chart 1.1.112 → 1.1.114

package/dist/locale/lang/de.js

@@ -147,6 +147,7 @@ const de = {
   "Execution_time_of_the_query_exceeds_the_limit": "Le temps d'exécution de la requête dépasse la limite. Les données ne peuvent pas être chargées.",
   "There_are_some_problems_with_the_filters": "Die Filterbedingungen sind abnormal. Bitte setzen sie die Filterbedingungen in den Ansichtseinstellungen zurück.",
   "Please_complete_the_chart_configuration_first": "Configure chart in element settings",
+  "The_chart_settings_are_invalid_please_contact_the_administrator_for_relevant_configurations": "The chart settings are invalid. Please contact the administrator for relevant configurations",
   "Not_used": "Nicht verwendet",
   "Select_field": "Feld auswählen",
   "Display_total": "Gesamtwert anzeigen",

package/dist/locale/lang/en.js

@@ -147,6 +147,7 @@ const en = {
   "Execution_time_of_the_query_exceeds_the_limit": "Execution time of the query exceeds the limit. Data cannot be loaded.",
   "There_are_some_problems_with_the_filters": "There are some problems with the filters.",
   "Please_complete_the_chart_configuration_first": "Configure chart in element settings",
+  "The_chart_settings_are_invalid_please_contact_the_administrator_for_relevant_configurations": "The chart settings are invalid. Please contact the administrator for relevant configurations",
   "Not_used": "Not used",
   "Select_field": "Select field",
   "Display_total": "Display total",

package/dist/locale/lang/es.js

@@ -147,6 +147,7 @@ const es = {
   "Execution_time_of_the_query_exceeds_the_limit": "Execution time of the query exceeds the limit. Data cannot be loaded.",
   "There_are_some_problems_with_the_filters": "There are some problems with the filters.",
   "Please_complete_the_chart_configuration_first": "Configure chart in element settings",
+  "The_chart_settings_are_invalid_please_contact_the_administrator_for_relevant_configurations": "The chart settings are invalid. Please contact the administrator for relevant configurations",
   "Not_used": "Not used",
   "Select_field": "Select field",
   "Display_total": "Display total",

package/dist/locale/lang/fr.js

@@ -147,6 +147,7 @@ const fr = {
   "Execution_time_of_the_query_exceeds_the_limit": "Le temps d'exécution de la requête dépasse la limite. Les données ne peuvent pas être chargées.",
   "There_are_some_problems_with_the_filters": "Les conditions de filtrage sont anormales. Veuillez réinitialiser les conditions de filtrage dans les paramètres de vue.",
   "Please_complete_the_chart_configuration_first": "Configure chart in element settings",
+  "The_chart_settings_are_invalid_please_contact_the_administrator_for_relevant_configurations": "The chart settings are invalid. Please contact the administrator for relevant configurations",
   "Not_used": "Ne pas utilisé",
   "Select_field": "Sélectionner un champ",
   "Display_total": "Afficher le total",

package/dist/locale/lang/pt.js

@@ -147,6 +147,7 @@ const pt = {
   "Execution_time_of_the_query_exceeds_the_limit": "Execution time of the query exceeds the limit. Data cannot be loaded.",
   "There_are_some_problems_with_the_filters": "There are some problems with the filters.",
   "Please_complete_the_chart_configuration_first": "Configure chart in element settings",
+  "The_chart_settings_are_invalid_please_contact_the_administrator_for_relevant_configurations": "The chart settings are invalid. Please contact the administrator for relevant configurations",
   "Not_used": "Not used",
   "Select_field": "Select field",
   "Display_total": "Display total",

package/dist/locale/lang/ru.js

@@ -147,6 +147,7 @@ const ru = {
   "Execution_time_of_the_query_exceeds_the_limit": "Execution time of the query exceeds the limit. Data cannot be loaded.",
   "There_are_some_problems_with_the_filters": "There are some problems with the filters.",
   "Please_complete_the_chart_configuration_first": "Configure chart in element settings",
+  "The_chart_settings_are_invalid_please_contact_the_administrator_for_relevant_configurations": "The chart settings are invalid. Please contact the administrator for relevant configurations",
   "Not_used": "Not used",
   "Select_field": "Select field",
   "Display_total": "Display total",

package/dist/locale/lang/zh_CN.js

@@ -147,6 +147,7 @@ const zh_CN = {
   "Execution_time_of_the_query_exceeds_the_limit": "查询的执行时间超出限制。无法加载数据。",
   "There_are_some_problems_with_the_filters": "过滤器有一些问题。",
   "Please_complete_the_chart_configuration_first": "在元素设置中配置图表",
+  "The_chart_settings_are_invalid_please_contact_the_administrator_for_relevant_configurations": "图表设置无效，请联系管理员进行相关配置",
   "Not_used": "不使用",
   "Select_field": "选择字段",
   "Display_total": "显示总计",

package/dist/settings/table-element-settings/components/data-filter.js

@@ -46,7 +46,14 @@ const DataFilter = _ref => {
   let availableFilters = [];
   // some of the filters of TABLE_ELEMENT maybe one of the hidden columns, so we need to filter them out
   if (shown_column_keys && type === CHART_TYPE.TABLE_ELEMENT) {
-    availableFilters = validFilters === null || validFilters === void 0 ? void 0 : validFilters.filter(filter => shown_column_keys.includes(filter.column_key));
+    availableFilters = validFilters === null || validFilters === void 0 ? void 0 : validFilters.filter(filter => {
+      // For filter groups, check if any sub-filter references shown columns
+      if (filter.filters) {
+        return filter.filters.some(subFilter => shown_column_keys.includes(subFilter.column_key));
+      }
+      // For regular filters, check directly
+      return shown_column_keys.includes(filter.column_key);
+    });
   } else {
     availableFilters = validFilters;
   }

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

@@ -149,7 +149,7 @@ BaseUtils.isValidExistChart = (tables, chart) => {
       // "key" and "column_key" are both exists currently, "column_key" is defined in public component, to avoid bugs, better not to change "column_key" to "key"
       summaryColumnKey = config.summary_columns[0].key || config.summary_columns[0].column_key;
     }
-    const summaryType = config.summary_type || config.y_axis_summary_type || config.horizontal_axis_summary_type;
+    const summaryType = _BaseUtils.getSummaryType(config);
     if (summaryType === CHART_SUMMARY_TYPE.ADVANCED && !summaryColumnKey) return false;
     if (summaryColumnKey) {
       return getTableColumnByKey(table, summaryColumnKey);
@@ -1145,6 +1145,32 @@ BaseUtils.convertConfig = config => {
   }
   return config;
 };
+BaseUtils.getSummaryType = config => {
+  switch (config.type) {
+    case CHART_TYPE.HORIZONTAL_BAR:
+    case CHART_TYPE.HORIZONTAL_GROUP_BAR:
+    case CHART_TYPE.STACKED_HORIZONTAL_BAR:
+      {
+        return config.horizontal_axis_summary_type;
+      }
+    case CHART_TYPE.BAR:
+    case CHART_TYPE.BAR_GROUP:
+    case CHART_TYPE.BAR_STACK:
+    case CHART_TYPE.LINE:
+    case CHART_TYPE.LINE_GROUP:
+    case CHART_TYPE.AREA:
+    case CHART_TYPE.AREA_GROUP:
+    case CHART_TYPE.SCATTER:
+      {
+        return config.y_axis_summary_type;
+      }
+    case CHART_TYPE.TABLE:
+    default:
+      {
+        return config.summary_type;
+      }
+  }
+};
 BaseUtils.getGroupLabel = (cellValue, formulaRow, column, dateGranularity, geoGranularity, value) => {
   let {
     type,

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

@@ -9,7 +9,9 @@ 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 roleId = context.getSetting('roleId');
+    const isEditAppPage = context.getSetting('isEditAppPage');
+    const tip_message = !roleId && !isEditAppPage ? 'The_chart_settings_are_invalid_please_contact_the_administrator_for_relevant_configurations' : 'Please_complete_the_chart_configuration_first';
     return callback && callback('', tip_message, null);
   }
   const id = uniqueId();

package/dist/utils/chart-utils/original-data-utils/dashboard-calculator.js

@@ -20,7 +20,10 @@ async function calculator(chart, value, _ref) {
   const selectedColumn2 = getTableColumnByKey(selectedTable, total_value_column_key);
   const statRows = await getViewRows(selectedView, selectedTable);
   if (statRows.length === 0) {
-    return 0;
+    return {
+      value: 0,
+      rows: []
+    };
   }
   const isNumericColumn1 = selectedColumn1 && isNumericColumn(selectedColumn1);
   const isNumericColumn2 = selectedColumn2 && isNumericColumn(selectedColumn2);
@@ -55,8 +58,14 @@ async function calculator(chart, value, _ref) {
     result2 = BaseUtils.getSummaryResult(numberList2, total_value_column_summary_method);
   }
   if (result2 === 0) {
-    return 0;
+    return {
+      value: 0,
+      rows: statRows
+    };
   }
-  return result1 / result2;
+  return {
+    value: result1 / result2,
+    rows: statRows
+  };
 }
 export default calculator;

package/dist/utils/chart-utils/original-data-utils/trend-calculator.js

@@ -85,7 +85,7 @@ async function calculator(chart, value, _ref) {
     const {
       compareDate,
       comparedDate
-    } = getCompareDate(date_granularity);
+    } = getCompareDate(date_granularity, 'base');
     currentValues = resultMap.get(compareDate);
     previousValues = resultMap.get(comparedDate);
     currentPeriodRows = rowsMap.get(compareDate) || [];

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

@@ -1600,7 +1600,7 @@ SQLStatisticsUtils.trendMapChartSQLResult2JavaScript = (chart, sqlRows, chartSQL
     const {
       compareDate,
       comparedDate
-    } = getCompareDate(date_granularity);
+    } = getCompareDate(date_granularity, 'app');
     for (const item of sqlRows) {
       if (!item[sqlGroupbyColumnKey]) continue;
       const currentDate = item[sqlGroupbyColumnKey] + '';

package/dist/utils/trend-utils.js

@@ -13,7 +13,7 @@ const dayOfWeekMap = {
   'Friday': 5,
   'Saturday': 6
 };
-export function getCompareDate(dateGranularity) {
+export function getCompareDate(dateGranularity, source) {
   const currentDate = dayjs();
   switch (dateGranularity) {
     case CHART_SUMMARY_TYPE.DAY:
@@ -28,7 +28,7 @@ export function getCompareDate(dateGranularity) {
     case CHART_SUMMARY_TYPE.WEEK:
       {
         var _dayOfWeekMap$firstDa;
-        const firstDayOfWeek = getFirstDayOfWeekForGroupby('app');
+        const firstDayOfWeek = getFirstDayOfWeekForGroupby(source);
         const startDayIndex = (_dayOfWeekMap$firstDa = dayOfWeekMap[firstDayOfWeek]) !== null && _dayOfWeekMap$firstDa !== void 0 ? _dayOfWeekMap$firstDa : 0; // default to Sunday
         const currentWeek = dayjs().day(startDayIndex);
         const compareDate = dayjs(currentWeek).subtract(1, 'weeks').format('YYYY-MM-DD');

package/dist/view/wrapper/dashboard.js

@@ -11,6 +11,22 @@ const textAlignPositionMap = {
 class Dashboard extends Component {
   constructor() {
     super(...arguments);
+    this.handleClickNumber = () => {
+      const {
+        toggleRecords,
+        result
+      } = this.props;
+      if (!toggleRecords) return;
+      if (typeof result === 'object' && result !== null && result.rows) {
+        toggleRecords({
+          rows: result.rows
+        });
+      } else {
+        toggleRecords({
+          isQueryBySql: true
+        });
+      }
+    };
     this.componentDidMount = () => {
       this.drawChart();
     };
@@ -23,7 +39,7 @@ class Dashboard extends Component {
         customRender
       } = this.props;
       const theme = CHART_THEME_COLOR[globalTheme];
-      const value = isNumber(result) ? result : 0;
+      const value = typeof result === 'object' && result !== null ? isNumber(result.value) ? result.value : 0 : isNumber(result) ? result : 0;
       const {
         config
       } = chart;
@@ -43,9 +59,6 @@ class Dashboard extends Component {
         width: '100%',
         height: '100%'
       });
-      this.chart.on('interval:click', e => {
-        this.props.toggleRecords(e.data.data);
-      });
       registerShape('point', 'pointer', {
         draw(cfg, container) {
           const group = container.addGroup();
@@ -156,20 +169,32 @@ class Dashboard extends Component {
       if (shownDotPos > -1 && shownDotPos < `${shownValue}`.length - 2) {
         shownValue = shownValue.toFixed(1);
       }
-      this.chart.annotation().text({
+
+      // render numeric value as clickable HTML to exclusively trigger drill-down when clicking the number
+      const numberFontSize = font_size || (canvasStyle.height > 240 ? 36 : 16);
+      const numberColor = font_color || theme.textColor;
+      const numberFontWeight = font_weight || 'bold';
+      const numberTextAlign = text_align || 'center';
+      this.chart.annotation().html({
         position: [textAlignPositionMap[text_align] || '50%', '90%'],
-        content: `${shownValue} %`,
-        style: {
-          fontSize: font_size || (canvasStyle.height > 240 ? 36 : 16),
-          fill: font_color || theme.textColor,
-          fontWeight: font_weight || 'bold',
-          textAlign: 'center'
-        },
+        html: () => `<div class="sea-chart-dashboard-number" style="width:100%;text-align:${numberTextAlign};">
+          <span class="dashboard-number"
+            style="cursor:pointer;font-size:${numberFontSize}px;color:${numberColor};font-weight:${numberFontWeight};">
+            ${shownValue} %
+          </span>
+        </div>`,
         offsetY: 0
       });
       isFunction(customRender) && customRender(this.chart);
       this.chart.render();
       this.container.title = `${data[0].value * 10} %`;
+      try {
+        var _this$container;
+        const numberEl = (_this$container = this.container) === null || _this$container === void 0 ? void 0 : _this$container.querySelector('.dashboard-number');
+        numberEl && numberEl.addEventListener('click', this.handleClickNumber);
+      } catch (e) {
+        console.error(e);
+      }
     };
   }
   componentDidUpdate(prevProps) {

package/package.json

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