eoss-ui 0.5.25 → 0.5.27

package/lib/button.js

@@ -3516,7 +3516,8 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
     stop: Boolean,
     syncKeys: Object,
     text: String,
-    onClick: Function
+    onClick: Function,
+    badge: [Object, Number]
   },
   computed: {
     _type: function _type() {
@@ -3708,6 +3709,34 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
       tag = 'a';
       clas = clas.concat(['el-button', this._type ? 'el-button--' + this._type : 'el-button--default', this.size ? 'el-button--' + this.size : '']);
     }
+    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(tag, {
       class: clas,
       props: _extends({}, this.$attrs, props),

package/lib/checkbox-group.js

@@ -3664,7 +3664,7 @@ module.exports = require("vue");
 // 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/checkbox-group/src/main.vue?vue&type=template&id=103e1959&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/checkbox-group/src/main.vue?vue&type=template&id=796a733a&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3797,7 +3797,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/checkbox-group/src/main.vue?vue&type=template&id=103e1959&
+// CONCATENATED MODULE: ./packages/checkbox-group/src/main.vue?vue&type=template&id=796a733a&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -3992,7 +3992,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
     labelVal: function labelVal() {
       var _this = this;
 
-      var model = typeof this.model === 'string' ? this.model.split(',') : this.model;
+      var model = typeof this.model === 'string' ? this.model.split(',') : this.model || [];
       var label = model.map(function (item) {
         if (util["a" /* default */].isObject(item)) {
           return item[_this.label];

package/lib/data-table.js

@@ -3857,8 +3857,8 @@ var component = Object(componentNormalizer["a" /* default */])(
 // 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=55ef7929&
-var mainvue_type_template_id_55ef7929_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=05f3b637&
+var mainvue_type_template_id_05f3b637_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -3873,6 +3873,7 @@ var mainvue_type_template_id_55ef7929_render = function () {
           expression: "tableLoading",
         },
       ],
+      ref: "component",
       tag: "component",
       staticClass: "es-data-table",
       attrs: {
@@ -3988,6 +3989,7 @@ var mainvue_type_template_id_55ef7929_render = function () {
                                           name: _vm.name,
                                           indexs: index,
                                           form: _vm.form,
+                                          readonly: _vm.readonly,
                                           optionData: _vm.optionDatas,
                                         },
                                         item
@@ -4105,10 +4107,10 @@ var mainvue_type_template_id_55ef7929_render = function () {
   )
 }
 var staticRenderFns = []
-mainvue_type_template_id_55ef7929_render._withStripped = true
+mainvue_type_template_id_05f3b637_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=55ef7929&
+// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=05f3b637&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -4156,8 +4158,8 @@ childrenvue_type_template_id_29bcbc72_render._withStripped = true
 
 // CONCATENATED MODULE: ./packages/data-table/src/children.vue?vue&type=template&id=29bcbc72&
 
-// 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=5798afd2&
-var columnvue_type_template_id_5798afd2_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/column.vue?vue&type=template&id=04b841ca&
+var columnvue_type_template_id_04b841ca_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4587,11 +4589,14 @@ var columnvue_type_template_id_5798afd2_render = function () {
                                       })
                                     )
                                   )
-                                : _vm.type === "text" || _vm.type === "textarea"
+                                : _vm.type === "text" ||
+                                  _vm.type === "input" ||
+                                  _vm.type === "textarea"
                                 ? [
                                     _vm.config.lazy
                                       ? [
-                                          _vm.type === "text"
+                                          _vm.type === "text" ||
+                                          _vm.type === "input"
                                             ? _c(
                                                 "input",
                                                 _vm._b(
@@ -4731,7 +4736,10 @@ var columnvue_type_template_id_5798afd2_render = function () {
                                           "es-input",
                                           _vm._b(
                                             {
-                                              attrs: { scope: scope },
+                                              attrs: {
+                                                type: _vm.type,
+                                                scope: scope,
+                                              },
                                               on: {
                                                 blur: function (event) {
                                                   _vm.handleBlur({
@@ -4809,6 +4817,13 @@ var columnvue_type_template_id_5798afd2_render = function () {
                           "\n    "
                       ),
                     ]
+                  : _vm.type === "textarea"
+                  ? _c("span", {
+                      style: _vm.styles ? _vm.styles[scope.row[_vm.prop]] : {},
+                      domProps: {
+                        innerHTML: _vm._s(_vm.format(scope.row, true)),
+                      },
+                    })
                   : _c(
                       "span",
                       {
@@ -4866,11 +4881,11 @@ var columnvue_type_template_id_5798afd2_render = function () {
     2
   )
 }
-var columnvue_type_template_id_5798afd2_staticRenderFns = []
-columnvue_type_template_id_5798afd2_render._withStripped = true
+var columnvue_type_template_id_04b841ca_staticRenderFns = []
+columnvue_type_template_id_04b841ca_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/column.vue?vue&type=template&id=5798afd2&
+// CONCATENATED MODULE: ./packages/data-table/src/column.vue?vue&type=template&id=04b841ca&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(12);
@@ -5295,6 +5310,16 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 
@@ -5412,13 +5437,25 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
         config = _extends({ type: this.type }, config, this.$attrs);
         return config;
       }
+      var required = this.required;
+      if (this.rules && !required) {
+        if (Array.isArray(this.rules)) {
+          this.rules.map(function (item) {
+            if (item.required) {
+              required = item.required;
+            }
+          });
+        } else if (this.rules.required) {
+          required = this.rules.required;
+        }
+      }
       var minWidth = this.label || this.title ? (this.label || this.title).length * 14 + 20 : this.width ? '' : '180px';
       config = _extends({}, config, {
         filterIcon: this.icon,
         sortable: this.sortable || this.sort,
         minWidth: this.minWidth || this.table.minWidth || minWidth,
         className: [this.className ? this.className : '', this.type ? ' es-table-' + this.type + '-box' : '', this.showOverflowTooltip ? ' es-text-ellipsis' : ''].join(' '),
-        labelClassName: [this.labelClassName ? this.labelClassName : '', this.required ? 'es-required' : ''].join(' '),
+        labelClassName: [this.labelClassName ? this.labelClassName : '', required ? 'es-required' : ''].join(' '),
         showOverflowTooltip: this.showOverflowTooltip,
         prop: this.field || this.prop,
         field: this.field
@@ -5434,9 +5471,6 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
       }, this.$attrs, {
         data: this.option
       });
-      if (this.type === 'textarea') {
-        config.type = 'textarea';
-      }
       return config;
     },
     icon: function icon() {
@@ -5447,7 +5481,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
     },
     isForm: function isForm() {
       var type = this.type ? this.type.toLowerCase() : '';
-      var flag = this.form && ['text', 'textarea', 'checkbox', 'radio', 'select', 'handle', 'date', 'year', 'month', 'date', 'dates', 'week', 'datetime', 'datetimerange', 'daterange', 'monthrange', 'quarter', 'halfyear', 'switch', 'selector', 'ganged', 'number'].indexOf(type) > -1 || ['space', 'slot'].indexOf(type) > -1;
+      var flag = this.form && ['input', 'text', 'textarea', 'checkbox', 'radio', 'select', 'handle', 'date', 'year', 'month', 'date', 'dates', 'week', 'datetime', 'datetimerange', 'daterange', 'monthrange', 'quarter', 'halfyear', 'switch', 'selector', 'ganged', 'number'].indexOf(type) > -1 || ['space', 'slot'].indexOf(type) > -1;
       return flag;
     },
     option: function option() {
@@ -5565,41 +5599,47 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
 
       return util["a" /* default */].exclAttribute({ data: data, attrs: attrs });
     },
-    format: function format(rows) {
+    format: function format(rows, flag) {
       var _this2 = this;
 
       var field = this.field || this.prop;
       var data = this.option;
+      var str = '';
       if (util["a" /* default */].isObject(rows[field])) {
-        return rows[field][this.labelKey] || rows[field]['name'] || rows[field]['label'] || rows[field]['shortName'];
+        str = rows[field][this.labelKey] || rows[field]['name'] || rows[field]['label'] || rows[field]['shortName'];
       } else if (Array.isArray(rows[field])) {
         var vals = rows[field].map(function (item) {
           if (util["a" /* default */].isObject(item)) {
-            return item[_this2.labelKey] || item['name'] || item['label'] || item['shortName'];
+            str = item[_this2.labelKey] || item['name'] || item['label'] || item['shortName'];
           } else {
             if (data && data.length && util["a" /* default */].isObject(data[0])) {
-              return _this2.getLabel(data, item);
+              str = _this2.getLabel(data, item);
             }
-            return item;
+            str = item;
           }
         });
-        return vals.join(this.symbol ? this.symbol : '-');
+        str = vals.join(this.symbol ? this.symbol : '-');
       } else {
         if (this.valueToString) {
           var _vals = rows[field].split(',').map(function (item) {
             if (data && data.length && util["a" /* default */].isObject(data[0])) {
-              return _this2.getLabel(data, item);
+              str = _this2.getLabel(data, item);
             }
-            return item;
+            str = item;
           });
-          return _vals.join(this.symbol ? this.symbol : '-');
+          str = _vals.join(this.symbol ? this.symbol : '-');
         } else {
           if (data && data.length && util["a" /* default */].isObject(data[0])) {
-            return this.getLabel(data, rows[field]);
+            str = this.getLabel(data, rows[field]);
           }
-          return rows[field];
+          str = rows[field];
         }
       }
+      if (str && flag) {
+        str = str.replace(RegExp('\\n', 'g'), '<br/>');
+        str = str.replace(RegExp(' ', 'g'), '&nbsp;');
+      }
+      return str;
     },
     getLabel: function getLabel(obj, val) {
       for (var i = 0; i < obj.length; i++) {
@@ -5709,8 +5749,8 @@ var componentNormalizer = __webpack_require__(3);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_columnvue_type_script_lang_js_,
-  columnvue_type_template_id_5798afd2_render,
-  columnvue_type_template_id_5798afd2_staticRenderFns,
+  columnvue_type_template_id_04b841ca_render,
+  columnvue_type_template_id_04b841ca_staticRenderFns,
   false,
   null,
   null,
@@ -6165,6 +6205,8 @@ var mainvue_type_script_lang_js_components, _watch;
 //
 //
 //
+//
+//
 
 
 
@@ -7246,10 +7288,13 @@ var mainvue_type_script_lang_js_components, _watch;
       });
     },
     validate: function validate(callback) {
-      var form = this.elForm || this.$el;
-      form.validate(function (valid) {
-        callback(valid);
-      });
+      console.log(this);
+      if (this.form) {
+        var form = this.elForm || this.$children[0];
+        form.validate(function (valid) {
+          callback(valid);
+        });
+      }
     },
     changeLoading: function changeLoading(show, text) {
       this.tableLoading = show;
@@ -7308,7 +7353,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_55ef7929_render,
+  mainvue_type_template_id_05f3b637_render,
   staticRenderFns,
   false,
   null,