fix/model-driven-bugs

Author: betterdancing

packages/builtinComponent/src/components/BaseForm.vue

@@ -62,7 +62,7 @@ import {
   Row as TinyRow,
   Col as TinyCol
 } from '@opentiny/vue'
-import { getMetaApi, META_SERVICE } from '@opentiny/tiny-engine-meta-register'
+import axios from 'axios'
 
 const props = defineProps({
   style: {
@@ -115,11 +115,9 @@ const insertApi = (data = modelData.value) => {
   if (!apiInfo) {
     return undefined
   }
-  return getMetaApi(META_SERVICE.Http)
-    .post(apiInfo.url, { nameEn: formModel.value.nameEn, params: data })
-    .catch((err) => {
-      throw new Error(err)
-    })
+  return axios.post(apiInfo.url, { nameEn: formModel.value.nameEn, params: data }).catch((err) => {
+    throw new Error(err)
+  })
 }
 
 const updateApi = (data = modelData.value) => {
@@ -129,7 +127,7 @@ const updateApi = (data = modelData.value) => {
   }
   const id = data.id
   delete data.id
-  return getMetaApi(META_SERVICE.Http)
+  return axios
     .post(apiInfo.url, {
       nameEn: formModel.value.nameEn,
       data: data,
@@ -147,7 +145,7 @@ const queryApi = ({ currentPage, pageSize, data } = {}) => {
   }
   // 处理查询参数
   const params = Object.fromEntries(formModel.value.parameters.map((item) => [item.prop, null]))
-  return getMetaApi(META_SERVICE.Http)
+  return axios
     .post(apiInfo.url, {
       currentPage: currentPage || 1,
       pageSize: pageSize || 10,
@@ -168,11 +166,9 @@ const deleteApi = () => {
   if (!apiInfo) {
     return undefined
   }
-  return getMetaApi(META_SERVICE.Http)
-    .post(apiInfo.url, { id: modelData.value?.id, nameEn: formModel.value.nameEn })
-    .catch((err) => {
-      throw new Error(err)
-    })
+  return axios.post(apiInfo.url, { id: modelData.value?.id, nameEn: formModel.value.nameEn }).catch((err) => {
+    throw new Error(err)
+  })
 }
 
 const initFormData = () => {

packages/builtinComponent/src/components/BasePage.vue

@@ -179,7 +179,7 @@ import {
   Notify
 } from '@opentiny/vue'
 import * as tinyVueIcon from '@opentiny/vue-icon'
-import { getMetaApi, META_SERVICE } from '@opentiny/tiny-engine-meta-register'
+import axios from 'axios'
 
 const props = defineProps({
   style: {
@@ -302,7 +302,7 @@ const insertApi = (data = addFormData.value) => {
   if (!apiInfo) {
     return undefined
   }
-  return getMetaApi(META_SERVICE.Http)
+  return axios
     .post(apiInfo.url, { nameEn: pageModel.value.nameEn, params: data })
     .then((res) => {
       Notify({
@@ -324,7 +324,7 @@ const updateApi = (data = addFormData.value) => {
   }
   const id = data.id
   delete data.id
-  return getMetaApi(META_SERVICE.Http)
+  return axios
     .post(apiInfo.url, {
       nameEn: pageModel.value.nameEn,
       data: data,
@@ -350,7 +350,7 @@ const queryApi = (data = formData.value) => {
   }
   // 处理查询参数
   const params = Object.fromEntries(pageModel.value.parameters.map((item) => [item.prop, null]))
-  return getMetaApi(META_SERVICE.Http)
+  return axios
     .post(apiInfo.url, {
       currentPage: pagerState.currentPage || 1,
       pageSize: pagerState.pageSize || 10,
@@ -362,8 +362,8 @@ const queryApi = (data = formData.value) => {
       }
     })
     .then((res) => {
-      tableData.value = res.list
-      pagerState.total = res.total
+      tableData.value = res.data.data.list
+      pagerState.total = res.data.data.total
       emit('update:tableData', tableData.value)
       return res
     })
@@ -377,7 +377,7 @@ const deleteApi = (evidence) => {
   if (!apiInfo) {
     return undefined
   }
-  return getMetaApi(META_SERVICE.Http)
+  return axios
     .post(apiInfo.url, { ...evidence, nameEn: pageModel.value.nameEn })
     .then((res) => {
       Notify({

packages/builtinComponent/src/components/BaseTable.vue

@@ -63,7 +63,7 @@ import {
   Popover as TinyPopover
 } from '@opentiny/vue'
 import * as tinyVueIcon from '@opentiny/vue-icon'
-import { getMetaApi, META_SERVICE } from '@opentiny/tiny-engine-meta-register'
+import axios from 'axios'
 
 const props = defineProps({
   style: {
@@ -169,11 +169,9 @@ const insertApi = (data = {}) => {
   if (!apiInfo) {
     return undefined
   }
-  return getMetaApi(META_SERVICE.Http)
-    .post(apiInfo.url, { nameEn: tableModel.value.nameEn, params: data })
-    .catch((err) => {
-      throw new Error(err)
-    })
+  return axios.post(apiInfo.url, { nameEn: tableModel.value.nameEn, params: data }).catch((err) => {
+    throw new Error(err)
+  })
 }
 
 const updateApi = (data) => {
@@ -183,7 +181,7 @@ const updateApi = (data) => {
   }
   const id = data.id
   delete data.id
-  return getMetaApi(META_SERVICE.Http)
+  return axios
     .post(apiInfo.url, {
       nameEn: tableModel.value.nameEn,
       data: data,
@@ -201,7 +199,7 @@ const queryApi = (data) => {
   }
   // 处理查询参数
   const params = Object.fromEntries(tableModel.value.parameters.map((item) => [item.prop, null]))
-  return getMetaApi(META_SERVICE.Http)
+  return axios
     .post(apiInfo.url, {
       currentPage: pagerState.currentPage || 1,
       pageSize: pagerState.pageSize || 10,
@@ -213,8 +211,8 @@ const queryApi = (data) => {
       }
     })
     .then((res) => {
-      tableData.value = res.list
-      pagerState.total = res.total
+      tableData.value = res.data.data.list
+      pagerState.total = res.data.data.total
       return res
     })
     .catch((err) => {
@@ -227,11 +225,9 @@ const deleteApi = (evidence) => {
   if (!apiInfo) {
     return undefined
   }
-  return getMetaApi(META_SERVICE.Http)
-    .post(apiInfo.url, { ...evidence, nameEn: tableModel.value.nameEn })
-    .catch((err) => {
-      throw new Error(err)
-    })
+  return axios.post(apiInfo.url, { ...evidence, nameEn: tableModel.value.nameEn }).catch((err) => {
+    throw new Error(err)
+  })
 }
 
 const exposedData = {