提交 2888f851 编写于 作者: KK's avatar KK

地图部件逻辑调整

上级 31cfadc6
...@@ -29,6 +29,31 @@ import 'echarts/map/js/china.js' ...@@ -29,6 +29,31 @@ import 'echarts/map/js/china.js'
*/ */
@Prop() protected fetchAction!: string; @Prop() protected fetchAction!: string;
/**
* 显示处理提示
*
* @type {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop({ default: true }) protected showBusyIndicator?: boolean;
/**
* 应用状态事件
*
* @public
* @type {(Subscription | undefined)}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
public appStateEvent: Subscription | undefined;
/**
* 地图数据数组
*
* @param {Array<any>}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
public items:Array<any> =[];
/** /**
* 获取单项树 * 获取单项树
* *
...@@ -60,13 +85,13 @@ import 'echarts/map/js/china.js' ...@@ -60,13 +85,13 @@ import 'echarts/map/js/china.js'
return; return;
} }
if (Object.is(action, "load")) { if (Object.is(action, "load")) {
this.load(Object.assign(data, { page: this.pageNumber, size: this.pageSize }), "init"); this.load(Object.assign(data);
} }
if (Object.is(action, "search")) { if (Object.is(action, "search")) {
this.load(Object.assign(data, { page: this.pageNumber, size: this.pageSize }), "init"); this.load(Object.assign(data);
} }
if (Object.is(action, "quicksearch")) { if (Object.is(action, "quicksearch")) {
this.load(Object.assign({ query: data }, { page: this.pageNumber, size: this.pageSize }), "init"); this.load(Object.assign({ query: data });
} }
if (Object.is(action, "refresh")) { if (Object.is(action, "refresh")) {
this.refresh(); this.refresh();
...@@ -109,12 +134,6 @@ import 'echarts/map/js/china.js' ...@@ -109,12 +134,6 @@ import 'echarts/map/js/china.js'
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}
*/ */
private async load(data: any = {}, type: string = "",isloadding = this.showBusyIndicator): Promise<any> { private async load(data: any = {}, type: string = "",isloadding = this.showBusyIndicator): Promise<any> {
if (!data.page) {
Object.assign(data, { page: this.pageNumber });
}
if (!data.size) {
Object.assign(data, { size: this.pageSize });
}
const parentdata: any = {}; const parentdata: any = {};
this.$emit('beforeload', parentdata); this.$emit('beforeload', parentdata);
Object.assign(data, parentdata); Object.assign(data, parentdata);
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册