From 151f90d6aa701be749ff2fc80b3599b88ece3844 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 23 三月 2022 21:22:04 +0800
Subject: [PATCH] 2022-03-23
---
src/tabviews/custom/components/card/cardcellList/index.jsx | 28 +++++++++++++++++++---------
src/tabviews/zshare/actionList/tabbutton/index.jsx | 4 ++--
src/tabviews/zshare/actionList/newpagebutton/index.jsx | 4 ++--
src/tabviews/zshare/actionList/popupbutton/index.jsx | 4 ++--
src/tabviews/zshare/actionList/normalbutton/index.jsx | 4 ++--
src/menu/components/card/cardcellcomponent/elementform/index.jsx | 2 +-
src/tabviews/zshare/actionList/changeuserbutton/index.jsx | 4 ++--
src/tabviews/zshare/actionList/excelInbutton/index.jsx | 4 ++--
src/tabviews/zshare/actionList/printbutton/index.jsx | 4 ++--
9 files changed, 34 insertions(+), 24 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/elementform/index.jsx b/src/menu/components/card/cardcellcomponent/elementform/index.jsx
index 3406ca1..1aaec05 100644
--- a/src/menu/components/card/cardcellcomponent/elementform/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/elementform/index.jsx
@@ -16,7 +16,7 @@
const cardTypeOptions = {
sequence: ['eleType', 'width'],
text: ['eleType', 'datatype', 'format', 'width', 'height', 'prefix', 'postfix', 'link', 'noValue'],
- number: ['eleType', 'datatype', 'format', 'width', 'height', 'prefix', 'postfix'],
+ number: ['eleType', 'datatype', 'format', 'width', 'height', 'prefix', 'postfix', 'noValue'],
picture: ['eleType', 'datatype', 'width', 'lenWidRadio', 'maxWidth', 'link', 'noValue'],
video: ['eleType', 'datatype', 'width', 'aspectRatio', 'autoPlay', 'loop', 'noValue'],
icon: ['eleType', 'icon', 'datatype', 'width'],
diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index 149d043..bfbb71e 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -328,6 +328,10 @@
val = data[card.field]
}
+ if (val === '' && card.noValue === 'hide') { // 绌哄�奸殣钘�
+ return null
+ }
+
if (typeof(val) === 'number') {
if (card.format === 'percent') {
val = val * 100
@@ -650,10 +654,16 @@
</Col>
)
} else if (card.eleType === 'button') {
+ let _disabled = data.$disabled
if (card.control === 'hidden') {
- let s = data[card.controlField]
+ let s = data[card.controlField] !== undefined ? data[card.controlField] + '' : ''
if (s === card.controlVal || (card.controlVal && card.controlVal.split(',').includes(s))) {
return null
+ }
+ } else if (card.control === 'disabled') {
+ let s = data[card.controlField] !== undefined ? data[card.controlField] + '' : ''
+ if (s === card.controlVal || (card.controlVal && card.controlVal.split(',').includes(s))) {
+ _disabled = true
}
}
@@ -673,7 +683,7 @@
<NormalButton
BID={data.$$BID}
BData={data.$$BData || ''}
- disabled={data.$disabled}
+ disabled={_disabled}
lineId={data.$$key || ''}
btn={card}
show={card.show}
@@ -690,7 +700,7 @@
<ExcelInButton
BID={data.$$BID}
BData={data.$$BData || ''}
- disabled={data.$disabled}
+ disabled={_disabled}
lineId={data.$$key || ''}
btn={card}
show={card.show}
@@ -707,7 +717,7 @@
BID={data.$$BID}
BData={data.$$BData || ''}
lineId={data.$$key || ''}
- disabled={data.$disabled}
+ disabled={_disabled}
btn={card}
show={card.show}
style={card.style}
@@ -721,7 +731,7 @@
<PopupButton
BID={data.$$BID}
BData={data.$$BData || ''}
- disabled={data.$disabled}
+ disabled={_disabled}
lineId={data.$$key || ''}
btn={card}
show={card.show}
@@ -736,7 +746,7 @@
<Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} span={card.width}>
<TabButton
BData={data.$$BData || ''}
- disabled={data.$disabled}
+ disabled={_disabled}
lineId={data.$$key || ''}
btn={card}
show={card.show}
@@ -751,7 +761,7 @@
<Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} span={card.width}>
<NewPageButton
BData={data.$$BData || ''}
- disabled={data.$disabled}
+ disabled={_disabled}
lineId={data.$$key || ''}
btn={card}
show={card.show}
@@ -768,7 +778,7 @@
<ChangeUserButton
BID={data.$$BID}
BData={data.$$BData || ''}
- disabled={data.$disabled}
+ disabled={_disabled}
lineId={data.$$key || ''}
btn={card}
show={card.show}
@@ -784,7 +794,7 @@
<PrintButton
BID={data.$$BID}
BData={data.$$BData || ''}
- disabled={data.$disabled}
+ disabled={_disabled}
lineId={data.$$key || ''}
btn={card}
show={card.show}
diff --git a/src/tabviews/zshare/actionList/changeuserbutton/index.jsx b/src/tabviews/zshare/actionList/changeuserbutton/index.jsx
index f04d337..efe644b 100644
--- a/src/tabviews/zshare/actionList/changeuserbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/changeuserbutton/index.jsx
@@ -38,7 +38,7 @@
if (btn.controlField && selectedData && selectedData.length > 0) { // 琛ㄦ牸涓寜閽殣钘忔帶鍒�
selectedData.forEach(item => {
- let s = item[btn.controlField] + ''
+ let s = item[btn.controlField] !== undefined ? item[btn.controlField] + '' : ''
if (s === btn.controlVal || (btn.controlVal && btn.controlVal.split(',').includes(s))) {
disabled = true
}
@@ -77,7 +77,7 @@
if (btn.controlField && !is(fromJS(nextProps.selectedData || []), fromJS(selectedData || []))) {
if (nextProps.selectedData && nextProps.selectedData.length > 0) { // 琛ㄦ牸涓寜閽殣钘忔帶鍒�
nextProps.selectedData.forEach(item => {
- let s = item[btn.controlField] + ''
+ let s = item[btn.controlField] !== undefined ? item[btn.controlField] + '' : ''
if (s === btn.controlVal || (btn.controlVal && btn.controlVal.split(',').includes(s))) {
disabled = true
}
diff --git a/src/tabviews/zshare/actionList/excelInbutton/index.jsx b/src/tabviews/zshare/actionList/excelInbutton/index.jsx
index 01eb659..2fb5f25 100644
--- a/src/tabviews/zshare/actionList/excelInbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/excelInbutton/index.jsx
@@ -43,7 +43,7 @@
if (btn.controlField && selectedData && selectedData.length > 0) { // 琛ㄦ牸涓寜閽殣钘忔帶鍒�
selectedData.forEach(item => {
- let s = item[btn.controlField] + ''
+ let s = item[btn.controlField] !== undefined ? item[btn.controlField] + '' : ''
if (s === btn.controlVal || (btn.controlVal && btn.controlVal.split(',').includes(s))) {
disabled = true
}
@@ -82,7 +82,7 @@
if (btn.controlField && !is(fromJS(nextProps.selectedData || []), fromJS(selectedData || []))) {
if (nextProps.selectedData && nextProps.selectedData.length > 0) { // 琛ㄦ牸涓寜閽殣钘忔帶鍒�
nextProps.selectedData.forEach(item => {
- let s = item[btn.controlField] + ''
+ let s = item[btn.controlField] !== undefined ? item[btn.controlField] + '' : ''
if (s === btn.controlVal || (btn.controlVal && btn.controlVal.split(',').includes(s))) {
disabled = true
}
diff --git a/src/tabviews/zshare/actionList/newpagebutton/index.jsx b/src/tabviews/zshare/actionList/newpagebutton/index.jsx
index 8914d39..2d7ccac 100644
--- a/src/tabviews/zshare/actionList/newpagebutton/index.jsx
+++ b/src/tabviews/zshare/actionList/newpagebutton/index.jsx
@@ -35,7 +35,7 @@
if (btn.controlField && selectedData && selectedData.length > 0) { // 琛ㄦ牸涓寜閽殣钘忔帶鍒�
selectedData.forEach(item => {
- let s = item[btn.controlField] + ''
+ let s = item[btn.controlField] !== undefined ? item[btn.controlField] + '' : ''
if (s === btn.controlVal || (btn.controlVal && btn.controlVal.split(',').includes(s))) {
disabled = true
}
@@ -74,7 +74,7 @@
if (btn.controlField && !is(fromJS(nextProps.selectedData || []), fromJS(selectedData || []))) {
if (nextProps.selectedData && nextProps.selectedData.length > 0) { // 琛ㄦ牸涓寜閽殣钘忔帶鍒�
nextProps.selectedData.forEach(item => {
- let s = item[btn.controlField] + ''
+ let s = item[btn.controlField] !== undefined ? item[btn.controlField] + '' : ''
if (s === btn.controlVal || (btn.controlVal && btn.controlVal.split(',').includes(s))) {
disabled = true
}
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index 4edf0ee..de43359 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -60,7 +60,7 @@
if (btn.controlField && selectedData && selectedData.length > 0) { // 琛ㄦ牸涓寜閽殣钘忔帶鍒�
selectedData.forEach(item => {
- let s = item[btn.controlField] + ''
+ let s = item[btn.controlField] !== undefined ? item[btn.controlField] + '' : ''
if (s === btn.controlVal || (btn.controlVal && btn.controlVal.split(',').includes(s))) {
disabled = true
}
@@ -117,7 +117,7 @@
if (btn.controlField && !is(fromJS(nextProps.selectedData || []), fromJS(selectedData || []))) {
if (nextProps.selectedData && nextProps.selectedData.length > 0) { // 琛ㄦ牸涓寜閽殣钘忔帶鍒�
nextProps.selectedData.forEach(item => {
- let s = item[btn.controlField] + ''
+ let s = item[btn.controlField] !== undefined ? item[btn.controlField] + '' : ''
if (s === btn.controlVal || (btn.controlVal && btn.controlVal.split(',').includes(s))) {
disabled = true
}
diff --git a/src/tabviews/zshare/actionList/popupbutton/index.jsx b/src/tabviews/zshare/actionList/popupbutton/index.jsx
index cc5849f..b1721bd 100644
--- a/src/tabviews/zshare/actionList/popupbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/popupbutton/index.jsx
@@ -43,7 +43,7 @@
if (btn.controlField && selectedData && selectedData.length > 0) { // 琛ㄦ牸涓寜閽殣钘忔帶鍒�
selectedData.forEach(item => {
- let s = item[btn.controlField] + ''
+ let s = item[btn.controlField] !== undefined ? item[btn.controlField] + '' : ''
if (s === btn.controlVal || (btn.controlVal && btn.controlVal.split(',').includes(s))) {
disabled = true
}
@@ -85,7 +85,7 @@
if (btn.controlField && !is(fromJS(nextProps.selectedData || []), fromJS(selectedData || []))) {
if (nextProps.selectedData && nextProps.selectedData.length > 0) { // 琛ㄦ牸涓寜閽殣钘忔帶鍒�
nextProps.selectedData.forEach(item => {
- let s = item[btn.controlField] + ''
+ let s = item[btn.controlField] !== undefined ? item[btn.controlField] + '' : ''
if (s === btn.controlVal || (btn.controlVal && btn.controlVal.split(',').includes(s))) {
disabled = true
}
diff --git a/src/tabviews/zshare/actionList/printbutton/index.jsx b/src/tabviews/zshare/actionList/printbutton/index.jsx
index 8d97947..329aa84 100644
--- a/src/tabviews/zshare/actionList/printbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/printbutton/index.jsx
@@ -54,7 +54,7 @@
if (btn.controlField && selectedData && selectedData.length > 0) { // 琛ㄦ牸涓寜閽殣钘忔帶鍒�
selectedData.forEach(item => {
- let s = item[btn.controlField] + ''
+ let s = item[btn.controlField] !== undefined ? item[btn.controlField] + '' : ''
if (s === btn.controlVal || (btn.controlVal && btn.controlVal.split(',').includes(s))) {
disabled = true
}
@@ -99,7 +99,7 @@
if (btn.controlField && !is(fromJS(nextProps.selectedData || []), fromJS(selectedData || []))) {
if (nextProps.selectedData && nextProps.selectedData.length > 0) { // 琛ㄦ牸涓寜閽殣钘忔帶鍒�
nextProps.selectedData.forEach(item => {
- let s = item[btn.controlField] + ''
+ let s = item[btn.controlField] !== undefined ? item[btn.controlField] + '' : ''
if (s === btn.controlVal || (btn.controlVal && btn.controlVal.split(',').includes(s))) {
disabled = true
}
diff --git a/src/tabviews/zshare/actionList/tabbutton/index.jsx b/src/tabviews/zshare/actionList/tabbutton/index.jsx
index 42774f4..5050452 100644
--- a/src/tabviews/zshare/actionList/tabbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/tabbutton/index.jsx
@@ -35,7 +35,7 @@
if (btn.controlField && selectedData && selectedData.length > 0) { // 琛ㄦ牸涓寜閽殣钘忔帶鍒�
selectedData.forEach(item => {
- let s = item[btn.controlField] + ''
+ let s = item[btn.controlField] !== undefined ? item[btn.controlField] + '' : ''
if (s === btn.controlVal || (btn.controlVal && btn.controlVal.split(',').includes(s))) {
disabled = true
}
@@ -74,7 +74,7 @@
if (btn.controlField && !is(fromJS(nextProps.selectedData || []), fromJS(selectedData || []))) {
if (nextProps.selectedData && nextProps.selectedData.length > 0) { // 琛ㄦ牸涓寜閽殣钘忔帶鍒�
nextProps.selectedData.forEach(item => {
- let s = item[btn.controlField] + ''
+ let s = item[btn.controlField] !== undefined ? item[btn.controlField] + '' : ''
if (s === btn.controlVal || (btn.controlVal && btn.controlVal.split(',').includes(s))) {
disabled = true
}
--
Gitblit v1.8.0