diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4916271..42be719 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,121 +4,10 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -233,7 +122,7 @@
-
+
@@ -297,8 +186,8 @@
-
+
@@ -348,7 +237,7 @@
-
+
@@ -366,7 +255,15 @@
1753774349962
-
+
+
+ 1753930725818
+
+
+
+ 1753930725818
+
+
@@ -417,7 +314,8 @@
-
+
+
diff --git a/chat-client/src/views/permission/menuManage/components/edit.vue b/chat-client/src/views/permission/menuManage/components/edit.vue
index 0016b03..3c555f6 100644
--- a/chat-client/src/views/permission/menuManage/components/edit.vue
+++ b/chat-client/src/views/permission/menuManage/components/edit.vue
@@ -265,6 +265,8 @@
menuForm.apendixForm.menu.parentId = parentId
}
menuForm.apendixForm.menu.idx = menuForm.apendixForm.name
+ menuForm.apendixForm.menu.icon = menuForm.definedFrom.icon
+ menuForm.apendixForm.icon = menuForm.definedFrom.icon
if (menuForm.definedFrom.id) {
//编辑
await editMenuApendix(menuForm.apendixForm)
@@ -281,6 +283,26 @@
const emit = defineEmits(['refresh'])
const close = () => {
formRef.value.resetFields()
+ Object.assign(menuForm, { definedFrom: {},
+ apendixForm: {
+ id:'',
+ name: '',
+ path: '',
+ component: '',
+ redirect: '',
+ iscustomsvg: false,
+ hidden: false,
+ levelhidden: false,
+ nokeepalive: false,
+ noclosable: false,
+ nocolumn: false,
+ dot: false,
+ dynamicnewtab: false,
+ badge: '',
+ activemenu: '',
+ },
+ })
+ isFuncMenu.value = true
dialogFormVisible.value = false
emit('refresh')
}
diff --git a/chat-server/src/main/java/com/bjtds/brichat/service/impl/MenuServiceImpl.java b/chat-server/src/main/java/com/bjtds/brichat/service/impl/MenuServiceImpl.java
index dc395c1..318c253 100644
--- a/chat-server/src/main/java/com/bjtds/brichat/service/impl/MenuServiceImpl.java
+++ b/chat-server/src/main/java/com/bjtds/brichat/service/impl/MenuServiceImpl.java
@@ -26,6 +26,8 @@ public class MenuServiceImpl implements MenuService {
public void addMenu(DTOmenu dtoMenu) {
if (dtoMenu.getId() == null) {
Menu menu = dtoMenu.getMenu();
+ dtoMenu.setIs_enable("1");
+ dtoMenu.setBreadcrumbhidden("0");
menuMapper.addMenu(dtoMenu);
long id = dtoMenu.getId();
if(id >Integer.MAX_VALUE||id