fix: 修复两个组件引入通一子组件热更新报错问题

将插入components改为插入函数
meadmin-cn · Sep 23, 2022 · add16a9 · add16a9
1 parent f292910
commit add16a9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/plugin/vueSetupExtend.ts b/plugin/vueSetupExtend.ts
@@ -83,10 +83,10 @@ export function supportScript(code: string, options: ExtendOptions) {
         attrs.langImport = `{{${langImport}}}`;
       }
     }
-    if (options.setComponents) {
+    if (options.setComponents && !attrs.getComponents) {
       const components = getComponent(descriptor);
       if (components.length) {
-        attrs.components = `{{[${components}]}}`;
+        attrs.getComponents = `{{()=>[${components}]}}`;
       }
     }
     let scriptStr = '';

diff --git a/src/layout/components/header/components/topBar/components/right/index.vue b/src/layout/components/header/components/topBar/components/right/index.vue
@@ -11,9 +11,6 @@
 </template>
 <script setup lang="ts" name="Right">
 import { localeConfig } from '@/config';
-import MeDarkSwitch from '@/components/meDarkSwitch.vue';
-import MeLocaleSelect from '@/components/meLocaleSelect.vue';
-import MeSizeSelect from '@/components/meSizeSelect.vue';
 import MessageBox from './components/messageBox.vue';
 import { useSettingStore } from '@/store';
 import User from './components/user.vue';

diff --git a/src/locales/hooks.ts b/src/locales/hooks.ts
@@ -89,6 +89,11 @@ export const useLoadMessages = () => {
           loadMessages(component as ComponentOptions, isLoading, locale, importArr);
         });
       }
+      if ((<ComponentOptions>options).getComponents) {
+        (<ComponentOptions>options).getComponents().forEach((component: ComponentOptions) => {
+          loadMessages(component, isLoading, locale, importArr);
+        });
+      }
       if ((<ComponentOptions>options).langImport) {
         const res = loadMessage((<ComponentOptions>options).langImport!, locale, isLoading);
         if (res instanceof Promise) {