evui 3.4.26 → 3.4.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "evui",
-  "version": "3.4.26",
+  "version": "3.4.28",
   "description": "A EXEM Library project",
   "author": "exem <dev_client@ex-em.com>",
   "license": "MIT",

package/src/components/chart/Chart.vue

@@ -72,6 +72,10 @@
         type: Number,
         default: 0,
       },
+      realTimeScatterReset: {
+        type: Boolean,
+        default: false,
+      },
     },
     emits: [
       'click',
@@ -83,8 +87,9 @@
       'update:selectedSeries',
       'update:zoomStartIdx',
       'update:zoomEndIdx',
+      'update:realTimeScatterReset',
     ],
-    setup(props) {
+    setup(props, { emit }) {
       let evChart = null;
       const isMounted = ref(false);
       const injectIsChartGroup = inject('isChartGroup', false);
@@ -246,6 +251,28 @@
         });
       }
 
+      watch(() => props.realTimeScatterReset, (flag) => {
+        if (flag) {
+          Object.keys(evChart.dataSet).forEach((series) => {
+            if (evChart.dataSet[series]) {
+              evChart.dataSet[series].dataGroup = [];
+            }
+          });
+
+          emit('update:realTimeScatterReset', false);
+        }
+      });
+
+      watch(() => props.options.realTimeScatter?.use, (use) => {
+        evChart.options.realTimeScatter.use = use ?? false;
+
+        evChart.update({
+          updateSeries: true,
+          updateSelTip: { update: false, keepDomain: false },
+          updateData: false,
+        });
+      });
+
       onMounted(async () => {
         if (injectEvChartPropsInGroup?.value) {
           injectEvChartPropsInGroup.value.push(props);

package/src/components/chart/element/element.scatter.js

@@ -144,9 +144,9 @@ class Scatter {
     const pointStyle = typeof this.pointStyle === 'string' ? this.pointStyle : this.pointStyle.value;
     const pointSize = typeof this.pointSize === 'number' ? this.pointSize : this.pointSize.value;
 
-    for (let i = 0; i < this.data[this.sId].dataGroup.length; i++) {
-      for (let j = 0; j < this.data[this.sId].dataGroup[i].data.length; j++) {
-        const item = this.data[this.sId].dataGroup[i].data[j];
+    for (let i = 0; i < this.data[this.sId]?.dataGroup?.length; i++) {
+      for (let j = 0; j < this.data[this.sId]?.dataGroup[i]?.data.length; j++) {
+        const item = this.data[this.sId]?.dataGroup[i]?.data[j];
 
         if (!duple.has(`${item.x}${item.y}`)) {
           duple.add(`${item.x}${item.y}`);

package/src/components/chart/model/model.store.js

@@ -81,7 +81,7 @@ const modules = {
     for (let x = 0; x < keys.length; x++) {
       const key = keys[x];
       const data = datas[key];
-      const storeLength = data.length;
+      const storeLength = data?.length;
       let lastTime = 0;
 
       if (!this.isInit || this.updateSeries) {
@@ -98,13 +98,13 @@ const modules = {
           ...defaultValues,
           ...this.dataSet[key],
         };
-        this.dataSet[key].length = this.options.realTimeScatter.range || 300;
-        this.dataSet[key].toTime = Math.floor(Date.now() / 1000) * 1000;
-        this.dataSet[key].fromTime = this.dataSet[key].toTime
-          - this.dataSet[key].length * 1000;
-        this.dataSet[key].endIndex = this.dataSet[key].length - 1;
       }
 
+      this.dataSet[key].length = this.options.realTimeScatter.range || 300;
+      this.dataSet[key].toTime = Math.floor(Date.now() / 1000) * 1000;
+      this.dataSet[key].fromTime = this.dataSet[key].toTime - this.dataSet[key].length * 1000;
+      this.dataSet[key].endIndex = this.dataSet[key].length - 1;
+
       for (let i = 0; i < storeLength; i++) {
         const item = data[i];
 
@@ -128,20 +128,19 @@ const modules = {
           - this.dataSet[key].length * 1000;
       }
 
-      if (!this.isInit || this.updateSeries) {
-        for (let i = 0; i < this.dataSet[key].length; i++) {
-          const defaultValues = {
-            data: [],
-            max: 0,
-            min: Infinity,
-          };
+      for (let i = 0; i < this.dataSet[key].length; i++) {
+        const defaultValues = {
+          data: [],
+          max: 0,
+          min: Infinity,
+        };
 
-          this.dataSet[key].dataGroup[i] = {
-            ...defaultValues,
-            ...this.dataSet[key].dataGroup[i],
-          };
-        }
-      } else if (gapCount > 0) {
+        this.dataSet[key].dataGroup[i] = {
+          ...defaultValues,
+          ...this.dataSet[key].dataGroup[i],
+        };
+      }
+      if (gapCount > 0) {
         if (gapCount >= this.dataSet[key].length) {
           for (let i = 0; i < this.dataSet[key].length; i++) {
             this.dataSet[key].dataGroup[i].data.length = 0;

package/src/components/chart/plugins/plugins.tooltip.js

@@ -574,6 +574,7 @@ const modules = {
       return;
     }
 
+    this.tooltipDOM.style.display = 'block';
     const contentsWidth = customTooltipEl.offsetWidth;
     const contentsHeight = customTooltipEl.offsetHeight;
 
@@ -595,8 +596,6 @@ const modules = {
     this.tooltipDOM.style.top = expectedPosY > maximumPosY
       ? `${reversedPosY}px`
       : `${expectedPosY}px`;
-
-    this.tooltipDOM.style.display = 'block';
   },
 
   /**

package/src/components/grid/GridSummary.vue

@@ -131,7 +131,16 @@ export default {
         if (column.type === 'number' || column.type === 'float') {
           let columnValues = [];
           if (props.isTree) {
-            columnValues = stores.value.store.map(node => node.data?.[column.field]);
+            columnValues = stores.value.store.reduce((acc, cur) => {
+                if (column.summaryOnlyTopParent) {
+                  if (!cur.parent) {
+                    acc.push(cur.data?.[column.field]);
+                  }
+                } else {
+                  acc.push(cur.data?.[column.field]);
+                }
+                return acc;
+              }, []);
           } else {
             columnValues = stores.value.store.map(row => row[ROW_DATA_INDEX][columnIndex]);
           }