eoss-ui 0.7.64 → 0.7.66

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

@@ -1,157 +1,157 @@
-<template>
-  <transition name="el-drawer-fade" @after-enter="handleMouse(false)">
-    <div
-      class="es-notice-box"
-      v-show="data.length"
-      @mouseover="handleMouse(true)"
-      @mouseout="handleMouse(false)"
-    >
-      <div class="es-msgs-box" :class="{ 'es-in': data.length }">
-        <div class="es-msg-header">
-          <span class="es-notice-title">通知消息</span>
-        </div>
-        <div class="es-msg-lists-box">
-          <div class="es-msg-lists">
-            <el-scrollbar class="es-scrollbar">
-              <el-card
-                v-for="(item, index) in data"
-                :key="item.id"
-                class="es-msg-item"
-              >
-                <div class="es-msg-item-title">{{ item.title }}</div>
-                <div>
-                  <span class="es-msg-item-time">{{ item.time }}</span>
-                  <span
-                    class="es-overlook"
-                    v-show="item.handlerUrl"
-                    @click="handleMessage(item, index)"
-                    >处理</span
-                  >
-                </div>
-              </el-card>
-            </el-scrollbar>
-          </div>
-        </div>
-        <div
-          class="es-notice-footer"
-          style="display: flex; justify-content: space-between"
-        >
-          <span @click="handleIgnoreAll">忽略全部</span
-          ><span @click="afterEnter">我知道了</span>
-        </div>
-      </div>
-      <es-dialog
-        title="处理"
-        name="manage"
-        width="90%"
-        height="80%"
-        :visible.sync="dialog.show"
-        :url="dialog.url"
-        :param="dialog.params"
-        @close="handleClose"
-      ></es-dialog>
-    </div>
-  </transition>
-</template>
-<script>
-import { ignoreAllSysMsg } from 'eoss-ui/src/config/api.js';
-import util from 'eoss-ui/src/utils/util';
-export default {
-  name: 'notice',
-  provide() {
-    return {
-      deleteNotice: this.handleRemove
-    };
-  },
-  props: {
-    visible: Boolean,
-    winopen: Boolean,
-    data: {
-      type: Array,
-      default() {
-        return [];
-      }
-    }
-  },
-  computed: {},
-  data() {
-    return {
-      //加载数据
-      loading: false,
-      //消息页码
-      pageNum: 1,
-      //消息数据,
-      msgs: [],
-      //即时消息
-      sysMsg: '',
-      dialog: {
-        params: {},
-        url: '',
-        show: false
-      },
-      index: null
-    };
-  },
-  methods: {
-    afterEnter() {
-      this.$emit('opened');
-    },
-    handleMouse(flag) {
-      this.$emit('opened', flag);
-    },
-    //全部忽略
-    handleIgnoreAll() {
-      util
-        .ajax({
-          url: ignoreAllSysMsg
-        })
-        .then((res) => {
-          this.count = 0;
-          this.msgs = [];
-          this.$emit('ignore', { type: 'ignore', value: 'all' });
-          this.$emit('opened', false);
-        })
-        .catch((err) => {
-          if (err.message && err.message !== 'canceled') {
-            this.$message.error(err.message);
-          }
-        });
-    },
-    //处理消息
-    handleMessage(item, index) {
-      if (item.urlopenmode === 1 || this.winopen) {
-        const mywin = util.win.open(item.handlerUrl);
-        if (mywin) {
-          let times = setInterval(() => {
-            if (mywin.closed) {
-              clearInterval(times);
-              this.$parent.$emit('bus-emit', 'waitdone');
-            }
-          }, 1000);
-        }
-      } else {
-        this.dialog = {
-          show: true,
-          url: item.handlerUrl,
-          params: {
-            id: item.id,
-            pendingId: item.pendingId,
-            userId: item.userId
-          }
-        };
-        this.index = index;
-      }
-    },
-    handleRemove() {
-      if (this.index === null) {
-        this.count -= 1;
-        this.msgs = this.msgs.splice(this.index, 1);
-      }
-      this.dialog.show = false;
-    },
-    handleClose() {
-      this.$parent.$emit('bus-emit', 'waitdone');
-    }
-  }
-};
-</script>
+<template>
+  <transition name="el-drawer-fade" @after-enter="handleMouse(false)">
+    <div
+      class="es-notice-box"
+      v-show="data.length"
+      @mouseover="handleMouse(true)"
+      @mouseout="handleMouse(false)"
+    >
+      <div class="es-msgs-box" :class="{ 'es-in': data.length }">
+        <div class="es-msg-header">
+          <span class="es-notice-title">通知消息</span>
+        </div>
+        <div class="es-msg-lists-box">
+          <div class="es-msg-lists">
+            <el-scrollbar class="es-scrollbar">
+              <el-card
+                v-for="(item, index) in data"
+                :key="item.id"
+                class="es-msg-item"
+              >
+                <div class="es-msg-item-title">{{ item.title }}</div>
+                <div>
+                  <span class="es-msg-item-time">{{ item.time }}</span>
+                  <span
+                    class="es-overlook"
+                    v-show="item.handlerUrl"
+                    @click="handleMessage(item, index)"
+                    >处理</span
+                  >
+                </div>
+              </el-card>
+            </el-scrollbar>
+          </div>
+        </div>
+        <div
+          class="es-notice-footer"
+          style="display: flex; justify-content: space-between"
+        >
+          <span @click="handleIgnoreAll">忽略全部</span
+          ><span @click="afterEnter">我知道了</span>
+        </div>
+      </div>
+      <es-dialog
+        title="处理"
+        name="manage"
+        width="90%"
+        height="80%"
+        :visible.sync="dialog.show"
+        :url="dialog.url"
+        :param="dialog.params"
+        @close="handleClose"
+      ></es-dialog>
+    </div>
+  </transition>
+</template>
+<script>
+import { ignoreAllSysMsg } from 'eoss-ui/src/config/api.js';
+import util from 'eoss-ui/src/utils/util';
+export default {
+  name: 'notice',
+  provide() {
+    return {
+      deleteNotice: this.handleRemove
+    };
+  },
+  props: {
+    visible: Boolean,
+    winopen: Boolean,
+    data: {
+      type: Array,
+      default() {
+        return [];
+      }
+    }
+  },
+  computed: {},
+  data() {
+    return {
+      //加载数据
+      loading: false,
+      //消息页码
+      pageNum: 1,
+      //消息数据,
+      msgs: [],
+      //即时消息
+      sysMsg: '',
+      dialog: {
+        params: {},
+        url: '',
+        show: false
+      },
+      index: null
+    };
+  },
+  methods: {
+    afterEnter() {
+      this.$emit('opened');
+    },
+    handleMouse(flag) {
+      this.$emit('opened', flag);
+    },
+    //全部忽略
+    handleIgnoreAll() {
+      util
+        .ajax({
+          url: ignoreAllSysMsg
+        })
+        .then((res) => {
+          this.count = 0;
+          this.msgs = [];
+          this.$emit('ignore', { type: 'ignore', value: 'all' });
+          this.$emit('opened', false);
+        })
+        .catch((err) => {
+          if (err.message && err.message !== 'canceled') {
+            this.$message.error(err.message);
+          }
+        });
+    },
+    //处理消息
+    handleMessage(item, index) {
+      if (item.urlopenmode === 1 || this.winopen) {
+        const mywin = util.win.open(item.handlerUrl);
+        if (mywin) {
+          let times = setInterval(() => {
+            if (mywin.closed) {
+              clearInterval(times);
+              this.$parent.$emit('bus-emit', 'waitdone');
+            }
+          }, 1000);
+        }
+      } else {
+        this.dialog = {
+          show: true,
+          url: item.handlerUrl,
+          params: {
+            id: item.id,
+            pendingId: item.pendingId,
+            userId: item.userId
+          }
+        };
+        this.index = index;
+      }
+    },
+    handleRemove() {
+      if (this.index === null) {
+        this.count -= 1;
+        this.msgs = this.msgs.splice(this.index, 1);
+      }
+      this.dialog.show = false;
+    },
+    handleClose() {
+      this.$parent.$emit('bus-emit', 'waitdone');
+    }
+  }
+};
+</script>

