eoss-ui 0.6.32 → 0.6.34

package/packages/main/src/simplicity/index.vue

@@ -1166,7 +1166,11 @@ export default {
             if (item[key] === res) {
               return item;
             }
-          } else if (item.url === res || item.id === res) {
+          } else if (
+            item.url === res ||
+            item.id === res ||
+            (item.appCode && item.appCode === res)
+          ) {
             return item;
           }
           if (
@@ -1889,8 +1893,12 @@ export default {
     },
     jumpMenu(res, close) {
       let apps = res;
+      let param = null;
       if (typeof res === 'string') {
         apps = res.split(',');
+      } else if (typeof res === 'object') {
+        apps = res.appCode.split(',');
+        param = res.param;
       }
       let obj = this.getMenu(this.menus, apps[apps.length - 1]);
       if (obj) {
@@ -1900,18 +1908,26 @@ export default {
         this.activeName = obj.id;
         if (i == -1) {
           let tab = this.setIframeType(obj);
+          this.$set(tab, 'url', util.handlerUrl(tab.url, param));
           this.tabs.splice(n + 1, 0, tab);
         } else {
           let tab = this.tabs[i];
           if (tab.method === 'iframe') {
-            this.$set(this.tabs[i], 'url', util.handlerUrl(tab.url));
+            this.$set(this.tabs[i], 'url', util.handlerUrl(tab.url, param));
           }
           if (tab.method === 'wujie' && tab.appCode) {
-            window.document
-              .querySelector(`iframe[name=${tab.appCode}]`)
-              .contentWindow.location.reload(true);
+            if (param) {
+              window.document.querySelector(
+                `iframe[name=${tab.appCode}]`
+              ).contentWindow.location.href = util.handlerUrl(tab.url, param);
+            } else {
+              window.document
+                .querySelector(`iframe[name=${tab.appCode}]`)
+                .contentWindow.location.reload(true);
+            }
           }
           if (tab.method === 'router') {
+            this.$set(this.tabs[i], 'url', util.handlerUrl(tab.url, param));
             this.$set(this.tabs[i], 'keys', util.uuid());
           }
         }

package/packages/tree/src/main.vue

@@ -374,8 +374,10 @@ export default {
     },
     where: {
       deep: true,
-      handler() {
-        this.getTreeData();
+      handler(val, old) {
+        if (!util.isObjectEqual(val, old)) {
+          this.getTreeData();
+        }
       }
     }
   },
@@ -562,7 +564,7 @@ export default {
           this.$message({
             showClose: true,
             message: '已达最大选择个数',
-            type: 'waring'
+            type: 'warning'
           });
         }
       }

package/packages/tree-group/src/main.vue

@@ -117,13 +117,7 @@
           v-else-if="table"
           size="mini"
           :mode="mode"
-          v-bind="
-            handleExclAttribute({
-              data: { close: true, ...table },
-              attrs: ['param']
-            })
-          "
-          :param="params"
+          v-bind="{ close: true, ...table, param: params }"
           :ref="table.ref ? table.ref : 'esDataTable'"
           v-on="{ ...$listeners, ...table.events }"
         >
@@ -296,7 +290,7 @@ export default {
       handler(val) {
         if (val !== undefined && this.tabs && this.tabs.length) {
           if (typeof val === 'string') {
-            for (let i = 0; i < this.tabs.lengt; i++) {
+            for (let i = 0; i < this.tabs.length; i++) {
               if (val === this.tabs[i].name) {
                 this.active = String(i);
               }

package/src/index.js

@@ -121,7 +121,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.6.32',
+  version: '0.6.34',
   install,
   Button,
   ButtonGroup,

package/src/utils/util.js

@@ -7,6 +7,7 @@
 
 /* eslint-disable indent */
 const sm2 = require('sm-crypto').sm2;
+const lodash = require('lodash');
 import { authCenter, mainConfig, logout } from '../config/api';
 import axios from 'axios';
 import qs from 'qs';
@@ -2438,24 +2439,7 @@ const isObject = function (obj) {
  * @param {Object} [_obj] - 对象
  **/
 const isObjectEqual = function (obj, _obj) {
-  if (
-    (obj === undefined && _obj) ||
-    (obj && _obj === undefined) ||
-    (obj === undefined && _obj === undefined)
-  ) {
-    return false;
-  }
-  var aProps = Object.getOwnPropertyNames(obj);
-  var bProps = Object.getOwnPropertyNames(_obj);
-  if (aProps.length !== bProps.length) {
-    return false;
-  }
-  for (let i in obj) {
-    if (obj[i] !== _obj[i]) {
-      return false;
-    }
-  }
-  return true;
+  return lodash.isEqual(obj, _obj);
 };
 
 /**