evui 3.4.22 → 3.4.23

package/package.json

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

package/src/components/chart/chart.core.js

@@ -113,6 +113,7 @@ class EvChart {
     }
 
     if (realTimeScatter?.use) {
+      this.dataSet = {};
       this.createRealTimeScatterDataSet(data);
     } else {
       this.createDataSet(data, labels);
@@ -723,6 +724,7 @@ class EvChart {
 
     this.resetProps();
 
+    this.updateSeries = updateSeries;
     if (updateSeries) {
       this.seriesInfo = null;
       this.seriesList = null;

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

@@ -71,10 +71,6 @@ const modules = {
   createRealTimeScatterDataSet(datas) {
     const keys = Object.keys(datas);
 
-    if (!this.isInit) {
-      this.dataSet = {};
-    }
-
     const minMaxValues = {
       maxY: 0,
       minY: Infinity,
@@ -88,8 +84,8 @@ const modules = {
       const storeLength = data.length;
       let lastTime = 0;
 
-      if (!this.isInit) {
-        this.dataSet[key] = {
+      if (!this.isInit || this.updateSeries) {
+        const defaultValues = {
           dataGroup: [],
           startIndex: 0,
           endIndex: 0,
@@ -97,6 +93,11 @@ const modules = {
           fromTime: 0,
           toTime: 0,
         };
+
+        this.dataSet[key] = {
+          ...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
@@ -127,13 +128,18 @@ const modules = {
           - this.dataSet[key].length * 1000;
       }
 
-      if (!this.isInit) {
+      if (!this.isInit || this.updateSeries) {
         for (let i = 0; i < this.dataSet[key].length; i++) {
-          this.dataSet[key].dataGroup[i] = {
+          const defaultValues = {
             data: [],
             max: 0,
             min: Infinity,
           };
+
+          this.dataSet[key].dataGroup[i] = {
+            ...defaultValues,
+            ...this.dataSet[key].dataGroup[i],
+          };
         }
       } else if (gapCount > 0) {
         if (gapCount >= this.dataSet[key].length) {

package/src/components/select/Select.vue

@@ -160,10 +160,12 @@
                         disabled: item.disabled
                     }"
                       :title="item.name"
-                      @click.self.prevent="[clickItem(item.value), changeDropboxPosition()]"
+                      @click.self.prevent="item.disabled
+                        ? [] : [clickItem(item.value), changeDropboxPosition()]"
                     >
                       <ev-checkbox
                         :label="item.value"
+                        :disabled="item.disabled"
                       >
                         <i
                           v-if="item.iconClass"
@@ -194,10 +196,12 @@
                     disabled: item.disabled
                   }"
                     :title="item.name"
-                    @click.stop.prevent="[clickItem(item.value), changeDropboxPosition()]"
+                    @click.stop.prevent="item.disabled
+                        ? [] : [clickItem(item.value), changeDropboxPosition()]"
                   >
                     <ev-checkbox
                       :model-value="mv === item.value"
+                      :disabled="item.disabled"
                     >
                       <i
                         v-if="item.iconClass"
@@ -228,7 +232,8 @@
                     disabled: item.disabled
                   }"
                   :title="item.name"
-                  @click.stop.prevent="[clickItem(item.value), changeDropboxPosition()]"
+                  @click.stop.prevent="item.disabled
+                        ? [] : [clickItem(item.value), changeDropboxPosition()]"
                 >
                   <i
                     v-if="item.iconClass"
@@ -541,6 +546,7 @@ export default {
   &.disabled {
     opacity: 1;
     color: #C0C4CC;
+    cursor: not-allowed;
   }
 }
 

package/src/components/select/uses.js

@@ -232,7 +232,7 @@ export const useDropdown = (param) => {
       allCheck.value = !allCheck.value;
     }
     if (allCheck.value) {
-      mv.value = filteredItems.value.map(item => item.value);
+      mv.value = filteredItems.value.filter(item => !item.disabled).map(item => item.value);
     } else {
       mv.value = [];
     }
@@ -261,7 +261,7 @@ export const useDropdown = (param) => {
       const idx = mv.value.indexOf(val);
       mv.value.splice(idx, 1);
     }
-    allCheck.value = mv.value.length === filteredItems.value.length;
+    allCheck.value = mv.value.length === filteredItems.value.filter(item => !item.disabled).length;
     changeMv();
   };
   const clickItem = !props.multiple ? singleClickItem : multipleClickItem;
@@ -277,7 +277,7 @@ export const useDropdown = (param) => {
 
   watch(() => mv.value, (curr) => {
     if (props.multiple && props.checkable) {
-      allCheck.value = curr.length === filteredItems.value.length;
+      allCheck.value = curr.length === filteredItems.value.filter(item => !item.disabled).length;
       changeDropboxPosition();
     }
   });