diff --git a/docs/about/change-log.md b/docs/about/change-log.md index 7ee54c36..c92d24dc 100644 --- a/docs/about/change-log.md +++ b/docs/about/change-log.md @@ -7,7 +7,8 @@ 🐞 修复 SFTP 加载失败后一直 loading 🐞 修复 SSH 配置未启用还可以连接 🐞 修复 主机配置保存后无法修改状态 -🔨 修改 菜单路由地址简化 +🔨 修改 菜单路由命名逻辑修改 +🔨 优化 前端组件命名规范化 [如何升级](/about/update.md?id=_v102) diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/core/CodeGenerator.java b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/core/CodeGenerator.java index eabfd817..bb85f65d 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/core/CodeGenerator.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/core/CodeGenerator.java @@ -346,7 +346,7 @@ public class CodeGenerator implements Executable { // api 文件 new String[]{"/templates/orion-vue-api.ts.vm", "${feature}.ts", "vue/api/${module}"}, // router 文件 - new String[]{"/templates/orion-vue-router.ts.vm", "${module}.${feature}.ts", "vue/router/routes/modules"}, + new String[]{"/templates/orion-vue-router.ts.vm", "${feature}.ts", "vue/router/routes/modules"}, // views index.ts 文件 new String[]{"/templates/orion-vue-views-index.vue.vm", "index.vue", "vue/views/${module}/${feature}"}, // form-modal.vue 文件 diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-sql-menu.sql.vm b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-sql-menu.sql.vm index a6cbc96a..6514b77a 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-sql-menu.sql.vm +++ b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-sql-menu.sql.vm @@ -2,9 +2,9 @@ -- 父菜单 INSERT INTO system_menu - (parent_id, name, type, sort, visible, status, cache, component) + (parent_id, name, type, sort, visible, status, cache) VALUES - (0, '${table.comment}管理', 1, 10, 1, 1, 1, '$vue.moduleEntityFirstLower'); + (0, '${table.comment}管理', 1, 10, 1, 1, 1); -- 设置临时父菜单id SELECT @TMP_PARENT_ID:=LAST_INSERT_ID(); @@ -13,7 +13,7 @@ SELECT @TMP_PARENT_ID:=LAST_INSERT_ID(); INSERT INTO system_menu (parent_id, name, type, sort, visible, status, cache, component) VALUES - (@TMP_PARENT_ID, '$table.comment', 2, 10, 1, 1, 1, '$vue.moduleEntityFirstLower$vue.featureEntity'); + (@TMP_PARENT_ID, '$table.comment', 2, 10, 1, 1, 1, '$vue.featureEntityFirstLower'); -- 设置临时子菜单id SELECT @TMP_SUB_ID:=LAST_INSERT_ID(); diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-router.ts.vm b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-router.ts.vm index 6959c09e..83bde468 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-router.ts.vm +++ b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-router.ts.vm @@ -2,12 +2,12 @@ import type { AppRouteRecordRaw } from '../types'; import { DEFAULT_LAYOUT } from '../base'; const $vue.moduleConst: AppRouteRecordRaw = { - name: '$vue.moduleEntityFirstLower', + name: '${vue.moduleEntityFirstLower}Module', component: DEFAULT_LAYOUT, children: [ { - name: '$vue.moduleEntityFirstLower$vue.featureEntity', - path: '/$vue.module-$vue.feature', + name: '$vue.featureEntityFirstLower', + path: '/$vue.feature', component: () => import('@/views/$vue.module/$vue.feature/index.vue'), }, ], diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-card-list.vue.vm b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-card-list.vue.vm index e4bd436e..7bf3e7be 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-card-list.vue.vm +++ b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-card-list.vue.vm @@ -111,7 +111,7 @@ diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-form-drawer.vue.vm b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-form-drawer.vue.vm index 437a9410..fc77d615 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-form-drawer.vue.vm +++ b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-form-drawer.vue.vm @@ -50,7 +50,7 @@ diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-form-modal.vue.vm b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-form-modal.vue.vm index 336cd890..b5d8e08f 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-form-modal.vue.vm +++ b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-form-modal.vue.vm @@ -54,7 +54,7 @@ diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-table.vue.vm b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-table.vue.vm index 24d32c87..2976b850 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-table.vue.vm +++ b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-table.vue.vm @@ -130,7 +130,7 @@ diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-index.vue.vm b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-index.vue.vm index 40d5aa41..73979f2a 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-index.vue.vm +++ b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-index.vue.vm @@ -33,20 +33,11 @@ diff --git a/orion-ops-ui/src/views/user/operator-log/components/operator-log-clear-modal.vue b/orion-ops-ui/src/views/user/operator-log/components/operator-log-clear-modal.vue index 3a154224..f46454bf 100644 --- a/orion-ops-ui/src/views/user/operator-log/components/operator-log-clear-modal.vue +++ b/orion-ops-ui/src/views/user/operator-log/components/operator-log-clear-modal.vue @@ -88,7 +88,7 @@ import { useDictStore } from '@/store'; import { operatorLogModuleKey, operatorLogResultKey, operatorLogTypeKey, operatorRiskLevelKey } from '@/views/user/operator-log/types/const'; import { labelFilter } from '@/types/form'; - import UserSelector from '@/components/user/user/user-selector.vue'; + import UserSelector from '@/components/user/user/selector/index.vue'; const { $state: dictState, toOptions } = useDictStore(); const { visible, setVisible } = useVisible(); diff --git a/orion-ops-ui/src/views/user/operator-log/components/operator-log-query-header.vue b/orion-ops-ui/src/views/user/operator-log/components/operator-log-query-header.vue index ed2ba2aa..5ee2c3b5 100644 --- a/orion-ops-ui/src/views/user/operator-log/components/operator-log-query-header.vue +++ b/orion-ops-ui/src/views/user/operator-log/components/operator-log-query-header.vue @@ -71,7 +71,7 @@ import { useDictStore } from '@/store'; import { operatorLogModuleKey, operatorLogTypeKey, operatorRiskLevelKey, operatorLogResultKey } from '../types/const'; import { labelFilter } from '@/types/form'; - import UserSelector from '@/components/user/user/user-selector.vue'; + import UserSelector from '@/components/user/user/selector/index.vue'; const emits = defineEmits(['submit']); const props = defineProps({ diff --git a/orion-ops-ui/src/views/user/operator-log/components/operator-log-simple-table.vue b/orion-ops-ui/src/views/user/operator-log/components/operator-log-simple-table.vue index d1cb2635..30d2b45d 100644 --- a/orion-ops-ui/src/views/user/operator-log/components/operator-log-simple-table.vue +++ b/orion-ops-ui/src/views/user/operator-log/components/operator-log-simple-table.vue @@ -79,7 +79,7 @@ import { getOperatorLogPage } from '@/api/user/operator-log'; import { getCurrentUserOperatorLog } from '@/api/user/mine'; import { replaceHtmlTag, clearHtmlTag } from '@/utils'; - import JsonEditorModal from '@/components/view/json-editor/json-editor-modal.vue'; + import JsonEditorModal from '@/components/view/json-editor/modal/index.vue'; const props = defineProps({ handleColumn: { diff --git a/orion-ops-ui/src/views/user/operator-log/components/operator-log-table.vue b/orion-ops-ui/src/views/user/operator-log/components/operator-log-table.vue index ead27305..6a435b43 100644 --- a/orion-ops-ui/src/views/user/operator-log/components/operator-log-table.vue +++ b/orion-ops-ui/src/views/user/operator-log/components/operator-log-table.vue @@ -143,7 +143,7 @@ import { Message } from '@arco-design/web-vue'; import OperatorLogQueryHeader from './operator-log-query-header.vue'; import OperatorLogClearModal from './operator-log-clear-modal.vue'; - import JsonEditorModal from '@/components/view/json-editor/json-editor-modal.vue'; + import JsonEditorModal from '@/components/view/json-editor/modal/index.vue'; const pagination = usePagination(); const rowSelection = useRowSelection(); diff --git a/orion-ops-ui/src/views/user/role/components/role-menu-grant-modal.vue b/orion-ops-ui/src/views/user/role/components/role-menu-grant-modal.vue index 83e00a70..7eb224b7 100644 --- a/orion-ops-ui/src/views/user/role/components/role-menu-grant-modal.vue +++ b/orion-ops-ui/src/views/user/role/components/role-menu-grant-modal.vue @@ -64,7 +64,7 @@ import { getRoleMenuId, grantRoleMenu } from '@/api/user/role'; import { Message } from '@arco-design/web-vue'; import { quickGrantMenuOperator } from '../types/const'; - import MenuGrantTable from '@/components/system/menu/grant/menu-grant-table.vue'; + import MenuGrantTable from '@/components/system/menu/grant-table/index.vue'; const { visible, setVisible } = useVisible(); const { loading, setLoading } = useLoading(); diff --git a/orion-ops-ui/src/views/user/user/components/user-grant-roles-form-modal.vue b/orion-ops-ui/src/views/user/user/components/user-grant-roles-form-modal.vue index b99fe411..80b6a558 100644 --- a/orion-ops-ui/src/views/user/user/components/user-grant-roles-form-modal.vue +++ b/orion-ops-ui/src/views/user/user/components/user-grant-roles-form-modal.vue @@ -49,9 +49,9 @@ import useLoading from '@/hooks/loading'; import useVisible from '@/hooks/visible'; import { Message } from '@arco-design/web-vue'; - import RoleSelector from '@/components/user/role/role-selector.vue'; import { useCacheStore } from '@/store'; import { getUserRoleIdList, grantUserRole } from '@/api/user/user'; + import RoleSelector from '@/components/user/role/selector/index.vue'; const { visible, setVisible } = useVisible(); const { loading, setLoading } = useLoading();