eoss-ui 0.5.30 → 0.5.32

package/lib/button-group.js

@@ -1915,6 +1915,17 @@ var indexOfObj = function indexOfObj(arry, target, key) {
   return -1;
 };
 
+/**
+ * isExist
+ * @desc:判断是否存在
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {Object} [obj] -
+ **/
+var isExist = function isExist(obj) {
+  return obj !== undefined && obj !== null && obj === '';
+};
+
 /**
  * isFunction
  * @desc:判断是否是函数
@@ -2939,6 +2950,7 @@ var watermark = function watermark(option) {
   hsvTorgb: hsvTorgb,
   identical: identical,
   indexOfObj: indexOfObj,
+  isExist: isExist,
   isFunction: isFunction,
   isLogged: isLogged,
   isLogined: isLogined,

package/lib/button.js

@@ -1915,6 +1915,17 @@ var indexOfObj = function indexOfObj(arry, target, key) {
   return -1;
 };
 
+/**
+ * isExist
+ * @desc:判断是否存在
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {Object} [obj] -
+ **/
+var isExist = function isExist(obj) {
+  return obj !== undefined && obj !== null && obj === '';
+};
+
 /**
  * isFunction
  * @desc:判断是否是函数
@@ -2939,6 +2950,7 @@ var watermark = function watermark(option) {
   hsvTorgb: hsvTorgb,
   identical: identical,
   indexOfObj: indexOfObj,
+  isExist: isExist,
   isFunction: isFunction,
   isLogged: isLogged,
   isLogined: isLogined,

package/lib/cascader.js

@@ -206,7 +206,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
   name: 'EsCascader',
   inheritAttrs: false,
   props: {
-    value: [String, Object, Array],
+    value: [String, Array],
     data: Array,
     options: Array,
     hide: {
@@ -302,23 +302,26 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
 
     if (!this.hide) {
       if (this.readonly) {
-        var value = this.model.map(function (item) {
-          if (Array.isArray(item)) {
-            return item.map(function (ele) {
-              if (typeof ele === 'string') {
-                return ele;
+        var value = '';
+        if (this.model) {
+          value = Array.isArray(this.model) ? this.model.map(function (item) {
+            if (Array.isArray(item)) {
+              return item.map(function (ele) {
+                if (typeof ele === 'string') {
+                  return ele;
+                } else {
+                  return ele[_this.newProps.label];
+                }
+              }).join(_this.separator);
+            } else {
+              if (typeof item === 'string') {
+                return item;
               } else {
-                return ele[_this.newProps.label];
+                return item[_this.newProps.label];
               }
-            }).join(_this.separator);
-          } else {
-            if (typeof item === 'string') {
-              return item;
-            } else {
-              return item[_this.newProps.label];
             }
-          }
-        }).join(this.multiple ? '，' : this.separator);
+          }).join(this.multiple ? '，' : this.separator) : this.model;
+        }
         return h('div', {
           class: ['el-cascader el-input__inner', { 'es-plain': this.plain }]
         }, [value]);

package/lib/checkbox-group.js

@@ -1914,6 +1914,17 @@ var indexOfObj = function indexOfObj(arry, target, key) {
   return -1;
 };
 
+/**
+ * isExist
+ * @desc:判断是否存在
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {Object} [obj] -
+ **/
+var isExist = function isExist(obj) {
+  return obj !== undefined && obj !== null && obj === '';
+};
+
 /**
  * isFunction
  * @desc:判断是否是函数
@@ -2938,6 +2949,7 @@ var watermark = function watermark(option) {
   hsvTorgb: hsvTorgb,
   identical: identical,
   indexOfObj: indexOfObj,
+  isExist: isExist,
   isFunction: isFunction,
   isLogged: isLogged,
   isLogined: isLogined,
@@ -3670,7 +3682,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=796a733a&
+// 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=68f9206f&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3711,7 +3723,11 @@ var render = function () {
                       },
                     },
                     "el-checkbox-group",
-                    _vm.$attrs,
+                    Object.assign(
+                      {},
+                      { valueKey: _vm.valKey, labelKey: _vm.label },
+                      _vm.$attrs
+                    ),
                     false
                   ),
                   _vm.$listeners
@@ -3803,7 +3819,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/checkbox-group/src/main.vue?vue&type=template&id=796a733a&
+// CONCATENATED MODULE: ./packages/checkbox-group/src/main.vue?vue&type=template&id=68f9206f&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -3919,6 +3935,10 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
       type: String,
       default: ''
     },
+    separator: {
+      type: String,
+      default: '、'
+    },
     display: {
       type: Boolean,
       default: true
@@ -3977,6 +3997,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
         return this.value === undefined ? [] : this.value;
       },
       set: function set(val) {
+        console.log(val);
         return val;
       }
     },
@@ -4004,15 +4025,17 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
           return item[_this.label];
         }
         if (util["a" /* default */].isObject(_this.results[0])) {
-          return _this.results.map(function (ele) {
-            if (ele[_this.valueKey] === item) {
-              return ele[_this.label];
+          var vals = [];
+          _this.results.forEach(function (ele) {
+            if (ele[_this.valKey] === item) {
+              vals.push(ele[_this.label]);
             }
-          }).join(' ');
+          });
+          return vals.join(_this.separator);
         }
         return item;
       });
