Browse Source

修复元数据信息页面bug

master
xueyinfei 4 weeks ago
parent
commit
4bf6f6442a
  1. 2
      vue-fastapi-backend/module_admin/dao/meta_dao.py
  2. 6
      vue-fastapi-backend/module_admin/entity/do/meta_do.py
  3. 16
      vue-fastapi-backend/module_admin/service/meta_service.py
  4. 2
      vue-fastapi-frontend/src/views/meta/metaInfo/businssRelation.vue
  5. 73
      vue-fastapi-frontend/src/views/meta/metaInfo/index.vue
  6. 2
      vue-fastapi-frontend/src/views/metadataConfig/metaclas/index.vue
  7. 4
      vue-fastapi-frontend/src/views/metadataConfig/relconf/index.vue
  8. 16
      vue-fastapi-frontend/src/views/system/flow/index.vue

2
vue-fastapi-backend/module_admin/dao/meta_dao.py

@ -126,7 +126,7 @@ class MetaDao:
MetadataExtractInfo.tab_eng_name == MetadataFldSuppInfo.tab_eng_name
), isouter=True)
.where(
MetadataExtractInfo.ssys_id == query_object.ssys_id if query_object.ssys_id else True,
MetadataExtractInfo.ssys_id == query_object.ssys_id if query_object.ssys_id and query_object.ssys_id != -1 else True,
MetadataExtractInfo.mdl_name == query_object.mdl_name if query_object.mdl_name else True,
or_(MetadataExtractInfo.tab_eng_name.like(f'%{query_object.tab_name}%'),
MetadataExtractInfo.tab_cn_name.like(f'%{query_object.tab_name}%'),

6
vue-fastapi-backend/module_admin/entity/do/meta_do.py

@ -107,9 +107,9 @@ class MetadataFldTabExtractInfo(Base):
fld_eng_name = Column(String(255, collation='utf8_general_ci'), comment='字段英文名称')
fld_cn_name = Column(String(255, collation='utf8_general_ci'), comment='字段中文名称')
fld_type = Column(String(50, collation='utf8_general_ci'), comment='字段类型')
pk_flag = Column(Boolean, default=False, comment='是否为主键') # 待确认字段类型
require_flag = Column(Boolean, default=False, comment='是否必填')
idx_flag = Column(Boolean, default=False, comment='是否为索引')
pk_flag = Column(String(50, collation='utf8_general_ci'), comment='是否为主键') # 待确认字段类型
require_flag = Column(String(50, collation='utf8_general_ci'), comment='是否必填')
idx_flag = Column(String(50, collation='utf8_general_ci'), comment='是否为索引')
upd_time = Column(DateTime, comment='更新时间')

16
vue-fastapi-backend/module_admin/service/meta_service.py

@ -578,7 +578,7 @@ class MetaService:
'对象英文名': 'tab_eng_name',
'补录对象名称': 'tab_crrct_name',
'补录对象描述': 'tab_desc',
'负责人': 'rec_subm_prsn'
'负责人': 'pic'
}
column_header_dict = {
'系统代码': 'ssys_cd',
@ -664,7 +664,7 @@ class MetaService:
if overWrite:
suppTableInfo.tab_crrct_name = row['tab_crrct_name']
suppTableInfo.tab_desc = row['tab_desc']
suppTableInfo.rec_subm_prsn = row['rec_subm_prsn']
suppTableInfo.rec_subm_prsn = row['pic']
else:
suppTableInfo.tab_crrct_name = row['tab_crrct_name'] if row['tab_crrct_name'] and \
str(row[
@ -672,10 +672,10 @@ class MetaService:
suppTableInfo.tab_desc = row['tab_desc'] if row['tab_desc'] and \
str(row[
'tab_desc']).strip() != '' else oldTable.tab_desc if oldTable else None
suppTableInfo.rec_subm_prsn = row['rec_subm_prsn'] if row['rec_subm_prsn'] and \
str(row[
'rec_subm_prsn']).strip() != '' else oldTable.rec_subm_prsn if oldTable else None
suppTableInfo.pic = oldTable.pic if oldTable else None
suppTableInfo.rec_subm_prsn = row['pic'] if row['pic'] and \
str(row[
'pic']).strip() != '' else oldTable.pic if oldTable else None
suppTableInfo.rec_subm_prsn = current_user.user.user_name
suppTableInfo.gov_flag = oldTable.gov_flag if oldTable else None
suppTableInfo.tab_clas = oldTable.tab_clas if oldTable else None
suppTableInfo.apply_time = applyTime
@ -748,8 +748,8 @@ class MetaService:
suppColumnInfo.fld_eng_name = row['fld_eng_name']
if overWrite:
suppColumnInfo.fld_crrct_name = row['fld_crrct_name']
suppColumnInfo.crrct_pk_flag = True if row['crrct_pk_flag'] and row[
'crrct_pk_flag'] == '' else False
suppColumnInfo.crrct_pk_flag = 'Y' if row['crrct_pk_flag'] and row[
'crrct_pk_flag'] == '' else 'N'
suppColumnInfo.fld_desc = row['fld_desc']
suppColumnInfo.data_sec_lvl = row['data_sec_lvl']
suppColumnInfo.data_dict_id = dataDictId if dataDictId != '' else None

2
vue-fastapi-frontend/src/views/meta/metaInfo/businssRelation.vue

@ -317,7 +317,7 @@ function initG6() {
let currentTableLabel = props.currentTable.tabEngName
if (props.currentTable.tabCnName && props.currentTable.tabCnName.length>0){
currentTableLabel += "("+props.currentTable.tabCnName+")"
}else if (props.currentTable.tabCrrctName && props.currentTable.tabCnName.tabCrrctName>0){
}else if (props.currentTable.tabCrrctName && props.currentTable.tabCrrctName.length>0){
currentTableLabel += "("+props.currentTable.tabCrrctName+")"
}
const list = attrs;

73
vue-fastapi-frontend/src/views/meta/metaInfo/index.vue

@ -27,7 +27,7 @@
</el-col>
<el-col :span="20" :xs="24">
<el-form :model="queryParams" :inline="true" label-width="75px">
<el-form-item label="对象名称:" prop="userName">
<el-form-item label="对象名称:">
<el-input
v-model="queryParams.tabName"
placeholder="请输入搜索表中文/英文名"
@ -36,6 +36,15 @@
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="模式名称:">
<el-input
v-model="queryParams.mdlName"
placeholder="请输入搜索模式名称"
clearable
style="width: 240px"
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="列名称:">
<el-input
v-model="queryParams.colName"
@ -227,7 +236,7 @@
<el-form-item label="对象负责人">
<el-input
v-model="currentMetaData.pic"
placeholder="请输入搜索状态"
placeholder="请输入负责人"
clearable
/>
</el-form-item>
@ -261,20 +270,20 @@
<el-table-column label="字段类型" width="170" align="center" prop="fldType" ></el-table-column>
<el-table-column label="主键标志" width="100" align="center" prop="pkFlag">
<template #default="scope">
<span v-if="scope.row.pkFlag === '1' || scope.row.pkFlag === 'Y' || scope.row.pkFlag === true"></span>
<span v-if="scope.row.pkFlag === 'Y'"></span>
<span v-else></span>
</template>
</el-table-column>
<!-- <el-table-column label="字段描述" width="250" align="center" prop="fldDesc"></el-table-column>-->
<el-table-column label="是否必填" width="70" align="center" prop="requireFlag">
<template #default="scope">
<span v-if="scope.row.requireFlag === '1' || scope.row.requireFlag === 'Y' || scope.row.requireFlag === true"></span>
<span v-if="scope.row.requireFlag === 'Y'"></span>
<span v-else></span>
</template>
</el-table-column>
<el-table-column label="是否索引" width="150" align="center" prop="idxFlag">
<template #default="scope">
<span v-if="scope.row.idxFlag === '1' || scope.row.idxFlag === 'Y' || scope.row.idxFlag === true"></span>
<span v-if="scope.row.idxFlag === 'Y'"></span>
<span v-else></span>
</template>
</el-table-column>
@ -285,7 +294,8 @@
</el-table-column>
<el-table-column label="补录主键" align="center" prop="crrctPkFlag">
<template #default="scope">
<span>{{scope.row.crrctPkFlag}}</span>
<span v-if="scope.row.crrctPkFlag"></span>
<span v-else></span>
</template>
</el-table-column>
<el-table-column label="补录字段描述" align="center" prop="fldDesc">
@ -298,11 +308,11 @@
<!-- <span>{{scope.row.suppRecStat}}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="负责人" align="center" prop="pic">
<template #default="scope">
<span>{{scope.row.pic}}</span>
</template>
</el-table-column>
<!-- <el-table-column label="负责人" align="center" prop="pic">-->
<!-- <template #default="scope">-->
<!-- <span>{{scope.row.pic}}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="字段标签" width="150" align="center" prop="fldClas">
<template #default="scope">
<el-popover v-for="item in scope.row.tempFldClas" placement="right" width="auto" trigger="hover">
@ -471,7 +481,7 @@
<el-input disabled v-model="currentColumnData.fldType"></el-input>
</el-form-item>
<el-form-item label="主键标志">
<template v-if="currentColumnData.pkFlag === '1' || currentColumnData.pkFlag === 'Y' || currentColumnData.pkFlag === true">
<template v-if="currentColumnData.pkFlag === 'Y'">
<el-input disabled :model-value="'是'"></el-input>
</template>
<template v-else>
@ -479,7 +489,7 @@
</template>
</el-form-item>
<el-form-item label="是否必填">
<template v-if="currentColumnData.requireFlag === '1' || currentColumnData.requireFlag === 'Y' || currentColumnData.requireFlag === true">
<template v-if="currentColumnData.requireFlag === 'Y'">
<el-input disabled :model-value="'是'"></el-input>
</template>
<template v-else>
@ -487,7 +497,7 @@
</template>
</el-form-item>
<el-form-item label="是否索引">
<template v-if="currentColumnData.idxFlag === '1' || currentColumnData.idxFlag === 'Y' || currentColumnData.idxFlag === true">
<template v-if="currentColumnData.idxFlag === 'Y'">
<el-input disabled :model-value="'是'"></el-input>
</template>
<template v-else>
@ -508,9 +518,9 @@
<!-- <el-form-item label="状态">-->
<!-- <el-input v-model="currentColumnData.suppRecStat"/>-->
<!-- </el-form-item>-->
<el-form-item label="负责人">
<el-input v-model="currentColumnData.pic"/>
</el-form-item>
<!-- <el-form-item label="负责人">-->
<!-- <el-input v-model="currentColumnData.pic"/>-->
<!-- </el-form-item>-->
<el-form-item label="字段空值率">
<el-input v-model="currentColumnData.fldNullRate"/>
</el-form-item>
@ -772,13 +782,28 @@
</template>
</el-upload>
<el-form>
<el-form-item label="开启覆盖">
<el-form-item>
<template #label>
开启覆盖
<el-tooltip
class="box-item"
effect="dark"
placement="right"
>
<template #content>
<div>打开开启覆盖则原补录信息会被模板中未填信息覆盖为空值<br>
关闭开启覆盖则模板中留空数据不会影响原补录信息
</div>
</template>
<el-link :underline="false" type="primary"><i class="ri-question-line"></i></el-link>
</el-tooltip>
</template>
<el-switch v-model="upload.overWrite"></el-switch>
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="submitFileForm"> </el-button>
<el-button type="primary" :disabled="upload.isUploading" @click="submitFileForm"> </el-button>
<el-button @click="upload.open = false"> </el-button>
</div>
</template>
@ -1037,10 +1062,10 @@
// if (columnList.value[i].suppRecStat !== currentColumnData.value.suppRecStat){
// columnList.value[i].suppRecStat = currentColumnData.value.suppRecStat
// }
if (columnList.value[i].pic !== currentColumnData.value.pic){
columnList.value[i].pic = currentColumnData.value.pic
changed = true
}
// if (columnList.value[i].pic !== currentColumnData.value.pic){
// columnList.value[i].pic = currentColumnData.value.pic
// changed = true
// }
if (columnList.value[i].fldNullRate !== currentColumnData.value.fldNullRate){
columnList.value[i].fldNullRate = currentColumnData.value.fldNullRate
changed = true
@ -1395,7 +1420,7 @@
password:cache.local.get("password")
}
getDataSourceList(query).then(res=>{
databaseList.value = [{ id: 100, name: "数据源", parentId: 0, children: res.data.totalList.map(element => ({ ...element, parentId: "100" })) }]
databaseList.value = [{ id: -1, name: "数据源", parentId: 0, children: res.data.totalList.map(element => ({ ...element, parentId: -1 })) }]
})
}
function handleQuery(){

2
vue-fastapi-frontend/src/views/metadataConfig/metaclas/index.vue

@ -3,7 +3,7 @@
<el-row :gutter="10" class="mb8">
<el-form :inline="true" :model="queryForm">
<el-form-item label="归属系统">
<el-select v-model="queryForm.ssysId" placeholder="请选择系统" clearable allow-create filterable style="width: 180px">
<el-select v-model="queryForm.ssysId" placeholder="请选择系统" clearable filterable style="width: 180px">
<el-option v-for="item in dsSysList" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>

4
vue-fastapi-frontend/src/views/metadataConfig/relconf/index.vue

@ -4,7 +4,7 @@
<el-form :inline="true" :model="queryForm">
<el-row>
<el-form-item label="归属系统A">
<el-select v-model="queryForm.aSsysId" placeholder="请选择系统" clearable allow-create filterable style="width: 180px">
<el-select v-model="queryForm.aSsysId" placeholder="请选择系统" clearable filterable style="width: 180px">
<el-option v-for="item in dsSysList" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
@ -14,7 +14,7 @@
</el-row>
<el-row>
<el-form-item label="归属系统B">
<el-select v-model="queryForm.bSsysId" placeholder="请选择系统" clearable allow-create filterable style="width: 180px">
<el-select v-model="queryForm.bSsysId" placeholder="请选择系统" clearable filterable style="width: 180px">
<el-option v-for="item in dsSysList" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>

16
vue-fastapi-frontend/src/views/system/flow/index.vue

@ -281,20 +281,20 @@
<el-table-column label="字段类型" width="170" align="center" prop="fldType" ></el-table-column>
<el-table-column label="主键标志" width="100" align="center" prop="pkFlag">
<template #default="scope">
<span v-if="scope.row.pkFlag === '1' || scope.row.pkFlag === 'Y' || scope.row.pkFlag === true"></span>
<span v-if="scope.row.pkFlag && scope.row.pkFlag === 'Y'"></span>
<span v-else></span>
</template>
</el-table-column>
<!-- <el-table-column label="字段描述" width="250" align="center" prop="fldDesc"></el-table-column>-->
<el-table-column label="是否必填" width="70" align="center" prop="requireFlag">
<template #default="scope">
<span v-if="scope.row.requireFlag === '1' || scope.row.requireFlag === 'Y' || scope.row.requireFlag === true"></span>
<span v-if="scope.row.requireFlag && scope.row.requireFlag === 'Y'"></span>
<span v-else></span>
</template>
</el-table-column>
<el-table-column label="是否索引" width="150" align="center" prop="idxFlag">
<template #default="scope">
<span v-if="scope.row.idxFlag === '1' || scope.row.idxFlag === 'Y' || scope.row.idxFlag === true"></span>
<span v-if="scope.row.idxFlag && scope.row.idxFlag === 'Y'"></span>
<span v-else></span>
</template>
</el-table-column>
@ -467,20 +467,20 @@
<el-table-column label="字段类型" width="170" align="center" prop="fldType" ></el-table-column>
<el-table-column label="主键标志" width="100" align="center" prop="pkFlag">
<template #default="scope">
<span v-if="scope.row.pkFlag === '1' || scope.row.pkFlag === 'Y' || scope.row.pkFlag === true"></span>
<span v-if="scope.row.pkFlag && scope.row.pkFlag === 'Y'"></span>
<span v-else></span>
</template>
</el-table-column>
<!-- <el-table-column label="字段描述" width="250" align="center" prop="fldDesc"></el-table-column>-->
<el-table-column label="是否必填" width="70" align="center" prop="requireFlag">
<template #default="scope">
<span v-if="scope.row.requireFlag === '1' || scope.row.requireFlag === 'Y' || scope.row.requireFlag === true"></span>
<span v-if="scope.row.requireFlag && scope.row.requireFlag === 'Y'"></span>
<span v-else></span>
</template>
</el-table-column>
<el-table-column label="是否索引" width="150" align="center" prop="idxFlag">
<template #default="scope">
<span v-if="scope.row.idxFlag === '1' || scope.row.idxFlag === 'Y' || scope.row.idxFlag === true"></span>
<span v-if="scope.row.idxFlag&&scope.row.idxFlag === 'Y'"></span>
<span v-else></span>
</template>
</el-table-column>
@ -558,7 +558,7 @@
<el-table-column prop="fldDesc" label="补录字段描述" align="center" />
<el-table-column prop="dataDictName" label="引用字典/标准" align="center" />
<el-table-column prop="dataSecLvl" label="安全等级" align="center" />
<el-table-column prop="recSubmPrsn" label="负责人" align="center" />
<!-- <el-table-column prop="recSubmPrsn" label="负责人" align="center" />-->
</el-table>
</template>
</el-table-column>
@ -578,7 +578,7 @@
<!-- <el-table-column prop="tabRecNum" label="记录数" align="center" />-->
<!-- <el-table-column prop="tabType" label="对象类型" align="center" />-->
<el-table-column prop="govFlag" label="对象治理标志" align="center" />
<el-table-column prop="recSubmPrsn" label="负责人" align="center" />
<el-table-column prop="pic" label="负责人" align="center" />
<el-table-column prop="pic" label="对象标签" align="center" >
<template #default="scope">
<template v-if="scope.row.showTabClas && scope.row.showTabClas.length > 0">

Loading…
Cancel
Save