Merge remote-tracking branch 'origin/master'

src/pages/JsDemo.vue

@@ -0,0 +1,50 @@
+<script setup lang="ts">
+import { ref } from "vue";
+import { Request } from "@ease-forge/shared";
+import YvSrcEditor from "../components/YvSrcEditor.vue"
+
+const code = ref(`
+
+log.info("测试打印日志，通过服务端控制台查看")
+const a = 111, b= 555;
+const sum = (a + b);
+print(a + "+" + b + " = " + sum);
+
+return {
+    sum,
+    date: new Date(),
+    msg: "测试JS脚本",
+}
+`);
+
+const res = ref("");
+
+function execute() {
+    Request.request.post("/api/workbench/JsDemo@runJs", {
+        jsCode: code.value,
+    }).then(data => {
+        res.value = JSON.stringify(data, null, 4);
+    }).catch(() => {
+        res.value = "执行失败";
+    });
+}
+
+</script>
+
+<template>
+    <div class="editor">
+        <YvSrcEditor ref="jsEditor" language="javascript" v-model="code"/>
+    </div>
+    <button @click="execute" style="width: 80px;">执行</button>
+    <pre class="res">{{ res }}</pre>
+</template>
+
+<style scoped>
+.editor {
+    height: 600px;
+}
+
+.res {
+    height: 300px;
+}
+</style>

src/router/index.ts

@@ -33,7 +33,12 @@ const router = createRouter({
       path: '/DataForm01',
       name: 'DataForm01',
       component: () => import('@/pages/DataForm01.vue')
-    }
+    },
+    {
+      path: '/JsDemo',
+      name: 'JsDemo',
+      component: () => import('@/pages/JsDemo.vue')
+    },
   ]
 })
 

vite.config.ts

@@ -2,7 +2,6 @@ import { fileURLToPath, URL } from 'node:url'
 
 import { defineConfig } from 'vite'
 import vue from '@vitejs/plugin-vue'
-import typescript from 'rollup-plugin-typescript2'
 // import vueJsx from '@vitejs/plugin-vue-jsx'
 // import vueDevTools from 'vite-plugin-vue-devtools'
 
@@ -22,7 +21,11 @@ export default defineConfig({
     port: 7791,
     open: false,
     proxy: {
-    }
+      '^/api/.*': {
+        target: "http://127.0.0.1:8089",
+        changeOrigin: false,
+      },
+    },
   },
   optimizeDeps: {
     include: [