eoss-ui 0.7.88 → 0.7.89

package/lib/select.js

@@ -4716,7 +4716,7 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
     },
     symbol: {
       type: String,
-      default: '，'
+      default: ','
     },
     plain: Boolean,
     where: Object,
@@ -5185,8 +5185,12 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
     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 (util["a" /* default */].isObject(item)) {
               if (!item[_this8.label] && !item.label) {
                 return _this8.getLabel(value[_this8.valKey], data);
@@ -5195,15 +5199,16 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
             }
             return _this8.getLabel(item, _this8.results);
           });
-        } else if (util["a" /* default */].isObject(this.models)) {
-          if (!this.models[this.label] && !this.models.label) {
-            dom = [this.getLabel(this.models[this.valKey], this.results)];
+        } else if (util["a" /* default */].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,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.7.88",
+  "version": "0.7.89",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [

package/packages/data-table/src/column.vue

@@ -660,6 +660,7 @@ export default {
     },
     isForm() {
       let type = this.type ? this.type.toLowerCase() : '';
+      console.log('type', type);
       let flag =
         (this.form &&
           [
@@ -799,6 +800,7 @@ export default {
       return Array.isArray(types) ? types.includes(type) : type == types;
     },
     getOptions(config) {
+      console.log('getOptions config', config);
       let option = config && config[this.field || this.prop];
       return option && typeof option == 'object'
         ? { ...this.formOption, ...option }
@@ -816,14 +818,19 @@ export default {
       const field = this.field || this.prop;
       let data = this.option;
       let str = '';
-      if (util.isObject(rows[field])) {
+      console.log('rows[field]', rows[field]);
+      let column = rows[field]?JSON.parse(JSON.stringify(rows[field])):'';
+      if(column.includes(',')){
+        column = column.split(',');
+      }
+      if (util.isObject(column)) {
         str =
-          rows[field][this.labelKey] ||
-          rows[field]['name'] ||
-          rows[field]['label'] ||
-          rows[field]['shortName'];
-      } else if (Array.isArray(rows[field])) {
-        const vals = rows[field].map((item) => {
+          column[this.labelKey] ||
+          column['name'] ||
+          column['label'] ||
+          column['shortName'];
+      } else if (Array.isArray(column)) {
+        const vals = column.map((item) => {
           if (util.isObject(item)) {
             return (
               item[this.labelKey] ||
@@ -838,21 +845,21 @@ export default {
             return item;
           }
         });
-        str = vals.join(this.symbol ? this.symbol : '-');
+        str = vals.join(this.symbol ? this.symbol : ',');
       } else {
         if (this.valueToString) {
-          const vals = rows[field].split(',').map((item) => {
+          const vals = column.split(',').map((item) => {
             if (data && data.length && util.isObject(data[0])) {
               return this.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.isObject(data[0])) {
-            str = this.getLabel(data, rows[field]);
+            str = this.getLabel(data, column);
           } else {
-            str = rows[field];
+            str = column;
           }
         }
       }