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,6 +12,7 @@ | ||
| 12 | @selection-change="useSelectionChange" | 12 | @selection-change="useSelectionChange" |
| 13 | :rowSelection="{ type: 'checkbox' }" | 13 | :rowSelection="{ type: 'checkbox' }" |
| 14 | class="w-3/4 xl:w-4/5" | 14 | class="w-3/4 xl:w-4/5" |
| 15 | + :clickToRowSelect="false" | ||
| 15 | > | 16 | > |
| 16 | <template #toolbar> | 17 | <template #toolbar> |
| 17 | <a-button type="primary" @click="handleCreateOrEdit(null)"> 新增告警配置 </a-button> | 18 | <a-button type="primary" @click="handleCreateOrEdit(null)"> 新增告警配置 </a-button> |
| @@ -6,7 +6,12 @@ | @@ -6,7 +6,12 @@ | ||
| 6 | @select="handleSelect" | 6 | @select="handleSelect" |
| 7 | ref="organizationIdTreeRef" | 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 | <template #toolbar> | 15 | <template #toolbar> |
| 11 | <a-button type="primary" @click="handleCreateOrEdit(null)"> 新增告警联系人 </a-button> | 16 | <a-button type="primary" @click="handleCreateOrEdit(null)"> 新增告警联系人 </a-button> |
| 12 | <a-button | 17 | <a-button |
| @@ -11,6 +11,7 @@ | @@ -11,6 +11,7 @@ | ||
| 11 | :rowSelection="{ type: 'checkbox' }" | 11 | :rowSelection="{ type: 'checkbox' }" |
| 12 | @register="registerTable" | 12 | @register="registerTable" |
| 13 | class="w-5/6 xl:w-4/5" | 13 | class="w-5/6 xl:w-4/5" |
| 14 | + :clickToRowSelect="false" | ||
| 14 | > | 15 | > |
| 15 | <template #toolbar> | 16 | <template #toolbar> |
| 16 | <a-button type="primary" @click="handleCreate" v-if="authBtn(role)"> 新增设备 </a-button> | 17 | <a-button type="primary" @click="handleCreate" v-if="authBtn(role)"> 新增设备 </a-button> |
| @@ -5,6 +5,7 @@ | @@ -5,6 +5,7 @@ | ||
| 5 | @register="registerTable" | 5 | @register="registerTable" |
| 6 | @selection-change="useSelectionChange" | 6 | @selection-change="useSelectionChange" |
| 7 | :rowSelection="{ type: 'checkbox' }" | 7 | :rowSelection="{ type: 'checkbox' }" |
| 8 | + :clickToRowSelect="false" | ||
| 8 | > | 9 | > |
| 9 | <template #toolbar> | 10 | <template #toolbar> |
| 10 | <a-button type="primary" @click="handleCreate"> 新增设备配置 </a-button> | 11 | <a-button type="primary" @click="handleCreate"> 新增设备配置 </a-button> |
| @@ -4,6 +4,7 @@ | @@ -4,6 +4,7 @@ | ||
| 4 | @selection-change="useSelectionChange" | 4 | @selection-change="useSelectionChange" |
| 5 | :rowSelection="{ type: 'checkbox' }" | 5 | :rowSelection="{ type: 'checkbox' }" |
| 6 | @register="registerTable" | 6 | @register="registerTable" |
| 7 | + :clickToRowSelect="false" | ||
| 7 | > | 8 | > |
| 8 | <template #toolbar> | 9 | <template #toolbar> |
| 9 | <a-button type="primary" @click="handleCreate"> 新增消息配置 </a-button> | 10 | <a-button type="primary" @click="handleCreate"> 新增消息配置 </a-button> |
| @@ -4,6 +4,7 @@ | @@ -4,6 +4,7 @@ | ||
| 4 | @selection-change="useSelectionChange" | 4 | @selection-change="useSelectionChange" |
| 5 | :rowSelection="{ type: 'checkbox' }" | 5 | :rowSelection="{ type: 'checkbox' }" |
| 6 | @register="registerTable" | 6 | @register="registerTable" |
| 7 | + :clickToRowSelect="false" | ||
| 7 | > | 8 | > |
| 8 | <template #toolbar> | 9 | <template #toolbar> |
| 9 | <a-button type="primary" @click="handleCreate"> 新增消息模板 </a-button> | 10 | <a-button type="primary" @click="handleCreate"> 新增消息模板 </a-button> |
| 1 | <template> | 1 | <template> |
| 2 | <div> | 2 | <div> |
| 3 | - <BasicTable @register="registerTable"> | 3 | + <BasicTable :clickToRowSelect="false" @register="registerTable"> |
| 4 | <template #toolbar> | 4 | <template #toolbar> |
| 5 | <a-button type="primary" @click="handleAdd">新增通知</a-button> | 5 | <a-button type="primary" @click="handleAdd">新增通知</a-button> |
| 6 | <a-button color="error" @click="handleDeleteOrBatchDelete(null)" :disabled="hasBatchDelete"> | 6 | <a-button color="error" @click="handleDeleteOrBatchDelete(null)" :disabled="hasBatchDelete"> |
| @@ -5,6 +5,7 @@ | @@ -5,6 +5,7 @@ | ||
| 5 | @register="registerTable" | 5 | @register="registerTable" |
| 6 | :loading="loading" | 6 | :loading="loading" |
| 7 | :rowSelection="{ type: 'checkbox' }" | 7 | :rowSelection="{ type: 'checkbox' }" |
| 8 | + :clickToRowSelect="false" | ||
| 8 | > | 9 | > |
| 9 | <template #toolbar> | 10 | <template #toolbar> |
| 10 | <a-button type="primary" @click="handleAdd"> 添加流转 </a-button> | 11 | <a-button type="primary" @click="handleAdd"> 添加流转 </a-button> |
| @@ -6,7 +6,7 @@ | @@ -6,7 +6,7 @@ | ||
| 6 | @select="handleSelect" | 6 | @select="handleSelect" |
| 7 | ref="organizationIdTreeRef" | 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 | <template #toolbar> | 10 | <template #toolbar> |
| 11 | <a-button type="primary" @click="handleCreate">新增账号</a-button> | 11 | <a-button type="primary" @click="handleCreate">新增账号</a-button> |
| 12 | <a-button | 12 | <a-button |
| 1 | <template> | 1 | <template> |
| 2 | <div> | 2 | <div> |
| 3 | - <BasicTable @register="registerTable"> | 3 | + <BasicTable :clickToRowSelect="false" @register="registerTable"> |
| 4 | <template #toolbar> | 4 | <template #toolbar> |
| 5 | <a-button type="primary" @click="handleCreate"> 新增字典 </a-button> | 5 | <a-button type="primary" @click="handleCreate"> 新增字典 </a-button> |
| 6 | <a-button color="error" @click="handleDeleteOrBatchDelete(null)" :disabled="hasBatchDelete"> | 6 | <a-button color="error" @click="handleDeleteOrBatchDelete(null)" :disabled="hasBatchDelete"> |
| 1 | <template> | 1 | <template> |
| 2 | <div class="p-4"> | 2 | <div class="p-4"> |
| 3 | - <BasicTable @register="registerTable" @fetch-success="onFetchSuccess"> | 3 | + <BasicTable :clickToRowSelect="false" @register="registerTable" @fetch-success="onFetchSuccess"> |
| 4 | <template #toolbar> | 4 | <template #toolbar> |
| 5 | <a-button type="primary" @click="handleCreate"> | 5 | <a-button type="primary" @click="handleCreate"> |
| 6 | {{ getI18n }} | 6 | {{ getI18n }} |
| @@ -4,6 +4,7 @@ | @@ -4,6 +4,7 @@ | ||
| 4 | :rowSelection="{ type: 'checkbox' }" | 4 | :rowSelection="{ type: 'checkbox' }" |
| 5 | @selection-change="useSelectionChange" | 5 | @selection-change="useSelectionChange" |
| 6 | @register="registerTable" | 6 | @register="registerTable" |
| 7 | + :clickToRowSelect="false" | ||
| 7 | > | 8 | > |
| 8 | <template #toolbar> | 9 | <template #toolbar> |
| 9 | <a-button type="primary" @click="handleCreate">新增角色</a-button> | 10 | <a-button type="primary" @click="handleCreate">新增角色</a-button> |
| @@ -4,6 +4,7 @@ | @@ -4,6 +4,7 @@ | ||
| 4 | @selection-change="useSelectionChange" | 4 | @selection-change="useSelectionChange" |
| 5 | :rowSelection="{ type: 'checkbox' }" | 5 | :rowSelection="{ type: 'checkbox' }" |
| 6 | @register="registerTable" | 6 | @register="registerTable" |
| 7 | + :clickToRowSelect="false" | ||
| 7 | > | 8 | > |
| 8 | <template #toolbar> | 9 | <template #toolbar> |
| 9 | <a-button type="primary" @click="handleAdd"> 新增租户配置 </a-button> | 10 | <a-button type="primary" @click="handleAdd"> 新增租户配置 </a-button> |
| @@ -4,6 +4,7 @@ | @@ -4,6 +4,7 @@ | ||
| 4 | @register="registerTable" | 4 | @register="registerTable" |
| 5 | @selection-change="useSelectionChange" | 5 | @selection-change="useSelectionChange" |
| 6 | :rowSelection="{ type: 'checkbox' }" | 6 | :rowSelection="{ type: 'checkbox' }" |
| 7 | + :clickToRowSelect="false" | ||
| 7 | > | 8 | > |
| 8 | <template #toolbar> | 9 | <template #toolbar> |
| 9 | <a-button type="primary" @click="handleCreate"> 新增角色 </a-button> | 10 | <a-button type="primary" @click="handleCreate"> 新增角色 </a-button> |