Skip to content

Commit 553047e

Browse files
committed
fix default value for configured field width
1 parent e8bd7eb commit 553047e

File tree

6 files changed

+15
-17
lines changed

6 files changed

+15
-17
lines changed

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,10 @@ Just include the table as seen in the example below.
114114
name: 'Awesome:',
115115
options: ['CREATE', 'EDIT', 'DELETE', 'DETAILS'],
116116
columns_setting: [
117-
{name: 'id', show: false, edit: true, size: '200px'},
118-
{name: 'name', show: true, edit: true, size: '200px'},
119-
{name: 'why', show: true, edit: true, size: '200px'},
120-
{name: 'sthg', show: true, edit: false, size: '200px'}
117+
{name: 'id', show: false, edit: true, width: '200px'},
118+
{name: 'name', show: true, edit: true, width: '200px'},
119+
{name: 'why', show: true, edit: true, width: '200px'},
120+
{name: 'sthg', show: true, edit: false, width: '200px'}
121121
]
122122
}}
123123
table_data={page_data}></SvelteGenericCrudTable>

dist/crud-table-config-html.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ let table_config = {
33
name: 'Awesome',
44
options: ['CREATE', 'EDIT', 'DELETE', 'DETAILS'],
55
columns_setting: [
6-
{name: 'id', show: false, edit: true, size: '200px'},
7-
{name: 'job', show: true, edit: true, size: '200px'},
8-
{name: 'name', show: true, edit: true, size: '200px'},
9-
{name: 'private', show: true, edit: false, size: '200px'}
6+
{name: 'id', show: false, edit: true, width: '200px'},
7+
{name: 'job', show: true, edit: true, width: '100px'},
8+
{name: 'name', show: true, edit: true, width: '200px'},
9+
{name: 'private', show: true, edit: false, width: '200px'}
1010
]
1111
}
1212

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "svelte-generic-crud-table",
3-
"version": "1.5.8",
3+
"version": "1.5.9",
44
"description": "<crud-table> renders object-arrays with options-panel and inline edit per row. Dispatches events for ongoing data handling. As self-containing webcomponent or for Svelte in 60KB",
55
"main": "dist/build/crud-table.js",
66
"module": "dist/build/crud-table.mjs",

src/SvelteGenericCrudTable.svelte

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@
161161
{#each table_config.columns_setting as elem}
162162
<!-- /* istanbul ignore next line */ -->
163163
<td class="headline {genericCrudTable.isShowField(elem.name) === false ? 'hidden' : 'shown'}"
164-
style="width:{genericCrudTable.getShowFieldWidth(elem.name)}"
164+
style="max-width:{genericCrudTable.getShowFieldWidth(elem.name)}"
165165
aria-label="Sort{elem.name}"
166166
on:click={(e) => handleSort(elem.name, e)}>
167167
<textarea class="sortable"
@@ -185,7 +185,7 @@
185185
<!-- /* istanbul ignore next */ -->
186186
{#if (column_order.name === genericCrudTable.getKey(elem))}
187187
<td class="{genericCrudTable.isShowField(column_order.name) === false ? 'hidden' : 'shown'}"
188-
style="width:{genericCrudTable.getShowFieldWidth(column_order.name)}">
188+
style="max-width:{genericCrudTable.getShowFieldWidth(column_order.name)}">
189189
<textarea id={name + column_order.name + i}
190190
aria-label={name + column_order.name + i}
191191
disabled>{table_data[i][column_order.name]}</textarea>
@@ -296,7 +296,6 @@
296296
text-align: left;
297297
border-collapse: collapse;
298298
table-layout: fixed;
299-
width: 100%;
300299
margin-left: 1em;
301300
}
302301

src/SvelteGenericCrudTableService.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,19 +134,18 @@ export class SvelteGenericCrudTableService {
134134
}
135135

136136
getShowFieldWidth(field) {
137-
return (this.getColumnSetting('width', field, '100px') !== undefined) ? this.getColumnSetting('width', field, '100px') : '';
137+
return (this.isShowField(field)) ? this.getColumnSetting('width', field, '100px') : 0;
138138
}
139139

140140
getColumnSetting(attr, column, preset) {
141-
let val = preset;
142-
let column_setting = {};
141+
let column_setting = [];
143142
this.table_config.columns_setting.forEach((elem) => {
144143
if (elem.name === column) {
145144
column_setting = elem;
146145
}
147146
});
148147

149-
return column_setting[attr];
148+
return (column_setting[attr] !== undefined) ? column_setting[attr] : preset;
150149
}
151150
}
152151

src/SvelteGenericCrudTableService.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ function runTest(shadowed) {
268268
const genericCrudTable = new SvelteGenericCrudTableService(config, shadowed);
269269
let actual = genericCrudTable.getShowFieldWidth('name');
270270

271-
expect(actual).toBe('');
271+
expect(actual).toBe('100px');
272272
})
273273

274274
};

0 commit comments

Comments
 (0)