Skip to content

csbr-daop / fe-data-trusted-space

Go to a project
Toggle navigation
Toggle navigation pinning
8eb15f05 by lxs
Options

Merge branch 'develop' of http://117.78.60.236:8000/csbr-daop/fe-data-asset-management into develop

2 parents 3358f313 3b923df6
Expand all
Inline Side-by-side
Showing 11 changed files with 298 additions and 41 deletions
src/api/modules/dataMetaService.ts
......@@ -404,7 +404,137 @@ export const getSankeyData = (guid) => request({
/** 数仓目录树列表查询 */
export const getDataWareCatalogList = (params) => request({
url: `${import.meta.env.VITE_APP_DATA_DELIVERY}delivery/ms-daop-data-plan-service/data-catalog-directory/tree-list`,
// url: `${import.meta.env.VITE_APP_DATA_DELIVERY}delivery/ms-daop-data-plan-service/data-catalog-directory/tree-list`,
url: `http://localhost:9000/delivery/ms-daop-data-plan-service/data-catalog-directory/tree-list`,
method: 'post',
data: params
})
export const getAllFlowData = (dictType) => request({
url: `${import.meta.env.VITE_APP_CONFIG_URL}/dict/data/get-by-dictType?dictType=${dictType}`,
method: 'get',
})
/** 元数据标准guid查询新建数据集字段 */
export const getMetaStandardDsField = (guid) => request({
url: `${import.meta.env.VITE_APP_STANDARD_URL}/meta-standard/get-standard?metaStandardGuid=${guid}`,
method: 'get'
})
/** 表分类类型 */
export const tableCategoryList = [
{
value: 1,
label: "明细表",
},
{
value: 2,
label: "汇总表",
},
{
value: 3,
label: "应用表",
},
{
value: 6,
label: "业务表",
},
// {
// value: 4,
// label: "维度表",
// },
// {
// value: 5,
// label: "缓慢变化维",
// }
];
/** 同步策略 */
export const syncPolicys = [
{
value: 1,
label: "实时",
},
{
value: 2,
label: "增量",
},
{
value: 3,
label: "全量",
},
{
value: 4,
label: "增量加更新",
},
];
/** 维表类型 */
export const dimTypeList = [{
label: "列表",
value: 1,
},
{
label: "层级",
value: 2,
},
{
label: "螺旋",
value: 3,
},
{
label: "通用",
value: 4,
}];
/** 表模型分类 */
export const tableModels = [
{
label: "主键模型",
value: 1,
},
{
label: "聚合模型",
value: 2,
},
{
label: "明细模型",
value: 3,
}
];
/** 聚合方式 */
export const aggMethodList = [{
value: 'SUM',
}, {
value: 'MAX'
}, {
value: 'MIN'
}, {
value: 'REPLACE'
}, {
value: 'REPLACE_IF_NOT_NULL'
}, {
value: 'HLL_UNION'
}, {
value: 'BITMAP_UNION'
}];
/** 保存主题表设置，直接入库 */
export const saveSubjectTable = (params) => request({
url: `http://localhost:9000/delivery/ms-daop-data-plan-service/data-catalog-subject/add`,
method: 'post',
data: params
})
/** 获取字典列表 */
export const getDictionary = (params) => request({
url: `${import.meta.env.VITE_APP_PLAN_BASEURL}/data-dictionary-general/list-all?state=1`,
method: 'post'
})
/** 获取维度列表 */
export const getDimList = () => request({
url: `http://localhost:9000/delivery/ms-daop-data-plan-service/data-catalog-subject/get-dim-list`,
method: 'get'
})
\ No newline at end of file
......
src/components/RelationNetwork/index.vue
......@@ -4,7 +4,7 @@
<div class="title">{{ detailInfoLabel }}</div>
<div class="row" v-for="item in Object.keys(detailInfo)">
<span>{{ item + '：' }}</span>
<span>{{ detailInfo[item] }}</span>
<span>{{ detailInfo[item] == null ? '-' : detailInfo[item] }}</span>
</div>
</div>
</div>
......@@ -37,6 +37,10 @@ const emits = defineEmits([
const { proxy } = getCurrentInstance() as any;
const maxChineseCount = ref(14);
const maxEnglishCount = ref(26);
const detailLoading = ref(false);
const detailInfo: any = ref({});
......@@ -116,9 +120,9 @@ const detectLanguage = (text) => {
const handleLabelLength = (label: string) => {
if (detectLanguage(label) == 'English') {
return label?.length > 30 ? label.slice(0, 30) + '...' : label;
return label?.length > maxEnglishCount.value ? label.slice(0, maxEnglishCount.value) + '...' : label;
}
return label?.length > 16 ? label.slice(0, 16) + '...' : label;
return label?.length > maxChineseCount.value ? label.slice(0, maxChineseCount.value) + '...' : label;
};
insertCss(`
......@@ -161,9 +165,9 @@ const initGraph = () => {
const name = item._cfg.model?.label;
if (currentAnchor == 'text-shape') {
if (detectLanguage(name) == 'English') {
return name?.length > 30;
return name?.length > maxEnglishCount.value;
}
return name?.length > 16;
return name?.length > maxChineseCount.value;
}
return false;
},
......@@ -237,7 +241,6 @@ const initGraph = () => {
{
type: 'collapse-expand',
onChange: (item, collapsed) => {
debugger
if (!item) {
return;
}
......@@ -246,7 +249,6 @@ const initGraph = () => {
return true;
},
shouldBegin: (e) => {
debugger
// 若当前操作的节点 id 为 'node1'，则不发生 collapse-expand
if (e.item && e.item.getModel().isLoading == true) return false;
return true;
......@@ -300,8 +302,9 @@ const initGraph = () => {
labelCfg: {
offset: 10,
style: {
fontSize: 16,
fontSize: 13,
fill: '#212121',
fontWeight: 500
},
position: !node.isField ? 'left' : 'right', //只有字段是最后一层级，不需要展开
},
......
src/router/modules/dataMeta.ts
......@@ -221,6 +221,44 @@ const routes: RouteRecordRaw[] = [
}
},
{
path: 'table-create-manual',
name: 'tableCreateManual',
component: () => import('@/views/data_meta/tableCreateManual.vue'),
meta: {
title: '新建表',
sidebar: false,
breadcrumb: false,
cache: true,
reuse: true,
activeMenu: '/data-meta/metadata-standard/standard-query'
},
beforeEnter: (to, from) => {
if (to.query.domainName) {
to.meta.title = `新建表(${to.query.domainName})-${to.query.standardName}`;
to.meta.editPage = true;
}
}
},
{
path: 'dim-table-create-manual',
name: 'dimTableCreateManual',
component: () => import('@/views/data_meta/dimTableCreateManual.vue'),
meta: {
title: '新建表',
sidebar: false,
breadcrumb: false,
cache: true,
reuse: true,
activeMenu: '/data-meta/metadata-standard/standard-query'
},
beforeEnter: (to, from) => {
if (to.query.domainName) {
to.meta.title = `新建表(${to.query.domainName})-${to.query.standardName}`;
to.meta.editPage = true;
}
}
},
{
path: 'standard-codetable',
name: 'metadataStandardCodetable',
component: () => import('@/views/data_meta/standard-codetable.vue'),
......
src/views/data_meta/components/dictFileds.vue
......@@ -233,23 +233,19 @@ const tableBtnClick = (scope, btn) => {
} else if (type == 'save') {
saveData(scope)
} else if (type == 'cancel') {
console.log('cancel')
if (row.guid != undefined) {
// row = orginData.value[(page.value.curr - 1) * page.value.limit + scope.$index]
row = JSON.parse(JSON.stringify(orginData.value[scope.$index]))
row.STATE = ''
row.STATUS = ''
tableData.value[scope.$index] = row
console.log('1111')
} else {
tableData.value.splice(scope.$index, 1)
orginData.value.splice(scope.$index, 1)
console.log('2222')
}
tableInfo.value.page.rows = tableData.value.length
// tableInfo.value.page.rows = tableData.value.length
let haveState = tableData.value.some(item => item.STATE)
saveDisabled.value = !haveState
console.log('3333')
} else if (type == 'remove') {
open("是否确定删除所选数据?", "warning");
}
......
src/views/data_meta/components/standardDialog.vue
<template>
<el-dialog v-model="visible" :title="title" width="900" modal-class="standard-modal">
<el-drawer
v-model="visible"
:title="title"
size="760px"
class="standard-modal"
:close-on-click-modal="false"
>
<el-form :rules="formRules" :model="form" ref="formEl" require-asterisk-position="right">
<el-row>
<el-col :span="12" style="padding-right:10px">
......@@ -75,17 +81,23 @@
</el-select>
</div>
<div class="table-form-item">
<el-select v-if="item.inputTypeCode == 2" v-model="item.dataTypeCode" style="width:220px" size="small" filterable clearable>
<el-select v-if="item.inputTypeCode == 2" v-model="item.dataTypeCode" style="width:160px" size="small" filterable clearable>
<el-option v-for="item in allDictOptions" :label="item.dictTypeName" :value="item.dictTypeName" :key="item.guid"></el-option>
</el-select>
<el-input v-else-if="item.inputTypeCode == 3" v-model="item.validateExpression" placeholder="请输入"></el-input>
</div>
<div class="table-form-operation">
<!-- <el-icon color="#4fa1a4" @click="() => addTableItem(index)">
<CirclePlus />
</el-icon> -->
<el-icon color="#b2b2b2" @click="() => deleteTableItem(index)"><Delete /></el-icon>
</div>
</div>
<div class="table-form-add">
<el-icon color="#4fa1a4" @click="() => addTableItem(index)">
<CirclePlus />
</el-icon>
<el-icon color="#F56C6C" @click="() => deleteTableItem(index)"><Delete /></el-icon>
</div>
<span @click="() => addTableItem(index)" style="cursor: pointer;">添加字段</span>
</div>
</div>
</el-form-item>
......@@ -93,10 +105,13 @@
</el-row>
</el-form>
<template #footer>
<div style="text-align:right">
<el-button @click="visible = false" :disabled="confirmLoading">取消</el-button>
<el-button type="primary" @click="confirm" :loading="confirmLoading">确认</el-button>
</div>
</template>
</el-dialog>
</el-drawer>
</template>
<script setup lang="ts">
......@@ -135,7 +150,7 @@ const visible = computed({
}
})
const title = computed(() => {
return props.type === 'add' ? '新建元标准' : '编辑元标准'
return props.type === 'add' ? '新增元数据标准' : '编辑元数据标准'
})
/**
......@@ -195,7 +210,8 @@ const tableFormTpl = {
}
function addTableItem (index) {
const tableObj = { ...tableFormTpl }
form.value.fieldRQVOS.splice(index + 1, 0, tableObj)
// form.value.fieldRQVOS.splice(index + 1, 0, tableObj)
form.value.fieldRQVOS.push(tableObj)
}
function deleteTableItem (index) {
form.value.fieldRQVOS.splice(index, 1)
......@@ -295,8 +311,9 @@ onBeforeMount(() => {
justify-content: flex-start;
}
}
.el-dialog__footer {
.el-drawer__footer {
padding: 10px;
justify-content: flex-end;
}
.el-dialog__body {
height: 500px;
......@@ -309,9 +326,14 @@ onBeforeMount(() => {
padding-right: 10px;
}
.table-form-operation {
flex: 0 0 70px;
padding-left: 6px;
flex: 0 0 30px;
// padding-left: 6px;
}
}
.table-form-add {
display: flex;
align-items: center;
color: #4fa1a4;
}
}
</style>
\ No newline at end of file
......
src/views/data_meta/components/standardFieldsDialog.vue
<template>
<el-dialog
<el-drawer
v-model="visible"
:title="title"
width="600"
modal-class="standard-modal"
width="520"
class="standard-meta-modal"
:close-on-click-modal="false"
>
<el-form :model="form" :rules="formRules" ref="formEl" style="min-height: 200px;" require-asterisk-position="right">
<el-row>
......@@ -36,10 +37,12 @@
</el-row>
</el-form>
<template #footer>
<div style="text-align:right">
<el-button @click="visible = false" :disabled="confirmLoading">取消</el-button>
<el-button type="primary" @click="confirm" :loading="confirmLoading">确认</el-button>
</div>
</template>
</el-dialog>
</el-drawer>
</template>
<script setup lang="ts">
......@@ -197,15 +200,16 @@ onBeforeMount(() => {
</script>
<style lang="scss">
.standard-modal {
.standard-meta-modal {
.el-form-item {
flex-direction: column;
.el-form-item__label {
justify-content: flex-start;
}
}
.el-dialog__footer {
.el-drawer__footer {
padding: 10px;
justify-content: flex-end;
}
.table-form-wrapper {
......
src/views/data_meta/components/tableDefaultValue.vue 0 → 100644
<template>
<el-select v-if="!readonly && isEdit && isSelectType(dbType, scope)" v-model="scope.row['defaultValue']" placeholder="请选择" collapse-tags-tooltip
filterable allow-create default-first-option :reserve-keyword="false">
<el-option v-for="opt in optionsConfig[dataType]" :key="opt['value']" :label="opt['label']" :value="opt['value']" />
</el-select>
<el-date-picker v-else-if="!readonly && isEdit && dataType === 'date'" v-model="scope.row['defaultValue']" type="date"
format="YYYY-MM-DD" value-format="YYYY-MM-DD" placeholder="请选择" />
<el-date-picker v-else-if="!readonly && isEdit && dbType === 'mysql' && dataType === 'datetime'"
v-model="scope.row['defaultValue']" placeholder="请选择" type="datetime" format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss" />
<el-input v-else-if="!readonly && isEdit" v-model.trim="scope.row['defaultValue']" placeholder="请填写"
@input="(val) => inputChange(val, scope.row.dataType, scope)" />
<span v-else>{{ scope.row["defaultValue"] == null ? '-' : (isSelectType(dbType, scope) ?
(optionsConfig[dataType].find(s => s.value == scope.row["defaultValue"])?.label ??
scope.row["defaultValue"]) : scope.row["defaultValue"]) }}</span>
</template>
<script lang="ts" setup name="tableDefaultValue">
import { ref } from "vue";
import { useDefault } from "@/hooks/useDefault";
const { optionsConfig, inputChange, isSelectType } = useDefault()
const props = defineProps({
dbType: {
type: String,
default: ''
},
scope: {
type: Object,
default: {}
},
readonly: {
type: Boolean,
default: false
}
})
const isEdit = computed(() => {
return props.scope.row['isEdit'];
});
const dataType = computed(() => {
return props.scope.row['dataType'];
});
</script>
\ No newline at end of file
src/views/data_meta/standard-query.vue
......@@ -228,14 +228,7 @@ onBeforeUnmount(() => {
})
/** 数仓目录树形列表 */
const dataCatalogList = ref([{
name: '测试',
guid: '1',
children: [{
name: 'cesi',
guid: '1-1'
}]
}]);
const dataCatalogList = ref([]);
const formItems = ref([{
label: "数仓目录",
......@@ -299,12 +292,37 @@ const dialogBtnClick = (btn, info) => {
if (btn.value == 'submit') {
dialogInfo.value.visible = false;
if (selectDataCatalogNodeObj.value.parent.data.layereAttribute == 2) { //维度
window.open(`${import.meta.env.VITE_APP_DATA_DELIVERY}data-catalog/data-warehouse/dim-table-create-manual?domainGuid=${info.domainGuid}&domainName=${selectDataCatalogNodeObj.value.data.name}&metaStandard=${contextNodeData.value.guid}`);
router.push({
name: 'dimTableCreateManual',
query: {
domainGuid: info.domainGuid,
domainName: selectDataCatalogNodeObj.value.data.name,
metaStandard: contextNodeData.value.guid,
standardName: contextNodeData.value.label
}
});
} else {
if (selectDataCatalogNodeObj.value.parent.data.layereAttribute == 4) {
window.open(`${import.meta.env.VITE_APP_DATA_DELIVERY}data-catalog/data-warehouse/table-create-manual?domainGuid=${info.domainGuid}&domainName=${selectDataCatalogNodeObj.value.data.name}&layereAttribute=${selectDataCatalogNodeObj.value.parent.data.layereAttribute}&metaStandard=${contextNodeData.value.guid}`);
router.push({
name: 'tableCreateManual',
query: {
domainGuid: info.domainGuid,
domainName: selectDataCatalogNodeObj.value.data.name,
metaStandard: contextNodeData.value.guid,
layereAttribute: selectDataCatalogNodeObj.value.parent.data.layereAttribute,
standardName: contextNodeData.value.label
}
});
} else {
window.open(`${import.meta.env.VITE_APP_DATA_DELIVERY}data-catalog/data-warehouse/table-create-manual?domainGuid=${info.domainGuid}&domainName=${selectDataCatalogNodeObj.value.data.name}&metaStandard=${contextNodeData.value.guid}`);
router.push({
name: 'tableCreateManual',
query: {
domainGuid: info.domainGuid,
domainName: selectDataCatalogNodeObj.value.data.name,
metaStandard: contextNodeData.value.guid,
standardName: contextNodeData.value.label
}
});
}
}
} else if (btn.value == 'cancel') {
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!