From 7b0dbecd1d6155d26ec67be0a47a16264c738c85 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 09 五月 2023 14:48:10 +0800
Subject: [PATCH] 2023-05-09
---
src/tabviews/custom/components/card/cardcellList/index.jsx | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index fe7a373..00fb6a8 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -24,6 +24,7 @@
const PrintButton = asyncComponent(() => import('@/tabviews/zshare/actionList/printbutton'))
const FuncMegvii = asyncComponent(() => import('@/tabviews/zshare/actionList/funcMegvii'))
const FuncZip = asyncComponent(() => import('@/tabviews/zshare/actionList/funczip'))
+const EditLine = asyncComponent(() => import('@/tabviews/zshare/actionList/editLine'))
const BarCode = asyncElementComponent(() => import('@/components/barcode'))
const QrCode = asyncElementComponent(() => import('@/components/qrcode'))
const MkProgress = asyncElementComponent(() => import('@/components/mkProgress'))
@@ -316,7 +317,7 @@
val = data[card.field]
}
- if (val === '' && card.noValue === 'hide') { // 绌哄�奸殣钘�
+ if (!val && card.noValue === 'hide') { // 绌哄�奸殣钘�
return null
}
@@ -646,7 +647,7 @@
val = data[card.field] || ''
}
- if (val === '' && card.noValue === 'hide') { // 绌哄�奸殣钘�
+ if (!val && card.noValue === 'hide') { // 绌哄�奸殣钘�
return null
}
@@ -668,7 +669,7 @@
url = data[card.field] || ''
}
- if (url === '' && card.noValue === 'hide') { // 绌哄�奸殣钘�
+ if (!url && card.noValue === 'hide') { // 绌哄�奸殣钘�
return null
}
@@ -700,7 +701,7 @@
val = data[card.field] || ''
}
- if (val === '' && card.noValue === 'hide') { // 绌哄�奸殣钘�
+ if (!val && card.noValue === 'hide') { // 绌哄�奸殣钘�
return null
}
@@ -757,6 +758,8 @@
val += _val
})
+ } else if (data && data.$$empty) {
+ val = ''
} else if (data) {
let _val = card.formula
Object.keys(data).forEach(key => {
@@ -776,7 +779,7 @@
val = _val === undefined ? '' : _val
}
- if (val === '' && card.noValue === 'hide') { // 绌哄�奸殣钘�
+ if (!val && card.noValue === 'hide') { // 绌哄�奸殣钘�
return null
}
@@ -834,7 +837,7 @@
color = data[card.field] || ''
}
- if (color === '' && card.noValue === 'hide') { // 绌哄�奸殣钘�
+ if (!color && card.noValue === 'hide') { // 绌哄�奸殣钘�
return null
}
@@ -1015,6 +1018,16 @@
/>
</div>
)
+ } else if (card.funcType === 'addline' || card.funcType === 'delline') {
+ contents.push(
+ <div className={'ant-col mk-cell-btn ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
+ <EditLine
+ btn={card}
+ disabled={_disabled}
+ selectedData={_data}
+ />
+ </div>
+ )
}
}
}
--
Gitblit v1.8.0