public/MaxKey
1
0
Fork 0
mirror of https://gitee.com/dromara/MaxKey.git synced 2026-05-14 12:32:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

OrganizationsCast

Browse Source 
机构映射关系
机构namepath重组
登录错误提示信息优化
界面元素优化
HttpRequestAdapter支持JSON
This commit is contained in:
Crystal.Sea
2021-10-31 08:25:59 +08:00
parent 37da95c649
commit 625c2e4336
24 changed files with 749 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
maxkey-webs/maxkey-web-mgt/build.gradle
View File

@@ -19,6 +19,7 @@ dependencies {
implementation project(":maxkey-identitys:maxkey-identity-scim")
implementation project(":maxkey-identitys:maxkey-identity-rest")
implementation project(":maxkey-identitys:maxkey-synchronizers")
implementation project(":maxkey-identitys:maxkey-synchronizers-reorgdept")
implementation project(":maxkey-identitys:maxkey-synchronizers-activedirectory")
implementation project(":maxkey-identitys:maxkey-synchronizers-ldap")
implementation project(":maxkey-identitys:maxkey-synchronizers-workweixin")

4
maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/accounts/accountsAdd.ftl
View File

@@ -51,7 +51,7 @@
<input class="button btn btn-primary mr-3 window" type="button" id="selectUserinfoBtn" value="<@locale code="button.text.select" />"
wurl="<@base/>/userinfo/select"
wwidth="800"
wheight="500"
wheight="620"
target="window"/>
</td>
</tr>
@@ -75,7 +75,7 @@
<input class="button btn btn-primary mr-3 window" type="button" id="selectAppsubmitBtn" value="<@locale code="button.text.select" />"
wurl="<@base/>/apps/select"
wwidth="800"
wheight="500"
wheight="620"
target="window"/>
</td>
</tr>

72
maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/apps/selectAppsList.ftl
View File

@@ -24,60 +24,54 @@
</script>
</head>
<body>
<div id="tool_box">
<div>
<table class="table table-bordered" >
<tr>
<td width="120px"><@locale code="apps.name"/>:</td>
<td width="374px" nowrap>
<td width="300px" nowrap>
<form id="basic_search_form">
<input type="text" class="form-control" name="name" style ="width:150px;float: left;">
<input class="button button btn btn-primary mr-3" id="searchBtn" type="button" size="50" value="<@locale code="button.text.search"/>">
<input type="text" class="form-control" name="name" >
</form>
</td>
<td colspan="2">
<div >
<input class="button btn btn-primary mr-3" id="selectBtn" type="button" value="<@locale code="button.text.select"/>" />
<div id="tool_box_right">
<input class="button btn btn-primary mr-3" id="searchBtn" type="button" size="50" value="<@locale code="button.text.search"/>">
<input class="button btn btn-success mr-3" id="selectBtn" type="button" value="<@locale code="button.text.select"/>" />
</div>
</td>
</tr>
</table>
</div>
<div id="advanced_search">
</div>
<div class="mainwrap" id="main">
<table data-url="<@base/>/apps/grid"
id="datagrid"
data-toggle="table"
data-classes="table table-bordered table-hover table-striped"
data-click-to-select="true"
data-pagination="true"
data-total-field="records"
data-page-list="[5, 10, 25, 50]"
data-search="false"
data-locale="zh-CN"
data-query-params="dataGridQueryParams"
data-query-params-type="pageSize"
data-side-pagination="server">
<thead>
<tr>
<th data-checkbox="true"></th>
<th data-sortable="true" data-field="id" data-visible="false">Id</th>
<th data-field="id" data-formatter="iconFormatter"><@locale code="apps.icon"/></th>
<th data-field="name"><@locale code="apps.name"/></th>
<th data-field="protocol" data-visible="false"><@locale code="apps.protocol"/></th>
<th data-field="category"><@locale code="apps.category"/></th>
<th data-field="vendor" data-visible="false"><@locale code="apps.vendor"/></th>
<th data-field="loginUrl" data-visible="false"><@locale code="log.loginhistory.loginUrl"/></th>
</tr>
</thead>
</table>
</div>
<table data-url="<@base/>/apps/grid"
id="datagrid"
data-toggle="table"
data-classes="table table-bordered table-hover table-striped"
data-click-to-select="true"
data-pagination="true"
data-total-field="records"
data-page-list="[5, 10, 25, 50]"
data-search="false"
data-locale="zh-CN"
data-query-params="dataGridQueryParams"
data-query-params-type="pageSize"
data-side-pagination="server">
<thead>
<tr>
<th data-checkbox="true"></th>
<th data-sortable="true" data-field="id" data-visible="false">Id</th>
<th data-field="id" data-formatter="iconFormatter"><@locale code="apps.icon"/></th>
<th data-field="name"><@locale code="apps.name"/></th>
<th data-field="protocol" data-visible="false"><@locale code="apps.protocol"/></th>
<th data-field="category"><@locale code="apps.category"/></th>
<th data-field="vendor" data-visible="false"><@locale code="apps.vendor"/></th>
<th data-field="loginUrl" data-visible="false"><@locale code="log.loginhistory.loginUrl"/></th>
</tr>
</thead>
</table>
</body>
</html>

29
maxkey-webs/maxkey-web-mgt/src/main/resources/templates/views/userinfo/userinfoSelect.ftl
View File

@@ -149,20 +149,35 @@
</head>
<body>
<div>
<form id="basic_search_form" style="display:none">
<input id="departmentId" class="form-control" name="departmentId" type="text" >
<input class="button btn mr-3 btn-primary" id="searchBtn" type="button" size="50" value="<@locale code="button.text.search"/>">
</form>
<input class="button btn btn-primary mr-3" style="float: right;" id="winClose" type="button" value="<@locale code="button.text.select" />" >
<table class="table table-bordered">
<tr>
<td width="120px">
<@locale code="userinfo.username"/>:
</td>
<td width="300px">
<form id="basic_search_form">
<input class="form-control" id="departmentId" name="departmentId" type="hidden">
<input class="form-control" name="username" type="text" >
</form>
</td>
<td colspan="2">
<div id="tool_box_right">
<input class="button btn mr-3 btn-primary" id="searchBtn" type="button" value="<@locale code="button.text.search"/>">
<input class="button btn mr-3 btn-success" id="winClose" type="button" value="<@locale code="button.text.select" />" >
</div>
</td>
</tr>
</table>
</div>
<!-- content -->
<table class="table table-bordered" width="100%" >
<tr>
<td valign="top" class="td_1" style="vertical-align: top;">
<td valign="top" style="vertical-align: top;min-width: 200px;">
<div id="orgsTree" class="ztree"></div>
</td>
<td valign="top" class="td_1" style="vertical-align: top;">
<td valign="top" style="vertical-align: top;">
<table data-url="<@base/>/userinfo/grid"
id="datagrid"
data-toggle="table"