Index: arms/js/reqAdd.js =================================================================== diff -u -r5a34cf7075d157859697e867740930437194775f -re099582857bef4e7ae1332435287036686d82949 --- arms/js/reqAdd.js (.../reqAdd.js) (revision 5a34cf7075d157859697e867740930437194775f) +++ arms/js/reqAdd.js (.../reqAdd.js) (revision e099582857bef4e7ae1332435287036686d82949) @@ -1896,13 +1896,17 @@ function tableSelectOption(obj) { const $li = document.createElement("li"); - $li.innerHTML = `${obj.c_title}`; + $li.innerHTML = `${obj.c_title}`; + $li.addEventListener("click", (e) => { + tableSelect(obj.c_id); + }); + return $li; } function tableSelect(id) { - makeTable({ + makeReqTable({ wrapper: "reqDataTable", id, onGetData: async function (id) { Index: arms/js/reqAddTable.js =================================================================== diff -u -r5a34cf7075d157859697e867740930437194775f -re099582857bef4e7ae1332435287036686d82949 --- arms/js/reqAddTable.js (.../reqAddTable.js) (revision 5a34cf7075d157859697e867740930437194775f) +++ arms/js/reqAddTable.js (.../reqAddTable.js) (revision e099582857bef4e7ae1332435287036686d82949) @@ -100,47 +100,29 @@ }, []); } - getOriginData(id) { - return origin; - } + updateData(id, key, value) { + const task = this.$data.find((item) => item.id === Number(id)); - updateData(id, obj) { - const { - origin: { - c_id, - c_title, - c_req_contents, - c_req_pdservice_versionset_link, - reqDifficultyEntity, - reqPriorityEntity, - reqStateEntity, - c_req_reviewer01, - c_req_reviewer02, - c_req_reviewer03, - c_req_reviewer04, - c_req_reviewer05 - } - } = this.$data.find((item) => item.id === Number(id)); - const params = { - c_id, - c_title, - c_req_pdservice_versionset_link, - c_req_priority_link: reqPriorityEntity?.c_id ?? null, // 5 - 중간 - c_req_difficulty_link: reqDifficultyEntity?.c_id ?? null, // 5 - 보통 - c_req_state_link: reqStateEntity?.c_id ?? null, //10 - 열림 - c_req_update_date: new Date(), - c_req_reviewer01, - c_req_reviewer02, - c_req_reviewer03, - c_req_reviewer04, - c_req_reviewer05, - c_req_status: "ChangeReq", - c_req_contents - }; + if (task[key] === value) return; - if (Object.keys(obj).every((k) => obj[k] === params[k])) return; + task[key] = value; - this.options.onUpdate(this.options.id, Object.assign(params, obj)); + this.options.onUpdate(this.options.id, { + c_id: task.id, + c_title: task.content, + c_req_pdservice_versionset_link: task.origin.c_req_pdservice_versionset_link, + c_req_priority_link: task._priority ?? null, // 5 - 중간 + c_req_difficulty_link: task._difficulty ?? null, // 5 - 보통 + c_req_state_link: task._status ?? null, //10 - 열림 + c_req_update_date: new Date(), + c_req_reviewer01: task.origin.c_req_reviewer01, + c_req_reviewer02: task.origin.c_req_reviewer02, + c_req_reviewer03: task.origin.c_req_reviewer03, + c_req_reviewer04: task.origin.c_req_reviewer04, + c_req_reviewer05: task.origin.c_req_reviewer05, + c_req_status: "ChangeReq", + c_req_contents: task.origin.c_req_contents + }); } addInput(node) { @@ -150,7 +132,7 @@ $input.id = uuid; $input.addEventListener("blur", () => { - this.updateData(node.parentElement.dataset.id, { c_title: $input.value }); + this.updateData(node.parentElement.dataset.id, "content", $input.value); node.textContent = $input.value; }); @@ -166,16 +148,16 @@ switch (name) { case "difficulty": options = ReqDifficulty; - keyname = "c_req_difficulty_link"; + keyname = "_difficulty"; break; case "priority": options = ReqPriority; - keyname = "c_req_priority_link"; + keyname = "_priority"; break; case "status": default: options = ReqStatus; - keyname = "c_req_state_link"; + keyname = "_status"; break; } @@ -185,9 +167,7 @@ $li.className = text.trim() === label ? "active" : ""; $li.innerHTML = `${label}`; $li.addEventListener("click", (e) => { - const result = {}; - result[keyname] = value; - this.updateData($li.parentElement.parentElement.parentElement.dataset.id, result); + this.updateData($li.parentElement.parentElement.parentElement.dataset.id, keyname, value); $li.parentElement.previousElementSibling.innerHTML = `${e.target.textContent} `; document.getElementById(uuid).remove(); @@ -330,29 +310,9 @@ }, []); }; -// const getMonitorData = async (id) => { -// return await $.ajax({ -// url: `/auth-user/api/arms/reqAdd/T_ARMS_REQADD_${id}/getMonitor.do`, -// type: "GET", -// dataType: "json", -// progress: true, -// statusCode: { -// 200: function (data) { -// if (!isEmpty(data)) { -// return data; -// } -// } -// } -// }); -// }; - -const makeTable = async (options) => { +const makeReqTable = async (options) => { const res = await options.onGetData(options.id); - // const $wrapper = document.getElementById(wrapper); const table = new Table(options, setTableData(res)); table.rendering(); - - // $wrapper.innerHTML = ""; - // $wrapper.appendChild(table.template); };