diff --git a/.codelf/_changelog.md b/.codelf/_changelog.md deleted file mode 100644 index 12d2cde5..00000000 --- a/.codelf/_changelog.md +++ /dev/null @@ -1,88 +0,0 @@ -## 2024-03-21 10:00:00 - -### 1. Initial Project Setup - -**Change Type**: feature - -> **Purpose**: Initialize the RuoYi-Plus-Soybean project -> **Detailed Description**: Set up the project structure combining RuoYi-Vue-Plus backend with Soybean Admin frontend features -> **Reason for Change**: Create a modern admin system with enhanced features -> **Impact Scope**: Entire project structure -> **API Changes**: None -> **Configuration Changes**: Initial project configuration files -> **Performance Impact**: None - - ``` - root - - build // add // Build configuration and plugins - - docs // add // Documentation and templates - - packages // add // Monorepo packages - - public // add // Static assets - - src // add // Main application source code - - .codelf // add // Project documentation and guidelines - ``` - -### 2. Development Guidelines Setup - -**Change Type**: docs - -> **Purpose**: Establish project development guidelines and best practices -> **Detailed Description**: Create comprehensive development guidelines covering framework usage, coding standards, and best practices -> **Reason for Change**: Ensure consistent development practices across the project -> **Impact Scope**: Development workflow -> **API Changes**: None -> **Configuration Changes**: None -> **Performance Impact**: None - - ``` - root - - .codelf // add // Project documentation and guidelines - - attention.md // add // Development guidelines and best practices - - project.md // add // Project structure and documentation - - _changelog.md // add // Project change history - ``` - -## 2024-03-21 11:00:00 - -### 1. User Center Page Enhancement - -**Change Type**: improvement - -> **Purpose**: Enhance the user center page with better UI and functionality -> **Detailed Description**: -> - Improved the layout with responsive design -> - Added form validation for profile and password updates -> - Enhanced third-party account binding functionality -> - Added online device management with force logout feature -> - Optimized user experience with loading states and feedback -> **Reason for Change**: Provide a better user experience and more comprehensive user management features -> **Impact Scope**: User center page and related components -> **API Changes**: None -> **Configuration Changes**: None -> **Performance Impact**: Improved user experience with better feedback and validation - - ``` - root - - src/views/_builtin/user-center/index.vue // refact // Enhanced user center page with better UI and functionality - ``` - -### 2. {function simple description} - -**Change Type**: {type: feature/fix/improvement/refactor/docs/test/build} - -> **Purpose**: {function purpose} -> **Detailed Description**: {function detailed description} -> **Reason for Change**: {why this change is needed} -> **Impact Scope**: {other modules or functions that may be affected by this change} -> **API Changes**: {if there are API changes, detail the old and new APIs} -> **Configuration Changes**: {changes to environment variables, config files, etc.} -> **Performance Impact**: {impact of the change on system performance} - - ``` - root - - pkg // {type: add/del/refact/-} {The role of a folder} - - utils // {type: add/del/refact} {The function of the file} - - xxx // {type: add/del/refact} {The function of the file} - ``` - -... diff --git a/.env.dev b/.env.dev index 4e18fee1..0daad891 100644 --- a/.env.dev +++ b/.env.dev @@ -1,5 +1,5 @@ # backend service base url, test environment -VITE_SERVICE_BASE_URL=https://ruoyi.xlsea.cn/prod-api +VITE_SERVICE_BASE_URL=http://127.0.0.1:8080 VITE_APP_BASE_API=/dev-api diff --git a/package.json b/package.json index 8d4bf399..067914d8 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,6 @@ "@sa/materials": "workspace:*", "@sa/tinymce": "workspace:*", "@sa/utils": "workspace:*", - "@tinymce/tinymce-vue": "6.1.0", "@vueuse/core": "13.0.0", "clipboard": "2.0.11", "dayjs": "1.11.13", @@ -71,7 +70,6 @@ "nprogress": "0.2.0", "pinia": "3.0.1", "tailwind-merge": "3.0.2", - "tinymce": "7.8.0", "vue": "3.5.13", "vue-advanced-cropper": "^2.8.9", "vue-draggable-plus": "0.6.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d002599d..28ade518 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -32,9 +32,6 @@ importers: '@sa/utils': specifier: workspace:* version: link:packages/utils - '@tinymce/tinymce-vue': - specifier: 6.1.0 - version: 6.1.0(tinymce@7.8.0)(vue@3.5.13(typescript@5.8.2)) '@vueuse/core': specifier: 13.0.0 version: 13.0.0(vue@3.5.13(typescript@5.8.2)) @@ -74,9 +71,6 @@ importers: tailwind-merge: specifier: 3.0.2 version: 3.0.2 - tinymce: - specifier: 7.8.0 - version: 7.8.0 vue: specifier: 3.5.13 version: 3.5.13(typescript@5.8.2) diff --git a/src/router/elegant/transform.ts b/src/router/elegant/transform.ts index e37dfbc4..797392e0 100644 --- a/src/router/elegant/transform.ts +++ b/src/router/elegant/transform.ts @@ -6,7 +6,6 @@ import type { RouteRecordRaw, RouteComponent } from 'vue-router'; import type { ElegantConstRoute } from '@elegant-router/vue'; import type { RouteMap, RouteKey, RoutePath } from '@elegant-router/types'; -import { createCustomNameComponent, RouteComponentLoader } from './helper'; /** * transform elegant const routes to vue routes @@ -126,11 +125,8 @@ function transformElegantRouteToVueRoute( if (isView(component)) { const viewName = getViewName(component); - // 给组件设置name 与route.name一致 - vueRoute.component = createCustomNameComponent(views[viewName] as RouteComponentLoader, - { name: route.name }); - // 路由名称与组件名称保持一致，解决keepAlive问题 - vueRoute.name = route.name; + + vueRoute.component = views[viewName]; } } diff --git a/src/store/modules/route/index.ts b/src/store/modules/route/index.ts index a5dbdc9b..b53344db 100644 --- a/src/store/modules/route/index.ts +++ b/src/store/modules/route/index.ts @@ -96,11 +96,11 @@ export const useRouteStore = defineStore(SetupStoreId.Route, () => { route.path = route.path.startsWith('//') ? route.path.substring(1) : route.path; route.path = parent ? parent.path + route.path : route.path; - // route.name = route.component!; - // if (['layout.base', 'iframe-page'].includes(route.component!)) { - const name = humpToLine(route.path.substring(1).replace('/', '_')); - route.name = parent ? `${parent.name}_${name}` : name; - // } + route.name = route.component!; + if (['layout.base', 'iframe-page'].includes(route.component!)) { + const name = humpToLine(route.path.substring(1).replace('/', '_')); + route.name = parent ? `${parent.name}_${name}` : name; + } route.meta = route.meta ? route.meta : { title: route.name };