Skip to content

Commit fefaa83

Browse files
committed
优化日历模块逻辑,调整数据处理顺序
1 parent 24dd7f3 commit fefaa83

File tree

2 files changed

+28
-9
lines changed

2 files changed

+28
-9
lines changed

src/calendar/module-calendar.ts

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ export class M_calendar {
8282
//加上周期
8383
const avids_zq = await this.getAVreferenceid('周期');
8484
console.log(avids);
85-
if (avids.includes(msg.data[0].doOperations[0].avID)||avids_zq.includes(msg.data[0].doOperations[0].avID)) {
85+
if (avids.includes(msg.data[0].doOperations[0].avID) || avids_zq.includes(msg.data[0].doOperations[0].avID)) {
8686
console.log("更新了日程信息");
8787
//延时执行
8888
this.avButton();//数据库每次更新都会重新加载页面
@@ -142,7 +142,7 @@ export class M_calendar {
142142
private avButton() {
143143
setTimeout(async () => {
144144
const targetSpans = Array.from(document.querySelectorAll('span[data-type="av-add-more"]'))
145-
.filter(span => span.closest('[name="日程"]') || span.closest('[name="周期"]'));
145+
.filter(span => span.closest('[name="日程"]') || span.closest('[name="周期"]'));
146146
// console.log(targetSpans, "targetSpans");
147147

148148
targetSpans.forEach(targetSpan => {
@@ -232,6 +232,18 @@ export class M_calendar {
232232

233233
}
234234

235+
showhelp() {
236+
// new Dialog({
237+
// title: null,
238+
// content: ``,
239+
// width: '70%',
240+
// height: '80vh',
241+
// disableClose: false,
242+
// hideCloseIcon: true,
243+
// });
244+
245+
}
246+
235247

236248

237249
onunload() {
@@ -408,6 +420,7 @@ export class M_calendar {
408420
console.error(`Invalid response for avId ${avId}:`, response);
409421
}
410422
}
423+
//周期部分
411424
const avIds_zq = await this.getAVreferenceid('周期');
412425
for (const avId of avIds_zq) {
413426
const response = await api.renderAttributeView(avId);
@@ -417,9 +430,9 @@ export class M_calendar {
417430
return {
418431
blockContent: row.cells[0]?.value?.block?.content || 'N/A', //标题
419432
dateContent: row.cells[1]?.value?.date?.content || 0, //日期
420-
textContent: row.cells[2]?.value?.text?.content || 'N/A', //描述
433+
textContent: row.cells[4]?.value?.text?.content || 'N/A', //描述
421434
rule: row.cells[3]?.value?.text?.content || 'N/A', //频率规则
422-
duration: row.cells[4]?.value?.number?.content || 1, //持续时间
435+
duration: row.cells[2]?.value?.number?.content || 1, //持续时间
423436
};
424437
});
425438
await this.runAddEvent(result, true);

src/setting-example.svelte

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,17 @@
7878
value: settings["cal-show-view"],
7979
},
8080
// {
81-
// type: "checkbox",
82-
// title: "日历视图夜间模式",
83-
// description: "启用日历视图夜间模式",
84-
// key: "cal-view-night",
85-
// value: settings["cal-view-night"],
81+
// type: "button",
82+
// title: "日程周期规则说明",
83+
// description: "日程周期规则说明",
84+
// key: "cal-rule",
85+
// value: settings["cal-rule"],
86+
// button: {
87+
// label: "查看",
88+
// callback: () => {
89+
// moduleInstances['M_calendar'].showhelp();
90+
// },
91+
// },
8692
// },
8793
{
8894
type: "button",

0 commit comments

Comments
 (0)