Skip to content

FOUR-20631: Update the row height #7921

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 21, 2025
Merged

FOUR-20631: Update the row height #7921

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c48ea7
FOUR-20631: Update the row height
hjonathan Jan 21, 2025
ed61c8f
FOUR-20631: Update the row height
hjonathan Jan 21, 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
Next Next commit
FOUR-20631: Update the row height
  • Loading branch information
@hjonathan
hjonathan committed Jan 21, 2025
commit 8c48ea7afe76ae3a1185818bfd758d496462e306
2 changes: 1 addition & 1 deletion resources/jscomposition/base/table/TCell.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<td
class="tw-relative"
class="tw-relative tw-p-0"
:style="{ width: `${column.width}px` }">
<template v-if="!column.cellRenderer">
<slot
Expand Down
4 changes: 2 additions & 2 deletions resources/jscomposition/base/table/THeader.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<template>
<th
class="tw-relative thead-resizable"
class="tw-relative thead-resizable tw-p-0"
:style="{ width: width + 'px' }">
<div
class="tw-py-4 tw-px-3 tw-text-left tw-text-nowrap tw-whitespace-nowrap tw-overflow-hidden tw-text-ellipsis">
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()) }}
</slot>
Expand Down
12 changes: 4 additions & 8 deletions resources/jscomposition/system/table/cell/CaseTitleCell.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,18 @@
<a
v-if="href !== null"
class="hover:tw-text-blue-400 tw-text-gray-500"
:href="href(row)"
>
:href="href(row)">
<case-title
:title="row.case_title_formatted"
:default-value="getValue()"
/>
:default-value="getValue()" />
</a>
<span
v-else
class="hover:tw-text-blue-400 tw-text-gray-500 hover:tw-cursor-pointer"
@click.prevent="onClick"
>
@click.prevent="onClick">
<case-title
:title="row.case_title_formatted"
:default-value="getValue()"
/>
:default-value="getValue()" />
</span>
</div>
</template>
Expand Down
9 changes: 3 additions & 6 deletions resources/jscomposition/system/table/cell/LinkCell.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,16 @@
<template>
<div
class="tw-text-nowrap tw-whitespace-nowrap tw-overflow-hidden tw-text-ellipsis tw-p-3"
>
class="tw-text-nowrap tw-whitespace-nowrap tw-overflow-hidden tw-text-ellipsis tw-p-3">
<a
v-if="href !== null"
class="hover:tw-text-blue-400 tw-text-gray-500"
:href="href(row)"
>
:href="href(row)">
{{ getValue() }}
</a>
<span
v-else
class="hover:tw-text-blue-400 tw-text-gray-500 hover:tw-cursor-pointer"
@click.prevent="onClick"
>
@click.prevent="onClick">
{{ getValue() }}
</span>
</div>
Expand Down
12 changes: 4 additions & 8 deletions resources/jscomposition/system/table/cell/TruncatedColumn.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,26 +11,22 @@
v-model="show"
:hover="false"
position="bottom"
class="!tw-absolute tw-right-0 tw-top-0 tw-h-full tw-flex tw-items-center"
>
class="!tw-absolute tw-right-0 tw-top-0 tw-h-full tw-flex tw-items-center">
<div
class="tw-self-center tw-px-2 tw-rounded-md hover:tw-cursor-pointer hover:tw-bg-gray-200 tw-bg-white "
@click.prevent="onClick"
>
@click.prevent="onClick">
<i class="fas fa-ellipsis-v" />
</div>

<template #content>
<ul
class="tw-bg-white tw-list-none tw-text-gray-600
tw-overflow-hidden tw-rounded-lg tw-w-50 tw-text-sm tw-border tw-border-gray-300"
>
tw-overflow-hidden tw-rounded-lg tw-w-50 tw-text-sm tw-border tw-border-gray-300">
<template v-for="(option, index) in optionsModel">
<li
v-if="index > 0"
:key="index"
class="hover:tw-bg-gray-100"
>
class="hover:tw-bg-gray-100">
<span class="tw-flex tw-py-2 tw-px-4 transition duration-300">
{{ getValueOption(option, index) }}
</span>
Expand Down
24 changes: 8 additions & 16 deletions resources/jscomposition/system/table/cell/TruncatedOptionsCell.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,14 @@
<a
v-if="href !== null"
class="hover:tw-text-blue-400 tw-text-gray-500"
:href="href(optionsModel[0])"
>
:href="href(optionsModel[0])">
{{ getValueOption(optionsModel[0], 0) }}
</a>
<span
v-else
class="hover:tw-text-blue-400 tw-text-gray-500 hover:tw-cursor-pointer"
href="#"
@click.prevent.stop="onClickOption(optionsModel[0], 0)"
>
@click.prevent.stop="onClickOption(optionsModel[0], 0)">
{{ getValueOption(optionsModel[0], 0) }}
</span>
</div>
Expand All @@ -24,37 +22,31 @@
v-model="show"
:hover="false"
position="bottom"
class="!tw-absolute tw-right-0 tw-top-0 tw-h-full tw-flex tw-items-center"
>
class="!tw-absolute tw-right-0 tw-top-0 tw-h-full tw-flex tw-items-center">
<div
class="tw-self-center tw-px-2 tw-rounded-md hover:tw-cursor-pointer hover:tw-bg-gray-200 tw-bg-white "
@click.prevent="onClick"
>
@click.prevent="onClick">
<i class="fas fa-ellipsis-v" />
</div>
<template #content>
<ul
class="tw-bg-white tw-list-none tw-text-gray-600
tw-overflow-hidden tw-rounded-lg tw-w-50 tw-text-sm tw-border tw-border-gray-300"
>
tw-overflow-hidden tw-rounded-lg tw-w-50 tw-text-sm tw-border tw-border-gray-300">
<template v-for="(option, index) in optionsModel">
<li
v-if="index > 0"
:key="index"
class="hover:tw-bg-gray-100"
>
class="hover:tw-bg-gray-100">
<a
v-if="href !== null"
class="tw-flex tw-py-2 tw-px-4 transition duration-300 tw-text-gray-500 hover:tw-bg-gray-200 hover:tw-text-blue-400"
:href="href(option)"
>
:href="href(option)">
{{ getValueOption(option, index) }}
</a>
<span
v-else
class="tw-flex tw-py-2 tw-px-4 transition duration-300 hover:tw-bg-gray-200 hover:tw-cursor-pointer"
@click.prevent.stop="onClickOption(option, index)"
>
@click.prevent.stop="onClickOption(option, index)">
{{ getValueOption(option, index) }}
</span>
</li>
Expand Down