From 055fb152259bfe3a87fe4b7f8cce6406207c17fd Mon Sep 17 00:00:00 2001 From: xueyinfei <1207092115@qq.com> Date: Mon, 17 Nov 2025 20:46:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/batch_label_config_dao.py | 28 ++++++++++---- .../views/metadataConfig/metaclas/index.vue | 37 +++++++++++++++++-- .../views/metadataConfig/relconf/index.vue | 22 +++++++++++ 3 files changed, 77 insertions(+), 10 deletions(-) diff --git a/vue-fastapi-backend/module_admin/dao/batch_label_config_dao.py b/vue-fastapi-backend/module_admin/dao/batch_label_config_dao.py index 1d95dc1..9f8515c 100644 --- a/vue-fastapi-backend/module_admin/dao/batch_label_config_dao.py +++ b/vue-fastapi-backend/module_admin/dao/batch_label_config_dao.py @@ -19,7 +19,11 @@ class BatchLabelConfigDAO: async def get_busi_list(cls, db: AsyncSession, query_object, is_page: bool = False): query = select(BatchBusiLabelConfig).where( BatchBusiLabelConfig.mdl_name == query_object.mdl_name if query_object.mdl_name else True, - BatchBusiLabelConfig.ssys_id == query_object.ssys_id if query_object.ssys_id else True, + BatchBusiLabelConfig.ssys_id.is_(None) if query_object.ssys_id and query_object.ssys_id == -1 else + BatchBusiLabelConfig.ssys_id == query_object.ssys_id if query_object.ssys_id + and query_object.ssys_id != -1 + else True, + ).order_by(BatchBusiLabelConfig.upd_time.desc()) return await PageUtil.paginate(db, query, query_object.page_num, query_object.page_size, is_page) @@ -28,7 +32,9 @@ class BatchLabelConfigDAO: async def get_col_optype_list(cls, db: AsyncSession, query_object, is_page: bool = False): query = select(BatchDataopLabelConfig).where( BatchDataopLabelConfig.mdl_name.like(f'%{query_object.mdl_name}%') if query_object.mdl_name else True, - BatchDataopLabelConfig.ssys_id == query_object.ssys_id if query_object.ssys_id else True, + BatchDataopLabelConfig.ssys_id.is_(None) if query_object.ssys_id and query_object.ssys_id == -1 else + BatchDataopLabelConfig.ssys_id == query_object.ssys_id if query_object.ssys_id and query_object.ssys_id != -1 + else True, ).order_by(BatchDataopLabelConfig.upd_time.desc()) return await PageUtil.paginate(db, query, query_object.page_num, query_object.page_size, is_page) @@ -99,7 +105,9 @@ class BatchLabelConfigDAO: async def get_datatype_list(cls, db: AsyncSession, query_object, is_page: bool = False): query = select(BatchDatatypeLabelConfig).where( BatchDatatypeLabelConfig.mdl_name == query_object.mdl_name if query_object.mdl_name else True, - BatchDatatypeLabelConfig.ssys_id == query_object.ssys_id if query_object.ssys_id else True, + BatchDatatypeLabelConfig.ssys_id.is_(None) if query_object.ssys_id and query_object.ssys_id == -1 else + BatchDatatypeLabelConfig.ssys_id == query_object.ssys_id if query_object.ssys_id and query_object.ssys_id != -1 + else True, ).order_by(BatchDatatypeLabelConfig.upd_time.desc()) return await PageUtil.paginate(db, query, query_object.page_num, query_object.page_size, is_page) @@ -107,10 +115,16 @@ class BatchLabelConfigDAO: @classmethod async def get_table_rel_list(cls, db: AsyncSession, query_object, is_page: bool = False): query = select(BatchTableRelaLabelConfig).where( - BatchTableRelaLabelConfig.a_mdl_name.like(f'%{query_object.a_mdl_name}%') if query_object.a_mdl_name else True, - BatchTableRelaLabelConfig.b_mdl_name.like(f'%{query_object.b_mdl_name}%') if query_object.b_mdl_name else True, - BatchTableRelaLabelConfig.a_ssys_id == query_object.a_ssys_id if query_object.a_ssys_id else True, - BatchTableRelaLabelConfig.a_ssys_id == query_object.a_ssys_id if query_object.a_ssys_id else True, + BatchTableRelaLabelConfig.a_mdl_name.like( + f'%{query_object.a_mdl_name}%') if query_object.a_mdl_name else True, + BatchTableRelaLabelConfig.b_mdl_name.like( + f'%{query_object.b_mdl_name}%') if query_object.b_mdl_name else True, + BatchTableRelaLabelConfig.a_ssys_id.is_(None) if query_object.a_ssys_id and query_object.a_ssys_id == -1 else + BatchTableRelaLabelConfig.a_ssys_id == query_object.a_ssys_id if query_object.a_ssys_id and query_object.a_ssys_id != -1 + else True, + BatchTableRelaLabelConfig.b_ssys_id.is_(None) if query_object.b_ssys_id and query_object.b_ssys_id == -1 else + BatchTableRelaLabelConfig.b_ssys_id == query_object.b_ssys_id if query_object.b_ssys_id and query_object.b_ssys_id != -1 + else True, ).order_by(BatchTableRelaLabelConfig.upd_time.desc()) return await PageUtil.paginate(db, query, query_object.page_num, query_object.page_size, is_page) diff --git a/vue-fastapi-frontend/src/views/metadataConfig/metaclas/index.vue b/vue-fastapi-frontend/src/views/metadataConfig/metaclas/index.vue index da0034f..598796c 100644 --- a/vue-fastapi-frontend/src/views/metadataConfig/metaclas/index.vue +++ b/vue-fastapi-frontend/src/views/metadataConfig/metaclas/index.vue @@ -4,6 +4,7 @@ + @@ -102,6 +103,7 @@ + @@ -132,6 +134,7 @@ + @@ -165,6 +168,7 @@ + @@ -390,13 +394,22 @@ function openEditDialog1(row) { } title.value = "编辑值类型参数"; Object.assign(form1.value, row); + if(row.ssysId === null){ + form1.value.ssysId = -1 + } open1.value = true; } function submitForm1() { clasFormRef1.value.validate(async (valid) => { if (!valid) return; - const submitData = { ...form1.value}; + let submitData = { ...form1.value}; + if (form1.value.ssysId === -1){ + submitData.ssysId = null + } + if(form1.value.mdlName === null || form1.value.mdlName === ''){ + submitData.mdlName = '*' + } try { if (title.value.includes("新增")) { await addDatatypeLabel(submitData); @@ -471,6 +484,9 @@ function openEditDialog2(row) { } title.value = "编辑业务类型参数"; Object.assign(form2.value, row); + if(row.ssysId === null){ + form2.value.ssysId = -1 + } open2.value = true; } @@ -481,13 +497,22 @@ function openEditDialog3(row) { } title.value = "编辑字段处理类型参数"; Object.assign(form3.value, row); + if(row.ssysId === null){ + form3.value.ssysId = -1 + } open3.value = true; } function submitForm2() { clasFormRef2.value.validate(async (valid) => { if (!valid) return; - const submitData = { ...form2.value,ssysId:queryForm.ssysId,mdlName:queryForm.mdlName}; + let submitData = { ...form2.value}; + if (form2.value.ssysId === -1){ + submitData.ssysId = null + } + if(form2.value.mdlName === null || form2.value.mdlName === ''){ + submitData.mdlName = '*' + } try { if (title.value.includes("新增")) { await addBusiLabel(submitData); @@ -506,7 +531,13 @@ function submitForm2() { function submitForm3() { clasFormRef3.value.validate(async (valid) => { if (!valid) return; - const submitData = { ...form3.value}; + let submitData = { ...form3.value}; + if (form3.value.ssysId === -1){ + submitData.ssysId = null + } + if(form2.value.mdlName === null || form2.value.mdlName === ''){ + submitData.mdlName = '*' + } try { if (title.value.includes("新增")) { await addDataopLabel(submitData); diff --git a/vue-fastapi-frontend/src/views/metadataConfig/relconf/index.vue b/vue-fastapi-frontend/src/views/metadataConfig/relconf/index.vue index fa4bb06..10c7d21 100644 --- a/vue-fastapi-frontend/src/views/metadataConfig/relconf/index.vue +++ b/vue-fastapi-frontend/src/views/metadataConfig/relconf/index.vue @@ -5,6 +5,7 @@ + @@ -15,6 +16,7 @@ + @@ -65,6 +67,7 @@ + @@ -73,6 +76,7 @@ + @@ -213,6 +217,12 @@ function openEditDialog1(row) { } title.value = "编辑表关系类型参数"; Object.assign(form1.value, row); + if (form1.value.aSsysId === null){ + form1.value.aSsysId = -1 + } + if (form1.value.bSsysId === null){ + form1.value.bSsysId = -1 + } open1.value = true; } @@ -220,6 +230,18 @@ function submitForm1() { clasFormRef1.value.validate(async (valid) => { if (!valid) return; const submitData = { ...form1.value}; + if (form1.value.aSsysId === -1){ + submitData.aSsysId = null + } + if(form1.value.aMdlName === null || form1.value.aMdlName === ''){ + submitData.aMdlName = '*' + } + if (form1.value.bSsysId === -1){ + submitData.bSsysId = null + } + if(form1.value.bMdlName === null || form1.value.bMdlName === ''){ + submitData.bMdlName = '*' + } try { if (title.value.includes("新增")) { await addTableRelaLabel(submitData);