From e8edfdadb561cd83bf6e1c3e00d55b8cc2aee6d5 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期一, 17 十月 2022 17:57:34 +0800 Subject: [PATCH] 2022-10-17 --- src/menu/components/card/cardcellcomponent/dragaction/card.jsx | 39 +++++++++++++++++---------------------- 1 files changed, 17 insertions(+), 22 deletions(-) diff --git a/src/menu/components/card/cardcellcomponent/dragaction/card.jsx b/src/menu/components/card/cardcellcomponent/dragaction/card.jsx index 61b0c90..e0c82a5 100644 --- a/src/menu/components/card/cardcellcomponent/dragaction/card.jsx +++ b/src/menu/components/card/cardcellcomponent/dragaction/card.jsx @@ -40,7 +40,13 @@ const [, drop] = useDrop({ accept: 'action', canDrop: () => true, - drop({ id: draggedId }) { + drop(item) { + const { id: draggedId } = item + + if (item.$init) { + item.overIndex = id + } + if (!draggedId || draggedId === id) return const { index: originIndex } = findCard(draggedId) @@ -71,7 +77,7 @@ const getContent = () => { if (card.eleType === 'sequence') { return ( - <div className={'ant-mk-text'}>1</div> + <div style={{height: card.innerHeight || 'auto'}} className="ant-mk-text">1</div> ) } else if (card.eleType === 'text' || card.eleType === 'number') { let val = `${card.prefix || ''}${card.datatype === 'static' ? (card.value || '') : (card.field || '')}${card.postfix || ''}` @@ -83,18 +89,7 @@ <div className={'ant-mk-text line' + (card.height || '')} style={{height: card.innerHeight || 'auto'}}>{val}</div> ) } else if (card.eleType === 'icon') { - let fontSize = 14 - let lineHeight = 1.5 - - if (card.style.fontSize) { - fontSize = parseInt(card.style.fontSize) - } - if (card.style.lineHeight) { - lineHeight = parseFloat(card.style.lineHeight) - } - - let innerHeight = fontSize * lineHeight - return (<MkIcon style={{height: innerHeight}} className="ant-mk-icon" type={card.icon}/>) + return (<MkIcon style={{height: card.innerHeight || 'auto'}} className="ant-mk-icon" type={card.icon}/>) } else if (card.eleType === 'slider') { let val = card.value ? (card.value / card.maxValue) * 100 : 30 return <MkProgress value={val} config={card}/> @@ -107,9 +102,10 @@ // ) } else if (card.eleType === 'picture') { let _imagestyle = {} + let url = card.url !== '@icon@' ? card.url : sessionStorage.getItem('CloudAvatar') - if (card.url) { - _imagestyle = {backgroundImage: `url('${card.url}')`} + if (url) { + _imagestyle = {backgroundImage: `url('${url}')`} } else { let index = card.uuid.match(/\d{1}/g) index = index.slice(-1)[0] % 5 @@ -134,7 +130,7 @@ } else if (card.eleType === 'splitline') { let _borderWidth = card.borderWidth === undefined ? 1 : card.borderWidth return ( - <div style={{paddingTop: '1px'}}> + <div style={{paddingTop: _borderWidth ? '1px' : '10px'}}> <div className="ant-mk-splitline" style={{borderColor: card.color, borderWidth: _borderWidth}}></div> </div> ) @@ -164,7 +160,7 @@ val = <><span style={_s}>{card.prefix || ''}</span>{moment().format(card.dateFormat)}<span style={_s}>{card.postfix || ''}</span></> } return ( - <div className="ant-mk-date"> + <div className="ant-mk-text line1" style={{height: card.innerHeight || 'auto'}}> {val} </div> ) @@ -175,7 +171,7 @@ val = <><span style={_s}>{card.prefix || ''}</span>{card.formula}<span style={_s}>{card.postfix || ''}</span></> } return ( - <div className="ant-mk-date"> + <div className="ant-mk-text" style={{height: card.innerHeight || 'auto'}}> {val} </div> ) @@ -190,8 +186,7 @@ } let able = true - if ((appType === 'mob' || appType === 'pc') && parent && (parent.setting.click === 'menu' || parent.setting.click === 'menus')) { - // if ((appType === 'mob' || appType === 'pc') && parent && parent.setting.click === 'menu') { + if ((appType === 'mob' || appType === 'pc') && (parent.setting.click === 'menu' || parent.setting.click === 'menus')) { able = false } @@ -202,7 +197,7 @@ <CopyOutlined className="copy" title="澶嶅埗" onClick={() => copyCard(id)} /> <CloseOutlined className="close" title="鍒犻櫎" onClick={() => delCard(id)} /> <FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={() => changeStyle(id)}/> - {['text', 'number', 'slider', 'sequence', 'formula'].includes(card.eleType) ? <MarkColumn columns={fields} type={card.eleType} marks={card.marks} onSubmit={(vals) => updateMarks({...card, marks: vals})} /> : null } + {['text', 'number', 'slider', 'sequence', 'formula'].includes(card.eleType) ? <MarkColumn field={card.field || ''} columns={fields} type={card.eleType} marks={card.marks} onSubmit={(vals) => updateMarks({...card, marks: vals})} /> : null } </div> } trigger="hover"> <div ref={node => drag(drop(node))} className={'ant-col card-cell ant-col-' + card.width}> -- Gitblit v1.8.0