eoss-ui 0.7.88 → 0.7.89
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/data-table.js +25 -18
- package/lib/eoss-ui.common.js +39 -27
- package/lib/index.js +1 -1
- package/lib/select.js +13 -8
- package/package.json +1 -1
- package/packages/data-table/src/column.vue +19 -12
- package/packages/data-table/src/main.vue +1840 -1840
- package/packages/select/src/main.vue +13 -8
- package/src/index.js +1 -1
|
@@ -88,7 +88,7 @@ export default {
|
|
|
88
88
|
},
|
|
89
89
|
symbol: {
|
|
90
90
|
type: String,
|
|
91
|
-
default: '
|
|
91
|
+
default: ','
|
|
92
92
|
},
|
|
93
93
|
plain: Boolean,
|
|
94
94
|
where: Object,
|
|
@@ -640,8 +640,12 @@ export default {
|
|
|
640
640
|
if (!this.hide) {
|
|
641
641
|
if (this.readonly) {
|
|
642
642
|
let dom = [];
|
|
643
|
-
|
|
644
|
-
|
|
643
|
+
let models = JSON.parse(JSON.stringify(this.models));
|
|
644
|
+
if(models.includes(',')){
|
|
645
|
+
models = models.split(',');
|
|
646
|
+
}
|
|
647
|
+
if (Array.isArray(models)) {
|
|
648
|
+
dom = models.map((item) => {
|
|
645
649
|
if (util.isObject(item)) {
|
|
646
650
|
if (!item[this.label] && !item.label) {
|
|
647
651
|
return this.getLabel(value[this.valKey], data);
|
|
@@ -650,15 +654,16 @@ export default {
|
|
|
650
654
|
}
|
|
651
655
|
return this.getLabel(item, this.results);
|
|
652
656
|
});
|
|
653
|
-
} else if (util.isObject(
|
|
654
|
-
if (!
|
|
655
|
-
dom = [this.getLabel(
|
|
657
|
+
} else if (util.isObject(models)) {
|
|
658
|
+
if (!models[this.label] && !models.label) {
|
|
659
|
+
dom = [this.getLabel(models[this.valKey], this.results)];
|
|
656
660
|
} else {
|
|
657
|
-
dom = [
|
|
661
|
+
dom = [models[this.label] || models.label];
|
|
658
662
|
}
|
|
659
663
|
} else {
|
|
660
|
-
dom = [this.getLabel(
|
|
664
|
+
dom = [this.getLabel(models, this.results)];
|
|
661
665
|
}
|
|
666
|
+
console.log('dom', dom);
|
|
662
667
|
return h(
|
|
663
668
|
'div',
|
|
664
669
|
{
|