fix:修复用户管理和角色管理编辑异常删除关联表内容的bug

Author: insistence

dash-fastapi-backend/mapper/schema/role_schema.py

@@ -56,6 +56,7 @@ class AddRoleModel(RoleModel):
     新增角色模型
     """
     menu_id: Optional[str]
+    type: Optional[str]
 
 
 class DeleteRoleModel(BaseModel):

dash-fastapi-backend/mapper/schema/user_schema.py

@@ -204,6 +204,7 @@ class AddUserModel(UserModel):
     """
     role_id: Optional[str]
     post_id: Optional[str]
+    type: Optional[str]
 
 
 class DeleteUserModel(BaseModel):

dash-fastapi-backend/service/role_service.py

@@ -54,7 +54,7 @@ def edit_role_services(result_db: Session, page_object: AddRoleModel):
     """
     edit_role = RoleModel(**page_object.dict())
     edit_role_result = edit_role_crud(result_db, edit_role)
-    if edit_role_result.is_success:
+    if edit_role_result.is_success and page_object.type != 'status':
         role_id_dict = dict(role_id=page_object.role_id)
         delete_role_menu_crud(result_db, RoleMenuModel(**role_id_dict))
         if page_object.menu_id:

dash-fastapi-backend/service/user_service.py

@@ -48,7 +48,7 @@ def edit_user_services(result_db: Session, page_object: AddUserModel):
     """
     edit_user = UserModel(**page_object.dict())
     edit_user_result = edit_user_crud(result_db, edit_user)
-    if edit_user_result.is_success:
+    if edit_user_result.is_success and page_object.type != 'status':
         user_id_dict = dict(user_id=page_object.user_id)
         delete_user_role_crud(result_db, UserRoleModel(**user_id_dict))
         delete_user_post_crud(result_db, UserPostModel(**user_id_dict))

dash-fastapi-frontend/callbacks/system_c/role_c.py

@@ -349,6 +349,39 @@ def role_confirm(confirm_trigger, operation_type, cur_role_info, role_name, role
     return [dash.no_update] * 10
 
 
+@app.callback(
+    [Output('role-operations-store', 'data', allow_duplicate=True),
+     Output('api-check-token', 'data', allow_duplicate=True),
+     Output('global-message-container', 'children', allow_duplicate=True)],
+    [Input('role-list-table', 'recentlySwitchDataIndex'),
+     Input('role-list-table', 'recentlySwitchStatus'),
+     Input('role-list-table', 'recentlySwitchRow')],
+    prevent_initial_call=True
+)
+def table_switch_role_status(recently_switch_data_index, recently_switch_status, recently_switch_row):
+    if recently_switch_data_index:
+        if recently_switch_status:
+            params = dict(role_id=int(recently_switch_row['key']), status='0', type='status')
+        else:
+            params = dict(role_id=int(recently_switch_row['key']), status='1', type='status')
+        edit_button_result = edit_role_api(params)
+        if edit_button_result['code'] == 200:
+
+            return [
+                {'type': 'switch-status'},
+                {'timestamp': time.time()},
+                fuc.FefferyFancyMessage('修改成功', type='success')
+            ]
+
+        return [
+            dash.no_update,
+            {'timestamp': time.time()},
+            fuc.FefferyFancyMessage('修改失败', type='error')
+        ]
+
+    return [dash.no_update] * 3
+
+
 @app.callback(
     [Output('role-delete-text', 'children'),
      Output('role-delete-confirm-modal', 'visible'),

dash-fastapi-frontend/callbacks/system_c/user_c.py

@@ -408,9 +408,9 @@ def usr_edit_confirm(edit_confirm, nick_name, dept_id, phone_number, email, sex,
 def table_switch_user_status(recently_switch_data_index, recently_switch_status, recently_switch_row):
     if recently_switch_data_index:
         if recently_switch_status:
-            params = dict(user_id=int(recently_switch_row['key']), status='0')
+            params = dict(user_id=int(recently_switch_row['key']), status='0', type='status')
         else:
-            params = dict(user_id=int(recently_switch_row['key']), status='1')
+            params = dict(user_id=int(recently_switch_row['key']), status='1', type='status')
         edit_button_result = edit_user_api(params)
         if edit_button_result['code'] == 200:
 

dash-fastapi-frontend/views/system/role/__init__.py

@@ -345,6 +345,7 @@ def render():
                         fac.AntdFormItem(
                             fac.AntdInputNumber(
                                 id='role-role_sort',
+                                placeholder='请输入角色顺序',
                                 defaultValue=0,
                                 min=0,
                                 style={