From de18412010f61955b349c3c10c4211a3b09c072b Mon Sep 17 00:00:00 2001
From: wc24 <wc24@qq.com>
Date: Mon, 25 May 2026 17:33:44 +0800
Subject: [PATCH] =?UTF-8?q?fix(v0.3.0):=20=E6=A1=86=E6=9E=B6=E5=86=85=20pe?=
 =?UTF-8?q?er=20=E5=BC=95=E7=94=A8=E5=9B=9E=E9=80=80=E9=9D=99=E6=80=81=20i?=
 =?UTF-8?q?mport=20+=20=E4=BF=AE=20FieldRelativeTime=20=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 覆盖颗粒度只在 3 个入口: router targets / module routes / field registry
- 框架内 .vue 之间互相引用全部硬编码静态 import,resolveVue/defineAsyncComponent 退出 .vue 文件
- 修 components/fields/FieldRelativeTime.vue 的 ../VueAdmin → ../../VueAdmin (移动后未跟改)
---
 src/VueAdmin.ts                             |  7 +++++--
 src/components/ShrimpTable.vue              | 13 ++++++-------
 src/components/fields/FieldRelativeTime.vue |  2 +-
 src/components/layout.vue                   | 15 +++++++--------
 src/components/login.vue                    |  7 +++----
 src/components/sideM.vue                    |  9 ++++-----
 src/components/userbar.vue                  |  6 ++----
 src/index.ts                                |  3 +--
 src/module/role.vue                         |  7 +++----
 src/module/user.vue                         |  7 ++-----
 src/module/user/operationLog.vue            |  7 +++----
 11 files changed, 37 insertions(+), 46 deletions(-)

