eoss-ui 0.5.84 → 0.5.85

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

@@ -2,23 +2,20 @@
   <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 ||
-          simpleUserInfo.orgShortName ||
-          simpleUserInfo.orgName
-        }}
+      <div
+        class="es-simplicity-org-name es-text-ellipsis-row2"
+        :title="simpleUserInfo.orgShortName || simpleUserInfo.orgName"
+      >
+        {{ simpleUserInfo.orgShortName || simpleUserInfo.orgName }}
       </div>
       <el-popover
         class="es-simplicity-user-popover"
         placement="right-start"
         width="360"
         trigger="click"
-        @show="showUserInfo"
       >
         <!-- 用户信息 -->
         <user
-          v-if="showUser"
           :user="user"
           :notifyList="notifyList"
           :notify="notify"
@@ -113,6 +110,7 @@
         :applications="applications"
         :business="business"
         :systems="systems"
+        :user="user"
         @click="handlerClickApps"
       ></apps>
       <!-- 应用 end -->
@@ -207,11 +205,7 @@
           slot="append"
           v-bind="handleConfig"
           :data="handleData"
-          :hide="{
-            home: indexUrl ? false : true,
-            index: doorIndex ? false : true,
-            ...hides
-          }"
+          :hide="hide"
           :online="userNums"
           :notice-num="notice"
           @click="handleClick"
@@ -292,7 +286,12 @@
       <!-- 消息提醒 end -->
 
       <es-dialog :visible.sync="showSearch" size="lg">
-        <search></search>
+        <search
+          :apps="applications"
+          :menus="menus"
+          :menuIcon="menuIcon"
+          @select="handleSelect"
+        ></search>
       </es-dialog>
       <!-- 公用弹窗 -->
       <es-dialog :title="dialog.title" :visible.sync="dialog.show" size="md">
@@ -415,11 +414,6 @@ export default {
       type: String,
       default: systemMode
     },
-    //记录菜单点击率作为工作台常用应用数据
-    recordApp: {
-      type: Boolean,
-      default: true
-    },
     sysCode: String,
     appCode: String,
     //logo
