eoss-ui 0.5.81-beta → 0.5.81-beta10

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

@@ -8,7 +8,7 @@
       <img
         class="es-main-logo"
         :src="logoUrl"
-        v-if="layout !== 'topside' && logoUrl && showDefault"
+        v-if="layout !== 'topside' && logoUrl"
       />
       <div class="es-main-top-nav">
         <es-menu
@@ -31,7 +31,7 @@
         ></es-menu>
       </div>
       <es-handler
-        v-if="showDefault"
+        :job-scrollbar="jobScrollbar"
         :userModel="userModel"
         :hide="hide"
         :subSystem="subsystem"
@@ -50,7 +50,7 @@
         @click="handleClick"
       ></es-handler>
     </div>
-    <div class="es-main-box" v-if="reset">
+    <div class="es-main-default-box" v-if="reset">
       <div class="es-main-left" v-if="layout !== 'topnav' && showSide">
         <div
           class="es-main-side"
@@ -67,7 +67,7 @@
           ></es-handle-user>
         </div>
         <es-nav
-          v-if="showMenu && showDefault"
+          v-if="showMenu"
           :hide-sub-menu="hideSubMenu"
           :is-top="layout == 'topside'"
           :overlap="layout == 'side'"
@@ -214,8 +214,7 @@ import {
   mainConfig,
   updateUserCustomInfo,
   getComplexApplications,
-  getComplexApplicationsNew,
-  mainDetail
+  getComplexApplicationsNew
 } from 'eoss-ui/src/config/api.js';
 import store from 'eoss-ui/src/utils/store';
 import util from 'eoss-ui/src/utils/util';
