功能調整

web/admin/print/tablet_edit/editorNewOne.html

@@ -854,11 +854,28 @@
                 self.bindEvent();
             },
             async addNewItem() {
+                console.log("addNewItem:",$("#custom_txt").val())
+                if ($("#custom_txt").val()=="") {
+
+                    alert("名稱不可空白")
+                    return false
+                }
+               
+
                 let self = this;
                 let target = $(self.selectedElement).children().first();
-
+                let error=""
                 //let fam = self.familyMembers.find(x => x.fam_name == target.text());
                 if (target.hasClass("liveList")) {
+                    self.alive.forEach(x => {
+                        if (x == $("#custom_txt").val()) {
+                            error = "名稱已存在"
+                        }
+                    })
+                    if (error != "") {
+                        alert(error)
+                        return false
+                    }
                     self.alive.push($("#custom_txt").val());
                     let obj = {
                         IsShuWen: false,
@@ -872,6 +889,15 @@
                     }
                     self.family_deceased_Y_selected.push(obj);
                 } else if (target.hasClass("nameList") || target.hasClass("rosterList")) {
+                    self.properTitle.forEach(x => {
+                        if (x == $("#custom_txt").val()) {
+                            error = "名稱已存在"
+                        }
+                    })
+                    if (error != "") {
+                        alert(error)
+                        return false
+                    }
                     self.properTitle.push($("#custom_txt").val());
                     let obj = {
                         IsShuWen: false,
@@ -885,6 +911,16 @@
                     }
                     self.family_deceased_N_selected.push(obj);
                 } else if (target.hasClass("ancestor-wrapper")) {
+                    //再來判斷是否已有這個名稱
+                    self.properTitle.forEach(x => {
+                        if (x == $("#custom_txt").val()) {
+                            error = "名稱已存在"
+                        }
+                    })
+                    if (error != "") {
+                        alert(error)
+                        return false
+                    }
                     if (self.properTitle.length >= 2) {
                         alert("多姓氏合併必須第一個名稱為姓，第二個名稱為氏歷代祖先之類，且最多兩個名稱");
                     } else {
@@ -902,9 +938,15 @@
                         self.family_deceased_N_selected.push(obj);
                     }
                 } else if (target.hasClass("lefttitle")) {
-                    //if (self.leftProperTitle.length >= 1) {
-                    //    alert("左正名");
-                    //} else {
+                    self.leftProperTitle.forEach(x => {
+                        if (x == $("#custom_txt").val()) {
+                            error = "名稱已存在"
+                        }
+                    })
+                    if (error != "") {
+                        alert(error)
+                        return false
+                    }
                     self.leftProperTitle.length = 0;
                     self.family_left_title.length = 0;
                     self.leftProperTitle.push($("#custom_txt").val());
@@ -922,9 +964,15 @@
                     //self.family_deceased_N_selected.push(obj);
                     //}
                 } else if (target.hasClass("righttitle")) {
-                    //if (self.rightProperTitle.length >= 1) {
-                    //    alert("右正名");
-                    //} else {
+                    self.rightProperTitle.forEach(x => {
+                        if (x == $("#custom_txt").val()) {
+                            error = "名稱已存在"
+                        }
+                    })
+                    if (error != "") {
+                        alert(error)
+                        return false
+                    }
                     self.rightProperTitle.length = 0;
                     self.family_right_title.length = 0;
                     self.rightProperTitle.push($("#custom_txt").val());