mooho-base-admin-plus 2.10.18 → 2.10.20
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/history.md +2 -0
- package/package/mooho-base-admin-plus.min.esm.js +33 -27
- package/package/mooho-base-admin-plus.min.js +13 -13
- package/package/style.css +1 -1
- package/package.json +1 -1
- package/src/components/view/mixin.js +6 -2
- package/src/components/view/view-form.vue +5 -1
- package/src/components/view/view-table.vue +5 -1
package/package.json
CHANGED
|
@@ -72,6 +72,12 @@ export default {
|
|
|
72
72
|
},
|
|
73
73
|
// 获取标签颜色
|
|
74
74
|
getTagColor(column, data) {
|
|
75
|
+
let color = 'default';
|
|
76
|
+
|
|
77
|
+
if (data == null) {
|
|
78
|
+
return color;
|
|
79
|
+
}
|
|
80
|
+
|
|
75
81
|
let tagColor = [];
|
|
76
82
|
if (column.param) {
|
|
77
83
|
try {
|
|
@@ -81,8 +87,6 @@ export default {
|
|
|
81
87
|
}
|
|
82
88
|
}
|
|
83
89
|
|
|
84
|
-
let color = 'default';
|
|
85
|
-
|
|
86
90
|
tagColor.forEach(item => {
|
|
87
91
|
if (
|
|
88
92
|
item.value.split(',').some(i => {
|
|
@@ -103,7 +103,11 @@
|
|
|
103
103
|
</div>
|
|
104
104
|
</template>
|
|
105
105
|
<template v-else-if="column.controlType === 'Tag'">
|
|
106
|
-
<Tag
|
|
106
|
+
<Tag
|
|
107
|
+
v-if="parseData(data, column.code) != null"
|
|
108
|
+
:color="getTagColor(column, parseData(data, column.code))"
|
|
109
|
+
:type="column.source == 'default' ? null : column.source"
|
|
110
|
+
>
|
|
107
111
|
{{ showData(data, column) }}
|
|
108
112
|
</Tag>
|
|
109
113
|
</template>
|
|
@@ -138,7 +138,11 @@
|
|
|
138
138
|
></div>
|
|
139
139
|
</template>
|
|
140
140
|
<template v-else-if="column.controlType === 'Tag'">
|
|
141
|
-
<Tag
|
|
141
|
+
<Tag
|
|
142
|
+
v-if="parseData(rowData(row, index), column.code) != null"
|
|
143
|
+
:color="getTagColor(column, parseData(rowData(row, index), column.code))"
|
|
144
|
+
:type="column.source == 'default' ? null : column.source"
|
|
145
|
+
>
|
|
142
146
|
{{ showData(rowData(row, index), column) }}
|
|
143
147
|
</Tag>
|
|
144
148
|
</template>
|