@revolist/revogrid
Advanced tools
Comparing version 1.5.18 to 1.5.19
@@ -20,6 +20,2 @@ import { h } from '@stencil/core'; | ||
const data = this.rowDataModel(r, c); | ||
// quick fix, remove | ||
if (!data) { | ||
return true; | ||
} | ||
return readOnly(data); | ||
@@ -39,6 +35,2 @@ } | ||
const data = this.rowDataModel(r, c); | ||
// quick fix, remove | ||
if (!data) { | ||
return props; | ||
} | ||
const extra = extraPropsFunc(data); | ||
@@ -69,6 +61,2 @@ if (!extra) { | ||
const data = this.rowDataModel(r, c); | ||
// quick fix, remove | ||
if (!data) { | ||
return; | ||
} | ||
return tpl(h, data); | ||
@@ -85,6 +73,2 @@ } | ||
const data = this.rowDataModel(r, c); | ||
// quick fix, remove | ||
if (!data) { | ||
return ''; | ||
} | ||
return ColumnService.getData(data.model[data.prop]); | ||
@@ -97,5 +81,2 @@ } | ||
const data = this.rowDataModel(rowIndex, c); | ||
if (!data) { | ||
throw new Error('Data expcted'); | ||
} | ||
return { prop: data.prop, rowIndex, val, model: data.model, type: this.dataStore.get('type') }; | ||
@@ -112,3 +93,3 @@ } | ||
if (!data[r]) { | ||
return; | ||
console.error('unexpected count'); | ||
} | ||
@@ -115,0 +96,0 @@ const model = data[r] || {}; |
@@ -42,5 +42,2 @@ import { Component, Element, Event, Prop, Watch, h } from '@stencil/core'; | ||
const model = this.columnService.rowDataModel(row.itemIndex, col.itemIndex); | ||
if (!model) { | ||
return; | ||
} | ||
return h("div", Object.assign({}, props), | ||
@@ -47,0 +44,0 @@ h(CellRenderer, { model: model, canDrag: this.canDrag, onDragStart: (e) => this.dragStartCell.emit(e) })); |
@@ -108,5 +108,15 @@ import debounce from 'lodash/debounce'; | ||
getCurrentCell({ x, y }, { el, rows, cols }) { | ||
const { top, left } = el.getBoundingClientRect(); | ||
const row = getItemByPosition(rows, y - top); | ||
const col = getItemByPosition(cols, x - left); | ||
const { top, left, height, width } = el.getBoundingClientRect(); | ||
let cellY = y - top; | ||
// limit to element height | ||
if (cellY >= height) { | ||
cellY = height - 1; | ||
} | ||
let cellX = x - left; | ||
// limit to element width | ||
if (cellX >= width) { | ||
cellX = width - 1; | ||
} | ||
const row = getItemByPosition(rows, cellY); | ||
const col = getItemByPosition(cols, cellX); | ||
return { x: col.itemIndex, y: row.itemIndex }; | ||
@@ -113,0 +123,0 @@ } |
@@ -18,3 +18,3 @@ import { Component, Prop, h, Watch, Element, Listen, Event, Method } from '@stencil/core'; | ||
*/ | ||
this.frameSize = 0; | ||
this.frameSize = 5; | ||
/** | ||
@@ -272,3 +272,3 @@ * Indicates default row size. | ||
"reflect": false, | ||
"defaultValue": "0" | ||
"defaultValue": "5" | ||
}, | ||
@@ -275,0 +275,0 @@ "rowSize": { |
@@ -73,4 +73,3 @@ import { getItemByPosition } from '../dimension/dimension.helpers'; | ||
let size = currentSize; | ||
let i = 0; | ||
while (size <= opt.maxSize && i < opt.maxCount) { | ||
while (size <= opt.maxSize && index < opt.maxCount) { | ||
const newSize = getItemSize(index, opt.sizes, opt.origSize); | ||
@@ -85,3 +84,2 @@ items.push({ | ||
index++; | ||
i++; | ||
} | ||
@@ -88,0 +86,0 @@ return items; |
@@ -18,3 +18,3 @@ import {generateHeader} from "./generate-header.js"; | ||
prop: col, | ||
pin: j === 2 ? 'colPinStart' : j === 20 ? 'colPinEnd' : undefined, | ||
pin: j === 0 ? 'colPinStart' : j === 20 ? 'colPinEnd' : undefined, | ||
sortable: true, | ||
@@ -24,2 +24,8 @@ size: j === 5 ? 200 : undefined, | ||
rowDrag: j === 2, | ||
} | ||
if (col === 1) { | ||
columns[col].cellTemplate = (h, props) => { | ||
if (!props.model) console.log(props.model); | ||
return props.model[props.prop]; | ||
} | ||
/* | ||
@@ -35,8 +41,2 @@ cellTemplate: (h, props) => { | ||
} | ||
if (col === 1) { | ||
columns[col].cellTemplate = (h, props) => { | ||
console.log(props.model); | ||
return props.model[props.prop]; | ||
} | ||
} | ||
} | ||
@@ -47,4 +47,4 @@ } | ||
let headers = Object.keys(columns).map((k) => columns[k]); | ||
// const grouped = headers.splice(1, 4); | ||
/* const grouped2 = grouped.splice(0, 2); | ||
const grouped = headers.splice(1, 4); | ||
const grouped2 = grouped.splice(0, 2); | ||
grouped.push({ | ||
@@ -55,3 +55,3 @@ name: 'Grouped2', | ||
/* | ||
const grouped4 = headers.splice(1, 3); | ||
@@ -70,3 +70,3 @@ */ | ||
rows: result, | ||
// pinnedTopRows, | ||
pinnedTopRows, | ||
// pinnedBottomRows, | ||
@@ -73,0 +73,0 @@ headers |
@@ -1,1 +0,1 @@ | ||
System.register(["./p-b76be787.system.js","./p-e2c75b87.system.js"],(function(e,o){"use strict";var r,n;return{setters:[function(e){r=e.p;n=e.b},function(){}],execute:function(){var e=function(){var e=o.meta.url;var n={};if(e!==""){n.resourcesUrl=new URL(".",e).href}return r(n)};e().then((function(e){return n([["p-a00adf8f.system",[[32,"revo-grid",{frameSize:[2,"frame-size"],rowSize:[2,"row-size"],colSize:[2,"col-size"],range:[4],readonly:[4],resize:[4],canFocus:[4,"can-focus"],columns:[16],source:[16],pinnedTopSource:[16],pinnedBottomSource:[16],editors:[16],theme:[1537],rowClass:[513,"row-class"],refresh:[64],scrollToRow:[64],scrollToColumnIndex:[64],scrollToColumnProp:[64],scrollToCoordinate:[64]},[[0,"internalCellEdit","onBeforeEdit"],[0,"internalRangeDataApply","onBeforeRangeEdit"],[0,"internalSelectionChanged","onRangeChanged"],[0,"initialRowDragStart","onDragStart"],[0,"initialRowDropped","onRowDropped"],[0,"initialHeaderClick","onHeaderClick"],[0,"internalFocusCell","onCellFocus"]]],[0,"revogr-viewport",{columnStores:[16],rowStores:[16],dimensions:[16],viewports:[16],editors:[16],rowClass:[1,"row-class"],uuid:[1],resize:[4],readonly:[4],range:[4],scrollToCoordinate:[64]},[[4,"click","handleOutsideClick"],[0,"internalRowDragStart","onRowDragStarted"],[0,"internalRowDragEnd","onRowDragEnd"],[0,"internalRowDrag","onRowDrag"],[0,"internalRowMouseMove","onRowMouseMove"]]],[4,"revogr-overlay-selection",{readonly:[4],range:[4],canDrag:[4,"can-drag"],selectionStore:[16],dimensionRow:[16],dimensionCol:[16],dataStore:[16],colData:[16],lastCell:[16],editors:[16],autoFill:[32]},[[5,"mouseleave","onMouseOut"],[5,"mouseup","onMouseUp"],[0,"dragStartCell","onCellDrag"],[4,"keydown","handleKeyDown"]]],[0,"revogr-data",{colData:[16],readonly:[4],range:[4],canDrag:[4,"can-drag"],rowClass:[1,"row-class"],rows:[16],cols:[16],dimensionRow:[16],dataStore:[16]}],[0,"revogr-header",{cols:[16],dimensionCol:[16],parent:[1],groups:[16],groupingDepth:[2,"grouping-depth"],canResize:[4,"can-resize"],colData:[16]}],[0,"revogr-scroll-virtual",{dimension:[1],contentSize:[2,"content-size"],virtualSize:[2,"virtual-size"],setScroll:[64]}],[4,"revogr-viewport-scroll",{contentWidth:[2,"content-width"],contentHeight:[2,"content-height"],setScroll:[64]}],[0,"revogr-edit",{editCell:[16],column:[16],editor:[16]}],[0,"revogr-order-editor",{parent:[16],dimensionRow:[16],dimensionCol:[16],dataStore:[16],dragStart:[64],endOrder:[64],clearOrder:[64]},[[5,"mouseleave","onMouseOut"],[5,"mouseup","onMouseUp"]]]]]],e)}))}}})); | ||
System.register(["./p-b76be787.system.js","./p-e2c75b87.system.js"],(function(e,o){"use strict";var r,n;return{setters:[function(e){r=e.p;n=e.b},function(){}],execute:function(){var e=function(){var e=o.meta.url;var n={};if(e!==""){n.resourcesUrl=new URL(".",e).href}return r(n)};e().then((function(e){return n([["p-6d65cd4d.system",[[32,"revo-grid",{frameSize:[2,"frame-size"],rowSize:[2,"row-size"],colSize:[2,"col-size"],range:[4],readonly:[4],resize:[4],canFocus:[4,"can-focus"],columns:[16],source:[16],pinnedTopSource:[16],pinnedBottomSource:[16],editors:[16],theme:[1537],rowClass:[513,"row-class"],refresh:[64],scrollToRow:[64],scrollToColumnIndex:[64],scrollToColumnProp:[64],scrollToCoordinate:[64]},[[0,"internalCellEdit","onBeforeEdit"],[0,"internalRangeDataApply","onBeforeRangeEdit"],[0,"internalSelectionChanged","onRangeChanged"],[0,"initialRowDragStart","onDragStart"],[0,"initialRowDropped","onRowDropped"],[0,"initialHeaderClick","onHeaderClick"],[0,"internalFocusCell","onCellFocus"]]],[0,"revogr-viewport",{columnStores:[16],rowStores:[16],dimensions:[16],viewports:[16],editors:[16],rowClass:[1,"row-class"],uuid:[1],resize:[4],readonly:[4],range:[4],scrollToCoordinate:[64]},[[4,"click","handleOutsideClick"],[0,"internalRowDragStart","onRowDragStarted"],[0,"internalRowDragEnd","onRowDragEnd"],[0,"internalRowDrag","onRowDrag"],[0,"internalRowMouseMove","onRowMouseMove"]]],[4,"revogr-overlay-selection",{readonly:[4],range:[4],canDrag:[4,"can-drag"],selectionStore:[16],dimensionRow:[16],dimensionCol:[16],dataStore:[16],colData:[16],lastCell:[16],editors:[16],autoFill:[32]},[[5,"mouseleave","onMouseOut"],[5,"mouseup","onMouseUp"],[0,"dragStartCell","onCellDrag"],[4,"keydown","handleKeyDown"]]],[0,"revogr-data",{colData:[16],readonly:[4],range:[4],canDrag:[4,"can-drag"],rowClass:[1,"row-class"],rows:[16],cols:[16],dimensionRow:[16],dataStore:[16]}],[0,"revogr-header",{cols:[16],dimensionCol:[16],parent:[1],groups:[16],groupingDepth:[2,"grouping-depth"],canResize:[4,"can-resize"],colData:[16]}],[0,"revogr-scroll-virtual",{dimension:[1],contentSize:[2,"content-size"],virtualSize:[2,"virtual-size"],setScroll:[64]}],[4,"revogr-viewport-scroll",{contentWidth:[2,"content-width"],contentHeight:[2,"content-height"],setScroll:[64]}],[0,"revogr-edit",{editCell:[16],column:[16],editor:[16]}],[0,"revogr-order-editor",{parent:[16],dimensionRow:[16],dimensionCol:[16],dataStore:[16],dragStart:[64],endOrder:[64],clearOrder:[64]},[[5,"mouseleave","onMouseOut"],[5,"mouseup","onMouseUp"]]]]]],e)}))}}})); |
@@ -1,1 +0,1 @@ | ||
import{p as o,b as e}from"./p-4d59ff7d.js";import"./p-92b34a33.js";(()=>{const e=import.meta.url,r={};return""!==e&&(r.resourcesUrl=new URL(".",e).href),o(r)})().then(o=>e([["p-7bec2a59",[[32,"revo-grid",{frameSize:[2,"frame-size"],rowSize:[2,"row-size"],colSize:[2,"col-size"],range:[4],readonly:[4],resize:[4],canFocus:[4,"can-focus"],columns:[16],source:[16],pinnedTopSource:[16],pinnedBottomSource:[16],editors:[16],theme:[1537],rowClass:[513,"row-class"],refresh:[64],scrollToRow:[64],scrollToColumnIndex:[64],scrollToColumnProp:[64],scrollToCoordinate:[64]},[[0,"internalCellEdit","onBeforeEdit"],[0,"internalRangeDataApply","onBeforeRangeEdit"],[0,"internalSelectionChanged","onRangeChanged"],[0,"initialRowDragStart","onDragStart"],[0,"initialRowDropped","onRowDropped"],[0,"initialHeaderClick","onHeaderClick"],[0,"internalFocusCell","onCellFocus"]]],[0,"revogr-viewport",{columnStores:[16],rowStores:[16],dimensions:[16],viewports:[16],editors:[16],rowClass:[1,"row-class"],uuid:[1],resize:[4],readonly:[4],range:[4],scrollToCoordinate:[64]},[[4,"click","handleOutsideClick"],[0,"internalRowDragStart","onRowDragStarted"],[0,"internalRowDragEnd","onRowDragEnd"],[0,"internalRowDrag","onRowDrag"],[0,"internalRowMouseMove","onRowMouseMove"]]],[4,"revogr-overlay-selection",{readonly:[4],range:[4],canDrag:[4,"can-drag"],selectionStore:[16],dimensionRow:[16],dimensionCol:[16],dataStore:[16],colData:[16],lastCell:[16],editors:[16],autoFill:[32]},[[5,"mouseleave","onMouseOut"],[5,"mouseup","onMouseUp"],[0,"dragStartCell","onCellDrag"],[4,"keydown","handleKeyDown"]]],[0,"revogr-data",{colData:[16],readonly:[4],range:[4],canDrag:[4,"can-drag"],rowClass:[1,"row-class"],rows:[16],cols:[16],dimensionRow:[16],dataStore:[16]}],[0,"revogr-header",{cols:[16],dimensionCol:[16],parent:[1],groups:[16],groupingDepth:[2,"grouping-depth"],canResize:[4,"can-resize"],colData:[16]}],[0,"revogr-scroll-virtual",{dimension:[1],contentSize:[2,"content-size"],virtualSize:[2,"virtual-size"],setScroll:[64]}],[4,"revogr-viewport-scroll",{contentWidth:[2,"content-width"],contentHeight:[2,"content-height"],setScroll:[64]}],[0,"revogr-edit",{editCell:[16],column:[16],editor:[16]}],[0,"revogr-order-editor",{parent:[16],dimensionRow:[16],dimensionCol:[16],dataStore:[16],dragStart:[64],endOrder:[64],clearOrder:[64]},[[5,"mouseleave","onMouseOut"],[5,"mouseup","onMouseUp"]]]]]],o)); | ||
import{p as o,b as e}from"./p-4d59ff7d.js";import"./p-92b34a33.js";(()=>{const e=import.meta.url,r={};return""!==e&&(r.resourcesUrl=new URL(".",e).href),o(r)})().then(o=>e([["p-8f0bffb5",[[32,"revo-grid",{frameSize:[2,"frame-size"],rowSize:[2,"row-size"],colSize:[2,"col-size"],range:[4],readonly:[4],resize:[4],canFocus:[4,"can-focus"],columns:[16],source:[16],pinnedTopSource:[16],pinnedBottomSource:[16],editors:[16],theme:[1537],rowClass:[513,"row-class"],refresh:[64],scrollToRow:[64],scrollToColumnIndex:[64],scrollToColumnProp:[64],scrollToCoordinate:[64]},[[0,"internalCellEdit","onBeforeEdit"],[0,"internalRangeDataApply","onBeforeRangeEdit"],[0,"internalSelectionChanged","onRangeChanged"],[0,"initialRowDragStart","onDragStart"],[0,"initialRowDropped","onRowDropped"],[0,"initialHeaderClick","onHeaderClick"],[0,"internalFocusCell","onCellFocus"]]],[0,"revogr-viewport",{columnStores:[16],rowStores:[16],dimensions:[16],viewports:[16],editors:[16],rowClass:[1,"row-class"],uuid:[1],resize:[4],readonly:[4],range:[4],scrollToCoordinate:[64]},[[4,"click","handleOutsideClick"],[0,"internalRowDragStart","onRowDragStarted"],[0,"internalRowDragEnd","onRowDragEnd"],[0,"internalRowDrag","onRowDrag"],[0,"internalRowMouseMove","onRowMouseMove"]]],[4,"revogr-overlay-selection",{readonly:[4],range:[4],canDrag:[4,"can-drag"],selectionStore:[16],dimensionRow:[16],dimensionCol:[16],dataStore:[16],colData:[16],lastCell:[16],editors:[16],autoFill:[32]},[[5,"mouseleave","onMouseOut"],[5,"mouseup","onMouseUp"],[0,"dragStartCell","onCellDrag"],[4,"keydown","handleKeyDown"]]],[0,"revogr-data",{colData:[16],readonly:[4],range:[4],canDrag:[4,"can-drag"],rowClass:[1,"row-class"],rows:[16],cols:[16],dimensionRow:[16],dataStore:[16]}],[0,"revogr-header",{cols:[16],dimensionCol:[16],parent:[1],groups:[16],groupingDepth:[2,"grouping-depth"],canResize:[4,"can-resize"],colData:[16]}],[0,"revogr-scroll-virtual",{dimension:[1],contentSize:[2,"content-size"],virtualSize:[2,"virtual-size"],setScroll:[64]}],[4,"revogr-viewport-scroll",{contentWidth:[2,"content-width"],contentHeight:[2,"content-height"],setScroll:[64]}],[0,"revogr-edit",{editCell:[16],column:[16],editor:[16]}],[0,"revogr-order-editor",{parent:[16],dimensionRow:[16],dimensionCol:[16],dataStore:[16],dragStart:[64],endOrder:[64],clearOrder:[64]},[[5,"mouseleave","onMouseOut"],[5,"mouseup","onMouseUp"]]]]]],o)); |
@@ -27,3 +27,3 @@ import { VNode } from '../../stencil-public-runtime'; | ||
getCellEditor(_r: number, c: number): string | undefined; | ||
rowDataModel(r: number, c: number): ColumnDataSchemaModel | void; | ||
rowDataModel(r: number, c: number): ColumnDataSchemaModel; | ||
getRangeData(d: Selection.ChangedRange): RevoGrid.DataLookup; | ||
@@ -30,0 +30,0 @@ applyRangeData(data: RevoGrid.DataLookup): void; |
{ | ||
"name": "@revolist/revogrid", | ||
"version": "1.5.18", | ||
"version": "1.5.19", | ||
"description": "Virtual reactive data grid component - RevoGrid.", | ||
@@ -5,0 +5,0 @@ "license": "MIT", |
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
4361920
64521