sea-chart 1.1.102 → 1.1.104

package/dist/utils/trend-utils.js

@@ -2,7 +2,17 @@ import dayjs from 'dayjs';
 import quarterOfYear from 'dayjs/plugin/quarterOfYear';
 import { CHART_SUMMARY_TYPE } from '../constants';
 import { BaseUtils } from './chart-utils';
+import { getFirstDayOfWeekForGroupby } from './index';
 dayjs.extend(quarterOfYear);
+const dayOfWeekMap = {
+  'Sunday': 0,
+  'Monday': 1,
+  'Tuesday': 2,
+  'Wednesday': 3,
+  'Thursday': 4,
+  'Friday': 5,
+  'Saturday': 6
+};
 export function getCompareDate(dateGranularity) {
   const currentDate = dayjs();
   switch (dateGranularity) {
@@ -17,7 +27,9 @@ export function getCompareDate(dateGranularity) {
       }
     case CHART_SUMMARY_TYPE.WEEK:
       {
-        const currentWeek = dayjs().day(1);
+        const firstDayOfWeek = getFirstDayOfWeekForGroupby('app');
+        const startDayIndex = dayOfWeekMap[firstDayOfWeek] || 6; // default to Saturday
+        const currentWeek = dayjs().day(startDayIndex);
         const compareDate = dayjs(currentWeek).subtract(1, 'weeks').format('YYYY-MM-DD');
         const comparedDate = dayjs(currentWeek).subtract(2, 'weeks').format('YYYY-MM-DD');
         return {

package/dist/view/wrapper/dashboard.js

@@ -3,6 +3,11 @@ import { isNumber } from 'dtable-utils';
 import { Chart, registerShape } from '../../utils/custom-g2';
 import { BaseUtils, isFunction } from '../../utils';
 import { CHART_THEME_COLOR } from '../../constants';
+const textAlignPositionMap = {
+  left: '43%',
+  center: '50%',
+  right: '57%'
+};
 class Dashboard extends Component {
   constructor() {
     super(...arguments);
@@ -22,6 +27,16 @@ class Dashboard extends Component {
       const {
         config
       } = chart;
+      const {
+        font_size,
+        font_weight,
+        font_color,
+        card_label_font_size,
+        label_font_weight,
+        label_font_color,
+        text_align,
+        label_text_align
+      } = config;
       this.chart = new Chart({
         container: this.container,
         autoFit: true,
@@ -126,11 +141,12 @@ class Dashboard extends Component {
         offsetY: -15
       });
       this.chart.annotation().text({
-        position: ['50%', '85%'],
+        position: [textAlignPositionMap[label_text_align] || '50%', '85%'],
         content: config.name,
         style: {
-          fontSize: canvasStyle.height > 240 ? 20 : 12,
-          fill: '#545454',
+          fontSize: card_label_font_size || (canvasStyle.height > 240 ? 20 : 12),
+          fill: label_font_color || '#545454',
+          fontWeight: label_font_weight || 'normal',
           textAlign: 'center'
         },
         offsetY: -10
@@ -141,11 +157,12 @@ class Dashboard extends Component {
         shownValue = shownValue.toFixed(1);
       }
       this.chart.annotation().text({
-        position: ['50%', '90%'],
+        position: [textAlignPositionMap[text_align] || '50%', '90%'],
         content: `${shownValue} %`,
         style: {
-          fontSize: canvasStyle.height > 240 ? 36 : 16,
-          fill: theme.textColor,
+          fontSize: font_size || (canvasStyle.height > 240 ? 36 : 16),
+          fill: font_color || theme.textColor,
+          fontWeight: font_weight || 'bold',
           textAlign: 'center'
         },
         offsetY: 0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sea-chart",
-  "version": "1.1.102",
+  "version": "1.1.104",
   "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.46",
+    "dtable-ui-component": "^6.0.53",
     "dtable-utils": "~5.0.*",
     "prop-types": "15.8.1",
     "react": "^18.3.1",
@@ -143,9 +143,9 @@
     "resolve": "1.12.0",
     "resolve-url-loader": "5.0.0",
     "rimraf": "^5.0.7",
-    "svgo-loader": "^3.0.0",
     "sass-loader": "13.3.2",
     "style-loader": "^1.0.1",
+    "svgo-loader": "^3.0.0",
     "terser-webpack-plugin": "4.2.3",
     "ts-pnp": "1.1.4",
     "url-loader": "4.1.1",