diff --git a/WebRoot/Excel/D0110CE1-26EE-435B-8EEB-464EA136601A.docx b/WebRoot/Excel/D0110CE1-26EE-435B-8EEB-464EA136601A.docx new file mode 100644 index 00000000..9f8f0eda Binary files /dev/null and b/WebRoot/Excel/D0110CE1-26EE-435B-8EEB-464EA136601A.docx differ diff --git a/WebRoot/view/tb/form/ayq/modules/formDesigner.js b/WebRoot/view/tb/form/ayq/modules/formDesigner.js index 836de29d..6512a660 100644 --- a/WebRoot/view/tb/form/ayq/modules/formDesigner.js +++ b/WebRoot/view/tb/form/ayq/modules/formDesigner.js @@ -4733,7 +4733,7 @@ layui.config({ base: './ayq/modules/' }).define(["layer", 'flow', "laytpl", "ele window.location = "../org/task_list_bdw.html"; } else { window.location = "../org/task_list.html"; - } + } }); $("#formSave").on('click', function () { @@ -5173,7 +5173,7 @@ layui.config({ base: './ayq/modules/' }).define(["layer", 'flow', "laytpl", "ele Class.prototype.findJsonItem = function (json, id) { var that = this, options = that.config; - for (var i = 0; i < json.length; i++) { + for (var i = 0; i < json.length; i++) { if (json[i].id === id) { return json[i]; } else { @@ -5202,6 +5202,14 @@ layui.config({ base: './ayq/modules/' }).define(["layer", 'flow', "laytpl", "ele if (json[i].id === id) { var _newjson = JSON.parse(JSON.stringify(json[i])); _newjson.id = that.autoId(_newjson.tag); + if (json[i].tag === 'grid') { + for (var j = 0; j < json[i].columns.length; j++) { + for (var k = 0; k < json[i].columns[j].list.length; k++) { + var _childjson = json[i].columns[j].list[k]; + _childjson.id = that.autoId(_childjson.tag); + } + } + } json.splice(i + 1, 0, _newjson); return json[i]; } else {