Skip to content

Commit

Permalink
修复按钮,各种问题
Browse files Browse the repository at this point in the history
  • Loading branch information
dongrentianyu committed Aug 16, 2023
1 parent a122c95 commit d65feb0
Show file tree
Hide file tree
Showing 23 changed files with 157 additions and 174 deletions.
37 changes: 0 additions & 37 deletions src/time-for-task/Buttons/ToggleProject.tid

This file was deleted.

25 changes: 0 additions & 25 deletions src/time-for-task/Buttons/ToggleTask.tid

This file was deleted.

31 changes: 31 additions & 0 deletions src/time-for-task/ViewTemplate/UnderIdea/AddIntention.tid
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
title: $:/plugins/mabuqian/time-for-task/ViewTemplate/UnderIdea/AddIntention
caption: {{$:/core/images/tag-button}} 回路或项目
tags: $:/tags/TFT/UnderIntention

<style>
.parent {
display: grid;
grid-template-columns: repeat(2, 1fr);
grid-template-rows: 1fr;
grid-column-gap: 10px;
grid-row-gap: 0px;
}
.div1 { grid-area: 1 / 1 / 2 / 2; }
.div2 { grid-area: 1 / 2 / 2 / 3; }
</style>
<div class="parent">
<div class="div1">
<$select tiddler='$:/state/tft/meaning' field='testing' multiple size='8' class="w-100">
<$list filter='[tft{$:/plugins/mabuqian/time-for-task/Config/resonance-tft}] [tft{$:/plugins/mabuqian/time-for-task/Config/project-tft}]'>
<option><$view field='title'/></option>
</$list>
</$select>
<$button>
<$action-setfield tags={{{ [[$:/state/tft/meaning]get[testing]] }}} />
确认添加
</$button>
</div>
<div class="div2">
<$edit-text field="tags" class="w-100" tag=textarea/>
</div>
</div>
20 changes: 20 additions & 0 deletions src/time-for-task/ViewTemplate/UnderIdea/UnderIdea.tid
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
title: $:/plugins/mabuqian/time-for-task/ViewTemplate/UnderIdea
list-after: $:/plugins/mabuqian/time-for-task/ViewTemplate/super-tag
tags: $:/tags/ViewTemplate

\import [[$:/plugins/mabuqian/time-for-task/Sidebar/Buttons]] [[$:/plugins/mabuqian/time-for-task/Components/Buttons]] [[$:/plugins/mabuqian/time-for-task/Components/Buttons/converted]]

<$let graphRootTiddler=<<currentTiddler>> >
<$list filter="[all[current]tft{$:/plugins/mabuqian/time-for-task/Config/idea-tft}then<graphRootTiddler>]">

<<idea-converted-to-task>>

<details>
<summary>查看更多信息</summary>

{{||$:/plugins/mabuqian/time-for-task/ViewTemplate/UnderIdea/AddIntention}}

</details>

</$list>
</$let>
24 changes: 13 additions & 11 deletions src/time-for-task/ViewTemplate/UnderIntention/UnderIntention.tid
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,22 @@ title: $:/plugins/mabuqian/time-for-task/ViewTemplate/UnderIntention
list-after: $:/plugins/mabuqian/time-for-task/ViewTemplate/super-tag
tags: $:/tags/ViewTemplate

\import [[$:/plugins/mabuqian/time-for-task/Sidebar/Buttons]] [[$:/plugins/mabuqian/time-for-task/Components/Buttons]]
\import [[$:/plugins/mabuqian/time-for-task/Sidebar/Buttons]] [[$:/plugins/mabuqian/time-for-task/Components/Buttons]] [[$:/plugins/mabuqian/time-for-task/Components/Buttons/converted]]

<$let graphRootTiddler=<<currentTiddler>> >
<$list filter="[all[current]tft{$:/plugins/mabuqian/time-for-task/Config/intention-tft}then<graphRootTiddler>]">

<<create-project-under-current-tiddler>>

<details>
<summary>查看更多信息</summary>

<<tabs "[all[tiddlers+shadows]tag[$:/tags/TFT/UnderIntention]] -[enlist{$:/config/ViewTemplate/UnderIntention}]" "$:/plugins/mabuqian/time-for-task/ViewTemplate/ProjectDynamicTable" "$:/state/tft/UnderIntention" "tc-vertical">>

</details>


<div class="tft-sidebar-project-list-item">
<<create-project-under-current-tiddler>>&nbsp;
<<intention-converted-to-resonance>>&nbsp;
</div>

<details>
<summary>查看更多信息</summary>

<<tabs "[all[tiddlers+shadows]tag[$:/tags/TFT/UnderIntention]] -[enlist{$:/config/ViewTemplate/UnderIntention}]" "$:/plugins/mabuqian/time-for-task/ViewTemplate/ProjectDynamicTable" "$:/state/tft/UnderIntention" "tc-vertical">>

