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

bug fixs

Browse source
This commit is contained in:
devezhao 2019-08-15 19:19:52 +08:00
parent 7b8abd0f0b
commit 0aca21a36e
3 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/webapp/_include/NavLeftAdmin.jsp
View file

@ -31,9 +31,11 @@
<li class="${param['activeNav'] == 'classifications' ? 'active' : ''}"><a href="${baseUrl}/admin/entityhub/classifications"><i class="icon x21 zmdi zmdi-layers"></i><span>分类数据</span></a></li>
<li class="${param['activeNav'] == 'robot-trigger' ? 'active' : ''}"><a href="${baseUrl}/admin/robot/triggers"><i class="icon zmdi zmdi-rotate-cw"></i><span>触发器</span></a></li>
<li class="${param['activeNav'] == 'robot-approval' ? 'active' : ''}"><a href="${baseUrl}/admin/robot/approvals"><i class="icon zmdi zmdi-assignment-check"></i><span>审批流程</span></a></li>
<li class="${param['activeNav'] == 'audit-logs' ? 'active' : ''} bosskey-show"><a href="${baseUrl}/admin/entityhub/audit-logs"><i class="icon zmdi zmdi-local-library"></i><span>审计日志</span></a></li>
<li class="${param['activeNav'] == 'data-importer' ? 'active' : ''}"><a href="${baseUrl}/admin/datas/data-importer"><i class="icon zmdi zmdi-cloud-upload"></i><span>数据导入</span></a></li>
<li class="${param['activeNav'] == 'data-reports' ? 'active' : ''}"><a href="${baseUrl}/admin/datas/data-reports"><i class="icon zmdi zmdi-map"></i><span>报表设计</span></a></li>
<li class="${param['activeNav'] == 'data-reports' ? 'active' : ''}"><a href="${baseUrl}/admin/datas/data-reports"><i class="icon zmdi zmdi-map"></i><span>报表模板</span></a></li>
<li class="divider bosskey-show">数据审计</li>
<li class="${param['activeNav'] == 'audit-logs' ? 'active' : ''} bosskey-show"><a href="${baseUrl}/admin/entityhub/audit-logs"><i class="icon zmdi zmdi-local-library"></i><span>审计日志</span></a></li>
<li class="${param['activeNav'] == 'recycle-bin' ? 'active' : ''} bosskey-show"><a href="${baseUrl}/admin/entityhub/recycle-bin"><i class="icon zmdi zmdi-delete fs-16"></i><span>回收站</span></a></li>
<li class="divider">用户</li>
<li class="${param['activeNav'] == 'users' ? 'active' : ''}"><a href="${baseUrl}/admin/bizuser/users"><i class="icon zmdi zmdi-accounts"></i><span>部门用户</span></a></li>
<li class="${param['activeNav'] == 'role-privileges' ? 'active' : ''}"><a href="${baseUrl}/admin/bizuser/role-privileges"><i class="icon zmdi zmdi-lock"></i><span>角色权限</span></a></li>

8
src/main/webapp/admin/datas/data-reports.jsp
View file