@@ -599,7 +593,8 @@ export default {
       //选中菜单
       active: '',
       //单位名称
-      simpleUserInfo: {}
+      simpleUserInfo: {},
+      topRightToolHide: ''
     };
   },
   computed: {
@@ -642,6 +637,30 @@ export default {
         return typeof this.onlineView == 'string' ? this.onlineView : '';
       }
       return false;
+    },
+    //隐藏操作按键
+    hide() {
+      let topRightToolHide = {};
+      if (this.topRightToolHide) {
+        topRightToolHide = JSON.parse(
+          this.topRightToolHide.replace(
+            /(['"])?([a-zA-Z0-9_]+)(['"])?:/g,
+            '"$2":'
+          )
+        );
+      }
+      let hides = {
+        home: this.indexUrl ? false : true,
+        index: this.doorIndex ? false : true
+      };
+
+      if (this.layout === 'subsystem' || this.application) {
+        hides.system = false;
+      }
+      if (this.layout === 'topside' || this.layout === 'side') {
+        hides.user = true;
+      }
+      return { ...hides, ...this.hides, ...topRightToolHide };
     }
   },
   watch: {
@@ -765,6 +784,7 @@ export default {
         }
         if (i === 'doorIndex' && results[i]) {
           util.win.open(results[i]);
+          this.doorIndex = results[i];
         }
         if (i === 'subsystemName' && results[i]) {
           document.title = results[i];
@@ -821,6 +841,12 @@ export default {
               this.aiConfig = results[i].aiConfig;
             }
           }
+          if (results[i].portalPage || results[i].portalpage) {
+            this.doorIndex = results[i].portalPage || results[i].portalpage;
+          }
+          if (results[i].topRightToolHide) {
+            this.topRightToolHide = results[i].topRightToolHide;
+          }
         }
         if (i === 'userModel' && results[i]) {
           if (results[i].userHeadUrl) {
@@ -1410,18 +1436,16 @@ export default {
      * @date 2024年9月7日
      **/
     handlerClickMenu(res) {
-      if (this.recordApp) {
-        util
-          .ajax({
-            url: recordUserApp,
-            params: {
-              userId: this.user.userId,
-              appId: res.id
-            }
-          })
-          .then(() => {})
-          .catch(() => {});
-      }
+      util
+        .ajax({
+          url: recordUserApp,
+          params: {
+            userId: this.user.userId,
+            appId: res.id
+          }
+        })
+        .then(() => {})
+        .catch(() => {});
       this.showMsg = false;
       this.showSet = false;
       let i = util.indexOfObj(this.tabs, res, 'id');
@@ -1610,6 +1634,9 @@ export default {
             this.showMsg = !this.showMsg;
             this.showSet = false;
             break;
+          case 'index':
+            util.win.open(this.doorIndex, '_self');
+            break;
           case 'set':
             this.showSet = !this.showSet;
             this.showMsg = false;
@@ -1825,6 +1852,15 @@ export default {
         },
         false
       );
+    },
+    handleSelect(res, parent) {
+      this.showSearch = false;
+      if (parent.name === '应用') {
+        this.handlerClickApps(res);
+      }
+      if (parent.name === '菜单') {
+        this.handlerClickApp(res);
+      }
     }
   },
   beforeDestroy() {

package/packages/select/src/main.vue

@@ -215,7 +215,7 @@ export default {
       immediate: true,
       handler(val, old) {
         if (val && old !== val && !this.sysCode) {
-          this.getData();
+          this.getData(this.sysCode);
         }
       }
     },

package/packages/theme-chalk/lib/calendar.css

@@ -1 +1 @@
-.es-calendar{background-color:#fff}.es-calendar .es-calendar-title{height:44px;padding:12px 30px;background-color:#fff;font-family:PingFang SC,PingFang SC;font-weight:400;font-size:14px;color:#262626;line-height:20px;text-align:center;position:relative;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.es-calendar .es-calendar-title .es-calendar-next,.es-calendar .es-calendar-title .es-calendar-prev{cursor:pointer;font-size:14px;color:#8c8c8c;line-height:20px}.es-calendar .es-calendar-title .es-calendar-prev{margin-right:8px}.es-calendar .es-calendar-title .es-calendar-next{margin-left:8px}.es-calendar .es-calendar-title .es-title .es-calendar-picker .el-input__inner{width:76px;height:20px;line-height:20px;text-align:center;padding:0;border:0!important;-webkit-box-shadow:none!important;box-shadow:none!important;cursor:pointer}.es-calendar .es-calendar-title .es-title .es-calendar-picker .el-input__prefix,.es-calendar .es-calendar-title .es-title .es-calendar-picker .el-input__suffix{display:none}.es-calendar .es-calendar-weeks{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;margin-bottom:4px}.es-calendar .es-calendar-weeks .es-week{width:14.28571%;height:32px;text-align:center;line-height:32px;font-size:14px;color:#8c8c8c;font-weight:700}.es-calendar .es-calendar-days{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap}.es-calendar .es-calendar-days .es-day{width:14.28571%;height:32px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.es-calendar .es-calendar-days .es-day .es-day-item{width:28px;height:28px;font-weight:400;font-size:14px;color:#262626;text-align:center;line-height:28px;position:relative;cursor:pointer}.es-calendar .es-calendar-days .es-day .es-day-item.es-disabled-day{color:#bfbfbf}.es-calendar .es-calendar-days .es-day .es-day-item.es-today{color:#2778e5;border:1px solid #2778e5;line-height:26px;border-radius:15px}.es-calendar .es-calendar-days .es-day .es-day-item.es-select{color:#fff;background-color:#2778e5;border-radius:15px}.es-calendar .es-calendar-days .es-day .es-day-item.es-disabled{cursor:not-allowed}.es-calendar .es-calendar-switch{height:22px;line-height:22px;font-weight:700;text-align:center;color:#8c8c8c}.es-calendar .es-calendar-switch .es-switch-icon{font-size:14px;cursor:pointer}
+.es-calendar{background-color:#fff}.es-calendar .es-calendar-title{height:44px;padding:12px 30px;background-color:#fff;font-family:PingFang SC,PingFang SC;font-weight:400;font-size:14px;color:#262626;line-height:20px;text-align:center;position:relative;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.es-calendar .es-calendar-title .es-calendar-next,.es-calendar .es-calendar-title .es-calendar-prev{cursor:pointer;font-size:14px;color:#8c8c8c;line-height:20px}.es-calendar .es-calendar-title .es-calendar-prev{margin-right:8px}.es-calendar .es-calendar-title .es-calendar-next{margin-left:8px}.es-calendar .es-calendar-title .es-title .es-calendar-picker .el-input__inner{width:76px;height:20px;line-height:20px;text-align:center;padding:0;border:0!important;-webkit-box-shadow:none!important;box-shadow:none!important;cursor:pointer}.es-calendar .es-calendar-title .es-title .es-calendar-picker .el-input__prefix,.es-calendar .es-calendar-title .es-title .es-calendar-picker .el-input__suffix{display:none}.es-calendar .es-calendar-weeks{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;margin-bottom:4px}.es-calendar .es-calendar-weeks .es-week{width:14.28571%;height:32px;text-align:center;line-height:32px;font-size:14px;color:#8c8c8c;font-weight:700}.es-calendar .es-calendar-days{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap}.es-calendar .es-calendar-days .es-day{width:14.28571%;height:32px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.es-calendar .es-calendar-days .es-day .es-day-item{width:28px;height:28px;font-weight:400;font-size:14px;color:#262626;text-align:center;line-height:28px;position:relative;cursor:pointer}.es-calendar .es-calendar-days .es-day .es-day-item.es-disabled-day{color:#bfbfbf}.es-calendar .es-calendar-days .es-day .es-day-item.es-today{color:var(--theme-primary-light-7,#2778e5);border:1px solid var(--theme-primary-light-7,#2778e5);line-height:26px;border-radius:15px}.es-calendar .es-calendar-days .es-day .es-day-item.es-select{color:#fff;background-color:var(--theme-primary-light-7,#2778e5);border-radius:15px}.es-calendar .es-calendar-days .es-day .es-day-item.es-disabled{cursor:not-allowed}.es-calendar .es-calendar-switch{height:22px;line-height:22px;font-weight:700;text-align:center;color:#8c8c8c}.es-calendar .es-calendar-switch .es-switch-icon{font-size:14px;cursor:pointer}

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

@@ -1 +1 @@
-@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-table-toolbar-plus{padding:16px 16px 8px;border-color:transparent}.es-data-table .es-toolbar.es-table-toolbar-plus .es-advanced-filter.es-absolute{top:55px}.es-data-table .es-toolbar.es-table-toolbar-plus .es-advanced-filter.es-absolute .es-form{border:0}.es-data-table .es-toolbar+.es-data-table-content{padding:16px}.es-data-table .es-toolbar+.es-data-table-content.es-table-plus{padding-top:0}.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:22px}.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 24px;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-table-plus .el-table__header thead,.es-data-table-content.es-table-plus .es-table-page .el-pagination__total,.es-data-table-content.es-table-plus .es-table-page .el-select__caret{color:#6e7c98}.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 .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}.es-data-table-content.es-table-plus{background-color:#fff;padding-top:0}.es-data-table-content.es-table-plus .el-table__header th{background-color:#fff;border-color:#cdd9e4}.es-data-table-content.es-table-plus .el-table__header th:not(.gutter){border-right-color:transparent}.es-data-table-content.es-table-plus .es-table{border-color:transparent}.es-data-table-content.es-table-plus .es-table::before{background-color:#cdd9e4}.es-data-table-content.es-table-plus .es-table td{border-color:#cdd9e4}.es-data-table-content.es-table-plus .es-table .cell{min-height:35px}.es-data-table-content.es-table-plus .es-table-page{height:48px;padding:10px 24px;background-color:#fff;border-color:#cdd9e4 transparent transparent}.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-table-toolbar-plus{padding:16px 16px 8px;border-color:transparent}.es-data-table .es-toolbar.es-table-toolbar-plus .es-advanced-filter.es-absolute{top:55px}.es-data-table .es-toolbar.es-table-toolbar-plus .es-advanced-filter.es-absolute .es-form{border:0}.es-data-table .es-toolbar+.es-data-table-content{padding:16px}.es-data-table .es-toolbar+.es-data-table-content.es-table-plus{padding-top:0}.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:22px}.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.el-scrollbar>.el-scrollbar__bar{z-index:8}.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 24px;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-table-plus .el-table__header thead,.es-data-table-content.es-table-plus .es-table-page .el-pagination__total,.es-data-table-content.es-table-plus .es-table-page .el-select__caret{color:#6e7c98}.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 .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}.es-data-table-content.es-table-plus{background-color:#fff;padding-top:0}.es-data-table-content.es-table-plus .el-table__header th{background-color:#fff;border-color:#cdd9e4}.es-data-table-content.es-table-plus .el-table__header th:not(.gutter){border-right-color:transparent}.es-data-table-content.es-table-plus .es-table{border-color:transparent}.es-data-table-content.es-table-plus .es-table::before{background-color:#cdd9e4}.es-data-table-content.es-table-plus .es-table td{border-color:#cdd9e4}.es-data-table-content.es-table-plus .es-table .cell{min-height:35px}.es-data-table-content.es-table-plus .es-table-page{height:48px;padding:10px 24px;background-color:#fff;border-color:#cdd9e4 transparent transparent}.el-table--border::after,.el-table--group::after,.el-table::before{z-index:5}.es-table-sizer{height:100%}.sizer-btn-box{text-align:right;margin-top:7px}.es-table-sizer-tips{color:red;line-height:20px}