Compare commits

...

20 Commits

Author SHA1 Message Date
7c0eb3290f 1.0.207 2023-09-16 14:31:03 +02:00
62403625ba fix(core): update 2023-09-16 14:31:03 +02:00
9a34b03540 1.0.206 2023-09-15 20:51:04 +02:00
8bb63df7e3 fix(core): update 2023-09-15 20:51:03 +02:00
65cd73845a 1.0.205 2023-09-15 20:11:52 +02:00
8534bc254b fix(core): update 2023-09-15 20:11:51 +02:00
2a2fd324a0 1.0.204 2023-09-15 19:07:35 +02:00
58e3de2559 fix(core): update 2023-09-15 19:07:34 +02:00
c30736870d 1.0.203 2023-09-15 19:03:19 +02:00
cfd48de885 fix(core): update 2023-09-15 19:03:18 +02:00
462df2b648 1.0.202 2023-09-15 17:27:36 +02:00
f64da93cf9 fix(core): update 2023-09-15 17:27:35 +02:00
a55db621ef 1.0.201 2023-09-14 19:46:10 +02:00
c033bdfc3b fix(core): update 2023-09-14 19:46:09 +02:00
2610e56ec1 1.0.200 2023-09-14 19:43:27 +02:00
08aa9e3fe4 fix(core): update 2023-09-14 19:43:26 +02:00
411ae7ee07 1.0.199 2023-09-13 21:14:06 +02:00
41700c1eb1 fix(core): update 2023-09-13 21:14:05 +02:00
8d7bac9793 1.0.198 2023-09-13 21:13:48 +02:00
0229eefa4d fix(core): update 2023-09-13 21:13:47 +02:00
7 changed files with 176 additions and 35 deletions

View File

