eoss-ui 0.5.92 → 0.5.94

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() {
@@ -425,6 +435,7 @@ export default {
       type: String,
       default: '0'
     },
+    firstLoginModel: String,
     //是否加密传输
     isEncrypt: {
       type: Boolean,
@@ -597,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() {
@@ -706,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: {
@@ -830,6 +856,15 @@ export default {
           event.preventDefault();
           return false;
         }
+      },
+      userName: '',
+      launchShow: this.launch,
+      showLaunch: false,
+      launchImages: this.launchImage,
+      launchKey: 'day',
+      launchTime: {
+        type: Number,
+        default: 3000
       }
     };
   },
@@ -850,6 +885,8 @@ export default {
     ]);
   },
   created() {
+    sessionStorage.setItem('launchImage', JSON.stringify(this.launchImages));
+    this.launchKey = 5 < new Date().getHours() < 18 ? 'day' : 'night';
     if (ceshi == 'true' || ceshi == true) {
       this.loginModel = '0';
     }
@@ -1074,6 +1111,7 @@ export default {
         });
     },
     setConfig(res) {
+      const isLogined = localStorage.getItem('isLogined');
       this.identifyingId = res.identifyingId || '';
       this.getImgCode();
       let downloads = {};
@@ -1095,9 +1133,10 @@ export default {
       if (res.linuxDownloadUrl) {
         downloads['linux'] = res.linuxDownloadUrl;
       }
+      this.sysName = res.subsystemName;
+      sessionStorage.setItem('sysName', this.sysName);
       this.secret = res.secret;
       this.setup = res.setup;
-      this.sysName = res.subsystemName;
       this.downloadSetup = res.downloadSetup;
       if (res.subsystemName) {
         document.title = res.subsystemName;
@@ -1107,7 +1146,10 @@ export default {
         this.qrimg = res.qrimg || res.qrImg;
       }
       if (res.loginModel && ceshi !== 'true' && ceshi !== true) {
-        this.loginModel = res.loginModel;
+        this.loginModel =
+          (res.firstLoginModel || this.firstLoginModel) && !isLogined
+            ? res.firstLoginModel || this.firstLoginModel
+            : res.loginModel;
       }
       if (res.loginBackgroundUrl) {
         this.loginBackgroundImg = res.loginBackgroundUrl.split(',');
@@ -1128,7 +1170,10 @@ export default {
           res.subsystemExtend.loginModel &&
           (ceshi == 'true' || ceshi == true)
         ) {
-          this.loginModel = res.subsystemExtend.loginModel;
+          this.loginModel =
+            (res.firstLoginModel || this.firstLoginModel) && !isLogined
+              ? res.firstLoginModel || this.firstLoginModel
+              : res.subsystemExtend.loginModel;
         }
         if (res.subsystemExtend.applicationName) {
           localStorage.setItem('appcode', res.subsystemExtend.applicationName);
@@ -1171,6 +1216,39 @@ export default {
         if (res.subsystemExtend.uosDownloadUrl) {
           downloads.uos = res.subsystemExtend.uosDownloadUrl;
         }
+        if (res.subsystemExtend.warningText) {
+          this.warningText = res.subsystemExtend.warningText;
+        }
+        if (res.subsystemExtend.launchTime) {
+          sessionStorage.setItem('launchTime', res.subsystemExtend.launchTime);
+        }
+        if (res.subsystemExtend.launchImage) {
+          if (!this.launchShow) {
+            this.launchShow = true;
+            setTimeout(
+              () => {
+                this.launchShow = false;
+              },
+              res.subsystemExtend.launchTime
+                ? parseInt(res.subsystemExtend.launchTime)
+                : this.launchTime
+            );
+          }
+          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;
+          }
+          sessionStorage.setItem(
+            'launchImage',
+            JSON.stringify(this.launchImages)
+          );
+        }
       }
       this.passModifyModel = res.passModifyModel;
       this.wechatAppid = res.wechatAppid;
@@ -1485,6 +1563,7 @@ export default {
     handleResults(results, type) {
       switch (results.statusCode) {
         case 0:
+          this.userName = results.userName;
           util.setStorage({
             type: this.storage,
             key: {
@@ -1497,25 +1576,52 @@ export default {
               useCaseCodes: results.resourceCodes
             }
           });
-          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);
-                window.location.href = results.doorIndex;
+          if (
+            this.launchShow &&
+            !this.toUrl &&
+            !results.doorIndex &&
+            !this.doorIndex
+          ) {
+            this.$message({
+              message: '登录成功!',
+              type: 'success',
+              duration: 1000
+            });
+            this.showLaunch = true;
+            setTimeout(() => {
+              sessionStorage.setItem('showLaunch', 1);
+              if (window.location.href.indexOf('login.html') > -1) {
+                window.location.href = './main.html';
               } else {
-                if (window.location.href.indexOf('login.html') > -1) {
-                  window.location.href = './main.html';
+                this.$router.push({ name: 'main' });
+              }
+              this.showLaunch = false;
+            }, 3000);
+          } else {
+            if (this.launchShow) {
+              sessionStorage.setItem('launch', this.launchShow);
+            }
+            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 {
-                  this.$router.push({ name: 'main' });
+                  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/main.vue

@@ -37,9 +37,19 @@
       ></iframe>
     </es-dialog>
     <!-- 公用弹窗 end -->
+
+    <transition name="launch-fade">
+      <div class="es-launch-image" :style="_launchImage" v-show="launchShow">
+        <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>
+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 +68,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 {
@@ -68,10 +99,18 @@ export default {
       appCode: '',
       params: {},
       dialogs: [],
-      visibles: []
+      visibles: [],
+      sysName: '',
+      userName: '',
+      launchShow: this.launch,
+      showLaunch: false,
+      launchImages: this.launchImage,
+      launchKey: 'day',
+      launchTimer: null
     };
   },
   created() {
+    this.init();
     this.params = util.getParams() || {};
     this.sysCode = this.params.sysCode;
     this.appCode = this.params.appCode;
@@ -132,6 +171,40 @@ export default {
     });
   },
   methods: {
+    /**
+     * @desc:初始化
+     * @author huangbo
+     * @date 2024年9月7日
+     **/
+    init() {
+      this.userName = util.getStorage('userName');
+      this.sysName = util.getStorage('sysName');
+      this.launchKey = 5 < new Date().getHours() < 18 ? 'day' : 'night';
+      const showLaunch = sessionStorage.getItem('showLaunch');
+      const launch = sessionStorage.getItem('launch');
+      const launchImage = sessionStorage.getItem('launchImage');
+      const launchTime = util.getStorage('launchTime');
+      if (launchImage) {
+        this.launchImages = JSON.parse(launchImage);
+      }
+      if (showLaunch) {
+        this.launchShow = false;
+      } else if (launch) {
+        if (launch == 'true') {
+          this.launchShow = true;
+          clearTimeout(this.launchTimer);
+          this.launchTimer = setTimeout(
+            () => {
+              this.launchShow = false;
+              sessionStorage.setItem('showLaunch', 1);
+            },
+            launchTime ? parseInt(launchTime, 10) : this.launchTime
+          );
+        } else {
+          this.launchShow = false;
+        }
+      }
+    },
     /**
      * @desc:重新登录
      * @author huangbo
@@ -244,8 +317,45 @@ export default {
       let mainConfig = util.getStorage('mainConfig');
       if (!mainConfig || mainConfig == '{}') {
         util.getMainConfig((res) => {
+          this.userName =
+            res.results.userModel.username || res.userModel.userName;
+          this.sysName = res.subsystemName;
+          if (res.subsystemExtend && res.subsystemExtend.launchImage) {
+            if (!this.launchShow) {
+              this.launchShow = true;
+              clearTimeout(this.launchTimer);
+              this.launchTimer = setTimeout(
+                () => {
+                  this.launchShow = false;
+                  sessionStorage.setItem('showLaunch', 1);
+                },
+                res.subsystemExtend.launchTime
+                  ? parseInt(res.subsystemExtend.launchTime, 10)
+                  : this.launchTime
+              );
+            }
+            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;
+            }
+            sessionStorage.setItem(
+              'launchImage',
+              JSON.stringify(this.launchImages)
+            );
+          }
           this.$refs.main.init(res);
         });
+      } else {
+        mainConfig = JSON.parse(mainConfig);
+        this.userName =
+          mainConfig.userModel.username || mainConfig.userModel.userName;
+        this.sysName = mainConfig.subsystemName;
       }
     },
     /**

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
         }
       });