Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# Changelog

## v1.8.0 (2026-11-10)

### Added
- 日 K 主图均线支持在「设置 → 通用」配置周期和条数,最多添加 10 条
- 分时图新增均价线与成交量副图

### Changed
- 分时图纵轴按当日行情自适应,单边走势也能充分利用图表空间

## v1.7.0 (2026-11-09)

### Added
Expand Down
5 changes: 3 additions & 2 deletions CLAUDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ $env:TAURI_SIGNING_PRIVATE_KEY_PASSWORD = "your-password"
| `utils/changelog.spec.ts` | 更新说明解析:版本/日期/小节、CRLF、坏输入不抛错 |
| `utils/dragSort.spec.ts` / `paging.spec.ts` | 拖拽落点(四向 × 前后)、轮播窗口(短列表不自转) |
| `utils/watchGroups.spec.ts` | 删除分组确认框的两份名单(顺序、去重、目标不存在给空) |
| `utils/minuteBars.spec.ts` / `minuteAxis.spec.ts` | 分时图交易日切分、昨收、未来 bar 的 UTC+8 上界;网格槽位/偏移/刻度与窄宽回退 |
| `utils/minuteBars.spec.ts` / `minuteAxis.spec.ts` | 分时图交易日切分、昨收、未来 bar 的 UTC+8 上界、当日累计均价(含零成交量);网格槽位/偏移/刻度与窄宽回退、自适应纵轴(单边行情不压半区、均价参与取幅) |
| `utils/paneSize.spec.ts` | 副图高度按 28% 夹在 48–80px;高度未知时给兜底值 |
| `composables/useTickerWindowHeight.spec.ts` | 行情条改高时下边缘不动 |
| `composables/useEscapeKey.spec.ts` | 详情 Esc 关闭:只认 Escape、输入法组合中不触发、卸载即摘监听 |
| `utils/webLog.spec.ts` | 日志桥:参数拼接、字符截断、去重窗口、窗口前缀 |
Expand Down Expand Up @@ -168,7 +169,7 @@ DataSource → Scheduler → QuoteCache(内存 + SQLite)
→ Pinia stores → Vue 组件(主窗口 + 行情条)
```

按需请求:深度 3s、分时 5s、日 K 30s、周/月 K 60s。分时/K 线的关键约束(日期来自数据而非本机时钟、以 UTC+8 墙钟过滤未来 bar、网格按会话固定、composable 自己注册卸载)见 [minuteBars.ts](src/utils/minuteBars.ts)、[minuteAxis.ts](src/utils/minuteAxis.ts)、[useMinuteChart.ts](src/composables/useMinuteChart.ts) 的注释与 spec。
按需请求:深度 3s、分时 5s、日 K 30s、周/月 K 60s。分时/K 线的关键约束(日期来自数据而非本机时钟、以 UTC+8 墙钟过滤未来 bar、网格按会话固定、composable 自己注册卸载)见 [minuteBars.ts](src/utils/minuteBars.ts)、[minuteAxis.ts](src/utils/minuteAxis.ts)、[useMinuteChart.ts](src/composables/useMinuteChart.ts) 的注释与 spec。分时图的均价线由前端按成交量累计 VWAP(`cumulativeAvgPrices`)—— 后端 `MinuteData.avg_price` 在两个适配器里填的都是 bar 的开盘价,不能直接画;成交量是独立副图 pane(`VOL`,`calcParams: []` 只留量柱),副图高度与 K 线同一套 28%/48–80px 规则。均价读数并进蜡烛 tooltip 的同一行(放在「量」后面),均价指标自己那行图例靠空 `shortName` + 无 `title` 的 figure 关掉 —— 否则 klinecharts 会把指标图例画在蜡烛图例下方的独立行。

自选写操作:`invoke` → Rust → SQLite → 前端重拉;每个影响自选的命令都发 `watchlist-changed`,行情条靠它同步。数据源切换走 `Notify` 立即刷新。

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
[![CI](https://github.com/Leaderxin/quant-desktop/actions/workflows/ci.yml/badge.svg)](https://github.com/Leaderxin/quant-desktop/actions/workflows/ci.yml)
[![Downloads](https://img.shields.io/github/downloads/Leaderxin/quant-desktop/total?style=flat-square)](https://github.com/Leaderxin/quant-desktop/releases)

[![下载最新版](https://img.shields.io/badge/%E4%B8%8B%E8%BD%BD%E6%9C%80%E6%96%B0%E7%89%88-v1.7.0-2ea44f?style=for-the-badge)](https://github.com/Leaderxin/quant-desktop/releases/latest)
[![下载最新版](https://img.shields.io/badge/%E4%B8%8B%E8%BD%BD%E6%9C%80%E6%96%B0%E7%89%88-v1.8.0-2ea44f?style=for-the-badge)](https://github.com/Leaderxin/quant-desktop/releases/latest)
[![Microsoft Store](https://img.shields.io/badge/Microsoft_Store-%E4%B8%8B%E8%BD%BD-00A4EF?style=for-the-badge)](https://apps.microsoft.com/detail/9P46MZZDTTZ0)
[![加入交流群](https://img.shields.io/badge/%E5%8A%A0%E5%85%A5%E4%BA%A4%E6%B5%81%E7%BE%A4-%E5%BE%AE%E4%BF%A1-07c160?style=for-the-badge)](#-贡献与交流)

Expand Down Expand Up @@ -342,6 +342,6 @@ Windows 10 / 11、macOS(Intel + Apple Silicon)、Linux(Ubuntu 22.04+ / gli

**如果 QuantDesktop 对你有用,欢迎点一个 ⭐ Star —— 这是持续开发的动力!**

QuantDesktop v1.7.0 · 让看盘更安静一点
QuantDesktop v1.8.0 · 让看盘更安静一点

</div>
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "quant-desktop",
"private": true,
"version": "1.7.0",
"version": "1.8.0",
"type": "module",
"scripts": {
"dev": "vite",
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "quant-desktop"
version = "1.7.0"
version = "1.8.0"
description = "A Tauri App"
authors = ["Leaderxin"]
edition = "2021"
Expand Down
3 changes: 3 additions & 0 deletions src-tauri/src/db/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ pub mod keys {
pub const WATCHLIST_COLUMNS: &str = "watchlist_columns";
pub const WATCHLIST_DEFAULT_SORT: &str = "watchlist_default_sort";
pub const COLOR_SCHEME: &str = "color_scheme";
pub const MOVING_AVERAGE_PERIODS: &str = "moving_average_periods";
/// 老板键(全局快捷键,按下即隐藏主窗口)。空串表示不设 —— 见 `crate::hotkey`。
pub const BOSS_KEY: &str = "boss_key";

Expand Down Expand Up @@ -359,6 +360,7 @@ impl Database {
(keys::WATCHLIST_COLUMNS, DEFAULT_WATCHLIST_COLUMNS_JSON),
(keys::WATCHLIST_DEFAULT_SORT, ""),
(keys::COLOR_SCHEME, "cn"),
(keys::MOVING_AVERAGE_PERIODS, r#"{"periods":[5,10,20,60]}"#),
// 通用。默认不占用任何全局热键:注册一个用户没要的组合键会去抢别的软件
// 已经在用的键,而失败的提示用户根本看不到(设置页没开)。空串 = 不注册。
(keys::BOSS_KEY, ""),
Expand Down Expand Up @@ -1887,6 +1889,7 @@ mod tests {
"watchlist_columns",
"watchlist_default_sort",
"color_scheme",
"moving_average_periods",
"boss_key",
]
);
Expand Down
6 changes: 3 additions & 3 deletions src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "https://schema.tauri.app/config/2",
"productName": "quant-desktop",
"version": "1.7.0",
"version": "1.8.0",
"identifier": "com.leaderxin.quant-desktop",
"build": {
"beforeDevCommand": "npm run dev",
Expand Down Expand Up @@ -68,9 +68,9 @@
"plugins": {
"updater": {
"endpoints": [
"https://github.com/Leaderxin/quant-desktop/releases/latest/download/latest.json"
"https://github.com/T0n0T/quant-desktop/releases/latest/download/latest.json"
],
"pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDdCMjNCQkVDMTAxRjJBMUMKUldRY0toOFE3THNqZTh6bVNtWHlyZmk2N2ZHeEprVXNXRVFtRzF3aHIvNXlPTmRHbzhoTXNla08K",
"pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEREM0JGNzM0NDY0OTMxMTEKUldRUk1VbEdOUGM3M1ZKRGM5Y2hEZHlXNnRIS0RLM2NNb1JWcXpLakRZUW92V0JUMEdqSEQ0bzEK",
"windows": {
"installMode": "passive"
}
Expand Down
164 changes: 157 additions & 7 deletions src/components/settings/GeneralSection.vue
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
<script setup lang="ts">
// 通用:主题、开机自启、数据源、快捷键。
// 通用:主题、开机自启、数据源、快捷键与 K 线均线。
import { computed } from 'vue';
import { NSwitch, NSelect } from 'naive-ui';
import { CircleAlert, Monitor, Moon, Sun } from '@lucide/vue';
import { NSwitch, NSelect, NInputNumber, NButton, NForm, NFormItem } from 'naive-ui';
import { CircleAlert, Monitor, Moon, Sun, Plus, Trash2 } from '@lucide/vue';
import { useSettingsStore } from '@/stores/settings';
import {
MAX_MOVING_AVERAGE_COUNT,
MAX_MOVING_AVERAGE_PERIOD,
MIN_MOVING_AVERAGE_PERIOD,
nextMovingAveragePeriod,
} from '@/utils/movingAverage';
import SettingsRow from './SettingsRow.vue';
import SegmentedControl from './SegmentedControl.vue';
import HotkeyInput from './HotkeyInput.vue';
Expand All @@ -23,11 +29,31 @@ const themeOptions = [
const dsOptions = computed(() =>
settings.datasources.map(([id, name]) => ({ value: id, label: name })),
);

function setMovingAveragePeriod(index: number, period: number | null) {
if (period === null) return;
const next = [...settings.movingAveragePeriods];
next[index] = period;
void settings.setMovingAveragePeriods(next);
}

function addMovingAverage() {
if (settings.movingAveragePeriods.length >= MAX_MOVING_AVERAGE_COUNT) return;
void settings.setMovingAveragePeriods([
...settings.movingAveragePeriods,
nextMovingAveragePeriod(settings.movingAveragePeriods),
]);
}

function removeMovingAverage(index: number) {
if (settings.movingAveragePeriods.length <= 1) return;
void settings.setMovingAveragePeriods(settings.movingAveragePeriods.filter((_, i) => i !== index));
}
</script>

<template>
<section class="panel">
<p class="panel-hint">界面主题、全局快捷键、开机自启与行情数据来源。</p>
<p class="panel-hint">界面主题、K 线均线、全局快捷键、开机自启与行情数据来源。</p>

<div class="card">
<div class="card-body">
Expand Down Expand Up @@ -69,6 +95,66 @@ const dsOptions = computed(() =>
/>
</SettingsRow>

<SettingsRow
class="ma-settings-row"
title="主图均线"
description="周期按 K 线根数计算;调整后图表立即更新"
>
<div class="ma-settings-control">
<NForm
class="ma-form"
size="small"
label-placement="left"
label-width="42px"
:show-feedback="false"
@submit.prevent
>
<div class="ma-period-grid">
<NFormItem
v-for="(period, index) in settings.movingAveragePeriods"
:key="index"
class="ma-period-field"
:label="'MA' + (index + 1)"
>
<NInputNumber
style="width: 88px"
:value="period"
:min="MIN_MOVING_AVERAGE_PERIOD"
:max="MAX_MOVING_AVERAGE_PERIOD"
:precision="0"
:show-button="false"
:input-props="{ 'aria-label': 'MA' + (index + 1) + ' 周期' }"
@update:value="setMovingAveragePeriod(index, $event)"
/>
<NButton
quaternary
circle
:disabled="settings.movingAveragePeriods.length <= 1"
:aria-label="'删除 MA' + (index + 1)"
:title="'删除 MA' + (index + 1)"
@click="removeMovingAverage(index)"
>
<template #icon><Trash2 :size="14" /></template>
</NButton>
</NFormItem>
</div>
<div class="ma-form-actions">
<NButton
quaternary
circle
:disabled="settings.movingAveragePeriods.length >= MAX_MOVING_AVERAGE_COUNT"
aria-label="添加均线"
title="添加均线"
@click="addMovingAverage"
>
<template #icon><Plus :size="14" /></template>
</NButton>
</div>
</NForm>
<span class="ma-period-count">{{ settings.movingAveragePeriods.length }} / {{ MAX_MOVING_AVERAGE_COUNT }}</span>
</div>
</SettingsRow>

<SettingsRow
title="老板键"
description="按下这个组合键立刻把主窗口藏起来(行情条不受影响,它由自己的开关管)。恢复用托盘图标,或点一下行情条。"
Expand All @@ -90,7 +176,71 @@ const dsOptions = computed(() =>
</template>

<style scoped>
/* 无分区独有样式 —— 卡片、下拉、行布局都在 assets/styles/settings.css。
「通用」只放真正可配置的项:刷新间隔由交易时段自动决定,放在这里当只读信息
纯属噪音,已移除。 */
/* 均线控件需要在桌面和窄窗口下都能容纳最多十个周期输入框。 */
.ma-settings-control {
display: flex;
flex-direction: column;
align-items: stretch;
gap: 4px;
min-width: 0;
width: 100%;
}

.ma-form {
width: 100%;
}

.ma-period-grid {
display: grid;
grid-template-columns: repeat(auto-fill, minmax(170px, 1fr));
gap: 4px 12px;
width: 100%;
}

.ma-period-count {
align-self: flex-end;
color: var(--color-text-tertiary);
font-size: var(--text-xs);
font-family: var(--font-mono);
}

.ma-form-actions {
display: flex;
justify-content: flex-end;
margin-top: 2px;
}

:deep(.ma-period-field.n-form-item) {
margin-bottom: 0;
}

:deep(.ma-period-field .n-form-item-blank) {
display: flex;
align-items: center;
gap: 4px;
}

:deep(.settings-row.ma-settings-row) {
align-items: flex-start;
}

:deep(.ma-settings-row .row-control) {
flex: 1;
justify-content: flex-end;
}

@media (max-width: 680px) {
:deep(.settings-row.ma-settings-row) {
flex-direction: column;
align-items: stretch;
}

.ma-settings-control {
align-items: flex-start;
}

.ma-form {
width: 100%;
}
}
</style>
11 changes: 8 additions & 3 deletions src/composables/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,18 @@ useMinuteChart.ts ←─ 分时图 (MinuteChart.vue)
useChart.ts ←─ K线图 (KLineChart.vue)
├─ invoke get_kline → K线数据 + 懒加载历史
├─ syncSubIndicator(VOL|MACD) → 副图切换
└─ MA 叠加 + VOL 自定义外观
├─ syncMainOverlay(MA|BOLL) → 主图叠加切换
└─ VOL 自定义外观

utils/movingAverage.ts ←─ 主图均线
├─ 配置解析、默认值与数量/周期边界
└─ syncMovingAverage() → 创建或更新 klinecharts MA 指标
```

### 关键数据流

1. **挂载**: initChart → initChartCore → applyStyles → overrideIndicator(VOL) → syncSubIndicator → createIndicator(MA)
1. **挂载**: initChart → initChartCore → applyStyles → syncSubIndicator → syncMainOverlay → syncMovingAverage
2. **加载**: loadData → invoke → map + setDataLoader → getBars('init') 触发渲染 → syncPrecision → startAutoRefresh
3. **周期切换**: watch([code,market,period]) → initChart + loadData → allData 重置
4. **副图切换**: SubIndicatorSwitcher emit → watch(subIndicator) → syncSubIndicator → createIndicator({name}, {pane: SUB_PANE_ID}) → isStack=false 自动替换
5. **主题切换**: watch(settings.theme) → reapplyStyles → themeColors() 重新计算全色板
5. **主题/均线设置**: watch(settings.theme / movingAveragePeriods) → 重放样式或 MA calcParams → themeColors() 重新计算色板
Loading