From 58e97dc979835a789e58a0e463fd12385d596477 Mon Sep 17 00:00:00 2001 From: mertsincan Date: Fri, 19 May 2023 12:19:50 +0100 Subject: [PATCH] Refactor #3965 - Update style name --- components/lib/basecomponent/BaseComponent.vue | 4 ++-- components/lib/calendar/BaseCalendar.vue | 2 +- components/lib/fieldset/BaseFieldset.vue | 2 +- components/lib/panel/BasePanel.vue | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/components/lib/basecomponent/BaseComponent.vue b/components/lib/basecomponent/BaseComponent.vue index 951b460fd..c156da97b 100644 --- a/components/lib/basecomponent/BaseComponent.vue +++ b/components/lib/basecomponent/BaseComponent.vue @@ -52,11 +52,11 @@ export default { return this.getPTValue(obj, key, params); }, cx(key = '', params = {}) { - return !this.isUnstyled ? ObjectUtils.getItemValue(this.getOption(this.$options.style && this.$options.style.classes, key), { instance: this, props: this.$props, state: this.$data, ...params }) : undefined; + return !this.isUnstyled ? ObjectUtils.getItemValue(this.getOption(this.$options.css && this.$options.css.classes, key), { instance: this, props: this.$props, state: this.$data, ...params }) : undefined; }, sx(key = '', when = true, params = {}) { if (when) { - const self = ObjectUtils.getItemValue(this.getOption(this.$options.style && this.$options.style.inlineStyles, key), { instance: this, props: this.$props, state: this.$data, ...params }); + const self = ObjectUtils.getItemValue(this.getOption(this.$options.css && this.$options.css.inlineStyles, key), { instance: this, props: this.$props, state: this.$data, ...params }); const base = ObjectUtils.getItemValue(this.getOption(inlineStyles, key), { instance: this, props: this.$props, state: this.$data, ...params }); return [base, self]; diff --git a/components/lib/calendar/BaseCalendar.vue b/components/lib/calendar/BaseCalendar.vue index ec1c41b6d..f4d1ef971 100644 --- a/components/lib/calendar/BaseCalendar.vue +++ b/components/lib/calendar/BaseCalendar.vue @@ -443,7 +443,7 @@ export default { default: null } }, - style: { + css: { inlineStyles, classes }, diff --git a/components/lib/fieldset/BaseFieldset.vue b/components/lib/fieldset/BaseFieldset.vue index a19bd059c..e327f229d 100644 --- a/components/lib/fieldset/BaseFieldset.vue +++ b/components/lib/fieldset/BaseFieldset.vue @@ -52,7 +52,7 @@ export default { default: null } }, - style: { + css: { classes }, watch: { diff --git a/components/lib/panel/BasePanel.vue b/components/lib/panel/BasePanel.vue index ca62ab0f6..944fdbdd2 100644 --- a/components/lib/panel/BasePanel.vue +++ b/components/lib/panel/BasePanel.vue @@ -54,7 +54,7 @@ export default { default: null } }, - style: { + css: { classes }, watch: {