提交 fe0e498f 编写于 作者: ibizdev's avatar ibizdev

ibiz4j 发布系统代码 [ibz-ou,统一组织单位]

上级 7e4bcf16
......@@ -482,7 +482,7 @@ export default class AppFormDRUIPart extends Vue {
* @public
* @memberof AppFormDRUIPart
*/
public viewdataschange(){
public viewdataschange($event:any){
console.log((this.$t('components.appFormDRUIPart.change1') as string));
}
......
.app-icon-menus{
display: flex;
flex-wrap: wrap;
.el-card{
margin-left: 16px;
margin: 6px 8px;
.el-card__body{
padding: 0;
width: 200px;
......
......@@ -10,13 +10,20 @@
</dropdown>
</template>
<script lang = 'ts'>
import { Component, Vue } from 'vue-property-decorator';
import { Component, Vue, Inject } from 'vue-property-decorator';
import { localList } from '@locale/local-list';
@Component({})
export default class AppLang extends Vue {
/**
* 注入刷新行为
*
* @memberof AppLang
*/
@Inject() reload: any;
/**
* 本地语言资源
*
......@@ -55,6 +62,7 @@ export default class AppLang extends Vue {
const local: any = this.localList.find((_local: any) => Object.is(_local.type, $evnet));
this.title = local.name;
localStorage.setItem('local', $evnet);
this.reload();
}
}
......
......@@ -312,9 +312,11 @@ export default class AppPicker extends Vue {
if (value) {
this.items.push({text: newVal, value: value});
}
if(newVal && value){
this.onSearch(newVal, null, false);
}
}
}
/**
* vue 生命周期
......
......@@ -68,7 +68,7 @@ export default class TabPageExp extends Vue {
public getCaption(caption: any, info: any): any {
return info && !Object.is(info, "")
? `${this.$t(caption)} - ${info}`
? `${this.$t(caption)} - ${this.$t(info)}`
: this.$t(caption);
}
......
......@@ -101,7 +101,7 @@ export default class EditViewEngine extends ViewEngine {
* @memberof EditViewEngine
*/
public onFormLoad(arg: any): void {
this.view.model.dataInfo = Object.is(arg.srfuf, '1') ? (this.majorPSDEField?arg[this.majorPSDEField]:arg.srfmajortext) : this.view.$t('app.local.new');
this.view.model.dataInfo = Object.is(arg.srfuf, '1') ? (this.majorPSDEField?arg[this.majorPSDEField]:arg.srfmajortext) : 'app.local.new';
this.setTabCaption(this.view.model.dataInfo,Object.is(arg.srfuf, '0'));
const newdata: boolean = !Object.is(arg.srfuf, '1');
......@@ -116,7 +116,7 @@ export default class EditViewEngine extends ViewEngine {
* @memberof EditViewEngine
*/
public onFormSave(arg: any): void {
this.view.model.dataInfo = Object.is(arg.srfuf, '1') ? (this.majorPSDEField?arg[this.majorPSDEField]:arg.srfmajortext) : this.view.$t('app.local.new');
this.view.model.dataInfo = Object.is(arg.srfuf, '1') ? (this.majorPSDEField?arg[this.majorPSDEField]:arg.srfmajortext) : 'app.local.new';
this.setTabCaption(this.view.model.dataInfo,Object.is(arg.srfuf, '0'));
const newdata: boolean = !Object.is(arg.srfuf, '1');
......@@ -200,12 +200,12 @@ export default class EditViewEngine extends ViewEngine {
}
// 解决表格视图标题问题
if(this.view.$tabPageExp && this.view.viewDefaultUsage){
this.view.$tabPageExp.setCurPageCaption(this.view.$t(viewdata.srfCaption), this.view.$t(viewdata.srfCaption), info);
this.view.$tabPageExp.setCurPageCaption(this.view.$t(viewdata.srfCaption), viewdata.srfCaption, info);
}
if(this.view.$route){
this.view.$route.meta.info = info;
}
this.view.model.srfCaption = `${this.view.$t(viewdata.srfCaption)}-${viewdata.dataInfo}`;
this.view.model.srfCaption = `${this.view.$t(viewdata.srfCaption)}-${this.view.$t(viewdata.dataInfo)}`;
this.view.initNavDataWithRoute(null,isNew);
}
}
......
......@@ -16,7 +16,7 @@ const messages = {
// 自动根据浏览器系统语言设置语言
const navLang = localStorage.getItem('local') || navigator.language;
const localLang = (navLang === 'zh-CN' || (navLang === 'en-US' && messages.hasOwnProperty('en-US'))) ? navLang : false;
const localLang = (navLang === 'zh-CN' || (navLang === 'en-US' && messages.hasOwnProperty('en-US')) || (navLang === 'ti-US' && messages.hasOwnProperty('ti-US'))) ? navLang : false;
let lang: string = localLang || 'zh-CN';
vueApp.config.lang = lang
......
此差异已折叠。
import app_BO_CN_Base from './BO-CN-base';
function getLocaleResource(){
const app_BO_CN_OwnData = {};
const targetData = Object.assign(app_BO_CN_Base(), app_BO_CN_OwnData);
return targetData;
}
export default getLocaleResource;
\ No newline at end of file
import codelist_BO_CN_Base from './codelist_BO_CN_base';
function getLocaleResource(){
const codelist_BO_CN_OwnData = {};
const targetData = Object.assign(codelist_BO_CN_Base(), codelist_BO_CN_OwnData);
return targetData;
}
export default getLocaleResource;
\ No newline at end of file
import commonLogic from '@/locale/logic/common/common-logic';
function getLocaleResourceBase(){
const data:any = {
CLSYS_Sex: {
"男": commonLogic.appcommonhandle("男性",null),
"女": commonLogic.appcommonhandle("女性",null),
"性别不详": commonLogic.appcommonhandle("性别不详",null),
"empty": commonLogic.appcommonhandle("",null)
},
YesNo: {
"1": commonLogic.appcommonhandle("是",null),
"0": commonLogic.appcommonhandle("否",null),
"empty": commonLogic.appcommonhandle("",null)
},
};
return data;
}
export default getLocaleResourceBase;
\ No newline at end of file
import components_BO_CN_Base from './components_BO_CN_base';
function getLocaleResource(){
const components_BO_CN_OwnData = {};
const targetData = Object.assign(components_BO_CN_Base(), components_BO_CN_OwnData);
return targetData;
}
export default getLocaleResource;
\ No newline at end of file
import SysDepartment_BO_CN_Base from './sys-department_BO_CN_base';
function getLocaleResource(){
const SysDepartment_BO_CN_OwnData = {};
const targetData = Object.assign(SysDepartment_BO_CN_Base(), SysDepartment_BO_CN_OwnData);
return targetData;
}
export default getLocaleResource;
\ No newline at end of file
import SysDeptMember_BO_CN_Base from './sys-dept-member_BO_CN_base';
function getLocaleResource(){
const SysDeptMember_BO_CN_OwnData = {};
const targetData = Object.assign(SysDeptMember_BO_CN_Base(), SysDeptMember_BO_CN_OwnData);
return targetData;
}
export default getLocaleResource;
\ No newline at end of file
import commonLogic from '@/locale/logic/common/common-logic';
function getLocaleResourceBase(){
const data:any = {
fields: {
memberid: commonLogic.appcommonhandle("标识",null),
deptid: commonLogic.appcommonhandle("部门标识",null),
deptname: commonLogic.appcommonhandle("部门名称",null),
userid: commonLogic.appcommonhandle("用户标识",null),
personname: commonLogic.appcommonhandle("成员",null),
postid: commonLogic.appcommonhandle("岗位标识",null),
postname: commonLogic.appcommonhandle("岗位名称",null),
bcode: commonLogic.appcommonhandle("业务条线",null),
domains: commonLogic.appcommonhandle("区属",null),
},
views: {
gridview: {
caption: commonLogic.appcommonhandle("部门成员",null),
title: commonLogic.appcommonhandle("部门成员表格视图",null),
},
editview: {
caption: commonLogic.appcommonhandle("部门成员",null),
title: commonLogic.appcommonhandle("部门成员编辑视图",null),
},
},
main_form: {
details: {
group1: commonLogic.appcommonhandle("部门成员基本信息",null),
formpage1: commonLogic.appcommonhandle("基本信息",null),
srforikey: commonLogic.appcommonhandle("",null),
srfkey: commonLogic.appcommonhandle("标识",null),
srfmajortext: commonLogic.appcommonhandle("成员",null),
srftempmode: commonLogic.appcommonhandle("",null),
srfuf: commonLogic.appcommonhandle("",null),
srfdeid: commonLogic.appcommonhandle("",null),
srfsourcekey: commonLogic.appcommonhandle("",null),
deptname: commonLogic.appcommonhandle("部门名称",null),
deptid: commonLogic.appcommonhandle("部门标识",null),
personname: commonLogic.appcommonhandle("成员",null),
userid: commonLogic.appcommonhandle("用户标识",null),
memberid: commonLogic.appcommonhandle("标识",null),
},
uiactions: {
},
},
main_grid: {
columns: {
deptname: commonLogic.appcommonhandle("部门",null),
postname: commonLogic.appcommonhandle("岗位名称",null),
personname: commonLogic.appcommonhandle("成员",null),
deptid: commonLogic.appcommonhandle("部门标识",null),
postid: commonLogic.appcommonhandle("岗位标识",null),
userid: commonLogic.appcommonhandle("用户标识",null),
},
nodata:commonLogic.appcommonhandle("",null),
uiactions: {
},
},
gridviewtoolbar_toolbar: {
tbitem24: {
caption: commonLogic.appcommonhandle("行编辑",null),
tip: commonLogic.appcommonhandle("行编辑",null),
},
tbitem25: {
caption: commonLogic.appcommonhandle("新建行",null),
tip: commonLogic.appcommonhandle("新建行",null),
},
deuiaction1: {
caption: commonLogic.appcommonhandle("保存行",null),
tip: commonLogic.appcommonhandle("保存行",null),
},
tbitem26: {
caption: commonLogic.appcommonhandle("-",null),
tip: commonLogic.appcommonhandle("",null),
},
tbitem8: {
caption: commonLogic.appcommonhandle("删除",null),
tip: commonLogic.appcommonhandle("删除",null),
},
},
editviewtoolbar_toolbar: {
tbitem3: {
caption: commonLogic.appcommonhandle("保存",null),
tip: commonLogic.appcommonhandle("保存",null),
},
tbitem6: {
caption: commonLogic.appcommonhandle("-",null),
tip: commonLogic.appcommonhandle("",null),
},
tbitem7: {
caption: commonLogic.appcommonhandle("删除",null),
tip: commonLogic.appcommonhandle("删除",null),
},
tbitem8: {
caption: commonLogic.appcommonhandle("-",null),
tip: commonLogic.appcommonhandle("",null),
},
tbitem14: {
caption: commonLogic.appcommonhandle("拷贝",null),
tip: commonLogic.appcommonhandle("拷贝",null),
},
},
};
return data;
}
export default getLocaleResourceBase;
\ No newline at end of file
import SysEmployee_BO_CN_Base from './sys-employee_BO_CN_base';
function getLocaleResource(){
const SysEmployee_BO_CN_OwnData = {};
const targetData = Object.assign(SysEmployee_BO_CN_Base(), SysEmployee_BO_CN_OwnData);
return targetData;
}
export default getLocaleResource;
\ No newline at end of file
import SysOrganization_BO_CN_Base from './sys-organization_BO_CN_base';
function getLocaleResource(){
const SysOrganization_BO_CN_OwnData = {};
const targetData = Object.assign(SysOrganization_BO_CN_Base(), SysOrganization_BO_CN_OwnData);
return targetData;
}
export default getLocaleResource;
\ No newline at end of file
import commonLogic from '@/locale/logic/common/common-logic';
function getLocaleResourceBase(){
const data:any = {
fields: {
orgid: commonLogic.appcommonhandle("单位标识",null),
orgcode: commonLogic.appcommonhandle("单位代码",null),
orgname: commonLogic.appcommonhandle("名称",null),
parentorgid: commonLogic.appcommonhandle("上级单位",null),
shortname: commonLogic.appcommonhandle("单位简称",null),
orglevel: commonLogic.appcommonhandle("单位级别",null),
showorder: commonLogic.appcommonhandle("排序",null),
parentorgname: commonLogic.appcommonhandle("上级单位",null),
domains: commonLogic.appcommonhandle("区属",null),
enable: commonLogic.appcommonhandle("逻辑有效",null),
createdate: commonLogic.appcommonhandle("创建时间",null),
updatedate: commonLogic.appcommonhandle("最后修改时间",null),
isvalid: commonLogic.appcommonhandle("启用标志",null),
},
views: {
pickupgridview: {
caption: commonLogic.appcommonhandle("单位机构",null),
title: commonLogic.appcommonhandle("单位机构选择表格视图",null),
},
editview: {
caption: commonLogic.appcommonhandle("单位管理",null),
title: commonLogic.appcommonhandle("单位管理",null),
},
treeexpview: {
caption: commonLogic.appcommonhandle("部门管理",null),
title: commonLogic.appcommonhandle("部门管理",null),
},
gridview: {
caption: commonLogic.appcommonhandle("单位管理",null),
title: commonLogic.appcommonhandle("单位管理",null),
},
pickupview: {
caption: commonLogic.appcommonhandle("单位机构",null),
title: commonLogic.appcommonhandle("单位机构数据选择视图",null),
},
optionview: {
caption: commonLogic.appcommonhandle("单位快速新建",null),
title: commonLogic.appcommonhandle("单位快速新建",null),
},
},
main_form: {
details: {
formpage1: commonLogic.appcommonhandle("基本信息",null),
srfupdatedate: commonLogic.appcommonhandle("最后修改时间",null),
srforikey: commonLogic.appcommonhandle("",null),
srfkey: commonLogic.appcommonhandle("单位标识",null),
srfmajortext: commonLogic.appcommonhandle("名称",null),
srftempmode: commonLogic.appcommonhandle("",null),
srfuf: commonLogic.appcommonhandle("",null),
srfdeid: commonLogic.appcommonhandle("",null),
srfsourcekey: commonLogic.appcommonhandle("",null),
orgid: commonLogic.appcommonhandle("单位标识",null),
orgcode: commonLogic.appcommonhandle("单位代码",null),
orgname: commonLogic.appcommonhandle("名称",null),
porgname: commonLogic.appcommonhandle("上级单位",null),
orglevel: commonLogic.appcommonhandle("单位级别",null),
shortname: commonLogic.appcommonhandle("单位简称",null),
showorder: commonLogic.appcommonhandle("排序",null),
isvalid: commonLogic.appcommonhandle("启用",null),
porgid: commonLogic.appcommonhandle("上级单位",null),
createdate: commonLogic.appcommonhandle("创建时间",null),
updatedate: commonLogic.appcommonhandle("最后修改时间",null),
},
uiactions: {
},
},
newform_form: {
details: {
group1: commonLogic.appcommonhandle("单位机构基本信息",null),
formpage1: commonLogic.appcommonhandle("基本信息",null),
srfupdatedate: commonLogic.appcommonhandle("最后修改时间",null),
srforikey: commonLogic.appcommonhandle("",null),
srfkey: commonLogic.appcommonhandle("单位标识",null),
srfmajortext: commonLogic.appcommonhandle("名称",null),
srftempmode: commonLogic.appcommonhandle("",null),
srfuf: commonLogic.appcommonhandle("",null),
srfdeid: commonLogic.appcommonhandle("",null),
srfsourcekey: commonLogic.appcommonhandle("",null),
orgcode: commonLogic.appcommonhandle("单位代码",null),
orgname: commonLogic.appcommonhandle("名称",null),
porgname: commonLogic.appcommonhandle("上级单位",null),
porgid: commonLogic.appcommonhandle("上级单位",null),
enable: commonLogic.appcommonhandle("逻辑有效",null),
orgid: commonLogic.appcommonhandle("单位标识",null),
},
uiactions: {
},
},
main_grid: {
columns: {
orgid: commonLogic.appcommonhandle("单位标识",null),
orgcode: commonLogic.appcommonhandle("单位代码",null),
orgname: commonLogic.appcommonhandle("名称",null),
orglevel: commonLogic.appcommonhandle("单位级别",null),
shortname: commonLogic.appcommonhandle("单位简称",null),
porgname: commonLogic.appcommonhandle("上级单位",null),
porgid: commonLogic.appcommonhandle("上级单位",null),
showorder: commonLogic.appcommonhandle("排序",null),
createdate: commonLogic.appcommonhandle("创建时间",null),
updatedate: commonLogic.appcommonhandle("最后修改时间",null),
},
nodata:commonLogic.appcommonhandle("",null),
uiactions: {
},
},
default_searchform: {
details: {
formpage1: commonLogic.appcommonhandle("常规条件",null),
orgcode: commonLogic.appcommonhandle("单位代码(文本左包含(%#))",null),
n_orgname_like: commonLogic.appcommonhandle("名称(%)",null),
n_porgid_eq: commonLogic.appcommonhandle("上级单位(=)",null),
porgname: commonLogic.appcommonhandle("上级单位(等于(=))",null),
},
uiactions: {
},
},
editviewtoolbar_toolbar: {
tbitem3: {
caption: commonLogic.appcommonhandle("保存",null),
tip: commonLogic.appcommonhandle("保存",null),
},
tbitem6: {
caption: commonLogic.appcommonhandle("-",null),
tip: commonLogic.appcommonhandle("",null),
},
tbitem7: {
caption: commonLogic.appcommonhandle("删除",null),
tip: commonLogic.appcommonhandle("删除",null),
},
tbitem8: {
caption: commonLogic.appcommonhandle("-",null),
tip: commonLogic.appcommonhandle("",null),
},
tbitem14: {
caption: commonLogic.appcommonhandle("拷贝",null),
tip: commonLogic.appcommonhandle("拷贝",null),
},
},
gridviewtoolbar_toolbar: {
tbitem1_opennewcreateview: {
caption: commonLogic.appcommonhandle("快速新建",null),
tip: commonLogic.appcommonhandle("快速新建",null),
},
tbitem2: {
caption: commonLogic.appcommonhandle("-",null),
tip: commonLogic.appcommonhandle("",null),
},
deuiaction1: {
caption: commonLogic.appcommonhandle("新建",null),
tip: commonLogic.appcommonhandle("新建",null),
},
tbitem4: {
caption: commonLogic.appcommonhandle("编辑",null),
tip: commonLogic.appcommonhandle("编辑",null),
},
tbitem6: {
caption: commonLogic.appcommonhandle("拷贝",null),
tip: commonLogic.appcommonhandle("拷贝",null),
},
tbitem7: {
caption: commonLogic.appcommonhandle("-",null),
tip: commonLogic.appcommonhandle("",null),
},
tbitem8: {
caption: commonLogic.appcommonhandle("删除",null),
tip: commonLogic.appcommonhandle("删除",null),
},
tbitem9: {
caption: commonLogic.appcommonhandle("-",null),
tip: commonLogic.appcommonhandle("",null),
},
tbitem13: {
caption: commonLogic.appcommonhandle("导出",null),
tip: commonLogic.appcommonhandle("导出",null),
},
tbitem10: {
caption: commonLogic.appcommonhandle("-",null),
tip: commonLogic.appcommonhandle("",null),
},
tbitem19: {
caption: commonLogic.appcommonhandle("过滤",null),
tip: commonLogic.appcommonhandle("过滤",null),
},
},
orgtree_treeview: {
nodata:commonLogic.appcommonhandle("",null),
nodes: {
root: commonLogic.appcommonhandle("默认根节点",null),
},
uiactions: {
},
},
};
return data;
}
export default getLocaleResourceBase;
\ No newline at end of file
import SysPost_BO_CN_Base from './sys-post_BO_CN_base';
function getLocaleResource(){
const SysPost_BO_CN_OwnData = {};
const targetData = Object.assign(SysPost_BO_CN_Base(), SysPost_BO_CN_OwnData);
return targetData;
}
export default getLocaleResource;
\ No newline at end of file
import commonLogic from '@/locale/logic/common/common-logic';
function getLocaleResourceBase(){
const data:any = {
fields: {
postid: commonLogic.appcommonhandle("岗位标识",null),
postcode: commonLogic.appcommonhandle("岗位编码",null),
postname: commonLogic.appcommonhandle("岗位名称",null),
domains: commonLogic.appcommonhandle("区属",null),
memo: commonLogic.appcommonhandle("备注",null),
},
views: {
pickupview: {
caption: commonLogic.appcommonhandle("岗位",null),
title: commonLogic.appcommonhandle("岗位数据选择视图",null),
},
editview: {
caption: commonLogic.appcommonhandle("岗位管理",null),
title: commonLogic.appcommonhandle("岗位管理",null),
},
pickupgridview: {
caption: commonLogic.appcommonhandle("岗位",null),
title: commonLogic.appcommonhandle("岗位选择表格视图",null),
},
gridview: {
caption: commonLogic.appcommonhandle("岗位管理",null),
title: commonLogic.appcommonhandle("岗位管理",null),
},
},
main_form: {
details: {
group1: commonLogic.appcommonhandle("岗位基本信息",null),
formpage1: commonLogic.appcommonhandle("基本信息",null),
srforikey: commonLogic.appcommonhandle("",null),
srfkey: commonLogic.appcommonhandle("岗位标识",null),
srfmajortext: commonLogic.appcommonhandle("岗位名称",null),
srftempmode: commonLogic.appcommonhandle("",null),
srfuf: commonLogic.appcommonhandle("",null),
srfdeid: commonLogic.appcommonhandle("",null),
srfsourcekey: commonLogic.appcommonhandle("",null),
postcode: commonLogic.appcommonhandle("岗位编码",null),
postname: commonLogic.appcommonhandle("岗位名称",null),
domains: commonLogic.appcommonhandle("区属",null),
memo: commonLogic.appcommonhandle("备注",null),
postid: commonLogic.appcommonhandle("岗位标识",null),
},
uiactions: {
},
},
main_grid: {
columns: {
postcode: commonLogic.appcommonhandle("岗位编码",null),
postname: commonLogic.appcommonhandle("岗位名称",null),
memo: commonLogic.appcommonhandle("备注",null),
},
nodata:commonLogic.appcommonhandle("",null),
uiactions: {
},
},
default_searchform: {
details: {
formpage1: commonLogic.appcommonhandle("常规条件",null),
},
uiactions: {
},
},
editviewtoolbar_toolbar: {
tbitem3: {
caption: commonLogic.appcommonhandle("保存",null),
tip: commonLogic.appcommonhandle("保存",null),
},
tbitem6: {
caption: commonLogic.appcommonhandle("-",null),
tip: commonLogic.appcommonhandle("",null),
},
tbitem7: {
caption: commonLogic.appcommonhandle("删除",null),
tip: commonLogic.appcommonhandle("删除",null),
},
tbitem8: {
caption: commonLogic.appcommonhandle("-",null),
tip: commonLogic.appcommonhandle("",null),
},
tbitem14: {
caption: commonLogic.appcommonhandle("拷贝",null),
tip: commonLogic.appcommonhandle("拷贝",null),
},
},
gridviewtoolbar_toolbar: {
deuiaction1: {
caption: commonLogic.appcommonhandle("新建",null),
tip: commonLogic.appcommonhandle("新建",null),
},
tbitem4: {
caption: commonLogic.appcommonhandle("编辑",null),
tip: commonLogic.appcommonhandle("编辑",null),
},
tbitem6: {
caption: commonLogic.appcommonhandle("拷贝",null),
tip: commonLogic.appcommonhandle("拷贝",null),
},
tbitem7: {
caption: commonLogic.appcommonhandle("-",null),
tip: commonLogic.appcommonhandle("",null),
},
tbitem8: {
caption: commonLogic.appcommonhandle("删除",null),
tip: commonLogic.appcommonhandle("删除",null),
},
tbitem9: {
caption: commonLogic.appcommonhandle("-",null),
tip: commonLogic.appcommonhandle("",null),
},
tbitem13: {
caption: commonLogic.appcommonhandle("导出",null),
tip: commonLogic.appcommonhandle("导出",null),
},
tbitem10: {
caption: commonLogic.appcommonhandle("-",null),
tip: commonLogic.appcommonhandle("",null),
},
tbitem19: {
caption: commonLogic.appcommonhandle("过滤",null),
tip: commonLogic.appcommonhandle("过滤",null),
},
},
};
return data;
}
export default getLocaleResourceBase;
\ No newline at end of file
import SysTeamMember_BO_CN_Base from './sys-team-member_BO_CN_base';
function getLocaleResource(){
const SysTeamMember_BO_CN_OwnData = {};
const targetData = Object.assign(SysTeamMember_BO_CN_Base(), SysTeamMember_BO_CN_OwnData);
return targetData;
}
export default getLocaleResource;
\ No newline at end of file
import commonLogic from '@/locale/logic/common/common-logic';
function getLocaleResourceBase(){
const data:any = {
fields: {
teammemberid: commonLogic.appcommonhandle("组成员标识",null),
teamid: commonLogic.appcommonhandle("组标识",null),
teamname: commonLogic.appcommonhandle("组名称",null),
userid: commonLogic.appcommonhandle("用户标识",null),
personname: commonLogic.appcommonhandle("姓名",null),
postid: commonLogic.appcommonhandle("岗位标识",null),
postname: commonLogic.appcommonhandle("岗位",null),
domains: commonLogic.appcommonhandle("区属",null),
username: commonLogic.appcommonhandle("登录名",null),
},
views: {
gridview: {
caption: commonLogic.appcommonhandle("组成员",null),
title: commonLogic.appcommonhandle("组成员表格视图",null),
},
editview: {
caption: commonLogic.appcommonhandle("组成员",null),
title: commonLogic.appcommonhandle("组成员编辑视图",null),
},
},
main_form: {
details: {
group1: commonLogic.appcommonhandle("组成员基本信息",null),
formpage1: commonLogic.appcommonhandle("基本信息",null),
srforikey: commonLogic.appcommonhandle("",null),
srfkey: commonLogic.appcommonhandle("组成员标识",null),
srfmajortext: commonLogic.appcommonhandle("姓名",null),
srftempmode: commonLogic.appcommonhandle("",null),
srfuf: commonLogic.appcommonhandle("",null),
srfdeid: commonLogic.appcommonhandle("",null),
srfsourcekey: commonLogic.appcommonhandle("",null),
personname: commonLogic.appcommonhandle("姓名",null),
postname: commonLogic.appcommonhandle("岗位",null),
domains: commonLogic.appcommonhandle("区属",null),
teamid: commonLogic.appcommonhandle("组标识",null),
postid: commonLogic.appcommonhandle("岗位标识",null),
userid: commonLogic.appcommonhandle("用户标识",null),
teammemberid: commonLogic.appcommonhandle("组成员标识",null),
},
uiactions: {
},
},
main_grid: {
columns: {
personname: commonLogic.appcommonhandle("姓名",null),
username: commonLogic.appcommonhandle("登录名",null),
postname: commonLogic.appcommonhandle("岗位",null),
postid: commonLogic.appcommonhandle("岗位标识",null),
userid: commonLogic.appcommonhandle("用户标识",null),
},
nodata:commonLogic.appcommonhandle("",null),
uiactions: {
},
},
gridviewtoolbar_toolbar: {
tbitem24: {
caption: commonLogic.appcommonhandle("行编辑",null),
tip: commonLogic.appcommonhandle("行编辑",null),
},
tbitem25: {
caption: commonLogic.appcommonhandle("新建行",null),
tip: commonLogic.appcommonhandle("新建行",null),
},
deuiaction1: {
caption: commonLogic.appcommonhandle("保存行",null),
tip: commonLogic.appcommonhandle("保存行",null),
},
tbitem26: {
caption: commonLogic.appcommonhandle("-",null),
tip: commonLogic.appcommonhandle("",null),
},
tbitem8: {
caption: commonLogic.appcommonhandle("删除",null),
tip: commonLogic.appcommonhandle("删除",null),
},
},
editviewtoolbar_toolbar: {
tbitem3: {
caption: commonLogic.appcommonhandle("保存",null),
tip: commonLogic.appcommonhandle("保存",null),
},
tbitem6: {
caption: commonLogic.appcommonhandle("-",null),
tip: commonLogic.appcommonhandle("",null),
},
tbitem7: {
caption: commonLogic.appcommonhandle("删除",null),
tip: commonLogic.appcommonhandle("删除",null),
},
tbitem8: {
caption: commonLogic.appcommonhandle("-",null),
tip: commonLogic.appcommonhandle("",null),
},
tbitem14: {
caption: commonLogic.appcommonhandle("拷贝",null),
tip: commonLogic.appcommonhandle("拷贝",null),
},
},
};
return data;
}
export default getLocaleResourceBase;
\ No newline at end of file
import SysTeam_BO_CN_Base from './sys-team_BO_CN_base';
function getLocaleResource(){
const SysTeam_BO_CN_OwnData = {};
const targetData = Object.assign(SysTeam_BO_CN_Base(), SysTeam_BO_CN_OwnData);
return targetData;
}
export default getLocaleResource;
\ No newline at end of file
import commonLogic from '@/locale/logic/common/common-logic';
function getLocaleResourceBase(){
const data:any = {
fields: {
teamid: commonLogic.appcommonhandle("组标识",null),
teamname: commonLogic.appcommonhandle("组名称",null),
memo: commonLogic.appcommonhandle("备注",null),
domains: commonLogic.appcommonhandle("区属",null),
},
views: {
editview: {
caption: commonLogic.appcommonhandle("组管理",null),
title: commonLogic.appcommonhandle("组管理",null),
},
gridview: {
caption: commonLogic.appcommonhandle("组管理",null),
title: commonLogic.appcommonhandle("组管理",null),
},
},
main_form: {
details: {
group1: commonLogic.appcommonhandle("组基本信息",null),
druipart1: commonLogic.appcommonhandle("",null),
grouppanel1: commonLogic.appcommonhandle("组成员",null),
formpage1: commonLogic.appcommonhandle("基本信息",null),
srforikey: commonLogic.appcommonhandle("",null),
srfkey: commonLogic.appcommonhandle("组标识",null),
srfmajortext: commonLogic.appcommonhandle("组名称",null),
srftempmode: commonLogic.appcommonhandle("",null),
srfuf: commonLogic.appcommonhandle("",null),
srfdeid: commonLogic.appcommonhandle("",null),
srfsourcekey: commonLogic.appcommonhandle("",null),
teamname: commonLogic.appcommonhandle("组名称",null),
memo: commonLogic.appcommonhandle("备注",null),
domains: commonLogic.appcommonhandle("区属",null),
teamid: commonLogic.appcommonhandle("组标识",null),
},
uiactions: {
},
},
main_grid: {
columns: {
teamname: commonLogic.appcommonhandle("组名称",null),
memo: commonLogic.appcommonhandle("备注",null),
},
nodata:commonLogic.appcommonhandle("",null),
uiactions: {
},
},
default_searchform: {
details: {
formpage1: commonLogic.appcommonhandle("常规条件",null),
},
uiactions: {
},
},
editviewtoolbar_toolbar: {
tbitem3: {
caption: commonLogic.appcommonhandle("保存",null),
tip: commonLogic.appcommonhandle("保存",null),
},
tbitem6: {
caption: commonLogic.appcommonhandle("-",null),
tip: commonLogic.appcommonhandle("",null),
},
tbitem7: {
caption: commonLogic.appcommonhandle("删除",null),
tip: commonLogic.appcommonhandle("删除",null),
},
tbitem8: {
caption: commonLogic.appcommonhandle("-",null),
tip: commonLogic.appcommonhandle("",null),
},
tbitem14: {
caption: commonLogic.appcommonhandle("拷贝",null),
tip: commonLogic.appcommonhandle("拷贝",null),
},
},
gridviewtoolbar_toolbar: {
deuiaction1: {
caption: commonLogic.appcommonhandle("新建",null),
tip: commonLogic.appcommonhandle("新建",null),
},
tbitem4: {
caption: commonLogic.appcommonhandle("编辑",null),
tip: commonLogic.appcommonhandle("编辑",null),
},
tbitem6: {
caption: commonLogic.appcommonhandle("拷贝",null),
tip: commonLogic.appcommonhandle("拷贝",null),
},
tbitem7: {
caption: commonLogic.appcommonhandle("-",null),
tip: commonLogic.appcommonhandle("",null),
},
tbitem8: {
caption: commonLogic.appcommonhandle("删除",null),
tip: commonLogic.appcommonhandle("删除",null),
},
tbitem9: {
caption: commonLogic.appcommonhandle("-",null),
tip: commonLogic.appcommonhandle("",null),
},
tbitem13: {
caption: commonLogic.appcommonhandle("导出",null),
tip: commonLogic.appcommonhandle("导出",null),
},
tbitem10: {
caption: commonLogic.appcommonhandle("-",null),
tip: commonLogic.appcommonhandle("",null),
},
tbitem19: {
caption: commonLogic.appcommonhandle("过滤",null),
tip: commonLogic.appcommonhandle("过滤",null),
},
},
};
return data;
}
export default getLocaleResourceBase;
\ No newline at end of file
// 用户自定义语言资源 藏文
function getLocaleResource(){
const data:any = {};
return data;
}
export default getLocaleResource;
\ No newline at end of file
export default {
el: {
colorpicker: {
confirm: 'གཏན་ཁེལ་',
clear: 'གཙང་སེལ་'
},
datepicker: {
now: 'སྐབས་དེར།',
today: 'དེ་རིང་',
cancel: 'མེད་པར་བཟོ་བ་',
clear: 'གཙང་སེལ་',
confirm: 'གཏན་ཁེལ་',
selectDate: 'བདམས་པའི་ཚེས་གྲངས།',
selectTime: 'བདམས་པའི་དུས་ཚོད།',
startDate: 'འགོ་འཛུགས་དུས་ཚོད།',
startTime: 'འགོ་རྩོམ་དུས་ཚོད།',
endDate: 'མཇུག་རྫོགས་ཚེས་གྲངས།',
endTime: 'མཇུག་རྫོགས་དུས་ཚོད།',
prevYear: 'ལོ་སྔོན་མ།',
nextYear: 'ལོ་རྗེས་མ།',
prevMonth: 'ཟླ་བ་གོང་མར་',
nextMonth: 'ཟླ་བ་རྗེས་མ་',
year: 'ལོ་',
month1: 'ཟླ་བ་དང་པོ།',
month2: 'ཟླ་བ་གཉིས་པ།',
month3: 'ཟླ་བ་གསུམ་པ།',
month4: 'ཟླ་བ་བཞི་པ།',
month5: 'ཟླ་བ་ལྔ་པ།',
month6: 'ཟླ་བ་དྲུག་པ།',
month7: 'ཟླ་བ་བདུན་པ།',
month8: 'ཟླ་བ་བརྒྱད་པ།',
month9: 'ཟླ་བ་དགུ་པ།',
month10: 'ཟླ་བ་བཅུ་པ།',
month11: 'ཟླ་བ་བཅུ་གཅིག་པ།',
month12: 'ཟླ་བ་བཅུ་གཉིས་པ།',
weeks: {
sun: 'ཉི་མ།',
mon: 'གཅིག',
tue: 'གཉིས།',
wed: 'གསུམ།',
thu: 'བཞི།',
fri: 'ལྔ།',
sat: 'དྲུག'
},
months: {
jan: 'ཟླ་བ་དང་པོ།',
feb: 'ཟླ་བ་གཉིས་པ།',
mar: 'ཟླ་བ་གསུམ་པ།',
apr: 'ཟླ་བ་བཞི་པ།',
may: 'ཟླ་བ་ལྔ་པ།',
jun: 'ཟླ་བ་དྲུག་པ།',
jul: 'ཟླ་བ་བདུན་པ།',
aug: 'ཟླ་བ་བརྒྱད་པ།',
sep: 'ཟླ་བ་དགུ་པ།',
oct: 'ཟླ་བ་བཅུ་པ།',
nov: 'ཟླ་བ་བཅུ་གཅིག་པ།',
dec: 'ཟླ་བ་བཅུ་གཉིས་པ།'
}
},
select: {
loading: 'སྣོན་འཇུག་ཁྲོད་',
noMatch: 'སྙོམ་མེད་གཞི་གྲངས།',
noData: 'གཞི་གྲངས་མེད་པ་',
placeholder: 'འདེམ་རོགས་།'
},
cascader: {
noMatch: 'སྙོམ་མེད་གཞི་གྲངས།',
loading: 'སྣོན་འཇུག་ཁྲོད་',
placeholder: 'འདེམ་རོགས་།',
noData: 'གནས་སྐབས་གཞི་གྲངས་མེད་པ་'
},
pagination: {
goto: 'ཕེབས་པ།',
pagesize: 'ནར་མོ/ལྡེབ་ངོས།',
total: 'མཉམ་དུ། {total} ལྕུག་མ།',
pageClassifier: 'ཤོག་ངོས་'
},
messagebox: {
title: 'གསལ་འདེབས་',
confirm: 'གཏན་ཁེལ་',
cancel: 'མེད་པར་བཟོ་བ་',
error: 'གཞི་གྲངས་ནང་འདྲེན་བྱས་པ་དེ་ཁྲིམས་དང་མི་མཐུན་པ་ཞིག་རེད།!'
},
upload: {
deleteTip: 'deleteམཐེབ་ལྟར་སུབ་པ་ཆོག་།',
delete: 'སུབ་པ་',
preview: 'པར་རིས་ལ་ལྟ་བ་',
continue: 'མུ་མཐུད་དུ་ཡར་བསྐུར་།'
},
table: {
emptyText: 'གནས་སྐབས་གཞི་གྲངས་མེད་པ་',
confirmFilter: 'འཚག་འདེམས་',
resetFilter: 'བསྐྱར་འཇོག',
clearFilter: 'ཚང་མ།',
sumText: 'བསྡོམས་འབོར་'
},
tree: {
emptyText: 'གནས་སྐབས་གཞི་གྲངས་མེད་པ་'
},
transfer: {
noMatch: 'སྙོམ་མེད་གཞི་གྲངས།',
noData: 'གཞི་གྲངས་མེད་པ་',
titles: ['རེའུ་མིག1', 'རེའུ་མིག2'],
filterPlaceholder: 'བཤེར་འཚོལ་ནང་དོན་ནང་འཇུག་རོགས་།',
noCheckedFormat: 'མཉམ་དུ། {total} ཚན།',
hasCheckedFormat: 'བདམས་ཟིན་པ་ {checked}/{total} ཚན།'
},
image: {
error: 'ཁུར་སྣོན་ཕམ་པ།'
},
pageHeader: {
title: 'ཕྱིར་ལོག'
},
popconfirm: {
confirmButtonText: 'གཏན་ཁེལ་',
cancelButtonText: 'མེད་པར་བཟོ་བ་'
}
}
};
\ No newline at end of file
export default {
i: {
locale: 'BO-CN',
select: {
placeholder: 'འདེམ་རོགས་།',
noMatch: 'སྙོམ་མེད་གཞི་གྲངས།',
loading: 'སྣོན་འཇུག་ཁྲོད་'
},
table: {
noDataText: 'གནས་སྐབས་གཞི་གྲངས་མེད་པ་',
noFilteredDataText: 'གནས་སྐབས་འཚག་འདེམས་མཇུག་འབྲས་མེད་།',
confirmFilter: 'འཚག་འདེམས་',
resetFilter: 'བསྐྱར་འཇོག',
clearFilter: 'ཚང་མ།',
sumText: 'བསྡོམས་འབོར་'
},
datepicker: {
selectDate: 'བདམས་པའི་ཚེས་གྲངས།',
selectTime: 'བདམས་པའི་དུས་ཚོད།',
startTime: 'འགོ་རྩོམ་དུས་ཚོད།',
endTime: 'མཇུག་རྫོགས་དུས་ཚོད།',
clear: 'གཙང་སེལ་',
ok: 'གཏན་ཁེལ་',
datePanelLabel: '[mmmm] [yyyy]',
month: 'ཟླ་བ།',
month1: 'ཟླ་བ་དང་པོ།',
month2: 'ཟླ་བ་གཉིས་པ།',
month3: 'ཟླ་བ་གསུམ་པ།',
month4: 'ཟླ་བ་བཞི་པ།',
month5: 'ཟླ་བ་ལྔ་པ།',
month6: 'ཟླ་བ་དྲུག་པ།',
month7: 'ཟླ་བ་བདུན་པ།',
month8: 'ཟླ་བ་བརྒྱད་པ།',
month9: 'ཟླ་བ་དགུ་པ།',
month10: 'ཟླ་བ་བཅུ་པ།',
month11: 'ཟླ་བ་བཅུ་གཅིག་པ།',
month12: 'ཟླ་བ་བཅུ་གཉིས་པ།',
year: 'ལོ་',
weekStartDay: '0',
weeks: {
sun: 'ཉི་མ།',
mon: 'གཅིག',
tue: 'གཉིས།',
wed: 'གསུམ།',
thu: 'བཞི།',
fri: 'ལྔ།',
sat: 'དྲུག'
},
months: {
m1: 'ཟླ་བ་དང་པོ།',
m2: 'ཟླ་བ་གཉིས་པ།',
m3: 'ཟླ་བ་གསུམ་པ།',
m4: 'ཟླ་བ་བཞི་པ།',
m5: 'ཟླ་བ་ལྔ་པ།',
m6: 'ཟླ་བ་དྲུག་པ།',
m7: 'ཟླ་བ་བདུན་པ།',
m8: 'ཟླ་བ་བརྒྱད་པ།',
m9: 'ཟླ་བ་དགུ་པ།',
m10: 'ཟླ་བ་བཅུ་པ།',
m11: 'ཟླ་བ་བཅུ་གཅིག་པ།',
m12: 'ཟླ་བ་བཅུ་གཉིས་པ།'
}
},
transfer: {
titles: {
source: 'ཁུངས་ཀྱི་རེའུ་མིག',
target: 'དམིགས་ཡུལ་རེའུ་མིག'
},
filterPlaceholder: 'བཤེར་འཚོལ་ནང་དོན་ནང་འཇུག་རོགས་།',
notFoundText: 'རེའུ་མིག་སྟོང་པ་རེད།'
},
modal: {
okText: 'གཏན་ཁེལ་',
cancelText: 'མེད་པར་བཟོ་བ་'
},
poptip: {
okText: 'གཏན་ཁེལ་',
cancelText: 'མེད་པར་བཟོ་བ་'
},
page: {
prev: 'ཤོག་ངོས་གོང་མ།',
next: 'ཤོག་ངོས་རྗེས་མ་',
total: 'མཉམ་དུ།',
item: 'ལྕུག་མ།',
items: 'ལྕུག་མ།',
prev5: 'མདུན་གྱི་ཤོག་ངོས་5།',
next5: 'རྒྱབ་ཏུ་ཤོག་ངོས་5།',
page: 'ནར་མོ/ལྡེབ་ངོས། ',
goto: 'མཆོང་།',
p: 'ཤོག་ངོས་'
},
rate: {
star: 'སྐར་མ་',
stars: 'སྐར་མ་'
},
time: {
before: 'མདུན།',
after: 'རྗེས་',
just: 'མ་ཐག་',
seconds: 'སྐར་ཆ་',
minutes: 'སྐར་མ་',
hours: 'ཆུ་ཚོད།',
days: 'གནམ་'
},
tree: {
emptyText: 'གནས་སྐབས་གཞི་གྲངས་མེད་པ་'
}
}
};
\ No newline at end of file
......@@ -10,5 +10,11 @@ declare module "view-design/dist/locale/zh-CN" {
declare module "element-ui/lib/locale/lang/zh-CN" {
}
declare module "view-design/dist/locale/BO-CN" {
}
declare module "element-ui/lib/locale/lang/BO-CN" {
}
declare module "tinymce/tinymce" {
}
\ No newline at end of file
......@@ -10,6 +10,7 @@
:cell-class-name="getCellClassName"
max-height="items.length > 0 ? 'calc(100%-50px)' : '100%'"
@row-click="rowClick($event)"
@cell-click="cellClick"
@select-all="selectAll($event)"
@select="select"
@row-class-name="onRowClassName($event)"
......@@ -1905,6 +1906,17 @@ export default class MainBase extends Vue implements ControlInterface {
this.$emit('selectionchange', this.selections);
}
/**
* 单元格单击隐藏提示框
*
* @memberof MainBase
*/
public cellClick() {
let el: any = document.getElementsByClassName('el-tooltip__popper')[0];
if (el) {
el.style.display = 'none';
}
}
/**
* 行单击选中
......@@ -1914,9 +1926,6 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase
*/
public rowClick($event: any, ifAlways: boolean = false): void {
// 提示栏样式
let el: any = document.getElementsByClassName('el-tooltip__popper')[0];
el.style.display = 'none';
// 分组行跳过
if($event && $event.children){
return;
......@@ -2042,6 +2051,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/
public uiAction(row: any, tag: any, $event: any) {
// this.rowClick(row, true);
this.cellClick();
$event.stopPropagation();
}
......
......@@ -10,6 +10,7 @@
:cell-class-name="getCellClassName"
max-height="items.length > 0 ? 'calc(100%-50px)' : '100%'"
@row-click="rowClick($event)"
@cell-click="cellClick"
@select-all="selectAll($event)"
@select="select"
@row-class-name="onRowClassName($event)"
......@@ -1878,6 +1879,17 @@ export default class MainBase extends Vue implements ControlInterface {
this.$emit('selectionchange', this.selections);
}
/**
* 单元格单击隐藏提示框
*
* @memberof MainBase
*/
public cellClick() {
let el: any = document.getElementsByClassName('el-tooltip__popper')[0];
if (el) {
el.style.display = 'none';
}
}
/**
* 行单击选中
......@@ -1887,9 +1899,6 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase
*/
public rowClick($event: any, ifAlways: boolean = false): void {
// 提示栏样式
let el: any = document.getElementsByClassName('el-tooltip__popper')[0];
el.style.display = 'none';
// 分组行跳过
if($event && $event.children){
return;
......@@ -2015,6 +2024,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/
public uiAction(row: any, tag: any, $event: any) {
// this.rowClick(row, true);
this.cellClick();
$event.stopPropagation();
}
......
......@@ -10,6 +10,7 @@
:cell-class-name="getCellClassName"
max-height="items.length > 0 ? 'calc(100%-50px)' : '100%'"
@row-click="rowClick($event)"
@cell-click="cellClick"
@select-all="selectAll($event)"
@select="select"
@row-class-name="onRowClassName($event)"
......@@ -1829,6 +1830,17 @@ export default class MainBase extends Vue implements ControlInterface {
this.$emit('selectionchange', this.selections);
}
/**
* 单元格单击隐藏提示框
*
* @memberof MainBase
*/
public cellClick() {
let el: any = document.getElementsByClassName('el-tooltip__popper')[0];
if (el) {
el.style.display = 'none';
}
}
/**
* 行单击选中
......@@ -1838,9 +1850,6 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase
*/
public rowClick($event: any, ifAlways: boolean = false): void {
// 提示栏样式
let el: any = document.getElementsByClassName('el-tooltip__popper')[0];
el.style.display = 'none';
// 分组行跳过
if($event && $event.children){
return;
......@@ -1966,6 +1975,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/
public uiAction(row: any, tag: any, $event: any) {
// this.rowClick(row, true);
this.cellClick();
$event.stopPropagation();
}
......
......@@ -10,6 +10,7 @@
:cell-class-name="getCellClassName"
max-height="items.length > 0 ? 'calc(100%-50px)' : '100%'"
@row-click="rowClick($event)"
@cell-click="cellClick"
@select-all="selectAll($event)"
@select="select"
@row-class-name="onRowClassName($event)"
......@@ -1809,6 +1810,17 @@ export default class MainBase extends Vue implements ControlInterface {
this.$emit('selectionchange', this.selections);
}
/**
* 单元格单击隐藏提示框
*
* @memberof MainBase
*/
public cellClick() {
let el: any = document.getElementsByClassName('el-tooltip__popper')[0];
if (el) {
el.style.display = 'none';
}
}
/**
* 行单击选中
......@@ -1818,9 +1830,6 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase
*/
public rowClick($event: any, ifAlways: boolean = false): void {
// 提示栏样式
let el: any = document.getElementsByClassName('el-tooltip__popper')[0];
el.style.display = 'none';
// 分组行跳过
if($event && $event.children){
return;
......@@ -1946,6 +1955,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/
public uiAction(row: any, tag: any, $event: any) {
// this.rowClick(row, true);
this.cellClick();
$event.stopPropagation();
}
......
......@@ -10,6 +10,7 @@
:cell-class-name="getCellClassName"
max-height="items.length > 0 ? 'calc(100%-50px)' : '100%'"
@row-click="rowClick($event)"
@cell-click="cellClick"
@select-all="selectAll($event)"
@select="select"
@row-class-name="onRowClassName($event)"
......@@ -1641,6 +1642,17 @@ export default class MainBase extends Vue implements ControlInterface {
this.$emit('selectionchange', this.selections);
}
/**
* 单元格单击隐藏提示框
*
* @memberof MainBase
*/
public cellClick() {
let el: any = document.getElementsByClassName('el-tooltip__popper')[0];
if (el) {
el.style.display = 'none';
}
}
/**
* 行单击选中
......@@ -1650,9 +1662,6 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase
*/
public rowClick($event: any, ifAlways: boolean = false): void {
// 提示栏样式
let el: any = document.getElementsByClassName('el-tooltip__popper')[0];
el.style.display = 'none';
// 分组行跳过
if($event && $event.children){
return;
......@@ -1778,6 +1787,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/
public uiAction(row: any, tag: any, $event: any) {
// this.rowClick(row, true);
this.cellClick();
$event.stopPropagation();
}
......
......@@ -10,6 +10,7 @@
:cell-class-name="getCellClassName"
max-height="items.length > 0 ? 'calc(100%-50px)' : '100%'"
@row-click="rowClick($event)"
@cell-click="cellClick"
@select-all="selectAll($event)"
@select="select"
@row-class-name="onRowClassName($event)"
......@@ -1799,6 +1800,17 @@ export default class MainBase extends Vue implements ControlInterface {
this.$emit('selectionchange', this.selections);
}
/**
* 单元格单击隐藏提示框
*
* @memberof MainBase
*/
public cellClick() {
let el: any = document.getElementsByClassName('el-tooltip__popper')[0];
if (el) {
el.style.display = 'none';
}
}
/**
* 行单击选中
......@@ -1808,9 +1820,6 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase
*/
public rowClick($event: any, ifAlways: boolean = false): void {
// 提示栏样式
let el: any = document.getElementsByClassName('el-tooltip__popper')[0];
el.style.display = 'none';
// 分组行跳过
if($event && $event.children){
return;
......@@ -1936,6 +1945,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/
public uiAction(row: any, tag: any, $event: any) {
// this.rowClick(row, true);
this.cellClick();
$event.stopPropagation();
}
......
......@@ -10,6 +10,7 @@
:cell-class-name="getCellClassName"
max-height="items.length > 0 ? 'calc(100%-50px)' : '100%'"
@row-click="rowClick($event)"
@cell-click="cellClick"
@select-all="selectAll($event)"
@select="select"
@row-class-name="onRowClassName($event)"
......@@ -1617,6 +1618,17 @@ export default class MainBase extends Vue implements ControlInterface {
this.$emit('selectionchange', this.selections);
}
/**
* 单元格单击隐藏提示框
*
* @memberof MainBase
*/
public cellClick() {
let el: any = document.getElementsByClassName('el-tooltip__popper')[0];
if (el) {
el.style.display = 'none';
}
}
/**
* 行单击选中
......@@ -1626,9 +1638,6 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase
*/
public rowClick($event: any, ifAlways: boolean = false): void {
// 提示栏样式
let el: any = document.getElementsByClassName('el-tooltip__popper')[0];
el.style.display = 'none';
// 分组行跳过
if($event && $event.children){
return;
......@@ -1754,6 +1763,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/
public uiAction(row: any, tag: any, $event: any) {
// this.rowClick(row, true);
this.cellClick();
$event.stopPropagation();
}
......
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: ibzou-app-web
labels:
app: ibzou-app-web
spec:
replicas: 1
selector:
matchLabels:
app: ibzou-app-web
template:
metadata:
labels:
app: ibzou-app-web
spec:
imagePullSecrets:
- name: aly-shanghai
containers:
- name: ibzou-app-web
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzou-app-web:latest
imagePullPolicy: Always
ports:
- containerPort: 8080
volumeMounts:
- name: data
mountPath: /app/file
volumes:
- name: data
persistentVolumeClaim:
claimName: demo-date-pvc-nfs
---
apiVersion: v1
kind: Service
metadata:
name: ibzou-app-web
labels:
app: ibzou-app-web
spec:
type: NodePort
ports:
- name: http
port: 8080
targetPort: 8080
nodePort: 8080
protocol: TCP
selector:
app: ibzou-app-web
......@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import java.util.HashMap;
import java.util.Map;
import org.apache.ibatis.annotations.Select;
import cn.ibizlab.core.ou.domain.SysDepartment;
import cn.ibizlab.core.ou.filter.SysDepartmentSearchContext;
......
......@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import java.util.HashMap;
import java.util.Map;
import org.apache.ibatis.annotations.Select;
import cn.ibizlab.core.ou.domain.SysDeptMember;
import cn.ibizlab.core.ou.filter.SysDeptMemberSearchContext;
......
......@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import java.util.HashMap;
import java.util.Map;
import org.apache.ibatis.annotations.Select;
import cn.ibizlab.core.ou.domain.SysEmployee;
import cn.ibizlab.core.ou.filter.SysEmployeeSearchContext;
......
......@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import java.util.HashMap;
import java.util.Map;
import org.apache.ibatis.annotations.Select;
import cn.ibizlab.core.ou.domain.SysOrganization;
import cn.ibizlab.core.ou.filter.SysOrganizationSearchContext;
......
......@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import java.util.HashMap;
import java.util.Map;
import org.apache.ibatis.annotations.Select;
import cn.ibizlab.core.ou.domain.SysPost;
import cn.ibizlab.core.ou.filter.SysPostSearchContext;
......
......@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import java.util.HashMap;
import java.util.Map;
import org.apache.ibatis.annotations.Select;
import cn.ibizlab.core.ou.domain.SysTeam;
import cn.ibizlab.core.ou.filter.SysTeamSearchContext;
......
......@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import java.util.HashMap;
import java.util.Map;
import org.apache.ibatis.annotations.Select;
import cn.ibizlab.core.ou.domain.SysTeamMember;
import cn.ibizlab.core.ou.filter.SysTeamMemberSearchContext;
......
......@@ -352,9 +352,6 @@ public class SysDepartmentServiceImpl extends ServiceImpl<SysDepartmentMapper, S
}
}
......
......@@ -312,9 +312,6 @@ public class SysDeptMemberServiceImpl extends ServiceImpl<SysDeptMemberMapper, S
public ISysDeptMemberService getProxyService() {
return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass());
}
......
......@@ -366,9 +366,6 @@ public class SysEmployeeServiceImpl extends ServiceImpl<SysEmployeeMapper, SysEm
}
public ISysEmployeeService getProxyService() {
return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass());
}
......
......@@ -301,9 +301,6 @@ public class SysOrganizationServiceImpl extends ServiceImpl<SysOrganizationMappe
}
public ISysOrganizationService getProxyService() {
return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass());
}
......
......@@ -230,9 +230,6 @@ public class SysPostServiceImpl extends ServiceImpl<SysPostMapper, SysPost> impl
public ISysPostService getProxyService() {
return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass());
}
......
......@@ -301,9 +301,6 @@ public class SysTeamMemberServiceImpl extends ServiceImpl<SysTeamMemberMapper, S
public ISysTeamMemberService getProxyService() {
return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass());
}
......
......@@ -224,9 +224,6 @@ public class SysTeamServiceImpl extends ServiceImpl<SysTeamMapper, SysTeam> impl
public ISysTeamService getProxyService() {
return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass());
}
......
......@@ -4,7 +4,7 @@
<!--输出实体[SYS_DEPT]数据结构 -->
<changeSet author="root" id="tab-sys_dept-77-1">
<changeSet author="a_A_5d9d78509" id="tab-sys_dept-79-1">
<createTable tableName="IBZDEPT">
<column name="DEPTID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_DEPT_DEPTID"/>
......@@ -44,7 +44,7 @@
<!--输出实体[SYS_DEPTMEMBER]数据结构 -->
<changeSet author="root" id="tab-sys_deptmember-34-2">
<changeSet author="a_A_5d9d78509" id="tab-sys_deptmember-35-2">
<createTable tableName="IBZDEPTMEMBER">
<column name="MEMBERID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_DEPTMEMBER_MEMBERID"/>
......@@ -62,7 +62,7 @@
<!--输出实体[SYS_EMP]数据结构 -->
<changeSet author="root" id="tab-sys_emp-84-3">
<changeSet author="a_A_5d9d78509" id="tab-sys_emp-85-3">
<createTable tableName="IBZEMP">
<column name="USERID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_EMP_USERID"/>
......@@ -142,7 +142,7 @@
<!--输出实体[SYS_ORG]数据结构 -->
<changeSet author="root" id="tab-sys_org-47-4">
<changeSet author="a_A_5d9d78509" id="tab-sys_org-49-4">
<createTable tableName="IBZORG">
<column name="ORGID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_ORG_ORGID"/>
......@@ -174,7 +174,7 @@
<!--输出实体[SYS_POST]数据结构 -->
<changeSet author="root" id="tab-sys_post-23-5">
<changeSet author="a_A_5d9d78509" id="tab-sys_post-25-5">
<createTable tableName="IBZPOST">
<column name="POSTID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_POST_POSTID"/>
......@@ -192,7 +192,7 @@
<!--输出实体[SYS_TEAM]数据结构 -->
<changeSet author="root" id="tab-sys_team-23-6">
<changeSet author="a_A_5d9d78509" id="tab-sys_team-25-6">
<createTable tableName="IBZTEAM">
<column name="TEAMID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_TEAM_TEAMID"/>
......@@ -208,7 +208,7 @@
<!--输出实体[SYS_TEAMMEMBER]数据结构 -->
<changeSet author="root" id="tab-sys_teammember-29-7">
<changeSet author="a_A_5d9d78509" id="tab-sys_teammember-30-7">
<createTable tableName="IBZTEAMMEMBER">
<column name="TEAMMEMBERID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_TEAMMEMBER_TEAMMEMBERID"/>
......@@ -225,46 +225,46 @@
</changeSet>
<!--输出实体[SYS_DEPT]外键关系 -->
<changeSet author="root" id="fk-sys_dept-77-8">
<changeSet author="a_A_5d9d78509" id="fk-sys_dept-79-8">
<addForeignKeyConstraint baseColumnNames="PDEPTID" baseTableName="IBZDEPT" constraintName="DER1N_SYS_DEPT_SYS_DEPT_PDEPTI" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="DEPTID" referencedTableName="IBZDEPT" validate="true"/>
</changeSet>
<changeSet author="root" id="fk-sys_dept-77-9">
<changeSet author="a_A_5d9d78509" id="fk-sys_dept-79-9">
<addForeignKeyConstraint baseColumnNames="ORGID" baseTableName="IBZDEPT" constraintName="DER1N_SYS_DEPT_SYS_ORG_ORGID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGID" referencedTableName="IBZORG" validate="true"/>
</changeSet>
<!--输出实体[SYS_DEPTMEMBER]外键关系 -->
<changeSet author="root" id="fk-sys_deptmember-34-10">
<changeSet author="a_A_5d9d78509" id="fk-sys_deptmember-35-10">
<addForeignKeyConstraint baseColumnNames="DEPTID" baseTableName="IBZDEPTMEMBER" constraintName="DER1N_SYS_DEPTMEMBER_SYS_DEPT_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="DEPTID" referencedTableName="IBZDEPT" validate="true"/>
</changeSet>
<changeSet author="root" id="fk-sys_deptmember-34-11">
<changeSet author="a_A_5d9d78509" id="fk-sys_deptmember-35-11">
<addForeignKeyConstraint baseColumnNames="USERID" baseTableName="IBZDEPTMEMBER" constraintName="DER1N_SYS_DEPTMEMBER_SYS_EMP_U" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="USERID" referencedTableName="IBZEMP" validate="true"/>
</changeSet>
<changeSet author="root" id="fk-sys_deptmember-34-12">
<changeSet author="a_A_5d9d78509" id="fk-sys_deptmember-35-12">
<addForeignKeyConstraint baseColumnNames="POSTID" baseTableName="IBZDEPTMEMBER" constraintName="DER1N_SYS_DEPTMEMBER_SYS_POST_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="POSTID" referencedTableName="IBZPOST" validate="true"/>
</changeSet>
<!--输出实体[SYS_EMP]外键关系 -->
<changeSet author="root" id="fk-sys_emp-84-13">
<changeSet author="a_A_5d9d78509" id="fk-sys_emp-85-13">
<addForeignKeyConstraint baseColumnNames="MDEPTID" baseTableName="IBZEMP" constraintName="DER1N_SYS_EMP_SYS_DEPT_MDEPTID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="DEPTID" referencedTableName="IBZDEPT" validate="true"/>
</changeSet>
<changeSet author="root" id="fk-sys_emp-84-14">
<changeSet author="a_A_5d9d78509" id="fk-sys_emp-85-14">
<addForeignKeyConstraint baseColumnNames="ORGID" baseTableName="IBZEMP" constraintName="DER1N_SYS_EMP_SYS_ORG_ORGID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGID" referencedTableName="IBZORG" validate="true"/>
</changeSet>
<changeSet author="root" id="fk-sys_emp-84-15">
<changeSet author="a_A_5d9d78509" id="fk-sys_emp-85-15">
<addForeignKeyConstraint baseColumnNames="POSTID" baseTableName="IBZEMP" constraintName="DER1N_SYS_EMP_SYS_POST_POSTID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="POSTID" referencedTableName="IBZPOST" validate="true"/>
</changeSet>
<!--输出实体[SYS_ORG]外键关系 -->
<changeSet author="root" id="fk-sys_org-47-16">
<changeSet author="a_A_5d9d78509" id="fk-sys_org-49-16">
<addForeignKeyConstraint baseColumnNames="PORGID" baseTableName="IBZORG" constraintName="DER1N_SYS_ORG_SYS_ORG_PORGID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGID" referencedTableName="IBZORG" validate="true"/>
</changeSet>
<!--输出实体[SYS_POST]外键关系 -->
<!--输出实体[SYS_TEAM]外键关系 -->
<!--输出实体[SYS_TEAMMEMBER]外键关系 -->
<changeSet author="root" id="fk-sys_teammember-29-17">
<changeSet author="a_A_5d9d78509" id="fk-sys_teammember-30-17">
<addForeignKeyConstraint baseColumnNames="USERID" baseTableName="IBZTEAMMEMBER" constraintName="DER1N_SYS_TEAMMEMBER_SYS_EMP_U" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="USERID" referencedTableName="IBZEMP" validate="true"/>
</changeSet>
<changeSet author="root" id="fk-sys_teammember-29-18">
<changeSet author="a_A_5d9d78509" id="fk-sys_teammember-30-18">
<addForeignKeyConstraint baseColumnNames="POSTID" baseTableName="IBZTEAMMEMBER" constraintName="DER1N_SYS_TEAMMEMBER_SYS_POST_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="POSTID" referencedTableName="IBZPOST" validate="true"/>
</changeSet>
<changeSet author="root" id="fk-sys_teammember-29-19">
<changeSet author="a_A_5d9d78509" id="fk-sys_teammember-30-19">
<addForeignKeyConstraint baseColumnNames="TEAMID" baseTableName="IBZTEAMMEMBER" constraintName="DER1N_SYS_TEAMMEMBER_SYS_TEAM_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TEAMID" referencedTableName="IBZTEAM" validate="true"/>
</changeSet>
......
......@@ -86,7 +86,6 @@
<oracle.version>19.8.0.0</oracle.version>
<postgresql.version>42.2.6</postgresql.version>
<rocketmq.version>4.7.0</rocketmq.version>
</properties>
<dependencyManagement>
......
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: ibzou-provider-api
labels:
app: ibzou-provider-api
spec:
replicas: 1
selector:
matchLabels:
app: ibzou-provider-api
template:
metadata:
labels:
app: ibzou-provider-api
spec:
imagePullSecrets:
- name: aly-shanghai
containers:
- name: ibzou-provider-api
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzou-provider-api:latest
imagePullPolicy: Always
ports:
- containerPort: 8081
volumeMounts:
- name: data
mountPath: /app/file
volumes:
- name: data
persistentVolumeClaim:
claimName: demo-date-pvc-nfs
---
apiVersion: v1
kind: Service
metadata:
name: ibzou-provider-api
labels:
app: ibzou-provider-api
spec:
type: NodePort
ports:
- name: http
port: 8081
targetPort: 8081
nodePort: 8081
protocol: TCP
selector:
app: ibzou-provider-api
......@@ -122,14 +122,12 @@ public class SysDepartmentResource {
return ResponseEntity.status(HttpStatus.OK).body(sysdepartmentService.checkKey(sysdepartmentMapping.toDomain(sysdepartmentdto)));
}
@PreAuthorize("hasPermission(this.sysdepartmentMapping.toDomain(#sysdepartmentdto),'ibzou-SysDepartment-Save')")
@ApiOperation(value = "保存部门", tags = {"部门" }, notes = "保存部门")
@RequestMapping(method = RequestMethod.POST, value = "/sysdepartments/save")
public ResponseEntity<Boolean> save(@RequestBody SysDepartmentDTO sysdepartmentdto) {
return ResponseEntity.status(HttpStatus.OK).body(sysdepartmentService.save(sysdepartmentMapping.toDomain(sysdepartmentdto)));
}
@PreAuthorize("hasPermission(this.sysdepartmentMapping.toDomain(#sysdepartmentdtos),'ibzou-SysDepartment-Save')")
@ApiOperation(value = "批量保存部门", tags = {"部门" }, notes = "批量保存部门")
@RequestMapping(method = RequestMethod.POST, value = "/sysdepartments/savebatch")
public ResponseEntity<Boolean> saveBatch(@RequestBody List<SysDepartmentDTO> sysdepartmentdtos) {
......@@ -137,7 +135,6 @@ public class SysDepartmentResource {
return ResponseEntity.status(HttpStatus.OK).body(true);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-SysDepartment-searchDefault-all') and hasPermission(#context,'ibzou-SysDepartment-Get')")
@ApiOperation(value = "获取DEFAULT", tags = {"部门" } ,notes = "获取DEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/sysdepartments/fetchdefault")
public ResponseEntity<List<SysDepartmentDTO>> fetchDefault(SysDepartmentSearchContext context) {
......@@ -150,7 +147,6 @@ public class SysDepartmentResource {
.body(list);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-SysDepartment-searchDefault-all') and hasPermission(#context,'ibzou-SysDepartment-Get')")
@ApiOperation(value = "查询DEFAULT", tags = {"部门" } ,notes = "查询DEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/sysdepartments/searchdefault")
public ResponseEntity<Page<SysDepartmentDTO>> searchDefault(@RequestBody SysDepartmentSearchContext context) {
......@@ -160,6 +156,7 @@ public class SysDepartmentResource {
}
@PreAuthorize("hasPermission(this.sysdepartmentMapping.toDomain(#sysdepartmentdto),'ibzou-SysDepartment-Create')")
@ApiOperation(value = "根据单位机构建立部门", tags = {"部门" }, notes = "根据单位机构建立部门")
@RequestMapping(method = RequestMethod.POST, value = "/sysorganizations/{sysorganization_id}/sysdepartments")
......@@ -246,7 +243,6 @@ public class SysDepartmentResource {
return ResponseEntity.status(HttpStatus.OK).body(sysdepartmentService.checkKey(sysdepartmentMapping.toDomain(sysdepartmentdto)));
}
@PreAuthorize("hasPermission(this.sysdepartmentMapping.toDomain(#sysdepartmentdto),'ibzou-SysDepartment-Save')")
@ApiOperation(value = "根据单位机构保存部门", tags = {"部门" }, notes = "根据单位机构保存部门")
@RequestMapping(method = RequestMethod.POST, value = "/sysorganizations/{sysorganization_id}/sysdepartments/save")
public ResponseEntity<Boolean> saveBySysOrganization(@PathVariable("sysorganization_id") String sysorganization_id, @RequestBody SysDepartmentDTO sysdepartmentdto) {
......@@ -255,7 +251,6 @@ public class SysDepartmentResource {
return ResponseEntity.status(HttpStatus.OK).body(sysdepartmentService.save(domain));
}
@PreAuthorize("hasPermission(this.sysdepartmentMapping.toDomain(#sysdepartmentdtos),'ibzou-SysDepartment-Save')")
@ApiOperation(value = "根据单位机构批量保存部门", tags = {"部门" }, notes = "根据单位机构批量保存部门")
@RequestMapping(method = RequestMethod.POST, value = "/sysorganizations/{sysorganization_id}/sysdepartments/savebatch")
public ResponseEntity<Boolean> saveBatchBySysOrganization(@PathVariable("sysorganization_id") String sysorganization_id, @RequestBody List<SysDepartmentDTO> sysdepartmentdtos) {
......@@ -267,7 +262,6 @@ public class SysDepartmentResource {
return ResponseEntity.status(HttpStatus.OK).body(true);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-SysDepartment-searchDefault-all') and hasPermission(#context,'ibzou-SysDepartment-Get')")
@ApiOperation(value = "根据单位机构获取DEFAULT", tags = {"部门" } ,notes = "根据单位机构获取DEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/sysorganizations/{sysorganization_id}/sysdepartments/fetchdefault")
public ResponseEntity<List<SysDepartmentDTO>> fetchSysDepartmentDefaultBySysOrganization(@PathVariable("sysorganization_id") String sysorganization_id,SysDepartmentSearchContext context) {
......@@ -281,7 +275,6 @@ public class SysDepartmentResource {
.body(list);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-SysDepartment-searchDefault-all') and hasPermission(#context,'ibzou-SysDepartment-Get')")
@ApiOperation(value = "根据单位机构查询DEFAULT", tags = {"部门" } ,notes = "根据单位机构查询DEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/sysorganizations/{sysorganization_id}/sysdepartments/searchdefault")
public ResponseEntity<Page<SysDepartmentDTO>> searchSysDepartmentDefaultBySysOrganization(@PathVariable("sysorganization_id") String sysorganization_id, @RequestBody SysDepartmentSearchContext context) {
......
......@@ -141,14 +141,12 @@ public class SysEmployeeResource {
return ResponseEntity.status(HttpStatus.OK).body(result);
}
@PreAuthorize("hasPermission(this.sysemployeeMapping.toDomain(#sysemployeedto),'ibzou-SysEmployee-Save')")
@ApiOperation(value = "保存人员", tags = {"人员" }, notes = "保存人员")
@RequestMapping(method = RequestMethod.POST, value = "/sysemployees/save")
public ResponseEntity<Boolean> save(@RequestBody SysEmployeeDTO sysemployeedto) {
return ResponseEntity.status(HttpStatus.OK).body(sysemployeeService.save(sysemployeeMapping.toDomain(sysemployeedto)));
}
@PreAuthorize("hasPermission(this.sysemployeeMapping.toDomain(#sysemployeedtos),'ibzou-SysEmployee-Save')")
@ApiOperation(value = "批量保存人员", tags = {"人员" }, notes = "批量保存人员")
@RequestMapping(method = RequestMethod.POST, value = "/sysemployees/savebatch")
public ResponseEntity<Boolean> saveBatch(@RequestBody List<SysEmployeeDTO> sysemployeedtos) {
......@@ -179,6 +177,7 @@ public class SysEmployeeResource {
}
@PreAuthorize("hasPermission(this.sysemployeeMapping.toDomain(#sysemployeedto),'ibzou-SysEmployee-Create')")
@ApiOperation(value = "根据部门建立人员", tags = {"人员" }, notes = "根据部门建立人员")
@RequestMapping(method = RequestMethod.POST, value = "/sysdepartments/{sysdepartment_id}/sysemployees")
......@@ -282,7 +281,6 @@ public class SysEmployeeResource {
boolean result = sysemployeeService.initPwdBatch(domains);
return ResponseEntity.status(HttpStatus.OK).body(result);
}
@PreAuthorize("hasPermission(this.sysemployeeMapping.toDomain(#sysemployeedto),'ibzou-SysEmployee-Save')")
@ApiOperation(value = "根据部门保存人员", tags = {"人员" }, notes = "根据部门保存人员")
@RequestMapping(method = RequestMethod.POST, value = "/sysdepartments/{sysdepartment_id}/sysemployees/save")
public ResponseEntity<Boolean> saveBySysDepartment(@PathVariable("sysdepartment_id") String sysdepartment_id, @RequestBody SysEmployeeDTO sysemployeedto) {
......@@ -291,7 +289,6 @@ public class SysEmployeeResource {
return ResponseEntity.status(HttpStatus.OK).body(sysemployeeService.save(domain));
}
@PreAuthorize("hasPermission(this.sysemployeeMapping.toDomain(#sysemployeedtos),'ibzou-SysEmployee-Save')")
@ApiOperation(value = "根据部门批量保存人员", tags = {"人员" }, notes = "根据部门批量保存人员")
@RequestMapping(method = RequestMethod.POST, value = "/sysdepartments/{sysdepartment_id}/sysemployees/savebatch")
public ResponseEntity<Boolean> saveBatchBySysDepartment(@PathVariable("sysdepartment_id") String sysdepartment_id, @RequestBody List<SysEmployeeDTO> sysemployeedtos) {
......@@ -429,7 +426,6 @@ public class SysEmployeeResource {
boolean result = sysemployeeService.initPwdBatch(domains);
return ResponseEntity.status(HttpStatus.OK).body(result);
}
@PreAuthorize("hasPermission(this.sysemployeeMapping.toDomain(#sysemployeedto),'ibzou-SysEmployee-Save')")
@ApiOperation(value = "根据单位机构保存人员", tags = {"人员" }, notes = "根据单位机构保存人员")
@RequestMapping(method = RequestMethod.POST, value = "/sysorganizations/{sysorganization_id}/sysemployees/save")
public ResponseEntity<Boolean> saveBySysOrganization(@PathVariable("sysorganization_id") String sysorganization_id, @RequestBody SysEmployeeDTO sysemployeedto) {
......@@ -438,7 +434,6 @@ public class SysEmployeeResource {
return ResponseEntity.status(HttpStatus.OK).body(sysemployeeService.save(domain));
}
@PreAuthorize("hasPermission(this.sysemployeeMapping.toDomain(#sysemployeedtos),'ibzou-SysEmployee-Save')")
@ApiOperation(value = "根据单位机构批量保存人员", tags = {"人员" }, notes = "根据单位机构批量保存人员")
@RequestMapping(method = RequestMethod.POST, value = "/sysorganizations/{sysorganization_id}/sysemployees/savebatch")
public ResponseEntity<Boolean> saveBatchBySysOrganization(@PathVariable("sysorganization_id") String sysorganization_id, @RequestBody List<SysEmployeeDTO> sysemployeedtos) {
......@@ -576,7 +571,6 @@ public class SysEmployeeResource {
boolean result = sysemployeeService.initPwdBatch(domains);
return ResponseEntity.status(HttpStatus.OK).body(result);
}
@PreAuthorize("hasPermission(this.sysemployeeMapping.toDomain(#sysemployeedto),'ibzou-SysEmployee-Save')")
@ApiOperation(value = "根据单位机构部门保存人员", tags = {"人员" }, notes = "根据单位机构部门保存人员")
@RequestMapping(method = RequestMethod.POST, value = "/sysorganizations/{sysorganization_id}/sysdepartments/{sysdepartment_id}/sysemployees/save")
public ResponseEntity<Boolean> saveBySysOrganizationSysDepartment(@PathVariable("sysorganization_id") String sysorganization_id, @PathVariable("sysdepartment_id") String sysdepartment_id, @RequestBody SysEmployeeDTO sysemployeedto) {
......@@ -585,7 +579,6 @@ public class SysEmployeeResource {
return ResponseEntity.status(HttpStatus.OK).body(sysemployeeService.save(domain));
}
@PreAuthorize("hasPermission(this.sysemployeeMapping.toDomain(#sysemployeedtos),'ibzou-SysEmployee-Save')")
@ApiOperation(value = "根据单位机构部门批量保存人员", tags = {"人员" }, notes = "根据单位机构部门批量保存人员")
@RequestMapping(method = RequestMethod.POST, value = "/sysorganizations/{sysorganization_id}/sysdepartments/{sysdepartment_id}/sysemployees/savebatch")
public ResponseEntity<Boolean> saveBatchBySysOrganizationSysDepartment(@PathVariable("sysorganization_id") String sysorganization_id, @PathVariable("sysdepartment_id") String sysdepartment_id, @RequestBody List<SysEmployeeDTO> sysemployeedtos) {
......
......@@ -122,14 +122,12 @@ public class SysOrganizationResource {
return ResponseEntity.status(HttpStatus.OK).body(sysorganizationService.checkKey(sysorganizationMapping.toDomain(sysorganizationdto)));
}
@PreAuthorize("hasPermission(this.sysorganizationMapping.toDomain(#sysorganizationdto),'ibzou-SysOrganization-Save')")
@ApiOperation(value = "保存单位机构", tags = {"单位机构" }, notes = "保存单位机构")
@RequestMapping(method = RequestMethod.POST, value = "/sysorganizations/save")
public ResponseEntity<Boolean> save(@RequestBody SysOrganizationDTO sysorganizationdto) {
return ResponseEntity.status(HttpStatus.OK).body(sysorganizationService.save(sysorganizationMapping.toDomain(sysorganizationdto)));
}
@PreAuthorize("hasPermission(this.sysorganizationMapping.toDomain(#sysorganizationdtos),'ibzou-SysOrganization-Save')")
@ApiOperation(value = "批量保存单位机构", tags = {"单位机构" }, notes = "批量保存单位机构")
@RequestMapping(method = RequestMethod.POST, value = "/sysorganizations/savebatch")
public ResponseEntity<Boolean> saveBatch(@RequestBody List<SysOrganizationDTO> sysorganizationdtos) {
......@@ -137,7 +135,6 @@ public class SysOrganizationResource {
return ResponseEntity.status(HttpStatus.OK).body(true);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-SysOrganization-searchDefault-all') and hasPermission(#context,'ibzou-SysOrganization-Get')")
@ApiOperation(value = "获取DEFAULT", tags = {"单位机构" } ,notes = "获取DEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/sysorganizations/fetchdefault")
public ResponseEntity<List<SysOrganizationDTO>> fetchDefault(SysOrganizationSearchContext context) {
......@@ -150,7 +147,6 @@ public class SysOrganizationResource {
.body(list);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-SysOrganization-searchDefault-all') and hasPermission(#context,'ibzou-SysOrganization-Get')")
@ApiOperation(value = "查询DEFAULT", tags = {"单位机构" } ,notes = "查询DEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/sysorganizations/searchdefault")
public ResponseEntity<Page<SysOrganizationDTO>> searchDefault(@RequestBody SysOrganizationSearchContext context) {
......@@ -160,5 +156,6 @@ public class SysOrganizationResource {
}
}
......@@ -121,14 +121,12 @@ public class SysPostResource {
return ResponseEntity.status(HttpStatus.OK).body(syspostService.checkKey(syspostMapping.toDomain(syspostdto)));
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-SysPost-Save-all')")
@ApiOperation(value = "保存岗位", tags = {"岗位" }, notes = "保存岗位")
@RequestMapping(method = RequestMethod.POST, value = "/sysposts/save")
public ResponseEntity<Boolean> save(@RequestBody SysPostDTO syspostdto) {
return ResponseEntity.status(HttpStatus.OK).body(syspostService.save(syspostMapping.toDomain(syspostdto)));
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-SysPost-Save-all')")
@ApiOperation(value = "批量保存岗位", tags = {"岗位" }, notes = "批量保存岗位")
@RequestMapping(method = RequestMethod.POST, value = "/sysposts/savebatch")
public ResponseEntity<Boolean> saveBatch(@RequestBody List<SysPostDTO> syspostdtos) {
......@@ -136,7 +134,6 @@ public class SysPostResource {
return ResponseEntity.status(HttpStatus.OK).body(true);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-SysPost-searchDefault-all')")
@ApiOperation(value = "获取DEFAULT", tags = {"岗位" } ,notes = "获取DEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/sysposts/fetchdefault")
public ResponseEntity<List<SysPostDTO>> fetchDefault(SysPostSearchContext context) {
......@@ -149,7 +146,6 @@ public class SysPostResource {
.body(list);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-SysPost-searchDefault-all')")
@ApiOperation(value = "查询DEFAULT", tags = {"岗位" } ,notes = "查询DEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/sysposts/searchdefault")
public ResponseEntity<Page<SysPostDTO>> searchDefault(@RequestBody SysPostSearchContext context) {
......@@ -159,5 +155,6 @@ public class SysPostResource {
}
}
......@@ -121,14 +121,12 @@ public class SysTeamMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(systeammemberService.checkKey(systeammemberMapping.toDomain(systeammemberdto)));
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-SysTeamMember-Save-all')")
@ApiOperation(value = "保存组成员", tags = {"组成员" }, notes = "保存组成员")
@RequestMapping(method = RequestMethod.POST, value = "/systeammembers/save")
public ResponseEntity<Boolean> save(@RequestBody SysTeamMemberDTO systeammemberdto) {
return ResponseEntity.status(HttpStatus.OK).body(systeammemberService.save(systeammemberMapping.toDomain(systeammemberdto)));
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-SysTeamMember-Save-all')")
@ApiOperation(value = "批量保存组成员", tags = {"组成员" }, notes = "批量保存组成员")
@RequestMapping(method = RequestMethod.POST, value = "/systeammembers/savebatch")
public ResponseEntity<Boolean> saveBatch(@RequestBody List<SysTeamMemberDTO> systeammemberdtos) {
......@@ -159,6 +157,7 @@ public class SysTeamMemberResource {
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-SysTeamMember-Create-all')")
@ApiOperation(value = "根据人员建立组成员", tags = {"组成员" }, notes = "根据人员建立组成员")
@RequestMapping(method = RequestMethod.POST, value = "/sysemployees/{sysemployee_id}/systeammembers")
......@@ -244,7 +243,6 @@ public class SysTeamMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(systeammemberService.checkKey(systeammemberMapping.toDomain(systeammemberdto)));
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-SysTeamMember-Save-all')")
@ApiOperation(value = "根据人员保存组成员", tags = {"组成员" }, notes = "根据人员保存组成员")
@RequestMapping(method = RequestMethod.POST, value = "/sysemployees/{sysemployee_id}/systeammembers/save")
public ResponseEntity<Boolean> saveBySysEmployee(@PathVariable("sysemployee_id") String sysemployee_id, @RequestBody SysTeamMemberDTO systeammemberdto) {
......@@ -253,7 +251,6 @@ public class SysTeamMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(systeammemberService.save(domain));
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-SysTeamMember-Save-all')")
@ApiOperation(value = "根据人员批量保存组成员", tags = {"组成员" }, notes = "根据人员批量保存组成员")
@RequestMapping(method = RequestMethod.POST, value = "/sysemployees/{sysemployee_id}/systeammembers/savebatch")
public ResponseEntity<Boolean> saveBatchBySysEmployee(@PathVariable("sysemployee_id") String sysemployee_id, @RequestBody List<SysTeamMemberDTO> systeammemberdtos) {
......@@ -373,7 +370,6 @@ public class SysTeamMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(systeammemberService.checkKey(systeammemberMapping.toDomain(systeammemberdto)));
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-SysTeamMember-Save-all')")
@ApiOperation(value = "根据组保存组成员", tags = {"组成员" }, notes = "根据组保存组成员")
@RequestMapping(method = RequestMethod.POST, value = "/systeams/{systeam_id}/systeammembers/save")
public ResponseEntity<Boolean> saveBySysTeam(@PathVariable("systeam_id") String systeam_id, @RequestBody SysTeamMemberDTO systeammemberdto) {
......@@ -382,7 +378,6 @@ public class SysTeamMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(systeammemberService.save(domain));
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-SysTeamMember-Save-all')")
@ApiOperation(value = "根据组批量保存组成员", tags = {"组成员" }, notes = "根据组批量保存组成员")
@RequestMapping(method = RequestMethod.POST, value = "/systeams/{systeam_id}/systeammembers/savebatch")
public ResponseEntity<Boolean> saveBatchBySysTeam(@PathVariable("systeam_id") String systeam_id, @RequestBody List<SysTeamMemberDTO> systeammemberdtos) {
......@@ -502,7 +497,6 @@ public class SysTeamMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(systeammemberService.checkKey(systeammemberMapping.toDomain(systeammemberdto)));
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-SysTeamMember-Save-all')")
@ApiOperation(value = "根据部门人员保存组成员", tags = {"组成员" }, notes = "根据部门人员保存组成员")
@RequestMapping(method = RequestMethod.POST, value = "/sysdepartments/{sysdepartment_id}/sysemployees/{sysemployee_id}/systeammembers/save")
public ResponseEntity<Boolean> saveBySysDepartmentSysEmployee(@PathVariable("sysdepartment_id") String sysdepartment_id, @PathVariable("sysemployee_id") String sysemployee_id, @RequestBody SysTeamMemberDTO systeammemberdto) {
......@@ -511,7 +505,6 @@ public class SysTeamMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(systeammemberService.save(domain));
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-SysTeamMember-Save-all')")
@ApiOperation(value = "根据部门人员批量保存组成员", tags = {"组成员" }, notes = "根据部门人员批量保存组成员")
@RequestMapping(method = RequestMethod.POST, value = "/sysdepartments/{sysdepartment_id}/sysemployees/{sysemployee_id}/systeammembers/savebatch")
public ResponseEntity<Boolean> saveBatchBySysDepartmentSysEmployee(@PathVariable("sysdepartment_id") String sysdepartment_id, @PathVariable("sysemployee_id") String sysemployee_id, @RequestBody List<SysTeamMemberDTO> systeammemberdtos) {
......@@ -631,7 +624,6 @@ public class SysTeamMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(systeammemberService.checkKey(systeammemberMapping.toDomain(systeammemberdto)));
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-SysTeamMember-Save-all')")
@ApiOperation(value = "根据单位机构人员保存组成员", tags = {"组成员" }, notes = "根据单位机构人员保存组成员")
@RequestMapping(method = RequestMethod.POST, value = "/sysorganizations/{sysorganization_id}/sysemployees/{sysemployee_id}/systeammembers/save")
public ResponseEntity<Boolean> saveBySysOrganizationSysEmployee(@PathVariable("sysorganization_id") String sysorganization_id, @PathVariable("sysemployee_id") String sysemployee_id, @RequestBody SysTeamMemberDTO systeammemberdto) {
......@@ -640,7 +632,6 @@ public class SysTeamMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(systeammemberService.save(domain));
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-SysTeamMember-Save-all')")
@ApiOperation(value = "根据单位机构人员批量保存组成员", tags = {"组成员" }, notes = "根据单位机构人员批量保存组成员")
@RequestMapping(method = RequestMethod.POST, value = "/sysorganizations/{sysorganization_id}/sysemployees/{sysemployee_id}/systeammembers/savebatch")
public ResponseEntity<Boolean> saveBatchBySysOrganizationSysEmployee(@PathVariable("sysorganization_id") String sysorganization_id, @PathVariable("sysemployee_id") String sysemployee_id, @RequestBody List<SysTeamMemberDTO> systeammemberdtos) {
......@@ -760,7 +751,6 @@ public class SysTeamMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(systeammemberService.checkKey(systeammemberMapping.toDomain(systeammemberdto)));
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-SysTeamMember-Save-all')")
@ApiOperation(value = "根据单位机构部门人员保存组成员", tags = {"组成员" }, notes = "根据单位机构部门人员保存组成员")
@RequestMapping(method = RequestMethod.POST, value = "/sysorganizations/{sysorganization_id}/sysdepartments/{sysdepartment_id}/sysemployees/{sysemployee_id}/systeammembers/save")
public ResponseEntity<Boolean> saveBySysOrganizationSysDepartmentSysEmployee(@PathVariable("sysorganization_id") String sysorganization_id, @PathVariable("sysdepartment_id") String sysdepartment_id, @PathVariable("sysemployee_id") String sysemployee_id, @RequestBody SysTeamMemberDTO systeammemberdto) {
......@@ -769,7 +759,6 @@ public class SysTeamMemberResource {
return ResponseEntity.status(HttpStatus.OK).body(systeammemberService.save(domain));
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-SysTeamMember-Save-all')")
@ApiOperation(value = "根据单位机构部门人员批量保存组成员", tags = {"组成员" }, notes = "根据单位机构部门人员批量保存组成员")
@RequestMapping(method = RequestMethod.POST, value = "/sysorganizations/{sysorganization_id}/sysdepartments/{sysdepartment_id}/sysemployees/{sysemployee_id}/systeammembers/savebatch")
public ResponseEntity<Boolean> saveBatchBySysOrganizationSysDepartmentSysEmployee(@PathVariable("sysorganization_id") String sysorganization_id, @PathVariable("sysdepartment_id") String sysdepartment_id, @PathVariable("sysemployee_id") String sysemployee_id, @RequestBody List<SysTeamMemberDTO> systeammemberdtos) {
......
......@@ -121,14 +121,12 @@ public class SysTeamResource {
return ResponseEntity.status(HttpStatus.OK).body(systeamService.checkKey(systeamMapping.toDomain(systeamdto)));
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-SysTeam-Save-all')")
@ApiOperation(value = "保存组", tags = {"组" }, notes = "保存组")
@RequestMapping(method = RequestMethod.POST, value = "/systeams/save")
public ResponseEntity<Boolean> save(@RequestBody SysTeamDTO systeamdto) {
return ResponseEntity.status(HttpStatus.OK).body(systeamService.save(systeamMapping.toDomain(systeamdto)));
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-SysTeam-Save-all')")
@ApiOperation(value = "批量保存组", tags = {"组" }, notes = "批量保存组")
@RequestMapping(method = RequestMethod.POST, value = "/systeams/savebatch")
public ResponseEntity<Boolean> saveBatch(@RequestBody List<SysTeamDTO> systeamdtos) {
......@@ -136,7 +134,6 @@ public class SysTeamResource {
return ResponseEntity.status(HttpStatus.OK).body(true);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-SysTeam-searchDefault-all')")
@ApiOperation(value = "获取DEFAULT", tags = {"组" } ,notes = "获取DEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/systeams/fetchdefault")
public ResponseEntity<List<SysTeamDTO>> fetchDefault(SysTeamSearchContext context) {
......@@ -149,7 +146,6 @@ public class SysTeamResource {
.body(list);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibzou-SysTeam-searchDefault-all')")
@ApiOperation(value = "查询DEFAULT", tags = {"组" } ,notes = "查询DEFAULT")
@RequestMapping(method= RequestMethod.POST , value="/systeams/searchdefault")
public ResponseEntity<Page<SysTeamDTO>> searchDefault(@RequestBody SysTeamSearchContext context) {
......@@ -159,5 +155,6 @@ public class SysTeamResource {
}
}
......@@ -124,6 +124,7 @@ public class RedisCacheConfig {
container.setConnectionFactory(redisConnectionFactory);
container.addMessageListener(messageListener, RedisChannelTopic.REDIS_CACHE_DELETE_TOPIC.getChannelTopic());
container.addMessageListener(messageListener, RedisChannelTopic.REDIS_CACHE_CLEAR_TOPIC.getChannelTopic());
container.addMessageListener(messageListener, RedisChannelTopic.REDIS_CACHE_DYNAMICMODEL_TOPIC.getChannelTopic());
return container;
}
}
\ No newline at end of file
......@@ -2,6 +2,8 @@ package cn.ibizlab.util.client;
import com.alibaba.fastjson.JSONObject;
import org.springframework.stereotype.Component;
import java.util.List;
import java.util.Map;
@Component
public class IBZLiteFallback implements IBZLiteFeignClient {
......@@ -10,4 +12,5 @@ public class IBZLiteFallback implements IBZLiteFeignClient {
public Boolean syncSysModel(JSONObject system) {
return null;
}
}
......@@ -3,6 +3,8 @@ package cn.ibizlab.util.client;
import com.alibaba.fastjson.JSONObject;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
@FeignClient(value = "${ibiz.ref.service.lite:ibzlite-api}",contextId = "lite",fallback = IBZLiteFallback.class)
public interface IBZLiteFeignClient
......@@ -14,4 +16,5 @@ public interface IBZLiteFeignClient
*/
@PostMapping("/lite/syncsysmodel")
Boolean syncSysModel(@RequestBody JSONObject system);
}
......@@ -6,7 +6,8 @@ import org.springframework.data.redis.listener.ChannelTopic;
*/
public enum RedisChannelTopic {
REDIS_CACHE_DELETE_TOPIC("redis:cache:delete:topic1", "删除redis缓存消息频道"),
REDIS_CACHE_CLEAR_TOPIC("redis:cache:clear:topic2", "清空redis缓存消息频道");
REDIS_CACHE_CLEAR_TOPIC("redis:cache:clear:topic2", "清空redis缓存消息频道"),
REDIS_CACHE_DYNAMICMODEL_TOPIC("redis:cache:dynamicmodel:topic3", "动态模型频道");
String channelTopic;
String label;
......
......@@ -293,7 +293,7 @@ public class AuthPermissionEvaluator implements PermissionEvaluator {
Map<String,String> permissionFiled=new HashMap<>();
String orgField="orgid"; //组织属性
String orgDeptField="orgsecid"; //部门属性
String orgDeptField="orgsectorid"; //部门属性
String createManField="createman"; //创建人属性
DEFieldCacheMap.getFieldMap(entityBase.getClass().getName());
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册