eoss-ui 0.5.42 → 0.5.44

package/lib/wxlogin.js

@@ -258,7 +258,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);
@@ -274,33 +280,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');
@@ -738,7 +748,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)) {
@@ -1988,7 +2004,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)) {
@@ -2029,22 +2050,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 : '账号未绑定，账号密码登录后自动绑定！', '提示', {
@@ -2052,14 +2089,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 }, '*');
                   }
                 }
               });
@@ -2071,14 +2112,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 }, '*');
               }
             }
           });
@@ -2091,14 +2136,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 }, '*');
       }
     }
   }
@@ -2528,30 +2577,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);
       }
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.5.42",
+  "version": "0.5.44",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [
@@ -96,7 +96,7 @@
     "cp-cli": "^1.0.2",
     "cross-env": "^3.1.3",
     "css-loader": "^2.1.0",
-    "eoss-element": "^0.2.83",
+    "eoss-element": "^0.2.85",
     "es6-promise": "^4.0.5",
     "eslint": "4.18.2",
     "eslint-config-elemefe": "0.1.1",

package/packages/button/src/main.vue

@@ -68,8 +68,20 @@ export default {
           let param = this.param ? this.param : {};
           evt.stopPropagation();
           evt.preventDefault();
-          let width = util.win.top.screen.availWidth - 10;
-          let height = util.win.top.screen.availHeight - 60;
+          let width = 0;
+          let height = 0;
+          try {
+            width = util.win.top.screen.availWidth - 10;
+            height = util.win.top.screen.availHeight - 60;
+          } catch (error) {
+            try {
+              width = util.win.parent.screen.availWidth - 10;
+              height = util.win.parent.screen.availHeight - 60;
+            } catch (error) {
+              width = util.win.screen.availWidth - 10;
+              height = util.win.screen.availHeight - 60;
+            }
+          }
           let flag = true;
           if (this.esForm) {
             let params = util.getParams({ url: this.link });
@@ -211,20 +223,20 @@ export default {
           if (flag) {
             if (this.specs) {
               if (typeof this.specs === 'boolean') {
-                windows = util.win.top.open(
+                windows = util.win.open(
                   util.urlJoinParams({ url: this.link, param: param }),
                   this.name,
                   `width=${width}px,height=${height}px,resizable=yes,status=yes,menubar=no,scrollbars=yes`
                 );
               } else {
-                windows = util.win.top.open(
+                windows = util.win.open(
                   util.urlJoinParams({ url: this.link, param: param }),
                   this.name,
                   this.specs
                 );
               }
             } else {
-              windows = util.win.top.open(
+              windows = util.win.open(
                 util.urlJoinParams({ url: this.link, param: param })
               );
             }

package/packages/button-group/src/main.vue

@@ -114,9 +114,11 @@ export default {
     },
     handleClick(obj) {
       this.$emit('handleClick', obj);
+      this.$emit('handle-click', obj);
     },
     handleCommand(res) {
       this.$emit('handleClick', { row: this.data, handle: res });
+      this.$emit('handle-click', { row: this.data, handle: res });
     },
     resetWidth() {
       this.$nextTick(() => {

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

@@ -800,10 +800,12 @@ export default {
     handleBlur(data) {
       this.events && this.events.blur && this.events.blur(data);
       this.$emit('formBlur', data);
+      this.$emit('form-blur', data);
     },
     handleFocus(data) {
       this.events && this.events.focus && this.events.focus(data);
       this.$emit('formFocus', data);
+      this.$emit('form-focus', data);
     },
     handleChange(data) {
       let { item } = data;
@@ -871,9 +873,11 @@ export default {
       }
       this.events && this.events.change && this.events.change(data);
       this.$emit('formChange', data);
+      this.$emit('form-change', data);
     },
     handleClick(data) {
       this.$emit('handleClick', data);
+      this.$emit('handle-click', data);
     },
     formatDate(date, fmt) {
       return util.formatDate(date, fmt);

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

@@ -5,6 +5,7 @@
     label-width="0"
     ref="component"
     v-loading="tableLoading"
+    element-loading-background="rgba(0, 0, 0, 0.65)"
     :model="tag === 'div' ? '' : datas"
     :element-loading-text="tableLoadingText"
   >
@@ -25,7 +26,8 @@
         submit: hanleSubmit,
         tabs: handleTabs,
         reset: hanleReset,
-        cancel: hanleCancel
+        cancel: hanleCancel,
+        ...(toolbars.events || {})
       }"
     ></es-toolbar>
     <p v-if="title" ref="title" class="es-table-title" v-html="title"></p>
@@ -48,7 +50,9 @@
             tableHeight !== 'auto' && tableHeight !== false
               ? tableHeight
               : undefined,
-          border: border
+          border: border,
+          infiniteScroll: getTableData,
+          infiniteScrollDisabled: infiniteDisabled
         }"
         v-on="{
           ...$listeners,
@@ -118,8 +122,12 @@
           </template>
         </el-table-column>
       </el-table>
+      <div v-if="infiniteScroll" class="es-table-page es-loading-page">
+        <span>共{{ config.totalCount }}条，</span>
+        <span>已加载{{ datas.length }}条</span>
+      </div>
       <es-pagination
-        v-if="page"
+        v-else-if="page"
         v-bind="config"
         class="es-table-page"
         :style="{ 'text-align': page.position || 'center' }"
@@ -362,21 +370,16 @@ export default {
       }
     },
     rowData: [Object, Boolean],
-    least: {
-      type: Boolean,
-      default: false
-    },
+    least: Boolean,
     //保留搜索参数
-    retainSearh: {
-      type: Boolean,
-      default: false
-    }
+    retainSearh: Boolean,
+    infiniteScroll: Boolean
   },
   data() {
     return {
       requests: [],
       theadData: [],
-      list: null,
+      list: [],
       tableLoading: this.loading,
       tableLoadingText: '加载中...',
       isFirsetCheck: false,
@@ -390,7 +393,6 @@ export default {
         pageSize: 20,
         totalCount: 0
       },
-      where: {},
       wheres: {},
       tableHeight: 'auto',
       styles: {},
@@ -398,7 +400,8 @@ export default {
       options: {},
       icon: true,
       show: true,
-      sysCodes: []
+      sysCodes: [],
+      infiniteDisabled: this.infiniteScroll
     };
   },
   computed: {
@@ -419,18 +422,22 @@ export default {
           });
         }
         if (this.numbers) {
+          let 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) {
@@ -446,14 +453,14 @@ export default {
     },
     datas: {
       get() {
-        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
+          this.config.totalCount < this.data.length + 2
         ) {
           this.config.totalCount = this.data.length - this.lose;
           return this.data.filter((item, index) => {
@@ -742,12 +749,19 @@ export default {
         }
         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 {
         let index = this.data.length;
         if (this.page) {
@@ -781,12 +795,19 @@ export default {
       }
       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(newVal) {
       this.$nextTick(() => {
@@ -842,6 +863,7 @@ export default {
         });
     },
     getTableData(res) {
+      console.log(11212);
       let where;
       let first;
       if (res) {
@@ -851,7 +873,7 @@ export default {
       if (!this.url) {
         return;
       }
-      if (first !== false) {
+      if (first !== false && !this.infiniteScroll) {
         this.config.pageNum = 1;
       }
       this.tableLoadingText = '加载中...';
@@ -869,7 +891,7 @@ export default {
         reqData = util.extend({}, reqData, where);
       }
       if (this.retainSearh) {
-        reqData = util.extend({}, reqData, this.where);
+        reqData = util.extend({}, reqData, this.wheres);
       }
       this.tableLoading = true;
       util
@@ -883,20 +905,33 @@ export default {
         .then((res) => {
           this.tableLoading = false;
           if (res.rCode === 0 || res.status === 'success') {
-            this.$refs.oaTable &&
-              this.$refs.oaTable.resetScroll &&
-              this.$refs.oaTable.resetScroll(0, 0);
             let results =
               this.parseData !== undefined
                 ? this.parseData(res.results || res.data || res)
                 : res.results || res.data;
-            this.list = results.data || results.records || results.list || [];
+            if (this.infiniteScroll) {
+              this.list = this.list.concat(
+                results.data || results.records || results.list
+              );
+              this.config.pageNum += 1;
+            } else {
+              this.list = results.data || results.records || results.list || [];
+              this.$refs.oaTable &&
+                this.$refs.oaTable.resetScroll &&
+                this.$refs.oaTable.resetScroll(0, 0);
+            }
             this.config.totalCount =
               results.count || results.total || results.totalCount;
             this.checked &&
               this.$nextTick(() => {
                 this.checkSelect(this.checked);
               });
+            if (
+              this.infiniteScroll &&
+              this.config.totalCount === this.list.length
+            ) {
+              this.infiniteDisabled = true;
+            }
           } else {
             this.list = [];
             //this.tableHeight = false;
@@ -1222,6 +1257,7 @@ export default {
     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 });
@@ -1229,6 +1265,7 @@ export default {
     },
     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 });
@@ -1236,10 +1273,12 @@ export default {
     },
     preClick(res) {
       this.config.pageNum = res;
+      this.checkSelect(this.checked);
       this.$emit('prev', res);
     },
     nextClick(res) {
       this.config.pageNum = res;
+      this.checkSelect(this.checked);
       this.$emit('next', res);
     },
     hanleSearch(data) {

package/packages/data-table-form/src/tbody.vue

@@ -219,12 +219,15 @@ export default {
   methods: {
     handleBlur(data) {
       this.$emit('formBlur', data);
+      this.$emit('form-blur', data);
     },
     handleFocus(data) {
       this.$emit('formFocus', data);
+      this.$emit('form-focus', data);
     },
     handleChange(data) {
       this.$emit('formChange', data);
+      this.$emit('form-change', data);
     },
     handeClick(res) {
       let { item, data, event } = res;