eoss-ui 0.7.88 → 0.7.89

package/lib/data-table.js

@@ -5065,8 +5065,8 @@ childrenvue_type_template_id_271bb842_render._withStripped = true
 
 // CONCATENATED MODULE: ./packages/data-table/src/children.vue?vue&type=template&id=271bb842&
 
-// 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=8d40b3a8&
-var columnvue_type_template_id_8d40b3a8_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=466ae6f8&
+var columnvue_type_template_id_466ae6f8_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -5876,11 +5876,11 @@ var columnvue_type_template_id_8d40b3a8_render = function () {
     2
   )
 }
-var columnvue_type_template_id_8d40b3a8_staticRenderFns = []
-columnvue_type_template_id_8d40b3a8_render._withStripped = true
+var columnvue_type_template_id_466ae6f8_staticRenderFns = []
+columnvue_type_template_id_466ae6f8_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/column.vue?vue&type=template&id=8d40b3a8&
+// CONCATENATED MODULE: ./packages/data-table/src/column.vue?vue&type=template&id=466ae6f8&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(4);
@@ -6538,6 +6538,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
     },
     isForm: function isForm() {
       var type = this.type ? this.type.toLowerCase() : '';
+      console.log('type', type);
       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', 'component'].indexOf(type) > -1;
       return flag;
     },
@@ -6661,6 +6662,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
       return Array.isArray(types) ? types.includes(type) : type == types;
     },
     getOptions: function getOptions(config) {
+      console.log('getOptions config', config);
       var option = config && config[this.field || this.prop];
       return option && (typeof option === 'undefined' ? 'undefined' : _typeof(option)) == 'object' ? _extends({}, this.formOption, option) : this.formOption;
     },
@@ -6679,10 +6681,15 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
       var field = this.field || this.prop;
       var data = this.option;
       var str = '';
-      if (util["a" /* default */].isObject(rows[field])) {
-        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) {
+      console.log('rows[field]', rows[field]);
+      var column = rows[field] ? JSON.parse(JSON.stringify(rows[field])) : '';
+      if (column.includes(',')) {
+        column = column.split(',');
+      }
+      if (util["a" /* default */].isObject(column)) {
+        str = column[this.labelKey] || column['name'] || column['label'] || column['shortName'];
+      } else if (Array.isArray(column)) {
+        var vals = column.map(function (item) {
           if (util["a" /* default */].isObject(item)) {
             return item[_this2.labelKey] || item['name'] || item['label'] || item['shortName'];
           } else {
@@ -6692,21 +6699,21 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
             return item;
           }
         });
-        str = 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) {
+          var _vals = column.split(',').map(function (item) {
             if (data && data.length && util["a" /* default */].isObject(data[0])) {
               return _this2.getLabel(data, item);
             }
             return item;
           });
-          str = _vals.join(this.symbol ? this.symbol : '-');
+          str = _vals.join(this.symbol ? this.symbol : ',');
         } else {
           if (data && data.length && util["a" /* default */].isObject(data[0])) {
-            str = this.getLabel(data, rows[field]);
+            str = this.getLabel(data, column);
           } else {
-            str = rows[field];
+            str = column;
           }
         }
       }
@@ -6830,8 +6837,8 @@ var componentNormalizer = __webpack_require__(3);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_columnvue_type_script_lang_js_,
-  columnvue_type_template_id_8d40b3a8_render,
-  columnvue_type_template_id_8d40b3a8_staticRenderFns,
+  columnvue_type_template_id_466ae6f8_render,
+  columnvue_type_template_id_466ae6f8_staticRenderFns,
   false,
   null,
   null,
@@ -6839,7 +6846,7 @@ var component = Object(componentNormalizer["a" /* default */])(
   
 )
 
-/* harmony default export */ var column = (component.exports);
+/* harmony default export */ var src_column = (component.exports);
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/children.vue?vue&type=script&lang=js&
 //
 //