</details>

</$list>
</$let>
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
title: $:/plugins/mabuqian/time-for-task/ViewTemplate/UnderProject/AddIntentionOrResonance
caption: {{$:/core/images/tag-button}} 添加意义或回路
caption: {{$:/core/images/tag-button}} 意义或回路
tags: $:/tags/TFT/UnderProject

<style>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
title: $:/plugins/mabuqian/time-for-task/ViewTemplate/IdeaDynamicTable
caption: {{$:/plugins/mabuqian/time-for-task/Images/idea}} 想法列表
tags: $:/tags/TFT/UnderProject

\import [[$:/plugins/mabuqian/time-for-task/filters/leaf-task]]

\define get-non-completed-leaf-ideas() [tag<currentTiddler>tft{$:/plugins/mabuqian/time-for-task/Config/idea-tft}]

<$macrocall $name=aggregation filter=<<get-non-completed-leaf-ideas>> defaultFields={{$:/plugins/mabuqian/time-for-task/Config/defaultFields-ideaDynamicTable}} class="w-100" state="TFT-TaskDynamicTable-state" />
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ title: $:/plugins/mabuqian/time-for-task/ViewTemplate/ProjectTaskCompletedDynami
caption: {{$:/plugins/mabuqian/time-for-task/Images/Table}} 已完成列表
tags: $:/tags/TFT/UnderProject

\define filter-projectTaskCompleted() [tag<currentTiddler>] -[tmo_taskState[New]] -[tmo_taskState[Running]]
\define filter-projectTaskCompleted() [tag<currentTiddler>has[tmo_taskState]] -[tmo_taskState[New]] -[tmo_taskState[Running]]

\define caption() 已完成列表 <$count filter=<<filter-projectTaskCompleted>> />
<$macrocall $name=aggregation caption=<<caption>> filter=<<filter-projectTaskCompleted>> defaultFields={{$:/plugins/mabuqian/time-for-task/Config/defaultFields-ProjectTaskCompletedDynamicTable}} class="w-100" state="TFT-ProjectTaskCompletedDynamicTable-state" />
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ tags: $:/tags/TFT/UnderProject

\import [[$:/plugins/mabuqian/time-for-task/filters/leaf-task]]

\define get-non-completed-leaf-tasks() [tag<currentTiddler>filter<filter-is-new-task>] [tag<currentTiddler>tft{$:/plugins/mabuqian/time-for-task/Config/idea-tft}]
\define get-non-completed-leaf-tasks() [tag<currentTiddler>filter<filter-is-new-task>]

<$macrocall $name=aggregation filter=<<get-non-completed-leaf-tasks>> defaultFields={{$:/plugins/mabuqian/time-for-task/Config/defaultFields-TaskDynamicTable}} class="w-100" state="TFT-TaskDynamicTable-state" />
9 changes: 6 additions & 3 deletions src/time-for-task/ViewTemplate/UnderProject/UnderProject.tid
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,23 @@ title: $:/plugins/mabuqian/time-for-task/ViewTemplate/UnderProject
list-after: $:/plugins/mabuqian/time-for-task/ViewTemplate/super-tag
tags: $:/tags/ViewTemplate

\import [[$:/plugins/mabuqian/time-for-task/Sidebar/Buttons]] [[$:/plugins/mabuqian/time-for-task/Components/Buttons]]
\import [[$:/plugins/mabuqian/time-for-task/Sidebar/Buttons]] [[$:/plugins/mabuqian/time-for-task/Components/Buttons]] [[$:/plugins/mabuqian/time-for-task/Components/Buttons/converted]]

<$let graphRootTiddler=<<currentTiddler>> >
<$list filter="[all[current]tft{$:/plugins/mabuqian/time-for-task/Config/project-tft}then<graphRootTiddler>]">

<div class="tft-sidebar-project-list-item">
<<create-task-under-project>>&nbsp;
<<create-idea-under-current-tiddler>>&nbsp;
<<project-converted-to-task>>&nbsp;
</div>

<details>
<details>
<summary>查看更多信息</summary>

<<tabs "[all[tiddlers+shadows]tag[$:/tags/TFT/UnderProject]] -[enlist{$:/config/ViewTemplate/UnderProject}]" "$:/plugins/mabuqian/time-for-task/ViewTemplate/TaskDynamicTable" "$:/state/tft/UnderProject" "tc-vertical">>

</details>
</details>

