✨ feat: node 转发请求，决绝跨域

Author: wjkang

README.md

@@ -90,7 +90,7 @@
       {
         "id": 137,
         "code": "mechanisms",
-        "name": "居有屋_外部机构",
+        "name": "外部机构",
         "internalType": 0,
         "needArea": 0,
         "assetTypes": [],
@@ -223,7 +223,7 @@ routes 目录下创建新的 mock 文件
 
 配置表单
 
-<p align="center"><img style="height:500px" src="https://p3-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/5b24b7d804ac4db1a3673fd2aa4aa4cd~tplv-k3u1fbpfcp-zoom-1.image"/></p>
+<p align="center"><a href="https://p3-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/5b24b7d804ac4db1a3673fd2aa4aa4cd~tplv-k3u1fbpfcp-zoom-1.image"><img style="height:500px;max-height:500px" src="https://p3-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/5b24b7d804ac4db1a3673fd2aa4aa4cd~tplv-k3u1fbpfcp-zoom-1.image"/></a></p>
 
 生成代码
 
@@ -335,12 +335,15 @@ routes 目录下创建新的 mock 文件
 ### 表单
 
 选择表单区块，配置 Schema 表单
+
 ![](https://p3-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/5a0c793a67924583a4cb83569483687c~tplv-k3u1fbpfcp-zoom-1.image)
 
 ## 自定义区块
 
 创建新的区块
+
 ![](https://p3-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/48f22790459d49f7b708a7684f9d2321~tplv-k3u1fbpfcp-zoom-1.image)
+
 ![](https://p3-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/ca76e8e939334df48d7bd3512dadf40a~tplv-k3u1fbpfcp-zoom-1.image)
 
 配置 Schema 表单：复制旧区块的 schema.json 内容覆盖到当前区块的 schema.json 文件内。将 schema 字段内容导入网页 https://xrender.fun/~demos/docs-generator-demo-0 中重新配置。

package.json

@@ -3,7 +3,7 @@
 	"displayName": "lowcode",
 	"description": "低代码工具",
 	"author": "wjkang <ruoxieme@gmail.com>",
-	"version": "1.4.0",
+	"version": "1.4.1",
 	"icon": "asset/icon.png",
 	"publisher": "wjkang",
 	"repository": "https://github.com/lowcoding/lowcode-vscode",

src/utils/request.ts

@@ -1,4 +1,5 @@
-import axios from 'axios';
+import axios, { AxiosRequestConfig } from 'axios';
+import common from 'mocha/lib/interfaces/common';
 
 const https = require('https');
 

src/webview/controllers/request.ts

@@ -0,0 +1,11 @@
+import axios, { AxiosRequestConfig } from 'axios';
+import { IMessage } from '../type';
+
+export const axiosRequest = async (
+  message: IMessage<{
+    config: AxiosRequestConfig;
+  }>,
+) => {
+  const res = await axios.request(message.data.config);
+  return res.data;
+};

src/webview/index.ts

@@ -114,13 +114,20 @@ export const showWebView = (options: {
     setWebviewHtml(panel);
     const disposables: vscode.Disposable[] = [];
     panel.webview.onDidReceiveMessage(
-      async (message: { cmd: string; cbid: string; data: any }) => {
+      async (message: {
+        cmd: string;
+        cbid: string;
+        data: any;
+        skipError?: boolean;
+      }) => {
         if (routes[message.cmd]) {
           try {
             const res = await routes[message.cmd](message);
             invokeCallback(panel, message.cbid, res);
           } catch (ex: any) {
-            window.showErrorMessage(ex.toString());
+            if (!message.skipError) {
+              window.showErrorMessage(ex.toString());
+            }
             invokeErrorCallback(panel, message.cbid, ex);
           }
         } else {

src/webview/routes/index.ts

@@ -10,6 +10,7 @@ import * as block from '../controllers/block';
 import * as json from '../controllers/json';
 import * as config from '../controllers/config';
 import * as intelliSense from '../controllers/intelliSense';
+import * as reqeust from '../controllers/request';
 
 export const routes: Record<string, any> = {
   alert: alert.alert,
@@ -46,4 +47,5 @@ export const routes: Record<string, any> = {
   savePluginConfig: config.savePluginConfig,
 
   refreshIntelliSense: intelliSense.refreshIntelliSense,
+  request: reqeust.axiosRequest,
 };

webview-react/src/hooks/useCheckVankeInternal.ts

@@ -1,5 +1,5 @@
 import { useMount } from 'ahooks';
-import { request } from 'umi';
+import { nodeRequest } from '@/webview/service';
 import { useState } from './useImmer';
 
 const useCheckVankeInternal = () => {
@@ -8,7 +8,7 @@ const useCheckVankeInternal = () => {
   );
 
   useMount(() => {
-    request('https://yapi.onewo.com', { skipErrorHandler: true })
+    nodeRequest({ url: 'https://yapi.onewo.com' })
       .then(() => {
         setIsVankeInternal(true);
       })

webview-react/src/pages/scaffold/List/useController.tsx

@@ -28,7 +28,9 @@ const useController = () => {
       s.fetch = true;
     });
     const promises: ReturnType<typeof getScaffolds>[] = [
-      getScaffolds('https://gitee.com/lowcoding/scaffold/raw/master/index.json'),
+      getScaffolds(
+        'https://gitee.com/lowcoding/scaffold/raw/master/index.json',
+      ),
     ];
     if (isVankeInternal) {
       promises.push(

webview-react/src/webview/index.ts

@@ -13,15 +13,15 @@ if (process.env.NODE_ENV !== 'production') {
               message: 'call vscode',
               description: `cmd: ${message.cmd}`,
             });
-            (callbacks[message.cbid] || function() {})(
+            (callbacks[message.cbid] || function () {})(
               require(`./mock/${message.cmd}`).default,
             );
           }, 1000);
         },
       };
 }
 export function callVscode(
-  data: { cmd: string; data?: any },
+  data: { cmd: string; data?: any; skipError?: boolean },
   cb?: (data: any) => void,
   errorCb?: (data: any) => void,
 ) {
@@ -40,10 +40,10 @@ export function callVscode(
   }
 }
 
-export function callVscodePromise(cmd: string, data: any) {
+export function callVscodePromise(cmd: string, data: any, skipError?: boolean) {
   return new Promise((resolve, reject) => {
     callVscode(
-      { cmd, data },
+      { cmd, data, skipError },
       (res) => {
         resolve(res);
       },
@@ -54,10 +54,14 @@ export function callVscodePromise(cmd: string, data: any) {
   });
 }
 
-export function request<T = unknown>(params: { cmd: string; data?: any }) {
+export function request<T = unknown>(params: {
+  cmd: string;
+  data?: any;
+  skipError?: boolean;
+}) {
   return new Promise<T>((resolve, reject) => {
     callVscode(
-      { cmd: params.cmd, data: params.data },
+      { cmd: params.cmd, data: params.data, skipError: params.skipError },
       (res) => {
         resolve(res);
       },
@@ -74,9 +78,9 @@ window.addEventListener('message', (event) => {
     // 来自vscode的回调
     case 'vscodeCallback':
       if (message.code === 200) {
-        (callbacks[message.cbid] || function() {})(message.data);
+        (callbacks[message.cbid] || function () {})(message.data);
       } else {
-        (errorCallbacks[message.cbid] || function() {})(message.data);
+        (errorCallbacks[message.cbid] || function () {})(message.data);
       }
       delete callbacks[message.cbid]; // 执行完回调删除
       delete errorCallbacks[message.cbid]; // 执行完回调删除

webview-react/src/webview/service.ts

@@ -1,3 +1,4 @@
+import { AxiosRequestConfig } from 'axios';
 import { request } from './index';
 
 export interface IGetLocalMaterialsResult {
@@ -461,3 +462,13 @@ export function executeVscodeCommand(data: { command: string }) {
     data,
   });
 }
+
+export function nodeRequest<IResult = unknown>(config: AxiosRequestConfig) {
+  return request<IResult>({
+    cmd: 'request',
+    skipError: true,
+    data: {
+      config,
+    },
+  });
+}