eoss-ui 0.5.94 → 0.5.95

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

@@ -37,15 +37,6 @@
       ></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>
@@ -99,18 +90,10 @@ export default {
       appCode: '',
       params: {},
       dialogs: [],
-      visibles: [],
-      sysName: '',
-      userName: '',
-      launchShow: this.launch,
-      showLaunch: false,
-      launchImages: this.launchImage,
-      launchKey: 'day',
-      launchTimer: null
+      visibles: []
     };
   },
   created() {
-    this.init();
     this.params = util.getParams() || {};
     this.sysCode = this.params.sysCode;
     this.appCode = this.params.appCode;
@@ -171,40 +154,6 @@ 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
@@ -253,8 +202,7 @@ export default {
                 'menus',
                 'useCaseCodes',
                 'mainConfig',
-                'jump',
-                'showLaunch'
+                'jump'
               ]);
               const loginPage =
                 util.getStorage('login') || util.getStorage('loginPage');
@@ -317,45 +265,10 @@ 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

@@ -1707,8 +1707,7 @@ export default {
                   'menus',
                   'useCaseCodes',
                   'mainConfig',
-                  'jump',
-                  'showLaunch'
+                  'jump'
                 ]);
                 if (this.onQuit && typeof this.onQuit === 'function') {
                   this.onQuit();

package/packages/upload/src/main.vue

@@ -638,8 +638,6 @@ export default {
           });
           this.filesTotalSize = filesTotalSize;
           this.$emit('input', val);
-        } else {
-          this.getFiles(this.params);
         }
       }
     },
@@ -758,6 +756,7 @@ export default {
                     dochubConfig: this.dochubConfig
                   });
                 }
+                this.getFiles(this.params);
               }
             })
             .catch((err) => {
@@ -779,10 +778,16 @@ export default {
       ) {
         return false;
       }
+      let url =
+        typeof this.fileList === 'string'
+          ? this.fileList
+          : this.dochubConfig.getDocumentList
+          ? this.dochubConfig.getDocumentList
+          : getAdjunctFileInfos;
       util
         .ajax({
           method: this.method,
-          url: this.getAdjunctFileInfos,
+          url: url,
           data: params,
           params: params,
           format: false

package/src/index.js

@@ -121,7 +121,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.5.94',
+  version: '0.5.95',
   install,
   Button,
   ButtonGroup,