Commit f6280df29c2a0baa267a698bd4073bfb547d4b50

Authored by sqy
1 parent 509576d5

’fix:修复删除逻辑'

@@ -8,6 +8,7 @@ import { useMessage } from '/@/hooks/web/useMessage'; @@ -8,6 +8,7 @@ import { useMessage } from '/@/hooks/web/useMessage';
8 * hasBatchDelete: 是否可以删除 8 * hasBatchDelete: 是否可以删除
9 * selectionOptions 表格复选框配置项 9 * selectionOptions 表格复选框配置项
10 * handleDeleteOrBatchDelete 删除方法,适用单一删除和批量删除。参数为null为批量删除 10 * handleDeleteOrBatchDelete 删除方法,适用单一删除和批量删除。参数为null为批量删除
  11 + * resetSelectedRowKeys 重置选中的数据
11 * } 12 * }
12 * 13 *
13 */ 14 */
@@ -49,6 +50,10 @@ export const useBatchDelete = ( @@ -49,6 +50,10 @@ export const useBatchDelete = (
49 } 50 }
50 }; 51 };
51 52
  53 + const resetSelectedRowKeys = () => {
  54 + selectedRowIds.value = [];
  55 + };
  56 +
52 const selectionOptions: selectionOptions = { 57 const selectionOptions: selectionOptions = {
53 rowKey: 'id', 58 rowKey: 'id',
54 clickToRowSelect: false, 59 clickToRowSelect: false,
@@ -57,5 +62,5 @@ export const useBatchDelete = ( @@ -57,5 +62,5 @@ export const useBatchDelete = (
57 type: 'checkbox', 62 type: 'checkbox',
58 }, 63 },
59 }; 64 };
60 - return { hasBatchDelete, selectionOptions, handleDeleteOrBatchDelete }; 65 + return { hasBatchDelete, selectionOptions, handleDeleteOrBatchDelete, resetSelectedRowKeys };
61 }; 66 };
@@ -70,10 +70,8 @@ @@ -70,10 +70,8 @@
70 name: 'LinkEdge', 70 name: 'LinkEdge',
71 components: { BasicTable, SceneLinkAgeDrawer, TableAction, Switch }, 71 components: { BasicTable, SceneLinkAgeDrawer, TableAction, Switch },
72 setup() { 72 setup() {
73 - const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions } = useBatchDelete(  
74 - screenLinkPageDeleteApi,  
75 - handleSuccess  
76 - ); 73 + const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions, resetSelectedRowKeys } =
  74 + useBatchDelete(screenLinkPageDeleteApi, handleSuccess);
77 selectionOptions.rowSelection.getCheckboxProps = (record: Recordable) => { 75 selectionOptions.rowSelection.getCheckboxProps = (record: Recordable) => {
78 // Demo:status为1的选择框禁用 76 // Demo:status为1的选择框禁用
79 if (record.status === 1) { 77 if (record.status === 1) {
@@ -87,7 +85,7 @@ @@ -87,7 +85,7 @@
87 const userId = userInfo.userId; 85 const userId = userInfo.userId;
88 const role: string = userInfo.roles[0]; 86 const role: string = userInfo.roles[0];
89 const [registerDrawer, { openDrawer }] = useDrawer(); 87 const [registerDrawer, { openDrawer }] = useDrawer();
90 - const [registerTable, { reload, setProps }] = useTable({ 88 + const [registerTable, { reload, setProps, setSelectedRowKeys }] = useTable({
91 title: '场景联动列表', 89 title: '场景联动列表',
92 api: screenLinkPageGetApi, 90 api: screenLinkPageGetApi,
93 columns, 91 columns,
@@ -136,6 +134,8 @@ @@ -136,6 +134,8 @@
136 setProps({ 134 setProps({
137 loading: true, 135 loading: true,
138 }); 136 });
  137 + setSelectedRowKeys([]);
  138 + resetSelectedRowKeys();
139 const newStatus = checked ? 1 : 0; 139 const newStatus = checked ? 1 : 0;
140 const { createMessage } = useMessage(); 140 const { createMessage } = useMessage();
141 try { 141 try {
@@ -87,7 +87,6 @@ @@ -87,7 +87,6 @@
87 const { setLoginState, getLoginState } = useLoginState(); 87 const { setLoginState, getLoginState } = useLoginState();
88 const { getFormRules } = useFormRules(); 88 const { getFormRules } = useFormRules();
89 const storage = createLocalStorage(); 89 const storage = createLocalStorage();
90 - const visible = ref(false);  
91 const formRef = ref(); 90 const formRef = ref();
92 const loading = ref(false); 91 const loading = ref(false);
93 const rememberMe = ref(false); 92 const rememberMe = ref(false);