Merge remote-tracking branch 'origin/master' into 1.X-dev

# Conflicts:
#	yudao-ui-admin-vue3/package.json
#	yudao-ui-admin-vue3/pnpm-lock.yaml
#	yudao-ui-admin-vue3/src/main.ts

yudao-ui-admin-vue3/src/main.ts

@@ -13,12 +13,15 @@ import { setupStore } from '@/store'
 // 全局组件
 import { setupGlobCom } from '@/components'
 
-// 引入element-plus
+// 引入 element-plus
 import { setupElementPlus } from '@/plugins/elementPlus'
 
-// 引入vxe-table
+// 引入 vxe-table
 import { setupVxeTable } from '@/plugins/vxeTable'
 
+// 引入 form-create
+import { setupFormCreate } from '@/plugins/formCreate'
+
 // 引入全局样式
 import '@/styles/index.scss'
 
@@ -39,8 +42,19 @@ import './permission'
 
 import { isDevMode } from '@/utils/env'
 
+import { MyPD } from '@/components/bpmnProcessDesigner/package/index.js'
+import '@/components/bpmnProcessDesigner/package/theme/index.scss'
+import 'bpmn-js/dist/assets/diagram-js.css'
+import 'bpmn-js/dist/assets/bpmn-font/css/bpmn.css'
+import 'bpmn-js/dist/assets/bpmn-font/css/bpmn-codes.css'
+import 'bpmn-js/dist/assets/bpmn-font/css/bpmn-embedded.css'
+
+import hljs from 'highlight.js' //导入代码高亮文件
+import 'highlight.js/styles/github.css' //导入代码高亮样式  新版
+
 import Logger from '@/utils/logger'
 
+// 本地开发模式 全局引入 element-plus 样式，加快第一次进入速度
 if (isDevMode() == true) {
   import('element-plus/dist/index.css')
 }
@@ -49,8 +63,18 @@ if (isDevMode() == true) {
 const setupAll = async () => {
   const app = createApp(App)
 
+  //自定义一个代码高亮指令
+  app.directive('highlight', function (el) {
+    const blocks = el.querySelectorAll('code')
+    blocks.forEach((block: any) => {
+      hljs.highlightElement(block)
+    })
+  })
+
   await setupI18n(app)
 
+  MyPD(app)
+
   setupStore(app)
 
   setupGlobCom(app)
@@ -59,6 +83,8 @@ const setupAll = async () => {
 
   setupVxeTable(app)
 
+  setupFormCreate(app)
+
   setupRouter(app)
 
   setupAuth(app)