eztech-core-components 1.0.73 → 1.0.74

package/package.json

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

package/utils/component-helper.js

@@ -189,7 +189,7 @@ export const getFormComponent = ({
       name = 'CustomUserSelect'
     } else if (['organization_id', 'parent_id'].some(c => col_field.includes(c)) && !['other_organization_id', 'rest_organization_id'].some(c => col_field.includes(c))) {
       name = 'CoreSelectTree'
-    } else if (ref_table === 'hrm_employees') {
+    } else if (ref_table === 'hrm_employees' && col_multiple) {
       name = 'HrmEmployeeSelect'
     } else {
       name = 'CoreSelect'
@@ -312,11 +312,15 @@ export const getColWidth = ({ col_type, col_multiple, col_length, col_key, col_f
   }
   return valWidth
 }
-export const isHidden = ({ col_field, col_hidden }, subColumn) => {
-  if (['oid', 'xyp_log_id', 'created_user_id'].includes(col_field)) {
+export const isHidden = ({ col_field, col_hidden }, subColumn, apiName) => {
+  const isColHidden = getFormBoolean(col_hidden)
+  if (isColHidden && apiName?.includes('vw_rprt') && ['current_user_id'].includes(col_field)) {
+    return false
+  }
+  if (!isColHidden && ['oid', 'xyp_log_id', 'created_user_id'].includes(col_field)) {
     return true
   }
-  if (getFormBoolean(col_hidden)) {
+  if (isColHidden) {
     return true
   }
   if (subColumn) {

package/utils/table-helper.js

@@ -535,7 +535,12 @@ export const tableMethods = {
         if (['decimal', 'number'].includes(col.col_type)) {
           trigger = 'blur'
         }
-        rules[col.col_field].push({ type: ruleType, required: true, trigger, message: options?.noMessage ? ' ' : `"${col.form.label || (col.props && col.props.label) || 'no label'}" утга шаардана.` })
+        rules[col.col_field].push({
+          type: ruleType,
+          required: true,
+          trigger,
+          message: options?.noMessage ? ' ' : `"${col.form.label || (col.props && col.props.label) || 'no label'}" утга шаардана.`
+        })
       } else if (trigger_required) {
         let trigger = 'change'
         if (['decimal', 'number'].includes(col.col_type)) {
@@ -551,11 +556,19 @@ export const tableMethods = {
         })
       }
       if (col.col_field && col.col_field.toLowerCase().endsWith('mail')) {
-        rules[col.col_field].push({ type: 'email', trigger: 'change', message: options?.noMessage ? ' ' : `"${col.form.label || (col.props && col.props.label) || 'no label'}" буруу байна.` })
+        rules[col.col_field].push({
+          type: 'email',
+          trigger: 'change',
+          message: options?.noMessage ? ' ' : `"${col.form.label || (col.props && col.props.label) || 'no label'}" буруу байна.`
+        })
       } else {
         const { pattern, patternMessage } = getRegexp(col.col_field, col.form.pattern)
         if (pattern) {
-          rules[col.col_field].push({ type: 'regexp', pattern, trigger: 'change', message: options?.noMessage ? ' ' : `${patternMessage || 'Утга буруу байна.'}` })
+          rules[col.col_field].push({
+            type: 'regexp',
+            pattern, trigger: 'change',
+            message: options?.noMessage ? ' ' : `${patternMessage || 'Утга буруу байна.'}`
+          })
         }
       }
       if (col.form.min) {
@@ -1459,7 +1472,7 @@ export const getAsyncData = async ({
         ref_table: col.ref_table,
         ref_column: col.ref_column,
         trigger_fields: col.trigger_fields,
-        col_hidden: isHidden(col, subColumn),
+        col_hidden: isHidden(col, subColumn, apiName),
         col_length: col.col_length,
         col_nullable: col.col_nullable,
         col_multiple: col.col_multiple,