tabulator-tables 6.5.0 → 6.5.1
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/dist/js/tabulator.js +1 -1
- package/dist/js/tabulator.min.js +1 -1
- package/dist/js/tabulator_esm.js +1 -1
- package/dist/js/tabulator_esm.min.js +1 -1
- package/dist/js/tabulator_esm.min.mjs +1 -1
- package/dist/js/tabulator_esm.mjs +1 -1
- package/package.json +2 -1
- package/src/js/builds/esm.js +16 -0
- package/src/js/builds/jquery_wrapper.js +63 -0
- package/src/js/builds/usd.js +1 -0
- package/src/js/core/ColumnManager.js +789 -0
- package/src/js/core/CoreFeature.js +140 -0
- package/src/js/core/FooterManager.js +102 -0
- package/src/js/core/Module.js +140 -0
- package/src/js/core/RowManager.js +1140 -0
- package/src/js/core/Tabulator.js +928 -0
- package/src/js/core/TabulatorFull.js +21 -0
- package/src/js/core/cell/Cell.js +299 -0
- package/src/js/core/cell/CellComponent.js +79 -0
- package/src/js/core/column/Column.js +978 -0
- package/src/js/core/column/ColumnComponent.js +151 -0
- package/src/js/core/column/defaults/options.js +18 -0
- package/src/js/core/defaults/options.js +66 -0
- package/src/js/core/modules/core.js +3 -0
- package/src/js/core/modules/optional.js +37 -0
- package/src/js/core/rendering/Renderer.js +204 -0
- package/src/js/core/rendering/renderers/BasicHorizontal.js +27 -0
- package/src/js/core/rendering/renderers/BasicVertical.js +103 -0
- package/src/js/core/rendering/renderers/VirtualDomHorizontal.js +587 -0
- package/src/js/core/rendering/renderers/VirtualDomVertical.js +642 -0
- package/src/js/core/row/PseudoRow.js +47 -0
- package/src/js/core/row/Row.js +487 -0
- package/src/js/core/row/RowComponent.js +94 -0
- package/src/js/core/tools/Alert.js +66 -0
- package/src/js/core/tools/ComponentFunctionBinder.js +32 -0
- package/src/js/core/tools/DataLoader.js +128 -0
- package/src/js/core/tools/DependencyRegistry.js +82 -0
- package/src/js/core/tools/DeprecationAdvisor.js +51 -0
- package/src/js/core/tools/ExternalEventBus.js +105 -0
- package/src/js/core/tools/Helpers.js +66 -0
- package/src/js/core/tools/InteractionMonitor.js +329 -0
- package/src/js/core/tools/InternalEventBus.js +162 -0
- package/src/js/core/tools/ModuleBinder.js +153 -0
- package/src/js/core/tools/OptionsList.js +45 -0
- package/src/js/core/tools/Popup.js +317 -0
- package/src/js/core/tools/TableRegistry.js +65 -0
- package/src/js/modules/Accessor/Accessor.js +115 -0
- package/src/js/modules/Accessor/defaults/accessors.js +5 -0
- package/src/js/modules/Ajax/Ajax.js +142 -0
- package/src/js/modules/Ajax/defaults/config.js +3 -0
- package/src/js/modules/Ajax/defaults/contentTypeFormatters.js +45 -0
- package/src/js/modules/Ajax/defaults/loaderPromise.js +87 -0
- package/src/js/modules/Ajax/defaults/urlGenerator.js +44 -0
- package/src/js/modules/Clipboard/Clipboard.js +282 -0
- package/src/js/modules/Clipboard/defaults/pasteActions.js +11 -0
- package/src/js/modules/Clipboard/defaults/pasteParsers.js +75 -0
- package/src/js/modules/Clipboard/extensions/extensions.js +9 -0
- package/src/js/modules/Clipboard/extensions/keybindings/actions.js +9 -0
- package/src/js/modules/Clipboard/extensions/keybindings/bindings.js +3 -0
- package/src/js/modules/ColumnCalcs/CalcComponent.js +46 -0
- package/src/js/modules/ColumnCalcs/ColumnCalcs.js +586 -0
- package/src/js/modules/ColumnCalcs/defaults/calculations.js +93 -0
- package/src/js/modules/Comms/Comms.js +49 -0
- package/src/js/modules/DataTree/DataTree.js +620 -0
- package/src/js/modules/Download/Download.js +146 -0
- package/src/js/modules/Download/defaults/downloaders/csv.js +61 -0
- package/src/js/modules/Download/defaults/downloaders/html.js +5 -0
- package/src/js/modules/Download/defaults/downloaders/json.js +34 -0
- package/src/js/modules/Download/defaults/downloaders/jsonLines.js +32 -0
- package/src/js/modules/Download/defaults/downloaders/pdf.js +113 -0
- package/src/js/modules/Download/defaults/downloaders/xlsx.js +103 -0
- package/src/js/modules/Download/defaults/downloaders.js +15 -0
- package/src/js/modules/Edit/Edit.js +845 -0
- package/src/js/modules/Edit/List.js +1060 -0
- package/src/js/modules/Edit/defaults/editors/adaptable.js +37 -0
- package/src/js/modules/Edit/defaults/editors/date.js +144 -0
- package/src/js/modules/Edit/defaults/editors/datetime.js +131 -0
- package/src/js/modules/Edit/defaults/editors/input.js +77 -0
- package/src/js/modules/Edit/defaults/editors/list.js +7 -0
- package/src/js/modules/Edit/defaults/editors/number.js +110 -0
- package/src/js/modules/Edit/defaults/editors/progress.js +127 -0
- package/src/js/modules/Edit/defaults/editors/range.js +81 -0
- package/src/js/modules/Edit/defaults/editors/star.js +146 -0
- package/src/js/modules/Edit/defaults/editors/textarea.js +123 -0
- package/src/js/modules/Edit/defaults/editors/tickCross.js +95 -0
- package/src/js/modules/Edit/defaults/editors/time.js +132 -0
- package/src/js/modules/Edit/defaults/editors.js +27 -0
- package/src/js/modules/Edit/inputMask.js +74 -0
- package/src/js/modules/Export/Export.js +654 -0
- package/src/js/modules/Export/ExportColumn.js +9 -0
- package/src/js/modules/Export/ExportRow.js +8 -0
- package/src/js/modules/Export/defaults/columnLookups.js +3 -0
- package/src/js/modules/Export/defaults/rowLookups.js +18 -0
- package/src/js/modules/Filter/Filter.js +902 -0
- package/src/js/modules/Filter/defaults/filters.js +215 -0
- package/src/js/modules/Format/Format.js +200 -0
- package/src/js/modules/Format/defaults/formatters/adaptable.js +32 -0
- package/src/js/modules/Format/defaults/formatters/array.js +30 -0
- package/src/js/modules/Format/defaults/formatters/buttonCross.js +3 -0
- package/src/js/modules/Format/defaults/formatters/buttonTick.js +3 -0
- package/src/js/modules/Format/defaults/formatters/color.js +4 -0
- package/src/js/modules/Format/defaults/formatters/datetime.js +39 -0
- package/src/js/modules/Format/defaults/formatters/datetimediff.js +43 -0
- package/src/js/modules/Format/defaults/formatters/handle.js +4 -0
- package/src/js/modules/Format/defaults/formatters/html.js +3 -0
- package/src/js/modules/Format/defaults/formatters/image.js +40 -0
- package/src/js/modules/Format/defaults/formatters/json.js +12 -0
- package/src/js/modules/Format/defaults/formatters/link.js +82 -0
- package/src/js/modules/Format/defaults/formatters/lookup.js +10 -0
- package/src/js/modules/Format/defaults/formatters/money.js +44 -0
- package/src/js/modules/Format/defaults/formatters/plaintext.js +3 -0
- package/src/js/modules/Format/defaults/formatters/progress.js +133 -0
- package/src/js/modules/Format/defaults/formatters/rownum.js +14 -0
- package/src/js/modules/Format/defaults/formatters/star.js +38 -0
- package/src/js/modules/Format/defaults/formatters/textarea.js +4 -0
- package/src/js/modules/Format/defaults/formatters/tickCross.js +22 -0
- package/src/js/modules/Format/defaults/formatters/toggle.js +48 -0
- package/src/js/modules/Format/defaults/formatters/traffic.js +47 -0
- package/src/js/modules/Format/defaults/formatters.js +47 -0
- package/src/js/modules/FrozenColumns/FrozenColumns.js +302 -0
- package/src/js/modules/FrozenRows/FrozenRows.js +175 -0
- package/src/js/modules/GroupRows/Group.js +615 -0
- package/src/js/modules/GroupRows/GroupComponent.js +69 -0
- package/src/js/modules/GroupRows/GroupRows.js +636 -0
- package/src/js/modules/History/History.js +172 -0
- package/src/js/modules/History/defaults/redoers.js +31 -0
- package/src/js/modules/History/defaults/undoers.js +33 -0
- package/src/js/modules/History/extensions/extensions.js +9 -0
- package/src/js/modules/History/extensions/keybindings/actions.js +27 -0
- package/src/js/modules/History/extensions/keybindings/bindings.js +4 -0
- package/src/js/modules/HtmlTableImport/HtmlTableImport.js +180 -0
- package/src/js/modules/Import/Import.js +303 -0
- package/src/js/modules/Import/defaults/importers/array.js +3 -0
- package/src/js/modules/Import/defaults/importers/csv.js +61 -0
- package/src/js/modules/Import/defaults/importers/json.js +8 -0
- package/src/js/modules/Import/defaults/importers/xlsx.js +7 -0
- package/src/js/modules/Import/defaults/importers.js +11 -0
- package/src/js/modules/Interaction/Interaction.js +339 -0
- package/src/js/modules/Keybindings/Keybindings.js +198 -0
- package/src/js/modules/Keybindings/defaults/actions.js +90 -0
- package/src/js/modules/Keybindings/defaults/bindings.js +12 -0
- package/src/js/modules/Layout/Layout.js +66 -0
- package/src/js/modules/Layout/defaults/modes/fitColumns.js +171 -0
- package/src/js/modules/Layout/defaults/modes/fitData.js +10 -0
- package/src/js/modules/Layout/defaults/modes/fitDataGeneral.js +10 -0
- package/src/js/modules/Layout/defaults/modes/fitDataStretch.js +40 -0
- package/src/js/modules/Layout/defaults/modes.js +12 -0
- package/src/js/modules/Localize/Localize.js +184 -0
- package/src/js/modules/Localize/defaults/langs.js +37 -0
- package/src/js/modules/Menu/Menu.js +302 -0
- package/src/js/modules/MoveColumns/MoveColumns.js +311 -0
- package/src/js/modules/MoveRows/MoveRows.js +604 -0
- package/src/js/modules/MoveRows/defaults/receivers.js +30 -0
- package/src/js/modules/MoveRows/defaults/senders.js +5 -0
- package/src/js/modules/Mutator/Mutator.js +164 -0
- package/src/js/modules/Mutator/defaults/mutators.js +1 -0
- package/src/js/modules/Page/Page.js +891 -0
- package/src/js/modules/Page/defaults/pageCounters/pages.js +33 -0
- package/src/js/modules/Page/defaults/pageCounters/rows.js +40 -0
- package/src/js/modules/Page/defaults/pageCounters.js +8 -0
- package/src/js/modules/Persistence/Persistence.js +473 -0
- package/src/js/modules/Persistence/defaults/readers.js +29 -0
- package/src/js/modules/Persistence/defaults/writers.js +13 -0
- package/src/js/modules/Popup/Popup.js +227 -0
- package/src/js/modules/Print/Print.js +136 -0
- package/src/js/modules/ReactiveData/ReactiveData.js +416 -0
- package/src/js/modules/ResizeColumns/ResizeColumns.js +365 -0
- package/src/js/modules/ResizeRows/ResizeRows.js +145 -0
- package/src/js/modules/ResizeTable/ResizeTable.js +158 -0
- package/src/js/modules/ResponsiveLayout/ResponsiveLayout.js +354 -0
- package/src/js/modules/ResponsiveLayout/extensions/extensions.js +9 -0
- package/src/js/modules/ResponsiveLayout/extensions/formatters/responsiveCollapse.js +44 -0
- package/src/js/modules/SelectRange/Range.js +366 -0
- package/src/js/modules/SelectRange/RangeComponent.js +91 -0
- package/src/js/modules/SelectRange/SelectRange.js +993 -0
- package/src/js/modules/SelectRange/extensions/clipboard/pasteActions.js +45 -0
- package/src/js/modules/SelectRange/extensions/clipboard/pasteParsers.js +57 -0
- package/src/js/modules/SelectRange/extensions/export/columnLookups.js +11 -0
- package/src/js/modules/SelectRange/extensions/export/rowLookups.js +5 -0
- package/src/js/modules/SelectRange/extensions/extensions.js +21 -0
- package/src/js/modules/SelectRange/extensions/keybindings/actions.js +38 -0
- package/src/js/modules/SelectRange/extensions/keybindings/bindings.js +14 -0
- package/src/js/modules/SelectRow/SelectRow.js +499 -0
- package/src/js/modules/SelectRow/extensions/extensions.js +9 -0
- package/src/js/modules/SelectRow/extensions/formatters/rowSelection.js +60 -0
- package/src/js/modules/Sort/Sort.js +480 -0
- package/src/js/modules/Sort/defaults/sorters/alphanum.js +44 -0
- package/src/js/modules/Sort/defaults/sorters/array.js +82 -0
- package/src/js/modules/Sort/defaults/sorters/boolean.js +7 -0
- package/src/js/modules/Sort/defaults/sorters/date.js +10 -0
- package/src/js/modules/Sort/defaults/sorters/datetime.js +48 -0
- package/src/js/modules/Sort/defaults/sorters/exists.js +7 -0
- package/src/js/modules/Sort/defaults/sorters/number.js +40 -0
- package/src/js/modules/Sort/defaults/sorters/string.js +34 -0
- package/src/js/modules/Sort/defaults/sorters/time.js +10 -0
- package/src/js/modules/Sort/defaults/sorters.js +21 -0
- package/src/js/modules/Spreadsheet/GridCalculator.js +64 -0
- package/src/js/modules/Spreadsheet/Sheet.js +243 -0
- package/src/js/modules/Spreadsheet/SheetComponent.js +59 -0
- package/src/js/modules/Spreadsheet/Spreadsheet.js +309 -0
- package/src/js/modules/Tooltip/Tooltip.js +128 -0
- package/src/js/modules/Validate/Validate.js +303 -0
- package/src/js/modules/Validate/defaults/validators.js +150 -0
- package/src/scss/tabulator.scss +1693 -0
- package/src/scss/themes/bootstrap/tabulator_bootstrap3.scss +302 -0
- package/src/scss/themes/bootstrap/tabulator_bootstrap4.scss +589 -0
- package/src/scss/themes/bootstrap/tabulator_bootstrap5.scss +979 -0
- package/src/scss/themes/bootstrap/variables3.scss +872 -0
- package/src/scss/themes/bootstrap/variables4.scss +1059 -0
- package/src/scss/themes/bootstrap/variables5.scss +1967 -0
- package/src/scss/themes/bulma/tabulator_bulma.scss +316 -0
- package/src/scss/themes/bulma/variables.scss +198 -0
- package/src/scss/themes/materialize/tabulator_materialize.scss +318 -0
- package/src/scss/themes/materialize/variables.scss +71 -0
- package/src/scss/themes/semanticui/tabulator_semanticui.scss +623 -0
- package/src/scss/themes/semanticui/variables.scss +843 -0
- package/src/scss/themes/semanticui/variables_table.scss +248 -0
- package/src/scss/themes/tabulator_midnight.scss +235 -0
- package/src/scss/themes/tabulator_modern.scss +308 -0
- package/src/scss/themes/tabulator_simple.scss +143 -0
- package/src/scss/themes/tabulator_site.scss +267 -0
- package/src/scss/themes/tabulator_site_dark.scss +496 -0
|
@@ -0,0 +1,365 @@
|
|
|
1
|
+
import Module from '../../core/Module.js';
|
|
2
|
+
|
|
3
|
+
export default class ResizeColumns extends Module{
|
|
4
|
+
|
|
5
|
+
static moduleName = "resizeColumns";
|
|
6
|
+
|
|
7
|
+
constructor(table){
|
|
8
|
+
super(table);
|
|
9
|
+
|
|
10
|
+
this.startColumn = false;
|
|
11
|
+
this.startX = false;
|
|
12
|
+
this.startWidth = false;
|
|
13
|
+
this.latestX = false;
|
|
14
|
+
this.handle = null;
|
|
15
|
+
this.initialNextColumn = null;
|
|
16
|
+
this.nextColumn = null;
|
|
17
|
+
|
|
18
|
+
this.initialized = false;
|
|
19
|
+
this.registerColumnOption("resizable", true);
|
|
20
|
+
this.registerTableOption("resizableColumnFit", false);
|
|
21
|
+
this.registerTableOption("resizableColumnGuide", false);
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
initialize(){
|
|
25
|
+
this.subscribe("column-rendered", this.layoutColumnHeader.bind(this));
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
initializeEventWatchers(){
|
|
29
|
+
if(!this.initialized){
|
|
30
|
+
|
|
31
|
+
this.subscribe("cell-rendered", this.layoutCellHandles.bind(this));
|
|
32
|
+
this.subscribe("cell-delete", this.deInitializeComponent.bind(this));
|
|
33
|
+
|
|
34
|
+
this.subscribe("cell-height", this.resizeHandle.bind(this));
|
|
35
|
+
this.subscribe("column-moved", this.columnLayoutUpdated.bind(this));
|
|
36
|
+
|
|
37
|
+
this.subscribe("column-hide", this.deInitializeColumn.bind(this));
|
|
38
|
+
this.subscribe("column-show", this.columnLayoutUpdated.bind(this));
|
|
39
|
+
this.subscribe("column-width", this.columnWidthUpdated.bind(this));
|
|
40
|
+
|
|
41
|
+
this.subscribe("column-delete", this.deInitializeComponent.bind(this));
|
|
42
|
+
this.subscribe("column-height", this.resizeHandle.bind(this));
|
|
43
|
+
|
|
44
|
+
this.initialized = true;
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
|
|
49
|
+
layoutCellHandles(cell){
|
|
50
|
+
if(cell.row.type === "row"){
|
|
51
|
+
this.deInitializeComponent(cell);
|
|
52
|
+
this.initializeColumn("cell", cell, cell.column, cell.element);
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
layoutColumnHeader(column){
|
|
57
|
+
if(column.definition.resizable){
|
|
58
|
+
this.initializeEventWatchers();
|
|
59
|
+
this.deInitializeComponent(column);
|
|
60
|
+
this.initializeColumn("header", column, column, column.element);
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
columnLayoutUpdated(column){
|
|
65
|
+
var prev = column.prevColumn();
|
|
66
|
+
|
|
67
|
+
this.reinitializeColumn(column);
|
|
68
|
+
|
|
69
|
+
if(prev){
|
|
70
|
+
this.reinitializeColumn(prev);
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
columnWidthUpdated(column){
|
|
75
|
+
if(column.modules.frozen){
|
|
76
|
+
if(this.table.modules.frozenColumns.leftColumns.includes(column)){
|
|
77
|
+
this.table.modules.frozenColumns.leftColumns.forEach((col) => {
|
|
78
|
+
this.reinitializeColumn(col);
|
|
79
|
+
});
|
|
80
|
+
}else if(this.table.modules.frozenColumns.rightColumns.includes(column)){
|
|
81
|
+
this.table.modules.frozenColumns.rightColumns.forEach((col) => {
|
|
82
|
+
this.reinitializeColumn(col);
|
|
83
|
+
});
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
frozenColumnOffset(column){
|
|
89
|
+
var offset = false;
|
|
90
|
+
|
|
91
|
+
if(column.modules.frozen){
|
|
92
|
+
offset = column.modules.frozen.marginValue;
|
|
93
|
+
|
|
94
|
+
if(column.modules.frozen.position === "left"){
|
|
95
|
+
offset += column.getWidth() - 3;
|
|
96
|
+
}else{
|
|
97
|
+
if(offset){
|
|
98
|
+
offset -= 3;
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
|
|
103
|
+
return offset !== false ? offset + "px" : false;
|
|
104
|
+
}
|
|
105
|
+
|
|
106
|
+
reinitializeColumn(column){
|
|
107
|
+
var frozenOffset = this.frozenColumnOffset(column);
|
|
108
|
+
|
|
109
|
+
column.cells.forEach((cell) => {
|
|
110
|
+
if(cell.modules.resize && cell.modules.resize.handleEl){
|
|
111
|
+
if(frozenOffset){
|
|
112
|
+
cell.modules.resize.handleEl.style[column.modules.frozen.position] = frozenOffset;
|
|
113
|
+
cell.modules.resize.handleEl.style["z-index"] = 11;
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
cell.element.after(cell.modules.resize.handleEl);
|
|
117
|
+
}
|
|
118
|
+
});
|
|
119
|
+
|
|
120
|
+
if(column.modules.resize && column.modules.resize.handleEl){
|
|
121
|
+
if(frozenOffset){
|
|
122
|
+
column.modules.resize.handleEl.style[column.modules.frozen.position] = frozenOffset;
|
|
123
|
+
}
|
|
124
|
+
|
|
125
|
+
column.element.after(column.modules.resize.handleEl);
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
|
|
129
|
+
initializeColumn(type, component, column, element){
|
|
130
|
+
var self = this,
|
|
131
|
+
variableHeight = false,
|
|
132
|
+
mode = column.definition.resizable,
|
|
133
|
+
config = {},
|
|
134
|
+
nearestColumn = column.getLastColumn();
|
|
135
|
+
|
|
136
|
+
//set column resize mode
|
|
137
|
+
if(type === "header"){
|
|
138
|
+
variableHeight = column.definition.formatter == "textarea" || column.definition.variableHeight;
|
|
139
|
+
config = {variableHeight:variableHeight};
|
|
140
|
+
}
|
|
141
|
+
|
|
142
|
+
if((mode === true || mode == type) && this._checkResizability(nearestColumn)){
|
|
143
|
+
|
|
144
|
+
var handle = document.createElement('span');
|
|
145
|
+
handle.className = "tabulator-col-resize-handle";
|
|
146
|
+
|
|
147
|
+
handle.addEventListener("click", function(e){
|
|
148
|
+
e.stopPropagation();
|
|
149
|
+
});
|
|
150
|
+
|
|
151
|
+
var handleDown = function(e){
|
|
152
|
+
self.startColumn = column;
|
|
153
|
+
self.initialNextColumn = self.nextColumn = nearestColumn.nextColumn();
|
|
154
|
+
self._mouseDown(e, nearestColumn, handle);
|
|
155
|
+
};
|
|
156
|
+
|
|
157
|
+
handle.addEventListener("mousedown", handleDown);
|
|
158
|
+
handle.addEventListener("touchstart", handleDown, {passive: true});
|
|
159
|
+
|
|
160
|
+
//resize column on double click
|
|
161
|
+
handle.addEventListener("dblclick", (e) => {
|
|
162
|
+
var oldWidth = nearestColumn.getWidth();
|
|
163
|
+
|
|
164
|
+
e.stopPropagation();
|
|
165
|
+
nearestColumn.reinitializeWidth(true);
|
|
166
|
+
|
|
167
|
+
if(oldWidth !== nearestColumn.getWidth()){
|
|
168
|
+
self.dispatch("column-resized", nearestColumn);
|
|
169
|
+
self.dispatchExternal("columnResized", nearestColumn.getComponent());
|
|
170
|
+
}
|
|
171
|
+
});
|
|
172
|
+
|
|
173
|
+
if(column.modules.frozen){
|
|
174
|
+
handle.style.position = "sticky";
|
|
175
|
+
handle.style[column.modules.frozen.position] = this.frozenColumnOffset(column);
|
|
176
|
+
}
|
|
177
|
+
|
|
178
|
+
config.handleEl = handle;
|
|
179
|
+
|
|
180
|
+
if(element.parentNode && column.visible){
|
|
181
|
+
element.after(handle);
|
|
182
|
+
}
|
|
183
|
+
}
|
|
184
|
+
|
|
185
|
+
component.modules.resize = config;
|
|
186
|
+
}
|
|
187
|
+
|
|
188
|
+
deInitializeColumn(column){
|
|
189
|
+
this.deInitializeComponent(column);
|
|
190
|
+
|
|
191
|
+
column.cells.forEach((cell) => {
|
|
192
|
+
this.deInitializeComponent(cell);
|
|
193
|
+
});
|
|
194
|
+
}
|
|
195
|
+
|
|
196
|
+
deInitializeComponent(component){
|
|
197
|
+
var handleEl;
|
|
198
|
+
|
|
199
|
+
if(component.modules.resize){
|
|
200
|
+
handleEl = component.modules.resize.handleEl;
|
|
201
|
+
|
|
202
|
+
if(handleEl && handleEl.parentElement){
|
|
203
|
+
handleEl.parentElement.removeChild(handleEl);
|
|
204
|
+
}
|
|
205
|
+
}
|
|
206
|
+
}
|
|
207
|
+
|
|
208
|
+
resizeHandle(component, height){
|
|
209
|
+
if(component.modules.resize && component.modules.resize.handleEl){
|
|
210
|
+
component.modules.resize.handleEl.style.height = height;
|
|
211
|
+
}
|
|
212
|
+
}
|
|
213
|
+
|
|
214
|
+
getResizingClientX(e){
|
|
215
|
+
if (typeof e.clientX !== "undefined") return e.clientX;
|
|
216
|
+
|
|
217
|
+
const touch = this.table.options.resizableColumnGuide
|
|
218
|
+
? e.changedTouches?.[0]
|
|
219
|
+
: e.touches?.[0];
|
|
220
|
+
|
|
221
|
+
return touch?.clientX;
|
|
222
|
+
}
|
|
223
|
+
|
|
224
|
+
resize(e, column){
|
|
225
|
+
var x = this.getResizingClientX(e);
|
|
226
|
+
|
|
227
|
+
if (typeof x !== "number" || !isFinite(x)) {
|
|
228
|
+
console.warn("ResizeColumns: could not resolve pointer X from event", e);
|
|
229
|
+
return;
|
|
230
|
+
}
|
|
231
|
+
|
|
232
|
+
var startDiff = x - this.startX,
|
|
233
|
+
moveDiff = x - this.latestX,
|
|
234
|
+
blockedBefore, blockedAfter;
|
|
235
|
+
|
|
236
|
+
this.latestX = x;
|
|
237
|
+
|
|
238
|
+
if(this.table.rtl){
|
|
239
|
+
startDiff = -startDiff;
|
|
240
|
+
moveDiff = -moveDiff;
|
|
241
|
+
}
|
|
242
|
+
|
|
243
|
+
blockedBefore = column.width == column.minWidth || column.width == column.maxWidth;
|
|
244
|
+
|
|
245
|
+
column.setWidth(this.startWidth + startDiff);
|
|
246
|
+
|
|
247
|
+
blockedAfter = column.width == column.minWidth || column.width == column.maxWidth;
|
|
248
|
+
|
|
249
|
+
if(moveDiff < 0){
|
|
250
|
+
this.nextColumn = this.initialNextColumn;
|
|
251
|
+
}
|
|
252
|
+
|
|
253
|
+
if(this.table.options.resizableColumnFit && this.nextColumn && !(blockedBefore && blockedAfter)){
|
|
254
|
+
let colWidth = this.nextColumn.getWidth();
|
|
255
|
+
|
|
256
|
+
if(moveDiff > 0){
|
|
257
|
+
if(colWidth <= this.nextColumn.minWidth){
|
|
258
|
+
this.nextColumn = this.nextColumn.nextColumn();
|
|
259
|
+
}
|
|
260
|
+
}
|
|
261
|
+
|
|
262
|
+
if(this.nextColumn){
|
|
263
|
+
this.nextColumn.setWidth(this.nextColumn.getWidth() - moveDiff);
|
|
264
|
+
}
|
|
265
|
+
}
|
|
266
|
+
|
|
267
|
+
this.table.columnManager.rerenderColumns(true);
|
|
268
|
+
|
|
269
|
+
if(!this.table.browserSlow && column.modules.resize && column.modules.resize.variableHeight){
|
|
270
|
+
column.checkCellHeights();
|
|
271
|
+
}
|
|
272
|
+
}
|
|
273
|
+
|
|
274
|
+
calcGuidePosition(e, column, handle) {
|
|
275
|
+
var mouseX = typeof e.clientX === "undefined" ? e.touches[0].clientX : e.clientX,
|
|
276
|
+
handleX = handle.getBoundingClientRect().x - this.table.element.getBoundingClientRect().x,
|
|
277
|
+
tableX = this.table.element.getBoundingClientRect().x,
|
|
278
|
+
columnX = column.element.getBoundingClientRect().left - tableX,
|
|
279
|
+
mouseDiff = mouseX - this.startX,
|
|
280
|
+
pos = Math.max(handleX + mouseDiff, columnX + column.minWidth);
|
|
281
|
+
|
|
282
|
+
if(column.maxWidth){
|
|
283
|
+
pos = Math.min(pos, columnX + column.maxWidth);
|
|
284
|
+
}
|
|
285
|
+
|
|
286
|
+
return pos;
|
|
287
|
+
}
|
|
288
|
+
|
|
289
|
+
_checkResizability(column){
|
|
290
|
+
return column.definition.resizable;
|
|
291
|
+
}
|
|
292
|
+
|
|
293
|
+
_mouseDown(e, column, handle){
|
|
294
|
+
var self = this,
|
|
295
|
+
guideEl;
|
|
296
|
+
|
|
297
|
+
this.dispatchExternal("columnResizing", column.getComponent());
|
|
298
|
+
|
|
299
|
+
if(self.table.options.resizableColumnGuide){
|
|
300
|
+
guideEl = document.createElement("span");
|
|
301
|
+
guideEl.classList.add('tabulator-col-resize-guide');
|
|
302
|
+
self.table.element.appendChild(guideEl);
|
|
303
|
+
setTimeout(() => {
|
|
304
|
+
guideEl.style.left = self.calcGuidePosition(e, column, handle) + "px";
|
|
305
|
+
});
|
|
306
|
+
}
|
|
307
|
+
|
|
308
|
+
self.table.element.classList.add("tabulator-block-select");
|
|
309
|
+
|
|
310
|
+
function mouseMove(e){
|
|
311
|
+
if(self.table.options.resizableColumnGuide){
|
|
312
|
+
guideEl.style.left = self.calcGuidePosition(e, column, handle) + "px";
|
|
313
|
+
}else{
|
|
314
|
+
self.resize(e, column);
|
|
315
|
+
}
|
|
316
|
+
}
|
|
317
|
+
|
|
318
|
+
function mouseUp(e){
|
|
319
|
+
if(self.table.options.resizableColumnGuide){
|
|
320
|
+
self.resize(e, column);
|
|
321
|
+
guideEl.remove();
|
|
322
|
+
}
|
|
323
|
+
|
|
324
|
+
//block editor from taking action while resizing is taking place
|
|
325
|
+
if(self.startColumn.modules.edit){
|
|
326
|
+
self.startColumn.modules.edit.blocked = false;
|
|
327
|
+
}
|
|
328
|
+
|
|
329
|
+
if(self.table.browserSlow && column.modules.resize && column.modules.resize.variableHeight){
|
|
330
|
+
column.checkCellHeights();
|
|
331
|
+
}
|
|
332
|
+
|
|
333
|
+
document.body.removeEventListener("mouseup", mouseUp);
|
|
334
|
+
document.body.removeEventListener("mousemove", mouseMove);
|
|
335
|
+
|
|
336
|
+
handle.removeEventListener("touchmove", mouseMove);
|
|
337
|
+
handle.removeEventListener("touchend", mouseUp);
|
|
338
|
+
|
|
339
|
+
self.table.element.classList.remove("tabulator-block-select");
|
|
340
|
+
|
|
341
|
+
if(self.startWidth !== column.getWidth()){
|
|
342
|
+
self.table.columnManager.verticalAlignHeaders();
|
|
343
|
+
|
|
344
|
+
self.dispatch("column-resized", column);
|
|
345
|
+
self.dispatchExternal("columnResized", column.getComponent());
|
|
346
|
+
}
|
|
347
|
+
}
|
|
348
|
+
|
|
349
|
+
e.stopPropagation(); //prevent resize from interfering with movable columns
|
|
350
|
+
|
|
351
|
+
//block editor from taking action while resizing is taking place
|
|
352
|
+
if(self.startColumn.modules.edit){
|
|
353
|
+
self.startColumn.modules.edit.blocked = true;
|
|
354
|
+
}
|
|
355
|
+
|
|
356
|
+
self.startX = typeof e.clientX === "undefined" ? e.touches[0].clientX : e.clientX;
|
|
357
|
+
self.latestX = self.startX;
|
|
358
|
+
self.startWidth = column.getWidth();
|
|
359
|
+
|
|
360
|
+
document.body.addEventListener("mousemove", mouseMove);
|
|
361
|
+
document.body.addEventListener("mouseup", mouseUp);
|
|
362
|
+
handle.addEventListener("touchmove", mouseMove, {passive: true});
|
|
363
|
+
handle.addEventListener("touchend", mouseUp);
|
|
364
|
+
}
|
|
365
|
+
}
|
|
@@ -0,0 +1,145 @@
|
|
|
1
|
+
import Module from '../../core/Module.js';
|
|
2
|
+
|
|
3
|
+
export default class ResizeRows extends Module{
|
|
4
|
+
|
|
5
|
+
static moduleName = "resizeRows";
|
|
6
|
+
|
|
7
|
+
constructor(table){
|
|
8
|
+
super(table);
|
|
9
|
+
|
|
10
|
+
this.startColumn = false;
|
|
11
|
+
this.startY = false;
|
|
12
|
+
this.startHeight = false;
|
|
13
|
+
this.handle = null;
|
|
14
|
+
this.prevHandle = null;
|
|
15
|
+
|
|
16
|
+
this.registerTableOption("resizableRows", false); //resizable rows
|
|
17
|
+
this.registerTableOption("resizableRowGuide", false);
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
initialize(){
|
|
21
|
+
if(this.table.options.resizableRows){
|
|
22
|
+
this.subscribe("row-layout-after", this.initializeRow.bind(this));
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
initializeRow(row){
|
|
27
|
+
var self = this,
|
|
28
|
+
rowEl = row.getElement();
|
|
29
|
+
|
|
30
|
+
var handle = document.createElement('div');
|
|
31
|
+
handle.className = "tabulator-row-resize-handle";
|
|
32
|
+
|
|
33
|
+
var prevHandle = document.createElement('div');
|
|
34
|
+
prevHandle.className = "tabulator-row-resize-handle prev";
|
|
35
|
+
|
|
36
|
+
handle.addEventListener("click", function(e){
|
|
37
|
+
e.stopPropagation();
|
|
38
|
+
});
|
|
39
|
+
|
|
40
|
+
var handleDown = function(e){
|
|
41
|
+
self.startRow = row;
|
|
42
|
+
self._mouseDown(e, row, handle);
|
|
43
|
+
};
|
|
44
|
+
|
|
45
|
+
handle.addEventListener("mousedown", handleDown);
|
|
46
|
+
handle.addEventListener("touchstart", handleDown, {passive: true});
|
|
47
|
+
|
|
48
|
+
prevHandle.addEventListener("click", function(e){
|
|
49
|
+
e.stopPropagation();
|
|
50
|
+
});
|
|
51
|
+
|
|
52
|
+
var prevHandleDown = function(e){
|
|
53
|
+
var prevRow = self.table.rowManager.prevDisplayRow(row);
|
|
54
|
+
|
|
55
|
+
if(prevRow){
|
|
56
|
+
self.startRow = prevRow;
|
|
57
|
+
self._mouseDown(e, prevRow, prevHandle);
|
|
58
|
+
}
|
|
59
|
+
};
|
|
60
|
+
|
|
61
|
+
prevHandle.addEventListener("mousedown",prevHandleDown);
|
|
62
|
+
prevHandle.addEventListener("touchstart",prevHandleDown, {passive: true});
|
|
63
|
+
|
|
64
|
+
rowEl.appendChild(handle);
|
|
65
|
+
rowEl.appendChild(prevHandle);
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
resize(e, row) {
|
|
69
|
+
row.setHeight(this.startHeight + ((typeof e.screenY === "undefined" ? e.touches[0].screenY : e.screenY) - this.startY));
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
calcGuidePosition(e, row, handle) {
|
|
73
|
+
var mouseY = typeof e.screenY === "undefined" ? e.touches[0].screenY : e.screenY,
|
|
74
|
+
handleY = handle.getBoundingClientRect().y - this.table.element.getBoundingClientRect().y,
|
|
75
|
+
tableY = this.table.element.getBoundingClientRect().y,
|
|
76
|
+
rowY = row.element.getBoundingClientRect().top - tableY,
|
|
77
|
+
mouseDiff = mouseY - this.startY;
|
|
78
|
+
|
|
79
|
+
return Math.max(handleY + mouseDiff, rowY);
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
_mouseDown(e, row, handle){
|
|
83
|
+
var self = this,
|
|
84
|
+
guideEl;
|
|
85
|
+
|
|
86
|
+
self.dispatchExternal("rowResizing", row.getComponent());
|
|
87
|
+
|
|
88
|
+
if(self.table.options.resizableRowGuide){
|
|
89
|
+
guideEl = document.createElement("span");
|
|
90
|
+
guideEl.classList.add('tabulator-row-resize-guide');
|
|
91
|
+
self.table.element.appendChild(guideEl);
|
|
92
|
+
setTimeout(() => {
|
|
93
|
+
guideEl.style.top = self.calcGuidePosition(e, row, handle) + "px";
|
|
94
|
+
});
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
self.table.element.classList.add("tabulator-block-select");
|
|
98
|
+
|
|
99
|
+
function mouseMove(e){
|
|
100
|
+
if(self.table.options.resizableRowGuide){
|
|
101
|
+
guideEl.style.top = self.calcGuidePosition(e, row, handle) + "px";
|
|
102
|
+
}else{
|
|
103
|
+
self.resize(e, row);
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
|
|
107
|
+
function mouseUp(e){
|
|
108
|
+
if(self.table.options.resizableRowGuide){
|
|
109
|
+
self.resize(e, row);
|
|
110
|
+
guideEl.remove();
|
|
111
|
+
}
|
|
112
|
+
|
|
113
|
+
// //block editor from taking action while resizing is taking place
|
|
114
|
+
// if(self.startColumn.modules.edit){
|
|
115
|
+
// self.startColumn.modules.edit.blocked = false;
|
|
116
|
+
// }
|
|
117
|
+
|
|
118
|
+
document.body.removeEventListener("mouseup", mouseMove);
|
|
119
|
+
document.body.removeEventListener("mousemove", mouseMove);
|
|
120
|
+
|
|
121
|
+
handle.removeEventListener("touchmove", mouseMove);
|
|
122
|
+
handle.removeEventListener("touchend", mouseUp);
|
|
123
|
+
|
|
124
|
+
self.table.element.classList.remove("tabulator-block-select");
|
|
125
|
+
|
|
126
|
+
self.dispatchExternal("rowResized", row.getComponent());
|
|
127
|
+
}
|
|
128
|
+
|
|
129
|
+
e.stopPropagation(); //prevent resize from interfering with movable columns
|
|
130
|
+
|
|
131
|
+
//block editor from taking action while resizing is taking place
|
|
132
|
+
// if(self.startColumn.modules.edit){
|
|
133
|
+
// self.startColumn.modules.edit.blocked = true;
|
|
134
|
+
// }
|
|
135
|
+
|
|
136
|
+
self.startY = typeof e.screenY === "undefined" ? e.touches[0].screenY : e.screenY;
|
|
137
|
+
self.startHeight = row.getHeight();
|
|
138
|
+
|
|
139
|
+
document.body.addEventListener("mousemove", mouseMove);
|
|
140
|
+
document.body.addEventListener("mouseup", mouseUp);
|
|
141
|
+
|
|
142
|
+
handle.addEventListener("touchmove", mouseMove, {passive: true});
|
|
143
|
+
handle.addEventListener("touchend", mouseUp);
|
|
144
|
+
}
|
|
145
|
+
}
|
|
@@ -0,0 +1,158 @@
|
|
|
1
|
+
import Module from '../../core/Module.js';
|
|
2
|
+
|
|
3
|
+
export default class ResizeTable extends Module{
|
|
4
|
+
|
|
5
|
+
static moduleName = "resizeTable";
|
|
6
|
+
|
|
7
|
+
constructor(table){
|
|
8
|
+
super(table);
|
|
9
|
+
|
|
10
|
+
this.binding = false;
|
|
11
|
+
this.visibilityObserver = false;
|
|
12
|
+
this.resizeObserver = false;
|
|
13
|
+
this.containerObserver = false;
|
|
14
|
+
|
|
15
|
+
this.tableHeight = 0;
|
|
16
|
+
this.tableWidth = 0;
|
|
17
|
+
this.containerHeight = 0;
|
|
18
|
+
this.containerWidth = 0;
|
|
19
|
+
|
|
20
|
+
this.autoResize = false;
|
|
21
|
+
|
|
22
|
+
this.visible = false;
|
|
23
|
+
|
|
24
|
+
this.initialized = false;
|
|
25
|
+
this.initialRedraw = false;
|
|
26
|
+
|
|
27
|
+
this.registerTableOption("autoResize", true); //auto resize table
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
initialize(){
|
|
31
|
+
if(this.table.options.autoResize){
|
|
32
|
+
var table = this.table,
|
|
33
|
+
tableStyle;
|
|
34
|
+
|
|
35
|
+
this.tableHeight = table.element.clientHeight;
|
|
36
|
+
this.tableWidth = table.element.clientWidth;
|
|
37
|
+
|
|
38
|
+
if(table.element.parentNode){
|
|
39
|
+
this.containerHeight = table.element.parentNode.clientHeight;
|
|
40
|
+
this.containerWidth = table.element.parentNode.clientWidth;
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
if(typeof IntersectionObserver !== "undefined" && typeof ResizeObserver !== "undefined" && table.rowManager.getRenderMode() === "virtual"){
|
|
44
|
+
|
|
45
|
+
this.initializeVisibilityObserver();
|
|
46
|
+
|
|
47
|
+
this.autoResize = true;
|
|
48
|
+
|
|
49
|
+
this.resizeObserver = new ResizeObserver((entry) => {
|
|
50
|
+
if(!table.browserMobile || (table.browserMobile && (!table.modules.edit || (table.modules.edit && !table.modules.edit.currentCell)))){
|
|
51
|
+
|
|
52
|
+
var nodeHeight = Math.floor(entry[0].contentRect.height);
|
|
53
|
+
var nodeWidth = Math.floor(entry[0].contentRect.width);
|
|
54
|
+
|
|
55
|
+
if(this.tableHeight != nodeHeight || this.tableWidth != nodeWidth){
|
|
56
|
+
this.tableHeight = nodeHeight;
|
|
57
|
+
this.tableWidth = nodeWidth;
|
|
58
|
+
|
|
59
|
+
if(table.element.parentNode){
|
|
60
|
+
this.containerHeight = table.element.parentNode.clientHeight;
|
|
61
|
+
this.containerWidth = table.element.parentNode.clientWidth;
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
this.redrawTable();
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
});
|
|
68
|
+
|
|
69
|
+
this.resizeObserver.observe(table.element);
|
|
70
|
+
|
|
71
|
+
tableStyle = window.getComputedStyle(table.element);
|
|
72
|
+
|
|
73
|
+
if(this.table.element.parentNode && !this.table.rowManager.fixedHeight && (tableStyle.getPropertyValue("max-height") || tableStyle.getPropertyValue("min-height"))){
|
|
74
|
+
|
|
75
|
+
this.containerObserver = new ResizeObserver((entry) => {
|
|
76
|
+
if(!table.browserMobile || (table.browserMobile && (!table.modules.edit || (table.modules.edit && !table.modules.edit.currentCell)))){
|
|
77
|
+
|
|
78
|
+
var nodeHeight = Math.floor(entry[0].contentRect.height);
|
|
79
|
+
var nodeWidth = Math.floor(entry[0].contentRect.width);
|
|
80
|
+
|
|
81
|
+
if(this.containerHeight != nodeHeight || this.containerWidth != nodeWidth){
|
|
82
|
+
this.containerHeight = nodeHeight;
|
|
83
|
+
this.containerWidth = nodeWidth;
|
|
84
|
+
this.tableHeight = table.element.clientHeight;
|
|
85
|
+
this.tableWidth = table.element.clientWidth;
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
this.redrawTable();
|
|
89
|
+
}
|
|
90
|
+
});
|
|
91
|
+
|
|
92
|
+
this.containerObserver.observe(this.table.element.parentNode);
|
|
93
|
+
}
|
|
94
|
+
|
|
95
|
+
this.subscribe("table-resize", this.tableResized.bind(this));
|
|
96
|
+
|
|
97
|
+
}else{
|
|
98
|
+
this.binding = function(){
|
|
99
|
+
if(!table.browserMobile || (table.browserMobile && (!table.modules.edit || (table.modules.edit && !table.modules.edit.currentCell)))){
|
|
100
|
+
table.columnManager.rerenderColumns(true);
|
|
101
|
+
table.redraw();
|
|
102
|
+
}
|
|
103
|
+
};
|
|
104
|
+
|
|
105
|
+
window.addEventListener("resize", this.binding);
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
this.subscribe("table-destroy", this.clearBindings.bind(this));
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
|
|
112
|
+
initializeVisibilityObserver(){
|
|
113
|
+
this.visibilityObserver = new IntersectionObserver((entries) => {
|
|
114
|
+
this.visible = entries[entries.length - 1].isIntersecting;
|
|
115
|
+
|
|
116
|
+
if(!this.initialized){
|
|
117
|
+
this.initialized = true;
|
|
118
|
+
this.initialRedraw = !this.visible;
|
|
119
|
+
}else{
|
|
120
|
+
if(this.visible){
|
|
121
|
+
this.redrawTable(this.initialRedraw);
|
|
122
|
+
this.initialRedraw = false;
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
});
|
|
126
|
+
|
|
127
|
+
this.visibilityObserver.observe(this.table.element);
|
|
128
|
+
}
|
|
129
|
+
|
|
130
|
+
redrawTable(force){
|
|
131
|
+
if(this.initialized && this.visible){
|
|
132
|
+
this.table.columnManager.rerenderColumns(true);
|
|
133
|
+
this.table.redraw(force);
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
|
|
137
|
+
tableResized(){
|
|
138
|
+
this.table.rowManager.redraw();
|
|
139
|
+
}
|
|
140
|
+
|
|
141
|
+
clearBindings(){
|
|
142
|
+
if(this.binding){
|
|
143
|
+
window.removeEventListener("resize", this.binding);
|
|
144
|
+
}
|
|
145
|
+
|
|
146
|
+
if(this.resizeObserver){
|
|
147
|
+
this.resizeObserver.unobserve(this.table.element);
|
|
148
|
+
}
|
|
149
|
+
|
|
150
|
+
if(this.visibilityObserver){
|
|
151
|
+
this.visibilityObserver.unobserve(this.table.element);
|
|
152
|
+
}
|
|
153
|
+
|
|
154
|
+
if(this.containerObserver){
|
|
155
|
+
this.containerObserver.unobserve(this.table.element.parentNode);
|
|
156
|
+
}
|
|
157
|
+
}
|
|
158
|
+
}
|