eoss-ui 0.5.42 → 0.5.44

package/packages/login/src/main.vue

@@ -183,7 +183,7 @@
               </div>
               <es-qr-code
                 :content="identifyingId"
-                v-if="active == 3"
+                v-if="active == 3 && identifyingId"
               ></es-qr-code>
               <div class="es-wx-qrcode-box" v-if="active == 9">
                 <es-wxlogin
@@ -761,7 +761,7 @@ export default {
       doAssistance: null
     };
   },
-  created() {
+  beforeCreate() {
     util.removeStorage([
       'remind',
       'ssId',
@@ -772,6 +772,8 @@ export default {
       'userName',
       'useCaseCodes'
     ]);
+  },
+  created() {
     this.code = util.getParams('code');
     if (this.code) {
       this.doWechatLogin(this.code);
@@ -914,6 +916,7 @@ export default {
           this.onDownLoadApp();
         } else {
           this.$emit('handleDownLoadApp');
+          this.$emit('handle-down-load-app');
         }
       } else {
         this.showDownLoadApp = true;
@@ -934,39 +937,37 @@ export default {
       return this.loginType.indexOf(res) > -1;
     },
     getLogin() {
-      const config = store.get('initLogin');
+      const config = util.getStorage('initLogin');
       if (config) {
         this.setConfig(config);
-      } else {
-        util
-          .ajax({ url: this.initLogin })
-          .then((res) => {
-            if (res && res.rCode === 0) {
-              store.set('initLogin', res.results);
-              util.setStorage({
-                type: this.storage,
-                key: 'initLogin',
-                value: JSON.stringify(res.results)
-              });
-              this.setConfig(res.results);
-            } else {
-              this.$message({
-                message: res.msg || '系统错误，请联系管理员！',
-                type: 'error',
-                duration: 2000
-              });
-            }
-          })
-          .catch((err) => {
-            if (err.message && err.message !== 'canceled') {
-              this.$message.error(err.message);
-            }
-          });
       }
+      util
+        .ajax({ url: this.initLogin })
+        .then((res) => {
+          if (res && res.rCode === 0) {
+            store.set('initLogin', res.results);
+            util.setStorage({
+              type: 'localStorage',
+              key: 'initLogin',
+              value: JSON.stringify(res.results)
+            });
+            this.setConfig(res.results);
+          } else {
+            this.$message({
+              message: res.msg || '系统错误，请联系管理员！',
+              type: 'error',
+              duration: 2000
+            });
+          }
+        })
+        .catch((err) => {
+          if (err.message && err.message !== 'canceled') {
+            this.$message.error(err.message);
+          }
+        });
     },
     setConfig(res) {
-      const host = util.getStorage('host');
-      this.identifyingId = res.identifyingId;
+      this.identifyingId = res.identifyingId || '';
       this.getImgCode();
       let downloads = {};
       if (res.androidDownloadUrl) {
@@ -996,9 +997,12 @@ export default {
         ? res.loginBackgroundUrl.split(',')
         : null;
       this.loginLogoImg = res.loginLogoUrl ? res.loginLogoUrl : null;
+      res.loginPage && sessionStorage.setItem('loginPage', res.loginPage);
       if (res.subsystemExtend && Object.keys(res.subsystemExtend).length) {
         this.icpInfo = res.subsystemExtend;
         this.forgetUrl = res.subsystemExtend.look_pass_url;
+        res.subsystemExtend.loginPage &&
+          sessionStorage.setItem('loginPage', res.subsystemExtend.loginPage);
         if (res.subsystemExtend.login_url) {
           this.actionUrl = res.subsystemExtend.login_url;
         }
@@ -1221,7 +1225,7 @@ export default {
         .then((res) => {
           this.submit = false;
           if (res.rCode == 0) {
-            sessionStorage.removeItem('extUserBindHandleId');
+            util.removeStorage('extUserBindHandleId');
             this.handleRemember();
             const results = res.results;
             this.handleResults(results);

package/packages/main/src/async-component/index.vue

@@ -12,7 +12,7 @@
 
 <script>
 import { importScript } from 'runtime-import';
-import util from 'eoss-ui/src/utils/util'
+import util from 'eoss-ui/src/utils/util';
 export default {
   name: 'AsyncComponent',
   inheritAttrs: true,
@@ -30,7 +30,7 @@ export default {
   watch: {
     componentRenderUrl: {
       immediate: true,
-      handler: function(newVal) {
+      handler: function (newVal) {
         this.handleImport(newVal);
       }
     }
@@ -52,6 +52,7 @@ export default {
             this.comp = catchComponent;
             // 回传props内容
             this.$emit('handleGetProps', this.comp.props);
+            this.$emit('handle-get-props', this.comp.props);
           } else {
             // 加载远端umd格式组件内容
             const comp = await importScript(url);
@@ -64,6 +65,7 @@ export default {
             util.win[url] = comp;
             // 回传props内容
             this.$emit('handleGetProps', this.comp.props);
+            this.$emit('handle-get-props', this.comp.props);
           }
         } else {
           // 如果不是url则当作文本片段处理

package/packages/main/src/main.vue

@@ -267,6 +267,7 @@ import store from 'eoss-ui/src/utils/store';
 import util from 'eoss-ui/src/utils/util';
 const isIE = navigator.userAgent.indexOf('MSIE') != -1;
 const log = util.getParams('console');
+const appCode = util.getParams('appCode');
 export default {
   name: 'EsMain',
   inheritAttrs: false,
@@ -303,7 +304,12 @@ export default {
       type: String,
       default: ''
     },
-    param: Object,
+    param: {
+      type: Object,
+      default() {
+        return {};
+      }
+    },
     header: {
       type: Boolean,
       default: true
@@ -408,7 +414,8 @@ export default {
     loadHomePage: {
       type: [Boolean, String],
       default: true
-    }
+    },
+    appCode: String
   },
   computed: {
     showHeader() {
@@ -535,6 +542,9 @@ export default {
     },
     isConsole() {
       return log ? true : this.console;
+    },
+    menuCode() {
+      return appCode || this.appCode;
     }
   },
   watch: {
@@ -937,8 +947,15 @@ export default {
           this.color = unescape(results[i].color).toLowerCase();
         }
         if (i === 'subsystemExtend' && results[i].webPageWatermark) {
-          util.win.top.webPageWatermark = results[i].webPageWatermark;
-          util.watermark(results[i].webPageWatermark);
+          try {
+            util.win.top.webPageWatermark = results[i].webPageWatermark;
+            util.watermark(results[i].webPageWatermark);
+          } catch (error) {
+            util.win.postMessage(
+              { type: 2, content: results[i].webPageWatermark },
+              '*'
+            );
+          }
         }
 
         if (i === 'subsystemExtend' && results[i].loginPage) {
@@ -1078,8 +1095,10 @@ export default {
     },
     //获取应用导航菜单
     getMenu() {
+      let param = this.menuCode ? { menuCode: this.menuCode } : {};
+      let params = { ...this.param, ...param };
       util
-        .ajax({ url: this.action, params: this.param ? this.param : {} })
+        .ajax({ url: this.action, params: params })
         .then((res) => {
           if (res.rCode === 0) {
             if (res.results && res.results.length) {
@@ -2021,33 +2040,39 @@ export default {
               ]);
               const loginPage =
                 util.getStorage('login') || util.getStorage('loginPage');
-              if (loginPage) {
-                let src;
-                if (!util.startWith(loginPage, ['http', '/'], true)) {
-                  let pathname = util.win.top.location.pathname;
-                  if (pathname !== '/') {
-                    pathname = pathname.split('/');
-                    pathname.splice(pathname.length - 1);
-                    pathname = pathname.join('/');
-                    src = pathname + '/' + loginPage.replace('./', '');
+              try {
+                if (loginPage) {
+                  let src;
+                  if (!util.startWith(loginPage, ['http', '/'], true)) {
+                    let pathname = util.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;
                   }
+                  util.win.top.location.href = src;
+                } else if (
+                  util.win.top.location.href.indexOf('main.html') > -1
+                ) {
+                  util.win.top.location.href = './login.html';
                 } else {
-                  src = loginPage;
-                }
-                util.win.top.location.href = src;
-              } else if (util.win.top.location.href.indexOf('main.html') > -1) {
-                util.win.top.location.href = './login.html';
-              } else {
-                const hash = util.win.top.location.hash;
-                if (hash) {
-                  const len = util.win.top.location.href.indexOf(hash);
-                  util.win.top.location.href =
-                    util.win.location.href.slice(0, len) + '#/login';
-                } else {
-                  util.win.top.location.href = '/login.html';
+                  const hash = util.win.top.location.hash;
+                  if (hash) {
+                    const len = util.win.top.location.href.indexOf(hash);
+                    util.win.top.location.href =
+                      util.win.location.href.slice(0, len) + '#/login';
+                  } else {
+                    util.win.top.location.href = '/login.html';
+                  }
                 }
+              } catch (error) {
+                util.win.postMessage({ type: 1 }, '*');
               }
             })
             .catch((e) => {
@@ -2068,8 +2093,15 @@ export default {
         src = pathname + url.replace('./', '/');
       }
       if (name) {
-        let w = width ? width : util.win.top.screen.availWidth - 10;
-        let h = height ? height : util.win.top.screen.availHeight - 60;
+        let w = 0;
+        let h = 0;
+        try {
+          w = width ? width : util.win.top.screen.availWidth - 10;
+          h = height ? height : util.win.top.screen.availHeight - 60;
+        } catch (error) {
+          w = width ? width : util.win.screen.availWidth - 10;
+          h = height ? height : util.win.screen.availHeight - 60;
+        }
         return util.win.open(
           src,
           name,

package/packages/main/src/userinfo.vue

@@ -392,35 +392,39 @@ export default {
                 .then(() => {
                   const loginPage =
                     util.getStorage('login') || util.getStorage('loginPage');
-                  if (loginPage) {
-                    let src;
-                    if (!util.startWith(loginPage, ['http', '/'], true)) {
-                      let pathname = util.win.top.location.pathname;
-                      if (pathname !== '/') {
-                        pathname = pathname.split('/');
-                        pathname.splice(pathname.length - 1);
-                        pathname = pathname.join('/');
-                        src = pathname + '/' + loginPage.replace('./', '');
+                  try {
+                    if (loginPage) {
+                      let src;
+                      if (!util.startWith(loginPage, ['http', '/'], true)) {
+                        let pathname = util.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;
                       }
+                      util.win.top.location.href = src;
+                    } else if (
+                      util.win.top.location.href.indexOf('main.html') > -1
+                    ) {
+                      util.win.top.location.href = './login.html';
                     } else {
-                      src = loginPage;
-                    }
-                    util.win.top.location.href = src;
-                  } else if (
-                    util.win.top.location.href.indexOf('main.html') > -1
-                  ) {
-                    util.win.top.location.href = './login.html';
-                  } else {
-                    const hash = util.win.top.location.hash;
-                    if (hash) {
-                      const len = util.win.top.location.href.indexOf(hash);
-                      util.win.top.location.href =
-                        util.win.location.href.slice(0, len) + '#/login';
-                    } else {
-                      util.win.top.location.href = '/login.html';
+                      const hash = util.win.top.location.hash;
+                      if (hash) {
+                        const len = util.win.top.location.href.indexOf(hash);
+                        util.win.top.location.href =
+                          util.win.location.href.slice(0, len) + '#/login';
+                      } else {
+                        util.win.top.location.href = '/login.html';
+                      }
                     }
+                  } catch (error) {
+                    util.win.postMessage({ type: 1 }, '*');
                   }
                 })
                 .catch((e) => {});

package/packages/retrial-auth/src/main.vue

@@ -171,7 +171,12 @@ export default {
                   type: 'success'
                 });
                 this.msgBox.handleClose();
-                this.reload && util.win.top.location.reload();
+                try {
+                  this.reload && util.win.top.location.reload();
+                } catch (error) {
+                  this.reload && util.win.location.reload();
+                  util.win.postMessage({ type: 3 }, '*');
+                }
               } else {
                 this.$message({
                   message: msg,
@@ -249,7 +254,12 @@ export default {
                 type: 'success'
               });
               this.msgBox.handleClose();
-              this.reload && util.win.top.location.reload();
+              try {
+                this.reload && util.win.top.location.reload();
+              } catch (error) {
+                this.reload && util.win.location.reload();
+                util.win.postMessage({ type: 3 }, '*');
+              }
             } else {
               this.scanCode = setTimeout(() => {
                 this.handleScanCodeRetrialAuth();

package/packages/selector-panel/src/selection.vue

@@ -16,6 +16,7 @@
           :disabled="typeof item == 'string' ? false : item.disabled"
           :class="{ 'es-radio-delete': genre === 'delete' }"
           :value-key="valueKey"
+          :tooltip="item[tipKey]"
         >
           {{ typeof item == 'string' ? item : getLabel(item) }}</el-radio
         >
@@ -37,6 +38,7 @@
           :disabled="typeof item == 'string' ? false : item.disabled"
           :class="{ 'es-checkbox-delete': genre === 'delete' }"
           :value-key="valueKey"
+          :tooltip="item[tipKey]"
         >
           {{ typeof item == 'string' ? item : getLabel(item) }}
           <i v-show="genre === 'delete'" class="el-icon-circle-close"></i>
@@ -61,6 +63,10 @@ export default {
       type: String,
       default: 'showname'
     },
+    tipKey: {
+      type: String,
+      default: 'pathname'
+    },
     valueType: {
       type: String,
       default: 'object',

package/packages/tabs/src/main.vue

@@ -771,6 +771,7 @@ export default {
     },
     handleChangeData(res) {
       this.$emit('changeData', res);
+      this.$emit('change-data', res);
     }
   }
 };

package/packages/theme-chalk/lib/data-table.css

@@ -1 +1 @@
-@charset "UTF-8";.es-data-table,.es-data-table-content .es-table .el-table__body-wrapper .el-table__body{position:relative}.es-data-table .es-toolbar+.es-data-table-content{padding:16px}.es-data-table-content{background-color:#fafafa}.es-data-table-content .es-table:not(.el-table--border){border:1px solid #e1e1e1;border-bottom:0}.es-data-table-content .es-table thead th,.es-data-table-content .es-table thead tr{background-color:#f8f8f8;border-color:#e1e1e1}.es-data-table-content .es-table th,.es-data-table-content .es-table thead tr{padding:6px 0;text-align:center}.es-data-table-content .es-table th .cell,.es-data-table-content .es-table thead tr .cell{-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.es-data-table-content .es-table td{padding:6px 0}.es-data-table-content .es-table td.es-table-handle-box .cell,.es-data-table-content .es-table td.is-center .cell{-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.es-data-table-content .es-table td.is-right .cell{-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}.es-data-table-content .es-table .es-table-handle-box{text-align:center}.es-data-table-content .es-table+.es-table-page{margin-top:-1px}.es-data-table-content .es-table .el-table__fixed-right::before,.es-data-table-content .es-table .el-table__fixed::before{background-color:transparent}.es-data-table-content .es-table .cell{min-height:28px;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-ms-flex-line-pack:center;align-content:center}.es-data-table-content .es-table .cell:not(.el-tooltip){display:-webkit-box;display:-ms-flexbox;display:flex}.es-data-table-content .es-table .cell.el-tooltip{line-height:28px}.es-data-table-content .es-table .el-form-item{margin-bottom:0;width:100%}.es-data-table-content .es-table .el-form-item .el-input:not(.el-input--prefix) .el-input__inner{padding:0 8px;margin-top:0}.es-data-table-content .es-table .el-form-item .el-input-number,.es-data-table-content .es-table .el-form-item .el-select{width:100%}.es-data-table-content .el-table__header,.es-data-table-content .el-table__header thead{color:#404040}.es-data-table-content .el-table__body tr.hover-row.current-row>td,.es-data-table-content .el-table__body tr.hover-row.el-table__row--striped.current-row>td,.es-data-table-content .el-table__body tr.hover-row.el-table__row--striped>td,.es-data-table-content .el-table__body tr.hover-row>td,.es-data-table-content .el-table__body tr:hover>td{background-color:#e6f7ff}.es-data-table-content .el-table__body tr.current-row>td{background-color:#91d5ff}.es-data-table-content .es-table-page{height:46px;border:1px solid #e1e1e1;padding:8px 12px;background-color:#f8f8f8}.es-data-table-content .es-thead-border .el-table__header th:not(.gutter){border-right:1px solid #e1e1e1}.es-data-table-content .es-thead-border .el-table__header thead:not(.is-group) th:last-child{border-right:0;border-bottom:1px solid #e1e1e1}.es-data-table-content .es-thead-border .el-table__fixed-right:not(.el-table-box-shadow) thead th:last-child{border-left:1px solid #e1e1e1}.es-data-table-content .es-thead-border .is-scrolling-right~.el-table__fixed-right:not(.el-table-box-shadow) thead th:last-child{border-left:0}.es-data-table-content .el-form-item__error{top:unset;bottom:0}.es-data-table-content .es-table:not(.el-table--border) .el-table--border td,.es-data-table-content .es-table:not(.el-table--border) .el-table--border th,.es-data-table-content .es-table:not(.el-table--border) .el-table__body-wrapper .el-table--border.is-scrolling-left~.el-table__fixed{border-right:0}.es-data-table-content .is-scrolling-right+.el-table__fixed-body-wrapper td{border-right:1px solid #e1e1e1}.es-data-table-content .is-scrolling-right+.el-table__fixed-body-wrapper td:last-child{border-right:0}.el-table--border::after,.el-table--group::after,.el-table::before{z-index:5}.sizer-btn-box{text-align:right;margin-top:7px}
+@charset "UTF-8";.es-data-table,.es-data-table-content .es-table .el-table__body-wrapper .el-table__body{position:relative}.es-data-table .es-toolbar+.es-data-table-content{padding:16px}.es-data-table-content{background-color:#fafafa}.es-data-table-content .es-table:not(.el-table--border){border:1px solid #e1e1e1;border-bottom:0}.es-data-table-content .es-table thead th,.es-data-table-content .es-table thead tr{background-color:#f8f8f8;border-color:#e1e1e1}.es-data-table-content .es-table th,.es-data-table-content .es-table thead tr{padding:6px 0;text-align:center}.es-data-table-content .es-table th .cell,.es-data-table-content .es-table thead tr .cell{-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.es-data-table-content .es-table td{padding:6px 0}.es-data-table-content .es-table td.es-table-handle-box .cell,.es-data-table-content .es-table td.is-center .cell{-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.es-data-table-content .es-table td.is-right .cell{-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}.es-data-table-content .es-table .es-table-handle-box{text-align:center}.es-data-table-content .es-table+.es-table-page{margin-top:-1px}.es-data-table-content .es-table .el-table__fixed-right::before,.es-data-table-content .es-table .el-table__fixed::before{background-color:transparent}.es-data-table-content .es-table .cell{min-height:28px;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-ms-flex-line-pack:center;align-content:center}.es-data-table-content .es-table .cell:not(.el-tooltip){display:-webkit-box;display:-ms-flexbox;display:flex}.es-data-table-content .es-table .cell.el-tooltip{line-height:28px}.es-data-table-content .es-table .el-form-item{margin-bottom:0;width:100%}.es-data-table-content .es-table .el-form-item .el-input:not(.el-input--prefix) .el-input__inner{padding:0 8px;margin-top:0}.es-data-table-content .es-table .el-form-item .el-input-number,.es-data-table-content .es-table .el-form-item .el-select{width:100%}.es-data-table-content .el-table__header,.es-data-table-content .el-table__header thead{color:#404040}.es-data-table-content .el-table__body tr.hover-row.current-row>td,.es-data-table-content .el-table__body tr.hover-row.el-table__row--striped.current-row>td,.es-data-table-content .el-table__body tr.hover-row.el-table__row--striped>td,.es-data-table-content .el-table__body tr.hover-row>td,.es-data-table-content .el-table__body tr:hover>td{background-color:#e6f7ff}.es-data-table-content .el-table__body tr.current-row>td{background-color:#91d5ff}.es-data-table-content .es-table-page{height:46px;border:1px solid #e1e1e1;padding:8px 12px;background-color:#f8f8f8}.es-data-table-content .es-table-page.es-loading-page{line-height:30px;font-size:14px;font-weight:400;color:rgba(0,0,0,.75)}.es-data-table-content .es-thead-border .el-table__header th:not(.gutter){border-right:1px solid #e1e1e1}.es-data-table-content .es-thead-border .el-table__header thead:not(.is-group) th:last-child{border-right:0;border-bottom:1px solid #e1e1e1}.es-data-table-content .es-thead-border .el-table__fixed-right:not(.el-table-box-shadow) thead th:last-child{border-left:1px solid #e1e1e1}.es-data-table-content .es-thead-border .is-scrolling-right~.el-table__fixed-right:not(.el-table-box-shadow) thead th:last-child{border-left:0}.es-data-table-content .el-form-item__error{top:unset;bottom:0}.es-data-table-content .es-table:not(.el-table--border) .el-table--border td,.es-data-table-content .es-table:not(.el-table--border) .el-table--border th,.es-data-table-content .es-table:not(.el-table--border) .el-table__body-wrapper .el-table--border.is-scrolling-left~.el-table__fixed{border-right:0}.es-data-table-content .is-scrolling-right+.el-table__fixed-body-wrapper td{border-right:1px solid #e1e1e1}.es-data-table-content .is-scrolling-right+.el-table__fixed-body-wrapper td:last-child{border-right:0}.el-table--border::after,.el-table--group::after,.el-table::before{z-index:5}.sizer-btn-box{text-align:right;margin-top:7px}