Commit e029909ae8f28a562024cf788d6e9fc6019328c9
Merge branch 'ft' into 'main'
fix:[DEFECT-324] 统一表格选中问题 See merge request huang/yun-teng-iot-front!189
Showing
14 changed files
with
19 additions
and
5 deletions
| ... | ... | @@ -12,6 +12,7 @@ |
| 12 | 12 | @selection-change="useSelectionChange" |
| 13 | 13 | :rowSelection="{ type: 'checkbox' }" |
| 14 | 14 | class="w-3/4 xl:w-4/5" |
| 15 | + :clickToRowSelect="false" | |
| 15 | 16 | > |
| 16 | 17 | <template #toolbar> |
| 17 | 18 | <a-button type="primary" @click="handleCreateOrEdit(null)"> 新增告警配置 </a-button> | ... | ... |
| ... | ... | @@ -6,7 +6,12 @@ |
| 6 | 6 | @select="handleSelect" |
| 7 | 7 | ref="organizationIdTreeRef" |
| 8 | 8 | /> |
| 9 | - <BasicTable @register="registerTable" :searchInfo="searchInfo" class="w-3/4 xl:w-4/5"> | |
| 9 | + <BasicTable | |
| 10 | + :clickToRowSelect="false" | |
| 11 | + @register="registerTable" | |
| 12 | + :searchInfo="searchInfo" | |
| 13 | + class="w-3/4 xl:w-4/5" | |
| 14 | + > | |
| 10 | 15 | <template #toolbar> |
| 11 | 16 | <a-button type="primary" @click="handleCreateOrEdit(null)"> 新增告警联系人 </a-button> |
| 12 | 17 | <a-button | ... | ... |
| 1 | 1 | <template> |
| 2 | 2 | <div> |
| 3 | - <BasicTable @register="registerTable"> | |
| 3 | + <BasicTable :clickToRowSelect="false" @register="registerTable"> | |
| 4 | 4 | <template #toolbar> |
| 5 | 5 | <a-button type="primary" @click="handleAdd">新增通知</a-button> |
| 6 | 6 | <a-button color="error" @click="handleDeleteOrBatchDelete(null)" :disabled="hasBatchDelete"> | ... | ... |
| ... | ... | @@ -6,7 +6,7 @@ |
| 6 | 6 | @select="handleSelect" |
| 7 | 7 | ref="organizationIdTreeRef" |
| 8 | 8 | /> |
| 9 | - <BasicTable @register="registerTable" class="w-3/4 xl:w-4/5"> | |
| 9 | + <BasicTable :clickToRowSelect="false" @register="registerTable" class="w-3/4 xl:w-4/5"> | |
| 10 | 10 | <template #toolbar> |
| 11 | 11 | <a-button type="primary" @click="handleCreate">新增账号</a-button> |
| 12 | 12 | <a-button | ... | ... |
| 1 | 1 | <template> |
| 2 | 2 | <div> |
| 3 | - <BasicTable @register="registerTable"> | |
| 3 | + <BasicTable :clickToRowSelect="false" @register="registerTable"> | |
| 4 | 4 | <template #toolbar> |
| 5 | 5 | <a-button type="primary" @click="handleCreate"> 新增字典 </a-button> |
| 6 | 6 | <a-button color="error" @click="handleDeleteOrBatchDelete(null)" :disabled="hasBatchDelete"> | ... | ... |
| 1 | 1 | <template> |
| 2 | 2 | <div class="p-4"> |
| 3 | - <BasicTable @register="registerTable" @fetch-success="onFetchSuccess"> | |
| 3 | + <BasicTable :clickToRowSelect="false" @register="registerTable" @fetch-success="onFetchSuccess"> | |
| 4 | 4 | <template #toolbar> |
| 5 | 5 | <a-button type="primary" @click="handleCreate"> |
| 6 | 6 | {{ getI18n }} | ... | ... |