dtable-statistic 4.3.7 → 4.3.9

package/es/assets/css/dashboard.css

@@ -302,7 +302,7 @@
 
 .statistic-chart-axis-label {
   font-size: 12px;
-  color: #444;
+  color: #212529;
 }
 
 .statistic-chart-summary-types__value-container .summary-type-explanation {
@@ -366,7 +366,7 @@
 
 .statistic-tabs-dropdown-light {
   --dropdown-bg-color: #ffffff;
-  --common-font-color: #000000;
+  --common-font-color: #212529;
   --dropdown-border-color: rgba(0, 40, 100, 0.12);
   --font-color: #6e7687;
   --font-hover-color: #ffffff;

package/es/assets/css/dialog.css

@@ -191,7 +191,7 @@
   flex: 1 1;
   line-height: 34px;
   text-align: center;
-  color: #000000;
+  color: #212529;
   cursor: pointer;
   box-sizing: border-box;
 }

package/es/assets/css/theme.css

@@ -35,31 +35,31 @@
   --dashboard-header-icon-color: rgba(0, 0, 0, .5);
   --dashboard-header-icon-hover-color: rgba(0, 0, 0, .75);
   --container-bg-color: #f5f5f5;
-  --common-font-color: #000000;
+  --common-font-color: #212529;
   --item-wrapper-bg-color: #ffffff;
   /*header*/
-  --statistic-header-focused-font-color: #444444;
+  --statistic-header-focused-font-color: #212529;
   --statistic-header-font-color: #999999;
   --add-stat-item-border-color: rgba(0, 40, 100, 0.12);
   --add-stat-item-hover-border-color: rgba(0, 40, 100, 0.12);
   --add-stat-item-bg-color: #ffffff;
-  --add-stat-item-color: #000000;
-  --add-stat-item-icon-hover-color: #000000;
-  --add-stat-item-icon-color: #000000;
-  --add-stat-item-icon-hover-color: #000000;
+  --add-stat-item-color: #212529;
+  --add-stat-item-icon-hover-color: #212529;
+  --add-stat-item-icon-color: #212529;
+  --add-stat-item-icon-hover-color: #212529;
   --border-color: #e7eaec;
   --view-icon-color: #949494;
   --icon-font-opcity: .5;
-  --btn-add-view-hover-color: #000;
+  --btn-add-view-hover-color: #212529;
   --op-item-icon-color: #808080;
   --op-item-icon-hover-color: #404040;
   /*header*/
   --stat-item-font-color: #999999;
-  --stat-item-font-hover-color: #000000;
+  --stat-item-font-hover-color: #212529;
   --dropdown-bg-color: #ffffff;
   --dropdown-border-color: rgba(0, 40, 100, 0.12);
   --stat-item-resizable-handler-color: #666666;
   --btn-scroll-icon-color: #c2c2c2;
   --btn-scroll-icon-active-color: #8c8c8c;
-  --btn-scroll-icon-active-hover-color: #000;
+  --btn-scroll-icon-active-hover-color: #212529;
 }

package/es/calculator/combination-calculator.js

