eoss-ui 0.4.61 → 0.4.63

package/lib/data-table.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 31);
+/******/ 	return __webpack_require__(__webpack_require__.s = 30);
 /******/ })
 /************************************************************************/
 /******/ ([
@@ -247,52 +247,54 @@ var ajax = function ajax(_ref) {
       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', 'jump']);
         if (win.top.location.href.indexOf('#/login') === -1 && win.top.location.href.indexOf('/login.html') === -1) {
-          clearTimeout(loginMsg);
           var remind = sessionStorage.getItem('remind');
-          !remind && (loginMsg = setTimeout(function () {
-            sessionStorage.setItem('remind', 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) {
-                var src = void 0;
-                if (!startWith(loginPage, ['http', '/'])) {
-                  var pathname = win.top.location.pathname;
-                  if (pathname !== '/') {
-                    pathname = pathname.split('/');
-                    pathname.splice(pathname.length - 1);
-                    pathname = pathname.join('/');
-                    src = pathname + '/' + loginPage.replace('./', '');
+          if (!remind) {
+            clearTimeout(loginMsg);
+            loginMsg = setTimeout(function () {
+              sessionStorage.setItem('remind', 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) {
+                  var src = void 0;
+                  if (!startWith(loginPage, ['http', '/'], true)) {
+                    var pathname = win.top.location.pathname;
+                    if (pathname !== '/') {
+                      pathname = pathname.split('/');
+                      pathname.splice(pathname.length - 1);
+                      pathname = pathname.join('/');
+                      src = pathname + '/' + loginPage.replace('./', '');
+                    } else {
+                      src = pathname + loginPage.replace('./', '');
+                    }
                   } else {
-                    src = pathname + loginPage.replace('./', '');
+                    src = loginPage;
                   }
+                  win.top.location.href = src;
+                } else if (win.top.location.href.indexOf('main.html') > -1) {
+                  win.top.location.href = './login.html';
                 } else {
-                  src = loginPage;
-                }
-                win.top.location.href = src;
-              } 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) {
-                  var len = win.top.location.href.indexOf(hash);
-                  win.top.location.href = win.location.href.slice(0, len) + '#/login';
-                } else {
-                  win.top.location.href = '/login.html';
+                  var hash = win.top.location.hash;
+                  if (hash) {
+                    var len = win.top.location.href.indexOf(hash);
+                    win.top.location.href = win.location.href.slice(0, len) + '#/login';
+                  } else {
+                    win.top.location.href = '/login.html';
+                  }
                 }
-              }
-            }).catch(function (e) {
-              sessionStorage.removeItem('remind');
-            });
-          }, 1000));
+              }).catch(function (e) {
+                sessionStorage.removeItem('remind');
+              });
+            }, 2000);
+          }
         }
       } else if (response.data.rCode === 61) {
         clearTimeout(initAuth);
@@ -2081,7 +2083,7 @@ var setStorage = function setStorage(_ref14) {
  * @param {boolean} [or] - 或者（等同于||）
  **/
 var startWith = function startWith(value, reg) {
-  var or = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+  var or = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
 
   if (Array.isArray(reg)) {
     var flag = true;
@@ -2902,16 +2904,15 @@ module.exports = require("vue");
 /* 27 */,
 /* 28 */,
 /* 29 */,
-/* 30 */,
-/* 31 */
+/* 30 */
 /***/ (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/data-table/src/main.vue?vue&type=template&id=59cbc514&
-var mainvue_type_template_id_59cbc514_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=0cfc4a8c&
+var mainvue_type_template_id_0cfc4a8c_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -2966,6 +2967,7 @@ var mainvue_type_template_id_59cbc514_render = function () {
         : _vm._e(),
       _vm.title
         ? _c("p", {
+            ref: "title",
             staticClass: "es-table-title",
             domProps: { innerHTML: _vm._s(_vm.title) },
           })
@@ -2997,7 +2999,7 @@ var mainvue_type_template_id_59cbc514_render = function () {
                       sumText: _vm.sumText || _vm.totalText,
                       totalRow: _vm.restotalRow || _vm.totalRow,
                       height:
-                        _vm.tableHeight !== "auto"
+                        _vm.tableHeight !== "auto" && _vm.tableHeight !== false
                           ? _vm.tableHeight
                           : undefined,
                       border: _vm.border,
@@ -3246,10 +3248,10 @@ var mainvue_type_template_id_59cbc514_render = function () {
   )
 }
 var staticRenderFns = []
-mainvue_type_template_id_59cbc514_render._withStripped = true
+mainvue_type_template_id_0cfc4a8c_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=59cbc514&
+// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=0cfc4a8c&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -3302,8 +3304,8 @@ childrenvue_type_template_id_796433ee_render._withStripped = true
 
 // CONCATENATED MODULE: ./packages/data-table/src/children.vue?vue&type=template&id=796433ee&
 
-// 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=256206e7&
-var columnvue_type_template_id_256206e7_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=4ca382cb&
+var columnvue_type_template_id_4ca382cb_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -3392,7 +3394,9 @@ var columnvue_type_template_id_256206e7_render = function () {
                                     attrs: {
                                       name: _vm.name,
                                       prop: _vm.item.field,
-                                      rules: _vm.item.rules,
+                                      rules: _vm.isNotRule(_vm.item, scope)
+                                        ? []
+                                        : _vm.item.rules,
                                       index: scope.$index,
                                     },
                                   },
@@ -4283,11 +4287,11 @@ var columnvue_type_template_id_256206e7_render = function () {
         2
       )
 }
-var columnvue_type_template_id_256206e7_staticRenderFns = []
-columnvue_type_template_id_256206e7_render._withStripped = true
+var columnvue_type_template_id_4ca382cb_staticRenderFns = []
+columnvue_type_template_id_4ca382cb_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/column.vue?vue&type=template&id=256206e7&
+// CONCATENATED MODULE: ./packages/data-table/src/column.vue?vue&type=template&id=4ca382cb&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(9);
@@ -4901,6 +4905,9 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
     }
   },
   inject: {
+    elForm: {
+      default: ''
+    },
     tableReload: {
       default: ''
     }
@@ -5106,6 +5113,13 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
     isReadOnly: function isReadOnly(item, scope) {
       return scope.row.canEdit === false || this.readonly || item.editable === false || scope.row.cantEditKey && scope.row.cantEditKey.indexOf(item.field || item.prop) > -1 || item.readonly;
     },
+    isNotRule: function isNotRule(item, scope) {
+      if (scope.row.canRule === false || scope.row.notRules && scope.row.notRules.indexOf(item.field || item.prop) > -1) {
+        this.elForm && this.elForm.clearValidate(item.field || item.prop);
+        return true;
+      }
+      return false;
+    },
     handleBlur: function handleBlur(data) {
       var item = data.item;
 
@@ -5197,8 +5211,8 @@ var componentNormalizer = __webpack_require__(3);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_columnvue_type_script_lang_js_,
-  columnvue_type_template_id_256206e7_render,
-  columnvue_type_template_id_256206e7_staticRenderFns,
+  columnvue_type_template_id_4ca382cb_render,
+  columnvue_type_template_id_4ca382cb_staticRenderFns,
   false,
   null,
   null,
@@ -5708,6 +5722,9 @@ var mainvue_type_script_lang_js_components;
 //
 //
 //
+//
+//
+//
 
 
 
@@ -6019,7 +6036,7 @@ var mainvue_type_script_lang_js_components;
     scale: {
       deep: true,
       handler: function handler(val) {
-        if (this.tableHeight != 'auto' && this.display) {
+        if (this.tableHeight != 'auto' && this.tableHeight !== false && this.display) {
           this.resetHeight();
           this.doLayout();
         }
@@ -6027,7 +6044,7 @@ var mainvue_type_script_lang_js_components;
     },
     zoom: {
       handler: function handler(val) {
-        if (this.tableHeight != 'auto' && this.display) {
+        if (this.tableHeight != 'auto' && this.tableHeight !== false && this.display) {
           this.resetHeight();
           this.doLayout();
         }
@@ -6280,11 +6297,13 @@ var mainvue_type_script_lang_js_components;
           });
         } else {
           _this6.list = [];
+          _this6.tableHeight = false;
           var msg = res.msg || '系统错误，请联系管理员！';
           _this6.$message.error(msg);
         }
         _this6.$emit('success', res);
       }).catch(function (err) {
+        _this6.tableHeight = false;
         if (err.message && err.message !== 'canceled') {
           _this6.$message.error(err.message);
         }
@@ -6663,36 +6682,33 @@ var mainvue_type_script_lang_js_components;
       }
     },
     resetHeight: function resetHeight() {
-      var _this9 = this;
-
-      this.$nextTick(function () {
-        if (_this9.full && !_this9.height && !_this9.maxHeight) {
-          var height = _this9.$el.parentNode.offsetHeight - parseInt(util["a" /* default */].getStyle(_this9.$el.parentNode, 'paddingTop'), 10) - parseInt(util["a" /* default */].getStyle(_this9.$el.parentNode, 'paddingBottom'), 10);
-          for (var i = 0; i < _this9.$el.parentNode.childNodes.length; i++) {
-            var ele = _this9.$el.parentNode.childNodes[i];
-            if (ele !== _this9.$el) {
-              height -= ele.offsetHeight === undefined ? 0 : ele.offsetHeight;
-            }
+      //this.$nextTick(() => {
+      if (this.full && !this.height && !this.maxHeight) {
+        var height = this.$el.parentNode.offsetHeight - parseInt(util["a" /* default */].getStyle(this.$el.parentNode, 'padding-top'), 10) - parseInt(util["a" /* default */].getStyle(this.$el.parentNode, 'padding-bottom'), 10);
+        for (var i = 0; i < this.$el.parentNode.childNodes.length; i++) {
+          var ele = this.$el.parentNode.childNodes[i];
+          if (ele !== this.$el && ele.offsetHeight !== undefined) {
+            height = height - ele.offsetHeight - parseInt(util["a" /* default */].getStyle(ele, 'margin-top'), 10) - parseInt(util["a" /* default */].getStyle(ele, 'margin-bottom'), 10);
           }
-          for (var _i3 = 0; _i3 < _this9.$el.childNodes.length; _i3++) {
-            var _ele = _this9.$el.childNodes[_i3];
-            if (_ele !== _this9.$refs.esTableContent) {
-              height -= _ele.offsetHeight === undefined ? 0 : _ele.offsetHeight;
-            }
-          }
-          _this9.styles = { height: height + 'px' };
-          var loadingDom = _this9.$refs.esTableContent.querySelector('.el-loading-mask');
-          for (var _i4 = 0; _i4 < _this9.$refs.esTableContent.childNodes.length; _i4++) {
-            var _ele2 = _this9.$refs.esTableContent.childNodes[_i4];
-            if (_ele2 !== _this9.$refs.oaTable.$el && (!loadingDom || _ele2 !== loadingDom)) {
-              height -= _ele2.offsetHeight === undefined ? 0 : _ele2.offsetHeight;
-            }
-          }
-          var pt = parseInt(util["a" /* default */].getStyle(_this9.$refs.esTableContent, 'paddingTop'), 10);
-          var pb = parseInt(util["a" /* default */].getStyle(_this9.$refs.esTableContent, 'paddingBottom'), 10);
-          _this9.tableHeight = height - pt - pb + (_this9.page ? 2 : 1) + 'px';
         }
-      });
+        height -= this.showToolbar ? 45 : 0;
+        height -= this.page === false ? 0 : 46;
+        height -= this.title ? this.$refs.title.offsetHeight : 0;
+        height -= parseInt(util["a" /* default */].getStyle(this.$refs.esTableContent, 'padding-top'), 10);
+        height -= parseInt(util["a" /* default */].getStyle(this.$refs.esTableContent, 'padding-bottom'), 10);
+        var emptyText = this.$refs.esTableContent.querySelector('.el-table__empty-text');
+        var eht = 0;
+        if (emptyText) {
+          eht = emptyText.offsetHeight;
+          var thead = this.$refs.esTableContent.querySelector('.el-table__header');
+          thead && (eht += thead.offsetHeight);
+        }
+        if (height > 1 && height - eht > 1) {
+          this.tableHeight = height;
+        } else {
+          console.warn(this.$el.parentNode, '\u83B7\u53D6\u4E0D\u5230\u9AD8\u5EA6\uFF01');
+        }
+      }
     },
     validate: function validate(callback) {
       var form = this.elForm || this.$refs.esTableForm;
@@ -6716,12 +6732,12 @@ var mainvue_type_script_lang_js_components;
       this.$emit('sort-change', res);
     },
     mergeThead: function mergeThead(res) {
-      var _this10 = this;
+      var _this9 = this;
 
       this.theadData = res;
       this.icon = true;
       setTimeout(function () {
-        _this10.show = true;
+        _this9.show = true;
       }, 100);
     }
   }
@@ -6738,7 +6754,7 @@ var mainvue_type_script_lang_js_components;
 
 var main_component = Object(componentNormalizer["a" /* default */])(
   src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_59cbc514_render,
+  mainvue_type_template_id_0cfc4a8c_render,
   staticRenderFns,
   false,
   null,

package/lib/date-picker.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 = 69);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -248,52 +248,54 @@ var ajax = function ajax(_ref) {
       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', 'jump']);
         if (win.top.location.href.indexOf('#/login') === -1 && win.top.location.href.indexOf('/login.html') === -1) {
-          clearTimeout(loginMsg);
           var remind = sessionStorage.getItem('remind');
-          !remind && (loginMsg = setTimeout(function () {
-            sessionStorage.setItem('remind', 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) {
-                var src = void 0;
-                if (!startWith(loginPage, ['http', '/'])) {
-                  var pathname = win.top.location.pathname;
-                  if (pathname !== '/') {
-                    pathname = pathname.split('/');
-                    pathname.splice(pathname.length - 1);
-                    pathname = pathname.join('/');
-                    src = pathname + '/' + loginPage.replace('./', '');
+          if (!remind) {
+            clearTimeout(loginMsg);
+            loginMsg = setTimeout(function () {
+              sessionStorage.setItem('remind', 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) {
+                  var src = void 0;
+                  if (!startWith(loginPage, ['http', '/'], true)) {
+                    var pathname = win.top.location.pathname;
+                    if (pathname !== '/') {
+                      pathname = pathname.split('/');
+                      pathname.splice(pathname.length - 1);
+                      pathname = pathname.join('/');
+                      src = pathname + '/' + loginPage.replace('./', '');
+                    } else {
+                      src = pathname + loginPage.replace('./', '');
+                    }
                   } else {
-                    src = pathname + loginPage.replace('./', '');
+                    src = loginPage;
                   }
+                  win.top.location.href = src;
+                } else if (win.top.location.href.indexOf('main.html') > -1) {
+                  win.top.location.href = './login.html';
                 } else {
-                  src = loginPage;
-                }
-                win.top.location.href = src;
-              } 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) {
-                  var len = win.top.location.href.indexOf(hash);
-                  win.top.location.href = win.location.href.slice(0, len) + '#/login';
-                } else {
-                  win.top.location.href = '/login.html';
+                  var hash = win.top.location.hash;
+                  if (hash) {
+                    var len = win.top.location.href.indexOf(hash);
+                    win.top.location.href = win.location.href.slice(0, len) + '#/login';
+                  } else {
+                    win.top.location.href = '/login.html';
+                  }
                 }
-              }
-            }).catch(function (e) {
-              sessionStorage.removeItem('remind');
-            });
-          }, 1000));
+              }).catch(function (e) {
+                sessionStorage.removeItem('remind');
+              });
+            }, 2000);
+          }
         }
       } else if (response.data.rCode === 61) {
         clearTimeout(initAuth);
@@ -2082,7 +2084,7 @@ var setStorage = function setStorage(_ref14) {
  * @param {boolean} [or] - 或者（等同于||）
  **/
 var startWith = function startWith(value, reg) {
-  var or = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+  var or = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
 
   if (Array.isArray(reg)) {
     var flag = true;
@@ -2862,14 +2864,7 @@ module.exports = require("json-bigint");
 
 /***/ }),
 
-/***/ 7:
-/***/ (function(module, exports) {
-
-module.exports = require("sm-crypto");
-
-/***/ }),
-
-/***/ 70:
+/***/ 69:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -3078,6 +3073,13 @@ main.install = function (Vue) {
 
 /* harmony default export */ var date_picker = __webpack_exports__["default"] = (main);
 
+/***/ }),
+
+/***/ 7:
+/***/ (function(module, exports) {
+
+module.exports = require("sm-crypto");
+
 /***/ })
 
 /******/ });