fix: 解决codecc安全工单,更新了admin中对编辑器的一些用法

magic-admin/server/package.json

@@ -35,7 +35,7 @@
     "log4js": "^6.3.0",
     "mysql2": "^2.3.3",
     "reflect-metadata": "^0.1.13",
-    "sequelize": "^6.6.2",
+    "sequelize": "^6.29.0",
     "sequelize-typescript": "^2.1.0",
     "tslib": "^2.4.0"
   },

magic-admin/web/package.json

@@ -3,25 +3,26 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "serve": "node --max_old_space_size=4096 node_modules/@vue/cli-service/bin/vue-cli-service.js serve --open",
+    "serve": "node --max_old_space_size=4096 node_modules/@vue/cli-service/bin/vue-cli-service.js serve",
     "build": "vue-cli-service build",
     "test": "vue-cli-service test:unit --maxWorkers=8 --coverage",
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
-    "@tmagic/design": "1.2.0",
-    "@tmagic/editor": "1.2.0",
-    "@tmagic/element-plus-adapter": "1.2.0",
-    "@tmagic/form": "1.2.0",
-    "@tmagic/schema": "1.2.0",
-    "@tmagic/stage": "1.2.0",
-    "@tmagic/table": "1.2.0",
-    "@tmagic/utils": "1.2.0",
+    "@tmagic/design": "^1.2.8",
+    "@tmagic/editor": "^1.2.8",
+    "@tmagic/element-plus-adapter": "^1.2.8",
+    "@tmagic/form": "^1.2.8",
+    "@tmagic/schema": "^1.2.8",
+    "@tmagic/stage": "^1.2.8",
+    "@tmagic/table": "^1.2.8",
+    "@tmagic/utils": "^1.2.8",
     "axios": "^0.27.2",
     "axios-jsonp": "^1.0.4",
     "core-js": "^3.20.0",
     "element-plus": "^2.2.32",
     "js-cookie": "^3.0.0",
+    "monaco-editor": "^0.36.1",
     "serialize-javascript": "^6.0.0",
     "vue": "^3.2.26",
     "vue-router": "^4.0.3"

magic-admin/web/src/components/publish-page-list.vue

@@ -37,10 +37,11 @@ import { View } from '@element-plus/icons-vue';
 import { ElMessage } from 'element-plus';
 
 import { editorService } from '@tmagic/editor';
+import { MPage } from '@tmagic/schema';
 
 import publishApi from '@src/api/publish';
 import magicStore from '@src/store/index';
-import type { ABTest, ActInfo, EditorInfo, PageInfo } from '@src/typings';
+import type { ABTest, ActInfo, EditorInfo } from '@src/typings';
 import { Res } from '@src/util/request';
 import { serializeConfig } from '@src/util/utils';
 
@@ -105,7 +106,7 @@ export default defineComponent({
     const getPageName = () => {
       // 从magic-editor root 拿到最新的页面名字
       state.pageList = [];
-      root.value?.items.forEach((item: PageInfo) => {
+      root.value?.items.forEach((item: MPage) => {
         state.pageList.push(item.name as string);
       });
       const actInfo = magicStore.get('actInfo') as ActInfo;

magic-admin/web/src/main.ts

@@ -38,7 +38,7 @@ app.use(ElementPlus);
 app.use(TMagicDesign, MagicElementPlusAdapter);
 app.use(MagicEditor);
 editorService.usePlugin(editorPlugin);
-app.use(MagicForm);
+app.use(MagicForm, {});
 app.use(router);
 installComponents(app);
 app.mount('#app');

magic-admin/web/src/views/editor.vue

@@ -66,13 +66,13 @@ export default defineComponent({
       await initConfigByActId({ actId: Number(route.params.actId) });
     };
 
-    asyncLoadJs('/static/vue3/entry/config/index.umd.js').then(() => {
+    asyncLoadJs('/static/vue3/entry/config/index.umd.cjs').then(() => {
       magicPresetConfigs.value = (window as any).magicPresetConfigs;
     });
-    asyncLoadJs('/static/vue3/entry/value/index.umd.js').then(() => {
+    asyncLoadJs('/static/vue3/entry/value/index.umd.cjs').then(() => {
       magicPresetValues.value = (window as any).magicPresetValues;
     });
-    asyncLoadJs('/static/vue3/entry/event/index.umd.js').then(() => {
+    asyncLoadJs('/static/vue3/entry/event/index.umd.cjs').then(() => {
       magicPresetEvents.value = (window as any).magicPresetEvents;
     });
 

magic-admin/web/tests/unit/components/publish-page-list.spec.ts

@@ -20,6 +20,7 @@ import { nextTick, ref } from 'vue';
 import { mount } from '@vue/test-utils';
 
 import { editorService } from '@tmagic/editor';
+import { MApp } from '@tmagic/schema';
 
 import publishApi from '@src/api/publish';
 import PublishPageList from '@src/components/publish-page-list.vue';
@@ -74,7 +75,7 @@ const actInfo = {
     },
   ],
 };
-editorService.set('root', root);
+editorService.set('root', root as MApp);
 magicStore.set('actInfo', actInfo);
 
 jest.mock('vue-router', () => {

magic-admin/web/vue.config.js

@@ -40,6 +40,6 @@ module.exports = defineConfig({
       },
     },
 
-    plugins: [new MonacoWebpackPlugin()],
+    plugins: [new MonacoWebpackPlugin({ languages: ['javascript'] })],
   },
 });