提交 2cdfb2b8 编写于 作者: tony001's avatar tony001

修复列表导航和卡片导航快速代码表无值也需加载数据问题

上级 d64685f3
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<#assign appCounter = view.getPSSysCounterRef().getPSAppCounter() /> <#assign appCounter = view.getPSSysCounterRef().getPSAppCounter() />
</#if> </#if>
<div class="quick-group-container"> <div class="quick-group-container">
<app-quick-group :items="quickGroupModel" <#if appCounter??>:counterService="${srfclassname('${appCounter.getCodeName()}')}counterservice"</#if> @valuechange="quickGroupValueChange"></app-quick-group> <app-quick-group :items="quickGroupModel" <#if appCounter??>:counterService="${appCounter.getCodeName()?lower_case}counterservice"</#if> @valuechange="quickGroupValueChange"></app-quick-group>
</div> </div>
</#if> </#if>
<#if ctrl.isEnableSearch()> <#if ctrl.isEnableSearch()>
...@@ -124,7 +124,7 @@ import ${srfclassname('${appCounter.getCodeName()}')}CounterService from '@/co ...@@ -124,7 +124,7 @@ import ${srfclassname('${appCounter.getCodeName()}')}CounterService from '@/co
* @type {${srfclassname('${appCounter.getCodeName()}')}CounterService} * @type {${srfclassname('${appCounter.getCodeName()}')}CounterService}
* @memberof ${srfclassname('${view.name}')}Base * @memberof ${srfclassname('${view.name}')}Base
*/ */
public ${srfclassname('${appCounter.getCodeName()}')}counterservice: ${srfclassname('${appCounter.getCodeName()}')}CounterService = new ${srfclassname('${appCounter.getCodeName()}')}CounterService({ $store: this.$store }); public ${appCounter.getCodeName()?lower_case}counterservice: ${srfclassname('${appCounter.getCodeName()}')}CounterService = new ${srfclassname('${appCounter.getCodeName()}')}CounterService({ $store: this.$store,context:this.context,viewparams:this.viewparams });
</#if> </#if>
/** /**
...@@ -317,10 +317,16 @@ import ${srfclassname('${appCounter.getCodeName()}')}CounterService from '@/co ...@@ -317,10 +317,16 @@ import ${srfclassname('${appCounter.getCodeName()}')}CounterService from '@/co
} }
this.quickGroupData = $event.data; this.quickGroupData = $event.data;
Object.assign(this.viewparams, $event.data); Object.assign(this.viewparams, $event.data);
}else{
if(this.quickGroupData) {
for(let key in this.quickGroupData) {
delete this.viewparams[key];
}
}
}
if(this.isEmitQuickGroupValue){ if(this.isEmitQuickGroupValue){
this.onSearch($event); this.onSearch($event);
} }
}
this.isEmitQuickGroupValue = true; this.isEmitQuickGroupValue = true;
} }
</#if> </#if>
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<#assign appCounter = view.getPSSysCounterRef().getPSAppCounter() /> <#assign appCounter = view.getPSSysCounterRef().getPSAppCounter() />
</#if> </#if>
<div class="quick-group-container"> <div class="quick-group-container">
<app-quick-group :items="quickGroupModel" <#if appCounter??>:counterService="${srfclassname('${appCounter.getCodeName()}')}counterservice"</#if> @valuechange="quickGroupValueChange"></app-quick-group> <app-quick-group :items="quickGroupModel" <#if appCounter??>:counterService="${appCounter.getCodeName()?lower_case}counterservice"</#if> @valuechange="quickGroupValueChange"></app-quick-group>
</div> </div>
</#if> </#if>
<#if ctrl.isEnableSearch()> <#if ctrl.isEnableSearch()>
...@@ -117,6 +117,17 @@ import ${srfclassname('${appCounter.getCodeName()}')}CounterService from '@/co ...@@ -117,6 +117,17 @@ import ${srfclassname('${appCounter.getCodeName()}')}CounterService from '@/co
*/ */
public isSingleSelect:boolean = true; public isSingleSelect:boolean = true;
<#if view.getPSSysCounterRef?? && view.getPSSysCounterRef?? && view.getPSSysCounterRef()?? && view.getPSSysCounterRef().getPSAppCounter()??>
<#assign appCounter = view.getPSSysCounterRef().getPSAppCounter() />
/**
* ${srfclassname('${appCounter.getCodeName()}')}CounterService计数器服务对象
*
* @type {${srfclassname('${appCounter.getCodeName()}')}CounterService}
* @memberof ${srfclassname('${view.name}')}Base
*/
public ${appCounter.getCodeName()?lower_case}counterservice: ${srfclassname('${appCounter.getCodeName()}')}CounterService = new ${srfclassname('${appCounter.getCodeName()}')}CounterService({ $store: this.$store,context:this.context,viewparams:this.viewparams });
</#if>
/** /**
* 呈现模式,可选值:horizontal或者vertical * 呈现模式,可选值:horizontal或者vertical
* *
...@@ -307,10 +318,16 @@ import ${srfclassname('${appCounter.getCodeName()}')}CounterService from '@/co ...@@ -307,10 +318,16 @@ import ${srfclassname('${appCounter.getCodeName()}')}CounterService from '@/co
} }
this.quickGroupData = $event.data; this.quickGroupData = $event.data;
Object.assign(this.viewparams, $event.data); Object.assign(this.viewparams, $event.data);
}else{
if(this.quickGroupData) {
for(let key in this.quickGroupData) {
delete this.viewparams[key];
}
}
}
if(this.isEmitQuickGroupValue){ if(this.isEmitQuickGroupValue){
this.onSearch(); this.onSearch();
} }
}
this.isEmitQuickGroupValue = true; this.isEmitQuickGroupValue = true;
} }
</#if> </#if>
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<#assign appCounter = view.getPSSysCounterRef().getPSAppCounter() /> <#assign appCounter = view.getPSSysCounterRef().getPSAppCounter() />
</#if> </#if>
<div class="quick-group-container"> <div class="quick-group-container">
<app-quick-group :items="quickGroupModel" <#if appCounter??>:counterService="${srfclassname('${appCounter.getCodeName()}')}counterservice"</#if> @valuechange="quickGroupValueChange"></app-quick-group> <app-quick-group :items="quickGroupModel" <#if appCounter??>:counterService="${appCounter.getCodeName()?lower_case}counterservice"</#if> @valuechange="quickGroupValueChange"></app-quick-group>
</div> </div>
</#if> </#if>
<#if ctrl.isEnableSearch()> <#if ctrl.isEnableSearch()>
...@@ -124,7 +124,7 @@ import ${srfclassname('${appCounter.getCodeName()}')}CounterService from '@/co ...@@ -124,7 +124,7 @@ import ${srfclassname('${appCounter.getCodeName()}')}CounterService from '@/co
* @type {${srfclassname('${appCounter.getCodeName()}')}CounterService} * @type {${srfclassname('${appCounter.getCodeName()}')}CounterService}
* @memberof ${srfclassname('${view.name}')}Base * @memberof ${srfclassname('${view.name}')}Base
*/ */
public ${srfclassname('${appCounter.getCodeName()}')}counterservice: ${srfclassname('${appCounter.getCodeName()}')}CounterService = new ${srfclassname('${appCounter.getCodeName()}')}CounterService({ $store: this.$store }); public ${appCounter.getCodeName()?lower_case}counterservice: ${srfclassname('${appCounter.getCodeName()}')}CounterService = new ${srfclassname('${appCounter.getCodeName()}')}CounterService({ $store: this.$store,context:this.context,viewparams:this.viewparams });
</#if> </#if>
/** /**
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册