Skip to content

T
TokenVaultManagement
Commit 8f51b435 authored by Jason's avatar Jason
Browse files
Options

ADD使用者 修改一半

parent 72a29395
Hide whitespace changes
Inline Side-by-side
Showing with 46 additions and 29 deletions
Merchant Token Vault Management/backstage/Controllers/TokenVaultController .cs
View file @ 8f51b435
...@@ -580,13 +580,20 @@ namespace backstage.Controllers ...@@ -580,13 +580,20 @@ namespace backstage.Controllers
if (apiResult.IsSuccess) if (apiResult.IsSuccess)
{ {
FieldsResponse = JsonConvert.DeserializeObject<FieldsResponse>(apiResult.Data.ToString()); FieldsResponse = JsonConvert.DeserializeObject<FieldsResponse>(apiResult.Data.ToString());
var existField = FieldsResponse.fields.FirstOrDefault(f => f.id == field_id);
ViewBag.masks = (from o in existField.masks
select new SelectListItem
{
Value = o.id.ToString(),
Text = o.id + "_" + o.name
}).ToList();
foreach (var u in field.users) foreach (var u in field.users)
{ {
if (u.masks.Count > 0) if (u.masks.Count > 0)
{ {
var maskTextList = new List<string>(); var maskTextList = new List<string>();
var existField = FieldsResponse.fields.FirstOrDefault(f => f.id == field_id);
foreach (var maskId in u.masks) foreach (var maskId in u.masks)
{ {
var matchingMask = existField.masks.FirstOrDefault(m => m.id == maskId); var matchingMask = existField.masks.FirstOrDefault(m => m.id == maskId);
...@@ -604,7 +611,7 @@ namespace backstage.Controllers ...@@ -604,7 +611,7 @@ namespace backstage.Controllers
} }
#endregion #endregion
return View(field.users); return View(field.users);
......
Merchant Token Vault Management/backstage/Views/TokenVault/ListUsers.cshtml
View file @ 8f51b435
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
<!--新增使用者 Popup Form--> <!--新增使用者 Popup Form-->
<div class="modal fade" id="new-field-user" tabindex="-1" style="display: none;" aria-hidden="true"> <div class="modal fade modal-full" id="new-field-user" tabindex="-1" style="display: none;" aria-hidden="true">
<div class="modal-dialog modalforMemberGo"> <div class="modal-dialog modalforMemberGo">
<!-- Modal content--> <!-- Modal content-->
...@@ -158,39 +158,35 @@ ...@@ -158,39 +158,35 @@
<form class="form-horizontal0"> <form class="form-horizontal0">
<!-- <div class="form-group"> <!-- <div class="form-group">
<label class="control-labe" for="name">姓名：</label> <label class="control-labe" for="name">姓名：</label>
<div class=""> <div class="">
<input type="text" class="form-control form-control-sm0"> <input type="text" class="form-control form-control-sm0">
</div> </div>
</div> --> </div> -->
<!-- <div class="form-group"> <!-- <div class="form-group">
<label class="control-labe" for="userName">使用者名稱：</label> <label class="control-labe" for="userName">使用者名稱：</label>
<div class=""> <div class="">
<input type="text" class="form-control form-control-sm0"> <input type="text" class="form-control form-control-sm0">
</div> </div>
</div> --> </div> -->
<div class="form-group"> <div class="form-group">
<label class="control-labe" for="userName">使用者名稱：</label> <label class="control-labe" for="userName">使用者名稱：</label>
<div class="form-group"> <div class="form-group">
<div class="dropdown bootstrap-select selecter form-control -tokenization"> <div class="dropdown bootstrap-select selecter form-control -tokenization">
<select title="請選使用者名稱(單選)" class="selectpicker selecter form-control selectpicker-tokenization" tabindex="null"> <select title="請選使用者名稱(單選)" class="selectpicker selecter form-control selectpicker-tokenization" asp-items="ViewBag.users" tabindex="null">
<option class="bs-title-option" value=""></option> </select>
<option>testuser</option>
<option>testuser2</option>
</select><button type="button" tabindex="-1" class="btn dropdown-toggle bs-placeholder btn-light" data-toggle="dropdown" role="combobox" aria-owns="bs-select-8" aria-haspopup="listbox" aria-expanded="false" title="請選使用者名稱(單選)"><div class="filter-option"><div class="filter-option-inner"><div class="filter-option-inner-inner">請選使用者名稱(單選)</div></div> </div></button><div class="dropdown-menu" style="max-height: 740.734px; overflow: hidden; min-height: 0px;"><div class="inner show" role="listbox" id="bs-select-8" tabindex="-1" style="max-height: 722.734px; overflow: hidden auto; min-height: 0px;"><ul class="dropdown-menu inner show" role="presentation" style="margin-top: 0px; margin-bottom: 0px;"><li><a role="option" class="dropdown-item" id="bs-select-8-0" tabindex="0"><span class=" bs-ok-default check-mark"></span><span class="text">testuser</span></a></li><li><a role="option" class="dropdown-item" id="bs-select-8-1" tabindex="0"><span class=" bs-ok-default check-mark"></span><span class="text">testuser2</span></a></li></ul></div></div>
</div> </div>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="control-labe" for="mask">遮罩：</label> <label class="control-labe" for="mask">遮罩：</label>
<div class="form-group"> <div class="form-group">
<div class="dropdown bootstrap-select show-tick selecter form-control -tokenization"> <div class="dropdown bootstrap-select show-tick selecter form-control -tokenization">
<select multiple="" title="請選遮罩(複選)" class="selectpicker selecter form-control selectpicker-tokenization" tabindex="null"> <select id="select_mask" multiple="" title="請選遮罩(複選)" class="selectpicker selecter form-control selectpicker-tokenization" tabindex="null" asp-items="ViewBag.masks">
<option>[]</option> </select>
<option>[]</option>
</select><button type="button" tabindex="-1" class="btn dropdown-toggle bs-placeholder btn-light" data-toggle="dropdown" role="combobox" aria-owns="bs-select-9" aria-haspopup="listbox" aria-expanded="false" title="請選遮罩(複選)"><div class="filter-option"><div class="filter-option-inner"><div class="filter-option-inner-inner">請選遮罩(複選)</div></div> </div></button><div class="dropdown-menu" style="max-height: 654.281px; overflow: hidden; min-height: 0px;"><div class="inner show" role="listbox" id="bs-select-9" tabindex="-1" aria-multiselectable="true" style="max-height: 636.281px; overflow: hidden auto; min-height: 0px;"><ul class="dropdown-menu inner show" role="presentation" style="margin-top: 0px; margin-bottom: 0px;"><li><a role="option" class="dropdown-item" id="bs-select-9-0" tabindex="0" aria-selected="false"><span class=" bs-ok-default check-mark"></span><span class="text">[]</span></a></li><li><a role="option" class="dropdown-item" id="bs-select-9-1" tabindex="0" aria-selected="false"><span class=" bs-ok-default check-mark"></span><span class="text">[]</span></a></li></ul></div></div>
</div> </div>
</div> </div>
</div> </div>
...@@ -199,11 +195,9 @@ ...@@ -199,11 +195,9 @@
<label class="control-labe" for="mask">預設遮罩：</label> <label class="control-labe" for="mask">預設遮罩：</label>
<div class="form-group"> <div class="form-group">
<div class="dropdown bootstrap-select selecter form-control -tokenization"> <div class="dropdown bootstrap-select selecter form-control -tokenization">
<select title="請選預設遮罩(單選)" class="selectpicker selecter form-control selectpicker-tokenization" tabindex="null"> <select id="default_mask" title="請選預設遮罩(單選)" class="selectpicker selecter form-control selectpicker-tokenization" tabindex="null">
<option class="bs-title-option" value=""></option>
<option>[]</option> </select>
<option>[]</option>
</select><button type="button" tabindex="-1" class="btn dropdown-toggle bs-placeholder btn-light" data-toggle="dropdown" role="combobox" aria-owns="bs-select-10" aria-haspopup="listbox" aria-expanded="false" title="請選預設遮罩(單選)"><div class="filter-option"><div class="filter-option-inner"><div class="filter-option-inner-inner">請選預設遮罩(單選)</div></div> </div></button><div class="dropdown-menu" style="max-height: 567.828px; overflow: hidden; min-height: 0px;"><div class="inner show" role="listbox" id="bs-select-10" tabindex="-1" style="max-height: 549.828px; overflow: hidden auto; min-height: 0px;"><ul class="dropdown-menu inner show" role="presentation" style="margin-top: 0px; margin-bottom: 0px;"><li><a role="option" class="dropdown-item" id="bs-select-10-0" tabindex="0" aria-setsize="2" aria-posinset="1"><span class=" bs-ok-default check-mark"></span><span class="text">[]</span></a></li><li><a role="option" class="dropdown-item" id="bs-select-10-1" tabindex="0" aria-setsize="2" aria-posinset="2"><span class=" bs-ok-default check-mark"></span><span class="text">[]</span></a></li></ul></div></div>
</div> </div>
</div> </div>
</div> </div>
...@@ -381,6 +375,22 @@ ...@@ -381,6 +375,22 @@
}); });
$('#select_mask').on('changed.bs.select', function (e, clickedIndex, isSelected, previousValue) {
// 清空 #default_mask 的選項
$('#default_mask').empty();
// 刷新 #default_mask
$('#default_mask').selectpicker('refresh');
console.log('select mask')
// 將 #select_mask 的所有選中選項加入到 #default_mask 中
$('#select_mask option:selected').each(function () {
var optionValue = $(this).val();
var optionText = $(this).text();
$('#default_mask').append(new Option(optionText, optionValue, false, false));
});
// 刷新 #default_mask
$('#default_mask').selectpicker('refresh');
});
//移除user //移除user
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment