From 05cd35931c3c526117b6cc297e451ee4139c4a67 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期五, 17 三月 2023 18:24:19 +0800 Subject: [PATCH] 2023-03-17 --- src/tabviews/custom/components/timeline/normal-timeline/index.jsx | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/tabviews/custom/components/timeline/normal-timeline/index.jsx b/src/tabviews/custom/components/timeline/normal-timeline/index.jsx index bcf11b3..a888021 100644 --- a/src/tabviews/custom/components/timeline/normal-timeline/index.jsx +++ b/src/tabviews/custom/components/timeline/normal-timeline/index.jsx @@ -83,6 +83,15 @@ card = _config.subcards[0] + if (_config.wrap.dotSign === 'adaptive') { + try { + let cl = Math.floor(document.body.clientWidth * _config.width / 24 / 320) + _config.wrap.dotSign = ['', 'size16', 'size18', 'size20', 'size22', 'size24', 'size24', 'size24', 'size24'][cl] + } catch(e) { + _config.wrap.dotSign = 'size20' + } + } + this.setState({ card, sync: _sync, @@ -445,7 +454,7 @@ </div> <div className="mk-timeline-item-head"> <div className="mk-timeline-item-tail" style={linebg}></div> - <div className={'mk-dot ' + (dot ? 'mk-dot-icon' : '')} style={{background: color}}> + <div className={'mk-dot ' + (dot ? 'mk-dot-icon' : '')} style={{background: color, color: color}}> {dot} </div> </div> @@ -454,7 +463,7 @@ return (<div className="mk-time-line-item" key={data.$Index}> <div className="mk-timeline-item-head"> <div className="mk-timeline-item-tail" style={linebg}></div> - <div className={'mk-dot ' + (dot ? 'mk-dot-icon' : '')} style={{background: color}}> + <div className={'mk-dot ' + (dot ? 'mk-dot-icon' : '')} style={{background: color, color: color}}> {dot} </div> </div> @@ -484,7 +493,7 @@ {config.wrap.direction !== 'horizontal' && data && data.length > 0 ? <Timeline mode={config.wrap.mode} className={'card-row-list ' + (config.wrap.line || '')} style={{height: config.wrap.contentHeight}}> {data.map(item => this.getnodes(item))} </Timeline> : null} - {config.wrap.direction === 'horizontal' && data && data.length > 0 ? <div className={'mk-time-line-wrap card-row-list ' + (config.wrap.line || '')} style={{height: config.wrap.contentHeight}}> + {config.wrap.direction === 'horizontal' && data && data.length > 0 ? <div className={`mk-time-line-wrap card-row-list ${config.wrap.line || ''} ${config.wrap.iconSize || ''} ${config.wrap.dotSign || ''}`} style={{height: config.wrap.contentHeight}}> {data.map(item => this.getMknodes(item))} </div> : null} {data && data.length === 0 ? <div className="card-row-list" style={{height: config.wrap.contentHeight}}> -- Gitblit v1.8.0