fix menu

Author: xlorne

antd-pro/src/pages/components/menu/index.tsx

@@ -41,6 +41,7 @@ const MenuPage: React.FC = () => {
         actionRef.current.reload();
         //@ts-ignore
         treeRef.current?.refresh();
+        reloadTree();
       }
       return true;
     } catch (error) {
@@ -51,11 +52,6 @@ const MenuPage: React.FC = () => {
   };
 
   const columns: ProColumns<any>[] = [
-    {
-      title: "编号",
-      dataIndex: 'id',
-      search: false,
-    },
     {
       title: "名称",
       dataIndex: 'name',
@@ -88,6 +84,7 @@ const MenuPage: React.FC = () => {
               form.setFieldValue(key, record[key])
             }
             handleModalOpen(true);
+            form.setFieldValue('parentId', record.parentId)
           }}
         >
           修改
@@ -148,6 +145,7 @@ const MenuPage: React.FC = () => {
                 key="primary"
                 onClick={() => {
                   handleModalOpen(true);
+                  form.setFieldValue('parentId', parentId)
                 }}
               >
                 <PlusOutlined /> 新建
@@ -180,9 +178,6 @@ const MenuPage: React.FC = () => {
             form.resetFields();
           },
         }}
-        initialValues={{
-          "parentId": parentId,
-        }}
         open={createModalOpen}
         onOpenChange={handleModalOpen}
         onFinish={async (value) => {
@@ -194,6 +189,7 @@ const MenuPage: React.FC = () => {
             }
             //@ts-ignore
             treeRef.current?.refresh();
+            reloadTree();
           }
         }
         }

components-server/components/menu/menu-domain/src/main/java/com/codingapi/components/menu/domain/Menu.java

@@ -37,11 +37,18 @@ public static Menu root() {
         return root;
     }
 
-    public int parentId() {
-        return parent == null ? 0 : parent.getId();
+    public int getParentId() {
+        if (parent == null) {
+            if (id.equals(root().id)) {
+                return 0;
+            }
+            return 1;
+        }else{
+            return parent.getId();
+        }
     }
-    
-    public void setParentId(int id){
+
+    public void setParentId(int id) {
         Menu parent = new Menu();
         parent.setId(id);
         this.parent = parent;

components-server/components/menu/menu-infrastructure-db/src/main/java/com/codingapi/components/infrastructure/menu/repository/impl/MenuRepositoryImpl.java

@@ -45,7 +45,7 @@ public Menu tree() {
 
     private void fetchChildren(Menu parent, List<Menu> menuList) {
         for (Menu menu : menuList) {
-            if (menu.parentId() == parent.getId()) {
+            if (menu.getParentId() == parent.getId()) {
                 parent.addChild(menu);
                 fetchChildren(menu, menuList);
             }