developers
/
vue-fastapi-admin
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

字段类型配置优化

master^2
xueyinfei 4 days ago
parent
b01dc986ce
commit
055fb15225
3 changed files with 77 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 28
      vue-fastapi-backend/module_admin/dao/batch_label_config_dao.py
  2. 37
      vue-fastapi-frontend/src/views/metadataConfig/metaclas/index.vue
  3. 22
      vue-fastapi-frontend/src/views/metadataConfig/relconf/index.vue

28
vue-fastapi-backend/module_admin/dao/batch_label_config_dao.py
View File

@ -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)

37
vue-fastapi-frontend/src/views/metadataConfig/metaclas/index.vue
View File

@ -4,6 +4,7 @@
<el-form :inline="true" :model="queryForm">
<el-form-item label="归属系统">
<el-select v-model="queryForm.ssysId" placeholder="请选择系统" clearable filterable style="width: 180px">
<el-option label="*" :value="-1"></el-option>
<el-option v-for="item in dsSysList" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
@ -102,6 +103,7 @@
</el-form-item>
<el-form-item label="所属系统" prop="ssysId">
<el-select v-model="form1.ssysId" placeholder="请选择系统" clearable filterable style="width: 350px">
<el-option label="*" :value="-1"></el-option>
<el-option v-for="item in dsSysList" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
@ -132,6 +134,7 @@
</el-form-item>
<el-form-item label="所属系统" prop="ssysId">
<el-select v-model="form2.ssysId" placeholder="请选择系统" clearable filterable style="width: 350px">
<el-option label="*" :value="-1"></el-option>
<el-option v-for="item in dsSysList" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
@ -165,6 +168,7 @@
</el-form-item>
<el-form-item label="所属系统" prop="ssysId">
<el-select v-model="form3.ssysId" placeholder="请选择系统" clearable filterable style="width: 350px">
<el-option label="*" :value="-1"></el-option>
<el-option v-for="item in dsSysList" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
@ -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);

22
vue-fastapi-frontend/src/views/metadataConfig/relconf/index.vue
View File

@ -5,6 +5,7 @@
<el-row>
<el-form-item label="归属系统A">
<el-select v-model="queryForm.aSsysId" placeholder="请选择系统" clearable filterable style="width: 180px">
<el-option label="*" :value="-1"></el-option>
<el-option v-for="item in dsSysList" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
@ -15,6 +16,7 @@
<el-row>
<el-form-item label="归属系统B">
<el-select v-model="queryForm.bSsysId" placeholder="请选择系统" clearable filterable style="width: 180px">
<el-option label="*" :value="-1"></el-option>
<el-option v-for="item in dsSysList" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
@ -65,6 +67,7 @@
</el-form-item>
<el-form-item label="所属系统A" prop="ssysId">
<el-select v-model="form1.aSsysId" placeholder="请选择系统" clearable filterable style="width: 350px">
<el-option label="*" :value="-1"></el-option>
<el-option v-for="item in dsSysList" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
@ -73,6 +76,7 @@
</el-form-item>
<el-form-item label="所属系统B" prop="ssysId">
<el-select v-model="form1.bSsysId" placeholder="请选择系统" clearable filterable style="width: 350px">
<el-option label="*" :value="-1"></el-option>
<el-option v-for="item in dsSysList" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
@ -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);

Write Preview
Loading…
Cancel
Save