From abd77ca3a8013ebadec10d45f3316a19724d4fc7 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 23 十二月 2021 15:13:13 +0800
Subject: [PATCH] 2021-12-23
---
src/menu/components/chart/antv-bar/chartcompile/index.jsx | 3 ++-
src/tabviews/custom/components/card/cardcellList/index.jsx | 5 +++++
src/tabviews/zshare/actionList/tabbutton/index.jsx | 2 +-
src/tabviews/zshare/actionList/popupbutton/index.jsx | 1 -
src/menu/components/share/actioncomponent/formconfig.jsx | 5 ++++-
src/tabviews/zshare/normalTable/index.jsx | 2 ++
src/tabviews/zshare/actionList/excelInbutton/index.jsx | 2 +-
src/tabviews/zshare/actionList/printbutton/index.jsx | 1 -
src/tabviews/zshare/actionList/exceloutbutton/index.jsx | 2 +-
src/menu/components/chart/antv-bar/index.jsx | 2 +-
src/menu/components/share/actioncomponent/actionform/index.jsx | 4 +++-
src/tabviews/zshare/actionList/index.jsx | 13 +++++--------
src/tabviews/zshare/actionList/newpagebutton/index.jsx | 2 +-
src/tabviews/zshare/actionList/changeuserbutton/index.jsx | 2 +-
14 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/src/menu/components/chart/antv-bar/chartcompile/index.jsx b/src/menu/components/chart/antv-bar/chartcompile/index.jsx
index cd66b94..16590f3 100644
--- a/src/menu/components/chart/antv-bar/chartcompile/index.jsx
+++ b/src/menu/components/chart/antv-bar/chartcompile/index.jsx
@@ -206,6 +206,7 @@
dataIndex: 'title',
inputType: 'select',
editable: true,
+ required: false,
width: '12%',
options: [
{ value: 'true', text: '鏄剧ず'},
@@ -213,7 +214,7 @@
],
render: (text, record) => {
let trans = {'true': '鏄剧ず', 'false': '闅愯棌'}
- return trans[text] || '鏄剧ず'
+ return trans[text] || ''
}
},
{
diff --git a/src/menu/components/chart/antv-bar/index.jsx b/src/menu/components/chart/antv-bar/index.jsx
index c31b3c2..d5600ef 100644
--- a/src/menu/components/chart/antv-bar/index.jsx
+++ b/src/menu/components/chart/antv-bar/index.jsx
@@ -553,7 +553,7 @@
})
let padding = [10, 30, 30, 30]
- if (plot.mutilBar === 'overlap') {
+ if (plot.mutilBar === 'overlap' || Bar_axis.length === 1) {
Bar_axis = []
}
diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index d328729..71396e9 100644
--- a/src/menu/components/share/actioncomponent/actionform/index.jsx
+++ b/src/menu/components/share/actioncomponent/actionform/index.jsx
@@ -223,7 +223,9 @@
if (_Ot !== 'notRequired' && _opentype !== 'excelOut') {
_options.push('control')
- if (_control) {
+ if (_control === 'parent') {
+ _options.push('controlVal')
+ } else if (_control) {
_options.push('controlField', 'controlVal')
}
}
diff --git a/src/menu/components/share/actioncomponent/formconfig.jsx b/src/menu/components/share/actioncomponent/formconfig.jsx
index 9ee1698..24c2e3a 100644
--- a/src/menu/components/share/actioncomponent/formconfig.jsx
+++ b/src/menu/components/share/actioncomponent/formconfig.jsx
@@ -756,6 +756,9 @@
}, {
value: 'hidden',
text: '闅愯棌'
+ // }, {
+ // value: 'parent',
+ // text: '涓婄骇'
}]
},
{
@@ -772,7 +775,7 @@
type: 'text',
key: 'controlVal',
label: '鎺у埗鍊�',
- tooltip: '褰撻�夋嫨鎺у埗瀛楁锛屼笖瀛楁鍊间笌鎺у埗鍊肩浉绛夋椂锛屾寜閽細闅愯棌鎴栫鐢紝澶氫釜鍊肩敤閫楀彿鍒嗛殧銆�',
+ tooltip: '褰撻�夋嫨绂佺敤鎴栭殣钘忥紝涓斿瓧娈靛�间笌鎺у埗鍊肩浉绛夋椂锛屾寜閽細闅愯棌鎴栫鐢紝澶氫釜鍊肩敤閫楀彿鍒嗛殧銆傚綋閫夋嫨涓婄骇鏃讹紝榛樿闅愯棌锛屽彧鏈変富琛ㄨ淇℃伅绗﹀悎鏉′欢鏃舵樉绀猴紝鏍煎紡涓篅field@:values锛宖ield涓轰富琛ㄥ瓧娈靛悕锛寁alues涓哄�煎涓彲鐢ㄩ�楀彿鎷兼帴',
initVal: card.controlVal || '',
required: false
},
diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index 747bad8..828b097 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -683,6 +683,7 @@
<Col key={card.uuid} className="mk-cell-btn" span={card.width}>
<ExcelInButton
BID={data.$$BID}
+ BData={data.$$BData || ''}
btn={card}
show={card.show}
style={card.style}
@@ -696,6 +697,7 @@
<Col key={card.uuid} className="mk-cell-btn" span={card.width}>
<ExcelOutButton
BID={data.$$BID}
+ BData={data.$$BData || ''}
btn={card}
show={card.show}
style={card.style}
@@ -721,6 +723,7 @@
return (
<Col key={card.uuid} className="mk-cell-btn" span={card.width}>
<TabButton
+ BData={data.$$BData || ''}
btn={card}
show={card.show}
style={card.style}
@@ -733,6 +736,7 @@
return (
<Col key={card.uuid} className="mk-cell-btn" span={card.width}>
<NewPageButton
+ BData={data.$$BData || ''}
btn={card}
show={card.show}
style={card.style}
@@ -747,6 +751,7 @@
<Col key={card.uuid} className="mk-cell-btn" span={card.width}>
<ChangeUserButton
BID={data.$$BID}
+ BData={data.$$BData || ''}
btn={card}
show={card.show}
style={card.style}
diff --git a/src/tabviews/zshare/actionList/changeuserbutton/index.jsx b/src/tabviews/zshare/actionList/changeuserbutton/index.jsx
index 407912c..f47853c 100644
--- a/src/tabviews/zshare/actionList/changeuserbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/changeuserbutton/index.jsx
@@ -15,8 +15,8 @@
class NewPageButton extends Component {
static propTpyes = {
show: PropTypes.any, // 鎸夐挳鏄剧ず鏍峰紡鎺у埗
- position: PropTypes.any, // 鎸夐挳浣嶇疆锛屽伐鍏锋爮涓簍oolbar
MenuID: PropTypes.any, // 鑿滃崟ID
+ BData: PropTypes.any, // 涓昏〃鏁版嵁
BID: PropTypes.string, // 涓昏〃ID
btn: PropTypes.object, // 鎸夐挳
selectedData: PropTypes.any, // 瀛愯〃涓�夋嫨鏁版嵁
diff --git a/src/tabviews/zshare/actionList/excelInbutton/index.jsx b/src/tabviews/zshare/actionList/excelInbutton/index.jsx
index 36f0a62..09c9f84 100644
--- a/src/tabviews/zshare/actionList/excelInbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/excelInbutton/index.jsx
@@ -18,8 +18,8 @@
class ExcelInButton extends Component {
static propTpyes = {
show: PropTypes.any, // 鏄剧ず鏍峰紡
- position: PropTypes.any, // 鎸夐挳浣嶇疆锛屽伐鍏锋爮涓簍oolbar
BID: PropTypes.string, // 涓昏〃ID
+ BData: PropTypes.any, // 涓昏〃鏁版嵁
selectedData: PropTypes.any, // 瀛愯〃涓�夋嫨鏁版嵁
Tab: PropTypes.any, // 濡傛灉褰撳墠鍏冪礌涓烘爣绛炬椂锛宼ab涓烘爣绛句俊鎭�
btn: PropTypes.object, // 鎸夐挳
diff --git a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
index d54aed8..3f3d390 100644
--- a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
@@ -18,7 +18,7 @@
class ExcelOutButton extends Component {
static propTpyes = {
BID: PropTypes.string, // 涓昏〃ID
- position: PropTypes.any, // 鎸夐挳浣嶇疆锛屽伐鍏锋爮涓簍oolbar
+ BData: PropTypes.any, // 涓昏〃鏁版嵁
show: PropTypes.any, // 鏄剧ず鏍峰紡
Tab: PropTypes.any, // 濡傛灉褰撳墠鍏冪礌涓烘爣绛炬椂锛宼ab涓烘爣绛句俊鎭�
btn: PropTypes.object, // 鎸夐挳
diff --git a/src/tabviews/zshare/actionList/index.jsx b/src/tabviews/zshare/actionList/index.jsx
index f446b69..068783c 100644
--- a/src/tabviews/zshare/actionList/index.jsx
+++ b/src/tabviews/zshare/actionList/index.jsx
@@ -49,7 +49,6 @@
BData={BData}
setting={setting}
columns={columns}
- position="toolbar"
ContainerId={ContainerId}
selectedData={selectedData}
/>
@@ -62,8 +61,8 @@
BID={BID}
Tab={Tab}
btn={item}
+ BData={BData}
setting={setting}
- position="toolbar"
selectedData={selectedData}
/>
)
@@ -75,8 +74,8 @@
BID={BID}
Tab={Tab}
btn={item}
+ BData={BData}
setting={setting}
- position="toolbar"
/>
)
} else if (item.OpenType === 'popview') {
@@ -89,7 +88,6 @@
btn={item}
BData={BData}
setting={setting}
- position="toolbar"
selectedData={selectedData}
/>
)
@@ -99,9 +97,9 @@
key={item.uuid}
show={item.show || 'actionList'}
btn={item}
+ BData={BData}
MenuID={MenuID}
setting={setting}
- position="toolbar"
selectedData={selectedData}
/>
)
@@ -111,8 +109,8 @@
key={item.uuid}
show="actionList"
btn={item}
+ BData={BData}
setting={setting}
- position="toolbar"
selectedData={selectedData}
/>
)
@@ -124,9 +122,9 @@
show={item.show || 'actionList'}
BID={BID}
btn={item}
+ BData={BData}
MenuID={MenuID}
setting={setting}
- position="toolbar"
selectedData={selectedData}
/>
)
@@ -140,7 +138,6 @@
btn={item}
BData={BData}
setting={setting}
- position="toolbar"
ContainerId={ContainerId}
selectedData={selectedData}
/>
diff --git a/src/tabviews/zshare/actionList/newpagebutton/index.jsx b/src/tabviews/zshare/actionList/newpagebutton/index.jsx
index c203721..517e7fa 100644
--- a/src/tabviews/zshare/actionList/newpagebutton/index.jsx
+++ b/src/tabviews/zshare/actionList/newpagebutton/index.jsx
@@ -14,7 +14,7 @@
class NewPageButton extends Component {
static propTpyes = {
show: PropTypes.any, // 鎸夐挳鏄剧ず鏍峰紡鎺у埗
- position: PropTypes.any, // 鎸夐挳浣嶇疆锛屽伐鍏锋爮涓簍oolbar
+ BData: PropTypes.any, // 涓昏〃鏁版嵁
btn: PropTypes.object, // 鎸夐挳
selectedData: PropTypes.any, // 瀛愯〃涓�夋嫨鏁版嵁
setting: PropTypes.any, // 椤甸潰閫氱敤璁剧疆
diff --git a/src/tabviews/zshare/actionList/popupbutton/index.jsx b/src/tabviews/zshare/actionList/popupbutton/index.jsx
index af830c6..9be39f6 100644
--- a/src/tabviews/zshare/actionList/popupbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/popupbutton/index.jsx
@@ -16,7 +16,6 @@
class PopupButton extends Component {
static propTpyes = {
show: PropTypes.any, // 鎸夐挳鏄剧ず鏍峰紡鎺у埗
- position: PropTypes.any, // 鎸夐挳浣嶇疆锛屽伐鍏锋爮涓簍oolbar
BID: PropTypes.string, // 涓昏〃ID
BData: PropTypes.any, // 涓昏〃鏁版嵁
selectedData: PropTypes.any, // 瀛愯〃涓�夋嫨鏁版嵁
diff --git a/src/tabviews/zshare/actionList/printbutton/index.jsx b/src/tabviews/zshare/actionList/printbutton/index.jsx
index 2c2e490..20c7891 100644
--- a/src/tabviews/zshare/actionList/printbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/printbutton/index.jsx
@@ -23,7 +23,6 @@
class PrintButton extends Component {
static propTpyes = {
show: PropTypes.any, // 鎸夐挳鏄剧ず鏍峰紡鎺у埗
- position: PropTypes.any, // 鎸夐挳浣嶇疆锛屽伐鍏锋爮涓簍oolbar
BID: PropTypes.string, // 涓昏〃ID
BData: PropTypes.any, // 涓昏〃鏁版嵁
selectedData: PropTypes.any, // 瀛愯〃涓�夋嫨鏁版嵁
diff --git a/src/tabviews/zshare/actionList/tabbutton/index.jsx b/src/tabviews/zshare/actionList/tabbutton/index.jsx
index da66493..eaff854 100644
--- a/src/tabviews/zshare/actionList/tabbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/tabbutton/index.jsx
@@ -13,7 +13,7 @@
class TabButton extends Component {
static propTpyes = {
show: PropTypes.any, // 鎸夐挳鏄剧ず鏍峰紡鎺у埗
- position: PropTypes.any, // 鎸夐挳浣嶇疆锛屽伐鍏锋爮涓簍oolbar
+ BData: PropTypes.any, // 涓昏〃鏁版嵁
MenuID: PropTypes.string, // 鑿滃崟ID
btn: PropTypes.object, // 鎸夐挳
selectedData: PropTypes.any, // 瀛愯〃涓�夋嫨鏁版嵁
diff --git a/src/tabviews/zshare/normalTable/index.jsx b/src/tabviews/zshare/normalTable/index.jsx
index ddbb12b..41e586a 100644
--- a/src/tabviews/zshare/normalTable/index.jsx
+++ b/src/tabviews/zshare/normalTable/index.jsx
@@ -749,6 +749,7 @@
key={btn.uuid}
btn={btn}
selectedData={[record]}
+ BData={this.props.BData}
MenuID={this.props.MenuID}
setting={this.props.setting}
/>
@@ -759,6 +760,7 @@
key={btn.uuid}
btn={btn}
selectedData={[record]}
+ BData={this.props.BData}
setting={this.props.setting}
/>
)
--
Gitblit v1.8.0