x4js 1.4.12 → 1.4.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/gridview.js +6 -4
- package/package.json +1 -1
- package/src/gridview.ts +9 -5
package/lib/gridview.js
CHANGED
|
@@ -328,6 +328,7 @@ class GridView extends layout_1.VLayout {
|
|
|
328
328
|
col.$col = comp;
|
|
329
329
|
return comp;
|
|
330
330
|
});
|
|
331
|
+
cols.push(new component_1.Flex({}));
|
|
331
332
|
// compute full width
|
|
332
333
|
let full_width = 0;
|
|
333
334
|
this.m_columns.forEach((col) => {
|
|
@@ -359,6 +360,7 @@ class GridView extends layout_1.VLayout {
|
|
|
359
360
|
});
|
|
360
361
|
return comp;
|
|
361
362
|
});
|
|
363
|
+
foots.push(new component_1.Flex({}));
|
|
362
364
|
this.m_footer = new layout_1.HLayout({
|
|
363
365
|
cls: '@footer',
|
|
364
366
|
content: foots,
|
|
@@ -579,16 +581,16 @@ class GridView extends layout_1.VLayout {
|
|
|
579
581
|
}
|
|
580
582
|
this.m_empty_msg.show(show);
|
|
581
583
|
if (full_width < rc.width) {
|
|
582
|
-
this.m_header.setStyleValue('width', null);
|
|
583
|
-
this.m_footer?.setStyleValue('width', null);
|
|
584
|
+
//this.m_header.setStyleValue('width', null);
|
|
585
|
+
//this.m_footer?.setStyleValue('width', null);
|
|
584
586
|
this.m_container.setStyle({
|
|
585
587
|
height: count * this.m_itemHeight,
|
|
586
588
|
width: null
|
|
587
589
|
});
|
|
588
590
|
}
|
|
589
591
|
else {
|
|
590
|
-
this.m_header.setStyleValue('width', full_width);
|
|
591
|
-
this.m_footer?.setStyleValue('width', full_width);
|
|
592
|
+
this.m_header.setStyleValue('width', full_width + 5);
|
|
593
|
+
this.m_footer?.setStyleValue('width', full_width + 5);
|
|
592
594
|
this.m_container.setStyle({
|
|
593
595
|
height: count * this.m_itemHeight,
|
|
594
596
|
width: full_width
|
package/package.json
CHANGED
package/src/gridview.ts
CHANGED
|
@@ -36,7 +36,7 @@ const T_UPDATE = Symbol('update');
|
|
|
36
36
|
|
|
37
37
|
|
|
38
38
|
import { HLayout, VLayout } from './layout'
|
|
39
|
-
import { Component, ContainerEventMap, EvSize, EvDblClick, CProps, flyWrap, html, HtmlString, SizerOverlay } from './component'
|
|
39
|
+
import { Component, ContainerEventMap, EvSize, EvDblClick, CProps, flyWrap, html, HtmlString, SizerOverlay, Flex } from './component'
|
|
40
40
|
import { Label } from './label'
|
|
41
41
|
import { _tr } from './i18n'
|
|
42
42
|
import * as Formatters from './formatters'
|
|
@@ -467,6 +467,8 @@ export class GridView extends VLayout<GridViewProps, GridViewEventMap> {
|
|
|
467
467
|
return comp;
|
|
468
468
|
});
|
|
469
469
|
|
|
470
|
+
(cols as any).push( new Flex( {} ) );
|
|
471
|
+
|
|
470
472
|
// compute full width
|
|
471
473
|
let full_width = 0;
|
|
472
474
|
this.m_columns.forEach((col) => {
|
|
@@ -507,6 +509,8 @@ export class GridView extends VLayout<GridViewProps, GridViewEventMap> {
|
|
|
507
509
|
return comp;
|
|
508
510
|
});
|
|
509
511
|
|
|
512
|
+
(foots as any).push( new Flex( {} ) );
|
|
513
|
+
|
|
510
514
|
this.m_footer = new HLayout({
|
|
511
515
|
cls: '@footer',
|
|
512
516
|
content: <any>foots,
|
|
@@ -779,16 +783,16 @@ export class GridView extends VLayout<GridViewProps, GridViewEventMap> {
|
|
|
779
783
|
this.m_empty_msg.show(show);
|
|
780
784
|
|
|
781
785
|
if (full_width < rc.width) {
|
|
782
|
-
this.m_header.setStyleValue('width', null);
|
|
783
|
-
this.m_footer?.setStyleValue('width', null);
|
|
786
|
+
//this.m_header.setStyleValue('width', null);
|
|
787
|
+
//this.m_footer?.setStyleValue('width', null);
|
|
784
788
|
this.m_container.setStyle({
|
|
785
789
|
height: count * this.m_itemHeight,
|
|
786
790
|
width: null
|
|
787
791
|
});
|
|
788
792
|
}
|
|
789
793
|
else {
|
|
790
|
-
this.m_header.setStyleValue('width', full_width);
|
|
791
|
-
this.m_footer?.setStyleValue('width', full_width);
|
|
794
|
+
this.m_header.setStyleValue('width', full_width + 5 );
|
|
795
|
+
this.m_footer?.setStyleValue('width', full_width + 5 );
|
|
792
796
|
|
|
793
797
|
this.m_container.setStyle({
|
|
794
798
|
height: count * this.m_itemHeight,
|