pref:调整公共接口管理

@@ -67,8 +67,8 @@
     initVal();
   });
 
-  function initVal() {
-    if (props?.type) getOptions(props?.type);
+  async function initVal() {
+    if (props?.type) await getOptions(props?.type);
     if (props?.value) for (let i in props.value) Reflect.set(valueObj, i, props.value[i]);
   }
 

@@ -163,6 +163,7 @@
 
   const handleTestParamsInterface = () => {
     excuteTestRef.value?.showTest();
+    excuteTestRef.value?.resetValue(false);
     let value = getValue(false) as any;
     dataMap.mapParamsObj = {
       list: value?.Params,
@@ -174,6 +175,7 @@
     let value = getValue(false) as any;
     const type = value?.Body?.requestParamsBodyType;
     excuteTestRef.value?.showTest();
+    excuteTestRef.value?.resetValue(false);
     let values = [];
     for (let i in value?.Body) if (i === type) values = value?.Body[i];
     dataMap.mapBodyObj = {
@@ -185,6 +187,7 @@
 
   const handleTestHeaderInterface = () => {
     excuteTestRef.value?.showTest();
+    excuteTestRef.value?.resetValue(false);
     let value = getValue(false) as any;
     dataMap.mapHeaderObj = {
       list: value?.Header,
@@ -207,14 +210,20 @@
   };
 
   //设置数据
-  const setValue = (data) => {
-    nextTick(() => {
-      const Objects = JSON.parse(data?.requestParams);
-      if (!Objects) return;
-      dataForTypeMap[0][1](isEmpty(Objects?.Params) ? [pushObj] : Objects?.Params);
-      dataForTypeMap[1][1](isEmpty(Objects?.Body) ? {} : Objects?.Body);
-      dataForTypeMap[2][1](isEmpty(Objects?.Header) ? [pushObj] : Objects?.Header);
-    });
+  const setValue = (data, flag, defaultValue) => {
+    if (!flag) {
+      nextTick(() => {
+        const Objects = JSON.parse(data?.requestParams);
+        if (!Objects) return;
+        dataForTypeMap[0][1](isEmpty(Objects?.Params) ? [pushObj] : Objects?.Params);
+        dataForTypeMap[1][1](isEmpty(Objects?.Body) ? {} : Objects?.Body);
+        dataForTypeMap[2][1](isEmpty(Objects?.Header) ? [pushObj] : Objects?.Header);
+      });
+    } else {
+      nextTick(() => {
+        dataForTypeMap[0][1](defaultValue);
+      });
+    }
   };
 
   //重置数据

@@ -31,7 +31,11 @@
             :options="selectTenantOptions"
           />
         </div>
-        <Button class="ml-2" @click="handleTest(isSingleClickText)" type="primary"
+        <Button
+          :disabled="testDisabled"
+          class="ml-2"
+          @click="handleTest(isSingleClickText)"
+          type="primary"
           >{{ `${isSingleClickText === 'open' ? '打开' : '关闭'}测试接口` }}
         </Button>
       </div>
@@ -43,7 +47,7 @@
               <TestBodyCellTable :token="getToken" ref="testEditCellTableRef" />
             </div>
             <div style="width: 30vw" v-else-if="data?.type === 'json'">
-              <JsonEditor ref="jsonEditorRef" />
+              <JsonEditor style="width: 35vw; height: 30vh" ref="jsonEditorRef" />
             </div>
             <div style="width: 30vw" v-else-if="data?.type === 'xml'">
               <a-textarea v-model:value="xmlContent" placeholder="请输入xml" :rows="6" />
@@ -102,6 +106,8 @@
 
   const showTestEditCell = ref(false);
 
+  const testDisabled = ref(true);
+
   const excuteData = ref({});
 
   const selectTenant = ref(undefined);
@@ -121,12 +127,22 @@
   const getToken = ref('');
 
   const onSelect = async (e) => {
+    if (e) {
+      testDisabled.value = false;
+    } else {
+      testDisabled.value = true;
+    }
     selectSysTenant.value = undefined;
     const rest = (await getTenantAllPageLists(e)) as any;
     selectTenantOptions.value = rest?.map((m) => ({ label: m.realName, value: m.id }));
   };
 
   const onSelctTenant = async (e) => {
+    if (e) {
+      testDisabled.value = false;
+    } else {
+      testDisabled.value = true;
+    }
     const { token } = await getUserToken(e);
     getToken.value = token;
   };

 <template>
   <div v-if="showTestFlag" class="mt-8">
     <div>
-      <Button @click="handleExcute" type="primary"> 执行测试请求 </Button>
+      <a-row>
+        <Button @click="handleExcute" type="primary"> 执行测试请求 </Button>
+      </a-row>
+      <a-row class="mt-8" type="flex" justify="center" align="middle">
+        <a-col :span="2"> 测试地址 </a-col>
+        <a-col :span="22">
+          <Tag color="blue" style="width: 31.6vw; white-space: normal; height: auto">
+            {{ apiUrl?.split('{?')[0] }}
+          </Tag>
+        </a-col>
+      </a-row>
     </div>
     <div class="mt-8">
       <a-row type="flex" justify="center">
-        <a-col :span="2"> 测试结果 </a-col>
-        <a-col :span="22">
+        <a-col :span="24">
           <JsonEditor
             v-if="isWebSocketType === '2'"
             style="width: 35vw; height: 40vh"
@@ -25,6 +34,7 @@
   import { useWebSocket } from '@vueuse/core';
   import { useUtils } from '../../../hooks/useUtils';
   import JsonEditor from '../../SimpleRequest/components/jsonEditor.vue';
+  import { Tag } from 'ant-design-vue';
 
   const emits = defineEmits(['emitExcute']);
 
@@ -73,6 +83,8 @@
 
   const isToken = ref('');
 
+  const apiUrl = ref('');
+
   const isPostToken = ref('');
 
   //执行测试接口
@@ -93,7 +105,7 @@
     isToken.value = Objects?.Params?.token;
     const body = Objects?.Body?.params;
     isPostToken.value = Objects?.Body?.token;
-    const apiUrl = url?.restfulFormat(params);
+    apiUrl.value = url?.restfulFormat(params);
     if (isWebSocketType.value === '2') {
       socketUrls.value = url;
       socketMessage.server = `${socketUrls.value}?token=${isToken.value}`;
@@ -105,24 +117,32 @@
         resetValue(false);
       }
     } else {
-      const resp = await otherHttpRequest(
-        apiType,
-        apiUrl?.split('{?')[0],
-        headers,
-        params,
-        body,
-        isToken.value,
-        isPostToken.value
-      );
-      if (!resp) return;
-      if (Object.prototype.toString.call(resp) === '[object Object]') {
-        jsonEditorRef.value?.setJsonValue(resp);
-      } else if (typeof resp === 'string') {
-        jsonEditorRef.value?.setJsonValue(resp);
-      } else if (Array.isArray(resp)) {
-        jsonEditorRef.value?.setJsonValue(JSON.stringify(resp));
-      } else {
-        jsonEditorRef.value?.setJsonValue(JSON.stringify(resp));
+      try {
+        const resp = await otherHttpRequest(
+          apiType,
+          apiUrl.value?.split('{?')[0],
+          headers,
+          params,
+          body,
+          isToken.value,
+          isPostToken.value
+        );
+        if (!resp) return;
+        if (Object.prototype.toString.call(resp) === '[object Object]') {
+          jsonEditorRef.value?.setJsonValue(resp);
+        } else if (typeof resp === 'string') {
+          jsonEditorRef.value?.setJsonValue(resp);
+        } else if (Array.isArray(resp)) {
+          jsonEditorRef.value?.setJsonValue(JSON.stringify(resp));
+        } else {
+          jsonEditorRef.value?.setJsonValue(JSON.stringify(resp));
+        }
+      } catch (e) {
+        if (Object.prototype.toString.call(e) === '[object Object]') {
+          jsonEditorRef.value?.setJsonValue(e);
+        } else {
+          jsonEditorRef.value?.setJsonValue(JSON.stringify(e));
+        }
       }
     }
   };
@@ -184,33 +204,42 @@
     const { convertObj } = useUtils();
     switch (apiType) {
       case 'GET':
-        const objGet = Object.assign({}, headers, { 'X-Authorization': `Bearer ${token}` });
+        const objGet = Object.assign({}, headers, {
+          'X-Authorization': `Bearer ${!token ? postToken : token}`,
+        });
         return await otherHttp.get(
           { url: apiUrl, params, headers: objGet },
           {
             apiUrl: '',
             joinPrefix,
             withToken: false,
+            errorMessageMode: 'none',
           }
         );
       case 'POST':
-        const objPost = Object.assign({}, headers, { 'X-Authorization': `Bearer ${postToken}` });
+        const objPost = Object.assign({}, headers, {
+          'X-Authorization': `Bearer ${!postToken ? token : postToken}`,
+        });
         return await otherHttp.post(
           { url: `${apiUrl}?${convertObj(params)}`, data: body, headers: objPost },
           {
             apiUrl: '',
             joinPrefix,
             withToken: false,
+            errorMessageMode: 'none',
           }
         );
       case 'PUT':
-        const objPut = Object.assign({}, headers, { 'X-Authorization': `Bearer ${postToken}` });
+        const objPut = Object.assign({}, headers, {
+          'X-Authorization': `Bearer ${!postToken ? token : postToken}`,
+        });
         return await otherHttp.put(
           { url: `${apiUrl}?${convertObj(params)}`, data: body, headers: objPut, params },
           {
             apiUrl: '',
             joinPrefix,
             withToken: false,
+            errorMessageMode: 'none',
           }
         );
     }
@@ -220,8 +249,10 @@
     if (flag) {
       showTestFlag.value = false;
     }
-    jsonEditorRef.value?.setJsonValue({});
-    jsonWebsocketEditorRef.value?.setJsonValue({});
+    nextTick(() => {
+      jsonEditorRef.value?.setJsonValue('执行测试结果为：');
+      jsonWebsocketEditorRef.value?.setJsonValue('执行测试结果为：');
+    });
     isWebSocketType.value = '0';
   };
 

@@ -31,7 +31,11 @@
             :options="selectTenantOptions"
           />
         </div>
-        <Button class="ml-2" @click="handleTest(isSingleClickText)" type="primary"
+        <Button
+          :disabled="testDisabled"
+          class="ml-2"
+          @click="handleTest(isSingleClickText)"
+          type="primary"
           >{{ `${isSingleClickText === 'open' ? '打开' : '关闭'}测试接口` }}
         </Button>
       </div>
@@ -87,6 +91,8 @@
 
   const selectTenantOptions = ref<selectType[]>([]);
 
+  const testDisabled = ref(true);
+
   const { createMessage } = useMessage();
 
   const showTestEditCell = ref(false);
@@ -104,12 +110,22 @@
   const getToken = ref('');
 
   const onSelect = async (e) => {
+    if (e) {
+      testDisabled.value = false;
+    } else {
+      testDisabled.value = true;
+    }
     selectSysTenant.value = undefined;
     const rest = (await getTenantAllPageLists(e)) as any;
     selectTenantOptions.value = rest?.map((m) => ({ label: m.realName, value: m.id }));
   };
 
   const onSelctTenant = async (e) => {
+    if (e) {
+      testDisabled.value = false;
+    } else {
+      testDisabled.value = true;
+    }
     const { token } = await getUserToken(e);
     getToken.value = token;
   };

@@ -21,7 +21,11 @@
             :options="selectTenantOptions"
           />
         </div>
-        <Button class="ml-2" @click="handleTest(isSingleClickText)" type="primary"
+        <Button
+          :disabled="isAdmin(role) ? testDisabled : false"
+          class="ml-2"
+          @click="handleTest(isSingleClickText)"
+          type="primary"
           >{{ `${isSingleClickText === 'open' ? '打开' : '关闭'}测试接口` }}
         </Button>
       </div>
@@ -77,6 +81,8 @@
 
   const selectOptions = ref<selectType[]>([]);
 
+  const testDisabled = ref(true);
+
   const selectTenantOptions = ref<selectType[]>([]);
 
   const { createMessage } = useMessage();
@@ -98,24 +104,28 @@
   const getToken = ref('');
 
   const onSelect = async (e) => {
+    if (e) {
+      testDisabled.value = false;
+    } else {
+      testDisabled.value = true;
+    }
     selectSysTenant.value = undefined;
     const rest = (await getTenantAllPageLists(e)) as any;
     selectTenantOptions.value = rest?.map((m) => ({ label: m.realName, value: m.id }));
   };
 
   const onSelctTenant = async (e) => {
+    if (e) {
+      testDisabled.value = false;
+    } else {
+      testDisabled.value = true;
+    }
     const { token } = await getUserToken(e);
     getToken.value = token;
   };
   const isSingleClickText = ref('open');
 
   const handleTest = (o) => {
-    if (isAdmin(role)) {
-      if (!selectTenant.value || !selectSysTenant.value) {
-        createMessage.error('请选择租户或者租户管理员');
-        throw Error('请选择租户或者租户管理员');
-      }
-    }
     if (o === 'open') {
       showTestEditCell.value = true;
       emits('testParamsInterface');

@@ -10,6 +10,9 @@
     >
       <BasicForm @register="registerForm">
         <template #selectMethods="{ model }">
+          <p style="display: none">{{
+            watchRequestHttpTypeAndUrl(model['requestHttpTypeAndUrl'])
+          }}</p>
           <SimpleRequest
             ref="simpleRequestRef"
             v-if="model['requestContentType'] === '0' || model['requestContentType'] === '2'"
@@ -30,7 +33,7 @@
         </template>
         <template #slotFillAddress="{ model }">
           <div>
-            <Tag style="height: 3.3vh; line-height: 3.3vh">
+            <Tag color="blue" style="width: 35vw; white-space: normal; height: auto">
               {{
                 ` ${
                   model['originUrlType'] !== 'server_url'
@@ -51,7 +54,7 @@
   </div>
 </template>
 <script lang="ts" setup name="publicApi">
-  import { ref, nextTick } from 'vue';
+  import { ref, nextTick, watch } from 'vue';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
   import { BasicForm, useForm } from '/@/components/Form';
   import { schemas } from './config';
@@ -84,6 +87,31 @@
     return isServerUrl(method, type);
   };
 
+  const watchRequestHttpTypeAndUrlStr = ref('');
+
+  const watchRequestHttpTypeAndUrl = (o) => {
+    watchRequestHttpTypeAndUrlStr.value = o;
+  };
+
+  watch(
+    () => watchRequestHttpTypeAndUrlStr.value,
+    (newValue: any) => {
+      if (!newValue?.requestUrl) return;
+      if (newValue?.requestUrl.includes('{entityType}')) {
+        simpleRequestRef.value?.setValue(null, true, [
+          {
+            key: 'scope',
+            value: 'entityType',
+            required: true,
+          },
+        ]);
+      }
+    },
+    {
+      deep: true,
+    }
+  );
+
   const [registerForm, { resetFields, validate, setFieldsValue, updateSchema }] = useForm({
     labelWidth: 120,
     schemas,
@@ -118,7 +146,7 @@
           requestUrl: data.record?.requestUrl,
         },
       });
-      await nextTick(() => simpleRequestRef.value?.setValue(data.record));
+      await nextTick(() => simpleRequestRef.value?.setValue(data.record, false, []));
       updateSchema({
         field: 'requestHttpTypeAndUrl',
         componentProps: {