From c1f9e05741e64087ebbfa5e1185bfd0beeb4eeb5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 07 一月 2022 17:50:18 +0800
Subject: [PATCH] 2022-01-07

---
 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 e3da235..5608b31 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -328,9 +328,11 @@
         val = data[card.field]
       }
 
-      if (val !== '' && typeof(val) === 'number') {
+      if (typeof(val) === 'number') {
         if (card.format === 'percent') {
           val = val * 100
+        } else if (card.format === 'abs') {
+          val = Math.abs(val)
         }
 
         if (card.col && card.col.type === 'number') {
@@ -667,11 +669,12 @@
 
       if (['exec', 'prompt', 'pop', 'form'].includes(card.OpenType)) {
         return (
-          <Col key={card.uuid} className="mk-cell-btn" span={card.width}>
+          <Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} span={card.width}>
             <NormalButton
               BID={data.$$BID}
               BData={data.$$BData || ''}
               disabled={data.$disabled}
+              lineId={data.$$key || ''}
               btn={card}
               show={card.show}
               style={card.style}
@@ -683,11 +686,12 @@
         )
       } else if (card.OpenType === 'excelIn') {
         return (
-          <Col key={card.uuid} className="mk-cell-btn" span={card.width}>
+          <Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} span={card.width}>
             <ExcelInButton
               BID={data.$$BID}
               BData={data.$$BData || ''}
               disabled={data.$disabled}
+              lineId={data.$$key || ''}
               btn={card}
               show={card.show}
               style={card.style}
@@ -698,10 +702,11 @@
         )
       } else if (card.OpenType === 'excelOut') {
         return (
-          <Col key={card.uuid} className="mk-cell-btn" span={card.width}>
+          <Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} span={card.width}>
             <ExcelOutButton
               BID={data.$$BID}
               BData={data.$$BData || ''}
+              lineId={data.$$key || ''}
               disabled={data.$disabled}
               btn={card}
               show={card.show}
@@ -712,11 +717,12 @@
         )
       } else if (card.OpenType === 'popview') {
         return (
-          <Col key={card.uuid} className="mk-cell-btn" span={card.width}>
+          <Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} span={card.width}>
             <PopupButton
               BID={data.$$BID}
               BData={data.$$BData || ''}
               disabled={data.$disabled}
+              lineId={data.$$key || ''}
               btn={card}
               show={card.show}
               style={card.style}
@@ -727,10 +733,11 @@
         )
       } else if (card.OpenType === 'tab') {
         return (
-          <Col key={card.uuid} className="mk-cell-btn" span={card.width}>
+          <Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} span={card.width}>
             <TabButton
               BData={data.$$BData || ''}
               disabled={data.$disabled}
+              lineId={data.$$key || ''}
               btn={card}
               show={card.show}
               style={card.style}
@@ -741,10 +748,11 @@
         )
       } else if (card.OpenType === 'innerpage') {
         return (
-          <Col key={card.uuid} className="mk-cell-btn" span={card.width}>
+          <Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} span={card.width}>
             <NewPageButton
               BData={data.$$BData || ''}
               disabled={data.$disabled}
+              lineId={data.$$key || ''}
               btn={card}
               show={card.show}
               style={card.style}
@@ -756,11 +764,12 @@
       } else if (card.OpenType === 'funcbutton') {
         if (card.funcType === 'changeuser' || card.funcType === 'closetab') {
           return (
-            <Col key={card.uuid} className="mk-cell-btn" span={card.width}>
+            <Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} span={card.width}>
               <ChangeUserButton
                 BID={data.$$BID}
                 BData={data.$$BData || ''}
                 disabled={data.$disabled}
+                lineId={data.$$key || ''}
                 btn={card}
                 show={card.show}
                 style={card.style}
@@ -771,11 +780,12 @@
           )
         } else if (card.funcType === 'print') {
           return (
-            <Col key={card.uuid} className="mk-cell-btn" span={card.width}>
+            <Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} span={card.width}>
               <PrintButton
                 BID={data.$$BID}
                 BData={data.$$BData || ''}
                 disabled={data.$disabled}
+                lineId={data.$$key || ''}
                 btn={card}
                 show={card.show}
                 style={card.style}

--
Gitblit v1.8.0