fix/model-driven

Author: betterdancing

packages/builtinComponent/src/components/BasePage.vue

@@ -322,12 +322,16 @@ const updateApi = (data = addFormData.value) => {
   if (!apiInfo) {
     return undefined
   }
-  const id = data.id
-  delete data.id
+  const requestData = {}
+  pageModel.value.parameters.forEach((item) => {
+    if (data[item.prop]) {
+      requestData[item.prop] = data[item.prop]
+    }
+  })
   return axios
     .post(apiInfo.url, {
       nameEn: pageModel.value.nameEn,
-      data: data,
+      data: requestData,
       params: { id }
     })
     .then((res) => {
@@ -385,6 +389,7 @@ const deleteApi = (evidence) => {
         message: '已删除',
         position: 'top-right'
       })
+      queryApi()
       return res
     })
     .catch((err) => {

packages/builtinComponent/src/components/BaseTable.vue

@@ -60,7 +60,8 @@ import {
   DatePicker as TinyDatePicker,
   Numeric as TinyNumeric,
   Pager as TinyPager,
-  Popover as TinyPopover
+  Popover as TinyPopover,
+  Notify
 } from '@opentiny/vue'
 import * as tinyVueIcon from '@opentiny/vue-icon'
 import axios from 'axios'
@@ -174,25 +175,7 @@ const insertApi = (data = {}) => {
   })
 }
 
-const updateApi = (data) => {
-  const apiInfo = props.modelApis.find((api) => api.nameEn === 'updateApi')
-  if (!apiInfo) {
-    return undefined
-  }
-  const id = data.id
-  delete data.id
-  return axios
-    .post(apiInfo.url, {
-      nameEn: tableModel.value.nameEn,
-      data: data,
-      params: { id }
-    })
-    .catch((err) => {
-      throw new Error(err)
-    })
-}
-
-const queryApi = (data) => {
+const queryApi = (data = {}) => {
   const apiInfo = props.modelApis.find((api) => api.nameEn === 'queryApi')
   if (!apiInfo) {
     return undefined
@@ -220,14 +203,56 @@ const queryApi = (data) => {
     })
 }
 
+const updateApi = (data) => {
+  const apiInfo = props.modelApis.find((api) => api.nameEn === 'updateApi')
+  if (!apiInfo) {
+    return undefined
+  }
+  const requestData = {}
+  tableModel.value.parameters.forEach((item) => {
+    if (data[item.prop]) {
+      requestData[item.prop] = data[item.prop]
+    }
+  })
+  return axios
+    .post(apiInfo.url, {
+      nameEn: tableModel.value.nameEn,
+      data: requestData,
+      params: { id: data.id }
+    })
+    .then((res) => {
+      Notify({
+        type: 'success',
+        message: '修改成功',
+        position: 'top-right'
+      })
+      queryApi()
+      return res
+    })
+    .catch((err) => {
+      throw new Error(err)
+    })
+}
+
 const deleteApi = (evidence) => {
   const apiInfo = props.modelApis.find((api) => api.nameEn === 'deleteApi')
   if (!apiInfo) {
     return undefined
   }
-  return axios.post(apiInfo.url, { ...evidence, nameEn: tableModel.value.nameEn }).catch((err) => {
-    throw new Error(err)
-  })
+  return axios
+    .post(apiInfo.url, { ...evidence, nameEn: tableModel.value.nameEn })
+    .then((res) => {
+      Notify({
+        type: 'success',
+        message: '已删除',
+        position: 'top-right'
+      })
+      queryApi()
+      return res
+    })
+    .catch((err) => {
+      throw new Error(err)
+    })
 }
 
 const exposedData = {

packages/configurator/src/model-api-configurator/ModelApiConfigurator.vue

@@ -61,7 +61,7 @@
   </div>
 </template>
 <script setup>
-import { ref, reactive, computed, defineProps, defineEmits, watch } from 'vue'
+import { ref, reactive, computed, defineProps, defineEmits, watch, onMounted } from 'vue'
 import {
   Button as TinyButton,
   Popover as TinyPopover,
@@ -219,6 +219,10 @@ watch(
     }
   }
 )
+
+onMounted(() => {
+  getModel()
+})
 </script>
 
 <style lang="less" scoped>

packages/plugins/model-manager/src/components/ModelSetting.vue

@@ -39,7 +39,7 @@
 </template>
 <script>
 import { ref, watch, nextTick } from 'vue'
-import { Button, Collapse, CollapseItem } from '@opentiny/vue'
+import { Button, Collapse, CollapseItem, Notify } from '@opentiny/vue'
 import { PluginSetting, ButtonGroup, SvgButton } from '@opentiny/tiny-engine-common'
 import { useLayout } from '@opentiny/tiny-engine-meta-register'
 import ModelBasicForm from './ModelBasicForm.vue'