eoss-ui 0.5.64 → 0.5.65

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=1080b7f0&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3648,27 +3648,33 @@ var render = function () {
                           )
                         : _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(
@@ -3758,7 +3764,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=1080b7f0&
 
 // EXTERNAL MODULE: ./src/utils/util.js
 var util = __webpack_require__(0);
@@ -3833,6 +3839,12 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
 //
 //
 //
+//
+//
+//
+//
+//
+//
 
 
 /* harmony default export */ var mainvue_type_script_lang_js_ = ({
@@ -3891,6 +3903,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;
 

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,74 @@ 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({}, 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=aa9b4086&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -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=aa9b4086&
 
 // 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,8 @@ render._withStripped = true
       type: Boolean,
       default: true
     },
-    mark: Boolean
+    mark: Boolean,
+    disabled: Boolean
   },
   watch: {
     date: {
@@ -545,6 +548,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 +679,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 +701,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
           });
         }
       }

package/lib/data-table.js

@@ -3818,8 +3818,8 @@ module.exports = require("throttle-debounce");
 // 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/data-table/src/main.vue?vue&type=template&id=c40e40b8&
-var mainvue_type_template_id_c40e40b8_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/main.vue?vue&type=template&id=5d38af04&
+var mainvue_type_template_id_5d38af04_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -3906,10 +3906,15 @@ var mainvue_type_template_id_c40e40b8_render = function () {
                         (_vm.theadBorder && _vm.border != "none"
                           ? " es-thead-border"
                           : ""),
+                      attrs: { data: _vm.datas },
+                      on: {
+                        "update:data": function ($event) {
+                          _vm.datas = $event
+                        },
+                      },
                     },
                     "el-table",
                     Object.assign({}, _vm.$attrs, {
-                      data: _vm.datas,
                       emptyText: _vm.emptyText,
                       showSummary: _vm.showTotal,
                       sumText: _vm.sumText || _vm.totalText,
@@ -3921,6 +3926,8 @@ var mainvue_type_template_id_c40e40b8_render = function () {
                       border: _vm._border,
                       infiniteScroll: _vm.getTableData,
                       infiniteScrollDisabled: _vm.infiniteDisabled,
+                      dragSort: _vm.dragSort,
+                      dragSortClass: _vm.dragSortIcon,
                     }),
                     false
                   ),
