Skip to content

Commit 548a20f

Browse files
committed
field modifiers and custom store modules moved to config
1 parent 977b475 commit 548a20f

File tree

7 files changed

+67
-58
lines changed

7 files changed

+67
-58
lines changed

src/crud/components/ChildDetails.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
</template>
8282
<script>
8383
import Vue from "vue";
84-
import { functionsList } from "@/helpers/functions.js";
84+
import { fieldModifiers } from "@/config/field-modifiers.js";
8585
import { mapState, mapGetters, mapMutations, mapActions } from "vuex";
8686
8787
export default {
@@ -172,7 +172,7 @@ export default {
172172
if (field.apiObject){
173173
if (field.apiObject.useFunctionsInDetails){
174174
let functions = field.apiObject.functions || []
175-
let availableFunctions = functionsList
175+
let availableFunctions = fieldModifiers
176176
177177
for (let i = 0; i < functions.length; i++) {
178178
let functionName = functions[i]

src/crud/components/ItemDetails.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@
215215
<script>
216216
import Vue from "vue";
217217
import { VueEditor } from "vue2-editor";
218-
import { functionsList } from "@/helpers/functions.js";
218+
import { fieldModifiers } from "@/config/field-modifiers.js";
219219
import { mapState, mapGetters, mapMutations, mapActions } from "vuex";
220220
221221
export default {
@@ -392,7 +392,7 @@ export default {
392392
if (field.apiObject) {
393393
if (field.apiObject.useFunctionsInDetails) {
394394
let functions = field.apiObject.functions || [];
395-
let availableFunctions = functionsList;
395+
let availableFunctions = fieldModifiers;
396396
397397
for (let i = 0; i < functions.length; i++) {
398398
let functionName = functions[i];

src/helpers/functions.js

Lines changed: 4 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import { fieldModifiers } from "@/config/field-modifiers.js";
2+
13
function parseIntIfNumber(str) {
24
return !/\D/.test(str) ? parseInt(str) : str
35
}
@@ -27,38 +29,6 @@ function humanFileSize(bytes, si) {
2729
return bytes.toFixed(1) + ' ' + units[u];
2830
}
2931

30-
let functionsList = {
31-
humanFileSize: (param) => {
32-
return humanFileSize(param)
33-
},
34-
dateFromTimestamp: (param) => {
35-
return param.substring(0, 10)
36-
},
37-
timeFromTimestamp: (param) => {
38-
let tmp = param || ''
39-
return tmp.substring(0, 5)
40-
},
41-
datetimeFromTimestamp: (param) => {
42-
return '<nobr>' + param.substring(0, 19) + '</nobr>'
43-
},
44-
croppedText: (param) => {
45-
return (param == null || param.length < 100) ? param : param.substring(0, 100) + '...'
46-
},
47-
list: (param) => {
48-
return param ? param.map(obj => obj.tableList).join(', ') : ''
49-
},
50-
listTasks: (param) => {
51-
return param ? param.map(obj => {
52-
return obj.task.name
53-
}).join('<br>') : ''
54-
},
55-
lastReset: (param) => {
56-
if (param.length > 0) {
57-
return '<nobr>' + param[param.length - 1].reset_time.substring(0, 19) + '</nobr>'
58-
}
59-
}
60-
};
61-
6232
function getItemsList(obj, fields, meta, primaryKey, customButtons, activeColumnName) {
6333
var rObj = {}
6434
rObj.meta = {
@@ -117,7 +87,7 @@ function getItemsList(obj, fields, meta, primaryKey, customButtons, activeColumn
11787
}, obj)
11888

11989
let functions = info.functions || []
120-
let availableFunctions = functionsList
90+
let availableFunctions = fieldModifiers
12191

12292
for (let i = 0; i < functions.length; i++) {
12393
let functionName = functions[i]
@@ -143,6 +113,5 @@ export {
143113
parseIntIfNumber,
144114
download,
145115
humanFileSize,
146-
getItemsList,
147-
functionsList
116+
getItemsList
148117
}

src/store/custom.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// custom modules
2+
import administration from '@/routes/main/routes/administration/store/'
3+
import crm from '@/routes/main/routes/crm/store/'
4+
5+
export default {
6+
administration,
7+
crm
8+
}
9+

src/store/index.js

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,33 +2,25 @@ import Vue from 'vue'
22
import Vuex from 'vuex'
33
import router from '@/router'
44

5-
//crud
6-
import crud from './modules/crud/'
5+
// main store
6+
import state from './state'
7+
import getters from './getters'
8+
import mutations from './mutations'
9+
import actions from './actions'
710

11+
// crud
12+
import crud from './modules/crud/'
813
// auth
9-
1014
import auth from './modules/auth/'
1115

12-
//modules
13-
import administration from '@/routes/main/routes/administration/store/'
14-
import crm from '@/routes/main/routes/crm/store/'
16+
let mainModules = {crud, auth}
1517

16-
import state from './state'
17-
import getters from './getters'
18-
import mutations from './mutations'
19-
import actions from './actions'
18+
import customModules from '@/config/store-modules.js'
19+
const modules = Object.assign(customModules, mainModules);
2020

21+
console.log(modules)
2122
Vue.use(Vuex);
2223

23-
const modules = {
24-
//crud
25-
crud: crud,
26-
//modules
27-
administration: administration,
28-
auth: auth,
29-
crm: crm,
30-
}
31-
3224
export default new Vuex.Store({
3325
modules,
3426
state,
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
let fieldModifiers = {
2+
humanFileSize: (param) => {
3+
return humanFileSize(param)
4+
},
5+
dateFromTimestamp: (param) => {
6+
return param.substring(0, 10)
7+
},
8+
timeFromTimestamp: (param) => {
9+
let tmp = param || ''
10+
return tmp.substring(0, 5)
11+
},
12+
datetimeFromTimestamp: (param) => {
13+
return '<nobr>' + param.substring(0, 19) + '</nobr>'
14+
},
15+
croppedText: (param) => {
16+
return (param == null || param.length < 100) ? param : param.substring(0, 100) + '...'
17+
},
18+
list: (param) => {
19+
return param ? param.map(obj => obj.tableList).join(', ') : ''
20+
},
21+
lastReset: (param) => {
22+
if (param.length > 0) {
23+
return '<nobr>' + param[param.length - 1].reset_time.substring(0, 19) + '</nobr>'
24+
}
25+
}
26+
};
27+
28+
export {
29+
fieldModifiers
30+
}
31+

templates/config/store-modules.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
// custom modules
2+
import administration from '@/routes/main/routes/administration/store/'
3+
import crm from '@/routes/main/routes/crm/store/'
4+
5+
export default {
6+
administration,
7+
crm
8+
}

0 commit comments

Comments
 (0)