From 2d3f82c3e07e6acaedbeae8b4ce0849dd588abc6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 29 七月 2020 10:09:32 +0800
Subject: [PATCH] 2020-07-29
---
src/templates/sharecomponent/columncomponent/index.jsx | 80 +++++++++++++++++++++++++++++++++++++++-
src/tabviews/subtabtable/index.jsx | 4 ++
src/tabviews/zshare/normalTable/index.jsx | 6 ++
src/tabviews/subtabtable/index.scss | 2
4 files changed, 88 insertions(+), 4 deletions(-)
diff --git a/src/tabviews/subtabtable/index.jsx b/src/tabviews/subtabtable/index.jsx
index 35b8d5a..677219b 100644
--- a/src/tabviews/subtabtable/index.jsx
+++ b/src/tabviews/subtabtable/index.jsx
@@ -697,9 +697,13 @@
tableId=""
plot={item}
config={config}
+ BID={this.props.BID}
+ BData={this.props.BData}
data={this.state.data}
loading={this.state.loading}
+ logcolumns={this.state.logcolumns}
buttonTrigger={this.buttonTrigger}
+ refreshdata={this.refreshbyaction}
handleTableId={() => {}}
/>
</Col>
diff --git a/src/tabviews/subtabtable/index.scss b/src/tabviews/subtabtable/index.scss
index 12f42fe..2537f46 100644
--- a/src/tabviews/subtabtable/index.scss
+++ b/src/tabviews/subtabtable/index.scss
@@ -35,7 +35,7 @@
.ant-tabs-bar {
position: relative;
z-index: 1;
- top: -10px;
+ top: 0px;
margin: 0;
border: 0;
.ant-tabs-nav-scroll {
diff --git a/src/tabviews/zshare/normalTable/index.jsx b/src/tabviews/zshare/normalTable/index.jsx
index 658c359..913ad26 100644
--- a/src/tabviews/zshare/normalTable/index.jsx
+++ b/src/tabviews/zshare/normalTable/index.jsx
@@ -223,7 +223,11 @@
let icon = ''
marks.some(mark => {
- let originType = colMap.get(mark.field).type
+ let originField = colMap.get(mark.field)
+
+ if (!originField) return false
+
+ let originType = originField.type || 'text'
let originVal = record.hasOwnProperty(mark.field) ? record[mark.field] : ''
let contrastVal = ''
diff --git a/src/templates/sharecomponent/columncomponent/index.jsx b/src/templates/sharecomponent/columncomponent/index.jsx
index 0b1532b..471e6b1 100644
--- a/src/templates/sharecomponent/columncomponent/index.jsx
+++ b/src/templates/sharecomponent/columncomponent/index.jsx
@@ -270,12 +270,57 @@
if (column.marks && column.marks.filter(mark => mark.field === card.field || mark.contrastField === card.field).length > 0) {
refers.push(column.label)
}
+ if (column.type === 'colspan') {
+ let _length = column.sublist.length
+ column.sublist = column.sublist.filter(cell => cell !== card.uuid)
+
+ if (column.sublist.length < _length) {
+ let subfield = [] // 鍚堝苟鍒楀瓧娈�
+ _columnlist.forEach(col => {
+ if (col.field && column.sublist.includes(col.uuid)) {
+ subfield.push(col.field)
+ }
+ })
+ column.subfield = subfield.join(', ')
+ }
+ }
})
if (refers.length > 0) {
notification.warning({
top: 92,
- message: '鏄剧ず鍒椼��' + refers.join('銆�') + '銆嬫爣璁颁腑鍚湁璇ュ瓧娈碉紝姝ゆ淇敼浼氬鑷存爣璁板け鏁堬紝璇蜂慨鏀广��' + refers.join('銆�') + '銆嬫爣璁拌缃紒',
+ message: '鏄剧ず鍒椼��' + refers.join('銆�') + '銆嬫爣璁颁腑鍚湁璇ュ瓧娈碉紝姝ゆ淇敼浼氬鑷存爣璁板け鏁堬紝璇蜂慨鏀圭浉搴旂殑鏍囪璁剧疆锛�',
+ duration: 5
+ })
+ }
+
+ let chartRefers = []
+ config.charts && config.charts.forEach((chart, index) => {
+ if (chart.chartType === 'card') {
+ if (chart.avatar && chart.avatar.field === card.field) {
+ chartRefers.push(chart.title || (index + 1))
+ } else if (chart.header && chart.header.datatype === 'dynamic' && chart.header.field === card.field) {
+ chartRefers.push(chart.title || (index + 1))
+ } else if (chart.details && chart.details.length > 0 && chart.details.filter(item => item.datatype === 'dynamic' && item.field === card.field).length > 0) {
+ chartRefers.push(chart.title || (index + 1))
+ }
+ } else if (['bar', 'line', 'pie'].includes(chart.chartType)) {
+ if (chart.Xaxis === card.field) {
+ chartRefers.push(chart.title || (index + 1))
+ } else if (Array.isArray(chart.Yaxis)) {
+ if (chart.Yaxis.includes(card.field)) {
+ chartRefers.push(chart.title || (index + 1))
+ }
+ } else if (chart.Yaxis === card.field) {
+ chartRefers.push(chart.title || (index + 1))
+ }
+ }
+ })
+
+ if (chartRefers.length > 0) {
+ notification.warning({
+ top: 92,
+ message: '鍥捐〃銆�' + chartRefers.join('銆�') + '銆嬩腑鍚湁璇ュ瓧娈碉紝姝ゆ淇敼浼氬鑷村浘琛ㄦ樉绀哄紓甯革紝璇蜂慨鏀圭浉搴旂殑鍥捐〃璁剧疆锛�',
duration: 5
})
}
@@ -342,7 +387,38 @@
if (refers.length > 0) {
notification.warning({
top: 92,
- message: '鏄剧ず鍒椼��' + refers.join('銆�') + '銆嬫爣璁颁腑鍚湁璇ュ瓧娈碉紝鍒犻櫎浼氬鑷存爣璁板け鏁堬紝璇蜂慨鏀广��' + refers.join('銆�') + '銆嬫爣璁拌缃紒',
+ message: '鏄剧ず鍒椼��' + refers.join('銆�') + '銆嬫爣璁颁腑鍚湁璇ュ瓧娈碉紝鍒犻櫎浼氬鑷存爣璁板け鏁堬紝璇蜂慨鏀圭浉搴旂殑鏍囪璁剧疆锛�',
+ duration: 5
+ })
+ }
+
+ let chartRefers = []
+ config.charts && config.charts.forEach((chart, index) => {
+ if (chart.chartType === 'card') {
+ if (chart.avatar && chart.avatar.field === card.field) {
+ chartRefers.push(chart.title || (index + 1))
+ } else if (chart.header && chart.header.datatype === 'dynamic' && chart.header.field === card.field) {
+ chartRefers.push(chart.title || (index + 1))
+ } else if (chart.details && chart.details.length > 0 && chart.details.filter(item => item.datatype === 'dynamic' && item.field === card.field).length > 0) {
+ chartRefers.push(chart.title || (index + 1))
+ }
+ } else if (['bar', 'line', 'pie'].includes(chart.chartType)) {
+ if (chart.Xaxis === card.field) {
+ chartRefers.push(chart.title || (index + 1))
+ } else if (Array.isArray(chart.Yaxis)) {
+ if (chart.Yaxis.includes(card.field)) {
+ chartRefers.push(chart.title || (index + 1))
+ }
+ } else if (chart.Yaxis === card.field) {
+ chartRefers.push(chart.title || (index + 1))
+ }
+ }
+ })
+
+ if (chartRefers.length > 0) {
+ notification.warning({
+ top: 92,
+ message: '鍥捐〃銆�' + chartRefers.join('銆�') + '銆嬩腑鍚湁璇ュ瓧娈碉紝鍒犻櫎浼氬鑷村浘琛ㄦ樉绀哄紓甯革紝璇蜂慨鏀圭浉搴旂殑鍥捐〃璁剧疆锛�',
duration: 5
})
}
--
Gitblit v1.8.0