@@ -13,12 +13,6 @@ var _rowUtils = require("../utils/row-utils");
 var _sqlUtils = require("../utils/sql-utils");
 var _constants = require("../constants");
 class CombinationCalculator extends _baseCalculator.default {
-  constructor() {
-    super(...arguments);
-    this.isEmptyLabel = label => {
-      return !label;
-    };
-  }
   isValidChart(chart) {
     if (!this.validateBaseConfigs(chart)) {
       return false;
@@ -245,5 +239,8 @@ class CombinationCalculator extends _baseCalculator.default {
     }
     return label;
   }
+  isEmptyLabel(label) {
+    return !label;
+  }
 }
 var _default = exports.default = CombinationCalculator;

package/es/calculator/thread-manager.js

@@ -6,52 +6,52 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 class ThreadManager {
   constructor(threadCount) {
-    this.applyThread = async (id, workerConstructor) => {
-      return new Promise((resolve, reject) => {
-        if (this.threadList.length < this.threadCount) {
-          const worker = new workerConstructor();
-          worker.id = id;
-          this.threadList.push(worker);
-          resolve(worker);
-        } else {
-          this.queue.push({
-            id,
-            emitter: resolve,
-            workerConstructor
-          });
-        }
-      });
-    };
-    this.removeThread = id => {
-      const index = this.threadList.findIndex(worker => worker.id === id);
-      if (index > -1) {
-        this.threadList[index] && this.threadList[index].terminate();
-        this.threadList.splice(index, 1);
-      }
-      if (this.queue.length > 0) {
-        const {
-          id,
-          emitter,
-          workerConstructor
-        } = this.queue.shift();
+    this.threadCount = threadCount;
+    this.threadList = [];
+    this.queue = [];
+  }
+  async applyThread(id, workerConstructor) {
+    return new Promise((resolve, reject) => {
+      if (this.threadList.length < this.threadCount) {
         const worker = new workerConstructor();
         worker.id = id;
         this.threadList.push(worker);
-        emitter(worker);
+        resolve(worker);
+      } else {
+        this.queue.push({
+          id,
+          emitter: resolve,
+          workerConstructor
+        });
       }
-    };
-    this.clearQueue = () => {
-      this.queue = [];
-    };
-    this.terminateWorkers = () => {
-      this.threadList.forEach(item => {
-        item && item.terminate();
-      });
-      this.threadList = [];
-    };
-    this.threadCount = threadCount;
-    this.threadList = [];
+    });
+  }
+  removeThread(id) {
+    const index = this.threadList.findIndex(worker => worker.id === id);
+    if (index > -1) {
+      this.threadList[index] && this.threadList[index].terminate();
+      this.threadList.splice(index, 1);
+    }
+    if (this.queue.length > 0) {
+      const {
+        id,
+        emitter,
+        workerConstructor
+      } = this.queue.shift();
+      const worker = new workerConstructor();
+      worker.id = id;
+      this.threadList.push(worker);
+      emitter(worker);
+    }
+  }
+  clearQueue() {
     this.queue = [];
   }
+  terminateWorkers() {
+    this.threadList.forEach(item => {
+      item && item.terminate();
+    });
+    this.threadList = [];
+  }
 }
 var _default = exports.default = ThreadManager;

package/es/components/dialog/chart-addition-widgets/statistic-chart-selector.module.css

@@ -26,7 +26,7 @@
 .statistic-type-title {
   font-weight: 600;
   font-size: 18px;
-  color: #202428;
+  color: #212529;
 }
 
 .chart-categories-nav {
@@ -75,7 +75,7 @@
 }
 
 .chart-icon:not(.icon-highlight):hover {
-  color: #202428;
+  color: #212529;
 }
 
 .icon-highlight {

package/es/components/select/select.js

@@ -31,7 +31,7 @@ class Select extends _react.Component {
       });
       window.app.eventBus.dispatch(_constants.CommonEventTypes.OPEN_SELECT, !this.state.isShowSelectOptions);
     };
-    this.onClick = event => {
+    this.onMousedown = event => {
       if (this.props.isShowSelected && event.target.className.includes('icon-fork-number')) {
         return;
       }
@@ -84,10 +84,10 @@ class Select extends _react.Component {
     };
   }
   componentDidMount() {
-    document.addEventListener('click', this.onClick);
+    document.addEventListener('mousedown', this.onMousedown);
   }
   componentWillUnmount() {
-    document.removeEventListener('click', this.onClick);
+    document.removeEventListener('mousedown', this.onMousedown);
   }
   render() {
     let {

package/es/constants/index.js

@@ -485,8 +485,8 @@ const STAT_ITEM_THEME_COLORS = exports.STAT_ITEM_THEME_COLORS = {
   [THEME_NAME_MAP.LIGHT]: {
     textColor: '#6e6e6e',
     gridColor: '#bfbfbf',
-    labelColor: '#000000',
-    legendPageNavigatorMarkerColor: '#000000',
+    labelColor: '#212529',
+    legendPageNavigatorMarkerColor: '#212529',
     cardColor: '#545454'
   }
 };

package/es/stat-editor/stat-settings/basic-chart-settings/time-comparison-settings.js

@@ -24,9 +24,10 @@ class TimeComparisonSettings extends _react.Component {
     this.renderGroupbyDateGranularity = () => {
       let {
         dateGranularityOptions,
-        groupbyDateGranularity
+        statItem
       } = this.props;
-      let selectedDateGranularity = this.getSelectedDateGranularity(groupbyDateGranularity);
+      dateGranularityOptions = dateGranularityOptions.filter(item => item.value !== 'year');
+      let selectedDateGranularity = this.getSelectedDateGranularity(statItem.x_axis_date_granularity);
       return /*#__PURE__*/_react.default.createElement("div", {
         className: "statistic-chart-parameter-item"
       }, /*#__PURE__*/_react.default.createElement(_components.DTableSelect, {
@@ -52,21 +53,6 @@ class TimeComparisonSettings extends _react.Component {
         options: this.columnsOptions
       }));
     };
-    this.renderGroupbyDateGranularity = () => {
-      let {
-        dateGranularityOptions,
-        statItem
-      } = this.props;
-      dateGranularityOptions = dateGranularityOptions.filter(item => item.value !== 'year');
-      let selectedDateGranularity = this.getSelectedDateGranularity(statItem.x_axis_date_granularity);
-      return /*#__PURE__*/_react.default.createElement("div", {
-        className: "statistic-chart-parameter-item"
-      }, /*#__PURE__*/_react.default.createElement(_components.DTableSelect, {
-        value: selectedDateGranularity,
-        onChange: this.onSelectGroupbyDateGranularity,
-        options: dateGranularityOptions
-      }));
-    };
     this.onSelectGroupbyDateGranularity = dateGranularity => {
       let updated = {
         x_axis_date_granularity: dateGranularity.value

package/es/stat-editor/stat-settings/color-setting/color-picker.js

@@ -21,6 +21,7 @@ class ColorPicker extends _react.default.PureComponent {
     this.onInputChanged = event => {
       const value = event.target.value;
       if (value === this.state.activeColor) return;
+
       // todo valid color
       this.updateColor(value);
       this.setState({

package/es/stat-view/basic-number-card.js

@@ -21,53 +21,6 @@ const propTypes = {
 class BasicNumericCard extends _baseChart.default {
   constructor(props) {
     super(props);
-    this.componentDidMount = async () => {
-      const {
-        statItem,
-        chartCalculator
-      } = this.props;
-      if (this.container) {
-        const data = await chartCalculator.calculate(statItem);
-        this.setState({
-          isCalculatingData: false
-        });
-        this.drawChart(data);
-        this.calculateData = data;
-      }
-    };
-    this.componentDidUpdate = async (preProps, preState) => {
-      const {
-        statItem,
-        chartCalculator
-      } = this.props;
-      const {
-        isCalculatingData
-      } = this.state;
-      if (isCalculatingData !== preState.isCalculatingData) return;
-      if (this.shouldCalculateStatItem(preProps, this.props)) {
-        this.setState({
-          isCalculatingData: true
-        });
-        if (this.container) {
-          const data = await chartCalculator.calculate(statItem);
-          this.calculateData = data;
-          this.setState({
-            isCalculatingData: false
-          });
-          this.chart && this.chart.destroy();
-          this.drawChart(data);
-          if (this.props.isPreview) {
-            this.chart.forceFit();
-          }
-        }
-      } else {
-        this.chart && this.chart.destroy();
-        this.drawChart(this.calculateData);
-        if (this.props.isPreview) {
-          this.chart.forceFit();
-        }
-      }
-    };
     this.drawChart = data => {
       const {
         isPreview,
@@ -175,6 +128,20 @@ class BasicNumericCard extends _baseChart.default {
     };
     this.calculateData = null;
   }
+  async componentDidMount() {
+    const {
+      statItem,
+      chartCalculator
+    } = this.props;
+    if (this.container) {
+      const data = await chartCalculator.calculate(statItem);
+      this.setState({
+        isCalculatingData: false
+      });
+      this.drawChart(data);
+      this.calculateData = data;
+    }
+  }
   shouldComponentUpdate(nextProps, nextState) {
     if (this.canUpdate(this.props, nextProps)) {
       return true;
@@ -184,6 +151,39 @@ class BasicNumericCard extends _baseChart.default {
     }
     return false;
   }
+  async componentDidUpdate(preProps, preState) {
+    const {
+      statItem,
+      chartCalculator
+    } = this.props;
+    const {
+      isCalculatingData
+    } = this.state;
+    if (isCalculatingData !== preState.isCalculatingData) return;
+    if (this.shouldCalculateStatItem(preProps, this.props)) {
+      this.setState({
+        isCalculatingData: true
+      });
+      if (this.container) {
+        const data = await chartCalculator.calculate(statItem);
+        this.calculateData = data;
+        this.setState({
+          isCalculatingData: false
+        });
+        this.chart && this.chart.destroy();
+        this.drawChart(data);
+        if (this.props.isPreview) {
+          this.chart.forceFit();
+        }
+      }
+    } else {
+      this.chart && this.chart.destroy();
+      this.drawChart(this.calculateData);
+      if (this.props.isPreview) {
+        this.chart.forceFit();
+      }
+    }
+  }
   componentWillUnmount() {
     this.container = null;
   }

package/es/stat-view/combination-chart.js

@@ -27,66 +27,6 @@ const propTypes = {
 class CombinationChart extends _baseChart.default {
   constructor(props) {
     super(props);
-    this.componentDidMount = async () => {
-      const {
-        statItem,
-        chartCalculator,
-        eventBus
-      } = this.props;
-      this.unsubscribeStyleChange = eventBus.subscribe(_constants.LABEL_CONFIG_CHANGED, newStatItem => {
-        this.renderAxisLabel(newStatItem);
-      });
-      if (!this.container) return;
-      const data = await chartCalculator.calculate(statItem);
-      let showResultDescription = data.length > 0 ? false : true;
-      this.setState({
-        isCalculatingData: false,
-        showResultDescription
-      }, () => {
-        if (!showResultDescription) {
-          this.drawChart(data);
-          this.calculateData = data;
-        }
-      });
-    };
-    this.componentDidUpdate = async (preProps, preState) => {
-      const {
-        statItem,
-        chartCalculator
-      } = this.props;
-      const {
-        isCalculatingData
-      } = this.state;
-      if (isCalculatingData !== preState.isCalculatingData) return;
-      if (this.shouldCalculateStatItem(preProps, this.props)) {
-        this.setState({
-          isCalculatingData: true
-        });
-        if (this.container) {
-          const data = await chartCalculator.calculate(statItem);
-          const showResultDescription = data.length > 0 ? false : true;
-          this.chart && this.destroyChart();
-          this.calculateData = data;
-          this.setState({
-            isCalculatingData: false,
-            showResultDescription
-          }, () => {
-            if (!showResultDescription) {
-              this.drawChart(data);
-              if (this.props.isPreview) this.chart.forceFit();
-            }
-          });
-        }
-      } else {
-        if (!this.state.showResultDescription) {
-          this.chart && this.destroyChart();
-          this.drawChart(this.calculateData);
-          if (this.props.isPreview) {
-            this.chart.forceFit();
-          }
-        }
-      }
-    };
     this.renderAxisLabel = newStatItem => {
       let {
         getTableById,
@@ -498,6 +438,28 @@ class CombinationChart extends _baseChart.default {
     };
     this.calculateData = null;
   }
+  async componentDidMount() {
+    const {
+      statItem,
+      chartCalculator,
+      eventBus
+    } = this.props;
+    this.unsubscribeStyleChange = eventBus.subscribe(_constants.LABEL_CONFIG_CHANGED, newStatItem => {
+      this.renderAxisLabel(newStatItem);
+    });
+    if (!this.container) return;
+    const data = await chartCalculator.calculate(statItem);
+    let showResultDescription = data.length > 0 ? false : true;
+    this.setState({
+      isCalculatingData: false,
+      showResultDescription
+    }, () => {
+      if (!showResultDescription) {
+        this.drawChart(data);
+        this.calculateData = data;
+      }
+    });
+  }
   shouldComponentUpdate(nextProps, nextState) {
     const {
       theme,
@@ -517,6 +479,44 @@ class CombinationChart extends _baseChart.default {
     }
     return false;
   }
+  async componentDidUpdate(preProps, preState) {
+    const {
+      statItem,
+      chartCalculator
+    } = this.props;
+    const {
+      isCalculatingData
+    } = this.state;
+    if (isCalculatingData !== preState.isCalculatingData) return;
+    if (this.shouldCalculateStatItem(preProps, this.props)) {
+      this.setState({
+        isCalculatingData: true
+      });
+      if (this.container) {
+        const data = await chartCalculator.calculate(statItem);
+        const showResultDescription = data.length > 0 ? false : true;
+        this.chart && this.destroyChart();
+        this.calculateData = data;
+        this.setState({
+          isCalculatingData: false,
+          showResultDescription
+        }, () => {
+          if (!showResultDescription) {
+            this.drawChart(data);
+            if (this.props.isPreview) this.chart.forceFit();
+          }
+        });
+      }
+    } else {
+      if (!this.state.showResultDescription) {
+        this.chart && this.destroyChart();
+        this.drawChart(this.calculateData);
+        if (this.props.isPreview) {
+          this.chart.forceFit();
+        }
+      }
+    }
+  }
   componentWillUnmount() {
     this.container = null;
     this.unsubscribeStyleChange();

package/es/stat-view/dashboard-chart.js

@@ -20,56 +20,6 @@ const HEIGHT = 400;
 class DashboardChart extends _baseChart.default {
   constructor(props) {
     super(props);
-    this.componentDidMount = async () => {
-      const {
-        statItem,
-        chartCalculator
-      } = this.props;
-      if (this.container) {
-        const data = await chartCalculator.calculate(statItem);
-        this.setState({
-          isCalculatingData: false
-        });
-        this.drawChart(data);
-        this.calculateData = data;
-      }
-    };
-    this.componentDidUpdate = async (preProps, preState) => {
-      const {
-        statItem,
-        chartCalculator
-      } = this.props;
-      const {
-        isCalculatingData
-      } = this.state;
-      if (isCalculatingData !== preState.isCalculatingData) return;
-      if (this.shouldCalculateStatItem(preProps, this.props)) {
-        this.setState({
-          isCalculatingData: true
-        });
-        if (this.container) {
-          const data = await chartCalculator.calculate(statItem);
-          if (!this.container) return;
-          this.calculateData = data;
-          this.setState({
-            isCalculatingData: false
-          });
-          this.chart && this.chart.destroy();
-          this.drawChart(data);
-          if (this.props.isPreview) {
-            const canvasSize = this.getCanvasSize();
-            this.chart.changeSize(canvasSize.w, canvasSize.h);
-          }
-        }
-      } else {
-        this.chart && this.chart.destroy();
-        this.drawChart(this.calculateData);
-        if (this.props.isPreview) {
-          const canvasSize = this.getCanvasSize();
-          this.chart.changeSize(canvasSize.w, canvasSize.h);
-        }
-      }
-    };
     this.getCanvasSize = () => {
       const maxWidth = this.container.clientWidth;
       const maxHeight = this.container.clientHeight;
@@ -243,6 +193,20 @@ class DashboardChart extends _baseChart.default {
     };
     this.calculateData = null;
   }
+  async componentDidMount() {
+    const {
+      statItem,
+      chartCalculator
+    } = this.props;
+    if (this.container) {
+      const data = await chartCalculator.calculate(statItem);
+      this.setState({
+        isCalculatingData: false
+      });
+      this.drawChart(data);
+      this.calculateData = data;
+    }
+  }
   shouldComponentUpdate(nextProps, nextState) {
     if (this.canUpdate(this.props, nextProps)) {
       return true;
@@ -252,6 +216,42 @@ class DashboardChart extends _baseChart.default {
     }
     return false;
   }
+  async componentDidUpdate(preProps, preState) {
+    const {
+      statItem,
+      chartCalculator
+    } = this.props;
+    const {
+      isCalculatingData
+    } = this.state;
+    if (isCalculatingData !== preState.isCalculatingData) return;
+    if (this.shouldCalculateStatItem(preProps, this.props)) {
+      this.setState({
+        isCalculatingData: true
+      });
+      if (this.container) {
+        const data = await chartCalculator.calculate(statItem);
+        if (!this.container) return;
+        this.calculateData = data;
+        this.setState({
+          isCalculatingData: false
+        });
+        this.chart && this.chart.destroy();
+        this.drawChart(data);
+        if (this.props.isPreview) {
+          const canvasSize = this.getCanvasSize();
+          this.chart.changeSize(canvasSize.w, canvasSize.h);
+        }
+      }
+    } else {
+      this.chart && this.chart.destroy();
+      this.drawChart(this.calculateData);
+      if (this.props.isPreview) {
+        const canvasSize = this.getCanvasSize();
+        this.chart.changeSize(canvasSize.w, canvasSize.h);
+      }
+    }
+  }
   render() {
     const {
       isCalculatingData

package/es/stat-view/scatter-chart.js

@@ -26,57 +26,6 @@ const propTypes = {
 class ScatterChart extends _baseChart.default {
   constructor(props) {
     super(props);
-    this.componentDidMount = async () => {
-      const {
-        statItem,
-        chartCalculator,
-        eventBus
-      } = this.props;
-      if (this.container) {
-        const data = await chartCalculator.calculate(statItem);
-        this.setState({
-          isCalculatingData: false
-        });
-        this.drawChart(data);
-        this.calculateData = data;
-      }
-      this.unsubscribeStyleChange = eventBus.subscribe(_constants.LABEL_CONFIG_CHANGED, newStatItem => {
-        this.renderAxisLabel(newStatItem);
-      });
-    };
-    this.componentDidUpdate = async (preProps, preState) => {
-      const {
-        statItem,
-        chartCalculator
-      } = this.props;
-      const {
-        isCalculatingData
-      } = this.state;
-      if (isCalculatingData !== preState.isCalculatingData) return;
-      if (this.shouldCalculateStatItem(preProps, this.props)) {
-        if (this.container) {
-          this.setState({
-            isCalculatingData: true
-          });
-          const data = await chartCalculator.calculate(statItem);
-          this.calculateData = data;
-          this.setState({
-            isCalculatingData: false
-          });
-          this.chart && this.chart.destroy();
-          this.drawChart(data);
-          if (this.props.isPreview) {
-            this.chart.forceFit();
-          }
-        }
-      } else {
-        this.chart && this.chart.destroy();
-        this.drawChart(this.calculateData);
-        if (this.props.isPreview) {
-          this.chart.forceFit();
-        }
-      }
-    };
     this.drawChart = data => {
       const {
         getTableById,
@@ -261,6 +210,24 @@ class ScatterChart extends _baseChart.default {
     };
     this.calculateData = null;
   }
+  async componentDidMount() {
+    const {
+      statItem,
+      chartCalculator,
+      eventBus
+    } = this.props;
+    if (this.container) {
+      const data = await chartCalculator.calculate(statItem);
+      this.setState({
+        isCalculatingData: false
+      });
+      this.drawChart(data);
+      this.calculateData = data;
+    }
+    this.unsubscribeStyleChange = eventBus.subscribe(_constants.LABEL_CONFIG_CHANGED, newStatItem => {
+      this.renderAxisLabel(newStatItem);
+    });
+  }
   shouldComponentUpdate(nextProps, nextState) {
     const {
       colorThemeName
@@ -276,6 +243,39 @@ class ScatterChart extends _baseChart.default {
     }
     return false;
   }
+  async componentDidUpdate(preProps, preState) {
+    const {
+      statItem,
+      chartCalculator
+    } = this.props;
+    const {
+      isCalculatingData
+    } = this.state;
+    if (isCalculatingData !== preState.isCalculatingData) return;
+    if (this.shouldCalculateStatItem(preProps, this.props)) {
+      if (this.container) {
+        this.setState({
+          isCalculatingData: true
+        });
+        const data = await chartCalculator.calculate(statItem);
+        this.calculateData = data;
+        this.setState({
+          isCalculatingData: false
+        });
+        this.chart && this.chart.destroy();
+        this.drawChart(data);
+        if (this.props.isPreview) {
+          this.chart.forceFit();
+        }
+      }
+    } else {
+      this.chart && this.chart.destroy();
+      this.drawChart(this.calculateData);
+      if (this.props.isPreview) {
+        this.chart.forceFit();
+      }
+    }
+  }
   componentWillUnmount() {
     this.container = null;
     this.unsubscribeStyleChange && this.unsubscribeStyleChange();

package/es/stat-view/treemap-chart.js

@@ -30,53 +30,6 @@ const propTypes = {
 class TreemapChart extends _baseChart.default {
   constructor(props) {
     super(props);
-    this.componentDidMount = async () => {
-      const {
-        statItem,
-        chartCalculator
-      } = this.props;
-      if (this.container) {
-        const data = await chartCalculator.calculate(statItem);
-        this.setState({
-          isCalculatingData: false
-        });
-        this.drawChart(data);
-        this.calculateData = data;
-      }
-    };
-    this.componentDidUpdate = async (preProps, preState) => {
-      const {
-        statItem,
-        chartCalculator
-      } = this.props;
-      const {
-        isCalculatingData
-      } = this.state;
-      if (isCalculatingData !== preState.isCalculatingData) return;
-      if (this.shouldCalculateStatItem(preProps, this.props)) {
-        this.setState({
-          isCalculatingData: true
-        });
-        if (this.container) {
-          const data = await chartCalculator.calculate(statItem);
-          this.calculateData = data;
-          this.setState({
-            isCalculatingData: false
-          });
-          this.chart && this.chart.destroy();
-          this.drawChart(data);
-          if (this.props.isPreview) {
-            this.chart.forceFit();
-          }
-        }
-      } else {
-        this.chart && this.chart.destroy();
-        this.drawChart(this.calculateData);
-        if (this.props.isPreview) {
-          this.chart.forceFit();
-        }
-      }
-    };
     this.drawChart = data => {
       const {
         getTableById,
@@ -221,6 +174,20 @@ class TreemapChart extends _baseChart.default {
     }
     (0, _customG.registerGeometryLabelLayout)('custom-limit-in-shape', limitInShape);
   }
+  async componentDidMount() {
+    const {
+      statItem,
+      chartCalculator
+    } = this.props;
+    if (this.container) {
+      const data = await chartCalculator.calculate(statItem);
+      this.setState({
+        isCalculatingData: false
+      });
+      this.drawChart(data);
+      this.calculateData = data;
+    }
+  }
   shouldComponentUpdate(nextProps, nextState) {
     const {
       colorThemeName
@@ -236,6 +203,39 @@ class TreemapChart extends _baseChart.default {
     }
     return false;
   }
+  async componentDidUpdate(preProps, preState) {
+    const {
+      statItem,
+      chartCalculator
+    } = this.props;
+    const {
+      isCalculatingData
+    } = this.state;
+    if (isCalculatingData !== preState.isCalculatingData) return;
+    if (this.shouldCalculateStatItem(preProps, this.props)) {
+      this.setState({
+        isCalculatingData: true
+      });
+      if (this.container) {
+        const data = await chartCalculator.calculate(statItem);
+        this.calculateData = data;
+        this.setState({
+          isCalculatingData: false
+        });
+        this.chart && this.chart.destroy();
+        this.drawChart(data);
+        if (this.props.isPreview) {
+          this.chart.forceFit();
+        }
+      }
+    } else {
+      this.chart && this.chart.destroy();
+      this.drawChart(this.calculateData);
+      if (this.props.isPreview) {
+        this.chart.forceFit();
+      }
+    }
+  }
   componentWillUnmount() {
     this.container = null;
   }

package/es/stat-view/trend-chart.js

@@ -18,56 +18,9 @@ const propTypes = {
   chartCalculator: _propTypes.default.object,
   getTableById: _propTypes.default.func
 };
-class BasicNumericCard extends _baseChart.default {
+class TrendChart extends _baseChart.default {
   constructor(props) {
     super(props);
-    this.componentDidMount = async () => {
-      const {
-        statItem,
-        chartCalculator
-      } = this.props;
-      if (this.container) {
-        const data = await chartCalculator.calculate(statItem);
-        this.setState({
-          isCalculatingData: false
-        });
-        this.drawChart(data);
-        this.calculateData = data;
-      }
-    };
-    this.componentDidUpdate = async (preProps, preState) => {
-      const {
-        statItem,
-        chartCalculator
-      } = this.props;
-      const {
-        isCalculatingData
-      } = this.state;
-      if (isCalculatingData !== preState.isCalculatingData) return;
-      if (this.shouldCalculateStatItem(preProps, this.props)) {
-        this.setState({
-          isCalculatingData: true
-        });
-        if (this.container) {
-          const data = await chartCalculator.calculate(statItem);
-          this.calculateData = data;
-          this.setState({
-            isCalculatingData: false
-          });
-          this.chart && this.chart.destroy();
-          this.drawChart(data);
-          if (this.props.isPreview) {
-            this.chart.forceFit();
-          }
-        }
-      } else {
-        this.chart && this.chart.destroy();
-        this.drawChart(this.calculateData);
-        if (this.props.isPreview) {
-          this.chart.forceFit();
-        }
-      }
-    };
     this.drawChart = data => {
       const {
         isPreview,
@@ -223,6 +176,20 @@ class BasicNumericCard extends _baseChart.default {
     };
     this.calculateData = null;
   }
+  async componentDidMount() {
+    const {
+      statItem,
+      chartCalculator
+    } = this.props;
+    if (this.container) {
+      const data = await chartCalculator.calculate(statItem);
+      this.setState({
+        isCalculatingData: false
+      });
+      this.drawChart(data);
+      this.calculateData = data;
+    }
+  }
   shouldComponentUpdate(nextProps, nextState) {
     if (this.canUpdate(this.props, nextProps)) {
       return true;
@@ -232,6 +199,39 @@ class BasicNumericCard extends _baseChart.default {
     }
     return false;
   }
+  async componentDidUpdate(preProps, preState) {
+    const {
+      statItem,
+      chartCalculator
+    } = this.props;
+    const {
+      isCalculatingData
+    } = this.state;
+    if (isCalculatingData !== preState.isCalculatingData) return;
+    if (this.shouldCalculateStatItem(preProps, this.props)) {
+      this.setState({
+        isCalculatingData: true
+      });
+      if (this.container) {
+        const data = await chartCalculator.calculate(statItem);
+        this.calculateData = data;
+        this.setState({
+          isCalculatingData: false
+        });
+        this.chart && this.chart.destroy();
+        this.drawChart(data);
+        if (this.props.isPreview) {
+          this.chart.forceFit();
+        }
+      }
+    } else {
+      this.chart && this.chart.destroy();
+      this.drawChart(this.calculateData);
+      if (this.props.isPreview) {
+        this.chart.forceFit();
+      }
+    }
+  }
   componentWillUnmount() {
     this.container = null;
   }
@@ -245,5 +245,5 @@ class BasicNumericCard extends _baseChart.default {
     }));
   }
 }
-BasicNumericCard.propTypes = propTypes;
-var _default = exports.default = BasicNumericCard;
+TrendChart.propTypes = propTypes;
+var _default = exports.default = TrendChart;

package/es/utils/cell-format.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.getClientFormulaDisplayString = exports.getClientCellValueDisplayString = void 0;
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _dtableUtils = require("dtable-utils");
+var _object = require("./object");
 const getClientFormulaDisplayString = function (value, columnData) {
   let {
     collaborators = []
@@ -48,7 +49,7 @@ const getClientLinkDisplayString = function (links, columnData) {
   let formulaData = {
     ...columnData
   };
-  if (!columnData.hasOwnProperty('result_type')) {
+  if (!(0, _object.hasOwnProperty)(columnData, 'result_type')) {
     formulaData.result_type = _dtableUtils.FORMULA_RESULT_TYPE.ARRAY;
   }
   const displayValue = links.map(link => link.display_value);

package/es/utils/object.js

@@ -8,17 +8,17 @@ var _react = require("react");
 const isSameObject = (a, b) => {
   let k;
   for (k in a) {
-    if (a.hasOwnProperty(k)) {
+    if (hasOwnProperty(a, k)) {
       if (typeof a[k] === 'function' && typeof b[k] === 'function' || /*#__PURE__*/(0, _react.isValidElement)(a[k]) && /*#__PURE__*/(0, _react.isValidElement)(b[k])) {
         continue;
       }
-      if (!b.hasOwnProperty(k) || a[k] !== b[k]) {
+      if (!hasOwnProperty(b, k) || a[k] !== b[k]) {
         return false;
       }
     }
   }
   for (k in b) {
-    if (b.hasOwnProperty(k) && !a.hasOwnProperty(k)) {
+    if (hasOwnProperty(b, k) && !hasOwnProperty(a, k)) {
       return false;
     }
   }

package/es/utils/stat-utils.js

@@ -189,7 +189,7 @@ class StatUtils {
                 }
                 return (0, _dtableUtils.sortNumber)(current, next, sortType);
               }
-              return (0, _dtableUtils.sortText)(result_type, current, next, sortType);
+              return (0, _dtableUtils.sortText)(current, next, sortType);
             }
           default:
             {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-statistic",
-  "version": "4.3.7",
+  "version": "4.3.9",
   "description": "statistics",
   "main": "dist/dtable-statistic.js",
   "author": "seafile",
@@ -31,6 +31,7 @@
   "devDependencies": {
     "@babel/cli": "7.22.15",
     "@babel/core": "^7.16.0",
+    "@babel/eslint-parser": "^7.16.3",
     "@babel/plugin-proposal-private-property-in-object": "7.21.11",
     "@babel/plugin-transform-runtime": "7.22.10",
     "@babel/runtime": "7.22.11",
@@ -39,8 +40,8 @@
     "@testing-library/jest-dom": "5.17.0",
     "@testing-library/react": "^11.1.0",
     "@testing-library/user-event": "13.5.0",
+    "@types/jest": "^29.5.10",
     "autoprefixer": "10.4.5",
-    "babel-eslint": "10.0.1",
     "babel-jest": "^27.4.2",
     "babel-loader": "^8.2.3",
     "babel-plugin-import": "^1.13.6",
@@ -51,6 +52,7 @@
     "browserslist": "^4.18.1",
     "camelcase": "^6.2.1",
     "case-sensitive-paths-webpack-plugin": "^2.4.0",
+    "circular-dependency-plugin": "^5.2.2",
     "css-loader": "^6.5.1",
     "css-minimizer-webpack-plugin": "^3.2.0",
     "dotenv": "^10.0.0",