eztech-core-components 1.0.26 → 1.0.28

package/comps/CoreLocked.vue

@@ -63,7 +63,7 @@ export default {
   computed: {
     ...mapGetters('user', ['isLocked', 'user']),
     isDevelopment () {
-      return process.env.NODE_ENV === 'development' && true
+      return process.env.NODE_ENV === 'development' && false
     },
     idleTimeoutServer () {
       return process.env.NODE_ENV === 'development' ? 10000 : this.idleTimeout
@@ -86,6 +86,9 @@ export default {
   methods: {
     ...mapActions('user', ['logout_locked', 'set_locked']),
     addIdleListeners () {
+      if (this.isLocked) {
+        return
+      }
       if (this.isDevelopment) {
         return
       }

package/comps/CoreSelectOrgEmp.vue

@@ -27,12 +27,12 @@
       <el-option
         v-for="item of dataList"
         :key="item._id"
-        :label="table_name === 'service_search_reg_org_emps' ? `${ (item.degree_name || item.position_name || '') } ${ item.name || '' } ${ item.phone_num || '' }` : `${item.full_name} ${ item.expert_num || ''}`"
+        :label="['service_search_reg_org_emps', 'reg_org_emps'].includes(table_name) ? `${ (item.degree_name || item.position_name || '') } ${ item.name || '' } ${ item.phone_num || '' }` : `${item.full_name} ${ item.expert_num || ''}`"
         :value="item"
         class="h-auto max-w-[500px] h-auto whitespace-normal break-normal"
       >
         <div class="flex">
-          <div v-if="table_name === 'service_search_reg_org_emps'" class="leading-3 flex-1">
+          <div v-if="['service_search_reg_org_emps', 'reg_org_emps'].includes(table_name)" class="leading-3 flex-1">
             <div class="flex flex-row justify-between leading-3">
               <span class="!text-normal">{{ item.degree_name || item.position_name }} <span class="font-bold text-xs">{{ item.name }}</span></span>
             </div>
@@ -244,7 +244,7 @@ export default {
           search.resolution_org_id = { val: this.parentTemp?.resolution_org_id?._id, t: 'number', op: 'eq' }
         }
         const fields = this.ref_column.split(',')
-        if (this.table_name === 'service_search_reg_org_emps') {
+        if (['service_search_reg_org_emps', 'reg_org_emps'].includes(this.table_name)) {
           fields.push('resolution_org_id.name', 'resolution_org_id.short_name')
         }
         this.dataList = []

package/comps/CoreTable.vue

@@ -70,7 +70,7 @@
         >
           Дахин ачаалах
         </el-button>
-        <!-- <el-button
+        <el-button
           icon="el-icon-search"
           :plain="plainButton"
           :size="sizeButton || defaultSize"
@@ -78,7 +78,7 @@
           @click="visibleSearch = true"
         >
           Дэлгэрэнгүй хайлт
-        </el-button> -->
+        </el-button>
         <el-button
           v-if="buttons.textExport"
           icon="el-icon-download"

package/package.json

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

package/plugins/axios.js

@@ -28,7 +28,7 @@ export default ({ $axios, query, store, $cookies, redirect, i18n, route, params,
       $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.Authorization = `Bearer ${userToken}`
       }
     }
     $axios.defaults.headers.common['Accept-Language'] = query.lang || i18n?.locale || 'mn'

package/utils/default-nuxt-config.js

@@ -20,7 +20,7 @@ export const getDefaultConfig = (options) => {
   const axios = {
     baseURL: process.env.BASE_URL_SERVER || process.env.BASE_URL,
     browserBaseURL: '/api',
-    credentials: true,
+    withCredentials: true,
     process: false
   }
   if (process.env.FILE_URL && !process.env.FILE_URL?.startsWith('/api')) {

package/utils/table-helper.js

@@ -528,11 +528,6 @@ export const tableMethods = {
       if (getFormBoolean(col.col_multiple)) {
         ruleType = 'array'
       } else if (['manyToOne', 'image', 'file', 'profileImage', 'icon'].includes(col.col_type)) {
-        // if (['hrm_employees', 'hrm_users'].includes(col.ref_table)) {
-        //   ruleType = 'string'
-        // } else {
-        //   ruleType = 'object'
-        // }
         ruleType = 'object'
       }
       if (col.form.required && !col.form.col_readonly) {