eztech-core-components 1.0.68 → 1.0.73

package/comps/Custom/UserRoles.vue

@@ -46,7 +46,7 @@
               project-id="5"
               :col_multiple="true"
               :disabled="!isSetRole"
-              ref_column="name"
+              ref_column="name,is_active"
               :trigger_fields="roleTriggerFields"
               @input="($event) => handleChangeRole(scope.row._id, $event)"
             />
@@ -82,10 +82,11 @@ export default {
       return this.level?.is_admin
     },
     roleTriggerFields () {
-      if (this.isAdmin) {
-        return null
+      let val = 'is_active:true:boolean:eq'
+      if (!this.isAdmin) {
+        val += ',is_admin:false:boolean:eq'
       }
-      return 'is_admin:false:boolean:eq'
+      return val
     }
   },
   watch: {

package/comps/Custom/UserSelect.vue

@@ -182,8 +182,11 @@ export default {
     isRegConfirmUser () {
       return this.col_field?.includes('reg_confirm_user_id')
     },
+    isDriver () {
+      return this.col_field === 'driver_id'
+    },
     isRoleUsers () {
-      return this.isRegUsers || this.isExpertUsers || this.isPsychologists || this.isFirearmExpert || this.isGrantExpert || this.isRegConfirmUser
+      return this.isDriver || this.isRegUsers || this.isExpertUsers || this.isPsychologists || this.isFirearmExpert || this.isGrantExpert || this.isRegConfirmUser
     },
     isMultiple () {
       return getFormBoolean(this.col_multiple)
@@ -381,7 +384,19 @@ export default {
           triggerSearch[localKey] = { val: localVal, t: type, op: operation }
         }
       }
-      if (this.isRoleUsers) {
+      if (this.isDriver) {
+        const { data: list } = await this.$axios.get('forensic/driver/users', {
+          process: false,
+          cancelToken: new CancelToken(function executor (c) {
+            that.cancel = c
+          }),
+          params: {
+            searchText: this.searchText,
+            search: JSON.stringify(triggerSearch)
+          }
+        })
+        this.list = list
+      } else if (this.isRoleUsers) {
         const { data: list } = await this.$axios.get('forensic/role/users', {
           process: false,
           cancelToken: new CancelToken(function executor (c) {

package/package.json

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

package/utils/component-helper.js

@@ -1,10 +1,17 @@
 import { getFormBoolean } from './data-helper'
 
 export const getFormComponent = ({
-  col_field, col_type, col_readonly,
-  col_multiple, col_length, ref_table,
-  ref_column, trigger_fields, enum_values,
-  col_default, is_file_secret
+  col_field,
+  col_type,
+  col_readonly,
+  col_multiple,
+  col_length,
+  ref_table,
+  ref_column,
+  trigger_fields,
+  enum_values,
+  col_default,
+  is_file_secret
 }, {
   isInline = false,
   formReadonly = false,

package/utils/table-helper.js

@@ -35,7 +35,7 @@ export const tableWatch = {
 }
 export const tableComputed = {
   ...mapGetters('settings', ['unsavedChanges', 'loadingWindow', 'env']),
-  ...mapGetters(['user_position_id', 'refs', 'regYear']),
+  ...mapGetters(['user_position_id', 'refs', 'regYear', 'isClosedRegYear']),
   ...mapGetters('user', ['token', 'authType']),
   localeId () {
     return this.tempLocaleId || this.locale?._id || (this.locales?.length ? this.locales[0]._id : null)
@@ -1346,6 +1346,7 @@ export const tableMethods = {
 
 export const getAsyncData = async ({
   $axios,
+  store,
   projectId,
   tableName,
   apiName,
@@ -1551,8 +1552,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 +1588,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'
@@ -1612,6 +1624,9 @@ export const getAsyncData = async ({
       if (c.col_type === 'pkid') {
         return true
       }
+      if (c.col_field === 'year' && c.col_default === 'current_reg_year' && store?.getters?.isClosedRegYear) {
+        return false
+      }
       return true
     })
     return showColumns