eoss-ui 0.5.81-beta → 0.5.81-beta1

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

@@ -57,7 +57,7 @@
         class="es-simplicity-side-app"
         v-if="_aiConfig"
         :style="_aibackground"
-        @click="handlerClickAi"
+        @click="handlerSetDrawer(_aiConfig)"
       >
         <es-icon
           v-show="_aiConfig.icon"
@@ -81,6 +81,7 @@
         :visible.sync="showMenu"
       >
         <sub-menu
+          ref="subMenus"
           :color="menuColor"
           :backgroundColor="menuBackgroundColor"
           :menu-icon="menuIcon"
@@ -118,16 +119,34 @@
         direction="ltr"
         modal-class="es-simplicity-apps-modal"
         size="100%"
+        show-close
         :modal-append-to-body="false"
         :with-header="false"
-        :visible.sync="showAi"
+        :visible.sync="drawer.visible"
       >
-        <iframe
-          frameborder="0"
-          width="100%"
-          height="100%"
-          :src="_aiConfig.url"
-        ></iframe>
+        <i
+          class="es-icon-close es-simplicity-drawer-close"
+          @click="handleCloseDrawer"
+        ></i>
+        <template v-if="drawer.url">
+          <template v-if="isIE || drawer.method !== 'wujie'">
+            <iframe
+              frameborder="0"
+              width="100%"
+              height="100%"
+              :src="drawer.url"
+            ></iframe>
+          </template>
+          <template v-else>
+            <es-wujie
+              :show="true"
+              :props="wjProps"
+              :attrs="wjAttrs"
+              :name="drawer.name"
+              :url="drawer.url"
+            ></es-wujie>
+          </template>
+        </template>
       </el-drawer>
       <!-- AI end -->
 
@@ -180,8 +199,14 @@
       >
         <handler
           slot="append"
-          :hide="hides"
-          :notice="notice"
+          v-bind="handleConfig"
+          :data="handleData"
+          :hide="{
+            home: indexUrl ? false : true,
+            index: doorIndex ? false : true,
+            ...hides
+          }"
+          :notice-num="notice"
           @click="handleClick"
         ></handler>
         <el-tab-pane
@@ -295,19 +320,39 @@ let events = [
     }
     return tabs;
   },
