diff --git a/package.json b/package.json index c40ccad8..e1abed0d 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "devDependencies": { "@ant-design/icons": "^4.7.0", "@ant-design/pro-layout": "^6.33.1", - "@monaco-editor/react": "4.2.1", + "@monaco-editor/react": "4.4.6", "@react-hook/resize-observer": "^1.2.6", "@sentry/react": "^7.12.1", "@types/body-parser": "^1.19.2", @@ -122,6 +122,7 @@ "compression-webpack-plugin": "9.2.0", "concurrently": "^7.0.0", "lint-staged": "^13.0.3", + "monaco-editor": "^0.34.1", "nodemon": "^2.0.15", "prettier": "^2.5.1", "qiniu": "^7.4.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3058f2ba..a386ed8a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -3,7 +3,7 @@ lockfileVersion: 5.4 specifiers: '@ant-design/icons': ^4.7.0 '@ant-design/pro-layout': ^6.33.1 - '@monaco-editor/react': 4.2.1 + '@monaco-editor/react': 4.4.6 '@otplib/preset-default': ^12.0.1 '@react-hook/resize-observer': ^1.2.6 '@sentry/node': ^7.12.1 @@ -54,6 +54,7 @@ specifiers: jsonwebtoken: ^8.5.1 lint-staged: ^13.0.3 lodash: ^4.17.21 + monaco-editor: ^0.34.1 multer: ^1.4.4 nedb: ^1.8.0 node-schedule: ^2.1.0 @@ -131,7 +132,7 @@ dependencies: devDependencies: '@ant-design/icons': 4.7.0_biqbaboplfbrettd7655fr4n2y '@ant-design/pro-layout': 6.38.22_biqbaboplfbrettd7655fr4n2y - '@monaco-editor/react': 4.2.1_biqbaboplfbrettd7655fr4n2y + '@monaco-editor/react': 4.4.6_6vrjaj6ridxbohi43n7zt4gn7q '@react-hook/resize-observer': 1.2.6_react@18.2.0 '@sentry/react': 7.13.0_react@18.2.0 '@types/body-parser': 1.19.2 @@ -162,6 +163,7 @@ devDependencies: compression-webpack-plugin: 9.2.0_webpack@5.74.0 concurrently: 7.4.0 lint-staged: 13.0.3 + monaco-editor: 0.34.1 nodemon: 2.0.20 prettier: 2.7.1 qiniu: 7.7.0 @@ -1890,7 +1892,7 @@ packages: - supports-color dev: false - /@monaco-editor/loader/1.3.2: + /@monaco-editor/loader/1.3.2_monaco-editor@0.34.1: resolution: {integrity: sha512-BTDbpHl3e47r3AAtpfVFTlAi7WXv4UQ/xZmz8atKl4q7epQV5e7+JbigFDViWF71VBi4IIBdcWP57Hj+OWuc9g==} peerDependencies: monaco-editor: '>= 0.21.0 < 1' @@ -1898,15 +1900,16 @@ packages: monaco-editor: optional: true dependencies: + monaco-editor: 0.34.1 state-local: 1.0.7 dev: true - /@monaco-editor/react/4.2.1_biqbaboplfbrettd7655fr4n2y: - resolution: {integrity: sha512-yN8qVY0PyFIbqPjfrZ5TbR/wrcfeiwoys8+0QkmyfiOzG74vXxSBOPIUxk7Ly+qCj7qWHPq1uDJskzFGaIqaPA==} + /@monaco-editor/react/4.4.6_6vrjaj6ridxbohi43n7zt4gn7q: + resolution: {integrity: sha512-Gr3uz3LYf33wlFE3eRnta4RxP5FSNxiIV9ENn2D2/rN8KgGAD8ecvcITRtsbbyuOuNkwbuHYxfeaz2Vr+CtyFA==} peerDependencies: monaco-editor: '>= 0.25.0 < 1' - react: ^16.8.0 || ^17.0.0 || 18 - react-dom: ^16.8.0 || ^17.0.0 || 18 + react: ^16.8.0 || ^17.0.0 || ^18.0.0 || 18 + react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || 18 peerDependenciesMeta: monaco-editor: optional: true @@ -1915,11 +1918,11 @@ packages: react-dom: optional: true dependencies: - '@monaco-editor/loader': 1.3.2 + '@monaco-editor/loader': 1.3.2_monaco-editor@0.34.1 + monaco-editor: 0.34.1 prop-types: 15.8.1 react: 18.2.0 react-dom: 18.2.0_react@18.2.0 - state-local: 1.0.7 dev: true /@nodelib/fs.scandir/2.1.5: @@ -8635,6 +8638,10 @@ packages: /moment/2.29.4: resolution: {integrity: sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==} + /monaco-editor/0.34.1: + resolution: {integrity: sha512-FKc80TyiMaruhJKKPz5SpJPIjL+dflGvz4CpuThaPMc94AyN7SeC9HQ8hrvaxX7EyHdJcUY5i4D0gNyJj1vSZQ==} + dev: true + /ms/2.0.0: resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==} diff --git a/shell/otask.sh b/shell/otask.sh index 44a08ee1..3d4937ec 100644 --- a/shell/otask.sh +++ b/shell/otask.sh @@ -35,7 +35,7 @@ random_delay() { done local delay_second=$(($(gen_random_num "$random_delay_max") + 1)) - echo -e "\n命令未添加 \"now\",随机延迟 $delay_second 秒后再执行任务,如需立即终止,请按 CTRL+C...\n" + echo -e "\n命令未添加 \"now\",随机延迟 $delay_second 秒后执行\n" sleep $delay_second fi } diff --git a/src/layouts/index.less b/src/layouts/index.less index 82b3972c..d7ed38eb 100644 --- a/src/layouts/index.less +++ b/src/layouts/index.less @@ -347,4 +347,5 @@ select:-webkit-autofill:focus { pre { word-break: break-all !important; white-space: break-spaces !important; + padding: 0 !important; } diff --git a/src/utils/init.ts b/src/utils/init.ts index e415d1a7..dab86f70 100644 --- a/src/utils/init.ts +++ b/src/utils/init.ts @@ -1,6 +1,7 @@ import * as Sentry from '@sentry/react'; import { Integrations } from '@sentry/tracing'; import { loader } from '@monaco-editor/react'; +import * as monaco from 'monaco-editor'; export function init(version: string) { // sentry监控 init @@ -26,9 +27,7 @@ export function init(version: string) { // monaco 编辑器配置cdn和locale loader.config({ - paths: { - vs: 'https://cdn.staticfile.org/monaco-editor/0.33.0/min/vs', - }, + monaco, 'vs/nls': { availableLanguages: { '*': 'zh-cn',