i

src/api/paas/apiApi.ts

@@ -31,9 +31,9 @@ export function getApiByList(data: any) {
  * @param apiId
  * @returns
  */
-export function getApiById(modId: number, apiId: number) {
+export function getApiById(moduleId: number, apiId: number) {
   return apiRequest({
-    url: `/paas/api/${modId}/${apiId}`,
+    url: `/paas/api/${moduleId}/${apiId}`,
     method: 'GET',
   })
 }
@@ -70,9 +70,9 @@ export function updateApi(data: any) {
  * @param status
  * @returns
  */
-export function updateApiStatus(modId: number, apiId: number, status: number) {
+export function updateApiStatus(moduleId: number, apiId: number, status: number) {
   return apiRequest({
-    url: `/paas/api/updateStatus/${modId}/${apiId}/${status}`,
+    url: `/paas/api/updateStatus/${moduleId}/${apiId}/${status}`,
     method: 'PUT',
   })
 }
@@ -82,9 +82,9 @@ export function updateApiStatus(modId: number, apiId: number, status: number) {
  * @param apiId
  * @returns
  */
-export function deleteApiById(apiId: number) {
+export function deleteApiById(moduleId: number, apiId: number) {
   return apiRequest({
-    url: `/paas/api/${apiId}`,
+    url: `/paas/api/${moduleId}/${apiId}`,
     method: 'DELETE',
   })
 }

src/api/paas/apiTransUnitApi.ts

@@ -19,9 +19,9 @@ export function getAtuByList(data: any) {
  * @param atuId
  * @returns
  */
-export function getAtuById(apiId: number, atuId: number) {
+export function getAtuById(moduleId: number, apiId: number, atuId: number) {
   return apiRequest({
-    url: `/paas/api/atu/${apiId}/${atuId}`,
+    url: `/paas/api/atu/${moduleId}/${apiId}/${atuId}`,
     method: 'GET',
   })
 }
@@ -54,13 +54,14 @@ export function updateAtu(data: any) {
 
 /**
  * 删除Atu
+ * @param moduleId
  * @param apiId
  * @param atuId
  * @returns
  */
-export function deleteAtuById(apiId: number, atuId: number) {
+export function deleteAtuById(moduleId: number, apiId: number, atuId: number) {
   return apiRequest({
-    url: `/paas/api/atu/${apiId}/${atuId}`,
+    url: `/paas/api/atu/${moduleId}/${apiId}/${atuId}`,
     method: 'DELETE',
   })
 }

src/router/modules/paas.ts

@@ -25,7 +25,7 @@ const routes: RouteRecordRaw[] = [
         },
       },
       {
-        path: 'api/trans/:modId/:apiId',
+        path: 'api/trans/:moduleId/:apiId',
         name: 'apiTrans',
         component: () => import('@/views/paas/atu/index.vue'),
         meta: {

src/views/paas/api/components/Module.vue

@@ -10,10 +10,10 @@ const emit = defineEmits(['success'])
 
 const formRef = ref<FormInstance>()
 const formRules = ref<FormRules>({
-  modTitle: [
+  moduleTitle: [
     { required: true, message: '请输入标题', trigger: 'blur' },
   ],
-  modDesc: [
+  moduleDesc: [
     { required: false, message: '请输入描述', trigger: 'blur' },
   ],
 })
@@ -23,9 +23,9 @@ const state = reactive({
   dialogVisible: false,
   loading: false,
   formData: {
-    modId: 1,
-    modTitle: '',
-    modDesc: '',
+    moduleId: 1,
+    moduleTitle: '',
+    moduleDesc: '',
     isFixed: 0,
   },
   actionType: 1,
@@ -33,9 +33,9 @@ const state = reactive({
 
 onMounted(() => {})
 
-const getData = async (modId: number) => {
+const getData = async (moduleId: number) => {
   state.loading = true
-  const { data } = await getModuleById(modId)
+  const { data } = await getModuleById(moduleId)
   state.formData = data
   state.loading = false
 }
@@ -63,9 +63,9 @@ function onCancel() {
 
 function resetFormData() {
   state.formData = {
-    modId: -1,
-    modTitle: '',
-    modDesc: '',
+    moduleId: -1,
+    moduleTitle: '',
+    moduleDesc: '',
     isFixed: 0,
   }
 }
@@ -77,12 +77,12 @@ defineExpose({
     state.actionType = 1
     state.dialogVisible = true
   },
-  showEditModule(modId: number) {
+  showEditModule(moduleId: number) {
     resetFormData()
     state.title = '编辑API模块'
     state.actionType = 2
     state.dialogVisible = true
-    getData(modId)
+    getData(moduleId)
   },
 })
 </script>
@@ -92,12 +92,12 @@ defineExpose({
     <el-dialog v-model="state.dialogVisible" :title="state.title" width="600px" :close-on-click-modal="false" append-to-body destroy-on-close>
       <div v-loading="state.loading">
         <el-form ref="formRef" :model="state.formData" :rules="formRules" label-width="120px" label-suffix="：">
-          <el-form-item label="API模块名称" prop="modTitle">
-            <el-input v-model="state.formData.modTitle" placeholder="请输入标题" />
+          <el-form-item label="API模块名称" prop="moduleTitle">
+            <el-input v-model="state.formData.moduleTitle" placeholder="请输入标题" />
           </el-form-item>
 
-          <el-form-item label="简要说明" prop="modDesc">
-            <el-input v-model="state.formData.modDesc" type="textarea" rows="10" placeholder="请输入标题" />
+          <el-form-item label="简要说明" prop="moduleDesc">
+            <el-input v-model="state.formData.moduleDesc" type="textarea" rows="10" placeholder="请输入标题" />
           </el-form-item>
         </el-form>
       </div>

src/views/paas/api/index.vue

@@ -19,11 +19,12 @@ const tabbar = useTabbar()
 interface TreeNode {
   label: string
   isLeaf: boolean
-  modId: number
+  moduleId: number
   children?: TreeNode[]
 }
 
 interface Api {
+  moduleId: number
   apiId: number
   apiType: number
   apiTitle: string
@@ -51,7 +52,7 @@ const getApiData = async () => {
   const curModuleId = state.curModuleId
   if (curModuleId > 0) {
     state.loading = true
-    const { data } = await getApiByList({ modId: curModuleId })
+    const { data } = await getApiByList({ moduleId: curModuleId })
     state.apiList = data
     state.loading = false
   }
@@ -62,8 +63,8 @@ const getModuleData = async () => {
   const children: TreeNode[] = []
   data.forEach((item: any) => {
     return children.push({
-      label: item.modTitle,
-      modId: item.modId,
+      label: item.moduleTitle,
+      moduleId: item.moduleId,
       isLeaf: true,
     })
   })
@@ -71,15 +72,15 @@ const getModuleData = async () => {
     {
       label: '功能模块',
       isLeaf: false,
-      modId: -1,
+      moduleId: -1,
       children,
     },
   ]
 
   if (data && data.length > 0) {
-    state.curModuleId = data[0].modId
+    state.curModuleId = data[0].moduleId
     nextTick(() => {
-      leftTreeRef.value.setCurrentKey(data[0].modId)
+      leftTreeRef.value.setCurrentKey(data[0].moduleId)
     })
     await getApiData()
   }
@@ -90,15 +91,15 @@ const onModuleAdd = () => {
 }
 
 // 模块编辑
-const onModuleEdit = (data: { ModId: number }) => {
-  const modId = data.ModId
-  ModuleRef.value.showEditModule(modId)
+const onModuleEdit = (data: { moduleId: number }) => {
+  const moduleId = data.moduleId
+  ModuleRef.value.showEditModule(moduleId)
 }
 
 // 模块删除
 const onModuleDelete = (data: any) => {
   ElMessageBox.confirm(`确认删除「${data.modTitle}」吗？`, '确认信息').then(async () => {
-    await deleteModuleById(data.modId)
+    await deleteModuleById(data.moduleId)
     await getModuleData()
     ElMessage.success({
       message: '删除成功',
@@ -114,7 +115,7 @@ onMounted(() => {
 // 模块选择
 const onTreeNodeClick = (node: TreeNode) => {
   if (node.isLeaf) {
-    state.curModuleId = node.modId
+    state.curModuleId = node.moduleId
     getApiData()
   }
 }
@@ -133,17 +134,17 @@ const onApiAdd = () => {
 }
 
 // 编辑API
-const onApiEdit = (data: { apiId: number; modId: number }) => {
+const onApiEdit = (data: { moduleId: number; apiId: number }) => {
+  const moduleId = data.moduleId
   const apiId = data.apiId
-  const modId = data.modId
-  apiRef.value.showEditApi(modId, apiId)
+  apiRef.value.showEditApi(moduleId, apiId)
 }
 
 // 删除API
 const onApiDelete = (row: any) => {
-  const { apiId, apiTitle } = row
+  const { moduleId, apiId, apiTitle } = row
   ElMessageBox.confirm(`确认删除「${apiTitle}」吗？`, '确认信息').then(async () => {
-    await deleteApiById(apiId)
+    await deleteApiById(moduleId, apiId)
     await getApiData()
     ElMessage.success({
       message: '删除成功',
@@ -153,12 +154,12 @@ const onApiDelete = (row: any) => {
 }
 
 // 编辑对象
-const onApiTrans = (row: { modId: number; apiId: number }) => {
+const onApiTrans = (row: { moduleId: number; apiId: number }) => {
   if (settingsStore.settings.tabbar.enable && settingsStore.settings.tabbar.mergeTabsBy !== 'activeMenu') {
     tabbar.open({
       name: 'apiTrans',
       params: {
-        modId: row.modId,
+        moduleId: row.moduleId,
         apiId: row.apiId,
       },
     })
@@ -167,15 +168,15 @@ const onApiTrans = (row: { modId: number; apiId: number }) => {
     router.push({
       name: 'apiTrans',
       params: {
-        modId: row.modId,
+        moduleId: row.moduleId,
         apiId: row.apiId,
       },
     })
   }
 }
 
-async function onChangeStatus(row: { modId: number;apiId: number; status: number }) {
-  const res = await updateApiStatus(row.modId, row.apiId, row.status)
+async function onChangeStatus(row: { moduleId: number; apiId: number; status: number }) {
+  const res = await updateApiStatus(row.moduleId, row.apiId, row.status)
   ElMessage.success({
     message: res.msg,
     center: true,
@@ -202,7 +203,7 @@ async function onChangeStatus(row: { modId: number;apiId: number; status: number
       <LayoutContainer left-side-width="300px" hide-left-side-toggle>
         <template #leftSide>
           <el-scrollbar class="tree">
-            <ElTree ref="leftTreeRef" :data="state.modules" default-expand-all node-key="modId" @node-click="onTreeNodeClick">
+            <ElTree ref="leftTreeRef" :data="state.modules" default-expand-all node-key="moduleId" @node-click="onTreeNodeClick">
               <template #default="{ node, data }">
                 <div class="custom-tree-node">
                   <div class="label" :title="node.label">

src/views/paas/atu/components/ModelObjectSelector.vue

@@ -38,6 +38,7 @@ const state = reactive({
     keywords: '',
   },
   formData: {
+    moduleId: 0,
     apiId: 0,
     modelId: 0,
     objectId: 0,
@@ -109,8 +110,9 @@ const onObjectSel = async (row: { modelId: any; objectId: any }) => {
 
 // 点击选择
 defineExpose({
-  showModel(apiId: number) {
+  showModel(moduleId: number, apiId: number) {
     state.search.apiId = apiId
+    state.formData.moduleId = moduleId
     state.formData.apiId = apiId
     drawerModel.value = true
   },

src/views/paas/atu/index.vue

@@ -17,7 +17,7 @@ const route = useRoute()
 const router = useRouter()
 const tabbar = useTabbar()
 
-const modId = parseInt(route.params.modId.toString())
+const moduleId = parseInt(route.params.moduleId.toString())
 const apiId = parseInt(route.params.apiId.toString())
 
 const state = reactive({
@@ -29,10 +29,11 @@ const state = reactive({
   atuList: [],
   dialogState: 1,
   search: {
+    moduleId,
     apiId,
     keywords: '',
   },
-  data: '',
+  params: '',
   result: '',
 })
 
@@ -46,7 +47,7 @@ const getAtuData = async () => {
 // 查询数据
 const getData = async () => {
   state.loading = true
-  const { data } = await getApiById(modId, apiId)
+  const { data } = await getApiById(moduleId, apiId)
   state.apiTitle = data.apiTitle
   state.apiCode = data.apiCode
   state.apiType = data.apiType
@@ -60,17 +61,17 @@ onMounted(() => {
 const formRef = ref<FormInstance>()
 
 const onAdd = () => {
-  ModelObjectSelectorRef.value.showModel(apiId)
+  ModelObjectSelectorRef.value.showModel(moduleId, apiId)
 }
 
 const onEdit = (data: { atuId: number }) => {
   window.console.log(data.atuId)
 }
 
-const onDelete = (data: { apiId: number; atuId: number; objectTitle: string }) => {
-  const { apiId, atuId, objectTitle } = data
+const onDelete = (data: { moduleId: number; apiId: number; atuId: number; objectTitle: string }) => {
+  const { moduleId, apiId, atuId, objectTitle } = data
   ElMessageBox.confirm(`确认删除「${objectTitle}」吗？`, '确认信息').then(async () => {
-    await deleteAtuById(apiId, atuId)
+    await deleteAtuById(moduleId, apiId, atuId)
     await getData()
     ElMessage.success({
       message: '删除成功',
@@ -81,14 +82,14 @@ const onDelete = (data: { apiId: number; atuId: number; objectTitle: string }) =
 
 const onGenerateParams = async () => {
   const { data } = await generateParamsByCode(state.apiCode)
-  state.data = JSON.stringify(data)
+  state.params = JSON.stringify(data)
 }
 
 const onExecute = async () => {
   try {
     const apiType = state.apiType
     const apiCode = state.apiCode
-    const params = JSON.parse(state.data)
+    const params = JSON.parse(state.params)
     if (apiType === 1) {
       await getX(apiCode, params)
     }