eoss-ui 0.4.31 → 0.4.33

package/lib/tips.js

@@ -126,6 +126,7 @@ var $brightnessStep2 = 0.15;
 var $lightColorCount = 5;
 var $darkColorCount = 4;
 var publicKey = 'abcdefghijklmnopqrstuvwxyz12345678';
+var loginMsg = void 0;
 
 var JSONbigToString = json_bigint__WEBPACK_IMPORTED_MODULE_3___default()({ storeAsString: true });
 
@@ -147,7 +148,6 @@ var JSONbigToString = json_bigint__WEBPACK_IMPORTED_MODULE_3___default()({ store
  * @param {Object} [loading] - loading加载对象
  **/
 // 请求
-var _timer = null;
 var pendingRequest = new Map();
 function getRequestKey(config) {
   var method = config.method,
@@ -246,44 +246,36 @@ var ajax = function ajax(_ref) {
     if (response.status === 200) {
       if (response.data.rCode === 64 || response.data.rCode === 65 || response.data.rCode === 67 || response.data.rCode === 69) {
         removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'deviceUnique', 'menus', 'menus', 'useCaseCodes', 'mainConfig']);
-
-        var 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) {
-          sessionStorage.setItem('timer', 1);
-          eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].confirm(response.data.rCode === 69 ? '该账号在其他地方已登陆!' : '登录已过期，请重新登录!', '提示', response.data.rCode === 69 ? {
-            confirmButtonText: '确定',
-            closeOnClickModal: false,
-            type: 'warning'
-          } : {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            closeOnClickModal: false,
-            type: 'warning'
-          }).then(function () {
-            var 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 {
-              var hash = win.top.location.hash;
-              if (hash || win.top.location.indexOf('model=') && win.top.location.indexOf('view=') && win.top.location.indexOf('render.html')) {
-                var len = win.top.location.href.indexOf(hash);
-                var href = win.top.location.href.slice(0, len) + '#/login';
-                win.top.location.href = href;
+        if (win.top.location.href.indexOf('#/login') === -1 && win.top.location.href.indexOf('/login.html') === -1) {
+          clearTimeout(loginMsg);
+          loginMsg = setTimeout(function () {
+            eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].confirm(response.data.rCode === 69 ? '该账号在其他地方已登陆!' : '登录已过期，请重新登录!', '提示', response.data.rCode === 69 ? {
+              confirmButtonText: '确定',
+              closeOnClickModal: false,
+              type: 'warning'
+            } : {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              closeOnClickModal: false,
+              type: 'warning'
+            }).then(function () {
+              var 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';
+                var hash = win.top.location.hash;
+                if (hash || win.top.location.indexOf('model=') && win.top.location.indexOf('view=') && win.top.location.indexOf('render.html')) {
+                  var len = win.top.location.href.indexOf(hash);
+                  var href = win.top.location.href.slice(0, len) + '#/login';
+                  win.top.location.href = href;
+                } else {
+                  win.top.location.href = '/login.html';
+                }
               }
-            }
-          }).catch(function (e) {
-            _timer && clearTimeout(_timer);
-            _timer = setTimeout(function () {
-              removeStorage('timer');
-              clearTimeout(_timer);
-              _timer = null;
-            }, 1000);
-          });
+            }).catch(function (e) {});
+          }, 1000);
         }
         return Promise.reject(response.data);
       } else {
@@ -427,31 +419,11 @@ var browser = function browser() {
  * @param {Boolean} [immediate] - 是否首次触发执行
  **/
 
-var debounce = function debounce(fn, wait, immediate) {
-  var timeout = void 0;
+var debounce = function debounce(callback, delay) {
+  var timeout = null;
   return function () {
-    var self = this;
-    var args = arguments;
-
-    if (timeout) clearTimeout(timeout);
-    // 是否在某一批事件中首次执行
-    if (immediate) {
-      var 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);
   };
 };
 /**

package/lib/tree-group.js

@@ -126,6 +126,7 @@ var $brightnessStep2 = 0.15;
 var $lightColorCount = 5;
 var $darkColorCount = 4;
 var publicKey = 'abcdefghijklmnopqrstuvwxyz12345678';
+var loginMsg = void 0;
 
 var JSONbigToString = json_bigint__WEBPACK_IMPORTED_MODULE_3___default()({ storeAsString: true });
 
@@ -147,7 +148,6 @@ var JSONbigToString = json_bigint__WEBPACK_IMPORTED_MODULE_3___default()({ store
  * @param {Object} [loading] - loading加载对象
  **/
 // 请求
-var _timer = null;
 var pendingRequest = new Map();
 function getRequestKey(config) {
   var method = config.method,
@@ -246,44 +246,36 @@ var ajax = function ajax(_ref) {
     if (response.status === 200) {
       if (response.data.rCode === 64 || response.data.rCode === 65 || response.data.rCode === 67 || response.data.rCode === 69) {
         removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'deviceUnique', 'menus', 'menus', 'useCaseCodes', 'mainConfig']);
-
-        var 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) {
-          sessionStorage.setItem('timer', 1);
-          eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].confirm(response.data.rCode === 69 ? '该账号在其他地方已登陆!' : '登录已过期，请重新登录!', '提示', response.data.rCode === 69 ? {
-            confirmButtonText: '确定',
-            closeOnClickModal: false,
-            type: 'warning'
-          } : {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            closeOnClickModal: false,
-            type: 'warning'
-          }).then(function () {
-            var 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 {
-              var hash = win.top.location.hash;
-              if (hash || win.top.location.indexOf('model=') && win.top.location.indexOf('view=') && win.top.location.indexOf('render.html')) {
-                var len = win.top.location.href.indexOf(hash);
-                var href = win.top.location.href.slice(0, len) + '#/login';
-                win.top.location.href = href;
+        if (win.top.location.href.indexOf('#/login') === -1 && win.top.location.href.indexOf('/login.html') === -1) {
+          clearTimeout(loginMsg);
+          loginMsg = setTimeout(function () {
+            eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].confirm(response.data.rCode === 69 ? '该账号在其他地方已登陆!' : '登录已过期，请重新登录!', '提示', response.data.rCode === 69 ? {
+              confirmButtonText: '确定',
+              closeOnClickModal: false,
+              type: 'warning'
+            } : {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              closeOnClickModal: false,
+              type: 'warning'
+            }).then(function () {
+              var 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';
+                var hash = win.top.location.hash;
+                if (hash || win.top.location.indexOf('model=') && win.top.location.indexOf('view=') && win.top.location.indexOf('render.html')) {
+                  var len = win.top.location.href.indexOf(hash);
+                  var href = win.top.location.href.slice(0, len) + '#/login';
+                  win.top.location.href = href;
+                } else {
+                  win.top.location.href = '/login.html';
+                }
               }
-            }
-          }).catch(function (e) {
-            _timer && clearTimeout(_timer);
-            _timer = setTimeout(function () {
-              removeStorage('timer');
-              clearTimeout(_timer);
-              _timer = null;
-            }, 1000);
-          });
+            }).catch(function (e) {});
+          }, 1000);
         }
         return Promise.reject(response.data);
       } else {
@@ -427,31 +419,11 @@ var browser = function browser() {
  * @param {Boolean} [immediate] - 是否首次触发执行
  **/
 
-var debounce = function debounce(fn, wait, immediate) {
-  var timeout = void 0;
+var debounce = function debounce(callback, delay) {
+  var timeout = null;
   return function () {
-    var self = this;
-    var args = arguments;
-
-    if (timeout) clearTimeout(timeout);
-    // 是否在某一批事件中首次执行
-    if (immediate) {
-      var 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);
   };
 };
 /**
@@ -2706,7 +2678,7 @@ module.exports = require("json-bigint");
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/tree-group/src/main.vue?vue&type=template&id=3a8a2abe&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/tree-group/src/main.vue?vue&type=template&id=67920e49&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -2766,6 +2738,7 @@ var render = function () {
                               on: {
                                 "node-click": _vm.handleNodeClick,
                                 "check-change": _vm.handleCheckChange,
+                                "current-first": _vm.handleCurrentFirst,
                               },
                             },
                             "es-tree",
@@ -2821,6 +2794,7 @@ var render = function () {
                       on: {
                         "node-click": _vm.handleNodeClick,
                         "check-change": _vm.handleCheckChange,
+                        "current-first": _vm.handleCurrentFirst,
                       },
                     },
                     "es-tree",
@@ -3023,7 +2997,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/tree-group/src/main.vue?vue&type=template&id=3a8a2abe&
+// CONCATENATED MODULE: ./packages/tree-group/src/main.vue?vue&type=template&id=67920e49&
 
 // EXTERNAL MODULE: ./src/utils/util.js
 var util = __webpack_require__(0);
@@ -3178,6 +3152,8 @@ var util = __webpack_require__(0);
 //
 //
 //
+//
+//
 
 
 /* harmony default export */ var mainvue_type_script_lang_js_ = ({
@@ -3433,6 +3409,10 @@ var util = __webpack_require__(0);
     handleConfirm: function handleConfirm(res) {
       this.checkeds = res;
       this.$emit('enterprise-confirm', res);
+    },
+    handleCurrentFirst: function handleCurrentFirst(res) {
+      this.checkeds = res.children[0];
+      this.$emit('current-first', res);
     }
   }
 });

package/lib/tree.js

@@ -126,6 +126,7 @@ var $brightnessStep2 = 0.15;
 var $lightColorCount = 5;
 var $darkColorCount = 4;
 var publicKey = 'abcdefghijklmnopqrstuvwxyz12345678';
+var loginMsg = void 0;
 
 var JSONbigToString = json_bigint__WEBPACK_IMPORTED_MODULE_3___default()({ storeAsString: true });
 
@@ -147,7 +148,6 @@ var JSONbigToString = json_bigint__WEBPACK_IMPORTED_MODULE_3___default()({ store
  * @param {Object} [loading] - loading加载对象
  **/
 // 请求
-var _timer = null;
 var pendingRequest = new Map();
 function getRequestKey(config) {
   var method = config.method,
@@ -246,44 +246,36 @@ var ajax = function ajax(_ref) {
     if (response.status === 200) {
       if (response.data.rCode === 64 || response.data.rCode === 65 || response.data.rCode === 67 || response.data.rCode === 69) {
         removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'deviceUnique', 'menus', 'menus', 'useCaseCodes', 'mainConfig']);
-
-        var 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) {
-          sessionStorage.setItem('timer', 1);
-          eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].confirm(response.data.rCode === 69 ? '该账号在其他地方已登陆!' : '登录已过期，请重新登录!', '提示', response.data.rCode === 69 ? {
-            confirmButtonText: '确定',
-            closeOnClickModal: false,
-            type: 'warning'
-          } : {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            closeOnClickModal: false,
-            type: 'warning'
-          }).then(function () {
-            var 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 {
-              var hash = win.top.location.hash;
-              if (hash || win.top.location.indexOf('model=') && win.top.location.indexOf('view=') && win.top.location.indexOf('render.html')) {
-                var len = win.top.location.href.indexOf(hash);
-                var href = win.top.location.href.slice(0, len) + '#/login';
-                win.top.location.href = href;
+        if (win.top.location.href.indexOf('#/login') === -1 && win.top.location.href.indexOf('/login.html') === -1) {
+          clearTimeout(loginMsg);
+          loginMsg = setTimeout(function () {
+            eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].confirm(response.data.rCode === 69 ? '该账号在其他地方已登陆!' : '登录已过期，请重新登录!', '提示', response.data.rCode === 69 ? {
+              confirmButtonText: '确定',
+              closeOnClickModal: false,
+              type: 'warning'
+            } : {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              closeOnClickModal: false,
+              type: 'warning'
+            }).then(function () {
+              var 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';
+                var hash = win.top.location.hash;
+                if (hash || win.top.location.indexOf('model=') && win.top.location.indexOf('view=') && win.top.location.indexOf('render.html')) {
+                  var len = win.top.location.href.indexOf(hash);
+                  var href = win.top.location.href.slice(0, len) + '#/login';
+                  win.top.location.href = href;
+                } else {
+                  win.top.location.href = '/login.html';
+                }
               }
-            }
-          }).catch(function (e) {
-            _timer && clearTimeout(_timer);
-            _timer = setTimeout(function () {
-              removeStorage('timer');
-              clearTimeout(_timer);
-              _timer = null;
-            }, 1000);
-          });
+            }).catch(function (e) {});
+          }, 1000);
         }
         return Promise.reject(response.data);
       } else {
@@ -427,31 +419,11 @@ var browser = function browser() {
  * @param {Boolean} [immediate] - 是否首次触发执行
  **/
 
-var debounce = function debounce(fn, wait, immediate) {
-  var timeout = void 0;
+var debounce = function debounce(callback, delay) {
+  var timeout = null;
   return function () {
-    var self = this;
-    var args = arguments;
-
-    if (timeout) clearTimeout(timeout);
-    // 是否在某一批事件中首次执行
-    if (immediate) {
-      var 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);
   };
 };
 /**
@@ -2699,7 +2671,7 @@ module.exports = require("eoss-element");
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/tree/src/main.vue?vue&type=template&id=8b6f2062&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/tree/src/main.vue?vue&type=template&id=6e8d7069&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -2847,6 +2819,7 @@ var render = function () {
                             "expand-on-click-node": false,
                             "highlight-current": true,
                             "show-checkbox": _vm.showCheckbox,
+                            "current-node-key": _vm.currentNodeKey,
                           },
                           scopedSlots: _vm._u([
                             {
@@ -2891,7 +2864,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/tree/src/main.vue?vue&type=template&id=8b6f2062&
+// CONCATENATED MODULE: ./packages/tree/src/main.vue?vue&type=template&id=6e8d7069&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -2983,6 +2956,7 @@ var util = __webpack_require__(0);
 //
 //
 //
+//
 
 
 
@@ -3043,6 +3017,8 @@ var util = __webpack_require__(0);
     },
     // 	选择项本地数据
     data: Array,
+    currentFirst: Boolean,
+    currentNodeKey: [String, Number],
     icon: {
       type: Boolean,
       default: true
@@ -3268,6 +3244,15 @@ var util = __webpack_require__(0);
         _this.loading = false;
         if (res.rCode === 0) {
           _this.treeList = JSON.parse(JSON.stringify(res.results));
+          if (_this.currentFirst) {
+            var currentNode = _this.treeList[0].children[0].id;
+            _this.$emit('current-first', _this.treeList[0]);
+            if (!_this.currentNodeKey) {
+              _this.$nextTick(function () {
+                _this.$refs.oaTree.setCurrentKey(currentNode);
+              });
+            }
+          }
           _this.expandedKeys = _this.treeList.filter(function (item) {
             if (item.open) {
               return item.id;