-  (tabs, index) => {
+  (tabs, index, that) => {
+    let i = util.indexOfObj(tabs, that.activeName, 'id');
+    if (tabs.length == 1) {
+      that.activeName = '';
+    } else if (i == index) {
+      if (index < tabs.length - 1) {
+        that.activeName = tabs[index + 1].id;
+      } else {
+        that.activeName = tabs[index - 1].id;
+      }
+    }
     tabs.splice(index, 1);
     return tabs;
   },
-  (tabs, index) => {
-    return tabs.slice(index, index + 1);
+  (tabs, index, that) => {
+    let tab = tabs.slice(index, index + 1);
+    that.activeName = tab[0].id;
+    return tab;
   },
-  (tabs, index) => {
+  (tabs, index, that) => {
+    let i = util.indexOfObj(tabs, that.activeName, 'id');
+    if (i < index) {
+      that.activeName = tabs[index].id;
+    }
     tabs.splice(0, index);
     return tabs;
   },
-  (tabs, index) => {
-    tabs.slice(index + 1, tabs.length - index);
+  (tabs, index, that) => {
+    let i = util.indexOfObj(tabs, that.activeName, 'id');
+    if (i > index) {
+      that.activeName = tabs[index].id;
+    }
+    tabs.splice(index + 1, tabs.length - index);
     return tabs;
   }
 ];
@@ -338,8 +383,12 @@ export default {
     },
     //主题颜色选择颜色集合
     themes: Array,
+    //操作栏配置
+    handleData: Array,
+    //操作栏单项配置
+    handleConfig: Object,
     //需要隐藏的头部功能
-    hides: [Object, Array],
+    hides: Object,
     //菜单颜色
     menuColor: [String, Array],
     //菜单背景颜色
@@ -419,8 +468,10 @@ export default {
       width: '296px',
       //人工智能配置
       aiConfig: null,
-      //展示人工智能界面
-      showAi: false,
+      //公用窗口面板配置
+      drawer: {
+        visible: false
+      },
       //所有应用
       applications: [],
       //业务系统
@@ -449,6 +500,10 @@ export default {
       initApps: null,
       //首页地址
       indexUrl: '',
+      //首页配置
+      homePage: {},
+      //门户跳转页地址
+      doorIndex: '',
       //弹窗
       dialog: {},
       //消息列表展示状态
@@ -532,6 +587,7 @@ export default {
       const results = JSON.parse(mainConfig);
       this.init(results);
     }
+    this.doorIndex = sessionStorage.getItem('doorIndex');
   },
   mounted() {
     util.win.reLogin = this.handleReLogin;
@@ -562,9 +618,7 @@ export default {
           path = path.replace(path[1], path[1].toLowerCase());
         }
         let pathname = url.substring(url.indexOf('#/') + 1);
-        pathname = pathname
-          .replace(pathname[1], pathname[1].toLowerCase())
-          .split('?')[0];
+        pathname = pathname.split('?')[0];
         if (res.path !== '/' && pathname == path) {
           if (typeof res.component === 'function') {
             let component = {};
@@ -770,15 +824,15 @@ export default {
                 if (obj) {
                   this.tabs = [this.setIframeType(obj)];
                   this.activeName = obj.id;
+                  this.homePage = obj;
                 } else {
-                  this.tabs = [
-                    this.setIframeType({
-                      url: this.indexUrl,
-                      text: '工作台',
-                      id: '0',
-                      appCode: 'indexUrl'
-                    })
-                  ];
+                  this.homePage = this.setIframeType({
+                    url: this.indexUrl,
+                    text: '工作台',
+                    id: '0',
+                    appCode: 'indexUrl'
+                  });
+                  this.tabs = [this.homePage];
                   this.activeName = '0';
                 }
               }
@@ -878,10 +932,11 @@ export default {
       if (Array.isArray(menus)) {
         for (let i = 0; i < menus.length; i++) {
           let item = menus[i];
-          if (key && item[key] === res) {
-            return item;
-          }
-          if (item.url === res || item.id === res) {
+          if (key) {
+            if (item[key] === res) {
+              return item;
+            }
+          } else if (item.url === res || item.id === res) {
             return item;
           }
           if (
@@ -1036,11 +1091,16 @@ export default {
           this.subMenus = res;
           this.showMenu = true;
           this.showApps = false;
+          this.width = '296px';
+          this.$refs.subMenus && this.$refs.subMenus.clearSubmenu();
         } else {
           if (res.code) {
-            this.subMenus = this.getMenu(this.menus, res.code, 'appCode');
-            this.showMenu = true;
+            let subMenus = this.getMenu(this.menus, res.code, 'appCode');
+            this.subMenus = subMenus ? subMenus : [];
+            this.showMenu = subMenus !== false;
             this.showApps = false;
+            this.width = '296px';
+            this.$refs.subMenus && this.$refs.subMenus.clearSubmenu();
           }
         }
         if (res.url) {
@@ -1055,19 +1115,32 @@ export default {
               this.tabs.push(this.setIframeType(res));
             }
           }
-        } else {
         }
       } else {
+        this.showMenu = false;
         this.showApps = !this.showApps;
       }
     },
     /**
-     * @desc:显示人工智能界面
+     * @desc:显示Drawer界面
      * @author huangbo
      * @date 2024年9月7日
      **/
-    handlerClickAi() {
-      this.showAi = !this.showAi;
+    handlerSetDrawer(res) {
+      this.drawer.visible = !this.drawer.visible;
+      this.drawer.mounted = res.mounted;
+      this.drawer.url = res.url;
+      if (res.mounted === 'wujie') {
+        this.drawer.name = res.name || util.uuid();
+      }
+    },
+    /**
+     * @desc:关闭Drawer界面
+     * @author huangbo
+     * @date 2024年9月7日
+     **/
+    handleCloseDrawer() {
+      this.drawer = { visible: false };
     },
     /**
      * @desc:菜单点击
@@ -1156,9 +1229,17 @@ export default {
      * @date 2024年9月7日
      **/
     handleRemove(name) {
+      let len = this.tabs.length - 1;
       let i = util.indexOfObj(this.tabs, name, 'id');
       if (i > -1) {
         this.tabs.splice(i, 1);
+        if (this.tabs.length == 0) {
+          this.activeName = '';
+        } else if (i == len) {
+          this.activeName = this.tabs[len - 1].id;
+        } else {
+          this.activeName = this.tabs[i].id;
+        }
       }
     },
     /**
@@ -1192,7 +1273,7 @@ export default {
      **/
     handleTabsEvents(num) {
       if (this.pane !== null) {
-        this.tabs = events[num](this.tabs, this.pane);
+        this.tabs = events[num](this.tabs, this.pane, this);
       }
       this.showTabsHandler = false;
       window.removeEventListener('click', this.closeTabsEvents);
@@ -1240,6 +1321,18 @@ export default {
           case 'set':
             this.showSet = !this.showSet;
             break;
+          case 'home':
+            if (this.homePage.id !== this.activeName) {
+              let i = util.indexOfObj(this.tabs, this.homePage.id, 'id');
+              if (i == -1) {
+                this.tabs.unshift(this.homePage);
+              }
+              this.activeName = this.homePage.id;
+            }
+            break;
+          case 'search':
+            this.handlerSetDrawer(res);
+            break;
           case 'goView':
             util.win.open(res.path, '_blank');
             break;

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

@@ -66,6 +66,9 @@ export default {
     handleClick(res) {
       this.active = res.id;
       this.$emit('command', res, this.index);
+    },
+    clearActive() {
+      this.active = '';
     }
   }
 };

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

@@ -3,6 +3,7 @@
     <div class="es-simplicity-menus-box">
       <div class="es-simplicity-menus-title">{{ text }}</div>
       <menu-list
+        ref="menus"
         :data="menus"
         :menuIcon="menuIcon"
         :color="color"
@@ -107,11 +108,16 @@ export default {
       } else {
         if (num === undefined) {
           this.$emit('command', 1);
+          this.subMenus = [];
         } else {
           this.subMenus.splice(parseInt(num, 10) + 1, 1);
           this.$emit('command', 2 + parseInt(num, 10));
         }
       }
+    },
+    clearSubmenu() {
+      this.$refs.menus.clearActive();
+      this.subMenus = [];
     }
   }
 };

package/packages/theme-chalk/lib/data-table.css

@@ -1 +1 @@
-@charset "UTF-8";.el-table__empty-block,.es-data-table,.es-data-table-content .es-table .el-table__body-wrapper .el-table__body{position:relative}.es-data-table .es-toolbar+.es-data-table-content{padding:16px}.es-data-table-content{background-color:#fafafa}.es-data-table-content .es-table:not(.el-table--border){border:1px solid #e1e1e1;border-bottom:0}.es-data-table-content .es-table thead th,.es-data-table-content .es-table thead tr{background-color:#f8f8f8;border-color:#e1e1e1}.es-data-table-content .es-table th,.es-data-table-content .es-table thead tr{padding:6px 0;text-align:center}.es-data-table-content .es-table th .cell,.es-data-table-content .es-table thead tr .cell{-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.es-data-table-content .es-table td{padding:6px 0}.es-data-table-content .es-table td.es-table-handle-box .cell,.es-data-table-content .es-table td.is-center .cell{-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.es-data-table-content .es-table td.is-right .cell{-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}.es-data-table-content .es-table .es-table-handle-box{text-align:center}.es-data-table-content .es-table+.es-table-page{margin-top:-1px}.es-data-table-content .es-table .el-table__fixed-right::before,.es-data-table-content .es-table .el-table__fixed::before{background-color:transparent}.es-data-table-content .es-table .cell{min-height:28px;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-ms-flex-line-pack:center;align-content:center}.es-data-table-content .es-table .cell:not(.el-tooltip){display:-webkit-box;display:-ms-flexbox;display:flex}.es-data-table-content .es-table .cell.el-tooltip{line-height:28px}.es-data-table-content .es-table .el-form-item{margin-bottom:0;width:100%}.es-data-table-content .es-table .el-form-item .el-input:not(.el-input--prefix) .el-input__inner{padding:0 8px;margin-top:0}.es-data-table-content .es-table .el-form-item .el-input-number,.es-data-table-content .es-table .el-form-item .el-select{width:100%}.es-data-table-content.es-table-border-none .es-table{border:0}.es-data-table-content.es-table-border-none .es-table::before{content:none}.es-data-table-content.es-table-border-none .es-table td,.es-data-table-content.es-table-border-none .es-table th{border:0}.es-data-table-content.es-table-border-none .es-table-page{border:0;margin-top:0;background-color:#fff}.es-data-table-content .el-table__header,.es-data-table-content .el-table__header thead{color:#404040}.es-data-table-content .el-table__body tr.hover-row.current-row>td,.es-data-table-content .el-table__body tr.hover-row.el-table__row--striped.current-row>td,.es-data-table-content .el-table__body tr.hover-row.el-table__row--striped>td,.es-data-table-content .el-table__body tr.hover-row>td,.es-data-table-content .el-table__body tr:hover>td{background-color:#e6f7ff}.es-data-table-content .el-table__body tr.current-row>td{background-color:#91d5ff}.es-data-table-content .es-table-page{height:46px;border:1px solid #e1e1e1;padding:8px 12px;background-color:#f8f8f8}.es-data-table-content .es-table-page.es-loading-page{line-height:30px;font-size:14px;font-weight:400;color:rgba(0,0,0,.75)}.es-data-table-content .es-thead-border .el-table__header th:not(.gutter){border-right:1px solid #e1e1e1}.es-data-table-content .es-thead-border .el-table__header thead:not(.is-group) th:last-child{border-right:0;border-bottom:1px solid #e1e1e1}.es-data-table-content .es-thead-border .el-table__fixed-right:not(.el-table-box-shadow) thead th:last-child{border-left:1px solid #e1e1e1}.es-data-table-content .es-thead-border .is-scrolling-right~.el-table__fixed-right:not(.el-table-box-shadow) thead th:last-child{border-left:0}.es-data-table-content .el-form-item__error{top:unset;bottom:0}.es-data-table-content .es-table:not(.el-table--border) .el-table--border td,.es-data-table-content .es-table:not(.el-table--border) .el-table--border th,.es-data-table-content .es-table:not(.el-table--border) .el-table__body-wrapper .el-table--border.is-scrolling-left~.el-table__fixed{border-right:0}.es-data-table-content .is-scrolling-right+.el-table__fixed-body-wrapper td{border-right:1px solid #e1e1e1}.es-data-table-content .is-scrolling-right+.el-table__fixed-body-wrapper td:last-child{border-right:0}.el-table--border::after,.el-table--group::after,.el-table::before{z-index:5}.sizer-btn-box{text-align:right;margin-top:7px}
+@charset "UTF-8";.es-data-table,.es-data-table-content .es-table .el-table__body-wrapper .el-table__body{position:relative}.es-data-table .es-toolbar+.es-data-table-content{padding:16px}.es-data-table-content{background-color:#fafafa}.es-data-table-content .es-table:not(.el-table--border){border:1px solid #e1e1e1;border-bottom:0}.es-data-table-content .es-table thead th,.es-data-table-content .es-table thead tr{background-color:#f8f8f8;border-color:#e1e1e1}.es-data-table-content .es-table th,.es-data-table-content .es-table thead tr{padding:6px 0;text-align:center}.es-data-table-content .es-table th .cell,.es-data-table-content .es-table thead tr .cell{-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.es-data-table-content .es-table td{padding:6px 0}.es-data-table-content .es-table td.es-table-handle-box .cell,.es-data-table-content .es-table td.is-center .cell{-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.es-data-table-content .es-table td.is-right .cell{-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}.es-data-table-content .es-table .es-table-handle-box{text-align:center}.es-data-table-content .es-table+.es-table-page{margin-top:-1px}.es-data-table-content .es-table .el-table__fixed-right::before,.es-data-table-content .es-table .el-table__fixed::before{background-color:transparent}.es-data-table-content .es-table .cell{min-height:28px;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-ms-flex-line-pack:center;align-content:center}.es-data-table-content .es-table .cell:not(.el-tooltip){display:-webkit-box;display:-ms-flexbox;display:flex}.es-data-table-content .es-table .cell.el-tooltip{line-height:28px}.es-data-table-content .es-table .el-form-item{margin-bottom:0;width:100%}.es-data-table-content .es-table .el-form-item .el-input:not(.el-input--prefix) .el-input__inner{padding:0 8px;margin-top:0}.es-data-table-content .es-table .el-form-item .el-input-number,.es-data-table-content .es-table .el-form-item .el-select{width:100%}.es-data-table-content.es-table-border-none .es-table{border:0}.es-data-table-content.es-table-border-none .es-table::before{content:none}.es-data-table-content.es-table-border-none .es-table td,.es-data-table-content.es-table-border-none .es-table th{border:0}.es-data-table-content.es-table-border-none .es-table-page{border:0;margin-top:0;background-color:#fff}.es-data-table-content .el-table__header,.es-data-table-content .el-table__header thead{color:#404040}.es-data-table-content .el-table__body tr.hover-row.current-row>td,.es-data-table-content .el-table__body tr.hover-row.el-table__row--striped.current-row>td,.es-data-table-content .el-table__body tr.hover-row.el-table__row--striped>td,.es-data-table-content .el-table__body tr.hover-row>td,.es-data-table-content .el-table__body tr:hover>td{background-color:#e6f7ff}.es-data-table-content .el-table__body tr.current-row>td{background-color:#91d5ff}.es-data-table-content .es-table-page{height:46px;border:1px solid #e1e1e1;padding:8px 12px;background-color:#f8f8f8}.es-data-table-content .es-table-page.es-loading-page{line-height:30px;font-size:14px;font-weight:400;color:rgba(0,0,0,.75)}.es-data-table-content .es-thead-border .el-table__header th:not(.gutter){border-right:1px solid #e1e1e1}.es-data-table-content .es-thead-border .el-table__header thead:not(.is-group) th:last-child{border-right:0;border-bottom:1px solid #e1e1e1}.es-data-table-content .es-thead-border .el-table__fixed-right:not(.el-table-box-shadow) thead th:last-child{border-left:1px solid #e1e1e1}.es-data-table-content .es-thead-border .is-scrolling-right~.el-table__fixed-right:not(.el-table-box-shadow) thead th:last-child{border-left:0}.es-data-table-content .el-form-item__error{top:unset;bottom:0}.es-data-table-content .es-table:not(.el-table--border) .el-table--border td,.es-data-table-content .es-table:not(.el-table--border) .el-table--border th,.es-data-table-content .es-table:not(.el-table--border) .el-table__body-wrapper .el-table--border.is-scrolling-left~.el-table__fixed{border-right:0}.es-data-table-content .is-scrolling-right+.el-table__fixed-body-wrapper td{border-right:1px solid #e1e1e1}.es-data-table-content .is-scrolling-right+.el-table__fixed-body-wrapper td:last-child{border-right:0}.el-table--border::after,.el-table--group::after,.el-table::before{z-index:5}.sizer-btn-box{text-align:right;margin-top:7px}