eoss-ui 0.5.81-beta5 → 0.5.81-beta7

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

@@ -2,7 +2,9 @@
   <div class="es-main">
     <div class="es-simplicity-side">
       <img class="es-simplicity-logo" v-if="mainLogo" :src="mainLogo" />
-      <div class="es-simplicity-org-name">{{ userModel.orgName }}</div>
+      <div class="es-simplicity-org-name">
+        {{ simpleUserInfo.orgShortName || simpleUserInfo.orgName }}
+      </div>
       <el-popover
         class="es-simplicity-user-popover"
         placement="right-start"
@@ -15,6 +17,7 @@
           :notifyList="notifyList"
           :notify="notify"
           :contents="userInfoContents"
+          @success="handleSuccess"
           @change="handleChangeConfig"
           @close="handlerClose"
         ></user>
@@ -83,6 +86,7 @@
         :color="menuColor"
         :backgroundColor="menuBackgroundColor"
         :menu-icon="menuIcon"
+        :active="subActive"
         v-bind="subMenus"
         @command="handlerClickMenu"
       ></sub-menu>
@@ -182,6 +186,7 @@
         v-model="activeName"
         closable
         hide-bar
+        opacity
         @tab-remove="handleRemove"
         @tab-contextmenu="handleContextmenu"
       >
@@ -466,6 +471,8 @@ export default {
       subMenus: null,
       //展示菜单导航
       showMenu: false,
+      //子菜单选中
+      subActive: '',
       //折叠菜单
       fold: false,
       //人工智能配置
@@ -528,7 +535,7 @@ export default {
       //选中菜单
       active: '',
       //单位名称
-      orgName: ''
+      simpleUserInfo: {}
     };
   },
   computed: {
@@ -841,52 +848,73 @@ export default {
                       let tab = this.setIframeType(obj);
                       this.tabs = [tab];
                       this.activeName = tab.id;
-                      // if (tab.method == 'router') {
-                      //   let params = util.getParams({ url: tab.url });
-                      //   this.$router.push({
-                      //     path: tab.path,
-                      //     query: { ...this.$parent.params, ...params }
-                      //   });
-                      // }
                     }
                   }
                 }
