提交 0081e72a 编写于 作者: zhangpingchuan's avatar zhangpingchuan

update:更新多数据视图逻辑

上级 618bf6d8
...@@ -404,19 +404,9 @@ export default class MDViewEngine extends ViewEngine { ...@@ -404,19 +404,9 @@ export default class MDViewEngine extends ViewEngine {
if (this.getSearchForm()) { if (this.getSearchForm()) {
Object.assign(arg, this.getSearchForm().getData()); Object.assign(arg, this.getSearchForm().getData());
} }
if (this.view && this.view.$refs.searchbar) { // 快速搜索
Object.assign(arg, this.view.$refs.searchbar.getData()); if (this.view && this.view.query) {
} Object.assign(arg, { query: this.view.query });
if (this.view) {
// 开启自定义面板时忽略是否展开搜索表单
if (this.view.layoutModelDetails) {
const quickSearchBar = Object.values(this.view.layoutModelDetails).find((item: any) => item.name.toLowerCase() === 'quicksearchbar');
if (quickSearchBar) {
Object.assign(arg, { query: this.view.query });
}
} else if (!this.view.isExpandSearchForm) {
Object.assign(arg, { query: this.view.query });
}
} }
// 快速分组和快速搜索栏 // 快速分组和快速搜索栏
let otherQueryParam:any = {}; let otherQueryParam:any = {};
...@@ -426,6 +416,10 @@ export default class MDViewEngine extends ViewEngine { ...@@ -426,6 +416,10 @@ export default class MDViewEngine extends ViewEngine {
if(this.view && this.view.quickFormData){ if(this.view && this.view.quickFormData){
Object.assign(otherQueryParam,this.view.quickFormData); Object.assign(otherQueryParam,this.view.quickFormData);
} }
// 搜索栏值
if (this.view && this.view.$refs.searchbar) {
Object.assign(otherQueryParam, this.view.$refs.searchbar.getData());
}
Object.assign(arg,{viewparams:otherQueryParam}); Object.assign(arg,{viewparams:otherQueryParam});
} }
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册