eztech-core-components 1.0.27 → 1.0.28
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/comps/CoreLocked.vue
CHANGED
|
@@ -63,7 +63,7 @@ export default {
|
|
|
63
63
|
computed: {
|
|
64
64
|
...mapGetters('user', ['isLocked', 'user']),
|
|
65
65
|
isDevelopment () {
|
|
66
|
-
return process.env.NODE_ENV === 'development' &&
|
|
66
|
+
return process.env.NODE_ENV === 'development' && false
|
|
67
67
|
},
|
|
68
68
|
idleTimeoutServer () {
|
|
69
69
|
return process.env.NODE_ENV === 'development' ? 10000 : this.idleTimeout
|
|
@@ -86,6 +86,9 @@ export default {
|
|
|
86
86
|
methods: {
|
|
87
87
|
...mapActions('user', ['logout_locked', 'set_locked']),
|
|
88
88
|
addIdleListeners () {
|
|
89
|
+
if (this.isLocked) {
|
|
90
|
+
return
|
|
91
|
+
}
|
|
89
92
|
if (this.isDevelopment) {
|
|
90
93
|
return
|
|
91
94
|
}
|
package/comps/CoreTable.vue
CHANGED
|
@@ -70,7 +70,7 @@
|
|
|
70
70
|
>
|
|
71
71
|
Дахин ачаалах
|
|
72
72
|
</el-button>
|
|
73
|
-
|
|
73
|
+
<el-button
|
|
74
74
|
icon="el-icon-search"
|
|
75
75
|
:plain="plainButton"
|
|
76
76
|
:size="sizeButton || defaultSize"
|
|
@@ -78,7 +78,7 @@
|
|
|
78
78
|
@click="visibleSearch = true"
|
|
79
79
|
>
|
|
80
80
|
Дэлгэрэнгүй хайлт
|
|
81
|
-
</el-button>
|
|
81
|
+
</el-button>
|
|
82
82
|
<el-button
|
|
83
83
|
v-if="buttons.textExport"
|
|
84
84
|
icon="el-icon-download"
|
package/package.json
CHANGED
|
@@ -20,7 +20,7 @@ export const getDefaultConfig = (options) => {
|
|
|
20
20
|
const axios = {
|
|
21
21
|
baseURL: process.env.BASE_URL_SERVER || process.env.BASE_URL,
|
|
22
22
|
browserBaseURL: '/api',
|
|
23
|
-
|
|
23
|
+
withCredentials: true,
|
|
24
24
|
process: false
|
|
25
25
|
}
|
|
26
26
|
if (process.env.FILE_URL && !process.env.FILE_URL?.startsWith('/api')) {
|
package/utils/table-helper.js
CHANGED
|
@@ -528,11 +528,6 @@ export const tableMethods = {
|
|
|
528
528
|
if (getFormBoolean(col.col_multiple)) {
|
|
529
529
|
ruleType = 'array'
|
|
530
530
|
} else if (['manyToOne', 'image', 'file', 'profileImage', 'icon'].includes(col.col_type)) {
|
|
531
|
-
// if (['hrm_employees', 'hrm_users'].includes(col.ref_table)) {
|
|
532
|
-
// ruleType = 'string'
|
|
533
|
-
// } else {
|
|
534
|
-
// ruleType = 'object'
|
|
535
|
-
// }
|
|
536
531
|
ruleType = 'object'
|
|
537
532
|
}
|
|
538
533
|
if (col.form.required && !col.form.col_readonly) {
|