Skip to content

I
ibzuaa
提交 11b5f966 编写于 作者: laizhilong's avatar laizhilong
浏览文件
操作

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	app_web/src/components/login/login.vue
上级 7fe5c5ca 666eab97
显示空白字符变更
内嵌 并排
正在显示 包含 808 行增加 和 215 行删除
app_web/src/assets/img/QQ.svg 0 → 100644
浏览文件 @ 11b5f966
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M511.999 1024a512 512 0 1 0-512-512 512 512 0 0 0 512 512z" fill="#23A0F0" /><path d="M735.765 604.422c-3.55-49.47-36.192-90.932-55.09-112.47a70.383 70.383 0 0 0-15.577-67.003v-1.718c0-97.235-68.028-167.254-153.35-167.55-85.333 0.342-153.35 70.315-153.35 167.55v1.718a70.383 70.383 0 0 0-15.576 67.003c-18.898 21.413-51.54 62.874-55.09 112.47a75.39 75.39 0 0 0 7.554 40.425c7.555 10.308 28.513-2.06 43.406-34.93a210.33 210.33 0 0 0 35.499 67.914c-36.307 8.477-46.729 44.897-34.475 64.853 8.59 14.086 28.445 25.657 62.419 25.657 60.473 0 87.267-16.611 99.18-28.057a16.259 16.259 0 0 1 20.844 0c11.913 11.57 38.684 28.057 99.18 28.057 34.02 0 53.715-11.57 62.419-25.657 12.253-19.922 1.831-56.342-34.475-64.853a211.627 211.627 0 0 0 35.499-67.914c14.893 32.87 35.85 45.124 43.406 34.93a76.493 76.493 0 0 0 7.577-40.425z" fill="#FFFFFF" /></svg>
\ No newline at end of file
app_web/src/assets/img/weixin.svg 0 → 100644
浏览文件 @ 11b5f966
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path fill="#36ab60" d="M352.814545 385.396364m-33.512727 0a33.512727 33.512727 0 1 0 67.025455 0 33.512727 33.512727 0 1 0-67.025455 0Z" /><path fill="#36ab60" d="M502.690909 384.465455m-33.512727 0a33.512727 33.512727 0 1 0 67.025454 0 33.512727 33.512727 0 1 0-67.025454 0Z" /><path fill="#36ab60" d="M576.232727 534.341818m-23.272727 0a23.272727 23.272727 0 1 0 46.545455 0 23.272727 23.272727 0 1 0-46.545455 0Z" /><path fill="#36ab60" d="M694.458182 536.203636m-23.272727 0a23.272727 23.272727 0 1 0 46.545454 0 23.272727 23.272727 0 1 0-46.545454 0Z" /><path fill="#36ab60" d="M512 0C229.003636 0 0 229.003636 0 512s229.003636 512 512 512 512-229.003636 512-512S794.996364 0 512 0z m-87.505455 630.225455c-26.996364 0-48.407273-5.585455-75.403636-11.17091l-75.403636 37.236364 21.410909-64.232727c-53.992727-37.236364-85.643636-85.643636-85.643637-145.221818 0-102.4 96.814545-182.458182 215.04-182.458182 105.192727 0 198.283636 64.232727 216.901819 150.807273-6.516364-0.930909-13.963636-0.930909-20.48-0.93091-102.4 0-182.458182 76.334545-182.458182 170.356364 0 15.825455 2.792727 30.72 6.516363 44.683636-7.447273 0-13.963636 0.930909-20.48 0.93091z m314.647273 75.403636l15.825455 53.992727-58.647273-32.581818c-21.410909 5.585455-42.821818 11.170909-64.232727 11.170909-102.4 0-182.458182-69.818182-182.458182-155.461818s80.058182-155.461818 182.458182-155.461818c96.814545 0 182.458182 69.818182 182.458182 155.461818 0 47.476364-31.650909 90.298182-75.403637 122.88z" /></svg>
\ No newline at end of file
app_web/src/components/app-transfer/app-transfer.vue
浏览文件 @ 11b5f966
<template> <template>
<Select v-model="dataRight" style="width:586px" multiple> <Select
<Option @on-open-change="transferRefresh"
class="hidden" @on-change="dataChange"
:value="item" v-model="dataRight"
v-for="(item,i) in dataRight" :style="{width:width}"
:key="i" multiple
>{{dataLeft[item-1].label}}</Option> >
<Option class="hidden" :value="item" v-for="(item,i) in dataRight" :key="i">{{findLabel(item)}}</Option>
<el-transfer v-model="dataRight" :data="dataLeft" @change="dataChange" :titles="['未选择', '已选择']"></el-transfer> <el-transfer v-model="dataRight" :data="dataLeft" @change="dataChange" :titles="['未选择', '已选择']"></el-transfer>
</Select> </Select>
</template> </template>
<script lang="ts"> <script lang="ts">
import { Vue, Component, Watch, Prop, Model } from "vue-property-decorator"; import { Vue, Component, Watch, Prop, Model } from "vue-property-decorator";
import CodeListService from "@service/app/codelist-service"; import CodeListService from "@service/app/codelist-service";
import { ElSelect } from "element-ui/types/select";
@Component({}) @Component({})
export default class AppTransfer extends Vue { export default class AppTransfer extends Vue {
/**
* 表单传递右侧框中的数据
*/
@Prop() public data?: any;
/** /**
* 左侧框数据 * 左侧框数据
*/ */
public dataLeft: any[] = []; public dataLeft: any[] = [];
/** /**
* 右侧框数据 * 右侧框数据
*/ */
public dataRight: any[] = []; public dataRight: any[] = [];
/**
* 穿梭框宽度
*/
@Prop() public width:any;
/** /**
* 代码表服务对象 * 代码表服务对象
* *
...@@ -38,14 +44,6 @@ export default class AppTransfer extends Vue { ...@@ -38,14 +44,6 @@ export default class AppTransfer extends Vue {
$store: this.$store $store: this.$store
}); });
/**
* 额外参数
*
* @type {*}
* @memberof AppTransfer
*/
public otherParam: any;
/** /**
* 查询参数 * 查询参数
* @type {*} * @type {*}
...@@ -53,12 +51,16 @@ export default class AppTransfer extends Vue { ...@@ -53,12 +51,16 @@ export default class AppTransfer extends Vue {
*/ */
public queryParam: any; public queryParam: any;
/**
* 表单传入字符串值分隔符
*/
@Prop() public valueSeparator?: string;
/** /**
* 当前选中值 * 当前选中值
* @type {any} * @type {any}
* @memberof AppTransfer * @memberof AppTransfer
*/ */
@Model("change") readonly itemValue!: any; @Model("change") public itemValue!: any;
/** /**
* 代码表标识 * 代码表标识
...@@ -76,33 +78,18 @@ export default class AppTransfer extends Vue { ...@@ -76,33 +78,18 @@ export default class AppTransfer extends Vue {
*/ */
@Prop() public codelistType?: string; @Prop() public codelistType?: string;
/**
* 监听表单数据
*
* @memberof AppTransfer
*/
@Watch("data", { deep: true })
onDataChange(newVal: any, val: any) {
if (newVal) {
}
}
/** /**
* 组件change事件,右侧框数据变化时 * 组件change事件,右侧框数据变化时
* @memberof AppTransfer * @memberof AppTransfer
*/ */
dataChange(e: any) { dataChange(e: any) {
console.log(e);
let val: any[] = [];
let newVal: any; let newVal: any;
this.dataLeft.forEach((elem: any) => { newVal = e.join(`${this.valueSeparator}`);
e.forEach((item: any) => { if (newVal) {
if (elem.key === item) val.push(elem.value); this.$emit("change", newVal);
}); } else {
}); this.$emit("change", null);
newVal = val.join(","); }
console.log(newVal, typeof newVal);
if (newVal) this.$emit("change", newVal);
} }
/** /**
...@@ -151,55 +138,6 @@ export default class AppTransfer extends Vue { ...@@ -151,55 +138,6 @@ export default class AppTransfer extends Vue {
*/ */
@Prop() public placeholder?: string; @Prop() public placeholder?: string;
/**
* 获取值对象
*
* @memberof AppTransfer
*/
get currentVal() {
return this.itemValue;
}
/**
* 代码表
*
* @type {any[]}
* @memberof AppTransfer
*/
// public items: any[] = [];
/**
* 公共参数处理
*
* @param {*} arg
* @returns
* @memberof AppTransfer
*/
public handlePublicParams(arg: any) {
// 合并表单参数
arg.param = this.viewparams
? JSON.parse(JSON.stringify(this.viewparams))
: {};
arg.context = this.context ? JSON.parse(JSON.stringify(this.context)) : {};
// 附加参数处理
if (this.itemParam && this.itemParam.context) {
let _context = this.$util.formatData(
this.data,
arg.context,
this.itemParam.context
);
Object.assign(arg.context, _context);
}
if (this.itemParam && this.itemParam.param) {
let _param = this.$util.formatData(
this.data,
arg.param,
this.itemParam.param
);
Object.assign(arg.param, _param);
}
}
/** /**
* vue 生命周期 * vue 生命周期
* *
...@@ -219,13 +157,11 @@ export default class AppTransfer extends Vue { ...@@ -219,13 +157,11 @@ export default class AppTransfer extends Vue {
this.dataLeft = [...JSON.parse(JSON.stringify(codelist.items))]; this.dataLeft = [...JSON.parse(JSON.stringify(codelist.items))];
this.initLeft(); this.initLeft();
this.initRight(); this.initRight();
console.log(this.dataLeft);
console.log(this.dataRight);
} else { } else {
console.log(`----${this.tag}----代码表不存在`); console.log(`----${this.tag}----代码表不存在`);
} }
} else if (this.tag && Object.is(this.codelistType, "DYNAMIC")) { } else if (this.tag && Object.is(this.codelistType, "DYNAMIC")) {
// 公共参数处理 // 处理公共参数
let data: any = {}; let data: any = {};
this.handlePublicParams(data); this.handlePublicParams(data);
// 参数处理 // 参数处理
...@@ -235,7 +171,6 @@ export default class AppTransfer extends Vue { ...@@ -235,7 +171,6 @@ export default class AppTransfer extends Vue {
.getItems(this.tag, _context, _param) .getItems(this.tag, _context, _param)
.then((res: any) => { .then((res: any) => {
this.dataLeft = res; this.dataLeft = res;
console.log(this.dataLeft);
this.initLeft(); this.initLeft();
this.initRight(); this.initRight();
}) })
...@@ -244,6 +179,38 @@ export default class AppTransfer extends Vue { ...@@ -244,6 +179,38 @@ export default class AppTransfer extends Vue {
}); });
} }
} }
/**
* 公共参数处理
*
* @param {*} arg
* @returns
* @memberof AppTransfer
*/
public handlePublicParams(arg: any) {
// 合并表单参数
arg.param = this.viewparams
? JSON.parse(JSON.stringify(this.viewparams))
: {};
arg.context = this.context ? JSON.parse(JSON.stringify(this.context)) : {};
// 附加参数处理
if (this.itemParam && this.itemParam.context) {
let _context = this.$util.formatData(
this.itemValue,
arg.context,
this.itemParam.context
);
Object.assign(arg.context, _context);
}
if (this.itemParam && this.itemParam.param) {
let _param = this.$util.formatData(
this.itemValue,
arg.param,
this.itemParam.param
);
Object.assign(arg.param, _param);
}
}
/** /**
* 初始化左侧框数据 * 初始化左侧框数据
*/ */
...@@ -253,8 +220,7 @@ export default class AppTransfer extends Vue { ...@@ -253,8 +220,7 @@ export default class AppTransfer extends Vue {
this.dataLeft = []; this.dataLeft = [];
left.forEach((elem: any, i: any) => { left.forEach((elem: any, i: any) => {
this.dataLeft.push({ this.dataLeft.push({
key: i + 1, key: elem.id,
id: elem.id,
value: elem.value, value: elem.value,
label: elem.label, label: elem.label,
disabled: elem.disabled disabled: elem.disabled
...@@ -265,10 +231,9 @@ export default class AppTransfer extends Vue { ...@@ -265,10 +231,9 @@ export default class AppTransfer extends Vue {
* 初始化右侧框数据 * 初始化右侧框数据
*/ */
public initRight() { public initRight() {
let _data: string = this.data; let _data: any = this.itemValue;
console.log(_data);
if (_data) { if (_data) {
let newData: any[] = _data.split(","); let newData: any[] = _data.split(`${this.valueSeparator}`);
this.dataLeft.forEach((elem: any) => { this.dataLeft.forEach((elem: any) => {
newData.forEach((item: any) => { newData.forEach((item: any) => {
if (item === elem.value) { if (item === elem.value) {
...@@ -278,6 +243,25 @@ export default class AppTransfer extends Vue { ...@@ -278,6 +243,25 @@ export default class AppTransfer extends Vue {
}); });
} }
} }
/**
* 穿梭框打开时刷新数据
*/
public transferRefresh(e: any) {
if (e && this.codelistType === "DYNAMIC") {
this.dataLeft = [];
this.dataRight = [];
this.dataHandle();
}
}
/**
* 找到dataLeft中key与dataRight中item相等的元素，返回label
*/
public findLabel(item: any) {
for (const elem of this.dataLeft) {
if (elem.key === item) return elem.label;
}
}
} }
</script> </script>
......
app_web/src/components/app-user/app-user.vue
浏览文件 @ 11b5f966
...@@ -86,6 +86,9 @@ export default class AppUser extends Vue { ...@@ -86,6 +86,9 @@ export default class AppUser extends Vue {
if (response && response.status === 200) { if (response && response.status === 200) {
localStorage.removeItem('user'); localStorage.removeItem('user');
localStorage.removeItem('token'); localStorage.removeItem('token');
let leftTime = new Date();
leftTime.setTime(leftTime.getSeconds() - 1);
document.cookie = "ibzuaa-token=;expires=" + leftTime.toUTCString();
this.$router.push({ name: 'login' }); this.$router.push({ name: 'login' });
} }
}).catch((error: any) =>{ }).catch((error: any) =>{
......
app_web/src/components/login/login.less
浏览文件 @ 11b5f966
...@@ -17,17 +17,18 @@ ...@@ -17,17 +17,18 @@
position: absolute; position: absolute;
left: 0; left: 0;
right: 0; right: 0;
top: 150px; top: 20%;
margin: auto; margin: auto;
width: 450px; width: 450px;
.ivu-card-head { .ivu-card-head {
padding: 30px 6px; padding: 30px 0px 20px 0px;
border-bottom: 0px; border-bottom: 0px;
>p{ >p{
line-height: 20px; height: 30px;
font-size: 24px; line-height: 30px;
font-size: 20px;
color: #666666; color: #666666;
font-weight: 700; font-weight: 600;
} }
} }
&-header{ &-header{
......
app_web/src/engine/view/kan-ban-view-engine.ts 0 → 100644
浏览文件 @ 11b5f966
import DataViewEngine from './data-view-engine';
/**
* 视图引擎基础
*
* @export
* @class DataViewEngine
* @extends {MDViewEngine}
*/
export default class KanBanViewEngine extends DataViewEngine {
/**
* 表格部件
*
* @type {*}
* @memberof DataViewEngine
*/
protected kanban: any;
/**
* 引擎初始化
*
* @param {*} [options={}]
* @memberof DataViewEngine
*/
public init(options: any = {}): void {
this.kanban = options.kanban;
super.init(options);
}
/**
* 部件事件
*
* @param {string} ctrlName
* @param {string} eventName
* @param {*} args
* @memberof DataViewEngine
*/
public onCtrlEvent(ctrlName: string, eventName: string, args: any): void {
if (Object.is(ctrlName, 'kanban')) {
this.MDCtrlEvent(eventName, args);
}
super.onCtrlEvent(ctrlName, eventName, args);
}
/**
* 获取多数据部件
*
* @returns {*}
* @memberof DataViewEngine
*/
public getMDCtrl(): any {
return this.kanban;
}
}
\ No newline at end of file
app_web/src/locale/lanres/entities/sys-app/sys-app_en_US.ts
浏览文件 @ 11b5f966
...@@ -14,11 +14,11 @@ export default { ...@@ -14,11 +14,11 @@ export default {
views: { views: {
editview: { editview: {
caption: "应用", caption: "应用",
title: '应用', title: '应用编辑视图',
}, },
gridview: { gridview: {
caption: "应用", caption: "应用",
title: '应用', title: '应用表格视图',
}, },
}, },
main_form: { main_form: {
......
app_web/src/locale/lanres/entities/sys-app/sys-app_zh_CN.ts
浏览文件 @ 11b5f966
...@@ -13,11 +13,11 @@ export default { ...@@ -13,11 +13,11 @@ export default {
views: { views: {
editview: { editview: {
caption: '应用', caption: '应用',
title: '应用', title: '应用编辑视图',
}, },
gridview: { gridview: {
caption: '应用', caption: '应用',
title: '应用', title: '应用表格视图',
}, },
}, },
main_form: { main_form: {
......
app_web/src/locale/lanres/entities/sys-auth-log/sys-auth-log_en_US.ts
浏览文件 @ 11b5f966
...@@ -14,7 +14,7 @@ export default { ...@@ -14,7 +14,7 @@ export default {
views: { views: {
gridview: { gridview: {
caption: "认证日志", caption: "认证日志",
title: '认证日志', title: '认证日志表格视图',
}, },
}, },
main_grid: { main_grid: {
......
app_web/src/locale/lanres/entities/sys-auth-log/sys-auth-log_zh_CN.ts
浏览文件 @ 11b5f966
...@@ -13,7 +13,7 @@ export default { ...@@ -13,7 +13,7 @@ export default {
views: { views: {
gridview: { gridview: {
caption: '认证日志', caption: '认证日志',
title: '认证日志', title: '认证日志表格视图',
}, },
}, },
main_grid: { main_grid: {
......
app_web/src/locale/lanres/entities/sys-permission/sys-permission_en_US.ts
浏览文件 @ 11b5f966
...@@ -12,31 +12,31 @@ export default { ...@@ -12,31 +12,31 @@ export default {
views: { views: {
gridview: { gridview: {
caption: "权限/资源", caption: "权限/资源",
title: '权限/资源', title: '权限表表格视图',
}, },
editview2: { editview2: {
caption: "权限/资源", caption: "权限/资源",
title: '权限/资源', title: '权限表编辑视图',
}, },
pickupview: { pickupview: {
caption: "权限/资源", caption: "权限/资源",
title: '权限/资源', title: '权限表数据选择视图',
}, },
pickupgridview: { pickupgridview: {
caption: "权限/资源", caption: "权限/资源",
title: '权限/资源', title: '权限表选择表格视图',
}, },
mpickupview: { mpickupview: {
caption: "权限/资源", caption: "权限/资源",
title: '权限/资源', title: '权限表数据多项选择视图',
}, },
redirectview: { redirectview: {
caption: "权限/资源", caption: "权限/资源",
title: '权限/资源', title: '权限表数据重定向视图',
}, },
editview: { editview: {
caption: "权限/资源", caption: "权限/资源",
title: '权限/资源', title: '权限表编辑视图',
}, },
}, },
main_form: { main_form: {
......
app_web/src/locale/lanres/entities/sys-permission/sys-permission_zh_CN.ts
浏览文件 @ 11b5f966
...@@ -11,31 +11,31 @@ export default { ...@@ -11,31 +11,31 @@ export default {
views: { views: {
gridview: { gridview: {
caption: '权限/资源', caption: '权限/资源',
title: '权限/资源', title: '权限表表格视图',
}, },
editview2: { editview2: {
caption: '权限/资源', caption: '权限/资源',
title: '权限/资源', title: '权限表编辑视图',
}, },
pickupview: { pickupview: {
caption: '权限/资源', caption: '权限/资源',
title: '权限/资源', title: '权限表数据选择视图',
}, },
pickupgridview: { pickupgridview: {
caption: '权限/资源', caption: '权限/资源',
title: '权限/资源', title: '权限表选择表格视图',
}, },
mpickupview: { mpickupview: {
caption: '权限/资源', caption: '权限/资源',
title: '权限/资源', title: '权限表数据多项选择视图',
}, },
redirectview: { redirectview: {
caption: '权限/资源', caption: '权限/资源',
title: '权限/资源', title: '权限表数据重定向视图',
}, },
editview: { editview: {
caption: '权限/资源', caption: '权限/资源',
title: '权限/资源', title: '权限表编辑视图',
}, },
}, },
main_form: { main_form: {
......
app_web/src/locale/lanres/entities/sys-role-permission/sys-role-permission_en_US.ts
浏览文件 @ 11b5f966
...@@ -14,35 +14,35 @@ export default { ...@@ -14,35 +14,35 @@ export default {
views: { views: {
mpickupview: { mpickupview: {
caption: "角色权限关系", caption: "角色权限关系",
title: '角色权限关系', title: '角色权限关系表数据多项选择视图',
}, },
redirectview: { redirectview: {
caption: "角色权限关系", caption: "角色权限关系",
title: '角色权限关系', title: '角色权限关系表数据重定向视图',
}, },
gridview: { gridview: {
caption: "角色权限关系", caption: "角色权限关系",
title: '角色权限关系', title: '角色权限关系表表格视图',
}, },
pickupgridview: { pickupgridview: {
caption: "角色权限关系", caption: "角色权限关系",
title: '角色权限关系', title: '角色权限关系表选择表格视图',
}, },
pickupview: { pickupview: {
caption: "角色权限关系", caption: "角色权限关系",
title: '角色权限关系', title: '角色权限关系表数据选择视图',
}, },
editview: { editview: {
caption: "角色权限关系", caption: "角色权限关系",
title: '角色权限关系', title: '角色权限关系表编辑视图',
}, },
editview2: { editview2: {
caption: "角色权限关系", caption: "角色权限关系",
title: '角色权限关系', title: '角色权限关系表编辑视图',
}, },
customview: { customview: {
caption: "角色权限关系", caption: "角色权限关系",
title: '角色权限关系', title: '角色权限关系自定义视图',
}, },
}, },
main_form: { main_form: {
......
app_web/src/locale/lanres/entities/sys-role-permission/sys-role-permission_zh_CN.ts
浏览文件 @ 11b5f966
...@@ -13,35 +13,35 @@ export default { ...@@ -13,35 +13,35 @@ export default {
views: { views: {
mpickupview: { mpickupview: {
caption: '角色权限关系', caption: '角色权限关系',
title: '角色权限关系', title: '角色权限关系表数据多项选择视图',
}, },
redirectview: { redirectview: {
caption: '角色权限关系', caption: '角色权限关系',
title: '角色权限关系', title: '角色权限关系表数据重定向视图',
}, },
gridview: { gridview: {
caption: '角色权限关系', caption: '角色权限关系',
title: '角色权限关系', title: '角色权限关系表表格视图',
}, },
pickupgridview: { pickupgridview: {
caption: '角色权限关系', caption: '角色权限关系',
title: '角色权限关系', title: '角色权限关系表选择表格视图',
}, },
pickupview: { pickupview: {
caption: '角色权限关系', caption: '角色权限关系',
title: '角色权限关系', title: '角色权限关系表数据选择视图',
}, },
editview: { editview: {
caption: '角色权限关系', caption: '角色权限关系',
title: '角色权限关系', title: '角色权限关系表编辑视图',
}, },
editview2: { editview2: {
caption: '角色权限关系', caption: '角色权限关系',
title: '角色权限关系', title: '角色权限关系表编辑视图',
}, },
customview: { customview: {
caption: '角色权限关系', caption: '角色权限关系',
title: '角色权限关系', title: '角色权限关系自定义视图',
}, },
}, },
main_form: { main_form: {
......
app_web/src/locale/lanres/entities/sys-role/sys-role_en_US.ts
浏览文件 @ 11b5f966
...@@ -10,31 +10,31 @@ export default { ...@@ -10,31 +10,31 @@ export default {
views: { views: {
pickupgridview: { pickupgridview: {
caption: "系统角色", caption: "系统角色",
title: '系统角色', title: '角色选择表格视图',
}, },
editview2: { editview2: {
caption: "系统角色", caption: "系统角色",
title: '系统角色', title: '角色编辑视图',
}, },
editview: { editview: {
caption: "系统角色", caption: "系统角色",
title: '系统角色', title: '角色编辑视图',
}, },
pickupview: { pickupview: {
caption: "系统角色", caption: "系统角色",
title: '系统角色', title: '角色数据选择视图',
}, },
redirectview: { redirectview: {
caption: "系统角色", caption: "系统角色",
title: '系统角色', title: '角色数据重定向视图',
}, },
gridview: { gridview: {
caption: "系统角色", caption: "系统角色",
title: '系统角色', title: '角色表格视图',
}, },
mpickupview: { mpickupview: {
caption: "系统角色", caption: "系统角色",
title: '系统角色', title: '角色数据多项选择视图',
}, },
}, },
main_form: { main_form: {
......
app_web/src/locale/lanres/entities/sys-role/sys-role_zh_CN.ts
浏览文件 @ 11b5f966
...@@ -9,31 +9,31 @@ export default { ...@@ -9,31 +9,31 @@ export default {
views: { views: {
pickupgridview: { pickupgridview: {
caption: '系统角色', caption: '系统角色',
title: '系统角色', title: '角色选择表格视图',
}, },
editview2: { editview2: {
caption: '系统角色', caption: '系统角色',
title: '系统角色', title: '角色编辑视图',
}, },
editview: { editview: {
caption: '系统角色', caption: '系统角色',
title: '系统角色', title: '角色编辑视图',
}, },
pickupview: { pickupview: {
caption: '系统角色', caption: '系统角色',
title: '系统角色', title: '角色数据选择视图',
}, },
redirectview: { redirectview: {
caption: '系统角色', caption: '系统角色',
title: '系统角色', title: '角色数据重定向视图',
}, },
gridview: { gridview: {
caption: '系统角色', caption: '系统角色',
title: '系统角色', title: '角色表格视图',
}, },
mpickupview: { mpickupview: {
caption: '系统角色', caption: '系统角色',
title: '系统角色', title: '角色数据多项选择视图',
}, },
}, },
main_form: { main_form: {
......
app_web/src/locale/lanres/entities/sys-user-role/sys-user-role_en_US.ts
浏览文件 @ 11b5f966
...@@ -12,31 +12,31 @@ export default { ...@@ -12,31 +12,31 @@ export default {
views: { views: {
redirectview: { redirectview: {
caption: "用户角色关系", caption: "用户角色关系",
title: '用户角色关系', title: '用户角色关系表数据重定向视图',
}, },
editview: { editview: {
caption: "用户角色关系", caption: "用户角色关系",
title: '用户角色关系', title: '用户角色关系表编辑视图',
}, },
pickupgridview: { pickupgridview: {
caption: "用户角色关系", caption: "用户角色关系",
title: '用户角色关系', title: '用户角色关系表选择表格视图',
}, },
mpickupview: { mpickupview: {
caption: "用户角色关系", caption: "用户角色关系",
title: '用户角色关系', title: '用户角色关系表数据多项选择视图',
}, },
editview2: { editview2: {
caption: "用户角色关系", caption: "用户角色关系",
title: '用户角色关系', title: '用户角色关系表编辑视图',
}, },
pickupview: { pickupview: {
caption: "用户角色关系", caption: "用户角色关系",
title: '用户角色关系', title: '用户角色关系表数据选择视图',
}, },
gridview: { gridview: {
caption: "用户角色关系", caption: "用户角色关系",
title: '用户角色关系', title: '用户角色关系表表格视图',
}, },
}, },
main_form: { main_form: {
......
app_web/src/locale/lanres/entities/sys-user-role/sys-user-role_zh_CN.ts
浏览文件 @ 11b5f966
...@@ -11,31 +11,31 @@ export default { ...@@ -11,31 +11,31 @@ export default {
views: { views: {
redirectview: { redirectview: {
caption: '用户角色关系', caption: '用户角色关系',
title: '用户角色关系', title: '用户角色关系表数据重定向视图',
}, },
editview: { editview: {
caption: '用户角色关系', caption: '用户角色关系',
title: '用户角色关系', title: '用户角色关系表编辑视图',
}, },
pickupgridview: { pickupgridview: {
caption: '用户角色关系', caption: '用户角色关系',
title: '用户角色关系', title: '用户角色关系表选择表格视图',
}, },
mpickupview: { mpickupview: {
caption: '用户角色关系', caption: '用户角色关系',
title: '用户角色关系', title: '用户角色关系表数据多项选择视图',
}, },
editview2: { editview2: {
caption: '用户角色关系', caption: '用户角色关系',
title: '用户角色关系', title: '用户角色关系表编辑视图',
}, },
pickupview: { pickupview: {
caption: '用户角色关系', caption: '用户角色关系',
title: '用户角色关系', title: '用户角色关系表数据选择视图',
}, },
gridview: { gridview: {
caption: '用户角色关系', caption: '用户角色关系',
title: '用户角色关系', title: '用户角色关系表表格视图',
}, },
}, },
main_form: { main_form: {
......
app_web/src/locale/lanres/entities/sys-user/sys-user_en_US.ts
浏览文件 @ 11b5f966
...@@ -9,31 +9,31 @@ export default { ...@@ -9,31 +9,31 @@ export default {
views: { views: {
mpickupview: { mpickupview: {
caption: "系统用户", caption: "系统用户",
title: '系统用户', title: '用户表数据多项选择视图',
}, },
editview2: { editview2: {
caption: "系统用户", caption: "系统用户",
title: '系统用户', title: '用户表编辑视图',
}, },
redirectview: { redirectview: {
caption: "系统用户", caption: "系统用户",
title: '系统用户', title: '用户表数据重定向视图',
}, },
pickupgridview: { pickupgridview: {
caption: "系统用户", caption: "系统用户",
title: '系统用户', title: '用户表选择表格视图',
}, },
editview: { editview: {
caption: "系统用户", caption: "系统用户",
title: '系统用户', title: '用户表编辑视图',
}, },
gridview: { gridview: {
caption: "系统用户", caption: "系统用户",
title: '系统用户', title: '用户表格视图',
}, },
pickupview: { pickupview: {
caption: "系统用户", caption: "系统用户",
title: '系统用户', title: '用户表数据选择视图',
}, },
}, },
main_form: { main_form: {
......
app_web/src/locale/lanres/entities/sys-user/sys-user_zh_CN.ts
浏览文件 @ 11b5f966
...@@ -8,31 +8,31 @@ export default { ...@@ -8,31 +8,31 @@ export default {
views: { views: {
mpickupview: { mpickupview: {
caption: '系统用户', caption: '系统用户',
title: '系统用户', title: '用户表数据多项选择视图',
}, },
editview2: { editview2: {
caption: '系统用户', caption: '系统用户',
title: '系统用户', title: '用户表编辑视图',
}, },
redirectview: { redirectview: {
caption: '系统用户', caption: '系统用户',
title: '系统用户', title: '用户表数据重定向视图',
}, },
pickupgridview: { pickupgridview: {
caption: '系统用户', caption: '系统用户',
title: '系统用户', title: '用户表选择表格视图',
}, },
editview: { editview: {
caption: '系统用户', caption: '系统用户',
title: '系统用户', title: '用户表编辑视图',
}, },
gridview: { gridview: {
caption: '系统用户', caption: '系统用户',
title: '系统用户', title: '用户表格视图',
}, },
pickupview: { pickupview: {
caption: '系统用户', caption: '系统用户',
title: '系统用户', title: '用户表数据选择视图',
}, },
}, },
main_form: { main_form: {
......
app_web/src/pages/uaa/sys-permissionmpickup-view/sys-permissionmpickup-view-base.vue
浏览文件 @ 11b5f966
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
<div class="center" :style="{width : !isShowButton ? '100%' : ''}"> <div class="center" :style="{width : !isShowButton ? '100%' : ''}">
<view_pickupviewpanel <view_pickupviewpanel
:viewState="viewState" :viewState="viewState"
:viewparams="viewparams" :viewparams="JSON.parse(JSON.stringify(viewparams))"
:context="context" :context="JSON.parse(JSON.stringify(context))"
:isSingleSelect="isSingleSelect" :isSingleSelect="isSingleSelect"
:selectedData="selectedData" :selectedData="selectedData"
:isShowButton="isShowButton" :isShowButton="isShowButton"
......
app_web/src/pages/uaa/sys-permissionpickup-view/sys-permissionpickup-view-base.vue
浏览文件 @ 11b5f966
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
<div class="content-container pickup-view"> <div class="content-container pickup-view">
<view_pickupviewpanel <view_pickupviewpanel
:viewState="viewState" :viewState="viewState"
:viewparams="viewparams" :viewparams="JSON.parse(JSON.stringify(viewparams))"
:context="context" :context="JSON.parse(JSON.stringify(context))"
:isSingleSelect="isSingleSelect" :isSingleSelect="isSingleSelect"
:selectedData="selectedData" :selectedData="selectedData"
:isShowButton="isShowButton" :isShowButton="isShowButton"
......
app_web/src/pages/uaa/sys-role-permissionmpickup-view/sys-role-permissionmpickup-view-base.vue
浏览文件 @ 11b5f966
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
<div class="center" :style="{width : !isShowButton ? '100%' : ''}"> <div class="center" :style="{width : !isShowButton ? '100%' : ''}">
<view_pickupviewpanel <view_pickupviewpanel
:viewState="viewState" :viewState="viewState"
:viewparams="viewparams" :viewparams="JSON.parse(JSON.stringify(viewparams))"
:context="context" :context="JSON.parse(JSON.stringify(context))"
:isSingleSelect="isSingleSelect" :isSingleSelect="isSingleSelect"
:selectedData="selectedData" :selectedData="selectedData"
:isShowButton="isShowButton" :isShowButton="isShowButton"
......
app_web/src/pages/uaa/sys-role-permissionpickup-view/sys-role-permissionpickup-view-base.vue
浏览文件 @ 11b5f966
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
<div class="content-container pickup-view"> <div class="content-container pickup-view">
<view_pickupviewpanel <view_pickupviewpanel
:viewState="viewState" :viewState="viewState"
:viewparams="viewparams" :viewparams="JSON.parse(JSON.stringify(viewparams))"
:context="context" :context="JSON.parse(JSON.stringify(context))"
:isSingleSelect="isSingleSelect" :isSingleSelect="isSingleSelect"
:selectedData="selectedData" :selectedData="selectedData"
:isShowButton="isShowButton" :isShowButton="isShowButton"
......
app_web/src/pages/uaa/sys-rolempickup-view/sys-rolempickup-view-base.vue
浏览文件 @ 11b5f966
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
<div class="center" :style="{width : !isShowButton ? '100%' : ''}"> <div class="center" :style="{width : !isShowButton ? '100%' : ''}">
<view_pickupviewpanel <view_pickupviewpanel
:viewState="viewState" :viewState="viewState"
:viewparams="viewparams" :viewparams="JSON.parse(JSON.stringify(viewparams))"
:context="context" :context="JSON.parse(JSON.stringify(context))"
:isSingleSelect="isSingleSelect" :isSingleSelect="isSingleSelect"
:selectedData="selectedData" :selectedData="selectedData"
:isShowButton="isShowButton" :isShowButton="isShowButton"
......
app_web/src/pages/uaa/sys-rolepickup-view/sys-rolepickup-view-base.vue
浏览文件 @ 11b5f966
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
<div class="content-container pickup-view"> <div class="content-container pickup-view">
<view_pickupviewpanel <view_pickupviewpanel
:viewState="viewState" :viewState="viewState"
:viewparams="viewparams" :viewparams="JSON.parse(JSON.stringify(viewparams))"
:context="context" :context="JSON.parse(JSON.stringify(context))"
:isSingleSelect="isSingleSelect" :isSingleSelect="isSingleSelect"
:selectedData="selectedData" :selectedData="selectedData"
:isShowButton="isShowButton" :isShowButton="isShowButton"
......
app_web/src/pages/uaa/sys-user-rolempickup-view/sys-user-rolempickup-view-base.vue
浏览文件 @ 11b5f966
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
<div class="center" :style="{width : !isShowButton ? '100%' : ''}"> <div class="center" :style="{width : !isShowButton ? '100%' : ''}">
<view_pickupviewpanel <view_pickupviewpanel
:viewState="viewState" :viewState="viewState"
:viewparams="viewparams" :viewparams="JSON.parse(JSON.stringify(viewparams))"
:context="context" :context="JSON.parse(JSON.stringify(context))"
:isSingleSelect="isSingleSelect" :isSingleSelect="isSingleSelect"
:selectedData="selectedData" :selectedData="selectedData"
:isShowButton="isShowButton" :isShowButton="isShowButton"
......
app_web/src/pages/uaa/sys-user-rolepickup-view/sys-user-rolepickup-view-base.vue
浏览文件 @ 11b5f966
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
<div class="content-container pickup-view"> <div class="content-container pickup-view">
<view_pickupviewpanel <view_pickupviewpanel
:viewState="viewState" :viewState="viewState"
:viewparams="viewparams" :viewparams="JSON.parse(JSON.stringify(viewparams))"
:context="context" :context="JSON.parse(JSON.stringify(context))"
:isSingleSelect="isSingleSelect" :isSingleSelect="isSingleSelect"
:selectedData="selectedData" :selectedData="selectedData"
:isShowButton="isShowButton" :isShowButton="isShowButton"
......
app_web/src/pages/uaa/sys-usermpickup-view/sys-usermpickup-view-base.vue
浏览文件 @ 11b5f966
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
<div class="center" :style="{width : !isShowButton ? '100%' : ''}"> <div class="center" :style="{width : !isShowButton ? '100%' : ''}">
<view_pickupviewpanel <view_pickupviewpanel
:viewState="viewState" :viewState="viewState"
:viewparams="viewparams" :viewparams="JSON.parse(JSON.stringify(viewparams))"
:context="context" :context="JSON.parse(JSON.stringify(context))"
:isSingleSelect="isSingleSelect" :isSingleSelect="isSingleSelect"
:selectedData="selectedData" :selectedData="selectedData"
:isShowButton="isShowButton" :isShowButton="isShowButton"
......
app_web/src/pages/uaa/sys-userpickup-view/sys-userpickup-view-base.vue
浏览文件 @ 11b5f966
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
<div class="content-container pickup-view"> <div class="content-container pickup-view">
<view_pickupviewpanel <view_pickupviewpanel
:viewState="viewState" :viewState="viewState"
:viewparams="viewparams" :viewparams="JSON.parse(JSON.stringify(viewparams))"
:context="context" :context="JSON.parse(JSON.stringify(context))"
:isSingleSelect="isSingleSelect" :isSingleSelect="isSingleSelect"
:selectedData="selectedData" :selectedData="selectedData"
:isShowButton="isShowButton" :isShowButton="isShowButton"
......
app_web/src/utils/interceptor/interceptor.ts
浏览文件 @ 11b5f966
...@@ -84,6 +84,13 @@ export class Interceptors { ...@@ -84,6 +84,13 @@ export class Interceptors {
if (appdata && appdata.context) { if (appdata && appdata.context) {
config.headers['srforgsectorid'] = appdata.context.srforgsectorid; config.headers['srforgsectorid'] = appdata.context.srforgsectorid;
} }
if(!window.localStorage.getItem('token')){
let arr;
let reg = new RegExp("(^| )ibzuaa-token=([^;]*)(;|$)");
if (arr = document.cookie.match(reg)){
window.localStorage.setItem('token',unescape(arr[2]));
}
}
if (window.localStorage.getItem('token')) { if (window.localStorage.getItem('token')) {
const token = window.localStorage.getItem('token'); const token = window.localStorage.getItem('token');
config.headers['Authorization'] = `Bearer ${token}`; config.headers['Authorization'] = `Bearer ${token}`;
......
app_web/src/widgets/sys-permission/mpickup-viewpickupviewpanel-pickupviewpanel/mpickup-viewpickupviewpanel-pickupviewpanel-base.vue
浏览文件 @ 11b5f966
...@@ -134,6 +134,8 @@ export default class MPickupViewpickupviewpanelBase extends Vue implements Contr ...@@ -134,6 +134,8 @@ export default class MPickupViewpickupviewpanelBase extends Vue implements Contr
} }
} }
/** /**
* 选中数据字符串 * 选中数据字符串
* *
...@@ -173,6 +175,22 @@ export default class MPickupViewpickupviewpanelBase extends Vue implements Contr ...@@ -173,6 +175,22 @@ export default class MPickupViewpickupviewpanelBase extends Vue implements Contr
data: {}, data: {},
} }
/**
* 局部上下文
*
* @type {*}
* @memberof MPickupViewpickupviewpanel
*/
public localContext: any = null;
/**
* 局部视图参数
*
* @type {*}
* @memberof PickupViewpickupviewpanel
*/
public localViewParam: any = null;
/** /**
* 视图数据 * 视图数据
* *
...@@ -266,6 +284,7 @@ export default class MPickupViewpickupviewpanelBase extends Vue implements Contr ...@@ -266,6 +284,7 @@ export default class MPickupViewpickupviewpanelBase extends Vue implements Contr
* @memberof MPickupViewpickupviewpanel * @memberof MPickupViewpickupviewpanel
*/ */
public afterCreated(){ public afterCreated(){
this.initNavParam();
if (this.viewState) { if (this.viewState) {
this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => { this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
if (!Object.is(tag, this.name)) { if (!Object.is(tag, this.name)) {
...@@ -280,6 +299,25 @@ export default class MPickupViewpickupviewpanelBase extends Vue implements Contr ...@@ -280,6 +299,25 @@ export default class MPickupViewpickupviewpanelBase extends Vue implements Contr
} }
} }
/**
* 初始化导航参数
*
* @memberof MPickupViewpickupviewpanel
*/
public initNavParam(){
if(this.localContext && Object.keys(this.localContext).length >0){
let _context:any = this.$util.computedNavData({},this.context,this.viewparams,this.localContext);
Object.assign(this.context,_context);
}
if(this.localViewParam && Object.keys(this.localViewParam).length >0){
let _param:any = this.$util.computedNavData({},this.context,this.viewparams,this.localViewParam);
Object.assign(this.viewparams,_param);
}
this.viewdata = JSON.stringify(this.context);
this.viewparam = JSON.stringify(this.viewparams);
}
/** /**
* vue 生命周期 * vue 生命周期
* *
......
app_web/src/widgets/sys-permission/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-base.vue
浏览文件 @ 11b5f966
...@@ -134,6 +134,8 @@ export default class PickupViewpickupviewpanelBase extends Vue implements Contro ...@@ -134,6 +134,8 @@ export default class PickupViewpickupviewpanelBase extends Vue implements Contro
} }
} }
/** /**
* 选中数据字符串 * 选中数据字符串
* *
...@@ -173,6 +175,22 @@ export default class PickupViewpickupviewpanelBase extends Vue implements Contro ...@@ -173,6 +175,22 @@ export default class PickupViewpickupviewpanelBase extends Vue implements Contro
data: {}, data: {},
} }
/**
* 局部上下文
*
* @type {*}
* @memberof PickupViewpickupviewpanel
*/
public localContext: any = null;
/**
* 局部视图参数
*
* @type {*}
* @memberof PickupViewpickupviewpanel
*/
public localViewParam: any = null;
/** /**
* 视图数据 * 视图数据
* *
...@@ -266,6 +284,7 @@ export default class PickupViewpickupviewpanelBase extends Vue implements Contro ...@@ -266,6 +284,7 @@ export default class PickupViewpickupviewpanelBase extends Vue implements Contro
* @memberof PickupViewpickupviewpanel * @memberof PickupViewpickupviewpanel
*/ */
public afterCreated(){ public afterCreated(){
this.initNavParam();
if (this.viewState) { if (this.viewState) {
this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => { this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
if (!Object.is(tag, this.name)) { if (!Object.is(tag, this.name)) {
...@@ -280,6 +299,25 @@ export default class PickupViewpickupviewpanelBase extends Vue implements Contro ...@@ -280,6 +299,25 @@ export default class PickupViewpickupviewpanelBase extends Vue implements Contro
} }
} }
/**
* 初始化导航参数
*
* @memberof PickupViewpickupviewpanel
*/
public initNavParam(){
if(this.localContext && Object.keys(this.localContext).length >0){
let _context:any = this.$util.computedNavData({},this.context,this.viewparams,this.localContext);
Object.assign(this.context,_context);
}
if(this.localViewParam && Object.keys(this.localViewParam).length >0){
let _param:any = this.$util.computedNavData({},this.context,this.viewparams,this.localViewParam);
Object.assign(this.viewparams,_param);
}
this.viewdata = JSON.stringify(this.context);
this.viewparam = JSON.stringify(this.viewparams);
}
/** /**
* vue 生命周期 * vue 生命周期
* *
......
app_web/src/widgets/sys-role-permission/mpickup-viewpickupviewpanel-pickupviewpanel/mpickup-viewpickupviewpanel-pickupviewpanel-base.vue
浏览文件 @ 11b5f966
...@@ -134,6 +134,8 @@ export default class MPickupViewpickupviewpanelBase extends Vue implements Contr ...@@ -134,6 +134,8 @@ export default class MPickupViewpickupviewpanelBase extends Vue implements Contr
} }
} }
/** /**
* 选中数据字符串 * 选中数据字符串
* *
...@@ -173,6 +175,22 @@ export default class MPickupViewpickupviewpanelBase extends Vue implements Contr ...@@ -173,6 +175,22 @@ export default class MPickupViewpickupviewpanelBase extends Vue implements Contr
data: {}, data: {},
} }
/**
* 局部上下文
*
* @type {*}
* @memberof MPickupViewpickupviewpanel
*/
public localContext: any = null;
/**
* 局部视图参数
*
* @type {*}
* @memberof PickupViewpickupviewpanel
*/
public localViewParam: any = null;
/** /**
* 视图数据 * 视图数据
* *
...@@ -266,6 +284,7 @@ export default class MPickupViewpickupviewpanelBase extends Vue implements Contr ...@@ -266,6 +284,7 @@ export default class MPickupViewpickupviewpanelBase extends Vue implements Contr
* @memberof MPickupViewpickupviewpanel * @memberof MPickupViewpickupviewpanel
*/ */
public afterCreated(){ public afterCreated(){
this.initNavParam();
if (this.viewState) { if (this.viewState) {
this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => { this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
if (!Object.is(tag, this.name)) { if (!Object.is(tag, this.name)) {
...@@ -280,6 +299,25 @@ export default class MPickupViewpickupviewpanelBase extends Vue implements Contr ...@@ -280,6 +299,25 @@ export default class MPickupViewpickupviewpanelBase extends Vue implements Contr
} }
} }
/**
* 初始化导航参数
*
* @memberof MPickupViewpickupviewpanel
*/
public initNavParam(){
if(this.localContext && Object.keys(this.localContext).length >0){
let _context:any = this.$util.computedNavData({},this.context,this.viewparams,this.localContext);
Object.assign(this.context,_context);
}
if(this.localViewParam && Object.keys(this.localViewParam).length >0){
let _param:any = this.$util.computedNavData({},this.context,this.viewparams,this.localViewParam);
Object.assign(this.viewparams,_param);
}
this.viewdata = JSON.stringify(this.context);
this.viewparam = JSON.stringify(this.viewparams);
}
/** /**
* vue 生命周期 * vue 生命周期
* *
......
app_web/src/widgets/sys-role-permission/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-base.vue
浏览文件 @ 11b5f966
...@@ -134,6 +134,8 @@ export default class PickupViewpickupviewpanelBase extends Vue implements Contro ...@@ -134,6 +134,8 @@ export default class PickupViewpickupviewpanelBase extends Vue implements Contro
} }
} }
/** /**
* 选中数据字符串 * 选中数据字符串
* *
...@@ -173,6 +175,22 @@ export default class PickupViewpickupviewpanelBase extends Vue implements Contro ...@@ -173,6 +175,22 @@ export default class PickupViewpickupviewpanelBase extends Vue implements Contro
data: {}, data: {},
} }
/**
* 局部上下文
*
* @type {*}
* @memberof PickupViewpickupviewpanel
*/
public localContext: any = null;
/**
* 局部视图参数
*
* @type {*}
* @memberof PickupViewpickupviewpanel
*/
public localViewParam: any = null;
/** /**
* 视图数据 * 视图数据
* *
...@@ -266,6 +284,7 @@ export default class PickupViewpickupviewpanelBase extends Vue implements Contro ...@@ -266,6 +284,7 @@ export default class PickupViewpickupviewpanelBase extends Vue implements Contro
* @memberof PickupViewpickupviewpanel * @memberof PickupViewpickupviewpanel
*/ */
public afterCreated(){ public afterCreated(){
this.initNavParam();
if (this.viewState) { if (this.viewState) {
this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => { this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
if (!Object.is(tag, this.name)) { if (!Object.is(tag, this.name)) {
...@@ -280,6 +299,25 @@ export default class PickupViewpickupviewpanelBase extends Vue implements Contro ...@@ -280,6 +299,25 @@ export default class PickupViewpickupviewpanelBase extends Vue implements Contro
} }
} }
/**
* 初始化导航参数
*
* @memberof PickupViewpickupviewpanel
*/
public initNavParam(){
if(this.localContext && Object.keys(this.localContext).length >0){
let _context:any = this.$util.computedNavData({},this.context,this.viewparams,this.localContext);
Object.assign(this.context,_context);
}
if(this.localViewParam && Object.keys(this.localViewParam).length >0){
let _param:any = this.$util.computedNavData({},this.context,this.viewparams,this.localViewParam);
Object.assign(this.viewparams,_param);
}
this.viewdata = JSON.stringify(this.context);
this.viewparam = JSON.stringify(this.viewparams);
}
/** /**
* vue 生命周期 * vue 生命周期
* *
......
app_web/src/widgets/sys-role/mpickup-viewpickupviewpanel-pickupviewpanel/mpickup-viewpickupviewpanel-pickupviewpanel-base.vue
浏览文件 @ 11b5f966
...@@ -134,6 +134,8 @@ export default class MPickupViewpickupviewpanelBase extends Vue implements Contr ...@@ -134,6 +134,8 @@ export default class MPickupViewpickupviewpanelBase extends Vue implements Contr
} }
} }
/** /**
* 选中数据字符串 * 选中数据字符串
* *
...@@ -173,6 +175,22 @@ export default class MPickupViewpickupviewpanelBase extends Vue implements Contr ...@@ -173,6 +175,22 @@ export default class MPickupViewpickupviewpanelBase extends Vue implements Contr
data: {}, data: {},
} }
/**
* 局部上下文
*
* @type {*}
* @memberof MPickupViewpickupviewpanel
*/
public localContext: any = null;
/**
* 局部视图参数
*
* @type {*}
* @memberof PickupViewpickupviewpanel
*/
public localViewParam: any = null;
/** /**
* 视图数据 * 视图数据
* *
...@@ -266,6 +284,7 @@ export default class MPickupViewpickupviewpanelBase extends Vue implements Contr ...@@ -266,6 +284,7 @@ export default class MPickupViewpickupviewpanelBase extends Vue implements Contr
* @memberof MPickupViewpickupviewpanel * @memberof MPickupViewpickupviewpanel
*/ */
public afterCreated(){ public afterCreated(){
this.initNavParam();
if (this.viewState) { if (this.viewState) {
this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => { this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
if (!Object.is(tag, this.name)) { if (!Object.is(tag, this.name)) {
...@@ -280,6 +299,25 @@ export default class MPickupViewpickupviewpanelBase extends Vue implements Contr ...@@ -280,6 +299,25 @@ export default class MPickupViewpickupviewpanelBase extends Vue implements Contr
} }
} }
/**
* 初始化导航参数
*
* @memberof MPickupViewpickupviewpanel
*/
public initNavParam(){
if(this.localContext && Object.keys(this.localContext).length >0){
let _context:any = this.$util.computedNavData({},this.context,this.viewparams,this.localContext);
Object.assign(this.context,_context);
}
if(this.localViewParam && Object.keys(this.localViewParam).length >0){
let _param:any = this.$util.computedNavData({},this.context,this.viewparams,this.localViewParam);
Object.assign(this.viewparams,_param);
}
this.viewdata = JSON.stringify(this.context);
this.viewparam = JSON.stringify(this.viewparams);
}
/** /**
* vue 生命周期 * vue 生命周期
* *
......
app_web/src/widgets/sys-role/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-base.vue
浏览文件 @ 11b5f966
...@@ -134,6 +134,8 @@ export default class PickupViewpickupviewpanelBase extends Vue implements Contro ...@@ -134,6 +134,8 @@ export default class PickupViewpickupviewpanelBase extends Vue implements Contro
} }
} }
/** /**
* 选中数据字符串 * 选中数据字符串
* *
...@@ -173,6 +175,22 @@ export default class PickupViewpickupviewpanelBase extends Vue implements Contro ...@@ -173,6 +175,22 @@ export default class PickupViewpickupviewpanelBase extends Vue implements Contro
data: {}, data: {},
} }
/**
* 局部上下文
*
* @type {*}
* @memberof PickupViewpickupviewpanel
*/
public localContext: any = null;
/**
* 局部视图参数
*
* @type {*}
* @memberof PickupViewpickupviewpanel
*/
public localViewParam: any = null;
/** /**
* 视图数据 * 视图数据
* *
...@@ -266,6 +284,7 @@ export default class PickupViewpickupviewpanelBase extends Vue implements Contro ...@@ -266,6 +284,7 @@ export default class PickupViewpickupviewpanelBase extends Vue implements Contro
* @memberof PickupViewpickupviewpanel * @memberof PickupViewpickupviewpanel
*/ */
public afterCreated(){ public afterCreated(){
this.initNavParam();
if (this.viewState) { if (this.viewState) {
this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => { this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
if (!Object.is(tag, this.name)) { if (!Object.is(tag, this.name)) {
...@@ -280,6 +299,25 @@ export default class PickupViewpickupviewpanelBase extends Vue implements Contro ...@@ -280,6 +299,25 @@ export default class PickupViewpickupviewpanelBase extends Vue implements Contro
} }
} }
/**
* 初始化导航参数
*
* @memberof PickupViewpickupviewpanel
*/
public initNavParam(){
if(this.localContext && Object.keys(this.localContext).length >0){
let _context:any = this.$util.computedNavData({},this.context,this.viewparams,this.localContext);
Object.assign(this.context,_context);
}
if(this.localViewParam && Object.keys(this.localViewParam).length >0){
let _param:any = this.$util.computedNavData({},this.context,this.viewparams,this.localViewParam);
Object.assign(this.viewparams,_param);
}
this.viewdata = JSON.stringify(this.context);
this.viewparam = JSON.stringify(this.viewparams);
}
/** /**
* vue 生命周期 * vue 生命周期
* *
......
app_web/src/widgets/sys-user-role/mpickup-viewpickupviewpanel-pickupviewpanel/mpickup-viewpickupviewpanel-pickupviewpanel-base.vue
浏览文件 @ 11b5f966
...@@ -134,6 +134,8 @@ export default class MPickupViewpickupviewpanelBase extends Vue implements Contr ...@@ -134,6 +134,8 @@ export default class MPickupViewpickupviewpanelBase extends Vue implements Contr
} }
} }
/** /**
* 选中数据字符串 * 选中数据字符串
* *
...@@ -173,6 +175,22 @@ export default class MPickupViewpickupviewpanelBase extends Vue implements Contr ...@@ -173,6 +175,22 @@ export default class MPickupViewpickupviewpanelBase extends Vue implements Contr
data: {}, data: {},
} }
/**
* 局部上下文
*
* @type {*}
* @memberof MPickupViewpickupviewpanel
*/
public localContext: any = null;
/**
* 局部视图参数
*
* @type {*}
* @memberof PickupViewpickupviewpanel
*/
public localViewParam: any = null;
/** /**
* 视图数据 * 视图数据
* *
...@@ -266,6 +284,7 @@ export default class MPickupViewpickupviewpanelBase extends Vue implements Contr ...@@ -266,6 +284,7 @@ export default class MPickupViewpickupviewpanelBase extends Vue implements Contr
* @memberof MPickupViewpickupviewpanel * @memberof MPickupViewpickupviewpanel
*/ */
public afterCreated(){ public afterCreated(){
this.initNavParam();
if (this.viewState) { if (this.viewState) {
this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => { this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
if (!Object.is(tag, this.name)) { if (!Object.is(tag, this.name)) {
...@@ -280,6 +299,25 @@ export default class MPickupViewpickupviewpanelBase extends Vue implements Contr ...@@ -280,6 +299,25 @@ export default class MPickupViewpickupviewpanelBase extends Vue implements Contr
} }
} }
/**
* 初始化导航参数
*
* @memberof MPickupViewpickupviewpanel
*/
public initNavParam(){
if(this.localContext && Object.keys(this.localContext).length >0){
let _context:any = this.$util.computedNavData({},this.context,this.viewparams,this.localContext);
Object.assign(this.context,_context);
}
if(this.localViewParam && Object.keys(this.localViewParam).length >0){
let _param:any = this.$util.computedNavData({},this.context,this.viewparams,this.localViewParam);
Object.assign(this.viewparams,_param);
}
this.viewdata = JSON.stringify(this.context);
this.viewparam = JSON.stringify(this.viewparams);
}
/** /**
* vue 生命周期 * vue 生命周期
* *
......
app_web/src/widgets/sys-user-role/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-base.vue
浏览文件 @ 11b5f966
...@@ -134,6 +134,8 @@ export default class PickupViewpickupviewpanelBase extends Vue implements Contro ...@@ -134,6 +134,8 @@ export default class PickupViewpickupviewpanelBase extends Vue implements Contro
} }
} }
/** /**
* 选中数据字符串 * 选中数据字符串
* *
...@@ -173,6 +175,22 @@ export default class PickupViewpickupviewpanelBase extends Vue implements Contro ...@@ -173,6 +175,22 @@ export default class PickupViewpickupviewpanelBase extends Vue implements Contro
data: {}, data: {},
} }
/**
* 局部上下文
*
* @type {*}
* @memberof PickupViewpickupviewpanel
*/
public localContext: any = null;
/**
* 局部视图参数
*
* @type {*}
* @memberof PickupViewpickupviewpanel
*/
public localViewParam: any = null;
/** /**
* 视图数据 * 视图数据
* *
...@@ -266,6 +284,7 @@ export default class PickupViewpickupviewpanelBase extends Vue implements Contro ...@@ -266,6 +284,7 @@ export default class PickupViewpickupviewpanelBase extends Vue implements Contro
* @memberof PickupViewpickupviewpanel * @memberof PickupViewpickupviewpanel
*/ */
public afterCreated(){ public afterCreated(){
this.initNavParam();
if (this.viewState) { if (this.viewState) {
this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => { this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
if (!Object.is(tag, this.name)) { if (!Object.is(tag, this.name)) {
...@@ -280,6 +299,25 @@ export default class PickupViewpickupviewpanelBase extends Vue implements Contro ...@@ -280,6 +299,25 @@ export default class PickupViewpickupviewpanelBase extends Vue implements Contro
} }
} }
/**
* 初始化导航参数
*
* @memberof PickupViewpickupviewpanel
*/
public initNavParam(){
if(this.localContext && Object.keys(this.localContext).length >0){
let _context:any = this.$util.computedNavData({},this.context,this.viewparams,this.localContext);
Object.assign(this.context,_context);
}
if(this.localViewParam && Object.keys(this.localViewParam).length >0){
let _param:any = this.$util.computedNavData({},this.context,this.viewparams,this.localViewParam);
Object.assign(this.viewparams,_param);
}
this.viewdata = JSON.stringify(this.context);
this.viewparam = JSON.stringify(this.viewparams);
}
/** /**
* vue 生命周期 * vue 生命周期
* *
......
app_web/src/widgets/sys-user/mpickup-viewpickupviewpanel-pickupviewpanel/mpickup-viewpickupviewpanel-pickupviewpanel-base.vue
浏览文件 @ 11b5f966
...@@ -134,6 +134,8 @@ export default class MPickupViewpickupviewpanelBase extends Vue implements Contr ...@@ -134,6 +134,8 @@ export default class MPickupViewpickupviewpanelBase extends Vue implements Contr
} }
} }
/** /**
* 选中数据字符串 * 选中数据字符串
* *
...@@ -173,6 +175,22 @@ export default class MPickupViewpickupviewpanelBase extends Vue implements Contr ...@@ -173,6 +175,22 @@ export default class MPickupViewpickupviewpanelBase extends Vue implements Contr
data: {}, data: {},
} }
/**
* 局部上下文
*
* @type {*}
* @memberof MPickupViewpickupviewpanel
*/
public localContext: any = null;
/**
* 局部视图参数
*
* @type {*}
* @memberof PickupViewpickupviewpanel
*/
public localViewParam: any = null;
/** /**
* 视图数据 * 视图数据
* *
...@@ -266,6 +284,7 @@ export default class MPickupViewpickupviewpanelBase extends Vue implements Contr ...@@ -266,6 +284,7 @@ export default class MPickupViewpickupviewpanelBase extends Vue implements Contr
* @memberof MPickupViewpickupviewpanel * @memberof MPickupViewpickupviewpanel
*/ */
public afterCreated(){ public afterCreated(){
this.initNavParam();
if (this.viewState) { if (this.viewState) {
this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => { this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
if (!Object.is(tag, this.name)) { if (!Object.is(tag, this.name)) {
...@@ -280,6 +299,25 @@ export default class MPickupViewpickupviewpanelBase extends Vue implements Contr ...@@ -280,6 +299,25 @@ export default class MPickupViewpickupviewpanelBase extends Vue implements Contr
} }
} }
/**
* 初始化导航参数
*
* @memberof MPickupViewpickupviewpanel
*/
public initNavParam(){
if(this.localContext && Object.keys(this.localContext).length >0){
let _context:any = this.$util.computedNavData({},this.context,this.viewparams,this.localContext);
Object.assign(this.context,_context);
}
if(this.localViewParam && Object.keys(this.localViewParam).length >0){
let _param:any = this.$util.computedNavData({},this.context,this.viewparams,this.localViewParam);
Object.assign(this.viewparams,_param);
}
this.viewdata = JSON.stringify(this.context);
this.viewparam = JSON.stringify(this.viewparams);
}
/** /**
* vue 生命周期 * vue 生命周期
* *
......
app_web/src/widgets/sys-user/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-base.vue
浏览文件 @ 11b5f966
...@@ -134,6 +134,8 @@ export default class PickupViewpickupviewpanelBase extends Vue implements Contro ...@@ -134,6 +134,8 @@ export default class PickupViewpickupviewpanelBase extends Vue implements Contro
} }
} }
/** /**
* 选中数据字符串 * 选中数据字符串
* *
...@@ -173,6 +175,22 @@ export default class PickupViewpickupviewpanelBase extends Vue implements Contro ...@@ -173,6 +175,22 @@ export default class PickupViewpickupviewpanelBase extends Vue implements Contro
data: {}, data: {},
} }
/**
* 局部上下文
*
* @type {*}
* @memberof PickupViewpickupviewpanel
*/
public localContext: any = null;
/**
* 局部视图参数
*
* @type {*}
* @memberof PickupViewpickupviewpanel
*/
public localViewParam: any = null;
/** /**
* 视图数据 * 视图数据
* *
...@@ -266,6 +284,7 @@ export default class PickupViewpickupviewpanelBase extends Vue implements Contro ...@@ -266,6 +284,7 @@ export default class PickupViewpickupviewpanelBase extends Vue implements Contro
* @memberof PickupViewpickupviewpanel * @memberof PickupViewpickupviewpanel
*/ */
public afterCreated(){ public afterCreated(){
this.initNavParam();
if (this.viewState) { if (this.viewState) {
this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => { this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
if (!Object.is(tag, this.name)) { if (!Object.is(tag, this.name)) {
...@@ -280,6 +299,25 @@ export default class PickupViewpickupviewpanelBase extends Vue implements Contro ...@@ -280,6 +299,25 @@ export default class PickupViewpickupviewpanelBase extends Vue implements Contro
} }
} }
/**
* 初始化导航参数
*
* @memberof PickupViewpickupviewpanel
*/
public initNavParam(){
if(this.localContext && Object.keys(this.localContext).length >0){
let _context:any = this.$util.computedNavData({},this.context,this.viewparams,this.localContext);
Object.assign(this.context,_context);
}
if(this.localViewParam && Object.keys(this.localViewParam).length >0){
let _param:any = this.$util.computedNavData({},this.context,this.viewparams,this.localViewParam);
Object.assign(this.viewparams,_param);
}
this.viewdata = JSON.stringify(this.context);
this.viewparam = JSON.stringify(this.viewparams);
}
/** /**
* vue 生命周期 * vue 生命周期
* *
......
ibzuaa-app/ibzuaa-app-web/src/main/docker/ibzuaa-app-web.yaml
浏览文件 @ 11b5f966
...@@ -14,6 +14,16 @@ services: ...@@ -14,6 +14,16 @@ services:
memory: 400M memory: 400M
mode: replicated mode: replicated
replicas: 1 replicas: 1
volumes:
- "nfs:/app/file"
volumes:
nfs:
driver: local
driver_opts:
type: "nfs"
o: "addr=172.16.240.109,rw"
device: ":/nfs"
networks: networks:
agent_network: agent_network:
......
ibzuaa-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 11b5f966
!!!!模版产生代码错误:---- <?xml version="1.1" encoding="UTF-8" standalone="no"?>
Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)?? <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
----
----
FTL stack trace ("~" means nesting-related): <!--输出实体[SYS_AUTHLOG]数据结构 -->
- Failed at: ${dbinst.getUserName()} [in template "CODETEMPL_zh_CN" at line 28, column 24] <changeSet author="a_A_5d9d78509" id="tab-sys_authlog-36-1">
---- <createTable tableName="IBZAUTHLOG">
\ No newline at end of file <column name="LOGID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_AUTHLOG_LOGID"/>
</column>
<column name="USERNAME" remarks="" type="VARCHAR(100)">
</column>
<column name="PERSONNAME" remarks="" type="VARCHAR(100)">
</column>
<column name="DOMAIN" remarks="" type="VARCHAR(100)">
</column>
<column name="AUTHTIME" remarks="" type="DATETIME">
</column>
<column name="IPADDR" remarks="" type="VARCHAR(100)">
</column>
<column name="MACADDR" remarks="" type="VARCHAR(100)">
</column>
<column name="USERAGENT" remarks="" type="VARCHAR(100)">
</column>
<column name="AUTHCODE" remarks="" type="VARCHAR(15)">
</column>
</createTable>
</changeSet>
<!--输出实体[SYS_ROLE_PERMISSION]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-sys_role_permission-93-2">
<createTable tableName="IBZROLE_PERMISSION">
<column name="SYS_ROLE_PERMISSIONID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_ROLE_PERMISSION_SYS_ROL"/>
</column>
<column name="SYS_ROLEID" remarks="" type="VARCHAR(100)">
</column>
<column name="SYS_PERMISSIONID" remarks="" type="VARCHAR(200)">
</column>
<column name="CREATEDATE" remarks="" type="DATETIME">
</column>
<column name="UPDATEDATE" remarks="" type="DATETIME">
</column>
</createTable>
</changeSet>
<!--输出实体[SYS_USER_ROLE]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-sys_user_role-62-3">
<createTable tableName="IBZUSER_ROLE">
<column name="SYS_USER_ROLEID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_USER_ROLE_SYS_USER_ROLE"/>
</column>
<column name="SYS_ROLEID" remarks="" type="VARCHAR(100)">
</column>
<column name="SYS_USERID" remarks="" type="VARCHAR(100)">
</column>
<column name="CREATEDATE" remarks="" type="DATETIME">
</column>
<column name="UPDATEDATE" remarks="" type="DATETIME">
</column>
</createTable>
</changeSet>
<!--输出实体[SYS_ROLE]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-sys_role-89-4">
<createTable tableName="IBZROLE">
<column name="SYS_ROLEID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_ROLE_SYS_ROLEID"/>
</column>
<column name="SYS_ROLENAME" remarks="" type="VARCHAR(200)">
</column>
<column name="MEMO" remarks="" type="VARCHAR(100)">
</column>
<column name="CREATEDATE" remarks="" type="DATETIME">
</column>
<column name="UPDATEDATE" remarks="" type="DATETIME">
</column>
</createTable>
</changeSet>
<!--输出实体[SYS_PSSYSTEM]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-sys_pssystem-36-5">
<createTable tableName="IBZPSSYSTEM">
<column name="PSSYSTEMID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_PSSYSTEM_PSSYSTEMID"/>
</column>
<column name="PSSYSTEMNAME" remarks="" type="VARCHAR(100)">
</column>
<column name="SYSSTRUCTURE" remarks="" type="TEXT(1048576)">
</column>
<column name="APPS" remarks="" type="TEXT(1048576)">
</column>
<column name="MD5CHECK" remarks="" type="VARCHAR(100)">
</column>
<column name="SHOWORDER" remarks="" type="INT">
</column>
</createTable>
</changeSet>
<!--输出实体[SYS_PERMISSION]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-sys_permission-219-6">
<createTable tableName="IBZPERMISSION">
<column name="SYS_PERMISSIONID" remarks="" type="VARCHAR(200)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_PERMISSION_SYS_PERMISSI"/>
</column>
<column name="SYS_PERMISSIONNAME" remarks="" type="VARCHAR(200)">
</column>
<column name="PERMISSIONTYPE" remarks="" type="VARCHAR(60)">
</column>
<column name="PSSYSTEMID" remarks="" type="VARCHAR(100)">
</column>
<column name="ENABLE" remarks="" type="INT">
</column>
<column name="CREATEDATE" remarks="" type="DATETIME">
</column>
<column name="UPDATEDATE" remarks="" type="DATETIME">
</column>
</createTable>
</changeSet>
<!--输出实体[SYS_AUTHLOG]外键关系 -->
<!--输出实体[SYS_ROLE_PERMISSION]外键关系 -->
<changeSet author="a_A_5d9d78509" id="fk-sys_role_permission-93-7">
<addForeignKeyConstraint baseColumnNames="SYS_PERMISSIONID" baseTableName="IBZROLE_PERMISSION" constraintName="DER1N_SYS_ROLE_PERMISSION_SYS_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SYS_PERMISSIONID" referencedTableName="IBZPERMISSION" validate="true"/>
</changeSet>
<!--输出实体[SYS_USER_ROLE]外键关系 -->
<changeSet author="a_A_5d9d78509" id="fk-sys_user_role-62-9">
<addForeignKeyConstraint baseColumnNames="SYS_ROLEID" baseTableName="IBZUSER_ROLE" constraintName="DER1N_SYS_USER_ROLE_SYS_ROLE_S" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SYS_ROLEID" referencedTableName="IBZROLE" validate="true"/>
</changeSet>
<!--输出实体[SYS_ROLE]外键关系 -->
<!--输出实体[SYS_PSSYSTEM]外键关系 -->
<!--输出实体[SYS_PERMISSION]外键关系 -->
</databaseChangeLog>
ibzuaa-provider/ibzuaa-provider-api/src/main/docker/ibzuaa-provider-api.yaml
浏览文件 @ 11b5f966
...@@ -14,6 +14,16 @@ services: ...@@ -14,6 +14,16 @@ services:
memory: 400M memory: 400M
mode: replicated mode: replicated
replicas: 1 replicas: 1
volumes:
- "nfs:/app/file"
volumes:
nfs:
driver: local
driver_opts:
type: "nfs"
o: "addr=172.16.240.109,rw"
device: ":/nfs"
networks: networks:
agent_network: agent_network:
......
ibzuaa-util/src/main/java/cn/ibizlab/util/rest/AppController.java
浏览文件 @ 11b5f966
...@@ -12,10 +12,7 @@ import org.springframework.http.ResponseEntity; ...@@ -12,10 +12,7 @@ import org.springframework.http.ResponseEntity;
import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.GrantedAuthority;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.Collection; import java.util.*;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
@RestController @RestController
@RequestMapping(value = "") @RequestMapping(value = "")
...@@ -38,8 +35,9 @@ public class AppController { ...@@ -38,8 +35,9 @@ public class AppController {
Set<String> appMenu = new HashSet(); Set<String> appMenu = new HashSet();
Set<String> uniRes = new HashSet(); Set<String> uniRes = new HashSet();
AuthenticationUser curUser = AuthenticationUser.getAuthenticationUser();
if(enablePermissionValid){ if(enablePermissionValid){
Collection<GrantedAuthority> authorities=AuthenticationUser.getAuthenticationUser().getAuthorities(); Collection<GrantedAuthority> authorities=curUser.getAuthorities();
Iterator it = authorities.iterator(); Iterator it = authorities.iterator();
while(it.hasNext()) { while(it.hasNext()) {
GrantedAuthority authority = (GrantedAuthority)it.next(); GrantedAuthority authority = (GrantedAuthority)it.next();
...@@ -50,6 +48,10 @@ public class AppController { ...@@ -50,6 +48,10 @@ public class AppController {
appMenu.add(strAuthority.substring(systemId.length()+9)); appMenu.add(strAuthority.substring(systemId.length()+9));
} }
} }
Map<String,Object> context = new HashMap<>();
context.putAll(curUser.getSessionParams());
context.put("srfusername",curUser.getPersonname());
appData.put("context",context);
appData.put("unires",uniRes); appData.put("unires",uniRes);
appData.put("appmenu",appMenu); appData.put("appmenu",appMenu);
appData.put("enablepermissionvalid",enablePermissionValid); appData.put("enablepermissionvalid",enablePermissionValid);
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或