eoss-ui 0.4.58 → 0.4.60

package/packages/handler/src/main.vue

@@ -141,7 +141,6 @@ export default {
   },
   computed: {
     lists() {
-      console.log(111);
       if (this.data === undefined) {
         if (Object.keys(this.hide).length) {
           this.list.forEach((item) => {
@@ -284,7 +283,27 @@ export default {
                 if (this.onQuit && typeof this.onQuit === 'function') {
                   this.onQuit();
                 } else {
-                  if (util.win.top.location.href.indexOf('main.html') > -1) {
+                  const loginPage =
+                    util.getStorage('login') || util.getStorage('loginPage');
+                  if (loginPage) {
+                    let src;
+                    if (!util.startWith(loginPage, ['http', '/'])) {
+                      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 = 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;
@@ -293,14 +312,7 @@ export default {
                       util.win.top.location.href =
                         util.win.location.href.slice(0, len) + '#/login';
                     } else {
-                      const loginPage =
-                        util.getStorage('login') ||
-                        util.getStorage('loginPage');
-                      if (loginPage) {
-                        util.win.top.location.href = loginPage;
-                      } else {
-                        util.win.top.location.href = '/login.html';
-                      }
+                      util.win.top.location.href = '/login.html';
                     }
                   }
                 }

package/packages/input/src/main.vue

@@ -45,7 +45,8 @@ export default {
     readonly: Boolean,
     plain: Boolean,
     text: [String, Number],
-    scope: {}
+    scope: {},
+    exclude: Boolean
   },
   data() {
     return {
@@ -151,7 +152,11 @@ export default {
     },
     searchFilter(query) {
       return (state) => {
-        return state.value.toLowerCase().indexOf(query.toLowerCase()) === 0;
+        if (this.exclude) {
+          return state.value.toLowerCase().indexOf(query.toLowerCase()) === -1;
+        } else {
+          return state.value.toLowerCase().indexOf(query.toLowerCase()) === 0;
+        }
       };
     },
     renderd(doms, h, type) {

package/packages/login/src/main.vue

@@ -55,19 +55,22 @@
                 prop="username"
                 :rules="username.rules"
               >
-                <el-input
+                <es-input
                   v-model="formData.username"
                   size="large"
                   type="text"
                   name="username"
+                  exclude
                   :placeholder="username.placeholder"
-                  @blur="handleBlur"
+                  :focusShow="focusShow"
+                  :data="users"
+                  @select="handleBlur"
                   autocomplete="off"
                 >
                   <template slot="prefix">
                     <i class="es-icon-zhanghao es-label-user"></i>
                   </template>
-                </el-input>
+                </es-input>
               </el-form-item>
               <el-form-item
                 size="large"
@@ -132,7 +135,7 @@
               </el-form-item>
               <div class="es-password-handle" v-show="remember && forget">
                 <el-checkbox
-                  v-show="remember && active == '0'"
+                  v-show="remember && (active == '0' || active == '12')"
                   v-model="checked"
                   >记住密码</el-checkbox
                 >
@@ -160,7 +163,11 @@
               <div class="es-login-down-app">
                 打开
                 <template v-if="active == 3">
-                  <a class="es-login-app-name es-pointer" v-if="downloadApp"
+                  <a
+                    class="es-login-app-name es-pointer"
+                    target="_blank"
+                    :href="downloadApp"
+                    v-if="downloadApp"
                     >{{ app }}app</a
                   >
                   <span
@@ -213,7 +220,6 @@
                   :placeholder="
                     active == 6 ? phone.placeholder : email.placeholder
                   "
-                  @blur="handleBlur"
                   autocomplete="off"
                 >
                   <template slot="prefix">
@@ -378,7 +384,9 @@ export default {
       default: () => {
         return {
           placeholder: '请输入账号',
-          rules: [{ required: true, message: '账号不能为空', trigger: 'blur' }]
+          rules: [
+            { required: true, message: '账号不能为空', trigger: 'change' }
+          ]
         };
       }
     },
@@ -507,6 +515,12 @@ export default {
       default: true
     },
     downloadApp: String,
+    downLoadUrls: {
+      type: Object,
+      default() {
+        return {};
+      }
+    },
     onDownLoadApp: [Function, Boolean],
     redirect_uri: String,
     position: {
@@ -665,7 +679,7 @@ export default {
     checked(val) {
       if (!val) {
         localStorage.removeItem('unpd');
-        localStorage.removeItem('remember');
+        //localStorage.removeItem('remember');
       }
     },
     secret: {
@@ -692,6 +706,8 @@ export default {
       submit: false,
       checked: false,
       formData: this.model,
+      focusShow: false,
+      users: [],
       imageCode: '',
       secret: null,
       identifyingId: '',
@@ -786,27 +802,38 @@ export default {
       return url;
     },
     getRemember(user) {
-      if (!user) {
-        user = localStorage.getItem('remember');
-        if (user) {
-          user = util.esDecode(user);
-        } else {
-          return false;
-        }
-      }
       let values = localStorage.getItem('unpd');
       let value = {};
       if (values) {
         try {
           values = JSON.parse(values);
+          let users = [];
           for (let i in values) {
-            value[util.esDecode(i)] = util.esDecode(values[i]);
+            let k = util.esDecode(i);
+            value[k] = util.esDecode(values[i]);
+            users.push({ value: k });
           }
-          if (value[user]) {
+          this.users = users;
+          let keys = Object.keys(value);
+          if (keys.length) {
             this.checked = true;
           }
-          this.$set(this.formData, 'username', user);
-          this.$set(this.formData, 'password', value[user]);
+          if (!user && keys.length == 1) {
+            user = keys[0];
+            // user = localStorage.getItem('remember');
+            // if (user) {
+            //   user = util.esDecode(user);
+            // } else {
+            //   user = keys[0];
+            // }
+          }
+          if (keys.length > 1) {
+            this.focusShow = true;
+          }
+          if (user) {
+            this.$set(this.formData, 'username', user);
+            this.$set(this.formData, 'password', value[user]);
+          }
         } catch (error) {
           localStorage.removeItem('unpd');
         }
@@ -827,7 +854,7 @@ export default {
         }
       }
       if (this.checked) {
-        localStorage.setItem('remember', util.esEncode(this.formData.username));
+        //localStorage.setItem('remember', util.esEncode(this.formData.username));
         value[this.formData.username] = this.formData.password;
         let data = {};
         for (let i in value) {
@@ -845,7 +872,7 @@ export default {
         } else {
           localStorage.removeItem('unpd');
         }
-        localStorage.removeItem('remember');
+        //localStorage.removeItem('remember');
       }
     },
     // 下载app的弹窗
@@ -865,7 +892,8 @@ export default {
       this.$refs.login && this.$refs.login.clearValidate();
       if (res != 1) {
         this.active = res;
-        this.formData = JSON.parse(JSON.stringify(this.defaultModel));
+        Object.keys(this.defaultModel).length &&
+          (this.formData = JSON.parse(JSON.stringify(this.defaultModel)));
       }
       this.countdown = 0;
       this.$emit('change-type', res, this.identifyingId);
@@ -908,10 +936,22 @@ export default {
       const host = util.getStorage('host');
       this.identifyingId = res.identifyingId;
       this.getImgCode();
-      this.download = {
-        android: res.androidDownloadUrl,
-        ios: res.iosDownloadUrl || res.iosDownloadUrl2
-      };
+      let downloads = {};
+      if (res.androidDownloadUrl) {
+        downloads['android'] = res.androidDownloadUrl;
+      }
+      if (res.iosDownloadUrl || res.iosDownloadUrl2) {
+        downloads['ios'] = res.iosDownloadUrl || res.iosDownloadUrl2;
+      }
+      if (res.macDownloadUrl) {
+        downloads['mac'] = res.macDownloadUrl;
+      }
+      if (res.winDownloadUrl) {
+        downloads['win'] = res.winDownloadUrl;
+      }
+      if (res.linuxDownloadUrl) {
+        downloads['linux'] = res.linuxDownloadUrl;
+      }
       this.secret = res.secret;
       this.setup = res.setup;
       this.sysName = res.subsystemName;
@@ -952,10 +992,20 @@ export default {
           util.updateTheme(res.subsystemExtend.themeColor);
           localStorage.setItem('theme', res.subsystemExtend.themeColor);
         }
+        if (res.subsystemExtend.macDownloadUrl) {
+          downloads.mac = res.subsystemExtend.macDownloadUrl;
+        }
+        if (res.subsystemExtend.winDownloadUrl) {
+          downloads.win = res.subsystemExtend.winDownloadUrl;
+        }
+        if (res.subsystemExtend.linuxDownloadUrl) {
+          downloads.linux = res.subsystemExtend.linuxDownloadUrl;
+        }
       }
       this.passModifyModel = res.passModifyModel;
       this.wechatAppid = res.wechatAppid;
       this.wechatScope = res.wechatScope;
+      this.download = { ...this.downLoadUrls, ...downloads };
       if (res.sysLogoIco) {
         util.setFavicon(res.sysLogoIco);
       }

package/packages/main/src/main.vue

@@ -602,7 +602,8 @@ export default {
       isTabs: false,
       isHeader: '',
       isSide: null,
-      navIds: null
+      navIds: null,
+      timer: null
     };
   },
   created() {
@@ -1751,45 +1752,63 @@ export default {
             type: 'warning'
           };
         } else {
-          console.log('handleReLogin');
           msg = '登录已过期，请重新登录！';
         }
       }
-      this.$confirm(msg, btn)
-        .then(() => {
-          util.removeStorage([
-            'Authorization',
-            'token',
-            'ssId',
-            'userId',
-            'userName',
-            'auth',
-            'deviceUnique',
-            'menus',
-            'useCaseCodes',
-            'mainConfig',
-            'jump'
-          ]);
-          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);
-              let href = util.win.top.location.href.slice(0, len) + '#/login';
-              util.win.top.location.href = href;
-            } else {
+      !this.timer &&
+        (this.timer = setTimeout(() => {
+          console.log('handleReLogin');
+          this.$confirm(msg, btn)
+            .then(() => {
+              util.removeStorage([
+                'Authorization',
+                'token',
+                'ssId',
+                'userId',
+                'userName',
+                'auth',
+                'deviceUnique',
+                'menus',
+                'useCaseCodes',
+                'mainConfig',
+                'jump'
+              ]);
               const loginPage =
                 util.getStorage('login') || util.getStorage('loginPage');
               if (loginPage) {
-                util.win.top.location.href = loginPage;
+                let src;
+                if (!util.startWith(loginPage, ['http', '/'])) {
+                  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 = 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 {
-                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((e) => {});
+            })
+            .catch((e) => {
+              clearTimeout(this.timer);
+              this.timer = null;
+            });
+        }, 1000));
     },
     openPage(url, name, width, height) {
       let src = url;
@@ -1816,6 +1835,7 @@ export default {
     }
   },
   beforeDestroy() {
+    this.timer = null;
     if (this.client && this.client.connected) {
       this.client.disconnect();
     }

package/packages/main/src/userinfo.vue

@@ -370,7 +370,27 @@ export default {
                 type: 'warning'
               })
                 .then(() => {
-                  if (util.win.top.location.href.indexOf('main.html') > -1) {
+                  const loginPage =
+                    util.getStorage('login') || util.getStorage('loginPage');
+                  if (loginPage) {
+                    let src;
+                    if (!util.startWith(loginPage, ['http', '/'])) {
+                      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 = 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;
@@ -379,14 +399,7 @@ export default {
                       util.win.top.location.href =
                         util.win.location.href.slice(0, len) + '#/login';
                     } else {
-                      const loginPage =
-                        util.getStorage('login') ||
-                        util.getStorage('loginPage');
-                      if (loginPage) {
-                        util.win.top.location.href = loginPage;
-                      } else {
-                        util.win.top.location.href = '/login.html';
-                      }
+                      util.win.top.location.href = '/login.html';
                     }
                   }
                 })

package/packages/mainComp/src/main.vue

@@ -1876,22 +1876,35 @@ export default {
             'mainConfig',
             'jump'
           ]);
-          if (util.win.top.location.href.indexOf('main.html') > -1) {
+
+          const loginPage =
+            util.getStorage('login') || util.getStorage('loginPage');
+          if (loginPage) {
+            let src;
+            if (!util.startWith(loginPage, ['http', '/'])) {
+              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 = 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);
-              let href = util.win.top.location.href.slice(0, len) + '#/login';
-              util.win.top.location.href = href;
+              util.win.top.location.href =
+                util.win.location.href.slice(0, len) + '#/login';
             } else {
-              const loginPage =
-                util.getStorage('login') || util.getStorage('loginPage');
-              if (loginPage) {
-                util.win.top.location.href = loginPage;
-              } else {
-                util.win.top.location.href = '/login.html';
-              }
+              util.win.top.location.href = '/login.html';
             }
           }
         })

package/packages/mainComp/src/userinfo.vue

@@ -353,7 +353,27 @@ export default {
                 type: 'warning'
               })
                 .then(() => {
-                  if (util.win.top.location.href.indexOf('main.html') > -1) {
+                  const loginPage =
+                    util.getStorage('login') || util.getStorage('loginPage');
+                  if (loginPage) {
+                    let src;
+                    if (!util.startWith(loginPage, ['http', '/'])) {
+                      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 = 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;
@@ -362,14 +382,7 @@ export default {
                       util.win.top.location.href =
                         util.win.location.href.slice(0, len) + '#/login';
                     } else {
-                      const loginPage =
-                        util.getStorage('login') ||
-                        util.getStorage('loginPage');
-                      if (loginPage) {
-                        util.win.top.location.href = loginPage;
-                      } else {
-                        util.win.top.location.href = '/login.html';
-                      }
+                      util.win.top.location.href = '/login.html';
                     }
                   }
                 })