Commit 6a30d48a247602f9d079b334e313a51f16ee0d5f

Authored by ww
1 parent ae263438

fix: DEFECT-997 device list page first enter pagination not render

@@ -34,7 +34,7 @@ enum DeviceManagerApi { @@ -34,7 +34,7 @@ enum DeviceManagerApi {
34 } 34 }
35 35
36 export const devicePage = (params: DeviceQueryParam) => { 36 export const devicePage = (params: DeviceQueryParam) => {
37 - return defHttp.get<DeviceModel>({ 37 + return defHttp.get<PaginationResult<DeviceModel>>({
38 url: DeviceManagerApi.DEVICE_URL, 38 url: DeviceManagerApi.DEVICE_URL,
39 params, 39 params,
40 }); 40 });
@@ -224,31 +224,33 @@ @@ -224,31 +224,33 @@
224 const [registerTbDetailDrawer, { openDrawer: openTbDeviceDrawer }] = useDrawer(); 224 const [registerTbDetailDrawer, { openDrawer: openTbDeviceDrawer }] = useDrawer();
225 const [registerGatewayDetailDrawer, { openDrawer: openGatewayDetailDrawer }] = useDrawer(); 225 const [registerGatewayDetailDrawer, { openDrawer: openGatewayDetailDrawer }] = useDrawer();
226 226
227 - const [registerTable, { reload, setSelectedRowKeys, setProps, setTableData, getForm }] =  
228 - useTable({  
229 - title: '设备列表',  
230 - api: devicePage,  
231 - immediate: immediateStatus.value,  
232 - columns,  
233 - formConfig: {  
234 - labelWidth: 100,  
235 - schemas: searchFormSchema,  
236 - resetFunc: resetFn,  
237 - },  
238 - useSearchForm: true,  
239 - showTableSetting: true,  
240 - bordered: true,  
241 - showIndexColumn: false,  
242 - rowKey: 'id',  
243 - searchInfo: searchInfo,  
244 - clickToRowSelect: false,  
245 - actionColumn: {  
246 - width: 200,  
247 - title: '操作',  
248 - slots: { customRender: 'action' },  
249 - fixed: 'right',  
250 - },  
251 - }); 227 + const [
  228 + registerTable,
  229 + { reload, setSelectedRowKeys, setProps, setTableData, getForm, setPagination },
  230 + ] = useTable({
  231 + title: '设备列表',
  232 + api: devicePage,
  233 + immediate: immediateStatus.value,
  234 + columns,
  235 + formConfig: {
  236 + labelWidth: 100,
  237 + schemas: searchFormSchema,
  238 + resetFunc: resetFn,
  239 + },
  240 + useSearchForm: true,
  241 + showTableSetting: true,
  242 + bordered: true,
  243 + showIndexColumn: false,
  244 + rowKey: 'id',
  245 + searchInfo: searchInfo,
  246 + clickToRowSelect: false,
  247 + actionColumn: {
  248 + width: 200,
  249 + title: '操作',
  250 + slots: { customRender: 'action' },
  251 + fixed: 'right',
  252 + },
  253 + });
252 const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions, resetSelectedRowKeys } = 254 const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions, resetSelectedRowKeys } =
253 useBatchDelete(deleteDevice, handleSuccess, setProps); 255 useBatchDelete(deleteDevice, handleSuccess, setProps);
254 selectionOptions.rowSelection.getCheckboxProps = (record: Recordable) => { 256 selectionOptions.rowSelection.getCheckboxProps = (record: Recordable) => {
@@ -275,14 +277,15 @@ @@ -275,14 +277,15 @@
275 const deviceProfileId = ref(''); 277 const deviceProfileId = ref('');
276 count.value = Number(getParams('count')); 278 count.value = Number(getParams('count'));
277 deviceProfileId.value = getParams('deviceProfileId') || ''; 279 deviceProfileId.value = getParams('deviceProfileId') || '';
278 - console.log(deviceProfileId.value); 280 +
279 const setRowClassName = async () => { 281 const setRowClassName = async () => {
280 if (deviceProfileId.value !== undefined) { 282 if (deviceProfileId.value !== undefined) {
281 - const { items } = await devicePage({ 283 + const { items, total } = await devicePage({
282 page: 1, 284 page: 1,
283 pageSize: count.value === 0 ? 10 : count.value, 285 pageSize: count.value === 0 ? 10 : count.value,
284 deviceProfileId: deviceProfileId.value, 286 deviceProfileId: deviceProfileId.value,
285 }); 287 });
  288 + setPagination({ total });
286 nextTick(() => { 289 nextTick(() => {
287 setTableData(items); 290 setTableData(items);
288 const { setFieldsValue, resetFields } = getForm(); 291 const { setFieldsValue, resetFields } = getForm();