Merge remote-tracking branch 'origin/dev'

.gitignore

@@ -8,4 +8,5 @@ site
 upkg
 types
 dist
-.temp
+.temp
+docs

.vscode/settings.json

@@ -6,7 +6,7 @@
     "**/CVS": true,
     "**/.DS_Store": true,
     "**/Thumbs.db": true,
-    "**/node_modules": true,
+    // "**/node_modules": true,
   },
   "editor.formatOnSave": true,
   "[typescript]": {

build-doc.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+mkdir docs
+mv ant-design/docs/.vitepress/dist ./docs/ant-design
+mv element/docs/.vitepress/dist ./docs/element

element/docs/.vitepress/theme/element-fix/ProvidedLayot.tsx

@@ -3,7 +3,7 @@ import { SetupContext } from 'vue'
 import Layout from 'vitepress-theme-document/src/Layout.vue'
 import 'vitepress-theme-document/src/custom.css'
 import { ElConfigProvider } from 'element-plus'
-import zhCN from 'element-plus/lib/locale/lang/zh-cn'
+import zhCN from 'element-plus/dist/locale/zh-cn.mjs'
 import 'element-plus/dist/index.css'
 import './style-fix.css'
 export default function ElementPlusProvidedLayout(props: any, context: SetupContext) {

package.json

@@ -17,6 +17,8 @@
     "serve": "lerna run serve --parallel",
     "watch": "lerna run watch --parallel",
     "dev": "lerna run dev --parallel",
-    "b": "lerna bootstrap"
+    "b": "lerna bootstrap",
+    "build": "lerna run build",
+    "doc": "lerna run docs:build && ./build-doc.sh"
   }
 }