getrebuild/rebuild
1
1
Fork 0
mirror of https://github.com/getrebuild/rebuild.git synced 2024-09-20 15:35:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

opt

Browse source
This commit is contained in:
FangfangZhao 2018-10-29 04:30:49 +08:00
parent 7b901fba6f
commit 0b0e94ff2a
12 changed files with 22 additions and 140 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/webapp/admin/bizuser/dept-view.jsp
View file

@ -6,7 +6,7 @@
<link rel="stylesheet" type="text/css" href="${baseUrl}/assets/css/view-page.css">
<title>${entityLabel}视图</title>
</head>
<body class="dialog">
<body class="view-body">
<div class="view-header">
<span class="header-icon zmdi zmdi-${entityIcon}"></span>
<h3 class="title">${entityLabel}视图</h3>

2
src/main/webapp/admin/entity/viewtab-config.jsp
View file

@ -24,7 +24,7 @@
</div>
<div class="dialog-footer">
<button class="btn btn-primary J_save" type="button">保存</button>
<button class="btn btn-secondary" onclick="parent.RbViewPage.hideModal()" type="button">取消</button>
<button class="btn btn-secondary" onclick="parent.$hideModal()" type="button">取消</button>
</div>
</div>
<%@ include file="/_include/Foot.jsp"%>

4
src/main/webapp/assets/js/assign-share.jsx
View file

@ -1,7 +1,7 @@
class TheBothDialog extends React.Component {
constructor(props) {
super(props)
this.state = { ...props, cascadesSpec: false }
this.state = { ...props, cascadesSpec: false, onView: !!window.RbViewPage }
this.opType = props.type == 'assign' ? '分派' : '共享'
}
render() {
@ -16,7 +16,7 @@ class TheBothDialog extends React.Component {
</div>
<div className='modal-body'>
<form>
<div className="form-group row">
<div className={'form-group row ' + (this.state.onView && 'hide')}>
<label className="col-sm-3 col-form-label text-sm-right">{this.opType + '哪些记录'}</label>
<div className="col-sm-7">
<div className="form-control-plaintext" id="records">{'选中的记录 (' + this.state.ids.length + '条)'}</div>

20
src/main/webapp/assets/js/rb-list.jsx
View file

@ -396,7 +396,7 @@ const RbListPage = {
})
$('.J_columns').click(function(){
that.__currentModal = rb.modal(`${rb.baseUrl}/page/general-entity/show-fields?entity=${entity[1]}`, '设置列显示')
window.__currentModal = rb.modal(`${rb.baseUrl}/page/general-entity/show-fields?entity=${entity[1]}`, '设置列显示')
})
// Privileges
@ -409,14 +409,6 @@ const RbListPage = {
$cleanMenu('.J_action')
}
},
// 隐藏当前 Modal
hideModal() {
if (this.__currentModal) {
this.__currentModal.hide(true)
this.__currentModal = null
}
}
}
// 列表快速查询
@ -441,7 +433,7 @@ const QuickFilter = {
if (event.which == 13) btn.trigger('click')
})
this.root.find('.J_qfields').click(function(event){
that.__currentModal = rb.modal(`${rb.baseUrl}/page/general-entity/quick-fields?entity=${that.entity}`, '设置快速查询字段')
window.__currentModal = rb.modal(`${rb.baseUrl}/page/general-entity/quick-fields?entity=${that.entity}`, '设置快速查询字段')
})
},
@ -466,13 +458,5 @@ const QuickFilter = {
// 复写增加额外过滤条件
mergeFilter() {
},
// 隐藏当前 Modal
hideModal() {
if (this.__currentModal) {
this.__currentModal.hide(true)
this.__currentModal = null
}
}
};

12
src/main/webapp/assets/js/rb-page.js
View file

@ -17,6 +17,9 @@ $(function(){
$(document.body).addClass('rb-animate')
}, 1000)
// tooltip
$('[data-toggle="tooltip"]').tooltip()
if (rb.isAdminUser == true) {
$('.J_for-admin').removeClass('hide')
if (location.href.indexOf('/admin/') == -1) {
@ -50,13 +53,16 @@ const __initNavs = function(){
})
}
navsModal = null;
$('.nav-settings').click(function(){
if (navsModal) navsModal.show();
else navsModal = rb.modal(rb.baseUrl + '/page/settings/nav-settings', '设置导航菜单', 720);
window.__currentModal = rb.modal(rb.baseUrl + '/page/settings/nav-settings', '设置导航菜单');
});
}
// 关闭当前打开的 Modal
var $hideModal = function() {
if (window.__currentModal) window.__currentModal.hide()
}
// 计算分页
// @tp 总计页面
// @cp 当前页面

15
src/main/webapp/assets/js/rb-view.jsx
View file

