extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-08 00:54:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

interface for nm getValue() and activeFilters

Browse Source
This commit is contained in:
Ralf Becker 2021-03-01 23:08:13 +02:00
parent 41346235ab
commit 9691a14279
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/js/etemplate/et2_extension_nextmatch.js
View File

@ -85,7 +85,6 @@ var et2_INextmatchSortable = "et2_INextmatchSortable";
function implements_et2_INextmatchSortable(obj) {
return implements_methods(obj, ["setSortmode"]);
}
;
/**
* Class which implements the "nextmatch" XET-Tag
*
@ -2014,7 +2013,7 @@ var et2_nextmatch = /** @class */ (function (_super) {
idsArr[i] = idsArr[i].split("::").pop();
}
var value = {
"selected": idsArr,
selected: idsArr,
col_filter: {}
};
jQuery.extend(value, this.activeFilters, this.value);

28
api/js/etemplate/et2_extension_nextmatch.ts
View File

@ -106,7 +106,18 @@ interface PrintSettings
old_height: number,
row_selector: string,
orientation_style: HTMLStyleElement
};
}
interface ActiveFilters
{
search? : string,
filter? : any,
filter2? : any,
col_filter: {[key:string]: any},
selectcols?: string[],
searchletter?: string,
selected? : string[]
}
/**
* Class which implements the "nextmatch" XET-Tag
@ -211,14 +222,7 @@ export class et2_nextmatch extends et2_DOMWidget implements et2_IResizeable, et2
};
// Currently active filters
activeFilters: {
search? : string,
filter? : any,
filter2? : any,
col_filter: {},
selectcols?: string[],
searchletter?: string
};
activeFilters : ActiveFilters;
/**
* Update types
@ -2696,7 +2700,7 @@ export class et2_nextmatch extends et2_DOMWidget implements et2_IResizeable, et2
/**
* Get the current 'value' for the nextmatch
*/
getValue( )
getValue( ) : ActiveFilters
{
const _ids = this.getSelection();
@ -2706,8 +2710,8 @@ export class et2_nextmatch extends et2_DOMWidget implements et2_IResizeable, et2
{
idsArr[i] = idsArr[i].split("::").pop();
}
const value = {
"selected": idsArr,
const value : ActiveFilters = {
selected: idsArr,
col_filter: {}
};
jQuery.extend(value, this.activeFilters, this.value);