eztech-core-components 1.0.11 → 1.0.13

package/comps/CoreFiles.vue

@@ -9,7 +9,7 @@
     >
       <img
         v-if="value"
-        :src="`/api${permittedPath}/${value?._id}?tid=${value?.tid}`"
+        :src="value?.public_link || `/api${permittedPath}/${value?._id}?tid=${value?.tid}`"
         class="h-full w-full rounded object-cover object-center cursor-zoom-in"
         @click="currentFullImage = value"
       >
@@ -42,7 +42,7 @@
           <img
             v-if="['image', 'icon'].includes(fileType)"
             class="w-20 h-20 object-contain max-h-full max-w-full border-r rounded-l image-rounded-l cursor-zoom-in"
-            :src="image.url || `/api${permittedPath}/${image?._id}?tid=${image.tid}`"
+            :src="image.url || image?.public_link || `/api${permittedPath}/${image?._id}?tid=${image.tid}`"
             @click="currentFullImage = image"
           >
           <div v-else class="text-lg py-3 pl-3">
@@ -60,7 +60,7 @@
             <div class="w-full py-1">
               <a
                 class="hover:underline"
-                :href="`/api${permittedPath}/${image?._id}?tid=${image.tid}`"
+                :href="image?.public_link || `/api${permittedPath}/${image?._id}?tid=${image.tid}`"
                 target="_blank"
               >
                 <span>{{ image.originalname }}</span>
@@ -155,7 +155,7 @@
       <div v-if="currentFullImage" class="fixed h-screen w-screen bg-black z-50 left-0 top-0 flex flex-row">
         <div class="flex-1 flex items-center justify-center relative">
           <img
-            :src="currentFullImage?.url || `/api${permittedPath}/${currentFullImage._id}?tid=${currentFullImage.tid}`"
+            :src="currentFullImage?.url || currentFullImage?.public_link || `/api${permittedPath}/${currentFullImage._id}?tid=${currentFullImage.tid}`"
             class="object-contain border rounded max-h-screen"
           >
           <div class="absolute top-3 right-3">
@@ -166,7 +166,7 @@
           <img
             v-for="image in images"
             :key="`full_image_${image?._id}`"
-            :src="image?.url || `/api${permittedPath}/${image?._id}?tid=${image?.tid}`"
+            :src="image?.url || image?.public_link || `/api${permittedPath}/${image?._id}?tid=${image?.tid}`"
             :class="['w-36 h-36 object-contain border rounded cursor-zoom-in', { 'border-black border-2': currentFullImage._id === image?._id }]"
             @click="currentFullImage = image"
           >
@@ -198,6 +198,7 @@ const resizeImage = ({ file, maxSize }) => {
   const canvas = document.createElement('canvas')
   const resize = () => {
     let { width, height } = image
+
     if (width > height) {
       if (width > maxSize) {
         height *= maxSize / width
@@ -209,8 +210,10 @@ const resizeImage = ({ file, maxSize }) => {
     }
     canvas.width = width
     canvas.height = height
-    canvas.getContext('2d').drawImage(image, 0, 0, width, height)
-    const dataUrl = canvas.toDataURL('image/jpeg')
+    const ctx = canvas.getContext('2d')
+    ctx.clearRect(0, 0, width, height)
+    ctx.drawImage(image, 0, 0, width, height)
+    const dataUrl = canvas.toDataURL('image/png')
     return dataURItoBlob(dataUrl, file.name)
   }
   return new Promise((ok, no) => {
@@ -219,11 +222,12 @@ const resizeImage = ({ file, maxSize }) => {
       return
     }
     reader.onload = (readerEvent) => {
-      image.onload = () => ok({
-        resizedImage: resize(),
-        width: image.width,
-        height: image.height
-      })
+      image.onload = () =>
+        ok({
+          resizedImage: resize(),
+          width: image.width,
+          height: image.height
+        })
       image.src = readerEvent.target.result
     }
     reader.readAsDataURL(file)
@@ -337,7 +341,7 @@ export default {
         this.set_pdf_url({ title: 'Файл харах', url: `${this.permittedPath}/${item._id}?tid=${item.tid}` })
       } else {
         const link = document.createElement('a')
-        link.href = `/api${this.permittedPath}/${item._id}?tid=${item.tid}`
+        link.href = item.public_link || `/api${this.permittedPath}/${item._id}?tid=${item.tid}`
         link.setAttribute('download', `${item.orignalname}`)
         document.body.appendChild(link)
         link.click()

package/comps/CoreTableImage.vue

@@ -29,7 +29,7 @@
           'rounded': !hideBorder,
           'rounded-full': circle
         }]"
-        :src="`/api/file/thumbnail/${image?._id}?tid=${image?.tid}`"
+        :src="image?.public_link || `/api/file/thumbnail/${image?._id}?tid=${image?.tid}`"
       >
     </div>
     <div v-if="images.length > 1" class="font-bold text-gray-500">

package/comps/CoreUploadImage.vue

@@ -8,11 +8,11 @@
       <div v-else-if="value">
         <img
           v-if="fileType === 'image'"
-          :src="`/api${permittedPath}/${value?._id}?tid=${value?.tid}`"
+          :src="value?.public_link || `/api${permittedPath}/${value?._id}?tid=${value?.tid}`"
           class="h-full w-full rounded object-cover object-top cursor-zoom-in"
           @click="currentFullImage = (value?._id || value)"
         >
-        <a v-else :href="`/api${permittedPath}/${value?._id}?tid=${value?._id}`" target="_blank">
+        <a v-else :href="value?.public_link || `/api${permittedPath}/${value?._id}?tid=${value?._id}`" target="_blank">
           {{ value?.originalname || `/api${permittedPath}/${value?._id}` }} <span class="text-xs font-bold">{{ formatFileSize(value?.size) }}</span>
         </a>
       </div>
@@ -38,7 +38,7 @@
     >
       <img
         v-if="value"
-        :src="`/api${permittedPath}/${value?._id}?tid=${value?.tid}`"
+        :src="value?.public_link || `/api${permittedPath}/${value?._id}?tid=${value?.tid}`"
         class="h-full w-full rounded object-cover object-center cursor-zoom-in"
         @click="currentFullImage = value"
       >
@@ -71,7 +71,7 @@
           <img
             v-if="['image', 'icon'].includes(fileType)"
             class="w-20 h-20 object-contain max-h-full max-w-full border-r rounded-l image-rounded-l cursor-zoom-in"
-            :src="`/api${permittedPath}/${image._id}?tid=${image.tid}`"
+            :src="image?.public_link || `/api${permittedPath}/${image._id}?tid=${image.tid}`"
             @click="currentFullImage = image"
           >
           <div class="flex-1 flex flex-row items-center overflow-hidden text-sm">
@@ -80,7 +80,7 @@
             </div>
             <a
               class="hover:underline"
-              :href="`/api${permittedPath}/${image._id}?tid=${image.tid}`"
+              :href="image?.public_link || `/api${permittedPath}/${image._id}?tid=${image.tid}`"
               target="_blank"
             >
               {{ image.originalname }}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eztech-core-components",
-  "version": "1.0.11",
+  "version": "1.0.13",
   "publishConfig": {
     "access": "public"
   },

package/readme.md

@@ -0,0 +1 @@
+test