diff --git a/src/VueAdmin.ts b/src/VueAdmin.ts
index cc51f9f..85e7fbd 100644
--- a/src/VueAdmin.ts
+++ b/src/VueAdmin.ts
@@ -57,8 +57,11 @@ export interface ShrimpAdminOptions {
 
 // ============== 源注册表 ==============
 //
-// 唯一约定:消费侧把 .vue 源放进 `sources`,框架按文件路径后缀解析。
-// 框架内部对可覆盖的 .vue 也用 resolveVue 解析(而不是静态 import),保证 consumer 覆盖在框架内部使用点也生效。
+// 框架在 3 个入口点用消费侧 sources 覆盖内置(按路径后缀同后缀覆盖):
+//   1. router: components/{layout,login,404}.vue
+//   2. registerRoute: module/<key>.vue 等业务模块
+//   3. fieldRegistry: components/fields/Field<X>.vue (按文件名导出的字段类型)
+// 框架内 .vue 之间的 peer 引用是硬编码静态 import,override 颗粒度就停在上面这些"入口"。
 
 const internalSources = import.meta.glob<Component>('./{components,module}/**/*.vue')
 const externalSources: Record<string, VueLoader> = {}
diff --git a/src/components/ShrimpTable.vue b/src/components/ShrimpTable.vue
index 478ac94..9c8fc1b 100644
--- a/src/components/ShrimpTable.vue
+++ b/src/components/ShrimpTable.vue
@@ -78,22 +78,21 @@
 </template>
 
 <script lang="ts" setup>
-import { defineAsyncComponent, ref, computed, useSlots, onMounted, type Component } from 'vue'
+import { ref, computed, useSlots, onMounted, type Component } from 'vue'
 import { ITableCrudProto, IFieldConfig, IModuleInfo, IPageQuery } from '../IShrimpType'
-import { vueAdmin, resolveVue } from '../VueAdmin'
+import { vueAdmin } from '../VueAdmin'
 import { Plus, Delete as DeleteIcon, Download, Upload, Edit, VideoPlay, VideoPause, Operation } from '@element-plus/icons-vue'
 import * as ElIcons from '@element-plus/icons-vue'
 import { ElMessageBox, ElMessage } from 'element-plus'
 import { useI18n } from 'vue-i18n'
 import { useRoute, useRouter } from 'vue-router'
 import { useTableUrlSync } from '../composables/useTableUrlSync'
+import ShrimpEditDrawer from './ShrimpEditDrawer.vue'
+import ShrimpFilterDrawer from './ShrimpFilterDrawer.vue'
+import ShrimpSearchInput from './ShrimpSearchInput.vue'
+import ShrimpFilterTrigger from './ShrimpFilterTrigger.vue'
 import * as XLSX from 'xlsx'
 
-const ShrimpEditDrawer = defineAsyncComponent(resolveVue('components/ShrimpEditDrawer.vue'))
-const ShrimpFilterDrawer = defineAsyncComponent(resolveVue('components/ShrimpFilterDrawer.vue'))
-const ShrimpSearchInput = defineAsyncComponent(resolveVue('components/ShrimpSearchInput.vue'))
-const ShrimpFilterTrigger = defineAsyncComponent(resolveVue('components/ShrimpFilterTrigger.vue'))
-
 const { t } = useI18n()
 
 interface Props {
diff --git a/src/components/fields/FieldRelativeTime.vue b/src/components/fields/FieldRelativeTime.vue
index 1fdf623..333a01b 100644
--- a/src/components/fields/FieldRelativeTime.vue
+++ b/src/components/fields/FieldRelativeTime.vue
@@ -10,7 +10,7 @@
 <script lang="ts" setup>
 import { computed } from 'vue'
 import { useI18n } from 'vue-i18n'
-import { vueAdmin } from '../VueAdmin'
+import { vueAdmin } from '../../VueAdmin'
 
 const { t } = useI18n()
 
diff --git a/src/components/layout.vue b/src/components/layout.vue
index a88623b..a67067f 100644
--- a/src/components/layout.vue
+++ b/src/components/layout.vue
@@ -43,15 +43,14 @@
 </template>
 
 <script lang="ts" setup>
-import { defineAsyncComponent, ref, watch } from "vue";
-import { vueAdmin, resolveVue } from "../VueAdmin";
+import { ref, watch } from "vue";
+import { vueAdmin } from "../VueAdmin";
 import { type IMenuItem } from "../IShrimpType";
-
-const SideM = defineAsyncComponent(resolveVue('components/sideM.vue'));
-const navMenu = defineAsyncComponent(resolveVue('components/navMenu.vue'));
-const Topbar = defineAsyncComponent(resolveVue('components/topbar.vue'));
-const Userbar = defineAsyncComponent(resolveVue('components/userbar.vue'));
-const Logo = defineAsyncComponent(resolveVue('components/logo.vue'));
+import SideM from "./sideM.vue";
+import navMenu from "./navMenu.vue";
+import Topbar from "./topbar.vue";
+import Userbar from "./userbar.vue";
+import Logo from "./logo.vue";
 
 // 初始化选中菜单
 let currentPath = vueAdmin.router.currentRoute.value.path;
diff --git a/src/components/login.vue b/src/components/login.vue
index f925bed..067f83d 100644
--- a/src/components/login.vue
+++ b/src/components/login.vue
@@ -30,11 +30,10 @@
 </template>
 
 <script lang="ts" setup>
-import { vueAdmin, resolveVue } from "../VueAdmin";
-import { defineAsyncComponent, reactive, computed, onMounted } from "vue";
+import { vueAdmin } from "../VueAdmin";
+import { reactive, computed, onMounted } from "vue";
 import { useI18n } from "vue-i18n";
-
-const LangSwitch = defineAsyncComponent(resolveVue('components/ShrimpLangSwitch.vue'));
+import LangSwitch from "./ShrimpLangSwitch.vue";
 
 vueAdmin.token = null;
 
diff --git a/src/components/sideM.vue b/src/components/sideM.vue
index c6ff5cd..5922a5e 100644
--- a/src/components/sideM.vue
+++ b/src/components/sideM.vue
@@ -33,11 +33,10 @@
 </template>
 
 <script lang="ts" setup>
-import { defineAsyncComponent, ref } from "vue";
-import { vueAdmin, resolveVue } from '../VueAdmin';
-
-const navMenu = defineAsyncComponent(resolveVue('components/navMenu.vue'));
-const Logo = defineAsyncComponent(resolveVue('components/logo.vue'));
+import { ref } from "vue";
+import { vueAdmin } from '../VueAdmin';
+import navMenu from "./navMenu.vue";
+import Logo from "./logo.vue";
 
 let nav = ref(false);
 function showMobileNav() { nav.value = true; }
diff --git a/src/components/userbar.vue b/src/components/userbar.vue
index c8c1671..c7dbaf8 100644
--- a/src/components/userbar.vue
+++ b/src/components/userbar.vue
@@ -20,10 +20,8 @@
 </template>
 
 <script lang="ts" setup>
-import { vueAdmin, resolveVue } from "../VueAdmin";
-import { defineAsyncComponent } from "vue";
-
-const LangSwitch = defineAsyncComponent(resolveVue('components/ShrimpLangSwitch.vue'));
+import { vueAdmin } from "../VueAdmin";
+import LangSwitch from "./ShrimpLangSwitch.vue";
 
 function screen() {
 	vueAdmin.fullscreen();
diff --git a/src/index.ts b/src/index.ts
index 5cc4b50..218d582 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -60,8 +60,7 @@ export {
 } from './ShrimpClient'
 
 // 框架组件 — 业务页面想直接复用就 import 这些。
-// 注意:这些是「静态」导出,直接 import 拿到的就是框架内置版本,不会被消费侧 sources 覆盖。
-// 要让 consumer 覆盖在所有引用点都生效,框架内部已统一改用 resolveVue 动态解析。
+// 这些是「静态」导出,拿到的就是框架内置版本,不受消费侧 sources 影响。
 export { default as ShrimpTable } from './components/ShrimpTable.vue'
 export { default as ShrimpEditDrawer } from './components/ShrimpEditDrawer.vue'
 export { default as ShrimpFilterDrawer } from './components/ShrimpFilterDrawer.vue'
diff --git a/src/module/role.vue b/src/module/role.vue
index 4ef26da..47b3bee 100644
--- a/src/module/role.vue
+++ b/src/module/role.vue
@@ -48,13 +48,12 @@
 </template>
 
 <script lang="ts" setup>
-import { defineAsyncComponent, ref, onMounted } from 'vue'
+import { ref, onMounted } from 'vue'
 import { useI18n } from 'vue-i18n'
-import { vueAdmin, resolveVue } from '../VueAdmin'
+import { vueAdmin } from '../VueAdmin'
 import { IRole, IRoleProto, WithId, ILabel } from '../IShrimpType'
 import { ElMessage } from 'element-plus'
-
-const ShrimpPowerTree = defineAsyncComponent(resolveVue('components/ShrimpPowerTree.vue'))
+import ShrimpPowerTree from '../components/ShrimpPowerTree.vue'
 
 interface IPowerItem {
     key: string
diff --git a/src/module/user.vue b/src/module/user.vue
index 9a40e7a..7bacb7b 100644
--- a/src/module/user.vue
+++ b/src/module/user.vue
@@ -7,11 +7,8 @@
 </template>
 
 <script lang="ts" setup>
-import { defineAsyncComponent } from 'vue'
-import { resolveVue } from '../VueAdmin'
-
-const ShrimpTable = defineAsyncComponent(resolveVue('components/ShrimpTable.vue'))
-const FieldRelativeTime = defineAsyncComponent(resolveVue('components/fields/FieldRelativeTime.vue'))
+import ShrimpTable from '../components/ShrimpTable.vue'
+import FieldRelativeTime from '../components/fields/FieldRelativeTime.vue'
 </script>
 
 <style scoped>
diff --git a/src/module/user/operationLog.vue b/src/module/user/operationLog.vue
index 15f1f95..42817d1 100644
--- a/src/module/user/operationLog.vue
+++ b/src/module/user/operationLog.vue
@@ -11,12 +11,11 @@
 </template>
 
 <script lang="ts" setup>
-import { defineAsyncComponent, ref, computed, onMounted, watch } from 'vue'
+import { ref, computed, onMounted, watch } from 'vue'
 import { useRoute } from 'vue-router'
 import { useI18n } from 'vue-i18n'
-import { vueAdmin, resolveVue } from '../../VueAdmin'
-
-const ShrimpTable = defineAsyncComponent(resolveVue('components/ShrimpTable.vue'))
+import { vueAdmin } from '../../VueAdmin'
+import ShrimpTable from '../../components/ShrimpTable.vue'
 
 const route = useRoute()
 const { t } = useI18n()