</$list>
</$let>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
title: $:/tags/TFT/UnderProject
list: $:/plugins/mabuqian/time-for-task/ViewTemplate/TaskDynamicTable $:/plugins/mabuqian/time-for-task/ViewTemplate/ProjectTaskCompletedDynamicTable $:/plugins/mabuqian/time-for-task/ViewTemplate/UnderProject/AddIntentionOrResonance $:/plugins/mabuqian/time-for-task/ViewTemplate/project-echarts
list: $:/plugins/mabuqian/time-for-task/ViewTemplate/TaskDynamicTable $:/plugins/mabuqian/time-for-task/ViewTemplate/ProjectTaskCompletedDynamicTable $:/plugins/mabuqian/time-for-task/ViewTemplate/IdeaDynamicTable $:/plugins/mabuqian/time-for-task/ViewTemplate/UnderProject/AddIntentionOrResonance $:/plugins/mabuqian/time-for-task/ViewTemplate/project-echarts

Tiddler with this tag will show in the section under project tiddler, become one of the tabs.
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,16 @@ title: $:/plugins/mabuqian/time-for-task/ViewTemplate/UnderResonance
list-after: $:/plugins/mabuqian/time-for-task/ViewTemplate/super-tag
tags: $:/tags/ViewTemplate

\import [[$:/plugins/mabuqian/time-for-task/Sidebar/Buttons]] [[$:/plugins/mabuqian/time-for-task/Components/Buttons]]
\import [[$:/plugins/mabuqian/time-for-task/Sidebar/Buttons]] [[$:/plugins/mabuqian/time-for-task/Components/Buttons]] [[$:/plugins/mabuqian/time-for-task/Components/Buttons/converted]]

<$let graphRootTiddler=<<currentTiddler>> >
<$list filter="[all[current]tft{$:/plugins/mabuqian/time-for-task/Config/resonance-tft}then<graphRootTiddler>]">

<div class="tft-sidebar-project-list-item">
<<create-project-under-current-tiddler>>&nbsp;
<<resonance-converted-to-intention>>&nbsp;
</div>

<<create-project-under-current-tiddler>>

<details>
<summary>查看更多信息</summary>
Expand Down
3 changes: 2 additions & 1 deletion src/time-for-task/ViewTemplate/UnderTask/UnderTask.tid
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ title: $:/plugins/mabuqian/time-for-task/ViewTemplate/UnderTask
list-after: $:/plugins/mabuqian/time-for-task/ViewTemplate/super-tag
tags: $:/tags/ViewTemplate

\import [[$:/plugins/mabuqian/time-for-task/Components/Buttons]]
\import [[$:/plugins/mabuqian/time-for-task/Sidebar/Buttons]] [[$:/plugins/mabuqian/time-for-task/Components/Buttons]] [[$:/plugins/mabuqian/time-for-task/Components/Buttons/converted]]

<$let graphRootTiddler=<<currentTiddler>> >
<$list filter="[all[current]tft{$:/plugins/mabuqian/time-for-task/Config/task-tft}!tft{$:/plugins/mabuqian/time-for-task/Config/project-tft}then<graphRootTiddler>]">
Expand All @@ -12,6 +12,7 @@ tags: $:/tags/ViewTemplate
<<create-task-under-current-tiddler>>&nbsp;
<<create-idea-under-current-tiddler>>&nbsp;
<<create-next-task-under-current-tiddler>>&nbsp;
<<task-converted-to-project>>&nbsp;
<<counts-number-of-completions>>&nbsp;
</div>

