diff --git a/ebts-ui/src/views/tool/top/packages/topology/src/behavior/dice-er-node.js b/ebts-ui/src/views/tool/top/packages/topology/src/behavior/dice-er-node.js index e819f7c..fd06433 100644 --- a/ebts-ui/src/views/tool/top/packages/topology/src/behavior/dice-er-node.js +++ b/ebts-ui/src/views/tool/top/packages/topology/src/behavior/dice-er-node.js @@ -1,3 +1,5 @@ +import utils from '../utils' + /** * @author: clay * @data: 2021/5/14 23:20 @@ -58,7 +60,7 @@ export default { if (nodes) { nodes.forEach((node) => { const model = node.getModel(); - if (model.attrs.length < 9) { + if (model.column.length < 9) { return; } const idx = model.startIndex || 0; @@ -71,8 +73,8 @@ export default { if (startX > 0) { startX = 0; } - if (startIndex > model.attrs.length - 1) { - startIndex = model.attrs.length - 1; + if (startIndex > model.column.length - 1) { + startIndex = model.column.length - 1; } graph.update(node, { startIndex, @@ -167,7 +169,7 @@ export default { }); vm.selectedNodeParams = { label: clickNodeModel.label || "", - attrs:clickNodeModel.attrs, + column:clickNodeModel.column, appConfig: { ...nodeAppConfig, ...clickNodeModel.appConfig } }; } @@ -184,8 +186,8 @@ export default { vm.selectedEdgeParams = { label: clickEdgeModel.label || "", relationalItem: clickEdgeModel.relationalItem, - sourceAttrs:clickEdgeModel.sourceAttrs, - targetAttrs:clickEdgeModel.targetAttrs, + sourceColumn:clickEdgeModel.sourceColumn, + targetColumn:clickEdgeModel.targetColumn, appConfig: { ...edgeAppConfig, ...clickEdgeModel.appConfig } }; } @@ -204,13 +206,16 @@ export default { graph.updateItem(item, { collapsed: true, size: [300, 50], + height:44, }); setTimeout(() => graph.layout(), 100); } else if (shape.get("name") === "expand") { - graph.updateItem(item, { + let updateGraph = graph.updateItem(item, { collapsed: false, size: [300, 500], + height:316, }); + // utils.anchor.update({height:100,}, graph) setTimeout(() => graph.layout(), 100); }else { // eslint-disable-next-line no-unused-vars diff --git a/ebts-ui/src/views/tool/top/packages/topology/src/behavior/drag-add-edge.js b/ebts-ui/src/views/tool/top/packages/topology/src/behavior/drag-add-edge.js index 1f08188..2f90b7e 100644 --- a/ebts-ui/src/views/tool/top/packages/topology/src/behavior/drag-add-edge.js +++ b/ebts-ui/src/views/tool/top/packages/topology/src/behavior/drag-add-edge.js @@ -99,7 +99,7 @@ export default { id: utils.generateUUID(), // 起始节点 source: sourceNodeModel.id, - sourceAttrs:sourceNodeModel.attrs, + sourceColumn:sourceNodeModel.attrs, sourceAnchor: sourceAnchor ? sourceAnchor.anchorIndex : "", // 终止节点/位置 relational: relational, @@ -160,7 +160,7 @@ export default { target: targetNodeModel.id, relationalItem:relationalItem, targetAnchor: targetAnchor ? targetAnchor.anchorIndex : "", - targetAttrs: targetNodeModel.attrs, + targetColumn: targetNodeModel.attrs, }); // ************** 记录historyData的逻辑 start ************** diff --git a/ebts-ui/src/views/tool/top/packages/topology/src/node/dice-er-box.js b/ebts-ui/src/views/tool/top/packages/topology/src/node/dice-er-box.js index 1d17813..bfec627 100644 --- a/ebts-ui/src/views/tool/top/packages/topology/src/node/dice-er-box.js +++ b/ebts-ui/src/views/tool/top/packages/topology/src/node/dice-er-box.js @@ -33,13 +33,13 @@ export default { }; const { - attrs = [], + column = [], startIndex = 0, selectedIndex, collapsed, icon, } = cfg; - const list = attrs; + const list = column; const afterList = list.slice( Math.floor(startIndex), Math.floor(startIndex + itemCount - 1) @@ -212,42 +212,40 @@ export default { name: `item-${Math.floor(startIndex) + i}-content`, draggable: true, }); - - if (!cfg.hideDot) { - // utils.anchor.erDrawLeft(group, label, 0, i * itemHeight + offsetY) - // utils.anchor.erDrawLeft(group,label,width,i * itemHeight + offsetY) - // listContainer.addShape("marker", { - // attrs: { - // x: 0, - // y: i * itemHeight + offsetY, - // r: 3, - // stroke: boxStyle.stroke, - // fill: "white", - // radius: 2, - // lineWidth: 1, - // cursor: "crosshair", - // }, - // - // name: 'marker-shape' - // }); - // listContainer.addShape("marker", { - // attrs: { - // x: width, - // y: i * itemHeight + offsetY, - // r: 3, - // stroke: boxStyle.stroke, - // fill: "white", - // radius: 2, - // lineWidth: 1, - // cursor: "crosshair", - // - // - // }, - // name: 'marker-shape' - // }); - - - } + //未来设置字段之间有锚点 + // if (!cfg.hideDot) { + // utils.anchor.erDrawLeft(group, label, 0, i * itemHeight + offsetY) + // utils.anchor.erDrawLeft(group,label,width,i * itemHeight + offsetY) + // listContainer.addShape("marker", { + // attrs: { + // x: 0, + // y: i * itemHeight + offsetY, + // r: 3, + // stroke: boxStyle.stroke, + // fill: "white", + // radius: 2, + // lineWidth: 1, + // cursor: "crosshair", + // }, + // + // name: 'marker-shape' + // }); + // listContainer.addShape("marker", { + // attrs: { + // x: width, + // y: i * itemHeight + offsetY, + // r: 3, + // stroke: boxStyle.stroke, + // fill: "white", + // radius: 2, + // lineWidth: 1, + // cursor: "crosshair", + // + // + // }, + // name: 'marker-shape' + // }); + // } listContainer.addShape("text", { attrs: { diff --git a/ebts-ui/src/views/tool/top/packages/topology/src/topology.vue b/ebts-ui/src/views/tool/top/packages/topology/src/topology.vue index b5b2ab6..a08bf59 100644 --- a/ebts-ui/src/views/tool/top/packages/topology/src/topology.vue +++ b/ebts-ui/src/views/tool/top/packages/topology/src/topology.vue @@ -139,7 +139,7 @@