From f0bb19512aa4a608f578e7bab6b1ed67d699a86a Mon Sep 17 00:00:00 2001 From: Ivan Bochkarev Date: Sun, 8 Feb 2026 10:31:30 +0600 Subject: [PATCH 1/9] =?UTF-8?q?=D0=92=D1=81=D0=B5=20=D0=BF=D0=BB=D0=B5?= =?UTF-8?q?=D0=B9=D1=81=D1=85=D0=BE=D0=BB=D0=B4=D0=B5=D1=80=D1=8B=20=D0=B8?= =?UTF-8?q?=20=D0=B2=D0=B2=D0=B5=D0=B4=D0=B5=D0=BD=D0=BD=D1=8B=D0=B5/?= =?UTF-8?q?=D0=B2=D1=8B=D0=B1=D1=80=D0=B0=D0=BD=D0=BD=D1=8B=D0=B5=20=D0=B7?= =?UTF-8?q?=D0=BD=D0=B0=D1=87=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B2=20=D0=BA?= =?UTF-8?q?=D0=BE=D0=BD=D1=82=D1=80=D0=BE=D0=BB=D0=B0=D1=85=20=D0=BF=D1=80?= =?UTF-8?q?=D0=B8=D0=B2=D0=B5=D0=B4=D0=B5=D0=BD=D1=8B=20=D0=BA=20=D0=BE?= =?UTF-8?q?=D0=B4=D0=BD=D0=BE=D0=BC=D1=83=20=D0=B2=D0=B8=D0=B4=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vueManager/src/entries/api-test.js | 2 + vueManager/src/entries/category-products.js | 2 + vueManager/src/entries/customers.js | 2 + vueManager/src/entries/deliveries.js | 2 + vueManager/src/entries/extra-fields.js | 2 + vueManager/src/entries/fields-management.js | 2 + vueManager/src/entries/gallery-uploader.js | 2 + vueManager/src/entries/grid-fields-config.js | 2 + vueManager/src/entries/help.js | 2 + vueManager/src/entries/import.js | 2 + vueManager/src/entries/links.js | 2 + vueManager/src/entries/model-fields.js | 2 + vueManager/src/entries/notifications.js | 2 + vueManager/src/entries/order.js | 2 + vueManager/src/entries/orders.js | 2 + vueManager/src/entries/payments.js | 2 + vueManager/src/entries/product-tabs.js | 2 + vueManager/src/entries/statuses.js | 2 + vueManager/src/entries/utilities-gallery.js | 2 + vueManager/src/entries/vendors.js | 2 + vueManager/src/utils/formStyles.js | 49 ++++++++++++++++++++ 21 files changed, 89 insertions(+) create mode 100644 vueManager/src/utils/formStyles.js diff --git a/vueManager/src/entries/api-test.js b/vueManager/src/entries/api-test.js index ddcb9a3..6a0989f 100644 --- a/vueManager/src/entries/api-test.js +++ b/vueManager/src/entries/api-test.js @@ -16,6 +16,7 @@ import ConfirmationService from 'primevue/confirmationservice'; import ToastService from 'primevue/toastservice'; import VueApiTest from '../components/ApiTest.vue'; +import { injectFormStylesOverride } from '../utils/formStyles.js'; /** * Creates and configures Vue application @@ -61,6 +62,7 @@ export function init(selector = '#vue-api-test') { const app = createVueApp(); app.mount(selector); + injectFormStylesOverride(); $el.dataset.vApp = 'true'; console.info('[API Test] Mounted successfully'); diff --git a/vueManager/src/entries/category-products.js b/vueManager/src/entries/category-products.js index f1a240c..77f9023 100644 --- a/vueManager/src/entries/category-products.js +++ b/vueManager/src/entries/category-products.js @@ -17,6 +17,7 @@ import ConfirmationService from 'primevue/confirmationservice'; import ToastService from 'primevue/toastservice'; import CategoryProductsGrid from '../components/CategoryProductsGrid.vue'; +import { injectFormStylesOverride } from '../utils/formStyles.js'; let appInstance = null; @@ -74,6 +75,7 @@ export function init(selector = '#ms3-vue-category-products', categoryId = 0) { appInstance = createVueApp(categoryId); appInstance.mount(selector); + injectFormStylesOverride(); $el.dataset.vApp = 'true'; return appInstance; diff --git a/vueManager/src/entries/customers.js b/vueManager/src/entries/customers.js index 2634ce4..12e48cb 100644 --- a/vueManager/src/entries/customers.js +++ b/vueManager/src/entries/customers.js @@ -16,6 +16,7 @@ import ConfirmationService from 'primevue/confirmationservice'; import ToastService from 'primevue/toastservice'; import CustomersGrid from '../components/CustomersGrid.vue'; +import { injectFormStylesOverride } from '../utils/formStyles.js'; /** * Creates and configures Vue application @@ -59,6 +60,7 @@ export function init(selector = '#ms3-customers-vue-wrapper') { const app = createVueApp(); app.mount(selector); + injectFormStylesOverride(); $el.dataset.vApp = 'true'; return app; diff --git a/vueManager/src/entries/deliveries.js b/vueManager/src/entries/deliveries.js index 1130e1e..75ca5d7 100644 --- a/vueManager/src/entries/deliveries.js +++ b/vueManager/src/entries/deliveries.js @@ -15,6 +15,7 @@ import ConfirmationService from 'primevue/confirmationservice' import ToastService from 'primevue/toastservice' import DeliveriesGrid from '../components/DeliveriesGrid.vue' +import { injectFormStylesOverride } from '../utils/formStyles.js' /** * Creates and configures Vue application @@ -56,6 +57,7 @@ export function init(selector = '#ms3-vue-deliveries') { const app = createVueApp() app.mount(selector) + injectFormStylesOverride() $el.dataset.vApp = 'true' return app diff --git a/vueManager/src/entries/extra-fields.js b/vueManager/src/entries/extra-fields.js index f1ab5c7..f3a3d33 100644 --- a/vueManager/src/entries/extra-fields.js +++ b/vueManager/src/entries/extra-fields.js @@ -17,6 +17,7 @@ import ToastService from 'primevue/toastservice'; import Tooltip from 'primevue/tooltip'; import VueExtraFieldsManager from '../components/ExtraFieldsManager.vue'; +import { injectFormStylesOverride } from '../utils/formStyles.js'; /** * Creates and configures Vue application @@ -64,6 +65,7 @@ export function init(selector = '#ms3-vue-extra-fields') { const app = createVueApp(); app.mount(selector); + injectFormStylesOverride(); $el.dataset.vApp = 'true'; return app; diff --git a/vueManager/src/entries/fields-management.js b/vueManager/src/entries/fields-management.js index 0d204be..dabe045 100644 --- a/vueManager/src/entries/fields-management.js +++ b/vueManager/src/entries/fields-management.js @@ -16,6 +16,7 @@ import ConfirmationService from 'primevue/confirmationservice'; import ToastService from 'primevue/toastservice'; import VueFieldsManagement from '../components/FieldsManagement.vue'; +import { injectFormStylesOverride } from '../utils/formStyles.js'; /** * Creates and configures Vue application @@ -61,6 +62,7 @@ export function init(selector = '#vue-fields-management') { const app = createVueApp(); app.mount(selector); + injectFormStylesOverride(); $el.dataset.vApp = 'true'; return app; diff --git a/vueManager/src/entries/gallery-uploader.js b/vueManager/src/entries/gallery-uploader.js index b77bc44..dbdd23a 100644 --- a/vueManager/src/entries/gallery-uploader.js +++ b/vueManager/src/entries/gallery-uploader.js @@ -1,5 +1,6 @@ import { createApp } from 'vue' import GalleryUploader from '../components/gallery/GalleryUploader.vue' +import { injectFormStylesOverride } from '../utils/formStyles.js' /** * Gallery Uploader Entry Point @@ -43,6 +44,7 @@ window.MS3_initGalleryUploader = function(config) { }) const instance = app.mount(container) + injectFormStylesOverride() container.__vueApp__ = app container.__vueInstance__ = instance diff --git a/vueManager/src/entries/grid-fields-config.js b/vueManager/src/entries/grid-fields-config.js index 6081535..a4003ad 100644 --- a/vueManager/src/entries/grid-fields-config.js +++ b/vueManager/src/entries/grid-fields-config.js @@ -16,6 +16,7 @@ import ConfirmationService from 'primevue/confirmationservice' import ToastService from 'primevue/toastservice' import GridFieldsConfig from '../components/GridFieldsConfig.vue' +import { injectFormStylesOverride } from '../utils/formStyles.js' /** * Creates and configures Vue application @@ -59,6 +60,7 @@ export function init(selector = '#ms3-grid-fields-config-vue-wrapper') { const app = createVueApp() app.mount(selector) + injectFormStylesOverride() $el.dataset.vApp = 'true' return app diff --git a/vueManager/src/entries/help.js b/vueManager/src/entries/help.js index 422a114..287c0f7 100644 --- a/vueManager/src/entries/help.js +++ b/vueManager/src/entries/help.js @@ -9,6 +9,7 @@ import Aura from '@primeuix/themes/aura' import 'primeicons/primeicons.css' import HelpPage from '../components/HelpPage.vue' +import { injectFormStylesOverride } from '../utils/formStyles.js' /** * Creates and configures Vue application @@ -45,6 +46,7 @@ export function init(selector = '#ms3-vue-help') { const app = createVueApp() app.mount(selector) + injectFormStylesOverride() $el.dataset.vApp = 'true' return app diff --git a/vueManager/src/entries/import.js b/vueManager/src/entries/import.js index 4654afe..018f11b 100644 --- a/vueManager/src/entries/import.js +++ b/vueManager/src/entries/import.js @@ -15,6 +15,7 @@ import ConfirmationService from 'primevue/confirmationservice'; import ToastService from 'primevue/toastservice'; import ImportProducts from '../components/ImportProducts.vue'; +import { injectFormStylesOverride } from '../utils/formStyles.js'; let app = null; @@ -64,6 +65,7 @@ export function init(selector = '#ms3-vue-import') { app = createVueApp(); app.mount(selector); + injectFormStylesOverride(); $el.dataset.vApp = 'true'; diff --git a/vueManager/src/entries/links.js b/vueManager/src/entries/links.js index 6e02c17..35e5cb1 100644 --- a/vueManager/src/entries/links.js +++ b/vueManager/src/entries/links.js @@ -11,6 +11,7 @@ import ToastService from 'primevue/toastservice' import ConfirmationService from 'primevue/confirmationservice' import { getPrimeVueLocale } from '@vuetools/usePrimeVueLocale'; import LinksGrid from '../components/LinksGrid.vue' +import { injectFormStylesOverride } from '../utils/formStyles.js' // Mount point ID const MOUNT_ID = 'ms3-vue-links' @@ -50,6 +51,7 @@ function mountApp() { app.use(ConfirmationService) app.mount(container) + injectFormStylesOverride() return true } diff --git a/vueManager/src/entries/model-fields.js b/vueManager/src/entries/model-fields.js index 5d19778..ab6b130 100644 --- a/vueManager/src/entries/model-fields.js +++ b/vueManager/src/entries/model-fields.js @@ -16,6 +16,7 @@ import ConfirmationService from 'primevue/confirmationservice'; import ToastService from 'primevue/toastservice'; import ModelFieldsGrid from '../components/ModelFieldsGrid.vue'; +import { injectFormStylesOverride } from '../utils/formStyles.js'; /** * Creates and configures Vue application @@ -59,6 +60,7 @@ export function init(selector = '#ms3-model-fields-vue-wrapper') { const app = createVueApp(); app.mount(selector); + injectFormStylesOverride(); $el.dataset.vApp = 'true'; return app; diff --git a/vueManager/src/entries/notifications.js b/vueManager/src/entries/notifications.js index 0f5ed23..35cac0f 100644 --- a/vueManager/src/entries/notifications.js +++ b/vueManager/src/entries/notifications.js @@ -16,6 +16,7 @@ import ConfirmationService from 'primevue/confirmationservice'; import ToastService from 'primevue/toastservice'; import NotificationsGrid from '../components/NotificationsGrid.vue'; +import { injectFormStylesOverride } from '../utils/formStyles.js'; /** * Creates and configures Vue application @@ -59,6 +60,7 @@ export function init(selector = '#ms3-notifications-vue-wrapper') { const app = createVueApp(); app.mount(selector); + injectFormStylesOverride(); $el.dataset.vApp = 'true'; return app; diff --git a/vueManager/src/entries/order.js b/vueManager/src/entries/order.js index c4a07b5..a091e44 100644 --- a/vueManager/src/entries/order.js +++ b/vueManager/src/entries/order.js @@ -16,6 +16,7 @@ import ConfirmationService from 'primevue/confirmationservice'; import ToastService from 'primevue/toastservice'; import OrderView from '../components/OrderView.vue'; +import { injectFormStylesOverride } from '../utils/formStyles.js'; /** * Creates and configures Vue application @@ -57,6 +58,7 @@ export function init(selector = '#ms3-order-vue-wrapper') { const app = createVueApp(); app.mount(selector); + injectFormStylesOverride(); $el.dataset.vApp = 'true'; return app; diff --git a/vueManager/src/entries/orders.js b/vueManager/src/entries/orders.js index 7b86d04..3b3c160 100644 --- a/vueManager/src/entries/orders.js +++ b/vueManager/src/entries/orders.js @@ -16,6 +16,7 @@ import ConfirmationService from 'primevue/confirmationservice'; import ToastService from 'primevue/toastservice'; import OrdersGrid from '../components/OrdersGrid.vue'; +import { injectFormStylesOverride } from '../utils/formStyles.js'; /** * Creates and configures Vue application @@ -59,6 +60,7 @@ export function init(selector = '#ms3-orders-vue-wrapper') { const app = createVueApp(); app.mount(selector); + injectFormStylesOverride(); $el.dataset.vApp = 'true'; return app; diff --git a/vueManager/src/entries/payments.js b/vueManager/src/entries/payments.js index 2b34a8d..4f35845 100644 --- a/vueManager/src/entries/payments.js +++ b/vueManager/src/entries/payments.js @@ -15,6 +15,7 @@ import ConfirmationService from 'primevue/confirmationservice' import ToastService from 'primevue/toastservice' import PaymentsGrid from '../components/PaymentsGrid.vue' +import { injectFormStylesOverride } from '../utils/formStyles.js' /** * Creates and configures Vue application @@ -55,6 +56,7 @@ export function init(selector = '#ms3-vue-payments') { const app = createVueApp() app.mount(selector) + injectFormStylesOverride() $el.dataset.vApp = 'true' return app diff --git a/vueManager/src/entries/product-tabs.js b/vueManager/src/entries/product-tabs.js index ef769cb..d9d7b06 100644 --- a/vueManager/src/entries/product-tabs.js +++ b/vueManager/src/entries/product-tabs.js @@ -16,6 +16,7 @@ import { getPrimeVueLocale } from '@vuetools/usePrimeVueLocale'; import ToastService from 'primevue/toastservice' import ProductTabs from '../components/product/ProductTabs.vue' +import { injectFormStylesOverride } from '../utils/formStyles.js' /** * Plugin Registry for third-party tabs @@ -212,6 +213,7 @@ window.MS3_initProductTabs = function(config) { const app = createVueApp(props) const instance = app.mount(container) + injectFormStylesOverride() // Store references container.__vueApp__ = app diff --git a/vueManager/src/entries/statuses.js b/vueManager/src/entries/statuses.js index 335e29f..c1e877a 100644 --- a/vueManager/src/entries/statuses.js +++ b/vueManager/src/entries/statuses.js @@ -10,6 +10,7 @@ import Aura from '@primeuix/themes/aura' import ToastService from 'primevue/toastservice' import ConfirmationService from 'primevue/confirmationservice' import StatusesGrid from '../components/StatusesGrid.vue' +import { injectFormStylesOverride } from '../utils/formStyles.js' import { getPrimeVueLocale } from '@vuetools/usePrimeVueLocale'; // Mount point ID @@ -50,6 +51,7 @@ function mountApp() { app.use(ConfirmationService) app.mount(container) + injectFormStylesOverride() return true } diff --git a/vueManager/src/entries/utilities-gallery.js b/vueManager/src/entries/utilities-gallery.js index 96f6384..2985df1 100644 --- a/vueManager/src/entries/utilities-gallery.js +++ b/vueManager/src/entries/utilities-gallery.js @@ -14,6 +14,7 @@ import 'primeicons/primeicons.css'; import ToastService from 'primevue/toastservice'; import UtilitiesGallery from '../components/UtilitiesGallery.vue'; +import { injectFormStylesOverride } from '../utils/formStyles.js'; let app = null; @@ -63,6 +64,7 @@ export function init(selector = '#ms3-vue-utilities-gallery') { // Component reads config from data-attributes set by ExtJS app = createVueApp(); app.mount(selector); + injectFormStylesOverride(); $el.dataset.vApp = 'true'; return app; diff --git a/vueManager/src/entries/vendors.js b/vueManager/src/entries/vendors.js index f4ec2a0..13a8286 100644 --- a/vueManager/src/entries/vendors.js +++ b/vueManager/src/entries/vendors.js @@ -15,6 +15,7 @@ import ConfirmationService from 'primevue/confirmationservice' import ToastService from 'primevue/toastservice' import VendorsGrid from '../components/VendorsGrid.vue' +import { injectFormStylesOverride } from '../utils/formStyles.js' /** * Creates and configures Vue application @@ -56,6 +57,7 @@ export function init(selector = '#ms3-vue-vendors') { const app = createVueApp() app.mount(selector) + injectFormStylesOverride() $el.dataset.vApp = 'true' return app diff --git a/vueManager/src/utils/formStyles.js b/vueManager/src/utils/formStyles.js new file mode 100644 index 0000000..78ff405 --- /dev/null +++ b/vueManager/src/utils/formStyles.js @@ -0,0 +1,49 @@ +/** + * Инжект переопределения font-size для контролов. + * Вызывать после app.mount() — стили PrimeVue встраиваются в runtime и перезаписывают CSS из файлов. + */ +const STYLE_ID = 'ms3-form-styles-override' + +export function injectFormStylesOverride() { + if (document.getElementById(STYLE_ID)) return + + const css = ` +.vueApp .p-dropdown .p-dropdown-label, +.vueApp .p-dropdown .p-inputtext, +.vueApp .p-select [data-pc-section="label"], +.vueApp .p-select .p-select-label, +.vueApp .p-select .p-inputtext, +.vueApp .p-multiselect [data-pc-section="label"], +.vueApp .p-multiselect .p-multiselect-label, +.vueApp .p-inputtext, +.vueApp .p-inputnumber .p-inputnumber-input, +.vueApp .p-inputnumber-input, +.vueApp .p-autocomplete .p-autocomplete-input, +.vueApp .p-autocomplete-input, +.vueApp .p-textarea, +.vueApp .p-cascadeselect [data-pc-section="label"], +.vueApp .p-treeselect [data-pc-section="label"], +.p-dialog .p-dropdown .p-dropdown-label, +.p-dialog .p-dropdown .p-inputtext, +.p-dialog .p-select [data-pc-section="label"], +.p-dialog .p-select .p-select-label, +.p-dialog .p-select .p-inputtext, +.p-dialog .p-multiselect [data-pc-section="label"], +.p-dialog .p-multiselect .p-multiselect-label, +.p-dialog .p-inputtext, +.p-dialog .p-inputnumber .p-inputnumber-input, +.p-dialog .p-inputnumber-input, +.p-dialog .p-autocomplete .p-autocomplete-input, +.p-dialog .p-autocomplete-input, +.p-dialog .p-textarea, +.p-dialog .p-cascadeselect [data-pc-section="label"], +.p-dialog .p-treeselect [data-pc-section="label"] { + font-size: 0.875rem !important; +} +` + + const el = document.createElement('style') + el.id = STYLE_ID + el.textContent = css + document.head.appendChild(el) +} From 2ab707e1c9377d90538cd9d0d02b0758403b9e38 Mon Sep 17 00:00:00 2001 From: Ivan Bochkarev Date: Sun, 8 Feb 2026 10:31:59 +0600 Subject: [PATCH 2/9] =?UTF-8?q?=D0=92=D1=81=D0=B5=20px=20=D0=BF=D0=B5?= =?UTF-8?q?=D1=80=D0=B5=D0=B2=D0=B5=D0=B4=D0=B5=D0=BD=D1=8B=20=D0=B2=20rem?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vueManager/src/components/ActionsEditor.vue | 12 +- vueManager/src/components/ApiTest.vue | 34 +++--- .../src/components/AutocompleteCombo.vue | 4 +- .../src/components/CategoryProductsGrid.vue | 46 ++++---- vueManager/src/components/CustomersGrid.vue | 38 +++---- vueManager/src/components/DeliveriesGrid.vue | 46 ++++---- .../src/components/ExtraFieldsManager.vue | 48 ++++---- .../src/components/FieldsManagement.vue | 2 +- vueManager/src/components/FileBrowser.vue | 12 +- .../src/components/GridFieldsConfig.vue | 30 ++--- vueManager/src/components/HelpPage.vue | 10 +- vueManager/src/components/ImportProducts.vue | 78 ++++++------- vueManager/src/components/LinksGrid.vue | 20 ++-- vueManager/src/components/ModelFieldsGrid.vue | 32 +++--- .../src/components/NotificationsGrid.vue | 18 +-- vueManager/src/components/OptionsChips.vue | 22 ++-- vueManager/src/components/OrderView.vue | 106 +++++++++--------- vueManager/src/components/OrdersGrid.vue | 36 +++--- vueManager/src/components/PaymentsGrid.vue | 42 +++---- vueManager/src/components/ProductData.vue | 34 +++--- .../src/components/ProductDataConfig.vue | 70 ++++++------ .../src/components/ProductDataFields.vue | 56 ++++----- vueManager/src/components/StatusesGrid.vue | 52 ++++----- .../src/components/UtilitiesGallery.vue | 42 +++---- .../src/components/ValidationRulesEditor.vue | 8 +- vueManager/src/components/VendorCombo.vue | 4 +- vueManager/src/components/VendorsGrid.vue | 40 +++---- .../components/gallery/GalleryUploader.vue | 4 +- .../src/components/product/ProductTabs.vue | 12 +- vueManager/src/scss/primevue.scss | 4 +- 30 files changed, 481 insertions(+), 481 deletions(-) diff --git a/vueManager/src/components/ActionsEditor.vue b/vueManager/src/components/ActionsEditor.vue index 019ed4f..ff9b112 100644 --- a/vueManager/src/components/ActionsEditor.vue +++ b/vueManager/src/components/ActionsEditor.vue @@ -188,25 +188,25 @@ function closeDialog() {
- + - + - + - + - +