diff --git a/.prettierrc b/.prettierrc index 258a7233..9786113d 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,6 +1,6 @@ { "singleAttributePerLine": true, - "printWidth": 100, + "printWidth": 90, "tabWidth": 2, "useTabs": false, "singleQuote": true, diff --git a/src/App.vue b/src/App.vue index b49e6b0f..68de55f7 100755 --- a/src/App.vue +++ b/src/App.vue @@ -29,7 +29,7 @@ - + diff --git a/src/components/CCatalogo/CCatalogo.vue b/src/components/CCatalogo/CCatalogo.vue index d815b243..aa5d8d43 100755 --- a/src/components/CCatalogo/CCatalogo.vue +++ b/src/components/CCatalogo/CCatalogo.vue @@ -1,9 +1,7 @@ + diff --git a/src/components/CMySlideNumber/CMySlideNumber.scss b/src/components/CMySlideNumber/CMySlideNumber.scss new file mode 100755 index 00000000..e69de29b diff --git a/src/components/CMySlideNumber/CMySlideNumber.ts b/src/components/CMySlideNumber/CMySlideNumber.ts new file mode 100755 index 00000000..f02a727b --- /dev/null +++ b/src/components/CMySlideNumber/CMySlideNumber.ts @@ -0,0 +1,76 @@ +import type { PropType } from 'vue'; +import { defineComponent, ref, computed, toRef, reactive, watch, onMounted } from 'vue'; +import type { ISize } from 'model'; +import { IOperators } from 'model'; + +import { useI18n } from 'vue-i18n'; +import { useQuasar } from 'quasar'; + +import { tools } from '@tools'; + +import { CMySlider } from '@src/components/CMySlider'; + +import { shared_consts } from '@src/common/shared_vuejs'; + +export default defineComponent({ + name: 'CMySlideNumber', + emits: ['update:modelValue'], + components: { CMySlider }, + props: { + modelValue: { + type: Number, + required: true, + default: 0, + }, + label: { + type: String, + required: true, + }, + min: { + type: Number, + required: false, + default: 0, + }, + max: { + type: Number, + required: false, + default: 100, + }, + disable: { + type: Boolean, + required: false, + default: false, + }, + addstr: { + type: Boolean, + required: false, + default: true, + }, + }, + setup(props, { emit }) { + const $q = useQuasar(); + const { t } = useI18n(); + const internalModel = reactive({ value: props.modelValue ?? 0 }); + + function modifValue(value: number) { + emit('update:modelValue', value); + } + + // Sincronizzare i cambiamenti esterni con internalModel quando props cambiano + watch( + () => props.modelValue, + (newModel: number) => { + internalModel.value = newModel; + }, + { immediate: true } + ); + + return { + t, + shared_consts, + modifValue, + internalModel, + tools, + }; + }, +}); diff --git a/src/components/CMySlideNumber/CMySlideNumber.vue b/src/components/CMySlideNumber/CMySlideNumber.vue new file mode 100755 index 00000000..c6da55e3 --- /dev/null +++ b/src/components/CMySlideNumber/CMySlideNumber.vue @@ -0,0 +1,32 @@ + + + + + diff --git a/src/components/CMySlideNumber/index.ts b/src/components/CMySlideNumber/index.ts new file mode 100755 index 00000000..ac0d3be8 --- /dev/null +++ b/src/components/CMySlideNumber/index.ts @@ -0,0 +1 @@ +export {default as CMySlideNumber} from './CMySlideNumber.vue' diff --git a/src/components/CText/CText.vue b/src/components/CText/CText.vue index 1522d93a..295bf651 100755 --- a/src/components/CText/CText.vue +++ b/src/components/CText/CText.vue @@ -9,7 +9,8 @@ width: rectext.font?.perc_text ?? '50%', ...( rectext.size && rectext.size.height ? { height: tools.adjustSize(optcatalogo, rectext.size.height) } : {}), marginTop: '0', - '--scalecatalog': tools.getScale(optcatalogo), + '--scalecatalogx': tools.getScaleX(optcatalogo, scheda), + '--scalecatalogy': tools.getScaleY(optcatalogo, scheda), 'line-height': rectext.font?.line_height, }" > @@ -25,11 +26,12 @@ :class="{ 'flex-details_and_barcode' : show_at_right }" :style="{ width: rectext.font?.perc_text ?? '50%', - ...( rectext.size && rectext.size.height ? { height: tools.adjustSize(optcatalogo, rectext.size.height) } : {}), + ...( rectext.size && rectext.size.height ? { height: tools.adjustSize(optcatalogo, rectext.size.height, scheda, false) } : {}), marginTop: '0rem', - '--scalecatalog': tools.getScale(optcatalogo), + '--scalecatalogx': tools.getScaleX(optcatalogo, scheda), + '--scalecatalogy': tools.getScaleY(optcatalogo, scheda), 'line-height': rectext.font?.line_height, - 'gap': show_at_right && scheda.barcode.size?.gap ? tools.adjustSize(optcatalogo, scheda.barcode.size?.gap) : '' + 'gap': show_at_right && scheda.barcode.size?.gap ? tools.adjustSize(optcatalogo, scheda.barcode.size?.gap, scheda, false) : '' }" >
diff --git a/src/components/MyHeader/MyHeader.ts b/src/components/MyHeader/MyHeader.ts index f353c362..d27abc3d 100755 --- a/src/components/MyHeader/MyHeader.ts +++ b/src/components/MyHeader/MyHeader.ts @@ -581,6 +581,7 @@ export default defineComponent({ tools.setCookie('menu3oriz', globalStore.leftDrawerOpen ? '1' : '0'); } + onBeforeMount(BeforeMount); onMounted(mounted); diff --git a/src/components/MyHeader/MyHeader.vue b/src/components/MyHeader/MyHeader.vue index 7e46d7ac..8b2a91b8 100755 --- a/src/components/MyHeader/MyHeader.vue +++ b/src/components/MyHeader/MyHeader.vue @@ -1,5 +1,5 @@