eoss-ui 0.4.31 → 0.4.33

package/packages/theme-chalk/src/form.scss

@@ -231,7 +231,7 @@
         color: #c0c4cc;
         line-height: 40px;
       }
-      & > div:not(.es-range) {
+      & > div:not(.es-range):not(.es-flex-none) {
         flex: 1;
       }
     }

package/packages/tree/src/main.vue

@@ -61,6 +61,7 @@
           :expand-on-click-node="false"
           :highlight-current="true"
           :show-checkbox="showCheckbox"
+          :current-node-key="currentNodeKey"
           v-on="{
             ...$listeners,
             'node-click': handleNodeClick,
@@ -159,6 +160,8 @@ export default {
     },
     // 	选择项本地数据
     data: Array,
+    currentFirst: Boolean,
+    currentNodeKey: [String, Number],
     icon: {
       type: Boolean,
       default: true
@@ -381,6 +384,15 @@ export default {
           this.loading = false;
           if (res.rCode === 0) {
             this.treeList = JSON.parse(JSON.stringify(res.results));
+            if (this.currentFirst) {
+              let currentNode = this.treeList[0].children[0].id;
+              this.$emit('current-first', this.treeList[0]);
+              if (!this.currentNodeKey) {
+                this.$nextTick(() => {
+                  this.$refs.oaTree.setCurrentKey(currentNode);
+                });
+              }
+            }
             this.expandedKeys = this.treeList.filter((item) => {
               if (item.open) {
                 return item.id;

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

@@ -25,6 +25,7 @@
             :ref="item.ref ? item.ref : 'groupTree' + index"
             @node-click="handleNodeClick"
             @check-change="handleCheckChange"
+            @current-first="handleCurrentFirst"
             v-on="item.tree && item.tree.events ? item.tree.events : {}"
           >
             <template v-if="item.enterprise" slot="filtrate">
@@ -48,6 +49,7 @@
         ref="groupTree"
         @node-click="handleNodeClick"
         @check-change="handleCheckChange"
+        @current-first="handleCurrentFirst"
         v-on="tree.events ? tree.events : {}"
       >
         <template v-if="enterprise" slot="filtrate">
@@ -432,6 +434,10 @@ export default {
     handleConfirm(res) {
       this.checkeds = res;
       this.$emit('enterprise-confirm', res);
+    },
+    handleCurrentFirst(res) {
+      this.checkeds = res.children[0];
+      this.$emit('current-first', res);
     }
   }
 };

package/packages/upload/src/main.vue

@@ -542,12 +542,14 @@ export default {
           return this.image;
         }
         return (
-          this.host + previewAdjunct + '?adjunctId=' + this.image.adjunctId
+          this.host + this.previewAdjunct + '?adjunctId=' + this.image.adjunctId
         );
       }
       if (this.value) {
         if (typeof this.value === 'string') {
-          if (this.value.indexOf('data:image/') === -1) {
+          if (this.value.indexOf('data:image/') === 0) {
+            return this.value;
+          } else if (this.value.indexOf(this.previewAdjunct) > -1) {
             let val =
               this.host +
               util.jointUrl({
@@ -555,38 +557,36 @@ export default {
                 reg: '/main2'
               });
             return val;
-          }
-          if (
-            this.value.indexOf(previewAdjunct) === -1 ||
-            this.value.indexOf('/') === -1
-          ) {
-            return this.host + previewAdjunct + '?adjunctId=' + this.value;
+          } else if (this.value.indexOf('/') === -1) {
+            return this.host + this.previewAdjunct + '?adjunctId=' + this.value;
           }
           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 + '?adjunctId=' + adjunctId;
+          return this.host + this.previewAdjunct + '?adjunctId=' + adjunctId;
         } else {
           let adjunctId = this.value.response
             ? this.value.response.adjunctId
             : this.value.adjunctId;
-          return this.host + previewAdjunct + '?adjunctId=' + adjunctId;
+          return this.host + this.previewAdjunct + '?adjunctId=' + adjunctId;
         }
       }
-      if (
-        this.photo &&
-        typeof this.photo === 'string' &&
-        this.photo.indexOf('data:image/') === -1
-      ) {
-        let val =
-          this.host +
-          util.jointUrl({
-            url: this.photo,
-            reg: '/main2'
-          });
-        return val;
+      if (this.photo && typeof this.photo === 'string') {
+        if (this.photo.indexOf('data:image/') === 0) {
+          return this.photo;
+        } else if (this.photo.indexOf(this.previewAdjunct) > -1) {
+          let val =
+            this.host +
+            util.jointUrl({
+              url: this.value,
+              reg: '/main2'
+            });
+          return val;
+        } else if (this.photo.indexOf('/') === -1) {
+          return this.host + this.previewAdjunct + '?adjunctId=' + this.photo;
+        }
       }
       return this.photo;
     }
@@ -782,7 +782,7 @@ export default {
             ) {
               this.imgUrl =
                 this.host +
-                (url ? url : previewAdjunct) +
+                (url ? url : this.previewAdjunct) +
                 '?adjunctId=' +
                 file.adjunctId;
               this.title = file.originalName;
@@ -794,7 +794,7 @@ export default {
               this.source = {
                 src:
                   this.host +
-                  (url ? url : previewAdjunct) +
+                  (url ? url : this.previewAdjunct) +
                   '?adjunctId=' +
                   file.adjunctId
               };
@@ -803,7 +803,7 @@ export default {
             } else {
               util.win.open(
                 this.host +
-                  (url ? url : previewAdjunct) +
+                  (url ? url : this.previewAdjunct) +
                   '?adjunctId=' +
                   file.adjunctId
               );

package/src/index.js

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

package/src/utils/util.js

@@ -22,6 +22,7 @@ const $brightnessStep2 = 0.15;
 const $lightColorCount = 5;
 const $darkColorCount = 4;
 const publicKey = 'abcdefghijklmnopqrstuvwxyz12345678';
+let loginMsg;
 
 const JSONbigToString = JSONbig({ storeAsString: true });
 import { MessageBox, Loading } from 'eoss-element';
@@ -43,7 +44,6 @@ import { MessageBox, Loading } from 'eoss-element';
  * @param {Object} [loading] - loading加载对象
  **/
 // 请求
-let _timer = null;
 const pendingRequest = new Map();
 function getRequestKey(config) {
   const { method, url, params, data } = config;
@@ -169,63 +169,55 @@ const ajax = function ({
             'useCaseCodes',
             'mainConfig'
           ]);
-
-          let timer = getStorage('timer') || 0;
-          timer = parseInt(timer, 10);
           if (
             win.top.location.href.indexOf('#/login') === -1 &&
-            win.top.location.href.indexOf('/login.html') === -1 &&
-            !timer
+            win.top.location.href.indexOf('/login.html') === -1
           ) {
-            sessionStorage.setItem('timer', 1);
-            MessageBox.confirm(
-              response.data.rCode === 69
-                ? '该账号在其他地方已登陆!'
-                : '登录已过期，请重新登录!',
-              '提示',
-              response.data.rCode === 69
-                ? {
-                  confirmButtonText: '确定',
-                  closeOnClickModal: false,
-                  type: 'warning'
-                }
-                : {
-                  confirmButtonText: '确定',
-                  cancelButtonText: '取消',
-                  closeOnClickModal: false,
-                  type: 'warning'
-                }
-            )
-              .then(() => {
-                const loginPage = getStorage('login') || getStorage('loginPage');
-                if (loginPage) {
-                  win.top.location.href = loginPage;
-                } else if (win.top.location.href.indexOf('main.html') > -1) {
-                  win.top.location.href = './login.html';
-                } else {
-                  const hash = win.top.location.hash;
-                  if (
-                    hash ||
-                    (win.top.location.indexOf('model=') &&
-                      win.top.location.indexOf('view=') &&
-                      win.top.location.indexOf('render.html'))
-                  ) {
-                    const len = win.top.location.href.indexOf(hash);
-                    let href = win.top.location.href.slice(0, len) + '#/login';
-                    win.top.location.href = href;
+            clearTimeout(loginMsg);
+            loginMsg = setTimeout(() => {
+              MessageBox.confirm(
+                response.data.rCode === 69
+                  ? '该账号在其他地方已登陆!'
+                  : '登录已过期，请重新登录!',
+                '提示',
+                response.data.rCode === 69
+                  ? {
+                    confirmButtonText: '确定',
+                    closeOnClickModal: false,
+                    type: 'warning'
+                  }
+                  : {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    closeOnClickModal: false,
+                    type: 'warning'
+                  }
+              )
+                .then(() => {
+                  const loginPage = getStorage('login') || getStorage('loginPage');
+                  if (loginPage) {
+                    win.top.location.href = loginPage;
+                  } else if (win.top.location.href.indexOf('main.html') > -1) {
+                    win.top.location.href = './login.html';
                   } else {
-                    win.top.location.href = '/login.html';
+                    const hash = win.top.location.hash;
+                    if (
+                      hash ||
+                      (win.top.location.indexOf('model=') &&
+                        win.top.location.indexOf('view=') &&
+                        win.top.location.indexOf('render.html'))
+                    ) {
+                      const len = win.top.location.href.indexOf(hash);
+                      let href = win.top.location.href.slice(0, len) + '#/login';
+                      win.top.location.href = href;
+                    } else {
+                      win.top.location.href = '/login.html';
+                    }
                   }
-                }
-              })
-              .catch(e => {
-                _timer && clearTimeout(_timer);
-                _timer = setTimeout(() => {
-                  removeStorage('timer');
-                  clearTimeout(_timer);
-                  _timer = null;
-                }, 1000);
-              });
+                })
+                .catch(e => {
+                });
+            }, 1000);
           }
           return Promise.reject(response.data);
         } else {
@@ -371,32 +363,13 @@ const browser = function () {
  * @param {Boolean} [immediate] - 是否首次触发执行
  **/
 
-const debounce = function (fn, wait, immediate) {
-  let timeout;
+const debounce = function (callback, delay) {
+  var timeout = null;
   return function () {
-    let self = this;
-    let args = arguments;
-
-    if (timeout) clearTimeout(timeout);
-    // 是否在某一批事件中首次执行
-    if (immediate) {
-      let callNow = !timeout;
-      timeout = setTimeout(function () {
-        timeout = null;
-        fn.apply(self, args);
-        immediate = true;
-      }, wait);
-      if (callNow) {
-        fn.apply(self, args);
-      }
-      immediate = false;
-    } else {
-      timeout = setTimeout(function () {
-        fn.apply(self, args);
-        immediate = true;
-      }, wait);
-    }
+    clearTimeout(timeout);
+    timeout = setTimeout(callback, delay ? delay : 500);
   };
+
 };
 /**
  * delUrlParam