eztech-core-components 1.0.2 → 1.0.4

package/comps/CoreFiles.vue

@@ -261,7 +261,7 @@ export default {
   },
   computed: {
     ...mapGetters('settings', ['env']),
-    ...mapGetters('user', ['token']),
+    ...mapGetters('user', ['token', 'authType']),
     isMultiple () {
       return getFormBoolean(this.col_multiple)
     },
@@ -464,24 +464,16 @@ export default {
         const headers = {
           'Content-Type': 'multipart/form-data'
         }
-        // if (this.token) {
-        //   headers.Authorization = `Bearer ${this.token}`
-        // }
-        // const instance = axios.create({
-        //   baseURL: this.env.baseUrl,
-        //   headers,
-        //   withCredentials: true
-        // })
-        
+        if (this.token && this.authType === 'header') {
+          headers.Authorization = `Bearer ${this.token}`
+        }
         let uploadUrl = 'file/upload'
         if (this.unsupportedImageTypes.includes(file.file.type)) {
           uploadUrl = 'file/upload/image'
         }
         // const { data } = await instance.post(uploadUrl, formData)
         const { data } = await this.$axios.post(uploadUrl, formData, {
-          headers: {
-            'Content-Type': 'multipart/form-data'
-          },
+          headers,
           withCredentials: true
         })
         this.handleAddFile(data, file.url)

package/comps/CoreFormTableInline.vue

@@ -73,8 +73,8 @@
 import { isEqual, get, has, cloneDeep } from 'lodash'
 import Schema from 'async-validator'
 import { getTriggerFields } from '../utils/data-helper'
-import { getButtons } from './../utils/role-helper'
 import { tableData, tableMethods, tableComputed, tableWatch, getAsyncData } from '../utils/table-helper'
+import { getButtons } from './../utils/role-helper'
 export default {
   name: 'CoreFormTableInline',
   props: {

package/comps/CoreSignCertificate.vue

@@ -38,7 +38,7 @@ export default {
   },
   computed: {
     ...mapGetters('settings', ['env', 'unsavedChanges']),
-    ...mapGetters('user', ['token']),
+    ...mapGetters('user', ['token', 'authType']),
     isDisabledButton () { return this.pdfFiles.length === this.pdfUrls.length }
   },
   methods: {
@@ -57,11 +57,13 @@ export default {
         const headers = { 'Content-Type': 'multipart/form-data' }
         if (this.ptoken) {
           headers.Authorization = `Bearer ${this.ptoken}`
-        } else if (this.token) {
+        } else if (this.token && this.authType === 'header') {
           headers.Authorization = `Bearer ${this.token}`
         }
-        const instance = this.$axios.create({ baseURL: this.env.baseUrl, headers })
-        const { data } = await instance.post(`file/${this.uploadUrl}`, formData)
+        const { data } = await this.$axios(`file/${this.uploadUrl}`, formData, {
+          headers,
+          withCredentials: true
+        })
         this.pdfFiles.push(data)
         const index = this.pdfUrls.findIndex(c => c.filename === filename)
         const nextPdfUrl = get(this.pdfUrls, `[${index + 1}]`)
@@ -120,8 +122,10 @@ export default {
       } else if (this.token) {
         headers.Authorization = `Bearer ${this.token}`
       }
-      const instance = this.$axios.create({ baseURL: this.env.baseUrl, headers })
-      const { data } = await instance.post(`file/${this.uploadUrl}`, formData)
+      const { data } = await this.$axios.post(`file/${this.uploadUrl}`, formData, {
+        headers,
+        withCredentials: true
+      })
       this.pdfFiles.push(data)
     }
   }

package/comps/CoreTable.vue

@@ -476,8 +476,8 @@ export default {
     statuses: { type: Array, default: () => { return [] } },
     statusCount: { type: Object, default: () => { return null } },
     editFields: { type: Array, default: () => { return [] } },
-    totalDurationMs: { type: Number, default: () => { return null }},
-    clientDurationMs: { type: Number, default: () => { return null }}
+    totalDurationMs: { type: Number, default: () => { return null } },
+    clientDurationMs: { type: Number, default: () => { return null } }
   },
   data () {
     return {
@@ -572,7 +572,7 @@ export default {
       const list = []
       const deleteCodes = ['DELETE', 'REMOVE']
       if (this.actions?.length && this.table_name === 'doc_requests') {
-        list.push(...this.actions.filter(k => this.level?.actions.some(c => (c.code === k.code) || (deleteCodes.includes(c.code) && deleteCodes.includes(k.code)) )).filter((c) => {
+        list.push(...this.actions.filter(k => this.level?.actions.some(c => (c.code === k.code) || (deleteCodes.includes(c.code) && deleteCodes.includes(k.code)))).filter((c) => {
           if (c.isNotSystem && this.currentRow?.is_system) {
             return false
           }

package/comps/CoreTableColumnHeader.vue

@@ -5,7 +5,7 @@
       :title="label"
     >
       {{ label }}
-        <!-- {{ col_key }} -->
+      <!-- {{ col_key }} -->
     </div>
     <div v-if="sortable" class="caret-wrapper w-6">
       <i class="sort-caret ascending" @click.stop="$emit('sort-change', { prop: col_key, order: 'ascending' })" />

package/comps/CoreUploadImage.vue

@@ -474,17 +474,12 @@ export default {
         formData.append('width', file.width)
         formData.append('height', file.height)
         formData.append('is_secret', this.isFileSecret)
-        // const headers = {
-        //   'Content-Type': 'multipart/form-data'
-        // }
-        // if (this.token) {
-        //   headers.Authorization = `Bearer ${this.token}`
-        // }
-        // const instance = axios.create({
-        //   baseURL: this.env.baseUrl,
-        //   headers,
-        //   withCredentials: true
-        // })
+        const headers = {
+          'Content-Type': 'multipart/form-data'
+        }
+        if (this.token && this.authType === 'header') {
+          headers.Authorization = `Bearer ${this.token}`
+        }
         file.startDate = new Date()
         const CancelToken = this.$axios.CancelToken
         const that = this
@@ -524,9 +519,7 @@ export default {
         }
         // const { data } = await instance.post(uploadUrl, formData, config)
         const { data } = await this.$axios.post(uploadUrl, formData, {
-          headers: {
-            'Content-Type': 'multipart/form-data'
-          },
+          headers,
           withCredentials: true
         }, config)
         this.$emit('input', data)

package/comps/CoreVueEditor.vue

@@ -72,20 +72,12 @@ export default {
       try {
         const formData = new FormData()
         formData.append('file', file)
-        // const headers = { 'Content-Type': 'multipart/form-data' }
-        // if (this.token) {
-        //   headers.Authorization = `Bearer ${this.token}`
-        // }
-        // const instance = axios.create({
-        //   baseURL: this.env.baseUrl,
-        //   headers,
-        //   withCredentials: true
-        // })
-        // const { data } = await instance.post('file/upload', formData)
+        const headers = { 'Content-Type': 'multipart/form-data' }
+        if (this.token && this.authType === 'header') {
+          headers.Authorization = `Bearer ${this.token}`
+        }
         const { data } = await this.$axios.post('file/upload', formData, {
-          headers: {
-            'Content-Type': 'multipart/form-data'
-          },
+          headers,
           withCredentials: true
         })
         Editor.insertEmbed(cursorLocation, 'image', `${this.env.baseUrl}/file/${data._id}`)

package/comps/SclHandbook.vue

@@ -82,7 +82,6 @@ export default {
           matches.push(match[1])
         }
       }
-      console.log('matches', matches)
       return matches
     }
   },

package/index.js

@@ -1,16 +1,26 @@
 export default {
-  install(Vue) {
+  install (Vue) {
     const requireComponent = require.context(
       './comps',
       true,
       /\.vue$/
     )
-    requireComponent.keys().forEach(fileName => {
+    requireComponent.keys().forEach((fileName) => {
       const componentConfig = requireComponent(fileName)
-      const componentName = fileName
-        .split('/')
-        .pop()
-        .replace(/\.\w+$/, '')
+      const componentName = fileName.split('/').slice(1).join('').replace(/\.\w+$/, '')
+      Vue.component(
+        componentName,
+        componentConfig.default || componentConfig
+      )
+    })
+    const chartComponent = require.context(
+      './charts',
+      true,
+      /\.vue$/
+    )
+    chartComponent.keys().forEach((fileName) => {
+      const componentConfig = chartComponent(fileName)
+      const componentName = fileName.split('/').slice(1).join('').replace(/\.\w+$/, '')
       Vue.component(
         componentName,
         componentConfig.default || componentConfig

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eztech-core-components",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "publishConfig": {
     "access": "public"
   },
@@ -34,6 +34,7 @@
   "dependencies": {
     "axios": "^0.30.0",
     "vue": "^2.7.10",
+    "vue-chartjs": "^3.5.1",
     "vue-cropperjs": "^4.2.0"
   },
   "devDependencies": {

package/plugins/axios.js

@@ -20,9 +20,17 @@ export default ({ $axios, query, store, $cookies, redirect, i18n, route, params,
     //   delete $axios.defaults.headers.common.Authorization
     // }
     const tokenName = store.getters['user/tokenName']
+    const authType = store.getters['user/authType']
     if (tokenName) {
       $axios.defaults.headers.common['x-pid'] = tokenName
     }
+    if (authType === 'header') {
+      $axios.defaults.headers.common['x-at'] = authType
+      const userToken = store.getters['user/token']
+      if (userToken) {
+        $axios.defaults.headers.common.Autherization = `Bearer ${userToken}`
+      }
+    }
     $axios.defaults.headers.common['Accept-Language'] = query.lang || i18n?.locale || 'mn'
     return config
   })

package/plugins/chart.js

@@ -1,134 +1,5 @@
 /* eslint-disable */
-import Vue from 'vue'
-import { Bar, Line, Pie } from 'vue-chartjs'
 import Chart from 'chart.js'
-
 import ChartDataLabels from 'chartjs-plugin-datalabels'
 Chart.plugins.register(ChartDataLabels)
-
-Vue.component('LineChart', {
-  extends: Line,
-  props: {
-    data: {
-      type: Object,
-      required: false,
-    },
-    options: {
-      type: Object,
-      required: false,
-      default: () => ({
-        responsive: true,
-        maintainAspectRatio: false,
-        legend: {
-          display: true,
-        },
-        interaction: {
-          mode: 'index',
-          intersect: false
-        },
-        scales: {
-          yAxes: [{
-            ticks: {
-              fontColor: 'rgb(75, 85, 99)',
-              suggestedMin: 30,
-              suggestedMax: 50,
-            },
-          }],
-          xAxes: [{
-            ticks: {
-              fontColor: 'rgb(75, 85, 99)'
-            },
-          }]
-        },
-        title: {
-          display: false,
-          text: ''
-        }
-      })
-    }
-  },
-  watch: {
-    data() {
-      this.renderChart(this.data, this.options)
-    },
-  },
-  mounted() {
-    this.renderChart(this.data, this.options)
-  },
-})
-Vue.component('BarChart', {
-  extends: Bar,
-  props: {
-    data: {
-      type: Object,
-      required: false,
-    },
-    options: {
-      type: Object,
-      required: false,
-      default: () => ({
-        responsive: true,
-        maintainAspectRatio: false,
-        legend: {
-          display: true,
-        },
-        scales: {
-          yAxes: [{
-            ticks: {
-              fontColor: 'rgb(75, 85, 99)'
-            },
-          }],
-          xAxes: [{
-            ticks: {
-              fontColor: 'rgb(75, 85, 99)'
-            },
-          }]
-        }
-      })
-    }
-  },
-  watch: {
-    data() {
-      this.renderChart(this.data, this.options)
-    },
-  },
-  mounted() {
-    this.renderChart(this.data, this.options)
-  },
-})
-Vue.component('PieChart', {
-  extends: Pie,
-  props: {
-    data: {
-      type: Object,
-      required: false,
-    },
-    options: {
-      type: Object,
-      required: false,
-      default: () => ({
-        responsive: true,
-        maintainAspectRatio: false,
-        legend: {
-          position: 'bottom',
-          labels: {
-            // fontColor: 'rgb(75, 85, 99)',
-          }
-        },
-        title: {
-          display: false,
-          text: ''
-        }
-      })
-    }
-  },
-  watch: {
-    data() {
-      this.renderChart(this.data, this.options)
-    },
-  },
-  mounted() {
-    this.renderChart(this.data, this.options)
-  },
-})
 /* eslint-enable */

package/store/user.js

@@ -9,29 +9,21 @@ export const state = () => ({
   notificationCount: 0,
   notificationList: [],
   isLocked: false,
-  loginProps: null
+  loginProps: null,
+  authType: 'cookie'
 })
 
 export const getters = {
-  user (state) {
-    return state.user
-  },
-  token (state) {
-    return state.token
-  },
-  tokenName (state) {
-    return state.tokenName
-  },
-  hideProfile (state) {
-    return state.hideProfile
-  },
-  projectId (state) {
-    return state.projectId
-  },
+  user (state) { return state.user },
+  token (state) { return state.token },
+  tokenName (state) { return state.tokenName },
+  hideProfile (state) { return state.hideProfile },
+  projectId (state) { return state.projectId },
   notificationCount (state) { return state.notificationCount },
   notificationList (state) { return state.notificationList },
   isLocked (state) { return state.isLocked },
-  loginProps (state) { return state.loginProps }
+  loginProps (state) { return state.loginProps },
+  authType (state) { return state.authType }
 }
 
 export const mutations = {
@@ -64,6 +56,9 @@ export const mutations = {
   },
   SET_LOGIN_PROPS (state, val) {
     state.loginProps = val
+  },
+  SET_AUTH_TYPE (state, val) {
+    state.authType = val
   }
 }
 
@@ -72,10 +67,14 @@ export const actions = {
     const tokenName = process.env.TOKEN_NAME || null
     const projectId = process.env.PROJECT_ID
     const loginProps = process.env.LOGIN_PROPS
-    // const token = query[tokenName] || $cookies.get(tokenName)
-    // if (token) {
-    //   commit('SET_TOKEN', token)
-    // }
+    const authType = process.env.AUTH_TYPE || 'cookie'
+    if (authType === 'header') {
+      commit('SET_AUTH_TYPE', 'header')
+      const token = query[tokenName] || $cookies.get(tokenName)
+      if (token) {
+        commit('SET_TOKEN', token)
+      }
+    }
     commit('SET_LOGIN_PROPS', loginProps)
     commit('SET_TOKEN_NAME', tokenName)
     commit('SET_PROJECT_ID', projectId)
@@ -163,8 +162,10 @@ export const actions = {
     commit('SET_HIDE_PROFILE', value)
   },
   set_token ({ commit, getters }, token) {
-    // const tokenOptions = { maxAge: 60 * 60 * 24 * 7, path: '/' }
-    // this.$cookies.set(getters.tokenName, token, tokenOptions)
+    if (getters.authType === 'header') {
+      const tokenOptions = { maxAge: 60 * 60 * 24 * 7, path: '/' }
+      this.$cookies.set(getters.tokenName, token, tokenOptions)
+    }
     commit('SET_TOKEN', token)
     if (process.client) {
       localStorage.setItem('forensic_checkLogin', Date.now())

package/utils/number-helper.js

@@ -107,7 +107,7 @@ const toText = (num) => {
 
 export const toWords = (num, options) => {
   if (num >= 1000000000000000) {
-    console.log('mon_num: The number exceeds the limit of 999999999999999')
+    // console.log('mon_num: The number exceeds the limit of 999999999999999')
     return ''
   }
 

package/utils/table-helper.js

@@ -4,7 +4,7 @@ import { getRegexp } from './regexps'
 import { getFormComponent, getFormWidth, getFormColSpan, getFormRowSpan, getColWidth, getColAlign, isHidden } from './component-helper'
 import { extractRegisterNum, getFormBoolean, addBusinessDays, getTriggerFields, getTriggerEquals, isValidJSON, getIdcardAddress, getAgeFromDate, getGenderFromName } from './data-helper'
 import { groupFieldLog } from './role-helper'
-import { uuidv4, base64ToBlob } from './helpers'
+import { base64ToBlob } from './helpers'
 export const tableWatch = {
   id () {
     if (this.isCustom) {
@@ -36,7 +36,7 @@ export const tableWatch = {
 export const tableComputed = {
   ...mapGetters('settings', ['unsavedChanges', 'loadingWindow', 'env']),
   ...mapGetters(['user_position_id', 'refs']),
-  ...mapGetters('user', ['token']),
+  ...mapGetters('user', ['token', 'authType']),
   localeId () {
     return this.tempLocaleId || this.locale?._id || (this.locales?.length ? this.locales[0]._id : null)
   },
@@ -793,7 +793,7 @@ export const tableMethods = {
       this.id = 'create'
     }
   },
-  async handleUpdate (row, updateGroupName = null) {
+  handleUpdate (row, updateGroupName = null) {
     this.updateGroupName = updateGroupName
     this.tid = row.tid
     setTimeout(() => {
@@ -1300,9 +1300,13 @@ export const tableMethods = {
     const formData = new FormData()
     formData.append('file', blob)
     const headers = { 'Content-Type': 'multipart/form-data' }
-    headers.Authorization = `Bearer ${this.token}`
-    const instance = this.$axios.create({ baseURL: this.env.baseUrl, headers })
-    const { data } = await instance.post('file/upload', formData)
+    if (this.token && this.authType === 'header') {
+      headers.Authorization = `Bearer ${this.token}`
+    }
+    const { data } = await this.$axios.post('file/upload', formData, {
+      headers,
+      withCredentials: true
+    })
     return data
   }
 }

package/plugins/ckeditor.js

@@ -1,3 +0,0 @@
-import Vue from 'vue'
-import CKEditor from 'ckeditor4-vue/dist/legacy.js'
-Vue.use(CKEditor)