eoss-ui 0.5.97 → 0.5.99

package/lib/tips.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);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -2175,6 +2175,7 @@ var isLogined = function isLogined(_ref8) {
     next && next();
   } else {
     if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
+      var loadingInstance = eoss_element__WEBPACK_IMPORTED_MODULE_5__["Loading"].service({ text: '页面加载中', spinner: 'el-icon-loading', background: 'rgba(0, 0, 0, 0.65)' });
       ajax({
         method: 'post',
         url: _config_api__WEBPACK_IMPORTED_MODULE_0__[/* authCenter */ "b"],
@@ -2273,7 +2274,10 @@ var isLogined = function isLogined(_ref8) {
             }
           });
         }
-      }).catch(function (e) {});
+        loadingInstance.close();
+      }).catch(function (e) {
+        loadingInstance.close();
+      });
     } else if (token || to.path === '/' || to.path === '/404' || to.path === '/error' || 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 }));
@@ -2676,7 +2680,7 @@ var setScale = function setScale() {
   } else {
     n = 1;
   }
-  if (zoom === 1) {
+  if (zoom === 1 && window.innerWidth === width) {
     document.body.style.removeProperty('transform');
     document.body.style.removeProperty('width');
     document.body.style.removeProperty('height');
@@ -3771,7 +3775,7 @@ module.exports = require("json-bigint");
 
 /***/ }),
 
-/***/ 65:
+/***/ 66:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/toolbar.js

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

package/lib/tree-group.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 67);
+/******/ 	return __webpack_require__(__webpack_require__.s = 68);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -2175,6 +2175,7 @@ var isLogined = function isLogined(_ref8) {
     next && next();
   } else {
     if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
+      var loadingInstance = eoss_element__WEBPACK_IMPORTED_MODULE_5__["Loading"].service({ text: '页面加载中', spinner: 'el-icon-loading', background: 'rgba(0, 0, 0, 0.65)' });
       ajax({
         method: 'post',
         url: _config_api__WEBPACK_IMPORTED_MODULE_0__[/* authCenter */ "b"],
@@ -2273,7 +2274,10 @@ var isLogined = function isLogined(_ref8) {
             }
           });
         }
-      }).catch(function (e) {});
+        loadingInstance.close();
+      }).catch(function (e) {
+        loadingInstance.close();
+      });
     } else if (token || to.path === '/' || to.path === '/404' || to.path === '/error' || 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 }));
@@ -2676,7 +2680,7 @@ var setScale = function setScale() {
   } else {
     n = 1;
   }
-  if (zoom === 1) {
+  if (zoom === 1 && window.innerWidth === width) {
     document.body.style.removeProperty('transform');
     document.body.style.removeProperty('width');
     document.body.style.removeProperty('height');
@@ -3764,7 +3768,7 @@ module.exports = require("json-bigint");
 
 /***/ }),
 
-/***/ 67:
+/***/ 68:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/tree.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 66);
+/******/ 	return __webpack_require__(__webpack_require__.s = 67);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -2175,6 +2175,7 @@ var isLogined = function isLogined(_ref8) {
     next && next();
   } else {
     if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
+      var loadingInstance = eoss_element__WEBPACK_IMPORTED_MODULE_5__["Loading"].service({ text: '页面加载中', spinner: 'el-icon-loading', background: 'rgba(0, 0, 0, 0.65)' });
       ajax({
         method: 'post',
         url: _config_api__WEBPACK_IMPORTED_MODULE_0__[/* authCenter */ "b"],
@@ -2273,7 +2274,10 @@ var isLogined = function isLogined(_ref8) {
             }
           });
         }
-      }).catch(function (e) {});
+        loadingInstance.close();
+      }).catch(function (e) {
+        loadingInstance.close();
+      });
     } else if (token || to.path === '/' || to.path === '/404' || to.path === '/error' || 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 }));
