fix(core): 修复题库配置BUG

ocsjs · May 20, 2022 · 2b8c939 · 2b8c939
1 parent 03fa9be
commit 2b8c939
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/packages/core/src/components/index.tsx b/packages/core/src/components/index.tsx
@@ -203,6 +203,7 @@ function parseAnswererWrappers (value: string): AnswererWrapper[] {
       return [];
     }
   } catch (e) {
+    console.log(e);
     message('error', '题库配置格式错误！');
     return [];
   }

diff --git a/packages/core/src/core/utils/common.ts b/packages/core/src/core/utils/common.ts
@@ -116,13 +116,14 @@ export function request(url: string, opts: {
   method?: 'get' | 'post';
   headers?: Record<string, string>;
   contentType?: 'json' | 'text',
-  body?: string
+  body?: string | URLSearchParams
 }): Promise<string | object> {
   return new Promise((resolve, reject) => {
     /** 默认参数 */
     const { contentType = 'json', body, method = 'get', headers = {}, type = 'fetch' } = opts || {};
     /** 环境变量 */
     const env = isInBrowser() ? 'browser' : 'node';
+    // console.log('request', { url, opts });
 
     /** 如果是跨域模式并且是浏览器环境 */
     if (type === 'GM_xmlhttpRequest' && env === 'browser') {
@@ -131,7 +132,7 @@ export function request(url: string, opts: {
         GM_xmlhttpRequest({
           method: opts.method?.toLocaleUpperCase() as any || 'GET',
           url,
-          data: JSON.stringify(body || {}),
+          data: body?.toString(),
           headers: opts.headers || {},
           responseType: 'json',
           onload: (response) => {

diff --git a/packages/core/src/core/worker/answer.wrapper.handler.ts b/packages/core/src/core/worker/answer.wrapper.handler.ts
@@ -130,7 +130,7 @@ export async function defaultAnswerWrapperHandler(
       const responseData = await request(url, {
         method: wrapper.method,
         contentType: wrapper.contentType,
-        body: wrapper.method === 'post' ? JSON.stringify(data) : undefined,
+        body: wrapper.method === 'post' ? new URLSearchParams(data) : undefined,
         type: wrapper.type,
         headers: wrapper.headers
       });
@@ -180,13 +180,16 @@ export async function defaultAnswerWrapperHandler(
   }
 
   function resolvePlaceHolder(str: string) {
-    const matches = str.match(/\${(.*?)}/g) || [];
-    matches.forEach((placeHolder) => {
-      const value: any =
-        /** 获取元素属性 */
-        get(env, placeHolder.replace(/\${(.*)}/, '$1'));
-      str = str.replace(placeHolder, value);
-    });
+    if (typeof str === 'string') {
+      const matches = str.match(/\${(.*?)}/g) || [];
+      matches.forEach((placeHolder) => {
+        const value: any =
+          /** 获取元素属性 */
+          get(env, placeHolder.replace(/\${(.*)}/, '$1'));
+        str = str.replace(placeHolder, value);
+      });
+    }
+
     return str;
   }