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

fixed

Browse source
This commit is contained in:
devezhao-mac 2019-01-08 00:15:23 +08:00
parent c09aece612
commit eb1a5513da
9 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
.setup/mysql-init.sql
View file

@ -152,60 +152,60 @@ create table /*!32312 if not exists*/ `pick_list` (
-- ************ Entity [LayoutConfig] DDL ************
drop table if exists `layout_config`;
create table /*!32312 if not exists*/ `layout_config` (
`APPLY_TO` varchar(420) default 'SELF' comment '应用到哪些人，可选值: ALL/SELF/$MemberID(U/D/R)',
`APPLY_TYPE` varchar(20) not null comment 'FORM,DATALIST,NAVI',
`MODIFIED_ON` timestamp not null default '0000-00-00 00:00:00' comment '修改时间',
`CREATED_BY` char(20) not null comment '创建人',
`CONFIG_ID` char(20) not null,
`SHARE_TO` varchar(420) default 'SELF' comment '共享给哪些人，可选值: ALL/SELF/$MemberID(U/D/R)',
`MODIFIED_BY` char(20) not null comment '修改人',
`BELONG_ENTITY` varchar(100) not null,
`TYPE` varchar(20) not null comment 'FORM,DATALIST,NAVI',
`LAYOUT_ID` char(20) not null,
`CONFIG` text(21845) not null comment 'JSON格式配置',
`CREATED_ON` timestamp not null default '0000-00-00 00:00:00' comment '创建时间',
primary key (`LAYOUT_ID`)
primary key (`CONFIG_ID`)
)Engine=InnoDB;
-- ************ Entity [FilterConfig] DDL ************
drop table if exists `filter_config`;
create table /*!32312 if not exists*/ `filter_config` (
`FILTER_ID` char(20) not null,
`APPLY_TO` varchar(420) default 'SELF' comment '应用到哪些人，可选值: ALL/SELF/$MemberID(U/D/R)',
`MODIFIED_ON` timestamp not null default '0000-00-00 00:00:00' comment '修改时间',
`CREATED_BY` char(20) not null comment '创建人',
`CONFIG_ID` char(20) not null,
`FILTER_NAME` varchar(100) not null,
`SHARE_TO` varchar(420) default 'SELF' comment '共享给哪些人，可选值: ALL/SELF/$MemberID(U/D/R)',
`MODIFIED_BY` char(20) not null comment '修改人',
`BELONG_ENTITY` varchar(100) not null,
`CONFIG` text(21845) not null comment 'JSON格式配置',
`CREATED_ON` timestamp not null default '0000-00-00 00:00:00' comment '创建时间',
primary key (`FILTER_ID`)
primary key (`CONFIG_ID`)
)Engine=InnoDB;
-- ************ Entity [ViewAddonsConfig] DDL ************
drop table if exists `view_addons_config`;
create table /*!32312 if not exists*/ `view_addons_config` (
`APPLY_TYPE` varchar(20) not null comment 'TAB,ADD',
`MODIFIED_ON` timestamp not null default '0000-00-00 00:00:00' comment '修改时间',
`CREATED_BY` char(20) not null comment '创建人',
`CONFIG_ID` char(20) not null,
`MODIFIED_BY` char(20) not null comment '修改人',
`ADDONS_ID` char(20) not null,
`BELONG_ENTITY` varchar(100) not null,
`TYPE` varchar(20) not null comment 'TAB,ADD',
`CONFIG` text(21845) not null comment 'JSON格式配置',
`CREATED_ON` timestamp not null default '0000-00-00 00:00:00' comment '创建时间',
primary key (`ADDONS_ID`),
unique index `UIX1_view_addons_config` (`BELONG_ENTITY`, `TYPE`)
primary key (`CONFIG_ID`),
unique index `UIX1_view_addons_config` (`BELONG_ENTITY`, `APPLY_TYPE`)
)Engine=InnoDB;
-- ************ Entity [DashboardConfig] DDL ************
drop table if exists `dashboard_config`;
create table /*!32312 if not exists*/ `dashboard_config` (
`MODIFIED_ON` timestamp not null default '0000-00-00 00:00:00' comment '修改时间',
`DASHBOARD_ID` char(20) not null,
`CREATED_BY` char(20) not null comment '创建人',
`CONFIG_ID` char(20) not null,
`SHARE_TO` varchar(420) default 'SELF' comment '共享给哪些人，可选值: ALL/SELF/$MemberID(U/D/R)',
`MODIFIED_BY` char(20) not null comment '修改人',
`TITLE` varchar(100) not null,
`CONFIG` text(21845) not null comment 'JSON格式配置',
`CREATED_ON` timestamp not null default '0000-00-00 00:00:00' comment '创建时间',
primary key (`DASHBOARD_ID`)
primary key (`CONFIG_ID`)
)Engine=InnoDB;
-- ************ Entity [ChartConfig] DDL ************
@ -214,9 +214,9 @@ create table /*!32312 if not exists*/ `chart_config` (
`MODIFIED_ON` timestamp not null default '0000-00-00 00:00:00' comment '修改时间',
`CHART_ID` char(20) not null,
`CREATED_BY` char(20) not null comment '创建人',
`CHART_TYPE` varchar(100) not null,
`MODIFIED_BY` char(20) not null comment '修改人',
`BELONG_ENTITY` varchar(100) not null,
`TYPE` varchar(100) not null,
`TITLE` varchar(100) not null,
`CONFIG` text(21845) not null comment 'JSON格式配置',
`CREATED_ON` timestamp not null default '0000-00-00 00:00:00' comment '创建时间',

4
src/main/resources/metadata-conf.xml
View file

@ -105,7 +105,7 @@
<entity name="LayoutConfig" type-code="013" description="布局配置（表单/视图/列表）">
<field name="configId" type="primary" />
<field name="config" type="text" description="JSON格式配置" nullable="false" />
<field name="shareTo" type="string" max-length="420" default-value="SELF" description="应用到哪些人，可选值: ALL/SELF/$MemberID(U/D/R)" />
<field name="shareTo" type="string" max-length="420" default-value="SELF" description="共享给哪些人，可选值: ALL/SELF/$MemberID(U/D/R)" />
<field name="belongEntity" type="string" max-length="100" nullable="false" updatable="false" />
<field name="applyType" type="string" max-length="20" nullable="false" updatable="false" description="FORM,DATALIST,NAVI" />
</entity>
@ -113,7 +113,7 @@
<entity name="FilterConfig" type-code="014" description="过滤条件配置">
<field name="configId" type="primary" />
<field name="config" type="text" description="JSON格式配置" nullable="false" />
<field name="shareTo" type="string" max-length="420" default-value="SELF" description="应用到哪些人，可选值: ALL/SELF/$MemberID(U/D/R)" />
<field name="shareTo" type="string" max-length="420" default-value="SELF" description="共享给哪些人，可选值: ALL/SELF/$MemberID(U/D/R)" />
<field name="belongEntity" type="string" max-length="100" nullable="false" updatable="false" />
<field name="filterName" type="string" max-length="100" nullable="false" />
</entity>

2
src/main/webapp/assets/js/bizuser/user-view.jsx
View file

@ -117,7 +117,7 @@ class DlgChangeRole extends DlgChangeDept {
$.post(rb.baseUrl + '/admin/bizuser/change-role?role=' + role + '&user=' + this.props.user, (res)=>{
if (res.error_code == 0) location.reload()
else rb.hberror(res.error_msg)
btn.button('reset')
btns.button('reset')
})
}
}

2
src/main/webapp/assets/js/charts/dashboard.jsx
View file

@ -107,7 +107,7 @@ let render_dashboard = function(cfg){
rendered_charts.push(c)
})
if (rendered_charts.length == 0){
let el = '<li><a class="chart-add" onclick="show_dlg(\"DlgAddChart\")"><i class="zmdi zmdi-plus"></i><p>添加图表</p></a></li>'
let el = '<li><a class="chart-add" onclick="show_dlg(\'DlgAddChart\')"><i class="zmdi zmdi-plus"></i><p>添加图表</p></a></li>'
gridster.add_widget(el, 2, 2)
gridster.disable_resize()
} else{

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

@ -471,7 +471,7 @@ const AdvFilters = {
this.__el.find('.J_advfilter').click(()=>{ that.showAdvFilter() })
// $ALL$
$('.adv-search .dropdown-item:eq(0)').click(()=>{
$('.adv-search .J_name').text('所有数据')
$('.adv-search .J_name').text('全部数据')
RbListPage._RbList.setAdvFilter(null)
})
@ -506,7 +506,7 @@ const AdvFilters = {
if (dfilter == _data[0]) {
RbListPage._RbList.setAdvFilter(null)
$('.adv-search .J_name').text('所有数据')
$('.adv-search .J_name').text('全部数据')
}
} else rb.hberror(res.error_msg)

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

@ -60,7 +60,7 @@
<div class="float-left hide J_for-admin">
<label class="custom-control custom-checkbox custom-control-inline">
<input class="custom-control-input" type="checkbox" id="shareTo" value="ALL" checked="checked">
<span class="custom-control-label">应用到全部用户</span>
<span class="custom-control-label">共享给全部用户</span>
</label>
</div>
<button class="btn btn-primary J_save" type="button">保存</button>

4
src/main/webapp/general-entity/record-list.jsp
View file

@ -30,9 +30,9 @@
<div class="dataTables_filter">
<div class="adv-search float-left">
<div class="btn-group">
<button class="btn btn-secondary dropdown-toggle" type="button" data-toggle="dropdown"><span class="text-truncate J_name">所有数据</span><i class="icon zmdi zmdi-caret-down"></i></button>
<button class="btn btn-secondary dropdown-toggle" type="button" data-toggle="dropdown"><span class="text-truncate J_name">全部数据</span><i class="icon zmdi zmdi-caret-down"></i></button>
<div class="dropdown-menu rb-scroller">
<div class="dropdown-item" data-id="$ALL$"><a>所有数据</a></div>
<div class="dropdown-item" data-id="$ALL$"><a>全部数据</a></div>
<div class="dropdown-divider"></div>
<div class="dropdown-item J_advfilter"><i class="icon zmdi zmdi-plus"></i>添加过滤项</div>
</div>

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

@ -26,7 +26,7 @@
<div class="float-left hide J_for-admin">
<label class="custom-control custom-checkbox custom-control-inline">
<input class="custom-control-input" type="checkbox" id="shareTo" value="ALL" checked="checked">
<span class="custom-control-label">应用到全部用户</span>
<span class="custom-control-label">共享给全部用户</span>
</label>
</div>
<button class="btn btn-primary J_save" type="button">保存</button>
@ -43,7 +43,7 @@ $(document).ready(function(){
$(res.data['fieldList']).each(function(){ render_unset([this.field, this.label]) })
$(res.data['configList']).each(function(){ $('.unset-list li[data-key="' + this.field + '"]').trigger('click') })
cfgid = res.data['configId'] || ''
$('#shareTo').attr('checked', res.data['shareTo'] == 'ALL')
if (cfgid) $('#shareTo').attr('checked', res.data['shareTo'] == 'ALL')
})
$('.J_save').click(function(){

4
src/main/webapp/general-entity/slave-list.jsp
View file

@ -27,9 +27,9 @@
<div class="dataTables_filter">
<div class="adv-search float-left">
<div class="btn-group">
<button class="btn btn-secondary dropdown-toggle" type="button" data-toggle="dropdown"><span class="text-truncate J_name">所有数据</span><i class="icon zmdi zmdi-caret-down"></i></button>
<button class="btn btn-secondary dropdown-toggle" type="button" data-toggle="dropdown"><span class="text-truncate J_name">全部数据</span><i class="icon zmdi zmdi-caret-down"></i></button>
<div class="dropdown-menu rb-scroller">
<div class="dropdown-item" data-id="$ALL$"><a>所有数据</a></div>
<div class="dropdown-item" data-id="$ALL$"><a>全部数据</a></div>
<div class="dropdown-divider"></div>
<div class="dropdown-item J_advfilter"><i class="icon zmdi zmdi-plus"></i>添加过滤项</div>
</div>