center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #2577 from dataease/pr@dev_regx_safari

Browse Source 
fix: 修复safari由于不支持对js中正则表达式的 几个新增的断言验证不支持导致的白屏
This commit is contained in:
dataeaseShu 2022-07-05 10:09:41 +08:00 committed by GitHub
commit 0ef7f86531
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
frontend/src/views/chart/view/CalcChartFieldEdit.vue
View File

@ -420,9 +420,10 @@ export default {
pre[next[from]] = next[to]
return pre
}, {})
const on = originName.match(/(?<=\[).+?(?=\])/g)
const on = originName.match(/\[(.+?)\]/g)
if (on) {
on.forEach(ele => {
on.forEach(itm => {
const ele = itm.slice(1, -1)
if (name2Auto) {
name2Auto.push(nameIdMap[ele])
}

5
frontend/src/views/dataset/data/CalcFieldEdit.vue
View File

@ -371,9 +371,10 @@ export default {
pre[next[from]] = next[to]
return pre
}, {})
const on = originName.match(/(?<=\[).+?(?=\])/g)
const on = originName.match(/\[(.+?)\]/g)
if (on) {
on.forEach(ele => {
on.forEach(itm => {
const ele = itm.slice(1, -1)
if (name2Auto) {
name2Auto.push(nameIdMap[ele])
}