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; }