feat/model-driven

Author: betterdancing

packages/builtinComponent/src/components/BaseForm.vue

@@ -118,7 +118,7 @@ const insertApi = (data = modelData.value) => {
   return getMetaApi(META_SERVICE.Http)
     .post(apiInfo.url, { nameEn: formModel.value.nameEn, params: data })
     .then((res) => {
-      return res.data
+      return res
     })
     .catch((err) => {
       throw new Error(err)
@@ -139,7 +139,7 @@ const updateApi = (data = modelData.value) => {
       params: { id }
     })
     .then((res) => {
-      return res.data
+      return res
     })
     .catch((err) => {
       throw new Error(err)
@@ -160,7 +160,7 @@ const queryApi = ({ currentPage, pageSize, data } = {}) => {
       params: data || modelData.value
     })
     .then((res) => {
-      return res.data
+      return res
     })
     .catch((err) => {
       throw new Error(err)
@@ -175,7 +175,7 @@ const deleteApi = () => {
   return getMetaApi(META_SERVICE.Http)
     .post(apiInfo.url, { id: modelData.value?.id, nameEn: formModel.value.nameEn })
     .then((res) => {
-      return res.data
+      return res
     })
     .catch((err) => {
       throw new Error(err)

packages/builtinComponent/src/components/BasePage.vue

@@ -310,7 +310,7 @@ const insertApi = (data = addFormData.value) => {
         message: '新增成功',
         position: 'top-right'
       })
-      return res.data
+      return res
     })
     .catch((err) => {
       throw new Error(err)
@@ -336,7 +336,7 @@ const updateApi = (data = addFormData.value) => {
         message: '修改成功',
         position: 'top-right'
       })
-      return res.data
+      return res
     })
     .catch((err) => {
       throw new Error(err)
@@ -357,10 +357,10 @@ const queryApi = ({ currentPage, pageSize, data } = {}) => {
       params: data
     })
     .then((res) => {
-      tableData.value = res.data.list
-      pagerState.total = res.data.total
+      tableData.value = res.list
+      pagerState.total = res.total
       emit('update:tableData', tableData.value)
-      return res.data
+      return res
     })
     .catch((err) => {
       throw new Error(err)
@@ -380,7 +380,7 @@ const deleteApi = (evidence) => {
         message: '已删除',
         position: 'top-right'
       })
-      return res.data
+      return res
     })
     .catch((err) => {
       throw new Error(err)

packages/builtinComponent/src/components/BaseTable.vue

@@ -172,7 +172,7 @@ const insertApi = (data = {}) => {
   return getMetaApi(META_SERVICE.Http)
     .post(apiInfo.url, { nameEn: tableModel.value.nameEn, params: data })
     .then((res) => {
-      return res.data
+      return res
     })
     .catch((err) => {
       throw new Error(err)
@@ -193,7 +193,7 @@ const updateApi = (data) => {
       params: { id }
     })
     .then((res) => {
-      return res.data
+      return res
     })
     .catch((err) => {
       throw new Error(err)
@@ -216,9 +216,9 @@ const queryApi = (
       params: data
     })
     .then((res) => {
-      tableData.value = res.data.list
-      pagerState.total = res.data.total
-      return res.data
+      tableData.value = res.list
+      pagerState.total = res.total
+      return res
     })
     .catch((err) => {
       throw new Error(err)
@@ -233,7 +233,7 @@ const deleteApi = (evidence) => {
   return getMetaApi(META_SERVICE.Http)
     .post(apiInfo.url, { ...evidence, nameEn: tableModel.value.nameEn })
     .then((res) => {
-      return res.data
+      return res
     })
     .catch((err) => {
       throw new Error(err)