eoss-ui 0.5.42 → 0.5.44

package/lib/data-table.js

@@ -257,7 +257,13 @@ 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', 'jump']);
-        if (win.top.location.href.indexOf('#/login') === -1 && win.top.location.href.indexOf('/login.html') === -1) {
+        var href = '';
+        try {
+          href = win.top.location.href;
+        } catch (error) {
+          href = win.location.href;
+        }
+        if (href.indexOf('#/login') === -1 && href.indexOf('/login.html') === -1) {
           var remind = sessionStorage.getItem('remind');
           if (!remind) {
             clearTimeout(loginMsg);
@@ -273,33 +279,37 @@ var ajax = function ajax(_ref) {
                 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('./', '');
+                try {
+                  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 (error) {
+                  win.postMessage({ type: 1 }, '*');
                 }
               }).catch(function (e) {
                 sessionStorage.removeItem('remind');
@@ -737,7 +747,13 @@ var delUrlParam = function delUrlParam(_ref2) {
   var url = _ref2.url,
       key = _ref2.key;
 
-  var src = url ? decodeURI(url) : decodeURI(win.top.location.href);
+  var pUrl = '';
+  try {
+    pUrl = win.top.location.href;
+  } catch (error) {
+    pUrl = win.location.href;
+  }
+  var src = url ? decodeURI(url) : decodeURI(pUrl);
   var param = getParams({ url: src });
   if (param && key.length) {
     if (Array.isArray(key)) {
@@ -1987,7 +2003,12 @@ var isLogined = function isLogined(_ref8) {
     }).catch(function () {});
     return;
   }
-  var pathname = win.top.location.pathname;
+  var pathname = '';
+  try {
+    pathname = win.top.location.pathname;
+  } catch (error) {
+    pathname = win.location.pathname;
+  }
   if (loginPage) {
     sessionStorage.setItem('loginPage', loginPage);
     if (!startWith(loginPage, ['http', '/'], true)) {
@@ -2028,22 +2049,38 @@ var isLogined = function isLogined(_ref8) {
                   deviceUnique: results.deviceUnique
                 }
               });
-              var url = delUrlParam({
-                url: win.top.location.href,
-                key: ['serverId', 'authType', 'code', 'sessionId']
-              });
-              win.top.location.href = url;
-              setTimeout(function () {
-                win.top.location.reload();
-              }, 200);
+              try {
+                var url = delUrlParam({
+                  url: win.top.location.href,
+                  key: ['serverId', 'authType', 'code', 'sessionId']
+                });
+                win.top.location.href = url;
+                setTimeout(function () {
+                  win.top.location.reload();
+                }, 200);
+              } catch (error) {
+                var _url2 = delUrlParam({
+                  url: win.location.href,
+                  key: ['serverId', 'authType', 'code', 'sessionId']
+                });
+                win.location.href = _url2;
+                setTimeout(function () {
+                  win.location.reload();
+                }, 200);
+              }
               break;
             case 1:
               break;
             case 2:
               break;
             case 3:
-              var href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(win.top.location.href));
-              win.top.location.href = href;
+              try {
+                var href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(win.top.location.href));
+                win.top.location.href = href;
+              } catch (error) {
+                var _href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(win.location.href));
+                win.location.href = _href;
+              }
               break;
             case 4:
               eoss_element__WEBPACK_IMPORTED_MODULE_5__["MessageBox"].alert(results.msg ? results.msg : '账号未绑定，账号密码登录后自动绑定！', '提示', {
@@ -2051,14 +2088,18 @@ var isLogined = function isLogined(_ref8) {
                 type: 'error',
                 callback: function callback() {
                   sessionStorage.setItem('extUserBindHandleId', results.extUserBindHandleId);
-                  if (loginPage) {
-                    win.top.location.replace(loginPage);
-                  } else if (document.referrer) {
-                    win.top.location.replace(document.referrer);
-                  } else if (win.top.location.href.indexOf('main.html') > -1) {
-                    win.top.location.href = './login.html';
-                  } else {
-                    next('/login');
+                  try {
+                    if (loginPage) {
+                      win.top.location.replace(loginPage);
+                    } else if (document.referrer) {
+                      win.top.location.replace(document.referrer);
+                    } else if (win.top.location.href.indexOf('main.html') > -1) {
+                      win.top.location.href = './login.html';
+                    } else {
+                      next('/login');
+                    }
+                  } catch (error) {
+                    win.postMessage({ type: 1 }, '*');
                   }
                 }
               });
@@ -2070,14 +2111,18 @@ var isLogined = function isLogined(_ref8) {
             confirmButtonText: '确定',
             type: 'error',
             callback: function callback() {
-              if (loginPage) {
-                win.top.location.replace(loginPage);
-              } else if (document.referrer) {
-                win.top.location.replace(document.referrer);
-              } else if (win.top.location.href.indexOf('main.html') > -1) {
-                win.top.location.href = './login.html';
-              } else {
-                next('/login');
+              try {
+                if (loginPage) {
+                  win.top.location.replace(loginPage);
+                } else if (document.referrer) {
+                  win.top.location.replace(document.referrer);
+                } else if (win.top.location.href.indexOf('main.html') > -1) {
+                  win.top.location.href = './login.html';
+                } else {
+                  next('/login');
+                }
+              } catch (error) {
+                win.postMessage({ type: 1 }, '*');
               }
             }
           });
@@ -2090,14 +2135,18 @@ var isLogined = function isLogined(_ref8) {
         next();
       }
     } else {
-      if (loginPage) {
-        win.top.location.replace(loginPage);
-      } else if (document.referrer) {
-        win.top.location.replace(document.referrer);
-      } else if (win.top.location.href.indexOf('main.html') > -1) {
-        win.top.location.href = './login.html';
-      } else {
-        next('/login');
+      try {
+        if (loginPage) {
+          win.top.location.replace(loginPage);
+        } else if (document.referrer) {
+          win.top.location.replace(document.referrer);
+        } else if (win.top.location.href.indexOf('main.html') > -1) {
+          win.top.location.href = './login.html';
+        } else {
+          next('/login');
+        }
+      } catch (error) {
+        win.postMessage({ type: 1 }, '*');
       }
     }
   }
@@ -2527,30 +2576,30 @@ var setStorage = function setStorage(_ref14) {
   if (value && (typeof value === 'undefined' ? 'undefined' : _typeof(value)) === 'object') {
     value = JSON.stringify(value);
   }
-  if (type === undefined || type === 'sessionStorage') {
+  if (type === 'localStorage') {
     if (typeof key === 'string') {
-      sessionStorage.setItem(key, value);
+      localStorage.setItem(key, value);
     } else if (Array.isArray(key)) {
       for (var i in key) {
-        sessionStorage.setItem(key[i], value);
+        localStorage.setItem(key[i], value);
       }
     } else {
       for (var _i6 in key) {
         var val = _typeof(key[_i6]) === 'object' ? JSON.stringify(key[_i6]) : key[_i6];
-        sessionStorage.setItem(_i6, val);
+        localStorage.setItem(_i6, val);
       }
     }
   } else {
     if (typeof key === 'string') {
-      localStorage.setItem(key, value);
+      sessionStorage.setItem(key, value);
     } else if (Array.isArray(key)) {
       for (var _i7 in key) {
-        localStorage.setItem(key[_i7], value);
+        sessionStorage.setItem(key[_i7], value);
       }
     } else {
       for (var _i8 in key) {
         var _val = _typeof(key[_i8]) === 'object' ? JSON.stringify(key[_i8]) : key[_i8];
-        localStorage.setItem(_i8, _val);
+        sessionStorage.setItem(_i8, _val);
       }
     }
   }
@@ -3683,8 +3732,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=ea89055a&
-var mainvue_type_template_id_ea89055a_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=4d70cb63&
+var mainvue_type_template_id_4d70cb63_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -3704,6 +3753,7 @@ var mainvue_type_template_id_ea89055a_render = function () {
       staticClass: "es-data-table",
       attrs: {
         "label-width": "0",
+        "element-loading-background": "rgba(0, 0, 0, 0.65)",
         model: _vm.tag === "div" ? "" : _vm.datas,
         "element-loading-text": _vm.tableLoadingText,
       },
@@ -3727,14 +3777,18 @@ var mainvue_type_template_id_ea89055a_render = function () {
                 },
                 false
               ),
-              {
-                click: _vm.handleClick,
-                search: _vm.hanleSearch,
-                submit: _vm.hanleSubmit,
-                tabs: _vm.handleTabs,
-                reset: _vm.hanleReset,
-                cancel: _vm.hanleCancel,
-              }
+              Object.assign(
+                {},
+                {
+                  click: _vm.handleClick,
+                  search: _vm.hanleSearch,
+                  submit: _vm.hanleSubmit,
+                  tabs: _vm.handleTabs,
+                  reset: _vm.hanleReset,
+                  cancel: _vm.hanleCancel,
+                },
+                _vm.toolbars.events || {}
+              )
             )
           )
         : _vm._e(),
@@ -3776,6 +3830,8 @@ var mainvue_type_template_id_ea89055a_render = function () {
                           ? _vm.tableHeight
                           : undefined,
                       border: _vm.border,
+                      infiniteScroll: _vm.getTableData,
+                      infiniteScrollDisabled: _vm.infiniteDisabled,
                     }),
                     false
                   ),
@@ -3898,7 +3954,16 @@ var mainvue_type_template_id_ea89055a_render = function () {
                 ],
                 2
               ),
-              _vm.page
+              _vm.infiniteScroll
+                ? _c("div", { staticClass: "es-table-page es-loading-page" }, [
+                    _c("span", [
+                      _vm._v("共" + _vm._s(_vm.config.totalCount) + "条，"),
+                    ]),
+                    _c("span", [
+                      _vm._v("已加载" + _vm._s(_vm.datas.length) + "条"),
+                    ]),
+                  ])
+                : _vm.page
                 ? _c(
                     "es-pagination",
                     _vm._g(
@@ -3934,10 +3999,10 @@ var mainvue_type_template_id_ea89055a_render = function () {
   )
 }
 var staticRenderFns = []
-mainvue_type_template_id_ea89055a_render._withStripped = true
+mainvue_type_template_id_4d70cb63_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=ea89055a&
+// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=4d70cb63&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -3985,8 +4050,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=84eb4d70&
-var columnvue_type_template_id_84eb4d70_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=00e33786&
+var columnvue_type_template_id_00e33786_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4704,11 +4769,11 @@ var columnvue_type_template_id_84eb4d70_render = function () {
     2
   )
 }
-var columnvue_type_template_id_84eb4d70_staticRenderFns = []
-columnvue_type_template_id_84eb4d70_render._withStripped = true
+var columnvue_type_template_id_00e33786_staticRenderFns = []
+columnvue_type_template_id_00e33786_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/column.vue?vue&type=template&id=84eb4d70&
+// CONCATENATED MODULE: ./packages/data-table/src/column.vue?vue&type=template&id=00e33786&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(12);
@@ -5483,10 +5548,12 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
     handleBlur: function handleBlur(data) {
       this.events && this.events.blur && this.events.blur(data);
       this.$emit('formBlur', data);
+      this.$emit('form-blur', data);
     },
     handleFocus: function handleFocus(data) {
       this.events && this.events.focus && this.events.focus(data);
       this.$emit('formFocus', data);
+      this.$emit('form-focus', data);
     },
     handleChange: function handleChange(data) {
       var _this3 = this;
@@ -5543,9 +5610,11 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
       }
       this.events && this.events.change && this.events.change(data);
       this.$emit('formChange', data);
+      this.$emit('form-change', data);
     },
     handleClick: function handleClick(data) {
       this.$emit('handleClick', data);
+      this.$emit('handle-click', data);
     },
     formatDate: function formatDate(date, fmt) {
       return util["a" /* default */].formatDate(date, fmt);
@@ -5567,8 +5636,8 @@ var componentNormalizer = __webpack_require__(3);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_columnvue_type_script_lang_js_,
-  columnvue_type_template_id_84eb4d70_render,
-  columnvue_type_template_id_84eb4d70_staticRenderFns,
+  columnvue_type_template_id_00e33786_render,
+  columnvue_type_template_id_00e33786_staticRenderFns,
   false,
   null,
   null,
@@ -6023,6 +6092,14 @@ var mainvue_type_script_lang_js_components, _watch;
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 
@@ -6247,21 +6324,16 @@ var mainvue_type_script_lang_js_components, _watch;
       }
     },
     rowData: [Object, Boolean],
