Skip to content

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

Merge remote-tracking branch 'origin/master'

上级 229528a3 55f74a4b
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 2116 行增加 和 926 行删除
app_web/public/assets/json/data-dictionary.json
浏览文件 @ 53a4e0db
...@@ -26,6 +26,41 @@ ...@@ -26,6 +26,41 @@
} }
] ]
}, },
{
"srfkey": "SystemPick",
"emptytext": "未定义",
"codelisttype":"dynamic",
"appdataentity":"",
"appdedataset":"",
"items": []
},
{
"srfkey": "AppType",
"emptytext": "未定义",
"codelisttype":"static",
"items": [
{
"id": "INNER",
"label": "内置应用",
"text": "内置应用",
"data":"",
"codename":"Inner",
"value": "INNER",
"disabled": false
}
, {
"id": "THIRD-PARTY",
"label": "第三方应用",
"text": "第三方应用",
"data":"",
"codename":"Third_SUB_party",
"value": "THIRD-PARTY",
"disabled": false
}
]
},
{ {
"srfkey": "CLAuthCode", "srfkey": "CLAuthCode",
"emptytext": "未定义", "emptytext": "未定义",
......
app_web/src/app-register.ts
浏览文件 @ 53a4e0db
...@@ -77,6 +77,7 @@ import IBizGroupSelect from './components/ibiz-group-select/ibiz-group-select.vu ...@@ -77,6 +77,7 @@ import IBizGroupSelect from './components/ibiz-group-select/ibiz-group-select.vu
import IBizGroupPicker from './components/ibiz-group-picker/ibiz-group-picker.vue' import IBizGroupPicker from './components/ibiz-group-picker/ibiz-group-picker.vue'
import AppWFApproval from './components/app-wf-approval/app-wf-approval.vue' import AppWFApproval from './components/app-wf-approval/app-wf-approval.vue'
import Breadcrumb from './components/app-breadcrumb/app-breadcrumb.vue'; import Breadcrumb from './components/app-breadcrumb/app-breadcrumb.vue';
import AppTransfer from './components/app-transfer/app-transfer.vue'
// 全局挂载UI实体服务注册中心 // 全局挂载UI实体服务注册中心
window['uiServiceRegister'] = uiServiceRegister; window['uiServiceRegister'] = uiServiceRegister;
...@@ -163,5 +164,6 @@ export const AppComponents = { ...@@ -163,5 +164,6 @@ export const AppComponents = {
v.component('ibiz-group-picker',IBizGroupPicker); v.component('ibiz-group-picker',IBizGroupPicker);
v.component('app-wf-approval',AppWFApproval); v.component('app-wf-approval',AppWFApproval);
v.component('app-breadcrumb',Breadcrumb); v.component('app-breadcrumb',Breadcrumb);
v.component('app-transfer',AppTransfer);
}, },
}; };
\ No newline at end of file
app_web/src/codelist/system-pick.ts 0 → 100644
浏览文件 @ 53a4e0db
/**
* 代码表--SystemPick
*
* @export
* @class SystemPick
*/
export default class SystemPick {
/**
* 是否启用缓存
*
* @type boolean
* @memberof SystemPick
*/
public isEnableCache:boolean = true;
/**
* 过期时间
*
* @type any
* @memberof SystemPick
*/
public expirationTime:any;
/**
* 缓存超长时长
*
* @type any
* @memberof SystemPick
*/
public cacheTimeout:any = -1;
/**
* 代码表模型对象
*
* @type any
* @memberof SystemPick
*/
public codelistModel:any = {
codelistid:"SystemPick"
};
/**
* 自定义参数集合
*
* @type any
* @memberof SystemPick
*/
public userParamNames:any ={
}
/**
* 查询参数集合
*
* @type any
* @memberof SystemPick
*/
public queryParamNames:any ={
}
/**
* 获取数据项
*
* @param {*} data
* @param {boolean} [isloading]
* @returns {Promise<any>}
* @memberof SystemPick
*/
public getItems(data: any={}, isloading?: boolean): Promise<any> {
return Promise.reject([]);
}
/**
* 处理查询参数
* @param data 传入data
* @memberof SystemPick
*/
public handleQueryParam(data:any){
let tempData:any = data?JSON.parse(JSON.stringify(data)):{};
if(this.userParamNames && Object.keys(this.userParamNames).length >0){
Object.keys(this.userParamNames).forEach((name: string) => {
if (!name) {
return;
}
let value: string | null = this.userParamNames[name];
if (value && value.startsWith('%') && value.endsWith('%')) {
const key = value.substring(1, value.length - 1);
if (this.codelistModel && this.codelistModel.hasOwnProperty(key)) {
value = (this.codelistModel[key] !== null && this.codelistModel[key] !== undefined) ? this.codelistModel[key] : null;
} else {
value = null;
}
}
Object.assign(tempData, { [name]: value });
});
}
Object.assign(tempData,{page: 0, size: 1000});
if(this.queryParamNames && Object.keys(this.queryParamNames).length > 0){
Object.assign(tempData,this.queryParamNames);
}
return tempData;
}
}
app_web/src/components/app-autocomplete/app-autocomplete.vue
浏览文件 @ 53a4e0db
...@@ -100,12 +100,20 @@ export default class AppAutocomplete extends Vue { ...@@ -100,12 +100,20 @@ export default class AppAutocomplete extends Vue {
@Prop() public name!: string; @Prop() public name!: string;
/** /**
* 编辑器参数 * 局部上下文导航参数
* *
* @type {string} * @type {any}
* @memberof AppAutocomplete * @memberof AppAutocomplete
*/ */
@Prop() public itemParam?: any; @Prop() public localContext!:any;
/**
* 局部导航参数
*
* @type {any}
* @memberof AppAutocomplete
*/
@Prop() public localParam!:any;
/** /**
* 值项名称 * 值项名称
...@@ -119,7 +127,7 @@ export default class AppAutocomplete extends Vue { ...@@ -119,7 +127,7 @@ export default class AppAutocomplete extends Vue {
* 值 * 值
* *
* @type {*} * @type {*}
* @memberof AppPicker * @memberof AppAutocomplete
*/ */
@Model('change') public value?: any; @Model('change') public value?: any;
...@@ -127,7 +135,7 @@ export default class AppAutocomplete extends Vue { ...@@ -127,7 +135,7 @@ export default class AppAutocomplete extends Vue {
* 当前值 * 当前值
* *
* @type {string} * @type {string}
* @memberof AppPicker * @memberof AppAutocomplete
*/ */
public curvalue: string = ''; public curvalue: string = '';
...@@ -160,7 +168,7 @@ export default class AppAutocomplete extends Vue { ...@@ -160,7 +168,7 @@ export default class AppAutocomplete extends Vue {
* *
* @param {*} newVal * @param {*} newVal
* @param {*} oldVal * @param {*} oldVal
* @memberof AppPicker * @memberof AppAutocomplete
*/ */
@Watch('value') @Watch('value')
public onValueChange(newVal: any, oldVal: any) { public onValueChange(newVal: any, oldVal: any) {
...@@ -277,19 +285,19 @@ export default class AppAutocomplete extends Vue { ...@@ -277,19 +285,19 @@ export default class AppAutocomplete extends Vue {
*/ */
public handlePublicParams(arg: any): boolean { public handlePublicParams(arg: any): boolean {
if (!this.data) { if (!this.data) {
this.$Notice.error({ title: (this.$t('components.appPicker.error') as any), desc: (this.$t('components.appPicker.formdataException') as any) }); this.$Notice.error({ title: (this.$t('components.AppAutocomplete.error') as any), desc: (this.$t('components.AppAutocomplete.formdataException') as any) });
return false; return false;
} }
// 合并表单参数 // 合并表单参数
arg.param = this.viewparams ? JSON.parse(JSON.stringify(this.viewparams)) : {}; arg.param = this.viewparams ? JSON.parse(JSON.stringify(this.viewparams)) : {};
arg.context = this.context ? JSON.parse(JSON.stringify(this.context)) : {}; arg.context = this.context ? JSON.parse(JSON.stringify(this.context)) : {};
// 附加参数处理 // 附加参数处理
if (this.itemParam && this.itemParam.context) { if (this.localContext && Object.keys(this.localContext).length >0) {
let _context = this.$util.formatData(this.data,arg.context,this.itemParam.context); let _context = this.$util.computedNavData(this.data,arg.context,arg.param,this.localContext);
Object.assign(arg.context,_context); Object.assign(arg.context,_context);
} }
if (this.itemParam && this.itemParam.param) { if (this.localParam && Object.keys(this.localParam).length >0) {
let _param = this.$util.formatData(this.data,arg.param,this.itemParam.param); let _param = this.$util.computedNavData(this.data,arg.param,arg.param,this.localParam);
Object.assign(arg.param,_param); Object.assign(arg.param,_param);
} }
return true; return true;
......
app_web/src/components/app-checkbox-list/app-checkbox-list.vue
浏览文件 @ 53a4e0db
...@@ -57,23 +57,31 @@ export default class AppCheckBox extends Vue { ...@@ -57,23 +57,31 @@ export default class AppCheckBox extends Vue {
* 传入表单数据 * 传入表单数据
* *
* @type {*} * @type {*}
* @memberof DropDownList * @memberof AppCheckBox
*/ */
@Prop() public data?: any; @Prop() public data?: any;
/** /**
* 传入额外参数 * 局部上下文导航参数
* *
* @type {*} * @type {any}
* @memberof DropDownList * @memberof AppCheckBox
*/
@Prop() public localContext!:any;
/**
* 局部导航参数
*
* @type {any}
* @memberof AppCheckBox
*/ */
@Prop() public itemParam?: any; @Prop() public localParam!:any;
/** /**
* 视图上下文 * 视图上下文
* *
* @type {*} * @type {*}
* @memberof AppAutocomplete * @memberof AppCheckBox
*/ */
@Prop() public context!: any; @Prop() public context!: any;
...@@ -81,7 +89,7 @@ export default class AppCheckBox extends Vue { ...@@ -81,7 +89,7 @@ export default class AppCheckBox extends Vue {
* 视图参数 * 视图参数
* *
* @type {*} * @type {*}
* @memberof AppFormDRUIPart * @memberof AppCheckBox
*/ */
@Prop() public viewparams!: any; @Prop() public viewparams!: any;
...@@ -203,19 +211,19 @@ export default class AppCheckBox extends Vue { ...@@ -203,19 +211,19 @@ export default class AppCheckBox extends Vue {
* *
* @param {*} arg * @param {*} arg
* @returns * @returns
* @memberof DropDownList * @memberof AppCheckBox
*/ */
public handlePublicParams(arg: any) { public handlePublicParams(arg: any) {
// 合并表单参数 // 合并表单参数
arg.param = this.viewparams ? JSON.parse(JSON.stringify(this.viewparams)) : {}; arg.param = this.viewparams ? JSON.parse(JSON.stringify(this.viewparams)) : {};
arg.context = this.context ? JSON.parse(JSON.stringify(this.context)) : {}; arg.context = this.context ? JSON.parse(JSON.stringify(this.context)) : {};
// 附加参数处理 // 附加参数处理
if (this.itemParam && this.itemParam.context) { if (this.localContext && Object.keys(this.localContext).length >0) {
let _context = this.$util.formatData(this.data,arg.context,this.itemParam.context); let _context = this.$util.computedNavData(this.data,arg.context,arg.param,this.localContext);
Object.assign(arg.context,_context); Object.assign(arg.context,_context);
} }
if (this.itemParam && this.itemParam.param) { if (this.localParam && Object.keys(this.localParam).length >0) {
let _param = this.$util.formatData(this.data,arg.param,this.itemParam.param); let _param = this.$util.computedNavData(this.data,arg.param,arg.param,this.localParam);
Object.assign(arg.param,_param); Object.assign(arg.param,_param);
} }
} }
...@@ -253,7 +261,7 @@ export default class AppCheckBox extends Vue { ...@@ -253,7 +261,7 @@ export default class AppCheckBox extends Vue {
/** /**
* 监听表单数据变化 * 监听表单数据变化
* *
* @memberof AppOrgSelect * @memberof AppCheckBox
*/ */
@Watch('data',{immediate:true,deep:true}) @Watch('data',{immediate:true,deep:true})
onDataChange(newVal: any, oldVal: any) { onDataChange(newVal: any, oldVal: any) {
......
app_web/src/components/app-embed-picker/app-embed-picker.vue
浏览文件 @ 53a4e0db
...@@ -62,7 +62,7 @@ export default class AppEmbedPicker extends Vue { ...@@ -62,7 +62,7 @@ export default class AppEmbedPicker extends Vue {
* 表单数据 * 表单数据
* *
* @type {*} * @type {*}
* @memberof AppPicker * @memberof AppEmbedPicker
*/ */
@Prop() public data!: any; @Prop() public data!: any;
...@@ -95,7 +95,7 @@ export default class AppEmbedPicker extends Vue { ...@@ -95,7 +95,7 @@ export default class AppEmbedPicker extends Vue {
* 值项名称 * 值项名称
* *
* @type {string} * @type {string}
* @memberof AppPicker * @memberof AppEmbedPicker
*/ */
@Prop() public valueItem?: string; @Prop() public valueItem?: string;
...@@ -103,7 +103,7 @@ export default class AppEmbedPicker extends Vue { ...@@ -103,7 +103,7 @@ export default class AppEmbedPicker extends Vue {
* 关联视图名称 * 关联视图名称
* *
* @type {string} * @type {string}
* @memberof AppPicker * @memberof AppEmbedPicker
*/ */
@Prop() public refviewname?: string; @Prop() public refviewname?: string;
...@@ -127,17 +127,25 @@ export default class AppEmbedPicker extends Vue { ...@@ -127,17 +127,25 @@ export default class AppEmbedPicker extends Vue {
* 属性项名称 * 属性项名称
* *
* @type {string} * @type {string}
* @memberof AppPicker * @memberof AppEmbedPicker
*/ */
@Prop() public name!: string; @Prop() public name!: string;
/** /**
* 关联视图参数 * 局部上下文导航参数
* *
* @type {*} * @type {any}
* @memberof AppEmbedPicker * @memberof AppEmbedPicker
*/ */
@Prop() public itemParam: any; @Prop() public localContext!:any;
/**
* 局部导航参数
*
* @type {any}
* @memberof AppEmbedPicker
*/
@Prop() public localParam!:any;
/** /**
* 是否忽略之变化 * 是否忽略之变化
...@@ -160,8 +168,8 @@ export default class AppEmbedPicker extends Vue { ...@@ -160,8 +168,8 @@ export default class AppEmbedPicker extends Vue {
* *
* @memberof AppEmbedPicker * @memberof AppEmbedPicker
*/ */
public setViewParam(activeData: any) { public setViewParam() {
if (!this.itemParam || !activeData) { if (!this.data) {
return; return;
} }
let arg: any = {}; let arg: any = {};
...@@ -169,17 +177,13 @@ export default class AppEmbedPicker extends Vue { ...@@ -169,17 +177,13 @@ export default class AppEmbedPicker extends Vue {
let param: any = JSON.parse(JSON.stringify(this.viewparams)); let param: any = JSON.parse(JSON.stringify(this.viewparams));
let context: any = JSON.parse(JSON.stringify(this.context)); let context: any = JSON.parse(JSON.stringify(this.context));
// 附加参数处理 // 附加参数处理
if (this.itemParam.context) { if (this.localContext && Object.keys(this.localContext).length >0) {
let _context = this.$util.formatData(activeData,context,this.itemParam.context); let _context = this.$util.computedNavData(this.data,arg.context,arg.param,this.localContext);
Object.assign(context,_context); Object.assign(arg.context,_context);
}
if (this.itemParam.param) {
let _param = this.$util.formatData(activeData,param,this.itemParam.param);
Object.assign(param,_param);
} }
if (this.itemParam.parentdata) { if (this.localParam && Object.keys(this.localParam).length >0) {
let _parentdata = this.$util.formatData(activeData,param,this.itemParam.parentdata); let _param = this.$util.computedNavData(this.data,arg.param,arg.param,this.localParam);
Object.assign(param,_parentdata); Object.assign(arg.param,_param);
} }
this.viewdata = JSON.stringify(context); this.viewdata = JSON.stringify(context);
this.viewparam = JSON.stringify(param); this.viewparam = JSON.stringify(param);
...@@ -196,7 +200,7 @@ export default class AppEmbedPicker extends Vue { ...@@ -196,7 +200,7 @@ export default class AppEmbedPicker extends Vue {
onActivedataChange(newVal: any, oldVal: any) { onActivedataChange(newVal: any, oldVal: any) {
const newFormData: any = JSON.parse(newVal); const newFormData: any = JSON.parse(newVal);
const oldDormData: any = JSON.parse(oldVal); const oldDormData: any = JSON.parse(oldVal);
this.setViewParam(newFormData); this.setViewParam();
if (!this.refreshitems || this.ignorefieldvaluechange) { if (!this.refreshitems || this.ignorefieldvaluechange) {
return; return;
} }
...@@ -215,7 +219,7 @@ export default class AppEmbedPicker extends Vue { ...@@ -215,7 +219,7 @@ export default class AppEmbedPicker extends Vue {
if(this.formState) { if(this.formState) {
this.formStateEvent = this.formState.subscribe(({ tag, action, data }) => { this.formStateEvent = this.formState.subscribe(({ tag, action, data }) => {
if (Object.is('load', action)) { if (Object.is('load', action)) {
this.setViewParam(JSON.parse(this.data)); this.setViewParam();
} }
}); });
} }
......
app_web/src/components/app-form-druipart/app-form-druipart.vue
浏览文件 @ 53a4e0db
...@@ -3,7 +3,8 @@ ...@@ -3,7 +3,8 @@
<component <component
:is="viewname" :is="viewname"
class="viewcontainer2" class="viewcontainer2"
:viewdata ="viewdata" :viewdata ="viewdata"
:viewparam="viewparam"
:viewDefaultUsage="false" :viewDefaultUsage="false"
:formDruipart="formDruipart" :formDruipart="formDruipart"
:isformDruipart="true" :isformDruipart="true"
...@@ -119,6 +120,22 @@ export default class AppFormDRUIPart extends Vue { ...@@ -119,6 +120,22 @@ export default class AppFormDRUIPart extends Vue {
*/ */
@Prop() public viewparams!: any; @Prop() public viewparams!: any;
/**
* 局部上下文
*
* @type {*}
* @memberof AppFormDRUIPart
*/
@Prop() public localContext!:any;
/**
* 局部参数
*
* @type {*}
* @memberof AppFormDRUIPart
*/
@Prop() public localParam!:any;
/** /**
* 应用实体参数名称 * 应用实体参数名称
* *
...@@ -240,21 +257,32 @@ export default class AppFormDRUIPart extends Vue { ...@@ -240,21 +257,32 @@ export default class AppFormDRUIPart extends Vue {
} }
const formData: any = data?data:JSON.parse(this.data); const formData: any = data?data:JSON.parse(this.data);
const _paramitem = formData[this.paramItem]; const _paramitem = formData[this.paramItem];
let viewdata = {}; let tempContext:any = {};
Object.assign(viewdata, this.$viewTool.getIndexViewParam()); let tempParam:any = {};
Object.assign(tempContext, this.$viewTool.getIndexViewParam());
const _parameters: any[] = [...this.$viewTool.getIndexParameters(), ...this.parameters]; const _parameters: any[] = [...this.$viewTool.getIndexParameters(), ...this.parameters];
_parameters.forEach((parameter: any) => { _parameters.forEach((parameter: any) => {
const { pathName, parameterName }: { pathName: string, parameterName: string } = parameter; const { pathName, parameterName }: { pathName: string, parameterName: string } = parameter;
if (formData[parameterName] && !Object.is(formData[parameterName], '')) { if (formData[parameterName] && !Object.is(formData[parameterName], '')) {
Object.assign(viewdata, { [parameterName]: formData[parameterName] }); Object.assign(tempContext, { [parameterName]: formData[parameterName] });
} }
}); });
Object.assign(viewdata, { [this.paramItem]: _paramitem }); Object.assign(tempContext, { [this.paramItem]: _paramitem });
//设置顶层视图唯一标识 //设置顶层视图唯一标识
Object.assign(viewdata,this.context); Object.assign(tempContext,this.context);
Object.assign(viewdata,{srfparentdename:this.parentName,srfparentkey:_paramitem}); Object.assign(tempContext,{srfparentdename:this.parentName,srfparentkey:_paramitem});
this.viewdata = JSON.stringify(viewdata); // 设置局部上下文
this.viewparam = JSON.stringify(this.viewparams); if(this.localContext && Object.keys(this.localContext).length >0){
let _context:any = this.$util.computedNavData(formData,tempContext,this.viewparams,this.localContext);
Object.assign(tempContext,_context);
}
this.viewdata = JSON.stringify(tempContext);
// 设置局部参数
if(this.localParam && Object.keys(this.localParam).length >0){
let _param:any = this.$util.computedNavData(formData,tempContext,this.viewparams,this.localParam);
Object.assign(tempParam,_param);
}
this.viewparam = JSON.stringify(tempParam);
if (this.isRelationalData) { if (this.isRelationalData) {
if (!_paramitem || _paramitem == null || Object.is(_paramitem, '')) { if (!_paramitem || _paramitem == null || Object.is(_paramitem, '')) {
this.blockUIStart(); this.blockUIStart();
......
app_web/src/components/app-mpicker/app-mpicker.vue
浏览文件 @ 53a4e0db
...@@ -45,12 +45,20 @@ export default class AppMpicker extends Vue { ...@@ -45,12 +45,20 @@ export default class AppMpicker extends Vue {
@Prop() curvalue?: any; @Prop() curvalue?: any;
/** /**
* 表单项参数 * 局部上下文导航参数
* *
* @type {any} * @type {any}
* @memberof AppPicker * @memberof AppMpicker
*/
@Prop() public localContext!:any;
/**
* 局部导航参数
*
* @type {any}
* @memberof AppMpicker
*/ */
@Prop() public itemParam: any; @Prop() public localParam!:any;
/** /**
* 表单项名称 * 表单项名称
...@@ -61,7 +69,7 @@ export default class AppMpicker extends Vue { ...@@ -61,7 +69,7 @@ export default class AppMpicker extends Vue {
* 视图上下文 * 视图上下文
* *
* @type {*} * @type {*}
* @memberof AppFormDRUIPart * @memberof AppMpicker
*/ */
@Prop() public context!: any; @Prop() public context!: any;
...@@ -69,7 +77,7 @@ export default class AppMpicker extends Vue { ...@@ -69,7 +77,7 @@ export default class AppMpicker extends Vue {
* 视图参数 * 视图参数
* *
* @type {*} * @type {*}
* @memberof AppFormDRUIPart * @memberof AppMpicker
*/ */
@Prop() public viewparams!: any; @Prop() public viewparams!: any;
...@@ -77,7 +85,7 @@ export default class AppMpicker extends Vue { ...@@ -77,7 +85,7 @@ export default class AppMpicker extends Vue {
* AC参数 * AC参数
* *
* @type {*} * @type {*}
* @memberof AppFormDRUIPart * @memberof AppMpicker
*/ */
@Prop({default: () => {}}) public acParams?: any; @Prop({default: () => {}}) public acParams?: any;
...@@ -85,7 +93,7 @@ export default class AppMpicker extends Vue { ...@@ -85,7 +93,7 @@ export default class AppMpicker extends Vue {
* 应用实体主信息属性名称 * 应用实体主信息属性名称
* *
* @type {string} * @type {string}
* @memberof AppAutocomplete * @memberof AppMpicker
*/ */
@Prop({default: 'srfmajortext'}) public deMajorField!: string; @Prop({default: 'srfmajortext'}) public deMajorField!: string;
...@@ -93,7 +101,7 @@ export default class AppMpicker extends Vue { ...@@ -93,7 +101,7 @@ export default class AppMpicker extends Vue {
* 应用实体主键属性名称 * 应用实体主键属性名称
* *
* @type {string} * @type {string}
* @memberof AppAutocomplete * @memberof AppMpicker
*/ */
@Prop({default: 'srfkey'}) public deKeyField!: string; @Prop({default: 'srfkey'}) public deKeyField!: string;
...@@ -101,7 +109,7 @@ export default class AppMpicker extends Vue { ...@@ -101,7 +109,7 @@ export default class AppMpicker extends Vue {
* 表单服务 * 表单服务
* *
* @type {*} * @type {*}
* @memberof AppFormDRUIPart * @memberof AppMpicker
*/ */
@Prop() public service?: any; @Prop() public service?: any;
...@@ -242,19 +250,19 @@ export default class AppMpicker extends Vue { ...@@ -242,19 +250,19 @@ export default class AppMpicker extends Vue {
*/ */
public handlePublicParams(arg: any): boolean { public handlePublicParams(arg: any): boolean {
if (!this.activeData) { if (!this.activeData) {
this.$Notice.error({ title: (this.$t('components.appPicker.error') as any), desc: (this.$t('components.appPicker.formdataException') as any) }); this.$Notice.error({ title: (this.$t('components.AppMpicker.error') as any), desc: (this.$t('components.AppMpicker.formdataException') as any) });
return false; return false;
} }
// 合并表单参数 // 合并表单参数
arg.param = this.viewparams ? JSON.parse(JSON.stringify(this.viewparams)) : {}; arg.param = this.viewparams ? JSON.parse(JSON.stringify(this.viewparams)) : {};
arg.context = this.context ? JSON.parse(JSON.stringify(this.context)) : {}; arg.context = this.context ? JSON.parse(JSON.stringify(this.context)) : {};
// 附加参数处理 // 附加参数处理
if (this.itemParam && this.itemParam.context) { if (this.localContext && Object.keys(this.localContext).length >0) {
let _context = this.$util.formatData(this.activeData,arg.context,this.itemParam.context); let _context = this.$util.computedNavData(this.activeData,arg.context,arg.param,this.localContext);
Object.assign(arg.context,_context); Object.assign(arg.context,_context);
} }
if (this.itemParam && this.itemParam.param) { if (this.localParam && Object.keys(this.localParam).length >0) {
let _param = this.$util.formatData(this.activeData,arg.param,this.itemParam.param); let _param = this.$util.computedNavData(this.activeData,arg.param,arg.param,this.localParam);
Object.assign(arg.param,_param); Object.assign(arg.param,_param);
} }
return true; return true;
......
app_web/src/components/app-picker/app-picker.vue
浏览文件 @ 53a4e0db
...@@ -153,12 +153,20 @@ export default class AppPicker extends Vue { ...@@ -153,12 +153,20 @@ export default class AppPicker extends Vue {
@Prop() public linkview?: any; @Prop() public linkview?: any;
/** /**
* 表单项参数 * 局部上下文导航参数
* *
* @type {any} * @type {any}
* @memberof AppPicker * @memberof AppPicker
*/ */
@Prop() public itemParam: any; @Prop() public localContext!:any;
/**
* 局部导航参数
*
* @type {any}
* @memberof AppPicker
*/
@Prop() public localParam!:any;
/** /**
* 值项名称 * 值项名称
...@@ -639,9 +647,6 @@ export default class AppPicker extends Vue { ...@@ -639,9 +647,6 @@ export default class AppPicker extends Vue {
* @memberof AppPicker * @memberof AppPicker
*/ */
public handlePublicParams(arg: any): boolean { public handlePublicParams(arg: any): boolean {
if (!this.itemParam) {
return true;
}
if (!this.data) { if (!this.data) {
this.$Notice.error({ title: (this.$t('components.appPicker.error') as any), desc: (this.$t('components.appPicker.formdataException') as any) }); this.$Notice.error({ title: (this.$t('components.appPicker.error') as any), desc: (this.$t('components.appPicker.formdataException') as any) });
return false; return false;
...@@ -650,12 +655,12 @@ export default class AppPicker extends Vue { ...@@ -650,12 +655,12 @@ export default class AppPicker extends Vue {
arg.param = this.viewparams ? JSON.parse(JSON.stringify(this.viewparams)) : {}; arg.param = this.viewparams ? JSON.parse(JSON.stringify(this.viewparams)) : {};
arg.context = this.context ? JSON.parse(JSON.stringify(this.context)) : {}; arg.context = this.context ? JSON.parse(JSON.stringify(this.context)) : {};
// 附加参数处理 // 附加参数处理
if (this.itemParam && this.itemParam.context) { if (this.localContext && Object.keys(this.localContext).length >0) {
let _context = this.$util.formatData(this.data,arg.context,this.itemParam.context); let _context = this.$util.computedNavData(this.data,arg.context,arg.param,this.localContext);
Object.assign(arg.context,_context); Object.assign(arg.context,_context);
} }
if (this.itemParam && this.itemParam.param) { if (this.localParam && Object.keys(this.localParam).length >0) {
let _param = this.$util.formatData(this.data,arg.param,this.itemParam.param); let _param = this.$util.computedNavData(this.data,arg.param,arg.param,this.localParam);
Object.assign(arg.param,_param); Object.assign(arg.param,_param);
} }
return true; return true;
......
app_web/src/components/app-radio-group/app-radio-group.vue
浏览文件 @ 53a4e0db
...@@ -65,14 +65,14 @@ export default class AppRadioGroup extends Vue { ...@@ -65,14 +65,14 @@ export default class AppRadioGroup extends Vue {
* 传入表单数据 * 传入表单数据
* *
* @type {*} * @type {*}
* @memberof DropDownList * @memberof AppRadioGroup
*/ */
@Prop() public data?: any; @Prop() public data?: any;
/** /**
* 监听表单数据变化 * 监听表单数据变化
* *
* @memberof AppOrgSelect * @memberof AppRadioGroup
*/ */
@Watch('data',{immediate:true,deep:true}) @Watch('data',{immediate:true,deep:true})
onDataChange(newVal: any, oldVal: any) { onDataChange(newVal: any, oldVal: any) {
...@@ -103,18 +103,26 @@ export default class AppRadioGroup extends Vue { ...@@ -103,18 +103,26 @@ export default class AppRadioGroup extends Vue {
@Prop() public disabled?: boolean; @Prop() public disabled?: boolean;
/** /**
* 传入额外参数 * 局部上下文导航参数
* *
* @type {*} * @type {any}
* @memberof DropDownList * @memberof AppRadioGroup
*/
@Prop() public localContext!:any;
/**
* 局部导航参数
*
* @type {any}
* @memberof AppRadioGroup
*/ */
@Prop() public itemParam?: any; @Prop() public localParam!:any;
/** /**
* 视图上下文 * 视图上下文
* *
* @type {*} * @type {*}
* @memberof AppAutocomplete * @memberof AppRadioGroup
*/ */
@Prop() public context!: any; @Prop() public context!: any;
...@@ -122,7 +130,7 @@ export default class AppRadioGroup extends Vue { ...@@ -122,7 +130,7 @@ export default class AppRadioGroup extends Vue {
* 视图参数 * 视图参数
* *
* @type {*} * @type {*}
* @memberof AppFormDRUIPart * @memberof AppRadioGroup
*/ */
@Prop() public viewparams!: any; @Prop() public viewparams!: any;
...@@ -161,19 +169,19 @@ export default class AppRadioGroup extends Vue { ...@@ -161,19 +169,19 @@ export default class AppRadioGroup extends Vue {
* *
* @param {*} arg * @param {*} arg
* @returns * @returns
* @memberof DropDownList * @memberof AppRadioGroup
*/ */
public handlePublicParams(arg: any) { public handlePublicParams(arg: any) {
// 合并表单参数 // 合并表单参数
arg.param = this.viewparams ? JSON.parse(JSON.stringify(this.viewparams)) : {}; arg.param = this.viewparams ? JSON.parse(JSON.stringify(this.viewparams)) : {};
arg.context = this.context ? JSON.parse(JSON.stringify(this.context)) : {}; arg.context = this.context ? JSON.parse(JSON.stringify(this.context)) : {};
// 附加参数处理 // 附加参数处理
if (this.itemParam && this.itemParam.context) { if (this.localContext && Object.keys(this.localContext).length >0) {
let _context = this.$util.formatData(this.data,arg.context,this.itemParam.context); let _context = this.$util.computedNavData(this.data,arg.context,arg.param,this.localContext);
Object.assign(arg.context,_context); Object.assign(arg.context,_context);
} }
if (this.itemParam && this.itemParam.param) { if (this.localParam && Object.keys(this.localParam).length >0) {
let _param = this.$util.formatData(this.data,arg.param,this.itemParam.param); let _param = this.$util.computedNavData(this.data,arg.param,arg.param,this.localParam);
Object.assign(arg.param,_param); Object.assign(arg.param,_param);
} }
} }
......
app_web/src/components/app-span/app-span.vue
浏览文件 @ 53a4e0db
<template> <template>
<codelist v-if="tag" :tag="tag" :value="value" :codelistType="codelistType" :renderMode="renderMode" :valueSeparator="valueSeparator" :textSeparator="textSeparator" :data="data" :itemParam="itemParam" :context="context" :viewparams="viewparams"></codelist> <codelist v-if="tag" :tag="tag" :value="value" :codelistType="codelistType" :renderMode="renderMode" :valueSeparator="valueSeparator" :textSeparator="textSeparator" :data="data" :localContext="localContext" :localParam="localParam" :context="context" :viewparams="viewparams"></codelist>
<app-upload-file-info v-else-if="Object.is(this.editorType,'PICTURE') || Object.is(this.editorType,'PICTURE_ONE') || Object.is(this.editorType,'FILEUPLOADER')" :value="value" :name="name"></app-upload-file-info> <app-upload-file-info v-else-if="Object.is(this.editorType,'PICTURE') || Object.is(this.editorType,'PICTURE_ONE') || Object.is(this.editorType,'FILEUPLOADER')" :value="value" :name="name"></app-upload-file-info>
<span class="app-span" v-else >{{text}}</span> <span class="app-span" v-else >{{text}}</span>
</template> </template>
...@@ -72,12 +72,20 @@ export default class AppSpan extends Vue { ...@@ -72,12 +72,20 @@ export default class AppSpan extends Vue {
@Prop() public data?: any; @Prop() public data?: any;
/** /**
* 传入额外参数 * 局部上下文导航参数
* *
* @type {*} * @type {any}
* @memberof AppSpan * @memberof AppSpan
*/ */
@Prop() public itemParam?: any; @Prop() public localContext!:any;
/**
* 局部导航参数
*
* @type {any}
* @memberof AppSpan
*/
@Prop() public localParam!:any;
/** /**
* 视图上下文 * 视图上下文
...@@ -137,9 +145,8 @@ export default class AppSpan extends Vue { ...@@ -137,9 +145,8 @@ export default class AppSpan extends Vue {
* @memberof AppSpan * @memberof AppSpan
*/ */
public load(){ public load(){
if(!this.value || this.tag){ if(this.tag){
return; //代码表走codelist组件 return; //代码表走codelist组件
}else if(this.editorType === "ADDRESSPICKUP"){ }else if(this.editorType === "ADDRESSPICKUP"){
JSON.parse(this.value).forEach((item:any,index:number) => { JSON.parse(this.value).forEach((item:any,index:number) => {
this.text += index === 0 ? item.srfmajortext : ","+item.srfmajortext; this.text += index === 0 ? item.srfmajortext : ","+item.srfmajortext;
......
app_web/src/components/app-transfer/app-transfer.less 0 → 100644
浏览文件 @ 53a4e0db
.ivu-select-dropdown {
padding: 0px;
.hidden {
display: none;
}
}
\ No newline at end of file
app_web/src/components/app-transfer/app-transfer.vue 0 → 100644
浏览文件 @ 53a4e0db
<template>
<Select v-model="dataRight" style="width:586px" multiple>
<Option
class="hidden"
:value="item"
v-for="(item,i) in dataRight"
:key="i"
>{{dataLeft[item-1].label}}</Option>
<el-transfer v-model="dataRight" :data="dataLeft" @change="dataChange" :titles="['未选择', '已选择']"></el-transfer>
</Select>
</template>
<script lang="ts">
import { Vue, Component, Watch, Prop, Model } from "vue-property-decorator";
import CodeListService from "@service/app/codelist-service";
@Component({})
export default class AppTransfer extends Vue {
/**
* 表单传递右侧框中的数据
*/
@Prop() public data?: any;
/**
* 左侧框数据
*/
public dataLeft: any[] = [];
/**
* 右侧框数据
*/
public dataRight: any[] = [];
/**
* 代码表服务对象
*
* @type {CodeListService}
* @memberof AppTransfer
*/
public codeListService: CodeListService = new CodeListService({
$store: this.$store
});
/**
* 额外参数
*
* @type {*}
* @memberof AppTransfer
*/
public otherParam: any;
/**
* 查询参数
* @type {*}
* @memberof AppTransfer
*/
public queryParam: any;
/**
* 当前选中值
* @type {any}
* @memberof AppTransfer
*/
@Model("change") readonly itemValue!: any;
/**
* 代码表标识
*
* @type {string}
* @memberof AppTransfer
*/
@Prop() public tag?: string;
/**
* 代码表类型
*
* @type {string}
* @memberof AppTransfer
*/
@Prop() public codelistType?: string;
/**
* 监听表单数据
*
* @memberof AppTransfer
*/
@Watch("data", { deep: true })
onDataChange(newVal: any, val: any) {
if (newVal) {
}
}
/**
* 组件change事件,右侧框数据变化时
* @memberof AppTransfer
*/
dataChange(e: any) {
console.log(e);
let val: any[] = [];
let newVal: any;
this.dataLeft.forEach((elem: any) => {
e.forEach((item: any) => {
if (elem.key === item) val.push(elem.value);
});
});
newVal = val.join(",");
console.log(newVal, typeof newVal);
if (newVal) this.$emit("change", newVal);
}
/**
* 传入额外参数
*
* @type {*}
* @memberof AppTransfer
*/
@Prop() public itemParam?: any;
/**
* 视图上下文
*
* @type {*}
* @memberof AppAutocomplete
*/
@Prop() public context!: any;
/**
* 视图参数
*
* @type {*}
* @memberof AppFormDRUIPart
*/
@Prop() public viewparams!: any;
/**
* 是否禁用
* @type {any}
* @memberof AppTransfer
*
*/
@Prop() public disabled?: any;
/**
* 是否支持过滤
* @type {boolean}
* @memberof AppTransfer
*/
@Prop() public filterable?: boolean;
/**
* 下拉选提示内容
* @type {string}
* @memberof AppTransfer
*/
@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 生命周期
*
* @memberof AppTransfer
*/
public created() {
this.dataHandle();
}
/**
* 数据处理
*/
public dataHandle() {
if (this.tag && Object.is(this.codelistType, "STATIC")) {
const codelist = this.$store.getters.getCodeList(this.tag);
if (codelist) {
this.dataLeft = [...JSON.parse(JSON.stringify(codelist.items))];
this.initLeft();
this.initRight();
console.log(this.dataLeft);
console.log(this.dataRight);
} else {
console.log(`----${this.tag}----代码表不存在`);
}
} else if (this.tag && Object.is(this.codelistType, "DYNAMIC")) {
// 公共参数处理
let data: any = {};
this.handlePublicParams(data);
// 参数处理
let _context = data.context;
let _param = data.param;
this.codeListService
.getItems(this.tag, _context, _param)
.then((res: any) => {
this.dataLeft = res;
console.log(this.dataLeft);
this.initLeft();
this.initRight();
})
.catch((error: any) => {
console.log(`----${this.tag}----代码表不存在`);
});
}
}
/**
* 初始化左侧框数据
*/
public initLeft() {
let left: any[] = [];
Object.assign(left, this.dataLeft);
this.dataLeft = [];
left.forEach((elem: any, i: any) => {
this.dataLeft.push({
key: i + 1,
id: elem.id,
value: elem.value,
label: elem.label,
disabled: elem.disabled
});
});
}
/**
* 初始化右侧框数据
*/
public initRight() {
let _data: string = this.data;
console.log(_data);
if (_data) {
let newData: any[] = _data.split(",");
this.dataLeft.forEach((elem: any) => {
newData.forEach((item: any) => {
if (item === elem.value) {
this.dataRight.push(elem.key);
}
});
});
}
}
}
</script>
<style lang='less'>
@import "./app-transfer.less";
</style>
\ No newline at end of file
app_web/src/components/app-tree-picker/app-tree-picker.vue
浏览文件 @ 53a4e0db
...@@ -36,7 +36,7 @@ export default class AppTreePicker extends Vue { ...@@ -36,7 +36,7 @@ export default class AppTreePicker extends Vue {
* 视图上下文 * 视图上下文
* *
* @type {*} * @type {*}
* @memberof AppFormDRUIPart * @memberof AppTreePicker
*/ */
@Prop() public context!: any; @Prop() public context!: any;
...@@ -44,7 +44,7 @@ export default class AppTreePicker extends Vue { ...@@ -44,7 +44,7 @@ export default class AppTreePicker extends Vue {
* 视图参数 * 视图参数
* *
* @type {*} * @type {*}
* @memberof AppFormDRUIPart * @memberof AppTreePicker
*/ */
@Prop() public viewparams!: any; @Prop() public viewparams!: any;
...@@ -52,7 +52,7 @@ export default class AppTreePicker extends Vue { ...@@ -52,7 +52,7 @@ export default class AppTreePicker extends Vue {
* 表单数据 * 表单数据
* *
* @type {*} * @type {*}
* @memberof AppPicker * @memberof AppTreePicker
*/ */
@Prop() public data!: any; @Prop() public data!: any;
...@@ -68,7 +68,7 @@ export default class AppTreePicker extends Vue { ...@@ -68,7 +68,7 @@ export default class AppTreePicker extends Vue {
* 是否启用 * 是否启用
* *
* @type {boolean} * @type {boolean}
* @memberof AppPicker * @memberof AppTreePicker
*/ */
@Prop({default: false}) public disabled!: boolean; @Prop({default: false}) public disabled!: boolean;
...@@ -101,7 +101,7 @@ export default class AppTreePicker extends Vue { ...@@ -101,7 +101,7 @@ export default class AppTreePicker extends Vue {
* 值项名称 * 值项名称
* *
* @type {string} * @type {string}
* @memberof AppPicker * @memberof AppTreePicker
*/ */
@Prop() public valueItem?: string; @Prop() public valueItem?: string;
...@@ -109,7 +109,7 @@ export default class AppTreePicker extends Vue { ...@@ -109,7 +109,7 @@ export default class AppTreePicker extends Vue {
* 关联视图名称 * 关联视图名称
* *
* @type {string} * @type {string}
* @memberof AppPicker * @memberof AppTreePicker
*/ */
@Prop() public refviewname?: string; @Prop() public refviewname?: string;
...@@ -125,17 +125,25 @@ export default class AppTreePicker extends Vue { ...@@ -125,17 +125,25 @@ export default class AppTreePicker extends Vue {
* 属性项名称 * 属性项名称
* *
* @type {string} * @type {string}
* @memberof AppPicker * @memberof AppTreePicker
*/ */
@Prop() public name!: string; @Prop() public name!: string;
/** /**
* 关联视图参数 * 局部上下文导航参数
* *
* @type {*} * @type {any}
* @memberof AppTreePicker * @memberof AppTreePicker
*/ */
@Prop() public itemParam: any; @Prop() public localContext!:any;
/**
* 局部导航参数
*
* @type {any}
* @memberof AppTreePicker
*/
@Prop() public localParam!:any;
/** /**
* 是否忽略之变化 * 是否忽略之变化
...@@ -210,8 +218,8 @@ export default class AppTreePicker extends Vue { ...@@ -210,8 +218,8 @@ export default class AppTreePicker extends Vue {
* *
* @memberof AppTreePicker * @memberof AppTreePicker
*/ */
public setViewParam(activeData: any) { public setViewParam() {
if (!this.itemParam || !activeData) { if (!this.data) {
return; return;
} }
let arg: any = {}; let arg: any = {};
...@@ -219,17 +227,13 @@ export default class AppTreePicker extends Vue { ...@@ -219,17 +227,13 @@ export default class AppTreePicker extends Vue {
let param: any = JSON.parse(JSON.stringify(this.viewparams)); let param: any = JSON.parse(JSON.stringify(this.viewparams));
let context: any = JSON.parse(JSON.stringify(this.context)); let context: any = JSON.parse(JSON.stringify(this.context));
// 附加参数处理 // 附加参数处理
if (this.itemParam.context) { if (this.localContext && Object.keys(this.localContext).length >0) {
let _context = this.$util.formatData(activeData,context,this.itemParam.context); let _context = this.$util.computedNavData(this.data,arg.context,arg.param,this.localContext);
Object.assign(context,_context); Object.assign(arg.context,_context);
} }
if (this.itemParam.param) { if (this.localParam && Object.keys(this.localParam).length >0) {
let _param = this.$util.formatData(activeData,param,this.itemParam.param); let _param = this.$util.computedNavData(this.data,arg.param,arg.param,this.localParam);
Object.assign(param,_param); Object.assign(arg.param,_param);
}
if (this.itemParam.parentdata) {
let _parentdata = this.$util.formatData(activeData,param,this.itemParam.parentdata);
Object.assign(param,_parentdata);
} }
this.viewdata = JSON.stringify(context); this.viewdata = JSON.stringify(context);
this.viewparam = JSON.stringify(param); this.viewparam = JSON.stringify(param);
...@@ -240,13 +244,13 @@ export default class AppTreePicker extends Vue { ...@@ -240,13 +244,13 @@ export default class AppTreePicker extends Vue {
* *
* @param {*} newVal * @param {*} newVal
* @param {*} oldVal * @param {*} oldVal
* @memberof AppFormDRUIPart * @memberof AppTreePicker
*/ */
@Watch('data') @Watch('data')
onActivedataChange(newVal: any, oldVal: any) { onActivedataChange(newVal: any, oldVal: any) {
const newFormData: any = JSON.parse(newVal); const newFormData: any = JSON.parse(newVal);
const oldDormData: any = JSON.parse(oldVal); const oldDormData: any = JSON.parse(oldVal);
this.setViewParam(newFormData); this.setViewParam();
if (!this.refreshitems || this.ignorefieldvaluechange) { if (!this.refreshitems || this.ignorefieldvaluechange) {
return; return;
} }
...@@ -261,7 +265,7 @@ export default class AppTreePicker extends Vue { ...@@ -261,7 +265,7 @@ export default class AppTreePicker extends Vue {
* *
* @param {*} newVal * @param {*} newVal
* @param {*} oldVal * @param {*} oldVal
* @memberof AppPicker * @memberof AppTreePicker
*/ */
@Watch('value') @Watch('value')
public onValueChange(newVal: any, oldVal: any) { public onValueChange(newVal: any, oldVal: any) {
...@@ -277,7 +281,7 @@ export default class AppTreePicker extends Vue { ...@@ -277,7 +281,7 @@ export default class AppTreePicker extends Vue {
if(this.formState) { if(this.formState) {
this.formStateEvent = this.formState.subscribe(({ tag, action, data }) => { this.formStateEvent = this.formState.subscribe(({ tag, action, data }) => {
if (Object.is('load', action)) { if (Object.is('load', action)) {
this.setViewParam(JSON.parse(this.data)); this.setViewParam();
} }
}); });
} }
...@@ -286,7 +290,7 @@ export default class AppTreePicker extends Vue { ...@@ -286,7 +290,7 @@ export default class AppTreePicker extends Vue {
/** /**
* vue 生命周期 * vue 生命周期
* *
* @memberof SelectType * @memberof AppTreePicker
*/ */
public destroyed() { public destroyed() {
if (this.formStateEvent) { if (this.formStateEvent) {
......
app_web/src/components/codelist/codelist.vue
浏览文件 @ 53a4e0db
...@@ -79,12 +79,20 @@ export default class CodeList extends Vue { ...@@ -79,12 +79,20 @@ export default class CodeList extends Vue {
@Prop() public data?: any; @Prop() public data?: any;
/** /**
* 传入额外参数 * 局部上下文导航参数
* *
* @type {*} * @type {any}
* @memberof CodeList
*/
@Prop() public localContext!:any;
/**
* 局部导航参数
*
* @type {any}
* @memberof CodeList * @memberof CodeList
*/ */
@Prop() public itemParam?: any; @Prop() public localParam!:any;
/** /**
* 视图上下文 * 视图上下文
...@@ -270,12 +278,12 @@ export default class CodeList extends Vue { ...@@ -270,12 +278,12 @@ export default class CodeList extends Vue {
arg.param = this.viewparams ? JSON.parse(JSON.stringify(this.viewparams)) : {}; arg.param = this.viewparams ? JSON.parse(JSON.stringify(this.viewparams)) : {};
arg.context = this.context ? JSON.parse(JSON.stringify(this.context)) : {}; arg.context = this.context ? JSON.parse(JSON.stringify(this.context)) : {};
// 附加参数处理 // 附加参数处理
if (this.itemParam && this.itemParam.context) { if (this.localContext && Object.keys(this.localContext).length >0) {
let _context = this.$util.formatData(this.data,arg.context,this.itemParam.context); let _context = this.$util.computedNavData(this.data,arg.context,arg.param,this.localContext);
Object.assign(arg.context,_context); Object.assign(arg.context,_context);
} }
if (this.itemParam && this.itemParam.param) { if (this.localParam && Object.keys(this.localParam).length >0) {
let _param = this.$util.formatData(this.data,arg.param,this.itemParam.param); let _param = this.$util.computedNavData(this.data,arg.param,arg.param,this.localParam);
Object.assign(arg.param,_param); Object.assign(arg.param,_param);
} }
} }
......
app_web/src/components/dropdown-list-dynamic/dropdown-list-dynamic.vue
浏览文件 @ 53a4e0db
...@@ -86,12 +86,20 @@ export default class DropDownListDynamic extends Vue { ...@@ -86,12 +86,20 @@ export default class DropDownListDynamic extends Vue {
} }
/** /**
* 传入额外参数 * 局部上下文导航参数
* *
* @type {*} * @type {*}
* @memberof DropDownListDynamic * @memberof DropDownList
*/
@Prop() public localContext!:any;
/**
* 局部导航参数
*
* @type {*}
* @memberof DropDownList
*/ */
@Prop() public itemParam?: any; @Prop() public localParam!:any;
/** /**
* 是否禁用 * 是否禁用
...@@ -172,12 +180,12 @@ export default class DropDownListDynamic extends Vue { ...@@ -172,12 +180,12 @@ export default class DropDownListDynamic extends Vue {
arg.param = this.viewparams ? JSON.parse(JSON.stringify(this.viewparams)) : {}; arg.param = this.viewparams ? JSON.parse(JSON.stringify(this.viewparams)) : {};
arg.context = this.context ? JSON.parse(JSON.stringify(this.context)) : {}; arg.context = this.context ? JSON.parse(JSON.stringify(this.context)) : {};
// 附加参数处理 // 附加参数处理
if (this.itemParam.context) { if (this.localContext && Object.keys(this.localContext).length >0) {
let _context = this.$util.formatData(this.data,arg.context,this.itemParam.context); let _context = this.$util.computedNavData(this.data,arg.context,arg.param,this.localContext);
Object.assign(arg.context,_context); Object.assign(arg.context,_context);
} }
if (this.itemParam.param) { if (this.localParam && Object.keys(this.localParam).length >0) {
let _param = this.$util.formatData(this.data,arg.param,this.itemParam.param); let _param = this.$util.computedNavData(this.data,arg.context,arg.param,this.localParam);
Object.assign(arg.param,_param); Object.assign(arg.param,_param);
} }
} }
......
app_web/src/components/dropdown-list-mpicker/dropdown-list-mpicker.vue
浏览文件 @ 53a4e0db
...@@ -85,12 +85,20 @@ export default class DropDownListMpicker extends Vue { ...@@ -85,12 +85,20 @@ export default class DropDownListMpicker extends Vue {
@Prop() public placeholder?: string; @Prop() public placeholder?: string;
/** /**
* 传入额外参数 * 局部上下文导航参数
* *
* @type {*} * @type {any}
* @memberof DropDownListMpicker
*/
@Prop() public localContext!:any;
/**
* 局部导航参数
*
* @type {any}
* @memberof DropDownListMpicker * @memberof DropDownListMpicker
*/ */
@Prop() public itemParam?: any; @Prop() public localParam!:any;
/** /**
* 视图上下文 * 视图上下文
...@@ -157,12 +165,12 @@ export default class DropDownListMpicker extends Vue { ...@@ -157,12 +165,12 @@ export default class DropDownListMpicker extends Vue {
arg.param = this.viewparams ? JSON.parse(JSON.stringify(this.viewparams)) : {}; arg.param = this.viewparams ? JSON.parse(JSON.stringify(this.viewparams)) : {};
arg.context = this.context ? JSON.parse(JSON.stringify(this.context)) : {}; arg.context = this.context ? JSON.parse(JSON.stringify(this.context)) : {};
// 附加参数处理 // 附加参数处理
if (this.itemParam.context) { if (this.localContext && Object.keys(this.localContext).length >0) {
let _context = this.$util.formatData(this.data,arg.context,this.itemParam.context); let _context = this.$util.computedNavData(this.data,arg.context,arg.param,this.localContext);
Object.assign(arg.context,_context); Object.assign(arg.context,_context);
} }
if (this.itemParam.param) { if (this.localParam && Object.keys(this.localParam).length >0) {
let _param = this.$util.formatData(this.data,arg.param,this.itemParam.param); let _param = this.$util.computedNavData(this.data,arg.param,arg.param,this.localParam);
Object.assign(arg.param,_param); Object.assign(arg.param,_param);
} }
} }
......
app_web/src/components/dropdown-list/dropdown-list.vue
浏览文件 @ 53a4e0db
...@@ -86,12 +86,20 @@ export default class DropDownList extends Vue { ...@@ -86,12 +86,20 @@ export default class DropDownList extends Vue {
} }
/** /**
* 传入额外参数 * 局部上下文导航参数
* *
* @type {*} * @type {*}
* @memberof DropDownList * @memberof DropDownList
*/ */
@Prop() public itemParam?: any; @Prop() public localContext!:any;
/**
* 局部导航参数
*
* @type {*}
* @memberof DropDownList
*/
@Prop() public localParam!:any;
/** /**
* 视图上下文 * 视图上下文
...@@ -172,12 +180,12 @@ export default class DropDownList extends Vue { ...@@ -172,12 +180,12 @@ export default class DropDownList extends Vue {
arg.param = this.viewparams ? JSON.parse(JSON.stringify(this.viewparams)) : {}; arg.param = this.viewparams ? JSON.parse(JSON.stringify(this.viewparams)) : {};
arg.context = this.context ? JSON.parse(JSON.stringify(this.context)) : {}; arg.context = this.context ? JSON.parse(JSON.stringify(this.context)) : {};
// 附加参数处理 // 附加参数处理
if (this.itemParam && this.itemParam.context) { if (this.localContext && Object.keys(this.localContext).length >0) {
let _context = this.$util.formatData(this.data,arg.context,this.itemParam.context); let _context = this.$util.computedNavData(this.data,arg.context,arg.param,this.localContext);
Object.assign(arg.context,_context); Object.assign(arg.context,_context);
} }
if (this.itemParam && this.itemParam.param) { if (this.localParam && Object.keys(this.localParam).length >0) {
let _param = this.$util.formatData(this.data,arg.param,this.itemParam.param); let _param = this.$util.computedNavData(this.data,arg.context,arg.param,this.localParam);
Object.assign(arg.param,_param); Object.assign(arg.param,_param);
} }
} }
......
app_web/src/components/login/login.less
浏览文件 @ 53a4e0db
...@@ -19,13 +19,14 @@ ...@@ -19,13 +19,14 @@
right: 0; right: 0;
top: 150px; top: 150px;
margin: auto; margin: auto;
width: 400px; width: 450px;
.ivu-card-head { .ivu-card-head {
padding: 14px 6px; padding: 30px 6px;
border-bottom: 0px;
>p{ >p{
line-height: 20px; line-height: 20px;
font-size: 14px; font-size: 24px;
color: #17233d; color: #666666;
font-weight: 700; font-weight: 700;
} }
} }
...@@ -36,7 +37,7 @@ ...@@ -36,7 +37,7 @@
padding: 30px 0; padding: 30px 0;
} }
.form-con{ .form-con{
padding: 10px 0 0; padding: 0px 20px 0px 20px;
>i-button{ >i-button{
width: 170px; width: 170px;
height: 40px; height: 40px;
...@@ -46,20 +47,21 @@ ...@@ -46,20 +47,21 @@
font-size: 10px; font-size: 10px;
text-align: center; text-align: center;
color: red; color: red;
height: 30px;
} }
} }
} }
.login_btn{ .login_btn{
width: 175px; width: 175px;
height: 32px; height: 40px;
font-size: 14px; font-size: 18px;
font-family: MicrosoftYaHei; font-family: MicrosoftYaHei;
} }
.login_register { .login_register {
width: 175px; width: 175px;
height: 32px; height: 40px;
font-size: 14px; font-size: 18px;
font-family: MicrosoftYaHei; font-family: MicrosoftYaHei;
float: right; float: right;
} }
......
app_web/src/components/login/login.vue
浏览文件 @ 53a4e0db
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
<i-form ref='loginForm' :rules="rules" :model="form"> <i-form ref='loginForm' :rules="rules" :model="form">
<form-item prop='loginname'> <form-item prop='loginname'>
<i-input <i-input
size='large'
prefix='ios-contact' prefix='ios-contact'
v-model.trim="form.loginname" v-model.trim="form.loginname"
placeholder="用户名" placeholder="用户名"
...@@ -19,6 +20,7 @@ ...@@ -19,6 +20,7 @@
</form-item> </form-item>
<form-item prop='password'> <form-item prop='password'>
<i-input <i-input
size='large'
prefix='ios-key' prefix='ios-key'
v-model.trim="form.password" v-model.trim="form.password"
type='password' type='password'
...@@ -61,9 +63,8 @@ ...@@ -61,9 +63,8 @@
</div> </div>
</card> </card>
<div class="log_footer"> <div class="log_footer">
<div class="copyright">Copyright © 2018 <div class="copyright">
<a href="http://www.ibizsys.net/ibizsys/channelview?channelId=ibizsys.about" target="_blank">埃毕致（上海）云计算科技</a> <a href="https://www.ibizlab.cn/" target="_blank">{{appTitle}} is based on ibizlab .</a>
版权所有
</div> </div>
</div> </div>
</div> </div>
...@@ -86,7 +87,7 @@ ...@@ -86,7 +87,7 @@
* @type {*} * @type {*}
* @memberof Login * @memberof Login
*/ */
public form: any = {loginname: '', password: ''}; public form: any = {loginname: 'ibzadmin', password: '123456'};
/** /**
*　登录提示语 *　登录提示语
...@@ -181,7 +182,7 @@ ...@@ -181,7 +182,7 @@
localStorage.setItem('user', JSON.stringify(data.user)); localStorage.setItem('user', JSON.stringify(data.user));
} }
// 设置cookie,保存账号密码7天 // 设置cookie,保存账号密码7天
this.setCookie(loginname, password, 7); this.setCookie(loginname, 7);
// 跳转首页 // 跳转首页
const url: any = this.$route.query.redirect ? this.$route.query.redirect : '*'; const url: any = this.$route.query.redirect ? this.$route.query.redirect : '*';
this.$router.push({path: url}); this.$router.push({path: url});
...@@ -190,11 +191,12 @@ ...@@ -190,11 +191,12 @@
// const loginfailed: any = this.$t('components.login.loginfailed'); // const loginfailed: any = this.$t('components.login.loginfailed');
// this.$Notice.error({ title: (this.$t('components.login.error') as any), desc: loginfailed }); // this.$Notice.error({ title: (this.$t('components.login.error') as any), desc: loginfailed });
// 登录提示 // 登录提示
// this.loginTip = loginfailed;
const data = error.data; const data = error.data;
if (data && data.message) { if (data && data.message) {
this.loginTip = data.message;
this.$Message.error({ this.$Message.error({
content: "登录失败，" + data.detail, content: "登录失败，" + data.message,
duration: 5, duration: 5,
closable: true closable: true
}); });
...@@ -223,14 +225,13 @@ ...@@ -223,14 +225,13 @@
* @param loginname * @param loginname
* @param password * @param password
*/ */
public setCookie(loginname: any, password: any, exdays: any) { public setCookie(loginname: any, exdays: any) {
// 获取时间 // 获取时间
let exdate = new Date(); let exdate = new Date();
// 保存的天数 // 保存的天数
exdate.setTime(exdate.getTime() + 24 * 60 * 60 * 1000 * exdays); exdate.setTime(exdate.getTime() + 24 * 60 * 60 * 1000 * exdays);
// 字符串拼接cookie // 字符串拼接cookie
window.document.cookie = "loginname" + "=" + loginname + ";path=/;expires=" + exdate.toUTCString(); window.document.cookie = "loginname" + "=" + loginname + ";path=/;expires=" + exdate.toUTCString();
window.document.cookie = "password" + "=" + password + ";path=/;expires=" + exdate.toUTCString();
} }
/** /**
...@@ -244,8 +245,6 @@ ...@@ -244,8 +245,6 @@
//判断查找相对应的值 //判断查找相对应的值
if (arr2[0] == 'loginname') { if (arr2[0] == 'loginname') {
this.form.loginname = arr2[1]; this.form.loginname = arr2[1];
} else if (arr2[0] == 'password') {
this.form.password = arr2[1];
} }
} }
} }
......
app_web/src/engine/view/edit-view-engine.ts
浏览文件 @ 53a4e0db
...@@ -249,7 +249,9 @@ export default class EditViewEngine extends ViewEngine { ...@@ -249,7 +249,9 @@ export default class EditViewEngine extends ViewEngine {
let viewdata: any = this.view.model; let viewdata: any = this.view.model;
if (viewdata && info && !Object.is(info, '') && this.view.$tabPageExp && (viewdata.srfTitle.indexOf(" - ") === -1)) { if (viewdata && info && !Object.is(info, '') && this.view.$tabPageExp && (viewdata.srfTitle.indexOf(" - ") === -1)) {
this.view.$tabPageExp.setCurPageCaption(viewdata.srfTitle, viewdata.srfTitle, info); this.view.$tabPageExp.setCurPageCaption(viewdata.srfTitle, viewdata.srfTitle, info);
this.view.$route.meta.info = info; if(this.view.$route){
this.view.$route.meta.info = info;
}
this.view.model.srfTitle = `${this.view.$t(viewdata.srfTitle)} - ${viewdata.dataInfo}`; this.view.model.srfTitle = `${this.view.$t(viewdata.srfTitle)} - ${viewdata.dataInfo}`;
} }
} }
......
app_web/src/locale/lanres/codelist/codelist_en_US.ts
浏览文件 @ 53a4e0db
...@@ -4,6 +4,14 @@ export default { ...@@ -4,6 +4,14 @@ export default {
'0': '否', '0': '否',
empty: '', empty: '',
}, },
SystemPick: {
empty: '',
},
AppType: {
'INNER': '内置应用',
'THIRD-PARTY': '第三方应用',
empty: '',
},
CLAuthCode: { CLAuthCode: {
'200': '成功', '200': '成功',
'400': '用户不存在', '400': '用户不存在',
......
app_web/src/locale/lanres/codelist/codelist_zh_CN.ts
浏览文件 @ 53a4e0db
...@@ -4,6 +4,14 @@ export default { ...@@ -4,6 +4,14 @@ export default {
'0': '否', '0': '否',
empty: '', empty: '',
}, },
SystemPick: {
empty: '',
},
AppType: {
'INNER': '内置应用',
'THIRD-PARTY': '第三方应用',
empty: '',
},
CLAuthCode: { CLAuthCode: {
'200': '成功', '200': '成功',
'400': '用户不存在', '400': '用户不存在',
......
app_web/src/locale/lanres/entities/sys-app/sys-app_en_US.ts
浏览文件 @ 53a4e0db
...@@ -6,9 +6,10 @@ export default { ...@@ -6,9 +6,10 @@ export default {
systemid: '系统标识', systemid: '系统标识',
fullname: '全称', fullname: '全称',
type: '类型', type: '类型',
addr: '地址', group: '分组',
icon: '图标', icon: '图标',
visabled: '可见', visabled: '可见',
addr: '地址',
}, },
views: { views: {
editview: { editview: {
...@@ -35,6 +36,7 @@ export default { ...@@ -35,6 +36,7 @@ export default {
appid: "应用标识", appid: "应用标识",
appname: "应用名", appname: "应用名",
apptype: "类型", apptype: "类型",
appgroup: "分组",
fullname: "全称", fullname: "全称",
icon: "图标", icon: "图标",
visabled: "可见", visabled: "可见",
...@@ -48,6 +50,7 @@ export default { ...@@ -48,6 +50,7 @@ export default {
pssystemid: "系统标识", pssystemid: "系统标识",
appid: "应用标识", appid: "应用标识",
appname: "应用名", appname: "应用名",
appgroup: "分组",
apptype: "类型", apptype: "类型",
fullname: "全称", fullname: "全称",
icon: "图标", icon: "图标",
......
app_web/src/locale/lanres/entities/sys-app/sys-app_zh_CN.ts
浏览文件 @ 53a4e0db
...@@ -5,9 +5,10 @@ export default { ...@@ -5,9 +5,10 @@ export default {
systemid: '系统标识', systemid: '系统标识',
fullname: '全称', fullname: '全称',
type: '类型', type: '类型',
addr: '地址', group: '分组',
icon: '图标', icon: '图标',
visabled: '可见', visabled: '可见',
addr: '地址',
}, },
views: { views: {
editview: { editview: {
...@@ -34,6 +35,7 @@ export default { ...@@ -34,6 +35,7 @@ export default {
appid: '应用标识', appid: '应用标识',
appname: '应用名', appname: '应用名',
apptype: '类型', apptype: '类型',
appgroup: '分组',
fullname: '全称', fullname: '全称',
icon: '图标', icon: '图标',
visabled: '可见', visabled: '可见',
...@@ -47,6 +49,7 @@ export default { ...@@ -47,6 +49,7 @@ export default {
pssystemid: '系统标识', pssystemid: '系统标识',
appid: '应用标识', appid: '应用标识',
appname: '应用名', appname: '应用名',
appgroup: '分组',
apptype: '类型', apptype: '类型',
fullname: '全称', fullname: '全称',
icon: '图标', icon: '图标',
......
app_web/src/mock/codelist/codelist.ts
浏览文件 @ 53a4e0db
...@@ -34,6 +34,41 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => { ...@@ -34,6 +34,41 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
}, },
] ]
}, },
{
"srfkey": "SystemPick",
"emptytext": "未定义",
"codelisttype":"dynamic",
"appdataentity":"",
"appdedataset":"",
"items": []
},
{
srfkey: 'AppType',
emptytext: '未定义',
"codelisttype":"static",
items: [
{
id: 'INNER',
label: '内置应用',
text: '内置应用',
"data":"",
"codename":"Inner",
value: 'INNER',
disabled: false,
},
{
id: 'THIRD-PARTY',
label: '第三方应用',
text: '第三方应用',
"data":"",
"codename":"Third_SUB_party",
value: 'THIRD-PARTY',
disabled: false,
},
]
},
{ {
srfkey: 'CLAuthCode', srfkey: 'CLAuthCode',
emptytext: '未定义', emptytext: '未定义',
......
app_web/src/pages/uaa/sys-app-edit-view/sys-app-edit-view-base.vue
浏览文件 @ 53a4e0db
...@@ -577,7 +577,6 @@ export default class SysAppEditViewBase extends Vue { ...@@ -577,7 +577,6 @@ export default class SysAppEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -606,7 +605,6 @@ export default class SysAppEditViewBase extends Vue { ...@@ -606,7 +605,6 @@ export default class SysAppEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -635,7 +633,6 @@ export default class SysAppEditViewBase extends Vue { ...@@ -635,7 +633,6 @@ export default class SysAppEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -664,7 +661,6 @@ export default class SysAppEditViewBase extends Vue { ...@@ -664,7 +661,6 @@ export default class SysAppEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -693,7 +689,6 @@ export default class SysAppEditViewBase extends Vue { ...@@ -693,7 +689,6 @@ export default class SysAppEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -722,7 +717,6 @@ export default class SysAppEditViewBase extends Vue { ...@@ -722,7 +717,6 @@ export default class SysAppEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -751,7 +745,6 @@ export default class SysAppEditViewBase extends Vue { ...@@ -751,7 +745,6 @@ export default class SysAppEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
......
app_web/src/pages/uaa/sys-app-grid-view/sys-app-grid-view-base.vue
浏览文件 @ 53a4e0db
...@@ -724,7 +724,6 @@ export default class SysAppGridViewBase extends Vue { ...@@ -724,7 +724,6 @@ export default class SysAppGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -753,7 +752,6 @@ export default class SysAppGridViewBase extends Vue { ...@@ -753,7 +752,6 @@ export default class SysAppGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -782,7 +780,6 @@ export default class SysAppGridViewBase extends Vue { ...@@ -782,7 +780,6 @@ export default class SysAppGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -811,7 +808,6 @@ export default class SysAppGridViewBase extends Vue { ...@@ -811,7 +808,6 @@ export default class SysAppGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -840,7 +836,6 @@ export default class SysAppGridViewBase extends Vue { ...@@ -840,7 +836,6 @@ export default class SysAppGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -869,7 +864,6 @@ export default class SysAppGridViewBase extends Vue { ...@@ -869,7 +864,6 @@ export default class SysAppGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -898,7 +892,6 @@ export default class SysAppGridViewBase extends Vue { ...@@ -898,7 +892,6 @@ export default class SysAppGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -927,7 +920,6 @@ export default class SysAppGridViewBase extends Vue { ...@@ -927,7 +920,6 @@ export default class SysAppGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -956,7 +948,6 @@ export default class SysAppGridViewBase extends Vue { ...@@ -956,7 +948,6 @@ export default class SysAppGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -985,7 +976,6 @@ export default class SysAppGridViewBase extends Vue { ...@@ -985,7 +976,6 @@ export default class SysAppGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -1009,14 +999,16 @@ export default class SysAppGridViewBase extends Vue { ...@@ -1009,14 +999,16 @@ export default class SysAppGridViewBase extends Vue {
* @memberof SysAppGridView * @memberof SysAppGridView
*/ */
public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) { public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) {
let localContext:any = null;
let localViewParam:any =null;
const data: any = {}; const data: any = {};
if(args[0].srfsourcekey){ if(args[0].srfsourcekey){
data.srfsourcekey = args[0].srfsourcekey; data.srfsourcekey = args[0].srfsourcekey;
} }
let curViewParam = JSON.parse(JSON.stringify(this.context)); let tempContext = JSON.parse(JSON.stringify(this.context));
delete curViewParam.sysapp; delete tempContext.sysapp;
if(args.length >0){ if(args.length >0){
Object.assign(curViewParam,args[0]); Object.assign(tempContext,args[0]);
} }
const deResParameters: any[] = []; const deResParameters: any[] = [];
const parameters: any[] = [ const parameters: any[] = [
...@@ -1024,7 +1016,7 @@ export default class SysAppGridViewBase extends Vue { ...@@ -1024,7 +1016,7 @@ export default class SysAppGridViewBase extends Vue {
]; ];
const _this: any = this; const _this: any = this;
const openDrawer = (view: any, data: any) => { const openDrawer = (view: any, data: any) => {
let container: Subject<any> = this.$appdrawer.openDrawer(view, curViewParam, data); let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
container.subscribe((result: any) => { container.subscribe((result: any) => {
if (!result || !Object.is(result.ret, 'OK')) { if (!result || !Object.is(result.ret, 'OK')) {
return; return;
...@@ -1057,10 +1049,12 @@ export default class SysAppGridViewBase extends Vue { ...@@ -1057,10 +1049,12 @@ export default class SysAppGridViewBase extends Vue {
* @memberof SysAppGridView * @memberof SysAppGridView
*/ */
public opendata(args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) { public opendata(args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) {
let localContext:any = null;
let localViewParam:any =null;
const data: any = {}; const data: any = {};
let curViewParam = JSON.parse(JSON.stringify(this.context)); let tempContext = JSON.parse(JSON.stringify(this.context));
if(args.length >0){ if(args.length >0){
Object.assign(curViewParam,args[0]); Object.assign(tempContext,args[0]);
} }
const deResParameters: any[] = []; const deResParameters: any[] = [];
const parameters: any[] = [ const parameters: any[] = [
...@@ -1068,7 +1062,7 @@ export default class SysAppGridViewBase extends Vue { ...@@ -1068,7 +1062,7 @@ export default class SysAppGridViewBase extends Vue {
]; ];
const _this: any = this; const _this: any = this;
const openDrawer = (view: any, data: any) => { const openDrawer = (view: any, data: any) => {
let container: Subject<any> = this.$appdrawer.openDrawer(view, curViewParam, data); let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
container.subscribe((result: any) => { container.subscribe((result: any) => {
if (!result || !Object.is(result.ret, 'OK')) { if (!result || !Object.is(result.ret, 'OK')) {
return; return;
......
app_web/src/pages/uaa/sys-authloggrid-view/sys-authloggrid-view-base.vue
浏览文件 @ 53a4e0db
...@@ -593,6 +593,8 @@ export default class SYS_AUTHLOGGridViewBase extends Vue { ...@@ -593,6 +593,8 @@ export default class SYS_AUTHLOGGridViewBase extends Vue {
* @memberof SYS_AUTHLOGGridView * @memberof SYS_AUTHLOGGridView
*/ */
public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) { public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) {
let localContext:any = null;
let localViewParam:any =null;
this.$Notice.warning({ title: '错误', desc: '未指定关系视图' }); this.$Notice.warning({ title: '错误', desc: '未指定关系视图' });
} }
...@@ -608,6 +610,8 @@ export default class SYS_AUTHLOGGridViewBase extends Vue { ...@@ -608,6 +610,8 @@ export default class SYS_AUTHLOGGridViewBase extends Vue {
* @memberof SYS_AUTHLOGGridView * @memberof SYS_AUTHLOGGridView
*/ */
public opendata(args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) { public opendata(args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) {
let localContext:any = null;
let localViewParam:any =null;
this.$Notice.warning({ title: '错误', desc: '未指定关系视图' }); this.$Notice.warning({ title: '错误', desc: '未指定关系视图' });
} }
......
app_web/src/pages/uaa/sys-permissionedit-view/sys-permissionedit-view-base.vue
浏览文件 @ 53a4e0db
...@@ -577,7 +577,6 @@ export default class SYS_PERMISSIONEditViewBase extends Vue { ...@@ -577,7 +577,6 @@ export default class SYS_PERMISSIONEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -606,7 +605,6 @@ export default class SYS_PERMISSIONEditViewBase extends Vue { ...@@ -606,7 +605,6 @@ export default class SYS_PERMISSIONEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -635,7 +633,6 @@ export default class SYS_PERMISSIONEditViewBase extends Vue { ...@@ -635,7 +633,6 @@ export default class SYS_PERMISSIONEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -664,7 +661,6 @@ export default class SYS_PERMISSIONEditViewBase extends Vue { ...@@ -664,7 +661,6 @@ export default class SYS_PERMISSIONEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -693,7 +689,6 @@ export default class SYS_PERMISSIONEditViewBase extends Vue { ...@@ -693,7 +689,6 @@ export default class SYS_PERMISSIONEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -722,7 +717,6 @@ export default class SYS_PERMISSIONEditViewBase extends Vue { ...@@ -722,7 +717,6 @@ export default class SYS_PERMISSIONEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -751,7 +745,6 @@ export default class SYS_PERMISSIONEditViewBase extends Vue { ...@@ -751,7 +745,6 @@ export default class SYS_PERMISSIONEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
......
app_web/src/pages/uaa/sys-permissionedit-view2/sys-permissionedit-view2-base.vue
浏览文件 @ 53a4e0db
...@@ -609,7 +609,6 @@ export default class SYS_PERMISSIONEditView2Base extends Vue { ...@@ -609,7 +609,6 @@ export default class SYS_PERMISSIONEditView2Base extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -638,7 +637,6 @@ export default class SYS_PERMISSIONEditView2Base extends Vue { ...@@ -638,7 +637,6 @@ export default class SYS_PERMISSIONEditView2Base extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -667,7 +665,6 @@ export default class SYS_PERMISSIONEditView2Base extends Vue { ...@@ -667,7 +665,6 @@ export default class SYS_PERMISSIONEditView2Base extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -696,7 +693,6 @@ export default class SYS_PERMISSIONEditView2Base extends Vue { ...@@ -696,7 +693,6 @@ export default class SYS_PERMISSIONEditView2Base extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -725,7 +721,6 @@ export default class SYS_PERMISSIONEditView2Base extends Vue { ...@@ -725,7 +721,6 @@ export default class SYS_PERMISSIONEditView2Base extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -754,7 +749,6 @@ export default class SYS_PERMISSIONEditView2Base extends Vue { ...@@ -754,7 +749,6 @@ export default class SYS_PERMISSIONEditView2Base extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -783,7 +777,6 @@ export default class SYS_PERMISSIONEditView2Base extends Vue { ...@@ -783,7 +777,6 @@ export default class SYS_PERMISSIONEditView2Base extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
......
app_web/src/pages/uaa/sys-permissiongrid-view/sys-permissiongrid-view-base.vue
浏览文件 @ 53a4e0db
...@@ -705,7 +705,6 @@ export default class SYS_PERMISSIONGridViewBase extends Vue { ...@@ -705,7 +705,6 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -734,7 +733,6 @@ export default class SYS_PERMISSIONGridViewBase extends Vue { ...@@ -734,7 +733,6 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -763,7 +761,6 @@ export default class SYS_PERMISSIONGridViewBase extends Vue { ...@@ -763,7 +761,6 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -792,7 +789,6 @@ export default class SYS_PERMISSIONGridViewBase extends Vue { ...@@ -792,7 +789,6 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -821,7 +817,6 @@ export default class SYS_PERMISSIONGridViewBase extends Vue { ...@@ -821,7 +817,6 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -850,7 +845,6 @@ export default class SYS_PERMISSIONGridViewBase extends Vue { ...@@ -850,7 +845,6 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -879,7 +873,6 @@ export default class SYS_PERMISSIONGridViewBase extends Vue { ...@@ -879,7 +873,6 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -908,7 +901,6 @@ export default class SYS_PERMISSIONGridViewBase extends Vue { ...@@ -908,7 +901,6 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -937,7 +929,6 @@ export default class SYS_PERMISSIONGridViewBase extends Vue { ...@@ -937,7 +929,6 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -966,7 +957,6 @@ export default class SYS_PERMISSIONGridViewBase extends Vue { ...@@ -966,7 +957,6 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -990,14 +980,16 @@ export default class SYS_PERMISSIONGridViewBase extends Vue { ...@@ -990,14 +980,16 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
* @memberof SYS_PERMISSIONGridView * @memberof SYS_PERMISSIONGridView
*/ */
public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) { public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) {
let localContext:any = null;
let localViewParam:any =null;
const data: any = {}; const data: any = {};
if(args[0].srfsourcekey){ if(args[0].srfsourcekey){
data.srfsourcekey = args[0].srfsourcekey; data.srfsourcekey = args[0].srfsourcekey;
} }
let curViewParam = JSON.parse(JSON.stringify(this.context)); let tempContext = JSON.parse(JSON.stringify(this.context));
delete curViewParam.syspermission; delete tempContext.syspermission;
if(args.length >0){ if(args.length >0){
Object.assign(curViewParam,args[0]); Object.assign(tempContext,args[0]);
} }
const deResParameters: any[] = []; const deResParameters: any[] = [];
const parameters: any[] = [ const parameters: any[] = [
...@@ -1008,7 +1000,7 @@ export default class SYS_PERMISSIONGridViewBase extends Vue { ...@@ -1008,7 +1000,7 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
const openIndexViewTab = (data: any) => { const openIndexViewTab = (data: any) => {
const _data: any = { w: (new Date().getTime()) }; const _data: any = { w: (new Date().getTime()) };
Object.assign(_data, data); Object.assign(_data, data);
const routePath = this.$viewTool.buildUpRoutePath(this.$route, curViewParam, deResParameters, parameters, args, _data); const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data);
this.$router.push(routePath); this.$router.push(routePath);
} }
openIndexViewTab(data); openIndexViewTab(data);
...@@ -1026,10 +1018,12 @@ export default class SYS_PERMISSIONGridViewBase extends Vue { ...@@ -1026,10 +1018,12 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
* @memberof SYS_PERMISSIONGridView * @memberof SYS_PERMISSIONGridView
*/ */
public opendata(args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) { public opendata(args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) {
let localContext:any = null;
let localViewParam:any =null;
const data: any = {}; const data: any = {};
let curViewParam = JSON.parse(JSON.stringify(this.context)); let tempContext = JSON.parse(JSON.stringify(this.context));
if(args.length >0){ if(args.length >0){
Object.assign(curViewParam,args[0]); Object.assign(tempContext,args[0]);
} }
const deResParameters: any[] = []; const deResParameters: any[] = [];
const parameters: any[] = [ const parameters: any[] = [
...@@ -1038,7 +1032,7 @@ export default class SYS_PERMISSIONGridViewBase extends Vue { ...@@ -1038,7 +1032,7 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
]; ];
const _this: any = this; const _this: any = this;
const openIndexViewTab = (data: any) => { const openIndexViewTab = (data: any) => {
const routePath = this.$viewTool.buildUpRoutePath(this.$route, curViewParam, deResParameters, parameters, args, data); const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
this.$router.push(routePath); this.$router.push(routePath);
} }
openIndexViewTab(data); openIndexViewTab(data);
......
app_web/src/pages/uaa/sys-role-permission-grid-view/sys-role-permission-grid-view-base.vue
浏览文件 @ 53a4e0db
...@@ -702,7 +702,6 @@ export default class SysRolePermissionGridViewBase extends Vue { ...@@ -702,7 +702,6 @@ export default class SysRolePermissionGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -731,7 +730,6 @@ export default class SysRolePermissionGridViewBase extends Vue { ...@@ -731,7 +730,6 @@ export default class SysRolePermissionGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -760,7 +758,6 @@ export default class SysRolePermissionGridViewBase extends Vue { ...@@ -760,7 +758,6 @@ export default class SysRolePermissionGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -789,7 +786,6 @@ export default class SysRolePermissionGridViewBase extends Vue { ...@@ -789,7 +786,6 @@ export default class SysRolePermissionGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -818,7 +814,6 @@ export default class SysRolePermissionGridViewBase extends Vue { ...@@ -818,7 +814,6 @@ export default class SysRolePermissionGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -847,7 +842,6 @@ export default class SysRolePermissionGridViewBase extends Vue { ...@@ -847,7 +842,6 @@ export default class SysRolePermissionGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -876,7 +870,6 @@ export default class SysRolePermissionGridViewBase extends Vue { ...@@ -876,7 +870,6 @@ export default class SysRolePermissionGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -905,7 +898,6 @@ export default class SysRolePermissionGridViewBase extends Vue { ...@@ -905,7 +898,6 @@ export default class SysRolePermissionGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -934,7 +926,6 @@ export default class SysRolePermissionGridViewBase extends Vue { ...@@ -934,7 +926,6 @@ export default class SysRolePermissionGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -963,7 +954,6 @@ export default class SysRolePermissionGridViewBase extends Vue { ...@@ -963,7 +954,6 @@ export default class SysRolePermissionGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -987,6 +977,8 @@ export default class SysRolePermissionGridViewBase extends Vue { ...@@ -987,6 +977,8 @@ export default class SysRolePermissionGridViewBase extends Vue {
* @memberof SysRolePermissionGridView * @memberof SysRolePermissionGridView
*/ */
public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) { public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) {
let localContext:any = null;
let localViewParam:any =null;
const batchAddPSAppViews=[ const batchAddPSAppViews=[
{view:{viewname:'sys-permissionmpickup-view',height: 0,width: 0,title: '权限表数据多项选择视图'}, {view:{viewname:'sys-permissionmpickup-view',height: 0,width: 0,title: '权限表数据多项选择视图'},
res:['SysPermission'], res:['SysPermission'],
...@@ -1045,13 +1037,15 @@ export default class SysRolePermissionGridViewBase extends Vue { ...@@ -1045,13 +1037,15 @@ export default class SysRolePermissionGridViewBase extends Vue {
* @memberof SysRolePermissionGridView * @memberof SysRolePermissionGridView
*/ */
public opendata(args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) { public opendata(args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) {
let localContext:any = null;
let localViewParam:any =null;
const data: any = {}; const data: any = {};
let curViewParam = JSON.parse(JSON.stringify(this.context)); let tempContext = JSON.parse(JSON.stringify(this.context));
if(args.length >0){ if(args.length >0){
Object.assign(curViewParam,args[0]); Object.assign(tempContext,args[0]);
} }
let deResParameters: any[] = []; let deResParameters: any[] = [];
if(curViewParam.syspermission && true){ if(tempContext.syspermission && true){
deResParameters = [ deResParameters = [
{ pathName: 'syspermissions', parameterName: 'syspermission' }, { pathName: 'syspermissions', parameterName: 'syspermission' },
] ]
...@@ -1062,7 +1056,7 @@ export default class SysRolePermissionGridViewBase extends Vue { ...@@ -1062,7 +1056,7 @@ export default class SysRolePermissionGridViewBase extends Vue {
]; ];
const _this: any = this; const _this: any = this;
const openIndexViewTab = (data: any) => { const openIndexViewTab = (data: any) => {
const routePath = this.$viewTool.buildUpRoutePath(this.$route, curViewParam, deResParameters, parameters, args, data); const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
this.$router.push(routePath); this.$router.push(routePath);
} }
openIndexViewTab(data); openIndexViewTab(data);
......
app_web/src/pages/uaa/sys-role-permissioncustom-view/sys-role-permissioncustom-view.less
浏览文件 @ 53a4e0db
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
margin-top:30px;margin-bottom:20px;margin-left:40px; margin-top:30px;margin-bottom:20px;margin-left:40px;
} }
.roll{ .roll{
height:calc(100vh - 305px) ;overflow:hidden;overflow-x: hidden;overflow-y: auto; height:calc(100vh - 355px) ;overflow:hidden;overflow-x: hidden;overflow-y: auto;
} }
.tre{ .tre{
margin-left:20px; margin-left:20px;
......
app_web/src/pages/uaa/sys-role-permissionedit-view/sys-role-permissionedit-view-base.vue
浏览文件 @ 53a4e0db
...@@ -577,7 +577,6 @@ export default class SYS_ROLE_PERMISSIONEditViewBase extends Vue { ...@@ -577,7 +577,6 @@ export default class SYS_ROLE_PERMISSIONEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -606,7 +605,6 @@ export default class SYS_ROLE_PERMISSIONEditViewBase extends Vue { ...@@ -606,7 +605,6 @@ export default class SYS_ROLE_PERMISSIONEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -635,7 +633,6 @@ export default class SYS_ROLE_PERMISSIONEditViewBase extends Vue { ...@@ -635,7 +633,6 @@ export default class SYS_ROLE_PERMISSIONEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -664,7 +661,6 @@ export default class SYS_ROLE_PERMISSIONEditViewBase extends Vue { ...@@ -664,7 +661,6 @@ export default class SYS_ROLE_PERMISSIONEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -693,7 +689,6 @@ export default class SYS_ROLE_PERMISSIONEditViewBase extends Vue { ...@@ -693,7 +689,6 @@ export default class SYS_ROLE_PERMISSIONEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -722,7 +717,6 @@ export default class SYS_ROLE_PERMISSIONEditViewBase extends Vue { ...@@ -722,7 +717,6 @@ export default class SYS_ROLE_PERMISSIONEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -751,7 +745,6 @@ export default class SYS_ROLE_PERMISSIONEditViewBase extends Vue { ...@@ -751,7 +745,6 @@ export default class SYS_ROLE_PERMISSIONEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
......
app_web/src/pages/uaa/sys-role-permissionedit-view2/sys-role-permissionedit-view2-base.vue
浏览文件 @ 53a4e0db
...@@ -609,7 +609,6 @@ export default class SYS_ROLE_PERMISSIONEditView2Base extends Vue { ...@@ -609,7 +609,6 @@ export default class SYS_ROLE_PERMISSIONEditView2Base extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -638,7 +637,6 @@ export default class SYS_ROLE_PERMISSIONEditView2Base extends Vue { ...@@ -638,7 +637,6 @@ export default class SYS_ROLE_PERMISSIONEditView2Base extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -667,7 +665,6 @@ export default class SYS_ROLE_PERMISSIONEditView2Base extends Vue { ...@@ -667,7 +665,6 @@ export default class SYS_ROLE_PERMISSIONEditView2Base extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -696,7 +693,6 @@ export default class SYS_ROLE_PERMISSIONEditView2Base extends Vue { ...@@ -696,7 +693,6 @@ export default class SYS_ROLE_PERMISSIONEditView2Base extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -725,7 +721,6 @@ export default class SYS_ROLE_PERMISSIONEditView2Base extends Vue { ...@@ -725,7 +721,6 @@ export default class SYS_ROLE_PERMISSIONEditView2Base extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -754,7 +749,6 @@ export default class SYS_ROLE_PERMISSIONEditView2Base extends Vue { ...@@ -754,7 +749,6 @@ export default class SYS_ROLE_PERMISSIONEditView2Base extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -783,7 +777,6 @@ export default class SYS_ROLE_PERMISSIONEditView2Base extends Vue { ...@@ -783,7 +777,6 @@ export default class SYS_ROLE_PERMISSIONEditView2Base extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
......
app_web/src/pages/uaa/sys-roleedit-view/sys-roleedit-view-base.vue
浏览文件 @ 53a4e0db
...@@ -577,7 +577,6 @@ export default class SYS_ROLEEditViewBase extends Vue { ...@@ -577,7 +577,6 @@ export default class SYS_ROLEEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -606,7 +605,6 @@ export default class SYS_ROLEEditViewBase extends Vue { ...@@ -606,7 +605,6 @@ export default class SYS_ROLEEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -635,7 +633,6 @@ export default class SYS_ROLEEditViewBase extends Vue { ...@@ -635,7 +633,6 @@ export default class SYS_ROLEEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -664,7 +661,6 @@ export default class SYS_ROLEEditViewBase extends Vue { ...@@ -664,7 +661,6 @@ export default class SYS_ROLEEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -693,7 +689,6 @@ export default class SYS_ROLEEditViewBase extends Vue { ...@@ -693,7 +689,6 @@ export default class SYS_ROLEEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -722,7 +717,6 @@ export default class SYS_ROLEEditViewBase extends Vue { ...@@ -722,7 +717,6 @@ export default class SYS_ROLEEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -751,7 +745,6 @@ export default class SYS_ROLEEditViewBase extends Vue { ...@@ -751,7 +745,6 @@ export default class SYS_ROLEEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
......
app_web/src/pages/uaa/sys-roleedit-view2/sys-roleedit-view2-base.vue
浏览文件 @ 53a4e0db
...@@ -609,7 +609,6 @@ export default class SYS_ROLEEditView2Base extends Vue { ...@@ -609,7 +609,6 @@ export default class SYS_ROLEEditView2Base extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -638,7 +637,6 @@ export default class SYS_ROLEEditView2Base extends Vue { ...@@ -638,7 +637,6 @@ export default class SYS_ROLEEditView2Base extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -667,7 +665,6 @@ export default class SYS_ROLEEditView2Base extends Vue { ...@@ -667,7 +665,6 @@ export default class SYS_ROLEEditView2Base extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -696,7 +693,6 @@ export default class SYS_ROLEEditView2Base extends Vue { ...@@ -696,7 +693,6 @@ export default class SYS_ROLEEditView2Base extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -725,7 +721,6 @@ export default class SYS_ROLEEditView2Base extends Vue { ...@@ -725,7 +721,6 @@ export default class SYS_ROLEEditView2Base extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -754,7 +749,6 @@ export default class SYS_ROLEEditView2Base extends Vue { ...@@ -754,7 +749,6 @@ export default class SYS_ROLEEditView2Base extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -783,7 +777,6 @@ export default class SYS_ROLEEditView2Base extends Vue { ...@@ -783,7 +777,6 @@ export default class SYS_ROLEEditView2Base extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
......
app_web/src/pages/uaa/sys-rolegrid-view/sys-rolegrid-view-base.vue
浏览文件 @ 53a4e0db
...@@ -705,7 +705,6 @@ export default class SYS_ROLEGridViewBase extends Vue { ...@@ -705,7 +705,6 @@ export default class SYS_ROLEGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -734,7 +733,6 @@ export default class SYS_ROLEGridViewBase extends Vue { ...@@ -734,7 +733,6 @@ export default class SYS_ROLEGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -763,7 +761,6 @@ export default class SYS_ROLEGridViewBase extends Vue { ...@@ -763,7 +761,6 @@ export default class SYS_ROLEGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -792,7 +789,6 @@ export default class SYS_ROLEGridViewBase extends Vue { ...@@ -792,7 +789,6 @@ export default class SYS_ROLEGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -821,7 +817,6 @@ export default class SYS_ROLEGridViewBase extends Vue { ...@@ -821,7 +817,6 @@ export default class SYS_ROLEGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -850,7 +845,6 @@ export default class SYS_ROLEGridViewBase extends Vue { ...@@ -850,7 +845,6 @@ export default class SYS_ROLEGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -879,7 +873,6 @@ export default class SYS_ROLEGridViewBase extends Vue { ...@@ -879,7 +873,6 @@ export default class SYS_ROLEGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -908,7 +901,6 @@ export default class SYS_ROLEGridViewBase extends Vue { ...@@ -908,7 +901,6 @@ export default class SYS_ROLEGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -937,7 +929,6 @@ export default class SYS_ROLEGridViewBase extends Vue { ...@@ -937,7 +929,6 @@ export default class SYS_ROLEGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -966,7 +957,6 @@ export default class SYS_ROLEGridViewBase extends Vue { ...@@ -966,7 +957,6 @@ export default class SYS_ROLEGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -990,14 +980,16 @@ export default class SYS_ROLEGridViewBase extends Vue { ...@@ -990,14 +980,16 @@ export default class SYS_ROLEGridViewBase extends Vue {
* @memberof SYS_ROLEGridView * @memberof SYS_ROLEGridView
*/ */
public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) { public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) {
let localContext:any = null;
let localViewParam:any =null;
const data: any = {}; const data: any = {};
if(args[0].srfsourcekey){ if(args[0].srfsourcekey){
data.srfsourcekey = args[0].srfsourcekey; data.srfsourcekey = args[0].srfsourcekey;
} }
let curViewParam = JSON.parse(JSON.stringify(this.context)); let tempContext = JSON.parse(JSON.stringify(this.context));
delete curViewParam.sysrole; delete tempContext.sysrole;
if(args.length >0){ if(args.length >0){
Object.assign(curViewParam,args[0]); Object.assign(tempContext,args[0]);
} }
const deResParameters: any[] = []; const deResParameters: any[] = [];
const parameters: any[] = [ const parameters: any[] = [
...@@ -1008,7 +1000,7 @@ export default class SYS_ROLEGridViewBase extends Vue { ...@@ -1008,7 +1000,7 @@ export default class SYS_ROLEGridViewBase extends Vue {
const openIndexViewTab = (data: any) => { const openIndexViewTab = (data: any) => {
const _data: any = { w: (new Date().getTime()) }; const _data: any = { w: (new Date().getTime()) };
Object.assign(_data, data); Object.assign(_data, data);
const routePath = this.$viewTool.buildUpRoutePath(this.$route, curViewParam, deResParameters, parameters, args, _data); const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data);
this.$router.push(routePath); this.$router.push(routePath);
} }
openIndexViewTab(data); openIndexViewTab(data);
...@@ -1026,10 +1018,12 @@ export default class SYS_ROLEGridViewBase extends Vue { ...@@ -1026,10 +1018,12 @@ export default class SYS_ROLEGridViewBase extends Vue {
* @memberof SYS_ROLEGridView * @memberof SYS_ROLEGridView
*/ */
public opendata(args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) { public opendata(args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) {
let localContext:any = null;
let localViewParam:any =null;
const data: any = {}; const data: any = {};
let curViewParam = JSON.parse(JSON.stringify(this.context)); let tempContext = JSON.parse(JSON.stringify(this.context));
if(args.length >0){ if(args.length >0){
Object.assign(curViewParam,args[0]); Object.assign(tempContext,args[0]);
} }
const deResParameters: any[] = []; const deResParameters: any[] = [];
const parameters: any[] = [ const parameters: any[] = [
...@@ -1038,7 +1032,7 @@ export default class SYS_ROLEGridViewBase extends Vue { ...@@ -1038,7 +1032,7 @@ export default class SYS_ROLEGridViewBase extends Vue {
]; ];
const _this: any = this; const _this: any = this;
const openIndexViewTab = (data: any) => { const openIndexViewTab = (data: any) => {
const routePath = this.$viewTool.buildUpRoutePath(this.$route, curViewParam, deResParameters, parameters, args, data); const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
this.$router.push(routePath); this.$router.push(routePath);
} }
openIndexViewTab(data); openIndexViewTab(data);
......
app_web/src/pages/uaa/sys-user-roleedit-view/sys-user-roleedit-view-base.vue
浏览文件 @ 53a4e0db
...@@ -577,7 +577,6 @@ export default class SYS_USER_ROLEEditViewBase extends Vue { ...@@ -577,7 +577,6 @@ export default class SYS_USER_ROLEEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -606,7 +605,6 @@ export default class SYS_USER_ROLEEditViewBase extends Vue { ...@@ -606,7 +605,6 @@ export default class SYS_USER_ROLEEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -635,7 +633,6 @@ export default class SYS_USER_ROLEEditViewBase extends Vue { ...@@ -635,7 +633,6 @@ export default class SYS_USER_ROLEEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -664,7 +661,6 @@ export default class SYS_USER_ROLEEditViewBase extends Vue { ...@@ -664,7 +661,6 @@ export default class SYS_USER_ROLEEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -693,7 +689,6 @@ export default class SYS_USER_ROLEEditViewBase extends Vue { ...@@ -693,7 +689,6 @@ export default class SYS_USER_ROLEEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -722,7 +717,6 @@ export default class SYS_USER_ROLEEditViewBase extends Vue { ...@@ -722,7 +717,6 @@ export default class SYS_USER_ROLEEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -751,7 +745,6 @@ export default class SYS_USER_ROLEEditViewBase extends Vue { ...@@ -751,7 +745,6 @@ export default class SYS_USER_ROLEEditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
......
app_web/src/pages/uaa/sys-user-roleedit-view2/sys-user-roleedit-view2-base.vue
浏览文件 @ 53a4e0db
...@@ -609,7 +609,6 @@ export default class SYS_USER_ROLEEditView2Base extends Vue { ...@@ -609,7 +609,6 @@ export default class SYS_USER_ROLEEditView2Base extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -638,7 +637,6 @@ export default class SYS_USER_ROLEEditView2Base extends Vue { ...@@ -638,7 +637,6 @@ export default class SYS_USER_ROLEEditView2Base extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -667,7 +665,6 @@ export default class SYS_USER_ROLEEditView2Base extends Vue { ...@@ -667,7 +665,6 @@ export default class SYS_USER_ROLEEditView2Base extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -696,7 +693,6 @@ export default class SYS_USER_ROLEEditView2Base extends Vue { ...@@ -696,7 +693,6 @@ export default class SYS_USER_ROLEEditView2Base extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -725,7 +721,6 @@ export default class SYS_USER_ROLEEditView2Base extends Vue { ...@@ -725,7 +721,6 @@ export default class SYS_USER_ROLEEditView2Base extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -754,7 +749,6 @@ export default class SYS_USER_ROLEEditView2Base extends Vue { ...@@ -754,7 +749,6 @@ export default class SYS_USER_ROLEEditView2Base extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -783,7 +777,6 @@ export default class SYS_USER_ROLEEditView2Base extends Vue { ...@@ -783,7 +777,6 @@ export default class SYS_USER_ROLEEditView2Base extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
......
app_web/src/pages/uaa/sys-user-rolegrid-view/sys-user-rolegrid-view-base.vue
浏览文件 @ 53a4e0db
...@@ -702,7 +702,6 @@ export default class SYS_USER_ROLEGridViewBase extends Vue { ...@@ -702,7 +702,6 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -731,7 +730,6 @@ export default class SYS_USER_ROLEGridViewBase extends Vue { ...@@ -731,7 +730,6 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -760,7 +758,6 @@ export default class SYS_USER_ROLEGridViewBase extends Vue { ...@@ -760,7 +758,6 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -789,7 +786,6 @@ export default class SYS_USER_ROLEGridViewBase extends Vue { ...@@ -789,7 +786,6 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -818,7 +814,6 @@ export default class SYS_USER_ROLEGridViewBase extends Vue { ...@@ -818,7 +814,6 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -847,7 +842,6 @@ export default class SYS_USER_ROLEGridViewBase extends Vue { ...@@ -847,7 +842,6 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -876,7 +870,6 @@ export default class SYS_USER_ROLEGridViewBase extends Vue { ...@@ -876,7 +870,6 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -905,7 +898,6 @@ export default class SYS_USER_ROLEGridViewBase extends Vue { ...@@ -905,7 +898,6 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -934,7 +926,6 @@ export default class SYS_USER_ROLEGridViewBase extends Vue { ...@@ -934,7 +926,6 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -963,7 +954,6 @@ export default class SYS_USER_ROLEGridViewBase extends Vue { ...@@ -963,7 +954,6 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -987,6 +977,8 @@ export default class SYS_USER_ROLEGridViewBase extends Vue { ...@@ -987,6 +977,8 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
* @memberof SYS_USER_ROLEGridView * @memberof SYS_USER_ROLEGridView
*/ */
public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) { public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) {
let localContext:any = null;
let localViewParam:any =null;
const batchAddPSAppViews=[ const batchAddPSAppViews=[
{view:{viewname:'sys-rolempickup-view',height: 0,width: 0,title: '角色数据多项选择视图'}, {view:{viewname:'sys-rolempickup-view',height: 0,width: 0,title: '角色数据多项选择视图'},
res:['SysRole'], res:['SysRole'],
...@@ -1045,13 +1037,15 @@ export default class SYS_USER_ROLEGridViewBase extends Vue { ...@@ -1045,13 +1037,15 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
* @memberof SYS_USER_ROLEGridView * @memberof SYS_USER_ROLEGridView
*/ */
public opendata(args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) { public opendata(args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) {
let localContext:any = null;
let localViewParam:any =null;
const data: any = {}; const data: any = {};
let curViewParam = JSON.parse(JSON.stringify(this.context)); let tempContext = JSON.parse(JSON.stringify(this.context));
if(args.length >0){ if(args.length >0){
Object.assign(curViewParam,args[0]); Object.assign(tempContext,args[0]);
} }
let deResParameters: any[] = []; let deResParameters: any[] = [];
if(curViewParam.sysrole && true){ if(tempContext.sysrole && true){
deResParameters = [ deResParameters = [
{ pathName: 'sysroles', parameterName: 'sysrole' }, { pathName: 'sysroles', parameterName: 'sysrole' },
] ]
...@@ -1062,7 +1056,7 @@ export default class SYS_USER_ROLEGridViewBase extends Vue { ...@@ -1062,7 +1056,7 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
]; ];
const _this: any = this; const _this: any = this;
const openIndexViewTab = (data: any) => { const openIndexViewTab = (data: any) => {
const routePath = this.$viewTool.buildUpRoutePath(this.$route, curViewParam, deResParameters, parameters, args, data); const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
this.$router.push(routePath); this.$router.push(routePath);
} }
openIndexViewTab(data); openIndexViewTab(data);
......
app_web/src/pages/uaa/sys-useredit-view/sys-useredit-view-base.vue
浏览文件 @ 53a4e0db
...@@ -577,7 +577,6 @@ export default class SYS_USEREditViewBase extends Vue { ...@@ -577,7 +577,6 @@ export default class SYS_USEREditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -606,7 +605,6 @@ export default class SYS_USEREditViewBase extends Vue { ...@@ -606,7 +605,6 @@ export default class SYS_USEREditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -635,7 +633,6 @@ export default class SYS_USEREditViewBase extends Vue { ...@@ -635,7 +633,6 @@ export default class SYS_USEREditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -664,7 +661,6 @@ export default class SYS_USEREditViewBase extends Vue { ...@@ -664,7 +661,6 @@ export default class SYS_USEREditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -693,7 +689,6 @@ export default class SYS_USEREditViewBase extends Vue { ...@@ -693,7 +689,6 @@ export default class SYS_USEREditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -722,7 +717,6 @@ export default class SYS_USEREditViewBase extends Vue { ...@@ -722,7 +717,6 @@ export default class SYS_USEREditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -751,7 +745,6 @@ export default class SYS_USEREditViewBase extends Vue { ...@@ -751,7 +745,6 @@ export default class SYS_USEREditViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
......
app_web/src/pages/uaa/sys-useredit-view2/sys-useredit-view2-base.vue
浏览文件 @ 53a4e0db
...@@ -609,7 +609,6 @@ export default class SYS_USEREditView2Base extends Vue { ...@@ -609,7 +609,6 @@ export default class SYS_USEREditView2Base extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -638,7 +637,6 @@ export default class SYS_USEREditView2Base extends Vue { ...@@ -638,7 +637,6 @@ export default class SYS_USEREditView2Base extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -667,7 +665,6 @@ export default class SYS_USEREditView2Base extends Vue { ...@@ -667,7 +665,6 @@ export default class SYS_USEREditView2Base extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -696,7 +693,6 @@ export default class SYS_USEREditView2Base extends Vue { ...@@ -696,7 +693,6 @@ export default class SYS_USEREditView2Base extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -725,7 +721,6 @@ export default class SYS_USEREditView2Base extends Vue { ...@@ -725,7 +721,6 @@ export default class SYS_USEREditView2Base extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -754,7 +749,6 @@ export default class SYS_USEREditView2Base extends Vue { ...@@ -754,7 +749,6 @@ export default class SYS_USEREditView2Base extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -783,7 +777,6 @@ export default class SYS_USEREditView2Base extends Vue { ...@@ -783,7 +777,6 @@ export default class SYS_USEREditView2Base extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
......
app_web/src/pages/uaa/sys-usergrid-view/sys-usergrid-view-base.vue
浏览文件 @ 53a4e0db
...@@ -705,7 +705,6 @@ export default class SYS_USERGridViewBase extends Vue { ...@@ -705,7 +705,6 @@ export default class SYS_USERGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -734,7 +733,6 @@ export default class SYS_USERGridViewBase extends Vue { ...@@ -734,7 +733,6 @@ export default class SYS_USERGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -763,7 +761,6 @@ export default class SYS_USERGridViewBase extends Vue { ...@@ -763,7 +761,6 @@ export default class SYS_USERGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -792,7 +789,6 @@ export default class SYS_USERGridViewBase extends Vue { ...@@ -792,7 +789,6 @@ export default class SYS_USERGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -821,7 +817,6 @@ export default class SYS_USERGridViewBase extends Vue { ...@@ -821,7 +817,6 @@ export default class SYS_USERGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -850,7 +845,6 @@ export default class SYS_USERGridViewBase extends Vue { ...@@ -850,7 +845,6 @@ export default class SYS_USERGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -879,7 +873,6 @@ export default class SYS_USERGridViewBase extends Vue { ...@@ -879,7 +873,6 @@ export default class SYS_USERGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -908,7 +901,6 @@ export default class SYS_USERGridViewBase extends Vue { ...@@ -908,7 +901,6 @@ export default class SYS_USERGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -937,7 +929,6 @@ export default class SYS_USERGridViewBase extends Vue { ...@@ -937,7 +929,6 @@ export default class SYS_USERGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -966,7 +957,6 @@ export default class SYS_USERGridViewBase extends Vue { ...@@ -966,7 +957,6 @@ export default class SYS_USERGridViewBase extends Vue {
// _this 指向容器对象 // _this 指向容器对象
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {}; let contextJO:any = {};
xData = this.$refs.grid; xData = this.$refs.grid;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
...@@ -990,14 +980,16 @@ export default class SYS_USERGridViewBase extends Vue { ...@@ -990,14 +980,16 @@ export default class SYS_USERGridViewBase extends Vue {
* @memberof SYS_USERGridView * @memberof SYS_USERGridView
*/ */
public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) { public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) {
let localContext:any = null;
let localViewParam:any =null;
const data: any = {}; const data: any = {};
if(args[0].srfsourcekey){ if(args[0].srfsourcekey){
data.srfsourcekey = args[0].srfsourcekey; data.srfsourcekey = args[0].srfsourcekey;
} }
let curViewParam = JSON.parse(JSON.stringify(this.context)); let tempContext = JSON.parse(JSON.stringify(this.context));
delete curViewParam.sysuser; delete tempContext.sysuser;
if(args.length >0){ if(args.length >0){
Object.assign(curViewParam,args[0]); Object.assign(tempContext,args[0]);
} }
const deResParameters: any[] = []; const deResParameters: any[] = [];
const parameters: any[] = [ const parameters: any[] = [
...@@ -1008,7 +1000,7 @@ export default class SYS_USERGridViewBase extends Vue { ...@@ -1008,7 +1000,7 @@ export default class SYS_USERGridViewBase extends Vue {
const openIndexViewTab = (data: any) => { const openIndexViewTab = (data: any) => {
const _data: any = { w: (new Date().getTime()) }; const _data: any = { w: (new Date().getTime()) };
Object.assign(_data, data); Object.assign(_data, data);
const routePath = this.$viewTool.buildUpRoutePath(this.$route, curViewParam, deResParameters, parameters, args, _data); const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data);
this.$router.push(routePath); this.$router.push(routePath);
} }
openIndexViewTab(data); openIndexViewTab(data);
...@@ -1026,10 +1018,12 @@ export default class SYS_USERGridViewBase extends Vue { ...@@ -1026,10 +1018,12 @@ export default class SYS_USERGridViewBase extends Vue {
* @memberof SYS_USERGridView * @memberof SYS_USERGridView
*/ */
public opendata(args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) { public opendata(args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) {
let localContext:any = null;
let localViewParam:any =null;
const data: any = {}; const data: any = {};
let curViewParam = JSON.parse(JSON.stringify(this.context)); let tempContext = JSON.parse(JSON.stringify(this.context));
if(args.length >0){ if(args.length >0){
Object.assign(curViewParam,args[0]); Object.assign(tempContext,args[0]);
} }
const deResParameters: any[] = []; const deResParameters: any[] = [];
const parameters: any[] = [ const parameters: any[] = [
...@@ -1038,7 +1032,7 @@ export default class SYS_USERGridViewBase extends Vue { ...@@ -1038,7 +1032,7 @@ export default class SYS_USERGridViewBase extends Vue {
]; ];
const _this: any = this; const _this: any = this;
const openIndexViewTab = (data: any) => { const openIndexViewTab = (data: any) => {
const routePath = this.$viewTool.buildUpRoutePath(this.$route, curViewParam, deResParameters, parameters, args, data); const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
this.$router.push(routePath); this.$router.push(routePath);
} }
openIndexViewTab(data); openIndexViewTab(data);
......
app_web/src/service/app/codelist-service.ts
浏览文件 @ 53a4e0db
import SystemPick from '@/codelist/system-pick';
import { Store } from 'vuex'; import { Store } from 'vuex';
/** /**
...@@ -49,6 +50,14 @@ export default class CodeListService { ...@@ -49,6 +50,14 @@ export default class CodeListService {
public static codelistCached:Map<string,any> = new Map(); public static codelistCached:Map<string,any> = new Map();
/**
* 代码表--SystemPick
*
* @type {SystemPick}
* @memberof CodeListService
*/
public SystemPick: SystemPick = new SystemPick();
/** /**
* 获取动态代码表 * 获取动态代码表
* *
......
app_web/src/shims-vue.d.ts
浏览文件 @ 53a4e0db
...@@ -8,4 +8,5 @@ declare module '@fullcalendar/timegrid'; ...@@ -8,4 +8,5 @@ declare module '@fullcalendar/timegrid';
declare module '@fullcalendar/list'; declare module '@fullcalendar/list';
declare module '@fullcalendar/interaction'; declare module '@fullcalendar/interaction';
declare module 'vue-grid-layout'; declare module 'vue-grid-layout';
declare module 'vue-print-nb'; declare module 'vue-print-nb';
\ No newline at end of file declare module 'vuedraggable';
\ No newline at end of file
app_web/src/utils/types/uiaction-tool.d.ts
浏览文件 @ 53a4e0db
...@@ -7,24 +7,28 @@ import Vue, { VNode, CreateElement } from "vue"; ...@@ -7,24 +7,28 @@ import Vue, { VNode, CreateElement } from "vue";
* @interface UIActionTool * @interface UIActionTool
*/ */
export declare interface UIActionTool { export declare interface UIActionTool {
/** /**
* 处理应用上下文参数 * 处理应用上下文参数
* *
* @param actionTarget 数据目标 * @param actionTarget 数据目标
* @param args 传入数据对象 * @param args 传入数据对象
* @param parentContext 父上下文
* @param parentParams 父参数
* @param param 传入应用上下数据参数 * @param param 传入应用上下数据参数
*/ */
handleContextParam(actionTarget:any,args:any,context:any):any; handleContextParam(actionTarget: any, args: any,parentContext:any,parentParams:any, context: any):any;
/** /**
* 处理界面行为参数 * 处理界面行为参数
* *
* @param actionTarget 数据目标 * @param actionTarget 数据目标
* @param args 传入数据对象 * @param args 传入数据对象
* @param parentContext 父上下文
* @param parentParams 父参数
* @param param 传入界面行为附加参数 * @param param 传入界面行为附加参数
*/ */
handleActionParam(actionTarget:any,args:any,params:any):any; handleActionParam(actionTarget: any, args: any,parentContext:any,parentParams:any, params: any):any;
} }
declare module "vue/types/vue" { declare module "vue/types/vue" {
......
app_web/src/utils/types/util.d.ts
浏览文件 @ 53a4e0db
...@@ -130,6 +130,20 @@ export declare interface Util { ...@@ -130,6 +130,20 @@ export declare interface Util {
*/ */
formatData(arg: any,parent:any, params: any): any ; formatData(arg: any,parent:any, params: any): any ;
/**
* 计算导航数据
* 先从当前数据目标计算，然后再从当前上下文计算，最后从当前视图参数计算，没有则为null
*
* @static
* @param {any} data 表单数据
* @param {any} parentContext 外层context
* @param {any} parentParam 外层param
* @param {any} params 附加参数
* @returns {any}
* @memberof Util
*/
computedNavData(data:any,parentContext:any,parentParam:any,params:any):any;
/** /**
* 日期格式化 * 日期格式化
* *
......
app_web/src/utils/uiaction-tool/uiaction-tool.ts
浏览文件 @ 53a4e0db
...@@ -8,10 +8,12 @@ export class UIActionTool { ...@@ -8,10 +8,12 @@ export class UIActionTool {
* *
* @param actionTarget 数据目标 * @param actionTarget 数据目标
* @param args 传入数据对象 * @param args 传入数据对象
* @param parentContext 父上下文
* @param parentParams 父参数
* @param param 传入应用上下数据参数 * @param param 传入应用上下数据参数
*/ */
public static handleContextParam(actionTarget: any, args: any, context: any) { public static handleContextParam(actionTarget: any, args: any,parentContext:any,parentParams:any, context: any) {
return this.formatData(actionTarget, args, context); return this.formatData(actionTarget, args,parentContext,parentParams,context);
} }
/** /**
...@@ -19,10 +21,12 @@ export class UIActionTool { ...@@ -19,10 +21,12 @@ export class UIActionTool {
* *
* @param actionTarget 数据目标 * @param actionTarget 数据目标
* @param args 传入数据对象 * @param args 传入数据对象
* @param parentContext 父上下文
* @param parentParams 父参数
* @param param 传入界面行为附加参数 * @param param 传入界面行为附加参数
*/ */
public static handleActionParam(actionTarget: any, args: any, params: any) { public static handleActionParam(actionTarget: any, args: any,parentContext:any,parentParams:any, params: any) {
return this.formatData(actionTarget, args, params); return this.formatData(actionTarget, args,parentContext,parentParams,params);
} }
/** /**
...@@ -32,11 +36,13 @@ export class UIActionTool { ...@@ -32,11 +36,13 @@ export class UIActionTool {
* @static * @static
* @param {*} actionTarget * @param {*} actionTarget
* @param {*} args * @param {*} args
* @param parentContext
* @param parentParams
* @param {*} _params * @param {*} _params
* @returns {*} * @returns {*}
* @memberof UIActionTool * @memberof UIActionTool
*/ */
private static formatData(actionTarget: any, args: any, _params: any): any { private static formatData(actionTarget: any, args: any,parentContext:any,parentParams:any, _params: any): any {
let _data: any = {}; let _data: any = {};
if (Object.is(actionTarget, 'SINGLEKEY')) { if (Object.is(actionTarget, 'SINGLEKEY')) {
let [arg] = args; let [arg] = args;
...@@ -50,12 +56,16 @@ export class UIActionTool { ...@@ -50,12 +56,16 @@ export class UIActionTool {
const key = value.substring(1, value.length - 1); const key = value.substring(1, value.length - 1);
if (arg && arg.hasOwnProperty(key)) { if (arg && arg.hasOwnProperty(key)) {
value = (arg[key] !== null && arg[key] !== undefined) ? arg[key] : null; value = (arg[key] !== null && arg[key] !== undefined) ? arg[key] : null;
} else { } else if(parentContext && parentContext.hasOwnProperty(key)){
value = (parentContext[key] !== null && parentContext[key] !== undefined) ? parentContext[key] : null;
}else if(parentParams && parentParams.hasOwnProperty(key)){
value = (parentParams[key] !== null && parentParams[key] !== undefined) ? parentParams[key] : null;
}else {
hasProperty = false; hasProperty = false;
} }
} }
if(hasProperty){ if(hasProperty){
Object.assign(_data, { [name]: value }); Object.assign(_data, { [name.toLowerCase()]: value });
} }
}); });
} else if (Object.is(actionTarget, 'MULTIKEY')) { } else if (Object.is(actionTarget, 'MULTIKEY')) {
...@@ -71,7 +81,11 @@ export class UIActionTool { ...@@ -71,7 +81,11 @@ export class UIActionTool {
args.forEach((arg: any) => { args.forEach((arg: any) => {
if (arg && arg.hasOwnProperty(key)) { if (arg && arg.hasOwnProperty(key)) {
value = (arg[key] !== null && arg[key] !== undefined) ? arg[key] : null; value = (arg[key] !== null && arg[key] !== undefined) ? arg[key] : null;
} else { }else if(parentContext && parentContext.hasOwnProperty(key)){
value = (parentContext[key] !== null && parentContext[key] !== undefined) ? parentContext[key] : null;
}else if(parentParams && parentParams.hasOwnProperty(key)){
value = (parentParams[key] !== null && parentParams[key] !== undefined) ? parentParams[key] : null;
}else {
value = null; value = null;
noPropertyNum++; noPropertyNum++;
} }
...@@ -79,7 +93,7 @@ export class UIActionTool { ...@@ -79,7 +93,7 @@ export class UIActionTool {
}); });
} }
if(values.length !== noPropertyNum){ if(values.length !== noPropertyNum){
Object.assign(_data, { [name]: values.length > 0 ? values.join(',') : value }); Object.assign(_data, { [name.toLowerCase()]: values.length > 0 ? values.join(',') : value });
} }
}); });
} }
......
app_web/src/utils/util/util.ts
浏览文件 @ 53a4e0db
...@@ -324,6 +324,44 @@ export class Util { ...@@ -324,6 +324,44 @@ export class Util {
return _data; return _data;
} }
/**
* 计算导航数据
* 先从当前数据目标计算，然后再从当前上下文计算，最后从当前视图参数计算，没有则为null
*
* @static
* @param {any} data 表单数据
* @param {any} parentContext 外层context
* @param {any} parentParam 外层param
* @param {any} params 附加参数
* @returns {any}
* @memberof Util
*/
public static computedNavData(data:any,parentContext:any,parentParam:any,params:any):any{
let _data: any = {};
if(params && Object.keys(params).length >0){
Object.keys(params).forEach((name: string) => {
if (!name) {
return;
}
let value: string | null = params[name];
if (value && value.startsWith('%') && value.endsWith('%')) {
const key = value.substring(1, value.length - 1).toLowerCase();
if (data && data.hasOwnProperty(key)) {
value = data[key];
}else if(parentContext && parentContext[key]){
value = parentContext[key];
}else if(parentParam && parentParam[key]){
value = parentParam[key];
} else {
value = null;
}
}
Object.assign(_data, { [name.toLowerCase()]: value });
});
}
return _data;
}
/** /**
* 日期格式化 * 日期格式化
* *
......
app_web/src/widgets/sys-app/main-form/main-form-base.vue
浏览文件 @ 53a4e0db
...@@ -8,7 +8,19 @@ ...@@ -8,7 +8,19 @@
<row> <row>
<i-col v-show="detailsModel.pssystemid.visible" :style="{}" :lg="{ span: 24, offset: 0 }"> <i-col v-show="detailsModel.pssystemid.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='pssystemid' :itemRules="this.rules.pssystemid" class='' :caption="$t('entities.sysapp.main_form.details.pssystemid')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.pssystemid.error" :isEmptyCaption="false" labelPos="LEFT"> <app-form-item name='pssystemid' :itemRules="this.rules.pssystemid" class='' :caption="$t('entities.sysapp.main_form.details.pssystemid')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.pssystemid.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.pssystemid" @enter="onEnter($event)" unit="" :disabled="detailsModel.pssystemid.disabled" type='text' style=""></input-box>
<dropdown-list
v-model="data.pssystemid"
:data="data"
:context="context"
:viewparams="viewparams"
:localContext ='{ }'
:localParam ='{ }'
:disabled="detailsModel.pssystemid.disabled"
tag='SystemPick'
codelistType='DYNAMIC'
placeholder='请选择...' style="">
</dropdown-list>
</app-form-item> </app-form-item>
</i-col> </i-col>
...@@ -26,7 +38,25 @@ ...@@ -26,7 +38,25 @@
</i-col> </i-col>
<i-col v-show="detailsModel.apptype.visible" :style="{}" :lg="{ span: 24, offset: 0 }"> <i-col v-show="detailsModel.apptype.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='apptype' :itemRules="this.rules.apptype" class='' :caption="$t('entities.sysapp.main_form.details.apptype')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.apptype.error" :isEmptyCaption="false" labelPos="LEFT"> <app-form-item name='apptype' :itemRules="this.rules.apptype" class='' :caption="$t('entities.sysapp.main_form.details.apptype')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.apptype.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.apptype" @enter="onEnter($event)" unit="" :disabled="detailsModel.apptype.disabled" type='text' style=""></input-box>
<dropdown-list
v-model="data.apptype"
:data="data"
:context="context"
:viewparams="viewparams"
:localContext ='{ }'
:localParam ='{ }'
:disabled="detailsModel.apptype.disabled"
tag='AppType'
codelistType='STATIC'
placeholder='请选择...' style="">
</dropdown-list>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.appgroup.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='appgroup' :itemRules="this.rules.appgroup" class='' :caption="$t('entities.sysapp.main_form.details.appgroup')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.appgroup.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.appgroup" @enter="onEnter($event)" unit="" :disabled="detailsModel.appgroup.disabled" type='text' style=""></input-box>
</app-form-item> </app-form-item>
</i-col> </i-col>
...@@ -368,6 +398,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -368,6 +398,7 @@ export default class MainBase extends Vue implements ControlInterface {
appid: null, appid: null,
appname: null, appname: null,
apptype: null, apptype: null,
appgroup: null,
fullname: null, fullname: null,
icon: null, icon: null,
visabled: null, visabled: null,
...@@ -480,6 +511,12 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -480,6 +511,12 @@ export default class MainBase extends Vue implements ControlInterface {
{ required: false, type: 'string', message: '类型 值不能为空', trigger: 'change' }, { required: false, type: 'string', message: '类型 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '类型 值不能为空', trigger: 'blur' }, { required: false, type: 'string', message: '类型 值不能为空', trigger: 'blur' },
], ],
appgroup: [
{ type: 'string', message: '分组 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '分组 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '分组 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '分组 值不能为空', trigger: 'blur' },
],
fullname: [ fullname: [
{ type: 'string', message: '全称 值必须为字符串类型', trigger: 'change' }, { type: 'string', message: '全称 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '全称 值必须为字符串类型', trigger: 'blur' }, { type: 'string', message: '全称 值必须为字符串类型', trigger: 'blur' },
...@@ -538,6 +575,8 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -538,6 +575,8 @@ export default class MainBase extends Vue implements ControlInterface {
appname: new FormItemModel({ caption: '应用名', detailType: 'FORMITEM', name: 'appname', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 1 }) appname: new FormItemModel({ caption: '应用名', detailType: 'FORMITEM', name: 'appname', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 1 })
, ,
apptype: new FormItemModel({ caption: '类型', detailType: 'FORMITEM', name: 'apptype', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }) apptype: new FormItemModel({ caption: '类型', detailType: 'FORMITEM', name: 'apptype', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
appgroup: new FormItemModel({ caption: '分组', detailType: 'FORMITEM', name: 'appgroup', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
, ,
fullname: new FormItemModel({ caption: '全称', detailType: 'FORMITEM', name: 'fullname', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }) fullname: new FormItemModel({ caption: '全称', detailType: 'FORMITEM', name: 'fullname', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
, ,
...@@ -681,6 +720,18 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -681,6 +720,18 @@ export default class MainBase extends Vue implements ControlInterface {
this.formDataChange({ name: 'apptype', newVal: newVal, oldVal: oldVal }); this.formDataChange({ name: 'apptype', newVal: newVal, oldVal: oldVal });
} }
/**
* 监控表单属性 appgroup 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof Main
*/
@Watch('data.appgroup')
onAppgroupChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'appgroup', newVal: newVal, oldVal: oldVal });
}
/** /**
* 监控表单属性 fullname 值 * 监控表单属性 fullname 值
* *
...@@ -782,6 +833,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -782,6 +833,7 @@ export default class MainBase extends Vue implements ControlInterface {
} }
/** /**
......
app_web/src/widgets/sys-app/main-form/main-form-model.ts
浏览文件 @ 53a4e0db
...@@ -68,6 +68,11 @@ export default class MainModel { ...@@ -68,6 +68,11 @@ export default class MainModel {
{ {
name: 'apptype', name: 'apptype',
prop: 'type', prop: 'type',
dataType: 'SSCODELIST',
},
{
name: 'appgroup',
prop: 'group',
dataType: 'TEXT', dataType: 'TEXT',
}, },
{ {
......
app_web/src/widgets/sys-app/main-grid/main-grid-model.ts
浏览文件 @ 53a4e0db
...@@ -32,38 +32,28 @@ export default class MainModel { ...@@ -32,38 +32,28 @@ export default class MainModel {
dataType: 'TEXT', dataType: 'TEXT',
}, },
{ {
name: 'visabled', name: 'pssystemid',
prop: 'visabled', prop: 'systemid',
dataType: 'YESNO', dataType: 'PICKUP',
},
{
name: 'appname',
prop: 'label',
dataType: 'TEXT',
}, },
{ {
name: 'appid', name: 'appid',
prop: 'id', prop: 'id',
dataType: 'TEXT', dataType: 'TEXT',
}, },
{
name: 'pssystemid',
prop: 'systemid',
dataType: 'PICKUP',
},
{ {
name: 'addr', name: 'addr',
prop: 'addr', prop: 'addr',
dataType: 'TEXT', dataType: 'TEXT',
}, },
{ {
name: 'apptype', name: 'srfmajortext',
prop: 'type', prop: 'label',
dataType: 'TEXT', dataType: 'TEXT',
}, },
{ {
name: 'srfmajortext', name: 'srfkey',
prop: 'label', prop: 'id',
dataType: 'TEXT', dataType: 'TEXT',
}, },
{ {
...@@ -72,8 +62,28 @@ export default class MainModel { ...@@ -72,8 +62,28 @@ export default class MainModel {
dataType: 'TEXT', dataType: 'TEXT',
}, },
{ {
name: 'srfkey', name: 'appname',
prop: 'id', prop: 'label',
dataType: 'TEXT',
},
{
name: 'visabled',
prop: 'visabled',
dataType: 'YESNO',
},
{
name: 'pssystemid_text',
prop: 'systemid',
dataType: 'PICKUP',
},
{
name: 'apptype',
prop: 'type',
dataType: 'SSCODELIST',
},
{
name: 'appgroup',
prop: 'group',
dataType: 'TEXT', dataType: 'TEXT',
}, },
{ {
......
app_web/src/widgets/sys-auth-log/default-searchform/default-searchform-base.vue
浏览文件 @ 53a4e0db
...@@ -18,12 +18,14 @@ ...@@ -18,12 +18,14 @@
</i-col> </i-col>
<i-col v-show="detailsModel.n_authcode_eq.visible" :style="{}" :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 8, offset: 0 }"> <i-col v-show="detailsModel.n_authcode_eq.visible" :style="{}" :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 8, offset: 0 }">
<app-form-item name='n_authcode_eq' :itemRules="this.rules.n_authcode_eq" class='' :caption="$t('entities.sysauthlog.default_searchform.details.n_authcode_eq')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_authcode_eq.error" :isEmptyCaption="false" labelPos="LEFT"> <app-form-item name='n_authcode_eq' :itemRules="this.rules.n_authcode_eq" class='' :caption="$t('entities.sysauthlog.default_searchform.details.n_authcode_eq')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_authcode_eq.error" :isEmptyCaption="false" labelPos="LEFT">
<dropdown-list
<dropdown-list
v-model="data.n_authcode_eq" v-model="data.n_authcode_eq"
:data="data" :data="data"
:context="context" :context="context"
:viewparams="viewparams" :viewparams="viewparams"
:itemParam="{}" :localContext ='{ }'
:localParam ='{ }'
:disabled="detailsModel.n_authcode_eq.disabled" :disabled="detailsModel.n_authcode_eq.disabled"
tag='CLAuthCode' tag='CLAuthCode'
codelistType='STATIC' codelistType='STATIC'
......
app_web/src/widgets/sys-auth-log/main-grid/main-grid-base.vue
浏览文件 @ 53a4e0db
...@@ -1513,6 +1513,14 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1513,6 +1513,14 @@ export default class MainBase extends Vue implements ControlInterface {
}); });
return isSelected ? "grid-selected-row" : ""; return isSelected ? "grid-selected-row" : "";
} }
/**
* 新建默认值
* @param {*} row 行数据
* @memberof Main
*/
public createDefault(row: any){
}
} }
</script> </script>
......
app_web/src/widgets/sys-permission/main-grid/main-grid-base.vue
浏览文件 @ 53a4e0db
...@@ -1375,6 +1375,14 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1375,6 +1375,14 @@ export default class MainBase extends Vue implements ControlInterface {
}); });
return isSelected ? "grid-selected-row" : ""; return isSelected ? "grid-selected-row" : "";
} }
/**
* 新建默认值
* @param {*} row 行数据
* @memberof Main
*/
public createDefault(row: any){
}
} }
</script> </script>
......
app_web/src/widgets/sys-role-permission/main-form/main-form-base.vue
浏览文件 @ 53a4e0db
...@@ -14,7 +14,8 @@ ...@@ -14,7 +14,8 @@
:data="data" :data="data"
:context="context" :context="context"
:viewparams="viewparams" :viewparams="viewparams"
:itemParam='{ }' :localContext ='{ }'
:localParam ='{ }'
:disabled="detailsModel.sys_rolename.disabled" :disabled="detailsModel.sys_rolename.disabled"
name='sys_rolename' name='sys_rolename'
deMajorField='rolename' deMajorField='rolename'
...@@ -40,7 +41,8 @@ ...@@ -40,7 +41,8 @@
:data="data" :data="data"
:context="context" :context="context"
:viewparams="viewparams" :viewparams="viewparams"
:itemParam='{ }' :localContext ='{ }'
:localParam ='{ }'
:disabled="detailsModel.sys_permissionname.disabled" :disabled="detailsModel.sys_permissionname.disabled"
name='sys_permissionname' name='sys_permissionname'
deMajorField='permissionname' deMajorField='permissionname'
......
app_web/src/widgets/sys-role-permission/main-grid/main-grid-base.vue
浏览文件 @ 53a4e0db
...@@ -1408,6 +1408,14 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1408,6 +1408,14 @@ export default class MainBase extends Vue implements ControlInterface {
}); });
return isSelected ? "grid-selected-row" : ""; return isSelected ? "grid-selected-row" : "";
} }
/**
* 新建默认值
* @param {*} row 行数据
* @memberof Main
*/
public createDefault(row: any){
}
} }
</script> </script>
......
app_web/src/widgets/sys-role/main-form/main-form-base.vue
浏览文件 @ 53a4e0db
...@@ -47,6 +47,8 @@ ...@@ -47,6 +47,8 @@
]" ]"
:context="context" :context="context"
:viewparams="viewparams" :viewparams="viewparams"
:localContext ='{}'
:localParam ='{}'
parameterName='sysrole' parameterName='sysrole'
parentName="SysRole" parentName="SysRole"
refviewtype='DECUSTOMVIEW' refviewtype='DECUSTOMVIEW'
...@@ -83,6 +85,8 @@ ...@@ -83,6 +85,8 @@
]" ]"
:context="context" :context="context"
:viewparams="viewparams" :viewparams="viewparams"
:localContext ='{}'
:localParam ='{}'
parameterName='sysrole' parameterName='sysrole'
parentName="SysRole" parentName="SysRole"
refviewtype='DEGRIDVIEW' refviewtype='DEGRIDVIEW'
......
app_web/src/widgets/sys-role/main-grid/main-grid-base.vue
浏览文件 @ 53a4e0db
...@@ -1427,6 +1427,14 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1427,6 +1427,14 @@ export default class MainBase extends Vue implements ControlInterface {
}); });
return isSelected ? "grid-selected-row" : ""; return isSelected ? "grid-selected-row" : "";
} }
/**
* 新建默认值
* @param {*} row 行数据
* @memberof Main
*/
public createDefault(row: any){
}
} }
</script> </script>
......
app_web/src/widgets/sys-user-role/main-form/main-form-base.vue
浏览文件 @ 53a4e0db
...@@ -14,12 +14,8 @@ ...@@ -14,12 +14,8 @@
</i-col> </i-col>
<i-col v-show="detailsModel.sys_user_roleid.visible" :style="{}" :lg="{ span: 24, offset: 0 }"> <i-col v-show="detailsModel.sys_user_roleid.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='sys_user_roleid' :itemRules="this.rules.sys_user_roleid" class='' :caption="$t('entities.sysuserrole.main_form.details.sys_user_roleid')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.sys_user_roleid.error" :isEmptyCaption="false" labelPos="LEFT"> <app-form-item name='sys_user_roleid' :itemRules="this.rules.sys_user_roleid" class='' :caption="$t('entities.sysuserrole.main_form.details.sys_user_roleid')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.sys_user_roleid.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span name='sys_user_roleid'
:value="data.sys_user_roleid" :data="data" <app-span name='sys_user_roleid' :value="data.sys_user_roleid" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style=""></app-span>
:context="context"
:viewparams="viewparams"
:itemParam="{}"
style=""></app-span>
</app-form-item> </app-form-item>
</i-col> </i-col>
...@@ -31,7 +27,8 @@ style=""></app-span> ...@@ -31,7 +27,8 @@ style=""></app-span>
:data="data" :data="data"
:context="context" :context="context"
:viewparams="viewparams" :viewparams="viewparams"
:itemParam='{ }' :localContext ='{ }'
:localParam ='{ }'
:disabled="detailsModel.sys_rolename.disabled" :disabled="detailsModel.sys_rolename.disabled"
name='sys_rolename' name='sys_rolename'
deMajorField='rolename' deMajorField='rolename'
...@@ -57,7 +54,8 @@ style=""></app-span> ...@@ -57,7 +54,8 @@ style=""></app-span>
:data="data" :data="data"
:context="context" :context="context"
:viewparams="viewparams" :viewparams="viewparams"
:itemParam='{ }' :localContext ='{ }'
:localParam ='{ }'
:disabled="detailsModel.sys_username.disabled" :disabled="detailsModel.sys_username.disabled"
name='sys_username' name='sys_username'
deMajorField='personname' deMajorField='personname'
......
app_web/src/widgets/sys-user-role/main-grid/main-grid-base.vue
浏览文件 @ 53a4e0db
...@@ -1403,6 +1403,14 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1403,6 +1403,14 @@ export default class MainBase extends Vue implements ControlInterface {
}); });
return isSelected ? "grid-selected-row" : ""; return isSelected ? "grid-selected-row" : "";
} }
/**
* 新建默认值
* @param {*} row 行数据
* @memberof Main
*/
public createDefault(row: any){
}
} }
</script> </script>
......
app_web/src/widgets/sys-user/main-form/main-form-base.vue
浏览文件 @ 53a4e0db
...@@ -33,6 +33,8 @@ ...@@ -33,6 +33,8 @@
]" ]"
:context="context" :context="context"
:viewparams="viewparams" :viewparams="viewparams"
:localContext ='{}'
:localParam ='{}'
parameterName='sysuser' parameterName='sysuser'
parentName="SysUser" parentName="SysUser"
refviewtype='DEGRIDVIEW' refviewtype='DEGRIDVIEW'
......
app_web/src/widgets/sys-user/main-grid/main-grid-base.vue
浏览文件 @ 53a4e0db
...@@ -1408,6 +1408,14 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1408,6 +1408,14 @@ export default class MainBase extends Vue implements ControlInterface {
}); });
return isSelected ? "grid-selected-row" : ""; return isSelected ? "grid-selected-row" : "";
} }
/**
* 新建默认值
* @param {*} row 行数据
* @memberof Main
*/
public createDefault(row: any){
}
} }
</script> </script>
......
ibzuaa-core/pom.xml
浏览文件 @ 53a4e0db
...@@ -156,7 +156,7 @@ ...@@ -156,7 +156,7 @@
<verbose>true</verbose> <verbose>true</verbose>
<logging>debug</logging> <logging>debug</logging>
<contexts>!test</contexts> <contexts>!test</contexts>
<diffExcludeObjects>Index:.*,table:ibzfile,ibzuser,ibzdataaudit,IBZFILE,IBZUSER,IBZDATAAUDIT</diffExcludeObjects> <diffExcludeObjects>Index:.*,table:ibzfile,ibzuser,ibzdataaudit,ibzcfg,IBZFILE,IBZUSER,IBZDATAAUDIT,IBZCFG</diffExcludeObjects>
</configuration> </configuration>
<phase>process-resources</phase> <phase>process-resources</phase>
<goals> <goals>
......
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SysApp.java
浏览文件 @ 53a4e0db
...@@ -72,11 +72,12 @@ public class SysApp extends EntityBase implements Serializable { ...@@ -72,11 +72,12 @@ public class SysApp extends EntityBase implements Serializable {
private String type; private String type;
/** /**
* 地址 * 分组
*/ */
@JSONField(name = "addr") @DEField(name = "appgroup")
@JsonProperty("addr") @JSONField(name = "group")
private String addr; @JsonProperty("group")
private String group;
/** /**
* 图标 * 图标
...@@ -92,6 +93,13 @@ public class SysApp extends EntityBase implements Serializable { ...@@ -92,6 +93,13 @@ public class SysApp extends EntityBase implements Serializable {
@JsonProperty("visabled") @JsonProperty("visabled")
private Integer visabled; private Integer visabled;
/**
* 地址
*/
@JSONField(name = "addr")
@JsonProperty("addr")
private String addr;
/** /**
* *
......
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/extensions/aspect/SysPSSystemAspect.java
浏览文件 @ 53a4e0db
...@@ -86,17 +86,25 @@ public class SysPSSystemAspect ...@@ -86,17 +86,25 @@ public class SysPSSystemAspect
return; return;
Map<String,SysApp> oldApps = new HashMap<>(); Map<String,SysApp> oldApps = new HashMap<>();
List<SysApp> newList=new ArrayList<>();
SysPSSystem old = sysPSSystemService.getById(system.getPssystemid()); SysPSSystem old = sysPSSystemService.getById(system.getPssystemid());
if(old!=null&&old.getApps()!=null) if(old!=null&&old.getApps()!=null)
old.getApps().forEach(app->oldApps.put(app.getId(),app)); old.getApps().forEach(app->oldApps.put(app.getId(),app));
List<SysApp> newList=new ArrayList<>();
system.getSysstructure().getSysApps(true).forEach(appNode -> { system.getSysstructure().getSysApps(true).forEach(appNode -> {
if(oldApps.containsKey(appNode.getId())) if(oldApps.containsKey(appNode.getId()))
newList.add(oldApps.get(appNode.getId())); newList.add(oldApps.get(appNode.getId()));
else else {
appNode.setVisabled(1);
newList.add(appNode); newList.add(appNode);
}
}); });
if(old!=null&&old.getApps()!=null)
old.getApps().forEach(app->{
if("THIRD-PARTY".equalsIgnoreCase(app.getGroup()))
newList.add(app);
});
system.setApps(newList); system.setApps(newList);
} }
......
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/extensions/domain/SysStructure.java
浏览文件 @ 53a4e0db
...@@ -226,7 +226,7 @@ public class SysStructure ...@@ -226,7 +226,7 @@ public class SysStructure
return apps; return apps;
this.getApps().forEach(app-> { this.getApps().forEach(app-> {
SysApp sysApp = SysApp.builder() SysApp sysApp = SysApp.builder()
.label(app.getAppname()).systemid(systemid).id(systemid.toLowerCase()+"-app-"+app.getAppid().toLowerCase()).build(); .label(app.getAppname()).systemid(systemid).id(systemid.toLowerCase()+"-"+app.getAppid().toLowerCase()).build();
apps.add(sysApp); apps.add(sysApp);
}); });
return apps; return apps;
......
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/extensions/service/SysAppService.java
浏览文件 @ 53a4e0db
...@@ -42,27 +42,37 @@ public class SysAppService extends SysAppServiceImpl ...@@ -42,27 +42,37 @@ public class SysAppService extends SysAppServiceImpl
private UAACoreService uaaCoreService; private UAACoreService uaaCoreService;
@Cacheable( value="ibzuaa_appnavbar",key = "'id:'+#p0+'||'+#p1") @Cacheable( value="ibzuaa_switcher",key = "'id:'+#p0+'||'+#p1")
public JSONObject getAppNavigationBar(String navId,String userId) public JSONObject getAppSwitcher(String id,String userId)
{ {
JSONObject jo=ibzConfigService.getConfig("AppNavigationBar",navId, userId); JSONObject jo=ibzConfigService.getConfig("AppSwitcher",id, userId);
if(!jo.containsKey("model")) boolean nullSwitcher=false;
jo.put("model",new JSONArray()); if(!jo.containsKey("model")) {
jo.put("model", new JSONArray());
nullSwitcher=true;
}
LinkedHashMap<String,SysApp> defApps=uaaCoreService.getApps(); LinkedHashMap<String,SysApp> defApps=uaaCoreService.getApps();
List<SysApp> list=new ArrayList<>(); List<SysApp> list=new ArrayList<>();
JSONArray.parseArray(jo.get("model").toString(),SysApp.class).forEach(sysApp -> { JSONArray.parseArray(jo.get("model").toString(),SysApp.class).forEach(sysApp -> {
SysApp def=defApps.get(sysApp.getId()); SysApp def=defApps.get(sysApp.getId());
if(def==null)return; if(def==null)return;
if(1!=def.getVisabled())return;
sysApp.setAddr(def.getAddr()); sysApp.setAddr(def.getAddr());
sysApp.setIcon(def.getIcon()); sysApp.setIcon(def.getIcon());
sysApp.setFullname(def.getFullname()); sysApp.setFullname(def.getFullname());
sysApp.setType(def.getType()); sysApp.setType(def.getType());
sysApp.setVisabled(1); sysApp.setGroup(def.getGroup());
list.add(sysApp); list.add(sysApp);
defApps.remove(def.getId()); defApps.remove(def.getId());
}); });
final boolean flag=nullSwitcher;
defApps.values().forEach(sysApp -> { defApps.values().forEach(sysApp -> {
sysApp.setVisabled(0); if(1!=sysApp.getVisabled())return;
if(flag&&id.equalsIgnoreCase("default"))
sysApp.setVisabled(1);
else
sysApp.setVisabled(0);
list.add(sysApp); list.add(sysApp);
}); });
jo.remove("model"); jo.remove("model");
...@@ -70,7 +80,7 @@ public class SysAppService extends SysAppServiceImpl ...@@ -70,7 +80,7 @@ public class SysAppService extends SysAppServiceImpl
return jo; return jo;
} }
@CacheEvict( value="ibzuaa_appnavbar",allEntries=true) @CacheEvict( value="ibzuaa_switcher",allEntries=true)
public void resetAppNavigationBars() public void resetAppNavigationBars()
{ {
......
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/extensions/service/UAACoreService.java
浏览文件 @ 53a4e0db
...@@ -110,7 +110,7 @@ public class UAACoreService { ...@@ -110,7 +110,7 @@ public class UAACoreService {
if(PermissionType.APPMENU.toString().equals(sysRolePermission.getPermissiontype())) if(PermissionType.APPMENU.toString().equals(sysRolePermission.getPermissiontype()))
{ {
//补充应用访问权 //补充应用访问权
String appid = sysRolePermission.getPermissionid().split("-")[0].toLowerCase()+"-app-"+sysRolePermission.getPermissionid().split("-")[1].toLowerCase(); String appid = sysRolePermission.getPermissionid().split("-")[0].toLowerCase()+"-"+sysRolePermission.getPermissionid().split("-")[1].toLowerCase();
if(!apps.contains(appid)){ if(!apps.contains(appid)){
apps.add(appid); apps.add(appid);
authorities.add(new SimpleGrantedAuthority(sysRolePermission.getPermissiontype()+"_"+appid)); authorities.add(new SimpleGrantedAuthority(sysRolePermission.getPermissiontype()+"_"+appid));
......
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/filter/SysAuthLogSearchContext.java
浏览文件 @ 53a4e0db
...@@ -31,21 +31,21 @@ public class SysAuthLogSearchContext extends QueryWrapperContext<SysAuthLog> { ...@@ -31,21 +31,21 @@ public class SysAuthLogSearchContext extends QueryWrapperContext<SysAuthLog> {
public void setN_username_like(String n_username_like) { public void setN_username_like(String n_username_like) {
this.n_username_like = n_username_like; this.n_username_like = n_username_like;
if(!ObjectUtils.isEmpty(this.n_username_like)){ if(!ObjectUtils.isEmpty(this.n_username_like)){
this.getSelectCond().like("username", n_username_like); this.getSearchCond().like("username", n_username_like);
} }
} }
private String n_personname_like;//[用户名称] private String n_personname_like;//[用户名称]
public void setN_personname_like(String n_personname_like) { public void setN_personname_like(String n_personname_like) {
this.n_personname_like = n_personname_like; this.n_personname_like = n_personname_like;
if(!ObjectUtils.isEmpty(this.n_personname_like)){ if(!ObjectUtils.isEmpty(this.n_personname_like)){
this.getSelectCond().like("personname", n_personname_like); this.getSearchCond().like("personname", n_personname_like);
} }
} }
private String n_domain_like;//[域] private String n_domain_like;//[域]
public void setN_domain_like(String n_domain_like) { public void setN_domain_like(String n_domain_like) {
this.n_domain_like = n_domain_like; this.n_domain_like = n_domain_like;
if(!ObjectUtils.isEmpty(this.n_domain_like)){ if(!ObjectUtils.isEmpty(this.n_domain_like)){
this.getSelectCond().like("domain", n_domain_like); this.getSearchCond().like("domain", n_domain_like);
} }
} }
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8") @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
...@@ -54,7 +54,7 @@ public class SysAuthLogSearchContext extends QueryWrapperContext<SysAuthLog> { ...@@ -54,7 +54,7 @@ public class SysAuthLogSearchContext extends QueryWrapperContext<SysAuthLog> {
public void setN_authtime_gtandeq(Timestamp n_authtime_gtandeq) { public void setN_authtime_gtandeq(Timestamp n_authtime_gtandeq) {
this.n_authtime_gtandeq = n_authtime_gtandeq; this.n_authtime_gtandeq = n_authtime_gtandeq;
if(!ObjectUtils.isEmpty(this.n_authtime_gtandeq)){ if(!ObjectUtils.isEmpty(this.n_authtime_gtandeq)){
this.getSelectCond().ge("authtime", n_authtime_gtandeq); this.getSearchCond().ge("authtime", n_authtime_gtandeq);
} }
} }
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8") @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
...@@ -63,21 +63,21 @@ public class SysAuthLogSearchContext extends QueryWrapperContext<SysAuthLog> { ...@@ -63,21 +63,21 @@ public class SysAuthLogSearchContext extends QueryWrapperContext<SysAuthLog> {
public void setN_authtime_ltandeq(Timestamp n_authtime_ltandeq) { public void setN_authtime_ltandeq(Timestamp n_authtime_ltandeq) {
this.n_authtime_ltandeq = n_authtime_ltandeq; this.n_authtime_ltandeq = n_authtime_ltandeq;
if(!ObjectUtils.isEmpty(this.n_authtime_ltandeq)){ if(!ObjectUtils.isEmpty(this.n_authtime_ltandeq)){
this.getSelectCond().le("authtime", n_authtime_ltandeq); this.getSearchCond().le("authtime", n_authtime_ltandeq);
} }
} }
private String n_ipaddr_like;//[IP地址] private String n_ipaddr_like;//[IP地址]
public void setN_ipaddr_like(String n_ipaddr_like) { public void setN_ipaddr_like(String n_ipaddr_like) {
this.n_ipaddr_like = n_ipaddr_like; this.n_ipaddr_like = n_ipaddr_like;
if(!ObjectUtils.isEmpty(this.n_ipaddr_like)){ if(!ObjectUtils.isEmpty(this.n_ipaddr_like)){
this.getSelectCond().like("ipaddr", n_ipaddr_like); this.getSearchCond().like("ipaddr", n_ipaddr_like);
} }
} }
private String n_authcode_eq;//[认证结果] private String n_authcode_eq;//[认证结果]
public void setN_authcode_eq(String n_authcode_eq) { public void setN_authcode_eq(String n_authcode_eq) {
this.n_authcode_eq = n_authcode_eq; this.n_authcode_eq = n_authcode_eq;
if(!ObjectUtils.isEmpty(this.n_authcode_eq)){ if(!ObjectUtils.isEmpty(this.n_authcode_eq)){
this.getSelectCond().eq("authcode", n_authcode_eq); this.getSearchCond().eq("authcode", n_authcode_eq);
} }
} }
...@@ -88,7 +88,7 @@ public class SysAuthLogSearchContext extends QueryWrapperContext<SysAuthLog> { ...@@ -88,7 +88,7 @@ public class SysAuthLogSearchContext extends QueryWrapperContext<SysAuthLog> {
{ {
this.query=query; this.query=query;
if(!StringUtils.isEmpty(query)){ if(!StringUtils.isEmpty(query)){
this.getSelectCond().and( wrapper -> this.getSearchCond().and( wrapper ->
wrapper.like("username", query) wrapper.like("username", query)
); );
} }
......
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/filter/SysPSSystemSearchContext.java
浏览文件 @ 53a4e0db
...@@ -31,7 +31,7 @@ public class SysPSSystemSearchContext extends QueryWrapperContext<SysPSSystem> { ...@@ -31,7 +31,7 @@ public class SysPSSystemSearchContext extends QueryWrapperContext<SysPSSystem> {
public void setN_pssystemname_like(String n_pssystemname_like) { public void setN_pssystemname_like(String n_pssystemname_like) {
this.n_pssystemname_like = n_pssystemname_like; this.n_pssystemname_like = n_pssystemname_like;
if(!ObjectUtils.isEmpty(this.n_pssystemname_like)){ if(!ObjectUtils.isEmpty(this.n_pssystemname_like)){
this.getSelectCond().like("pssystemname", n_pssystemname_like); this.getSearchCond().like("pssystemname", n_pssystemname_like);
} }
} }
...@@ -42,7 +42,7 @@ public class SysPSSystemSearchContext extends QueryWrapperContext<SysPSSystem> { ...@@ -42,7 +42,7 @@ public class SysPSSystemSearchContext extends QueryWrapperContext<SysPSSystem> {
{ {
this.query=query; this.query=query;
if(!StringUtils.isEmpty(query)){ if(!StringUtils.isEmpty(query)){
this.getSelectCond().and( wrapper -> this.getSearchCond().and( wrapper ->
wrapper.like("pssystemname", query) wrapper.like("pssystemname", query)
); );
} }
......
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/filter/SysPermissionSearchContext.java
浏览文件 @ 53a4e0db
...@@ -31,28 +31,28 @@ public class SysPermissionSearchContext extends QueryWrapperContext<SysPermissio ...@@ -31,28 +31,28 @@ public class SysPermissionSearchContext extends QueryWrapperContext<SysPermissio
public void setN_sys_permissionid_like(String n_sys_permissionid_like) { public void setN_sys_permissionid_like(String n_sys_permissionid_like) {
this.n_sys_permissionid_like = n_sys_permissionid_like; this.n_sys_permissionid_like = n_sys_permissionid_like;
if(!ObjectUtils.isEmpty(this.n_sys_permissionid_like)){ if(!ObjectUtils.isEmpty(this.n_sys_permissionid_like)){
this.getSelectCond().like("sys_permissionid", n_sys_permissionid_like); this.getSearchCond().like("sys_permissionid", n_sys_permissionid_like);
} }
} }
private String n_sys_permissionname_like;//[资源名称] private String n_sys_permissionname_like;//[资源名称]
public void setN_sys_permissionname_like(String n_sys_permissionname_like) { public void setN_sys_permissionname_like(String n_sys_permissionname_like) {
this.n_sys_permissionname_like = n_sys_permissionname_like; this.n_sys_permissionname_like = n_sys_permissionname_like;
if(!ObjectUtils.isEmpty(this.n_sys_permissionname_like)){ if(!ObjectUtils.isEmpty(this.n_sys_permissionname_like)){
this.getSelectCond().like("sys_permissionname", n_sys_permissionname_like); this.getSearchCond().like("sys_permissionname", n_sys_permissionname_like);
} }
} }
private String n_permissiontype_eq;//[资源类别] private String n_permissiontype_eq;//[资源类别]
public void setN_permissiontype_eq(String n_permissiontype_eq) { public void setN_permissiontype_eq(String n_permissiontype_eq) {
this.n_permissiontype_eq = n_permissiontype_eq; this.n_permissiontype_eq = n_permissiontype_eq;
if(!ObjectUtils.isEmpty(this.n_permissiontype_eq)){ if(!ObjectUtils.isEmpty(this.n_permissiontype_eq)){
this.getSelectCond().eq("permissiontype", n_permissiontype_eq); this.getSearchCond().eq("permissiontype", n_permissiontype_eq);
} }
} }
private Integer n_enable_eq;//[逻辑有效] private Integer n_enable_eq;//[逻辑有效]
public void setN_enable_eq(Integer n_enable_eq) { public void setN_enable_eq(Integer n_enable_eq) {
this.n_enable_eq = n_enable_eq; this.n_enable_eq = n_enable_eq;
if(!ObjectUtils.isEmpty(this.n_enable_eq)){ if(!ObjectUtils.isEmpty(this.n_enable_eq)){
this.getSelectCond().eq("enable", n_enable_eq); this.getSearchCond().eq("enable", n_enable_eq);
} }
} }
...@@ -63,7 +63,7 @@ public class SysPermissionSearchContext extends QueryWrapperContext<SysPermissio ...@@ -63,7 +63,7 @@ public class SysPermissionSearchContext extends QueryWrapperContext<SysPermissio
{ {
this.query=query; this.query=query;
if(!StringUtils.isEmpty(query)){ if(!StringUtils.isEmpty(query)){
this.getSelectCond().and( wrapper -> this.getSearchCond().and( wrapper ->
wrapper.like("sys_permissionname", query) wrapper.like("sys_permissionname", query)
); );
} }
......
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/filter/SysRolePermissionSearchContext.java
浏览文件 @ 53a4e0db
...@@ -31,42 +31,42 @@ public class SysRolePermissionSearchContext extends QueryWrapperContext<SysRoleP ...@@ -31,42 +31,42 @@ public class SysRolePermissionSearchContext extends QueryWrapperContext<SysRoleP
public void setN_sys_roleid_eq(String n_sys_roleid_eq) { public void setN_sys_roleid_eq(String n_sys_roleid_eq) {
this.n_sys_roleid_eq = n_sys_roleid_eq; this.n_sys_roleid_eq = n_sys_roleid_eq;
if(!ObjectUtils.isEmpty(this.n_sys_roleid_eq)){ if(!ObjectUtils.isEmpty(this.n_sys_roleid_eq)){
this.getSelectCond().eq("sys_roleid", n_sys_roleid_eq); this.getSearchCond().eq("sys_roleid", n_sys_roleid_eq);
} }
} }
private String n_sys_rolename_eq;//[角色名称] private String n_sys_rolename_eq;//[角色名称]
public void setN_sys_rolename_eq(String n_sys_rolename_eq) { public void setN_sys_rolename_eq(String n_sys_rolename_eq) {
this.n_sys_rolename_eq = n_sys_rolename_eq; this.n_sys_rolename_eq = n_sys_rolename_eq;
if(!ObjectUtils.isEmpty(this.n_sys_rolename_eq)){ if(!ObjectUtils.isEmpty(this.n_sys_rolename_eq)){
this.getSelectCond().eq("sys_rolename", n_sys_rolename_eq); this.getSearchCond().eq("sys_rolename", n_sys_rolename_eq);
} }
} }
private String n_sys_rolename_like;//[角色名称] private String n_sys_rolename_like;//[角色名称]
public void setN_sys_rolename_like(String n_sys_rolename_like) { public void setN_sys_rolename_like(String n_sys_rolename_like) {
this.n_sys_rolename_like = n_sys_rolename_like; this.n_sys_rolename_like = n_sys_rolename_like;
if(!ObjectUtils.isEmpty(this.n_sys_rolename_like)){ if(!ObjectUtils.isEmpty(this.n_sys_rolename_like)){
this.getSelectCond().like("sys_rolename", n_sys_rolename_like); this.getSearchCond().like("sys_rolename", n_sys_rolename_like);
} }
} }
private String n_sys_permissionid_eq;//[权限表标识] private String n_sys_permissionid_eq;//[权限表标识]
public void setN_sys_permissionid_eq(String n_sys_permissionid_eq) { public void setN_sys_permissionid_eq(String n_sys_permissionid_eq) {
this.n_sys_permissionid_eq = n_sys_permissionid_eq; this.n_sys_permissionid_eq = n_sys_permissionid_eq;
if(!ObjectUtils.isEmpty(this.n_sys_permissionid_eq)){ if(!ObjectUtils.isEmpty(this.n_sys_permissionid_eq)){
this.getSelectCond().eq("sys_permissionid", n_sys_permissionid_eq); this.getSearchCond().eq("sys_permissionid", n_sys_permissionid_eq);
} }
} }
private String n_sys_permissionname_eq;//[权限名称] private String n_sys_permissionname_eq;//[权限名称]
public void setN_sys_permissionname_eq(String n_sys_permissionname_eq) { public void setN_sys_permissionname_eq(String n_sys_permissionname_eq) {
this.n_sys_permissionname_eq = n_sys_permissionname_eq; this.n_sys_permissionname_eq = n_sys_permissionname_eq;
if(!ObjectUtils.isEmpty(this.n_sys_permissionname_eq)){ if(!ObjectUtils.isEmpty(this.n_sys_permissionname_eq)){
this.getSelectCond().eq("sys_permissionname", n_sys_permissionname_eq); this.getSearchCond().eq("sys_permissionname", n_sys_permissionname_eq);
} }
} }
private String n_sys_permissionname_like;//[权限名称] private String n_sys_permissionname_like;//[权限名称]
public void setN_sys_permissionname_like(String n_sys_permissionname_like) { public void setN_sys_permissionname_like(String n_sys_permissionname_like) {
this.n_sys_permissionname_like = n_sys_permissionname_like; this.n_sys_permissionname_like = n_sys_permissionname_like;
if(!ObjectUtils.isEmpty(this.n_sys_permissionname_like)){ if(!ObjectUtils.isEmpty(this.n_sys_permissionname_like)){
this.getSelectCond().like("sys_permissionname", n_sys_permissionname_like); this.getSearchCond().like("sys_permissionname", n_sys_permissionname_like);
} }
} }
...@@ -77,7 +77,7 @@ public class SysRolePermissionSearchContext extends QueryWrapperContext<SysRoleP ...@@ -77,7 +77,7 @@ public class SysRolePermissionSearchContext extends QueryWrapperContext<SysRoleP
{ {
this.query=query; this.query=query;
if(!StringUtils.isEmpty(query)){ if(!StringUtils.isEmpty(query)){
this.getSelectCond().and( wrapper -> this.getSearchCond().and( wrapper ->
wrapper.like("sys_permissionid", query) wrapper.like("sys_permissionid", query)
); );
} }
......
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/filter/SysRoleSearchContext.java
浏览文件 @ 53a4e0db
...@@ -32,7 +32,7 @@ public class SysRoleSearchContext extends QueryWrapperContext<SysRole> { ...@@ -32,7 +32,7 @@ public class SysRoleSearchContext extends QueryWrapperContext<SysRole> {
this.n_sys_rolename_isnotnull = n_sys_rolename_isnotnull; this.n_sys_rolename_isnotnull = n_sys_rolename_isnotnull;
if(!ObjectUtils.isEmpty(this.n_sys_rolename_isnotnull)){ if(!ObjectUtils.isEmpty(this.n_sys_rolename_isnotnull)){
if(this.n_sys_rolename_isnotnull.toString().equals("1")){ if(this.n_sys_rolename_isnotnull.toString().equals("1")){
this.getSelectCond().isNotNull("sys_rolename"); this.getSearchCond().isNotNull("sys_rolename");
} }
} }
} }
...@@ -41,7 +41,7 @@ public class SysRoleSearchContext extends QueryWrapperContext<SysRole> { ...@@ -41,7 +41,7 @@ public class SysRoleSearchContext extends QueryWrapperContext<SysRole> {
this.n_sys_rolename_isnull = n_sys_rolename_isnull; this.n_sys_rolename_isnull = n_sys_rolename_isnull;
if(!ObjectUtils.isEmpty(this.n_sys_rolename_isnull)){ if(!ObjectUtils.isEmpty(this.n_sys_rolename_isnull)){
if(this.n_sys_rolename_isnull.toString().equals("1")){ if(this.n_sys_rolename_isnull.toString().equals("1")){
this.getSelectCond().isNull("sys_rolename"); this.getSearchCond().isNull("sys_rolename");
} }
} }
} }
...@@ -49,7 +49,7 @@ public class SysRoleSearchContext extends QueryWrapperContext<SysRole> { ...@@ -49,7 +49,7 @@ public class SysRoleSearchContext extends QueryWrapperContext<SysRole> {
public void setN_sys_rolename_like(String n_sys_rolename_like) { public void setN_sys_rolename_like(String n_sys_rolename_like) {
this.n_sys_rolename_like = n_sys_rolename_like; this.n_sys_rolename_like = n_sys_rolename_like;
if(!ObjectUtils.isEmpty(this.n_sys_rolename_like)){ if(!ObjectUtils.isEmpty(this.n_sys_rolename_like)){
this.getSelectCond().like("sys_rolename", n_sys_rolename_like); this.getSearchCond().like("sys_rolename", n_sys_rolename_like);
} }
} }
...@@ -60,7 +60,7 @@ public class SysRoleSearchContext extends QueryWrapperContext<SysRole> { ...@@ -60,7 +60,7 @@ public class SysRoleSearchContext extends QueryWrapperContext<SysRole> {
{ {
this.query=query; this.query=query;
if(!StringUtils.isEmpty(query)){ if(!StringUtils.isEmpty(query)){
this.getSelectCond().and( wrapper -> this.getSearchCond().and( wrapper ->
wrapper.like("sys_rolename", query) wrapper.like("sys_rolename", query)
); );
} }
......
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/filter/SysUserRoleSearchContext.java
浏览文件 @ 53a4e0db
...@@ -31,28 +31,28 @@ public class SysUserRoleSearchContext extends QueryWrapperContext<SysUserRole> { ...@@ -31,28 +31,28 @@ public class SysUserRoleSearchContext extends QueryWrapperContext<SysUserRole> {
public void setN_sys_roleid_eq(String n_sys_roleid_eq) { public void setN_sys_roleid_eq(String n_sys_roleid_eq) {
this.n_sys_roleid_eq = n_sys_roleid_eq; this.n_sys_roleid_eq = n_sys_roleid_eq;
if(!ObjectUtils.isEmpty(this.n_sys_roleid_eq)){ if(!ObjectUtils.isEmpty(this.n_sys_roleid_eq)){
this.getSelectCond().eq("sys_roleid", n_sys_roleid_eq); this.getSearchCond().eq("sys_roleid", n_sys_roleid_eq);
} }
} }
private String n_sys_userid_eq;//[用户标识] private String n_sys_userid_eq;//[用户标识]
public void setN_sys_userid_eq(String n_sys_userid_eq) { public void setN_sys_userid_eq(String n_sys_userid_eq) {
this.n_sys_userid_eq = n_sys_userid_eq; this.n_sys_userid_eq = n_sys_userid_eq;
if(!ObjectUtils.isEmpty(this.n_sys_userid_eq)){ if(!ObjectUtils.isEmpty(this.n_sys_userid_eq)){
this.getSelectCond().eq("sys_userid", n_sys_userid_eq); this.getSearchCond().eq("sys_userid", n_sys_userid_eq);
} }
} }
private String n_sys_username_eq;//[用户名称] private String n_sys_username_eq;//[用户名称]
public void setN_sys_username_eq(String n_sys_username_eq) { public void setN_sys_username_eq(String n_sys_username_eq) {
this.n_sys_username_eq = n_sys_username_eq; this.n_sys_username_eq = n_sys_username_eq;
if(!ObjectUtils.isEmpty(this.n_sys_username_eq)){ if(!ObjectUtils.isEmpty(this.n_sys_username_eq)){
this.getSelectCond().eq("sys_username", n_sys_username_eq); this.getSearchCond().eq("sys_username", n_sys_username_eq);
} }
} }
private String n_sys_username_like;//[用户名称] private String n_sys_username_like;//[用户名称]
public void setN_sys_username_like(String n_sys_username_like) { public void setN_sys_username_like(String n_sys_username_like) {
this.n_sys_username_like = n_sys_username_like; this.n_sys_username_like = n_sys_username_like;
if(!ObjectUtils.isEmpty(this.n_sys_username_like)){ if(!ObjectUtils.isEmpty(this.n_sys_username_like)){
this.getSelectCond().like("sys_username", n_sys_username_like); this.getSearchCond().like("sys_username", n_sys_username_like);
} }
} }
...@@ -63,7 +63,7 @@ public class SysUserRoleSearchContext extends QueryWrapperContext<SysUserRole> { ...@@ -63,7 +63,7 @@ public class SysUserRoleSearchContext extends QueryWrapperContext<SysUserRole> {
{ {
this.query=query; this.query=query;
if(!StringUtils.isEmpty(query)){ if(!StringUtils.isEmpty(query)){
this.getSelectCond().and( wrapper -> this.getSearchCond().and( wrapper ->
wrapper.like("sys_userid", query) wrapper.like("sys_userid", query)
); );
} }
......
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/filter/SysUserSearchContext.java
浏览文件 @ 53a4e0db
...@@ -31,14 +31,14 @@ public class SysUserSearchContext extends QueryWrapperContext<SysUser> { ...@@ -31,14 +31,14 @@ public class SysUserSearchContext extends QueryWrapperContext<SysUser> {
public void setN_username_like(String n_username_like) { public void setN_username_like(String n_username_like) {
this.n_username_like = n_username_like; this.n_username_like = n_username_like;
if(!ObjectUtils.isEmpty(this.n_username_like)){ if(!ObjectUtils.isEmpty(this.n_username_like)){
this.getSelectCond().like("username", n_username_like); this.getSearchCond().like("username", n_username_like);
} }
} }
private String n_personname_like;//[用户姓名] private String n_personname_like;//[用户姓名]
public void setN_personname_like(String n_personname_like) { public void setN_personname_like(String n_personname_like) {
this.n_personname_like = n_personname_like; this.n_personname_like = n_personname_like;
if(!ObjectUtils.isEmpty(this.n_personname_like)){ if(!ObjectUtils.isEmpty(this.n_personname_like)){
this.getSelectCond().like("personname", n_personname_like); this.getSearchCond().like("personname", n_personname_like);
} }
} }
...@@ -49,7 +49,7 @@ public class SysUserSearchContext extends QueryWrapperContext<SysUser> { ...@@ -49,7 +49,7 @@ public class SysUserSearchContext extends QueryWrapperContext<SysUser> {
{ {
this.query=query; this.query=query;
if(!StringUtils.isEmpty(query)){ if(!StringUtils.isEmpty(query)){
this.getSelectCond().and( wrapper -> this.getSearchCond().and( wrapper ->
wrapper.like("personname", query) wrapper.like("personname", query)
); );
} }
......
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/mapper/SysPSSystemMapper.java
浏览文件 @ 53a4e0db
...@@ -19,6 +19,7 @@ import com.alibaba.fastjson.JSONObject; ...@@ -19,6 +19,7 @@ import com.alibaba.fastjson.JSONObject;
public interface SysPSSystemMapper extends BaseMapper<SysPSSystem>{ public interface SysPSSystemMapper extends BaseMapper<SysPSSystem>{
Page<SysPSSystem> searchPick(IPage page, @Param("srf") SysPSSystemSearchContext context, @Param("ew") Wrapper<SysPSSystem> wrapper) ;
Page<SysPSSystem> searchDefault(IPage page, @Param("srf") SysPSSystemSearchContext context, @Param("ew") Wrapper<SysPSSystem> wrapper) ; Page<SysPSSystem> searchDefault(IPage page, @Param("srf") SysPSSystemSearchContext context, @Param("ew") Wrapper<SysPSSystem> wrapper) ;
@Override @Override
SysPSSystem selectById(Serializable id); SysPSSystem selectById(Serializable id);
......
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/ISysPSSystemService.java
浏览文件 @ 53a4e0db
...@@ -36,6 +36,7 @@ public interface ISysPSSystemService extends IService<SysPSSystem>{ ...@@ -36,6 +36,7 @@ public interface ISysPSSystemService extends IService<SysPSSystem>{
void saveBatch(List<SysPSSystem> list) ; void saveBatch(List<SysPSSystem> list) ;
boolean update(SysPSSystem et) ; boolean update(SysPSSystem et) ;
void updateBatch(List<SysPSSystem> list) ; void updateBatch(List<SysPSSystem> list) ;
Page<SysPSSystem> searchPick(SysPSSystemSearchContext context) ;
Page<SysPSSystem> searchDefault(SysPSSystemSearchContext context) ; Page<SysPSSystem> searchDefault(SysPSSystemSearchContext context) ;
/** /**
*自定义查询SQL *自定义查询SQL
......
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SysPSSystemServiceImpl.java
浏览文件 @ 53a4e0db
...@@ -143,6 +143,15 @@ public class SysPSSystemServiceImpl extends ServiceImpl<SysPSSystemMapper, SysPS ...@@ -143,6 +143,15 @@ public class SysPSSystemServiceImpl extends ServiceImpl<SysPSSystemMapper, SysPS
/**
* 查询集合 Pick
*/
@Override
public Page<SysPSSystem> searchPick(SysPSSystemSearchContext context) {
com.baomidou.mybatisplus.extension.plugins.pagination.Page<SysPSSystem> pages=baseMapper.searchPick(context.getPages(),context,context.getSelectCond());
return new PageImpl<SysPSSystem>(pages.getRecords(), context.getPageable(), pages.getTotal());
}
/** /**
* 查询集合 DEFAULT * 查询集合 DEFAULT
*/ */
......
ibzuaa-core/src/main/java/cn/ibizlab/core/util/config/MybatisConfiguration.java
浏览文件 @ 53a4e0db
...@@ -29,6 +29,7 @@ public class MybatisConfiguration { ...@@ -29,6 +29,7 @@ public class MybatisConfiguration {
Properties p = new Properties(); Properties p = new Properties();
p.setProperty("Oracle", "oracle"); p.setProperty("Oracle", "oracle");
p.setProperty("MySQL", "mysql"); p.setProperty("MySQL", "mysql");
p.setProperty("PostgreSQL", "postgresql");
p.setProperty("DM", "oracle");//达梦数据库使用oracle模式 p.setProperty("DM", "oracle");//达梦数据库使用oracle模式
p.setProperty("H2", "mysql");//根据当前运行的数据库设置h2对应的databaseid p.setProperty("H2", "mysql");//根据当前运行的数据库设置h2对应的databaseid
databaseIdProvider.setProperties(p); databaseIdProvider.setProperties(p);
......
ibzuaa-core/src/main/resources/liquibase/changelog/20200608071912_changelog.xml 0 → 100644
浏览文件 @ 53a4e0db
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:pro="http://www.liquibase.org/xml/ns/pro" 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/pro http://www.liquibase.org/xml/ns/pro/liquibase-pro-3.8.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.8.xsd">
<changeSet author="sq3536 (generated)" id="1591600780913-1">
<addColumn tableName="IBZPSSYSTEM">
<column name="APPS" type="CLOB(2147483647)"/>
</addColumn>
</changeSet>
<changeSet author="sq3536 (generated)" id="1591600780913-2">
<addColumn tableName="IBZPSSYSTEM">
<column name="MD5CHECK" type="VARCHAR(100 BYTE)"/>
</addColumn>
</changeSet>
<changeSet author="sq3536 (generated)" id="1591600780913-3">
<addColumn tableName="IBZPSSYSTEM">
<column name="SHOWORDER" type="INTEGER"/>
</addColumn>
</changeSet>
</databaseChangeLog>
ibzuaa-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 53a4e0db
<?xml version="1.1" encoding="UTF-8" standalone="no"?> !!!!模版产生代码错误:----
<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"> 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)??
----
----
<!--输出实体[SYS_AUTHLOG]数据结构 --> FTL stack trace ("~" means nesting-related):
<changeSet author="a_A_5d9d78509" id="tab-sys_authlog-36-1"> - Failed at: ${dbinst.getUserName()} [in template "CODETEMPL_zh_CN" at line 28, column 24]
<createTable tableName="IBZAUTHLOG"> ----
<column name="LOGID" remarks="" type="VARCHAR(100)"> \ No newline at end of file
<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-29-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-core/src/main/resources/mapper/uaa/syspssystem/SysPSSystemMapper.xml
浏览文件 @ 53a4e0db
...@@ -14,6 +14,11 @@ ...@@ -14,6 +14,11 @@
</resultMap> </resultMap>
<select id="searchPick" parameterType="cn.ibizlab.core.uaa.filter.SysPSSystemSearchContext" >
SELECT t1.PSSYSTEMID,t1.SHOWORDER FROM IBZPSSYSTEM t1
<where><if test="ew!=null and ew.sqlSegment!=null and !ew.emptyOfWhere">${ew.sqlSegment}</if></where>
<if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">${ew.sqlSegment}</if>
</select>
<!--数据集合[Default]--> <!--数据集合[Default]-->
<select id="searchDefault" parameterType="cn.ibizlab.core.uaa.filter.SysPSSystemSearchContext" resultMap="SysPSSystemResultMap"> <select id="searchDefault" parameterType="cn.ibizlab.core.uaa.filter.SysPSSystemSearchContext" resultMap="SysPSSystemResultMap">
......
ibzuaa-dependencies/pom.xml
浏览文件 @ 53a4e0db
...@@ -77,6 +77,9 @@ ...@@ -77,6 +77,9 @@
<!--xxl-job定时服务 --> <!--xxl-job定时服务 -->
<xxl-job.version>2.1.0</xxl-job.version> <xxl-job.version>2.1.0</xxl-job.version>
<oracle.version>11.2.0.3</oracle.version>
<postgresql.version>42.2.6</postgresql.version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
...@@ -299,12 +302,6 @@ ...@@ -299,12 +302,6 @@
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
</dependency> </dependency>
<!-- MySQL驱动包 -->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>
<!-- 阿里Druid数据源 --> <!-- 阿里Druid数据源 -->
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
...@@ -317,9 +314,23 @@ ...@@ -317,9 +314,23 @@
<artifactId>h2</artifactId> <artifactId>h2</artifactId>
</dependency> </dependency>
<!-- Error --> <!-- Oracle驱动包 -->
<dependency>
<!-- Security --> <groupId>com.oracle</groupId>
<artifactId>ojdbc6</artifactId>
<version>${oracle.version}</version>
</dependency>
<!-- PostgreSQL驱动包 -->
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>${postgresql.version}</version>
</dependency>
<!-- MySQL驱动包 -->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>
</dependencies> </dependencies>
......
ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/dto/SysAppDTO.java
浏览文件 @ 53a4e0db
...@@ -64,12 +64,12 @@ public class SysAppDTO extends DTOBase implements Serializable { ...@@ -64,12 +64,12 @@ public class SysAppDTO extends DTOBase implements Serializable {
private String type; private String type;
/** /**
* 属性 [ADDR] * 属性 [APPGROUP]
* *
*/ */
@JSONField(name = "addr") @JSONField(name = "group")
@JsonProperty("addr") @JsonProperty("group")
private String addr; private String group;
/** /**
* 属性 [ICON] * 属性 [ICON]
...@@ -87,6 +87,14 @@ public class SysAppDTO extends DTOBase implements Serializable { ...@@ -87,6 +87,14 @@ public class SysAppDTO extends DTOBase implements Serializable {
@JsonProperty("visabled") @JsonProperty("visabled")
private Integer visabled; private Integer visabled;
/**
* 属性 [ADDR]
*
*/
@JSONField(name = "addr")
@JsonProperty("addr")
private String addr;
/** /**
* 设置 [APPNAME] * 设置 [APPNAME]
...@@ -121,11 +129,11 @@ public class SysAppDTO extends DTOBase implements Serializable { ...@@ -121,11 +129,11 @@ public class SysAppDTO extends DTOBase implements Serializable {
} }
/** /**
* 设置 [ADDR] * 设置 [APPGROUP]
*/ */
public void setAddr(String addr){ public void setGroup(String group){
this.addr = addr ; this.group = group ;
this.modify("addr",addr); this.modify("appgroup",group);
} }
/** /**
...@@ -144,6 +152,14 @@ public class SysAppDTO extends DTOBase implements Serializable { ...@@ -144,6 +152,14 @@ public class SysAppDTO extends DTOBase implements Serializable {
this.modify("visabled",visabled); this.modify("visabled",visabled);
} }
/**
* 设置 [ADDR]
*/
public void setAddr(String addr){
this.addr = addr ;
this.modify("addr",addr);
}
} }
ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/rest/extensions/ClientAuthenticationResource.java
浏览文件 @ 53a4e0db
...@@ -4,6 +4,7 @@ package cn.ibizlab.api.rest.extensions; ...@@ -4,6 +4,7 @@ package cn.ibizlab.api.rest.extensions;
import cn.ibizlab.core.uaa.extensions.service.SysAppService; import cn.ibizlab.core.uaa.extensions.service.SysAppService;
import cn.ibizlab.core.uaa.extensions.service.UAACoreService; import cn.ibizlab.core.uaa.extensions.service.UAACoreService;
import cn.ibizlab.util.client.IBZOUFeignClient; import cn.ibizlab.util.client.IBZOUFeignClient;
import cn.ibizlab.util.helper.CachedBeanCopier;
import cn.ibizlab.util.security.AuthTokenUtil; import cn.ibizlab.util.security.AuthTokenUtil;
import cn.ibizlab.util.security.AuthenticationInfo; import cn.ibizlab.util.security.AuthenticationInfo;
import cn.ibizlab.util.security.AuthenticationUser; import cn.ibizlab.util.security.AuthenticationUser;
...@@ -17,8 +18,12 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; ...@@ -17,8 +18,12 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.AuthorityUtils; import org.springframework.security.core.authority.AuthorityUtils;
import org.springframework.util.StringUtils;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletResponse;
import java.util.*; import java.util.*;
/** /**
...@@ -33,6 +38,12 @@ public class ClientAuthenticationResource ...@@ -33,6 +38,12 @@ public class ClientAuthenticationResource
@Value("${ibiz.jwt.header:Authorization}") @Value("${ibiz.jwt.header:Authorization}")
private String tokenHeader; private String tokenHeader;
@Value("${ibiz.auth.cookie.domain:}")
private String cookiedomain;
@Value("${ibiz.jwt.expiration:7200000}")
private Long expiration;
@Autowired @Autowired
private AuthTokenUtil jwtTokenUtil; private AuthTokenUtil jwtTokenUtil;
...@@ -49,9 +60,12 @@ public class ClientAuthenticationResource ...@@ -49,9 +60,12 @@ public class ClientAuthenticationResource
final String token = jwtTokenUtil.generateToken(user); final String token = jwtTokenUtil.generateToken(user);
user.setPermissionList(null); AuthenticationUser user2=new AuthenticationUser();
CachedBeanCopier.copy(user,user2);
user2.setAuthorities(null);
user2.setPermissionList(null);
// 返回 token // 返回 token
return ResponseEntity.ok().body(new AuthenticationInfo(token,user)); return ResponseEntity.ok().body(new AuthenticationInfo(token,user2));
} }
@PostMapping(value = "uaa/login") @PostMapping(value = "uaa/login")
...@@ -71,10 +85,10 @@ public class ClientAuthenticationResource ...@@ -71,10 +85,10 @@ public class ClientAuthenticationResource
@Autowired @Autowired
private SysAppService sysAppService; private SysAppService sysAppService;
@GetMapping(value = "uaa/access-center/nav/{id}") @GetMapping(value = "uaa/access-center/app-switcher/{id}")
public ResponseEntity<JSONObject> appnavbar(@PathVariable("id") String id) public ResponseEntity<JSONObject> appswitcher(@PathVariable("id") String id)
{ {
return ResponseEntity.ok(sysAppService.getAppNavigationBar(id,AuthenticationUser.getAuthenticationUser().getUserid())); return ResponseEntity.ok(sysAppService.getAppSwitcher(id,AuthenticationUser.getAuthenticationUser().getUserid()));
} }
} }
ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/swagger/SwaggerConfiguration.java
浏览文件 @ 53a4e0db
...@@ -17,6 +17,7 @@ import springfox.documentation.spring.web.plugins.Docket; ...@@ -17,6 +17,7 @@ import springfox.documentation.spring.web.plugins.Docket;
import springfox.documentation.spring.web.readers.operation.OperationParameterReader; import springfox.documentation.spring.web.readers.operation.OperationParameterReader;
import springfox.documentation.spring.web.readers.parameter.ModelAttributeParameterExpander; import springfox.documentation.spring.web.readers.parameter.ModelAttributeParameterExpander;
import springfox.documentation.swagger2.annotations.EnableSwagger2; import springfox.documentation.swagger2.annotations.EnableSwagger2;
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -24,6 +25,7 @@ import java.util.List; ...@@ -24,6 +25,7 @@ import java.util.List;
@Configuration @Configuration
@EnableSwagger2 @EnableSwagger2
@ConditionalOnExpression("${swagger.enable:false}")
public class SwaggerConfiguration { public class SwaggerConfiguration {
@Bean @Bean
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或