eoss-ui 0.5.98 → 0.6.0

package/packages/main/src/{default → public}/settings.vue

@@ -44,9 +44,12 @@
         >
           <div
             class="es-setting-navs es-setting-top-nav"
-            @click.stop="handleLayout('topnav')"
+            @click.stop="handleLayout('default', 'topnav')"
           >
-            <i class="es-icon-gou" v-show="activeName == 'topnav'"></i>
+            <i
+              class="es-icon-gou"
+              v-show="layoutType == 'default' && activeName == 'topnav'"
+            ></i>
           </div>
         </el-tooltip>
         <el-tooltip
@@ -57,10 +60,13 @@
         >
           <div
             class="es-setting-navs es-setting-side-nav"
-            @click.stop="handleLayout('default')"
+            @click.stop="handleLayout('default', 'default')"
           >
             <div class="es-setting-side-sub-nav"></div>
-            <i class="es-icon-gou" v-show="activeName == 'default'"></i>
+            <i
+              class="es-icon-gou"
+              v-show="layoutType == 'default' && activeName == 'default'"
+            ></i>
           </div>
         </el-tooltip>
         <el-tooltip
@@ -71,9 +77,12 @@
         >
           <div
             class="es-setting-navs es-setting-subsystem-nav"
-            @click.stop="handleLayout('subsystem')"
+            @click.stop="handleLayout('default', 'subsystem')"
           >
-            <i class="es-icon-gou" v-show="activeName == 'subsystem'"></i>
+            <i
+              class="es-icon-gou"
+              v-show="layoutType == 'default' && activeName == 'subsystem'"
+            ></i>
           </div>
         </el-tooltip>
         <el-tooltip
@@ -84,9 +93,12 @@
         >
           <div
             class="es-setting-navs es-setting-top-side-nav"
-            @click.stop="handleLayout('topside')"
+            @click.stop="handleLayout('default', 'topside')"
           >
-            <i class="es-icon-gou" v-show="activeName == 'topside'"></i>
+            <i
+              class="es-icon-gou"
+              v-show="layoutType == 'default' && activeName == 'topside'"
+            ></i>
           </div>
         </el-tooltip>
         <el-tooltip
@@ -97,9 +109,29 @@
         >
           <div
             class="es-setting-navs es-setting-side-navs"
-            @click.stop="handleLayout('side')"
+            @click.stop="handleLayout('default', 'side')"
           >
-            <i class="es-icon-gou" v-show="activeName == 'side'"></i>
+            <i
+              class="es-icon-gou"
+              v-show="layoutType == 'default' && activeName == 'side'"
+            ></i>
+          </div>
+        </el-tooltip>
+        <el-tooltip
+          class="es-setting-navs-item"
+          effect="dark"
+          content="(新)应用菜单布局"
+          placement="bottom"
+        >
+          <div
+            class="es-setting-navs es-setting-app-nav"
+            @click.stop="handleLayout('simplicity')"
+          >
+            <div class="es-setting-side-sub-nav"></div>
+            <i
+              class="es-icon-gou"
+              v-show="layoutType == 'simplicity' && activeName == 'simplicity'"
+            ></i>
           </div>
         </el-tooltip>
       </div>
@@ -108,6 +140,7 @@
 </template>
 <script>
 import util from 'eoss-ui/src/utils/util';
+import { string } from 'slate';
 export default {
   name: 'message',
   props: {
@@ -123,10 +156,8 @@ export default {
         return ['#a60006', '#409eff'];
       }
     },
-    layout: {
-      type: String,
-      default: 'default'
-    }
+    active: String,
+    layoutType: String
   },
   computed: {
     show: {
@@ -163,7 +194,8 @@ export default {
   data() {
     return {
       color: '',
-      activeName: this.layout
+      layoutName: this.layoutType,
+      activeName: this.active
     };
   },
   mounted() {},
@@ -179,11 +211,11 @@ export default {
       //this.setTheme(res);
     },
     //选择菜单布局
-    handleLayout(res) {
+    handleLayout(res, active) {
       let old = this.activeName;
-      this.activeName = res;
-      this.$emit('update:layout', res);
-      this.$emit('layout', res, old);
+      this.layoutName = res;
+      this.activeName = active;
+      this.$emit('layout', res, active, old);
     }
   }
 };

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

@@ -79,16 +79,6 @@ export default {
         };
       }
     },
