提交 70cde8da 编写于 作者: ibizdev's avatar ibizdev

chitanda 发布系统代码

上级 0ddc6bfd
......@@ -391,11 +391,11 @@ export default class MDViewEngine extends ViewEngine {
}
// 快速分组和快速搜索栏
let otherQueryParam:any = {};
if(this.view && this.view.qucikGroupData){
Object.assign(otherQueryParam,this.view.qucikGroupData);
if(this.view && this.view.quickGroupData){
Object.assign(otherQueryParam,this.view.quickGroupData);
}
if(this.view && this.view.qucikFormData){
Object.assign(otherQueryParam,this.view.qucikFormData);
if(this.view && this.view.quickFormData){
Object.assign(otherQueryParam,this.view.quickFormData);
}
Object.assign(arg,{viewparams:otherQueryParam});
}
......
......@@ -2,7 +2,7 @@
<studio-view-style2 viewName="activitypointerbyparentkey" viewTitle="活动" class='degridview activity-pointer-by-parent-key'>
<i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" search @on-search="onSearch($event)"/>
<template slot="quickGroupSearch">
<app-quick-group :items="quickGroupModel" @valuechange="qucikGroupValueChange"></app-quick-group>
<app-quick-group :items="quickGroupModel" @valuechange="quickGroupValueChange"></app-quick-group>
</template>
<template slot="toolbar">
<view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click"/> </template>
......
......@@ -2,7 +2,7 @@
<studio-view-style2 viewName="activitypointergridview" viewTitle="活动" class='degridview activity-pointer-grid-view'>
<i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" search @on-search="onSearch($event)"/>
<template slot="quickGroupSearch">
<app-quick-group :items="quickGroupModel" @valuechange="qucikGroupValueChange"></app-quick-group>
<app-quick-group :items="quickGroupModel" @valuechange="quickGroupValueChange"></app-quick-group>
</template>
<template slot="searchForm">
<view_searchform
......
......@@ -29,25 +29,44 @@ export class CalendarViewBase extends MDViewBase {
* @memberof CalendarViewBase
*/
public onBeforeLoad(arg: any): void {
let _this:any = this;
if (_this.viewparams && Object.keys(_this.viewparams).length > 0) {
Object.assign(arg, _this.viewparams);
if (this.viewparams && Object.keys(this.viewparams).length > 0) {
Object.assign(arg, this.viewparams);
}
if (_this.$refs.searchform && _this.isExpandSearchForm) {
Object.assign(arg, _this.$refs.searchform.getData());
if (this.$refs.searchform && this.isExpandSearchForm) {
Object.assign(arg, (this.$refs.searchform as any).getData());
}
if (_this && !_this.isExpandSearchForm) {
Object.assign(arg, { query: _this.query });
if (this && !this.isExpandSearchForm) {
Object.assign(arg, { query: this.query });
}
// 快速分组和快速搜索栏
let otherQueryParam:any = {};
if(_this && (_this.qucikGroupData as any)){
Object.assign(otherQueryParam,_this.qucikGroupData);
const otherQueryParam: any = {};
if (this.quickGroupData) {
Object.assign(otherQueryParam, this.quickGroupData);
}
if(_this && _this.qucikFormData){
Object.assign(otherQueryParam,_this.qucikFormData);
if (this.quickFormData) {
Object.assign(otherQueryParam, this.quickFormData);
}
Object.assign(arg,{viewparams:otherQueryParam});
Object.assign(arg, { viewparams: otherQueryParam });
}
/**
* searchform 部件 search 事件
*
* @param {*} $event
* @memberof CalendarViewBase
*/
public searchform_search() {
this.onSearch();
}
/**
* searchform 部件 load 事件
*
* @param {*} $event
* @memberof CalendarViewBase
*/
public searchform_load() {
this.onSearch();
}
}
\ No newline at end of file
......@@ -76,8 +76,7 @@ export class GridViewBase extends MDViewBase {
this.viewState.next({ tag: 'grid', action: 'save', data: this.viewparams });
}
if (Object.is(res.action, 'load')) {
const _this: any = this;
_this.engine.load(res.data, true);
this.engine.load(res.data, true);
}
});
}
......
import { Prop } from 'vue-property-decorator';
import { ViewBase } from './ViewBase';
import CodeListService from '@/service/app/codelist-service';
import { Prop } from 'vue-property-decorator';
/**
* 多数据视图基类
......@@ -44,7 +44,7 @@ export class MDViewBase extends ViewBase {
* @type {*}
* @memberof MDViewBase
*/
public qucikFormData: any;
public quickFormData: any = {};
/**
* 快速分组数据对象
......@@ -52,7 +52,7 @@ export class MDViewBase extends ViewBase {
* @type {*}
* @memberof MDViewBase
*/
public qucikGroupData: any;
public quickGroupData: any = {};
/**
* 快速分组是否有抛值
......@@ -65,10 +65,10 @@ export class MDViewBase extends ViewBase {
/**
* 快速分组模型
*
* @type {Array<any>}
* @type {any[]}
* @memberof MDViewBase
*/
public quickGroupModel: Array<any> = [];
public quickGroupModel: any[] = [];
/**
* 快速搜索栏值变化
......@@ -76,8 +76,8 @@ export class MDViewBase extends ViewBase {
* @param {*} $event
* @memberof MDViewBase
*/
public qucikFormValueChange($event: any) {
this.qucikFormData = $event;
public quickFormValueChange = ($event: any) => {
this.quickFormData = $event;
this.onSearch();
}
......@@ -114,9 +114,9 @@ export class MDViewBase extends ViewBase {
* @param {*} $event
* @memberof MDViewBase
*/
protected qucikGroupValueChange($event: any) {
protected quickGroupValueChange = ($event: any) => {
if ($event && $event.data) {
this.qucikGroupData = $event.data;
this.quickGroupData = $event.data;
if (this.isEmitQuickGroupValue) {
this.onSearch();
}
......@@ -154,24 +154,4 @@ export class MDViewBase extends ViewBase {
return inputArray;
}
/**
* searchform 部件 search 事件
*
* @param {*} $event
* @memberof MDViewBase
*/
public searchform_search() {
this.onSearch();
}
/**
* searchform 部件 load 事件
*
* @param {*} $event
* @memberof MDViewBase
*/
public searchform_load() {
this.onSearch();
}
}
\ No newline at end of file
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册