@ -3,7 +3,7 @@
<html>
<head>
<%@ include file="/_include/Head.jsp"%>
<title>报表设计</title>
<title>报表模板</title>
<style type="text/css">
.syscfg h5{background-color:#eee;margin:0;padding:10px;}
.syscfg .table td{padding:10px;}
@ -13,7 +13,7 @@
<body>
<div class="rb-wrapper rb-fixed-sidebar rb-collapsible-sidebar rb-collapsible-sidebar-hide-logo rb-color-header rb-aside">
<jsp:include page="/_include/NavTop.jsp">
<jsp:param value="报表设计" name="pageTitle"/>
<jsp:param value="报表模板" name="pageTitle"/>
</jsp:include>
<jsp:include page="/_include/NavLeftAdmin.jsp">
<jsp:param value="data-reports" name="activeNav"/>
@ -30,7 +30,7 @@
</div>
</aside>
<div class="page-head">
<div class="float-left"><div class="page-head-title">报表设计</div></div>
<div class="float-left"><div class="page-head-title">报表模板</div></div>
<div class="float-right pt-1">
<button class=" btn btn-primary J_add" type="button"><i class="icon zmdi zmdi-plus"></i> 添加</button>
</div>
@ -46,7 +46,7 @@
<table class="table table-hover table-striped table-fixed">
<thead>
<tr>
<th>报表名称</th>
<th>名称</th>
<th>应用实体</th>
<th width="10%">启用</th>
<th width="15%">更新时间</th>

11
src/main/webapp/assets/js/entity/approval-design.jsx
View file

@ -1,4 +1,5 @@
/* eslint-disable react/prop-types */
let __debug = false
var wpc = window.__PageConfig
let activeNode
$(document).ready(() => {
@ -64,7 +65,7 @@ class NodeSpec extends React.Component {
let call = function (d) {
that.setState({ data: d, active: false })
}
let props = { ...(this.state.data || {}), call: call, key: 'csk-' + this.props.nodeId }
let props = { ...(this.state.data || {}), call: call, key: 'kns-' + this.props.nodeId }
if (this.nodeType === 'start') renderRbcomp(<StartNodeConfig {...props} />, 'config-side')
else if (this.nodeType === 'approver') renderRbcomp(<ApproverNodeConfig {...props} />, 'config-side')
else if (this.nodeType === 'cc') renderRbcomp(<CCNodeConfig {...props} />, 'config-side')
@ -95,7 +96,7 @@ class NodeGroupSpec extends React.Component {
}
renderNodes() {
let nodes = (this.state.nodes || []).map((item) => {
let props = { ...item, key: 'k-' + item.nodeId, $$$parent: this }
let props = { ...item, key: 'kn-' + item.nodeId, $$$parent: this }
if (item.type === 'condition') return <ConditionNode {...props} />
else return <Node {...props} />
})
@ -194,7 +195,7 @@ class ConditionNode extends NodeSpec {
<div className="branch-box">
<button className="add-branch" onClick={this.addBranch}>添加分支</button>
{this.state.branches.map((item, idx) => {
return <ConditionBranch key={this.props.nodeId + '-b' + idx} priority={idx + 1} isFirst={idx === 0} isLast={idx === bLen} $$$parent={this} {...item} />
return <ConditionBranch key={'kcb-' + item.nodeId} priority={idx + 1} isFirst={idx === 0} isLast={idx === bLen} $$$parent={this} {...item} />
})}
</div>
<AddNodeButton addNodeCall={this.addNodeQuick} />
@ -257,7 +258,7 @@ class ConditionBranch extends NodeGroupSpec {
{this.state.isFirst && <div className="top-left-cover-line"></div>}
{this.state.isFirst && <div className="bottom-left-cover-line"></div>}
<div className="condition-node">
<div className="condition-node-box animated fadeIn">
<div className="condition-node-box animated fadeIn" title={__debug ? this.props.nodeId : null}>
<div className={`auto-judge ${this.state.hasError ? 'error' : ''} ${this.state.active ? 'active' : ''}`} onClick={this.openConfig}>
<div className="title-wrapper">
<span className="editable-title float-left">{data.nodeName || '分支条件'}</span>
@ -298,7 +299,7 @@ class ConditionBranch extends NodeGroupSpec {
that.setState({ data: d, active: false })
}
let props = { ...(this.state.data || {}), entity: wpc.applyEntity, call: call }
renderRbcomp(<ConditionBranchConfig key={'cks-' + this.props.nodeId} {...props} isLast={this.state.isLast} />, 'config-side')
renderRbcomp(<ConditionBranchConfig key={'kcbc-' + this.props.nodeId} {...props} isLast={this.state.isLast} />, 'config-side')
$(document.body).addClass('open-right-sidebar')
this.setState({ active: true })