@@ -6865,7 +6872,7 @@ var component = Object(componentNormalizer["a" /* default */])(
 /* harmony default export */ var childrenvue_type_script_lang_js_ = ({
   name: 'Children',
   components: {
-    column: column
+    column: src_column
   },
   props: {
     dragSort: Boolean,

package/lib/eoss-ui.common.js

@@ -10202,8 +10202,8 @@ childrenvue_type_template_id_271bb842_render._withStripped = true
 
 // CONCATENATED MODULE: ./packages/data-table/src/children.vue?vue&type=template&id=271bb842&
 
-// 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=8d40b3a8&
-var columnvue_type_template_id_8d40b3a8_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=466ae6f8&
+var columnvue_type_template_id_466ae6f8_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -11013,11 +11013,11 @@ var columnvue_type_template_id_8d40b3a8_render = function () {
     2
   )
 }
-var columnvue_type_template_id_8d40b3a8_staticRenderFns = []
-columnvue_type_template_id_8d40b3a8_render._withStripped = true
+var columnvue_type_template_id_466ae6f8_staticRenderFns = []
+columnvue_type_template_id_466ae6f8_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/column.vue?vue&type=template&id=8d40b3a8&
+// CONCATENATED MODULE: ./packages/data-table/src/column.vue?vue&type=template&id=466ae6f8&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/column.vue?vue&type=script&lang=js&
 
@@ -11668,6 +11668,7 @@ function columnvue_type_script_lang_js_asyncToGenerator(fn) { return function ()
     },
     isForm: function isForm() {
       var type = this.type ? this.type.toLowerCase() : '';
+      console.log('type', type);
       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', 'component'].indexOf(type) > -1;
       return flag;
     },
@@ -11791,6 +11792,7 @@ function columnvue_type_script_lang_js_asyncToGenerator(fn) { return function ()
       return Array.isArray(types) ? types.includes(type) : type == types;
     },
     getOptions: function getOptions(config) {
+      console.log('getOptions config', config);
       var option = config && config[this.field || this.prop];
       return option && (typeof option === 'undefined' ? 'undefined' : columnvue_type_script_lang_js_typeof(option)) == 'object' ? columnvue_type_script_lang_js_extends({}, this.formOption, option) : this.formOption;
     },
@@ -11809,10 +11811,15 @@ function columnvue_type_script_lang_js_asyncToGenerator(fn) { return function ()
       var field = this.field || this.prop;
       var data = this.option;
       var str = '';
-      if (utils_util.isObject(rows[field])) {
-        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) {
+      console.log('rows[field]', rows[field]);
+      var column = rows[field] ? JSON.parse(JSON.stringify(rows[field])) : '';
+      if (column.includes(',')) {
+        column = column.split(',');
+      }
+      if (utils_util.isObject(column)) {
+        str = column[this.labelKey] || column['name'] || column['label'] || column['shortName'];
+      } else if (Array.isArray(column)) {
+        var vals = column.map(function (item) {
           if (utils_util.isObject(item)) {
             return item[_this2.labelKey] || item['name'] || item['label'] || item['shortName'];
           } else {
@@ -11822,21 +11829,21 @@ function columnvue_type_script_lang_js_asyncToGenerator(fn) { return function ()
             return item;
           }
         });
-        str = 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) {
+          var _vals = column.split(',').map(function (item) {
             if (data && data.length && utils_util.isObject(data[0])) {
               return _this2.getLabel(data, item);
             }
             return item;
           });
-          str = _vals.join(this.symbol ? this.symbol : '-');
+          str = _vals.join(this.symbol ? this.symbol : ',');
         } else {
           if (data && data.length && utils_util.isObject(data[0])) {
-            str = this.getLabel(data, rows[field]);
+            str = this.getLabel(data, column);
           } else {
-            str = rows[field];
+            str = column;
           }
         }
       }
@@ -11957,8 +11964,8 @@ function columnvue_type_script_lang_js_asyncToGenerator(fn) { return function ()
 
 var column_component = normalizeComponent(
   src_columnvue_type_script_lang_js_,
-  columnvue_type_template_id_8d40b3a8_render,
-  columnvue_type_template_id_8d40b3a8_staticRenderFns,
+  columnvue_type_template_id_466ae6f8_render,
+  columnvue_type_template_id_466ae6f8_staticRenderFns,
   false,
   null,
   null,
@@ -11966,7 +11973,7 @@ var column_component = normalizeComponent(
   
 )
 
-/* harmony default export */ var column = (column_component.exports);
+/* harmony default export */ var src_column = (column_component.exports);
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/children.vue?vue&type=script&lang=js&
 //
 //
@@ -11992,7 +11999,7 @@ var column_component = normalizeComponent(
 /* harmony default export */ var childrenvue_type_script_lang_js_ = ({
   name: 'Children',
   components: {
-    column: column
+    column: src_column
   },
   props: {
     dragSort: Boolean,
@@ -85421,7 +85428,7 @@ function select_src_mainvue_type_script_lang_js_objectWithoutProperties(obj, key
     },
     symbol: {
       type: String,
-      default: '，'
+      default: ','
     },
     plain: Boolean,
     where: Object,
@@ -85890,8 +85897,12 @@ function select_src_mainvue_type_script_lang_js_objectWithoutProperties(obj, key
     if (!this.hide) {
       if (this.readonly) {
         var dom = [];
-        if (Array.isArray(this.models)) {
-          dom = this.models.map(function (item) {
+        var models = JSON.parse(JSON.stringify(this.models));
+        if (models.includes(',')) {
+          models = models.split(',');
+        }
+        if (Array.isArray(models)) {
+          dom = models.map(function (item) {
             if (utils_util.isObject(item)) {
               if (!item[_this8.label] && !item.label) {
                 return _this8.getLabel(value[_this8.valKey], data);
@@ -85900,15 +85911,16 @@ function select_src_mainvue_type_script_lang_js_objectWithoutProperties(obj, key
             }
             return _this8.getLabel(item, _this8.results);
           });
-        } else if (utils_util.isObject(this.models)) {
-          if (!this.models[this.label] && !this.models.label) {
-            dom = [this.getLabel(this.models[this.valKey], this.results)];
+        } else if (utils_util.isObject(models)) {
+          if (!models[this.label] && !models.label) {
+            dom = [this.getLabel(models[this.valKey], this.results)];
           } else {
-            dom = [this.models[this.label] || this.models.label];
+            dom = [models[this.label] || models.label];
           }
         } else {
-          dom = [this.getLabel(this.models, this.results)];
+          dom = [this.getLabel(models, this.results)];
         }
+        console.log('dom', dom);
         return h('div', {
           class: [{
             'es-plain': this.plain,
@@ -102453,7 +102465,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
-  version: '0.7.88',
+  version: '0.7.89',
   install: install,
   Button: packages_button,
   ButtonGroup: button_group,