Browse Source

代码提交

master
si@aidatagov.com 4 weeks ago
parent
commit
c31f837d26
  1. 1
      vue-fastapi-backend/module_admin/dao/metadata_config_dao.py
  2. 2
      vue-fastapi-backend/module_admin/service/metasecurity_service.py
  3. 4
      vue-fastapi-frontend/src/views/dataAsset/assetDetail/index.vue
  4. 3
      vue-fastapi-frontend/src/views/meta/metatask/index.vue
  5. 8
      vue-fastapi-frontend/src/views/metadataConfig/taskBizConfig/index.vue
  6. 14
      vue-fastapi-frontend/src/views/system/flow/dataStdDictAppr.vue

1
vue-fastapi-backend/module_admin/dao/metadata_config_dao.py

@ -401,6 +401,7 @@ class MetadataConfigDao:
async def get_task_biz_config_list(cls, db: AsyncSession, query_object, is_page: bool = False): async def get_task_biz_config_list(cls, db: AsyncSession, query_object, is_page: bool = False):
query = select(TaskBizConfig).where( query = select(TaskBizConfig).where(
TaskBizConfig.risk_lvl.like(f"%{query_object.risk_lvl}%") if query_object.risk_lvl else True, TaskBizConfig.risk_lvl.like(f"%{query_object.risk_lvl}%") if query_object.risk_lvl else True,
TaskBizConfig.biz_name.like(f"%{query_object.biz_name}%") if query_object.biz_name else True,
TaskBizConfig.isStop == query_object.isStop if query_object.isStop is not None else True, TaskBizConfig.isStop == query_object.isStop if query_object.isStop is not None else True,
TaskBizConfig.create_time.between( TaskBizConfig.create_time.between(
datetime.combine(datetime.strptime(query_object.begin_time, '%Y-%m-%d'), time.min), datetime.combine(datetime.strptime(query_object.begin_time, '%Y-%m-%d'), time.min),

2
vue-fastapi-backend/module_admin/service/metasecurity_service.py

@ -634,7 +634,7 @@ async def generate_sql(tablesRowCol: dict, table_columns: dict):
if not cfg.get("isHave", False) if not cfg.get("isHave", False)
] ]
if no_config_tables: if no_config_tables:
raise ValueError(f"表:{','.join(no_config_tables)} 均未配置行列数据安全") raise ValueError(f"您没有查看{','.join(no_config_tables)} 表记录的权限,请联系管理员配置相关行/列 数据安全策略")
# ========= 1. 遍历每个表 ========= # ========= 1. 遍历每个表 =========
for table_name, config in tablesRowCol.items(): for table_name, config in tablesRowCol.items():

4
vue-fastapi-frontend/src/views/dataAsset/assetDetail/index.vue

@ -185,7 +185,7 @@
<el-form-item label="数据资产来源" prop="dataAstSrc"> <el-form-item label="数据资产来源" prop="dataAstSrc">
<el-tree-select v-model="form.dataAstSrc" :data="treeDataChildren" <el-tree-select v-model="form.dataAstSrc" :data="treeDataChildren"
:props="{ value: 'id', label: 'name', children: 'children' }" value-key="id" placeholder="请选择" :props="{ value: 'name', label: 'name', children: 'children' }" value-key="id" placeholder="请选择"
check-strictly /> check-strictly />
</el-form-item> </el-form-item>
@ -617,7 +617,7 @@ function submitForm() {
"dataAstClas": JSON.stringify(astTags.value)?JSON.stringify(astTags.value):"", "dataAstClas": JSON.stringify(astTags.value)?JSON.stringify(astTags.value):"",
"dataAstCont": form.value.dataAstCont?form.value.dataAstCont:"", "dataAstCont": form.value.dataAstCont?form.value.dataAstCont:"",
"dataAstFaq": form.value.dataAstFaq?form.value.dataAstFaq:"", "dataAstFaq": form.value.dataAstFaq?form.value.dataAstFaq:"",
"dataAstSrc": form.value.dataAstSrc, "dataAstSrc": getIdByName(form.value.dataAstSrc),
"versionNo": form.value.versionNo, "versionNo": form.value.versionNo,
"ctrlFlag": form.value.ctrlFlag, "ctrlFlag": form.value.ctrlFlag,
} }

3
vue-fastapi-frontend/src/views/meta/metatask/index.vue

@ -779,8 +779,7 @@ const resetQuery = () => {
proxy.resetForm("queryForm"); proxy.resetForm("queryForm");
queryParams.value.dbRCode = clickNode.value?.id; queryParams.value.dbRCode = clickNode.value?.id;
proxy.tree.setCurrentKey(null); handleQuery();
handleQuery();
}; };
const handleSelectionChange = (selection) => { const handleSelectionChange = (selection) => {

8
vue-fastapi-frontend/src/views/metadataConfig/taskBizConfig/index.vue

@ -292,7 +292,7 @@
/> />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="loadLeftTable">查询</el-button> <el-button type="primary" @click="seacheLeft">查询</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -533,6 +533,11 @@ async function loadLeftTable() {
ElMessage.error('加载左侧表数据失败') ElMessage.error('加载左侧表数据失败')
} }
} }
async function seacheLeft() {
leftQueryForm.pageNum=1
loadLeftTable()
}
async function loadRightTable(onum) { async function loadRightTable(onum) {
try { try {
@ -603,6 +608,7 @@ function openAddDialog() {
onum: null, onum: null,
bizName: '', bizName: '',
}) })
loadLeftTable()
rightTableData.value = [] rightTableData.value = []
open.value = true open.value = true
} }

14
vue-fastapi-frontend/src/views/system/flow/dataStdDictAppr.vue

@ -30,8 +30,18 @@ getNameById(scope.row.srcSys)
<el-table-column label="字典编号" width="150" align="center" prop="dataDictNo" /> <el-table-column label="字典编号" width="150" align="center" prop="dataDictNo" />
<el-table-column label="字典英文名" width="120" align="center" prop="dataDictEngName" /> <el-table-column label="字典英文名" width="120" align="center" prop="dataDictEngName" />
<el-table-column label="字典中文名" width="120" align="center" prop="dataDictCnName" /> <el-table-column label="字典中文名" width="120" align="center" prop="dataDictCnName" />
<el-table-column label="字典业务定义" width="120" align="center" prop="dataDictBusiMean" /> <el-table-column label="字典业务定义" prop="dataDictBusiMean" width="150">
<el-table-column label="数据类型" align="center" prop="dataDictDataType" /> <template #default="{ row }">
<!-- 设置 title 属性便于右键复制全文 -->
<span :title="row.dataDictBusiMean" style="cursor: text; user-select: text;">
{{ row.dataDictBusiMean?.length > 20
? row.dataDictBusiMean.slice(0, 20) + '...'
: row.dataDictBusiMean }}
</span>
</template>
</el-table-column><el-table-column label="数据类型" align="center" prop="dataDictDataType" />
<el-table-column label="数据标准" align="center" prop="dataStdNo"> <el-table-column label="数据标准" align="center" prop="dataStdNo">
<template #default="{ row }"> <template #default="{ row }">

Loading…
Cancel
Save