mirror of
https://gitcode.com/gh_mirrors/hy/Hydro.git
synced 2026-10-19 17:38:19 +08:00
upgrade dep:
css-loader 0.28->3.5 del 4.1->5.1 eslint 5.18->6.8 eslint-config-airbnb 17.1->18.1 eslint-loader 2.1->4.0 file-loader 2.0->6.0 fs.extra 8.0->9.0 gulp 2.0->3.0 gulp-nunjucks 4.0->5.0 json-loader 0.5->Removed style-loader 0.23->1.1 uglifyjs-webpack-plugin 1.3->2.2 yargs 13.2->15.3 katex 0.10->0.11 react-monaco-editor 0.35->0.36 timeage-react 1.2->3.0 timeago.js 3.0->4.0 uuid 3.3->7.0
This commit is contained in:
1 parent
9cb68397b9
commit
f9468536de
55 files changed
+776
-1032
No files matched your search
@@ -27,7 +27,7 @@ export default class Calendar {
|
||||
<div class="calendar__body-container"></div>
|
||||
</div>
|
||||
`);
|
||||
this.events = events.map(ev => ({
|
||||
this.events = events.map((ev) => ({
|
||||
...ev,
|
||||
beginAt: moment(ev.beginAt),
|
||||
endAt: moment(ev.endAt),
|
||||
@@ -258,11 +258,11 @@ export default class Calendar {
|
||||
|
||||
// layout banners
|
||||
const layout = bannersByWeek
|
||||
.map(banners => _
|
||||
.map((banners) => _
|
||||
.sortBy(banners, [
|
||||
banner => banner.beginAt.valueOf(),
|
||||
banner => (banner.beginTrunc ? 0 : 1), // truncated events first
|
||||
banner => -banner.endAt.valueOf(), // long events first
|
||||
(banner) => banner.beginAt.valueOf(),
|
||||
(banner) => (banner.beginTrunc ? 0 : 1), // truncated events first
|
||||
(banner) => -banner.endAt.valueOf(), // long events first
|
||||
]))
|
||||
.map((banners) => {
|
||||
const dayBitmap = _
|
||||
@@ -274,12 +274,12 @@ export default class Calendar {
|
||||
// find available space
|
||||
const vIndexMax = _.max(_
|
||||
.range(beginDay, endDay + 1)
|
||||
.map(day => dayBitmap[day].length));
|
||||
.map((day) => dayBitmap[day].length));
|
||||
let vIndex = 0;
|
||||
for (; vIndex < vIndexMax; ++vIndex) {
|
||||
if (_.every(_
|
||||
.range(beginDay, endDay + 1)
|
||||
.map(day => !dayBitmap[day][vIndex]) // eslint-disable-line no-loop-func
|
||||
.map((day) => !dayBitmap[day][vIndex]) // eslint-disable-line no-loop-func
|
||||
)) { // eslint-disable-line function-paren-newline
|
||||
break;
|
||||
}
|
||||
@@ -290,7 +290,7 @@ export default class Calendar {
|
||||
}
|
||||
});
|
||||
// merge adjacent cells and arrange banners by vertical index
|
||||
const vMaxLength = _.max(_.range(0, 7).map(day => dayBitmap[day].length));
|
||||
const vMaxLength = _.max(_.range(0, 7).map((day) => dayBitmap[day].length));
|
||||
const weekBanners = _
|
||||
.fill(new Array(vMaxLength), 1)
|
||||
.map(() => []);
|
||||
|
||||
Reference in new issue
Block a user