Expand Down
13 changes: 7 additions & 6 deletions src/time-for-task/components/Buttons.tid
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ title: $:/plugins/mabuqian/time-for-task/Components/Buttons
tags={{!!tags}}
tmo_taskState="New"
tmo_timeSpent="30"
tmo_priority="">
tmo_priority="Medium">
<$action-sendmessage $message="tm-edit-tiddler" $param=<<createTiddler-title>>/>
</$action-createtiddler>
{{$:/plugins/mabuqian/time-for-task/Images/Task}} 新子任务
Expand All @@ -26,7 +26,7 @@ title: $:/plugins/mabuqian/time-for-task/Components/Buttons
tags=<<currentTiddler>>
tmo_taskState="New"
tmo_timeSpent="30"
tmo_priority="">
tmo_priority="Medium">
<$action-sendmessage $message="tm-edit-tiddler" $param=<<createTiddler-title>>/>
</$action-createtiddler>
{{$:/plugins/mabuqian/time-for-task/Images/Task}} 新子任务
Expand Down Expand Up @@ -55,7 +55,7 @@ title: $:/plugins/mabuqian/time-for-task/Components/Buttons
tft={{$:/plugins/mabuqian/time-for-task/Config/task-tft}}
super-tag=<<super-tag>>
tmo_taskState="New"
tmo_priority=""
tmo_priority="Medium"
tmo_timeSpent="30"
tmo_dependency=<<currentTiddler>> >
<$action-sendmessage $message="tm-edit-tiddler" $param=<<createTiddler-title>>/>
Expand All @@ -71,7 +71,8 @@ title: $:/plugins/mabuqian/time-for-task/Components/Buttons
tft={{$:/plugins/mabuqian/time-for-task/Config/project-tft}}
super-tag={{$:/plugins/mabuqian/time-for-task/Config/project-tft}}
tags=<<currentTiddler>>
tmo_projectState="New">
tmo_projectState="New"
tmo_projectPriority="Medium">
<$action-sendmessage $message="tm-edit-tiddler" $param=<<createTiddler-title>>/>
</$action-createtiddler>
{{$:/plugins/mabuqian/time-for-task/Images/Project}} 新项目
Expand Down Expand Up @@ -100,7 +101,7 @@ title: $:/plugins/mabuqian/time-for-task/Components/Buttons
tmo_taskState="New"
tmo_timeSpent="30"
super-tag=<<super-tag>>
tmo_priority=""
tmo_priority="Medium"
>
<<after-create-tiddler-without-parent>>
</$action-createtiddler>
Expand All @@ -118,7 +119,7 @@ title: $:/plugins/mabuqian/time-for-task/Components/Buttons
tmo_taskState="New"
tmo_timeSpent="30"
super-tag=<<super-tag>>
tmo_priority=""
tmo_priority="Medium"
tmo_dueDate=<<now "YYYY-0MM-0DD" >>
>
<<after-create-tiddler-without-parent>>
Expand Down
59 changes: 59 additions & 0 deletions src/time-for-task/components/converted.tid
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
title: $:/plugins/mabuqian/time-for-task/Components/Buttons/converted

\define task-converted-to-project()
<$list filter="[<currentTiddler>tft{$:/plugins/mabuqian/time-for-task/Config/task-tft}!tft{$:/plugins/mabuqian/time-for-task/Config/project-tft}]" variable="ignore">
<$button tooltip="设为项目" aria-label="设为项目" >
<$action-setfield tft={{$:/plugins/mabuqian/time-for-task/Config/project-tft}} />
<$action-setfield super-tag={{$:/plugins/mabuqian/time-for-task/Config/project-tft}} />
{{$:/plugins/mabuqian/time-for-task/Images/SetAsProject}} 设为项目
</$button>
</$list>
\end

\define project-converted-to-task()
<$list filter="[<currentTiddler>tft{$:/plugins/mabuqian/time-for-task/Config/project-tft}]" variable="ignore">
<$button tooltip="把项目改成任务" aria-label="把项目改成任务" >
<$set name="super-tag" filter="[{$:/plugins/mabuqian/time-for-task/Config/time-tft}] [{$:/plugins/mabuqian/time-for-task/Config/task-tft}]">
<$action-setfield tft={{$:/plugins/mabuqian/time-for-task/Config/task-tft}} />
<$action-setfield super-tag=<<super-tag>> />
{{$:/plugins/mabuqian/time-for-task/Images/SetAsNotProject}} 设为任务
</$set>
</$button>
</$list>
\end

\define idea-converted-to-task()
<$list filter="[<currentTiddler>tft{$:/plugins/mabuqian/time-for-task/Config/idea-tft}]">
<$button tooltip="设为任务" aria-label="设为任务" >
<$action-setfield
tft={{$:/plugins/mabuqian/time-for-task/Config/task-tft}}
super-tag={{$:/plugins/mabuqian/time-for-task/Config/task-tft}}
tmo_taskState="New"
tmo_priority="Medium"
/>
{{$:/plugins/mabuqian/time-for-task/Images/ToggleTask}} 设为任务
</$button>
</$list>
\end

\define resonance-converted-to-intention()
<$list filter="[<currentTiddler>tft{$:/plugins/mabuqian/time-for-task/Config/resonance-tft}]">
<$button tooltip="设为意义" aria-label="设为意义" >
<$action-setfield
tft={{$:/plugins/mabuqian/time-for-task/Config/intention-tft}}
/>
{{$:/plugins/mabuqian/time-for-task/Images/Motivation}} 设为意义
</$button>
</$list>
\end

\define intention-converted-to-resonance()
<$list filter="[<currentTiddler>tft{$:/plugins/mabuqian/time-for-task/Config/intention-tft}]">
<$button tooltip="设为回路" aria-label="设为回路" >
<$action-setfield
tft={{$:/plugins/mabuqian/time-for-task/Config/resonance-tft}}
/>
{{$:/plugins/mabuqian/time-for-task/Images/resonance}} 设为回路
</$button>
</$list>
\end
18 changes: 0 additions & 18 deletions wiki/tiddlers/00.tid

This file was deleted.

Loading

0 comments on commit d65feb0

Please sign in to comment.