perf: 优化各模块表单校验方式

Author: insistence

dash-fastapi-frontend/callbacks/forget_c.py

@@ -5,6 +5,7 @@
 from dash.exceptions import PreventUpdate
 
 from server import app
+from utils.common import validate_data_not_empty
 from api.user import forget_user_pwd_api
 from api.message import send_message_api
 
@@ -38,7 +39,7 @@
 def forget_auth(nClicks, username, password, password_again, input_captcha, session_id):
     if nClicks:
     # 校验全部输入值是否不为空
-        if all([username, password, password_again, input_captcha]):
+        if all(validate_data_not_empty(item) for item in [username, password, password_again, input_captcha]):
 
             if password == password_again:
                 try:
@@ -107,14 +108,14 @@ def forget_auth(nClicks, username, password, password_again, input_captcha, sess
                 )
 
         return dict(
-            username_form_status=None if username else 'error',
-            password_form_status=None if password else 'error',
-            password_again_form_status=None if password_again else 'error',
-            captcha_form_status=None if input_captcha else 'error',
-            username_form_help=None if username else '请输入用户名！',
-            password_form_help=None if password else '请输入新密码！',
-            password_again_form_help=None if password_again else '请再次输入新密码！',
-            captcha_form_help=None if input_captcha else '请输入短信验证码！',
+            username_form_status=None if validate_data_not_empty(username) else 'error',
+            password_form_status=None if validate_data_not_empty(password) else 'error',
+            password_again_form_status=None if validate_data_not_empty(password_again) else 'error',
+            captcha_form_status=None if validate_data_not_empty(input_captcha) else 'error',
+            username_form_help=None if validate_data_not_empty(username) else '请输入用户名！',
+            password_form_help=None if validate_data_not_empty(password) else '请输入新密码！',
+            password_again_form_help=None if validate_data_not_empty(password_again) else '请再次输入新密码！',
+            captcha_form_help=None if validate_data_not_empty(input_captcha) else '请输入短信验证码！',
             submit_loading=False,
             redirect_container=None,
             global_message_container=None

dash-fastapi-frontend/callbacks/login_c.py

@@ -6,6 +6,7 @@
 import time
 
 from server import app
+from utils.common import validate_data_not_empty
 from api.login import login_api, get_captcha_image_api
 
 
@@ -41,7 +42,7 @@ def login_auth(nClicks, username, password, input_captcha, session_id, image_cli
         if captcha_hidden:
             input_captcha = 'hidden'
         # 校验全部输入值是否不为空
-        if all([username, password, input_captcha]):
+        if all(validate_data_not_empty(item) for item in [username, password, input_captcha]):
 
             try:
                 user_params = dict(username=username, password=password, captcha=input_captcha, session_id=session_id)
@@ -95,12 +96,12 @@ def login_auth(nClicks, username, password, input_captcha, session_id, image_cli
                 )
 
         return dict(
-            username_form_status=None if username else 'error',
-            password_form_status=None if password else 'error',
-            captcha_form_status=None if input_captcha else 'error',
-            username_form_help=None if username else '请输入用户名！',
-            password_form_help=None if password else '请输入密码！',
-            captcha_form_help=None if input_captcha else '请输入验证码！',
+            username_form_status=None if validate_data_not_empty(username) else 'error',
+            password_form_status=None if validate_data_not_empty(password) else 'error',
+            captcha_form_status=None if validate_data_not_empty(input_captcha) else 'error',
+            username_form_help=None if validate_data_not_empty(username) else '请输入用户名！',
+            password_form_help=None if validate_data_not_empty(password) else '请输入密码！',
+            captcha_form_help=None if validate_data_not_empty(input_captcha) else '请输入验证码！',
             image_click=dash.no_update,
             submit_loading=False,
             token=None,

dash-fastapi-frontend/callbacks/monitor_c/job_c/job_c.py

@@ -8,6 +8,7 @@
 import feffery_utils_components as fuc
 
 from server import app
+from utils.common import validate_data_not_empty
 from api.job import get_job_list_api, get_job_detail_api, add_job_api, edit_job_api, execute_job_api, delete_job_api, export_job_list_api
 from api.dict import query_dict_data_list_api
 
@@ -334,7 +335,7 @@ def job_confirm(confirm_trigger, modal_type, edit_row_info, form_value, form_lab
         # 获取所有输入表单项对应的value及label
         form_value_state = {x['id']['index']: x.get('value') for x in dash.ctx.states_list[-2]}
         form_label_state = {x['id']['index']: x.get('value') for x in dash.ctx.states_list[-1]}
-        if all([form_value_state.get(k) for k in form_label_output_list]):
+        if all(validate_data_not_empty(item) for item in [form_value_state.get(k) for k in form_label_output_list]):
             params_add = form_value_state
             params_edit = params_add.copy()
             params_edit['job_id'] = edit_row_info.get('job_id') if edit_row_info else None
@@ -374,8 +375,8 @@ def job_confirm(confirm_trigger, modal_type, edit_row_info, form_value, form_lab
             )
 
         return dict(
-            form_label_validate_status=[None if form_value_state.get(k) else 'error' for k in form_label_output_list],
-            form_label_validate_info=[None if form_value_state.get(k) else f'{form_label_state.get(k)}不能为空!' for k in form_label_output_list],
+            form_label_validate_status=[None if validate_data_not_empty(form_value_state.get(k)) else 'error' for k in form_label_output_list],
+            form_label_validate_info=[None if validate_data_not_empty(form_value_state.get(k)) else f'{form_label_state.get(k)}不能为空!' for k in form_label_output_list],
             modal_visible=dash.no_update,
             operations=dash.no_update,
             api_check_token_trigger=dash.no_update,

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

@@ -7,6 +7,7 @@
 import feffery_utils_components as fuc
 
 from server import app
+from utils.common import validate_data_not_empty
 from api.config import get_config_list_api, get_config_detail_api, add_config_api, edit_config_api, delete_config_api, export_config_list_api, refresh_config_api
 
 
@@ -297,7 +298,7 @@ def add_edit_config_modal(operation_click, button_click, selected_row_keys, clic
     ),
     prevent_initial_call=True
 )
-def dict_type_confirm(confirm_trigger, modal_type, edit_row_info, form_value, form_label):
+def config_confirm(confirm_trigger, modal_type, edit_row_info, form_value, form_label):
     """
     新增或编辑参数设置弹窗确认回调，实现新增或编辑操作
     """
@@ -307,7 +308,7 @@ def dict_type_confirm(confirm_trigger, modal_type, edit_row_info, form_value, fo
         # 获取所有输入表单项对应的value及label
         form_value_state = {x['id']['index']: x.get('value') for x in dash.ctx.states_list[-2]}
         form_label_state = {x['id']['index']: x.get('value') for x in dash.ctx.states_list[-1]}
-        if all([form_value_state.get(k) for k in form_label_output_list]):
+        if all(validate_data_not_empty(item) for item in [form_value_state.get(k) for k in form_label_output_list]):
             params_add = form_value_state
             params_edit = params_add.copy()
             params_edit['config_id'] = edit_row_info.get('config_id') if edit_row_info else None
@@ -347,8 +348,8 @@ def dict_type_confirm(confirm_trigger, modal_type, edit_row_info, form_value, fo
             )
 
         return dict(
-            form_label_validate_status=[None if form_value_state.get(k) else 'error' for k in form_label_output_list],
-            form_label_validate_info=[None if form_value_state.get(k) else f'{form_label_state.get(k)}不能为空!' for k in form_label_output_list],
+            form_label_validate_status=[None if validate_data_not_empty(form_value_state.get(k)) else 'error' for k in form_label_output_list],
+            form_label_validate_info=[None if validate_data_not_empty(form_value_state.get(k)) else f'{form_label_state.get(k)}不能为空!' for k in form_label_output_list],
             modal_visible=dash.no_update,
             operations=dash.no_update,
             api_check_token_trigger=dash.no_update,

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

@@ -6,6 +6,7 @@
 import feffery_utils_components as fuc
 
 from server import app
+from utils.common import validate_data_not_empty
 from utils.tree_tool import list_to_tree
 from api.dept import get_dept_tree_api, get_dept_list_api, add_dept_api, edit_dept_api, delete_dept_api, \
     get_dept_detail_api, get_dept_tree_for_edit_option_api
@@ -304,7 +305,7 @@ def dept_confirm(confirm_trigger, modal_type, edit_row_info, form_value, form_la
         # 获取所有输入表单项对应的value及label
         form_value_state = {x['id']['index']: x.get('value') for x in dash.ctx.states_list[-2]}
         form_label_state = {x['id']['index']: x.get('value') for x in dash.ctx.states_list[-1]}
-        if all([form_value_state.get(k) for k in form_label_output_list]):
+        if all(validate_data_not_empty(item) for item in [form_value_state.get(k) for k in form_label_output_list]):
             params_add = form_value_state
             params_edit = params_add.copy()
             params_edit['dept_id'] = edit_row_info.get('dept_id') if edit_row_info else None
@@ -344,8 +345,8 @@ def dept_confirm(confirm_trigger, modal_type, edit_row_info, form_value, form_la
             )
 
         return dict(
-            form_label_validate_status=[None if form_value_state.get(k) else 'error' for k in form_label_output_list],
-            form_label_validate_info=[None if form_value_state.get(k) else f'{form_label_state.get(k)}不能为空!' for k in form_label_output_list],
+            form_label_validate_status=[None if validate_data_not_empty(form_value_state.get(k)) else 'error' for k in form_label_output_list],
+            form_label_validate_info=[None if validate_data_not_empty(form_value_state.get(k)) else f'{form_label_state.get(k)}不能为空!' for k in form_label_output_list],
             modal_visible=dash.no_update,
             operations=dash.no_update,
             api_check_token_trigger=dash.no_update,

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

@@ -7,6 +7,7 @@
 import feffery_utils_components as fuc
 
 from server import app
+from utils.common import validate_data_not_empty
 from api.dict import get_dict_type_list_api, get_all_dict_type_api, get_dict_type_detail_api, add_dict_type_api, edit_dict_type_api, delete_dict_type_api, export_dict_type_list_api, refresh_dict_api
 
 
@@ -311,7 +312,7 @@ def dict_type_confirm(confirm_trigger, modal_type, edit_row_info, form_value, fo
         # 获取所有输入表单项对应的value及label
         form_value_state = {x['id']['index']: x.get('value') for x in dash.ctx.states_list[-2]}
         form_label_state = {x['id']['index']: x.get('value') for x in dash.ctx.states_list[-1]}
-        if all([form_value_state.get(k) for k in form_label_output_list]):
+        if all(validate_data_not_empty(item) for item in [form_value_state.get(k) for k in form_label_output_list]):
             params_add = form_value_state
             params_edit = params_add.copy()
             params_edit['dict_id'] = edit_row_info.get('dict_id') if edit_row_info else None
@@ -351,8 +352,8 @@ def dict_type_confirm(confirm_trigger, modal_type, edit_row_info, form_value, fo
             )
 
         return dict(
-            form_label_validate_status=[None if form_value_state.get(k) else 'error' for k in form_label_output_list],
-            form_label_validate_info=[None if form_value_state.get(k) else f'{form_label_state.get(k)}不能为空!' for k in form_label_output_list],
+            form_label_validate_status=[None if validate_data_not_empty(form_value_state.get(k)) else 'error' for k in form_label_output_list],
+            form_label_validate_info=[None if validate_data_not_empty(form_value_state.get(k)) else f'{form_label_state.get(k)}不能为空!' for k in form_label_output_list],
             modal_visible=dash.no_update,
             operations=dash.no_update,
             api_check_token_trigger=dash.no_update,

dash-fastapi-frontend/callbacks/system_c/dict_c/dict_data_c.py

@@ -7,6 +7,7 @@
 import feffery_utils_components as fuc
 
 from server import app
+from utils.common import validate_data_not_empty
 from api.dict import get_dict_data_list_api, get_dict_data_detail_api, add_dict_data_api, edit_dict_data_api, delete_dict_data_api, export_dict_data_list_api
 
 
@@ -306,7 +307,7 @@ def dict_data_confirm(confirm_trigger, modal_type, edit_row_info, form_value, fo
         # 获取所有输入表单项对应的value及label
         form_value_state = {x['id']['index']: x.get('value') for x in dash.ctx.states_list[-2]}
         form_label_state = {x['id']['index']: x.get('value') for x in dash.ctx.states_list[-1]}
-        if all([form_value_state.get(k) for k in form_label_output_list]):
+        if all(validate_data_not_empty(item) for item in [form_value_state.get(k) for k in form_label_output_list]):
             params_add = form_value_state
             params_edit = params_add.copy()
             params_edit['dict_code'] = edit_row_info.get('dict_code') if edit_row_info else None
@@ -346,8 +347,8 @@ def dict_data_confirm(confirm_trigger, modal_type, edit_row_info, form_value, fo
             )
 
         return dict(
-            form_label_validate_status=[None if form_value_state.get(k) else 'error' for k in form_label_output_list],
-            form_label_validate_info=[None if form_value_state.get(k) else f'{form_label_state.get(k)}不能为空!' for k in form_label_output_list],
+            form_label_validate_status=[None if validate_data_not_empty(form_value_state.get(k)) else 'error' for k in form_label_output_list],
+            form_label_validate_info=[None if validate_data_not_empty(form_value_state.get(k)) else f'{form_label_state.get(k)}不能为空!' for k in form_label_output_list],
             modal_visible=dash.no_update,
             operations=dash.no_update,
             api_check_token_trigger=dash.no_update,

dash-fastapi-frontend/callbacks/system_c/menu_c/components_c/button_type_c.py

@@ -5,6 +5,7 @@
 import feffery_utils_components as fuc
 
 from server import app
+from utils.common import validate_data_not_empty
 from api.menu import add_menu_api, edit_menu_api
 
 
@@ -43,7 +44,7 @@ def menu_confirm_button(confirm_trigger, modal_type, edit_row_info, parent_id, m
     菜单类型为按钮时新增或编辑弹窗确认回调，实现新增或编辑操作
     """
     if confirm_trigger:
-        if all([parent_id, menu_name, order_num]):
+        if all(validate_data_not_empty(item) for item in [parent_id, menu_name, order_num]):
             params_add = dict(parent_id=parent_id, menu_type=menu_type, icon=icon, menu_name=menu_name, order_num=order_num, perms=perms)
             params_edit = dict(menu_id=edit_row_info.get('menu_id') if edit_row_info else None, parent_id=parent_id, menu_type=menu_type, icon=icon,
                             menu_name=menu_name, order_num=order_num, perms=perms)
@@ -81,12 +82,12 @@ def menu_confirm_button(confirm_trigger, modal_type, edit_row_info, parent_id, m
 
         return dict(
             form_validate=[
-                None if parent_id else 'error',
-                None if menu_name else 'error',
-                None if order_num else 'error',
-                None if parent_id else '请选择上级菜单！',
-                None if menu_name else '请输入菜单名称！',
-                None if order_num else '请输入显示排序！'
+                None if validate_data_not_empty(parent_id) else 'error',
+                None if validate_data_not_empty(menu_name) else 'error',
+                None if validate_data_not_empty(order_num) else 'error',
+                None if validate_data_not_empty(parent_id) else '请选择上级菜单！',
+                None if validate_data_not_empty(menu_name) else '请输入菜单名称！',
+                None if validate_data_not_empty(order_num) else '请输入显示排序！'
             ],
             modal_visible=dash.no_update,
             operations=dash.no_update,

dash-fastapi-frontend/callbacks/system_c/menu_c/components_c/content_type_c.py

@@ -5,6 +5,7 @@
 import feffery_utils_components as fuc
 
 from server import app
+from utils.common import validate_data_not_empty
 from api.menu import add_menu_api, edit_menu_api
 
 
@@ -48,7 +49,7 @@ def menu_confirm_content(confirm_trigger, modal_type, edit_row_info, parent_id,
     菜单类型为目录时新增或编辑弹窗确认回调，实现新增或编辑操作
     """
     if confirm_trigger:
-        if all([parent_id, menu_name, order_num, path]):
+        if all(validate_data_not_empty(item) for item in [parent_id, menu_name, order_num, path]):
             params_add = dict(parent_id=parent_id, menu_type=menu_type, icon=icon, menu_name=menu_name, order_num=order_num,
                             is_frame=is_frame, path=path, visible=visible, status=status)
             params_edit = dict(menu_id=edit_row_info.get('menu_id') if edit_row_info else None, parent_id=parent_id, menu_type=menu_type, icon=icon,
@@ -87,14 +88,14 @@ def menu_confirm_content(confirm_trigger, modal_type, edit_row_info, parent_id,
 
         return dict(
             form_validate=[
-                None if parent_id else 'error',
-                None if menu_name else 'error',
-                None if order_num else 'error',
-                None if path else 'error',
-                None if parent_id else '请选择上级菜单！',
-                None if menu_name else '请输入菜单名称！',
-                None if order_num else '请输入显示排序！',
-                None if path else '请输入路由地址！',
+                None if validate_data_not_empty(parent_id) else 'error',
+                None if validate_data_not_empty(menu_name) else 'error',
+                None if validate_data_not_empty(order_num) else 'error',
+                None if validate_data_not_empty(path) else 'error',
+                None if validate_data_not_empty(parent_id) else '请选择上级菜单！',
+                None if validate_data_not_empty(menu_name) else '请输入菜单名称！',
+                None if validate_data_not_empty(order_num) else '请输入显示排序！',
+                None if validate_data_not_empty(path) else '请输入路由地址！',
             ],
             modal_visible=dash.no_update,
             operations=dash.no_update,