Merge pull request #20 from FatttSnake/release/1.0.2

v1.0.2

README.md

@@ -24,7 +24,7 @@ This project is a front-end web UI of Oxygen Toolbox and needs to be used with t
 # Requires
 
 - Web Server (e.g. Nginx, Apache httpd)
-- [API of Oxygen Toolbox](https://github.com/FatttSnake/oxygen-api) (v1.0.0 and later versions)
+- [API of Oxygen Toolbox](https://github.com/FatttSnake/oxygen-api) (v1.0.0 or later versions)
 
 # Related projects
 

README_zh.md

@@ -24,7 +24,7 @@
 # 环境要求
 
 - Web 服务器（如 Nginx, Apache httpd）
-- [API of Oxygen Toolbox](https://github.com/FatttSnake/oxygen-api) (v1.0.0 及更高版本)
+- [API of Oxygen Toolbox](https://github.com/FatttSnake/oxygen-api) (v1.0.0 或更高版本)
 
 # 关联项目
 

package.json

@@ -2,7 +2,7 @@
   "name": "oxygen-ui",
   "private": true,
   "type": "module",
-  "version": "1.0.1-SNAPSHOT",
+  "version": "1.0.2",
   "description": "Oxygen Toolbox browser version",
   "author": {
     "name": "FatttSnake",

src/assets/css/components/tools/store-card.scss

@@ -78,6 +78,7 @@
     .author {
       display: flex;
       margin-top: auto;
+      padding-top: 8px;
       flex-direction: row;
       justify-content: end;
       padding-bottom: 10px;

src/assets/css/pages/tools/edit.scss

@@ -6,6 +6,7 @@
     width: 100%;
 
     .root-content {
+      position: relative;
       width: 100%;
       height: 100%;
 

src/assets/css/pages/tools/index.scss

@@ -13,7 +13,7 @@
 
       > .card-box, > div {
         width: 180px;
-        height: 290px;
+        min-height: 290px;
         flex: 0 0 auto;
       }
 
@@ -102,7 +102,7 @@
 
       > .card-box, > div {
         width: 180px;
-        height: 290px;
+        min-height: 290px;
         flex: 0 0 auto;
       }
     }

src/assets/css/pages/tools/store.scss

@@ -28,7 +28,7 @@
 
     > div {
       width: 180px;
-      height: 290px;
+      min-height: 290px;
       flex: 0 0 auto;
     }
 

src/assets/css/pages/tools/user.scss

@@ -70,7 +70,7 @@
 
       > div {
         width: 180px;
-        height: 290px;
+        min-height: 290px;
         flex: 0 0 auto;
       }
 

src/components/Playground/CodeEditor/Editor/ata.ts

@@ -36,6 +36,31 @@ export const createATA = async (): Promise<TypeHelper> => {
     // @ts-expect-error
     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     const ts = await import('https://esm.sh/typescript@5.3.3')
+
+    const maxConcurrentRequests = 50
+    let activeRequests = 0
+    const requestQueue: Array<() => void> = []
+    const fetchWithQueue = (input: RequestInfo | URL, init?: RequestInit | undefined) =>
+        new Promise<Response>((resolve, reject) => {
+            const attemptRequest = () => {
+                if (activeRequests < maxConcurrentRequests) {
+                    activeRequests++
+                    fetch(input, init)
+                        .then((response) => resolve(response))
+                        .catch((error) => reject(error))
+                        .finally(() => {
+                            activeRequests--
+                            if (requestQueue.length > 0) {
+                                requestQueue.shift()?.()
+                            }
+                        })
+                } else {
+                    requestQueue.push(attemptRequest)
+                }
+            }
+            attemptRequest()
+        })
+
     const ata = setupTypeAcquisition({
         projectName: 'monaco-ts',
         // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
@@ -43,7 +68,7 @@ export const createATA = async (): Promise<TypeHelper> => {
         logger: console,
         fetcher: (input, init) => {
             try {
-                return fetch(input, init)
+                return fetchWithQueue(input, init)
             } catch (error) {
                 console.error('Error fetching data:', error)
             }
@@ -92,6 +117,7 @@ export const createATA = async (): Promise<TypeHelper> => {
     }
 
     return {
+        // eslint-disable-next-line @typescript-eslint/no-misused-promises
         acquireType,
         addListener,
         removeListener,

src/components/Playground/CodeEditor/Editor/hooks.ts

@@ -12,8 +12,8 @@ export const useEditor = () => {
         const selection = input.options ? input.options.selection : null
         if (selection) {
             if (
-                typeof selection.endLineNumber === 'number' &&
+                typeof selection?.endLineNumber === 'number' &&
-                typeof selection.endColumn === 'number'
+                typeof selection?.endColumn === 'number'
             ) {
                 editor.setSelection(selection)
                 editor.revealRangeInCenter(selection, ScrollType.Immediate)

src/components/Playground/compiler.ts

@@ -57,7 +57,7 @@ class Compiler {
 
     transform = async (code: string, loader: Loader) => {
         await this.waitInit()
-        return esbuild.transform(code, { loader })
+        return esbuild.transform(code, { loader, target: 'es2015' })
     }
 
     compile = async (files: IFiles, importMap: IImportMap, entryPoint: string) => {
@@ -66,6 +66,7 @@ class Compiler {
             bundle: true,
             entryPoints: [entryPoint],
             format: 'esm',
+            target: 'es2015',
             metafile: true,
             write: false,
             plugins: [this.fileResolverPlugin(files, importMap)]

src/pages/System/Tools/Base.tsx

@@ -1100,7 +1100,7 @@ const Base = () => {
                                 <Playground.CodeEditor
                                     files={editingFiles[editingBaseId]}
                                     selectedFileName={editingFileName}
-                                    onSelectedFileChange={() => {}}
+                                    onSelectedFileChange={setEditingFileName}
                                     onChangeFileContent={handleOnChangeFileContent}
                                     showFileSelector={false}
                                     tsconfig={tsconfig}

src/pages/System/Tools/Template.tsx

@@ -1044,7 +1044,7 @@ const Template = () => {
                                 <Playground.CodeEditor
                                     files={editingFiles[editingTemplateId]}
                                     selectedFileName={editingFileName}
-                                    onSelectedFileChange={() => {}}
+                                    onSelectedFileChange={setEditingFileName}
                                     onChangeFileContent={handleOnChangeFileContent}
                                     showFileSelector={false}
                                     tsconfig={tsconfig}