Skip to content

Commit 5c400a7

Browse files
committed
eslint configure worked
1 parent b0ae612 commit 5c400a7

File tree

4 files changed

+225
-224
lines changed

4 files changed

+225
-224
lines changed

package.json

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,14 @@
3838
"@vue/cli-plugin-eslint": "^3.0.0",
3939
"@vue/cli-plugin-unit-jest": "~4.5.0",
4040
"@vue/cli-service": "^3.0.0",
41+
"@vue/eslint-config-standard": "^6.0.0",
4142
"@vue/test-utils": "^1.2.1",
4243
"babel-eslint": "^10.0.1",
43-
"eslint": "^5.8.0",
44-
"eslint-plugin-vue": "^5.0.0-0",
44+
"eslint": "^7.29.0",
45+
"eslint-plugin-import": "^2.23.4",
46+
"eslint-plugin-node": "^11.1.0",
47+
"eslint-plugin-promise": "^5.1.0",
48+
"eslint-plugin-vue": "^7.11.1",
4549
"vue-template-compiler": "^2.6.14"
4650
},
4751
"eslintConfig": {
@@ -51,7 +55,7 @@
5155
},
5256
"extends": [
5357
"plugin:vue/essential",
54-
"eslint:recommended"
58+
"@vue/standard"
5559
],
5660
"rules": {},
5761
"parserOptions": {
@@ -79,4 +83,4 @@
7983
"last 2 versions",
8084
"not ie <= 8"
8185
]
82-
}
86+
}

src/components/calendar.vue

