From a1b34fcc49cfeb7324cb7f4584380426ec6b092f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 29 五月 2022 20:08:00 +0800
Subject: [PATCH] 2022-05-29
---
src/menu/components/card/cardcellcomponent/formconfig.jsx | 9 +++++++++
src/tabviews/custom/components/card/balcony/index.jsx | 4 ++--
src/tabviews/custom/components/share/normalTable/index.jsx | 3 ++-
src/tabviews/zshare/normalTable/index.jsx | 5 +++--
src/menu/components/card/cardcellcomponent/elementform/index.scss | 4 ++--
src/tabviews/zshare/actionList/normalbutton/index.jsx | 12 ++++++++----
src/components/video/index.jsx | 2 +-
src/menu/components/card/cardcellcomponent/elementform/index.jsx | 14 ++++++++------
src/tabviews/zshare/actionList/funcMegvii/index.jsx | 6 +++++-
9 files changed, 40 insertions(+), 19 deletions(-)
diff --git a/src/components/video/index.jsx b/src/components/video/index.jsx
index fef570b..d83636e 100644
--- a/src/components/video/index.jsx
+++ b/src/components/video/index.jsx
@@ -28,7 +28,7 @@
return (
<div style={{overflow: 'hidden'}}>
- <Player poster="" autoPlay={card.autoPlay === 'true'} aspectRatio={card.aspectRatio || '16:9'} loop={card.loop === 'true'}>
+ <Player startTime={card.startTime || 0} poster="" currentTime={10} autoPlay={card.autoPlay === 'true'} aspectRatio={card.aspectRatio || '16:9'} loop={card.loop === 'true'}>
<source src={value} />
<BigPlayButton position="center" />
<ControlBar>
diff --git a/src/menu/components/card/cardcellcomponent/elementform/index.jsx b/src/menu/components/card/cardcellcomponent/elementform/index.jsx
index 9e5c2c1..cab73fe 100644
--- a/src/menu/components/card/cardcellcomponent/elementform/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/elementform/index.jsx
@@ -18,7 +18,7 @@
text: ['eleType', 'datatype', 'format', 'width', 'height', 'prefix', 'postfix', 'link', 'anchors', 'noValue', 'bgImage', 'fixStyle'],
number: ['eleType', 'datatype', 'format', 'width', 'height', 'prefix', 'postfix', 'noValue', 'fixStyle'],
picture: ['eleType', 'datatype', 'width', 'lenWidRadio', 'maxWidth', 'link', 'noValue'],
- video: ['eleType', 'datatype', 'width', 'aspectRatio', 'autoPlay', 'loop', 'noValue'],
+ video: ['eleType', 'datatype', 'width', 'aspectRatio', 'autoPlay', 'loop', 'startTime', 'noValue'],
icon: ['eleType', 'icon', 'datatype', 'width'],
slider: ['eleType', 'datatype', 'width', 'color', 'maxValue', 'showInfo', 'showType', 'strokeWidth', 'strokeLinecap', 'trailColor'],
splitline: ['eleType', 'color', 'width', 'borderWidth'],
@@ -83,6 +83,9 @@
} else if (item.key === 'value' && card.eleType === 'slider') {
item.type = 'number'
item.label = '鍊�'
+ } else if (item.key === 'value' && card.eleType === 'text') {
+ item.type = 'textarea'
+ item.label = '鍐呭'
} else if (item.key === 'format') {
if (card.eleType === 'text') {
item.options = item.oriOptions.filter(op => !['percent', 'thdSeparator', 'abs'].includes(op.value))
@@ -184,6 +187,9 @@
if (value === 'slider') {
item.type = 'number'
item.label = '鍊�'
+ } else if (value === 'text') {
+ item.type = 'textarea'
+ item.label = '鍐呭'
} else {
item.type = 'text'
item.label = '鍐呭'
@@ -361,13 +367,9 @@
{
required: item.readonly ? false : !!item.required,
message: this.props.dict['form.required.input'] + item.label + '!'
- },
- {
- max: formRule.input.max,
- message: formRule.input.message
}
]
- })(<TextArea rows={2} disabled={item.readonly} placeholder={item.placeholder || ''} />)}
+ })(<TextArea autoSize={{minRows: 2}} disabled={item.readonly} placeholder={item.placeholder || ''} />)}
</Form.Item>
</Col>
)
diff --git a/src/menu/components/card/cardcellcomponent/elementform/index.scss b/src/menu/components/card/cardcellcomponent/elementform/index.scss
index 2fc1e1b..090ce2d 100644
--- a/src/menu/components/card/cardcellcomponent/elementform/index.scss
+++ b/src/menu/components/card/cardcellcomponent/elementform/index.scss
@@ -2,11 +2,11 @@
min-height: 190px;
>.ant-row {
- >.ant-col {
+ >.ant-col:not(.textarea) {
height: 65px;
}
.ant-col.textarea {
- height: 80px;
+ min-height: 80px;
.ant-form-item-label {
width: 14.2%;
}
diff --git a/src/menu/components/card/cardcellcomponent/formconfig.jsx b/src/menu/components/card/cardcellcomponent/formconfig.jsx
index 9ef3260..675e05e 100644
--- a/src/menu/components/card/cardcellcomponent/formconfig.jsx
+++ b/src/menu/components/card/cardcellcomponent/formconfig.jsx
@@ -124,6 +124,15 @@
]
},
{
+ type: 'number',
+ key: 'startTime',
+ precision: 0,
+ label: '寮�濮嬫椂闂�',
+ initVal: card.startTime || 0,
+ tooltip: '瑙嗛寮�濮嬫挱鏀剧殑鏃堕棿锛岀敤浜庤皟鏁磋棰戝垵濮嬪寲灞曠ず鐨勭晫闈€��',
+ required: false
+ },
+ {
type: 'select',
key: 'format',
label: '鏍煎紡鍖�',
diff --git a/src/tabviews/custom/components/card/balcony/index.jsx b/src/tabviews/custom/components/card/balcony/index.jsx
index 313f2b9..eb8d22b 100644
--- a/src/tabviews/custom/components/card/balcony/index.jsx
+++ b/src/tabviews/custom/components/card/balcony/index.jsx
@@ -65,7 +65,7 @@
if (_config.wrap.position === 'fixed' || _config.wrap.position === 'absolute') {
_config.style.position = _config.wrap.position
- _config.style.zIndex = 2
+ _config.style.zIndex = 3
_config.style.left = _config.wrap.left || ''
_config.style.right = _config.wrap.right || ''
_config.style.top = _config.wrap.top || ''
@@ -73,7 +73,7 @@
_config.style.transform = _config.wrap.transform || ''
_config.style.width = _config.wrap.realwidth || ''
} else {
- _config.style.zIndex = 2
+ _config.style.zIndex = 3
_config.style.left = _config.wrap.left || ''
_config.style.right = _config.wrap.right || ''
_config.style.top = _config.wrap.top || ''
diff --git a/src/tabviews/custom/components/share/normalTable/index.jsx b/src/tabviews/custom/components/share/normalTable/index.jsx
index 0946175..d80adcc 100644
--- a/src/tabviews/custom/components/share/normalTable/index.jsx
+++ b/src/tabviews/custom/components/share/normalTable/index.jsx
@@ -664,6 +664,7 @@
let index = ''
let _activeIndex = null
if (selectedRowKeys.length > 0) {
+ selectedRowKeys = selectedRowKeys.filter(key => !data[key].$disabled)
index = selectedRowKeys.slice(-1)[0]
}
@@ -675,7 +676,7 @@
this.setState({ selectedRowKeys, activeIndex: _activeIndex })
- let selects = this.props.data.filter((item, _index) => selectedRowKeys.includes(_index) && !item.$disabled)
+ let selects = data.filter((item, _index) => selectedRowKeys.includes(_index) && !item.$disabled)
this.props.chgSelectData(selects)
if (setting.$hasSyncModule) {
diff --git a/src/tabviews/zshare/actionList/funcMegvii/index.jsx b/src/tabviews/zshare/actionList/funcMegvii/index.jsx
index 887a625..d2d9145 100644
--- a/src/tabviews/zshare/actionList/funcMegvii/index.jsx
+++ b/src/tabviews/zshare/actionList/funcMegvii/index.jsx
@@ -518,9 +518,13 @@
} else {
type = ''
icon = btn.icon || ''
- label = (loadingNumber && !loadingTotal ? `(${loadingNumber})` : '') + btn.label
+ label = btn.label
className = 'mk-btn mk-' + btn.class
}
+
+ if (loadingNumber && !loadingTotal && btn.$toolbtn && (!btn.show || btn.show === 'button')) {
+ label = (loadingNumber && !loadingTotal ? `(${loadingNumber})` : '') + btn.label
+ }
return (
<>
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index c5efa4a..69b040a 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -861,7 +861,7 @@
_resolve()
})
} else { // 瓒呭嚭20涓姹傛椂寰幆鎵ц
- if (btn.progress === 'progressbar') {
+ if (btn.progress === 'progressbar' && btn.$toolbtn) {
this.setState({
loadingTotal: params.length
})
@@ -926,7 +926,7 @@
})
}
- if (_params.length > 1 && btn.progress === 'progressbar') {
+ if (_params.length > 1 && btn.progress === 'progressbar' && btn.$toolbtn) {
this.setState({
loadingTotal: _params.length
})
@@ -947,7 +947,7 @@
params = this.getInnerParam(data, formdata)
}
- if (params.length > 1 && btn.progress === 'progressbar') {
+ if (params.length > 1 && btn.progress === 'progressbar' && btn.$toolbtn) {
this.setState({
loadingTotal: params.length
})
@@ -2140,10 +2140,14 @@
} else {
type = ''
icon = btn.icon || ''
- label = (loadingNumber && !loadingTotal ? `(${loadingNumber})` : '') + btn.label
+ label = btn.label
className = 'mk-btn mk-' + btn.class
}
+ if (loadingNumber && !loadingTotal && btn.$toolbtn && (!btn.show || btn.show === 'button')) {
+ label = (loadingNumber && !loadingTotal ? `(${loadingNumber})` : '') + btn.label
+ }
+
return <div style={{display: 'inline-block'}} onClick={(e) => e.stopPropagation()}>
<Button
type={type}
diff --git a/src/tabviews/zshare/normalTable/index.jsx b/src/tabviews/zshare/normalTable/index.jsx
index 5daebb0..4bf5a88 100644
--- a/src/tabviews/zshare/normalTable/index.jsx
+++ b/src/tabviews/zshare/normalTable/index.jsx
@@ -1045,11 +1045,12 @@
*
*/
onSelectChange = selectedRowKeys => {
- const { setting } = this.props
+ const { setting, data } = this.props
let index = ''
let _activeIndex = null
if (selectedRowKeys.length > 0) {
+ selectedRowKeys = selectedRowKeys.filter(key => !data[key].$disabled)
index = selectedRowKeys.slice(-1)[0]
}
@@ -1061,7 +1062,7 @@
this.setState({ selectedRowKeys, activeIndex: _activeIndex })
- let selects = this.props.data.filter((item, _index) => selectedRowKeys.includes(_index) && !item.$disabled)
+ let selects = data.filter((item, _index) => selectedRowKeys.includes(_index) && !item.$disabled)
this.props.chgSelectData(selects)
}
--
Gitblit v1.8.0