feat/model-driven

Author: betterdancing

packages/builtinComponent/src/components/BaseForm.vue

@@ -117,9 +117,6 @@ const insertApi = (data = modelData.value) => {
   }
   return getMetaApi(META_SERVICE.Http)
     .post(apiInfo.url, { nameEn: formModel.value.nameEn, params: data })
-    .then((res) => {
-      return res
-    })
     .catch((err) => {
       throw new Error(err)
     })
@@ -138,9 +135,6 @@ const updateApi = (data = modelData.value) => {
       data: data,
       params: { id }
     })
-    .then((res) => {
-      return res
-    })
     .catch((err) => {
       throw new Error(err)
     })
@@ -164,9 +158,6 @@ const queryApi = ({ currentPage, pageSize, data } = {}) => {
         ...(data || modelData.value)
       }
     })
-    .then((res) => {
-      return res
-    })
     .catch((err) => {
       throw new Error(err)
     })
@@ -179,9 +170,6 @@ const deleteApi = () => {
   }
   return getMetaApi(META_SERVICE.Http)
     .post(apiInfo.url, { id: modelData.value?.id, nameEn: formModel.value.nameEn })
-    .then((res) => {
-      return res
-    })
     .catch((err) => {
       throw new Error(err)
     })

packages/builtinComponent/src/components/BaseTable.vue

@@ -171,9 +171,6 @@ const insertApi = (data = {}) => {
   }
   return getMetaApi(META_SERVICE.Http)
     .post(apiInfo.url, { nameEn: tableModel.value.nameEn, params: data })
-    .then((res) => {
-      return res
-    })
     .catch((err) => {
       throw new Error(err)
     })
@@ -192,9 +189,6 @@ const updateApi = (data) => {
       data: data,
       params: { id }
     })
-    .then((res) => {
-      return res
-    })
     .catch((err) => {
       throw new Error(err)
     })
@@ -237,9 +231,6 @@ const deleteApi = (evidence) => {
   }
   return getMetaApi(META_SERVICE.Http)
     .post(apiInfo.url, { ...evidence, nameEn: tableModel.value.nameEn })
-    .then((res) => {
-      return res
-    })
     .catch((err) => {
       throw new Error(err)
     })

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

@@ -19,15 +19,6 @@
       </div>
       <div class="model-set-wrap">
         <div class="model-wrap">
-          <div class="model-groups">
-            <model-select
-              :model-page-size="5"
-              @model-select="getModel"
-              :meta="meta"
-              :isShow="isShow"
-              :isModelApi="true"
-            ></model-select>
-          </div>
           <div class="model-parameters">
             <tiny-grid
               :data="selectedModel?.method || []"
@@ -80,7 +71,7 @@
   <tiny-button @click="openPopover">{{ modelValue?.name || buttonText }}</tiny-button>
 </template>
 <script setup>
-import { ref, reactive, defineProps, defineEmits } from 'vue'
+import { ref, reactive, defineProps, defineEmits, watch } from 'vue'
 import {
   Button as TinyButton,
   Popover as TinyPopover,
@@ -95,7 +86,8 @@ import {
   Notify
 } from '@opentiny/vue'
 import { iconClose, iconDel } from '@opentiny/vue-icon'
-import ModelSelect from '../model-common/ModelSelect.vue'
+import { useCanvas } from '@opentiny/tiny-engine-meta-register'
+import { getModelDetail } from '../model-common/http'
 import ParamsBindGrid from './ParamsBindGrid.vue'
 
 const props = defineProps({
@@ -166,15 +158,22 @@ const selectedFunction = ref()
 
 const openPopover = () => {
   isShow.value = true
+  getModel()
 }
 
 const closePopover = () => {
   isShow.value = false
 }
 
-const getModel = (data) => {
-  selectedModel.value = data
-  methodBasicData.method = 'post'
+const getModel = () => {
+  const modelId = useCanvas().getCurrentSchema().props?.serviceModel?.id
+  if (modelId) {
+    getModelDetail(modelId).then(res => {
+      console.log(res)
+    })
+    selectedModel.value = useCanvas().getCurrentSchema().props.serviceModel
+    methodBasicData.method = 'post'
+  }
 }
 
 const setModelFunction = async () => {
@@ -209,6 +208,26 @@ const selectModelFunction = (data) => {
   selectedFunction.value = data.row
   methodBasicData.url = `${selectedModel.value.baseUrl}/${selectedFunction.value.nameEn}`
 }
+
+watch(
+  () => useCanvas().getCurrentSchema().props.serviceModel,
+  (model) => {
+    console.log(model)
+    if (model) {
+      getModel()
+      // modelValue.value = model.method.map((api) => {
+      //   return {
+      //     url: `${model.baseUrl}/${api.nameEn}`,
+      //     method: 'post',
+      //     name: api.name,
+      //     nameEn: api.nameEn
+      //   }
+      // })
+      // 添加增删改查方法
+      // emit('update:modelValue', modelValue.value)
+    }
+  }
+)
 </script>
 
 <style lang="less" scoped>
@@ -240,30 +259,8 @@ const selectModelFunction = (data) => {
       max-height: 355px;
       border: 1px solid #e6e6e6;
       border-radius: 4px;
-      .model-groups {
-        width: 410px;
-        padding: 12px;
-        border-right: 1px solid #e6e6e6;
-        :deep(.tiny-tree) {
-          .tiny-tree-node__content .tiny-tree-node__content-left {
-            padding: 0;
-            .tiny-tree-node__label {
-              color: #191919;
-            }
-          }
-          .tiny-tree-node__children .tiny-tree-node__content {
-            padding: 0;
-            .tiny-tree-node__content-left .tiny-tree-node__label {
-              color: #595959;
-            }
-          }
-        }
-        .search {
-          margin-bottom: 12px;
-        }
-      }
       .model-parameters {
-        width: 412px;
+        width: 100%;
         padding: 12px;
         overflow-y: scroll;
         &::-webkit-scrollbar {

packages/configurator/src/model-common/ModelSelect.vue

@@ -54,10 +54,6 @@ export default {
     isShow: {
       type: Boolean,
       default: false
-    },
-    isModelApi: {
-      type: Boolean,
-      default: false
     }
   },
   emits: ['modelSelect'],
@@ -93,21 +89,8 @@ export default {
     }
 
     const selectModel = async (data) => {
-      // 处理parameters
-      if (props.isModelApi) {
-        emit('modelSelect', {
-          id: data.row.id,
-          name: data.row.nameCn,
-          nameEn: data.row.nameEn,
-          description: data.row.description,
-          version: data.row.version,
-          baseUrl: data.row.modelUrl ?? '',
-          method: data.row.method
-        })
-      } else {
-        currentSelectedModel.value = await handleSelectedModelParameters(data.row)
-        emit('modelSelect', currentSelectedModel.value)
-      }
+      currentSelectedModel.value = await handleSelectedModelParameters(data.row)
+      emit('modelSelect', currentSelectedModel.value)
     }
 
     watch(

packages/configurator/src/model-common/http.js

@@ -4,3 +4,5 @@ export const getModelList = (currentPage, params) =>
   getMetaApi(META_SERVICE.Http).get(`/material-center/api/model/list?currentPage=${currentPage}&pageSize=10`, {
     params: params || {}
   })
+
+export const getModelDetail = (id) => getMetaApi(META_SERVICE.Http).get(`/material-center/api/model/detail/${id}`)