eztech-core-components 1.0.67 → 1.0.69

package/comps/CoreFiles.vue

@@ -340,10 +340,10 @@ export default {
     },
     handleDownload (item) {
       if (item.mimetype === 'application/pdf') {
-        this.set_pdf_url({ title: 'Файл харах', url: `${this.permittedPath}/${item._id}?tid=${item.tid}${ this.routeId ? `&routeId=${this.routeId}` : ''}` })
+        this.set_pdf_url({ title: 'Файл харах', url: `${this.permittedPath}/${item._id}?tid=${item.tid}${this.routeId ? `&routeId=${this.routeId}` : ''}` })
       } else {
         const link = document.createElement('a')
-        link.href = item.public_link || `/api${this.permittedPath}/${item._id}?tid=${item.tid}${ this.routeId ? `&routeId=${this.routeId}` : ''}`
+        link.href = item.public_link || `/api${this.permittedPath}/${item._id}?tid=${item.tid}${this.routeId ? `&routeId=${this.routeId}` : ''}`
         link.setAttribute('download', `${item.orignalname}`)
         document.body.appendChild(link)
         link.click()

package/comps/CoreForm.vue

@@ -224,7 +224,7 @@
                     :no-search="true"
                     :plain-button="true"
                     :parent-level="level"
-                    :serviceName="serviceName"
+                    :service-name="serviceName"
                   />
                 </div>
               </fieldset>

package/comps/CoreFormTable.vue

@@ -90,7 +90,6 @@
   </div>
 </template>
 <script>
-import { isReadonly } from 'vue'
 import { tableData, tableMethods, tableComputed, tableWatch, getAsyncData } from '../utils/table-helper'
 export default {
   name: 'CoreFormTable',

package/comps/CoreInputNumber.vue

@@ -24,7 +24,7 @@ export default {
     disabled: { type: Boolean, default: false },
     controlsPosition: { type: String, default: 'right' },
     precision: { type: Number, default: null },
-    size: { type: String, default: null },
+    size: { type: String, default: null }
   },
   computed: {
     modelValue: {

package/comps/CorePdfDialog.vue

@@ -3,13 +3,20 @@
     <div v-if="loading" class="bg-[#525659] px-20 h-[900px] flex items-center justify-center text-slate-200 text-lg font-medium gap-2">
       <i class="el-icon-loading" /> Түр хүлээнэ үү..
     </div>
-    <div v-else-if="hrefBlob" class="relative w-full h-[900px]">
+    <div v-else-if="hrefBlob" class="iframe-wrapper relative w-full h-[900px]">
+      <div v-if="isReadonly" class="bg-[#282828] flex flex-col items-center py-10">
+        <div class="w-[210mm] max-w-full">
+          <pdf-viewer :src="hrefBlob" />
+        </div>
+      </div>
       <iframe
+        v-else="isReadonly"
         id="pdfFrame"
-        :src="hrefBlob + pdfUrlParams"
+        :src="hrefBlob"
         class="w-full h-full"
         frameborder="0"
         @load="handlePrintPdf"
+        @contextmenu="return false"
       />
     </div>
   </el-dialog>
@@ -27,11 +34,8 @@ export default {
   },
   computed: {
     ...mapGetters('settings', ['env', 'pdfUrl', 'pdfTitle', 'isPdfPrint', 'pdfPageSize']),
-    pdfUrlParams () {
-      if (this.pdfUrl.includes('#')) {
-        return '#' + this.pdfUrl.split('#')[1]
-      }
-      return ''
+    isReadonly () {
+      return this.pdfUrl.includes('#')
     },
     visible: {
       get () {
@@ -73,10 +77,6 @@ export default {
       }
     },
     handlePrintPdf () {
-      const iframe = document.getElementById('pdfFrame')
-      if (iframe.contentWindow) {
-        iframe.contentWindow.document.addEventListener('contextmenu', e => e.preventDefault())
-      }
       if (!this.isPdfPrint) {
         return
       }

package/comps/CoreTableSearchDetail.vue

@@ -17,8 +17,8 @@
           }"
         >
           <component
-            :value="getValue(item.field)"
             :is="item.component"
+            :value="getValue(item.field)"
             v-bind="item.props"
             :parent-temp="getParentTemp(item)"
             :placeholder="item.placeholder || ''"

package/comps/Custom/UserClotheRow.vue

@@ -1,8 +1,10 @@
 <template>
-  <tr :class="['border-b', {
-    'bg-coreDanger/20 text-coreDanger font-bold !border-b-coreDanger/30': value?.next_receive_date && $moment(value?.next_receive_date).isBefore($moment()),
-    'bg-coreWarning/20 text-coreWarning font-bold !border-b-coreWarning/30': value?.next_receive_date && $moment().isBefore(value?.next_receive_date) && $moment().add(10, 'days').isAfter(value.next_receive_date)
-  }]">
+  <tr
+    :class="['border-b', {
+      'bg-coreDanger/20 text-coreDanger font-bold !border-b-coreDanger/30': value?.next_receive_date && $moment(value?.next_receive_date).isBefore($moment()),
+      'bg-coreWarning/20 text-coreWarning font-bold !border-b-coreWarning/30': value?.next_receive_date && $moment().isBefore(value?.next_receive_date) && $moment().add(10, 'days').isAfter(value.next_receive_date)
+    }]"
+  >
     <td class="text-center">
       {{ ind + 1 }}
     </td>

package/comps/Custom/UserClothes.vue

@@ -110,10 +110,12 @@
                   {{ item.clothe_reg_id?.type_general_id?.name }}
                 </td>
               </tr>
-              <tr :key="item._id" :class="['border-b', {
-                'bg-coreDanger/20 text-coreDanger font-bold !border-b-coreDanger/30': !item.next_receive_date || $moment(item.next_receive_date).isBefore($moment()),
-                'bg-coreWarning/20 text-coreWarning font-bold !border-b-coreWarning/30': item.next_receive_date && $moment().isBefore(item.next_receive_date) && $moment().add(10, 'days').isAfter(item.next_receive_date)
-              }]">
+              <tr
+                :key="item._id" :class="['border-b', {
+                  'bg-coreDanger/20 text-coreDanger font-bold !border-b-coreDanger/30': !item.next_receive_date || $moment(item.next_receive_date).isBefore($moment()),
+                  'bg-coreWarning/20 text-coreWarning font-bold !border-b-coreWarning/30': item.next_receive_date && $moment().isBefore(item.next_receive_date) && $moment().add(10, 'days').isAfter(item.next_receive_date)
+                }]"
+              >
                 <td class="text-center">
                   {{ index + 1 }}
                 </td>
