diff --git a/modules/travel/front/extra-community/index.html b/modules/travel/front/extra-community/index.html index fbf982b68..5174f8da2 100644 --- a/modules/travel/front/extra-community/index.html +++ b/modules/travel/front/extra-community/index.html @@ -100,38 +100,37 @@ {{::travel.id}} - + {{::travel.cargoSupplierNickname}} - {{::travel.agencyModeName}} - - - + {{::travel.agencyModeName}} + + + {{travel.ref}} + + + + + {{::travel.stickers}} - - - + + + {{travel.kg}} + + + + + {{::travel.loadedKg}} {{::travel.volumeKg}} @@ -151,7 +150,7 @@ {{::entry.id}} - + diff --git a/modules/travel/front/extra-community/style.scss b/modules/travel/front/extra-community/style.scss index 4b0dd6b22..fb64822f9 100644 --- a/modules/travel/front/extra-community/style.scss +++ b/modules/travel/front/extra-community/style.scss @@ -3,7 +3,6 @@ vn-travel-extra-community { .header { margin-bottom: 16px; - font-size: 1.1rem; line-height: 1; padding: 7px; padding-bottom: 7px; @@ -16,6 +15,10 @@ vn-travel-extra-community { overflow: hidden; text-overflow: ellipsis; cursor: pointer; + .multi-line{ + padding-top: 15px; + padding-bottom: 15px; + } } table[vn-droppable] { @@ -46,16 +49,19 @@ vn-travel-extra-community { font-weight: bold; } - .td-editable { + + .multi-line{ max-width: 200px; + word-wrap: normal; + white-space: normal; } - vn-input-number.number { - min-width: 100px; - padding-right: 10px; - } - - .number * { - text-align: center; + vn-td-editable text { + background-color: transparent; + padding: 0; + border: 0; + border-bottom: 1px dashed $color-active; + border-radius: 0; + color: $color-active } } diff --git a/modules/zone/back/methods/zone/getLeaves.js b/modules/zone/back/methods/zone/getLeaves.js index db17beb1b..ed421e339 100644 --- a/modules/zone/back/methods/zone/getLeaves.js +++ b/modules/zone/back/methods/zone/getLeaves.js @@ -59,7 +59,10 @@ module.exports = Self => { } const leaves = map.get(parentId); - setLeaves(leaves); + + const maxNodes = 250; + if (res.length <= maxNodes) + setLeaves(leaves); return leaves || []; };