feat: 长期计划(目标→每日任务物化+进度条) / 详情页Markdown范围导出 / 记账与详情页改内容优先弹窗新增

intern-log/src/components/log/DayPanel.vue

@@ -161,61 +161,15 @@ async function saveMakeupForm() {
   showToast('补卡已保存')
 }
 
-// ---- 新增工作记录 ----
-const content = ref('')
-const contentError = ref('')
-watch(content, () => {
-  if (contentError.value) contentError.value = ''
-})
-const projectId = ref<number | null>(null)
-const category = ref('dev')
-const minutesVal = ref<number | null>(null)
-const takeawayVal = ref('')
-const remarkVal = ref('')
-const submitting = ref(false)
-const formDirty = computed(() => !!(content.value.trim() || minutesVal.value || takeawayVal.value.trim() || remarkVal.value.trim()))
-
-onMounted(async () => {
-  const lp = await getLastPick()
-  projectId.value = lp.project_id
-  category.value = lp.category
-})
-
-function resetForm() {
-  content.value = ''
-  minutesVal.value = null
-  takeawayVal.value = ''
-  remarkVal.value = ''
-  contentError.value = ''
-}
-
-async function submit() {
-  const text = content.value.trim()
-  if (!text) {
-    contentError.value = '请填写工作内容'
-    return
-  }
-  if (submitting.value) return
-  submitting.value = true
-  await addLogItem(props.date, {
-    content: text,
-    project_id: projectId.value,
-    category: category.value,
-    minutes: minutesVal.value && minutesVal.value > 0 ? minutesVal.value : null,
-    takeaway: takeawayVal.value.trim() || null,
-    remark: remarkVal.value.trim() || null
-  })
-  resetForm()
-  await load()
-  showToast('记录已添加')
-  submitting.value = false
-}
 
 // ---- 条目操作 ----
 const editTarget = ref<LogItem | null>(null)
 function openEdit(it: LogItem) {
   editTarget.value = it
 }
+function openAdd() {
+  editTarget.value = null
+}
 async function onEditSave(payload: {
   id: number
   content: string
@@ -227,21 +181,22 @@ async function onEditSave(payload: {
   is_milestone: number
   needs_followup: number
 }) {
-  const id = payload.id
-  const patch = {
-    content: payload.content,
-    project_id: payload.project_id,
-    category: payload.category,
-    minutes: payload.minutes,
-    takeaway: payload.takeaway,
-    remark: payload.remark,
-    is_milestone: payload.is_milestone,
-    needs_followup: payload.needs_followup
+  if (payload.id) {
+    await updateLogItem(payload.id, {
+      content: payload.content, project_id: payload.project_id, category: payload.category,
+      minutes: payload.minutes, takeaway: payload.takeaway, remark: payload.remark,
+      is_milestone: payload.is_milestone, needs_followup: payload.needs_followup
+    })
+    showToast('记录已更新')
+  } else {
+    await addLogItem(props.date, {
+      content: payload.content, project_id: payload.project_id, category: payload.category,
+      minutes: payload.minutes, takeaway: payload.takeaway, remark: payload.remark
+    })
+    showToast('记录已添加')
   }
-  await updateLogItem(id, patch)
   editTarget.value = null
   await load()
-  showToast('修改已保存')
 }
 async function toggleMilestone(it: LogItem) {
   await updateLogItem(it.id as number, { is_milestone: it.is_milestone ? 0 : 1 })
@@ -381,54 +336,11 @@ async function confirmDelete() {
       </div>
     </div>
 
-    <div class="card sec">
-      <div class="sec-head">
-        <span class="sec-title">新增工作记录</span>
-        <span class="muted form-hint">内容必填，其余选填</span>
-      </div>
-      <div class="form-grid">
-        <div class="field span2">
-          <label>工作内容（必填）</label>
-          <input
-            class="input" :class="{ invalid: contentError }"
-            v-model="content" placeholder="做了什么，一句话一条" @keydown.enter="submit"
-          />
-          <div v-if="contentError" class="form-error">{{ contentError }}</div>
-        </div>
-        <div class="field">
-          <label>所属项目</label>
-          <select class="select" v-model="projectId">
-            <option :value="null">无项目</option>
-            <option v-for="p in projects" :key="p.id" :value="p.id">{{ p.name }}</option>
-          </select>
-        </div>
-        <div class="field">
-          <label>工作分类</label>
-          <select class="select" v-model="category">
-            <option v-for="c in logCats" :key="c" :value="c">{{ c }}</option>
-          </select>
-        </div>
-        <div class="field">
-          <label>耗时（分钟）</label>
-          <input class="input" type="number" min="0" v-model.number="minutesVal" placeholder="选填" />
-        </div>
-        <div class="field">
-          <label>主要收获</label>
-          <input class="input" v-model="takeawayVal" placeholder="一句话：学到了什么" />
-        </div>
-        <div class="field span2">
-          <label>备注</label>
-          <textarea class="textarea" v-model="remarkVal" placeholder="背景、链接、未决事项（选填）"></textarea>
-        </div>
-      </div>
-      <div class="form-footer">
-        <button class="btn btn-sm" :disabled="!formDirty" @click="resetForm">重置</button>
-        <button class="btn btn-primary btn-sm" :disabled="submitting" @click="submit">添加记录</button>
-      </div>
-    </div>
-
     <div class="list-sec">
-      <div class="sec-title">工作记录（{{ items.length }}）</div>
+      <div class="sec-head">
+        <span class="sec-title">工作记录（{{ items.length }}）</span>
+        <button class="btn btn-primary btn-sm" @click="openAdd"><Icon name="plus" :size="14" /> 添加记录</button>
+      </div>
       <div v-if="!items.length && !loading" class="empty muted">暂无记录</div>
       <div v-for="it in items" :key="it.id" class="item">
         <div class="item-main">

intern-log/src/components/log/EditLogDialog.vue

@@ -89,7 +89,7 @@ function save() {
     return
   }
   if (!props.item || !props.item.id) {
-    emit('cancel')
+    emit('save', { id: 0, content: text, project_id: formProjectId.value, category: formCategory.value, minutes: formMinutes.value && formMinutes.value > 0 ? formMinutes.value : null, takeaway: formTakeaway.value.trim() || null, remark: formRemark.value.trim() || null, is_milestone: formMilestone.value, needs_followup: formFollowup.value })
     return
   }
   emit('save', {