Commit f6280df29c2a0baa267a698bd4073bfb547d4b50

Authored by sqy
1 parent 509576d5

’fix:修复删除逻辑'

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