From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 八月 2022 11:42:43 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/components/normalform/modalform/index.jsx | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/components/normalform/modalform/index.jsx b/src/components/normalform/modalform/index.jsx
index 4c2f73a..8bc59c5 100644
--- a/src/components/normalform/modalform/index.jsx
+++ b/src/components/normalform/modalform/index.jsx
@@ -263,7 +263,14 @@
} else if (item.type === 'source') {
content = (<SourceComponent type="" placement="right"/>)
} else if (item.type === 'table') {
- content = (<MKTable columns={item.columns || []}/>)
+ content = (<MKTable tip={item.tip || ''} columns={item.columns || []} actions={item.actions || []}/>)
+ } else if (item.type === 'hint') {
+ fields.push(
+ <Col span={24} key={index}>
+ <div style={{color: '#1890ff', borderBottom: '1px solid #e9e9e9', marginBottom: '15px', paddingLeft: '10px'}}>{item.label}</div>
+ </Col>
+ )
+ return
}
if (!content) return
--
Gitblit v1.8.0