From 50d288f04ad66a18d3ebe80db3ca7c6e68aa65fe Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 08 一月 2025 15:52:31 +0800
Subject: [PATCH] 2025-01-08
---
src/menu/components/card/cardcellcomponent/dragaction/card.jsx | 3 +++
src/menu/components/share/actioncomponent/actionform/index.jsx | 3 +++
src/menu/components/card/cardcellcomponent/index.jsx | 11 +++++++++++
src/menu/stylecontroller/index.jsx | 5 +++--
src/menu/components/share/actioncomponent/formconfig.jsx | 3 ++-
src/menu/components/card/cardcellcomponent/dragaction/action.jsx | 4 ++++
src/menu/components/share/actioncomponent/index.jsx | 5 +++++
7 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/dragaction/action.jsx b/src/menu/components/card/cardcellcomponent/dragaction/action.jsx
index 729095c..c22c252 100644
--- a/src/menu/components/card/cardcellcomponent/dragaction/action.jsx
+++ b/src/menu/components/card/cardcellcomponent/dragaction/action.jsx
@@ -55,6 +55,10 @@
let btnElement = null
let _style = resetStyle(card.style)
+ if (_style.display === 'none') {
+ _style.display = 'block'
+ }
+
if (card.OpenType === 'form') {
if (card.formType === 'switch') {
btnElement = (<Switch style={_style} className={card.size === 'large' ? 'ant-switch-large' : ''} size={card.size} checkedChildren={card.openText || ''} unCheckedChildren={card.closeText || ''}/>)
diff --git a/src/menu/components/card/cardcellcomponent/dragaction/card.jsx b/src/menu/components/card/cardcellcomponent/dragaction/card.jsx
index 1c1b983..6b85d33 100644
--- a/src/menu/components/card/cardcellcomponent/dragaction/card.jsx
+++ b/src/menu/components/card/cardcellcomponent/dragaction/card.jsx
@@ -63,6 +63,9 @@
_style = {...card.style, opacity: isDragging ? 0.3 : 1}
_style = resetStyle(_style)
}
+ if (_style.display === 'none') {
+ _style.display = 'block'
+ }
if (card.eleType === 'picture' && card.maxWidth) {
_style.maxWidth = card.maxWidth
let left = _style.marginLeft || 'auto'
diff --git a/src/menu/components/card/cardcellcomponent/index.jsx b/src/menu/components/card/cardcellcomponent/index.jsx
index 89008dd..193be32 100644
--- a/src/menu/components/card/cardcellcomponent/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/index.jsx
@@ -151,6 +151,9 @@
options = ['margin', 'float']
} else {
options.push('width', 'minHeight', 'float')
+ if (element.OpenType !== 'form') {
+ options.push('display')
+ }
_style.minHeight = _style.minHeight || '28px'
_style.textAlign = _style.textAlign || 'center'
}
@@ -255,6 +258,10 @@
_card.innerHeight = _card.barHeight + (_card.displayValue === 'true' ? fontSize + 2 : 0)
} else if (_card.eleType === 'button') { // 鎷嗗垎style
_card.style = fromJS(style).toJS()
+
+ if (_card.OpenType === 'form') {
+ delete _card.style.display
+ }
if (style.float) {
_card.wrapStyle = {textAlign: style.float}
@@ -511,6 +518,10 @@
if (cell.OpenType !== 'form') {
res.style = {}
}
+
+ if (res.style) {
+ delete res.style.display
+ }
// } else if (res.class !== cell.class || res.show !== cell.show || !res.style) {
} else if (res.class !== cell.class || !res.style) {
if (res.class) {
diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index 6fcaa2f..30cd614 100644
--- a/src/menu/components/share/actioncomponent/actionform/index.jsx
+++ b/src/menu/components/share/actioncomponent/actionform/index.jsx
@@ -495,6 +495,9 @@
shows.push('execSuccess', 'execError', 'tipTitle')
} else if (_funcType === 'mkUnsubscribe' || _funcType === 'reAuth') {
shows.push('tipTitle')
+ } else if (_funcType === 'reSystem') {
+ shows.push('tipTitle', 'Ot')
+ reOptions.Ot = requireOptions.filter(op => op.value === 'requiredSgl')
} else if (_funcType === 'closetab') {
shows.push('refreshTab')
} else if (_funcType === 'scan') {
diff --git a/src/menu/components/share/actioncomponent/formconfig.jsx b/src/menu/components/share/actioncomponent/formconfig.jsx
index 3b1815b..eec1f28 100644
--- a/src/menu/components/share/actioncomponent/formconfig.jsx
+++ b/src/menu/components/share/actioncomponent/formconfig.jsx
@@ -214,7 +214,8 @@
{ value: 'mkBinding', text: '寮�閫氭壂鐮佺櫥褰�' },
{ value: 'mkUnBinding', text: '鐢ㄦ埛瑙ｇ粦' },
{ value: 'mkUnsubscribe', text: '娉ㄩ攢璐︽埛' },
- { value: 'reAuth', text: '鍒囨崲绯荤粺锛堟竻绌虹紦瀛�-灏忕▼搴忥級' },
+ { value: 'reAuth', text: '鍒囨崲鎺堟潈鐮� / 灏忕▼搴忔竻绌虹紦瀛�' },
+ { value: 'reSystem', text: '鍒囨崲绯荤粺锛圓PP鍐咃級' },
{ value: 'clearCache', text: '娓呯┖鏈湴閰嶇疆' },
{ value: 'copyurl', text: '澶嶅埗閾炬帴鍦板潃' },
{ value: 'expPdf', text: '瀵煎嚭PDF' },
diff --git a/src/menu/components/share/actioncomponent/index.jsx b/src/menu/components/share/actioncomponent/index.jsx
index e71e10d..a754d81 100644
--- a/src/menu/components/share/actioncomponent/index.jsx
+++ b/src/menu/components/share/actioncomponent/index.jsx
@@ -461,6 +461,11 @@
}
btn.updateTime = moment().format('YYYY-MM-DD HH:mm')
+
+ if (btn.style) {
+ delete btn.style.display
+ }
+
return btn
} else {
return item
diff --git a/src/menu/stylecontroller/index.jsx b/src/menu/stylecontroller/index.jsx
index 59dabec..71a5517 100644
--- a/src/menu/stylecontroller/index.jsx
+++ b/src/menu/stylecontroller/index.jsx
@@ -1103,8 +1103,9 @@
labelCol={{xs: { span: 24 }, sm: { span: 4 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 20 }} }
>
<Radio.Group style={{whiteSpace: 'nowrap'}} defaultValue={card.display || 'block'} onChange={(e) => this.changeNormalStyle(e.target.value, 'display')}>
- <Radio value="block">鍧楃骇鍏冪礌</Radio>
- <Radio value="inline-block">琛屽唴鍧楀厓绱�</Radio>
+ <Radio value="block">鏁磋</Radio>
+ <Radio value="inline-block">鑷�傚簲</Radio>
+ <Radio value="none">涓嶆樉绀�</Radio>
</Radio.Group>
</Form.Item>
</Col>
--
Gitblit v1.8.0