-    least: {
-      type: Boolean,
-      default: false
-    },
+    least: Boolean,
     //保留搜索参数
-    retainSearh: {
-      type: Boolean,
-      default: false
-    }
+    retainSearh: Boolean,
+    infiniteScroll: Boolean
   },
   data: function data() {
     return {
       requests: [],
       theadData: [],
-      list: null,
+      list: [],
       tableLoading: this.loading,
       tableLoadingText: '加载中...',
       isFirsetCheck: false,
@@ -6275,7 +6347,6 @@ var mainvue_type_script_lang_js_components, _watch;
         pageSize: 20,
         totalCount: 0
       },
-      where: {},
       wheres: {},
       tableHeight: 'auto',
       styles: {},
@@ -6283,7 +6354,8 @@ var mainvue_type_script_lang_js_components, _watch;
       options: {},
       icon: true,
       show: true,
-      sysCodes: []
+      sysCodes: [],
+      infiniteDisabled: this.infiniteScroll
     };
   },
 
@@ -6306,13 +6378,19 @@ var mainvue_type_script_lang_js_components, _watch;
           });
         }
         if (this.numbers) {
+          var index = 1;
+          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;
+          }
           thead.push({
             type: 'index',
             label: '序号',
             width: '70',
             align: 'center',
             fixed: 'left',
-            index: this.index === true ? (this.config.pageNum - 1) * this.config.pageSize + 1 : this.index === false ? 1 : this.index
+            index: index
           });
         }
         if (this.theadData.length) {
@@ -6330,10 +6408,10 @@ var mainvue_type_script_lang_js_components, _watch;
       get: function get() {
         var _this = this;
 
-        if (this.list) {
+        if (this.list && this.list.length) {
           return this.list;
         }
-        if (this.page && this.data && this.data.length && this.config.totalCount < this.data.length + 1) {
+        if (this.page && this.data && this.data.length && this.config.totalCount < this.data.length + 2) {
           this.config.totalCount = this.data.length - this.lose;
           return this.data.filter(function (item, index) {
             return index > (_this.config.pageNum - 1) * _this.config.pageSize - 1 && index < _this.config.pageNum * _this.config.pageSize;
@@ -6586,12 +6664,19 @@ var mainvue_type_script_lang_js_components, _watch;
         }
         this.data.splice(index, 0, data);
         this.$emit('dataChange', 'add', data);
+        this.$emit('data-change', 'add', data);
         this.$emit('btnClick', {
           event: 'addRow',
           row: data,
           index: index,
           data: this.data
         });
+        this.$emit('btn-click', {
+          event: 'addRow',
+          row: data,
+          index: index,
+          data: this.data
+        });
       } else {
         var _index = this.data.length;
         if (this.page) {
@@ -6627,12 +6712,19 @@ var mainvue_type_script_lang_js_components, _watch;
       }
       this.data.splice(index, 1);
       this.$emit('dataChange', 'delete', data);
+      this.$emit('data-change', 'delete', data);
       this.$emit('btnClick', {
         event: 'deleteRow',
         row: data,
         index: index,
         data: this.data
       });
+      this.$emit('btn-click', {
+        event: 'deleteRow',
+        row: data,
+        index: index,
+        data: this.data
+      });
     },
     checkSelect: function checkSelect(newVal) {
       var _this5 = this;
@@ -6689,6 +6781,7 @@ var mainvue_type_script_lang_js_components, _watch;
     getTableData: function getTableData(res) {
       var _this7 = this;
 
+      console.log(11212);
       var where = void 0;
       var first = void 0;
       if (res) {
@@ -6698,7 +6791,7 @@ var mainvue_type_script_lang_js_components, _watch;
       if (!this.url) {
         return;
       }
-      if (first !== false) {
+      if (first !== false && !this.infiniteScroll) {
         this.config.pageNum = 1;
       }
       this.tableLoadingText = '加载中...';
@@ -6710,7 +6803,7 @@ var mainvue_type_script_lang_js_components, _watch;
         reqData = util["a" /* default */].extend({}, reqData, where);
       }
       if (this.retainSearh) {
-        reqData = util["a" /* default */].extend({}, reqData, this.where);
+        reqData = util["a" /* default */].extend({}, reqData, this.wheres);
       }
       this.tableLoading = true;
       util["a" /* default */].ajax({
@@ -6722,13 +6815,21 @@ var mainvue_type_script_lang_js_components, _watch;
       }).then(function (res) {
         _this7.tableLoading = false;
         if (res.rCode === 0 || res.status === 'success') {
-          _this7.$refs.oaTable && _this7.$refs.oaTable.resetScroll && _this7.$refs.oaTable.resetScroll(0, 0);
           var results = _this7.parseData !== undefined ? _this7.parseData(res.results || res.data || res) : res.results || res.data;
-          _this7.list = results.data || results.records || results.list || [];
+          if (_this7.infiniteScroll) {
+            _this7.list = _this7.list.concat(results.data || results.records || results.list);
+            _this7.config.pageNum += 1;
+          } else {
+            _this7.list = results.data || results.records || results.list || [];
+            _this7.$refs.oaTable && _this7.$refs.oaTable.resetScroll && _this7.$refs.oaTable.resetScroll(0, 0);
+          }
           _this7.config.totalCount = results.count || results.total || results.totalCount;
           _this7.checked && _this7.$nextTick(function () {
             _this7.checkSelect(_this7.checked);
           });
+          if (_this7.infiniteScroll && _this7.config.totalCount === _this7.list.length) {
+            _this7.infiniteDisabled = true;
+          }
         } else {
           _this7.list = [];
           //this.tableHeight = false;
@@ -7028,6 +7129,7 @@ var mainvue_type_script_lang_js_components, _watch;
     sizeChange: function sizeChange(res) {
       this.config.pageSize = res;
       this.config.pageNum = 1;
+      this.checkSelect(this.checked);
       this.$emit('page-size-change', res);
       if (this.url) {
         this.getTableData({ where: this.wheres, first: false });
@@ -7035,6 +7137,7 @@ var mainvue_type_script_lang_js_components, _watch;
     },
     currentChange: function currentChange(res) {
       this.config.pageNum = res;
+      this.checkSelect(this.checked);
       this.$emit('page-current-change', res);
       if (this.url) {
         this.getTableData({ where: this.wheres, first: false });
@@ -7042,10 +7145,12 @@ var mainvue_type_script_lang_js_components, _watch;
     },
     preClick: function preClick(res) {
       this.config.pageNum = res;
+      this.checkSelect(this.checked);
       this.$emit('prev', res);
     },
     nextClick: function nextClick(res) {
       this.config.pageNum = res;
+      this.checkSelect(this.checked);
       this.$emit('next', res);
     },
     hanleSearch: function hanleSearch(data) {
@@ -7221,7 +7326,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_ea89055a_render,
+  mainvue_type_template_id_4d70cb63_render,
   staticRenderFns,
   false,
   null,