pref: 公共接口管理新增接口类型字段

@@ -2,7 +2,7 @@
   <div class="flex flex-col justify-between">
     <div ref="jsoneditorRef" style="height: 100%; width: 100%"></div>
     <div class="ml-2 -mt-1.5">
-      <Button v-if="showBtn" @click="onHandleCopy" class="mt-8">
+      <Button v-if="showBtn" @click="onHandleCopy" class="mt-8 -ml-2">
         <template #icon>
           <CopyOutlined />
         </template>
@@ -42,11 +42,7 @@
         mode: 'code',
         mainMenuBar: false,
         statusBar: false,
-        onFocus: () => {
-          if (props.showBtn) {
-            setJsonValue('测试结果为');
-          }
-        },
+        onFocus: () => {},
         onBlur: () => {},
         onChangeText: (e) => {
           if (props.showBtn) {

@@ -235,6 +235,7 @@
     excuteData.value = {
       params,
       token: getToken.value,
+      type: props.data?.type,
     };
     return excuteData.value;
   };

@@ -100,6 +100,8 @@
 
   const isShowTestResult = ref(false);
 
+  const postBodyType = ref('');
+
   //执行测试接口
   const handleExcute = () => {
     emits('emitExcute');
@@ -123,6 +125,7 @@
     isToken.value = Objects?.Params?.token;
     const body = Objects?.Body?.params;
     isPostToken.value = Objects?.Body?.token;
+    postBodyType.value = Objects?.Body?.type;
     apiUrl.value = url?.restfulFormat(params);
     if (isWebSocketType.value === '2') {
       socketUrls.value = url;
@@ -143,7 +146,8 @@
           params,
           body,
           isToken.value,
-          isPostToken.value
+          isPostToken.value,
+          postBodyType.value
         );
         if (!resp) return;
         if (Object.prototype.toString.call(resp) === '[object Object]') {
@@ -151,7 +155,10 @@
         } else if (typeof resp === 'string') {
           jsonEditorRef.value?.setJsonValue(resp);
         } else if (Array.isArray(resp)) {
-          jsonEditorRef.value?.setJsonValue(JSON.stringify(resp));
+          const temp = {
+            data: resp,
+          };
+          jsonEditorRef.value?.setJsonValue(temp);
         } else {
           jsonEditorRef.value?.setJsonValue(JSON.stringify(resp));
         }
@@ -217,14 +224,19 @@
     body,
     token,
     postToken,
+    postBodyType,
     joinPrefix = false
   ) => {
     const { convertObj } = useUtils();
     switch (apiType) {
       case 'GET':
-        const objGet = Object.assign({}, headers, {
-          'X-Authorization': `Bearer ${!token ? postToken : token}`,
-        });
+        const objGet = Object.assign(
+          {},
+          {
+            'X-Authorization': `Bearer ${!token ? postToken : token}`,
+          },
+          headers
+        );
         return await otherHttp.get(
           { url: apiUrl, params, headers: objGet },
           {
@@ -235,9 +247,26 @@
           }
         );
       case 'POST':
-        const objPost = Object.assign({}, headers, {
-          'X-Authorization': `Bearer ${!postToken ? token : postToken}`,
-        });
+        console.log(postBodyType);
+        const objPost = Object.assign(
+          {},
+          {
+            'X-Authorization': `Bearer ${!postToken ? token : postToken}`,
+          },
+          {
+            'Content-Type':
+              postBodyType === 'xml'
+                ? 'text/xml'
+                : postBodyType === 'form-data'
+                ? 'multipart/form-data'
+                : postBodyType === 'x-www-form-urlencoded'
+                ? 'application/x-www-form-urlencoded'
+                : postBodyType === 'json'
+                ? 'application/json'
+                : 'none',
+          },
+          headers
+        );
         return await otherHttp.post(
           { url: `${apiUrl}?${convertObj(params)}`, data: body, headers: objPost },
           {

@@ -82,6 +82,46 @@ export const schemas: FormSchema[] = [
       placeholder: '请输入接口名称',
     },
   },
+  // {
+  //   field: 'interfaceType',
+  //   component: 'ApiRadioGroup',
+  //   label: '接口类型',
+  //   required: true,
+  //   colProps: {
+  //     span: 8,
+  //   },
+  //   defaultValue: 'SYSTEM',
+  //   componentProps: {
+  //     api: findDictItemByCode,
+  //     params: {
+  //       dictCode: 'interface_Type',
+  //     },
+  //     labelField: 'itemText',
+  //     valueField: 'itemValue',
+  //   },
+  // },
+  {
+    field: 'interfaceType',
+    component: 'ApiRadioGroup',
+    label: '接口类型',
+    required: true,
+    colProps: {
+      span: 8,
+    },
+    defaultValue: 'SYSTEM',
+    componentProps: {
+      options: [
+        {
+          label: '系统默认',
+          value: 'SYSTEM',
+        },
+        {
+          label: '自定义',
+          value: 'CUSTOM',
+        },
+      ],
+    },
+  },
   {
     field: 'requestContentType',
     label: '请求方式',
@@ -190,9 +230,17 @@ export const schemas: FormSchema[] = [
     slot: 'slotFillAddress',
     colProps: { span: 24 },
     ifShow: ({ values }) => {
-      if (values['requestOriginUrl']) {
-        return true;
-      } else return false;
+      return values['originUrlType'] === 'custom_url' && values['requestOriginUrl'];
+    },
+  },
+  {
+    field: 'slotServerAddress',
+    label: '完整地址',
+    component: 'Input',
+    slot: 'slotServerAddress',
+    colProps: { span: 24 },
+    ifShow: ({ values }) => {
+      return values['originUrlType'] === 'server_url';
     },
   },
   {

@@ -33,6 +33,19 @@
         </template>
         <template #slotFillAddress="{ model }">
           <div>
+            <template v-if="model['originUrlType'] === 'custom_url'">
+              <Tag
+                v-if="model['requestOriginUrl']"
+                color="blue"
+                style="width: 35vw; white-space: normal; height: auto"
+              >
+                {{ ` ${model['requestOriginUrl'] + model['requestHttpTypeAndUrl']?.requestUrl}` }}
+              </Tag>
+            </template>
+          </div>
+        </template>
+        <template #slotServerAddress="{ model }">
+          <div>
             <Tag
               v-if="model['originUrlType'] === 'server_url'"
               color="blue"
@@ -45,15 +58,6 @@
                 `
               }}
             </Tag>
-            <template v-else>
-              <Tag
-                v-if="model['requestOriginUrl']"
-                color="blue"
-                style="width: 35vw; white-space: normal; height: auto"
-              >
-                {{ ` ${model['requestOriginUrl'] + model['requestHttpTypeAndUrl']?.requestUrl}` }}
-              </Tag>
-            </template>
           </div>
         </template>
       </BasicForm>