-                if (this.tabs.length == 0) {
-                  let subMenus = this.getMenu(
-                    this.menus,
-                    this.appCode,
-                    'appCode'
-                  );
-                  if (subMenus) {
-                    // this.subMenus = subMenus;
-                    // this.showMenu = true;
+                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;
-                      // if (tab.method == 'router') {
-                      //   let params = util.getParams({ url: tab.url });
+                    } else {
+                      this.subActive = '';
+                    }
+                  }
+                  this.subMenus = subMenus;
+                  this.showMenu = true;
+                } else {
+                  this.subMenus = null;
+                  this.showMenu = false;
+                }
+              } else {
+                if (this.indexUrl) {
+                  let obj = this.getMenu(this.menus, this.indexUrl);
+                  if (obj) {
+                    if (!this.appCode) {
+                      let tab = this.setIframeType(obj);
+                      this.tabs = [tab];
+                      this.activeName = tab.id;
+                    }
+                    this.homePage = obj;
+                  } else {
+                    this.homePage = this.setIframeType({
+                      url: this.indexUrl,
+                      text: '工作台',
+                      id: '0',
+                      appCode: 'indexUrl'
+                    });
+                    if (!this.appCode) {
+                      this.tabs = [this.homePage];
+                      this.activeName = '0';
+                      // if (this.homePage.method == 'router') {
+                      //   let params = util.getParams({ url: this.homePage.url });
                       //   this.$router.push({
-                      //     path: tab.path,
+                      //     path: this.homePage.path,
                       //     query: { ...this.$parent.params, ...params }
                       //   });
                       // }
                     }
-                  } else {
-                    this.subMenus = null;
-                    this.showMenu = false;
                   }
-                }
-                // this.width = this.menuWidth;
-                // this.$refs.subMenus && this.$refs.subMenus.clearSubmenu();
-              }
-              if (this.indexUrl) {
-                let obj = this.getMenu(this.menus, this.indexUrl);
-                if (obj) {
-                  if (!this.appCode) {
+                } else if (
+                  this.initApps &&
+                  this.initApps.length &&
+                  !this.appCode
+                ) {
+                  let obj = this.getMenu(
+                    this.menus,
+                    this.initApps[this.initApps.length - 1]
+                  );
+                  if (obj) {
                     let tab = this.setIframeType(obj);
-                    this.tabs = [tab];
+                    this.tabs.push(tab);
                     this.activeName = tab.id;
                     // if (tab.method == 'router') {
                     //   let params = util.getParams({ url: tab.url });
@@ -896,46 +924,6 @@ export default {
                     //   });
                     // }
                   }
-                  this.homePage = obj;
-                } else {
-                  this.homePage = this.setIframeType({
-                    url: this.indexUrl,
-                    text: '工作台',
-                    id: '0',
-                    appCode: 'indexUrl'
-                  });
-                  if (!this.appCode) {
-                    this.tabs = [this.homePage];
-                    this.activeName = '0';
-                    // if (this.homePage.method == 'router') {
-                    //   let params = util.getParams({ url: this.homePage.url });
-                    //   this.$router.push({
-                    //     path: this.homePage.path,
-                    //     query: { ...this.$parent.params, ...params }
-                    //   });
-                    // }
-                  }
-                }
-              } else if (
-                this.initApps &&
-                this.initApps.length &&
-                !this.appCode
-              ) {
-                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;
-                  // if (tab.method == 'router') {
-                  //   let params = util.getParams({ url: tab.url });
-                  //   this.$router.push({
-                  //     path: tab.path,
-                  //     query: { ...this.$parent.params, ...params }
-                  //   });
-                  // }
                 }
               }
             } else {
@@ -1114,8 +1102,9 @@ export default {
             return flag;
           }
         } else {
-          if (this.menuTips[obj.id] && Number(this.menuTips[obj.id])) {
-            this.$set(obj, 'tips', Number(this.menuTips[obj.id]));
+          let num = this.menuTips[obj.id] || this.menuTips[obj.code];
+          if (num && Number(num)) {
+            this.$set(obj, 'tips', Number(num));
             return this.menuTips[obj.id];
           }
         }
@@ -1274,6 +1263,15 @@ export default {
         this.tabs.push(tab);
       }
     },
