feature: combined-video player.
This commit is contained in:
@ -780,9 +780,11 @@ export class GridDateColumn extends GridColumn {
|
||||
* @ignore
|
||||
* @param {HTMLElement} element
|
||||
* @param {(string | number | Date)} val
|
||||
* @param {GridItemWrapper} _wrapper
|
||||
* @param {GridColumnDefinition} col
|
||||
*/
|
||||
static setValue(element, val) {
|
||||
setDateValue(element, val);
|
||||
static setValue(element, val, _wrapper, col) {
|
||||
setDateValue(element, val, col.dateDisplayFormatter);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -793,7 +795,10 @@ export class GridDateColumn extends GridColumn {
|
||||
*/
|
||||
static getValue(e, col) {
|
||||
if (e.target.tagName === 'INPUT') {
|
||||
return getDateValue(e.target, col.dateValueFormatter);
|
||||
return {
|
||||
value: getDateValue(e.target, col.dateValueFormatter),
|
||||
text: getDateValue(e.target, col.dateDisplayFormatter)
|
||||
};
|
||||
}
|
||||
return e.target.innerText;
|
||||
}
|
||||
|
@ -264,7 +264,8 @@ let r = lang;
|
||||
* @property {("fa-light" | "fa-regular" | "fa-solid")} [iconType=fa-light] - 列为图标类型时以该值设置图标样式
|
||||
* @property {string} [dateMin] - 列为日期类型时以该值作为最小可选日期值
|
||||
* @property {string} [dateMax] - 列为日期类型时以该值作为最大可选日期值
|
||||
* @property {DateFormatterCallback} [dateValueFormatter] - 列为日期类型时自定义日期格式化函数
|
||||
* @property {string} [dateDisplayFormatter] - 列为日期类型时日期显示的格式化字符串
|
||||
* @property {(string | DateFormatterCallback)} [dateValueFormatter] - 列为日期类型时自定义日期格式化字符串或函数
|
||||
* @property {(string | GridItemStringCallback)} [tooltip] - 额外设置单元格的 tooltip,支持直接使用字符串或者使用函数返回的字符串
|
||||
* @property {Function} [onAllChecked] - 列头复选框改变时触发事件
|
||||
* @property {Function} [onChanged] - 单元格变化时触发事件
|
||||
@ -2834,6 +2835,9 @@ export class Grid {
|
||||
if (type.editing) {
|
||||
val = type.getValue({ target: cell.children[0] }, col);
|
||||
this._onRowChanged(null, i, col, val, cell, oldValue);
|
||||
if (Object.prototype.hasOwnProperty.call(val, 'value')) {
|
||||
val = val.value;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (stateChanged) {
|
||||
@ -4205,7 +4209,7 @@ export class Grid {
|
||||
});
|
||||
vals.__changed = true;
|
||||
if (typeof col.onChanged === 'function') {
|
||||
col.onChanged.call(this, item, value, oldValue, e);
|
||||
col.onChanged.call(this, item, v, oldValue, e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user