| undefined,
required: false,
default: () => {
- return { }
+ return {}
},
},
id: {
@@ -151,7 +151,7 @@ export default defineComponent({
console.log('showandsel CMyFieldDb', row, col, newval)
if (newval !== valinitial) {
- setValDb($q, props.mykey, newval, props.type, props.serv, props.table, props.mysubkey, props.id, props.indrec, props.mysubsubkey, props.specialField)
+ tools.saveInDBForTypes($q, props.mykey, newval, props.type, props.serv, props.table, props.mysubkey, props.id, props.indrec, props.mysubsubkey, props.specialField)
}
}
diff --git a/src/components/CSelectImage/CSelectImage.ts b/src/components/CSelectImage/CSelectImage.ts
index 3c3474c4..3777acc6 100755
--- a/src/components/CSelectImage/CSelectImage.ts
+++ b/src/components/CSelectImage/CSelectImage.ts
@@ -81,7 +81,7 @@ export default defineComponent({
if (Array.isArray(myarr)) {
myarr.forEach((imgfile: string) => {
if (imgfile) {
- gallerylist.value.push({ imagefile: imgfile })
+ gallerylist.value.push({ imagefile: imgfile, vers_img: 1 })
}
})
}
@@ -92,11 +92,6 @@ export default defineComponent({
}
- function showandsave(value: any) {
- console.log('EMIT: showandsave')
- emit('showandsave', value)
- }
-
function getnumimages() {
if (gallerylist.value)
return gallerylist.value.length
@@ -218,12 +213,18 @@ export default defineComponent({
function uploaded(info: any) {
console.log('uploaded', info)
+ let vers_img = tools.getGenerateVersionImage()
+
if (gallerylist.value) {
for (const file of info.files) {
- gallerylist.value.push({ imagefile: file.name })
+ if (file.name.imagefile) {
+ gallerylist.value.push(file.name)
+ } else {
+ gallerylist.value.push({ imagefile: file.name, vers_img })
+ }
}
- console.log('gallerylist', gallerylist.value)
+ console.log('CSELECtIMAGE gallerylist', gallerylist.value)
}
}
@@ -288,11 +289,11 @@ export default defineComponent({
}
function save() {
- console.log('CGallery save', gallerylist.value)
+ console.log('CSelectImage save', gallerylist.value)
if (gallerylist.value.length > 0) {
- emit('showandsave', gallerylist.value[0].imagefile)
+ emit('showandsave', gallerylist.value[0])
} else {
- emit('showandsave', '')
+ emit('showandsave', { imagefile: '' })
}
}
@@ -300,21 +301,6 @@ export default defineComponent({
return ''
}
- function getsrcimg(imgfile: any) {
-
- if (!imgfile.imagefile) {
- return 'images/noimg.png';
- }
- if (imgfile) {
- if (tools.getextfile(imgfile.imagefile) === 'pdf')
- return 'images/images/pdf.jpg'
- else
- return costanti.DIR_UPLOAD + props.directory + '/' + imgfile.imagefile
- } else {
- return 'images/noimg.png';
- }
- }
-
function getParamDir() {
return tools.escapeslash(props.directory)
}
@@ -341,18 +327,25 @@ export default defineComponent({
}
onMounted(created)
+ function getrealdirectory() {
+ if (props.directory == 'productinfos')
+ return 'products'
+ else
+ return props.directory
+ }
+
return {
getlistimages,
onDragStart,
onDragEnter,
onDragLeave,
onDragOver,
+ getrealdirectory,
onDrop,
getclass,
getclimg,
copytoclipboard,
deleteFile,
- getsrcimg,
tools,
uploaded,
gallerylist,
diff --git a/src/components/CSelectImage/CSelectImage.vue b/src/components/CSelectImage/CSelectImage.vue
index 610c0ead..c2e629a3 100755
--- a/src/components/CSelectImage/CSelectImage.vue
+++ b/src/components/CSelectImage/CSelectImage.vue
@@ -7,48 +7,57 @@
-
+ :src="tools.getsrcimg(imgfile, getrealdirectory())"
+ :class="getclimg()"
+ >
+
({{ getnumimages() }})
-
-
-
-
-
+
+
-
-
+
+ :label="$t('gallery.load_image')"
+ >