diff --git a/.setup/mysql-init.sql b/.setup/mysql-init.sql index edfdb4477..921d9a2b3 100644 --- a/.setup/mysql-init.sql +++ b/.setup/mysql-init.sql @@ -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 '创建时间', diff --git a/src/main/resources/metadata-conf.xml b/src/main/resources/metadata-conf.xml index f7dc7495b..d3d380e76 100644 --- a/src/main/resources/metadata-conf.xml +++ b/src/main/resources/metadata-conf.xml @@ -105,7 +105,7 @@ - + @@ -113,7 +113,7 @@ - + diff --git a/src/main/webapp/assets/js/bizuser/user-view.jsx b/src/main/webapp/assets/js/bizuser/user-view.jsx index dbbc19001..57f9764f4 100644 --- a/src/main/webapp/assets/js/bizuser/user-view.jsx +++ b/src/main/webapp/assets/js/bizuser/user-view.jsx @@ -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') }) } } diff --git a/src/main/webapp/assets/js/charts/dashboard.jsx b/src/main/webapp/assets/js/charts/dashboard.jsx index 4c7b54361..f5a80a024 100644 --- a/src/main/webapp/assets/js/charts/dashboard.jsx +++ b/src/main/webapp/assets/js/charts/dashboard.jsx @@ -107,7 +107,7 @@ let render_dashboard = function(cfg){ rendered_charts.push(c) }) if (rendered_charts.length == 0){ - let el = '

  • 添加图表

    • ' + let el = '

  • 添加图表

    • ' gridster.add_widget(el, 2, 2) gridster.disable_resize() } else{ diff --git a/src/main/webapp/assets/js/rb-list.jsx b/src/main/webapp/assets/js/rb-list.jsx index ba07e6d20..2823baea7 100644 --- a/src/main/webapp/assets/js/rb-list.jsx +++ b/src/main/webapp/assets/js/rb-list.jsx @@ -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) diff --git a/src/main/webapp/commons/nav-settings.jsp b/src/main/webapp/commons/nav-settings.jsp index 6bc56425b..d1d02bcc0 100644 --- a/src/main/webapp/commons/nav-settings.jsp +++ b/src/main/webapp/commons/nav-settings.jsp @@ -60,7 +60,7 @@
    diff --git a/src/main/webapp/general-entity/record-list.jsp b/src/main/webapp/general-entity/record-list.jsp index e8c4805a1..6c6427ec8 100644 --- a/src/main/webapp/general-entity/record-list.jsp +++ b/src/main/webapp/general-entity/record-list.jsp @@ -30,9 +30,9 @@
    - +
    -
    所有数据
    +
    全部数据
    添加过滤项
    diff --git a/src/main/webapp/general-entity/show-fields.jsp b/src/main/webapp/general-entity/show-fields.jsp index 2c86d44f9..3da4d0a77 100644 --- a/src/main/webapp/general-entity/show-fields.jsp +++ b/src/main/webapp/general-entity/show-fields.jsp @@ -26,7 +26,7 @@
    @@ -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(){ diff --git a/src/main/webapp/general-entity/slave-list.jsp b/src/main/webapp/general-entity/slave-list.jsp index 45762a6e1..b29b5860c 100644 --- a/src/main/webapp/general-entity/slave-list.jsp +++ b/src/main/webapp/general-entity/slave-list.jsp @@ -27,9 +27,9 @@
    - +
    -
    所有数据
    +
    全部数据
    添加过滤项