@befly-addon/admin 1.0.24 → 1.0.26

package/apis/admin/roleSave.ts

@@ -7,7 +7,6 @@ import { Yes, No } from 'befly';
 export default {
     name: '管理员角色保存',
     fields: {
-        adminId: Fields._id,
         roleCode: {
             name: '角色编码',
             type: 'string',
@@ -33,7 +32,7 @@ export default {
         // 更新管理员的角色ID、角色编码和角色类型
         await befly.db.updData({
             table: 'addon_admin_admin',
-            where: { id: ctx.body.adminId },
+            where: { id: ctx.body.id },
             data: {
                 roleId: role.id,
                 roleCode: role.code,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@befly-addon/admin",
-    "version": "1.0.24",
+    "version": "1.0.26",
     "description": "Befly - 管理后台功能组件",
     "type": "module",
     "private": false,
@@ -39,7 +39,7 @@
         "url": "https://github.com/chenbimo/befly.git",
         "directory": "packages/addon-admin"
     },
-    "gitHead": "f3f4db9f70580b0103c9dab3891c816ed6b03135",
+    "gitHead": "ca96814c3b67376809086cd8bef8e7816b736483",
     "dependencies": {
         "befly": "3.8.12"
     }

package/util.ts

@@ -1,14 +1,25 @@
-import type { RouteRecordRaw } from 'vue-router';
+import type { RouteRecordRaw, Component } from 'vue-router';
+
+/**
+ * 布局配置接口
+ */
+export interface LayoutConfig {
+    path: string;
+    layoutName: string;
+    component: Component;
+    children?: LayoutConfig[];
+    meta?: Record<string, any>;
+}
 
 /**
  * 自定义布局处理函数
  * 根据文件名后缀判断使用哪个布局
  * @param routes - 原始路由配置
  * @param inheritLayout - 继承的布局名称（来自父级目录）
- * @returns 处理后的路由配置
+ * @returns 处理后的布局配置（不包含实际的布局组件导入）
  */
-export function Layouts(routes: RouteRecordRaw[], inheritLayout = ''): RouteRecordRaw[] {
-    const result: RouteRecordRaw[] = [];
+export function Layouts(routes: RouteRecordRaw[], inheritLayout = ''): LayoutConfig[] {
+    const result: LayoutConfig[] = [];
 
     for (const route of routes) {
         const currentPath = route.path || '';
@@ -23,9 +34,11 @@ export function Layouts(routes: RouteRecordRaw[], inheritLayout = ''): RouteReco
             const cleanPath = pathMatch ? currentPath.replace(/_\d+$/, '') : currentPath;
 
             result.push({
-                ...route,
                 path: cleanPath,
-                children: Layouts(route.children, currentLayout)
+                layoutName: currentLayout || 'default',
+                component: route.component!,
+                children: Layouts(route.children, currentLayout),
+                meta: route.meta
             });
             continue;
         }
@@ -51,19 +64,12 @@ export function Layouts(routes: RouteRecordRaw[], inheritLayout = ''): RouteReco
             cleanPath = lastPart;
         }
 
-        // 根据布局名称加载对应组件
-        const layoutComponent = layoutName === 'default' ? () => import('@/layouts/default.vue') : () => import(`@/layouts/${layoutName}.vue`);
-
-        // 包裹布局
+        // 返回布局配置（不执行实际导入）
         result.push({
             path: cleanPath,
-            component: layoutComponent,
-            children: [
-                {
-                    ...route,
-                    path: ''
-                }
-            ]
+            layoutName: layoutName,
+            component: route.component!,
+            meta: route.meta
         });
     }
 

package/views/403/index.vue

@@ -15,7 +15,6 @@
 <script setup>
 import { useRouter, useRoute } from 'vue-router';
 import { Button as TinyButton } from '@opentiny/vue';
-import { useRouter } from 'vue-router';
 
 const router = useRouter();
 

package/views/admin/components/edit.vue

@@ -34,9 +34,8 @@
 </template>
 
 <script setup>
-import { shallowRef } from 'vue';
+import { $ref, $shallowRef } from 'vue-macros/macros';
 import { Button as TinyButton, DialogBox as TinyDialogBox, Form as TinyForm, FormItem as TinyFormItem, Input as TinyInput, Radio as TinyRadio, RadioGroup as TinyRadioGroup, Modal } from '@opentiny/vue';
-import { Modal } from '@opentiny/vue';
 import { $Http } from '@/plugins/http';
 
 const $Prop = defineProps({

package/views/admin/components/role.vue

@@ -16,9 +16,8 @@
 </template>
 
 <script setup>
-import { shallowRef } from 'vue';
+import { $ref } from 'vue-macros/macros';
 import { Button as TinyButton, DialogBox as TinyDialogBox, Select as TinySelect, Tag as TinyTag, Modal } from '@opentiny/vue';
-import { Modal } from '@opentiny/vue';
 import { $Http } from '@/plugins/http';
 
 const $Prop = defineProps({

package/views/admin/index.vue

@@ -78,6 +78,7 @@
 </template>
 
 <script setup>
+import { $ref } from 'vue-macros/macros';
 import { Button as TinyButton, Grid as TinyGrid, GridColumn as TinyGridColumn, Tag as TinyTag, Dropdown as TinyDropdown, DropdownMenu as TinyDropdownMenu, DropdownItem as TinyDropdownItem, Pager as TinyPager, Modal } from '@opentiny/vue';
 import IconLucidePlus from '~icons/lucide/plus';
 import IconLucideRotateCw from '~icons/lucide/rotate-cw';

package/views/dict/components/edit.vue

@@ -34,9 +34,9 @@
 </template>
 
 <script setup>
-import { watch, shallowRef } from 'vue';
+import { $ref, $shallowRef } from 'vue-macros/macros';
+import { watch } from 'vue';
 import { Button as TinyButton, DialogBox as TinyDialogBox, Form as TinyForm, FormItem as TinyFormItem, Input as TinyInput, Numeric as TinyNumeric, Radio as TinyRadio, RadioGroup as TinyRadioGroup, Modal } from '@opentiny/vue';
-import { Modal } from '@opentiny/vue';
 import { $Http } from '@/plugins/http';
 
 const $Prop = defineProps({

package/views/dict/index.vue

@@ -65,6 +65,7 @@
 </template>
 
 <script setup>
+import { $ref } from 'vue-macros/macros';
 import { Button as TinyButton, Grid as TinyGrid, GridColumn as TinyGridColumn, Tag as TinyTag, Dropdown as TinyDropdown, DropdownMenu as TinyDropdownMenu, DropdownItem as TinyDropdownItem, Pager as TinyPager, Modal } from '@opentiny/vue';
 import IconLucidePlus from '~icons/lucide/plus';
 import IconLucideRotateCw from '~icons/lucide/rotate-cw';
@@ -74,8 +75,6 @@ import IconLucideTrash2 from '~icons/lucide/trash-2';
 import EditDialog from './components/edit.vue';
 import { $Http } from '@/plugins/http';
 
-import EditDialog from './components/edit.vue';
-
 // 响应式数据
 const $Data = $ref({
     dictList: [],

package/views/index/components/addonList.vue

@@ -24,6 +24,7 @@
 </template>
 
 <script setup>
+import { $ref } from 'vue-macros/macros';
 import IconLucideBox from '~icons/lucide/box';
 import { Tag as TinyTag } from '@opentiny/vue';
 import IconLucidePackage from '~icons/lucide/package';

package/views/index/components/environmentInfo.vue

@@ -36,6 +36,7 @@
 </template>
 
 <script setup>
+import { $ref } from 'vue-macros/macros';
 import IconLucideServer from '~icons/lucide/server';
 import { $Http } from '@/plugins/http';
 

package/views/index/components/operationLogs.vue

@@ -34,6 +34,7 @@
 </template>
 
 <script setup>
+import { $ref } from 'vue-macros/macros';
 import { Tag as TinyTag } from '@opentiny/vue';
 import IconLucideFileText from '~icons/lucide/file-text';
 

package/views/index/components/performanceMetrics.vue

@@ -53,6 +53,7 @@
 </template>
 
 <script setup>
+import { $ref } from 'vue-macros/macros';
 import IconLucideActivity from '~icons/lucide/activity';
 import IconLucideTrendingUp from '~icons/lucide/trending-up';
 import IconLucideAlertCircle from '~icons/lucide/alert-circle';

package/views/index/components/serviceStatus.vue

@@ -35,6 +35,7 @@
 </template>
 
 <script setup>
+import { $ref } from 'vue-macros/macros';
 import IconLucideCheckCircle from '~icons/lucide/check-circle';
 import IconLucideZap from '~icons/lucide/zap';
 import IconLucideCloud from '~icons/lucide/cloud';

package/views/index/components/systemNotifications.vue

@@ -26,6 +26,7 @@
 </template>
 
 <script setup>
+import { $ref } from 'vue-macros/macros';
 import IconLucideBell from '~icons/lucide/bell';
 import IconLucideCheckCircle from '~icons/lucide/check-circle';
 import IconLucideAlertTriangle from '~icons/lucide/alert-triangle';

package/views/index/components/systemOverview.vue

@@ -39,6 +39,7 @@
 </template>
 
 <script setup>
+import { $ref } from 'vue-macros/macros';
 import IconLucideWebhook from '~icons/lucide/webhook';
 import IconLucideUsers from '~icons/lucide/users';
 import IconLucideUser from '~icons/lucide/user';

package/views/index/components/systemResources.vue

@@ -39,6 +39,7 @@
 </template>
 
 <script setup>
+import { $ref } from 'vue-macros/macros';
 import IconLucideDisc from '~icons/lucide/disc';
 import { Progress as TinyProgress } from '@opentiny/vue';
 import IconLucideCpu from '~icons/lucide/cpu';

package/views/index/components/userInfo.vue

@@ -37,6 +37,7 @@
 </template>
 
 <script setup>
+import { $ref } from 'vue-macros/macros';
 import IconLucidePhone from '~icons/lucide/phone';
 import IconLucideClock from '~icons/lucide/clock';
 import { Button as TinyButton } from '@opentiny/vue';

package/views/login/components/emailLoginForm.vue

@@ -25,7 +25,7 @@
 </template>
 
 <script setup lang="ts">
-import { shallowRef } from 'vue';
+import { $ref, $shallowRef } from 'vue-macros/macros';
 import { useRouter, useRoute } from 'vue-router';
 import { Button as TinyButton, Form as TinyForm, FormItem as TinyFormItem, Input as TinyInput, Modal } from '@opentiny/vue';
 import IconLucideUser from '~icons/lucide/user';

package/views/login/components/registerForm.vue

@@ -37,7 +37,7 @@
 </template>
 
 <script setup>
-import { shallowRef } from 'vue';
+import { $ref, $shallowRef } from 'vue-macros/macros';
 import { Button as TinyButton, Form as TinyForm, FormItem as TinyFormItem, Input as TinyInput } from '@opentiny/vue';
 import IconLucideUser from '~icons/lucide/user';
 import IconLucideMail from '~icons/lucide/mail';

package/views/login/index_1.vue

@@ -26,6 +26,7 @@
 </template>
 
 <script setup>
+import { $ref } from 'vue-macros/macros';
 import WelcomePanel from './components/welcomePanel.vue';
 import EmailLoginForm from './components/emailLoginForm.vue';
 import RegisterForm from './components/registerForm.vue';

package/views/menu/components/edit.vue

@@ -28,7 +28,8 @@
 </template>
 
 <script setup>
-import { watch, shallowRef } from 'vue';
+import { $ref, $shallowRef } from 'vue-macros/macros';
+import { watch } from 'vue';
 import { Button as TinyButton, DialogBox as TinyDialogBox, Form as TinyForm, FormItem as TinyFormItem, Input as TinyInput, Numeric as TinyNumeric, Radio as TinyRadio, RadioGroup as TinyRadioGroup, Modal } from '@opentiny/vue';
 import { $Http } from '@/plugins/http';
 

package/views/menu/index.vue

@@ -68,6 +68,7 @@
 </template>
 
 <script setup>
+import { $ref } from 'vue-macros/macros';
 import { Button as TinyButton, Grid as TinyGrid, GridColumn as TinyGridColumn, Tag as TinyTag, Dropdown as TinyDropdown, DropdownMenu as TinyDropdownMenu, DropdownItem as TinyDropdownItem, Pager as TinyPager, Modal } from '@opentiny/vue';
 import IconLucidePlus from '~icons/lucide/plus';
 import IconLucideRotateCw from '~icons/lucide/rotate-cw';

package/views/role/components/api.vue

@@ -33,6 +33,7 @@
 </template>
 
 <script setup>
+import { $ref } from 'vue-macros/macros';
 import { Button as TinyButton, DialogBox as TinyDialogBox, Search as TinySearch, Checkbox as TinyCheckbox, CheckboxGroup as TinyCheckboxGroup, Modal } from '@opentiny/vue';
 import { $Http } from '@/plugins/http';
 

package/views/role/components/edit.vue

@@ -30,7 +30,7 @@
 </template>
 
 <script setup>
-import { shallowRef } from 'vue';
+import { $ref, $shallowRef } from 'vue-macros/macros';
 import { Button as TinyButton, DialogBox as TinyDialogBox, Form as TinyForm, FormItem as TinyFormItem, Input as TinyInput, Numeric as TinyNumeric, Radio as TinyRadio, RadioGroup as TinyRadioGroup, Modal } from '@opentiny/vue';
 import { $Http } from '@/plugins/http';
 

package/views/role/components/menu.vue

@@ -11,7 +11,8 @@
 </template>
 
 <script setup>
-import { nextTick, shallowRef } from 'vue';
+import { $ref, $shallowRef } from 'vue-macros/macros';
+import { nextTick } from 'vue';
 import { Button as TinyButton, DialogBox as TinyDialogBox, Tree as TinyTree, Modal } from '@opentiny/vue';
 
 import { arrayToTree } from '@/utils';

package/views/role/index.vue

@@ -77,6 +77,7 @@
 </template>
 
 <script setup>
+import { $ref } from 'vue-macros/macros';
 import { Button as TinyButton, Grid as TinyGrid, GridColumn as TinyGridColumn, Tag as TinyTag, Dropdown as TinyDropdown, DropdownMenu as TinyDropdownMenu, DropdownItem as TinyDropdownItem, Pager as TinyPager, Modal } from '@opentiny/vue';
 import IconLucidePlus from '~icons/lucide/plus';
 import IconLucideRotateCw from '~icons/lucide/rotate-cw';

package/views/user/index.vue

@@ -74,6 +74,7 @@
 </template>
 
 <script setup>
+import { $ref } from 'vue-macros/macros';
 import { Tag as TinyTag, Modal } from '@opentiny/vue';
 import IconLucidePlus from '~icons/lucide/plus';
 import IconLucideSearch from '~icons/lucide/search';