feat/model-driven

Author: betterdancing

packages/builtinComponent/package.json

@@ -22,7 +22,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "axios": "^0.28.0",
+    "@opentiny/tiny-engine-meta-register": "workspace:*",
     "vite-plugin-css-injected-by-js": "^3.3.1"
   },
   "devDependencies": {

packages/builtinComponent/src/components/BaseForm.vue

@@ -62,7 +62,7 @@ import {
   Row as TinyRow,
   Col as TinyCol
 } from '@opentiny/vue'
-import axios from 'axios'
+import { getMetaApi, META_SERVICE } from '@opentiny/tiny-engine-meta-register'
 
 const props = defineProps({
   style: {
@@ -115,7 +115,7 @@ const insertApi = (data = modelData.value) => {
   if (!apiInfo) {
     return undefined
   }
-  return axios
+  return getMetaApi(META_SERVICE.Http)
     .post(apiInfo.url, { nameEn: formModel.value.nameEn, params: data })
     .then((res) => {
       if (res.code === 200) {
@@ -136,7 +136,7 @@ const updateApi = (data = modelData.value) => {
   }
   const id = data.id
   delete data.id
-  return axios
+  return getMetaApi(META_SERVICE.Http)
     .post(apiInfo.url, {
       nameEn: formModel.value.nameEn,
       data: data,
@@ -159,7 +159,7 @@ const queryApi = ({ currentPage, pageSize, data } = {}) => {
   if (!apiInfo) {
     return undefined
   }
-  return axios
+  return getMetaApi(META_SERVICE.Http)
     .post(apiInfo.url, {
       currentPage: currentPage || 1,
       pageSize: pageSize || 10,
@@ -183,7 +183,7 @@ const deleteApi = () => {
   if (!apiInfo) {
     return undefined
   }
-  return axios
+  return getMetaApi(META_SERVICE.Http)
     .post(apiInfo.url, { id: modelData.value?.id, nameEn: formModel.value.nameEn })
     .then((res) => {
       if (res.code === 200) {

packages/builtinComponent/src/components/BasePage.vue

@@ -179,7 +179,7 @@ import {
   Notify
 } from '@opentiny/vue'
 import * as tinyVueIcon from '@opentiny/vue-icon'
-import axios from 'axios'
+import { getMetaApi, META_SERVICE } from '@opentiny/tiny-engine-meta-register'
 
 const props = defineProps({
   style: {
@@ -302,9 +302,10 @@ const insertApi = (data = addFormData.value) => {
   if (!apiInfo) {
     return undefined
   }
-  return axios
+  return getMetaApi(META_SERVICE.Http)
     .post(apiInfo.url, { nameEn: pageModel.value.nameEn, params: data })
     .then((res) => {
+      console.log(res)
       if (res.code === 200) {
         Notify({
           type: 'success',
@@ -328,13 +329,14 @@ const updateApi = (data = addFormData.value) => {
   }
   const id = data.id
   delete data.id
-  return axios
+  return getMetaApi(META_SERVICE.Http)
     .post(apiInfo.url, {
       nameEn: pageModel.value.nameEn,
       data: data,
       params: { id }
     })
     .then((res) => {
+      console.log(res)
       if (res.code === 200) {
         Notify({
           type: 'success',
@@ -356,7 +358,7 @@ const queryApi = ({ currentPage, pageSize, data } = {}) => {
   if (!apiInfo) {
     return undefined
   }
-  return axios
+  return getMetaApi(META_SERVICE.Http)
     .post(apiInfo.url, {
       currentPage: currentPage || 1,
       pageSize: pageSize || 10,
@@ -365,6 +367,7 @@ const queryApi = ({ currentPage, pageSize, data } = {}) => {
       params: data
     })
     .then((res) => {
+      console.log(res)
       if (res.code === 200) {
         tableData.value = res.data.list
         pagerState.total = res.data.total
@@ -383,9 +386,10 @@ const deleteApi = (evidence) => {
   if (!apiInfo) {
     return undefined
   }
-  return axios
+  return getMetaApi(META_SERVICE.Http)
     .post(apiInfo.url, { ...evidence, nameEn: pageModel.value.nameEn })
     .then((res) => {
+      console.log(res)
       if (res.code === 200) {
         Notify({
           type: 'success',

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 axios from 'axios'
+import { getMetaApi, META_SERVICE } from '@opentiny/tiny-engine-meta-register'
 
 const props = defineProps({
   style: {
@@ -169,7 +169,7 @@ const insertApi = (data = {}) => {
   if (!apiInfo) {
     return undefined
   }
-  return axios
+  return getMetaApi(META_SERVICE.Http)
     .post(apiInfo.url, { nameEn: tableModel.value.nameEn, params: data })
     .then((res) => {
       if (res.code === 200) {
@@ -190,7 +190,7 @@ const updateApi = (data) => {
   }
   const id = data.id
   delete data.id
-  return axios
+  return getMetaApi(META_SERVICE.Http)
     .post(apiInfo.url, {
       nameEn: tableModel.value.nameEn,
       data: data,
@@ -215,7 +215,7 @@ const queryApi = (
   if (!apiInfo) {
     return undefined
   }
-  return axios
+  return getMetaApi(META_SERVICE.Http)
     .post(apiInfo.url, {
       currentPage: currentPage || 1,
       pageSize: pageSize || 10,
@@ -241,7 +241,8 @@ const deleteApi = (evidence) => {
   if (!apiInfo) {
     return undefined
   }
-  return axios[apiInfo.method](apiInfo.url, { params: { ...evidence, nameEn: tableModel.value.nameEn } })
+  return getMetaApi(META_SERVICE.Http)
+    .post(apiInfo.url, { ...evidence, nameEn: tableModel.value.nameEn })
     .then((res) => {
       if (res.status === 200) {
         return res.data