@@ -2676,7 +2680,7 @@ var setScale = function setScale() {
   } else {
     n = 1;
   }
-  if (zoom === 1) {
+  if (zoom === 1 && window.innerWidth === width) {
     document.body.style.removeProperty('transform');
     document.body.style.removeProperty('width');
     document.body.style.removeProperty('height');
@@ -3771,7 +3775,7 @@ module.exports = require("json-bigint");
 
 /***/ }),
 
-/***/ 66:
+/***/ 67:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/upload.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 36);
+/******/ 	return __webpack_require__(__webpack_require__.s = 37);
 /******/ })
 /************************************************************************/
 /******/ ([
@@ -2174,6 +2174,7 @@ var isLogined = function isLogined(_ref8) {
     next && next();
   } else {
     if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
+      var loadingInstance = eoss_element__WEBPACK_IMPORTED_MODULE_5__["Loading"].service({ text: '页面加载中', spinner: 'el-icon-loading', background: 'rgba(0, 0, 0, 0.65)' });
       ajax({
         method: 'post',
         url: _config_api__WEBPACK_IMPORTED_MODULE_0__[/* authCenter */ "b"],
@@ -2272,7 +2273,10 @@ var isLogined = function isLogined(_ref8) {
             }
           });
         }
-      }).catch(function (e) {});
+        loadingInstance.close();
+      }).catch(function (e) {
+        loadingInstance.close();
+      });
     } else if (token || to.path === '/' || to.path === '/404' || to.path === '/error' || 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 }));
@@ -2675,7 +2679,7 @@ var setScale = function setScale() {
   } else {
     n = 1;
   }
-  if (zoom === 1) {
+  if (zoom === 1 && window.innerWidth === width) {
     document.body.style.removeProperty('transform');
     document.body.style.removeProperty('width');
     document.body.style.removeProperty('height');
@@ -3970,7 +3974,8 @@ module.exports = require("js-base64");
 /* 33 */,
 /* 34 */,
 /* 35 */,
-/* 36 */
+/* 36 */,
+/* 37 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/utils/util.js

@@ -2092,6 +2092,7 @@ var isLogined = function isLogined(_ref8) {
     next && next();
   } else {
     if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
+      var loadingInstance = _eossElement.Loading.service({ text: '页面加载中', spinner: 'el-icon-loading', background: 'rgba(0, 0, 0, 0.65)' });
       ajax({
         method: 'post',
         url: _api.authCenter,
@@ -2190,7 +2191,10 @@ var isLogined = function isLogined(_ref8) {
             }
           });
         }
-      }).catch(function (e) {});
+        loadingInstance.close();
+      }).catch(function (e) {
+        loadingInstance.close();
+      });
     } else if (token || to.path === '/' || to.path === '/404' || to.path === '/error' || 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 }));
@@ -2593,7 +2597,7 @@ var setScale = function setScale() {
   } else {
     n = 1;
   }
-  if (zoom === 1) {
+  if (zoom === 1 && window.innerWidth === width) {
     document.body.style.removeProperty('transform');
     document.body.style.removeProperty('width');
     document.body.style.removeProperty('height');

package/lib/wujie.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 69);
+/******/ 	return __webpack_require__(__webpack_require__.s = 70);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -2175,6 +2175,7 @@ var isLogined = function isLogined(_ref8) {
     next && next();
   } else {
     if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
+      var loadingInstance = eoss_element__WEBPACK_IMPORTED_MODULE_5__["Loading"].service({ text: '页面加载中', spinner: 'el-icon-loading', background: 'rgba(0, 0, 0, 0.65)' });
       ajax({
         method: 'post',
         url: _config_api__WEBPACK_IMPORTED_MODULE_0__[/* authCenter */ "b"],
@@ -2273,7 +2274,10 @@ var isLogined = function isLogined(_ref8) {
             }
           });
         }
-      }).catch(function (e) {});
+        loadingInstance.close();
+      }).catch(function (e) {
+        loadingInstance.close();
+      });
     } else if (token || to.path === '/' || to.path === '/404' || to.path === '/error' || 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 }));
