From 589582f0eb2879a7852e0919f543e5b509e4baaa Mon Sep 17 00:00:00 2001 From: jcollier Date: Wed, 3 Apr 2024 10:56:06 -0400 Subject: [PATCH 01/49] fix #5518: prevent erros thrown by ScrollPanel loading in some cases --- components/lib/scrollpanel/ScrollPanel.vue | 32 ++++++++++++---------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/components/lib/scrollpanel/ScrollPanel.vue b/components/lib/scrollpanel/ScrollPanel.vue index 99f315991..c4515d01d 100644 --- a/components/lib/scrollpanel/ScrollPanel.vue +++ b/components/lib/scrollpanel/ScrollPanel.vue @@ -129,22 +129,26 @@ export default { this.scrollYRatio = ownHeight / totalHeight; this.frame = this.requestAnimationFrame(() => { - if (this.scrollXRatio >= 1) { - this.$refs.xBar.setAttribute('data-p-scrollpanel-hidden', 'true'); - !this.isUnstyled && DomHandler.addClass(this.$refs.xBar, 'p-scrollpanel-hidden'); - } else { - this.$refs.xBar.setAttribute('data-p-scrollpanel-hidden', 'false'); - !this.isUnstyled && DomHandler.removeClass(this.$refs.xBar, 'p-scrollpanel-hidden'); - this.$refs.xBar.style.cssText = 'width:' + Math.max(this.scrollXRatio * 100, 10) + '%; left:' + (this.$refs.content.scrollLeft / totalWidth) * 100 + '%;bottom:' + bottom + 'px;'; + if (this.$refs.xBar) { + if (this.scrollXRatio >= 1) { + this.$refs.xBar.setAttribute('data-p-scrollpanel-hidden', 'true'); + !this.isUnstyled && DomHandler.addClass(this.$refs.xBar, 'p-scrollpanel-hidden'); + } else { + this.$refs.xBar.setAttribute('data-p-scrollpanel-hidden', 'false'); + !this.isUnstyled && DomHandler.removeClass(this.$refs.xBar, 'p-scrollpanel-hidden'); + this.$refs.xBar.style.cssText = 'width:' + Math.max(this.scrollXRatio * 100, 10) + '%; left:' + (this.$refs.content.scrollLeft / totalWidth) * 100 + '%;bottom:' + bottom + 'px;'; + } } - if (this.scrollYRatio >= 1) { - this.$refs.yBar.setAttribute('data-p-scrollpanel-hidden', 'true'); - !this.isUnstyled && DomHandler.addClass(this.$refs.yBar, 'p-scrollpanel-hidden'); - } else { - this.$refs.yBar.setAttribute('data-p-scrollpanel-hidden', 'false'); - !this.isUnstyled && DomHandler.removeClass(this.$refs.yBar, 'p-scrollpanel-hidden'); - this.$refs.yBar.style.cssText = 'height:' + Math.max(this.scrollYRatio * 100, 10) + '%; top: calc(' + (this.$refs.content.scrollTop / totalHeight) * 100 + '% - ' + this.$refs.xBar.clientHeight + 'px);right:' + right + 'px;'; + if (this.$refs.yBar) { + if (this.scrollYRatio >= 1) { + this.$refs.yBar.setAttribute('data-p-scrollpanel-hidden', 'true'); + !this.isUnstyled && DomHandler.addClass(this.$refs.yBar, 'p-scrollpanel-hidden'); + } else { + this.$refs.yBar.setAttribute('data-p-scrollpanel-hidden', 'false'); + !this.isUnstyled && DomHandler.removeClass(this.$refs.yBar, 'p-scrollpanel-hidden'); + this.$refs.yBar.style.cssText = 'height:' + Math.max(this.scrollYRatio * 100, 10) + '%; top: calc(' + (this.$refs.content.scrollTop / totalHeight) * 100 + '% - ' + this.$refs.xBar.clientHeight + 'px);right:' + right + 'px;'; + } } }); } From e31e2bd9830fc6fc50e1c4339ef0e4e695187f54 Mon Sep 17 00:00:00 2001 From: Franco Lucchini Date: Thu, 4 Apr 2024 06:44:17 +0200 Subject: [PATCH 02/49] Fix TreeTable not using filterField --- components/lib/treetable/TreeTable.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/lib/treetable/TreeTable.vue b/components/lib/treetable/TreeTable.vue index 9ec3a677f..71a93cd0e 100755 --- a/components/lib/treetable/TreeTable.vue +++ b/components/lib/treetable/TreeTable.vue @@ -494,12 +494,12 @@ export default { for (let j = 0; j < this.columns.length; j++) { let col = this.columns[j]; - let filterField = this.columnProp(col, 'field'); + let filterField = this.columnProp(col, 'filterField') || this.columnProp(col, 'field'); //local - if (Object.prototype.hasOwnProperty.call(this.filters, this.columnProp(col, 'field'))) { + if (Object.prototype.hasOwnProperty.call(this.filters, filterField)) { let filterMatchMode = this.columnProp(col, 'filterMatchMode') || 'startsWith'; - let filterValue = this.filters[this.columnProp(col, 'field')]; + let filterValue = this.filters[filterField]; let filterConstraint = FilterService.filters[filterMatchMode]; let paramsWithoutNode = { filterField, filterValue, filterConstraint, strict }; From 608ceae956013fdc05c605588cf2b36acbad895a Mon Sep 17 00:00:00 2001 From: Rainer Eli Date: Tue, 9 Apr 2024 10:25:52 -0600 Subject: [PATCH 03/49] Update StyledDoc.vue --- doc/dropdown/theming/StyledDoc.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/dropdown/theming/StyledDoc.vue b/doc/dropdown/theming/StyledDoc.vue index fb151e889..258841c38 100644 --- a/doc/dropdown/theming/StyledDoc.vue +++ b/doc/dropdown/theming/StyledDoc.vue @@ -55,6 +55,10 @@ p-focus Container element when it is in focus. + + p-highlight + Container element when it is selected. + From 84bbb330453dc36075b4c90272cc41df6963bb2a Mon Sep 17 00:00:00 2001 From: Melloware Date: Wed, 10 Apr 2024 07:43:44 -0400 Subject: [PATCH 04/49] Update InputNumber.vue --- components/lib/inputnumber/InputNumber.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/lib/inputnumber/InputNumber.vue b/components/lib/inputnumber/InputNumber.vue index f0ec6d5c9..adc2e2e16 100755 --- a/components/lib/inputnumber/InputNumber.vue +++ b/components/lib/inputnumber/InputNumber.vue @@ -376,7 +376,7 @@ export default { return; } - if (event.shiftKey || event.altKey || event.ctrlKey || event.metaKey) { + if (event.altKey || event.ctrlKey || event.metaKey) { this.isSpecialChar = true; return; From 6a8ea1875d39c2fb0948038fb299565fe654ad0a Mon Sep 17 00:00:00 2001 From: i7slegend Date: Wed, 10 Apr 2024 20:00:57 +0300 Subject: [PATCH 05/49] fix(#5562): support style for submenuHeader in Menu --- components/lib/menu/Menu.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/lib/menu/Menu.vue b/components/lib/menu/Menu.vue index ece3fa078..392c30acb 100644 --- a/components/lib/menu/Menu.vue +++ b/components/lib/menu/Menu.vue @@ -21,7 +21,7 @@ > @@ -17,13 +16,11 @@ export default { code: { basic: ` - `, options: ` @@ -39,9 +36,8 @@ export default { `, composition: ` From f3c71bcfc1c66fee0effab5d18fc3fe9936e3248 Mon Sep 17 00:00:00 2001 From: xujiangyang Date: Fri, 19 Apr 2024 17:21:20 +0800 Subject: [PATCH 14/49] fix: #5433 add formattedValue type --- components/lib/inputnumber/InputNumber.d.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/components/lib/inputnumber/InputNumber.d.ts b/components/lib/inputnumber/InputNumber.d.ts index 8e4fb37db..5f63b130c 100755 --- a/components/lib/inputnumber/InputNumber.d.ts +++ b/components/lib/inputnumber/InputNumber.d.ts @@ -71,6 +71,10 @@ export interface InputNumberInputEvent { * New value */ value: string | number | undefined; + /** + * currentValue + */ + formattedValue: string; } /** @@ -86,6 +90,10 @@ export interface InputNumberBlurEvent { * Input value */ value: string; + /** + * currentValue + */ + formattedValue: string; } /** From b4a6eb17ef050f4079911b63cbef021415ced829 Mon Sep 17 00:00:00 2001 From: GitHub Actions Bot <> Date: Fri, 19 Apr 2024 09:36:04 +0000 Subject: [PATCH 15/49] Code Format --- components/lib/scrollpanel/ScrollPanel.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/components/lib/scrollpanel/ScrollPanel.vue b/components/lib/scrollpanel/ScrollPanel.vue index c4515d01d..6924933a2 100644 --- a/components/lib/scrollpanel/ScrollPanel.vue +++ b/components/lib/scrollpanel/ScrollPanel.vue @@ -147,7 +147,8 @@ export default { } else { this.$refs.yBar.setAttribute('data-p-scrollpanel-hidden', 'false'); !this.isUnstyled && DomHandler.removeClass(this.$refs.yBar, 'p-scrollpanel-hidden'); - this.$refs.yBar.style.cssText = 'height:' + Math.max(this.scrollYRatio * 100, 10) + '%; top: calc(' + (this.$refs.content.scrollTop / totalHeight) * 100 + '% - ' + this.$refs.xBar.clientHeight + 'px);right:' + right + 'px;'; + this.$refs.yBar.style.cssText = + 'height:' + Math.max(this.scrollYRatio * 100, 10) + '%; top: calc(' + (this.$refs.content.scrollTop / totalHeight) * 100 + '% - ' + this.$refs.xBar.clientHeight + 'px);right:' + right + 'px;'; } } }); From eb1228749aaab929a39a50d1feca49f4312ef811 Mon Sep 17 00:00:00 2001 From: xujiangyang Date: Fri, 19 Apr 2024 17:54:28 +0800 Subject: [PATCH 16/49] fix: #5433 InputNumberBlurEvent not type formattedValue --- components/lib/inputnumber/InputNumber.d.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/components/lib/inputnumber/InputNumber.d.ts b/components/lib/inputnumber/InputNumber.d.ts index 5f63b130c..4b2edde7f 100755 --- a/components/lib/inputnumber/InputNumber.d.ts +++ b/components/lib/inputnumber/InputNumber.d.ts @@ -90,10 +90,6 @@ export interface InputNumberBlurEvent { * Input value */ value: string; - /** - * currentValue - */ - formattedValue: string; } /** From f57a90eb5119ac7343198d698d744df1ce06f9e3 Mon Sep 17 00:00:00 2001 From: carldenigma Date: Fri, 19 Apr 2024 11:16:23 +0100 Subject: [PATCH 17/49] #5618 - Updated AutoComplete to allow form submission using return --- components/lib/autocomplete/AutoComplete.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/components/lib/autocomplete/AutoComplete.vue b/components/lib/autocomplete/AutoComplete.vue index 0f79b35af..945e35ee5 100755 --- a/components/lib/autocomplete/AutoComplete.vue +++ b/components/lib/autocomplete/AutoComplete.vue @@ -617,16 +617,14 @@ export default { onEnterKey(event) { if (!this.overlayVisible) { this.focusedOptionIndex = -1; // reset - this.onArrowDownKey(event); } else { if (this.focusedOptionIndex !== -1) { this.onOptionSelect(event, this.visibleOptions[this.focusedOptionIndex]); + event.preventDefault(); } this.hide(); } - - event.preventDefault(); }, onEscapeKey(event) { this.overlayVisible && this.hide(true); From b15719071e58d2388f358f846cd78e0957878528 Mon Sep 17 00:00:00 2001 From: GitHub Actions Bot <> Date: Fri, 19 Apr 2024 11:34:59 +0000 Subject: [PATCH 18/49] Update API doc --- doc/common/apidoc/index.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/doc/common/apidoc/index.json b/doc/common/apidoc/index.json index 70cfec2fb..8b5d15554 100644 --- a/doc/common/apidoc/index.json +++ b/doc/common/apidoc/index.json @@ -31398,6 +31398,14 @@ "type": "undefined | string | number", "default": "", "description": "New value" + }, + { + "name": "formattedValue", + "optional": false, + "readonly": false, + "type": "string", + "default": "", + "description": "currentValue" } ], "methods": [] From 63b5ca752313df159b0a69ae7e6a45a5806bf7e5 Mon Sep 17 00:00:00 2001 From: GitHub Actions Bot <> Date: Fri, 19 Apr 2024 11:47:39 +0000 Subject: [PATCH 19/49] Code Format --- components/lib/sidebar/BaseSidebar.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/lib/sidebar/BaseSidebar.vue b/components/lib/sidebar/BaseSidebar.vue index 773397a56..77ee5b83e 100644 --- a/components/lib/sidebar/BaseSidebar.vue +++ b/components/lib/sidebar/BaseSidebar.vue @@ -61,6 +61,6 @@ export default { this.unbindOutsideClickListener(); } } - }, + } }; From d1a26a2bdbbf71835ea5e9fa378d8cf2a5ea6462 Mon Sep 17 00:00:00 2001 From: GitHub Actions Bot <> Date: Fri, 19 Apr 2024 11:52:56 +0000 Subject: [PATCH 20/49] Code Format --- components/lib/calendar/Calendar.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/components/lib/calendar/Calendar.vue b/components/lib/calendar/Calendar.vue index 6d7bb7b45..53414b618 100755 --- a/components/lib/calendar/Calendar.vue +++ b/components/lib/calendar/Calendar.vue @@ -1162,9 +1162,7 @@ export default { let date = new Date(dateMeta.year, dateMeta.month, dateMeta.day); if (this.showTime) { - (this.hourFormat === '12' && this.currentHour !== 12 && this.pm) ? - date.setHours(this.currentHour + 12) : - date.setHours(this.currentHour); + this.hourFormat === '12' && this.currentHour !== 12 && this.pm ? date.setHours(this.currentHour + 12) : date.setHours(this.currentHour); date.setMinutes(this.currentMinute); date.setSeconds(this.currentSecond); From b0b91c2050f8adaa5dac83d0472db187669cc654 Mon Sep 17 00:00:00 2001 From: tugcekucukoglu Date: Fri, 19 Apr 2024 15:11:30 +0300 Subject: [PATCH 21/49] Fixed #5618 - AutoComplete: Enter does not submit form --- components/lib/autocomplete/AutoComplete.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/lib/autocomplete/AutoComplete.vue b/components/lib/autocomplete/AutoComplete.vue index 945e35ee5..8a7a5b3a7 100755 --- a/components/lib/autocomplete/AutoComplete.vue +++ b/components/lib/autocomplete/AutoComplete.vue @@ -617,10 +617,10 @@ export default { onEnterKey(event) { if (!this.overlayVisible) { this.focusedOptionIndex = -1; // reset + this.onArrowDownKey(event); } else { if (this.focusedOptionIndex !== -1) { this.onOptionSelect(event, this.visibleOptions[this.focusedOptionIndex]); - event.preventDefault(); } this.hide(); From 169a9af8eb515047d1ba69cba6d8aa295d4f4321 Mon Sep 17 00:00:00 2001 From: tugcekucukoglu Date: Fri, 19 Apr 2024 15:28:49 +0300 Subject: [PATCH 22/49] Fixed #5599 - Menu / Stepper: Pass Through Unstyled Mode --- components/lib/menu/Menu.vue | 15 ++++++++++++++- components/lib/stepper/Stepper.vue | 3 +++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/components/lib/menu/Menu.vue b/components/lib/menu/Menu.vue index a0efcd476..9f4c4f9ad 100644 --- a/components/lib/menu/Menu.vue +++ b/components/lib/menu/Menu.vue @@ -31,6 +31,7 @@ :item="child" :templates="$slots" :focusedOptionId="focusedOptionId" + :unstyled="unstyled" @item-click="itemClick" @item-mousemove="itemMouseMove" :pt="pt" @@ -39,7 +40,19 @@
  • - +
    diff --git a/components/lib/stepper/Stepper.vue b/components/lib/stepper/Stepper.vue index 7ba3d49cf..f4d760542 100644 --- a/components/lib/stepper/Stepper.vue +++ b/components/lib/stepper/Stepper.vue @@ -31,6 +31,7 @@ :clickCallback="(event) => onItemClick(event, index)" :getStepPT="getStepPT" :getStepProp="getStepProp" + :unstyled="unstyled" /> @@ -42,6 +43,7 @@ :active="isStepActive(index)" :highlighted="index < d_activeStep" :getStepPT="getStepPT(step, 'separator', index)" + :unstyled="unstyled" /> @@ -61,6 +63,7 @@ :nextCallback="(event) => nextCallback(event, index)" :getStepPT="getStepPT" :aria-labelledby="getStepHeaderActionId(index)" + :unstyled="unstyled" />
    From 344ec64cd461aad1493073dd3ff10bc8a7338654 Mon Sep 17 00:00:00 2001 From: tugcekucukoglu Date: Fri, 19 Apr 2024 15:30:12 +0300 Subject: [PATCH 23/49] Update menu.json --- assets/menu/menu.json | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/assets/menu/menu.json b/assets/menu/menu.json index 9c3262884..4b5eae4ac 100644 --- a/assets/menu/menu.json +++ b/assets/menu/menu.json @@ -95,13 +95,11 @@ }, { "name": "FloatLabel", - "to": "/floatlabel", - "badge": "NEW" + "to": "/floatlabel" }, { "name": "IconField", - "to": "/iconfield", - "badge": "NEW" + "to": "/iconfield" }, { "name": "InputGroup", @@ -117,8 +115,7 @@ }, { "name": "InputOtp", - "to": "/inputotp", - "badge": "NEW" + "to": "/inputotp" }, { "name": "InputSwitch", @@ -277,8 +274,7 @@ }, { "name": "Stepper", - "to": "/stepper", - "badge": "NEW" + "to": "/stepper" }, { "name": "TabView", @@ -449,8 +445,7 @@ }, { "name": "MeterGroup", - "to": "/metergroup", - "badge": "NEW" + "to": "/metergroup" }, { "name": "ScrollTop", From aa345b66eafd7b6404d83b62af16767233b208b5 Mon Sep 17 00:00:00 2001 From: tugcekucukoglu Date: Mon, 22 Apr 2024 10:57:06 +0300 Subject: [PATCH 24/49] Template pages discount implementation --- assets/styles/layout/templates/_templates.scss | 11 +++++++++-- components/template/License.vue | 7 +++++-- pages/templates/apollo/index.vue | 3 +++ pages/templates/atlantis/index.vue | 3 +++ pages/templates/avalon/index.vue | 3 +++ pages/templates/diamond/index.vue | 3 +++ pages/templates/freya/index.vue | 3 +++ pages/templates/poseidon/index.vue | 3 +++ pages/templates/ultima/index.vue | 3 +++ pages/templates/verona/index.vue | 3 +++ 10 files changed, 38 insertions(+), 4 deletions(-) diff --git a/assets/styles/layout/templates/_templates.scss b/assets/styles/layout/templates/_templates.scss index f7a3a18fd..b12a84501 100644 --- a/assets/styles/layout/templates/_templates.scss +++ b/assets/styles/layout/templates/_templates.scss @@ -1398,19 +1398,26 @@ border-radius: 1rem; border: 1px solid var(--surface-200); background-color: var(--surface-card); - span { + + &-title { color: var(--surface-900); font-weight: 600; line-height: 1.5rem; } - h2 { + &-pricing { color: var(--surface-900); font-size: 2.5rem; font-weight: 600; line-height: 3rem; letter-spacing: -0.025rem; margin: 1rem 0 1.25rem; + + &-discount-active { + color: var(--surface-600); + text-decoration: line-through; + margin-right: 1rem; + } } button { diff --git a/components/template/License.vue b/components/template/License.vue index 274986f7d..493e8381b 100644 --- a/components/template/License.vue +++ b/components/template/License.vue @@ -4,8 +4,11 @@