eoss-ui 0.5.44 → 0.5.46

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-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-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 .el-form-item__content{line-height:32px!important}.es-toolbar .el-form-item__label{line-height:32px!important;height:32px}.es-toolbar .el-button.es-upload{padding:0!important;border:0!important}
+@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}

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

@@ -0,0 +1,93 @@
+.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/data-table-form.scss

@@ -38,6 +38,17 @@
   .es-data-form-head {
     background-color: $--table-header-background-color;
   }
+  &.es-data-form-full {
+    height: 100%;
+    .es-data-form {
+      height: 100%;
+      &.es-data-form-haspage {
+        .es-scrollbar {
+          height: calc(100% - 46px);
+        }
+      }
+    }
+  }
 }
 .es-data-form {
   position: relative;

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

@@ -1,9 +1,10 @@
 @import "./base.scss";
 @import "./button.scss";
 @import "./button-group.scss";
-@import "./checkbox-group.scss";
+@import "./calendar.scss";
 @import "./card.scss";
 @import "./cascader.scss";
+@import "./checkbox-group.scss";
 @import "./clients.scss";
 @import "./data-table.scss";
 @import "./data-table-form.scss";

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

@@ -32,6 +32,9 @@
     .es-advanced-btn {
       margin-left: 6px;
       height: 32px;
+      .es-advanced-icon {
+        margin-right: -8px;
+      }
     }
     .es-toolbar-text {
       line-height: 32px;
@@ -104,6 +107,19 @@
       }
     }
   }
+  .es-form-search-small {
+    .el-form-item__content {
+      line-height: 32px !important;
+    }
+    .el-form-item__label {
+      line-height: 32px !important;
+      height: 32px;
+    }
+  }
+  .el-button.es-upload {
+    padding: 0 !important;
+    border: 0 !important;
+  }
   .es-advanced-filter {
     margin-top: 20px;
     z-index: 9;
@@ -126,15 +142,4 @@
       }
     }
   }
-  .el-form-item__content {
-    line-height: 32px !important;
-  }
-  .el-form-item__label {
-    line-height: 32px !important;
-    height: 32px;
-  }
-  .el-button.es-upload {
-    padding: 0 !important;
-    border: 0 !important;
-  }
 }

package/packages/toolbar/src/main.vue

@@ -51,41 +51,25 @@ export default {
       default: 'auto'
     }
   },
-  computed: {
-    searchData: {
-      get() {
-        let value;
-        for (let i = 0; i < this.contents.length; i++) {
-          if (this.contents[i].type === 'search') {
-            value = this.contents[i].value || this.contents[i].searchValue;
-            break;
-          }
-        }
-        return value ? value : this.searchValue;
-      },
-      set(val) {
-        return val;
+  watch: {
+    searchValue: {
+      deep: true,
+      handler(val) {
+        this.searchData = val;
       }
     },
-    advancedData: {
-      get() {
-        let value;
-        for (let i = 0; i < this.contents.length; i++) {
-          if (this.contents[i].type === 'filter') {
-            value = this.contents[i].value || this.contents[i].searchValue;
-            break;
-          }
-        }
-        return value ? value : this.advanceValue;
-      },
-      set(val) {
-        return val;
+    advanceValue: {
+      deep: true,
+      handler(val) {
+        this.advancedData = val;
       }
     }
   },
   data() {
     return {
-      show: false
+      show: false,
+      searchData: this.searchValue,
+      advancedData: this.advanceValue
     };
   },
   created() {
@@ -303,7 +287,16 @@ export default {
                 }
               }
             },
-            '高级搜索'
+            [
+              '高级搜索',
+              h('i', {
+                class: {
+                  'el-icon-arrow-down': !this.show,
+                  'el-icon-arrow-up': this.show,
+                  'es-advanced-icon': 1
+                }
+              })
+            ]
           )
         );
         filter = h(
@@ -329,26 +322,28 @@ export default {
                 ]
               },
               [
-                h(
-                  'es-form',
-                  {
-                    class: 'es-form-search',
-                    ref: 'filter',
-                    props: {
-                      ...other,
-                      ...(config || {}),
-                      size: 'medium',
-                      closeDialog: false,
-                      model: this.advancedData,
-                      contents: contents
-                    },
-                    on: {
-                      submit: this.hanleSubmit,
-                      reset: this.hanleCancel
-                    }
-                  },
-                  []
-                )
+                this.show
+                  ? h(
+                      'es-form',
+                      {
+                        class: 'es-form-advanced-filter',
+                        ref: 'filter',
+                        props: {
+                          ...other,
+                          ...(config || {}),
+                          size: 'medium',
+                          closeDialog: false,
+                          model: this.advancedData,
+                          contents: contents
+                        },
+                        on: {
+                          submit: this.hanleSubmit,
+                          reset: this.hanleCancel
+                        }
+                      },
+                      []
+                    )
+                  : ''
               ]
             )
           ]

package/packages/upload/src/main.vue

@@ -802,16 +802,7 @@ export default {
       this.$refs.upload.submit();
     },
     openKkfileview(file) {
-      let host = '';
-      try {
-        host = util.win.top.location.origin;
-      } catch (error) {
-        try {
-          host = util.win.parent.location.origin;
-        } catch (error) {
-          host = util.win.location.origin;
-        }
-      }
+      let host = util.win.location.origin;
       if (this.host) {
         if (util.startWith(this.host, 'http')) {
           host = this.host;

package/src/index.js

@@ -2,9 +2,10 @@
 
 import Button from '../packages/button/index.js';
 import ButtonGroup from '../packages/button-group/index.js';
-import CheckboxGroup from '../packages/checkbox-group/index.js';
+import Calendar from '../packages/calendar/index.js';
 import Card from '../packages/card/index.js';
 import Cascader from '../packages/cascader/index.js';
+import CheckboxGroup from '../packages/checkbox-group/index.js';
 import Clients from '../packages/clients/index.js';
 import DataTable from '../packages/data-table/index.js';
 import DataTableForm from '../packages/data-table-form/index.js';
@@ -55,9 +56,10 @@ import Wxlogin from '../packages/wxlogin/index.js';
 const components = [
   Button,
   ButtonGroup,
-  CheckboxGroup,
+  Calendar,
   Card,
   Cascader,
+  CheckboxGroup,
   Clients,
   DataTable,
   DataTableForm,
@@ -117,13 +119,14 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.5.44',
+  version: '0.5.46',
   install,
   Button,
   ButtonGroup,
-  CheckboxGroup,
+  Calendar,
   Card,
   Cascader,
+  CheckboxGroup,
   Clients,
   DataTable,
   DataTableForm,

package/src/utils/util.js

@@ -1163,6 +1163,21 @@ const getHour = function (datetime) {
   return datetimeObj.getHours();
 };
 
+/**
+ * getMyWinTop
+ * @desc 获取同域的top窗口
+ * @param {object} wind - window对象
+ **/
+const getMyWinTop = function (wind) {
+  wind = wind ? wind : win;
+  try {
+    wind.parent.document;
+    return getMyWinTop(wind.parent);
+  } catch (error) {
+    return wind;
+  }
+};
+
 /**
  * getWeekNumber
  * @desc 当年第几周
@@ -2947,6 +2962,7 @@ export default {
   getCurrentDate,
   getCurrentDateTime,
   getHour,
+  getMyWinTop,
   getWeekNumber,
   getLength,
   getMainConfig,