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 +++++++++++++++++++--------- 1 files changed, 19 insertions(+), 9 deletions(-) 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} -- Gitblit v1.8.0