Commit 414ecd6ba23c90b20c71e97ea3ae8dd7fa8f3382
Merge branch 'main_dev' into 'v1.4.0_dev'
Main dev See merge request yunteng/thingskit-front!1361
Showing
3 changed files
with
5 additions
and
5 deletions
| @@ -20,9 +20,9 @@ | @@ -20,9 +20,9 @@ | ||
| 20 | </template> | 20 | </template> |
| 21 | <template #toolbar> | 21 | <template #toolbar> |
| 22 | <Authority value="api:yt:alarm:batch:clear"> | 22 | <Authority value="api:yt:alarm:batch:clear"> |
| 23 | - <Button @click="handleBatchClear" type="primary" :disabled="getCanBatchClear"> | ||
| 24 | - <span>批量清除</span> | ||
| 25 | - </Button> | 23 | + <a-button type="danger" :disabled="getCanBatchClear" @click="handleBatchClear"> |
| 24 | + 批量清除 | ||
| 25 | + </a-button> | ||
| 26 | </Authority> | 26 | </Authority> |
| 27 | <Authority value="api:yt:alarm:batch:handle"> | 27 | <Authority value="api:yt:alarm:batch:handle"> |
| 28 | <Button @click="handleBatchAck" type="primary" :disabled="getCanBatchAck"> | 28 | <Button @click="handleBatchAck" type="primary" :disabled="getCanBatchAck"> |
| @@ -96,7 +96,7 @@ | @@ -96,7 +96,7 @@ | ||
| 96 | <template #action> | 96 | <template #action> |
| 97 | <Tooltip title="删除"> | 97 | <Tooltip title="删除"> |
| 98 | <Icon | 98 | <Icon |
| 99 | - v-if="!disabledDrawer" | 99 | + v-if="!disabledDrawer && executionActionListRef.length > 1" |
| 100 | class="ml-2 cursor-pointer" | 100 | class="ml-2 cursor-pointer" |
| 101 | icon="fluent:delete-off-20-regular" | 101 | icon="fluent:delete-off-20-regular" |
| 102 | size="20" | 102 | size="20" |
| @@ -143,7 +143,7 @@ | @@ -143,7 +143,7 @@ | ||
| 143 | </div> | 143 | </div> |
| 144 | <Tooltip title="删除"> | 144 | <Tooltip title="删除"> |
| 145 | <Icon | 145 | <Icon |
| 146 | - v-if="!disabledDrawer" | 146 | + v-if="!disabledDrawer && flipFlopListElRef.length > 1" |
| 147 | class="ml-2 cursor-pointer" | 147 | class="ml-2 cursor-pointer" |
| 148 | icon="fluent:delete-off-20-regular" | 148 | icon="fluent:delete-off-20-regular" |
| 149 | size="20" | 149 | size="20" |