eoss-ui 0.5.56 → 0.5.59

package/lib/button-group.js

@@ -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,
@@ -3569,7 +3608,7 @@ function normalizeComponent(
 // 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/button-group/src/main.vue?vue&type=template&id=10c7630a&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/button-group/src/main.vue?vue&type=template&id=72ff1457&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3589,7 +3628,9 @@ var render = function () {
                     attrs: { stop: _vm.stop, size: _vm.size, type: item.type },
                     on: {
                       click: function ($event) {
-                        _vm.handleClick({ row: _vm.data, handle: item })
+                        _vm.handleClick(
+                          Object.assign({}, _vm.data, { handle: item })
+                        )
                       },
                     },
                   },
@@ -3602,7 +3643,9 @@ var render = function () {
                     "\n      " +
                       _vm._s(
                         item.template
-                          ? item.template({ row: _vm.data, config: item })
+                          ? item.template(
+                              Object.assign({}, _vm.data, { config: item })
+                            )
                           : item.text
                       ) +
                       "\n    "
@@ -3633,7 +3676,11 @@ var render = function () {
                           _vm._v(
                             _vm._s(
                               item.template
-                                ? item.template({ row: _vm.data, config: item })
+                                ? item.template(
+                                    Object.assign({}, _vm.data, {
+                                      config: item,
+                                    })
+                                  )
                                 : item.text
                             )
                           ),
@@ -3656,12 +3703,14 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/button-group/src/main.vue?vue&type=template&id=10c7630a&
+// CONCATENATED MODULE: ./packages/button-group/src/main.vue?vue&type=template&id=72ff1457&
 
 // EXTERNAL MODULE: ./src/utils/util.js
 var util = __webpack_require__(0);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/button-group/src/main.vue?vue&type=script&lang=js&
+var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
+
 //
 //
 //
@@ -3727,7 +3776,8 @@ var util = __webpack_require__(0);
     trigger: {
       type: String,
       default: 'click'
-    }
+    },
+    useCaseCodeKey: String
   },
   computed: {
     btns: function btns() {
@@ -3752,21 +3802,22 @@ var util = __webpack_require__(0);
       var _this = this;
 
       var useCaseCodes = util["a" /* default */].getStorage('useCaseCodes');
+      var keyword = this.data && this.useCaseCodeKey ? this.data.row[this.useCaseCodeKey] : null;
       var arry = this.contents.filter(function (item) {
         if (Object.prototype.hasOwnProperty.call(item, 'rules')) {
-          if (useCaseCodes && item.useCaseCode) {
-            return item.rules(_this.data) && useCaseCodes.indexOf(item.useCaseCode) > -1;
+          if (useCaseCodes && (item.useCaseCode || keyword)) {
+            return item.rules(_this.data.row) && useCaseCodes.indexOf(item.useCaseCode || keyword) > -1;
           }
-          return item.rules(_this.data);
+          return item.rules(_this.data.row);
         }
         if (_this.rules !== undefined) {
-          if (useCaseCodes && item.useCaseCode) {
-            return _this.rules(_this.data) && useCaseCodes.indexOf(item.useCaseCode) > -1;
+          if (useCaseCodes && (item.useCaseCode || keyword)) {
+            return _this.rules(_this.data.row) && useCaseCodes.indexOf(item.useCaseCode || keyword) > -1;
           }
-          return _this.rules(_this.data);
+          return _this.rules(_this.data.row);
         }
-        if (useCaseCodes && item.useCaseCode) {
-          return useCaseCodes.indexOf(item.useCaseCode) > -1;
+        if (useCaseCodes && (item.useCaseCode || keyword)) {
+          return useCaseCodes.indexOf(item.useCaseCode || keyword) > -1;
         }
         return true;
       });
@@ -3777,8 +3828,8 @@ var util = __webpack_require__(0);
       this.$emit('handle-click', obj);
     },
     handleCommand: function handleCommand(res) {
-      this.$emit('handleClick', { row: this.data, handle: res });
-      this.$emit('handle-click', { row: this.data, handle: res });
+      this.$emit('handleClick', _extends({}, this.data, { handle: res }));
+      this.$emit('handle-click', _extends({}, this.data, { handle: res }));
     },
     resetWidth: function resetWidth() {
       var _this2 = this;

package/lib/button.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 70);
+/******/ 	return __webpack_require__(__webpack_require__.s = 71);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -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,
@@ -3716,7 +3755,7 @@ var WebSocket = function () {
 
 /***/ }),
 
-/***/ 70:
+/***/ 71:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/cascader.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 71);
+/******/ 	return __webpack_require__(__webpack_require__.s = 72);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -192,7 +192,7 @@ function normalizeComponent(
 
 /***/ }),
 
-/***/ 71:
+/***/ 72:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/checkbox-group.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,

package/lib/data-table-form.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,

package/lib/data-table.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,
@@ -3766,8 +3805,8 @@ module.exports = require("vue");
 // 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/data-table/src/main.vue?vue&type=template&id=fa664770&
-var mainvue_type_template_id_fa664770_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/main.vue?vue&type=template&id=6d62957e&
+var mainvue_type_template_id_6d62957e_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -3839,6 +3878,7 @@ var mainvue_type_template_id_fa664770_render = function () {
             {
               ref: "esTableContent",
               staticClass: "es-data-table-content",
+              class: _vm.border == "none" ? "es-table-border-none" : "",
               staticStyle: {},
             },
             [
@@ -3850,7 +3890,9 @@ var mainvue_type_template_id_fa664770_render = function () {
                       ref: "oaTable",
                       class:
                         "es-table" +
-                        (_vm.theadBorder ? " es-thead-border" : ""),
+                        (_vm.theadBorder && _vm.border != "none"
+                          ? " es-thead-border"
+                          : ""),
                     },
                     "el-table",
                     Object.assign({}, _vm.$attrs, {
@@ -3863,7 +3905,7 @@ var mainvue_type_template_id_fa664770_render = function () {
                         _vm.tableHeight !== "auto" && _vm.tableHeight !== false
                           ? _vm.tableHeight
                           : undefined,
-                      border: _vm.border,
+                      border: _vm._border,
                       infiniteScroll: _vm.getTableData,
                       infiniteScrollDisabled: _vm.infiniteDisabled,
                     }),
@@ -4033,10 +4075,10 @@ var mainvue_type_template_id_fa664770_render = function () {
   )
 }
 var staticRenderFns = []
-mainvue_type_template_id_fa664770_render._withStripped = true
+mainvue_type_template_id_6d62957e_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=fa664770&
+// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=6d62957e&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -4084,8 +4126,8 @@ childrenvue_type_template_id_29bcbc72_render._withStripped = true
 
 // CONCATENATED MODULE: ./packages/data-table/src/children.vue?vue&type=template&id=29bcbc72&
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/column.vue?vue&type=template&id=66569ceb&
-var columnvue_type_template_id_66569ceb_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/column.vue?vue&type=template&id=449ae3d7&
+var columnvue_type_template_id_449ae3d7_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4763,7 +4805,7 @@ var columnvue_type_template_id_66569ceb_render = function () {
                           attrs: {
                             stop: "",
                             contents: _vm.contents || _vm.events,
-                            data: scope.row,
+                            data: scope,
                           },
                           on: { handleClick: _vm.handleClick },
                           model: {
@@ -4803,11 +4845,11 @@ var columnvue_type_template_id_66569ceb_render = function () {
     2
   )
 }
-var columnvue_type_template_id_66569ceb_staticRenderFns = []
-columnvue_type_template_id_66569ceb_render._withStripped = true
+var columnvue_type_template_id_449ae3d7_staticRenderFns = []
+columnvue_type_template_id_449ae3d7_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/column.vue?vue&type=template&id=66569ceb&
+// CONCATENATED MODULE: ./packages/data-table/src/column.vue?vue&type=template&id=449ae3d7&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(12);
@@ -5677,8 +5719,8 @@ var componentNormalizer = __webpack_require__(3);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_columnvue_type_script_lang_js_,
-  columnvue_type_template_id_66569ceb_render,
-  columnvue_type_template_id_66569ceb_staticRenderFns,
+  columnvue_type_template_id_449ae3d7_render,
+  columnvue_type_template_id_449ae3d7_staticRenderFns,
   false,
   null,
   null,
@@ -6141,6 +6183,10 @@ var mainvue_type_script_lang_js_components, _watch;
 //
 //
 //
+//
+//
+//
+//
 
 
 
@@ -6342,8 +6388,11 @@ var mainvue_type_script_lang_js_components, _watch;
     response: Function,
     minWidth: [Number, String],
     border: {
-      type: Boolean,
-      default: false
+      type: [Boolean, String],
+      default: false,
+      validator: function validator(value) {
+        return [true, false, 'none'].includes(value);
+      }
     },
     theadBorder: {
       type: Boolean,
@@ -6427,6 +6476,9 @@ var mainvue_type_script_lang_js_components, _watch;
     tag: function tag() {
       return this.form && this.elForm == '' ? 'el-form' : 'div';
     },
+    _border: function _border() {
+      return this.border === true ? true : false;
+    },
 
     theads: {
       get: function get() {
@@ -7391,7 +7443,7 @@ var mainvue_type_script_lang_js_components, _watch;
 
 var main_component = Object(componentNormalizer["a" /* default */])(
   src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_fa664770_render,
+  mainvue_type_template_id_6d62957e_render,
   staticRenderFns,
   false,
   null,