Browse Source

👣 解决路由冲突问题

master
wangxiang 3 years ago
parent
commit
da862e4ede
  1. 5
      kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/MenuController.java
  2. 4
      kicc-ui/src/router/routes/index.ts
  3. 9
      kicc-ui/src/router/routes/modules/dashboard.ts
  4. 18
      kicc-ui/src/views/system/config/index.vue

5
kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/MenuController.java

@ -99,7 +99,10 @@ public class MenuController { @@ -99,7 +99,10 @@ public class MenuController {
"1510519775390703616",
"1510519775680110592",
"1510519775961128960",
"1510519776250535936"}, id)) {
"1510519776250535936",
"1521311762108076034",
"1521312258390708226",
"1521312739301216257"}, id)) {
return R.error("不允许删除菜单模块!");
}
if (menuService.count(new LambdaQueryWrapper<Menu>().eq(Menu::getParentId, id)) > 0) {

4
kicc-ui/src/router/routes/index.ts

@ -11,9 +11,11 @@ const modules = import.meta.globEager('./modules/**/*.ts'); @@ -11,9 +11,11 @@ const modules = import.meta.globEager('./modules/**/*.ts');
const routeModuleList: AppRouteModule[] = [];
Object.keys(modules).forEach((key) => {
const mod = modules[key].default || {};
const mod = modules[key].default;
if (mod) {
const modList = Array.isArray(mod) ? [...mod] : [mod];
routeModuleList.push(...modList);
}
});
export const routesConfig = [

9
kicc-ui/src/router/routes/modules/dashboard.ts

@ -6,7 +6,12 @@ @@ -6,7 +6,12 @@
* @create: 2022/4/9
*/
import type { AppRouteModule } from '/@/router/types';
/**
* ,,
* ,,
* ,
*/
/*import type { AppRouteModule } from '/@/router/types';
import { LAYOUT } from '/@/router/constant';
import {useI18n} from "/@/hooks/web/useI18n";
const { t } = useI18n();
@ -40,4 +45,4 @@ const dashboard: AppRouteModule = { @@ -40,4 +45,4 @@ const dashboard: AppRouteModule = {
]
};
export default dashboard;
export default dashboard;*/

18
kicc-ui/src/views/system/config/index.vue

@ -52,11 +52,7 @@ @@ -52,11 +52,7 @@
:dataSource="state.dataSource"
:columns="columns"
:bordered="true"
:scroll="{
x: '100%',
y: state.tableHeight,
scrollToFirstRowOnChange: true
}"
:scroll="getScrollRef"
:rowClassName="getRowClassName"
:rowSelection="getRowSelectionRef"
:pagination="getPaginationInfo"
@ -162,7 +158,7 @@ @@ -162,7 +158,7 @@
import { RedoOutlined, ColumnHeightOutlined, FullscreenOutlined, FullscreenExitOutlined, LeftOutlined, RightOutlined } from '@ant-design/icons-vue';
import {ref, onMounted, watchEffect, ComputedRef, computed, watch} from 'vue';
import { Table, Form, Row, Col, Divider, Tooltip, Dropdown, Menu, Select, DatePicker, Alert } from 'ant-design-vue';
import {BasicTableProps, PaginationProps, SizeType, SorterResult} from '/@/components/Table';
import {BasicColumn, BasicTableProps, PaginationProps, SizeType, SorterResult} from '/@/components/Table';
import { listConfig, delConfig } from '/@/api/platform/system/controller/config';
import ConfigModal from './ConfigModal.vue';
import { columns } from './config.data';
@ -286,14 +282,8 @@ @@ -286,14 +282,8 @@
} = usePagination(basicTableProps);
// 使vben-table线
const { getRowClassName } = useTableStyle(basicTableProps, prefixCls);
// 使vben-table
/*const { getScrollRef, redoHeight } = useTableScroll(
basicTableProps,
tableElRef,
getColumnsRef,
getRowSelectionRef,
getDataSourceRef
);*/
// 使vben-table
const { getScrollRef, redoHeight } = useTableScroll(basicTableProps, tableElRef, columns as any, getRowSelectionRef, state.dataSource as any);
/** 生命周期钩子回调处理区域 */
onMounted(() => {

Loading…
Cancel
Save