@@ -180,10 +182,12 @@
                 Хугацаа болсон авах хувцас хэрэгсэл байхгүй байна..
               </td>
             </tr>
-            <tr v-for="(item, index) in expiredClothes" :key="item._id" :class="['border-b', {
-              'bg-coreDanger/20 text-coreDanger font-bold !border-b-coreDanger/30': !item.next_receive_date || $moment(item.next_receive_date).isBefore($moment()),
-              'bg-coreWarning/20 text-coreWarning font-bold !border-b-coreWarning/30': item.next_receive_date && $moment().isBefore(item.next_receive_date) && $moment().add(10, 'days').isAfter(item.next_receive_date)
-            }]">
+            <tr
+              v-for="(item, index) in expiredClothes" :key="item._id" :class="['border-b', {
+                'bg-coreDanger/20 text-coreDanger font-bold !border-b-coreDanger/30': !item.next_receive_date || $moment(item.next_receive_date).isBefore($moment()),
+                'bg-coreWarning/20 text-coreWarning font-bold !border-b-coreWarning/30': item.next_receive_date && $moment().isBefore(item.next_receive_date) && $moment().add(10, 'days').isAfter(item.next_receive_date)
+              }]"
+            >
               <td class="text-center">
                 {{ index + 1 }}
               </td>