+
+    /**
+     * @desc:用户详情请求成功
+     * @author huangbo
+     * @date 2024年9月7日
+     **/
+    handleSuccess(res) {
+      this.simpleUserInfo = res.simpleUserInfo;
+    },
     /**
      * @desc:修改用户配置
      * @author huangbo
@@ -1314,7 +1312,14 @@ export default {
      * @date 2024年9月7日
      **/
     handleRefresh() {
-      this.handleTab();
+      let tab = this.tabs[this.activeName];
+      if (tab.method === 'iframe') {
+        tab.url = util.handlerUrl(tab.url);
+      }
+      tab.refresh = false;
+      this.$nextTick(() => {
+        tab.refresh = true;
+      });
     },
     /**
      * @desc:删除iframe

package/packages/main/src/simplicity/menu-list.vue

@@ -10,21 +10,28 @@
         trigger="hover"
         popper-class="es-simplicity-menus-sub"
         :width="width"
+        @show="handleShow"
+        @hide="handleHide"
       >
-        <menu-list
-          ref="menus"
-          :data="[...(item.children || []), ...(item.fourthTabs || [])]"
-          :menuIcon="menuIcon"
-          :color="color"
-          :backgroundColor="backgroundColor"
-          :width="width"
-          @command="handleClick"
-        ></menu-list>
+        <template slot-scope="{ parent }">
+          <menu-list
+            ref="menus"
+            :parent="parent"
+            :active="active"
+            :popover="show"
+            :data="[...(item.children || []), ...(item.fourthTabs || [])]"
+            :menuIcon="menuIcon"
+            :color="color"
+            :backgroundColor="backgroundColor"
+            :width="width"
+            @command="handleClick"
+          ></menu-list>
+        </template>
         <div
           slot="reference"
           class="es-simplicity-menus-item"
           :key="item.id"
-          :class="{ 'is-active': active === item.id, 'is-fold': fold }"
+          :class="{ 'is-active': defaultActive === item.id, 'is-fold': fold }"
           :title="fold ? item.text || item.name : ''"
         >
           <template v-if="fold">
@@ -55,7 +62,7 @@
         v-else
         class="es-simplicity-menus-item"
         :key="item.id"
-        :class="{ 'is-active': active === item.id, 'is-fold': fold }"
+        :class="{ 'is-active': defaultActive === item.id, 'is-fold': fold }"
         :title="fold ? item.text || item.name : ''"
         @click="handleClick(item)"
       >
@@ -91,20 +98,33 @@ export default {
   name: 'MenuList',
   components: {},
   props: {
+    active: String,
     menuIcon: String,
     color: [String, Array],
     backgroundColor: [String, Array],
     data: Array,
     fold: Boolean,
-    width: Number
+    width: Number,
+    popover: Boolean,
+    parent: Object
   },
   data() {
     return {
-      active: ''
+      defaultActive: this.active,
+      show: false,
+      height: document.body.offsetHeight - 44
     };
   },
   computed: {},
-  watch: {},
+  watch: {
+    popover() {
+      if (this.$el.offsetHeight > this.height) {
+        this.$el.style.height = this.height + 'px';
+      } else {
+        this.$el.style.height = '';
+      }
+    }
+  },
   created() {},
   mounted() {},
   methods: {
@@ -129,7 +149,7 @@ export default {
       return obj;
     },
     handleClick(res) {
-      this.active = res.id;
+      this.defaultActive = res.id;
       if (res.url) {
         if (res.urlopenmode == 1) {
           util.win.open(res.url);
@@ -141,8 +161,17 @@ export default {
       }
       this.$emit('command', res);
     },
-    clearActive() {
-      this.active = '';
+    handleShow() {
+      this.show = true;
+      if (this.parent) {
+        this.parent.changeContinue(true);
+      }
+    },
+    handleHide() {
+      if (this.parent) {
+        this.parent.changeContinue(false);
+        //this.parent.hidePopper();
+      }
     }
   }
 };

package/packages/main/src/simplicity/sub-menu.vue

@@ -30,6 +30,7 @@
         </div>
         <menu-list
           ref="menus"
+          :active="active"
           :data="menus"
           :menuIcon="menuIcon"
           :color="color"
@@ -50,6 +51,7 @@ export default {
   components: { MenuList },
   props: {
     title: String,
+    active: String,
     color: {
       type: [String, Array],
       default: '#fff'
@@ -91,7 +93,6 @@ export default {
     return {
       fold: false,
       width: this.size,
-      active: '',
       subMenus: []
     };
   },

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

@@ -133,6 +133,7 @@ export default {
             this.checkPassword = results.checkPassword;
             this.checkPasswordMsg = results.checkPasswordMsg;
             this.headImgCode = results.headImgCode || undefined;
+            this.$emit('success', results);
           } else {
             let msg = res.msg || '系统错误，请联系管理员！';
             this.$message.error(msg);

package/packages/select/src/main.vue

@@ -498,7 +498,10 @@ export default {
             }
           }
         } else {
-          if (typeof data === 'string' || !data.length) {
+          if (
+            typeof data === 'string' ||
+            (!data.length && !this.sysCode && !this.url)
+          ) {
             return value;
           }
           if (Array.isArray(data) && data.length) {