From 5ed69b4bb3416ec61abf424375af8650864dbdfa Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 08 八月 2021 17:27:10 +0800
Subject: [PATCH] 2021-08-08
---
src/pc/quotecomponent/index.jsx | 6 +++
src/templates/sharecomponent/fieldscomponent/index.scss | 3 +
src/components/imgScale/index.jsx | 6 ++-
src/templates/sharecomponent/columncomponent/colspanform/index.jsx | 4 -
src/tabviews/custom/components/share/normalTable/index.jsx | 5 ++
src/tabviews/zshare/normalTable/index.jsx | 12 +++--
src/mob/mobshell/index.jsx | 14 ++++++
src/pc/menushell/index.jsx | 12 +++++
src/tabviews/zshare/normalTable/index.scss | 2
src/templates/modalconfig/dragelement/index.scss | 3 +
10 files changed, 53 insertions(+), 14 deletions(-)
diff --git a/src/components/imgScale/index.jsx b/src/components/imgScale/index.jsx
index 8363674..f948dd7 100644
--- a/src/components/imgScale/index.jsx
+++ b/src/components/imgScale/index.jsx
@@ -39,12 +39,14 @@
if (url || !src) return
let index = 0
+ let _list = []
- if (list.length > 0) {
+ if (list.length > 1) {
index = list.indexOf(src)
+ _list = list
}
- this.setState({url: src, className: 'opening', list, scale: 1, rotate: 0, index})
+ this.setState({url: src, className: 'opening', list: _list, scale: 1, rotate: 0, index})
setTimeout(() => {
this.setState({className: 'open'})
}, 300)
diff --git a/src/mob/mobshell/index.jsx b/src/mob/mobshell/index.jsx
index 6d14bee..a69679c 100644
--- a/src/mob/mobshell/index.jsx
+++ b/src/mob/mobshell/index.jsx
@@ -76,6 +76,8 @@
return
}
+ let style = null
+
if (item.component === 'search') { // 鎼滅储缁勪欢涓嶅彲閲嶅娣诲姞
if (cards.filter(card => card.type === 'search').length > 0) {
notification.warning({
@@ -94,6 +96,9 @@
})
return
}
+ if (!menu.style.paddingBottom) {
+ style = {...menu.style, paddingBottom: '50px'}
+ }
} else if (item.component === 'topbar') {
if (cards.filter(card => card.type === 'topbar').length > 0) {
notification.warning({
@@ -102,6 +107,9 @@
duration: 5
})
return
+ }
+ if (!menu.style.paddingTop) {
+ style = {...menu.style, paddingTop: '50px'}
}
}
@@ -177,7 +185,11 @@
_cards.push(Navbar)
}
- handleList({...menu, components: _cards})
+ if (style) {
+ handleList({...menu, style, components: _cards})
+ } else {
+ handleList({...menu, components: _cards})
+ }
setCards(_cards)
}
})
diff --git a/src/pc/menushell/index.jsx b/src/pc/menushell/index.jsx
index 2ad5bd7..6143786 100644
--- a/src/pc/menushell/index.jsx
+++ b/src/pc/menushell/index.jsx
@@ -76,6 +76,8 @@
return
}
+ let style = null
+
if (item.component === 'search') { // 鎼滅储缁勪欢涓嶅彲閲嶅娣诲姞
if (cards.filter(card => card.type === 'search').length > 0) {
notification.warning({
@@ -93,6 +95,10 @@
duration: 5
})
return
+ }
+
+ if (!menu.style.paddingTop) {
+ style = {...menu.style, paddingTop: '50px'}
}
}
@@ -149,7 +155,11 @@
const { index: overIndex } = findCard(`${targetId}`)
const _cards = update(cards, { $splice: [[overIndex + 1, 0, newcard]] })
- handleList({...menu, components: _cards})
+ if (style) {
+ handleList({...menu, style, components: _cards})
+ } else {
+ handleList({...menu, components: _cards})
+ }
setCards(_cards)
}
})
diff --git a/src/pc/quotecomponent/index.jsx b/src/pc/quotecomponent/index.jsx
index a0bb263..1054d31 100644
--- a/src/pc/quotecomponent/index.jsx
+++ b/src/pc/quotecomponent/index.jsx
@@ -84,6 +84,12 @@
config.components.unshift(_config)
+ if (sessionStorage.getItem('appType') !== 'pc' && !config.style.paddingBottom) {
+ config.style.paddingBottom = '50px'
+ } else if (sessionStorage.getItem('appType') === 'pc' && !config.style.paddingTop) {
+ config.style.paddingTop = '50px'
+ }
+
this.setState({
visible: false
})
diff --git a/src/tabviews/custom/components/share/normalTable/index.jsx b/src/tabviews/custom/components/share/normalTable/index.jsx
index f0ba8f3..3253c81 100644
--- a/src/tabviews/custom/components/share/normalTable/index.jsx
+++ b/src/tabviews/custom/components/share/normalTable/index.jsx
@@ -284,7 +284,10 @@
<div>
{photos.map((url, i) => (
<Col key={i} span={cols}>
- <div className="ant-mk-picture" style={{paddingTop, backgroundImage: `url('${url}')`}}></div>
+ <div className="ant-mk-picture" onClick={() => {
+ if (col.scale !== 'true') return
+ MKEmitter.emit('mkImageScale', url, photos)
+ }} style={{paddingTop, backgroundImage: `url('${url}')`}}></div>
</Col>
))}
</div>
diff --git a/src/tabviews/zshare/normalTable/index.jsx b/src/tabviews/zshare/normalTable/index.jsx
index 105916e..21feaa5 100644
--- a/src/tabviews/zshare/normalTable/index.jsx
+++ b/src/tabviews/zshare/normalTable/index.jsx
@@ -555,8 +555,9 @@
<div className="picture-col">
{photos && photos.map((url, i) => {
if (item.scale === 'true') {
- return <img style={{maxHeight: maxHeight}} className="image-scale" onClick={() => {
- MKEmitter.emit('mkImageScale', url, photos.length > 1 ? photos : '')
+ return <img style={{maxHeight: maxHeight}} className="image-scale" onClick={(e) => {
+ e.stopPropagation()
+ MKEmitter.emit('mkImageScale', url, photos)
}} key={`${i}`} src={url} alt=""/>
} else {
return <img style={{maxHeight: maxHeight}} key={`${i}`} src={url} alt=""/>
@@ -870,8 +871,9 @@
<div className="content-fence-top" style={images[0] ? {textAlign: images[0].align} : null}>
{images.map((_img, index) => {
if (_img.scale) {
- return <img style={{maxHeight: _img.maxHeight}} className="image-scale" onClick={() => {
- MKEmitter.emit('mkImageScale', _img.url, images.length > 1 ? images.map(g => g.url) : '')
+ return <img style={{maxHeight: _img.maxHeight}} className="image-scale" onClick={(e) => {
+ e.stopPropagation()
+ MKEmitter.emit('mkImageScale', _img.url, images.map(g => g.url))
}} key={`${index}`} src={_img.url} alt=""/>
} else {
return (<img style={{maxHeight: _img.maxHeight}} key={`${index}`} src={_img.url} alt=""/>)
@@ -892,7 +894,7 @@
{images.map((_img, index) => {
if (_img.scale) {
return <img style={{maxHeight: _img.maxHeight}} className="image-scale" onClick={() => {
- MKEmitter.emit('mkImageScale', _img.url, images.length > 1 ? images.map(g => g.url) : '')
+ MKEmitter.emit('mkImageScale', _img.url, images.map(g => g.url))
}} key={`${index}`} src={_img.url} alt=""/>
} else {
return (<img style={{maxHeight: _img.maxHeight}} key={`${index}`} src={_img.url} alt=""/>)
diff --git a/src/tabviews/zshare/normalTable/index.scss b/src/tabviews/zshare/normalTable/index.scss
index 5c27e47..9c97a66 100644
--- a/src/tabviews/zshare/normalTable/index.scss
+++ b/src/tabviews/zshare/normalTable/index.scss
@@ -137,7 +137,7 @@
.picture-col {
img {
max-width: 100%;
- display: block;
+ display: inline-block;
}
img + img {
margin-top: 10px;
diff --git a/src/templates/modalconfig/dragelement/index.scss b/src/templates/modalconfig/dragelement/index.scss
index ad41b4d..c6bc0a5 100644
--- a/src/templates/modalconfig/dragelement/index.scss
+++ b/src/templates/modalconfig/dragelement/index.scss
@@ -63,6 +63,9 @@
line-height: 1.3;
float: left;
}
+ .ant-btn + .field-name {
+ float: none;
+ }
.ant-checkbox-group {
line-height: 40px;
.ant-checkbox-wrapper {
diff --git a/src/templates/sharecomponent/columncomponent/colspanform/index.jsx b/src/templates/sharecomponent/columncomponent/colspanform/index.jsx
index 8474416..653a136 100644
--- a/src/templates/sharecomponent/columncomponent/colspanform/index.jsx
+++ b/src/templates/sharecomponent/columncomponent/colspanform/index.jsx
@@ -187,9 +187,7 @@
}
]
})(
- <Select
- getPopupContainer={() => document.getElementById('columncolspan')}
- >
+ <Select getPopupContainer={() => document.getElementById('columncolspan')} >
<Select.Option value="vertical">{this.props.dict['header.form.vertical']}</Select.Option>
<Select.Option value="horizontal">{this.props.dict['header.form.horizontal']}</Select.Option>
<Select.Option value="vertical2">{this.props.dict['header.form.vertical2']}</Select.Option>
diff --git a/src/templates/sharecomponent/fieldscomponent/index.scss b/src/templates/sharecomponent/fieldscomponent/index.scss
index eb8645e..1497d32 100644
--- a/src/templates/sharecomponent/fieldscomponent/index.scss
+++ b/src/templates/sharecomponent/fieldscomponent/index.scss
@@ -8,6 +8,9 @@
.ant-empty {
margin: 15vh 8px;
}
+ .ant-card-bordered {
+ border: 1px solid #e8e8e8;
+ }
}
.ant-modal-body::-webkit-scrollbar {
width: 7px;
--
Gitblit v1.8.0