排版設定
This commit is contained in:
@@ -130,6 +130,13 @@
|
|||||||
<label for="deceased_sel">存歿</label>
|
<label for="deceased_sel">存歿</label>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="col-12">
|
||||||
|
<div class="form-floating mb-3">
|
||||||
|
<input class="form-control" type="text" id="title_txt"
|
||||||
|
placeholder="稱謂" />
|
||||||
|
<label for="title_txt">稱謂</label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-footer">
|
<div class="modal-footer">
|
||||||
@@ -669,6 +676,13 @@
|
|||||||
.tablet-element span{
|
.tablet-element span{
|
||||||
z-index: 999;
|
z-index: 999;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.selectedItem .canselectItem{
|
||||||
|
font-size: 18px;
|
||||||
|
}
|
||||||
|
.selectedItem,.rounded-pill .canselectItem,.rounded-pill{
|
||||||
|
font-size: 12px;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
`
|
`
|
||||||
$("#pageStyle").remove();
|
$("#pageStyle").remove();
|
||||||
@@ -692,8 +706,14 @@
|
|||||||
//抓未往生的人出來
|
//抓未往生的人出來
|
||||||
//self.familyMembers;
|
//self.familyMembers;
|
||||||
self.alive.forEach(x => {
|
self.alive.forEach(x => {
|
||||||
|
let f = self.familyMembers.find(z => z.fam_name == x);
|
||||||
|
|
||||||
$(".selectedItem").append(`<li><span style="opacity:0.5">卍</span>
|
$(".selectedItem").append(`<li><span style="opacity:0.5">卍</span>
|
||||||
<span class="selected">${x}</span>
|
<span class="selected">${x}</span>
|
||||||
|
<span>
|
||||||
|
<i class="rounded-pill rounded-3 ${(f && f.fam_title && f.fam_title != '' && f.fam_title != null) ? 'p-1' : ''}" style="background-color:lightgray">
|
||||||
|
${(f && f.fam_title != null) ? f.fam_title : ""}</i>
|
||||||
|
</span>
|
||||||
<span class="itemRemove" style="float:right ;margin-left:2rem;cursor:pointer;" >−</span>
|
<span class="itemRemove" style="float:right ;margin-left:2rem;cursor:pointer;" >−</span>
|
||||||
<span class="itemUp" style="float:right ;margin-left:2rem;cursor:pointer;">↑</span>
|
<span class="itemUp" style="float:right ;margin-left:2rem;cursor:pointer;">↑</span>
|
||||||
<span class="itemDown" style="float:right ;margin-left:2rem;cursor:pointer;">↓</span></li>`);
|
<span class="itemDown" style="float:right ;margin-left:2rem;cursor:pointer;">↓</span></li>`);
|
||||||
@@ -705,19 +725,29 @@
|
|||||||
});
|
});
|
||||||
let finalItem = items.filter(y => !self.alive.includes(y))
|
let finalItem = items.filter(y => !self.alive.includes(y))
|
||||||
finalItem.forEach(yy => {
|
finalItem.forEach(yy => {
|
||||||
$(".canselectItem").append(`<li><span style="opacity:0.5">卍</span> <span class="unselect">${yy}</span><span class='itemAppend' style="float:right;cursor:pointer;">+<span></li>`);
|
let f = self.familyMembers.find(z => z.fam_name == yy);
|
||||||
|
$(".canselectItem").append(`<li><span style="opacity:0.5">卍</span>
|
||||||
|
<span class="unselect">${yy}</span>
|
||||||
|
<span>
|
||||||
|
<i class="rounded-pill rounded-3 ${(f && f.fam_title && f.fam_title != ''&&f.fam_title!=null) ? 'p-1':''}" style="background-color:lightgray">
|
||||||
|
${(f && f.fam_title != null) ? f.fam_title : ""}</i>
|
||||||
|
</span>
|
||||||
|
<span class='itemAppend' style="float:right;cursor:pointer;">+<span></li>`);
|
||||||
});
|
});
|
||||||
|
|
||||||
} else if (element.hasClass("address")) {//地址
|
} else if (element.hasClass("address")) {//地址
|
||||||
$(".selectedItem").append(`<li><span style="opacity:0.5">卍</span>
|
$(".selectedItem").append(`<li><span style="opacity:0.5">卍</span>
|
||||||
<span class="selected">${self.address}</span>027
|
<span class="selected">${self.address}</span>
|
||||||
<span class="itemRemove" style="float:right ;margin-left:2rem;cursor:pointer;" >−</span>`);
|
<span class="itemRemove" style="float:right ;margin-left:2rem;cursor:pointer;" >−</span>`);
|
||||||
} else if (element.hasClass("lefttitle")) {//左正名
|
} else if (element.hasClass("lefttitle")) {//左正名
|
||||||
self.leftProperTitle.forEach(x => {
|
self.leftProperTitle.forEach(x => {
|
||||||
|
let f = self.familyMembers.find(z => z.fam_name == x);
|
||||||
|
|
||||||
$(".selectedItem").append(`<li><span style="opacity:0.5">卍</span>
|
$(".selectedItem").append(`<li><span style="opacity:0.5">卍</span>
|
||||||
<span class="selected">${x}</span>
|
<span class="selected">${x}</span>
|
||||||
|
<span>
|
||||||
|
<i class="rounded-pill rounded-3 ${(f && f.fam_title && f.fam_title != '' && f.fam_title != null) ? 'p-1' : ''}" style="background-color:lightgray">
|
||||||
|
${(f && f.fam_title != null) ? f.fam_title : ""}</i>
|
||||||
|
</span>
|
||||||
<span class="itemRemove" style="float:right ;margin-left:2rem;cursor:pointer;" >−</span>`);
|
<span class="itemRemove" style="float:right ;margin-left:2rem;cursor:pointer;" >−</span>`);
|
||||||
})
|
})
|
||||||
let items = [];
|
let items = [];
|
||||||
@@ -730,12 +760,24 @@
|
|||||||
});
|
});
|
||||||
let finalItem = items.filter(y => !self.leftProperTitle.includes(y))
|
let finalItem = items.filter(y => !self.leftProperTitle.includes(y))
|
||||||
finalItem.forEach(yy => {
|
finalItem.forEach(yy => {
|
||||||
$(".canselectItem").append(`<li><span style="opacity:0.5">卍</span> <span class="unselect">${yy}</span><span class='itemAppend' style="float:right;cursor:pointer;">+<span></li>`);
|
let f = self.familyMembers.find(z => z.fam_name == yy);
|
||||||
|
$(".canselectItem").append(`<li><span style="opacity:0.5">卍</span>
|
||||||
|
<span class="unselect">${yy}</span>
|
||||||
|
<span>
|
||||||
|
<i class="rounded-pill rounded-3 ${(f && f.fam_title && f.fam_title != '' && f.fam_title != null) ? 'p-1' : ''}" style="background-color:lightgray">
|
||||||
|
${(f && f.fam_title != null) ? f.fam_title : ""}</i>
|
||||||
|
</span>
|
||||||
|
<span class='itemAppend' style="float:right;cursor:pointer;">+<span></li>`);
|
||||||
});
|
});
|
||||||
} else if (element.hasClass("righttitle")) {//右正名
|
} else if (element.hasClass("righttitle")) {//右正名
|
||||||
self.rightProperTitle.forEach(x => {
|
self.rightProperTitle.forEach(x => {
|
||||||
|
let f = self.familyMembers.find(z => z.fam_name == x);
|
||||||
$(".selectedItem").append(`<li><span style="opacity:0.5">卍</span>
|
$(".selectedItem").append(`<li><span style="opacity:0.5">卍</span>
|
||||||
<span class="selected">${x}</span>
|
<span class="selected">${x}</span>
|
||||||
|
<span>
|
||||||
|
<i class="rounded-pill rounded-3 ${(f && f.fam_title && f.fam_title != '' && f.fam_title != null) ? 'p-1' : ''}" style="background-color:lightgray">
|
||||||
|
${(f && f.fam_title != null) ? f.fam_title : ""}</i>
|
||||||
|
</span>
|
||||||
<span class="itemRemove" style="float:right ;margin-left:2rem;cursor:pointer;" >−</span>`);
|
<span class="itemRemove" style="float:right ;margin-left:2rem;cursor:pointer;" >−</span>`);
|
||||||
})
|
})
|
||||||
let items = [];
|
let items = [];
|
||||||
@@ -748,14 +790,26 @@
|
|||||||
});
|
});
|
||||||
let finalItem = items.filter(y => !self.rightProperTitle.includes(y))
|
let finalItem = items.filter(y => !self.rightProperTitle.includes(y))
|
||||||
finalItem.forEach(yy => {
|
finalItem.forEach(yy => {
|
||||||
$(".canselectItem").append(`<li><span style="opacity:0.5">卍</span> <span class="unselect">${yy}</span><span class='itemAppend' style="float:right;cursor:pointer;">+<span></li>`);
|
let f=self.familyMembers.find(z=>z.fam_name==yy);
|
||||||
|
$(".canselectItem").append(`<li><span style="opacity:0.5">卍</span>
|
||||||
|
<span class="unselect">${yy}</span>
|
||||||
|
<span>
|
||||||
|
<i class="rounded-pill rounded-3 ${(f && f.fam_title && f.fam_title != '' && f.fam_title != null) ? 'p-1' : ''}" style="background-color:lightgray">
|
||||||
|
${(f && f.fam_title != null) ? f.fam_title : ""}</i>
|
||||||
|
</span>
|
||||||
|
<span class='itemAppend' style="float:right;cursor:pointer;">+<span></li>`);
|
||||||
});
|
});
|
||||||
} else {//其他都是正名
|
} else {//其他都是正名
|
||||||
|
|
||||||
if (element.hasClass("ancestor-wrapper")) {//多姓氏合併,只允許用打的
|
if (element.hasClass("ancestor-wrapper")) {//多姓氏合併,只允許用打的
|
||||||
self.properTitle.forEach(y => {
|
self.properTitle.forEach(y => {
|
||||||
|
let f = self.familyMembers.find(z => z.fam_name == y);
|
||||||
$(".selectedItem").append(`<li><span style="opacity:0.5">卍</span>
|
$(".selectedItem").append(`<li><span style="opacity:0.5">卍</span>
|
||||||
<span class="selected">${y}</span>
|
<span class="selected">${y}</span>
|
||||||
|
<span>
|
||||||
|
<i class="rounded-pill rounded-3 ${(f && f.fam_title && f.fam_title != '' && f.fam_title != null) ? 'p-1' : ''}" style="background-color:lightgray">
|
||||||
|
${(f && f.fam_title != null) ? f.fam_title : ""}</i>
|
||||||
|
</span>
|
||||||
<span class="itemRemove" style="float:right ;margin-left:2rem;cursor:pointer;" >−</span>
|
<span class="itemRemove" style="float:right ;margin-left:2rem;cursor:pointer;" >−</span>
|
||||||
<span class="itemUp" style="float:right ;margin-left:2rem;cursor:pointer;">↑</span>
|
<span class="itemUp" style="float:right ;margin-left:2rem;cursor:pointer;">↑</span>
|
||||||
<span class="itemDown" style="float:right ;margin-left:2rem;cursor:pointer;">↓</span></li>`);
|
<span class="itemDown" style="float:right ;margin-left:2rem;cursor:pointer;">↓</span></li>`);
|
||||||
@@ -763,8 +817,13 @@
|
|||||||
} else if (element.hasClass("nameList") || element.hasClass("rosterList")) {//
|
} else if (element.hasClass("nameList") || element.hasClass("rosterList")) {//
|
||||||
|
|
||||||
self.properTitle.forEach(y => {
|
self.properTitle.forEach(y => {
|
||||||
|
let f = self.familyMembers.find(z => z.fam_name == y);
|
||||||
$(".selectedItem").append(`<li><span style="opacity:0.5">卍</span>
|
$(".selectedItem").append(`<li><span style="opacity:0.5">卍</span>
|
||||||
<span class="selected">${y}</span>
|
<span class="selected">${y}</span>
|
||||||
|
<span>
|
||||||
|
<i class="rounded-pill rounded-3 ${(f && f.fam_title && f.fam_title != '' && f.fam_title != null) ? 'p-1' : ''}" style="background-color:lightgray">
|
||||||
|
${(f && f.fam_title != null) ? f.fam_title : ""}</i>
|
||||||
|
</span>
|
||||||
<span class="itemRemove" style="float:right ;margin-left:2rem;cursor:pointer;" >−</span>
|
<span class="itemRemove" style="float:right ;margin-left:2rem;cursor:pointer;" >−</span>
|
||||||
<span class="itemUp" style="float:right ;margin-left:2rem;cursor:pointer;">↑</span>
|
<span class="itemUp" style="float:right ;margin-left:2rem;cursor:pointer;">↑</span>
|
||||||
<span class="itemDown" style="float:right ;margin-left:2rem;cursor:pointer;">↓</span></li>`);
|
<span class="itemDown" style="float:right ;margin-left:2rem;cursor:pointer;">↓</span></li>`);
|
||||||
@@ -779,7 +838,14 @@
|
|||||||
});
|
});
|
||||||
let finalItem = items.filter(y => !self.properTitle.includes(y))
|
let finalItem = items.filter(y => !self.properTitle.includes(y))
|
||||||
finalItem.forEach(yy => {
|
finalItem.forEach(yy => {
|
||||||
$(".canselectItem").append(`<li><span style="opacity:0.5">卍</span> <span class="unselect">${yy}</span><span class='itemAppend' style="float:right;cursor:pointer;">+<span></li>`);
|
let f = self.familyMembers.find(z => z.fam_name == yy);
|
||||||
|
$(".canselectItem").append(`<li><span style="opacity:0.5">卍</span>
|
||||||
|
<span class="unselect">${yy}</span>
|
||||||
|
<span>
|
||||||
|
<i class="rounded-pill rounded-3 ${(f && f.fam_title && f.fam_title != '' && f.fam_title != null) ? 'p-1' : ''}" style="background-color:lightgray">
|
||||||
|
${(f && f.fam_title != null) ? f.fam_title : ""}</i>
|
||||||
|
</span>
|
||||||
|
<span class='itemAppend' style="float:right;cursor:pointer;">+<span></li>`);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1444,6 +1510,7 @@
|
|||||||
//appellation_id: this.editedItem.appellation_id_selected.val, //儲存時的稱謂
|
//appellation_id: this.editedItem.appellation_id_selected.val, //儲存時的稱謂
|
||||||
follower_num: this.follower_id,
|
follower_num: this.follower_id,
|
||||||
fam_name: $("#family_txt").val(),
|
fam_name: $("#family_txt").val(),
|
||||||
|
fam_title:$("#title_txt").val(),
|
||||||
deceased: $("#deceased_sel").val() == "False" ? false : true,
|
deceased: $("#deceased_sel").val() == "False" ? false : true,
|
||||||
num: 0
|
num: 0
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user