eoss-ui 0.7.75 → 0.7.76

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

@@ -110,7 +110,11 @@ export default {
       type: Number,
       default: 3000
     },
-    multiple: Boolean
+    multiple: Boolean,
+    changeThemeReload: {
+      type: Boolean,
+      default: false
+    }
   },
   computed: {
     _launchImage() {
@@ -134,6 +138,10 @@ export default {
     };
   },
   created() {
+    const layoutType = localStorage.getItem('layoutType');
+    if (layoutType) {
+      this.layoutType = layoutType;
+    }
     this.params = util.getParams() || {};
     this.sysCode = this.params.sysCode;
     this.appCode = this.params.appCode || this.params.appcode;
@@ -157,10 +165,6 @@ export default {
     this.$nextTick(() => {
       // 当主题变化时，重新绑定一次事件 防止事件丢失 或者绑定错误
       this.bindEvent();
-      const layoutType = localStorage.getItem('layoutType');
-      if (layoutType) {
-        this.layoutType = layoutType;
-      }
     });
   },
   methods: {
@@ -268,20 +272,29 @@ export default {
       if (active) {
         this.layout = active;
       }
+      // 重新加载页面，刷新布局风格配置信息
+      // 如果不刷新,会导致事件绑定出现问题，导致事件丢失
+      if (this.changeThemeReload) {
+        window.top.location.reload();
+        return;
+      }
+
       let mainConfig = util.getStorage('mainConfig');
-      if (mainConfig) {
-        mainConfig = JSON.parse(mainConfig);
-        this.$nextTick(() => {
+      // 切换布局风格后，重新绑定事件
+      this.$nextTick(() => {
+        this.bindEvent();
+        if (mainConfig) {
+          mainConfig = JSON.parse(mainConfig);
           this.$refs.main.init(mainConfig, true);
           util.getMainConfig((res) => {
             this.$refs.main.init(res, false);
           });
-        });
-      } else {
-        util.getMainConfig((res) => {
-          this.$refs.main.init(res, true);
-        });
-      }
+        } else {
+          util.getMainConfig((res) => {
+            this.$refs.main.init(res, true);
+          });
+        }
+      });
     },
     /**
      * @desc:重新登录
@@ -596,7 +609,6 @@ export default {
      **/
     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/simplicity/index.vue

@@ -629,6 +629,10 @@ export default {
       type: Number,
       default: 220
     },
+    showTipNums: {
+      type: Boolean,
+      default: true
+    },
     //路由方式
     routeType: String,
     host: {
@@ -1457,6 +1461,8 @@ export default {
      * @date 2024年9月7日
      **/
     setTips(obj) {
+      // 不显示菜单气泡提醒
+      if (!this.showTipNums) return;
       if (!this.menuTips || !Object.keys(this.menuTips).length) {
         return false;
       }

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

@@ -1,84 +1,84 @@
-<template>
-  <div v-for="(item, index) in data" :key="item.id" @click="handleClick(item)">
-    <div
-      class="es-simplicity-menus-item"
-      :class="{
-        'is-active': active === item.id,
-        'is-open': openId === item.id
-      }"
-    >
-      <es-icon
-        class="es-simplicity_apps-icon"
-        :style="setStyle(index)"
-        :contents="item.icons || item.icon || menuIcon"
-      ></es-icon>
-      <div class="es-simplicity-menus-tips" v-if="item.tips">
-        {{ item.tips > 99 ? '99+' : item.tips }}
-      </div>
-      <div class="es-simplicity_apps-text">
-        {{ item.text || item.name }}
-      </div>
-    </div>
-    <lists
-      v-if="
-        (item.children && item.children.length) ||
-        (item.fourthTabs && item.fourthTabs.length)
-      "
-      :menuIcon="menuIcon"
-      :color="color"
-      :backgroundColor="backgroundColor"
-      :data="[...(item.children || []), ...(item.fourthTabs || [])]"
-    ></lists>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'Lists',
-  components: {},
-  props: {
-    menuIcon: String,
-    color: [String, Array],
-    backgroundColor: [String, Array],
-    data: Array
-  },
-  data() {
-    return {
-      active: '',
-      openId: ''
-    };
-  },
-  computed: {},
-  watch: {},
-  created() {},
-  mounted() {},
-  methods: {
-    setStyle(num) {
-      let obj = {};
-      if (this.color) {
-        obj.color = this.color;
-        if (Array.isArray(this.color)) {
-          obj.color = this.color[num % this.color.length];
-        } else {
-          obj.color = this.color;
-        }
-      }
-      if (this.backgroundColor) {
-        if (Array.isArray(this.backgroundColor)) {
-          obj.backgroundColor =
-            this.backgroundColor[num % this.backgroundColor.length];
-        } else {
-          obj.backgroundColor = this.backgroundColor;
-        }
-      }
-      return obj;
-    },
-    handleClick(res) {
-      this.active = res.id;
-      this.$emit('command', res);
-    }
-  }
-};
-</script>
-
-<style lang="scss" scoped></style>
+<template>
+  <div v-for="(item, index) in data" :key="item.id" @click="handleClick(item)">
+    <div
+      class="es-simplicity-menus-item"
+      :class="{
+        'is-active': active === item.id,
+        'is-open': openId === item.id
+      }"
+    >
+      <es-icon
+        class="es-simplicity_apps-icon"
+        :style="setStyle(index)"
+        :contents="item.icons || item.icon || menuIcon"
+      ></es-icon>
+      <div class="es-simplicity-menus-tips" v-if="item.tips">
+        {{ item.tips > 99 ? '99+' : item.tips }}
+      </div>
+      <div class="es-simplicity_apps-text">
+        {{ item.text || item.name }}
+      </div>
+    </div>
+    <lists
+      v-if="
+        (item.children && item.children.length) ||
+        (item.fourthTabs && item.fourthTabs.length)
+      "
+      :menuIcon="menuIcon"
+      :color="color"
+      :backgroundColor="backgroundColor"
+      :data="[...(item.children || []), ...(item.fourthTabs || [])]"
+    ></lists>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'Lists',
+  components: {},
+  props: {
+    menuIcon: String,
+    color: [String, Array],
+    backgroundColor: [String, Array],
+    data: Array
+  },
+  data() {
+    return {
+      active: '',
+      openId: ''
+    };
+  },
+  computed: {},
+  watch: {},
+  created() {},
+  mounted() {},
+  methods: {
+    setStyle(num) {
+      let obj = {};
+      if (this.color) {
+        obj.color = this.color;
+        if (Array.isArray(this.color)) {
+          obj.color = this.color[num % this.color.length];
+        } else {
+          obj.color = this.color;
+        }
+      }
+      if (this.backgroundColor) {
+        if (Array.isArray(this.backgroundColor)) {
+          obj.backgroundColor =
+            this.backgroundColor[num % this.backgroundColor.length];
+        } else {
+          obj.backgroundColor = this.backgroundColor;
+        }
+      }
+      return obj;
+    },
+    handleClick(res) {
+      this.active = res.id;
+      this.$emit('command', res);
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped></style>

package/packages/main/src/simplicity/router-page.vue

@@ -1,45 +1,45 @@
-<template>
-  <div style="height: 100%">
-    <router-view :key="keys || appCode" :name="appCode" />
-  </div>
-</template>
-
-<script>
-import util from 'eoss-ui/src/utils/util';
-export default {
-  name: 'RouterPage',
-  components: {},
-  props: {
-    appCode: String,
-    path: String,
-    url: String,
-    query: {
-      type: Object,
-      default() {
-        return {};
-      }
-    },
-    keys: String
-  },
-  data() {
-    return {};
-  },
-  computed: {},
-  watch: {},
-  created() {},
-  mounted() {
-    this.jump();
-  },
-  methods: {
-    jump() {
-      let params = util.getParams({ url: this.url });
-      this.$router.push({
-        path: this.path,
-        query: { ...this.query, ...params }
-      });
-    }
-  }
-};
-</script>
-
-<style lang="scss" scoped></style>
+<template>
+  <div style="height: 100%">
+    <router-view :key="keys || appCode" :name="appCode" />
+  </div>
+</template>
+
+<script>
+import util from 'eoss-ui/src/utils/util';
+export default {
+  name: 'RouterPage',
+  components: {},
+  props: {
+    appCode: String,
+    path: String,
+    url: String,
+    query: {
+      type: Object,
+      default() {
+        return {};
+      }
+    },
+    keys: String
+  },
+  data() {
+    return {};
+  },
+  computed: {},
+  watch: {},
+  created() {},
+  mounted() {
+    this.jump();
+  },
+  methods: {
+    jump() {
+      let params = util.getParams({ url: this.url });
+      this.$router.push({
+        path: this.path,
+        query: { ...this.query, ...params }
+      });
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped></style>