eoss-ui 0.5.81-beta → 0.5.81-beta1

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,6 @@
         ></es-menu>
       </div>
       <es-handler
-        v-if="showDefault"
         :userModel="userModel"
         :hide="hide"
         :subSystem="subsystem"
@@ -50,7 +49,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 +66,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'"
@@ -459,7 +458,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 +569,6 @@ export default {
   data() {
     return {
       layout: this.scene.toLowerCase(),
-      showDefault: false,
       themeJSON: {
         logo: { comp: '', data: {} },
         topNav: { comp: '', data: {} },
@@ -668,7 +667,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 +698,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 +812,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 +917,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

@@ -31,11 +31,7 @@ export default {
     EsMainDefault
   },
   props: {
-    type: String,
-    remote: {
-      type: Boolean,
-      default: true
-    }
+    type: String
   },
   computed: {},
   watch: {},
@@ -54,6 +50,7 @@ export default {
      * @date 2024年9月7日
      **/
     getConfig(query) {
+      console.log(121212);
       const token =
         util.getStorage('token') || util.getStorage('Authorization');
       if (

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

@@ -1,7 +1,17 @@
 <template>
   <div class="es-simplicity_apps">
     <div class="es-simplicity_apps-all">
-      <div class="es-simplicity_apps-title">所有业务系统</div>
+      <div class="es-simplicity_apps-title">
+        所有业务系统
+        <el-input
+          class="es-simplicity_apps-search"
+          size="medium"
+          placeholder="请输入关键字"
+          prefix-icon="el-icon-search"
+          v-model="value"
+        >
+        </el-input>
+      </div>
       <div class="es-simplicity_apps-box">
         <ul class="es-simplicity_apps-list">
           <li
@@ -19,10 +29,10 @@
                   class="es-simplicity_apps-icon"
                   :contents="item.icons || item.icon || menuIcon"
                 ></es-icon>
-                <div class="es-simplicity_apps-text">
-                  {{ item.text || item.name }}
-                </div>
               </el-badge>
+              <div class="es-simplicity_apps-text">
+                {{ item.text || item.name }}
+              </div>
               <div class="es-simplicity_apps-hover">
                 <es-icon
                   class="es-simplicity_apps-icon"
@@ -44,7 +54,7 @@
         layout="total,prev, pager, next"
         total-text="共 {total} 个业务系统"
         :page-size="appSize"
-        :total="applications.length"
+        :total="apps.length"
         @current-change="
           (res) => {
             this.handleChange(res, 0);
@@ -67,12 +77,12 @@
               :class="{ 'es-simplicity_apps-disabled': !item.permission }"
               @click="handleClick(item)"
             >
+              <es-icon
+                class="es-simplicity_app-icon"
+                :style="setStyle(index)"
+                :contents="item.icons || item.icon || menuIcon"
+              ></es-icon>
               <el-badge v-bind="getBadge(item)">
-                <es-icon
-                  class="es-simplicity_app-icon"
-                  :style="setStyle(index)"
-                  :contents="item.icons || item.icon || menuIcon"
-                ></es-icon>
                 <div class="es-simplicity_apps-text">
                   {{ item.text || item.name }}
                 </div>
@@ -119,12 +129,12 @@
               :class="{ 'es-simplicity_apps-disabled': !item.permission }"
               @click="handleClick(item)"
             >
+              <es-icon
+                class="es-simplicity_app-icon"
+                :style="setStyle(index)"
+                :contents="item.icons || item.icon || menuIcon"
+              ></es-icon>
               <el-badge v-bind="getBadge(item)">
-                <es-icon
-                  class="es-simplicity_app-icon"
-                  :style="setStyle(index)"
-                  :contents="item.icons || item.icon || menuIcon"
-                ></es-icon>
                 <div class="es-simplicity_apps-text">
                   {{ item.text || item.name }}
                 </div>
@@ -164,6 +174,7 @@
 </template>
 
 <script>
+import { debounce } from 'throttle-debounce';
 export default {
   name: 'Apps',
   components: {},
@@ -211,6 +222,8 @@ export default {
   },
   data() {
     return {
+      value: '',
+      apps: [],
       appSize: 20,
       appNum: 1,
       bsSize: 8,
@@ -221,7 +234,7 @@ export default {
   },
   computed: {
     _applications() {
-      return this.applications.filter((item, index) => {
+      return this.apps.filter((item, index) => {
         return (
           index > (this.appNum - 1) * this.appSize - 1 &&
           index < this.appNum * this.appSize
@@ -245,10 +258,34 @@ export default {
       });
     }
   },
-  watch: {},
+  watch: {
+    applications: {
+      deep: true,
+      handler() {
+        this.getApps();
+      }
+    },
+    value() {
+      this.getApps();
+    }
+  },
+  beforeCreate() {
+    this.getApps = debounce(500, () => {
+      this.getApp();
+    });
+  },
   created() {},
-  mounted() {},
+  mounted() {
+    this.getApps();
+  },
   methods: {
+    getApp() {
+      this.apps = this.value
+        ? this.applications.filter((item) => {
+            return (item.name || item.text).indexOf(this.value) > -1;
+          })
+        : this.applications;
+    },
     setStyle(num) {
       let obj = {};
       if (this.color) {

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

@@ -17,9 +17,9 @@
           class="es-simplicity-handler-item"
           v-if="item.type === 'notice'"
           :key="item.type"
-          :value="notice"
+          :value="noticeNum"
           :max="99"
-          :hidden="notice === 0"
+          :hidden="noticeNum === 0"
         >
           <div
             class="es-simplicity-handler-icon"
@@ -43,18 +43,80 @@
 
 <script>
 import util from 'eoss-ui/src/utils/util';
+let doorIndex = sessionStorage.getItem('doorIndex');
 export default {
   name: 'Handler',
   components: {},
   props: {
+    search: {
+      type: Object,
+      default() {
+        return {
+          type: 'search',
+          icon: 'es-icon-magnifier',
+          title: '搜索'
+        };
+      }
+    },
+    index: {
+      type: Object,
+      default() {
+        return {
+          type: 'index',
+          open: doorIndex,
+          icon: 'es-icon-home',
+          title: '门户'
+        };
+      }
+    },
+    home: {
+      type: Object,
+      default() {
+        return {
+          type: 'home',
+          icon: 'es-icon-zuomian',
+          title: '个人工作台'
+        };
+      }
+    },
+    notice: {
+      type: Object,
+      default() {
+        return {
+          type: 'notice',
+          icon: 'es-icon-tongzhi',
+          title: '通知消息'
+        };
+      }
+    },
+    quit: {
+      type: Object,
+      default() {
+        return {
+          type: 'quit',
+          icon: 'es-icon-guanji',
+          title: '退出'
+        };
+      }
+    },
+    set: {
+      type: Object,
+      default() {
+        return {
+          type: 'set',
+          icon: 'es-icon-xitongguanli',
+          title: '设置'
+        };
+      }
+    },
     data: Array,
     hide: {
-      type: [Array, Object],
+      type: Object,
       default() {
         return {};
       }
     },
-    notice: {
+    noticeNum: {
       type: Number,
       default: 0
     },
@@ -67,44 +129,22 @@ export default {
     return {
       time: '',
       date: '',
-      list: [
-        {
-          type: 'search',
-          icon: 'es-icon-magnifier',
-          title: '个人工作台'
-        },
-        {
-          type: 'home',
-          icon: 'es-icon-home',
-          title: '个人工作台'
-        },
-        {
-          type: 'notice',
-          icon: 'es-icon-tongzhi',
-          title: '通知消息'
-        },
-        {
-          type: 'quit',
-          icon: 'es-icon-guanji',
-          title: '退出'
-        },
-        {
-          type: 'set',
-          icon: 'es-icon-xitongguanli',
-          title: '设置'
-        }
-      ],
       timer: null
     };
   },
   computed: {
     lists() {
-      let lists = this.data ? this.data : this.list;
-
-      return lists.filter((item) => {
-        if (Array.isArray(this.hide)) {
-          return !this.hide.includes(item.type);
-        }
+      let data = this.data
+        ? this.data
+        : [
+            this.search,
+            this.index,
+            this.home,
+            this.notice,
+            this.quit,
+            this.set
+          ];
+      return data.filter((item) => {
         return !this.hide[item.type];
       });
     },