From 28a0fb9d6bd4f1ef13d372489a5103f43b69d96e Mon Sep 17 00:00:00 2001
From: "Crystal.Sea" <shimingxy@163.com>
Date: Wed, 13 Oct 2021 10:43:57 +0800
Subject: [PATCH] accountsstrategy

---
 .../accountsstrategy/accountsStrategyAdd.ftl  | 53 ++++++++++++++----
 .../accountsstrategy/accountsStrategyList.ftl | 15 ++---
 .../accountsStrategyUpdate.ftl                | 56 ++++++++++++++-----
 3 files changed, 90 insertions(+), 34 deletions(-)
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accountsstrategy/accountsStrategyAdd.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accountsstrategy/accountsStrategyAdd.ftl
index 8ac42eb2a..2eade827f 100644
--- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accountsstrategy/accountsStrategyAdd.ftl
+++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accountsstrategy/accountsStrategyAdd.ftl
@@ -160,47 +160,76 @@ function showOrgsTree() {
 </script>
 </head>
 <body>
-<form id="actionForm"  method="post" type="label" autoclose="true"  action="<@base/>/roles/add"  class="needs-validation" novalidate>
+<form id="actionForm"  method="post" type="label" autoclose="true"  action="<@base/>/accountsstrategy/add"  class="needs-validation" novalidate>
 	<table border="0" cellpadding="0" cellspacing="0" class="table table-bordered" >
 		<tbody>
 			<tr>
-				<th><@locale code="role.id" />：</th>
+				<th><@locale code="accounts.strategy.id" />：</th>
 				<td nowrap>
 					<input type="text" id="id" name="id" class="form-control" title="" value=""  />
 				</td>
 			</tr>
 			<tr>
-				<th><@locale code="role.name" />：</th>
+				<th><@locale code="accounts.strategy.name" />：</th>
 				<td nowrap>
 					<input type="text" id="name" name="name" class="form-control" title="" value=""  required="" />
 				</td>
 			</tr>
 			<tr>
-				<th><@locale code="role.dynamic" />：</th>
+                <th><@locale code="apps.name"/>：</th>
+                <td nowrap>
+                    <input class="form-control appId" id="appId" name="appId" value="" type="hidden"  >
+                    <input class="form-control" id="pid" name="pid" value="" type="hidden"  >
+                    <input class="form-control appName"    style="width:80%;float: left;" value=""    id="appName" name="appName" type="text" >
+                    <input class="button btn btn-success mr-3 window" style="float: left;" id="selectBtn" type="button" value="<@locale code="button.text.select"/>" 
+                            wurl="<@base/>/apps/select"
+                            wwidth="700"
+                            wheight="500"
+                            target="window">
+                </td>
+            </tr>
+			<tr>
+				<th><@locale code="accounts.strategy.mapping" />：</th>
 				<td nowrap>
-					<select id="dynamic" name="dynamic"  class="form-control  form-select">
-						<option value="0" selected ><@locale code="common.text.no" /></option>
-						<option value="1"          ><@locale code="common.text.yes" /></option>
-					</select>
+					<select id="mapping" name="mapping" class="form-control form-select"   >
+                        <option value="username"  selected >
+                            <@locale code="userinfo.username" />
+                        </option>
+                        <option value="mobile"   >
+                            <@locale code="userinfo.mobile" />
+                        </option>
+                        <option value="email"  >
+                            <@locale code="userinfo.email" />
+                        </option>
+                        <option value="employeeNumber" >
+                            <@locale code="userinfo.employeeNumber" />
+                        </option>
+                        <option value="windowsAccount"  >
+                            <@locale code="userinfo.windowsAccount" />
+                        </option>
+                        <option value="idCardNo"   >
+                            <@locale code="userinfo.idCardNo" />
+                        </option>
+                    </select>
 				</td>
 			</tr>
 			<tr>
-				<th><@locale code="role.orgidslist" />：</th>
+				<th><@locale code="accounts.strategy.orgidslist" />：</th>
 				<td nowrap>
 					<input type="text" id="orgIdsListName" name="orgIdsListName"   readonly  class="form-control" title="" value=""   onclick="showOrgsTree();"/>
 					<input type="hidden" id="orgIdsList" name="orgIdsList"   readonly  class="form-control" title="" value=""   />
 				</td>
 			</tr>
 			<tr>
-				<th><@locale code="role.filters" />：</th>
+				<th><@locale code="accounts.strategy.filters" />：</th>
 				<td nowrap>
-					<textarea id="filters" name="filters" class="form-control"  rows="7" cols="20"></textarea>
+					<textarea id="filters" name="filters" class="form-control"  rows="4" cols="20"></textarea>
 				</td>
 			</tr>
 			<tr>
                 <th><@locale code="common.text.description" />：</th>
                 <td nowrap>
-                    <textarea id="description" name="description" class="form-control"  rows="6" cols="20"></textarea>
+                    <textarea id="description" name="description" class="form-control"  rows="3" cols="20"></textarea>
                 </td>
             </tr>
 			
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accountsstrategy/accountsStrategyList.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accountsstrategy/accountsStrategyList.ftl
index e3183bb92..87abec2b5 100644
--- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accountsstrategy/accountsStrategyList.ftl
+++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accountsstrategy/accountsStrategyList.ftl
@@ -43,7 +43,7 @@
 		
 			<table  class="table table-bordered">
  				<tr>
-		 			<td width="120px"><@locale code="role.name"/>:</td>
+		 			<td width="120px"><@locale code="accounts.strategy.name"/>:</td>
 		 			<td width="375px">
 		 				<form id="basic_search_form">
 			 				<input class="form-control" type="text" name="name"  style ="width:150px;float:left;">
@@ -56,14 +56,14 @@
 		 				<div id="tool_box_right">
 		 					 <input class="button btn btn-success mr-3" id="addBtn" type="button" value="<@locale code="button.text.add"/>" 
 						 		    wurl="<@base/>/accountsstrategy/forwardAdd"
-						 		    wwidth="500"
-						 		    wheight="600"
+						 		    wwidth="800"
+						 		    wheight="550"
 					 		    	target="window">	    	
 					 		    	
 					 	<input class="button btn btn-info mr-3 " id="modifyBtn" type="button" value="<@locale code="button.text.edit"/>" 
 					 				wurl="<@base/>/accountsstrategy/forwardUpdate"
-					 				wwidth="500"
-						 		    wheight="600"
+					 				wwidth="800"
+						 		    wheight="550"
 					 		    	target="window"> 
 					 		    	
 					 	<input class="button btn btn-danger mr-3 "  id="deleteBtn" type="button" value="<@locale code="button.text.delete"/>"
@@ -95,8 +95,9 @@
                 <tr>
                     <th data-checkbox="true"></th>
                     <th data-sortable="true" data-field="id"   data-visible="false">Id</th>
-                    <th data-field="name"><@locale code="role.name"/></th>
-                    <th data-field="dynamic"  data-formatter="dynamicFormatter"><@locale code="group.dynamic"/></th>
+                    <th data-field="name"><@locale code="accounts.strategy.name"/></th>
+                    <th data-field="appName" ><@locale code="app.name"/></th>
+                    <th data-field="status"  data-formatter="dynamicFormatter"><@locale code="accounts.strategy.status"/></th>
                     <th data-field="description"><@locale code="common.text.description"/></th>
                     <th data-field="createdBy"    data-visible="false"><@locale code="common.text.createdby"/></th>
                     <th data-field="createdDate"  data-visible="false"><@locale code="common.text.createddate"/></th>
diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accountsstrategy/accountsStrategyUpdate.ftl b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accountsstrategy/accountsStrategyUpdate.ftl
index 8e3b4d737..8e94371ad 100644
--- a/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accountsstrategy/accountsStrategyUpdate.ftl
+++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accountsstrategy/accountsStrategyUpdate.ftl
@@ -174,47 +174,73 @@ function showOrgsTree() {
 </script>
 </head>
 <body>
-<form id="actionForm"  method="post" type="label" autoclose="true"  action="<@base/>/roles/update"  class="needs-validation" novalidate>
+<form id="actionForm"  method="post" type="label" autoclose="true"  action="<@base/>/accountsstrategy/update"  class="needs-validation" novalidate>
 	 <table  border="0" cellpadding="0" cellspacing="0" class="table table-bordered">
 		<tbody>
 		<tr>
-			<th><@locale code="role.id" />：</th>
+			<th><@locale code="accounts.strategy.id" />：</th>
 			<td nowrap>
 				<input id="id" type="text" readonly name="id"  class="form-control"   value="${model.id}"/>
 			</td>
 		</tr>
 		<tr>
-			<th><@locale code="role.name" />：</th>
+			<th><@locale code="accounts.strategy.name" />：</th>
 			<td nowrap>
 				<input type="text" id="name" name="name" class="form-control" title="" value="${model.name!}"  required="" />
 			</td>
 		</tr>
 		<tr>
-			<th><@locale code="role.dynamic" />：</th>
-			<td nowrap>
-				<select id="dynamic" name="dynamic"  class="form-control  form-select">
-					<option value="0" <#if '0'==model.dynamic>selected</#if> ><@locale code="common.text.no" /></option>
-					<option value="1" <#if '1'==model.dynamic>selected</#if> ><@locale code="common.text.yes" /></option>
-				</select>
-			</td>
-		</tr>
+            <th><@locale code="apps.name"/>：</th>
+            <td nowrap>
+                <input class="form-control appId" id="appId" name="appId" value="${model.appId!}" type="hidden"  >
+                <input class="form-control appName" readonly value="${model.appName!}"    id="appName" name="appName" type="text" >
+               
+            </td>
+        </tr>
 		<tr>
-				<th><@locale code="role.orgidslist" />：</th>
+                <th><@locale code="accounts.strategy.mapping" />：</th>
+                <td nowrap>
+                    <select id="mapping" name="mapping" class="form-control form-select"   >
+                        
+                        <option value="username"  <#if model.mapping?contains("username")>selected</#if> >
+                            <@locale code="userinfo.username" />
+                        </option>
+                        <option value="mobile"  <#if model.mapping?contains("mobile")>selected</#if> >
+                            <@locale code="userinfo.mobile" />
+                        </option>
+                        <option value="email"  <#if model.mapping?contains("email")>selected</#if> >
+                            <@locale code="userinfo.email" />
+                        </option>
+                        <option value="employeeNumber"  <#if model.mapping?contains("employeeNumber")>selected</#if> >
+                            <@locale code="userinfo.employeeNumber" />
+                        </option>
+                        <option value="windowsAccount"  <#if model.mapping?contains("windowsAccount")>selected</#if> >
+                            <@locale code="userinfo.windowsAccount" />
+                        </option>
+                        <option value="idCardNo"  <#if model.mapping?contains("idCardNo")>selected</#if> >
+                            <@locale code="userinfo.idCardNo" />
+                        </option>
+                        
+                    </select>
+                </td>
+            </tr>
+		<tr>
+				<th><@locale code="accounts.strategy.orgidslist" />：</th>
 				<td nowrap>
 					<input type="text" id="orgIdsListName" name="orgIdsListName"   readonly  class="form-control" title="" value=""   onclick="showOrgsTree();"/>
 					<input type="hidden" id="orgIdsList" name="orgIdsList"   readonly  class="form-control" title="" value="${model.orgIdsList!}"   />
 				</td>
 		</tr>
 		<tr>
-			<th><@locale code="role.filters" />：</th>
+			<th><@locale code="accounts.strategy.filters" />：</th>
 			<td nowrap>
-				<textarea id="filters" name="filters" class="form-control"  rows="7" cols="20">${model.filters!}</textarea>
+				<textarea id="filters" name="filters" class="form-control"  rows="4" cols="20">${model.filters!}</textarea>
 			</td>
 		</tr>
 		<tr>
                 <th><@locale code="common.text.description" />：</th>
                 <td nowrap>
-                	<textarea id="description" name="description" class="form-control"  rows="6" cols="20">${model.description!}</textarea>
+                	<textarea id="description" name="description" class="form-control"  rows="3" cols="20">${model.description!}</textarea>
                 </td>
             </tr>
 		<tr>

<@locale code="role.id" />：	<@locale code="accounts.strategy.id" />：
<@locale code="role.name" />：	<@locale code="accounts.strategy.name" />：
<@locale code="role.dynamic" />：	<@locale code="apps.name"/>：	+ + + + " + wurl="<@base/>/apps/select" + wwidth="700" + wheight="500" + target="window"> +
<@locale code="accounts.strategy.mapping" />：	- +
<@locale code="role.orgidslist" />：	<@locale code="accounts.strategy.orgidslist" />：
<@locale code="role.filters" />：	<@locale code="accounts.strategy.filters" />：	- +
<@locale code="common.text.description" />：	- +