修复发件箱部分投递状态显示
This commit is contained in:
parent
fc0c550ab5
commit
8235ed537b
@ -298,6 +298,11 @@ export function usePage() {
|
|||||||
errorDialogVisible.value = true
|
errorDialogVisible.value = true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const isPartialDelivery = function (row) {
|
||||||
|
if (row?.status !== 2) return false
|
||||||
|
return /^投递未全部完成;已接收\s*[1-9]\d*,失败\s*[1-9]\d*/.test(String(row.error || ''))
|
||||||
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
EpArrowDownBold,
|
EpArrowDownBold,
|
||||||
Delete,
|
Delete,
|
||||||
@ -341,6 +346,7 @@ export function usePage() {
|
|||||||
isOutbox,
|
isOutbox,
|
||||||
trustSender,
|
trustSender,
|
||||||
showError,
|
showError,
|
||||||
|
isPartialDelivery,
|
||||||
errorDialogVisible,
|
errorDialogVisible,
|
||||||
currentErrorMsg,
|
currentErrorMsg,
|
||||||
isRefreshing,
|
isRefreshing,
|
||||||
|
|||||||
@ -92,6 +92,11 @@
|
|||||||
<el-icon><Warning /></el-icon> 投递结果待核对
|
<el-icon><Warning /></el-icon> 投递结果待核对
|
||||||
</el-tag>
|
</el-tag>
|
||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
|
<el-tooltip :content="scope.row.error" placement="top" v-else-if="isPartialDelivery(scope.row)">
|
||||||
|
<el-tag type="warning" effect="light" size="small" class="clickable-tag" @click.stop="showError(scope.row)">
|
||||||
|
<el-icon><Warning /></el-icon> 部分成功 (查看详情)
|
||||||
|
</el-tag>
|
||||||
|
</el-tooltip>
|
||||||
<el-tag type="success" effect="light" size="small" v-else-if="scope.row.status === 1 && !scope.row.error">
|
<el-tag type="success" effect="light" size="small" v-else-if="scope.row.status === 1 && !scope.row.error">
|
||||||
<el-icon><Check /></el-icon> 发送成功
|
<el-icon><Check /></el-icon> 发送成功
|
||||||
</el-tag>
|
</el-tag>
|
||||||
@ -164,6 +169,7 @@ const {
|
|||||||
isOutbox,
|
isOutbox,
|
||||||
trustSender,
|
trustSender,
|
||||||
showError,
|
showError,
|
||||||
|
isPartialDelivery,
|
||||||
errorDialogVisible,
|
errorDialogVisible,
|
||||||
currentErrorMsg,
|
currentErrorMsg,
|
||||||
isRefreshing,
|
isRefreshing,
|
||||||
|
|||||||
@ -11,6 +11,20 @@ const Vue = require('vue')
|
|||||||
const { parse, compileScript } = require('@vue/compiler-sfc')
|
const { parse, compileScript } = require('@vue/compiler-sfc')
|
||||||
const read = name => readFileSync(new URL(`../../frontend/${name}`, import.meta.url), 'utf8')
|
const read = name => readFileSync(new URL(`../../frontend/${name}`, import.meta.url), 'utf8')
|
||||||
|
|
||||||
|
test('发件箱必须区分部分成功与全部失败', () => {
|
||||||
|
const source = read('src/views/List/List.js')
|
||||||
|
.replace(/^import .*$/gm, '')
|
||||||
|
.replace('export function usePage', 'function usePage')
|
||||||
|
.replace(/export \{[^}]+\}\s*$/, '')
|
||||||
|
const { isPartialDelivery } = compileFunction(source + '\nreturn { isPartialDelivery }')()
|
||||||
|
assert.equal(isPartialDelivery({
|
||||||
|
status: 2,
|
||||||
|
error: '投递未全部完成;已接收 1,失败 1。已接收的收件人不会自动重投'
|
||||||
|
}), true)
|
||||||
|
assert.equal(isPartialDelivery({ status: 2, error: '投递失败;已接收 0,失败 2' }), false)
|
||||||
|
assert.equal(isPartialDelivery({ status: 1, error: '' }), false)
|
||||||
|
})
|
||||||
|
|
||||||
test('邮件列表挂载后,表格选中项必须用于全选和批量操作', async () => {
|
test('邮件列表挂载后,表格选中项必须用于全选和批量操作', async () => {
|
||||||
const source = read('src/views/List/List.js').replace(/^import .*$/gm, '')
|
const source = read('src/views/List/List.js').replace(/^import .*$/gm, '')
|
||||||
.replace('export function usePage', 'function usePage').replace(/export \{[^}]+\}\s*$/, '')
|
.replace('export function usePage', 'function usePage').replace(/export \{[^}]+\}\s*$/, '')
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user