Skip to content

Commit 3673a93

Browse files
committed
refactor: rename field.name to field.id
1 parent 090fff3 commit 3673a93

File tree

3 files changed

+22
-22
lines changed

3 files changed

+22
-22
lines changed

examples/vue-cron.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414

1515
<template v-for="f in orderByRank(p.fields)">
16-
<span :key="f.name" v-if="p.rankAttrs.value >= f.rank">
17-
{{f.name}}:
16+
<span :key="f.id" v-if="p.rankAttrs.value >= f.rank">
17+
{{f.id}}:
1818
<select @input="f.events.input(getSelected($event.target))" multiple>
1919
<option v-for="item in f.items" :key="item.value" :value="item.value">{{item.text}}</option>
2020
</select>
@@ -25,7 +25,7 @@
2525

2626
<div>error:{{p.error}}</div>
2727
<div>rank:{{p.rankAttrs.value}}</div>
28-
<div v-for="f in p.fields" :key="'div'+f.name">{{f.name}}: {{f.attrs.value}}, {{f.cron}}, {{f.selectedStr}}</div>
28+
<div v-for="f in p.fields" :key="'div'+f.id">{{f.id}}: {{f.attrs.value}}, {{f.cron}}, {{f.selectedStr}}</div>
2929
</div>
3030
</template>
3131
</VueCronCore>

src/core.vue

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ export default {
2424
let locale = getLocale(this.locale)
2525
2626
return [
27-
{name: 'minute', items: locale.minuteItems, rank: 0},
28-
{name: 'hour', items: locale.hourItems, rank: 1},
29-
{name: 'day', items: locale.dayItems, rank: 2},
30-
{name: 'month', items: locale.monthItems, rank: 4},
31-
{name: 'dayOfWeek', items: locale.dayOfWeekItems, rank: 3},
27+
{id: 'minute', items: locale.minuteItems, rank: 0},
28+
{id: 'hour', items: locale.hourItems, rank: 1},
29+
{id: 'day', items: locale.dayItems, rank: 2},
30+
{id: 'month', items: locale.monthItems, rank: 4},
31+
{id: 'dayOfWeek', items: locale.dayOfWeekItems, rank: 3},
3232
]
3333
}
3434
},
@@ -50,7 +50,7 @@ export default {
5050
5151
let selected = {}
5252
for(let field of this.fields){
53-
selected[field.name] = []
53+
selected[field.id] = []
5454
}
5555
5656
return {
@@ -66,12 +66,12 @@ export default {
6666
},
6767
fieldIndex(){
6868
return this.fields.reduce((acc, f, i) => {
69-
acc[f.name] = i
69+
acc[f.id] = i
7070
return acc
7171
}, {})
7272
},
7373
computedFields(){
74-
return this.fields.map((f) => new Field(f.name, f.items, f.rank))
74+
return this.fields.map((f) => new Field(f.id, f.items, f.rank))
7575
}
7676
},
7777
@@ -103,17 +103,17 @@ export default {
103103
104104
let fieldProps = []
105105
for(let field of this.computedFields){
106-
let i = this.fieldIndex[field.name]
107-
let values = this.selected[field.name]
106+
let i = this.fieldIndex[field.id]
107+
let values = this.selected[field.id]
108108
109109
let attrs = {
110110
value: values,
111111
}
112112
let events = {
113-
input: ((fieldName) => (evt) => {
114-
console.log('input', fieldName, evt)
115-
this.selected[fieldName] = evt
116-
})(field.name)
113+
input: ((fieldId) => (evt) => {
114+
console.log('input', fieldId, evt)
115+
this.selected[fieldId] = evt
116+
})(field.id)
117117
}
118118
119119
fieldProps.push({
@@ -169,7 +169,7 @@ export default {
169169
this.error = 'invalid pattern'
170170
return
171171
}
172-
this.selected[field.name] = array
172+
this.selected[field.id] = array
173173
}
174174
175175
this.error = ''
@@ -182,7 +182,7 @@ export default {
182182
strings.push('*')
183183
continue
184184
}
185-
let array = selected[field.name]
185+
let array = selected[field.id]
186186
let str = multiple.arrayToStr(array, field)
187187
if(str === null){
188188
this.error = 'invalid selection'

src/util.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ class Field {
1717
* @param {Array} items
1818
* @param {Number} rank
1919
*/
20-
constructor(name, items, rank){
21-
this.name = name
20+
constructor(id, items, rank){
21+
this.id = id
2222
this.items = items
2323
this.rank = rank
2424

@@ -67,7 +67,7 @@ class AnyColumn extends CronColumn {
6767
}
6868

6969
get text(){
70-
return `every ${this.field.name}`
70+
return `every ${this.field.id}`
7171
}
7272
}
7373

0 commit comments

Comments
 (0)