feat: 1.任务管理修改

JuckZ · May 6, 2023 · 79e3acc · 79e3acc
1 parent cb61326
commit 79e3acc
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 61 deletions.
diff --git a/src/ui/PomodoroHistory.vue b/src/ui/PomodoroHistory.vue
@@ -12,7 +12,6 @@
  <H1Title></H1Title>
  <!-- <Title></Title> -->
  <OverView :all-pomodoro="pomodoroHistory" />
- <DataViewTimeLine />
  <TaskSelector></TaskSelector>
  <ClockView></ClockView>
  <TimeLine :time="focusTime" />
@@ -55,7 +54,6 @@ import {
 import CalendarView from './CalendarView.vue';
 import OverView from './OverView.vue';
 import TaskSelector from './TaskSelector.vue';
-import DataViewTimeLine from './DataViewTimeLine.vue';
 import ClockView from './ClockView.vue';
 import TimeLine from './TimeLine.vue';
 import TestTitle from './TestTitle';

diff --git a/src/ui/TaskSelector.vue b/src/ui/TaskSelector.vue
@@ -1,41 +1,24 @@
 <template>
  <div>
- <div @click="openSelectorModal">专注 +</div>
- <div class="taskListContainer">
- <div
- v-for="task in taskList"
- :key="task.id"
- @mouseenter="previewTask($event, task)"
- @click="onClicked($event, task)"
- >
- <input type="checkbox" :checked="task.status !== ' '" @click="onChecked($event, task)" />
- {{ task.text }}
- </div>
- </div>
- <div>
- <div id="helloEl">hello</div>
- <n-modal
- v-model:show="showModal"
- :mask-closable="false"
- preset="dialog"
- title="确认"
- content="你确认"
- positive-text="确认"
- negative-text="算了"
- @positive-click="onPositiveClick"
- @negative-click="onNegativeClick"
- />
- </div>
+ <div class="selectorTrigger" @click="openSelectorModal">专注 &gt;</div>
+ <n-modal
+ v-model:show="showModal"
+ :mask-closable="true"
+ preset="dialog"
+ @positive-click="onPositiveClick"
+ @negative-click="onNegativeClick"
+ >
+ <DataViewTimeLine></DataViewTimeLine>
+ </n-modal>
  </div>
 </template>
 
 <script setup lang="ts">
-import { useMessage } from 'naive-ui';
+import { NModal, useMessage } from 'naive-ui';
 import { Component, MarkdownPreviewView, MarkdownView, Platform } from 'obsidian';
-import { type SListItem, STask, getAPI as getDataviewApi } from 'obsidian-dataview';
 import { type Ref, ref } from 'vue';
+import DataViewTimeLine from './DataViewTimeLine.vue';
 import { CommonModal } from '@/ui/modal';
-
 import {
  concentrateTasks,
  importantTasks,
@@ -48,43 +31,36 @@ import {
 
 const message = useMessage();
 const showModal = ref(false);
-const taskList: Ref<STask[]> = ref([]);
-
-const DataviewAPI = getDataviewApi();
+const onPositiveClick = () => {
+ message.success({
+ title: '成功',
+ content: '你点击了确认',
+ });
+ showModal.value = false;
+};
+const onNegativeClick = () => {
+ message.info({
+ title: '提示',
+ content: '你点击了取消',
+ });
+ showModal.value = false;
+};
 
 const openSelectorModal = () => {
- console.log(123123);
-
- const modal = new CommonModal(window.app, activeDocument.querySelector('#helloEl'));
- modal.open();
  showModal.value = true;
+ // activeDocument.body.createEl('div', {
+ // attr: {
+ // id: 'helloEl',
+ // },
+ // });
+ // const modal = new CommonModal(window.app, activeDocument.querySelector('#helloEl'));
+ // modal.open();
 };
 </script>
 
 <style lang="scss" scoped>
-.taskListContainer {
- margin: 8px 0;
- max-height: 300px;
- max-width: 100%;
+.selectorTrigger {
  cursor: pointer;
- overflow-y: scroll;
- word-wrap: break-word;
- word-break: break-all;
- overflow-x: hidden;
-
- input {
- cursor: pointer;
- }
-
- div {
- padding: 4px 8px;
- border-radius: 4px;
- margin: 4px 0;
- background-color: rgba(0, 0, 0, 0.1);
- transition: background-color 0.2s ease-in-out;
- }
- div:hover {
- background-color: rgba(0, 183, 255, 0.692);
- }
+ padding: 5px;
 }
 </style>