package/packages/main/src/main.vue

@@ -10,6 +10,16 @@
       @chang-layout="changLayout"
       @bus-emit="busEmit"
     ></simplicity>
+    <simplicityTop
+      ref="main"
+      v-else-if="layoutType == 'simplicityTop'"
+      :appCode="appCode"
+      :old-version="multiple"
+      v-bind="$attrs"
+      v-on="$listeners"
+      @chang-layout="changLayout"
+      @bus-emit="busEmit"
+    ></simplicityTop>
     <main-default
       v-else
       :new-version="multiple"
@@ -66,6 +76,7 @@
 <script>
 import { dayImg, nightImg } from 'eoss-ui/src/config/image';
 import Simplicity from './simplicity/index.vue';
+import SimplicityTop from './simplicityTop/index.vue';
 import MainDefault from './default/index.vue';
 import util from 'eoss-ui/src/utils/util';
 import WujieVue from 'wujie-vue2';
@@ -79,6 +90,7 @@ export default {
   },
   components: {
     Simplicity,
+    SimplicityTop,
     MainDefault
   },
   props: {
@@ -522,6 +534,10 @@ export default {
      * @date 2024年9月7日
      **/
     handleClosed(res, index) {
+      // 在关闭弹窗后更新数量
+      if (this.layoutType == 'simplicityTop') {
+        this.$refs.main.getNums();
+      }
       this.$nextTick(() => {
         this.dialogs.splice(index, 1);
       });
@@ -532,6 +548,8 @@ export default {
      * @date 2024年9月7日
      **/
     busEmit(event, args) {
+      console.log('busEmit', event, args);
+
       WujieVue.bus.$emit(event, args);
       const iframes = document.getElementsByTagName('iframe');
       for (let i = 0; i < iframes.length; i++) {

package/packages/main/src/public/settings.vue

@@ -6,7 +6,7 @@
     :visible.sync="show"
     :append-to-body="true"
   >
-    <div class="es-setting-item">
+    <div class="es-setting-item" v-if="showMoreTheme">
       <div class="es-setting-title">主题色</div>
       <el-radio-group
         v-if="themes"
@@ -36,107 +36,132 @@
     <div class="es-setting-item">
       <div class="es-setting-title">菜单风格</div>
       <div class="es-setting-navs-box">
-        <el-tooltip
-          class="es-setting-navs-item"
-          effect="dark"
-          content="顶部菜单布局"
-          placement="bottom"
-        >
-          <div
-            class="es-setting-navs es-setting-top-nav"
-            @click.stop="handleLayout('default', 'topnav')"
+        <template v-if="showMoreTheme">
+          <el-tooltip
+            class="es-setting-navs-item"
+            effect="dark"
+            content="顶部菜单布局"
+            placement="bottom"
           >
-            <es-icon
-              class="icon-gou"
-              contents="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAQCAYAAAAS7Y8mAAAAAXNSR0IArs4c6QAAAStJREFUOE+t070rxVEcx/HXLVkMGJVRUozkYVI2t0QZbFIikywWRu5iMYqBMpiEomwsRpuHxeAPUGSz6Vu/Xx0396l7v9N5+Jx35/s5n1PQ2urAGoqFFnHbsI0V9OC+FeAitjCOD1yg1Cx4J4NG49fYwFtMmgEfYDWzcg+bqa0puB1h/mcN3ztxi7FMF8AA/6kc3I1j9GERjxXgA3hN9uLGh/9pA9yLU0wmgkG8lB2YwVWyFg9WqtRdgJ8QoLTeI4sJfBlHieAc89Usy61Yx36Z8BJzWMBZshc2DdfKf/p4o9jFVHIo4hM/qT9bi07C559GwLn2BtPZ5Atd2fgbs7irBa2W4wdMlAHC0/C2rqr2QeJmeVJOsFQXMRPV+nk5fAjPrQSPZL5GZhuqX8ZgLa+dHzYmAAAAAElFTkSuQmCC"
-              v-show="layoutType == 'default' && activeName == 'topnav'"
-            ></es-icon>
-          </div>
-        </el-tooltip>
-        <el-tooltip
-          class="es-setting-navs-item"
-          effect="dark"
-          content="侧边双列菜单布局"
-          placement="bottom"
-        >
-          <div
-            class="es-setting-navs es-setting-side-nav"
-            @click.stop="handleLayout('default', 'default')"
+            <div
+              class="es-setting-navs es-setting-top-nav"
+              @click.stop="handleLayout('default', 'topnav')"
+            >
+              <es-icon
+                class="icon-gou"
+                contents="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAQCAYAAAAS7Y8mAAAAAXNSR0IArs4c6QAAAStJREFUOE+t070rxVEcx/HXLVkMGJVRUozkYVI2t0QZbFIikywWRu5iMYqBMpiEomwsRpuHxeAPUGSz6Vu/Xx0396l7v9N5+Jx35/s5n1PQ2urAGoqFFnHbsI0V9OC+FeAitjCOD1yg1Cx4J4NG49fYwFtMmgEfYDWzcg+bqa0puB1h/mcN3ztxi7FMF8AA/6kc3I1j9GERjxXgA3hN9uLGh/9pA9yLU0wmgkG8lB2YwVWyFg9WqtRdgJ8QoLTeI4sJfBlHieAc89Usy61Yx36Z8BJzWMBZshc2DdfKf/p4o9jFVHIo4hM/qT9bi07C559GwLn2BtPZ5Atd2fgbs7irBa2W4wdMlAHC0/C2rqr2QeJmeVJOsFQXMRPV+nk5fAjPrQSPZL5GZhuqX8ZgLa+dHzYmAAAAAElFTkSuQmCC"
+                v-show="layoutType == 'default' && activeName == 'topnav'"
+              ></es-icon>
+            </div>
+          </el-tooltip>
+
+          <el-tooltip
+            class="es-setting-navs-item"
+            effect="dark"
+            content="侧边双列菜单布局"
+            placement="bottom"
           >
-            <div class="es-setting-side-sub-nav"></div>
-            <es-icon
-              class="icon-gou"
-              contents="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAQCAYAAAAS7Y8mAAAAAXNSR0IArs4c6QAAAStJREFUOE+t070rxVEcx/HXLVkMGJVRUozkYVI2t0QZbFIikywWRu5iMYqBMpiEomwsRpuHxeAPUGSz6Vu/Xx0396l7v9N5+Jx35/s5n1PQ2urAGoqFFnHbsI0V9OC+FeAitjCOD1yg1Cx4J4NG49fYwFtMmgEfYDWzcg+bqa0puB1h/mcN3ztxi7FMF8AA/6kc3I1j9GERjxXgA3hN9uLGh/9pA9yLU0wmgkG8lB2YwVWyFg9WqtRdgJ8QoLTeI4sJfBlHieAc89Usy61Yx36Z8BJzWMBZshc2DdfKf/p4o9jFVHIo4hM/qT9bi07C559GwLn2BtPZ5Atd2fgbs7irBa2W4wdMlAHC0/C2rqr2QeJmeVJOsFQXMRPV+nk5fAjPrQSPZL5GZhuqX8ZgLa+dHzYmAAAAAElFTkSuQmCC"
-              v-show="layoutType == 'default' && activeName == 'default'"
-            ></es-icon>
-          </div>
-        </el-tooltip>
-        <el-tooltip
-          class="es-setting-navs-item"
-          effect="dark"
-          content="子系统+侧边菜单布局"
-          placement="bottom"
-        >
-          <div
-            class="es-setting-navs es-setting-subsystem-nav"
-            @click.stop="handleLayout('default', 'subsystem')"
+            <div
+              class="es-setting-navs es-setting-side-nav"
+              @click.stop="handleLayout('default', 'default')"
+            >
+              <div class="es-setting-side-sub-nav"></div>
+              <es-icon
+                class="icon-gou"
+                contents="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAQCAYAAAAS7Y8mAAAAAXNSR0IArs4c6QAAAStJREFUOE+t070rxVEcx/HXLVkMGJVRUozkYVI2t0QZbFIikywWRu5iMYqBMpiEomwsRpuHxeAPUGSz6Vu/Xx0396l7v9N5+Jx35/s5n1PQ2urAGoqFFnHbsI0V9OC+FeAitjCOD1yg1Cx4J4NG49fYwFtMmgEfYDWzcg+bqa0puB1h/mcN3ztxi7FMF8AA/6kc3I1j9GERjxXgA3hN9uLGh/9pA9yLU0wmgkG8lB2YwVWyFg9WqtRdgJ8QoLTeI4sJfBlHieAc89Usy61Yx36Z8BJzWMBZshc2DdfKf/p4o9jFVHIo4hM/qT9bi07C559GwLn2BtPZ5Atd2fgbs7irBa2W4wdMlAHC0/C2rqr2QeJmeVJOsFQXMRPV+nk5fAjPrQSPZL5GZhuqX8ZgLa+dHzYmAAAAAElFTkSuQmCC"
+                v-show="layoutType == 'default' && activeName == 'default'"
+              ></es-icon>
+            </div>
+          </el-tooltip>
+          <el-tooltip
+            class="es-setting-navs-item"
+            effect="dark"
+            content="子系统+侧边菜单布局"
+            placement="bottom"
           >
-            <es-icon
-              class="icon-gou"
-              contents="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAQCAYAAAAS7Y8mAAAAAXNSR0IArs4c6QAAAStJREFUOE+t070rxVEcx/HXLVkMGJVRUozkYVI2t0QZbFIikywWRu5iMYqBMpiEomwsRpuHxeAPUGSz6Vu/Xx0396l7v9N5+Jx35/s5n1PQ2urAGoqFFnHbsI0V9OC+FeAitjCOD1yg1Cx4J4NG49fYwFtMmgEfYDWzcg+bqa0puB1h/mcN3ztxi7FMF8AA/6kc3I1j9GERjxXgA3hN9uLGh/9pA9yLU0wmgkG8lB2YwVWyFg9WqtRdgJ8QoLTeI4sJfBlHieAc89Usy61Yx36Z8BJzWMBZshc2DdfKf/p4o9jFVHIo4hM/qT9bi07C559GwLn2BtPZ5Atd2fgbs7irBa2W4wdMlAHC0/C2rqr2QeJmeVJOsFQXMRPV+nk5fAjPrQSPZL5GZhuqX8ZgLa+dHzYmAAAAAElFTkSuQmCC"
-              v-show="layoutType == 'default' && activeName == 'subsystem'"
-            ></es-icon>
-          </div>
-        </el-tooltip>
-        <el-tooltip
-          class="es-setting-navs-item"
-          effect="dark"
-          content="顶部+侧边菜单布局"
-          placement="bottom"
-        >
-          <div
-            class="es-setting-navs es-setting-top-side-nav"
-            @click.stop="handleLayout('default', 'topside')"
+            <div
+              class="es-setting-navs es-setting-subsystem-nav"
+              @click.stop="handleLayout('default', 'subsystem')"
+            >
+              <es-icon
+                class="icon-gou"
+                contents="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAQCAYAAAAS7Y8mAAAAAXNSR0IArs4c6QAAAStJREFUOE+t070rxVEcx/HXLVkMGJVRUozkYVI2t0QZbFIikywWRu5iMYqBMpiEomwsRpuHxeAPUGSz6Vu/Xx0396l7v9N5+Jx35/s5n1PQ2urAGoqFFnHbsI0V9OC+FeAitjCOD1yg1Cx4J4NG49fYwFtMmgEfYDWzcg+bqa0puB1h/mcN3ztxi7FMF8AA/6kc3I1j9GERjxXgA3hN9uLGh/9pA9yLU0wmgkG8lB2YwVWyFg9WqtRdgJ8QoLTeI4sJfBlHieAc89Usy61Yx36Z8BJzWMBZshc2DdfKf/p4o9jFVHIo4hM/qT9bi07C559GwLn2BtPZ5Atd2fgbs7irBa2W4wdMlAHC0/C2rqr2QeJmeVJOsFQXMRPV+nk5fAjPrQSPZL5GZhuqX8ZgLa+dHzYmAAAAAElFTkSuQmCC"
+                v-show="layoutType == 'default' && activeName == 'subsystem'"
+              ></es-icon>
+            </div>
+          </el-tooltip>
+          <el-tooltip
+            class="es-setting-navs-item"
+            effect="dark"
+            content="顶部+侧边菜单布局"
+            placement="bottom"
           >
-            <es-icon
-              class="icon-gou"
-              contents="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAQCAYAAAAS7Y8mAAAAAXNSR0IArs4c6QAAAStJREFUOE+t070rxVEcx/HXLVkMGJVRUozkYVI2t0QZbFIikywWRu5iMYqBMpiEomwsRpuHxeAPUGSz6Vu/Xx0396l7v9N5+Jx35/s5n1PQ2urAGoqFFnHbsI0V9OC+FeAitjCOD1yg1Cx4J4NG49fYwFtMmgEfYDWzcg+bqa0puB1h/mcN3ztxi7FMF8AA/6kc3I1j9GERjxXgA3hN9uLGh/9pA9yLU0wmgkG8lB2YwVWyFg9WqtRdgJ8QoLTeI4sJfBlHieAc89Usy61Yx36Z8BJzWMBZshc2DdfKf/p4o9jFVHIo4hM/qT9bi07C559GwLn2BtPZ5Atd2fgbs7irBa2W4wdMlAHC0/C2rqr2QeJmeVJOsFQXMRPV+nk5fAjPrQSPZL5GZhuqX8ZgLa+dHzYmAAAAAElFTkSuQmCC"
-              v-show="layoutType == 'default' && activeName == 'topside'"
-            ></es-icon>
-          </div>
-        </el-tooltip>
+            <div
+              class="es-setting-navs es-setting-top-side-nav"
+              @click.stop="handleLayout('default', 'topside')"
+            >
+              <es-icon
+                class="icon-gou"
+                contents="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAQCAYAAAAS7Y8mAAAAAXNSR0IArs4c6QAAAStJREFUOE+t070rxVEcx/HXLVkMGJVRUozkYVI2t0QZbFIikywWRu5iMYqBMpiEomwsRpuHxeAPUGSz6Vu/Xx0396l7v9N5+Jx35/s5n1PQ2urAGoqFFnHbsI0V9OC+FeAitjCOD1yg1Cx4J4NG49fYwFtMmgEfYDWzcg+bqa0puB1h/mcN3ztxi7FMF8AA/6kc3I1j9GERjxXgA3hN9uLGh/9pA9yLU0wmgkG8lB2YwVWyFg9WqtRdgJ8QoLTeI4sJfBlHieAc89Usy61Yx36Z8BJzWMBZshc2DdfKf/p4o9jFVHIo4hM/qT9bi07C559GwLn2BtPZ5Atd2fgbs7irBa2W4wdMlAHC0/C2rqr2QeJmeVJOsFQXMRPV+nk5fAjPrQSPZL5GZhuqX8ZgLa+dHzYmAAAAAElFTkSuQmCC"
+                v-show="layoutType == 'default' && activeName == 'topside'"
+              ></es-icon>
+            </div>
+          </el-tooltip>
+          <el-tooltip
+            class="es-setting-navs-item"
+            effect="dark"
+            content="侧边+按钮菜单布局"
+            placement="bottom"
+          >
+            <div
+              class="es-setting-navs es-setting-side-navs"
+              @click.stop="handleLayout('default', 'side')"
+            >
+              <es-icon
+                class="icon-gou"
+                contents="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAQCAYAAAAS7Y8mAAAAAXNSR0IArs4c6QAAAStJREFUOE+t070rxVEcx/HXLVkMGJVRUozkYVI2t0QZbFIikywWRu5iMYqBMpiEomwsRpuHxeAPUGSz6Vu/Xx0396l7v9N5+Jx35/s5n1PQ2urAGoqFFnHbsI0V9OC+FeAitjCOD1yg1Cx4J4NG49fYwFtMmgEfYDWzcg+bqa0puB1h/mcN3ztxi7FMF8AA/6kc3I1j9GERjxXgA3hN9uLGh/9pA9yLU0wmgkG8lB2YwVWyFg9WqtRdgJ8QoLTeI4sJfBlHieAc89Usy61Yx36Z8BJzWMBZshc2DdfKf/p4o9jFVHIo4hM/qT9bi07C559GwLn2BtPZ5Atd2fgbs7irBa2W4wdMlAHC0/C2rqr2QeJmeVJOsFQXMRPV+nk5fAjPrQSPZL5GZhuqX8ZgLa+dHzYmAAAAAElFTkSuQmCC"
+                v-show="layoutType == 'default' && activeName == 'side'"
+              ></es-icon>
+            </div>
+          </el-tooltip>
+        </template>
         <el-tooltip
           class="es-setting-navs-item"
           effect="dark"
-          content="侧边+按钮菜单布局"
+          content="(新)应用菜单布局"
           placement="bottom"
         >
           <div
-            class="es-setting-navs es-setting-side-navs"
-            @click.stop="handleLayout('default', 'side')"
+            class="es-setting-navs es-setting-app-nav"
+            @click.stop="handleLayout('simplicity')"
           >
+            <div class="es-setting-side-sub-nav"></div>
             <es-icon
               class="icon-gou"
               contents="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAQCAYAAAAS7Y8mAAAAAXNSR0IArs4c6QAAAStJREFUOE+t070rxVEcx/HXLVkMGJVRUozkYVI2t0QZbFIikywWRu5iMYqBMpiEomwsRpuHxeAPUGSz6Vu/Xx0396l7v9N5+Jx35/s5n1PQ2urAGoqFFnHbsI0V9OC+FeAitjCOD1yg1Cx4J4NG49fYwFtMmgEfYDWzcg+bqa0puB1h/mcN3ztxi7FMF8AA/6kc3I1j9GERjxXgA3hN9uLGh/9pA9yLU0wmgkG8lB2YwVWyFg9WqtRdgJ8QoLTeI4sJfBlHieAc89Usy61Yx36Z8BJzWMBZshc2DdfKf/p4o9jFVHIo4hM/qT9bi07C559GwLn2BtPZ5Atd2fgbs7irBa2W4wdMlAHC0/C2rqr2QeJmeVJOsFQXMRPV+nk5fAjPrQSPZL5GZhuqX8ZgLa+dHzYmAAAAAElFTkSuQmCC"
-              v-show="layoutType == 'default' && activeName == 'side'"
+              v-show="layoutType == 'simplicity' && activeName == 'simplicity'"
             ></es-icon>
           </div>
         </el-tooltip>
         <el-tooltip
           class="es-setting-navs-item"
           effect="dark"
-          content="(新)应用菜单布局"
+          content="顶部菜单+侧边固定布局"
           placement="bottom"
         >
           <div
-            class="es-setting-navs es-setting-app-nav"
-            @click.stop="handleLayout('simplicity')"
+            class="es-setting-navs es-setting-top-nav-side"
+            @click.stop="handleLayout('simplicityTop')"
           >
             <div class="es-setting-side-sub-nav"></div>
             <es-icon
               class="icon-gou"
               contents="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAQCAYAAAAS7Y8mAAAAAXNSR0IArs4c6QAAAStJREFUOE+t070rxVEcx/HXLVkMGJVRUozkYVI2t0QZbFIikywWRu5iMYqBMpiEomwsRpuHxeAPUGSz6Vu/Xx0396l7v9N5+Jx35/s5n1PQ2urAGoqFFnHbsI0V9OC+FeAitjCOD1yg1Cx4J4NG49fYwFtMmgEfYDWzcg+bqa0puB1h/mcN3ztxi7FMF8AA/6kc3I1j9GERjxXgA3hN9uLGh/9pA9yLU0wmgkG8lB2YwVWyFg9WqtRdgJ8QoLTeI4sJfBlHieAc89Usy61Yx36Z8BJzWMBZshc2DdfKf/p4o9jFVHIo4hM/qT9bi07C559GwLn2BtPZ5Atd2fgbs7irBa2W4wdMlAHC0/C2rqr2QeJmeVJOsFQXMRPV+nk5fAjPrQSPZL5GZhuqX8ZgLa+dHzYmAAAAAElFTkSuQmCC"
-              v-show="layoutType == 'simplicity' && activeName == 'simplicity'"
+              v-show="
+                layoutType == 'simplicityTop' ||
+                activeName == 'simplicityTop' ||
+                layoutName == 'simplicityTop'
+              "
             ></es-icon>
           </div>
         </el-tooltip>
@@ -200,7 +225,15 @@ export default {
     return {
       color: '',
       layoutName: this.layoutType,
-      activeName: this.active
+      activeName: this.active,
+      // 是否显示更多主题颜色选择面板 测试环境时需要显示 (打包后是什么环境?)  在simplicityTop/simplicity布局下 不显示
+      showMoreTheme:
+        process.env.NODE_ENV === 'development'
+          ? true
+          : this.layoutType === 'simplicityTop' ||
+            this.layoutType === 'simplicity'
+          ? false
+          : true
     };
   },
   mounted() {},
@@ -225,3 +258,16 @@ export default {
   }
 };
 </script>
+<style scoped>
+.es-setting-top-nav-side::before {
+  content: '';
+  display: block;
+  position: absolute;
+  left: 0;
+  width: 8px;
+  top: 10px;
+  bottom: 0;
+  z-index: 2;
+  background-color: rgb(0, 80, 179);
+}
+</style>

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

@@ -548,15 +548,15 @@ export default {
           icon: 'es-icon-xiaoxi',
           title: '消息'
         },
-        {
-          type: 'quit',
-          icon: 'es-icon-tuichu',
-          title: '退出'
-        },
         {
           type: 'set',
           icon: 'es-icon-shezhi',
           title: '设置'
+        },
+        {
+          type: 'quit',
+          icon: 'es-icon-tuichu',
+          title: '退出'
         }
       ]
     },