eoss-ui 0.6.31 → 0.6.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.6.31",
+  "version": "0.6.33",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [
@@ -58,6 +58,7 @@
     "interactjs": "^1.10.26",
     "js-base64": "^3.7.5",
     "json-bigint": "^1.0.0",
+    "lodash": "^4.17.21",
     "net": "^1.0.2",
     "qrcode": "1.5.3",
     "qs": "^6.11.2",
@@ -97,7 +98,7 @@
     "cp-cli": "^1.0.2",
     "cross-env": "^3.1.3",
     "css-loader": "^2.1.0",
-    "eoss-element": "^0.3.30",
+    "eoss-element": "^0.3.31",
     "es6-promise": "^4.0.5",
     "eslint": "4.18.2",
     "eslint-config-elemefe": "0.1.1",

package/packages/data-table/src/main.vue

@@ -795,11 +795,13 @@ export default {
     },
     thead: {
       deep: true,
-      handler(val) {
-        this.getOptions(val);
-        this.chekOpenTotalArea();
-        if (Array.isArray(val) && val.length && this.datas.length == 0) {
-          this.getTableData();
+      handler(val, old) {
+        if (!util.isObjectEqual(val, old)) {
+          this.getOptions(val);
+          this.chekOpenTotalArea();
+          if (Array.isArray(val) && val.length && this.datas.length == 0) {
+            this.getTableData();
+          }
         }
       }
     },
@@ -810,8 +812,10 @@ export default {
       }
     },
     param: {
-      handler(val) {
-        this.getTableData();
+      handler(val, old) {
+        if (!util.isObjectEqual(val, old)) {
+          this.getTableData();
+        }
       }
     },
     page: {

package/packages/handle-user/src/main.vue

@@ -75,6 +75,10 @@ export default {
           this.job = val.identityList.filter((item) => {
             return item.id === val.identityId;
           })[0];
+          if (!this.job) {
+            console.error('identityId与identityList中的任何id不匹配！');
+            this.job = {};
+          }
         }
       }
     }

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

@@ -1521,21 +1521,23 @@ export default {
         this.tabs.push(tab);
         this.activeName = res.id;
       } else {
-        let tab = this.tabs[i];
-        if (tab.method === 'iframe') {
-          this.activeName = res.id;
-          this.$set(this.tabs[i], 'url', util.handlerUrl(tab.url));
-        } else {
-          if (tab.method === 'wujie' && tab.appCode) {
-            window.document
-              .querySelector(`iframe[name=${tab.appCode}]`)
-              .contentWindow.location.reload(true);
-          }
-          if (tab.method === 'router') {
-            this.$set(this.tabs[i], 'keys', util.uuid());
-          }
-          this.activeName = res.id;
-        }
+        this.tabs = events[0](this.tabs, i, this);
+        // let tab = this.tabs[i];
+        // if (tab.method === 'iframe') {
+        //   this.activeName = res.id;
+        //   this.$set(this.tabs[i], 'url', util.handlerUrl(tab.url));
+        // } else {
+        //   if (tab.method === 'wujie' && tab.appCode) {
+        //     window.document
+        //       .querySelector(`iframe[name=${tab.appCode}]`)
+        //       .contentWindow.location.reload(true);
+        //   }
+        //   if (tab.method === 'router') {
+        //     this.$set(this.tabs[i], 'keys', util.uuid());
+        //   }
+        //   this.activeName = res.id;
+        // }
+        this.activeName = res.id;
       }
     },
 

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/packages/upload/src/main.vue

@@ -568,14 +568,15 @@ export default {
       return { success: true, error: true };
     },
     profile() {
-      const previewAdjunct = this.dochubConfig
-        ? this.dochubConfig.downloadDocumentUrl
-        : this.previewAdjunct;
+      const previewAdjunct =
+        this.dochubConfig.downloadDocumentUrl || this.previewAdjunct;
       if (this.image) {
         if (typeof this.image === 'string') {
           return this.image;
         }
-        return `${this.host}${previewAdjunct}?documentId=${this.image.adjunctId}&adjunctId=${this.image.adjunctId}`;
+        return `${this.host}${previewAdjunct}?documentId=${
+          this.image.adjunctId
+        }&adjunctId=${this.image.adjunctId}&_tt=${new Date().getTime()}`;
       }
       if (this.value) {
         if (typeof this.value === 'string') {
@@ -590,19 +591,25 @@ export default {
               });
             return val;
           } else if (this.value.indexOf('/') === -1) {
-            return `${this.host}${previewAdjunct}?documentId=${this.value}&adjunctId=${this.value}`;
+            return `${this.host}${previewAdjunct}?documentId=${
+              this.value
+            }&adjunctId=${this.value}&_tt=${new Date().getTime()}`;
           }
           return this.value;
         } else if (Array.isArray(this.value)) {
           let adjunctId = this.value[0].response
             ? this.value[0].response.adjunctId
             : this.value[0].adjunctId;
-          return `${this.host}${previewAdjunct}?documentId=${adjunctId}&adjunctId=${adjunctId}`;
+          return `${
+            this.host
+          }${previewAdjunct}?documentId=${adjunctId}&adjunctId=${adjunctId}&_tt=${new Date().getTime()}`;
         } else {
           let adjunctId = this.value.response
             ? this.value.response.adjunctId
             : this.value.adjunctId;
-          return `${this.host}${previewAdjunct}?documentId=${adjunctId}&adjunctId=${adjunctId}`;
+          return `${
+            this.host
+          }${previewAdjunct}?documentId=${adjunctId}&adjunctId=${adjunctId}&_tt=${new Date().getTime()}`;
         }
       }
       if (this.photo && typeof this.photo === 'string') {
@@ -617,7 +624,9 @@ export default {
             });
           return val;
         } else if (this.photo.indexOf('/') === -1) {
-          return `${this.host}${previewAdjunct}?documentId=${this.photo}&adjunctId=${this.photo}`;
+          return `${this.host}${previewAdjunct}?documentId=${
+            this.photo
+          }&adjunctId=${this.photo}&_tt=${new Date().getTime()}`;
         }
       }
       return this.photo;

package/src/index.js

@@ -121,7 +121,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.6.31',
+  version: '0.6.33',
   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);
 };
 
 /**