提交 3eb39141 编写于 作者: tony001's avatar tony001

调整合入应用级上下文时机

上级 50f0364e
...@@ -104,6 +104,9 @@ ...@@ -104,6 +104,9 @@
for(let key in this.context){ for(let key in this.context){
delete this.context[key]; delete this.context[key];
} }
if(this.$store.getters.getAppData() && this.$store.getters.getAppData().context){
Object.assign(this.context,this.$store.getters.getAppData().context);
}
if (!this.viewDefaultUsage && this.viewdata && !Object.is(this.viewdata, '')) { if (!this.viewDefaultUsage && this.viewdata && !Object.is(this.viewdata, '')) {
Object.assign(this.context, JSON.parse(this.viewdata)); Object.assign(this.context, JSON.parse(this.viewdata));
if(this.context && this.context.srfparentdename){ if(this.context && this.context.srfparentdename){
...@@ -112,9 +115,6 @@ ...@@ -112,9 +115,6 @@
if(this.context && this.context.srfparentkey){ if(this.context && this.context.srfparentkey){
Object.assign(this.viewparams,{srfparentkey:this.context.srfparentkey}); Object.assign(this.viewparams,{srfparentkey:this.context.srfparentkey});
} }
if(this.$store.getters.getAppData() && this.$store.getters.getAppData().context){
Object.assign(this.context,this.$store.getters.getAppData().context);
}
this.handleCustomViewData(); this.handleCustomViewData();
<#if self_viewparam??> <#if self_viewparam??>
${self_viewparam} ${self_viewparam}
...@@ -138,9 +138,6 @@ ...@@ -138,9 +138,6 @@
Object.assign(this.context,{'${appde.getCodeName()?lower_case}':inputvalue}); Object.assign(this.context,{'${appde.getCodeName()?lower_case}':inputvalue});
} }
</#if> </#if>
if(this.$store.getters.getAppData() && this.$store.getters.getAppData().context){
Object.assign(this.context,this.$store.getters.getAppData().context);
}
<#if view.isPSDEView()> <#if view.isPSDEView()>
//初始化视图唯一标识 //初始化视图唯一标识
Object.assign(this.context,{srfsessionid:this.$util.createUUID()}); Object.assign(this.context,{srfsessionid:this.$util.createUUID()});
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册