evui 3.2.2 → 3.3.2

package/package.json

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

package/src/components/chart/Chart.vue

@@ -105,13 +105,20 @@ import { onMounted, onBeforeUnmount, watch, onDeactivated } from 'vue';
         }
       });
 
-      const redrawChart = () => {
-        if (evChart && 'resize' in evChart && isInit) {
-          evChart.resize();
+      const redraw = () => {
+        if (evChart && isInit) {
+          evChart.update({
+            updateSeries: true,
+            updateSelTip: { update: true, keepDomain: false },
+          });
         }
       };
 
-      const onResize = debounce(redrawChart, props.resizeTimeout);
+      const onResize = debounce(() => {
+        if (evChart && 'resize' in evChart && isInit) {
+          evChart.resize();
+        }
+      }, props.resizeTimeout);
 
       const selectItemByLabel = (label) => {
         evChart.selectItemByLabel(label);
@@ -121,6 +128,7 @@ import { onMounted, onBeforeUnmount, watch, onDeactivated } from 'vue';
         wrapper,
         wrapperStyle,
         onResize,
+        redraw,
         selectItemByLabel,
       };
     },

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

@@ -97,7 +97,7 @@ const modules = {
      */
     this.onDblClick = (e) => {
       const selectItem = this.options.selectItem;
-      const args = {};
+      const args = { e };
 
       if (selectItem.use) {
         const offset = this.getMousePosition(e);
@@ -122,8 +122,7 @@ const modules = {
      * @returns {undefined}
      */
     this.onClick = (e) => {
-      const args = {};
-
+      const args = { e };
       if (this.options.selectItem.use) {
         const offset = this.getMousePosition(e);
         const hitInfo = this.findClickedData(offset);
@@ -136,7 +135,9 @@ const modules = {
       }
 
       if (typeof this.listeners.click === 'function') {
-        this.listeners.click(args);
+        if (!this.dragInfoBackup) {
+          this.listeners.click(args);
+        }
       }
     };
 
@@ -256,11 +257,12 @@ const modules = {
      *
      * @returns {undefined}
      */
-    const dragEnd = () => {
+    const dragEnd = (e) => {
       const dragInfo = this.dragInfo;
 
-      if (dragInfo?.isMove) {
+      if (dragInfo?.isMove && dragInfo?.width > 1 && dragInfo?.height > 1) {
         const args = {
+          e,
           data: this.findSelectedItems(dragInfo),
           range: this.getSelectionRage(dragInfo),
         };
@@ -579,10 +581,10 @@ const modules = {
     const yMax = dataRangeY.graphMin + graphHeight * (1 - yMaxRatio);
 
     return {
-      xMin: +parseFloat(xMin).toFixed(3),
-      xMax: +parseFloat(xMax).toFixed(3),
-      yMin: +parseFloat(yMin).toFixed(3),
-      yMax: +parseFloat(yMax).toFixed(3),
+      xMin: Math.max(+parseFloat(xMin).toFixed(3), dataRangeX.graphMin),
+      xMax: Math.min(+parseFloat(xMax).toFixed(3), dataRangeX.graphMax),
+      yMin: Math.max(+parseFloat(yMin).toFixed(3), dataRangeY.graphMin),
+      yMax: Math.min(+parseFloat(yMax).toFixed(3), dataRangeY.graphMax),
     };
   },
 

package/src/components/chart/uses.js

@@ -102,7 +102,7 @@ export const useModel = () => {
   const getNormalizedOptions = (options) => {
     const normalizedOptions = defaultsDeep({}, options, DEFAULT_OPTIONS);
 
-    if (options.type === 'scatter') {
+    if (options.type === 'scatter' && !options?.tooltip) {
       normalizedOptions.tooltip.use = false;
     }
 

package/src/components/grid/Grid.vue

@@ -341,7 +341,7 @@ export default {
         items: [],
       },
       isSearch: false,
-      searchWord: '',
+      searchValue: computed(() => (props.option.searchValue || '')),
     });
     const stores = reactive({
       viewStore: [],
@@ -512,7 +512,7 @@ export default {
       (value) => {
         setStore(value);
         if (filterInfo.isSearch) {
-          onSearch(filterInfo.searchWord);
+          onSearch(filterInfo.searchValue);
         }
       },
     );
@@ -581,6 +581,12 @@ export default {
         setStore([], false);
       },
     );
+    watch(
+      () => filterInfo.searchValue,
+      (value) => {
+        onSearch(value?.value ?? value);
+      }, { immediate: true },
+    );
     const isFilterButton = field => filterInfo.isFiltering && field !== 'db-icon' && field !== 'user-icon';
     return {
       showHeader,

package/src/components/grid/style/grid.scss

@@ -208,7 +208,7 @@
       text-align: right;
     }
     &.string,
-    &.stringnumber {
+    &.stringNumber {
       text-align: left;
     }
     &.center {

package/src/components/grid/uses.js

@@ -496,21 +496,32 @@ export const sortEvent = (params) => {
     const index = getColumnIndex(sortInfo.sortField);
     const type = props.columns[index]?.type || 'string';
     const sortFn = sortInfo.sortOrder === 'desc' ? setDesc : setAsc;
-    if (type === 'string') {
-      stores.store.sort((a, b) => {
-        if (typeof a[ROW_DATA_INDEX][index] === 'string') {
-          return sortFn(a[ROW_DATA_INDEX][index]?.toLowerCase(),
-            b[ROW_DATA_INDEX][index]?.toLowerCase());
-        }
-        return 0;
-      });
-    } else {
-      stores.store.sort((a, b) => {
-        if (typeof a[ROW_DATA_INDEX][index] === 'number') {
-          return sortFn(a[ROW_DATA_INDEX][index], b[ROW_DATA_INDEX][index]);
-        }
-        return 0;
-      });
+    switch (type) {
+      case 'string':
+        stores.store.sort((a, b) => {
+          if (typeof a[ROW_DATA_INDEX][index] === 'string') {
+            return sortFn(a[ROW_DATA_INDEX][index]?.toLowerCase(),
+              b[ROW_DATA_INDEX][index]?.toLowerCase());
+          }
+          return 0;
+        });
+        break;
+      case 'stringNumber':
+        stores.store.sort((a, b) => {
+          if (typeof a[ROW_DATA_INDEX][index] === 'string' || typeof a[ROW_DATA_INDEX][index] === 'number') {
+            return sortFn(Number(a[ROW_DATA_INDEX][index]), Number(b[ROW_DATA_INDEX][index]));
+          }
+          return 0;
+        });
+        break;
+      default:
+        stores.store.sort((a, b) => {
+          if (typeof a[ROW_DATA_INDEX][index] === 'number' || typeof a[ROW_DATA_INDEX][index] === 'boolean') {
+            return sortFn(a[ROW_DATA_INDEX][index], b[ROW_DATA_INDEX][index]);
+          }
+          return 0;
+        });
+        break;
     }
   };
   return { onSort, setSort };
@@ -710,7 +721,6 @@ export const filterEvent = (params) => {
     }
     timer = setTimeout(() => {
       filterInfo.isSearch = false;
-      filterInfo.searchWord = searchWord;
       if (searchWord) {
         stores.searchStore = stores.store.filter((row) => {
           let isShow = false;

package/src/components/treeGrid/TreeGrid.vue

@@ -242,6 +242,7 @@ export default {
       resizeLine: null,
       'grid-wrapper': null,
     });
+    const searchValue = computed(() => (props.option.searchValue || ''));
     const stores = reactive({
       treeStore: [],
       viewStore: [],
@@ -396,6 +397,12 @@ export default {
         onResize();
       },
     );
+    watch(
+      () => searchValue.value,
+      (value) => {
+        onSearch(value?.value ?? value);
+      }, { immediate: true },
+    );
     const gridStyle = computed(() => ({
       width: resizeInfo.gridWidth,
       height: resizeInfo.gridHeight,

package/src/components/treeGrid/style/treeGrid.scss

@@ -198,7 +198,7 @@
       text-align: right;
     }
     &.string,
-    &.stringnumber {
+    &.stringNumber {
       text-align: left;
     }
     &.center {

package/src/components/window/uses.js

@@ -433,8 +433,8 @@ const useMouseEvent = (param) => {
       setDragStyle({
         top: `${tempTop}px`,
         left: `${tempLeft}px`,
-        width: props.width,
-        height: props.height,
+        width: dragStyle.width ?? props.width,
+        height: dragStyle.height ?? props.height,
       });
     } else if (props.resizable && clickedInfo.pressedSpot === 'border') {
       resizeWindow(e);