From b1df470c0c1ef83fdc5929c8ec369dcda022c38f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 14 七月 2023 16:12:33 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx | 18 ++++--
src/menu/components/card/cardcellcomponent/formconfig.jsx | 15 +++--
src/tabviews/custom/components/card/cardcellList/index.jsx | 24 +++++++
src/menu/components/table/base-table/columns/editColumn/index.jsx | 2
src/menu/components/table/normal-table/columns/editColumn/index.jsx | 2
src/tabviews/custom/components/share/normalTable/index.jsx | 39 +++++++++----
src/menu/components/table/edit-table/columns/editColumn/index.jsx | 2
src/menu/components/card/cardcellcomponent/elementform/index.jsx | 2
src/menu/components/table/base-table/columns/editColumn/formconfig.jsx | 18 ++++--
src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx | 18 ++++--
src/tabviews/custom/components/table/edit-table/normalTable/index.jsx | 32 ++++++++--
11 files changed, 122 insertions(+), 50 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/elementform/index.jsx b/src/menu/components/card/cardcellcomponent/elementform/index.jsx
index 2f3f53a..a5b33a8 100644
--- a/src/menu/components/card/cardcellcomponent/elementform/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/elementform/index.jsx
@@ -626,7 +626,7 @@
values.marks = this.props.card.marks || null
// eslint-disable-next-line
- if (values.eleType === 'formula' && values.eval !== 'false' && /^[\u4E00-\u9FA50-9a-zA-Z_\s@\+\-\*\/]*$/ig.test(values.formula) && /[\+\-\*\/]/ig.test(values.formula)) {
+ if (values.eleType === 'formula' && values.eval === 'true' && /^[\u4E00-\u9FA50-9a-zA-Z_\s@\+\-\*\/]*$/ig.test(values.formula) && /[\+\-\*\/]/ig.test(values.formula)) {
let cols = []
config.subColumns && config.subColumns.forEach(col => {
if (/^(Int|Decimal)/ig.test(col.datatype)) {
diff --git a/src/menu/components/card/cardcellcomponent/formconfig.jsx b/src/menu/components/card/cardcellcomponent/formconfig.jsx
index 2e494ac..d682050 100644
--- a/src/menu/components/card/cardcellcomponent/formconfig.jsx
+++ b/src/menu/components/card/cardcellcomponent/formconfig.jsx
@@ -235,16 +235,19 @@
{
type: 'radio',
key: 'eval',
- label: '瑙ｆ瀽',
+ label: '瑙ｆ瀽鏂瑰紡',
initVal: card.eval || 'false',
- tooltip: '褰撳叕寮忓唴瀹规秹鍙婅绠楁椂璇烽�夋嫨鈥滄槸鈥濓紝褰撳叕寮忓唴瀹逛负瀛楁鎷兼帴鏃惰閫夋嫨鈥滃惁鈥濄��',
+ tooltip: '褰撳叕寮忓唴瀹规秹鍙婅绠楁椂璇烽�夋嫨鈥滆绠椻�濓紝褰撳叕寮忓唴瀹逛负瀛楁鎷兼帴鏃惰閫夋嫨鈥滃瓧娈垫浛鎹⑩�濓紝浣跨敤鍑芥暟鏃跺叆鍙備负data锛堟暟缁勶級銆�',
required: false,
options: [{
- value: 'true',
- text: '鏄�'
- }, {
value: 'false',
- text: '鍚�'
+ text: '瀛楁鏇挎崲'
+ }, {
+ value: 'true',
+ text: '璁＄畻'
+ }, {
+ value: 'func',
+ text: '鍑芥暟'
}]
},
{
diff --git a/src/menu/components/table/base-table/columns/editColumn/formconfig.jsx b/src/menu/components/table/base-table/columns/editColumn/formconfig.jsx
index f550a1c..0ebdd54 100644
--- a/src/menu/components/table/base-table/columns/editColumn/formconfig.jsx
+++ b/src/menu/components/table/base-table/columns/editColumn/formconfig.jsx
@@ -164,14 +164,20 @@
{
type: 'radio',
key: 'eval',
- label: '瑙ｆ瀽',
+ label: '瑙ｆ瀽鏂瑰紡',
initVal: card.eval || 'false',
- tooltip: '褰撳叕寮忓唴瀹规秹鍙婅绠楁椂璇烽�夋嫨鈥滄槸鈥濓紝褰撳叕寮忓唴瀹逛负瀛楁鎷兼帴鏃惰閫夋嫨鈥滃惁鈥濄��',
+ tooltip: '褰撳叕寮忓唴瀹规秹鍙婅绠楁椂璇烽�夋嫨鈥滆绠椻�濓紝褰撳叕寮忓唴瀹逛负瀛楁鎷兼帴鏃惰閫夋嫨鈥滃瓧娈垫浛鎹⑩�濓紝浣跨敤鍑芥暟鏃跺叆鍙備负data锛堟暟缁勶級銆�',
required: false,
- options: [
- { value: 'true', text: '鏄�' },
- { value: 'false', text: '鍚�' }
- ]
+ options: [{
+ value: 'false',
+ text: '瀛楁鏇挎崲'
+ }, {
+ value: 'true',
+ text: '璁＄畻'
+ }, {
+ value: 'func',
+ text: '鍑芥暟'
+ }]
},
{
type: 'radio',
diff --git a/src/menu/components/table/base-table/columns/editColumn/index.jsx b/src/menu/components/table/base-table/columns/editColumn/index.jsx
index 95e9bf5..7318054 100644
--- a/src/menu/components/table/base-table/columns/editColumn/index.jsx
+++ b/src/menu/components/table/base-table/columns/editColumn/index.jsx
@@ -416,7 +416,7 @@
this.props.form.validateFieldsAndScroll((err, values) => {
if (!err) {
// eslint-disable-next-line
- if (values.type === 'formula' && values.eval !== 'false' && /^[\u4E00-\u9FA50-9a-zA-Z_\s@\+\-\*\/]*$/ig.test(values.formula) && /[\+\-\*\/]/ig.test(values.formula)) {
+ if (values.type === 'formula' && values.eval === 'true' && /^[\u4E00-\u9FA50-9a-zA-Z_\s@\+\-\*\/]*$/ig.test(values.formula) && /[\+\-\*\/]/ig.test(values.formula)) {
let cols = []
fields.forEach(col => {
if (/^(Int|Decimal)/ig.test(col.datatype)) {
diff --git a/src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx b/src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx
index 263da80..c9f7736 100644
--- a/src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx
+++ b/src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx
@@ -146,14 +146,20 @@
{
type: 'radio',
key: 'eval',
- label: '瑙ｆ瀽',
+ label: '瑙ｆ瀽鏂瑰紡',
initVal: card.eval || 'false',
- tooltip: '褰撳叕寮忓唴瀹规秹鍙婅绠楁椂璇烽�夋嫨鈥滄槸鈥濓紝褰撳叕寮忓唴瀹逛负瀛楁鎷兼帴鏃惰閫夋嫨鈥滃惁鈥濄��',
+ tooltip: '褰撳叕寮忓唴瀹规秹鍙婅绠楁椂璇烽�夋嫨鈥滆绠椻�濓紝褰撳叕寮忓唴瀹逛负瀛楁鎷兼帴鏃惰閫夋嫨鈥滃瓧娈垫浛鎹⑩�濓紝浣跨敤鍑芥暟鏃跺叆鍙備负data锛堟暟缁勶級銆�',
required: false,
- options: [
- { value: 'true', text: '鏄�' },
- { value: 'false', text: '鍚�' }
- ]
+ options: [{
+ value: 'false',
+ text: '瀛楁鏇挎崲'
+ }, {
+ value: 'true',
+ text: '璁＄畻'
+ }, {
+ value: 'func',
+ text: '鍑芥暟'
+ }]
},
{
type: 'radio',
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 36565c3..14f0606 100644
--- a/src/menu/components/table/edit-table/columns/editColumn/index.jsx
+++ b/src/menu/components/table/edit-table/columns/editColumn/index.jsx
@@ -421,7 +421,7 @@
return
}
// eslint-disable-next-line
- } else if (values.type === 'formula' && values.eval !== 'false' && /^[\u4E00-\u9FA50-9a-zA-Z_\s@\+\-\*\/]*$/ig.test(values.formula) && /[\+\-\*\/]/ig.test(values.formula)) {
+ } else if (values.type === 'formula' && values.eval === 'true' && /^[\u4E00-\u9FA50-9a-zA-Z_\s@\+\-\*\/]*$/ig.test(values.formula) && /[\+\-\*\/]/ig.test(values.formula)) {
let cols = []
fields.forEach(col => {
if (/^(Int|Decimal)/ig.test(col.datatype)) {
diff --git a/src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx b/src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx
index 0057faf..e39e5b7 100644
--- a/src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx
+++ b/src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx
@@ -156,14 +156,20 @@
{
type: 'radio',
key: 'eval',
- label: '瑙ｆ瀽',
+ label: '瑙ｆ瀽鏂瑰紡',
initVal: card.eval || 'false',
- tooltip: '褰撳叕寮忓唴瀹规秹鍙婅绠楁椂璇烽�夋嫨鈥滄槸鈥濓紝褰撳叕寮忓唴瀹逛负瀛楁鎷兼帴鏃惰閫夋嫨鈥滃惁鈥濄��',
+ tooltip: '褰撳叕寮忓唴瀹规秹鍙婅绠楁椂璇烽�夋嫨鈥滆绠椻�濓紝褰撳叕寮忓唴瀹逛负瀛楁鎷兼帴鏃惰閫夋嫨鈥滃瓧娈垫浛鎹⑩�濓紝浣跨敤鍑芥暟鏃跺叆鍙備负data锛堟暟缁勶級銆�',
required: false,
- options: [
- { value: 'true', text: '鏄�' },
- { value: 'false', text: '鍚�' }
- ]
+ options: [{
+ value: 'false',
+ text: '瀛楁鏇挎崲'
+ }, {
+ value: 'true',
+ text: '璁＄畻'
+ }, {
+ value: 'func',
+ text: '鍑芥暟'
+ }]
},
{
type: 'radio',
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 a5f9a50..6f51d09 100644
--- a/src/menu/components/table/normal-table/columns/editColumn/index.jsx
+++ b/src/menu/components/table/normal-table/columns/editColumn/index.jsx
@@ -424,7 +424,7 @@
this.props.form.validateFieldsAndScroll((err, values) => {
if (!err) {
// eslint-disable-next-line
- if (values.type === 'formula' && values.eval !== 'false' && /^[\u4E00-\u9FA50-9a-zA-Z_\s@\+\-\*\/]*$/ig.test(values.formula) && /[\+\-\*\/]/ig.test(values.formula)) {
+ if (values.type === 'formula' && values.eval === 'true' && /^[\u4E00-\u9FA50-9a-zA-Z_\s@\+\-\*\/]*$/ig.test(values.formula) && /[\+\-\*\/]/ig.test(values.formula)) {
let cols = []
fields.forEach(col => {
if (/^(Int|Decimal)/ig.test(col.datatype)) {
diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index 333a959..cb07a91 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -751,8 +751,26 @@
} else if (card.eleType === 'formula') {
let val = 0
let _style = {...card.style}
+
+ if (card.eval === 'func') {
+ let _data = []
+ if (card.$sync) {
+ _data = this.props.syncData
+ } else if (data && !data.$$empty) {
+ _data = [data]
+ }
- if (card.$sync) {
+ try {
+ // eslint-disable-next-line
+ let func = new Function('data', card.formula)
+ val = func(_data)
+ } catch (e) {
+ if (window.debugger) {
+ console.warn(e)
+ }
+ val = ''
+ }
+ } else if (card.$sync) {
if (card.eval === 'false') {
val = ''
}
@@ -813,7 +831,9 @@
val = val.toFixed(card.decimal)
}
- if (val !== '') {
+ if (card.eval === 'func') {
+ val = <span dangerouslySetInnerHTML={{__html: val}}></span>
+ } else if (val !== '') {
if (val && typeof(val) === 'string') {
val = val.replace(/\n/ig, '<br/>')
if (!/<(span|div|p|a|img)\s/g.test(val)) {
diff --git a/src/tabviews/custom/components/share/normalTable/index.jsx b/src/tabviews/custom/components/share/normalTable/index.jsx
index 83b7612..b16b14a 100644
--- a/src/tabviews/custom/components/share/normalTable/index.jsx
+++ b/src/tabviews/custom/components/share/normalTable/index.jsx
@@ -330,32 +330,47 @@
)
} else if (col.type === 'formula') {
let content = col.formula
- Object.keys(record).forEach(key => {
- let reg = new RegExp('@' + key + '@', 'ig')
- content = content.replace(reg, record[key])
- })
- if (col.eval !== 'false') {
+ if (col.eval === 'func') {
try {
// eslint-disable-next-line
- content = eval(content)
+ let func = new Function('data', col.formula)
+ content = func([record])
} catch (e) {
if (window.debugger) {
- console.info(content)
console.warn(e)
}
content = ''
}
-
- if (col.round && typeof(content) === 'number') {
- content = Math.round(content * col.round) / col.round
- content = content.toFixed(col.decimal)
+ } else {
+ Object.keys(record).forEach(key => {
+ let reg = new RegExp('@' + key + '@', 'ig')
+ content = content.replace(reg, record[key])
+ })
+ if (col.eval !== 'false') {
+ try {
+ // eslint-disable-next-line
+ content = eval(content)
+ } catch (e) {
+ if (window.debugger) {
+ console.info(content)
+ console.warn(e)
+ }
+ content = ''
+ }
+
+ if (col.round && typeof(content) === 'number') {
+ content = Math.round(content * col.round) / col.round
+ content = content.toFixed(col.decimal)
+ }
}
}
content = content === undefined ? '' : content
- if (content !== '') {
+ if (col.eval === 'func') {
+ content = <span dangerouslySetInnerHTML={{__html: content}}></span>
+ } else if (content !== '') {
content = `${col.prefix || ''}${content}${col.postfix || ''}`
content = content.replace(/\n/ig, '<br/>').replace(/\s/ig, ' ')
content = <span dangerouslySetInnerHTML={{__html: content}}></span>
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 2260a2d..e4c2fc2 100644
--- a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
@@ -433,21 +433,35 @@
)
} else if (col.type === 'formula') {
let content = col.formula
- Object.keys(record).forEach(key => {
- let reg = new RegExp('@' + key + '@', 'ig')
- content = content.replace(reg, record[key])
- })
- if (col.eval !== 'false') {
+ if (col.eval === 'func') {
try {
// eslint-disable-next-line
- content = eval(content)
+ let func = new Function('data', col.formula)
+ content = func([record])
} catch (e) {
if (window.debugger) {
- console.info(content)
console.warn(e)
}
content = ''
+ }
+ } else {
+ Object.keys(record).forEach(key => {
+ let reg = new RegExp('@' + key + '@', 'ig')
+ content = content.replace(reg, record[key])
+ })
+
+ if (col.eval !== 'false') {
+ try {
+ // eslint-disable-next-line
+ content = eval(content)
+ } catch (e) {
+ if (window.debugger) {
+ console.info(content)
+ console.warn(e)
+ }
+ content = ''
+ }
}
}
@@ -462,7 +476,9 @@
content = content.toFixed(col.decimal)
}
- if (content !== '') {
+ if (col.eval === 'func') {
+ content = <span dangerouslySetInnerHTML={{__html: content}}></span>
+ } else if (content !== '') {
content = `${col.prefix || ''}${content}${col.postfix || ''}`
content = content.replace(/\n/ig, '<br/>').replace(/\s/ig, ' ')
content = <span dangerouslySetInnerHTML={{__html: content}}></span>
--
Gitblit v1.8.0