-    old: {
-      type: Object,
-      default() {
-        return {
-          type: 'old',
-          icon: 'es-icon-shiyongjiuban',
-          title: '使用旧版'
-        };
-      }
-    },
     notice: {
       type: Object,
       default() {
@@ -152,7 +142,6 @@ export default {
             this.search,
             this.index,
             this.home,
-            this.old,
             this.notice,
             this.quit,
             this.set

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

@@ -276,10 +276,13 @@
       <!-- 设置 -->
       <settings
         v-bind="$attrs"
+        layout-type="simplicity"
+        active="simplicity"
         :theme="themeColor"
         :predefine="themes"
         :visible.sync="showSet"
         @change="handleChange"
+        @layout="handleLayout"
       ></settings>
       <!-- 设置 end-->
 
@@ -325,7 +328,7 @@ import apps from './apps.vue';
 import user from './user.vue';
 import message from './message.vue';
 import notice from './notice.vue';
-import settings from './settings.vue';
+import settings from '../public/settings.vue';
 import routerPage from './router-page.vue';
 import online from '../public/online.vue';
 import search from '../public/search.vue';
@@ -731,18 +734,26 @@ export default {
         }
         let pathname = url.substring(url.indexOf('#/') + 1);
         pathname = pathname.split('?')[0];
+        let code;
         if (res.path !== '/' && pathname == path) {
           if (res.components) {
             if (!res.components[code]) {
-              console.error('“命名视图”规范属性名称与菜单appCode不一致', res);
+              console.error(
+                '路由“命名视图”规范属性名称与菜单appCode不一致',
+                res,
+                code
+              );
+              code = Object.keys(res.components).filter((item) => {
+                return item !== 'default';
+              })[0];
             }
           } else {
             console.error(
-              '请根据“命名视图”规范，正确添加components属性名称',
+              '请根据路由“命名视图”规范，正确添加components属性名称',
               res
             );
           }
-          return pathname;
+          return code ? { path: pathname, appCode: code } : pathname;
         }
         if (res && Object.prototype.hasOwnProperty.call(res, 'children')) {
           let path = this.hasRouter(res.children, url, code);
@@ -812,7 +823,7 @@ export default {
           util.setStorage('loginPage', results[i]);
         }
         if (i === 'sysLogoIco' && results[i]) {
-          sessionStorage.setItem('sysLogoIco', results[i]);
+          localStorage.setItem('sysLogoIco', results[i]);
           util.setFavicon(results[i]);
         }
         if (i === 'userStyle' && results[i]) {
@@ -937,114 +948,21 @@ export default {
      * @date 2024年9月7日
      **/
     getMenus(loading) {
+      const menuData = store.get('nav');
+      if (menuData && menuData.length) {
+        loading.close();
+        this.renderMenus(menuData);
+        return;
+      }
       util
         .ajax({ url: this._menuUrl })
         .then((res) => {
           loading.close();
           if (res.rCode === 0) {
             if (res.results && res.results.length) {
-              this.menus = res.results;
-              this.setTips(this.menus);
-              store.set('nav', this.menus);
-              if (this.indexUrl) {
-                let obj = this.getMenu(this.menus, this.indexUrl);
-                obj = obj
-                  ? obj
-                  : {
-                      url: this.indexUrl,
-                      text: '工作台',
-                      id: '0',
-                      appCode: 'indexUrl'
-                    };
-                this.homePage = this.setIframeType(obj);
-                if (!this.appCode) {
-                  this.tabs = [this.homePage];
-                  this.activeName = this.homePage.id;
-                }
-              }
-              if (this.appCode) {
-                let code = this.sysCode || this.appCode;
-                let app = this.userApps.filter((item) => {
-                  return item.code === code;
-                })[0];
-                if (app) {
-                  this.active = app.id;
-                  if (app.url) {
-                    let obj = this.getMenu(this.menus, app.url);
-                    if (obj) {
-                      let tab = this.setIframeType(obj);
-                      this.tabs = [tab];
-                      this.activeName = tab.id;
-                    } else {
-                      this.tabs = [app];
-                    }
-                  }
-                }
-                if (this.sysCode) {
-                  let subMenus = this.getMenu(
-                    this.menus,
-                    this.sysCode,
-                    'appCode'
-                  );
-                  if (subMenus) {
-                    let obj = this.getMenu(this.menus, this.appCode, 'appCode');
-                    if (obj) {
-                      if (!obj.url) {
-                        obj = this.getFirst(obj);
-                      }
-                      this.subActive = obj.id;
-                      let tab = this.setIframeType(obj);
-                      this.tabs = [tab];
-                      this.activeName = tab.id;
-                    } else {
-                      this.subActive = '';
-                    }
-                    this.subMenus = subMenus;
-                    this.showMenu = true;
-                  } else {
-                    this.subMenus = null;
-                    this.showMenu = false;
-                  }
-                } else {
-                  let subMenus = this.getMenu(
-                    this.menus,
-                    this.appCode,
-                    'appCode'
-                  );
-                  if (subMenus) {
-                    if (this.tabs.length == 0) {
-                      let obj = this.getFirst(subMenus);
-                      if (obj) {
-                        this.subActive = obj.id;
-                        let tab = this.setIframeType(obj);
-                        this.tabs = [tab];
-                        this.activeName = tab.id;
-                      } else {
-                        this.subActive = '';
-                      }
-                    }
-                    this.subMenus = subMenus;
-                    this.showMenu = true;
-                  } else {
-                    this.subMenus = null;
-                    this.showMenu = false;
-                  }
-                }
-              } else if (
-                this.initApps &&
-                this.initApps.length &&
-                !this.indexUrl
-              ) {
-                let obj = this.getMenu(
-                  this.menus,
-                  this.initApps[this.initApps.length - 1]
-                );
-                if (obj) {
-                  let tab = this.setIframeType(obj);
-                  this.tabs.push(tab);
-                  this.activeName = tab.id;
-                }
-              }
+              //this.$emit('update:menuData', res.results);
+              store.set('nav', JSON.parse(JSON.stringify(res.results)));
+              this.renderMenus(JSON.parse(JSON.stringify(res.results)));
             } else {
               this.$message.error('未分配菜单权限，请联系管理员！');
             }
@@ -1060,6 +978,103 @@ export default {
           }
         });
     },
+    /**
+     * @desc:处理菜单列表
+     * @author huangbo
+     * @date 2024年9月7日
+     **/
+    renderMenus(res) {
+      this.menus = res;
+      this.setTips(this.menus);
+      store.set('nav', this.menus);
+      if (this.indexUrl) {
+        let obj = this.getMenu(this.menus, this.indexUrl);
+        obj = obj
+          ? obj
+          : {
+              url: this.indexUrl,
+              text: '工作台',
+              id: '0',
+              appCode: 'indexUrl'
+            };
+        this.homePage = this.setIframeType(obj);
+        if (!this.appCode) {
+          this.tabs = [this.homePage];
+          this.activeName = this.homePage.id;
+        }
+      }
+      if (this.appCode) {
+        let code = this.sysCode || this.appCode;
+        let app = this.userApps.filter((item) => {
+          return item.code === code;
+        })[0];
+        if (app) {
+          this.active = app.id;
+          if (app.url) {
+            let obj = this.getMenu(this.menus, app.url);
+            if (obj) {
+              let tab = this.setIframeType(obj);
+              this.tabs = [tab];
+              this.activeName = tab.id;
+            } else {
+              this.tabs = [app];
+            }
+          }
+        }
+        if (this.sysCode) {
+          let subMenus = this.getMenu(this.menus, this.sysCode, 'appCode');
+          if (subMenus) {
+            let obj = this.getMenu(this.menus, this.appCode, 'appCode');
+            if (obj) {
+              if (!obj.url) {
+                obj = this.getFirst(obj);
+              }
+              this.subActive = obj.id;
+              let tab = this.setIframeType(obj);
+              this.tabs = [tab];
+              this.activeName = tab.id;
+            } else {
+              this.subActive = '';
+            }
+            this.subMenus = subMenus;
+            this.showMenu = true;
+          } else {
+            this.subMenus = null;
+            this.showMenu = false;
+          }
+        } else {
+          let subMenus = this.getMenu(this.menus, this.appCode, 'appCode');
+          if (subMenus) {
+            if (this.tabs.length == 0) {
+              let obj = this.getFirst(subMenus);
+              if (obj) {
+                this.subActive = obj.id;
+                let tab = this.setIframeType(obj);
+                this.tabs = [tab];
+                this.activeName = tab.id;
+              } else {
+                this.subActive = '';
+              }
+            }
+            this.subMenus = subMenus;
+            this.showMenu = true;
+          } else {
+            this.subMenus = null;
+            this.showMenu = false;
+          }
+        }
+      } else if (this.initApps && this.initApps.length && !this.indexUrl) {
+        let obj = this.getMenu(
+          this.menus,
+          this.initApps[this.initApps.length - 1]
+        );
+        if (obj) {
+          let tab = this.setIframeType(obj);
+          this.tabs.push(tab);
+          this.activeName = tab.id;
+        }
+      }
+    },
     /**
      * @desc:设置页面加载类型
      * @author huangbo
@@ -1087,7 +1102,12 @@ export default {
             let path = this.hasRouter(routes, urls[0], res.appCode);
             if (path && this.routeType !== 'wujie') {
               res.method = 'router';
-              res.path = path;
+              if (typeof path === 'string') {
+                res.path = path;
+              } else {
+                res.path = path.path;
+                res.appCode = path.appCode;
+              }
               res.keys = util.uuid();
             } else {
               let urlopenmode = util.getParams({
@@ -1660,13 +1680,6 @@ export default {
           case 'index':
             util.win.open(this.doorIndex, '_self');
             break;
-          case 'old':
-            if (typeof this.showOld === 'string') {
-              window.location.href = this.showOld;
-            } else {
-              this.$emit('chang-layout', 'default');
-            }
-            break;
           case 'set':
             this.showSet = !this.showSet;
             this.showMsg = false;
@@ -1804,6 +1817,17 @@ export default {
           break;
       }
     },
+    /**
+     * @desc:菜单布局样式切换
+     * @author huangbo
+     * @date 2024年9月7日
+     **/
+    handleLayout(res, active) {
+      if (active) {
+        localStorage.setItem('layout', active);
+      }
+      this.$emit('chang-layout', res, active);
+    },
     /**
      * @desc:消息修改总数
      * @author huangbo