From 05b66ce9fbe2c1abc34b5f459b29b6e49e40125e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 10 三月 2025 10:47:19 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/card/cardcellcomponent/formconfig.jsx | 10 ++++++++++
src/tabviews/custom/components/card/cardcellList/index.jsx | 4 ++++
src/tabviews/custom/components/share/braftContent/index.scss | 4 ++++
src/menu/components/card/cardcellcomponent/elementform/index.jsx | 23 +++++++++++++++++++++++
4 files changed, 41 insertions(+), 0 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/elementform/index.jsx b/src/menu/components/card/cardcellcomponent/elementform/index.jsx
index 9673341..3b9f876 100644
--- a/src/menu/components/card/cardcellcomponent/elementform/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/elementform/index.jsx
@@ -115,6 +115,26 @@
})
})
}
+ } else if (item.key === 'noVField') {
+ item.options = []
+
+ if (side === 'sub') {
+ config.subColumns.forEach(col => {
+ let label = `${col.field}锛�${col.label}锛塦
+ item.options.push({
+ value: col.field,
+ text: label
+ })
+ })
+ } else {
+ config.columns.forEach(col => {
+ let label = `${col.field}锛�${col.label}锛塦
+ item.options.push({
+ value: col.field,
+ text: label
+ })
+ })
+ }
} else if (item.key === 'formula') {
item.fields = []
@@ -181,6 +201,9 @@
_options.push('value')
}
+ if (this.record.eleType === 'text' && this.record.datatype === 'static' && this.record.noValue === 'hide') {
+ _options.push('noVField')
+ }
if (this.record.eleType === 'picture' && this.record.noValue === 'show') {
_options.push('lostTip')
} else if (this.record.eleType === 'video' && this.record.posterType) {
diff --git a/src/menu/components/card/cardcellcomponent/formconfig.jsx b/src/menu/components/card/cardcellcomponent/formconfig.jsx
index 55eb030..08054fd 100644
--- a/src/menu/components/card/cardcellcomponent/formconfig.jsx
+++ b/src/menu/components/card/cardcellcomponent/formconfig.jsx
@@ -725,6 +725,16 @@
]
},
{
+ type: 'select',
+ key: 'noVField',
+ label: '绌哄�煎瓧娈�',
+ initVal: card.noVField || '',
+ tooltip: '鐢ㄤ簬鎺у埗姝ら潤鎬佸厓绱犵殑鏄剧ず/闅愯棌锛屽綋姝ゅ瓧娈典负绌烘椂锛堟暟鍊间负0锛夛紝闅愯棌褰撳墠鍏冪礌銆�',
+ required: false,
+ allowClear: true,
+ options: [],
+ },
+ {
type: 'radio',
key: 'lostTip',
label: '鍥剧墖缂哄け',
diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index b591266..e7537d1 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -373,6 +373,10 @@
})())
}
}
+
+ if (card.noVField && !data[card.noVField]) {
+ val = ''
+ }
} else if (data.hasOwnProperty(card.field)) {
val = data[card.field] + ''
}
diff --git a/src/tabviews/custom/components/share/braftContent/index.scss b/src/tabviews/custom/components/share/braftContent/index.scss
index e81c2c6..ab7b200 100644
--- a/src/tabviews/custom/components/share/braftContent/index.scss
+++ b/src/tabviews/custom/components/share/braftContent/index.scss
@@ -41,6 +41,10 @@
padding: 5px 10px;
font-size: var(--table-font-size, 16px);
border: 1px solid #ddd;
+
+ br:first-of-type {
+ height: 0px;
+ }
}
}
ul {
--
Gitblit v1.8.0