@ -1,6 +1,6 @@
{ {
"name": "@design.estate/dees-catalog", "name": "@design.estate/dees-catalog",
"version": "1.0.197", "version": "1.0.207",
"private": false, "private": false,
"description": "website for lossless.com", "description": "website for lossless.com",
"main": "dist_ts_web/index.js", "main": "dist_ts_web/index.js",

View File

@ -3,6 +3,6 @@
*/ */
export const commitinfo = { export const commitinfo = {
name: '@design.estate/dees-catalog', name: '@design.estate/dees-catalog',
version: '1.0.197', version: '1.0.207',
description: 'website for lossless.com' description: 'website for lossless.com'
} }

View File

@ -71,11 +71,11 @@ export class DeesContextmenu extends DeesElement {
color: ${cssManager.bdTheme('#222', '#ccc')}; color: ${cssManager.bdTheme('#222', '#ccc')};
font-size: 14px; font-size: 14px;
width: 200px; width: 200px;
border: 1px solid #444; border: 1px solid ${cssManager.bdTheme('#fff', '#444')};
min-height: 34px; min-height: 34px;
border-radius: 3px; border-radius: 3px;
background: #222; background: ${cssManager.bdTheme('#fff', '#222')};
box-shadow: 0px 1px 4px #000; box-shadow: 0px 1px 4px ${cssManager.bdTheme('#00000020', '#000000')};
user-select: none; user-select: none;
} }
@ -92,7 +92,7 @@ export class DeesContextmenu extends DeesElement {
.mainbox .menuitem:hover { .mainbox .menuitem:hover {
cursor: pointer; cursor: pointer;
background: #ffffff10; background: ${cssManager.bdTheme('#00000010', '#ffffff10')};
} }
.mainbox .menuitem:active { .mainbox .menuitem:active {

View File

@ -42,6 +42,7 @@ import {
faCircleInfo as faCircleInfoSolid, faCircleInfo as faCircleInfoSolid,
faCircleCheck as faCircleCheckSolid, faCircleCheck as faCircleCheckSolid,
faCircleXmark as faCircleXmarkSolid, faCircleXmark as faCircleXmarkSolid,
faClockRotateLeft as faClockRotateLeftSolid,
faCopy as faCopySolid, faCopy as faCopySolid,
faDesktop as faDesktopSolid, faDesktop as faDesktopSolid,
faEye as faEyeSolid, faEye as faEyeSolid,
@ -82,6 +83,8 @@ export const faIcons = {
circleCheckSolid: faCircleCheckSolid, circleCheckSolid: faCircleCheckSolid,
circleXmark: faCircleXmarkRegular, circleXmark: faCircleXmarkRegular,
circleXmarkSolid: faCircleXmarkSolid, circleXmarkSolid: faCircleXmarkSolid,
clockRotateLeft: faClockRotateLeftSolid,
clockRotateLeftSolid: faClockRotateLeftSolid,
copy: faCopyRegular, copy: faCopyRegular,
copySolid: faCopySolid, copySolid: faCopySolid,
desktop: faDesktopSolid, desktop: faDesktopSolid,
@ -95,7 +98,7 @@ export const faIcons = {
message: faMessageRegular, message: faMessageRegular,
messageSolid: faMessageSolid, messageSolid: faMessageSolid,
mugHot: faMugHotSolid, mugHot: faMugHotSolid,
faMugHotSolid: faMugHotSolid, mugHotSolid: faMugHotSolid,
minus: faMinusSolid, minus: faMinusSolid,
minusSolid: faMinusSolid, minusSolid: faMinusSolid,
paste: faPasteRegular, paste: faPasteRegular,

View File

@ -124,7 +124,7 @@ export class DeesInputText extends DeesElement {
.showPassword:hover { .showPassword:hover {
cursor: pointer; cursor: pointer;
background: #333; background: ${cssManager.bdTheme('#00000010', '#ffffff10')};
} }
</style> </style>
<div class="maincontainer"> <div class="maincontainer">

View File

@ -2,6 +2,12 @@ import { type ITableAction } from './dees-table.js';
import * as plugins from './plugins.js'; import * as plugins from './plugins.js';
import { html } from '@design.estate/dees-element'; import { html } from '@design.estate/dees-element';
interface ITableDemoData {
date: string;
amount: string;
description: string;
}
export const demoFunc = () => html` export const demoFunc = () => html`
<style> <style>
.demoWrapper { .demoWrapper {
@ -17,6 +23,7 @@ export const demoFunc = () => html`
<dees-table <dees-table
heading1="Current Account Statement" heading1="Current Account Statement"
heading2="Bunq - Payment Account 2 - April 2021" heading2="Bunq - Payment Account 2 - April 2021"
.editableFields="${['description']}"
.data=${[ .data=${[
{ {
date: '2021-04-01', date: '2021-04-01',
@ -51,7 +58,7 @@ export const demoFunc = () => html`
iconName: 'bell', iconName: 'bell',
useTableBehaviour: 'upload', useTableBehaviour: 'upload',
type: ['inRow'], type: ['inRow'],
actionFunc: async (itemArg: any) => { actionFunc: async (itemArg) => {
alert(itemArg.amount); alert(itemArg.amount);
}, },
}, },
@ -100,7 +107,16 @@ export const demoFunc = () => html`
return null; return null;
}, },
}, },
] as ITableAction[]}" {
name: 'preview',
type: ['doubleClick', 'contextmenu'],
iconName: 'eye',
actionFunc: async (itemArg) => {
alert(itemArg.amount);
return null;
},
}
] as (ITableAction<ITableDemoData>)[] as any}"
.displayFunction=${(itemArg) => { .displayFunction=${(itemArg) => {
return { return {
...itemArg, ...itemArg,

View File

@ -37,7 +37,15 @@ export interface ITableAction<T = any> {
/** /**
* the type of the action * the type of the action
*/ */
type: ('inRow' | 'contextmenu' | 'footer' | 'header' | 'preview' | 'keyCombination')[]; type: (
| 'inRow'
| 'contextmenu'
| 'doubleClick'
| 'footer'
| 'header'
| 'preview'
| 'keyCombination'
)[];
/** /**
* allows to check if the action is relevant for the given item * allows to check if the action is relevant for the given item
* @param itemArg * @param itemArg
@ -84,7 +92,7 @@ export class DeesTable<T> extends DeesElement {
@property({ @property({
type: Array, type: Array,
}) })
public dataActions: ITableAction[] = []; public dataActions: ITableAction<T>[] = [];
@property({ @property({
attribute: false, attribute: false,
@ -96,6 +104,11 @@ export class DeesTable<T> extends DeesElement {
}) })
public selectedDataRow: T; public selectedDataRow: T;
@property({
type: Array,
})
public editableFields: string[] = [];
public files: File[] = []; public files: File[] = [];
public fileWeakMap = new WeakMap(); public fileWeakMap = new WeakMap();
@ -185,8 +198,8 @@ export class DeesTable<T> extends DeesElement {
tr:hover { tr:hover {
cursor: pointer; cursor: pointer;
} }
tr:hover .innerCellContainer { tr:hover td {
background: ${cssManager.bdTheme('#22222210', '#ffffff20')}; background: ${cssManager.bdTheme('#22222210', '#ffffff10')};
} }
tr:first-child:hover { tr:first-child:hover {
cursor: auto; cursor: auto;
@ -194,19 +207,30 @@ export class DeesTable<T> extends DeesElement {
tr:first-child:hover .innerCellContainer { tr:first-child:hover .innerCellContainer {
background: none; background: none;
} }
tr.selected .innerCellContainer { tr.selected td {
background: ${cssManager.bdTheme('#22222220', '#ffffff40')}; background: ${cssManager.bdTheme('#22222220', '#ffffff20')};
} }
tr.hasAttachment td {
background: ${cssManager.bdTheme('#0098847c', '#0098847c')};
}
th { th {
text-transform: uppercase; text-transform: uppercase;
} }
th, th,
td { td {
padding: 3px 0px; position: relative;
padding: 0px;
border-right: 1px dashed ${cssManager.bdTheme('#999', '#808080')}; border-right: 1px dashed ${cssManager.bdTheme('#999', '#808080')};
} }
.innerCellContainer { .innerCellContainer {
min-height: 36px;
position: relative;
height: 100%;
width: 100%;
padding: 6px 8px; padding: 6px 8px;
line-height: 24px;
} }
th:first-child .innerCellContainer, th:first-child .innerCellContainer,
td:first-child .innerCellContainer { td:first-child .innerCellContainer {
@ -220,11 +244,29 @@ export class DeesTable<T> extends DeesElement {
td:last-child { td:last-child {
border-right: none; border-right: none;
} }
td input {
width: 100%;
height: 100%;
outline: none;
border: 2px solid #fa6101;
top: 0px;
bottom: 0px;
right: 0px;
left: 0px;
position: absolute;
background: #fa610140;
color: inherit;
font-family: inherit;
font-size: inherit;
font-weight: inherit;
padding: 0px 6px
}
.action { .action {
margin: -8px 0px; margin: -6px 0px;
padding: 8px; padding: 10px;
line-height: 16px; line-height: 36px;
height: 36px;
display: inline-block; display: inline-block;
} }
@ -234,7 +276,7 @@ export class DeesTable<T> extends DeesElement {
} }
.action:hover { .action:hover {
background: ${cssManager.bdTheme('#CCC', '#111')}; background: ${cssManager.bdTheme('#CCC', '#00000030')};
} }
.footer { .footer {
@ -355,14 +397,14 @@ export class DeesTable<T> extends DeesElement {
console.log('dragenter'); console.log('dragenter');
console.log(realTarget); console.log(realTarget);
setTimeout(() => { setTimeout(() => {
realTarget.style.background = 'green'; realTarget.classList.add('hasAttachment');
}, 0); }, 0);
}} }}
@dragleave=${async (eventArg: DragEvent) => { @dragleave=${async (eventArg: DragEvent) => {
eventArg.preventDefault(); eventArg.preventDefault();
eventArg.stopPropagation(); eventArg.stopPropagation();
const realTarget = getTr(eventArg.target as HTMLElement); const realTarget = getTr(eventArg.target as HTMLElement);
realTarget.style.background = 'none'; realTarget.classList.remove('hasAttachment');
}} }}
@dragover=${async (eventArg: DragEvent) => { @dragover=${async (eventArg: DragEvent) => {
eventArg.preventDefault(); eventArg.preventDefault();
@ -383,23 +425,39 @@ export class DeesTable<T> extends DeesElement {
} }
}} }}
@contextmenu=${async (eventArg: MouseEvent) => { @contextmenu=${async (eventArg: MouseEvent) => {
DeesContextmenu.openContextMenuWithOptions(eventArg, this.getActionsForType('contextmenu').map(action => { DeesContextmenu.openContextMenuWithOptions(
eventArg,
this.getActionsForType('contextmenu').map((action) => {
const menuItem: plugins.tsclass.website.IMenuItem = { const menuItem: plugins.tsclass.website.IMenuItem = {
name: action.name, name: action.name,
iconName: action.iconName as any, iconName: action.iconName as any,
action: async () => { action: async () => {
await action.actionFunc(itemArg); await action.actionFunc(itemArg);
return null; return null;
} },
} };
return menuItem; return menuItem;
})); })
);
}} }}
class="${itemArg === this.selectedDataRow ? 'selected' : ''}" class="${itemArg === this.selectedDataRow ? 'selected' : ''}"
> >
${headings.map( ${headings.map(
(headingArg) => html` (headingArg) => html`
<td> <td
@dblclick=${(e: Event) => {
if (this.editableFields.includes(headingArg)) {
this.handleCellEditing(e, itemArg, headingArg);
} else {
const wantedAction = this.dataActions.find((actionArg) =>
actionArg.type.includes('doubleClick')
);
if (wantedAction) {
wantedAction.actionFunc(itemArg);
}
}
}}
>
<div class="innerCellContainer">${transformedItem[headingArg]}</div> <div class="innerCellContainer">${transformedItem[headingArg]}</div>
</td> </td>
` `
@ -468,6 +526,45 @@ export class DeesTable<T> extends DeesElement {
public async firstUpdated() {} public async firstUpdated() {}
public async updated(changedProperties: Map<string | number | symbol, unknown>): Promise<void> {
super.updated(changedProperties);
this.freezeColumnWidths();
}
freezeColumnWidths() {
// Get the table element
const table = this.shadowRoot.querySelector('table');
if (!table) return;
// Create a colgroup if it doesn't exist
let colgroup = table.querySelector('colgroup');
if (!colgroup) {
colgroup = document.createElement('colgroup');
table.insertBefore(colgroup, table.firstChild);
}
// Get the first row's cells to measure the widths
const cells = table.rows[0].cells;
for (let i = 0; i < cells.length; i++) {
const cell = cells[i];
// Get computed width
const width = window.getComputedStyle(cell).width;
// Check if there's already a <col> for this cell
let col = colgroup.children[i] as HTMLElement;
if (!col) {
col = document.createElement('col');
colgroup.appendChild(col);
}
// Set the width
col.style.width = width;
}
}
getActionsForType(typeArg: ITableAction['type'][0]) { getActionsForType(typeArg: ITableAction['type'][0]) {
const actions: ITableAction[] = []; const actions: ITableAction[] = [];
for (const action of this.dataActions) { for (const action of this.dataActions) {
@ -476,4 +573,29 @@ export class DeesTable<T> extends DeesElement {
} }
return actions; return actions;
} }
handleCellEditing(event: Event, item: T, key: string) {
const target = event.target as HTMLElement;
// Create an input element
const input = document.createElement('input');
input.type = 'text';
input.value = (item[key] as unknown as string) || '';
// When the input loses focus or the Enter key is pressed, update the data
input.addEventListener('blur', () => {
item[key] = input.value as any; // Convert string to T (you might need better type casting depending on your data structure)
target.innerHTML = input.value; // Update the cell's display
});
input.addEventListener('keydown', (e: KeyboardEvent) => {
if (e.key === 'Enter') {
input.blur(); // This will trigger the blur event handler above
}
});
// Replace the cell's content with the input
target.innerHTML = '';
target.appendChild(input);
input.focus();
}
} }