diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md index 78cb86de0..a47ed65b7 100644 --- a/CHANGELOG.zh_CN.md +++ b/CHANGELOG.zh_CN.md @@ -1,5 +1,9 @@ ## Wip +### ✨ Refactor + +- 重构整体 layout。更改代码实现方式。代码更精简 + ### ✨ Features - 缓存可以配置是否加密 @@ -7,6 +11,7 @@ ### 🎫 Chores - 移除 messageSetting 配置 +- 暂时删除 `@vueuse/core`.等稳定后在集成。目前不太稳定。 ## 2.0.0-rc.11 (2020-11-18) diff --git a/build/vite/plugin/transform/globby/index.ts b/build/vite/plugin/transform/globby/index.ts index 235b00d32..41c39702b 100644 --- a/build/vite/plugin/transform/globby/index.ts +++ b/build/vite/plugin/transform/globby/index.ts @@ -154,15 +154,17 @@ const globTransform = function (config: SharedConfig): Transform { const groups: Array[] = []; const replaceFiles = files.map((f, i) => { - const fileNameWithAlias = resolver.fileToRequest(f); - - const file = bareExporter + fileNameWithAlias + bareExporter; + const filePath = resolver.fileToRequest(f); + const file = bareExporter + filePath + bareExporter; if (isLocale) { const globrexRes = globrex(globPath, { extended: true, globstar: true }); // Get segments for files like an en/system ch/modules for: // ['en', 'system'] ['ch', 'modules'] + + // TODO The window system and mac system path are inconsistent? + const fileNameWithAlias = filePath.replace(/^(\/src\/)/, '/@/'); const matchedGroups = globrexRes.regex.exec(fileNameWithAlias); if (matchedGroups && matchedGroups.length) { diff --git a/package.json b/package.json index 91abafbca..bb9a1484c 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,6 @@ }, "dependencies": { "@iconify/iconify": "^2.0.0-rc.2", - "@vueuse/core": "^4.0.0-rc.3", "ant-design-vue": "2.0.0-beta.15", "apexcharts": "3.22.0", "axios": "^0.21.0", diff --git a/src/components/Application/src/AppLogo.vue b/src/components/Application/src/AppLogo.vue index 990b683b5..980c3abd0 100644 --- a/src/components/Application/src/AppLogo.vue +++ b/src/components/Application/src/AppLogo.vue @@ -1,7 +1,11 @@