Merge branch 'main' into pages

pure-admin · Dec 27, 2024 · 5c73d18 · 5c73d18
2 parents dfa3797 + 79cd159
commit 5c73d18
Show file tree

Hide file tree

Showing 29 changed files with 412 additions and 54 deletions.
diff --git a/build/optimize.ts b/build/optimize.ts
@@ -11,6 +11,7 @@ const include = [
   "dayjs",
   "axios",
   "pinia",
+  "vditor",
   "typeit",
   "swiper",
   "qrcode",
@@ -22,6 +23,7 @@ const include = [
   "vue-tippy",
   "cropperjs",
   "jsbarcode",
+  "codemirror",
   "pinyin-pro",
   "sortablejs",
   "swiper/vue",
@@ -42,6 +44,7 @@ const include = [
   "@howdyjs/mouse-menu",
   "@logicflow/extension",
   "vue-virtual-scroller",
+  "codemirror-editor-vue3",
   "@amap/amap-jsapi-loader",
   "el-table-infinite-scroll",
   "vue-waterfall-plugin-next",

diff --git a/index.html b/index.html
@@ -18,9 +18,6 @@
       s.parentNode.insertBefore(hm, s)
     })();
   </script>
-  <script>
-    window.process = {};
-  </script>
 </head>
 
 <body>

diff --git a/locales/en.yaml b/locales/en.yaml
@@ -76,6 +76,8 @@ menus:
   pureLoginLog: Login Log
   pureOperationLog: Operation Log
   pureSystemLog: System Log
+  pureCodeMirror: CodeMirror
+  pureMarkdown: Markdown
   pureEditor: Editor
   pureAbnormal: Abnormal Page
   pureFourZeroFour: "404"

diff --git a/locales/zh-CN.yaml b/locales/zh-CN.yaml
@@ -76,6 +76,8 @@ menus:
   pureLoginLog: 登录日志
   pureOperationLog: 操作日志
   pureSystemLog: 系统日志
+  pureCodeMirror: 代码编辑器
+  pureMarkdown: Markdown
   pureEditor: 编辑器
   pureAbnormal: 异常页面
   pureFourZeroFour: "404"

diff --git a/package.json b/package.json
@@ -65,6 +65,8 @@
     "animate.css": "^4.1.1",
     "axios": "^1.7.9",
     "china-area-data": "^5.0.1",
+    "codemirror": "^5",
+    "codemirror-editor-vue3": "^2.8.0",
     "cropperjs": "^1.6.2",
     "dayjs": "^1.11.13",
     "echarts": "^5.5.1",
@@ -90,6 +92,7 @@
     "typeit": "^8.8.7",
     "v-contextmenu": "^3.2.0",
     "v3-infinite-loading": "^1.3.2",
+    "vditor": "^3.10.8",
     "version-rocket": "^1.7.4",
     "vue": "^3.5.13",
     "vue-i18n": "^10.0.5",
@@ -118,6 +121,7 @@
     "@iconify-icons/ri": "^1.2.10",
     "@iconify/vue": "^4.2.0",
     "@intlify/unplugin-vue-i18n": "^6.0.1",
+    "@types/codemirror": "^5.60.15",
     "@types/dagre": "^0.7.52",
     "@types/intro.js": "^5.1.5",
     "@types/js-cookie": "^3.0.6",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/layout/components/lay-notice/components/NoticeItem.vue b/src/layout/components/lay-notice/components/NoticeItem.vue
@@ -112,7 +112,7 @@ function hoverDescription(event, description) {
   max-width: 238px;
 }
 </style>
-<style scoped lang="scss">
+<style lang="scss" scoped>
 .notice-container {
   display: flex;
   align-items: flex-start;

diff --git a/src/router/enums.ts b/src/router/enums.ts
@@ -17,14 +17,16 @@ const home = 0, // 平台规定只有 home 路由的 rank 才能为 0 ，所以
   monitor = 14,
   tabs = 15,
   about = 16,
-  editor = 17,
-  flowchart = 18,
-  formdesign = 19,
-  board = 20,
-  ppt = 21,
-  mind = 22,
-  guide = 23,
-  menuoverflow = 24;
+  codemirror = 17,
+  markdown = 18,
+  editor = 19,
+  flowchart = 20,
+  formdesign = 21,
+  board = 22,
+  ppt = 23,
+  mind = 24,
+  guide = 25,
+  menuoverflow = 26;
 
 export {
   home,
@@ -44,6 +46,8 @@ export {
   monitor,
   tabs,
   about,
+  codemirror,
+  markdown,
   editor,
   flowchart,
   formdesign,

diff --git a/src/router/modules/able.ts b/src/router/modules/able.ts
@@ -15,8 +15,7 @@ export default {
       name: "MqttClient",
       component: () => import("@/views/able/mqtt-client.vue"),
       meta: {
-        title: $t("menus.pureMqtt"),
-        extraIcon: "IF-pure-iconfont-new svg"
+        title: $t("menus.pureMqtt")
       }
     },
     {

diff --git a/src/router/modules/codemirror.ts b/src/router/modules/codemirror.ts
@@ -0,0 +1,23 @@
+import { $t } from "@/plugins/i18n";
+import { codemirror } from "@/router/enums";
+
+export default {
+  path: "/codemirror",
+  redirect: "/codemirror/index",
+  meta: {
+    icon: "ri:code-box-line",
+    title: $t("menus.pureCodeMirror"),
+    rank: codemirror
+  },
+  children: [
+    {
+      path: "/codemirror/index",
+      name: "CodeMirror",
+      component: () => import("@/views/codemirror/index.vue"),
+      meta: {
+        title: $t("menus.pureCodeMirror"),
+        extraIcon: "IF-pure-iconfont-new svg"
+      }
+    }
+  ]
+} satisfies RouteConfigsTable;
diff --git a/src/router/modules/form.ts b/src/router/modules/form.ts
@@ -15,8 +15,7 @@ export default {
       name: "SchemaForm",
       component: () => import("@/views/schema-form/index.vue"),
       meta: {
-        title: $t("menus.pureSchemaForm"),
-        extraIcon: "IF-pure-iconfont-new svg"
+        title: $t("menus.pureSchemaForm")
       }
     }
   ]

diff --git a/src/router/modules/ganttastic.ts b/src/router/modules/ganttastic.ts
@@ -15,8 +15,7 @@ export default {
       name: "Ganttastic",
       component: () => import("@/views/ganttastic/index.vue"),
       meta: {
-        title: $t("menus.pureGanttastic"),
-        extraIcon: "IF-pure-iconfont-new svg"
+        title: $t("menus.pureGanttastic")
       }
     }
   ]

diff --git a/src/router/modules/markdown.ts b/src/router/modules/markdown.ts
@@ -0,0 +1,23 @@
+import { $t } from "@/plugins/i18n";
+import { markdown } from "@/router/enums";
+
+export default {
+  path: "/markdown",
+  redirect: "/markdown/index",
+  meta: {
+    icon: "ri:markdown-line",
+    title: $t("menus.pureMarkdown"),
+    rank: markdown
+  },
+  children: [
+    {
+      path: "/markdown/index",
+      name: "Markdown",
+      component: () => import("@/views/markdown/index.vue"),
+      meta: {
+        title: $t("menus.pureMarkdown"),
+        extraIcon: "IF-pure-iconfont-new svg"
+      }
+    }
+  ]
+} satisfies RouteConfigsTable;