eztech-core-components 1.0.48 → 1.0.50

package/comps/CoreSelect.vue

@@ -47,6 +47,7 @@ export default {
     value: { type: [String, Array, Number, Object], default: null },
     table_name: { type: String, default: null },
     ref_column: { type: String, default: null },
+    col_field: { type: String, default: null },
     projectId: { type: [String, Number], default: null },
     col_multiple: { type: [Boolean, Number, String], default: false },
     trigger_fields: { type: String, default: '' },

package/comps/CoreTableSearch.vue

@@ -203,7 +203,7 @@ export default {
     },
     val0: {
       get () {
-        const val1 = get(this.value, '[1]')
+        const val1 = get(this.value, '[0]')
         const val = ['', undefined].includes(val1) ? null : val1
         if (['number', 'decimal'].includes(this.colType) && val && !this.col?.col_field?.includes('year')) {
           return val.$format()

package/package.json

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

package/utils/component-helper.js

@@ -17,7 +17,9 @@ export const getFormComponent = ({
 }) => {
   let name = 'ElInput'
   let props = { disabled: formReadonly || getFormBoolean(col_readonly) }
-  if (col_field.endsWith('duration_justified')) {
+  if (col_field === 'year' && col_default === 'current_reg_year') {
+    name = 'RegYear'
+  } else if (col_field.endsWith('duration_justified')) {
     name = 'CoreDurationJustified'
   } else if (col_field === 'app_password') {
     name = 'CoreAppPassword'
@@ -124,11 +126,6 @@ export const getFormComponent = ({
       }
     }
   } else if (['date'].includes(col_type)) {
-    // if (col_field.endsWith('start_date')) {
-    //   name = 'CoreDateRange'
-    // } else {
-    //   name = 'CoreDate'
-    // }
     if (col_field.endsWith('end_date')) {
       props = { ...props, col_field }
     } else if (col_field.endsWith('_month')) {
@@ -185,6 +182,8 @@ 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') {
+      name = 'HrmEmployeeSelect'
     } else {
       name = 'CoreSelect'
     }

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']),
+  ...mapGetters(['user_position_id', 'refs', 'regYear']),
   ...mapGetters('user', ['token', 'authType']),
   localeId () {
     return this.tempLocaleId || this.locale?._id || (this.locales?.length ? this.locales[0]._id : null)
@@ -499,7 +499,10 @@ export const tableMethods = {
         set(defaultTemp, col.col_field, null)
         continue
       }
-      if (col.form.col_default === 'now') {
+      if (col.form.col_default === 'current_reg_year') {
+        set(defaultTemp, col.col_field, this.regYear)
+        ruleType = 'number'
+      } else if (col.form.col_default === 'now') {
         set(defaultTemp, col.col_field, this.$moment().format('YYYY-MM-DD'))
       } else if (['decimal', 'number'].includes(col.col_type)) {
         ruleType = 'number'