Browse Source

chore(nc-gui): remove duplicated fn calls

pull/4071/head
braks 2 years ago
parent
commit
4ab7ff0bde
  1. 35
      packages/nc-gui/components/erd/utils.ts

35
packages/nc-gui/components/erd/utils.ts

@ -44,9 +44,6 @@ interface Relation {
type: 'mm' | 'hm' type: 'mm' | 'hm'
} }
const nodeWidth = 300
const nodeHeight = 50
export function useErdElements(tables: MaybeRef<TableType[]>, props: MaybeRef<ERDConfig>) { export function useErdElements(tables: MaybeRef<TableType[]>, props: MaybeRef<ERDConfig>) {
const elements = ref<Elements<NodeData | EdgeData>>([]) const elements = ref<Elements<NodeData | EdgeData>>([])
@ -63,6 +60,9 @@ export function useErdElements(tables: MaybeRef<TableType[]>, props: MaybeRef<ER
const erdTables = computed(() => unref(tables)) const erdTables = computed(() => unref(tables))
const config = $computed(() => unref(props)) const config = $computed(() => unref(props))
const nodeWidth = 300
const nodeHeight = $computed(() => (config.showViews && config.showAllColumns ? 50 : 40))
const relations = computed(() => const relations = computed(() =>
erdTables.value.reduce((acc, table) => { erdTables.value.reduce((acc, table) => {
const meta = metasWithIdAsKey.value[table.id!] const meta = metasWithIdAsKey.value[table.id!]
@ -115,7 +115,7 @@ export function useErdElements(tables: MaybeRef<TableType[]>, props: MaybeRef<ER
}, [] as Relation[]), }, [] as Relation[]),
) )
function edgeLabel({ type, source, target, modelId, childColId, parentColId }: Relation, simple = false) { function edgeLabel({ type, source, target, modelId, childColId, parentColId }: Relation) {
const typeLabel = type === 'mm' ? 'many to many' : 'has many' const typeLabel = type === 'mm' ? 'many to many' : 'has many'
const parentCol = metasWithIdAsKey.value[source].columns?.find((col) => { const parentCol = metasWithIdAsKey.value[source].columns?.find((col) => {
@ -147,18 +147,19 @@ export function useErdElements(tables: MaybeRef<TableType[]>, props: MaybeRef<ER
if (!mmModel) return '' if (!mmModel) return ''
if (mmModel.title !== mmModel.table_name) { if (mmModel.title !== mmModel.table_name) {
return `${mmModel.title} (${mmModel.table_name})` return [`${mmModel.title} (${mmModel.table_name})`]
} }
return mmModel.title return [mmModel.title]
} }
} }
if (simple) { return [
return `${metasWithIdAsKey.value[source].title} - ${typeLabel} - ${metasWithIdAsKey.value[target].title}` // detailed edge label
} `[${metasWithIdAsKey.value[source].title}] ${parentCol.title} - ${typeLabel} - ${childCol.title} [${metasWithIdAsKey.value[target].title}]`,
// simple edge label (for skeleton)
return `[${metasWithIdAsKey.value[source].title}] ${parentCol.title} - ${typeLabel} - ${childCol.title} [${metasWithIdAsKey.value[target].title}]` `${metasWithIdAsKey.value[source].title} - ${typeLabel} - ${metasWithIdAsKey.value[target].title}`,
]
} }
function createNodes() { function createNodes() {
@ -207,15 +208,17 @@ export function useErdElements(tables: MaybeRef<TableType[]>, props: MaybeRef<ER
targetColumnId = childColId targetColumnId = childColId
} }
acc.push({ const [label, simpleLabel] = edgeLabel({
id: `e-${sourceColumnId}-${source}-${targetColumnId}-${target}-#${edgeLabel({
source, source,
target, target,
type, type,
childColId, childColId,
parentColId, parentColId,
modelId, modelId,
})}`, })
acc.push({
id: `e-${sourceColumnId}-${source}-${targetColumnId}-${target}-#${label}`,
source: `${source}`, source: `${source}`,
target: `${target}`, target: `${target}`,
sourceHandle: `s-${sourceColumnId}-${source}`, sourceHandle: `s-${sourceColumnId}-${source}`,
@ -228,8 +231,8 @@ export function useErdElements(tables: MaybeRef<TableType[]>, props: MaybeRef<ER
data: { data: {
isManyToMany: type === 'mm', isManyToMany: type === 'mm',
isSelfRelation: source === target && sourceColumnId === targetColumnId, isSelfRelation: source === target && sourceColumnId === targetColumnId,
label: edgeLabel({ type, source, target, childColId, parentColId, modelId }), label,
simpleLabel: edgeLabel({ type, source, target, childColId, parentColId, modelId }, true), simpleLabel,
color: '', color: '',
}, },
}) })

Loading…
Cancel
Save