|
|
|
@ -82,8 +82,13 @@ export default {
|
|
|
|
|
if (res.data.datasetType === 'js') {
|
|
|
|
|
try {
|
|
|
|
|
const scriptAfterReplacement = res.data.script.replace(/\${(.*?)}/g, (match, p) => {
|
|
|
|
|
// 根据parmas的key获取value
|
|
|
|
|
return `'${this.config.dataSource?.params[p]}' || '${p}'`
|
|
|
|
|
const value = this.config.dataSource?.params[p]
|
|
|
|
|
|
|
|
|
|
if (!isNaN(value)) {
|
|
|
|
|
return value || p
|
|
|
|
|
} else {
|
|
|
|
|
return `'${value}' || '${p}'`
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
// eslint-disable-next-line no-new-func
|
|
|
|
|
const scriptMethod = new Function(scriptAfterReplacement)
|
|
|
|
@ -129,8 +134,12 @@ export default {
|
|
|
|
|
if (res.data.datasetType === 'js') {
|
|
|
|
|
try {
|
|
|
|
|
const scriptAfterReplacement = res.data.script.replace(/\${(.*?)}/g, (match, p) => {
|
|
|
|
|
// 根据parmas的key获取value
|
|
|
|
|
return `'${this.config.dataSource?.params[p]}' || '${p}'`
|
|
|
|
|
const value = this.config.dataSource?.params[p]
|
|
|
|
|
if (!isNaN(value)) {
|
|
|
|
|
return value || p
|
|
|
|
|
} else {
|
|
|
|
|
return `'${value}' || '${p}'`
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
// eslint-disable-next-line no-new-func
|
|
|
|
|
const scriptMethod = new Function(scriptAfterReplacement)
|
|
|
|
|