Commit 301f26068f52c3b7018f756877d8876d21e871ea

Authored by xp.Huang
2 parents 83c318b8 7247118c

Merge branch 'f-dev' into 'main'

fix:修复Teambition上的问题

See merge request huang/yun-teng-iot-front!285
... ... @@ -54,7 +54,7 @@ export const columns: BasicColumn[] = [
54 54 title: '配置状态',
55 55 dataIndex: 'status',
56 56 width: 120,
57   - slots: { customRender: 'status' },
  57 + slots: { customRender: 'configStatus' },
58 58 },
59 59 {
60 60 title: '执行方式',
... ...
... ... @@ -54,7 +54,7 @@
54 54 ]"
55 55 />
56 56 </template>
57   - <template #status="{ record }">
  57 + <template #configStatus="{ record }">
58 58 <Switch
59 59 :disabled="disabledSwitch"
60 60 :checked="record.status === 1"
... ... @@ -92,7 +92,7 @@
92 92 const searchInfo = reactive<Recordable>({});
93 93 const disabledSwitch = ref(false);
94 94
95   - const [registerTable, { reload, setProps }] = useTable({
  95 + const [registerTable, { reload, setProps, setSelectedRowKeys }] = useTable({
96 96 title: '报表列表',
97 97 api: reportPage,
98 98 columns,
... ... @@ -125,11 +125,8 @@
125 125 reload();
126 126 };
127 127
128   - const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions } = useBatchDelete(
129   - deleteReportManage,
130   - handleSuccess,
131   - setProps
132   - );
  128 + const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions, resetSelectedRowKeys } =
  129 + useBatchDelete(deleteReportManage, handleSuccess, setProps);
133 130 selectionOptions.rowSelection.getCheckboxProps = (record: Recordable) => {
134 131 // Demo:status为1的选择框禁用
135 132 if (record.status === 1) {
... ... @@ -181,6 +178,8 @@
181 178 setProps({
182 179 loading: true,
183 180 });
  181 + setSelectedRowKeys([]);
  182 + resetSelectedRowKeys();
184 183 disabledSwitch.value = true;
185 184 const newStatus = checked ? 1 : 0;
186 185 const res = await putReportByidAndStatusManage(record.id, newStatus);
... ...
... ... @@ -107,7 +107,7 @@
107 107
108 108 const disabledSwitch = ref(false);
109 109 const { createMessage } = useMessage();
110   - const [registerTable, { setProps, reload }] = useTable({
  110 + const [registerTable, { setProps, reload, setSelectedRowKeys }] = useTable({
111 111 title: '定时任务列表',
112 112 api: scheduePage,
113 113 columns: columnSchedue,
... ... @@ -134,11 +134,8 @@
134 134 const handleSuccess = () => {
135 135 reload();
136 136 };
137   - const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions } = useBatchDelete(
138   - deleteSchedueManage,
139   - handleSuccess,
140   - setProps
141   - );
  137 + const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions, resetSelectedRowKeys } =
  138 + useBatchDelete(deleteSchedueManage, handleSuccess, setProps);
142 139 selectionOptions.rowSelection.getCheckboxProps = (record: Recordable) => {
143 140 // Demo:status为1的选择框禁用
144 141 if (record.status === 1) {
... ... @@ -187,6 +184,8 @@
187 184 setProps({
188 185 loading: true,
189 186 });
  187 + setSelectedRowKeys([]);
  188 + resetSelectedRowKeys();
190 189 disabledSwitch.value = true;
191 190 const newStatus = checked ? 1 : 0;
192 191 const res = await putSchedueByidAndStatusManage(record.id, newStatus);
... ...