From 1f9e73d2e0e838acfee9e0aa8570a874bd130b89 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 05 十月 2023 13:41:13 +0800
Subject: [PATCH] 2023-10-05
---
src/menu/components/form/formaction/formconfig.jsx | 2 ++
src/menu/components/form/simple-form/options.jsx | 4 ++++
src/menu/components/form/simple-form/index.jsx | 6 ++++++
src/menu/components/form/formaction/index.jsx | 13 +++++++++++++
src/tabviews/custom/components/form/simple-form/index.jsx | 13 ++++++++++++-
src/templates/zshare/formconfig.jsx | 2 +-
src/menu/components/form/formaction/actionform/index.jsx | 2 +-
7 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/src/menu/components/form/formaction/actionform/index.jsx b/src/menu/components/form/formaction/actionform/index.jsx
index b21638c..b65157b 100644
--- a/src/menu/components/form/formaction/actionform/index.jsx
+++ b/src/menu/components/form/formaction/actionform/index.jsx
@@ -54,7 +54,7 @@
shows = ['typeName', 'label', 'actionType']
} else if (this.record.type === 'next') {
shows = ['typeName', 'label', 'actionType']
- } else if (this.record.type === 'close') {
+ } else if (this.record.type === 'close' || this.record.type === 'reset') {
shows = ['typeName', 'label']
} else {
shows = ['typeName', 'label', 'intertype', 'Ot', 'execSuccess', 'syncComponent', 'anchors', 'linkmenu', 'output', 'reload'] // 閫夐」鍒楄〃
diff --git a/src/menu/components/form/formaction/formconfig.jsx b/src/menu/components/form/formaction/formconfig.jsx
index 2e98dbc..e90047a 100644
--- a/src/menu/components/form/formaction/formconfig.jsx
+++ b/src/menu/components/form/formaction/formconfig.jsx
@@ -14,6 +14,8 @@
_type = '涓嬩竴姝�'
} else if (card.type === 'close') {
_type = '鍏抽棴'
+ } else if (card.type === 'reset') {
+ _type = '閲嶇疆'
}
let menulist = []
diff --git a/src/menu/components/form/formaction/index.jsx b/src/menu/components/form/formaction/index.jsx
index 50fae57..ed05fb3 100644
--- a/src/menu/components/form/formaction/index.jsx
+++ b/src/menu/components/form/formaction/index.jsx
@@ -65,6 +65,8 @@
group.nextButton.style = style
} else if (card.type === 'close') {
group.closeButton.style = style
+ } else if (card.type === 'reset') {
+ group.resetButton.style = style
}
this.props.updateconfig(group)
@@ -148,6 +150,9 @@
} else if (res.type === 'close') {
res.enable = group.closeButton.enable || 'true'
group.closeButton = res
+ } else if (res.type === 'reset') {
+ res.enable = group.resetButton.enable || 'true'
+ group.resetButton = res
}
this.setState({
@@ -220,6 +225,14 @@
} trigger="hover">
<Button type="link" className="submit mk-primary" onDoubleClick={this.changeMenu} style={resetStyle(group.subButton.style)}>{group.subButton.label}</Button>
</Popover>
+ {group.resetButton && group.resetButton.enable === 'true' ? <Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
+ <div className="mk-popover-control">
+ <EditOutlined className="edit" title="缂栬緫" onClick={() => this.handleAction(group.resetButton)} />
+ <FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={() => this.handleStyle(group.resetButton)}/>
+ </div>
+ } trigger="hover">
+ <Button type="link" style={resetStyle(group.resetButton.style)}>{group.resetButton.label}</Button>
+ </Popover> : null}
{group.closeButton && group.closeButton.enable === 'true' ? <Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
<EditOutlined className="edit" title="缂栬緫" onClick={() => this.handleAction(group.closeButton)} />
diff --git a/src/menu/components/form/simple-form/index.jsx b/src/menu/components/form/simple-form/index.jsx
index 15527e3..ba3c39c 100644
--- a/src/menu/components/form/simple-form/index.jsx
+++ b/src/menu/components/form/simple-form/index.jsx
@@ -523,6 +523,7 @@
res.enable = buttons.includes('enable') ? 'true' : 'false'
res.closeEnable = buttons.includes('closeEnable') ? 'true' : 'false'
+ res.resetEnable = buttons.includes('resetEnable') ? 'true' : 'false'
_card.wrap = res
@@ -546,6 +547,11 @@
} else if (_card.subcards[0].closeButton) {
_card.subcards[0].closeButton.enable = _card.wrap.closeEnable
}
+ if (_card.wrap.resetEnable === 'true' && !_card.subcards[0].resetButton) {
+ _card.subcards[0].resetButton = {label: '閲嶇疆', enable: 'true', type: 'reset', style: {backgroundColor: '#ffffff', color: 'rgba(0,0,0,0.65)', borderColor: '#d9d9d9', borderWidth: '1px', paddingLeft: '25px', paddingRight: '25px', paddingTop: '5px', paddingBottom: '5px', marginLeft: '10px'}}
+ } else if (_card.subcards[0].resetButton) {
+ _card.subcards[0].resetButton.enable = _card.wrap.resetEnable
+ }
this.updateComponent(_card)
}
diff --git a/src/menu/components/form/simple-form/options.jsx b/src/menu/components/form/simple-form/options.jsx
index 1ace5c6..9df9c00 100644
--- a/src/menu/components/form/simple-form/options.jsx
+++ b/src/menu/components/form/simple-form/options.jsx
@@ -53,6 +53,9 @@
if (wrap.closeEnable === 'true') {
buttons.push('closeEnable')
}
+ if (wrap.resetEnable === 'true') {
+ buttons.push('resetEnable')
+ }
const wrapForm = [
{
@@ -152,6 +155,7 @@
required: false,
options: [
{value: 'enable', label: '鎻愪氦'},
+ {value: 'resetEnable', label: '閲嶇疆'},
{value: 'closeEnable', label: '鍏抽棴'},
],
},
diff --git a/src/tabviews/custom/components/form/simple-form/index.jsx b/src/tabviews/custom/components/form/simple-form/index.jsx
index 8115aea..5b3c32c 100644
--- a/src/tabviews/custom/components/form/simple-form/index.jsx
+++ b/src/tabviews/custom/components/form/simple-form/index.jsx
@@ -63,7 +63,7 @@
let _group = _config.subcards[0]
- if (_group.subButton.enable === 'false' && (!_group.closeButton || _group.closeButton.enable !== 'true')) {
+ if (_group.subButton.enable === 'false' && (!_group.closeButton || _group.closeButton.enable !== 'true') && (!_group.resetButton || _group.resetButton.enable !== 'true')) {
_group.subButton.style.display = 'none'
_group.$button = 'no-button'
}
@@ -318,6 +318,16 @@
MKEmitter.emit('closeTabView', group.subButton.$MenuID)
}
+ resetTab = () => {
+ const { data } = this.state
+
+ this.setState({
+ data: null
+ }, () => {
+ this.setState({data: data})
+ })
+ }
+
render() {
const { config, loading, BID, BData, data, group } = this.state
@@ -350,6 +360,7 @@
columns={config.columns}
selectedData={data.$$empty ? [] : [data]}
/>
+ {group.resetButton && group.resetButton.enable === 'true' ? <Button type="link" onClick={this.resetTab} style={group.resetButton.style}>{group.resetButton.label}</Button> : null}
{group.closeButton && group.closeButton.enable === 'true' ? <Button type="link" onClick={this.closeTab} style={group.closeButton.style}>{group.closeButton.label}</Button> : null}
</div> : null}
</div>
diff --git a/src/templates/zshare/formconfig.jsx b/src/templates/zshare/formconfig.jsx
index 3faf7b4..f2373e3 100644
--- a/src/templates/zshare/formconfig.jsx
+++ b/src/templates/zshare/formconfig.jsx
@@ -3870,7 +3870,7 @@
type: 'radio',
key: 'constant',
label: 'Unicode甯搁噺',
- tooltip: '浣跨敤鏃跺皢鍦ㄦ彁浜ゅ唴瀹瑰墠鍔犱笂 N锛屼唬琛ㄥ瓨鍏ユ暟鎹簱鏃朵互 Unicode 鏍煎紡瀛樺偍銆�',
+ tooltip: `浣跨敤鏃跺皢鍦ㄦ彁浜ゅ唴瀹瑰墠鍔犱笂 N锛屼唬琛ㄥ瓨鍏ユ暟鎹簱鏃朵互 Unicode 鏍煎紡瀛樺偍銆備緥濡傦細@nvarchar=N'脴W30041'銆俙,
initVal: card.constant || 'false',
options: [{
value: 'true',
--
Gitblit v1.8.0