From 2048dfa2320c9473c65892ff4cb63bf83a2c9869 Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Tue, 26 Apr 2022 10:36:33 +0800 Subject: [PATCH] * Fix bug #15655. --- module/api/js/common.js | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/module/api/js/common.js b/module/api/js/common.js index 14cbbefac5..0a18e788bc 100644 --- a/module/api/js/common.js +++ b/module/api/js/common.js @@ -311,8 +311,6 @@ try { }, current: { handler(val) { - // console.log(val) - /* handle level field data. */ const attr = []; val.forEach((item) => { if (item.sub == 1) { @@ -394,13 +392,11 @@ try { }) }, addSub(current, key, s) { - sub = current.sub ? current.sub : 1; - sub += 1 + sub = current.sub ? current.sub + 1 : 2; if (s.sub) { sub = s.sub + 1 } fieldKey = s.key - // console.log('添加子字段', JSON.stringify(s), fieldKey) const field = { ...this.getInitField(), parentKey: fieldKey, @@ -408,11 +404,14 @@ try { } current.splice(key + 1, 0, field) }, - add(data, sub) { + add(data, key, sub) { const field = this.getInitField(); field.sub = sub.sub; field.parentKey = sub.parentKey; - data.push({...field}); + for(let index = key+1; index < data.length; index++) { + if(data[index].sub <= field.sub) return data.splice(index, 0, field); + } + data.splice(data.length, 0, field) }, del(data, index) { if(data.length <= 1) return; @@ -451,7 +450,7 @@ try {