Commit 5c6c932

authored

Merge pull request #34 from zhangyxapp/master

fix: 删除自动获取宽度,子级撑开

2 parents 54a12e3 + 0796316 commit 5c6c932Copy full SHA for 5c6c932

File tree

3 files changed

-31

lines changed

package.json
src
- adaptor.js
- canvas
  - node.js

3 files changed

-31

lines changed

`‎package.json‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "react-visual-modeling",`
`3`		`- "version": "1.0.31",`
	`3`	`+ "version": "1.0.32",`
`4`	`4`	`"description": "一个基于React的数据可视化建模的DAG图,适用于UML,数据库建模,数据仓库建设等业务",`
`5`	`5`	`"main": "dist/index.js",`
`6`	`6`	`"pack": "pack/index.js",`

`‎src/adaptor.js‎`

Lines changed: 0 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,17 +3,6 @@ import * as _ from 'lodash';`
`3`	`3`	`import Edge from './canvas/edge';`
`4`	`4`	`import TableNode from './canvas/node';`
`5`	`5`
`6`		`-export const BORDER_WIDTH = 2;`
`7`		`-export const OPER_ICON_WIDTH = 86;`
`8`		`-`
`9`		`-export const getWidth = (columns) => {`
`10`		`- let width = columns.reduce((cur, pre) => {`
`11`		`- cur = cur + pre.width;`
`12`		`- return cur;`
`13`		`- }, 0);`
`14`		`- return width;`
`15`		`-}`
`16`		`-`
`17`	`6`	`export const transformInitData = (info) => {`
`18`	`7`	`let {`
`19`	`8`	`columns, data, config,`

`‎src/canvas/node.js‎`

Lines changed: 1 addition & 19 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,6 @@ import emptyDom from './empty';`
`7`	`7`	`import Endpoint from './endpoint';`
`8`	`8`	`import RightMenuGen from './right-menu';`
`9`	`9`
`10`		`-import {getWidth, BORDER_WIDTH, OPER_ICON_WIDTH} from '../adaptor'`
`11`		`-`
`12`	`10`	`export default class TableNode extends Node {`
`13`	`11`	`constructor(opts) {`
`14`	`12`	`super(opts);`
`@@ -48,15 +46,9 @@ export default class TableNode extends Node {`
`48`	`46`	`this._createNodeEndpoint();`
`49`	`47`	`// 保持title宽度`
`50`	`48`	`if (this.fieldsList.length > 0) {`
`51`		`- let columns = _.get(this.options, '_columns', []);`
`52`		`- // 获取所有columns的宽度总和加border`
`53`		`- let width = getWidth(columns);`
`54`		`- // let width = $(this.fieldsList[0].dom).width();`
	`49`	`+ let width = $(this.fieldsList[0].dom).width();`
`55`	`50`	`$(this.dom).find('.title').css('width', width);`
`56`	`51`	`} else {`
`57`		`- let columns = _.get(this.options, '_columns', []);`
`58`		`- // 获取所有columns的宽度总和加border`
`59`		`- let width = getWidth(columns);`
`60`	`52`	`$(this.dom).find('.title').css('width', this.options._emptyWidth \|\| width);`
`61`	`53`	`}`
`62`	`54`
`@@ -109,10 +101,6 @@ export default class TableNode extends Node {`
`109`	`101`	`}`
`110`	`102`
`111`	`103`	`_collapse(oldEdges) {`
`112`		`- let columns = _.get(this.options, '_columns', []);`
`113`		`- // 获取所有columns的宽度总和加border`
`114`		`- let width = getWidth(columns) + BORDER_WIDTH;`
`115`		`-`
`116`	`104`	`if (this.status === 'collapse') {`
`117`	`105`	console.warn(`节点${this.id}已经是收缩状态`)
`118`	`106`	`return;`
`@@ -121,7 +109,6 @@ export default class TableNode extends Node {`
`121`	`109`	`this._createTitleEndpoint();`
`122`	`110`	`// 隐藏字段`
`123`	`111`	`this.fieldsList.forEach((item) => {`
`124`		`- $(item.dom).parent().css('width', width);`
`125`	`112`	`$(item.dom).css('display', 'none');`
`126`	`113`	`});`
`127`	`114`	`// 记录状态`
`@@ -160,23 +147,18 @@ export default class TableNode extends Node {`
`160`	`147`	`let title = _.get(this, 'options.title');`
`161`	`148`	`let titleRender = _.get(this, 'options._config.titleRender');`
`162`	`149`	let titleDom = $(`<div class="title"></div>`);
`163`		`- let columns = _.get(this.options, '_columns', []);`
`164`		`- // 获取所有columns的宽度 - 操作按钮预留宽度`
`165`		`- let width = getWidth(columns) - OPER_ICON_WIDTH;`
`166`	`150`	`$(container).append(titleDom);`
`167`	`151`	`if (title) {`
`168`	`152`	`if (titleRender) {`
`169`	`153`	let titleTextDom = $(`<div class="title-text"></div>`);
`170`	`154`	`$(titleDom).append(titleTextDom);`
`171`		`- titleTextDom.css('width', width)`
`172`	`155`	`ReactDOM.render(`
`173`	`156`	`titleRender(title),`
`174`	`157`	`titleTextDom[0]`
`175`	`158`	`);`
`176`	`159`	`} else {`
`177`	`160`	let titleTextDom = $(`<div class="title-text">${title}</div>`);
`178`	`161`	`$(titleDom).append(titleTextDom);`
`179`		`- titleTextDom.css('width', width)`
`180`	`162`	`}`
`181`	`163`	`}`
`182`	`164`	`}`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 5c6c932

File tree

3 files changed

3 files changed

`‎package.json‎`

`‎src/adaptor.js‎`

`‎src/canvas/node.js‎`

0 commit comments