eoss-ui 0.5.56 → 0.5.59

package/lib/tree.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 65);
+/******/ 	return __webpack_require__(__webpack_require__.s = 66);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -1974,7 +1974,45 @@ var indexOfObj = function indexOfObj(arry, target, key) {
   }
   return -1;
 };
+/**
+ * isEmpty
+ * @desc:判断是否为空
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {Object} [obj] -
+ **/
+var isEmpty = function isEmpty(val) {
+  // null or undefined
+  if (val === null || val === undefined) return true;
+
+  if (typeof val === 'boolean') return false;
+
+  if (typeof val === 'number') return !val;
+
+  if (val instanceof Error) return val.message === '';
 
+  switch (Object.prototype.toString.call(val)) {
+    // String or Array
+    case '[object String]':
+    case '[object Array]':
+      return !val.length;
+
+    // Map or Set or File
+    case '[object File]':
+    case '[object Map]':
+    case '[object Set]':
+      {
+        return !val.size;
+      }
+    // Plain Object
+    case '[object Object]':
+      {
+        return !Object.keys(val).length;
+      }
+  }
+
+  return false;
+};
 /**
  * isExist
  * @desc:判断是否存在
@@ -2005,7 +2043,7 @@ var isFunction = function isFunction(obj) {
  * @param {object} [to] - 路由跳转信息
  * @param {object} [from] - 路由来源信息
  * @param {function} [next] - 跳转函数
- * @param {array} [exclude] - 不拦截的路由
+ * @param {array/boolean} [exclude] - 不拦截的路由
  * @param {boolean} [open] - 是否新窗口打开
  * @param {boolean} [cookie] - 是否尝试采用
  * @param {sting} [loginPage] - 第三方登录页面地址
@@ -2158,7 +2196,7 @@ var isLogined = function isLogined(_ref8) {
           });
         }
       }).catch(function (e) {});
-    } else if (token || to.path === '/' || to.path === '/404' || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
+    } else if (token || to.path === '/' || to.path === '/404' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
       if (redirect && (to.path === '/main' || to.path === '/login')) {
         window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
       } else {
@@ -3055,6 +3093,7 @@ var watermark = function watermark(option) {
   hsvTorgb: hsvTorgb,
   identical: identical,
   indexOfObj: indexOfObj,
+  isEmpty: isEmpty,
   isExist: isExist,
   isFunction: isFunction,
   isLogged: isLogged,
@@ -3583,14 +3622,14 @@ module.exports = require("json-bigint");
 
 /***/ }),
 
-/***/ 65:
+/***/ 66:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 // 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=6991bbb6&
+// 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=9f4d1ddc&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3791,7 +3830,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/tree/src/main.vue?vue&type=template&id=6991bbb6&
+// CONCATENATED MODULE: ./packages/tree/src/main.vue?vue&type=template&id=9f4d1ddc&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -4096,6 +4135,7 @@ var util = __webpack_require__(0);
         return {};
       }
     },
+    parseData: Function,
     onLoadsub: Function,
     parseParams: Function,
     onNodeClick: Function,
