From d52169be5ed98d6846bb07f75e5a305271e374d4 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 27 四月 2023 18:07:05 +0800
Subject: [PATCH] 2023-04-27
---
src/menu/components/table/normal-table/columns/editColumn/index.jsx | 7 +++++++
src/tabviews/custom/components/share/normalTable/index.jsx | 7 ++-----
src/menu/components/table/edit-table/columns/editColumn/index.jsx | 7 +++++++
src/menu/components/card/cardcellcomponent/elementform/index.jsx | 7 +++++++
src/tabviews/custom/components/table/edit-table/normalTable/index.jsx | 14 ++++----------
5 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/elementform/index.jsx b/src/menu/components/card/cardcellcomponent/elementform/index.jsx
index b6badfd..02ece02 100644
--- a/src/menu/components/card/cardcellcomponent/elementform/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/elementform/index.jsx
@@ -289,6 +289,11 @@
return item
})
+ let _field = ''
+ if (value === 'formula') {
+ _field = this.props.form.getFieldValue('field') || ''
+ }
+
this.setState({
link: '',
eleType: value,
@@ -303,6 +308,8 @@
this.props.form.setFieldsValue({color: '#000000'})
} else if (value === 'text' || value === 'number') {
this.props.form.setFieldsValue({format: ''})
+ } else if (value === 'formula' && _field) {
+ this.props.form.setFieldsValue({formula: '@' + _field + '@'})
}
if (value === 'text' || value === 'picture') {
this.props.form.setFieldsValue({link: ''})
diff --git a/src/menu/components/table/edit-table/columns/editColumn/index.jsx b/src/menu/components/table/edit-table/columns/editColumn/index.jsx
index ba7f32b..ed167a3 100644
--- a/src/menu/components/table/edit-table/columns/editColumn/index.jsx
+++ b/src/menu/components/table/edit-table/columns/editColumn/index.jsx
@@ -128,6 +128,11 @@
if (key === 'type') {
let _options = this.getOptions()
+ let _field = ''
+ if (value === 'formula') {
+ _field = this.props.form.getFieldValue('field') || ''
+ }
+
this.setState({
formlist: this.state.formlist.map(item => {
item.initVal = this.column[item.key] || item.initVal
@@ -138,6 +143,8 @@
}, () => {
if (value === 'action' || value === 'colspan') {
this.props.form.setFieldsValue({Align: 'center'})
+ } else if (value === 'formula' && _field) {
+ this.props.form.setFieldsValue({formula: '@' + _field + '@'})
}
})
} else if (key === 'field') {
diff --git a/src/menu/components/table/normal-table/columns/editColumn/index.jsx b/src/menu/components/table/normal-table/columns/editColumn/index.jsx
index d580db8..f855127 100644
--- a/src/menu/components/table/normal-table/columns/editColumn/index.jsx
+++ b/src/menu/components/table/normal-table/columns/editColumn/index.jsx
@@ -84,6 +84,11 @@
if (key === 'type') {
let _options = fromJS(columnTypeOptions[value]).toJS()
+ let _field = ''
+ if (value === 'formula') {
+ _field = this.props.form.getFieldValue('field') || ''
+ }
+
this.setState({
type: value,
formlist: this.state.formlist.map(item => {
@@ -98,6 +103,8 @@
this.props.form.setFieldsValue({perspective: ''})
} else if (value === 'action' || value === 'colspan') {
this.props.form.setFieldsValue({Align: 'center'})
+ } else if (value === 'formula' && _field) {
+ this.props.form.setFieldsValue({formula: '@' + _field + '@'})
}
})
} else if (key === 'field') {
diff --git a/src/tabviews/custom/components/share/normalTable/index.jsx b/src/tabviews/custom/components/share/normalTable/index.jsx
index 993c4db..38d3d69 100644
--- a/src/tabviews/custom/components/share/normalTable/index.jsx
+++ b/src/tabviews/custom/components/share/normalTable/index.jsx
@@ -348,11 +348,8 @@
if (content !== '') {
content = `${col.prefix || ''}${content}${col.postfix || ''}`
-
- if (col.eval === 'false') {
- content = content.replace(/\n/ig, '<br/>').replace(/\s/ig, ' ')
- content = <span dangerouslySetInnerHTML={{__html: content}}></span>
- }
+ content = content.replace(/\n/ig, '<br/>').replace(/\s/ig, ' ')
+ content = <span dangerouslySetInnerHTML={{__html: content}}></span>
}
if (col.marks) {
diff --git a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
index 2efbd4e..997e630 100644
--- a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
@@ -480,11 +480,8 @@
if (content !== '') {
content = `${col.prefix || ''}${content}${col.postfix || ''}`
-
- if (col.eval === 'false') {
- content = content.replace(/\n/ig, '<br/>').replace(/\s/ig, ' ')
- content = <span dangerouslySetInnerHTML={{__html: content}}></span>
- }
+ content = content.replace(/\n/ig, '<br/>').replace(/\s/ig, ' ')
+ content = <span dangerouslySetInnerHTML={{__html: content}}></span>
}
if (col.marks) {
@@ -859,11 +856,8 @@
if (content !== '') {
content = `${col.prefix || ''}${content}${col.postfix || ''}`
-
- if (col.eval === 'false') {
- content = content.replace(/\n/ig, '<br/>').replace(/\s/ig, ' ')
- content = <span dangerouslySetInnerHTML={{__html: content}}></span>
- }
+ content = content.replace(/\n/ig, '<br/>').replace(/\s/ig, ' ')
+ content = <span dangerouslySetInnerHTML={{__html: content}}></span>
}
if (col.marks) {
--
Gitblit v1.8.0