eoss-ui 0.5.64 → 0.5.66

package/lib/button-group.js

@@ -3616,7 +3616,7 @@ function normalizeComponent(
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/button-group/src/main.vue?vue&type=template&id=a336a590&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/button-group/src/main.vue?vue&type=template&id=1a095074&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3634,41 +3634,58 @@ var render = function () {
                       item.upload || (item.code && item.ownId)
                         ? _c(
                             "es-upload",
-                            _vm._b(
-                              { staticClass: "el-button" },
-                              "es-upload",
-                              Object.assign({}, item, {
-                                method: "post",
-                                btnSize: _vm.size,
-                                showFileList: false,
-                                selectType: item.type ? item.type : "",
-                              }),
-                              false
+                            _vm._g(
+                              _vm._b(
+                                { staticClass: "el-button" },
+                                "es-upload",
+                                Object.assign(
+                                  {},
+                                  _vm.exclAttribute({
+                                    data: item,
+                                    attrs: ["events"],
+                                  }),
+                                  _vm.parseProps(),
+                                  {
+                                    method: "post",
+                                    btnSize: _vm.size,
+                                    showFileList: false,
+                                    selectType: item.type ? item.type : "",
+                                  }
+                                ),
+                                false
+                              ),
+                              item.events
                             )
                           )
                         : _c(
                             "es-button",
-                            _vm._b(
-                              {
-                                key: index,
-                                attrs: {
-                                  stop: _vm.stop,
-                                  size: _vm.size,
-                                  type: item.type,
-                                },
-                                on: {
-                                  click: function ($event) {
-                                    _vm.handleClick(
-                                      Object.assign({}, _vm.data, {
-                                        handle: item,
-                                      })
-                                    )
+                            _vm._g(
+                              _vm._b(
+                                {
+                                  key: index,
+                                  attrs: {
+                                    stop: _vm.stop,
+                                    size: _vm.size,
+                                    type: item.type,
+                                  },
+                                  on: {
+                                    click: function ($event) {
+                                      _vm.handleClick(
+                                        Object.assign({}, _vm.data, {
+                                          handle: item,
+                                        })
+                                      )
+                                    },
                                   },
                                 },
-                              },
-                              "es-button",
-                              item,
-                              false
+                                "es-button",
+                                _vm.exclAttribute({
+                                  data: item,
+                                  attrs: ["events"],
+                                }),
+                                false
+                              ),
+                              item.events
                             ),
                             [
                               _vm._v(
@@ -3696,6 +3713,7 @@ var render = function () {
         ? _c(
             "el-dropdown",
             {
+              ref: "dropdown",
               attrs: { trigger: _vm.trigger },
               on: {
                 command: _vm.handleCommand,
@@ -3729,19 +3747,99 @@ var render = function () {
                 _vm._l(_vm.other, function (item, index) {
                   return _c(
                     "el-dropdown-item",
-                    { key: index, attrs: { command: item } },
+                    {
+                      key: index,
+                      class: {
+                        "es-dropdown-padding": item.upload || item.selector,
+                      },
+                      attrs: { command: item },
+                    },
                     [
-                      item.icon ? _c("i", { class: item.icon }) : _vm._e(),
-                      _vm._v(
-                        _vm._s(
-                          item.template
-                            ? item.template(
-                                Object.assign({}, _vm.data, { config: item })
-                              )
-                            : item.text
-                        )
-                      ),
-                    ]
+                      item.upload || (item.code && item.ownId)
+                        ? _c(
+                            "es-upload",
+                            _vm._g(
+                              _vm._b(
+                                { staticClass: "es-dropdown-upload" },
+                                "es-upload",
+                                Object.assign(
+                                  {},
+                                  _vm.exclAttribute({
+                                    data: item,
+                                    attrs: ["events"],
+                                  }),
+                                  _vm.parseProps(),
+                                  {
+                                    method: "post",
+                                    showFileList: false,
+                                    selectType: "text",
+                                  }
+                                ),
+                                false
+                              ),
+                              item.events
+                            )
+                          )
+                        : item.selector
+                        ? _c(
+                            "es-selector",
+                            _vm._g(
+                              _vm._b(
+                                {
+                                  staticClass: "es-dropdown-selector",
+                                  attrs: {
+                                    button: { size: "medium", type: "text" },
+                                  },
+                                },
+                                "es-selector",
+                                Object.assign(
+                                  {},
+                                  { reset: true },
+                                  _vm.exclAttribute({
+                                    data: item,
+                                    attrs: ["events", "type", "value"],
+                                  }),
+                                  { businessData: _vm.data }
+                                ),
+                                false
+                              ),
+                              item.events
+                            ),
+                            [
+                              item.icon
+                                ? _c("i", { class: item.icon })
+                                : _vm._e(),
+                              _vm._v(
+                                _vm._s(
+                                  item.template
+                                    ? item.template(
+                                        Object.assign({}, _vm.data, {
+                                          config: item,
+                                        })
+                                      )
+                                    : item.text
+                                ) + "\n        "
+                              ),
+                            ]
+                          )
+                        : [
+                            item.icon
+                              ? _c("i", { class: item.icon })
+                              : _vm._e(),
+                            _vm._v(
+                              _vm._s(
+                                item.template
+                                  ? item.template(
+                                      Object.assign({}, _vm.data, {
+                                        config: item,
+                                      })
+                                    )
+                                  : item.text
+                              ) + "\n        "
+                            ),
+                          ],
+                    ],
+                    2
                   )
                 }),
                 1
@@ -3758,7 +3856,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/button-group/src/main.vue?vue&type=template&id=a336a590&
+// CONCATENATED MODULE: ./packages/button-group/src/main.vue?vue&type=template&id=1a095074&
 
 // EXTERNAL MODULE: ./src/utils/util.js
 var util = __webpack_require__(0);
@@ -3833,6 +3931,59 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 /* harmony default export */ var mainvue_type_script_lang_js_ = ({
@@ -3866,7 +4017,8 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
     placement: {
       type: String,
       default: 'bottom'
-    }
+    },
+    parseData: Function
   },
   computed: {
     btns: function btns() {
@@ -3891,6 +4043,12 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
   },
 
   methods: {
+    exclAttribute: function exclAttribute(_ref) {
+      var data = _ref.data,
+          attrs = _ref.attrs;
+
+      return util["a" /* default */].exclAttribute({ data: data, attrs: attrs });
+    },
     getBtns: function getBtns() {
       var _this = this;
 
@@ -3924,6 +4082,10 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
       this.$emit('handle-click', obj);
     },
     handleCommand: function handleCommand(res) {
+      if (res.upload || res.selector) {
+        this.$refs.dropdown.hide();
+        return false;
+      }
       this.$emit('handleClick', _extends({}, this.data, { handle: res }));
       this.$emit('handle-click', _extends({}, this.data, { handle: res }));
     },
@@ -3943,6 +4105,9 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
           _this2.$emit('input', w + 'px');
         }
       });
+    },
+    parseProps: function parseProps() {
+      return this.parseData && this.data ? this.parseData(this.data) : {};
     }
   }
 });

package/lib/button.js

@@ -3826,7 +3826,9 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
     text: String,
     onClick: Function,
     badge: [Object, Number],
-    float: String
+    float: String,
+    selector: Boolean,
+    upload: Boolean
   },
   computed: {
     _type: function _type() {
@@ -4012,52 +4014,78 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
     }
     var tag = 'el-button';
     var clas = ['es-button'];
-    var props = { type: this._type, size: this.size };
+    var props = {};
     var attrs = {};
-    if (this.link && !this.open) {
-      var link = this.param ? util["a" /* default */].urlJoinParams({ url: this.link, param: this.param }) : this.link;
-      attrs = { href: link };
-      tag = 'a';
-      clas = clas.concat(['el-button', this._type ? 'el-button--' + this._type : 'el-button--default', this.size ? 'el-button--' + this.size : '', this.float ? 'es-button--' + this.float : '']);
-    }
-    if (this.badge) {
-      var config = {};
-      if (typeof this.badge === 'number') {
-        config = { class: 'es-button-badge', props: { value: this.badge } };
-      } else {
-        var _badge = this.badge,
-            value = _badge.value,
-            max = _badge.max,
-            isDot = _badge.isDot,
-            hidden = _badge.hidden,
-            type = _badge.type;
-
-        config = {
-          class: this.badge.class ? this.badge.class + ' es-button-badge' : 'es-button-badge',
-          props: { value: value, max: max, isDot: isDot, hidden: hidden, type: type }
-        };
+    var listeners = {};
+    var config = {};
+    if (this.selector) {
+      tag = 'es-selector';
+      props = _extends({
+        reset: true
+      }, this.$attrs, {
+        button: { type: this._type, size: this.size }
+      });
+      listeners = this.$listeners;
+    } else if (this.upload) {
+      tag = 'es-upload';
+      props = _extends({}, this.$attrs, { showFileList: false });
+      listeners = this.$listeners;
+      config = {
+        type: this._type,
+        size: this.size
+      };
+    } else {
+      props = _extends({}, this.$attrs, { type: this._type, size: this.size });
+      listeners = _extends({}, this.$listeners, { click: this.handleClick });
+      if (this.link && !this.open) {
+        var link = this.param ? util["a" /* default */].urlJoinParams({ url: this.link, param: this.param }) : this.link;
+        attrs = { href: link };
+        tag = 'a';
+        clas = clas.concat(['el-button', this._type ? 'el-button--' + this._type : 'el-button--default', this.size ? 'el-button--' + this.size : '', this.float ? 'es-button--' + this.float : '']);
+      }
+      if (this.badge) {
+        var _config = {};
+        if (typeof this.badge === 'number') {
+          _config = { class: 'es-button-badge', props: { value: this.badge } };
+        } else {
+          var _badge = this.badge,
+              value = _badge.value,
+              max = _badge.max,
+              isDot = _badge.isDot,
+              hidden = _badge.hidden,
+              type = _badge.type;
+
+          _config = {
+            class: this.badge.class ? this.badge.class + ' es-button-badge' : 'es-button-badge',
+            props: { value: value, max: max, isDot: isDot, hidden: hidden, type: type }
+          };
+        }
+        return h('el-badge', _config, [h(tag, {
+          class: clas,
+          props: _extends({}, this.$attrs, props),
+          attrs: attrs,
+          on: _extends({}, this.$listeners, { click: this.handleClick }),
+          directives: [{
+            name: 'show',
+            value: !this.hide
+          }]
+        }, this.iconPlacement === 'start' ? [this.icon ? h('i', { class: this.icon }) : '', this.$slots.default || this.text] : [this.$slots.default || this.text, this.icon ? h('i', { class: this.icon }) : ''])]);
       }
-      return h('el-badge', config, [h(tag, {
-        class: clas,
-        props: _extends({}, this.$attrs, props),
-        attrs: attrs,
-        on: _extends({}, this.$listeners, { click: this.handleClick }),
-        directives: [{
-          name: 'show',
-          value: !this.hide
-        }]
-      }, this.iconPlacement === 'start' ? [this.icon ? h('i', { class: this.icon }) : '', this.$slots.default || this.text] : [this.$slots.default || this.text, this.icon ? h('i', { class: this.icon }) : ''])]);
     }
     return h(tag, {
       class: clas,
-      props: _extends({}, this.$attrs, props),
+      props: props,
       attrs: attrs,
-      on: _extends({}, this.$listeners, { click: this.handleClick }),
+      on: listeners,
       directives: [{
         name: 'show',
         value: !this.hide
       }]
-    }, this.iconPlacement === 'start' ? [this.icon ? h('i', { class: this.icon }) : '', this.$slots.default || this.text] : [this.$slots.default || this.text, this.icon ? h('i', { class: this.icon }) : '']);
+    }, this.iconPlacement === 'start' ? [this.icon ? h('i', { class: this.icon }) : '', this.upload ? h('el-button', {
+      props: config
+    }, [this.$slots.default || this.text]) : this.$slots.default || this.text] : [this.upload ? h('el-button', {
+      props: config
+    }, [this.$slots.default || this.text]) : this.$slots.default || this.text, this.icon ? h('i', { class: this.icon }) : '']);
   }
 });
 // CONCATENATED MODULE: ./packages/button/src/main.vue?vue&type=script&lang=js&

package/lib/calendar.js

@@ -199,7 +199,7 @@ function normalizeComponent(
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/calendar/src/main.vue?vue&type=template&id=31c0856e&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/calendar/src/main.vue?vue&type=template&id=37892338&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -270,7 +270,7 @@ var render = function () {
     ),
     _c(
       "ul",
-      { staticClass: "es-calendar-days" },
+      { staticClass: "es-calendar-days", style: { height: _vm._height } },
       _vm._l(_vm.lists, function (item, index) {
         return _c(
           "li",
@@ -292,6 +292,7 @@ var render = function () {
                   "es-disabled-day": item.type == 0,
                   "es-today": _vm.isSelect(item, _vm.today) && _vm.mark,
                   "es-select": _vm.isSelect(item, _vm.select),
+                  "es-disabled": item.disabled,
                 },
               },
               [
@@ -352,7 +353,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/calendar/src/main.vue?vue&type=template&id=31c0856e&
+// CONCATENATED MODULE: ./packages/calendar/src/main.vue?vue&type=template&id=37892338&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/calendar/src/main.vue?vue&type=script&lang=js&
 //
@@ -415,6 +416,7 @@ render._withStripped = true
 //
 //
 //
+//
 
 /* harmony default export */ var mainvue_type_script_lang_js_ = ({
   name: 'EsCalendar',
@@ -435,7 +437,9 @@ render._withStripped = true
       type: Boolean,
       default: true
     },
-    mark: Boolean
+    mark: Boolean,
+    disabled: Boolean,
+    height: String
   },
   watch: {
     date: {
@@ -470,6 +474,9 @@ render._withStripped = true
           }
         }
       });
+    },
+    _height: function _height() {
+      return this.height && this.all ? parseInt(this.height) + 'px' : '';
     }
   },
   data: function data() {
@@ -545,6 +552,9 @@ render._withStripped = true
       return target == year + '/' + month + '/' + date;
     },
     handleClick: function handleClick(res) {
+      if (res.disabled) {
+        return false;
+      }
       var year = res.year,
           month = res.month,
           date = res.date;
@@ -673,7 +683,8 @@ render._withStripped = true
             date: _i3,
             type: 0,
             year: month == 0 ? year - 1 : year,
-            month: month == 0 ? 12 : month
+            month: month == 0 ? 12 : month,
+            disabled: this.disabled
           });
         }
       }
@@ -694,7 +705,8 @@ render._withStripped = true
             date: i,
             type: 0,
             year: month == 11 ? year + 1 : year,
-            month: month == 11 ? 1 : month + 2
+            month: month == 11 ? 1 : month + 2,
+            disabled: this.disabled
           });
         }
       }