@@ -3929,6 +3936,7 @@ var mainvue_type_template_id_c40e40b8_render = function () {
                     "selection-change": _vm.selectionChange,
                     "filter-column": _vm.handleFilterColumn,
                     "sort-change": _vm.handleSortChange,
+                    "update-drag-sort": _vm.handleUpdateDragSort,
                   })
                 ),
                 [
@@ -3938,13 +3946,38 @@ var mainvue_type_template_id_c40e40b8_render = function () {
                     return [
                       item.hide !== true
                         ? [
-                            item.type === "index" || item.type === "selection"
+                            item.type === "sort"
+                              ? _c("el-table-column", {
+                                  key: index,
+                                  attrs: { width: "32" },
+                                  scopedSlots: _vm._u([
+                                    {
+                                      key: "default",
+                                      fn: function (scope) {
+                                        return [
+                                          _c("es-icon", {
+                                            staticClass: "es-move",
+                                            attrs: {
+                                              contents: _vm.dragSortIcon,
+                                            },
+                                          }),
+                                        ]
+                                      },
+                                    },
+                                  ]),
+                                })
+                              : item.type === "index" ||
+                                item.type === "selection"
                               ? _c(
                                   "el-table-column",
                                   _vm._b(
                                     { key: index },
                                     "el-table-column",
-                                    item,
+                                    _vm.dragSort
+                                      ? Object.assign({}, item, {
+                                          fixed: false,
+                                        })
+                                      : item,
                                     false
                                   )
                                 )
@@ -3962,8 +3995,13 @@ var mainvue_type_template_id_c40e40b8_render = function () {
                                           form: _vm.form,
                                           readonly: _vm.readonly,
                                           optionData: _vm.optionDatas,
+                                          dragSort: _vm.dragSort,
                                         },
-                                        item
+                                        _vm.dragSort
+                                          ? Object.assign({}, item, {
+                                              fixed: false,
+                                            })
+                                          : item
                                       ),
                                       false
                                     ),
@@ -4088,10 +4126,10 @@ var mainvue_type_template_id_c40e40b8_render = function () {
   )
 }
 var staticRenderFns = []
-mainvue_type_template_id_c40e40b8_render._withStripped = true
+mainvue_type_template_id_5d38af04_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=c40e40b8&
+// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=5d38af04&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -4099,8 +4137,8 @@ var api = __webpack_require__(1);
 // EXTERNAL MODULE: external "throttle-debounce"
 var external_throttle_debounce_ = __webpack_require__(19);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/children.vue?vue&type=template&id=29bcbc72&
-var childrenvue_type_template_id_29bcbc72_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/children.vue?vue&type=template&id=44b7ff61&
+var childrenvue_type_template_id_44b7ff61_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4119,9 +4157,15 @@ var childrenvue_type_template_id_29bcbc72_render = function () {
                         _vm._b(
                           { key: index },
                           "children",
-                          Object.assign({}, _vm.$attrs, item, {
-                            indexs: index,
-                          }),
+                          Object.assign(
+                            {},
+                            _vm.$attrs,
+                            item,
+                            { indexs: index },
+                            _vm.dragSort
+                              ? Object.assign({}, item, { fixed: false })
+                              : item
+                          ),
                           false
                         ),
                         _vm.$listeners
@@ -4136,11 +4180,11 @@ var childrenvue_type_template_id_29bcbc72_render = function () {
     2
   )
 }
-var childrenvue_type_template_id_29bcbc72_staticRenderFns = []
-childrenvue_type_template_id_29bcbc72_render._withStripped = true
+var childrenvue_type_template_id_44b7ff61_staticRenderFns = []
+childrenvue_type_template_id_44b7ff61_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/children.vue?vue&type=template&id=29bcbc72&
+// CONCATENATED MODULE: ./packages/data-table/src/children.vue?vue&type=template&id=44b7ff61&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/column.vue?vue&type=template&id=449ae3d7&
 var columnvue_type_template_id_449ae3d7_render = function () {
@@ -5766,12 +5810,14 @@ var _components;
 //
 //
 //
+//
 
 
 /* harmony default export */ var childrenvue_type_script_lang_js_ = ({
   name: 'Children',
   components: (_components = {}, _components[column.name] = column, _components),
   props: {
+    dragSort: Boolean,
     children: Array,
     childHead: Array
   },
@@ -5793,8 +5839,8 @@ var _components;
 
 var children_component = Object(componentNormalizer["a" /* default */])(
   src_childrenvue_type_script_lang_js_,
-  childrenvue_type_template_id_29bcbc72_render,
-  childrenvue_type_template_id_29bcbc72_staticRenderFns,
+  childrenvue_type_template_id_44b7ff61_render,
+  childrenvue_type_template_id_44b7ff61_staticRenderFns,
   false,
   null,
   null,
@@ -6204,6 +6250,24 @@ var mainvue_type_script_lang_js_components, _watch;
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 
@@ -6455,6 +6519,11 @@ var mainvue_type_script_lang_js_components, _watch;
       default: function _default() {
         return {};
       }
+    },
+    dragSort: Boolean,
+    dragSortIcon: {
+      type: String,
+      default: 'es-icon-caidan'
     }
   },
   data: function data() {
@@ -6483,7 +6552,8 @@ var mainvue_type_script_lang_js_components, _watch;
       icon: true,
       show: true,
       sysCodes: [],
-      infiniteDisabled: this.infiniteScroll
+      infiniteDisabled: this.infiniteScroll,
+      isUpadeData: false
     };
   },
 
@@ -6501,7 +6571,17 @@ var mainvue_type_script_lang_js_components, _watch;
     theads: {
       get: function get() {
         var thead = [];
-        if (this.checkbox) {
+        var types = this.theadData.filter(function (item) {
+          return item.type == 'selection' || item.type == 'index' || item.type == 'sort';
+        }).map(function (item) {
+          return item.type;
+        });
+        if (this.dragSort && !types.includes('sort')) {
+          thead.push({
+            type: 'sort'
+          });
+        }
+        if (this.checkbox && !types.includes('selection')) {
           thead.push({
             type: 'selection',
             width: '55',
@@ -6511,7 +6591,7 @@ var mainvue_type_script_lang_js_components, _watch;
             reserveSelection: this.reserveSelection
           });
         }
-        if (this.numbers) {
+        if (this.numbers && !types.includes('index')) {
           var index = 1;
           if (this.infiniteScroll) {
             index = typeof this.index == 'boolean' ? 1 : this.index;
@@ -6524,7 +6604,8 @@ var mainvue_type_script_lang_js_components, _watch;
             width: '70',
             align: 'center',
             fixed: 'left',
-            index: index
+            index: index,
+            filterIcon: this.filter ? 'es-icon-biao' : undefined
           });
         }
         if (this.theadData.length) {
@@ -6554,6 +6635,7 @@ var mainvue_type_script_lang_js_components, _watch;
         return this.data;
       },
       set: function set(val) {
+        this.$emit('update:data', val);
         return val;
       }
     },
@@ -7425,6 +7507,9 @@ var mainvue_type_script_lang_js_components, _watch;
       }
       this.$emit('sort-change', res);
     },
+    handleUpdateDragSort: function handleUpdateDragSort(data, event) {
+      this.$emit('update-drag-sort', data, event);
+    },
     mergeThead: function mergeThead(res) {
       var _this12 = this;
 
@@ -7470,7 +7555,7 @@ var mainvue_type_script_lang_js_components, _watch;
 
 var main_component = Object(componentNormalizer["a" /* default */])(
   src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_c40e40b8_render,
+  mainvue_type_template_id_5d38af04_render,
   staticRenderFns,
   false,
   null,