eoss-ui 0.5.93 → 0.5.95

package/packages/login/src/main.vue

@@ -311,7 +311,7 @@
             <slot name="button"></slot>
             <span @click="downloadExe">初次使用请下载一键安装包</span>
           </div>
-          <div class="es-warning" v-if="warning">
+          <div class="es-warning" v-if="warnInfo">
             {{ warnInfo }}
           </div>
         </div>
@@ -371,6 +371,14 @@
     >
       <es-qr-code :content="checkCode" v-if="checkCode"></es-qr-code>
     </es-dialog>
+    <transition name="launch-fade">
+      <div class="es-launch-image" :style="_launchImage" v-show="showLaunch">
+        <p class="es-launch-text es-launch-user-name">{{ userName }}，你好！</p>
+        <p class="es-launch-text es-launch-system-name">
+          欢迎进入{{ sysName }}
+        </p>
+      </div>
+    </transition>
   </div>
 </template>
 <script>
@@ -393,6 +401,7 @@ import {
   doAssistanceQrLogin
 } from 'eoss-ui/src/config/api.js';
 const ceshi = util.getParams('ceshi');
+import { dayImg, nightImg } from 'eoss-ui/src/config/image';
 export default {
   name: 'EsLogin',
   inheritAttrs: false,
@@ -410,6 +419,7 @@ export default {
       type: String,
       default: 'default'
     },
+    launch: Boolean,
     param: {
       type: Object,
       default() {
@@ -598,7 +608,16 @@ export default {
     },
     isScale: Boolean,
     showIosTips: Boolean,
-    safe: Boolean
+    safe: Boolean,
+    launchImage: {
+      type: [String, Object],
+      default() {
+        return {
+          day: dayImg,
+          night: nightImg
+        };
+      }
+    }
   },
   computed: {
     transform() {
@@ -707,6 +726,12 @@ export default {
         (this.passModifyModel.indexOf('6') > -1 ||
           this.passModifyModel.indexOf('11') > -1)
       );
+    },
+    _launchImage() {
+      let img = util.isObject(this.launchImages)
+        ? this.launchImages[this.launchKey]
+        : this.launchImages;
+      return { 'background-image': `url(${img})` };
     }
   },
   watch: {
@@ -831,7 +856,13 @@ export default {
           event.preventDefault();
           return false;
         }
-      }
+      },
+      userName: '',
+      launchShow: this.launch,
+      showLaunch: false,
+      launchImages: this.launchImage,
+      launchKey: 'day',
+      launchTime: 3000
     };
   },
   beforeCreate() {
@@ -846,11 +877,11 @@ export default {
       'deviceUnique',
       'userId',
       'userName',
-      'useCaseCodes',
-      'showLaunch'
+      'useCaseCodes'
     ]);
   },
   created() {
+    this.launchKey = 5 < new Date().getHours() < 18 ? 'day' : 'night';
     if (ceshi == 'true' || ceshi == true) {
       this.loginModel = '0';
     }
@@ -1046,7 +1077,7 @@ export default {
     async getLogin() {
       const config = util.getStorage('initLogin');
       if (config) {
-        this.setConfig(config);
+        this.setConfig(JSON.parse(config));
       }
       await util
         .ajax({ url: this.initLogin })
@@ -1097,9 +1128,9 @@ export default {
       if (res.linuxDownloadUrl) {
         downloads['linux'] = res.linuxDownloadUrl;
       }
+      this.sysName = res.subsystemName;
       this.secret = res.secret;
       this.setup = res.setup;
-      this.sysName = res.subsystemName;
       this.downloadSetup = res.downloadSetup;
       if (res.subsystemName) {
         document.title = res.subsystemName;
@@ -1179,6 +1210,27 @@ export default {
         if (res.subsystemExtend.uosDownloadUrl) {
           downloads.uos = res.subsystemExtend.uosDownloadUrl;
         }
+        if (res.subsystemExtend.warningText) {
+          this.warningText = res.subsystemExtend.warningText;
+        }
+        if (res.subsystemExtend.launchTime) {
+          this.launchTime = parseInt(res.subsystemExtend.launchTime, 10);
+        }
+        if (res.subsystemExtend.launchImage) {
+          if (!this.launchShow) {
+            this.launchShow = true;
+          }
+          if (
+            res.subsystemExtend.launchImage != 'true' &&
+            res.subsystemExtend.launchImage != true
+          ) {
+            this.launchImages =
+              res.subsystemExtend.launchImage.indexOf('{') > -1 &&
+              res.subsystemExtend.launchImage.indexOf('}') > -1
+                ? JSON.parse(res.subsystemExtend.launchImage)
+                : res.subsystemExtend.launchImage;
+          }
+        }
       }
       this.passModifyModel = res.passModifyModel;
       this.wechatAppid = res.wechatAppid;
@@ -1493,6 +1545,7 @@ export default {
     handleResults(results, type) {
       switch (results.statusCode) {
         case 0:
+          this.userName = results.userName;
           util.setStorage({
             type: this.storage,
             key: {
@@ -1505,11 +1558,14 @@ export default {
               useCaseCodes: results.resourceCodes
             }
           });
-          this.$message({
-            message: '登录成功!',
-            type: 'success',
-            duration: 1500,
-            onClose: () => {
+          if (this.launchShow) {
+            this.$message({
+              message: '登录成功!',
+              type: 'success',
+              duration: 1000
+            });
+            this.showLaunch = true;
+            setTimeout(() => {
               if (this.toUrl) {
                 window.location.href = this.toUrl;
               } else if (results.doorIndex && this.doorIndex) {
@@ -1523,8 +1579,30 @@ export default {
                   this.$router.push({ name: 'main' });
                 }
               }
-            }
-          });
+              this.showLaunch = false;
+            }, this.launchTime);
+          } else {
+            this.$message({
+              message: '登录成功!',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {
+                if (this.toUrl) {
+                  window.location.href = this.toUrl;
+                } else if (results.doorIndex && this.doorIndex) {
+                  sessionStorage.setItem('doorIndex', results.doorIndex);
+                  localStorage.setItem('isLogined', true);
+                  window.location.href = results.doorIndex;
+                } else {
+                  if (window.location.href.indexOf('login.html') > -1) {
+                    window.location.href = './main.html';
+                  } else {
+                    this.$router.push({ name: 'main' });
+                  }
+                }
+              }
+            });
+          }
           break;
         case 2:
           this.$confirm(

package/packages/main/src/default/index.vue

@@ -382,7 +382,7 @@ export default {
       default: true
     },
     loadHomePage: {
-      type: [Boolean, String],
+      type: Boolean,
       default: true
     },
     appCode: String,
@@ -586,6 +586,7 @@ export default {
       selectPage: '',
       //主页面
       homePage: '',
+      isLoadHomePage: this.loadHomePage,
       //header背景
       mainLogo: null,
       headerImg: this.headerImage,
@@ -639,8 +640,8 @@ export default {
   },
   created() {
     let params = util.getParams() || {};
-    if (typeof this.loadHomePage === 'string') {
-      this.homePage = this.loadHomePage;
+    if (params.homePage == 0) {
+      this.isLoadHomePage = false;
     }
     this.isHeader = params.header;
     let sysLogoIco = sessionStorage.getItem('sysLogoIco');
@@ -813,39 +814,38 @@ export default {
         if (i === 'initApplication' && results[i]) {
           this.results[i] = results[i].split(',');
         }
-        if (i === 'indexUrl' && results[i] && this.loadHomePage) {
-          let applicationid =
-            util.getParams('applicationid') || util.getParams('applicationId');
-          let hash = util.win.location.hash;
-          if (hash) {
-            hash = hash.split('?')[0];
-          }
-          let jump = sessionStorage.getItem('jump');
-          if (
-            (!applicationid &&
-              !this.menuCode &&
-              (!jump || !this.isHistory) &&
-              (hash === '#/' || hash === '#/main')) ||
-            jump == results[i]
-          ) {
-            this.homePage =
-              typeof this.loadHomePage === 'string'
-                ? this.loadHomePage
-                : results[i];
-            if (this.isHomePage && this.homePage) {
-              if (this.menus && this.menus.length) {
-                let ids = null;
-                this.homePage && (ids = this.getId(this.menus, this.homePage));
-                if (ids) {
-                  this.defaultActive = ids;
-                } else if (this.homePage) {
-                  this.handleJump(this.homePage);
+        if (i === 'indexUrl' && results[i]) {
+          this.homePage = results[i];
+          if (this.isLoadHomePage) {
+            let applicationid =
+              util.getParams('applicationid') ||
+              util.getParams('applicationId');
+            let hash = util.win.location.hash;
+            if (hash) {
+              hash = hash.split('?')[0];
+            }
+            let jump = sessionStorage.getItem('jump');
+            if (
+              (!applicationid &&
+                !this.menuCode &&
+                (!jump || !this.isHistory) &&
+                (hash === '#/' || hash === '#/main')) ||
+              jump == results[i]
+            ) {
+              if (this.isHomePage) {
+                if (this.menus && this.menus.length) {
+                  let ids = (ids = this.getId(this.menus, this.homePage));
+                  if (ids) {
+                    this.defaultActive = ids;
+                  } else {
+                    this.handleJump(this.homePage);
+                  }
+                  this.setMenu(this.menus);
                 }
-                this.setMenu(this.menus);
               }
+            } else if (this.menus && this.menus.length) {
+              this.setMenu(this.menus);
             }
-          } else if (this.menus && this.menus.length) {
-            this.setMenu(this.menus);
           }
         }
         if (i === 'doorIndex' && results[i]) {
@@ -1173,10 +1173,10 @@ export default {
         this.isDefault = false;
         this.setDefault(res, this.defaultActive);
       } else {
-        if (this.homePage || !util.getStorage('mainConfig')) {
-          this.isDefault = true;
+        if (this.homePage) {
+          this.isDefault = this.isLoadHomePage;
           if (
-            this.homePage &&
+            this.isLoadHomePage &&
             (!this.defaultActive || !this.defaultActive.length)
           ) {
             let ids = this.getId(this.menus, this.homePage);

package/packages/main/src/main.vue

@@ -40,6 +40,7 @@
   </div>
 </template>
 <script>
+import { dayImg, nightImg } from 'eoss-ui/src/config/image';
 import Simplicity from './simplicity/index.vue';
 import MainDefault from './default/index.vue';
 import util from 'eoss-ui/src/utils/util';
@@ -58,9 +59,30 @@ export default {
     MainDefault
   },
   props: {
-    type: String
+    launch: Boolean,
+    type: String,
+    launchImage: {
+      type: [String, Object],
+      default() {
+        return {
+          day: dayImg,
+          night: nightImg
+        };
+      }
+    },
+    launchTime: {
+      type: Number,
+      default: 3000
+    }
+  },
+  computed: {
+    _launchImage() {
+      let img = util.isObject(this.launchImages)
+        ? this.launchImages[this.launchKey]
+        : this.launchImages;
+      return { 'background-image': `url(${img})` };
+    }
   },
-  computed: {},
   watch: {},
   data() {
     return {
@@ -180,8 +202,7 @@ export default {
                 'menus',
                 'useCaseCodes',
                 'mainConfig',
-                'jump',
-                'showLaunch'
+                'jump'
               ]);
               const loginPage =
                 util.getStorage('login') || util.getStorage('loginPage');
@@ -246,6 +267,8 @@ export default {
         util.getMainConfig((res) => {
           this.$refs.main.init(res);
         });
+      } else {
+        mainConfig = JSON.parse(mainConfig);
       }
     },
     /**

package/packages/main/src/simplicity/index.vue

@@ -765,7 +765,7 @@ export default {
           depId: results.userModel.depId,
           orgId: results.userModel.orgId,
           userId: results.userModel.userId,
-          userName: results.userModel.username,
+          userName: results.userModel.username || results.userModel.userName,
           useCaseCodes: results.resourceCodes || results.userModel.resourceCodes
         }
       });
@@ -1707,8 +1707,7 @@ export default {
                   'menus',
                   'useCaseCodes',
                   'mainConfig',
-                  'jump',
-                  'showLaunch'
+                  'jump'
                 ]);
                 if (this.onQuit && typeof this.onQuit === 'function') {
                   this.onQuit();