提交 0c47f353 编写于 作者: tony001's avatar tony001

Merge branch 'dev'

...@@ -21,7 +21,6 @@ ${item.render.code} ...@@ -21,7 +21,6 @@ ${item.render.code}
]" ]"
:context="context" :context="context"
:viewparams="viewparams" :viewparams="viewparams"
ref="druipart"
:localContext ='<@getNavigateContext item />' :localContext ='<@getNavigateContext item />'
:localParam ='<@getNavigateParams item />' :localParam ='<@getNavigateParams item />'
parameterName='${appde.getCodeName()?lower_case}' parameterName='${appde.getCodeName()?lower_case}'
......
...@@ -1076,16 +1076,6 @@ import { Environment } from '@/environments/environment'; ...@@ -1076,16 +1076,6 @@ import { Environment } from '@/environments/environment';
this.$emit('load', this.data); this.$emit('load', this.data);
</#if> </#if>
}); });
if(AppCenterService && AppCenterService.getMessageCenter()){
this.appStateEvent = AppCenterService.getMessageCenter().subscribe(({ name, action, data }) =>{
if(!Object.is(name,"${ctrl.getPSAppDataEntity().getCodeName()}")){
return;
}
if(Object.is(action,'appRefresh')){
this.refresh([data]);
}
})
}
} }
/** /**
...@@ -1133,11 +1123,6 @@ import { Environment } from '@/environments/environment'; ...@@ -1133,11 +1123,6 @@ import { Environment } from '@/environments/environment';
* @memberof ${srfclassname('${ctrl.codeName}')}Base * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public refresh(args?: any): void { public refresh(args?: any): void {
let druipart:any = this.$refs.druipart
if (druipart) {
druipart.refreshDRUIPart(args);
return;
}
let arg: any = {}; let arg: any = {};
Object.assign(arg,args?args[0]:{}); Object.assign(arg,args?args[0]:{});
if (this.data.srfkey && !Object.is(this.data.srfkey, '')) { if (this.data.srfkey && !Object.is(this.data.srfkey, '')) {
......
...@@ -1816,6 +1816,9 @@ ${gridColumn.getName()} ...@@ -1816,6 +1816,9 @@ ${gridColumn.getName()}
* @memberof ${srfclassname('${ctrl.codeName}')}Base * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public rowClick($event: any, ifAlways: boolean = false): void { public rowClick($event: any, ifAlways: boolean = false): void {
// 提示栏样式
let el: any = document.getElementsByClassName('el-tooltip__popper')[0];
el.style.display = 'none';
// 分组行跳过 // 分组行跳过
if($event && $event.children){ if($event && $event.children){
return; return;
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册