dany/antos-frontend
1
0
Fork 0
mirror of https://github.com/lxsang/antos-frontend.git synced 2024-12-26 17:38:20 +01:00
Code Issues 1 Actions Projects Releases Wiki Activity

add test and fix some tags

Browse Source
This commit is contained in:
Xuan Sang LE 2020-05-31 23:37:36 +02:00
parent ced3777d30
commit af496b0aac
4 changed files with 282 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/core/tags/GridViewTag.ts
View File

@ -171,7 +171,9 @@ namespace OS {
get cellitem(): string {
return $(this).attr("cellitem");
}
get header(): GenericObject<any>[] {
return this._header;
}
set header(v: GenericObject<any>[]) {
this._header = v;
if (!v || v.length === 0) {
@ -237,14 +239,23 @@ namespace OS {
}
push(row: GenericObject<any>[], flag: boolean): void {
const rowel = $("<afx-grid-row>").css(
"display",
"contents"
);
if (flag) {
$(this.refs.grid).prepend(rowel[0]);
if(!this.rows.includes(row))
{
this.rows.unshift(row);
}
} else {
rowel.appendTo(this.refs.grid);
if(!this.rows.includes(row))
{
this.rows.push(row);
}
}
const el = rowel[0] as GridRowTag;
@ -320,12 +331,13 @@ namespace OS {
return;
}
$(this.selectedRow).removeClass();
this._selectedRow = row;
this._selectedRows = [row];
evt.data.item = row;
evt.data.items = [row];
$(row).removeClass().addClass("afx-grid-row-selected");
this._selectedRows = [row];
}
this._selectedRow = row;
this._onrowselect(evt);
return this.observable.trigger("rowselect", evt);
}

2
src/core/tags/ListViewTag.ts
View File

@ -654,7 +654,6 @@ namespace OS {
let tag = this.itemtag;
if (item.tag) tag = item.tag;
const el = $(`<${tag}>`);
el.appendTo(this.refs.mlist);
if (flag) {
if (!this.has_data(item)) {
this.data.unshift(item);
@ -664,6 +663,7 @@ namespace OS {
if (!this.has_data(item)) {
this.data.push(item);
}
el.appendTo(this.refs.mlist);
}
el[0].uify(this.observable);
const element = el[0] as ListViewItemTag;

9
src/core/tags/MenuTag.ts
View File

@ -219,7 +219,6 @@ namespace OS {
};
e.preventDefault();
if (this.is_root() && this.has_nodes()) {
console.log("show submenu");
$(this.refs.submenu).show();
} else {
this.submenuoff();
@ -393,15 +392,15 @@ namespace OS {
* @returns {void}
* @memberof SimpleMenuEntryTag
*/
reset_radio(): void {
protected reset_radio(): void {
if (!this.has_nodes()) {
return;
}
for (let v of this.nodes) {
if (!v.domel.get("radio")) {
return;
if (!v.domel.radio) {
continue;
}
v.domel.set("checked", false);
v.domel.checked = false;
}
}

307
tests/testTag.ts
View File

@ -1,14 +1,16 @@
import * as JQuery from "../src/libs/jquery-3.2.1.min"
import {OS as _OS_} from "../dist/antos";
import * as JQuery from "../src/libs/jquery-3.2.1.min";
import { OS as _OS_ } from "../dist/antos";
// some global variable
const _w_ = window as any;
_w_.$ = JQuery;
const OS = _OS_ as any;
_w_.OS = OS;
interface GenericObject<T> {
[propName: string]: T;
}
// an example tag
class ExampleTag extends OS.GUI.AFXTag
{
class ExampleTag extends OS.GUI.AFXTag {
private _prop1: number;
private _prop2: string;
constructor() {
@ -38,7 +40,7 @@ class ExampleTag extends OS.GUI.AFXTag
OS.GUI.tag.define("afx-example-tag", ExampleTag);
test("Test base tag getter/setter", ()=>{
test("Test base tag getter/setter", () => {
const tag = new ExampleTag();
tag.uify();
expect(tag.aid).toBeDefined();
@ -49,7 +51,7 @@ test("Test base tag getter/setter", ()=>{
tag.set({
prop1: 10,
prop2: "Hello",
prop3: "test"
prop3: "test",
});
expect(tag.prop1).toBe(10);
expect(tag.prop2).toBe("Hello");
@ -61,7 +63,7 @@ test("Test base tag getter/setter", ()=>{
// Button test
test("Test button tag setter/getter", () =>{
test("Test button tag setter/getter", () => {
const bt = new OS.GUI.tag.ButtonTag();
bt.uify();
expect(bt.enable).toBe(true);
@ -88,25 +90,25 @@ test("Test button tag setter/getter", () =>{
expect(bt.toggle).toBe(false);
});
test("Test button tag behavior", () =>{
test("Test button tag behavior", () => {
const bt = new OS.GUI.tag.ButtonTag();
bt.uify();
const cb = jest.fn();
bt.onbtclick = cb
$("button",bt).trigger("click");
bt.onbtclick = cb;
$("button", bt).trigger("click");
expect(cb).toBeCalledTimes(1);
const data = {
text: "name",
onbtclick: jest.fn()
onbtclick: jest.fn(),
};
bt.set(data);
$("button",bt).trigger("click");
$("button", bt).trigger("click");
expect(data.onbtclick).toBeCalledTimes(1);
});
// Label test
// Label test
test("Test label tag setter/getter", () =>{
test("Test label tag setter/getter", () => {
const lbl = new OS.GUI.tag.LabelTag();
expect(lbl).toBeDefined();
lbl.uify();
@ -122,7 +124,7 @@ test("Test label tag setter/getter", () =>{
});
// switch test
test("Test switcher getter/setter", () =>{
test("Test switcher getter/setter", () => {
const sw = new OS.GUI.tag.SwitchTag();
sw.uify();
expect(sw.swon).toBe(false);
@ -135,7 +137,7 @@ test("Test switcher getter/setter", () =>{
expect(sw.enable).toBe(false);
});
test("Test switch behavior", ()=>{
test("Test switch behavior", () => {
const sw = new OS.GUI.tag.SwitchTag();
sw.uify();
const cb = jest.fn();
@ -143,10 +145,10 @@ test("Test switch behavior", ()=>{
$("span", sw).trigger("click");
expect(cb).toBeCalledTimes(1);
expect(sw.swon).toBe(true);
})
});
// List view item test
test("Test simple list view item setter/getter", ()=>{
test("Test simple list view item setter/getter", () => {
const item = new OS.GUI.tag.SimpleListItemTag();
item.uify();
expect(item.closable).toBe(false);
@ -160,11 +162,10 @@ test("Test simple list view item setter/getter", ()=>{
item.data = data;
expect(item.closable).toBe(true);
expect(item.selected).toBe(true);
expect(($("afx-label",item)[0] as any).text).toBe("Hello");
expect(($("afx-label", item)[0] as any).text).toBe("Hello");
});
test("Test simple list view item behaviour", ()=>{
test("Test simple list view item behaviour", () => {
const item = new OS.GUI.tag.SimpleListItemTag();
item.uify();
const cb = jest.fn();
@ -184,7 +185,7 @@ test("Test simple list view item behaviour", ()=>{
});
// list view test
test("Test list view setter/getter", ()=>{
test("Test list view setter/getter", () => {
const item = new OS.GUI.tag.ListViewTag();
item.uify();
expect(item.data).toBeDefined();
@ -206,19 +207,30 @@ test("Test list view setter/getter", ()=>{
expect(item.dropdown).toBe(true);
expect(item.dragndrop).toBe(true);
expect(item.itemtag).toBe("afx-sample");
})
const data: GenericObject<string>[] = [{ text: "Item 1" }];
item.data = data;
expect(item.data).toBe(data);
const dbot = { text: "bot" };
const dtop = { text: "top" };
item.push(dbot);
item.unshift(dtop);
expect(item.data[2]).toBe(dbot);
expect(item.data[0]).toBe(dtop);
item.delete(item.data[2].domel);
expect(item.data.length).toBe(2);
});
test("Test list view behaviour", () =>{
test("Test list view behaviour", () => {
const item = new OS.GUI.tag.ListViewTag();
item.uify();
const cb = jest.fn();
item.onlistselect = cb;
item.onlistdbclick = cb;
item.onlist
item.onlist;
const data = [
{ text: "Item 1", closable: true, selected: false },
{ text: "Item 2", closable: true, selected: true },
{ text: "Item 3", closable: true, selected: false }
{ text: "Item 3", closable: true, selected: false },
];
item.data = data;
expect(item.data).toBe(data);
@ -233,7 +245,7 @@ test("Test list view behaviour", () =>{
expect(cb).toBeCalledTimes(3);
expect(item.selectedItem).toBe((data[2] as any).domel);
expect(item.selectedItems.length).toBe(2);
var el = (data[0] as any).domel
var el = (data[0] as any).domel;
$("li", el).trigger("click");
expect(cb).toBeCalledTimes(4);
expect(item.selectedItems.length).toBe(3);
@ -248,7 +260,7 @@ test("Test list view behaviour", () =>{
item.data = data;
expect(item.selectedItem).toBe((data[2] as any).domel);
expect(item.selectedItems.length).toBe(1);
el = (data[1] as any).domel
el = (data[1] as any).domel;
$("li", el).trigger("dblclick");
expect(cb).toBeCalledTimes(8);
expect(item.selectedItem).toBe(el);
@ -261,7 +273,7 @@ test("Test list view behaviour", () =>{
// close an element
var close_cb = jest.fn((x) => false);
item.onitemclose = close_cb;
el = (data[0] as any).domel
el = (data[0] as any).domel;
$("i.closable", el).trigger("click");
expect(close_cb).toBeCalledTimes(1);
expect(item.data.length).toBe(3);
@ -277,31 +289,31 @@ test("Test list view behaviour", () =>{
expect(item.data.length).toBe(1);
expect(item.selectedItem).toBeUndefined();
expect(close_cb).toBeCalledTimes(2);
})
});
// test Menu item
const tree_data = {
name: 'My Tree',
function get_treedata(): GenericObject<any> {
return {
name: "My Tree",
nodes: [
{ name: 'child 1', iconclass:'fa fa-car'},
{ name: 'child 2' },
{ name: "child 1", iconclass: "fa fa-car" },
{ name: "child 2" },
{
name: 'sub tree 1',
name: "sub tree 1",
nodes: [
{
name: 'sub sub tree 1',
nodes: [
{ name: 'leaf 1' },
{ name: 'leaf 2' }
]
name: "sub sub tree 1",
nodes: [{ name: "leaf 1" }, { name: "leaf 2" }],
},
{ name: 'leaf 3' },
{ name: 'leaf 4' }
]
}
]
{ name: "leaf 3" },
{ name: "leaf 4" },
],
},
],
};
}
test("Test menu item setter/getter",()=>{
test("Test menu item setter/getter", () => {
const treedata = get_treedata();
const item = new OS.GUI.tag.SimpleMenuEntryTag();
item.uify();
expect(item.data).toBeUndefined();
@ -311,21 +323,208 @@ test("Test menu item setter/getter",()=>{
expect(item.nodes).toBeUndefined();
expect(item.parent).toBeUndefined();
expect(item.root).toBeUndefined();
const leaf = tree_data.nodes[0];
const leaf = { name: "child 1", switch: true, radio: true };
item.data = leaf;
expect(item.data).toBe(leaf);
expect(item.data.nodes).toBeUndefined();
})
expect(item.switch).toBe(true);
expect(item.radio).toBe(true);
item.data = treedata;
expect(item.nodes).toBe(treedata.nodes);
});
test("Test menu item behaviour",()=>{
test("Test menu item behaviour", () => {
const item = new OS.GUI.tag.SimpleMenuEntryTag();
item.uify();
const treedata = get_treedata();
item.data = treedata;
const cb = jest.fn();
item.onmenuselect = cb;
item.onchildselect = cb;
$(">li>a", item).trigger("click");
expect(cb).toBeCalledTimes(1);
const node0 = treedata.nodes[0].domel;
const node1 = treedata.nodes[1].domel;
node0.switch = true;
node1.switch = true;
expect(node0.checked).toBe(false);
node1.checked = true;
$(">li>a", node0).trigger("click");
expect(cb).toBeCalledTimes(2);
expect(node0.checked).toBe(true);
expect(node1.checked).toBe(true);
})
// check radio option
node0.switch = false;
node1.switch = false;
node0.radio = true;
node1.radio = true;
node0.checked = false;
expect(node0.parent).toBe(item);
expect(node1.parent).toBe(item);
expect(node0.checked).toBe(false);
expect(node1.checked).toBe(true);
$(">li>a", node0).trigger("click");
expect(cb).toBeCalledTimes(3);
expect(node0.checked).toBe(true);
expect(node1.checked).toBe(false);
});
// test Menu
test("Test menu setter/getter",()=>{
test("Test menu setter/getter", () => {
const item = new OS.GUI.tag.MenuTag();
item.uify();
const treedata = get_treedata();
item.items = [treedata];
expect(item.items[0]).toBe(treedata);
expect(item.context).toBe(false);
item.context = true;
expect(item.context).toBe(true);
expect(item.contentag).toBe("afx-menu-entry");
item.contentag = "afx-sample";
expect(item.contentag).toBe("afx-sample");
const extra_data_top: GenericObject<string> = { name: "test" };
item.unshift(extra_data_top);
expect(item.items.length).toBe(2);
expect(item.items[0]).toBe(extra_data_top);
const extra_data_bot: GenericObject<string> = { name: "test" };
item.push(extra_data_bot);
expect(item.items[2]).toBe(extra_data_bot);
item.delete(extra_data_top.domel);
expect(item.items[0] === extra_data_top).toBe(false);
});
})
test("Test menu behavior", () => {
const item = new OS.GUI.tag.MenuTag();
const treedata = get_treedata();
item.uify();
item.items = [treedata];
const cb = jest.fn();
item.onmenuselect = cb;
const node0 = treedata.nodes[0].domel;
$(">li>a", node0).trigger("click");
expect(cb).toBeCalledTimes(1);
});
test("Test menu behavior",()=>{
// Gridview tag
test("Test gridview cell setter/getter", () => {
const cell = new OS.GUI.tag.SimpleGridCellTag();
cell.uify();
expect(cell.selected).toBe(false);
cell.selected = true;
expect(cell.selected).toBe(true);
const celldata = { text: "test" };
cell.data = celldata;
expect(cell.data).toBe(celldata);
});
})
test("Test gridview cell behavior", () => {
const cell = new OS.GUI.tag.SimpleGridCellTag();
cell.uify();
const celldata = { text: "test" };
cell.data = celldata;
const cb = jest.fn();
cell.oncellselect = cb;
cell.oncelldbclick = cb;
cell.selected = true;
expect(cb).toBeCalledTimes(1);
$(cell).trigger("click");
expect(cb).toBeCalledTimes(2);
$(cell).trigger("dblclick");
expect(cb).toBeCalledTimes(3);
});
function get_grid_data(): GenericObject<any> {
return {
header: [
{ text: "header 1" },
{ text: "header 2" },
{ text: "header 3" },
],
rows: [
[{ text: "text 1" }, { text: "text 2" }, { text: "text 3" }],
[{ text: "text 4" }, { text: "text 5" }, { text: "text 6" }],
[{ text: "text 7" }, { text: "text 8" }, { text: "text 9" }],
],
};
}
test("Test gridview setter/getter", () => {
const grid = new OS.GUI.tag.GridViewTag();
grid.uify();
expect(grid.headeritem).toBe("afx-grid-cell");
expect(grid.cellitem).toBe("afx-grid-cell");
expect(grid.selectedCell).toBe(undefined);
expect(grid.selectedRow).toBe(undefined);
expect(grid.selectedRows).toBeDefined();
expect(grid.selectedRows.length).toBe(0);
expect(grid.rows).toBeDefined();
expect(grid.rows.length).toBe(0);
expect(grid.multiselect).toBe(false);
grid.multiselect = true;
const data = get_grid_data();
data.rows[1][0].selected = true;
data.rows[2][0].selected = true;
grid.set(data);
const row = data.rows[2];
const cell = row[0];
expect(grid.rows).toBe(data.rows);
expect(grid.header).toBe(data.header);
expect(grid.selectedCell).toBe(cell.domel);
expect(grid.selectedRow).toBe(row.domel);
expect(grid.selectedRows.length).toBe(2);
const toprow: any = [{ text: "text -3" }, { text: "text -2" }, { text: "text -1" }];
const botrow: any = [{ text: "text 10" }, { text: "text 11" }, { text: "text 12" }];
grid.unshift(toprow);
grid.push(botrow);
expect(grid.rows.length).toBe(5);
grid.delete(toprow.domel);
grid.delete(botrow.domel);
expect(grid.rows.length).toBe(3);
expect(grid.rows.includes(toprow.domel)).toBe(false);
expect(grid.rows.includes(botrow.domel)).toBe(false);
grid.headeritem = "afx-sample";
grid.cellitem = "afx-sample";
expect(grid.headeritem).toBe("afx-sample");
expect(grid.cellitem).toBe("afx-sample");
});
test("Test gridview behavior", () => {
const grid = new OS.GUI.tag.GridViewTag();
grid.uify();
const cb = jest.fn();
grid.oncellselect = cb;
grid.onrowselect = cb;
grid.oncelldbclick = cb;
const data = get_grid_data();
const row0 = data.rows[0];
const row1 = data.rows[1];
row0[1].selected = true;
grid.set(data);
$(row1[0].domel).trigger("click");
expect(cb).toBeCalledTimes(4);
expect(grid.selectedCell).toBe(row1[0].domel);
expect(grid.selectedRow).toBe(row1.domel);
expect(grid.selectedRows.length).toBe(1);
grid.multiselect = true;
$(row0[1].domel).trigger("click");
expect(cb).toBeCalledTimes(6);
expect(grid.selectedRows.length).toBe(2);
$(row0[1].domel).trigger("dblclick");
expect(cb).toBeCalledTimes(7);
expect(grid.selectedRows.length).toBe(2);
});
// Treeview
test("Treeview item setter/getter", ()=>{
});
test("Treeview item behavior", ()=>{
});
// Treeview
test("Treeview setter/getter", ()=>{
});
test("Treeview behavior", ()=>{
});