pref: 优化公共接口管理部分代码

@@ -71,7 +71,13 @@
   import { Tag } from 'ant-design-vue';
   import { RequestMethodTypeEnum, RequestOriginTypeEnum } from './config/enum';
 
-  const { resetReqHttpType, isServerUrl, resetUpdateSchema } = useUtils();
+  const {
+    resetReqHttpType,
+    isServerUrl,
+    resetUpdateSchema,
+    validateRequestTypeAndUrl,
+    getOriginUrlType,
+  } = useUtils();
 
   const emits = defineEmits(['success', 'register']);
 
@@ -81,6 +87,8 @@
 
   const putId = ref('');
 
+  const editSetFilter = ref('');
+
   const simpleRequestRef = ref<InstanceType<typeof SimpleRequest>>();
 
   const templateFillAddress = (method, type) => {
@@ -127,6 +135,7 @@
     updateSchema(resetUpdateSchema);
     isUpdate.value = data.isUpdate;
     !isUpdate.value ? (putId.value = '') : (putId.value = data.record.id);
+    editSetFilter.value = data.record?.filter;
     simpleRequestRef.value?.resetValue();
     if (isUpdate.value) {
       await setFieldsValue({
@@ -152,31 +161,14 @@
   });
 
   const handleSubmit = async () => {
-    setDrawerProps({ loading: true });
     try {
+      setDrawerProps({ loading: true });
       const values = await validate();
       if (!values) return;
-      const isRequestHttpTypeAndUrlEmpty = values?.requestHttpTypeAndUrl;
-      if (values.requestContentType === RequestMethodTypeEnum.COMMOM) {
-        if (
-          !Reflect.get(isRequestHttpTypeAndUrlEmpty, 'requestHttpType') ||
-          !Reflect.get(isRequestHttpTypeAndUrlEmpty, 'requestUrl')
-        ) {
-          createMessage.error('请填写请求类型&地址');
-          throw Error('请填写请求类型&地址');
-        }
-      } else if (values.requestContentType === RequestMethodTypeEnum.WEBSOCKET) {
-        if (!Reflect.get(isRequestHttpTypeAndUrlEmpty, 'requestUrl')) {
-          createMessage.error('请填写请求类型&地址');
-          throw Error('请填写请求类型&地址');
-        }
-      }
+      validateRequestTypeAndUrl(values);
       const Objects = simpleRequestRef.value?.getValue(true);
       const filter = simpleRequestRef.value?.getFilterValue();
-      const requestOriginUrl =
-        values['originUrlType'] === RequestOriginTypeEnum.SERVER_URL
-          ? 'localhost'
-          : values['requestOriginUrl'];
+      const requestOriginUrl = getOriginUrlType(values);
       const data = {
         ...values,
         id: !putId.value ? null : putId.value,
@@ -186,7 +178,7 @@
           },
           ...Objects,
         }),
-        filter: !filter ? null : filter,
+        filter: !putId.value ? filter : filter ? filter : editSetFilter.value,
         requestOriginUrl,
         requestHttpType: values['requestHttpTypeAndUrl']?.requestHttpType,
         requestUrl: values['requestHttpTypeAndUrl']?.requestUrl,

 import { commonHttpPlaceHolder, websocketPlaceHolder } from '../config/constants';
-import { RequestMethodTypeEnum } from '../config/enum';
+import { RequestMethodTypeEnum, RequestOriginTypeEnum } from '../config/enum';
 import { otherHttp } from '/@/utils/http/axios';
 import { tableItems } from '../config/types';
+import { useMessage } from '/@/hooks/web/useMessage';
 
 export const useUtils = () => {
+  const { createMessage } = useMessage();
   //获取多个key
   const getMultipleKeys = (list) => {
     let temps = [];
@@ -231,6 +233,34 @@ export const useUtils = () => {
     }
   }
 
+  //验证请求类型&地址
+  const errorMsg = () => {
+    createMessage.error('请填写请求类型&地址');
+    throw Error('请填写请求类型&地址');
+  };
+  const validateRequestTypeAndUrl = (values) => {
+    const isRequestHttpTypeAndUrlEmpty = values?.requestHttpTypeAndUrl;
+    if (values.requestContentType === RequestMethodTypeEnum.COMMOM) {
+      if (
+        !Reflect.get(isRequestHttpTypeAndUrlEmpty, 'requestHttpType') ||
+        !Reflect.get(isRequestHttpTypeAndUrlEmpty, 'requestUrl')
+      ) {
+        return errorMsg();
+      }
+    } else if (values.requestContentType === RequestMethodTypeEnum.WEBSOCKET) {
+      if (!Reflect.get(isRequestHttpTypeAndUrlEmpty, 'requestUrl')) {
+        return errorMsg();
+      }
+    }
+  };
+
+  //获取originUrlType
+  const getOriginUrlType = (values) => {
+    return values['originUrlType'] === RequestOriginTypeEnum.SERVER_URL
+      ? 'localhost'
+      : values['requestOriginUrl'];
+  };
+
   return {
     getMultipleKeys,
     pushObj,
@@ -246,5 +276,7 @@ export const useUtils = () => {
     commonParams,
     CommonFuncValue,
     ParamsFuncValue,
+    validateRequestTypeAndUrl,
+    getOriginUrlType,
   };
 };