eoss-ui 0.5.59 → 0.5.61

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

@@ -1 +1 @@
-@charset "UTF-8";.es-toolbar{padding:6px 12px;border-bottom:1px solid #d9d9d9;position:relative;background-color:#fff}.es-toolbar .es-toolbar-content{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}.es-toolbar .es-toolbar-content .es-button-content{-webkit-box-flex:1;-ms-flex:1;flex:1}.es-toolbar .es-toolbar-content .es-button-content .el-button{padding:4px 8px}.es-toolbar .es-toolbar-content .es-button-content .el-button+.el-button,.es-toolbar .es-toolbar-content .es-button-content .el-button+.es-button-badge,.es-toolbar .es-toolbar-content .es-button-content .es-button-badge+.el-button{margin-left:6px}.es-toolbar .es-toolbar-content .es-form{background:0 0}.es-toolbar .es-toolbar-content .es-form .es-form-content{padding:0}.es-toolbar .es-toolbar-content .es-form .el-form-item{margin-bottom:0}.es-toolbar .es-toolbar-content .es-advanced-btn{margin-left:6px;height:32px}.es-toolbar .es-toolbar-content .es-advanced-btn .es-advanced-icon{margin-right:-8px}.es-toolbar .es-toolbar-content .es-toolbar-text{line-height:32px}.es-toolbar .es-toolbar-content .es-toolbar-info{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.es-toolbar .es-toolbar-content .es-toolbar-info .es-info{font-size:13px;margin-left:20px}.es-toolbar .es-toolbar-content .el-menu--horizontal{border-bottom:0;position:relative;bottom:-6px}.es-toolbar .es-toolbar-content .el-menu-item{height:32px;line-height:24px}.es-toolbar .es-toolbar-content .el-input__inner,.es-toolbar .es-toolbar-content .es-checkbox-group{height:32px;line-height:32px}.es-toolbar .es-toolbar-content .es-radio-group,.es-toolbar .es-toolbar-content .es-switch-content{line-height:32px}.es-toolbar .es-toolbar-content .el-switch{top:-2px}.es-toolbar .es-toolbar-content .el-button span{line-height:14px}.es-toolbar .es-toolbar-content .el-checkbox:not(:last-child),.es-toolbar .es-toolbar-content .el-radio:not(:last-child){margin-right:8px}.es-toolbar .es-toolbar-content .el-form-item.es-toolbar-item-checkbox+.el-form-item,.es-toolbar .es-toolbar-content .el-form-item.es-toolbar-item-radio+.el-form-item,.es-toolbar .es-toolbar-content .el-form-item.es-toolbar-item-switch+.el-form-item{margin-left:16px}.es-toolbar .es-toolbar-content .el-form-item .el-input__icon{line-height:32px;vertical-align:top}.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner{width:100%;max-width:156px}.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner.el-date-editor--daterange{max-width:300px}.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner.el-date-editor--daterange .el-input__icon,.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner.el-date-editor--daterange .el-range-separator{line-height:24px}.es-toolbar .es-form-search-small .el-form-item__content{line-height:32px!important}.es-toolbar .es-form-search-small .el-form-item__label{line-height:32px!important;height:32px}.es-toolbar .el-button.es-upload{padding:0!important;border:0!important}.es-toolbar .es-advanced-filter{margin-top:20px;z-index:9}.es-toolbar .es-advanced-filter.es-absolute{position:absolute;left:0;top:45px;right:0;margin-top:0;-webkit-box-shadow:0 1px 10px rgba(0,0,0,.05),0 4px 5px rgba(0,0,0,.08),0 2px 4px -1px rgba(0,0,0,.12);box-shadow:0 1px 10px rgba(0,0,0,.05),0 4px 5px rgba(0,0,0,.08),0 2px 4px -1px rgba(0,0,0,.12);border-bottom-left-radius:6px;border-bottom-right-radius:6px}.es-toolbar .es-advanced-filter.es-absolute .es-form{background-color:#fff;border:1px solid #d9d9d9;border-bottom-left-radius:6px;border-bottom-right-radius:6px;border-top:0;padding:20px 20px 20px 10px}
+@charset "UTF-8";.es-toolbar{padding:6px 12px;border-bottom:1px solid #d9d9d9;position:relative;background-color:#fff}.es-toolbar .es-toolbar-content{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}.es-toolbar .es-toolbar-content .es-button-content{-webkit-box-flex:1;-ms-flex:1;flex:1}.es-toolbar .es-toolbar-content .es-button-content .el-button{padding:4px 8px}.es-toolbar .es-toolbar-content .es-button-content .el-button+.el-button,.es-toolbar .es-toolbar-content .es-button-content .el-button+.es-button-badge,.es-toolbar .es-toolbar-content .es-button-content .es-button-badge+.el-button{margin-left:6px}.es-toolbar .es-toolbar-content .es-form{background:0 0}.es-toolbar .es-toolbar-content .es-form .es-form-content{padding:0}.es-toolbar .es-toolbar-content .es-form .el-form-item{margin-bottom:0}.es-toolbar .es-toolbar-content .es-advanced-btn{margin-left:6px;height:32px}.es-toolbar .es-toolbar-content .es-advanced-btn .es-advanced-icon{margin-right:-8px}.es-toolbar .es-toolbar-content .es-toolbar-text{line-height:32px}.es-toolbar .es-toolbar-content .es-toolbar-info{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.es-toolbar .es-toolbar-content .es-toolbar-info .es-info{font-size:13px;margin-left:20px}.es-toolbar .es-toolbar-content .el-menu--horizontal{border-bottom:0;position:relative;bottom:-6px}.es-toolbar .es-toolbar-content .el-menu-item{height:32px;line-height:24px}.es-toolbar .es-toolbar-content .el-input__inner,.es-toolbar .es-toolbar-content .es-checkbox-group{height:32px;line-height:32px}.es-toolbar .es-toolbar-content .es-radio-group,.es-toolbar .es-toolbar-content .es-switch-content{line-height:32px}.es-toolbar .es-toolbar-content .el-switch{top:-2px}.es-toolbar .es-toolbar-content .el-button span{line-height:14px}.es-toolbar .es-toolbar-content .el-checkbox:not(:last-child),.es-toolbar .es-toolbar-content .el-radio:not(:last-child){margin-right:8px}.es-toolbar .es-toolbar-content .el-form-item.es-toolbar-item-checkbox+.el-form-item,.es-toolbar .es-toolbar-content .el-form-item.es-toolbar-item-radio+.el-form-item,.es-toolbar .es-toolbar-content .el-form-item.es-toolbar-item-switch+.el-form-item{margin-left:16px}.es-toolbar .es-toolbar-content .el-form-item .el-input__icon{line-height:32px;vertical-align:top}.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner{width:100%;max-width:156px}.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner.el-date-editor--daterange{max-width:300px}.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner.el-date-editor--daterange .el-input__icon,.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner.el-date-editor--daterange .el-range-separator{line-height:24px}.es-toolbar .es-form-search-small .el-form-item__content{line-height:32px!important}.es-toolbar .es-form-search-small .el-form-item__label{line-height:32px!important;height:32px}.es-toolbar .el-button.es-upload{padding:0!important;border:0!important}.es-toolbar .es-advanced-filter{margin-top:20px;z-index:9}.es-toolbar .es-advanced-filter.es-absolute{position:absolute;left:0;top:45px;right:0;margin-top:0;-webkit-box-shadow:0 1px 10px rgba(0,0,0,.05),0 4px 5px rgba(0,0,0,.08),0 2px 4px -1px rgba(0,0,0,.12);box-shadow:0 1px 10px rgba(0,0,0,.05),0 4px 5px rgba(0,0,0,.08),0 2px 4px -1px rgba(0,0,0,.12);border-bottom-left-radius:6px;border-bottom-right-radius:6px}.es-toolbar .es-advanced-filter.es-absolute .es-form{background-color:#fff;border:1px solid #d9d9d9;border-bottom-left-radius:6px;border-bottom-right-radius:6px;border-top:0;padding:20px 20px 20px 10px}.es-toolbar .es-toolbar-button-group .el-button--medium{border-radius:3px!important}.es-toolbar .es-toolbar-button-group .el-dropdown{margin-left:6px}

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

@@ -4,6 +4,9 @@
 }
 .es-button-badge {
   vertical-align: unset;
+  .el-badge__content {
+    z-index: 9;
+  }
 }
 .el-button[float='left'],
 .es-button--left {

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

@@ -0,0 +1,110 @@
+.es-calendar {
+  background-color: #fff;
+  .es-calendar-title {
+    height: 44px;
+    padding: 12px 30px;
+    background-color: #ffffff;
+    font-family: PingFang SC, PingFang SC;
+    font-weight: 400;
+    font-size: 14px;
+    color: #262626;
+    line-height: 20px;
+    text-align: center;
+    position: relative;
+    display: flex;
+    justify-content: center;
+    .es-calendar-prev,
+    .es-calendar-next {
+      cursor: pointer;
+      font-size: 14px;
+      color: #8c8c8c;
+      line-height: 20px;
+    }
+    .es-calendar-prev {
+      margin-right: 8px;
+    }
+    .es-calendar-next {
+      margin-left: 8px;
+    }
+    .es-title {
+      .es-calendar-picker {
+        .el-input__inner {
+          width: 76px;
+          height: 20px;
+          line-height: 20px;
+          text-align: center;
+          padding: 0;
+          border: 0 !important;
+          box-shadow: none !important;
+          cursor: pointer;
+        }
+        .el-input__prefix,
+        .el-input__suffix {
+          display: none;
+        }
+      }
+    }
+  }
+  .es-calendar-weeks {
+    display: flex;
+    flex-wrap: wrap;
+    margin-bottom: 4px;
+    .es-week {
+      width: (100% / 7);
+      height: 32px;
+      text-align: center;
+      line-height: 32px;
+      font-weight: 400;
+      font-size: 14px;
+      color: #8c8c8c;
+      font-weight: bold;
+    }
+  }
+  .es-calendar-days {
+    display: flex;
+    flex-wrap: wrap;
+    .es-day {
+      width: (100% / 7);
+      height: 32px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      .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-disabled-day {
+          color: #bfbfbf;
+        }
+        &.es-today {
+          color: #2778e5;
+          border: 1px solid #2778e5;
+          line-height: 26px;
+          border-radius: 15px 15px 15px 15px;
+        }
+        &.es-select {
+          color: #fff;
+          background-color: #2778e5;
+          border-radius: 15px 15px 15px 15px;
+        }
+      }
+    }
+  }
+  .es-calendar-switch {
+    height: 22px;
+    line-height: 22px;
+    font-weight: bold;
+    text-align: center;
+    color: #8c8c8c;
+    .es-switch-icon {
+      font-size: 14px;
+      cursor: pointer;
+    }
+  }
+}

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

@@ -1,50 +1,88 @@
 @import './common/var.scss';
 .es-card {
+  padding: 10px 20px 6px 20px;
+  position: relative;
+  &:not(.es-card-border-none):before {
+    content: '';
+    display: block;
+    height: 1px;
+    background-color: #d9d9d9;
+    position: absolute;
+    left: 0;
+    top: 50px;
+    right: 0;
+  }
   .el-card__header {
-    padding: 8px;
+    padding: 0;
+  }
+  .el-card__body {
+    padding: 16px 0;
   }
   .es-card-header {
     position: relative;
-    padding-left: 8px;
-    line-height: 28px;
+    line-height: 40px;
     display: flex;
-    &.es-card-ornament-hide{
-      padding-left: 0;
+    .es-icon {
+      line-height: 40px;
+    }
+    &.es-card-ornament-bar {
+      padding-left: 10px;
+      &:before {
+        content: '';
+        display: block;
+        height: 20px;
+        width: 4px;
+        display: inline-block;
+        position: absolute;
+        left: 0;
+        top: 50%;
+        margin-top: -10px;
+        border-radius: 2px;
+        background-color: $--color-primary;
+      }
     }
-    &:not(.es-card-ornament-hide):before {
-      content: '';
-      width: 4px;
-      display: inline-block;
-      position: absolute;
-      left: 0;
-      top: 4px;
-      bottom: 4px;
-      border-radius: 2px;
-      background-color: $--color-primary;
+    &.es-card-ornament-chunk {
+      padding-left: 20px;
+      &::before,
+      &::after {
+        content: '';
+        display: block;
+        width: 10px;
+        height: 10px;
+        background-color: #d7e0f4;
+        position: absolute;
+        left: 6px;
+        top: 11px;
+      }
+      &::after {
+        background-color: $--color-primary;
+        left: 0;
+        top: 17px;
+      }
     }
     .es-header-text {
+      font-size: 15px;
+      font-weight: bold;
       margin: 0 4px;
-      &+.es-card-menu{
-        margin-left: 48px;
+      & + .es-card-menu {
+        margin-left: 24px;
       }
     }
     .es-card-menu {
-      margin-top: -8px;
-      margin-bottom: -8px;
       border-bottom: 0;
       .el-menu-item {
         padding: 8px 16px;
-        height: 44px;
+        height: 40px;
         line-height: 28px;
         color: initial;
         &.is-active {
           color: $--color-primary;
         }
-        .el-badge__content{
+        .el-badge__content {
           top: 6px;
           right: 0;
         }
-        .el-badge__content:not(.is-dot){
+        .el-badge__content:not(.is-dot) {
           width: 18px;
           padding: 0;
           text-align: center;
@@ -52,4 +90,10 @@
       }
     }
   }
+  &.es-card-border-none {
+    border: 0;
+    .el-card__header {
+      border: 0;
+    }
+  }
 }

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

@@ -1,93 +0,0 @@
-.es-calendar {
-  background-color: #fff;
-  .es-calendar-title {
-    height: 44px;
-    padding: 12px 30px;
-    background-color: #ffffff;
-    font-family: PingFang SC, PingFang SC;
-    font-weight: 400;
-    font-size: 14px;
-    color: #262626;
-    line-height: 20px;
-    text-align: center;
-    position: relative;
-    display: flex;
-    justify-content: center;
-    .es-calendar-prev,
-    .es-calendar-next {
-      cursor: pointer;
-      font-size: 14px;
-      color: #8c8c8c;
-      line-height: 20px;
-    }
-    .es-calendar-prev {
-      margin-right: 8px;
-    }
-    .es-calendar-next {
-      margin-left: 8px;
-    }
-    .es-title {
-      width: 86px;
-    }
-  }
-  .es-calendar-weeks {
-    display: flex;
-    flex-wrap: wrap;
-    .es-week {
-      width: (100% / 7);
-      height: 20px;
-      text-align: center;
-      line-height: 20px;
-      font-weight: 400;
-      font-size: 12px;
-      color: #8c8c8c;
-    }
-  }
-  .es-calendar-days {
-    display: flex;
-    flex-wrap: wrap;
-    .es-day {
-      width: (100% / 7);
-      height: 44px;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      .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-disabled-day {
-          color: #bfbfbf;
-        }
-        &.es-today {
-          color: #2778e5;
-          border: 1px solid #2778e5;
-          line-height: 26px;
-          border-radius: 15px 15px 15px 15px;
-        }
-        &.es-select {
-          color: #fff;
-          background-color: #2778e5;
-          border-radius: 15px 15px 15px 15px;
-        }
-      }
-    }
-  }
-  .es-calendar-switch {
-    height: 22px;
-    line-height: 22px;
-    font-weight: bold;
-    text-align: center;
-    color: #8c8c8c;
-    .es-switch-icon {
-      font-size: 14px;
-      cursor: pointer;
-    }
-  }
-}

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

@@ -142,4 +142,12 @@
       }
     }
   }
+  .es-toolbar-button-group {
+    .el-button--medium {
+      border-radius: 3px !important;
+    }
+    .el-dropdown {
+      margin-left: 6px;
+    }
+  }
 }

package/packages/toolbar/src/main.vue

@@ -134,7 +134,8 @@ export default {
     let filter = [];
 
     this.contents.forEach((items) => {
-      let { config, type, reset, multiCondition, contents, ...other } = items;
+      let { config, type, reset, multiCondition, contents, group, ...other } =
+        items;
       if (type === 'text') {
         text = [
           h(
@@ -151,41 +152,64 @@ export default {
           )
         ];
       }
-      if (type === 'button') {
-        contents.forEach((item) => {
-          if (!item.hide && (item.upload || (item.code && item.ownId))) {
-            buttons.push(
-              h('es-upload', {
-                class: 'el-button',
-                attrs: {
-                  ...item,
-                  method: 'post',
-                  btnSize: 'medium',
-                  showFileList: false,
-                  selectType: item.type ? item.type : ''
+      if (
+        type === 'button' ||
+        type === 'button-group' ||
+        type === 'buttonGroup'
+      ) {
+        if (type === 'button-group' || type === 'buttonGroup' || group) {
+          buttons = [
+            h('es-button-group', {
+              class: 'es-toolbar-button-group',
+              props: {
+                moreText: '更多',
+                size: 'medium',
+                ...other,
+                contents: contents
+              },
+              on: {
+                handleClick: (res) => {
+                  this.handleClick(res.handle);
                 }
-              })
-            );
-          } else {
-            buttons.push(
-              h(
-                'es-button',
-                {
+              }
+            })
+          ];
+        } else {
+          contents.forEach((item) => {
+            if (!item.hide && (item.upload || (item.code && item.ownId))) {
+              buttons.push(
+                h('es-upload', {
+                  class: 'el-button',
                   attrs: {
                     ...item,
-                    size: 'medium'
-                  },
-                  on: {
-                    click: () => {
-                      this.handleClick(item);
-                    }
+                    method: 'post',
+                    btnSize: 'medium',
+                    showFileList: false,
+                    selectType: item.type ? item.type : ''
                   }
-                },
-                item.text
-              )
-            );
-          }
-        });
+                })
+              );
+            } else {
+              buttons.push(
+                h(
+                  'es-button',
+                  {
+                    attrs: {
+                      ...item,
+                      size: 'medium'
+                    },
+                    on: {
+                      click: () => {
+                        this.handleClick(item);
+                      }
+                    }
+                  },
+                  item.text
+                )
+              );
+            }
+          });
+        }
       }
       if (type === 'tabs') {
         buttons = buttons.concat([

package/src/index.js

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