evui 3.1.50 → 3.1.51

package/package.json

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

package/src/components/chart/Chart.vue

@@ -8,7 +8,7 @@
 </template>
 
 <script>
-  import { onMounted, onBeforeUnmount, watch } from 'vue';
+import { onMounted, onBeforeUnmount, watch, onDeactivated } from 'vue';
   import { cloneDeep, isEqual, debounce } from 'lodash-es';
   import EvChart from './chart.core';
   import { useModel, useWrapper } from './uses';
@@ -98,6 +98,10 @@
         evChart.destroy();
       });
 
+      onDeactivated(() => {
+        evChart.hideTooltip();
+      });
+
       const redrawChart = () => {
         if (isInit) {
           evChart.update({

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

@@ -714,6 +714,17 @@ class EvChart {
       target.removeChild(target.firstChild);
     }
   }
+
+  /**
+   * hide chart tooltip
+   *
+   * @returns {undefined}
+   */
+  hideTooltip() {
+    if (this.options.tooltip.use) {
+      this.tooltipDOM.style.display = 'none';
+    }
+  }
 }
 
 export default EvChart;

package/src/components/textField/TextField.vue

@@ -101,7 +101,7 @@
 </template>
 
 <script>
-import { ref, computed } from 'vue';
+import { ref, computed, nextTick } from 'vue';
 
 export default {
   name: 'EvTextField',
@@ -205,7 +205,9 @@ export default {
       if (mv.value !== inputValue) {
         mv.value = inputValue;
       }
-      emit('input', mv.value, e);
+      nextTick(() => {
+        emit('input', mv.value, e);
+      });
     };
     const changeMv = (e) => {
       emit('change', mv.value, e);

package/src/components/treeGrid/TreeGrid.vue

@@ -162,7 +162,7 @@
 </template>
 
 <script>
-import { reactive, toRefs, computed, watch, nextTick } from 'vue';
+import { reactive, toRefs, computed, watch } from 'vue';
 import treeGridNode from './TreeGridNode';
 import Toolbar from './treeGrid.toolbar';
 import {
@@ -227,9 +227,8 @@ export default {
     'update:checked': null,
     'check-row': null,
     'check-all': null,
-    'update-tree-data': null,
   },
-  setup(props, { emit }) {
+  setup(props) {
     const {
       isRenderer,
       getComponentName,
@@ -246,7 +245,8 @@ export default {
     const stores = reactive({
       treeStore: [],
       viewStore: [],
-      treeRows: computed(() => JSON.parse(JSON.stringify(props.rows))),
+      filterStore: [],
+      treeRows: props.rows,
       showTreeStore: computed(() => stores.treeStore.filter(item => item.show)),
       orderedColumns: computed(() =>
         props.columns.map((column, index) => ({ index, ...column }))),
@@ -324,7 +324,7 @@ export default {
     } = contextMenuEvent({ contextInfo, stores, selectInfo });
 
     const {
-      setTreeStore,
+      setTreeNodeStore,
       handleExpand,
     } = treeEvent({ stores, onResize });
 
@@ -359,17 +359,16 @@ export default {
         checkInfo.isHeaderChecked = false;
       },
     );
+    stores.treeStore = setTreeNodeStore();
+
     watch(
       () => props.rows,
-      () => {
-        nextTick(() => {
-          stores.treeStore = [];
-          calculatedColumn();
-          setTreeStore(stores.treeRows, 0, true);
-          updateVScroll();
-          emit('update-tree-data', stores.treeRows);
-        });
-      }, { deep: true, immediate: true },
+      (newData) => {
+        stores.treeRows = newData;
+        stores.treeStore = setTreeNodeStore();
+        onResize();
+        updateVScroll();
+      }, { deep: true },
     );
     watch(
       () => [props.width, props.height, resizeInfo.adjust, props.option.columnWidth],

package/src/components/treeGrid/uses.js

@@ -550,35 +550,71 @@ export const contextMenuEvent = (params) => {
 
 export const treeEvent = (params) => {
   const { stores, onResize } = params;
-  // tree data init
-  let index = 0;
-  const filterObj = (keys, obj) => {
-    const newObj = {};
-    Object.keys(obj).forEach((key) => {
-      if (!keys.includes(key)) {
-        newObj[key] = obj[key];
-      }
-    });
-    return newObj;
-  };
-  const setTreeStore = (rows, count, isShow, parent) => {
-    rows.forEach((nodeObj) => {
-      const node = nodeObj;
-      const dataObj = filterObj('children', nodeObj);
-      node.data = dataObj;
-      node.level = count;
-      node.expand = node.expand === undefined ? true : node.expand;
-      node.show = isShow;
-      node.checked = false;
-      node.index = index++;
-      node.parent = parent;
-      node.isFilter = false;
-      stores.treeStore.push(node);
-      if (node.children && node.children.length > 0) {
-        node.hasChild = true;
-        setTreeStore(node.children, node.level + 1, node.show && node.expand, node);
+  const setTreeNodeStore = () => {
+    let nodeIndex = 0;
+    const nodeList = [];
+
+    function getDataObj(nodeObj) {
+      const newObj = {};
+      Object.keys(nodeObj).forEach((key) => {
+        if (key !== 'children') {
+          newObj[key] = nodeObj[key];
+        }
+      });
+      return newObj;
+    }
+
+    function setNodeData(nodeInfo) {
+      const { node, level, isShow, parent } = nodeInfo;
+      if (node !== null && typeof node === 'object') {
+        node.index = nodeIndex++;
+        node.level = level;
+
+        if (!Object.hasOwnProperty.call(node, 'checked')) {
+          node.checked = false;
+        }
+
+        if (!Object.hasOwnProperty.call(node, 'show')) {
+          node.show = isShow;
+        }
+
+        if (!Object.hasOwnProperty.call(node, 'expand')) {
+          node.expand = true;
+        }
+
+        if (!Object.hasOwnProperty.call(node, 'isFilter')) {
+          node.isFilter = false;
+        }
+
+        if (!Object.hasOwnProperty.call(node, 'data')) {
+          node.data = getDataObj(node);
+        }
+
+        nodeList.push(node);
+
+        if (typeof parent !== 'undefined') {
+          node.parent = parent;
+        }
+        if (node.children) {
+          node.hasChild = true;
+          node.children.forEach(child =>
+            setNodeData({
+              node: child,
+              level: level + 1,
+              isShow: node.show && node.expand,
+              parent: node,
+            }),
+          );
+        }
       }
+    }
+    setNodeData({
+      node: stores.treeRows[0],
+      level: 0,
+      isShow: true,
+      parent: undefined,
     });
+    return nodeList;
   };
   const setExpandNode = (children, isShow, isFilter) => {
     children.forEach((nodeObj) => {
@@ -595,7 +631,7 @@ export const treeEvent = (params) => {
     setExpandNode(data.children, data.expand, data.isFilter);
     onResize();
   };
-  return { setTreeStore, handleExpand };
+  return { setTreeNodeStore, handleExpand };
 };
 
 export const filterEvent = (params) => {