diff --git a/blade-ops/blade-develop/src/main/resources/templates/sword/list.js.vm b/blade-ops/blade-develop/src/main/resources/templates/sword/list.js.vm index 72a6eef1..a75faf8b 100644 --- a/blade-ops/blade-develop/src/main/resources/templates/sword/list.js.vm +++ b/blade-ops/blade-develop/src/main/resources/templates/sword/list.js.vm @@ -10,7 +10,7 @@ const FormItem = Form.Item; @connect(({ $!{table.entityPath}, loading }) => ({ $!{table.entityPath}, - loading: loading.models.param, + loading: loading.models.$!{table.entityPath}, })) @Form.create() class $!{entity} extends PureComponent { diff --git a/blade-ops/blade-develop/src/main/resources/templates/sword/model.js.vm b/blade-ops/blade-develop/src/main/resources/templates/sword/model.js.vm index 54b40c1d..9390b885 100644 --- a/blade-ops/blade-develop/src/main/resources/templates/sword/model.js.vm +++ b/blade-ops/blade-develop/src/main/resources/templates/sword/model.js.vm @@ -20,8 +20,12 @@ export default { yield put({ type: 'saveList', payload: { - list: response.data, - pagination: false, + list: response.data.records, + pagination: { + total: response.data.total, + current: response.data.current, + pageSize: response.data.size, + }, }, }); } diff --git a/blade-ops/blade-develop/src/test/resources/templates/sword/list.js.vm b/blade-ops/blade-develop/src/test/resources/templates/sword/list.js.vm index 72a6eef1..a75faf8b 100644 --- a/blade-ops/blade-develop/src/test/resources/templates/sword/list.js.vm +++ b/blade-ops/blade-develop/src/test/resources/templates/sword/list.js.vm @@ -10,7 +10,7 @@ const FormItem = Form.Item; @connect(({ $!{table.entityPath}, loading }) => ({ $!{table.entityPath}, - loading: loading.models.param, + loading: loading.models.$!{table.entityPath}, })) @Form.create() class $!{entity} extends PureComponent { diff --git a/blade-ops/blade-develop/src/test/resources/templates/sword/model.js.vm b/blade-ops/blade-develop/src/test/resources/templates/sword/model.js.vm index 54b40c1d..9390b885 100644 --- a/blade-ops/blade-develop/src/test/resources/templates/sword/model.js.vm +++ b/blade-ops/blade-develop/src/test/resources/templates/sword/model.js.vm @@ -20,8 +20,12 @@ export default { yield put({ type: 'saveList', payload: { - list: response.data, - pagination: false, + list: response.data.records, + pagination: { + total: response.data.total, + current: response.data.current, + pageSize: response.data.size, + }, }, }); }