eoss-ui 0.5.80 → 0.5.81-beta1

package/packages/theme-chalk/src/main.scss

@@ -1,10 +1,14 @@
 @import './common/var.scss';
 @import './base.scss';
-
-.es-main {
+@import './simplicity.scss';
+.es-main-box {
   height: 100%;
   overflow: hidden;
   position: relative;
+}
+.es-main {
+  height: 100%;
+  overflow: hidden;
   position: relative;
 
   .es-main-header {
@@ -38,7 +42,7 @@
         color: #909399;
       }
     }
-    & ~ .es-main-box {
+    & ~ .es-main-default-box {
       top: $--main-header-height;
     }
   }
@@ -89,7 +93,7 @@
       }
     }
   }
-  .es-main-box {
+  .es-main-default-box {
     display: flex;
     position: absolute;
     left: 0;

package/packages/theme-chalk/src/simplicity.scss

@@ -0,0 +1,566 @@
+@import './common/var.scss';
+@import './base.scss';
+.es-simplicity-side {
+  width: $--main-simplicity-side-width;
+  height: 100%;
+  float: left;
+  padding: 8px;
+  @extend .es-flex-vertical;
+  @if $--main-simplicity-side-background-color != '' {
+    background-color: $--main-simplicity-side-background-color;
+  } @else {
+    background-color: $--color-primary-light-9;
+  }
+  .es-simplicity-side-item + .es-simplicity-side-item {
+    margin-top: 16px;
+  }
+  .es-simplicity-logo {
+    width: $--main-simplicity-side-width - 16px;
+  }
+  .es-simplicity-portrait {
+    width: $--main-simplicity-side-width - 16px;
+    height: $--main-simplicity-side-width - 16px;
+    border-radius: 50%;
+    overflow: hidden;
+    padding: 8px;
+    cursor: pointer;
+  }
+  .es-simplicity-side-Application {
+    flex: 1;
+    position: relative;
+    margin-right: -8px;
+    .el-scrollbar {
+      position: absolute;
+      top: 0;
+      right: 0;
+      bottom: 0;
+      left: 0;
+    }
+    .el-scrollbar__view {
+      padding-right: 8px;
+    }
+    .el-scrollbar__thumb {
+      background-color: $--color-primary-light-7;
+    }
+  }
+  .es-simplicity-side-app {
+    text-align: center;
+    color: #fff;
+    height: 64px;
+    padding: 6px 0;
+    position: relative;
+    cursor: pointer;
+    @extend .es-flex-vertical;
+    justify-content: center;
+    align-items: center;
+    background-repeat: no-repeat;
+    background-size: contain;
+    background-position: center;
+  }
+  .el-badge {
+    width: 100%;
+  }
+  .es-simplicity-side-app-icon {
+    font-size: 24px;
+    &.es-icon_image {
+      width: $--main-simplicity-side-width - 32px;
+    }
+  }
+  .es-simplicity-side-app-text {
+    @extend .es-text-ellipsis;
+  }
+}
+.es-simplicity-portrait-image {
+  width: 100%;
+  border-radius: 50%;
+  vertical-align: top;
+}
+.es-simplicity-main {
+  height: 100%;
+  margin-left: $--main-simplicity-side-width;
+  overflow: hidden;
+  position: relative;
+  .es-simplicity-apps,
+  .es-simplicity-subMenus,
+  .es-simplicity-apps-modal {
+    position: absolute;
+    top: $--main-simplicity-header-height;
+    height: calc(100% - #{$--main-simplicity-header-height});
+  }
+  .es-simplicity-apps {
+    .el-drawer__body {
+      background-color: #f4f4f4;
+      padding: 20px;
+    }
+  }
+  .es-simplicity-subMenus {
+    .el-drawer__body {
+      padding: 0;
+      position: relative;
+    }
+  }
+}
+.es-simplicity_apps {
+  height: 100%;
+  display: flex;
+  .es-simplicity_apps-all {
+    flex: 1;
+    @extend .es-flex-vertical;
+    margin-right: 20px;
+    .es-simplicity_apps-box {
+      flex: 1;
+    }
+    .es-simplicity_apps-list {
+      position: absolute;
+      top: 0;
+      right: 0;
+      bottom: 0;
+      left: 0;
+      overflow: hidden;
+      display: flex;
+      align-content: flex-start;
+      flex-wrap: wrap;
+      .es-simplicity_apps-list-item {
+        width: 20%;
+        height: 25%;
+        padding: 12px;
+      }
+    }
+    .es-simplicity_apps-list-content {
+      @extend .es-flex-vertical;
+      height: 100%;
+      justify-content: center;
+      align-items: center;
+    }
+    .es-simplicity_apps-icon {
+      margin-bottom: 16px;
+      color: $--color-primary;
+    }
+    .es-simplicity_apps-search {
+      width: 200px;
+      .el-input__inner {
+        border-radius: 16px;
+      }
+    }
+  }
+  .es-simplicity_apps-title {
+    font-weight: 500;
+    font-size: 20px;
+    color: #15224c;
+    line-height: 32px;
+    padding: 6px 12px 12px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
+  .es-simplicity_apps-box {
+    position: relative;
+  }
+  .es-simplicity_apps-list-content {
+    background: #ffffff;
+    border-radius: 9px;
+    padding: 4px;
+    cursor: pointer;
+    overflow: hidden;
+    position: relative;
+    &:hover {
+      .es-simplicity_apps-hover {
+        opacity: 1;
+        z-index: 1;
+        .es-simplicity_apps-icon {
+          color: rgba(255, 255, 255, 0.5);
+        }
+      }
+    }
+    &.es-simplicity_apps-disabled {
+      cursor: not-allowed;
+      .es-simplicity_apps-hover {
+        background-color: rgba(115, 122, 148, 0.9);
+      }
+    }
+  }
+  .es-simplicity_apps-icon {
+    font-size: 34px;
+  }
+  .es-simplicity_apps-text {
+    font-weight: 400;
+    font-size: 16px;
+    text-align: center;
+    line-height: 19px;
+  }
+  .es-simplicity_apps-hover {
+    opacity: 0;
+    display: flex;
+    flex-direction: column;
+    box-orient: vertical;
+    justify-content: center;
+    align-items: center;
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    z-index: -1;
+    background-color: $--color-primary-light-5;
+    color: #fff;
+  }
+  .es-simplicity_apps-pagination {
+    text-align: right;
+    padding: 18px 20px;
+    .el-pagination__total {
+      float: left;
+    }
+    .el-pager li {
+      background-color: #fff;
+    }
+  }
+  .es-simplicity_apps-other {
+    width: 34%;
+    padding-left: 20px;
+    border-left: 1px solid #cdd9e4;
+    .es-simplicity_apps-list {
+      display: flex;
+      align-content: flex-start;
+      flex-wrap: wrap;
+      .es-simplicity_apps-list-item {
+        width: 50%;
+        padding: 12px;
+      }
+      .es-simplicity_app-icon {
+        display: block;
+        width: 34px;
+        height: 34px;
+        font-size: 18px;
+        line-height: 34px;
+        text-align: center;
+        border-radius: 9px;
+      }
+      .es-simplicity_apps-text {
+        margin-left: 16px;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        overflow: hidden;
+      }
+    }
+    .es-simplicity_apps-list-content {
+      display: flex;
+      align-items: center;
+      padding: 16px;
+      .es-simplicity_apps-hover {
+        flex-direction: row;
+      }
+    }
+    .es-simplicity_apps-systems {
+      padding-top: 20px;
+      border-top: 1px solid #cdd9e4;
+    }
+  }
+}
+.es-simplicity-userinfo {
+  padding: 20px;
+  .es-simplicity-user {
+    border-bottom: 1px solid #dfebf6;
+    position: relative;
+    padding-bottom: 16px;
+    .es-simplicity-user-name {
+      font-weight: 500;
+      font-size: 20px;
+      color: #15224c;
+      line-height: 23px;
+      margin-bottom: 12px;
+      margin-right: 80px;
+    }
+    .es-simplicity-org-name,
+    .es-simplicity-dep-post {
+      margin-right: 80px;
+      font-weight: 400;
+      font-size: 14px;
+      color: #737a94;
+      line-height: 16px;
+      margin-bottom: 8px;
+    }
+    .es-icon-renyuanqiehuan {
+      font-size: 20px;
+      color: #2591f7;
+      cursor: pointer;
+      margin-left: 16px;
+    }
+    .es-simplicity-portrait {
+      position: absolute;
+      top: 0;
+      right: 0;
+      width: 64px;
+      padding: 0 8px 8px;
+      .es-upload {
+        margin-top: 12px;
+        margin-left: -8px;
+        margin-right: -8px;
+      }
+    }
+    .el-upload--handle {
+      width: 100%;
+    }
+    .el-upload--text {
+      width: 100%;
+      text-align: center;
+      font-size: 14px;
+      color: #2591f7;
+    }
+  }
+  .es-simplicity-notice-type {
+    padding: 24px 0;
+    border-bottom: 1px solid #dfebf6;
+  }
+  .es-simplicity-notice-title {
+    font-size: 14px;
+    color: #15224c;
+    line-height: 16px;
+    margin-bottom: 12px;
+  }
+  .es-simplicity-notice-list {
+    .el-checkbox {
+      min-width: 115px;
+    }
+  }
+  .es-simplicity-password {
+    padding-top: 24px;
+    font-size: 14px;
+    color: #2591f7;
+    line-height: 16px;
+    cursor: pointer;
+    .es-icon-arrow-right {
+      position: relative;
+      top: 1px;
+      margin-left: 8px;
+    }
+  }
+  .es-simplicity-qrcode {
+    width: 100px;
+    height: 100px;
+  }
+}
+.es-simplicity-menus {
+  height: 100%;
+  display: flex;
+  .es-simplicity-menus-box {
+    width: 296px;
+    height: 100%;
+    position: relative;
+    & + .es-simplicity-menus-box {
+      border-left: 1px solid #dfebf6;
+    }
+    .es-simplicity-menus-title {
+      font-weight: bold;
+      font-size: 20px;
+      color: #15224c;
+      line-height: 30px;
+      padding: 24px;
+      border-bottom: 1px solid #dfebf6;
+    }
+    .el-scrollbar {
+      position: absolute;
+      top: 79px;
+      right: 0;
+      bottom: 0;
+      left: 0;
+      .el-scrollbar__view {
+        padding: 12px;
+      }
+    }
+  }
+}
+.es-simplicity-menus-item {
+  height: 48px;
+  display: flex;
+  align-items: center;
+  padding: 8px 12px;
+  position: relative;
+  cursor: pointer;
+  overflow: hidden;
+  border-radius: 6px;
+  color: #15224c;
+  .es-simplicity_apps-icon {
+    padding: 4px;
+    border-radius: 3px;
+    margin-right: 12px;
+    color: $--color-primary;
+  }
+  .es-simplicity-menus-tips {
+    font-size: 14px;
+    color: #737a94;
+    position: absolute;
+    right: 12px;
+    & + .es-simplicity_apps-text {
+      width: 176px;
+    }
+  }
+  .es-simplicity_apps-text {
+    width: 200px;
+    font-weight: 400;
+    font-size: 14px;
+    line-height: 16px;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+  }
+  &:hover {
+    color: $--color-primary;
+  }
+  &.is-active {
+    background-color: $--color-primary-light-1;
+    color: $--color-primary;
+  }
+}
+.es-simplicity-iframe {
+  height: 100%;
+  .el-tabs__header {
+    height: $--main-simplicity-header-height;
+    padding: ($--main-simplicity-header-height - 36px)/2 0;
+    margin: 0;
+    border-bottom: 1px solid #dfebf6;
+    background-color: #fff;
+  }
+  .el-tabs__nav-main {
+    margin: 0 10px;
+  }
+  .el-tabs__nav-next,
+  .el-tabs__nav-prev {
+    height: 36px;
+    font-size: 16px;
+    padding: 0 6px;
+  }
+  .el-tabs__nav-wrap {
+    padding: 0 10px;
+    &.is-scrollable {
+      padding: 0 28px;
+    }
+    &::after {
+      content: none;
+    }
+    .el-tabs__item {
+      height: 36px;
+      line-height: 36px;
+      padding: 0 12px !important;
+      background: #f2f2f2;
+      border-radius: 6px;
+      color: #737a94;
+      & + .el-tabs__item {
+        margin-left: 12px;
+      }
+      &.is-active {
+        color: $--color-primary;
+        background-color: $--color-primary-light-1;
+      }
+    }
+  }
+  .el-tabs__content {
+    height: calc(100% - #{$--main-simplicity-header-height});
+    .el-tab-pane {
+      height: 100%;
+    }
+  }
+}
+
+.es-simplicity-handler {
+  height: 36px;
+  display: flex;
+  align-items: center;
+  height: 100%;
+  line-height: 24px;
+  padding: 0 10px;
+  .es-simplicity-handler-date {
+    font-size: 14px;
+    color: #15224c;
+    margin-right: 33px;
+    position: relative;
+    &::after {
+      content: '';
+      display: block;
+      width: 1px;
+      height: 16px;
+      position: absolute;
+      right: -16px;
+      top: 4px;
+      background-color: #cdd9e4;
+    }
+  }
+  .es-simplicity-handler-time {
+    font-size: 20px;
+    color: #2591f7;
+    margin-right: 12px;
+  }
+  .es-simplicity-online {
+    font-size: 14px;
+    color: #15224c;
+    margin-right: 33px;
+    position: relative;
+    &::after {
+      content: '';
+      display: block;
+      width: 1px;
+      height: 16px;
+      position: absolute;
+      right: -16px;
+      top: 4px;
+      background-color: #cdd9e4;
+    }
+  }
+  .es-simplicity-online-num {
+    font-weight: 700;
+    color: #ffea00;
+    font-size: 15px;
+  }
+  .es-simplicity-handler-item {
+    & + .es-simplicity-handler-item {
+      margin-left: 12px;
+    }
+  }
+  .es-simplicity-handler-icon {
+    font-size: 20px;
+    padding: 3px 5px;
+    border-radius: 3px;
+    overflow: hidden;
+    cursor: pointer;
+    &:hover {
+      color: #fff;
+      background: $--color-primary-light-5;
+      box-shadow: 0px 4px 16px 0px $--color-primary-light-1;
+    }
+  }
+}
+.es-simplicity-tabs-handler-mask {
+  position: absolute;
+  z-index: 99999;
+  left: 0;
+  top: 0;
+  right: 0;
+  bottom: 0;
+}
+.es-simplicity-tabs-handler {
+  width: 120px;
+  position: fixed;
+  .el-card__body {
+    padding: 4px 0;
+  }
+  .es-simplicity-tabs-handler-item {
+    height: 32px;
+    line-height: 32px;
+    padding: 0 20px;
+    color: $--button-disabled-font-color;
+    user-select: none;
+    &:not(.is-disabled) {
+      color: rgba(0, 0, 0, 0.75);
+      &:hover {
+        background-color: rgba(144, 147, 153, 0.2);
+      }
+    }
+  }
+}
+.es-simplicity-drawer-close {
+  cursor: pointer;
+  position: absolute;
+  right: 0;
+  top: 0;
+  color: #6e7c98;
+  z-index: 9999;
+}

package/packages/upload/src/main.vue

@@ -1,6 +1,6 @@
 <template>
   <el-upload
-    v-if="isRender"
+    v-if="isRender && url"
     ref="upload"
     v-bind="$attrs"
     class="es-upload"
@@ -16,7 +16,7 @@
     :readonly="isReadonly"
     :class="[
       {
-        'es-avatar-uploader': portrait,
+        'es-avatar-uploader': portrait && !$slots.default,
         'es-upload-readonly': isReadonly && !downloads
       },
       'es-upload-' + listType
@@ -418,6 +418,7 @@ export default {
   },
   data() {
     return {
+      url: this.action,
       lists: [],
       image: '',
       fileAccept: '',
@@ -482,14 +483,6 @@ export default {
       }
       return this.showFileList;
     },
-    url() {
-      let url = this.action
-        ? this.action
-        : this.portrait
-        ? this.dochubConfig.reuploadDocument || uploadOnlyOne
-        : this.dochubConfig.uploadDocument || uploads;
-      return url.indexOf(this.host) > -1 ? url : this.host + url;
-    },
     excludes() {
       return this.exclude ? this.exclude : this.excludeNames;
     },
@@ -714,7 +707,12 @@ export default {
           this.fileAccept = config.accept;
           this.fileSize = config.size;
           this.fileTotalSize = config.totalSize;
-          this.dochubConfig = config.dochubConfig;
+          this.dochubConfig = config.dochubConfig || {};
+
+          let url = this.portrait
+            ? this.dochubConfig.reuploadDocument || uploadOnlyOne
+            : this.dochubConfig.uploadDocument || uploads;
+          this.url = url.indexOf(this.host) > -1 ? url : this.host + url;
         } else {
           util
             .ajax({
@@ -736,12 +734,12 @@ export default {
                       })
                       .join(',');
                   }
-                  if (
-                    res.results.dochubConfig &&
-                    Object.keys(res.results.dochubConfig).length
-                  ) {
-                    this.dochubConfig = res.results.dochubConfig;
-                  }
+                  this.dochubConfig = res.results.dochubConfig || {};
+                  let url = this.portrait
+                    ? this.dochubConfig.reuploadDocument || uploadOnlyOne
+                    : this.dochubConfig.uploadDocument || uploads;
+                  this.url =
+                    url.indexOf(this.host) > -1 ? url : this.host + url;
                   if (res.results.kkViewRootPath) {
                     this.kkfileview = res.results.kkViewRootPath;
                   }

package/src/config/api.js

@@ -36,6 +36,7 @@ export const getApplicationIdArray = '/main2/main/getApplicationIdArray'; // 获
 export const getComplexApplications = '/main2/menu/getComplexApplications'; // 获取当前用户菜单; 含页签菜单格式的数据
 export const getComplexApplicationsNew =
   '/main2/menu/getComplexApplicationsNew'; // 获取当前用户应用菜单; 含页签菜单格式的数据
+export const getUserAppWithTag = '/sysv3/sysUucApp/getUserAppWithTag';// 获取应用
 export const getUserCustomInfo = '/main2/main/getUserCustomInfo'; // 获取主题样式
 export const updateUserCustomInfo = '/main2/main/updateUserCustomInfo'; // 更新主题样式
 // 框架 - 系统消息

package/src/index.js

@@ -121,7 +121,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.5.80',
+  version: '0.5.81-beta1',
   install,
   Button,
   ButtonGroup,

package/src/utils/util.js

@@ -2530,7 +2530,7 @@ const replenish = function ({ data, precision }) {
     while (res.length <= len + precision) {
       res += '0';
     }
-    return parseFloat(res);
+    return res;
   }
   return data;
 };