dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v1.12' into v1.12

Browse Source
This commit is contained in:
junjun 2022-07-05 10:44:14 +08:00
commit 785a72b94b
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] pre[next[from]] = next[to]
return pre return pre
}, {}) }, {})
const on = originName.match(/(?<=\[).+?(?=\])/g) const on = originName.match(/\[(.+?)\]/g)
if (on) { if (on) {
on.forEach(ele => { on.forEach(itm => {
const ele = itm.slice(1, -1)
if (name2Auto) { if (name2Auto) {
name2Auto.push(nameIdMap[ele]) 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] pre[next[from]] = next[to]
return pre return pre
}, {}) }, {})
const on = originName.match(/(?<=\[).+?(?=\])/g) const on = originName.match(/\[(.+?)\]/g)
if (on) { if (on) {
on.forEach(ele => { on.forEach(itm => {
const ele = itm.slice(1, -1)
if (name2Auto) { if (name2Auto) {
name2Auto.push(nameIdMap[ele]) name2Auto.push(nameIdMap[ele])
} }