FOUR-20598: Horizontal adaptation define a minimum width of the columns#7920

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pmPaulis merged 2 commits into from
Jan 23, 2025
Merged

FOUR-20598: Horizontal adaptation define a minimum width of the columns #7920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0db0a1
FOUR-20598: Horizontal adaptation define a minimum width of the columns
hjonathan Jan 21, 2025
f0d4cdc
FOUR-20598: Horizontal adaptation define a minimum width of the columns
hjonathan Jan 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions resources/jscomposition/base/table/BaseTable.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
<template>
<div
class="tw-w-full tw-relative tw-text-gray-600 tw-text-sm
tw-border tw-rounded-xl tw-border-gray-300 tw-overflow-hidden tw-overflow-x-auto tw-overflow-y-auto"
>
tw-border tw-rounded-xl tw-border-gray-300 tw-overflow-hidden tw-overflow-x-auto tw-overflow-y-auto">
<table
class="tw-w-full tw-border-collapse"
:class="{
Expand DownExpand Up@@ -86,7 +85,7 @@ import TCell from "./TCell.vue";
import ContainerRow from "./ContainerRow.vue";

const defaultConfig = () => ({
tableFixed: true,
tableFixed: false,
});

export default defineComponent({
Expand Down
19 changes: 16 additions & 3 deletions resources/jscomposition/base/table/TCell.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
<template>
<td
class="tw-relative tw-p-0"
:style="{ width: `${column.width}px` }">
:style="{ width: width }">
<template v-if="!column.cellRenderer">
<slot
:columns="columns"
:column="column"
:row="row">
<div class="tw-p-3 tw-text-ellipsis tw-text-nowrap tw-overflow-hidden">
<div
:style="{ width: width }"
class="tw-p-3 tw-text-ellipsis tw-text-nowrap tw-overflow-hidden">
{{ getValue() }}
</div>
</slot>
</template>
<component
:is="getComponent()"
v-else
:style="{ width: width }"
v-bind="getParams()"
:columns="columns"
:column="column"
Expand All@@ -24,7 +27,7 @@
</template>

<script>
import { defineComponent } from "vue";
import { defineComponent, computed } from "vue";
import { isFunction, get } from "lodash";

export default defineComponent({
Expand DownExpand Up@@ -56,11 +59,21 @@ export default defineComponent({

const collapseContainer = (value) => emit("toogleContainer", value);

const index = computed(() => props.columns.findIndex((column) => column.field === props.column.field));

const width = computed(() => {
if (index.value === props.columns.length - 1) {
return "auto";
}
return `${props.column.width || 200}px`;
});

return {
getComponent,
getParams,
getValue,
collapseContainer,
width,
};
},
});
Expand Down
15 changes: 12 additions & 3 deletions resources/jscomposition/base/table/THeader.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
<template>
<th
class="tw-relative thead-resizable tw-p-0"
:style="{ width: width + 'px' }">
:style="{ width: width }">
<div
:style="{ width: width }"
class="tw-py-3 tw-px-3 tw-text-left tw-text-nowrap tw-whitespace-nowrap tw-overflow-hidden tw-text-ellipsis">
<slot>
{{ $t(getValue()) }}
Expand All@@ -22,7 +23,7 @@

<script>
import { isFunction } from "lodash";
import { defineComponent, computed } from "vue";
import { defineComponent, computed, ref } from "vue";
import { columnResizeComposable } from "./composables/columnComposable";

export default defineComponent({
Expand All@@ -39,7 +40,14 @@ export default defineComponent({
setup(props, { emit }) {
const columnResize = columnResizeComposable(props.column);

const width = computed(() => props.column.width || 200);
const index = computed(() => props.columns.findIndex((column) => column.field === props.column.field));

const width = computed(() => {
if (index.value === props.columns.length - 1) {
return "auto";
}
return `${props.column.width || 200}px`;
});

const getValue = () => {
if (isFunction(props.column?.headerFormatter)) {
Expand All@@ -50,6 +58,7 @@ export default defineComponent({
};
return {
getValue,
index,
width,
columnResize,
};
Expand Down
11 changes: 8 additions & 3 deletions resources/jscomposition/base/table/composables/columnComposable.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,13 +12,17 @@ export const columnResizeComposable = (column) => {
const startWidth = ref(0);
const isResizing = ref(false);

//Resize the column value
const minWidth = 144;

// Resize the column value
const doResize = (event) => {
if (isResizing.value) {
const diff = event.pageX - startX.value;
const min = 30;
const min = minWidth;
const currentWidth = Math.max(min, startWidth.value + diff);

console.log("doResize", currentWidth);

column.width = currentWidth;
}
};
Expand All@@ -35,7 +39,8 @@ export const columnResizeComposable = (column) => {
const startResize = (event, index) => {
isResizing.value = true;
startX.value = event.pageX;
startWidth.value = column.width || 200;
startWidth.value = column.width || minWidth;
console.log("startResize", startWidth.value);

document.addEventListener("mousemove", doResize);
document.addEventListener("mouseup", stopResize);
Expand Down
3 changes: 1 addition & 2 deletions resources/jscomposition/cases/casesDetail/components/TaskTable.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,7 @@
:columns="columnsConfig"
:data="data"
:placeholder="showPlaceholder"
@changeFilter="onChangeFilter"
>
@changeFilter="onChangeFilter">
<template #placeholder>
<TablePlaceholder
:placeholder="placeholderType"
Expand Down
6 changes: 3 additions & 3 deletions resources/jscomposition/cases/casesDetail/config/columns.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ const taskNumberColumn = () => ({
field: "id",
header: "Tasks #",
resizable: true,
width: 100,
width: 144,
filter: true,
formatter: (row, column, columns) => `#${row.id}`,
cellRenderer: () => ({
Expand DownExpand Up@@ -68,7 +68,7 @@ const dueDateColumn = () => ({
field: "due_at",
header: "Due Date",
resizable: true,
width: 200,
width: "auto",
filter: true,
formatter: (row, column, columns) => formatDate(row.due_at, "datetime"),
});
Expand DownExpand Up@@ -127,7 +127,7 @@ const startedColumn = () => ({
header: "Started",
filter: true,
resizable: true,
width: 200,
width: "auto",
formatter: (row, column, columns) => formatDate(row.initiated_at, "datetime"),
});

Expand Down
12 changes: 4 additions & 8 deletions resources/jscomposition/cases/casesMain/CasesDataSection.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,20 +3,17 @@
<CaseFilter @enter="onChangeSearch" />
<BadgesSection
v-model="badgesData"
@remove="onRemoveBadge"
/>
@remove="onRemoveBadge" />
<FilterableTable
ref="table"
:columns="columnsConfig"
:data="data"
:placeholder="showPlaceholder"
@changeFilter="onChangeFilter"
>
@changeFilter="onChangeFilter">
<template #placeholder>
<TablePlaceholder
:placeholder="placeholderType"
class="tw-grow"
/>
class="tw-grow" />
</template>
</FilterableTable>
<Pagination
Expand All@@ -28,8 +25,7 @@
:page="dataPagination.page"
:pages="dataPagination.pages"
@perPage="onPerPage"
@go="onGo"
/>
@go="onGo" />
</div>
</template>
<script setup>
Expand Down
4 changes: 2 additions & 2 deletions resources/jscomposition/cases/casesMain/config/columns.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ export const caseNumberColumn = () => ({
field: "case_number",
header: "Case #",
resizable: true,
width: 100,
width: 144,
filter: {
dataType: "string",
operators: ["=", ">", ">=", "in", "between"],
Expand DownExpand Up@@ -162,7 +162,7 @@ export const completedColumn = () => ({
field: "completed_at",
header: "Completed",
resizable: true,
width: 200,
width: "auto",
formatter: (row, column, columns) => formatDate(row.completed_at, "datetime"),
filter: {
dataType: "datetime",
Expand Down
10 changes: 7 additions & 3 deletions resources/jscomposition/system/table/FilterableTable.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,14 +3,14 @@
:columns="columns"
:data="data"
:placeholder="placeholder"
class="tw-grow"
>
:config="config"
class="tw-grow">
<template
v-for="(column, index) in columns"
#[`theader-filter-${column.field}`]>
<FilterColumn
:id="column.field"
v-if="column.filter"
:id="column.field"
:key="`default-${index}-${hasFilter(index,column)}`"
:filter="column.filter"
:value="getFilter(index, column)"
Expand DownExpand Up@@ -42,6 +42,10 @@ const props = defineProps({
type: Boolean,
default: () => false,
},
config: {
type: Object,
default: () => {},
},
});

const filters = ref([]);
Expand Down
3 changes: 1 addition & 2 deletions resources/jscomposition/system/table/SortTable.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,7 @@
:data="data"
:config="config"
:placeholder="placeholder"
class="tw-grow"
>
class="tw-grow">
<template
v-for="(column, index) in columns"
#[`theader-filter-${column.field}`]>
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
FOUR-20598: Horizontal adaptation define a minimum width of the columns#7920

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

pmPaulis
merged 2 commits into

from

Jan 23, 2025
 Merged


FOUR-20598: Horizontal adaptation define a minimum width of the columns
#7920
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
b0db0a1

FOUR-20598: Horizontal adaptation define a minimum width of the columns


hjonathan Jan 21, 2025
f0d4cdc

FOUR-20598: Horizontal adaptation define a minimum width of the columns


hjonathan Jan 23, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 2 additions & 3 deletions
resources/jscomposition/base/table/BaseTable.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
<template>
 <div
 class="tw-w-full tw-relative tw-text-gray-600 tw-text-sm
 tw-border tw-rounded-xl tw-border-gray-300 tw-overflow-hidden tw-overflow-x-auto tw-overflow-y-auto"
 >
 tw-border tw-rounded-xl tw-border-gray-300 tw-overflow-hidden tw-overflow-x-auto tw-overflow-y-auto">
 <table
 class="tw-w-full tw-border-collapse"
 :class="{
Expand DownExpand Up@@ -86,7 +85,7 @@ import TCell from "./TCell.vue";
import ContainerRow from "./ContainerRow.vue";

const defaultConfig = () => ({
 tableFixed: true,
 tableFixed: false,
});

export default defineComponent({
Expand Down

19 changes: 16 additions & 3 deletions
resources/jscomposition/base/table/TCell.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
<template>
 <td
 class="tw-relative tw-p-0"
 :style="{ width: `${column.width}px` }">
 :style="{ width: width }">
 <template v-if="!column.cellRenderer">
 <slot
 :columns="columns"
 :column="column"
 :row="row">
 <div class="tw-p-3 tw-text-ellipsis tw-text-nowrap tw-overflow-hidden">
 <div
 :style="{ width: width }"
 class="tw-p-3 tw-text-ellipsis tw-text-nowrap tw-overflow-hidden">
 {{ getValue() }}
 </div>
 </slot>
 </template>
 <component
 :is="getComponent()"
 v-else
 :style="{ width: width }"
 v-bind="getParams()"
 :columns="columns"
 :column="column"
Expand All@@ -24,7 +27,7 @@
</template>

<script>
import { defineComponent } from "vue";
import { defineComponent, computed } from "vue";
import { isFunction, get } from "lodash";

export default defineComponent({
Expand DownExpand Up@@ -56,11 +59,21 @@ export default defineComponent({

 const collapseContainer = (value) => emit("toogleContainer", value);

 const index = computed(() => props.columns.findIndex((column) => column.field === props.column.field));

 const width = computed(() => {
 if (index.value === props.columns.length - 1) {
 return "auto";
 }
 return `${props.column.width || 200}px`;
 });

 return {
 getComponent,
 getParams,
 getValue,
 collapseContainer,
 width,
 };
 },
});
Expand Down

15 changes: 12 additions & 3 deletions
resources/jscomposition/base/table/THeader.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
<template>
 <th
 class="tw-relative thead-resizable tw-p-0"
 :style="{ width: width + 'px' }">
 :style="{ width: width }">
 <div
 :style="{ width: width }"
 class="tw-py-3 tw-px-3 tw-text-left tw-text-nowrap tw-whitespace-nowrap tw-overflow-hidden tw-text-ellipsis">
 <slot>
 {{ $t(getValue()) }}
Expand All@@ -22,7 +23,7 @@

<script>
import { isFunction } from "lodash";
import { defineComponent, computed } from "vue";
import { defineComponent, computed, ref } from "vue";
import { columnResizeComposable } from "./composables/columnComposable";

export default defineComponent({
Expand All@@ -39,7 +40,14 @@ export default defineComponent({
 setup(props, { emit }) {
 const columnResize = columnResizeComposable(props.column);

 const width = computed(() => props.column.width || 200);
 const index = computed(() => props.columns.findIndex((column) => column.field === props.column.field));

 const width = computed(() => {
 if (index.value === props.columns.length - 1) {
 return "auto";
 }
 return `${props.column.width || 200}px`;
 });

 const getValue = () => {
 if (isFunction(props.column?.headerFormatter)) {
Expand All@@ -50,6 +58,7 @@ export default defineComponent({
 };
 return {
 getValue,
 index,
 width,
 columnResize,
 };
Expand Down

11 changes: 8 additions & 3 deletions
resources/jscomposition/base/table/composables/columnComposable.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,13 +12,17 @@ export const columnResizeComposable = (column) => {
 const startWidth = ref(0);
 const isResizing = ref(false);

 //Resize the column value
 const minWidth = 144;

 // Resize the column value
 const doResize = (event) => {
 if (isResizing.value) {
 const diff = event.pageX - startX.value;
 const min = 30;
 const min = minWidth;
 const currentWidth = Math.max(min, startWidth.value + diff);

 console.log("doResize", currentWidth);

 column.width = currentWidth;
 }
 };
Expand All@@ -35,7 +39,8 @@ export const columnResizeComposable = (column) => {
 const startResize = (event, index) => {
 isResizing.value = true;
 startX.value = event.pageX;
 startWidth.value = column.width || 200;
 startWidth.value = column.width || minWidth;
 console.log("startResize", startWidth.value);

 document.addEventListener("mousemove", doResize);
 document.addEventListener("mouseup", stopResize);
Expand Down

3 changes: 1 addition & 2 deletions
resources/jscomposition/cases/casesDetail/components/TaskTable.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,7 @@
 :columns="columnsConfig"
 :data="data"
 :placeholder="showPlaceholder"
 @changeFilter="onChangeFilter"
 >
 @changeFilter="onChangeFilter">
 <template #placeholder>
 <TablePlaceholder
 :placeholder="placeholderType"
Expand Down

6 changes: 3 additions & 3 deletions
resources/jscomposition/cases/casesDetail/config/columns.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ const taskNumberColumn = () => ({
 field: "id",
 header: "Tasks #",
 resizable: true,
 width: 100,
 width: 144,
 filter: true,
 formatter: (row, column, columns) => `#${row.id}`,
 cellRenderer: () => ({
Expand DownExpand Up@@ -68,7 +68,7 @@ const dueDateColumn = () => ({
 field: "due_at",
 header: "Due Date",
 resizable: true,
 width: 200,
 width: "auto",
 filter: true,
 formatter: (row, column, columns) => formatDate(row.due_at, "datetime"),
});
Expand DownExpand Up@@ -127,7 +127,7 @@ const startedColumn = () => ({
 header: "Started",
 filter: true,
 resizable: true,
 width: 200,
 width: "auto",
 formatter: (row, column, columns) => formatDate(row.initiated_at, "datetime"),
});

Expand Down

12 changes: 4 additions & 8 deletions
resources/jscomposition/cases/casesMain/CasesDataSection.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,20 +3,17 @@
 <CaseFilter @enter="onChangeSearch" />
 <BadgesSection
 v-model="badgesData"
 @remove="onRemoveBadge"
 />
 @remove="onRemoveBadge" />
 <FilterableTable
 ref="table"
 :columns="columnsConfig"
 :data="data"
 :placeholder="showPlaceholder"
 @changeFilter="onChangeFilter"
 >
 @changeFilter="onChangeFilter">
 <template #placeholder>
 <TablePlaceholder
 :placeholder="placeholderType"
 class="tw-grow"
 />
 class="tw-grow" />
 </template>
 </FilterableTable>
 <Pagination
Expand All@@ -28,8 +25,7 @@
 :page="dataPagination.page"
 :pages="dataPagination.pages"
 @perPage="onPerPage"
 @go="onGo"
 />
 @go="onGo" />
 </div>
</template>
<script setup>
Expand Down

4 changes: 2 additions & 2 deletions
resources/jscomposition/cases/casesMain/config/columns.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ export const caseNumberColumn = () => ({
 field: "case_number",
 header: "Case #",
 resizable: true,
 width: 100,
 width: 144,
 filter: {
 dataType: "string",
 operators: ["=", ">", ">=", "in", "between"],
Expand DownExpand Up@@ -162,7 +162,7 @@ export const completedColumn = () => ({
 field: "completed_at",
 header: "Completed",
 resizable: true,
 width: 200,
 width: "auto",
 formatter: (row, column, columns) => formatDate(row.completed_at, "datetime"),
 filter: {
 dataType: "datetime",
Expand Down

10 changes: 7 additions & 3 deletions
resources/jscomposition/system/table/FilterableTable.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,14 +3,14 @@
 :columns="columns"
 :data="data"
 :placeholder="placeholder"
class="tw-grow"
 >
:config="config"
 class="tw-grow">
 <template
 v-for="(column, index) in columns"
 #[`theader-filter-${column.field}`]>
 <FilterColumn
 :id="column.field"
 v-if="column.filter"
 :id="column.field"
 :key="`default-${index}-${hasFilter(index,column)}`"
 :filter="column.filter"
 :value="getFilter(index, column)"
Expand DownExpand Up@@ -42,6 +42,10 @@ const props = defineProps({
 type: Boolean,
 default: () => false,
 },
 config: {
 type: Object,
 default: () => {},
 },
});

const filters = ref([]);
Expand Down

3 changes: 1 addition & 2 deletions
resources/jscomposition/system/table/SortTable.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,7 @@
 :data="data"
 :config="config"
 :placeholder="placeholder"
 class="tw-grow"
 >
 class="tw-grow">
 <template
 v-for="(column, index) in columns"
 #[`theader-filter-${column.field}`]>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
FOUR-20598: Horizontal adaptation define a minimum width of the columns#7920

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

pmPaulis
merged 2 commits into

from

Jan 23, 2025
 Merged


FOUR-20598: Horizontal adaptation define a minimum width of the columns
#7920
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
b0db0a1

FOUR-20598: Horizontal adaptation define a minimum width of the columns


hjonathan Jan 21, 2025
f0d4cdc

FOUR-20598: Horizontal adaptation define a minimum width of the columns


hjonathan Jan 23, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 2 additions & 3 deletions
resources/jscomposition/base/table/BaseTable.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
<template>
 <div
 class="tw-w-full tw-relative tw-text-gray-600 tw-text-sm
 tw-border tw-rounded-xl tw-border-gray-300 tw-overflow-hidden tw-overflow-x-auto tw-overflow-y-auto"
 >
 tw-border tw-rounded-xl tw-border-gray-300 tw-overflow-hidden tw-overflow-x-auto tw-overflow-y-auto">
 <table
 class="tw-w-full tw-border-collapse"
 :class="{
Expand DownExpand Up@@ -86,7 +85,7 @@ import TCell from "./TCell.vue";
import ContainerRow from "./ContainerRow.vue";

const defaultConfig = () => ({
 tableFixed: true,
 tableFixed: false,
});

export default defineComponent({
Expand Down

19 changes: 16 additions & 3 deletions
resources/jscomposition/base/table/TCell.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
<template>
 <td
 class="tw-relative tw-p-0"
 :style="{ width: `${column.width}px` }">
 :style="{ width: width }">
 <template v-if="!column.cellRenderer">
 <slot
 :columns="columns"
 :column="column"
 :row="row">
 <div class="tw-p-3 tw-text-ellipsis tw-text-nowrap tw-overflow-hidden">
 <div
 :style="{ width: width }"
 class="tw-p-3 tw-text-ellipsis tw-text-nowrap tw-overflow-hidden">
 {{ getValue() }}
 </div>
 </slot>
 </template>
 <component
 :is="getComponent()"
 v-else
 :style="{ width: width }"
 v-bind="getParams()"
 :columns="columns"
 :column="column"
Expand All@@ -24,7 +27,7 @@
</template>

<script>
import { defineComponent } from "vue";
import { defineComponent, computed } from "vue";
import { isFunction, get } from "lodash";

export default defineComponent({
Expand DownExpand Up@@ -56,11 +59,21 @@ export default defineComponent({

 const collapseContainer = (value) => emit("toogleContainer", value);

 const index = computed(() => props.columns.findIndex((column) => column.field === props.column.field));

 const width = computed(() => {
 if (index.value === props.columns.length - 1) {
 return "auto";
 }
 return `${props.column.width || 200}px`;
 });

 return {
 getComponent,
 getParams,
 getValue,
 collapseContainer,
 width,
 };
 },
});
Expand Down

15 changes: 12 additions & 3 deletions
resources/jscomposition/base/table/THeader.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
<template>
 <th
 class="tw-relative thead-resizable tw-p-0"
 :style="{ width: width + 'px' }">
 :style="{ width: width }">
 <div
 :style="{ width: width }"
 class="tw-py-3 tw-px-3 tw-text-left tw-text-nowrap tw-whitespace-nowrap tw-overflow-hidden tw-text-ellipsis">
 <slot>
 {{ $t(getValue()) }}
Expand All@@ -22,7 +23,7 @@

<script>
import { isFunction } from "lodash";
import { defineComponent, computed } from "vue";
import { defineComponent, computed, ref } from "vue";
import { columnResizeComposable } from "./composables/columnComposable";

export default defineComponent({
Expand All@@ -39,7 +40,14 @@ export default defineComponent({
 setup(props, { emit }) {
 const columnResize = columnResizeComposable(props.column);

 const width = computed(() => props.column.width || 200);
 const index = computed(() => props.columns.findIndex((column) => column.field === props.column.field));

 const width = computed(() => {
 if (index.value === props.columns.length - 1) {
 return "auto";
 }
 return `${props.column.width || 200}px`;
 });

 const getValue = () => {
 if (isFunction(props.column?.headerFormatter)) {
Expand All@@ -50,6 +58,7 @@ export default defineComponent({
 };
 return {
 getValue,
 index,
 width,
 columnResize,
 };
Expand Down

11 changes: 8 additions & 3 deletions
resources/jscomposition/base/table/composables/columnComposable.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,13 +12,17 @@ export const columnResizeComposable = (column) => {
 const startWidth = ref(0);
 const isResizing = ref(false);

 //Resize the column value
 const minWidth = 144;

 // Resize the column value
 const doResize = (event) => {
 if (isResizing.value) {
 const diff = event.pageX - startX.value;
 const min = 30;
 const min = minWidth;
 const currentWidth = Math.max(min, startWidth.value + diff);

 console.log("doResize", currentWidth);

 column.width = currentWidth;
 }
 };
Expand All@@ -35,7 +39,8 @@ export const columnResizeComposable = (column) => {
 const startResize = (event, index) => {
 isResizing.value = true;
 startX.value = event.pageX;
 startWidth.value = column.width || 200;
 startWidth.value = column.width || minWidth;
 console.log("startResize", startWidth.value);

 document.addEventListener("mousemove", doResize);
 document.addEventListener("mouseup", stopResize);
Expand Down

3 changes: 1 addition & 2 deletions
resources/jscomposition/cases/casesDetail/components/TaskTable.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,7 @@
 :columns="columnsConfig"
 :data="data"
 :placeholder="showPlaceholder"
 @changeFilter="onChangeFilter"
 >
 @changeFilter="onChangeFilter">
 <template #placeholder>
 <TablePlaceholder
 :placeholder="placeholderType"
Expand Down

6 changes: 3 additions & 3 deletions
resources/jscomposition/cases/casesDetail/config/columns.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ const taskNumberColumn = () => ({
 field: "id",
 header: "Tasks #",
 resizable: true,
 width: 100,
 width: 144,
 filter: true,
 formatter: (row, column, columns) => `#${row.id}`,
 cellRenderer: () => ({
Expand DownExpand Up@@ -68,7 +68,7 @@ const dueDateColumn = () => ({
 field: "due_at",
 header: "Due Date",
 resizable: true,
 width: 200,
 width: "auto",
 filter: true,
 formatter: (row, column, columns) => formatDate(row.due_at, "datetime"),
});
Expand DownExpand Up@@ -127,7 +127,7 @@ const startedColumn = () => ({
 header: "Started",
 filter: true,
 resizable: true,
 width: 200,
 width: "auto",
 formatter: (row, column, columns) => formatDate(row.initiated_at, "datetime"),
});

Expand Down

12 changes: 4 additions & 8 deletions
resources/jscomposition/cases/casesMain/CasesDataSection.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,20 +3,17 @@
 <CaseFilter @enter="onChangeSearch" />
 <BadgesSection
 v-model="badgesData"
 @remove="onRemoveBadge"
 />
 @remove="onRemoveBadge" />
 <FilterableTable
 ref="table"
 :columns="columnsConfig"
 :data="data"
 :placeholder="showPlaceholder"
 @changeFilter="onChangeFilter"
 >
 @changeFilter="onChangeFilter">
 <template #placeholder>
 <TablePlaceholder
 :placeholder="placeholderType"
 class="tw-grow"
 />
 class="tw-grow" />
 </template>
 </FilterableTable>
 <Pagination
Expand All@@ -28,8 +25,7 @@
 :page="dataPagination.page"
 :pages="dataPagination.pages"
 @perPage="onPerPage"
 @go="onGo"
 />
 @go="onGo" />
 </div>
</template>
<script setup>
Expand Down

4 changes: 2 additions & 2 deletions
resources/jscomposition/cases/casesMain/config/columns.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ export const caseNumberColumn = () => ({
 field: "case_number",
 header: "Case #",
 resizable: true,
 width: 100,
 width: 144,
 filter: {
 dataType: "string",
 operators: ["=", ">", ">=", "in", "between"],
Expand DownExpand Up@@ -162,7 +162,7 @@ export const completedColumn = () => ({
 field: "completed_at",
 header: "Completed",
 resizable: true,
 width: 200,
 width: "auto",
 formatter: (row, column, columns) => formatDate(row.completed_at, "datetime"),
 filter: {
 dataType: "datetime",
Expand Down

10 changes: 7 additions & 3 deletions
resources/jscomposition/system/table/FilterableTable.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,14 +3,14 @@
 :columns="columns"
 :data="data"
 :placeholder="placeholder"
class="tw-grow"
 >
:config="config"
 class="tw-grow">
 <template
 v-for="(column, index) in columns"
 #[`theader-filter-${column.field}`]>
 <FilterColumn
 :id="column.field"
 v-if="column.filter"
 :id="column.field"
 :key="`default-${index}-${hasFilter(index,column)}`"
 :filter="column.filter"
 :value="getFilter(index, column)"
Expand DownExpand Up@@ -42,6 +42,10 @@ const props = defineProps({
 type: Boolean,
 default: () => false,
 },
 config: {
 type: Object,
 default: () => {},
 },
});

const filters = ref([]);
Expand Down

3 changes: 1 addition & 2 deletions
resources/jscomposition/system/table/SortTable.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,7 @@
 :data="data"
 :config="config"
 :placeholder="placeholder"
 class="tw-grow"
 >
 class="tw-grow">
 <template
 v-for="(column, index) in columns"
 #[`theader-filter-${column.field}`]>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
FOUR-20598: Horizontal adaptation define a minimum width of the columns#7920

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

pmPaulis
merged 2 commits into

from

Jan 23, 2025
 Merged


FOUR-20598: Horizontal adaptation define a minimum width of the columns
#7920
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
b0db0a1

FOUR-20598: Horizontal adaptation define a minimum width of the columns


hjonathan Jan 21, 2025
f0d4cdc

FOUR-20598: Horizontal adaptation define a minimum width of the columns


hjonathan Jan 23, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 2 additions & 3 deletions
resources/jscomposition/base/table/BaseTable.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
<template>
 <div
 class="tw-w-full tw-relative tw-text-gray-600 tw-text-sm
 tw-border tw-rounded-xl tw-border-gray-300 tw-overflow-hidden tw-overflow-x-auto tw-overflow-y-auto"
 >
 tw-border tw-rounded-xl tw-border-gray-300 tw-overflow-hidden tw-overflow-x-auto tw-overflow-y-auto">
 <table
 class="tw-w-full tw-border-collapse"
 :class="{
Expand DownExpand Up@@ -86,7 +85,7 @@ import TCell from "./TCell.vue";
import ContainerRow from "./ContainerRow.vue";

const defaultConfig = () => ({
 tableFixed: true,
 tableFixed: false,
});

export default defineComponent({
Expand Down

19 changes: 16 additions & 3 deletions
resources/jscomposition/base/table/TCell.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
<template>
 <td
 class="tw-relative tw-p-0"
 :style="{ width: `${column.width}px` }">
 :style="{ width: width }">
 <template v-if="!column.cellRenderer">
 <slot
 :columns="columns"
 :column="column"
 :row="row">
 <div class="tw-p-3 tw-text-ellipsis tw-text-nowrap tw-overflow-hidden">
 <div
 :style="{ width: width }"
 class="tw-p-3 tw-text-ellipsis tw-text-nowrap tw-overflow-hidden">
 {{ getValue() }}
 </div>
 </slot>
 </template>
 <component
 :is="getComponent()"
 v-else
 :style="{ width: width }"
 v-bind="getParams()"
 :columns="columns"
 :column="column"
Expand All@@ -24,7 +27,7 @@
</template>

<script>
import { defineComponent } from "vue";
import { defineComponent, computed } from "vue";
import { isFunction, get } from "lodash";

export default defineComponent({
Expand DownExpand Up@@ -56,11 +59,21 @@ export default defineComponent({

 const collapseContainer = (value) => emit("toogleContainer", value);

 const index = computed(() => props.columns.findIndex((column) => column.field === props.column.field));

 const width = computed(() => {
 if (index.value === props.columns.length - 1) {
 return "auto";
 }
 return `${props.column.width || 200}px`;
 });

 return {
 getComponent,
 getParams,
 getValue,
 collapseContainer,
 width,
 };
 },
});
Expand Down

15 changes: 12 additions & 3 deletions
resources/jscomposition/base/table/THeader.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
<template>
 <th
 class="tw-relative thead-resizable tw-p-0"
 :style="{ width: width + 'px' }">
 :style="{ width: width }">
 <div
 :style="{ width: width }"
 class="tw-py-3 tw-px-3 tw-text-left tw-text-nowrap tw-whitespace-nowrap tw-overflow-hidden tw-text-ellipsis">
 <slot>
 {{ $t(getValue()) }}
Expand All@@ -22,7 +23,7 @@

<script>
import { isFunction } from "lodash";
import { defineComponent, computed } from "vue";
import { defineComponent, computed, ref } from "vue";
import { columnResizeComposable } from "./composables/columnComposable";

export default defineComponent({
Expand All@@ -39,7 +40,14 @@ export default defineComponent({
 setup(props, { emit }) {
 const columnResize = columnResizeComposable(props.column);

 const width = computed(() => props.column.width || 200);
 const index = computed(() => props.columns.findIndex((column) => column.field === props.column.field));

 const width = computed(() => {
 if (index.value === props.columns.length - 1) {
 return "auto";
 }
 return `${props.column.width || 200}px`;
 });

 const getValue = () => {
 if (isFunction(props.column?.headerFormatter)) {
Expand All@@ -50,6 +58,7 @@ export default defineComponent({
 };
 return {
 getValue,
 index,
 width,
 columnResize,
 };
Expand Down

11 changes: 8 additions & 3 deletions
resources/jscomposition/base/table/composables/columnComposable.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,13 +12,17 @@ export const columnResizeComposable = (column) => {
 const startWidth = ref(0);
 const isResizing = ref(false);

 //Resize the column value
 const minWidth = 144;

 // Resize the column value
 const doResize = (event) => {
 if (isResizing.value) {
 const diff = event.pageX - startX.value;
 const min = 30;
 const min = minWidth;
 const currentWidth = Math.max(min, startWidth.value + diff);

 console.log("doResize", currentWidth);

 column.width = currentWidth;
 }
 };
Expand All@@ -35,7 +39,8 @@ export const columnResizeComposable = (column) => {
 const startResize = (event, index) => {
 isResizing.value = true;
 startX.value = event.pageX;
 startWidth.value = column.width || 200;
 startWidth.value = column.width || minWidth;
 console.log("startResize", startWidth.value);

 document.addEventListener("mousemove", doResize);
 document.addEventListener("mouseup", stopResize);
Expand Down

3 changes: 1 addition & 2 deletions
resources/jscomposition/cases/casesDetail/components/TaskTable.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,7 @@
 :columns="columnsConfig"
 :data="data"
 :placeholder="showPlaceholder"
 @changeFilter="onChangeFilter"
 >
 @changeFilter="onChangeFilter">
 <template #placeholder>
 <TablePlaceholder
 :placeholder="placeholderType"
Expand Down

6 changes: 3 additions & 3 deletions
resources/jscomposition/cases/casesDetail/config/columns.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ const taskNumberColumn = () => ({
 field: "id",
 header: "Tasks #",
 resizable: true,
 width: 100,
 width: 144,
 filter: true,
 formatter: (row, column, columns) => `#${row.id}`,
 cellRenderer: () => ({
Expand DownExpand Up@@ -68,7 +68,7 @@ const dueDateColumn = () => ({
 field: "due_at",
 header: "Due Date",
 resizable: true,
 width: 200,
 width: "auto",
 filter: true,
 formatter: (row, column, columns) => formatDate(row.due_at, "datetime"),
});
Expand DownExpand Up@@ -127,7 +127,7 @@ const startedColumn = () => ({
 header: "Started",
 filter: true,
 resizable: true,
 width: 200,
 width: "auto",
 formatter: (row, column, columns) => formatDate(row.initiated_at, "datetime"),
});

Expand Down

12 changes: 4 additions & 8 deletions
resources/jscomposition/cases/casesMain/CasesDataSection.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,20 +3,17 @@
 <CaseFilter @enter="onChangeSearch" />
 <BadgesSection
 v-model="badgesData"
 @remove="onRemoveBadge"
 />
 @remove="onRemoveBadge" />
 <FilterableTable
 ref="table"
 :columns="columnsConfig"
 :data="data"
 :placeholder="showPlaceholder"
 @changeFilter="onChangeFilter"
 >
 @changeFilter="onChangeFilter">
 <template #placeholder>
 <TablePlaceholder
 :placeholder="placeholderType"
 class="tw-grow"
 />
 class="tw-grow" />
 </template>
 </FilterableTable>
 <Pagination
Expand All@@ -28,8 +25,7 @@
 :page="dataPagination.page"
 :pages="dataPagination.pages"
 @perPage="onPerPage"
 @go="onGo"
 />
 @go="onGo" />
 </div>
</template>
<script setup>
Expand Down

4 changes: 2 additions & 2 deletions
resources/jscomposition/cases/casesMain/config/columns.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ export const caseNumberColumn = () => ({
 field: "case_number",
 header: "Case #",
 resizable: true,
 width: 100,
 width: 144,
 filter: {
 dataType: "string",
 operators: ["=", ">", ">=", "in", "between"],
Expand DownExpand Up@@ -162,7 +162,7 @@ export const completedColumn = () => ({
 field: "completed_at",
 header: "Completed",
 resizable: true,
 width: 200,
 width: "auto",
 formatter: (row, column, columns) => formatDate(row.completed_at, "datetime"),
 filter: {
 dataType: "datetime",
Expand Down

10 changes: 7 additions & 3 deletions
resources/jscomposition/system/table/FilterableTable.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,14 +3,14 @@
 :columns="columns"
 :data="data"
 :placeholder="placeholder"
class="tw-grow"
 >
:config="config"
 class="tw-grow">
 <template
 v-for="(column, index) in columns"
 #[`theader-filter-${column.field}`]>
 <FilterColumn
 :id="column.field"
 v-if="column.filter"
 :id="column.field"
 :key="`default-${index}-${hasFilter(index,column)}`"
 :filter="column.filter"
 :value="getFilter(index, column)"
Expand DownExpand Up@@ -42,6 +42,10 @@ const props = defineProps({
 type: Boolean,
 default: () => false,
 },
 config: {
 type: Object,
 default: () => {},
 },
});

const filters = ref([]);
Expand Down

3 changes: 1 addition & 2 deletions
resources/jscomposition/system/table/SortTable.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,7 @@
 :data="data"
 :config="config"
 :placeholder="placeholder"
 class="tw-grow"
 >
 class="tw-grow">
 <template
 v-for="(column, index) in columns"
 #[`theader-filter-${column.field}`]>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
FOUR-20598: Horizontal adaptation define a minimum width of the columns#7920

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

pmPaulis
merged 2 commits into

from

Jan 23, 2025
 Merged


FOUR-20598: Horizontal adaptation define a minimum width of the columns
#7920
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
b0db0a1

FOUR-20598: Horizontal adaptation define a minimum width of the columns


hjonathan Jan 21, 2025
f0d4cdc

FOUR-20598: Horizontal adaptation define a minimum width of the columns


hjonathan Jan 23, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 2 additions & 3 deletions
resources/jscomposition/base/table/BaseTable.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
<template>
 <div
 class="tw-w-full tw-relative tw-text-gray-600 tw-text-sm
 tw-border tw-rounded-xl tw-border-gray-300 tw-overflow-hidden tw-overflow-x-auto tw-overflow-y-auto"
 >
 tw-border tw-rounded-xl tw-border-gray-300 tw-overflow-hidden tw-overflow-x-auto tw-overflow-y-auto">
 <table
 class="tw-w-full tw-border-collapse"
 :class="{
Expand DownExpand Up@@ -86,7 +85,7 @@ import TCell from "./TCell.vue";
import ContainerRow from "./ContainerRow.vue";

const defaultConfig = () => ({
 tableFixed: true,
 tableFixed: false,
});

export default defineComponent({
Expand Down

19 changes: 16 additions & 3 deletions
resources/jscomposition/base/table/TCell.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
<template>
 <td
 class="tw-relative tw-p-0"
 :style="{ width: `${column.width}px` }">
 :style="{ width: width }">
 <template v-if="!column.cellRenderer">
 <slot
 :columns="columns"
 :column="column"
 :row="row">
 <div class="tw-p-3 tw-text-ellipsis tw-text-nowrap tw-overflow-hidden">
 <div
 :style="{ width: width }"
 class="tw-p-3 tw-text-ellipsis tw-text-nowrap tw-overflow-hidden">
 {{ getValue() }}
 </div>
 </slot>
 </template>
 <component
 :is="getComponent()"
 v-else
 :style="{ width: width }"
 v-bind="getParams()"
 :columns="columns"
 :column="column"
Expand All@@ -24,7 +27,7 @@
</template>

<script>
import { defineComponent } from "vue";
import { defineComponent, computed } from "vue";
import { isFunction, get } from "lodash";

export default defineComponent({
Expand DownExpand Up@@ -56,11 +59,21 @@ export default defineComponent({

 const collapseContainer = (value) => emit("toogleContainer", value);

 const index = computed(() => props.columns.findIndex((column) => column.field === props.column.field));

 const width = computed(() => {
 if (index.value === props.columns.length - 1) {
 return "auto";
 }
 return `${props.column.width || 200}px`;
 });

 return {
 getComponent,
 getParams,
 getValue,
 collapseContainer,
 width,
 };
 },
});
Expand Down

15 changes: 12 additions & 3 deletions
resources/jscomposition/base/table/THeader.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
<template>
 <th
 class="tw-relative thead-resizable tw-p-0"
 :style="{ width: width + 'px' }">
 :style="{ width: width }">
 <div
 :style="{ width: width }"
 class="tw-py-3 tw-px-3 tw-text-left tw-text-nowrap tw-whitespace-nowrap tw-overflow-hidden tw-text-ellipsis">
 <slot>
 {{ $t(getValue()) }}
Expand All@@ -22,7 +23,7 @@

<script>
import { isFunction } from "lodash";
import { defineComponent, computed } from "vue";
import { defineComponent, computed, ref } from "vue";
import { columnResizeComposable } from "./composables/columnComposable";

export default defineComponent({
Expand All@@ -39,7 +40,14 @@ export default defineComponent({
 setup(props, { emit }) {
 const columnResize = columnResizeComposable(props.column);

 const width = computed(() => props.column.width || 200);
 const index = computed(() => props.columns.findIndex((column) => column.field === props.column.field));

 const width = computed(() => {
 if (index.value === props.columns.length - 1) {
 return "auto";
 }
 return `${props.column.width || 200}px`;
 });

 const getValue = () => {
 if (isFunction(props.column?.headerFormatter)) {
Expand All@@ -50,6 +58,7 @@ export default defineComponent({
 };
 return {
 getValue,
 index,
 width,
 columnResize,
 };
Expand Down

11 changes: 8 additions & 3 deletions
resources/jscomposition/base/table/composables/columnComposable.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,13 +12,17 @@ export const columnResizeComposable = (column) => {
 const startWidth = ref(0);
 const isResizing = ref(false);

 //Resize the column value
 const minWidth = 144;

 // Resize the column value
 const doResize = (event) => {
 if (isResizing.value) {
 const diff = event.pageX - startX.value;
 const min = 30;
 const min = minWidth;
 const currentWidth = Math.max(min, startWidth.value + diff);

 console.log("doResize", currentWidth);

 column.width = currentWidth;
 }
 };
Expand All@@ -35,7 +39,8 @@ export const columnResizeComposable = (column) => {
 const startResize = (event, index) => {
 isResizing.value = true;
 startX.value = event.pageX;
 startWidth.value = column.width || 200;
 startWidth.value = column.width || minWidth;
 console.log("startResize", startWidth.value);

 document.addEventListener("mousemove", doResize);
 document.addEventListener("mouseup", stopResize);
Expand Down

3 changes: 1 addition & 2 deletions
resources/jscomposition/cases/casesDetail/components/TaskTable.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,7 @@
 :columns="columnsConfig"
 :data="data"
 :placeholder="showPlaceholder"
 @changeFilter="onChangeFilter"
 >
 @changeFilter="onChangeFilter">
 <template #placeholder>
 <TablePlaceholder
 :placeholder="placeholderType"
Expand Down

6 changes: 3 additions & 3 deletions
resources/jscomposition/cases/casesDetail/config/columns.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ const taskNumberColumn = () => ({
 field: "id",
 header: "Tasks #",
 resizable: true,
 width: 100,
 width: 144,
 filter: true,
 formatter: (row, column, columns) => `#${row.id}`,
 cellRenderer: () => ({
Expand DownExpand Up@@ -68,7 +68,7 @@ const dueDateColumn = () => ({
 field: "due_at",
 header: "Due Date",
 resizable: true,
 width: 200,
 width: "auto",
 filter: true,
 formatter: (row, column, columns) => formatDate(row.due_at, "datetime"),
});
Expand DownExpand Up@@ -127,7 +127,7 @@ const startedColumn = () => ({
 header: "Started",
 filter: true,
 resizable: true,
 width: 200,
 width: "auto",
 formatter: (row, column, columns) => formatDate(row.initiated_at, "datetime"),
});

Expand Down

12 changes: 4 additions & 8 deletions
resources/jscomposition/cases/casesMain/CasesDataSection.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,20 +3,17 @@
 <CaseFilter @enter="onChangeSearch" />
 <BadgesSection
 v-model="badgesData"
 @remove="onRemoveBadge"
 />
 @remove="onRemoveBadge" />
 <FilterableTable
 ref="table"
 :columns="columnsConfig"
 :data="data"
 :placeholder="showPlaceholder"
 @changeFilter="onChangeFilter"
 >
 @changeFilter="onChangeFilter">
 <template #placeholder>
 <TablePlaceholder
 :placeholder="placeholderType"
 class="tw-grow"
 />
 class="tw-grow" />
 </template>
 </FilterableTable>
 <Pagination
Expand All@@ -28,8 +25,7 @@
 :page="dataPagination.page"
 :pages="dataPagination.pages"
 @perPage="onPerPage"
 @go="onGo"
 />
 @go="onGo" />
 </div>
</template>
<script setup>
Expand Down

4 changes: 2 additions & 2 deletions
resources/jscomposition/cases/casesMain/config/columns.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ export const caseNumberColumn = () => ({
 field: "case_number",
 header: "Case #",
 resizable: true,
 width: 100,
 width: 144,
 filter: {
 dataType: "string",
 operators: ["=", ">", ">=", "in", "between"],
Expand DownExpand Up@@ -162,7 +162,7 @@ export const completedColumn = () => ({
 field: "completed_at",
 header: "Completed",
 resizable: true,
 width: 200,
 width: "auto",
 formatter: (row, column, columns) => formatDate(row.completed_at, "datetime"),
 filter: {
 dataType: "datetime",
Expand Down

10 changes: 7 additions & 3 deletions
resources/jscomposition/system/table/FilterableTable.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,14 +3,14 @@
 :columns="columns"
 :data="data"
 :placeholder="placeholder"
class="tw-grow"
 >
:config="config"
 class="tw-grow">
 <template
 v-for="(column, index) in columns"
 #[`theader-filter-${column.field}`]>
 <FilterColumn
 :id="column.field"
 v-if="column.filter"
 :id="column.field"
 :key="`default-${index}-${hasFilter(index,column)}`"
 :filter="column.filter"
 :value="getFilter(index, column)"
Expand DownExpand Up@@ -42,6 +42,10 @@ const props = defineProps({
 type: Boolean,
 default: () => false,
 },
 config: {
 type: Object,
 default: () => {},
 },
});

const filters = ref([]);
Expand Down

3 changes: 1 addition & 2 deletions
resources/jscomposition/system/table/SortTable.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,7 @@
 :data="data"
 :config="config"
 :placeholder="placeholder"
 class="tw-grow"
 >
 class="tw-grow">
 <template
 v-for="(column, index) in columns"
 #[`theader-filter-${column.field}`]>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
FOUR-20598: Horizontal adaptation define a minimum width of the columns#7920

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

pmPaulis
merged 2 commits into

from

Jan 23, 2025
 Merged


FOUR-20598: Horizontal adaptation define a minimum width of the columns
#7920
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
b0db0a1

FOUR-20598: Horizontal adaptation define a minimum width of the columns


hjonathan Jan 21, 2025
f0d4cdc

FOUR-20598: Horizontal adaptation define a minimum width of the columns


hjonathan Jan 23, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 2 additions & 3 deletions
resources/jscomposition/base/table/BaseTable.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
<template>
 <div
 class="tw-w-full tw-relative tw-text-gray-600 tw-text-sm
 tw-border tw-rounded-xl tw-border-gray-300 tw-overflow-hidden tw-overflow-x-auto tw-overflow-y-auto"
 >
 tw-border tw-rounded-xl tw-border-gray-300 tw-overflow-hidden tw-overflow-x-auto tw-overflow-y-auto">
 <table
 class="tw-w-full tw-border-collapse"
 :class="{
Expand DownExpand Up@@ -86,7 +85,7 @@ import TCell from "./TCell.vue";
import ContainerRow from "./ContainerRow.vue";

const defaultConfig = () => ({
 tableFixed: true,
 tableFixed: false,
});

export default defineComponent({
Expand Down

19 changes: 16 additions & 3 deletions
resources/jscomposition/base/table/TCell.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
<template>
 <td
 class="tw-relative tw-p-0"
 :style="{ width: `${column.width}px` }">
 :style="{ width: width }">
 <template v-if="!column.cellRenderer">
 <slot
 :columns="columns"
 :column="column"
 :row="row">
 <div class="tw-p-3 tw-text-ellipsis tw-text-nowrap tw-overflow-hidden">
 <div
 :style="{ width: width }"
 class="tw-p-3 tw-text-ellipsis tw-text-nowrap tw-overflow-hidden">
 {{ getValue() }}
 </div>
 </slot>
 </template>
 <component
 :is="getComponent()"
 v-else
 :style="{ width: width }"
 v-bind="getParams()"
 :columns="columns"
 :column="column"
Expand All@@ -24,7 +27,7 @@
</template>

<script>
import { defineComponent } from "vue";
import { defineComponent, computed } from "vue";
import { isFunction, get } from "lodash";

export default defineComponent({
Expand DownExpand Up@@ -56,11 +59,21 @@ export default defineComponent({

 const collapseContainer = (value) => emit("toogleContainer", value);

 const index = computed(() => props.columns.findIndex((column) => column.field === props.column.field));

 const width = computed(() => {
 if (index.value === props.columns.length - 1) {
 return "auto";
 }
 return `${props.column.width || 200}px`;
 });

 return {
 getComponent,
 getParams,
 getValue,
 collapseContainer,
 width,
 };
 },
});
Expand Down

15 changes: 12 additions & 3 deletions
resources/jscomposition/base/table/THeader.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
<template>
 <th
 class="tw-relative thead-resizable tw-p-0"
 :style="{ width: width + 'px' }">
 :style="{ width: width }">
 <div
 :style="{ width: width }"
 class="tw-py-3 tw-px-3 tw-text-left tw-text-nowrap tw-whitespace-nowrap tw-overflow-hidden tw-text-ellipsis">
 <slot>
 {{ $t(getValue()) }}
Expand All@@ -22,7 +23,7 @@

<script>
import { isFunction } from "lodash";
import { defineComponent, computed } from "vue";
import { defineComponent, computed, ref } from "vue";
import { columnResizeComposable } from "./composables/columnComposable";

export default defineComponent({
Expand All@@ -39,7 +40,14 @@ export default defineComponent({
 setup(props, { emit }) {
 const columnResize = columnResizeComposable(props.column);

 const width = computed(() => props.column.width || 200);
 const index = computed(() => props.columns.findIndex((column) => column.field === props.column.field));

 const width = computed(() => {
 if (index.value === props.columns.length - 1) {
 return "auto";
 }
 return `${props.column.width || 200}px`;
 });

 const getValue = () => {
 if (isFunction(props.column?.headerFormatter)) {
Expand All@@ -50,6 +58,7 @@ export default defineComponent({
 };
 return {
 getValue,
 index,
 width,
 columnResize,
 };
Expand Down

11 changes: 8 additions & 3 deletions
resources/jscomposition/base/table/composables/columnComposable.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,13 +12,17 @@ export const columnResizeComposable = (column) => {
 const startWidth = ref(0);
 const isResizing = ref(false);

 //Resize the column value
 const minWidth = 144;

 // Resize the column value
 const doResize = (event) => {
 if (isResizing.value) {
 const diff = event.pageX - startX.value;
 const min = 30;
 const min = minWidth;
 const currentWidth = Math.max(min, startWidth.value + diff);

 console.log("doResize", currentWidth);

 column.width = currentWidth;
 }
 };
Expand All@@ -35,7 +39,8 @@ export const columnResizeComposable = (column) => {
 const startResize = (event, index) => {
 isResizing.value = true;
 startX.value = event.pageX;
 startWidth.value = column.width || 200;
 startWidth.value = column.width || minWidth;
 console.log("startResize", startWidth.value);

 document.addEventListener("mousemove", doResize);
 document.addEventListener("mouseup", stopResize);
Expand Down

3 changes: 1 addition & 2 deletions
resources/jscomposition/cases/casesDetail/components/TaskTable.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,7 @@
 :columns="columnsConfig"
 :data="data"
 :placeholder="showPlaceholder"
 @changeFilter="onChangeFilter"
 >
 @changeFilter="onChangeFilter">
 <template #placeholder>
 <TablePlaceholder
 :placeholder="placeholderType"
Expand Down

6 changes: 3 additions & 3 deletions
resources/jscomposition/cases/casesDetail/config/columns.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ const taskNumberColumn = () => ({
 field: "id",
 header: "Tasks #",
 resizable: true,
 width: 100,
 width: 144,
 filter: true,
 formatter: (row, column, columns) => `#${row.id}`,
 cellRenderer: () => ({
Expand DownExpand Up@@ -68,7 +68,7 @@ const dueDateColumn = () => ({
 field: "due_at",
 header: "Due Date",
 resizable: true,
 width: 200,
 width: "auto",
 filter: true,
 formatter: (row, column, columns) => formatDate(row.due_at, "datetime"),
});
Expand DownExpand Up@@ -127,7 +127,7 @@ const startedColumn = () => ({
 header: "Started",
 filter: true,
 resizable: true,
 width: 200,
 width: "auto",
 formatter: (row, column, columns) => formatDate(row.initiated_at, "datetime"),
});

Expand Down

12 changes: 4 additions & 8 deletions
resources/jscomposition/cases/casesMain/CasesDataSection.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,20 +3,17 @@
 <CaseFilter @enter="onChangeSearch" />
 <BadgesSection
 v-model="badgesData"
 @remove="onRemoveBadge"
 />
 @remove="onRemoveBadge" />
 <FilterableTable
 ref="table"
 :columns="columnsConfig"
 :data="data"
 :placeholder="showPlaceholder"
 @changeFilter="onChangeFilter"
 >
 @changeFilter="onChangeFilter">
 <template #placeholder>
 <TablePlaceholder
 :placeholder="placeholderType"
 class="tw-grow"
 />
 class="tw-grow" />
 </template>
 </FilterableTable>
 <Pagination
Expand All@@ -28,8 +25,7 @@
 :page="dataPagination.page"
 :pages="dataPagination.pages"
 @perPage="onPerPage"
 @go="onGo"
 />
 @go="onGo" />
 </div>
</template>
<script setup>
Expand Down

4 changes: 2 additions & 2 deletions
resources/jscomposition/cases/casesMain/config/columns.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ export const caseNumberColumn = () => ({
 field: "case_number",
 header: "Case #",
 resizable: true,
 width: 100,
 width: 144,
 filter: {
 dataType: "string",
 operators: ["=", ">", ">=", "in", "between"],
Expand DownExpand Up@@ -162,7 +162,7 @@ export const completedColumn = () => ({
 field: "completed_at",
 header: "Completed",
 resizable: true,
 width: 200,
 width: "auto",
 formatter: (row, column, columns) => formatDate(row.completed_at, "datetime"),
 filter: {
 dataType: "datetime",
Expand Down

10 changes: 7 additions & 3 deletions
resources/jscomposition/system/table/FilterableTable.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,14 +3,14 @@
 :columns="columns"
 :data="data"
 :placeholder="placeholder"
class="tw-grow"
 >
:config="config"
 class="tw-grow">
 <template
 v-for="(column, index) in columns"
 #[`theader-filter-${column.field}`]>
 <FilterColumn
 :id="column.field"
 v-if="column.filter"
 :id="column.field"
 :key="`default-${index}-${hasFilter(index,column)}`"
 :filter="column.filter"
 :value="getFilter(index, column)"
Expand DownExpand Up@@ -42,6 +42,10 @@ const props = defineProps({
 type: Boolean,
 default: () => false,
 },
 config: {
 type: Object,
 default: () => {},
 },
});

const filters = ref([]);
Expand Down

3 changes: 1 addition & 2 deletions
resources/jscomposition/system/table/SortTable.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,7 @@
 :data="data"
 :config="config"
 :placeholder="placeholder"
 class="tw-grow"
 >
 class="tw-grow">
 <template
 v-for="(column, index) in columns"
 #[`theader-filter-${column.field}`]>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
FOUR-20598: Horizontal adaptation define a minimum width of the columns#7920

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

pmPaulis
merged 2 commits into

from

Jan 23, 2025
 Merged


FOUR-20598: Horizontal adaptation define a minimum width of the columns
#7920
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
b0db0a1

FOUR-20598: Horizontal adaptation define a minimum width of the columns


hjonathan Jan 21, 2025
f0d4cdc

FOUR-20598: Horizontal adaptation define a minimum width of the columns


hjonathan Jan 23, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 2 additions & 3 deletions
resources/jscomposition/base/table/BaseTable.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
<template>
 <div
 class="tw-w-full tw-relative tw-text-gray-600 tw-text-sm
 tw-border tw-rounded-xl tw-border-gray-300 tw-overflow-hidden tw-overflow-x-auto tw-overflow-y-auto"
 >
 tw-border tw-rounded-xl tw-border-gray-300 tw-overflow-hidden tw-overflow-x-auto tw-overflow-y-auto">
 <table
 class="tw-w-full tw-border-collapse"
 :class="{
Expand DownExpand Up@@ -86,7 +85,7 @@ import TCell from "./TCell.vue";
import ContainerRow from "./ContainerRow.vue";

const defaultConfig = () => ({
 tableFixed: true,
 tableFixed: false,
});

export default defineComponent({
Expand Down

19 changes: 16 additions & 3 deletions
resources/jscomposition/base/table/TCell.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
<template>
 <td
 class="tw-relative tw-p-0"
 :style="{ width: `${column.width}px` }">
 :style="{ width: width }">
 <template v-if="!column.cellRenderer">
 <slot
 :columns="columns"
 :column="column"
 :row="row">
 <div class="tw-p-3 tw-text-ellipsis tw-text-nowrap tw-overflow-hidden">
 <div
 :style="{ width: width }"
 class="tw-p-3 tw-text-ellipsis tw-text-nowrap tw-overflow-hidden">
 {{ getValue() }}
 </div>
 </slot>
 </template>
 <component
 :is="getComponent()"
 v-else
 :style="{ width: width }"
 v-bind="getParams()"
 :columns="columns"
 :column="column"
Expand All@@ -24,7 +27,7 @@
</template>

<script>
import { defineComponent } from "vue";
import { defineComponent, computed } from "vue";
import { isFunction, get } from "lodash";

export default defineComponent({
Expand DownExpand Up@@ -56,11 +59,21 @@ export default defineComponent({

 const collapseContainer = (value) => emit("toogleContainer", value);

 const index = computed(() => props.columns.findIndex((column) => column.field === props.column.field));

 const width = computed(() => {
 if (index.value === props.columns.length - 1) {
 return "auto";
 }
 return `${props.column.width || 200}px`;
 });

 return {
 getComponent,
 getParams,
 getValue,
 collapseContainer,
 width,
 };
 },
});
Expand Down

15 changes: 12 additions & 3 deletions
resources/jscomposition/base/table/THeader.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
<template>
 <th
 class="tw-relative thead-resizable tw-p-0"
 :style="{ width: width + 'px' }">
 :style="{ width: width }">
 <div
 :style="{ width: width }"
 class="tw-py-3 tw-px-3 tw-text-left tw-text-nowrap tw-whitespace-nowrap tw-overflow-hidden tw-text-ellipsis">
 <slot>
 {{ $t(getValue()) }}
Expand All@@ -22,7 +23,7 @@

<script>
import { isFunction } from "lodash";
import { defineComponent, computed } from "vue";
import { defineComponent, computed, ref } from "vue";
import { columnResizeComposable } from "./composables/columnComposable";

export default defineComponent({
Expand All@@ -39,7 +40,14 @@ export default defineComponent({
 setup(props, { emit }) {
 const columnResize = columnResizeComposable(props.column);

 const width = computed(() => props.column.width || 200);
 const index = computed(() => props.columns.findIndex((column) => column.field === props.column.field));

 const width = computed(() => {
 if (index.value === props.columns.length - 1) {
 return "auto";
 }
 return `${props.column.width || 200}px`;
 });

 const getValue = () => {
 if (isFunction(props.column?.headerFormatter)) {
Expand All@@ -50,6 +58,7 @@ export default defineComponent({
 };
 return {
 getValue,
 index,
 width,
 columnResize,
 };
Expand Down

11 changes: 8 additions & 3 deletions
resources/jscomposition/base/table/composables/columnComposable.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,13 +12,17 @@ export const columnResizeComposable = (column) => {
 const startWidth = ref(0);
 const isResizing = ref(false);

 //Resize the column value
 const minWidth = 144;

 // Resize the column value
 const doResize = (event) => {
 if (isResizing.value) {
 const diff = event.pageX - startX.value;
 const min = 30;
 const min = minWidth;
 const currentWidth = Math.max(min, startWidth.value + diff);

 console.log("doResize", currentWidth);

 column.width = currentWidth;
 }
 };
Expand All@@ -35,7 +39,8 @@ export const columnResizeComposable = (column) => {
 const startResize = (event, index) => {
 isResizing.value = true;
 startX.value = event.pageX;
 startWidth.value = column.width || 200;
 startWidth.value = column.width || minWidth;
 console.log("startResize", startWidth.value);

 document.addEventListener("mousemove", doResize);
 document.addEventListener("mouseup", stopResize);
Expand Down

3 changes: 1 addition & 2 deletions
resources/jscomposition/cases/casesDetail/components/TaskTable.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,7 @@
 :columns="columnsConfig"
 :data="data"
 :placeholder="showPlaceholder"
 @changeFilter="onChangeFilter"
 >
 @changeFilter="onChangeFilter">
 <template #placeholder>
 <TablePlaceholder
 :placeholder="placeholderType"
Expand Down

6 changes: 3 additions & 3 deletions
resources/jscomposition/cases/casesDetail/config/columns.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ const taskNumberColumn = () => ({
 field: "id",
 header: "Tasks #",
 resizable: true,
 width: 100,
 width: 144,
 filter: true,
 formatter: (row, column, columns) => `#${row.id}`,
 cellRenderer: () => ({
Expand DownExpand Up@@ -68,7 +68,7 @@ const dueDateColumn = () => ({
 field: "due_at",
 header: "Due Date",
 resizable: true,
 width: 200,
 width: "auto",
 filter: true,
 formatter: (row, column, columns) => formatDate(row.due_at, "datetime"),
});
Expand DownExpand Up@@ -127,7 +127,7 @@ const startedColumn = () => ({
 header: "Started",
 filter: true,
 resizable: true,
 width: 200,
 width: "auto",
 formatter: (row, column, columns) => formatDate(row.initiated_at, "datetime"),
});

Expand Down

12 changes: 4 additions & 8 deletions
resources/jscomposition/cases/casesMain/CasesDataSection.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,20 +3,17 @@
 <CaseFilter @enter="onChangeSearch" />
 <BadgesSection
 v-model="badgesData"
 @remove="onRemoveBadge"
 />
 @remove="onRemoveBadge" />
 <FilterableTable
 ref="table"
 :columns="columnsConfig"
 :data="data"
 :placeholder="showPlaceholder"
 @changeFilter="onChangeFilter"
 >
 @changeFilter="onChangeFilter">
 <template #placeholder>
 <TablePlaceholder
 :placeholder="placeholderType"
 class="tw-grow"
 />
 class="tw-grow" />
 </template>
 </FilterableTable>
 <Pagination
Expand All@@ -28,8 +25,7 @@
 :page="dataPagination.page"
 :pages="dataPagination.pages"
 @perPage="onPerPage"
 @go="onGo"
 />
 @go="onGo" />
 </div>
</template>
<script setup>
Expand Down

4 changes: 2 additions & 2 deletions
resources/jscomposition/cases/casesMain/config/columns.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ export const caseNumberColumn = () => ({
 field: "case_number",
 header: "Case #",
 resizable: true,
 width: 100,
 width: 144,
 filter: {
 dataType: "string",
 operators: ["=", ">", ">=", "in", "between"],
Expand DownExpand Up@@ -162,7 +162,7 @@ export const completedColumn = () => ({
 field: "completed_at",
 header: "Completed",
 resizable: true,
 width: 200,
 width: "auto",
 formatter: (row, column, columns) => formatDate(row.completed_at, "datetime"),
 filter: {
 dataType: "datetime",
Expand Down

10 changes: 7 additions & 3 deletions
resources/jscomposition/system/table/FilterableTable.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,14 +3,14 @@
 :columns="columns"
 :data="data"
 :placeholder="placeholder"
class="tw-grow"
 >
:config="config"
 class="tw-grow">
 <template
 v-for="(column, index) in columns"
 #[`theader-filter-${column.field}`]>
 <FilterColumn
 :id="column.field"
 v-if="column.filter"
 :id="column.field"
 :key="`default-${index}-${hasFilter(index,column)}`"
 :filter="column.filter"
 :value="getFilter(index, column)"
Expand DownExpand Up@@ -42,6 +42,10 @@ const props = defineProps({
 type: Boolean,
 default: () => false,
 },
 config: {
 type: Object,
 default: () => {},
 },
});

const filters = ref([]);
Expand Down

3 changes: 1 addition & 2 deletions
resources/jscomposition/system/table/SortTable.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,7 @@
 :data="data"
 :config="config"
 :placeholder="placeholder"
 class="tw-grow"
 >
 class="tw-grow">
 <template
 v-for="(column, index) in columns"
 #[`theader-filter-${column.field}`]>
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
FOUR-20598: Horizontal adaptation define a minimum width of the columns#7920

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

pmPaulis
merged 2 commits into

from

Jan 23, 2025
 Merged


FOUR-20598: Horizontal adaptation define a minimum width of the columns
#7920
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
b0db0a1

FOUR-20598: Horizontal adaptation define a minimum width of the columns


hjonathan Jan 21, 2025
f0d4cdc

FOUR-20598: Horizontal adaptation define a minimum width of the columns


hjonathan Jan 23, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 2 additions & 3 deletions
resources/jscomposition/base/table/BaseTable.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
<template>
 <div
 class="tw-w-full tw-relative tw-text-gray-600 tw-text-sm
 tw-border tw-rounded-xl tw-border-gray-300 tw-overflow-hidden tw-overflow-x-auto tw-overflow-y-auto"
 >
 tw-border tw-rounded-xl tw-border-gray-300 tw-overflow-hidden tw-overflow-x-auto tw-overflow-y-auto">
 <table
 class="tw-w-full tw-border-collapse"
 :class="{
Expand DownExpand Up@@ -86,7 +85,7 @@ import TCell from "./TCell.vue";
import ContainerRow from "./ContainerRow.vue";

const defaultConfig = () => ({
 tableFixed: true,
 tableFixed: false,
});

export default defineComponent({
Expand Down

19 changes: 16 additions & 3 deletions
resources/jscomposition/base/table/TCell.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
<template>
 <td
 class="tw-relative tw-p-0"
 :style="{ width: `${column.width}px` }">
 :style="{ width: width }">
 <template v-if="!column.cellRenderer">
 <slot
 :columns="columns"
 :column="column"
 :row="row">
 <div class="tw-p-3 tw-text-ellipsis tw-text-nowrap tw-overflow-hidden">
 <div
 :style="{ width: width }"
 class="tw-p-3 tw-text-ellipsis tw-text-nowrap tw-overflow-hidden">
 {{ getValue() }}
 </div>
 </slot>
 </template>
 <component
 :is="getComponent()"
 v-else
 :style="{ width: width }"
 v-bind="getParams()"
 :columns="columns"
 :column="column"
Expand All@@ -24,7 +27,7 @@
</template>

<script>
import { defineComponent } from "vue";
import { defineComponent, computed } from "vue";
import { isFunction, get } from "lodash";

export default defineComponent({
Expand DownExpand Up@@ -56,11 +59,21 @@ export default defineComponent({

 const collapseContainer = (value) => emit("toogleContainer", value);

 const index = computed(() => props.columns.findIndex((column) => column.field === props.column.field));

 const width = computed(() => {
 if (index.value === props.columns.length - 1) {
 return "auto";
 }
 return `${props.column.width || 200}px`;
 });

 return {
 getComponent,
 getParams,
 getValue,
 collapseContainer,
 width,
 };
 },
});
Expand Down

15 changes: 12 additions & 3 deletions
resources/jscomposition/base/table/THeader.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
<template>
 <th
 class="tw-relative thead-resizable tw-p-0"
 :style="{ width: width + 'px' }">
 :style="{ width: width }">
 <div
 :style="{ width: width }"
 class="tw-py-3 tw-px-3 tw-text-left tw-text-nowrap tw-whitespace-nowrap tw-overflow-hidden tw-text-ellipsis">
 <slot>
 {{ $t(getValue()) }}
Expand All@@ -22,7 +23,7 @@

<script>
import { isFunction } from "lodash";
import { defineComponent, computed } from "vue";
import { defineComponent, computed, ref } from "vue";
import { columnResizeComposable } from "./composables/columnComposable";

export default defineComponent({
Expand All@@ -39,7 +40,14 @@ export default defineComponent({
 setup(props, { emit }) {
 const columnResize = columnResizeComposable(props.column);

 const width = computed(() => props.column.width || 200);
 const index = computed(() => props.columns.findIndex((column) => column.field === props.column.field));

 const width = computed(() => {
 if (index.value === props.columns.length - 1) {
 return "auto";
 }
 return `${props.column.width || 200}px`;
 });

 const getValue = () => {
 if (isFunction(props.column?.headerFormatter)) {
Expand All@@ -50,6 +58,7 @@ export default defineComponent({
 };
 return {
 getValue,
 index,
 width,
 columnResize,
 };
Expand Down

11 changes: 8 additions & 3 deletions
resources/jscomposition/base/table/composables/columnComposable.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,13 +12,17 @@ export const columnResizeComposable = (column) => {
 const startWidth = ref(0);
 const isResizing = ref(false);

 //Resize the column value
 const minWidth = 144;

 // Resize the column value
 const doResize = (event) => {
 if (isResizing.value) {
 const diff = event.pageX - startX.value;
 const min = 30;
 const min = minWidth;
 const currentWidth = Math.max(min, startWidth.value + diff);

 console.log("doResize", currentWidth);

 column.width = currentWidth;
 }
 };
Expand All@@ -35,7 +39,8 @@ export const columnResizeComposable = (column) => {
 const startResize = (event, index) => {
 isResizing.value = true;
 startX.value = event.pageX;
 startWidth.value = column.width || 200;
 startWidth.value = column.width || minWidth;
 console.log("startResize", startWidth.value);

 document.addEventListener("mousemove", doResize);
 document.addEventListener("mouseup", stopResize);
Expand Down

3 changes: 1 addition & 2 deletions
resources/jscomposition/cases/casesDetail/components/TaskTable.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,7 @@
 :columns="columnsConfig"
 :data="data"
 :placeholder="showPlaceholder"
 @changeFilter="onChangeFilter"
 >
 @changeFilter="onChangeFilter">
 <template #placeholder>
 <TablePlaceholder
 :placeholder="placeholderType"
Expand Down

6 changes: 3 additions & 3 deletions
resources/jscomposition/cases/casesDetail/config/columns.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ const taskNumberColumn = () => ({
 field: "id",
 header: "Tasks #",
 resizable: true,
 width: 100,
 width: 144,
 filter: true,
 formatter: (row, column, columns) => `#${row.id}`,
 cellRenderer: () => ({
Expand DownExpand Up@@ -68,7 +68,7 @@ const dueDateColumn = () => ({
 field: "due_at",
 header: "Due Date",
 resizable: true,
 width: 200,
 width: "auto",
 filter: true,
 formatter: (row, column, columns) => formatDate(row.due_at, "datetime"),
});
Expand DownExpand Up@@ -127,7 +127,7 @@ const startedColumn = () => ({
 header: "Started",
 filter: true,
 resizable: true,
 width: 200,
 width: "auto",
 formatter: (row, column, columns) => formatDate(row.initiated_at, "datetime"),
});

Expand Down

12 changes: 4 additions & 8 deletions
resources/jscomposition/cases/casesMain/CasesDataSection.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,20 +3,17 @@
 <CaseFilter @enter="onChangeSearch" />
 <BadgesSection
 v-model="badgesData"
 @remove="onRemoveBadge"
 />
 @remove="onRemoveBadge" />
 <FilterableTable
 ref="table"
 :columns="columnsConfig"
 :data="data"
 :placeholder="showPlaceholder"
 @changeFilter="onChangeFilter"
 >
 @changeFilter="onChangeFilter">
 <template #placeholder>
 <TablePlaceholder
 :placeholder="placeholderType"
 class="tw-grow"
 />
 class="tw-grow" />
 </template>
 </FilterableTable>
 <Pagination
Expand All@@ -28,8 +25,7 @@
 :page="dataPagination.page"
 :pages="dataPagination.pages"
 @perPage="onPerPage"
 @go="onGo"
 />
 @go="onGo" />
 </div>
</template>
<script setup>
Expand Down

4 changes: 2 additions & 2 deletions
resources/jscomposition/cases/casesMain/config/columns.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ export const caseNumberColumn = () => ({
 field: "case_number",
 header: "Case #",
 resizable: true,
 width: 100,
 width: 144,
 filter: {
 dataType: "string",
 operators: ["=", ">", ">=", "in", "between"],
Expand DownExpand Up@@ -162,7 +162,7 @@ export const completedColumn = () => ({
 field: "completed_at",
 header: "Completed",
 resizable: true,
 width: 200,
 width: "auto",
 formatter: (row, column, columns) => formatDate(row.completed_at, "datetime"),
 filter: {
 dataType: "datetime",
Expand Down

10 changes: 7 additions & 3 deletions
resources/jscomposition/system/table/FilterableTable.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,14 +3,14 @@
 :columns="columns"
 :data="data"
 :placeholder="placeholder"
class="tw-grow"
 >
:config="config"
 class="tw-grow">
 <template
 v-for="(column, index) in columns"
 #[`theader-filter-${column.field}`]>
 <FilterColumn
 :id="column.field"
 v-if="column.filter"
 :id="column.field"
 :key="`default-${index}-${hasFilter(index,column)}`"
 :filter="column.filter"
 :value="getFilter(index, column)"
Expand DownExpand Up@@ -42,6 +42,10 @@ const props = defineProps({
 type: Boolean,
 default: () => false,
 },
 config: {
 type: Object,
 default: () => {},
 },
});

const filters = ref([]);
Expand Down

3 changes: 1 addition & 2 deletions
resources/jscomposition/system/table/SortTable.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,7 @@
 :data="data"
 :config="config"
 :placeholder="placeholder"
 class="tw-grow"
 >
 class="tw-grow">
 <template
 v-for="(column, index) in columns"
 #[`theader-filter-${column.field}`]>
Expand Down