eztech-core-components 1.0.10 → 1.0.12

package/comps/CoreFormSub.vue

@@ -91,22 +91,22 @@ export default {
       try {
         this.initted = false
         const config = await getAsyncData({
-          tableName: this.refColumn ? this.refColumn.ref_table : this.table_name,
+          tableName: this.refColumn?.ref_table || this.table_name,
           projectId: this.projectId,
-          sub: this.refColumn ? this.refColumn._id : this.sub,
+          sub: this.refColumn?._id || this.sub,
           $axios: this.$axios,
           id: this.tempId,
           apiName: this.apiName,
-          error: this.$nuxt.error
+          error: this.$nuxt.error,
+          skipFormReadonly: true
         })
         for (const configKey in config) {
           this[configKey] = config[configKey]
         }
-        this.$nextTick(() => {
-          this.resetSearch()
-          this.resetDefaultTemp()
-          this.resetTemp()
-        })
+        await this.$nextTick()
+        this.resetSearch()
+        this.resetDefaultTemp()
+        await this.resetTemp()
       } catch (err) {
         this.$showError(err)
       } finally {

package/comps/CoreTableConfig.vue

@@ -193,7 +193,7 @@ export default {
         await this.$showConfirm('Та тухайн хүснэгтийн анхны тохиргоонд буцаах уу?')
         this.loading = true
         for (const r of this.list) {
-          await this.$axios.delete(`1/config_table_users/${r._id}`, { data: { tid: r.tid }})
+          await this.$axios.delete(`1/config_table_users/${r._id}`, { data: { tid: r.tid } })
         }
         this.handleReload()
       } catch (err) {

package/package.json

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

package/plugins/global-prototype.js

@@ -0,0 +1,32 @@
+/* eslint-disable */
+import moment from 'moment'
+Number.prototype.$format = function () {
+  return new Intl.NumberFormat('mn-MN', { maximumFractionDigits: 2 }).format(this)
+}
+String.prototype.$format = function () {
+  const parsedNumber = this.replace(/,/g, '')
+  if (parsedNumber && !isNaN(parsedNumber)) {
+    return new Intl.NumberFormat('mn-MN', { maximumFractionDigits: 2 }).format(Number(parsedNumber))
+  }
+  return this
+}
+String.prototype.$date = function () {
+  return moment(this).isValid() ? moment(this).format('YYYY/MM/DD') : '-'
+}
+String.prototype.$datetime = function () {
+  return moment(this).isValid() ? moment(this).format('YYYY/MM/DD HH:mm') : '-'
+}
+String.prototype.$number = function () {
+  const parsedNumber = this.replace(/,/g, '')
+  if (parsedNumber && !isNaN(parsedNumber)) {
+    return Number(parsedNumber)
+  }
+  return this
+}
+String.prototype.$postmanLink = function () {
+  return this.replace(/\*\*(.*?)\*\*/g, '<strong>$1</strong>')
+    .replace(/\[(.*?)\]/g, '')
+    .replace(/[\(](\b(https?|ftp|file):\/\/([-A-Z0-9+&@#%?=~_|!:,.;]*)([-A-Z0-9+&@#%?\/=~_|!:,.;]*)[-A-Z0-9+&@#\/%=~_|])[\)]/ig,
+      '<a class="underline text-blue-500" href="$1" target="_blank">$1</a>')
+}
+/* eslint-enable */

package/readme.md

@@ -0,0 +1 @@
+test

package/store/user.js

@@ -1,4 +1,3 @@
-import Vue from 'vue'
 import { cloneDeep } from 'lodash'
 export const state = () => ({
   token: null,
@@ -189,7 +188,7 @@ export const actions = {
   //     dispatch('set_user')
   //     dispatch('remove_token')
   //   } catch (err) {
-  //     Vue.prototype.$showError(err)
+  //     this.$showError(err)
   //   }
   // },
   async logout_locked ({ dispatch }) {
@@ -198,19 +197,19 @@ export const actions = {
       dispatch('remove_token')
       location.reload()
     } catch (err) {
-      Vue.prototype.$showError(err)
+      this.$showError(err)
     }
   },
   async logout ({ dispatch, getters }) {
     try {
       // console.log('Vue', Vue)
-      await Vue.prototype.$showConfirm('Та системээс гарах уу?')
+      await this.$showConfirm('Та системээс гарах уу?')
       this.$cookies.remove('idle_email', { path: '/' })
       await this.$axios.post('auth/logout')
       dispatch('remove_token')
       location.reload()
     } catch (err) {
-      Vue.prototype.$showError(err)
+      this.$showError(err)
     }
   }
 }

package/utils/component-helper.js

@@ -143,9 +143,6 @@ export const getFormComponent = ({
       props = { ...props, isSimple: true, height: 350 }
     }
   } else if (['manyToOne', 'table'].includes(col_type)) {
-    // if (ref_table === 'hrm_employees') {
-    //   name = 'CustomEmployeeSelect'
-    // } else
     if (ref_table === 'hrm_users' && ['archive_classification_item', 'archive_classification_list'].includes(table_name)) {
       name = 'DocUserSelect'
       props = { ...props }
@@ -190,9 +187,6 @@ export const getFormComponent = ({
       name = 'CoreSelect'
     }
     const customProps = {}
-    // if (col_field === 'status_id') {
-    //   customProps.disabled = true
-    // }
     props = { ...props, col_field, table_name: ref_table, ref_column, col_multiple, trigger_fields, ...customProps }
   }
   return { name, props }
@@ -227,6 +221,7 @@ export const getFormRowSpan = ({ col_field, col_type, col_length }, form_col) =>
   }
   return rowSpan
 }
+
 export const getFormWidth = ({ col_field, col_type, col_length }, form_col) => {
   let colCount = Number(form_col || 1)
   if (['html_'].some(c => col_field.startsWith(c))) {
@@ -262,10 +257,7 @@ export const getColWidth = ({ col_type, col_multiple, col_length, col_key, col_f
   } else if (['manyToOne'].includes(col_type)) {
     if (col_multiple) {
       valWidth.width = '180px'
-    } else {
-      // console.log('-)
     }
-    // console.log(col_type, col_multiple, col_length, col_key)
   } else if (['datetime'].includes(col_type)) {
     valWidth.width = isInline ? '160px' : '90px'
   } else if (['date'].includes(col_type)) {
@@ -310,7 +302,6 @@ export const getColWidth = ({ col_type, col_multiple, col_length, col_key, col_f
       width: '120px'
     }
   }
-  // console.log('col_field', col_field, col_type, col_key, valWidth)
   return valWidth
 }
 export const isHidden = ({ col_field, col_hidden }, subColumn) => {

package/utils/eslint-rules.js

@@ -8,5 +8,6 @@ module.exports = {
   'promise/param-names': 'off',
   'prefer-regex-literals': 'off',
   'vue/max-attributes-per-line': 'off',
-  'no-irregular-whitespace': 'off'
+  'no-irregular-whitespace': 'off',
+  'no-console': 'off'
 }

package/utils/table-helper.js

@@ -330,7 +330,7 @@ export const tableMethods = {
               }
             }
           } catch (err) {
-            this.$log(err)
+            this.$log('handleFormSearch', err)
           }
           if (!idDownload) {
             const { data } = await this.$axios.get('xypservice/birth/info', {
@@ -741,13 +741,15 @@ export const tableMethods = {
           }
         })
         if (!data) {
-          this.$nuxt.error({ statusCode: 402 })
+          // Тусламж тэтгэмж ажиллахгүй байсныг засварлав.
+          // this.$nuxt.error({ statusCode: 402 })
         }
         const temp = {
           [this.pk_field_name]: data[this.pk_field_name],
           work_families: data.work_families,
           employee_history_text: data.employee_history_text,
-          employee_degree_text: data.employee_degree_text
+          employee_degree_text: data.employee_degree_text,
+          tid: data.tid
         }
         for (const key in this.defaultTemp) {
           const col = this.columns.find(c => c.col_field === key)
@@ -767,7 +769,7 @@ export const tableMethods = {
         if (this.parentRow && has(this.parentRow, this.pk_field_name)) {
           temp[this.subColumn.col_field] = this.parentRow[this.pk_field_name]
         }
-        this.temp = Object.assign({}, this.defaultTemp)
+        this.temp = Object.assign({}, this.defaultTemp, temp)
         if (this.resetedTemp) {
           this.resetedTemp()
         }