@@ -2676,7 +2680,7 @@ var setScale = function setScale() {
   } else {
     n = 1;
   }
-  if (zoom === 1) {
+  if (zoom === 1 && window.innerWidth === width) {
     document.body.style.removeProperty('transform');
     document.body.style.removeProperty('width');
     document.body.style.removeProperty('height');
@@ -3764,7 +3768,150 @@ module.exports = require("json-bigint");
 
 /***/ }),
 
-/***/ 69:
+/***/ 7:
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony import */ var sockjs_client__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(8);
+/* harmony import */ var sockjs_client__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(sockjs_client__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var stompjs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(9);
+/* harmony import */ var stompjs__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(stompjs__WEBPACK_IMPORTED_MODULE_1__);
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+
+
+
+var WebSocket = function () {
+  // 构造函数
+  function WebSocket() {
+    _classCallCheck(this, WebSocket);
+
+    this.host = sessionStorage.getItem('wshost') || '';
+    this.tryTimes = 1; // 重连次数
+    this.callback = null; // 回调函数
+    this.client = null; // stomp对象
+    this.reconTimeout = null; // 重连延时器
+    this.debug = true; // 调试
+    this.interval = 20; // 重连间隔时间
+    this.vm = null;
+    this.nextDate = 0;
+    this.connects = 1;
+    this.recon = false;
+    this.sendTimeout = null;
+    this.socket = null;
+    this.subscription = null;
+  }
+
+  /** socket连接 */
+
+
+  WebSocket.prototype.connect = function connect() {
+    var _this = this;
+
+    if (!this.client) {
+      // 连接SockJS
+      this.socket = new sockjs_client__WEBPACK_IMPORTED_MODULE_0___default.a(this.host + this.url, { timeout: 60000 });
+      this.client = stompjs__WEBPACK_IMPORTED_MODULE_1___default.a.over(this.socket);
+    }
+
+    // 日志不打印
+    if (!this.debug) {
+      this.client.debug = function () {};
+    }
+
+    // 向服务器发起websocket连接
+    this.client.connect({}, function () {
+      _this.recon = true;
+      // tryTimes定义重置
+      _this.connects = 1;
+      // 订阅消息
+      _this.subscribe();
+    }, function (error) {
+      _this.unsubscribe();
+      _this.client = null;
+      var diffSecond = parseInt((new Date() - _this.nextDate) / 1000, 10);
+      if (_this.connects > 5 && diffSecond < _this.interval) {
+        _this.error && _this.error(error);
+      } else {
+        _this.reconTimeout = setTimeout(function () {
+          _this.connect();
+          _this.connects++;
+        }, 5000);
+      }
+    });
+  }; // 清除订阅
+
+
+  WebSocket.prototype.unsubscribe = function unsubscribe() {
+    if (this.subscription) {
+      this.subscription.unsubscribe();
+      this.subscription = null;
+    }
+  };
+  /** 订阅服务端 */
+
+
+  WebSocket.prototype.subscribe = function subscribe() {
+    var _this2 = this;
+
+    // 订阅服务端提供的某个topic
+    this.subscription = this.client.subscribe(this.take, function (response) {
+      if (response && (_this2.callback || _this2.success)) {
+        var callback = _this2.callback || _this2.success;
+        callback(JSON.parse(response.body));
+      }
+    });
+  };
+
+  /** 赋值、初始化socket */
+
+
+  WebSocket.prototype.init = function init(option, vm) {
+    for (var i in option) {
+      this[i] = option[i];
+    }
+    this.vm = vm;
+    // 初始化连接
+    this.connect();
+  };
+
+  /** 发送消息 */
+
+
+  WebSocket.prototype.send = function send(data) {
+    var _this3 = this;
+
+    if (this.recon) {
+      clearTimeout(this.sendTimeout);
+      this.client.send(this.take, {}, typeof data === 'string' ? data : JSON.stringify(data));
+    } else {
+      this.sendTimeout = setTimeout(function () {
+        _this3.send(data);
+      }, 1000);
+    }
+  };
+
+  /** 销毁 */
+
+
+  WebSocket.prototype.destroy = function destroy() {
+    // 断开连接,清除定时器
+    this.unsubscribe();
+    if (this.client) {
+      this.client.disconnect();
+    };
+    this.reconTimeout && clearTimeout(this.reconTimeout);
+    this.sendTimeout && clearTimeout(this.sendTimeout);
+  };
+
+  return WebSocket;
+}();
+
+/* harmony default export */ __webpack_exports__["a"] = (WebSocket);
+
+/***/ }),
+
+/***/ 70:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -4005,149 +4152,6 @@ main.install = function (Vue) {
 
 /***/ }),
 
