From 0cb66ffaa5be092771775628bd683d7c8532583d Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 5 Jul 2024 22:36:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A1=B9=E7=9B=AE=E9=9A=90?= =?UTF-8?q?=E8=97=8F=E7=9C=81=E7=95=A5=E5=8F=B7=E5=92=8C=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E8=A1=8C=E9=AB=98=E5=86=B2=E7=AA=81=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/item/components/AppxItemList.vue | 13 +++++++++++++ src/pages/item/components/List.vue | 12 ++++++++++++ src/pages/item/components/StartMenuItemList.vue | 13 +++++++++++++ src/pages/item/components/SystemItemList.vue | 13 +++++++++++++ src/styles/style.css | 3 --- 5 files changed, 51 insertions(+), 3 deletions(-) diff --git a/src/pages/item/components/AppxItemList.vue b/src/pages/item/components/AppxItemList.vue index c6a20c7..0be679e 100644 --- a/src/pages/item/components/AppxItemList.vue +++ b/src/pages/item/components/AppxItemList.vue @@ -65,6 +65,19 @@ : 'item-name-tile-1' }`, ]" + :style="{ + fontSize: store.setting.item.fontSize + 'px', + fontWeight: store.setting.item.fontWeight, + lineHeight: store.setting.item.fontLineHeight + 'rem', + maxHeight: + store.setting.item.itemNameRowCount == 2 + ? store.setting.item.hideEllipsis + ? store.setting.item.fontLineHeight * 2 + 'rem' + : undefined + : store.setting.item.hideEllipsis + ? store.setting.item.fontLineHeight * 1 + 'rem' + : undefined, + }" > {{ item.name }}

diff --git a/src/pages/item/components/List.vue b/src/pages/item/components/List.vue index 4479b39..e56bd67 100644 --- a/src/pages/item/components/List.vue +++ b/src/pages/item/components/List.vue @@ -60,6 +60,18 @@ : undefined, fontWeight: store.setting.item.fontWeight, lineHeight: store.setting.item.fontLineHeight + 'rem', + maxHeight: + getLayout(classificationId) === 'list' + ? store.setting.item.hideEllipsis + ? store.setting.item.fontLineHeight * 1 + 'rem' + : undefined + : store.setting.item.itemNameRowCount === 2 + ? store.setting.item.hideEllipsis + ? store.setting.item.fontLineHeight * 2 + 'rem' + : undefined + : store.setting.item.hideEllipsis + ? store.setting.item.fontLineHeight * 1 + 'rem' + : undefined, }" v-if="!store.setting.item.hideItemName" > diff --git a/src/pages/item/components/StartMenuItemList.vue b/src/pages/item/components/StartMenuItemList.vue index 9e2b123..884e415 100644 --- a/src/pages/item/components/StartMenuItemList.vue +++ b/src/pages/item/components/StartMenuItemList.vue @@ -65,6 +65,19 @@ : 'item-name-tile-1' }`, ]" + :style="{ + fontSize: store.setting.item.fontSize + 'px', + fontWeight: store.setting.item.fontWeight, + lineHeight: store.setting.item.fontLineHeight + 'rem', + maxHeight: + store.setting.item.itemNameRowCount == 2 + ? store.setting.item.hideEllipsis + ? store.setting.item.fontLineHeight * 2 + 'rem' + : undefined + : store.setting.item.hideEllipsis + ? store.setting.item.fontLineHeight * 1 + 'rem' + : undefined, + }" > {{ item.name }}

diff --git a/src/pages/item/components/SystemItemList.vue b/src/pages/item/components/SystemItemList.vue index 2289543..34062b9 100644 --- a/src/pages/item/components/SystemItemList.vue +++ b/src/pages/item/components/SystemItemList.vue @@ -66,6 +66,19 @@ : 'item-name-tile-1' }`, ]" + :style="{ + fontSize: store.setting.item.fontSize + 'px', + fontWeight: store.setting.item.fontWeight, + lineHeight: store.setting.item.fontLineHeight + 'rem', + maxHeight: + store.setting.item.itemNameRowCount == 2 + ? store.setting.item.hideEllipsis + ? store.setting.item.fontLineHeight * 2 + 'rem' + : undefined + : store.setting.item.hideEllipsis + ? store.setting.item.fontLineHeight * 1 + 'rem' + : undefined, + }" > {{ item.name }}

diff --git a/src/styles/style.css b/src/styles/style.css index 7deea5c..7703c59 100644 --- a/src/styles/style.css +++ b/src/styles/style.css @@ -85,7 +85,6 @@ input::-webkit-inner-spin-button { } .item-name-tile-2-no-ellipsis { - max-height: 40px; word-break: break-word; overflow: hidden; } @@ -101,7 +100,6 @@ input::-webkit-inner-spin-button { } .item-name-tile-1-no-ellipsis { - max-height: 20px; word-break: break-all; overflow: hidden; } @@ -117,7 +115,6 @@ input::-webkit-inner-spin-button { } .item-name-list-no-ellipsis { - max-height: 20px; word-break: break-all; overflow: hidden; }