Lines changed: 91 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -77,96 +77,96 @@ export default {
7777
props: {
7878
calendar: {
7979
type: Object,
80-
required: true,
80+
required: true
8181
},
8282
currentDate: {
8383
type: Object,
84-
required: true,
84+
required: true
8585
},
8686
formatDate: {
8787
type: Function,
88-
required: true,
88+
required: true
8989
},
9090
selectedDate: {
91-
required: true,
91+
required: true
9292
},
9393
range: {
94-
type: Boolean,
94+
type: Boolean
9595
},
9696
textFormat: {
9797
type: String,
98-
required: true,
98+
required: true
9999
},
100100
pickerType: {
101101
type: String,
102-
default: "start",
102+
default: 'start'
103103
},
104104
circle: {
105105
type: Boolean,
106-
default: false,
106+
default: false
107107
},
108108
viewMode: {
109-
type: String,
109+
type: String
110110
},
111111
rangeSeperator: {
112-
type: String,
112+
type: String
113113
},
114-
disableDate: {},
114+
disableDate: {}
115115
},
116116
computed: {
117-
selectPickerDate() {
118-
if (this.range)
119-
return this.pickerType === "start"
117+
selectPickerDate () {
118+
if (this.range) {
119+
return this.pickerType === 'start'
120120
? this.selectedDate[0]
121-
: this.selectedDate[1];
122-
else return this.selectedDate;
121+
: this.selectedDate[1]
122+
} else return this.selectedDate
123123
},
124-
isDayMode() {
125-
return this.viewMode === "days";
124+
isDayMode () {
125+
return this.viewMode === 'days'
126126
},
127-
yearsRange() {
128-
let years = this.calendar.years;
129-
return years[0] + this.rangeSeperator + years[years.length - 1];
127+
yearsRange () {
128+
const years = this.calendar.years
129+
return years[0] + this.rangeSeperator + years[years.length - 1]
130130
},
131-
dayViewText() {
131+
dayViewText () {
132132
return (
133133
this.calendar.months[this.currentDate.month].name +
134-
" " +
134+
' ' +
135135
this.currentDate.year
136-
);
136+
)
137137
},
138-
viewButtonText() {
139-
let text;
138+
viewButtonText () {
139+
let text
140140
switch (this.viewMode) {
141-
case "years":
142-
text = this.yearsRange;
143-
break;
144-
case "months":
145-
text = this.currentDate.year;
146-
break;
141+
case 'years':
142+
text = this.yearsRange
143+
break
144+
case 'months':
145+
text = this.currentDate.year
146+
break
147147
default:
148-
text = this.dayViewText;
148+
text = this.dayViewText
149149
}
150-
return text;
150+
return text
151151
},
152-
years() {
152+
years () {
153153
return this.calendar.years.map((y) => {
154-
let disable =
154+
const disable =
155155
(!!this.disableDate &&
156156
!!this.disableDate.from &&
157157
new Date(this.disableDate.from).getFullYear() < y) ||
158158
(!!this.disableDate.to &&
159-
new Date(this.disableDate.to).getFullYear() > y);
159+
new Date(this.disableDate.to).getFullYear() > y)
160160
return {
161161
year: y,
162-
disable,
163-
};
164-
});
162+
disable
163+
}
164+
})
165165
},
166-
months() {
167-
let { year } = this.currentDate;
168-
let endDate = new Date(this.disableDate.to)
169-
let startDate = new Date(this.disableDate.from)
166+
months () {
167+
const { year } = this.currentDate
168+
const endDate = new Date(this.disableDate.to)
169+
const startDate = new Date(this.disableDate.from)
170170
171171
return this.calendar.months.map((m) => {
172172
let disable = true
@@ -176,73 +176,73 @@ export default {
176176
endDate.getFullYear() >= year) ||
177177
(!!this.disableDate.from &&
178178
startDate.getMonth() > m.index &&
179-
startDate.getFullYear() <= year);
179+
startDate.getFullYear() <= year)
180180
} else {
181181
disable = (this.disableDate.from &&
182182
startDate.getMonth() < m.index &&
183183
startDate.getFullYear() <= year)
184184
}
185185
return {
186186
disable,
187-
...m,
188-
};
189-
});
190-
},
187+
...m
188+
}
189+
})
190+
}
191191
},
192192
methods: {
193-
getDate(date) {
194-
return new Date(date).setHours(0, 0, 0, 0);
195-
},
196-
isInSelectedDate(date) {
197-
if (!this.range) return null;
198-
let selectedDate1 = this.getDate(this.selectedDate[0]);
199-
let selectedDate2 = this.getDate(this.selectedDate[1]);
200-
let currentDate = this.getDate(date);
193+
getDate (date) {
194+
return new Date(date).setHours(0, 0, 0, 0)
195+
},
196+
isInSelectedDate (date) {
197+
if (!this.range) return null
198+
const selectedDate1 = this.getDate(this.selectedDate[0])
199+
const selectedDate2 = this.getDate(this.selectedDate[1])
200+
const currentDate = this.getDate(date)
201201
202-
return selectedDate1 <= currentDate && selectedDate2 >= currentDate;
202+
return selectedDate1 <= currentDate && selectedDate2 >= currentDate
203203
},
204-
handlerDate(fullDate) {
205-
this.$emit("handlerDate", { fullDate, picker: this.pickerType });
204+
handlerDate (fullDate) {
205+
this.$emit('handlerDate', { fullDate, picker: this.pickerType })
206206
},
207-
prev() {
207+
prev () {
208208
switch (this.viewMode) {
209-
case "days":
210-
this.$emit("prevMonth", this.pickerType);
211-
break;
212-
case "months":
213-
this.$emit("setUniqYear", {
209+
case 'days':
210+
this.$emit('prevMonth', this.pickerType)
211+
break
212+
case 'months':
213+
this.$emit('setUniqYear', {
214214
year: this.currentDate.year - 1,
215-
picker: this.pickerType,
216-
});
217-
break;
218-
case "years":
219-
this.$emit("setYears", { route: "prev", picker: this.pickerType });
215+
picker: this.pickerType
216+
})
217+
break
218+
case 'years':
219+
this.$emit('setYears', { route: 'prev', picker: this.pickerType })
220220
}
221221
},
222-
next() {
222+
next () {
223223
switch (this.viewMode) {
224-
case "days":
225-
this.$emit("nextMonth", this.pickerType);
226-
break;
227-
case "months":
228-
this.$emit("setUniqYear", {
224+
case 'days':
225+
this.$emit('nextMonth', this.pickerType)
226+
break
227+
case 'months':
228+
this.$emit('setUniqYear', {
229229
year: this.currentDate.year + 1,
230-
picker: this.pickerType,
231-
});
232-
break;
233-
case "years":
234-
this.$emit("setYears", { route: "next", picker: this.pickerType });
230+
picker: this.pickerType
231+
})
232+
break
233+
case 'years':
234+
this.$emit('setYears', { route: 'next', picker: this.pickerType })
235235
}
236236
},
237-
changeViewMode(mode) {
238-
this.$emit("changeViewMode", { mode, picker: this.pickerType });
237+
changeViewMode (mode) {
238+
this.$emit('changeViewMode', { mode, picker: this.pickerType })
239239
},
240-
setYear(year) {
241-
this.$emit("setYear", { year, picker: this.pickerType });
240+
setYear (year) {
241+
this.$emit('setYear', { year, picker: this.pickerType })
242242
},
243-
setMonth(month) {
244-
this.$emit("setMonth", { month, picker: this.pickerType });
245-
},
246-
},
247-
};
243+
setMonth (month) {
244+
this.$emit('setMonth', { month, picker: this.pickerType })
245+
}
246+
}
247+
}
248248
</script>

0 commit comments

Comments
 (0)