From d5f630cfead07be24ab8da3f0701bc251fb45ead Mon Sep 17 00:00:00 2001 From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com> Date: Tue, 5 Jul 2022 10:09:07 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dsafari=E7=94=B1?= =?UTF-8?q?=E4=BA=8E=E4=B8=8D=E6=94=AF=E6=8C=81=E5=AF=B9js=E4=B8=AD?= =?UTF-8?q?=E6=AD=A3=E5=88=99=E8=A1=A8=E8=BE=BE=E5=BC=8F=E7=9A=84=20?= =?UTF-8?q?=E5=87=A0=E4=B8=AA=E6=96=B0=E5=A2=9E=E7=9A=84=E6=96=AD=E8=A8=80?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E4=B8=8D=E6=94=AF=E6=8C=81=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E7=9A=84=E7=99=BD=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/chart/view/CalcChartFieldEdit.vue | 5 +++-- frontend/src/views/dataset/data/CalcFieldEdit.vue | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/frontend/src/views/chart/view/CalcChartFieldEdit.vue b/frontend/src/views/chart/view/CalcChartFieldEdit.vue index a212dcdd1b..ce6e3a49fb 100644 --- a/frontend/src/views/chart/view/CalcChartFieldEdit.vue +++ b/frontend/src/views/chart/view/CalcChartFieldEdit.vue @@ -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]) } diff --git a/frontend/src/views/dataset/data/CalcFieldEdit.vue b/frontend/src/views/dataset/data/CalcFieldEdit.vue index 2776a86ef0..58c12bfdb3 100644 --- a/frontend/src/views/dataset/data/CalcFieldEdit.vue +++ b/frontend/src/views/dataset/data/CalcFieldEdit.vue @@ -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]) }