@ -47,7 +47,6 @@ rb.RbViewForm = function(props, target){
const RbViewPage = {
_RbViewForm: null,
_currentModal: null,
init(id, entity, ep) {
this.__id = id
@ -79,10 +78,10 @@ const RbViewPage = {
})
$('.J_assign').click(function(){
rb.AssignDialog({ entity: entity[1], ids: id })
rb.AssignDialog({ entity: entity[1], ids: [id] })
})
$('.J_share').click(function(){
rb.ShareDialog({ entity: entity[1], ids: id })
rb.ShareDialog({ entity: entity[1], ids: [id] })
})
// Privileges
@ -139,7 +138,7 @@ const RbViewPage = {
}
$('.vtab-settings').click(function(){
that._currentModal = rb.modal(`${rb.baseUrl}/page/admin/entity/viewtab-config?entity=${that.__entity[1]}`, '设置视图相关项')
window.__currentModal = rb.modal(`${rb.baseUrl}/page/admin/entity/viewtab-config?entity=${that.__entity[1]}`, '设置视图相关项')
})
},
@ -175,14 +174,6 @@ const RbViewPage = {
console.log($(el).attr('href'))
},
// 隐藏当前 Modal
hideModal() {
if (this._currentModal) {
this._currentModal.hide(true)
this._currentModal = null
}
},
// 隐藏划出的 View
hide(reload) {
if (parent.RbViewModal_Comp) parent.RbViewModal_Comp.hide()

48
src/main/webapp/general-entity/assign.jsp
View file

@ -1,48 +0,0 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<!DOCTYPE html>
<html>
<head>
<%@ include file="/_include/Head.jsp"%>
<title>分派</title>
</head>
<body class="dialog">
<div class="main-content">
<form>
<div class="form-group row">
<label class="col-sm-3 col-form-label text-sm-right">分派哪些记录</label>
<div class="col-sm-7 col-lg-4">
<div class="form-control-plaintext" id="records">选中的记录</div>
</div>
</div>
<div class="form-group row">
<label class="col-sm-3 col-form-label text-sm-right">分派给谁</label>
<div class="col-sm-7 col-lg-4">
<select class="form-control form-control-sm" id="toUser" multiple="multiple">
</select>
</div>
</div>
<div class="form-group row J_click-cass">
<div class="col-sm-7 offset-sm-3">
<a href="javascript:;">同时分派关联记录</a>
</div>
</div>
<div class="form-group row J_cass hide">
<label class="col-sm-3 col-form-label text-sm-right">同时分派关联记录</label>
<div class="col-sm-7 col-lg-4">
<select class="form-control form-control-sm" id="cascades" multiple="multiple">
</select>
</div>
</div>
<div class="form-group row footer">
<div class="col-sm-7 offset-sm-3">
<button class="btn btn-primary J_submit" type="button" data-loading-text="请稍后">确定</button>
<a class="btn btn-link J_cancel">取消</a>
</div>
</div>
</form>
</div>
<%@ include file="/_include/Foot.jsp"%>
<script src="${baseUrl}/assets/js/assign-share.js"></script>
</body>
</html>

2
src/main/webapp/general-entity/quick-fields.jsp
View file

@ -30,7 +30,7 @@
</label>
</div>
<button class="btn btn-primary J_save" type="button">保存</button>
<button class="btn btn-secondary" onclick="parent.QuickFilter.hideModal()" type="button">取消</button>
<button class="btn btn-secondary" onclick="parent.$hideModal()" type="button">取消</button>
</div>
</div>
<%@ include file="/_include/Foot.jsp"%>

2
src/main/webapp/general-entity/record-view.jsp
View file

@ -8,7 +8,7 @@
<style type="text/css">
</style>
</head>
<body class="dialog">
<body class="view-body">
<div class="view-header">
<span class="header-icon zmdi zmdi-${entityIcon}"></span>
<h3 class="title">${entityLabel}视图</h3>

51
src/main/webapp/general-entity/share.jsp
View file

@ -1,51 +0,0 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<!DOCTYPE html>
<html>
<head>
<%@ include file="/_include/Head.jsp"%>
<title>共享</title>
</head>
<body class="dialog">
<div class="main-content">
<form>
<div class="form-group row">
<label class="col-sm-3 col-form-label text-sm-right">共享哪些记录</label>
<div class="col-sm-7 col-lg-4">
<div class="form-control-plaintext" id="records">选中的记录</div>
</div>
</div>
<div class="form-group row">
<label class="col-sm-3 col-form-label text-sm-right">共享给谁</label>
<div class="col-sm-7 col-lg-4">
<select class="form-control form-control-sm" id="toUser" multiple="multiple">
</select>
</div>
</div>
<div class="form-group row J_click-cass">
<div class="col-sm-7 offset-sm-3">
<a href="javascript:;">同时共享关联记录</a>
</div>
</div>
<div class="form-group row J_cass hide">
<label class="col-sm-3 col-form-label text-sm-right">同时共享关联记录</label>
<div class="col-sm-7 col-lg-4">
<select class="form-control form-control-sm" id="cascades" multiple="multiple">
</select>
</div>
</div>
<div class="form-group row footer">
<div class="col-sm-7 offset-sm-3">
<button class="btn btn-primary J_submit" type="button" data-loading-text="请稍后">确定</button>
<a class="btn btn-link J_cancel">取消</a>
</div>
</div>
</form>
</div>
<%@ include file="/_include/Foot.jsp"%>
<script type="text/javascript">
opType = ['share', '共享']
</script>
<script src="${baseUrl}/assets/js/assign-share.js"></script>
</body>
</html>

2
src/main/webapp/general-entity/show-fields.jsp
View file

@ -30,7 +30,7 @@
</label>
</div>
<button class="btn btn-primary J_save" type="button">保存</button>
<button class="btn btn-secondary" onclick="parent.RbListPage.hideModal()" type="button">取消</button>
<button class="btn btn-secondary" onclick="parent.$hideModal()" type="button">取消</button>
</div>
</div>
<%@ include file="/_include/Foot.jsp"%>

2
src/main/webapp/settings/nav-settings.jsp
View file

@ -62,7 +62,7 @@
</label>
</div>
<button class="btn btn-primary J_save" type="button">保存</button>
<button class="btn btn-secondary" onclick="parent.navsModal.hide()" type="button">取消</button>
<button class="btn btn-secondary" onclick="parent.$hideModal()" type="button">取消</button>
</div>
</div>
<%@ include file="/_include/Foot.jsp"%>