Syinpo/syinpoSlicer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge part changes from branch bootstrap, next to test HtmlInputElement

Browse Source
This commit is contained in:
沐见南 2020-05-01 10:43:06 +08:00
parent 56811702d2
commit c676bb727e
7 changed files with 41 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/managers/filterManager.ts
View File

@ -14,6 +14,11 @@ export class FilterManager implements IFilterManager{
constructor(host:IVisualHost){
this.host=host;
}
public clear():void{
console.debug("clear start:");
this.host.applyJsonFilter(null,"general","filter",powerbi.FilterAction.remove);
console.debug("clear end");
}
public update(field:powerbi.DataViewCategoryColumn):void{
let queryName:string=field.source.queryName;
let splitPosition:number=queryName.indexOf('.');

11
src/managers/layoutManager.ts
View File

@ -3,13 +3,22 @@ import powerbi from "powerbi-visuals-api";
import DataView = powerbi.DataView;
import * as visualInterfaces from "../visual/visualInterfaces";
import * as d3 from "d3";
import { ILayoutManager } from "../visual/visualInterfaces";
import { ILayoutManager,IFilterManager } from "../visual/visualInterfaces";
import { IFilter } from "powerbi-models";
type Selection<T extends d3.BaseType> = d3.Selection<T, any, any, any>;
export class LayoutManager implements ILayoutManager{
layout:Selection<HTMLElement>;
// constructor(layout:Selection<HTMLElement>){
// this.layout=layout;
// }
header:Selection<HTMLDivElement>
constructor(layout:Selection<HTMLElement>,filterManager:IFilterManager){
this.layout=layout;
this.header=this.layout.append('div').attr('header',true);
this.header.append('button').attr('clear',true).text('clear').on('click',function(){
filterManager.clear();
});
}
update(dataView:DataView,width:number,height:number):void{
//this.layout.style("width",width+"px").style("height",height+"px");
}

4
src/managers/managerFactory.ts
View File

@ -4,8 +4,8 @@ import * as d3 from "d3";
import powerbi from "powerbi-visuals-api";
type Selection<T extends d3.BaseType> = d3.Selection<T, any, any, any>;
export class ManagerFactory{
public static CreateLayoutManager(classLayoutManager:visualInterfaces.ILayoutManagerConstructor,container:Selection<HTMLElement>):visualInterfaces.ILayoutManager{
return new classLayoutManager(container);
public static CreateLayoutManager(classLayoutManager:visualInterfaces.ILayoutManagerConstructor,container:Selection<HTMLElement>,filterManager:visualInterfaces.IFilterManager):visualInterfaces.ILayoutManager{
return new classLayoutManager(container,filterManager);
}
public static CreateSelectorManager(classSelectorManager:visualInterfaces.ISelectorManagerConstructor,container:Selection<HTMLElement>,filterManager:visualInterfaces.IFilterManager):visualInterfaces.ISelectorManager{
return new classSelectorManager(container,filterManager);

14
src/managers/selectorManager.ts
View File

@ -26,11 +26,11 @@ export class SelectorManager implements ISelectorManager{
this.selector?.dispose();
this.selector=newSelector;
}
updateData(categories: powerbi.DataViewCategoryColumn, defaultSelect: powerbi.DataViewValueColumn, defaultStart: powerbi.DataViewValueColumn, defaultEnd: powerbi.DataViewValueColumn){
updateData(field: powerbi.DataViewCategoryColumn, defaultSelect: powerbi.DataViewValueColumn, defaultStart: powerbi.DataViewValueColumn, defaultEnd: powerbi.DataViewValueColumn){
if(!this.selector){
let fieldType=categories.source.type;
let fieldType=field.source.type;
if(fieldType.text){
this.selector=new DropDownSelector(this);
}else if(fieldType.numeric){
@ -43,7 +43,7 @@ export class SelectorManager implements ISelectorManager{
}
this.selector.update(categories, defaultSelect, defaultStart, defaultEnd);
this.selector.update(field, defaultSelect, defaultStart, defaultEnd);
};
public filterStringField(selection:string[]){
@ -51,7 +51,7 @@ export class SelectorManager implements ISelectorManager{
}
interface ISelector{
update(categories: powerbi.DataViewCategoryColumn, defaultSelect: powerbi.DataViewValueColumn, defaultStart: powerbi.DataViewValueColumn, defaultEnd: powerbi.DataViewValueColumn);
update(field: powerbi.DataViewCategoryColumn, defaultSelect: powerbi.DataViewValueColumn, defaultStart: powerbi.DataViewValueColumn, defaultEnd: powerbi.DataViewValueColumn);
dispose():void;
}
@ -64,7 +64,7 @@ abstract class Selector implements ISelector{
protected abstract createView():void;
public abstract dispose():void;
protected readonly manager:ISelectorManager;
public abstract update(categories: powerbi.DataViewCategoryColumn, defaultSelect: powerbi.DataViewValueColumn, defaultStart: powerbi.DataViewValueColumn, defaultEnd: powerbi.DataViewValueColumn):void;
public abstract update(field: powerbi.DataViewCategoryColumn, defaultSelect: powerbi.DataViewValueColumn, defaultStart: powerbi.DataViewValueColumn, defaultEnd: powerbi.DataViewValueColumn):void;
}
class DropDownSelector extends Selector{
private dropDown:Selection<HTMLSelectElement>;
@ -76,9 +76,9 @@ class DropDownSelector extends Selector{
public dispose(){
this.dropDown.remove();
}
public update(categories: powerbi.DataViewCategoryColumn, defaultSelect: powerbi.DataViewValueColumn, defaultStart: powerbi.DataViewValueColumn, defaultEnd: powerbi.DataViewValueColumn) {
public update(field: powerbi.DataViewCategoryColumn, defaultSelect: powerbi.DataViewValueColumn, defaultStart: powerbi.DataViewValueColumn, defaultEnd: powerbi.DataViewValueColumn) {
console.debug('dropDownViewManager','update start');
let options=this.dropDown.selectAll("option").data(categories.values,function(d){return d.toString();});//map data
let options=this.dropDown.selectAll("option").data(field.values,function(d){return d.toString();});//map data
options.enter().append("option").text(function(d){return d.toString();}).attr('dropDown-option');//add
options.exit().remove();//delete
console.debug("dropDown:",this.dropDown);

24
src/visual/visual.ts
View File

@ -63,20 +63,22 @@ export class Visual implements IVisual {
if (document) {
this.selectionManager =options.host.createSelectionManager();
let container=d3.select(options.element).append("div").classed("container",true);
d3.select(options.element).on('contextmenu', () => {
const mouseEvent: MouseEvent = <MouseEvent>d3.event;
//const eventTarget: EventTarget = mouseEvent.target;
//let dataPoint = d3.select(eventTarget).datum();
this.selectionManager.showContextMenu({}, {
x: mouseEvent.clientX,
y: mouseEvent.clientY
});
//mouseEvent.preventDefault();
});
// d3.select(options.element).on('contextmenu', () => {
// const mouseEvent: MouseEvent = <MouseEvent>d3.event;
// //const eventTarget: EventTarget = mouseEvent.target;
// //let dataPoint = d3.select(eventTarget).datum();
// this.selectionManager.showContextMenu({}, {
// x: mouseEvent.clientX,
// y: mouseEvent.clientY
// });
// //mouseEvent.preventDefault();
// });
let headerContainer=container.append("div").classed("header-container",true);
let selectorContainer=container.append("div").classed("selector-container",true);
this.layoutManager=ManagerFactory.CreateLayoutManager(LayoutManager,container);
//First, create the filterManager
this.filterManager=ManagerFactory.CreateFilterManager(FilterManager,options.host);
//Then, layoutManager and selectorManager
this.layoutManager=ManagerFactory.CreateLayoutManager(LayoutManager,container,this.filterManager);
this.selectorManager=ManagerFactory.CreateSelectorManager(SelectorManager,selectorContainer,this.filterManager);
}
console.debug('end constructor');

3
src/visual/visualInterfaces.ts
View File

@ -16,7 +16,7 @@ export interface ILayoutManager{
update(dataView:DataView,width:number,height:number):void;
}
export interface ILayoutManagerConstructor{
new(container:Selection<HTMLElement>):ILayoutManager;
new(container:Selection<HTMLElement>,filterManager:IFilterManager):ILayoutManager;
};
//ISelectorManager
@ -35,6 +35,7 @@ export interface ISelectorManagerConstructor{
export interface IFilterManager{
update(field:powerbi.DataViewCategoryColumn):void;
filterStringField(selection:string[]):void;
clear():void;
}
export interface IFilterManagerConstructor{
new(host:IVisualHost):IFilterManager;

4
webpack.statistics.dev.html
View File

File diff suppressed because one or more lines are too long