Commit 980b44478738fce353befdc7746850a1e9a874d2
1 parent
ea182ad6
fix：DEFECT-453 修改数据流转，先批量启用,然后单独禁用,批量删除按钮显示,点击删除成功问题
Showing
1 changed file
with
23 additions
and
11 deletions
| @@ -18,7 +18,9 @@ | @@ -18,7 +18,9 @@ | ||
| 18 | @click="handleDeleteOrBatchDelete(null)" | 18 | @click="handleDeleteOrBatchDelete(null)" |
| 19 | :disabled="singleStopDeleteStatus || hasBatchDelete" | 19 | :disabled="singleStopDeleteStatus || hasBatchDelete" |
| 20 | > | 20 | > |
| 21 | - 批量删除 | 21 | + <span :style="{ color: singleStopDeleteStatus || hasBatchDelete ? 'grey' : 'white' }" |
| 22 | + >批量删除</span | ||
| 23 | + > | ||
| 22 | </a-button> | 24 | </a-button> |
| 23 | </Authority> | 25 | </Authority> |
| 24 | <a-button | 26 | <a-button |
| @@ -128,6 +130,7 @@ | @@ -128,6 +130,7 @@ | ||
| 128 | let isJudgeSelectRowsArr: any = ref([]); | 130 | let isJudgeSelectRowsArr: any = ref([]); |
| 129 | const handleSuccess = () => { | 131 | const handleSuccess = () => { |
| 130 | reload(); | 132 | reload(); |
| 133 | + resetSelectedRowKeys(); | ||
| 131 | }; | 134 | }; |
| 132 | const [registerModal, { openModal }] = useModal(); | 135 | const [registerModal, { openModal }] = useModal(); |
| 133 | const [ | 136 | const [ |
| @@ -155,16 +158,14 @@ | @@ -155,16 +158,14 @@ | ||
| 155 | fixed: 'right', | 158 | fixed: 'right', |
| 156 | }, | 159 | }, |
| 157 | }); | 160 | }); |
| 158 | - const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions } = useBatchDelete( | ||
| 159 | - deleteConvertApi, | ||
| 160 | - handleSuccess, | ||
| 161 | - setProps | ||
| 162 | - ); | 161 | + const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions, resetSelectedRowKeys } = |
| 162 | + useBatchDelete(deleteConvertApi, handleSuccess, setProps); | ||
| 163 | selectionOptions.rowSelection.getCheckboxProps = (record: Recordable) => { | 163 | selectionOptions.rowSelection.getCheckboxProps = (record: Recordable) => { |
| 164 | - // Demo:status为1的选择框禁用 | 164 | + //status为1的选择框禁用 |
| 165 | if (record.status === 1) { | 165 | if (record.status === 1) { |
| 166 | return { disabled: true }; | 166 | return { disabled: true }; |
| 167 | } else { | 167 | } else { |
| 168 | + disabledStatus2.value = true; | ||
| 168 | singleStopDeleteStatus.value = false; | 169 | singleStopDeleteStatus.value = false; |
| 169 | return { disabled: false }; | 170 | return { disabled: false }; |
| 170 | } | 171 | } |
| @@ -204,8 +205,13 @@ | @@ -204,8 +205,13 @@ | ||
| 204 | if (res !== '') { | 205 | if (res !== '') { |
| 205 | createMessage.success('流转配置启用成功'); | 206 | createMessage.success('流转配置启用成功'); |
| 206 | setLoading(false); | 207 | setLoading(false); |
| 207 | - reload(); | 208 | + handleSuccess(); |
| 209 | + singleStopDeleteStatus.value = true; | ||
| 208 | disabledStatus1.value = true; | 210 | disabledStatus1.value = true; |
| 211 | + disabledStatus2.value = true; | ||
| 212 | + disabledStatus3.value = true; | ||
| 213 | + resetSelectedRowKeys(); | ||
| 214 | + clearSelectedRowKeys(); | ||
| 209 | } else { | 215 | } else { |
| 210 | createMessage.error('流转配置启用失败'); | 216 | createMessage.error('流转配置启用失败'); |
| 211 | } | 217 | } |
| @@ -228,7 +234,13 @@ | @@ -228,7 +234,13 @@ | ||
| 228 | if (res !== '') { | 234 | if (res !== '') { |
| 229 | createMessage.success('流转配置禁用成功'); | 235 | createMessage.success('流转配置禁用成功'); |
| 230 | setLoading(false); | 236 | setLoading(false); |
| 231 | - reload(); | 237 | + handleSuccess(); |
| 238 | + singleStopDeleteStatus.value = true; | ||
| 239 | + disabledStatus1.value = true; | ||
| 240 | + disabledStatus2.value = true; | ||
| 241 | + disabledStatus3.value = true; | ||
| 242 | + resetSelectedRowKeys(); | ||
| 243 | + clearSelectedRowKeys(); | ||
| 232 | } else { | 244 | } else { |
| 233 | createMessage.error('流转配置禁用失败'); | 245 | createMessage.error('流转配置禁用失败'); |
| 234 | } | 246 | } |
| @@ -287,7 +299,7 @@ | @@ -287,7 +299,7 @@ | ||
| 287 | if (res !== '') { | 299 | if (res !== '') { |
| 288 | createMessage.success('流转配置多项禁用成功'); | 300 | createMessage.success('流转配置多项禁用成功'); |
| 289 | setLoading(false); | 301 | setLoading(false); |
| 290 | - reload(); | 302 | + handleSuccess(); |
| 291 | } else { | 303 | } else { |
| 292 | createMessage.error('流转配置多项禁用失败'); | 304 | createMessage.error('流转配置多项禁用失败'); |
| 293 | } | 305 | } |
| @@ -314,7 +326,7 @@ | @@ -314,7 +326,7 @@ | ||
| 314 | if (res !== '') { | 326 | if (res !== '') { |
| 315 | createMessage.success('流转配置多项启用成功'); | 327 | createMessage.success('流转配置多项启用成功'); |
| 316 | setLoading(false); | 328 | setLoading(false); |
| 317 | - reload(); | 329 | + handleSuccess(); |
| 318 | disabledStatus1.value = true; | 330 | disabledStatus1.value = true; |
| 319 | singleStopDeleteStatus.value = true; | 331 | singleStopDeleteStatus.value = true; |
| 320 | } else { | 332 | } else { |