feat: merge

src/pages/device/components/InputSelect/index.tsx

@@ -31,9 +31,9 @@ const InputSelect = (props: Props) => {
       mode={'tags'}
       onChange={(value) => {
         if (value.length > 1) {
-          props.onChange(value.slice(value.length - 1));
+          props.onChange(value.slice(value.length - 1)?.[0]);
         } else {
-          props.onChange(value);
+          props.onChange(value?.[0]);
         }
       }}
       value={props.value}

src/pages/link/Type/Detail/index.tsx

@@ -472,11 +472,11 @@ const Save = observer(() => {
             'x-validator': [
               {
                 max: 65535,
-                message: '请输入0-65535之间的正整数',
+                message: '请输入1-65535之间的正整数',
               },
               {
-                min: 0,
-                message: '请输入0-65535之间的正整数',
+                min: 1,
+                message: '请输入1-65535之间的正整数',
               },
               {
                 required: true,

src/pages/system/Platforms/Api/swagger-ui/debugging.tsx

@@ -79,20 +79,27 @@ export default observer(() => {
 
   const onSearch = useCallback(async () => {
     const formData: any = await form.submit();
+    // 判断请求类型
+    const method = ApiModel.swagger.method && ApiModel.swagger.method.toUpperCase();
     console.log(formData);
     let newUrl = ApiModel.swagger.url;
+    const urlParams = {};
     if (formData && formData.params && formData.params.length) {
       const params = formData.params;
       params.forEach((item: any) => {
+        if (method === 'GET') {
+          console.log(ApiModel.swagger.method);
+          // const arr = ApiModel.swagger.url.split('/').filter((it:any)=>it.includes('{'))
+          urlParams[item.name] = item.values;
+        }
         if (newUrl.includes(`{${item.name}}`)) {
           newUrl = newUrl.replace(`{${item.name}}`, item.values);
         }
       });
       console.log(newUrl);
+      console.log(urlParams);
     }
 
-    // 判断请求类型
-    const method = ApiModel.swagger.method && ApiModel.swagger.method.toUpperCase();
     let options = {};
     if (['POST', 'PUT', 'PATCH'].includes(method)) {
       options = {
@@ -102,7 +109,11 @@ export default observer(() => {
     } else if (['GET', 'DELETE'].includes(method)) {
       options = {
         method,
-        params: body || {},
+        params:
+          {
+            ...body,
+            ...urlParams,
+          } || {},
       };
     }