-      return label.join(' ');
+      return label.join(this.separator);
     }
   },
   watch: {

package/lib/data-table-form.js

@@ -1914,6 +1914,17 @@ var indexOfObj = function indexOfObj(arry, target, key) {
   return -1;
 };
 
+/**
+ * isExist
+ * @desc:判断是否存在
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {Object} [obj] -
+ **/
+var isExist = function isExist(obj) {
+  return obj !== undefined && obj !== null && obj === '';
+};
+
 /**
  * isFunction
  * @desc:判断是否是函数
@@ -2938,6 +2949,7 @@ var watermark = function watermark(option) {
   hsvTorgb: hsvTorgb,
   identical: identical,
   indexOfObj: indexOfObj,
+  isExist: isExist,
   isFunction: isFunction,
   isLogged: isLogged,
   isLogined: isLogined,

package/lib/data-table.js

@@ -1914,6 +1914,17 @@ var indexOfObj = function indexOfObj(arry, target, key) {
   return -1;
 };
 
+/**
+ * isExist
+ * @desc:判断是否存在
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {Object} [obj] -
+ **/
+var isExist = function isExist(obj) {
+  return obj !== undefined && obj !== null && obj === '';
+};
+
 /**
  * isFunction
  * @desc:判断是否是函数
@@ -2938,6 +2949,7 @@ var watermark = function watermark(option) {
   hsvTorgb: hsvTorgb,
   identical: identical,
   indexOfObj: indexOfObj,
+  isExist: isExist,
   isFunction: isFunction,
   isLogged: isLogged,
   isLogined: isLogined,
@@ -3945,8 +3957,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=04b841ca&
-var columnvue_type_template_id_04b841ca_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=84eb4d70&
+var columnvue_type_template_id_84eb4d70_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -3966,7 +3978,6 @@ var columnvue_type_template_id_04b841ca_render = function () {
                             "el-form-item",
                             {
                               attrs: {
-                                "label-width": "0",
                                 name: _vm.name,
                                 prop: _vm.field || _vm.prop,
                                 rules: _vm.isNotRule(scope) ? [] : _vm.rules,
@@ -4112,10 +4123,7 @@ var columnvue_type_template_id_04b841ca_render = function () {
                                         },
                                       },
                                       "es-select-ganged",
-                                      _vm.exclAttribute({
-                                        data: _vm.config,
-                                        attrs: ["width", "url", "sysCode"],
-                                      }),
+                                      _vm.formOption,
                                       false
                                     )
                                   )
@@ -4668,11 +4676,11 @@ var columnvue_type_template_id_04b841ca_render = function () {
     2
   )
 }
-var columnvue_type_template_id_04b841ca_staticRenderFns = []
-columnvue_type_template_id_04b841ca_render._withStripped = true
+var columnvue_type_template_id_84eb4d70_staticRenderFns = []
+columnvue_type_template_id_84eb4d70_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/column.vue?vue&type=template&id=04b841ca&
+// CONCATENATED MODULE: ./packages/data-table/src/column.vue?vue&type=template&id=84eb4d70&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(12);
@@ -5101,12 +5109,6 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
 //
 //
 //
-//
-//
-//
-//
-//
-//
 
 
 
@@ -5397,12 +5399,12 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
       } else if (Array.isArray(rows[field])) {
         var vals = rows[field].map(function (item) {
           if (util["a" /* default */].isObject(item)) {
-            str = item[_this2.labelKey] || item['name'] || item['label'] || item['shortName'];
+            return item[_this2.labelKey] || item['name'] || item['label'] || item['shortName'];
           } else {
             if (data && data.length && util["a" /* default */].isObject(data[0])) {
-              str = _this2.getLabel(data, item);
+              return _this2.getLabel(data, item);
             }
-            str = item;
+            return item;
           }
         });
         str = vals.join(this.symbol ? this.symbol : '-');