-/***/ 7:
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony import */ var sockjs_client__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(8);
-/* harmony import */ var sockjs_client__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(sockjs_client__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var stompjs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(9);
-/* harmony import */ var stompjs__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(stompjs__WEBPACK_IMPORTED_MODULE_1__);
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-
-
-
-var WebSocket = function () {
-  // 构造函数
-  function WebSocket() {
-    _classCallCheck(this, WebSocket);
-
-    this.host = sessionStorage.getItem('wshost') || '';
-    this.tryTimes = 1; // 重连次数
-    this.callback = null; // 回调函数
-    this.client = null; // stomp对象
-    this.reconTimeout = null; // 重连延时器
-    this.debug = true; // 调试
-    this.interval = 20; // 重连间隔时间
-    this.vm = null;
-    this.nextDate = 0;
-    this.connects = 1;
-    this.recon = false;
-    this.sendTimeout = null;
-    this.socket = null;
-    this.subscription = null;
-  }
-
-  /** socket连接 */
-
-
-  WebSocket.prototype.connect = function connect() {
-    var _this = this;
-
-    if (!this.client) {
-      // 连接SockJS
-      this.socket = new sockjs_client__WEBPACK_IMPORTED_MODULE_0___default.a(this.host + this.url, { timeout: 60000 });
-      this.client = stompjs__WEBPACK_IMPORTED_MODULE_1___default.a.over(this.socket);
-    }
-
-    // 日志不打印
-    if (!this.debug) {
-      this.client.debug = function () {};
-    }
-
-    // 向服务器发起websocket连接
-    this.client.connect({}, function () {
-      _this.recon = true;
-      // tryTimes定义重置
-      _this.connects = 1;
-      // 订阅消息
-      _this.subscribe();
-    }, function (error) {
-      _this.unsubscribe();
-      _this.client = null;
-      var diffSecond = parseInt((new Date() - _this.nextDate) / 1000, 10);
-      if (_this.connects > 5 && diffSecond < _this.interval) {
-        _this.error && _this.error(error);
-      } else {
-        _this.reconTimeout = setTimeout(function () {
-          _this.connect();
-          _this.connects++;
-        }, 5000);
-      }
-    });
-  }; // 清除订阅
-
-
-  WebSocket.prototype.unsubscribe = function unsubscribe() {
-    if (this.subscription) {
-      this.subscription.unsubscribe();
-      this.subscription = null;
-    }
-  };
-  /** 订阅服务端 */
-
-
-  WebSocket.prototype.subscribe = function subscribe() {
-    var _this2 = this;
-
-    // 订阅服务端提供的某个topic
-    this.subscription = this.client.subscribe(this.take, function (response) {
-      if (response && (_this2.callback || _this2.success)) {
-        var callback = _this2.callback || _this2.success;
-        callback(JSON.parse(response.body));
-      }
-    });
-  };
-
-  /** 赋值、初始化socket */
-
-
-  WebSocket.prototype.init = function init(option, vm) {
-    for (var i in option) {
-      this[i] = option[i];
-    }
-    this.vm = vm;
-    // 初始化连接
-    this.connect();
-  };
-
-  /** 发送消息 */
-
-
-  WebSocket.prototype.send = function send(data) {
-    var _this3 = this;
-
-    if (this.recon) {
-      clearTimeout(this.sendTimeout);
-      this.client.send(this.take, {}, typeof data === 'string' ? data : JSON.stringify(data));
-    } else {
-      this.sendTimeout = setTimeout(function () {
-        _this3.send(data);
-      }, 1000);
-    }
-  };
-
-  /** 销毁 */
-
-
-  WebSocket.prototype.destroy = function destroy() {
-    // 断开连接,清除定时器
-    this.unsubscribe();
-    if (this.client) {
-      this.client.disconnect();
-    };
-    this.reconTimeout && clearTimeout(this.reconTimeout);
-    this.sendTimeout && clearTimeout(this.sendTimeout);
-  };
-
-  return WebSocket;
-}();
-
-/* harmony default export */ __webpack_exports__["a"] = (WebSocket);
-
-/***/ }),
-
 /***/ 8:
 /***/ (function(module, exports) {
 

package/lib/wxlogin.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);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -2175,6 +2175,7 @@ var isLogined = function isLogined(_ref8) {
     next && next();
   } else {
     if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
+      var loadingInstance = eoss_element__WEBPACK_IMPORTED_MODULE_5__["Loading"].service({ text: '页面加载中', spinner: 'el-icon-loading', background: 'rgba(0, 0, 0, 0.65)' });
       ajax({
         method: 'post',
         url: _config_api__WEBPACK_IMPORTED_MODULE_0__[/* authCenter */ "b"],
@@ -2273,7 +2274,10 @@ var isLogined = function isLogined(_ref8) {
             }
           });
         }
-      }).catch(function (e) {});
+        loadingInstance.close();
+      }).catch(function (e) {
+        loadingInstance.close();
+      });
     } else if (token || to.path === '/' || to.path === '/404' || to.path === '/error' || 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 }));