@@ -223,7 +222,7 @@ const isIE = navigator.userAgent.indexOf('MSIE') != -1;
 const log = util.getParams('console');
 const appCode = util.getParams('appCode') || util.getParams('appcode');
 export default {
-  name: 'EsMainDefault',
+  name: 'MainDefault',
   inheritAttrs: false,
   provide() {
     return {
@@ -237,6 +236,7 @@ export default {
     notice
   },
   props: {
+    jobScrollbar: Boolean,
     maxHeight: String,
     //菜单导航地址
     menuUrl: String,
@@ -459,7 +459,8 @@ export default {
     },
     //隐藏操作按键
     hide() {
-      let mainConfig = JSON.parse(util.getStorage('mainConfig'));
+      let mainConfig = util.getStorage('mainConfig');
+      mainConfig = mainConfig ? JSON.parse(mainConfig) : mainConfig;
       let topRightToolHide = '';
       if (
         mainConfig &&
@@ -569,7 +570,6 @@ export default {
   data() {
     return {
       layout: this.scene.toLowerCase(),
-      showDefault: false,
       themeJSON: {
         logo: { comp: '', data: {} },
         topNav: { comp: '', data: {} },
@@ -668,7 +668,12 @@ export default {
     this.isHeader = params.header;
     let sysLogoIco = sessionStorage.getItem('sysLogoIco');
     sysLogoIco && util.setFavicon(sysLogoIco);
-    this.getConfig(params);
+
+    let mainConfig = util.getStorage('mainConfig');
+    if (mainConfig) {
+      const results = JSON.parse(mainConfig);
+      this.init(results);
+    }
   },
   mounted() {
     util.win.reLogin = this.handleReLogin;
@@ -694,56 +699,6 @@ export default {
         this.setMenu(res);
       }
     },
-    //获取主题模板JSON
-    getMainDetail(id) {
-      let params = {
-        url: mainDetail,
-        params: { id }
-      };
-      util
-        .ajax(params)
-        .then((res) => {
-          let _that = this;
-          if (!res.results) {
-            _that.showDefault = true;
-          }
-          if (res.rCode == 0) {
-            if (res.results && JSON.parse(res.results.layout)) {
-              // 初始化布局器
-              _that.themeJSON = JSON.parse(res.results.layout);
-              let count = 0;
-              for (let key in _that.themeJSON) {
-                if (_that.themeJSON[key].comp) {
-                  count++;
-                }
-              }
-              if (count == 0) {
-                _that.showDefault = true;
-              }
-              let theme = JSON.parse(res.results.theme);
-
-              util.updateTheme(theme.primaryColor);
-              _that.handleColorToPage(theme.globalThalk);
-            }
-          } else {
-            _that.$message.error('主题加载发生错误');
-            throw res.msg || '系统错误，请联系管理员！';
-          }
-          if (_that.showDefault && _that.data === undefined) {
-            _that.getMenu();
-          } else if (_that.showDefault) {
-            if (_that.data && _that.data.length) {
-              _that.menus = JSON.parse(JSON.stringify(_that.data));
-              _that.setMenu(_that.data);
-            }
-          }
-        })
-        .catch((err) => {
-          if (err.message && err.message !== 'canceled') {
-            this.$message.error(err.message);
-          }
-        });
-    },
     // 将chalk写入到页面中
     handleColorToPage(globalThalk) {
       const thalk = document.getElementById('chalk-style');
@@ -858,22 +813,19 @@ export default {
     handleSet() {
       this.showSet = !this.showSet;
     },
-    setConfig(results, flag) {
+    setConfig(results) {
       if (this.socket) {
         this.initWebSocket();
       }
-      if (flag) {
-        sessionStorage.setItem('mainConfig', JSON.stringify(results));
-        util.setStorage({
-          type: this.storage,
-          key: {
-            userId: results.userModel.userId,
-            userName: results.userModel.username,
-            useCaseCodes:
-              results.resourceCodes || results.userModel.resourceCodes
-          }
-        });
-      }
+      sessionStorage.setItem('mainConfig', JSON.stringify(results));
+      util.setStorage({
+        type: this.storage,
+        key: {
+          userId: results.userModel.userId,
+          userName: results.userModel.username,
+          useCaseCodes: results.resourceCodes || results.userModel.resourceCodes
+        }
+      });
       for (let i in results) {
         if (i === 'mainLogoUrl' && results[i]) {
           this.mainLogo = results[i];
@@ -966,44 +918,15 @@ export default {
         store.set(i, results[i]);
       }
       this.userModel = results.userModel;
-      let mainFrameLayout = results.mainFrameLayout;
-      if (results.userStyle.layout && this.isCustomMain) {
-        this.getMainDetail(results.userStyle.layout);
-      } else if (this.isCustomMain) {
-        this.getMainDetail(mainFrameLayout);
-      } else {
-        this.showDefault = true;
-      }
     },
-    //获取用户配置及信息
-    getConfig(query) {
-      const token =
-        util.getStorage('token') || util.getStorage('Authorization');
-      if (
-        !token &&
-        Object.prototype.hasOwnProperty.call(query, 'serverId') &&
-        Object.prototype.hasOwnProperty.call(query, 'authType')
-      ) {
-        return false;
-      }
-      if (util.getStorage('mainConfig')) {
-        const results = JSON.parse(util.getStorage('mainConfig'));
-        this.setConfig(results);
-        if (this.remote) {
-          this.getMenu();
-        } else {
-          this.renderMenu();
-        }
-        return true;
+    //初始用户配置及信息
+    init(results) {
+      this.setConfig(results);
+      if (this.remote) {
+        this.getMenu();
+      } else {
+        this.renderMenu();
       }
-      util.getMainConfig((res) => {
-        this.setConfig(res, 1);
-        if (this.remote) {
-          this.getMenu();
-        } else {
-          this.renderMenu();
-        }
-      });
     },
     reGetConfig() {
       util

package/packages/main/src/main.vue

@@ -1,22 +1,23 @@
 <template>
   <div class="es-main-box">
-    <es-main-simplicity
+    <simplicity
       ref="main"
       v-if="type == 'simplicity'"
+      :appCode="appCode"
       v-bind="$attrs"
       v-on="$listeners"
-    ></es-main-simplicity>
-    <es-main-default
+    ></simplicity>
+    <main-default
       v-else
       v-bind="$attrs"
       ref="main"
       v-on="$listeners"
-    ></es-main-default>
+    ></main-default>
   </div>
 </template>
 <script>
-import EsMainSimplicity from './simplicity/index.vue';
-import EsMainDefault from './default/index.vue';
+import Simplicity from './simplicity/index.vue';
+import MainDefault from './default/index.vue';
 import util from 'eoss-ui/src/utils/util';
 export default {
   name: 'EsMain',
@@ -27,24 +28,24 @@ export default {
     };
   },
   components: {
-    EsMainSimplicity,
-    EsMainDefault
+    Simplicity,
+    MainDefault
   },
   props: {
-    type: String,
-    remote: {
-      type: Boolean,
-      default: true
-    }
+    type: String
   },
   computed: {},
   watch: {},
   data() {
-    return {};
+    return {
+      appCode: '',
+      params: {}
+    };
   },
   created() {
-    let params = util.getParams() || {};
-    this.getConfig(params);
+    this.params = util.getParams() || {};
+    this.appCode = this.params.appCode;
+    this.getConfig(this.params);
   },
   mounted() {},
   methods: {