@ywfe/fe-tools 1.2.1-beta.30 → 1.2.1-beta.32

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@ywfe/fe-tools",
-  "version": "1.2.1-beta.30",
+  "version": "1.2.1-beta.32",
   "description": "工具函数库",
   "main": "./lib/ywfe-tools.cjs",
   "module": "./lib/ywfe-tools.esm.js",

package/request.ts

@@ -18,16 +18,8 @@ async function request({ input }: { input: RequestOptions }) {
     return basePathMap.get(env);
   };
   const isValidURL = (url:string) => {
-    var pattern = new RegExp(
-      "^(https?:\/\/)?" + // protocol
-        "((([a-z\d]([a-z\d-]*[a-z\d])*)\.)+[a-z]{2,}|" + // domain name
-        "((\d{1,3}\.){3}\d{1,3}))" + // OR ip (v4) address
-        "(\:\d+)?(\/[-a-z\d%_.~+]*)*" + // port and path
-        "(\?[;&a-z\d%_.~+=-]*)?" + // query string
-        "(\#[-a-z\d_]*)?$",
-      "i"
-    ); // fragment locator
-    return !!pattern.test(url);
+   const regex = /^https?:\/\//;
+   return regex.test(url);
   };
   const prefix = getBasePath();
   let requestUrl = isValidURL(input.url) ? input.url : `${prefix}${input.url}`;
@@ -46,9 +38,11 @@ async function request({ input }: { input: RequestOptions }) {
   const response = await fetch(requestUrl, fetchOption);
   if (!response.ok) {
     const message = `An error has occured: ${response.status}`;
+     console.log('req result', message);
     return { success: false, message };
   }
   const result = await response.json();
+  console.log('req result',result);
   return result;
 }
 

package/userInputToJson.ts

@@ -5,6 +5,7 @@ interface userInput {
   rules?: string;
 }
 async function userInputToJson({ input }: { input: userInput }) {
+  console.log("input", input);
   const res: { message: string; success: boolean; data: any } =
     await request({
       input: {
@@ -13,7 +14,11 @@ async function userInputToJson({ input }: { input: userInput }) {
         params: input,
       },
     });
-  return res
- 
+  if (res.success) {
+    const result = res.data;
+    return result.success ? result.data : result;
+  } else {
+    return res.success ? res.data : res;
+  }
 }
 export default userInputToJson