From 5e70c54c7ac1c4f6f5b46a3873279ab5b4105963 Mon Sep 17 00:00:00 2001 From: kgdxpr Date: Fri, 2 Feb 2024 15:15:46 +0800 Subject: [PATCH] 'commit' --- .../D0110CE1-26EE-435B-8EEB-464EA136601A.docx | Bin 0 -> 11567 bytes .../view/tb/form/ayq/modules/formDesigner.js | 12 ++++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 WebRoot/Excel/D0110CE1-26EE-435B-8EEB-464EA136601A.docx 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 0000000000000000000000000000000000000000..9f8f0edaec2da719caa3d3877f9a42ee0ca08b35 GIT binary patch literal 11567 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 literal 0 HcmV?d00001 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 {