diff --git a/package.json b/package.json index bb124de..37959dd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-visual-modeling", - "version": "1.0.31", + "version": "1.0.32", "description": "一个基于React的数据可视化建模的DAG图,适用于UML,数据库建模,数据仓库建设等业务", "main": "dist/index.js", "pack": "pack/index.js", diff --git a/src/adaptor.js b/src/adaptor.js index 8b26508..f69237a 100644 --- a/src/adaptor.js +++ b/src/adaptor.js @@ -3,17 +3,6 @@ import * as _ from 'lodash'; import Edge from './canvas/edge'; import TableNode from './canvas/node'; -export const BORDER_WIDTH = 2; -export const OPER_ICON_WIDTH = 86; - -export const getWidth = (columns) => { - let width = columns.reduce((cur, pre) => { - cur = cur + pre.width; - return cur; - }, 0); - return width; -} - export const transformInitData = (info) => { let { columns, data, config, diff --git a/src/canvas/node.js b/src/canvas/node.js index 90cd376..fedb37f 100644 --- a/src/canvas/node.js +++ b/src/canvas/node.js @@ -7,8 +7,6 @@ import emptyDom from './empty'; import Endpoint from './endpoint'; import RightMenuGen from './right-menu'; -import {getWidth, BORDER_WIDTH, OPER_ICON_WIDTH} from '../adaptor' - export default class TableNode extends Node { constructor(opts) { super(opts); @@ -48,15 +46,9 @@ export default class TableNode extends Node { this._createNodeEndpoint(); // 保持title宽度 if (this.fieldsList.length > 0) { - let columns = _.get(this.options, '_columns', []); - // 获取所有columns的宽度总和 加border - let width = getWidth(columns); - // let width = $(this.fieldsList[0].dom).width(); + let width = $(this.fieldsList[0].dom).width(); $(this.dom).find('.title').css('width', width); } else { - let columns = _.get(this.options, '_columns', []); - // 获取所有columns的宽度总和 加border - let width = getWidth(columns); $(this.dom).find('.title').css('width', this.options._emptyWidth || width); } @@ -109,10 +101,6 @@ export default class TableNode extends Node { } _collapse(oldEdges) { - let columns = _.get(this.options, '_columns', []); - // 获取所有columns的宽度总和 加border - let width = getWidth(columns) + BORDER_WIDTH; - if (this.status === 'collapse') { console.warn(`节点${this.id}已经是收缩状态`) return; @@ -121,7 +109,6 @@ export default class TableNode extends Node { this._createTitleEndpoint(); // 隐藏字段 this.fieldsList.forEach((item) => { - $(item.dom).parent().css('width', width); $(item.dom).css('display', 'none'); }); // 记录状态 @@ -160,15 +147,11 @@ export default class TableNode extends Node { let title = _.get(this, 'options.title'); let titleRender = _.get(this, 'options._config.titleRender'); let titleDom = $(`
`); - let columns = _.get(this.options, '_columns', []); - // 获取所有columns的宽度 - 操作按钮预留宽度 - let width = getWidth(columns) - OPER_ICON_WIDTH; $(container).append(titleDom); if (title) { if (titleRender) { let titleTextDom = $(`
`); $(titleDom).append(titleTextDom); - titleTextDom.css('width', width) ReactDOM.render( titleRender(title), titleTextDom[0] @@ -176,7 +159,6 @@ export default class TableNode extends Node { } else { let titleTextDom = $(`
${title}
`); $(titleDom).append(titleTextDom); - titleTextDom.css('width', width) } } }