|
183 | 183 | <template #message> |
184 | 184 | <exclamation-circle-outlined style="color: red; fontSize: 30px; display: inline-flex" /> |
185 | 185 | <span style="padding-left: 5px" v-html="`<b>${selectedRowKeys.length} ` + $t('label.items.selected') + `. </b>`" /> |
186 | | - <span v-html="$t(currentAction.message)" /> |
| 186 | + <span v-html="currentAction.message" /> |
187 | 187 | </template> |
188 | 188 | </a-alert> |
189 | 189 | <a-alert v-else type="warning"> |
190 | 190 | <template #message> |
191 | 191 | <span v-if="selectedRowKeys.length > 0" v-html="`<b>${selectedRowKeys.length} ` + $t('label.items.selected') + `. </b>`" /> |
192 | | - <span v-html="$t(currentAction.message)" /> |
| 192 | + <span v-html="currentAction.message" /> |
193 | 193 | </template> |
194 | 194 | </a-alert> |
195 | 195 | </div> |
196 | 196 | <div v-else> |
197 | 197 | <a-alert type="warning"> |
198 | 198 | <template #message> |
199 | | - <span v-html="$t(currentAction.message)" /> |
| 199 | + <span v-html="currentAction.message" /> |
200 | 200 | </template> |
201 | 201 | </a-alert> |
202 | 202 | </div> |
@@ -1145,13 +1145,11 @@ export default { |
1145 | 1145 | this.currentAction.paramFields = [] |
1146 | 1146 | this.currentAction.paramFilters = [] |
1147 | 1147 | if ('message' in action) { |
1148 | | - var message = action.message |
1149 | 1148 | if (typeof action.message === 'function') { |
1150 | | - message = action.message(action.resource) |
| 1149 | + action.message = action.message(action.resource) |
1151 | 1150 | } |
1152 | | - action.message = message |
| 1151 | + action.message = Array.isArray(action.message) ? this.$t(...action.message) : this.$t(action.message) |
1153 | 1152 | } |
1154 | | -
|
1155 | 1153 | this.getArgs(action, isGroupAction, paramFields) |
1156 | 1154 | this.getFilters(action, isGroupAction, paramFields) |
1157 | 1155 | this.getFirstIndexFocus() |
@@ -1480,18 +1478,26 @@ export default { |
1480 | 1478 | this.selectedItems.filter(item => item === resource) |
1481 | 1479 | } |
1482 | 1480 | } |
1483 | | - var message = action.successMessage ? this.$t(action.successMessage) : this.$t(action.label) + |
1484 | | - (resourceName ? ' - ' + resourceName : '') |
1485 | | - var duration = 2 |
1486 | | - if (action.additionalMessage) { |
1487 | | - message = message + ' - ' + this.$t(action.successMessage) |
1488 | | - duration = 5 |
1489 | | - } |
1490 | 1481 | if (this.selectedItems.length === 0) { |
| 1482 | + let message = '' |
| 1483 | + let messageDuration = 2 |
| 1484 | + if ('successMessage' in action) { |
| 1485 | + message = action.successMessage |
| 1486 | + if (typeof action.successMessage === 'function') { |
| 1487 | + message = action.successMessage(action.resource) |
| 1488 | + } |
| 1489 | + message = Array.isArray(message) ? this.$t(...message) : this.$t(message) |
| 1490 | + } else { |
| 1491 | + message = this.$t(action.label) + (resourceName ? ' - ' + resourceName : '') |
| 1492 | + } |
| 1493 | + if ('additionalMessage' in action) { |
| 1494 | + message = `${message} - ${this.$t(action.additionalMessage)}` |
| 1495 | + messageDuration = 5 |
| 1496 | + } |
1491 | 1497 | this.$message.success({ |
1492 | 1498 | content: message, |
1493 | 1499 | key: action.label + resourceName, |
1494 | | - duration: duration |
| 1500 | + duration: messageDuration |
1495 | 1501 | }) |
1496 | 1502 | } |
1497 | 1503 | break |
|
0 commit comments