@@ -4186,7 +4226,7 @@ var util = __webpack_require__(0);
       }).then(function (res) {
         _this.loading = false;
         if (res.rCode === 0) {
-          var treeList = JSON.parse(JSON.stringify(res.results));
+          var treeList = _this.parseData ? _this.parseData(JSON.parse(JSON.stringify(res.results)), 'results') : JSON.parse(JSON.stringify(res.results));
           _this.$emit('results', treeList);
           if (_this.currentFirst) {
             var currentNode = treeList[0].id;
@@ -4212,6 +4252,7 @@ var util = __webpack_require__(0);
           _this.treeList = treeList;
         }
       }).catch(function (err) {
+        _this.loading = false;
         if (err.message && err.message !== 'canceled') {
           _this.$message.error(err.message);
         }
@@ -4246,7 +4287,7 @@ var util = __webpack_require__(0);
           }).then(function (res) {
             if (res.rCode === 0) {
               _this2.loading = false;
-              var results = JSON.parse(JSON.stringify(res.results));
+              var results = _this2.parseData ? _this2.parseData(JSON.parse(JSON.stringify(res.results)), 'sub-results') : JSON.parse(JSON.stringify(res.results));
               _this2.$emit('sub-results', results);
               if (Array.isArray(results)) {
                 if (data.id === results[0].id) {

package/lib/upload.js

@@ -1973,7 +1973,45 @@ var indexOfObj = function indexOfObj(arry, target, key) {
   }
   return -1;
 };
+/**
+ * isEmpty
+ * @desc:判断是否为空
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {Object} [obj] -
+ **/
+var isEmpty = function isEmpty(val) {
+  // null or undefined
+  if (val === null || val === undefined) return true;
+
+  if (typeof val === 'boolean') return false;
+
+  if (typeof val === 'number') return !val;
+
+  if (val instanceof Error) return val.message === '';
 
+  switch (Object.prototype.toString.call(val)) {
+    // String or Array
+    case '[object String]':
+    case '[object Array]':
+      return !val.length;
+
+    // Map or Set or File
+    case '[object File]':
+    case '[object Map]':
+    case '[object Set]':
+      {
+        return !val.size;
+      }
+    // Plain Object
+    case '[object Object]':
+      {
+        return !Object.keys(val).length;
+      }
+  }
+
+  return false;
+};
 /**
  * isExist
  * @desc:判断是否存在
@@ -2004,7 +2042,7 @@ var isFunction = function isFunction(obj) {
  * @param {object} [to] - 路由跳转信息
  * @param {object} [from] - 路由来源信息
  * @param {function} [next] - 跳转函数
- * @param {array} [exclude] - 不拦截的路由
+ * @param {array/boolean} [exclude] - 不拦截的路由
  * @param {boolean} [open] - 是否新窗口打开
  * @param {boolean} [cookie] - 是否尝试采用
  * @param {sting} [loginPage] - 第三方登录页面地址
@@ -2157,7 +2195,7 @@ var isLogined = function isLogined(_ref8) {
           });
         }
       }).catch(function (e) {});
-    } else if (token || to.path === '/' || to.path === '/404' || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
+    } else if (token || to.path === '/' || to.path === '/404' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
       if (redirect && (to.path === '/main' || to.path === '/login')) {
         window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
       } else {
@@ -3054,6 +3092,7 @@ var watermark = function watermark(option) {
   hsvTorgb: hsvTorgb,
   identical: identical,
   indexOfObj: indexOfObj,
+  isEmpty: isEmpty,
   isExist: isExist,
   isFunction: isFunction,
   isLogged: isLogged,
@@ -3781,8 +3820,8 @@ module.exports = require("js-base64");
 // 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/upload/src/main.vue?vue&type=template&id=49429871&
-var mainvue_type_template_id_49429871_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/main.vue?vue&type=template&id=789e2154&
+var mainvue_type_template_id_789e2154_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4163,10 +4202,10 @@ var mainvue_type_template_id_49429871_render = function () {
     : _vm._e()
 }
 var staticRenderFns = []
-mainvue_type_template_id_49429871_render._withStripped = true
+mainvue_type_template_id_789e2154_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=49429871&
+// CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=789e2154&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -4693,7 +4732,6 @@ var _props;
       return this.readonly || (this.elForm || {}).readonly;
     },
     isRemove: function isRemove() {
-      console.log(this.remove, this.deleted, 999);
       if (this.remove == false || this.deleted == false) {
         return false;
       }
@@ -5267,7 +5305,7 @@ var componentNormalizer = __webpack_require__(3);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_49429871_render,
+  mainvue_type_template_id_789e2154_render,
   staticRenderFns,
   false,
   null,

package/lib/utils/util.js

@@ -1891,7 +1891,45 @@ var indexOfObj = function indexOfObj(arry, target, key) {
   }
   return -1;
 };
+/**
+ * isEmpty
+ * @desc:判断是否为空
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {Object} [obj] -
+ **/
+var isEmpty = function isEmpty(val) {
+  // null or undefined
+  if (val === null || val === undefined) return true;
+
+  if (typeof val === 'boolean') return false;
+
+  if (typeof val === 'number') return !val;
+
+  if (val instanceof Error) return val.message === '';
 
+  switch (Object.prototype.toString.call(val)) {
+    // String or Array
+    case '[object String]':
+    case '[object Array]':
+      return !val.length;
+
+    // Map or Set or File
+    case '[object File]':
+    case '[object Map]':
+    case '[object Set]':
+      {
+        return !val.size;
+      }
+    // Plain Object
+    case '[object Object]':
+      {
+        return !Object.keys(val).length;
+      }
+  }
+
+  return false;
+};
 /**
  * isExist
  * @desc:判断是否存在
@@ -1922,7 +1960,7 @@ var isFunction = function isFunction(obj) {
  * @param {object} [to] - 路由跳转信息
  * @param {object} [from] - 路由来源信息
  * @param {function} [next] - 跳转函数
- * @param {array} [exclude] - 不拦截的路由
+ * @param {array/boolean} [exclude] - 不拦截的路由
  * @param {boolean} [open] - 是否新窗口打开
  * @param {boolean} [cookie] - 是否尝试采用
  * @param {sting} [loginPage] - 第三方登录页面地址
@@ -2075,7 +2113,7 @@ var isLogined = function isLogined(_ref8) {
           });
         }
       }).catch(function (e) {});
-    } else if (token || to.path === '/' || to.path === '/404' || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
+    } else if (token || to.path === '/' || to.path === '/404' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
       if (redirect && (to.path === '/main' || to.path === '/login')) {
         window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
       } else {
@@ -2972,6 +3010,7 @@ exports.default = {
   hsvTorgb: hsvTorgb,
   identical: identical,
   indexOfObj: indexOfObj,
+  isEmpty: isEmpty,
   isExist: isExist,
   isFunction: isFunction,
   isLogged: isLogged,

package/lib/wujie.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 68);
+/******/ 	return __webpack_require__(__webpack_require__.s = 69);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -1974,7 +1974,45 @@ var indexOfObj = function indexOfObj(arry, target, key) {
   }
   return -1;
 };
+/**
+ * isEmpty
+ * @desc:判断是否为空
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {Object} [obj] -
+ **/
+var isEmpty = function isEmpty(val) {
+  // null or undefined
+  if (val === null || val === undefined) return true;
+
+  if (typeof val === 'boolean') return false;
+
+  if (typeof val === 'number') return !val;
+
+  if (val instanceof Error) return val.message === '';
 
+  switch (Object.prototype.toString.call(val)) {
+    // String or Array
+    case '[object String]':
+    case '[object Array]':
+      return !val.length;
+
+    // Map or Set or File
+    case '[object File]':
+    case '[object Map]':
+    case '[object Set]':
+      {
+        return !val.size;
+      }
+    // Plain Object
+    case '[object Object]':
+      {
+        return !Object.keys(val).length;
+      }
+  }
+
+  return false;
+};
 /**
  * isExist
  * @desc:判断是否存在
@@ -2005,7 +2043,7 @@ var isFunction = function isFunction(obj) {
  * @param {object} [to] - 路由跳转信息
  * @param {object} [from] - 路由来源信息
  * @param {function} [next] - 跳转函数
- * @param {array} [exclude] - 不拦截的路由
+ * @param {array/boolean} [exclude] - 不拦截的路由
  * @param {boolean} [open] - 是否新窗口打开
  * @param {boolean} [cookie] - 是否尝试采用
  * @param {sting} [loginPage] - 第三方登录页面地址
@@ -2158,7 +2196,7 @@ var isLogined = function isLogined(_ref8) {
           });
         }
       }).catch(function (e) {});
-    } else if (token || to.path === '/' || to.path === '/404' || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
+    } else if (token || to.path === '/' || to.path === '/404' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
       if (redirect && (to.path === '/main' || to.path === '/login')) {
         window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
       } else {
@@ -3055,6 +3093,7 @@ var watermark = function watermark(option) {
   hsvTorgb: hsvTorgb,
   identical: identical,
   indexOfObj: indexOfObj,
+  isEmpty: isEmpty,
   isExist: isExist,
   isFunction: isFunction,
   isLogged: isLogged,
@@ -3583,7 +3622,7 @@ module.exports = require("json-bigint");
 
 /***/ }),
 
-/***/ 68:
+/***/ 69:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";