@@ -2676,7 +2680,7 @@ var setScale = function setScale() {
   } else {
     n = 1;
   }
-  if (zoom === 1) {
+  if (zoom === 1 && window.innerWidth === width) {
     document.body.style.removeProperty('transform');
     document.body.style.removeProperty('width');
     document.body.style.removeProperty('height');
@@ -3907,7 +3911,7 @@ var WebSocket = function () {
 
 /***/ }),
 
-/***/ 70:
+/***/ 71:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.5.97",
+  "version": "0.5.99",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [

package/packages/data-table/src/main.vue

@@ -454,9 +454,13 @@ export default {
       default: true
     },
     index: {
-      type: [Boolean, Number],
+      type: [Number, Function],
       default: 1
     },
+    accumulated: {
+      type: Boolean,
+      default: true
+    },
     immediate: {
       type: Boolean,
       default: true
@@ -594,17 +598,19 @@ export default {
         }
         if (this.numbers && !types.includes('index')) {
           let index = 1;
-          if (this.orders == 'desc') {
-            index = (num) => {
-              return this.config.totalCount - num;
-            };
-          } else if (this.infiniteScroll) {
-            index = typeof this.index == 'boolean' ? 1 : this.index;
-          } else if (this.index || this.index === 0) {
-            index =
-              this.index === true
-                ? (this.config.pageNum - 1) * this.config.pageSize + 1
-                : this.index;
+          if (typeof this.index === 'function') {
+            index = this.index;
+          } else {
+            if (this.orders == 'desc') {
+              index = (num) => {
+                return this.config.totalCount - num;
+              };
+            } else if (this.accumulated) {
+              index =
+                (this.config.pageNum - 1) * this.config.pageSize + this.index;
+            } else {
+              index = this.index;
+            }
           }
           thead.push({
             type: 'index',