@@ -5410,16 +5412,17 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
         if (this.valueToString) {
           var _vals = rows[field].split(',').map(function (item) {
             if (data && data.length && util["a" /* default */].isObject(data[0])) {
-              str = _this2.getLabel(data, item);
+              return _this2.getLabel(data, item);
             }
-            str = item;
+            return item;
           });
           str = _vals.join(this.symbol ? this.symbol : '-');
         } else {
           if (data && data.length && util["a" /* default */].isObject(data[0])) {
             str = this.getLabel(data, rows[field]);
+          } else {
+            str = rows[field];
           }
-          str = rows[field];
         }
       }
       if (str && flag) {
@@ -5536,8 +5539,8 @@ var componentNormalizer = __webpack_require__(3);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_columnvue_type_script_lang_js_,
-  columnvue_type_template_id_04b841ca_render,
-  columnvue_type_template_id_04b841ca_staticRenderFns,
+  columnvue_type_template_id_84eb4d70_render,
+  columnvue_type_template_id_84eb4d70_staticRenderFns,
   false,
   null,
   null,

package/lib/date-picker.js

@@ -1915,6 +1915,17 @@ var indexOfObj = function indexOfObj(arry, target, key) {
   return -1;
 };
 
+/**
+ * isExist
+ * @desc:判断是否存在
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {Object} [obj] -
+ **/
+var isExist = function isExist(obj) {
+  return obj !== undefined && obj !== null && obj === '';
+};
+
 /**
  * isFunction
  * @desc:判断是否是函数
@@ -2939,6 +2950,7 @@ var watermark = function watermark(option) {
   hsvTorgb: hsvTorgb,
   identical: identical,
   indexOfObj: indexOfObj,
+  isExist: isExist,
   isFunction: isFunction,
   isLogged: isLogged,
   isLogined: isLogined,

package/lib/dialog.js

@@ -1914,6 +1914,17 @@ var indexOfObj = function indexOfObj(arry, target, key) {
   return -1;
 };
 
+/**
+ * isExist
+ * @desc:判断是否存在
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {Object} [obj] -
+ **/
+var isExist = function isExist(obj) {
+  return obj !== undefined && obj !== null && obj === '';
+};
+
 /**
  * isFunction
  * @desc:判断是否是函数
@@ -2938,6 +2949,7 @@ var watermark = function watermark(option) {
   hsvTorgb: hsvTorgb,
   identical: identical,
   indexOfObj: indexOfObj,
+  isExist: isExist,
   isFunction: isFunction,
   isLogged: isLogged,
   isLogined: isLogined,