diff --git a/src/components/CCatalogoCard/CCatalogoCard.ts b/src/components/CCatalogoCard/CCatalogoCard.ts index d967a000..2da58b05 100755 --- a/src/components/CCatalogoCard/CCatalogoCard.ts +++ b/src/components/CCatalogoCard/CCatalogoCard.ts @@ -39,6 +39,7 @@ import type { IProduct, IVariazione, IRecFields, + ICatalog, } from '@src/model'; import { IBaseOrder } from '@src/model'; import { tools } from '@tools'; @@ -58,6 +59,11 @@ export default defineComponent({ required: false, default: null, }, + myCatalog: { + type: Object as PropType, + required: false, + default: null, + }, id: { type: String, required: false, diff --git a/src/components/CCatalogoCard/CCatalogoCard.vue b/src/components/CCatalogoCard/CCatalogoCard.vue index 36cb06c0..147652f7 100755 --- a/src/components/CCatalogoCard/CCatalogoCard.vue +++ b/src/components/CCatalogoCard/CCatalogoCard.vue @@ -88,8 +88,9 @@ :style="`position: relative; align-content: center;`" > @@ -157,18 +158,18 @@ z-index: 10; " > -
+
-
+
, + required: false, + default: null, + }, cosa: { type: Number, required: false, diff --git a/src/components/CContainerCatalogoCard/CContainerCatalogoCard.vue b/src/components/CContainerCatalogoCard/CContainerCatalogoCard.vue index 4822e7c1..c3f3dcb3 100755 --- a/src/components/CContainerCatalogoCard/CContainerCatalogoCard.vue +++ b/src/components/CContainerCatalogoCard/CContainerCatalogoCard.vue @@ -10,6 +10,7 @@ @opendetail="opendetail" v-model="optcatalogo" :scheda="scheda" + :myCatalog="myCatalog" >
diff --git a/src/model/CatalogStore.ts b/src/model/CatalogStore.ts index 36185b78..ec41cb1b 100755 --- a/src/model/CatalogStore.ts +++ b/src/model/CatalogStore.ts @@ -32,6 +32,8 @@ export interface ICatalog { pagina_introduttiva_sfondo_nero?: boolean backcolor?: string + disattiva_link_immagini?: boolean + pdf_generato?: string pdf_generato_compressed?: string pdf_generato_compr_size?: string diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js index 1eb17fd7..6770df4a 100755 --- a/src/statics/lang/it.js +++ b/src/statics/lang/it.js @@ -2057,6 +2057,7 @@ const msg_it = { }, cataloglist: { + disattiva_link_immagini: 'Disattiva i link sulle immagini', nomefile_generare: 'Nome del File da generare (PDF)', op_andor: 'Condizione', casaeditrice: 'Casa Editrice', diff --git a/src/store/Modules/fieldsTable.ts b/src/store/Modules/fieldsTable.ts index 3c48c030..8fb9f97a 100755 --- a/src/store/Modules/fieldsTable.ts +++ b/src/store/Modules/fieldsTable.ts @@ -307,6 +307,11 @@ export const colTableCatalogList = [ label_trans: 'cataloglist.pdf_online_stampa', dont_clone: true, }), + AddCol({ + name: 'disattiva_link_immagini', + label_trans: 'cataloglist.disattiva_link_immagini', + fieldtype: costanti.FieldType.boolean, + }), // AddCol({ name: 'data_online', label_trans: 'dataloglist.data_online', fieldtype: costanti.FieldType.date }), AddCol(ModifRec), diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts index ccbe2e32..75fabbea 100644 --- a/src/store/Modules/tools.ts +++ b/src/store/Modules/tools.ts @@ -8295,7 +8295,7 @@ export const tools = { } } }, - getFullFileNameByImageFile(table: string, imagefile: string, id: string) { + getFullFileNameByImageFile(table: string, imagefile: string, id: string = '') { // console.log('arrimage', arrimage) if (shared_consts.TABLES_IMAGEFILE_SINGOLO.includes(table)) { diff --git a/src/views/ecommerce/catalogo/catalogo.vue b/src/views/ecommerce/catalogo/catalogo.vue index 5697671e..029d2af1 100755 --- a/src/views/ecommerce/catalogo/catalogo.vue +++ b/src/views/ecommerce/catalogo/catalogo.vue @@ -1186,6 +1186,7 @@ in_3d: false, }" @selauthor="selauthor" + :myCatalog="myCatalog" />