@@ -212,10 +216,10 @@
       </el-tab-pane> -->
     </el-tabs>
     <el-dialog
+      v-el-drag-dialog
       :visible.sync="visible"
       :title="title"
       width="950px"
-      v-el-drag-dialog
       append-to-body
       :close-on-click-modal="false"
     >

package/comps/PdfViewer.vue

@@ -0,0 +1,46 @@
+<template>
+  <div ref="pdfContainer" class="pdf-container" @contextmenu.prevent />
+</template>
+
+<script>
+import * as pdfjsLib from 'pdfjs-dist/legacy/build/pdf'
+import pdfjsWorker from 'pdfjs-dist/legacy/build/pdf.worker.entry'
+
+pdfjsLib.GlobalWorkerOptions.workerSrc = pdfjsWorker
+
+export default {
+  props: {
+    src: { type: String, required: true } // PDF file path or URL
+  },
+  mounted () {
+    this.renderPDF()
+  },
+  methods: {
+    async renderPDF () {
+      const loadingTask = pdfjsLib.getDocument(this.src)
+      const pdf = await loadingTask.promise
+      const container = this.$refs.pdfContainer
+      container.innerHTML = ''
+      for (let pageNum = 1; pageNum <= pdf.numPages; pageNum++) {
+        const page = await pdf.getPage(pageNum)
+        const viewport = page.getViewport({ scale: 2 })
+        const canvas = document.createElement('canvas')
+        const context = canvas.getContext('2d')
+        canvas.height = viewport.height
+        canvas.width = viewport.width
+        await page.render({ canvasContext: context, viewport }).promise
+        container.appendChild(canvas)
+      }
+    }
+  }
+}
+</script>
+
+<style>
+.pdf-container {
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+  overflow: auto;
+}
+</style>

package/package.json

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

package/utils/table-helper.js

@@ -229,7 +229,7 @@ export const tableMethods = {
       this.formSearching = true
       const isEmployee = this.table?.name === 'hrm_employees'
       if (isEmployee && !this.temp?._id) {
-        const { data } = await this.$axios.get(`one/5/service_search_hrm_employees`, {
+        const { data } = await this.$axios.get('one/5/service_search_hrm_employees', {
           params: {
             search: JSON.stringify({ [col_field]: { val: this.temp[col_field], t: 'string', op: 'eq' } }),
             locale_id: this.localeId,
@@ -1551,8 +1551,18 @@ export const getAsyncData = async ({
         }
       }
       if (col.columns && col.columns.length > 0 && !conf.tableHidden) {
-        const searchStringTables = ['firearm_gun', 'cstm_crime_places']
-        const searchStringFields = ['model_id', 'calibre_id', 'expert_id']
+        const searchStringTables = [
+          'firearm_gun',
+          'cstm_crime_places'
+        ]
+        const searchStringFields = [
+          'model_id',
+          'calibre_id',
+          'expert_id'
+        ]
+        const searchAllStringFields = [
+          'position_id'
+        ]
         conf.columns = getColumns(col.columns, parentKeys.concat(col.col_field), parentFields[col.col_field] || {})
         const showChildColumn = conf.columns?.filter(c => !c.tableHidden && !['color', 'is_ping', 'code'].includes(c.col_field))
         conf.hasChildren = showChildColumn.length > 1
@@ -1577,11 +1587,12 @@ export const getAsyncData = async ({
             conf.props.width = get(confChild, 'props.width')
             conf.props['min-width'] = get(confChild, 'props.min-width')
           }
-          if (searchStringTables.includes(table?.name) && searchStringFields.includes(col.col_field)) {
+          if ((searchStringTables.includes(table?.name) && searchStringFields.includes(col.col_field)) || searchAllStringFields.includes(col.col_field)) {
             conf.search_type = confChild?.col_type
             conf.search_key = confChild?.col_key
             conf.search_op = 'start'
           }
+          
           // if (['created_by'].includes(conf.col_key)) {
           //   conf.child_key = `${conf.col_key}.full_name`
           //   conf.search_type = 'string'