Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 jif2.zhang
|
be70868d0b | ||
|
jif2.zhang
|
49583599b3 | ||
|
jif2.zhang
|
8cfa3802d5 |
+149
-168
@@ -1,168 +1,149 @@
|
|||||||
name: Docker Build and Push
|
name: Docker Build and Push
|
||||||
|
|
||||||
# 仅主分支 (master) push 触发部署; 其他分支一律不触发 (见 readme「分支规则」)
|
# 仅主分支 (master) push 触发部署; 其他分支一律不触发 (见 readme「分支规则」)
|
||||||
# 每次提交: 构建前端 + 生成 OTA 升级包 (签名) → 打进 Docker 镜像 → 自动升级数据库 → 部署
|
# 每次提交: 构建前端 + 生成 OTA 升级包 (签名) → 打进 Docker 镜像 → 自动升级数据库 → 部署
|
||||||
# OTA 随镜像发布: 容器内 OTA_PACKAGE_DIR=/app/ota-package 指向打包的 ota-package/
|
# OTA 随镜像发布: 容器内 OTA_PACKAGE_DIR=/app/ota-package 指向打包的 ota-package/
|
||||||
#
|
#
|
||||||
# 分支策略 (2026-10 调整):
|
# 分支策略 (2026-10 调整):
|
||||||
# - master = 主分支, 唯一部署出口, push 即发布生产 (容器 iboard, 宿主 3001)
|
# - master = 主分支, 唯一部署出口, push 即发布生产 (容器 iboard, 宿主 3001)
|
||||||
# - dev-* = 开发集成分支, 只做 CI 校验 (构建/版本一致性), **不再自动部署**;
|
# - dev-* = 开发集成分支, 只做 CI 校验 (构建/版本一致性), **不再自动部署**;
|
||||||
# 要上线必须先合并到 master 再推 master
|
# 要上线必须先合并到 master 再推 master
|
||||||
# - tmp-* = 单个问题的临时分支, 合到 dev-* 后删除
|
# - tmp-* = 单个问题的临时分支, 合到 dev-* 后删除
|
||||||
# - android-*= 只用于触发 APK 外壳构建, 不部署; 改动前须与 master 同步
|
# - android-*= 只用于触发 APK 外壳构建, 不部署; 改动前须与 master 同步
|
||||||
#
|
#
|
||||||
# 历史: 之前 dev-* 与 master 共用同一套生产环境 (推送即发布), 容易把半成品带上线,
|
# 历史: 之前 dev-* 与 master 共用同一套生产环境 (推送即发布), 容易把半成品带上线,
|
||||||
# 现已取消 dev-* 的 push 触发。
|
# 现已取消 dev-* 的 push 触发。
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- master
|
- master
|
||||||
|
|
||||||
# 连续 push master 时取消还在跑的旧部署, 避免排队执行过时版本的完整部署
|
# 连续 push master 时取消还在跑的旧部署, 避免排队执行过时版本的完整部署
|
||||||
concurrency:
|
concurrency:
|
||||||
group: deploy-master
|
group: deploy-master
|
||||||
cancel-in-progress: true
|
cancel-in-progress: true
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build-image:
|
build-image:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
env:
|
env:
|
||||||
# 关键: 显式固定 Android/OTA 后端地址, 覆盖 runner 环境里可能存在的
|
# 关键: 显式固定 Android/OTA 后端地址, 覆盖 runner 环境里可能存在的
|
||||||
# 其他 VITE_API_BASE 值。否则 OTA 包里的前端可能连错后端, 导致
|
# 其他 VITE_API_BASE 值。否则 OTA 包里的前端可能连错后端, 导致
|
||||||
# "OTA 更新后登录失败/进不去内部"。与 android-build.yml 保持一致。
|
# "OTA 更新后登录失败/进不去内部"。与 android-build.yml 保持一致。
|
||||||
VITE_API_BASE: https://iboard.honor3.com
|
VITE_API_BASE: https://iboard.honor3.com
|
||||||
# OTA bundle 要求的最低原生二进制版本 (hotswap 据此拒绝不兼容的旧外壳)。
|
# OTA bundle 要求的最低原生二进制版本。
|
||||||
# 0.2.1 起必须为 0.2.1: 旧外壳 (0.1.0) 的 CSP 白名单编译进了原生二进制,
|
# 与 package.json 的应用版本是**两个概念**: 前端 OTA 不碰原生层,
|
||||||
# 不含 https://iboard.honor3.com, 若让它拉到 0.2.1 前端会因 CSP 拦截而白屏。
|
# 现有 APK 仍是 0.1.0, 所以这里固定 0.1.0 (否则旧 APK 会被判定为不兼容而收不到更新)。
|
||||||
# 旧外壳请整包升级 (Windows 重装 exe / Android 换装 APK), 不要靠 OTA。
|
# 重打 APK 并确认原生层无破坏后, 再提升此值。
|
||||||
OTA_MIN_BINARY: '0.2.1'
|
OTA_MIN_BINARY: '0.1.0'
|
||||||
steps:
|
steps:
|
||||||
- uses: https://gitea.com/actions/checkout@v4
|
- uses: https://gitea.com/actions/checkout@v4
|
||||||
|
|
||||||
- name: Setup Node
|
- name: Setup Node
|
||||||
uses: https://gitea.com/actions/setup-node@v4
|
uses: https://gitea.com/actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
node-version: 22
|
node-version: 22
|
||||||
cache: 'npm'
|
cache: 'npm'
|
||||||
|
|
||||||
- name: Check version consistency & branch
|
- name: Check version consistency & branch
|
||||||
# 1) package.json / tauri.conf.json / Cargo.toml / Cargo.lock 四处版本必须完全相等且不带 -ota
|
# 1) package.json / tauri.conf.json / Cargo.toml / Cargo.lock 四处版本必须完全相等且不带 -ota
|
||||||
# （tauri.conf.json 的 version 就是 APK 的 versionName）
|
# （tauri.conf.json 的 version 就是 APK 的 versionName）
|
||||||
# 2) 防止 OTA 版本号与分支错位: OTA 包的 version 直接取自 package.json,
|
# 2) 防止 OTA 版本号与分支错位: OTA 包的 version 直接取自 package.json,
|
||||||
# dev-0.2 分支上必须是 0.2.x, 否则线上 OTA 会报成上一个版本的号
|
# dev-0.2 分支上必须是 0.2.x, 否则线上 OTA 会报成上一个版本的号
|
||||||
# (master 分支跳过分支前缀校验, 但四处一致性照样强制)
|
# (master 分支跳过分支前缀校验, 但四处一致性照样强制)
|
||||||
env:
|
env:
|
||||||
GITHUB_REF_NAME: ${{ github.ref_name }}
|
GITHUB_REF_NAME: ${{ github.ref_name }}
|
||||||
run: node scripts/ci/check-version.mjs
|
run: node scripts/ci/check-version.mjs
|
||||||
|
|
||||||
- name: Install deps
|
- name: Install deps
|
||||||
run: npm ci --no-audit --no-fund
|
run: npm ci --no-audit --no-fund
|
||||||
|
|
||||||
- name: Build frontend
|
- name: Build frontend
|
||||||
# 全流程唯一一次前端构建: dist/ 既供 OTA 打包, 也通过 build context 进入镜像
|
# 全流程唯一一次前端构建: dist/ 既供 OTA 打包, 也通过 build context 进入镜像
|
||||||
# (docker build 传 PREBUILT_DIST=true 跳过镜像内的重复构建)
|
# (docker build 传 PREBUILT_DIST=true 跳过镜像内的重复构建)
|
||||||
run: npm run build
|
run: npm run build
|
||||||
|
|
||||||
- name: Install minisign
|
- name: Install minisign
|
||||||
# 静态二进制直接下载, 免去每次 apt-get update + install
|
# 静态二进制直接下载, 免去每次 apt-get update + install
|
||||||
# 注意: release tarball 是 macOS 上打包的, 混有多个平台的 minisign 二进制,
|
# 注意: release tarball 是 macOS 上打包的, 混有多个平台的 minisign 二进制,
|
||||||
# 逐个试运行挑出本机可执行的, 都不行再回退 apt
|
# 逐个试运行挑出本机可执行的, 都不行再回退 apt
|
||||||
run: |
|
run: |
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
mkdir -p /tmp/ms
|
mkdir -p /tmp/ms
|
||||||
curl -sL https://github.com/jedisct1/minisign/releases/download/0.12/minisign-0.12-linux.tar.gz | tar xz -C /tmp/ms
|
curl -sL https://github.com/jedisct1/minisign/releases/download/0.12/minisign-0.12-linux.tar.gz | tar xz -C /tmp/ms
|
||||||
BIN=""
|
BIN=""
|
||||||
for c in $(find /tmp/ms -type f -name minisign); do
|
for c in $(find /tmp/ms -type f -name minisign); do
|
||||||
if "$c" -v >/dev/null 2>&1; then BIN="$c"; break; fi
|
if "$c" -v >/dev/null 2>&1; then BIN="$c"; break; fi
|
||||||
done
|
done
|
||||||
if [ -n "$BIN" ]; then
|
if [ -n "$BIN" ]; then
|
||||||
sudo install -m755 "$BIN" /usr/local/bin/minisign
|
sudo install -m755 "$BIN" /usr/local/bin/minisign
|
||||||
else
|
else
|
||||||
echo "未找到可执行的静态二进制, 回退 apt 安装"
|
echo "未找到可执行的静态二进制, 回退 apt 安装"
|
||||||
sudo apt-get update && sudo apt-get install -y minisign
|
sudo apt-get update && sudo apt-get install -y minisign
|
||||||
fi
|
fi
|
||||||
minisign -v
|
minisign -v
|
||||||
|
|
||||||
- name: Build & sign OTA package
|
- name: Build & sign OTA package
|
||||||
# 每次主分支提交生成 OTA 升级包, sequence 默认时间戳 (单调递增)
|
# 每次主分支提交生成 OTA 升级包, sequence 默认时间戳 (单调递增)
|
||||||
# 发布说明 = 触发构建的 commit message (标题+正文; 打包脚本内安全截断 400 字符),
|
# 发布说明 = 触发构建的 commit message (标题+正文; 打包脚本内安全截断 400 字符),
|
||||||
# commit sha 通过 --commit 单独写入 manifest, 前端分行展示
|
# commit sha 通过 --commit 单独写入 manifest, 前端分行展示
|
||||||
# 产物 ota-package/ (tar.gz + latest.json + .minisig) 进入 docker build context, 由 Dockerfile COPY 进镜像
|
# 产物 ota-package/ (tar.gz + latest.json + .minisig) 进入 docker build context, 由 Dockerfile COPY 进镜像
|
||||||
env:
|
env:
|
||||||
MINISIGN_PRIVATE_KEY: ${{ secrets.MINISIGN_PRIVATE_KEY }}
|
MINISIGN_PRIVATE_KEY: ${{ secrets.MINISIGN_PRIVATE_KEY }}
|
||||||
run: |
|
run: |
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
# 不用 head -c 截断: 那会把多字节汉字切成非法 UTF-8, latest.json 解析失败
|
# 不用 head -c 截断: 那会把多字节汉字切成非法 UTF-8, latest.json 解析失败
|
||||||
MSG="$(git log -1 --pretty=format:%B | sed -e '/^[[:space:]]*$/d')"
|
MSG="$(git log -1 --pretty=format:%B | sed -e '/^[[:space:]]*$/d')"
|
||||||
echo "notes: ${MSG}"
|
echo "notes: ${MSG}"
|
||||||
node scripts/build-ota.mjs --out ota-package --notes "${MSG}" --commit "${GITHUB_SHA}" --min-binary ${OTA_MIN_BINARY}
|
node scripts/build-ota.mjs --out ota-package --notes "${MSG}" --commit "${GITHUB_SHA}" --min-binary ${OTA_MIN_BINARY}
|
||||||
echo "===== latest.json ====="
|
echo "===== latest.json ====="
|
||||||
cat ota-package/latest.json
|
cat ota-package/latest.json
|
||||||
echo "===== bundle sha256 ====="
|
echo "===== bundle sha256 ====="
|
||||||
sha256sum ota-package/iboard-ota.tar.gz
|
sha256sum ota-package/iboard-ota.tar.gz
|
||||||
|
|
||||||
- name: Publish OTA package to server
|
- name: Build Docker image
|
||||||
# CI 跑在容器内, 无法直接写宿主文件系统; 用 docker cp 经bind-mount容器
|
# DATABASE_URL 仅在 prisma generate 阶段需要, 可用任何合法占位串
|
||||||
# 把 ota-package 落到宿主 /app/iboard-prod/deploy/prod/data/ota
|
# PREBUILT_DIST=true: 复用上一步构建好的 dist/, 镜像内跳过前端构建
|
||||||
# (该目录被生产 app 容器挂载为 /app/ota-package)。
|
# DOCKER_BUILDKIT=1: Dockerfile 用了 cache mount 语法
|
||||||
# docker 不可用或目录缺失时仅告警, 不影响发布。
|
run: docker build -t iboard:latest --build-arg DATABASE_URL=mysql://build:build@127.0.0.1:3306/build --build-arg PREBUILT_DIST=true .
|
||||||
run: |
|
env:
|
||||||
set -euo pipefail
|
DOCKER_BUILDKIT: '1'
|
||||||
HOST_DIR=/app/iboard-prod
|
|
||||||
if ! docker info >/dev/null 2>&1; then
|
- name: List images
|
||||||
echo "::warning::docker 不可用, 跳过 OTA 包同步"; exit 0
|
run: docker images
|
||||||
fi
|
|
||||||
docker run -d --name ota-bridge -v "${HOST_DIR}/deploy/prod/data/ota:/dst" alpine:3.20 sleep 30 >/dev/null
|
- name: Apply DB migrations
|
||||||
docker cp ota-package/. ota-bridge:/dst/ || echo "::warning::OTA 包复制失败"
|
# 数据库自动升级: 按 prisma/migrations/ 下的迁移顺序应用 (生产库由 master 部署时统一升级)
|
||||||
docker rm -f ota-bridge >/dev/null 2>&1 || true
|
# migrate deploy 幂等, 无新迁移时为 no-op
|
||||||
echo "== 宿主 OTA 目录 =="
|
# 位置关键: 在 "Remove old container" 之前 —— 建表/改表成功后才切换流量,
|
||||||
docker run --rm -v "${HOST_DIR}/deploy/prod/data/ota:/d" alpine:3.20 sh -c 'ls -la /d | head -6'
|
# 迁移失败则整个 workflow 中断, 不会用新镜像顶掉仍在运行的旧容器
|
||||||
docker restart iboard-prod-app-1 >/dev/null 2>&1 || true
|
env:
|
||||||
|
DATABASE_URL: ${{ secrets.DATABASE_URL }}
|
||||||
- name: Build Docker image
|
run: |
|
||||||
# DATABASE_URL 仅在 prisma generate 阶段需要, 可用任何合法占位串
|
set -euo pipefail
|
||||||
# PREBUILT_DIST=true: 复用上一步构建好的 dist/, 镜像内跳过前端构建
|
npx prisma migrate status || true
|
||||||
# DOCKER_BUILDKIT=1: Dockerfile 用了 cache mount 语法
|
npx prisma migrate deploy
|
||||||
run: docker build -t iboard:latest --build-arg DATABASE_URL=mysql://build:build@127.0.0.1:3306/build --build-arg PREBUILT_DIST=true .
|
|
||||||
env:
|
- name: Remove old container
|
||||||
DOCKER_BUILDKIT: '1'
|
run: docker rm -vf iboard || true
|
||||||
|
|
||||||
- name: List images
|
- name: Prune dangling images
|
||||||
run: docker images
|
# 只清理本项目的悬空镜像 (旧 iboard:latest 被同名新镜像顶掉后变 dangling),
|
||||||
|
# 不再用 `docker system prune --volumes` —— 那会清光宿主机 build cache,
|
||||||
- name: Deploy 0.2.1 production stack
|
# 导致每次部署都全量重装 npm 依赖、重跑构建
|
||||||
# 0.2.1 起生产为单端口架构: app(3001 对外) + pg(内网) + powersync(内网),
|
run: docker image prune -f
|
||||||
# 客户端同步经 app 的 /sync 反代进入同步服务 (无独立同步端口)。
|
|
||||||
# 部署逻辑在服务器的 /app/iboard-prod/scripts/deploy/prod.sh (幂等), 这里只负责:
|
- name: Run container
|
||||||
# 1) 把刚构建好的镜像交给该脚本
|
# DATABASE_URL 通过 gitea Actions secret 注入, 不进镜像层
|
||||||
# 2) 未配置 PG 相关 secrets 或脚本缺失时跳过部署 (发布不失败, 仅提示)
|
# OTA_PACKAGE_DIR 已在 Dockerfile 设为 /app/ota-package
|
||||||
env:
|
# 米家凭证 (auth.txt) 不进 git: 运维放宿主机 /app/iboard/cache, bind-mount 进容器 (MIHOME_CACHE_DIR=/app/cache)
|
||||||
PG_PASSWORD: ${{ secrets.PG_PASSWORD }}
|
run: |
|
||||||
PS_STORAGE_PASSWORD: ${{ secrets.PS_STORAGE_PASSWORD }}
|
docker run -d --name iboard -p 3001:3001 \
|
||||||
JWT_SECRET: ${{ secrets.JWT_SECRET }}
|
-e DATABASE_URL="${{ secrets.DATABASE_URL }}" \
|
||||||
POWERSYNC_JWT_SECRET: ${{ secrets.POWERSYNC_JWT_SECRET }}
|
-e JWT_SECRET="${{ secrets.JWT_SECRET }}" \
|
||||||
POWERSYNC_JWT_KEY_B64: ${{ secrets.POWERSYNC_JWT_KEY_B64 }}
|
-e MIHOME_CACHE_DIR=/app/cache \
|
||||||
run: |
|
-v /app/iboard/cache:/app/cache \
|
||||||
set -euo pipefail
|
iboard:latest
|
||||||
HOST_DIR=/app/iboard-prod
|
env:
|
||||||
if [ -z "${PG_PASSWORD:-}" ]; then
|
DATABASE_URL: ${{ secrets.DATABASE_URL }}
|
||||||
echo "::warning::未配置 PG_PASSWORD 等 secrets, 跳过自动部署 (镜像已构建完成)"
|
JWT_SECRET: ${{ secrets.JWT_SECRET }}
|
||||||
echo "手工部署: ssh baihu 'bash $HOST_DIR/scripts/deploy/prod.sh'"
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
if ! docker run --rm -v "$HOST_DIR:/w" alpine:3.20 test -f /w/scripts/deploy/prod.sh; then
|
|
||||||
echo "::warning::$HOST_DIR/scripts/deploy/prod.sh 不存在, 跳过部署"
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
docker run --rm \
|
|
||||||
-v /var/run/docker.sock:/var/run/docker.sock \
|
|
||||||
-v "$HOST_DIR:$HOST_DIR" \
|
|
||||||
-w "$HOST_DIR" \
|
|
||||||
-e PG_PASSWORD="$PG_PASSWORD" \
|
|
||||||
-e PS_STORAGE_PASSWORD="$PS_STORAGE_PASSWORD" \
|
|
||||||
-e JWT_SECRET="$JWT_SECRET" \
|
|
||||||
-e POWERSYNC_JWT_SECRET="$POWERSYNC_JWT_SECRET" \
|
|
||||||
-e POWERSYNC_JWT_KEY_B64="$POWERSYNC_JWT_KEY_B64" \
|
|
||||||
-e PUBLIC_URL=https://iboard.honor3.com \
|
|
||||||
-e ROOT="$HOST_DIR" \
|
|
||||||
docker:27-cli sh -c 'apk add -q bash curl >/dev/null 2>&1; bash /app/iboard-prod/scripts/deploy/prod.sh'
|
|
||||||
|
|||||||
-10
@@ -62,13 +62,3 @@ deploy/0.2.1/.env
|
|||||||
# Windows ´ò°ü²úÎï (±¾µØÉú³É, ²»Èë¿â)
|
# Windows ´ò°ü²úÎï (±¾µØÉú³É, ²»Èë¿â)
|
||||||
/artifacts/
|
/artifacts/
|
||||||
|
|
||||||
|
|
||||||
# 生产部署密钥与数据卷
|
|
||||||
/deploy/prod/.env
|
|
||||||
/deploy/prod/data/
|
|
||||||
|
|
||||||
|
|
||||||
# 本地临时脚本 (含口令, 不入库)
|
|
||||||
scripts/_*.mjs
|
|
||||||
.dsh-ops/
|
|
||||||
|
|
||||||
|
|||||||
@@ -2,21 +2,25 @@
|
|||||||
|
|
||||||
跨平台个人看板 (Tauri + React + Express + MariaDB)。用于收集和整理经济数据，但是以策略为主体重新组织。
|
跨平台个人看板 (Tauri + React + Express + MariaDB)。用于收集和整理经济数据，但是以策略为主体重新组织。
|
||||||
|
|
||||||
- 宏观：新闻 / 经济文章（本地），以及外接 ifinance 模块的分类（经济数据 / 策略研究 / 看板，运行时动态挂载为 tab）
|
- 首页主要是放经济文章
|
||||||
- 数据与策略由外接 ifinance 模块承担（静态包，见 `../ifinance/readme.md`）
|
- 数据主要是放各种经济数据和图表
|
||||||
- 报警并入「监控」；油价模块已下线
|
- 策略是放按照经济理论组织的相关数据和图表的对比
|
||||||
|
|
||||||
## 宏观
|
## 首页
|
||||||
|
|
||||||
宏观页固定「新闻 / 经济文章」两个本地 tab，并动态挂载外接 ifinance `info.json` 的 `categories[]` 作为额外 tab：
|
首页显示新闻模块和报警模块的数据，按照时间最新优先，无限滚动，直到数据库中没有数据为止。
|
||||||
|
|
||||||
- 新闻：每日夜间 3 点通过妙想 MCP 获取国内外最新经济政治新闻，按影响大小排序 10 条，存入数据库；列表按时间倒序无限滚动。
|
### 新闻模块
|
||||||
- 经济文章：由 `content/articles/*.md` 承载的长文。
|
|
||||||
- 经济数据 / 策略研究 / …：交给外接 ifinance 模块，宿主只读取 `info.json` 并用 iframe 打开条目页（纯前端直连，见 `ifinance/readme.md` §9）。iBoard 本地不再保存指标 / 策略数据。
|
增加一个新闻模块，数据来源是每日夜间 3 点，通过妙想 MCP 获取国内外最新经济政治新闻，按影响大小排序 10 条。存入数据库。
|
||||||
|
|
||||||
|
### 报警模块
|
||||||
|
|
||||||
|
World Bank 中的数据只用来对比妙想 MCP 拉取的数据正确性。当同一时间的同一项数据不同时，记录一个报警。
|
||||||
|
|
||||||
## 监控
|
## 监控
|
||||||
|
|
||||||
监控分为主机监控 / 服务监控 / 环境监控 / 报警四个 tab。主机监控对接 komari：<https://komari.honor3.com/>；报警 tab 展示跨源数据差异与定时任务异常，按时间倒序。
|
监控分为服务器监控和服务监控两部分。服务器监控对接 komari，地址：<https://komari.honor3.com/>
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -270,47 +274,3 @@ Web 端不会自动下载包，也不会替换前端代码。
|
|||||||
- 由于只有 `master` 会部署，**迁移真正作用到生产库的唯一时机就是 master 发布**；
|
- 由于只有 `master` 会部署，**迁移真正作用到生产库的唯一时机就是 master 发布**；
|
||||||
开发分支上的迁移不会被自动应用，请在合并到 `master` 前确认可回滚。
|
开发分支上的迁移不会被自动应用，请在合并到 `master` 前确认可回滚。
|
||||||
- 本地改了 `prisma/schema.prisma` 后：写迁移 SQL → `npx prisma migrate deploy` 验证 → 提交迁移目录。
|
- 本地改了 `prisma/schema.prisma` 后：写迁移 SQL → `npx prisma migrate deploy` 验证 → 提交迁移目录。
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Windows 本地实时预览（不打包）
|
|
||||||
|
|
||||||
改完前端 UI 想立刻在 **Windows 外壳**里看效果，不必 `tauri build`、不必打 NSIS/便携包、也不必重装。
|
|
||||||
|
|
||||||
```bash
|
|
||||||
npm run win:dev # 构建(shell 模式) + 挂载 + 重启外壳
|
|
||||||
npm run win:dev -- --no-build # 复用现有 dist, 只挂载+重启 (最快, 约 2 秒)
|
|
||||||
npm run win:dev -- --no-launch # 只挂载, 自己手动启动外壳
|
|
||||||
npm run win:dev -- --exe "D:\path\iBoard.exe"
|
|
||||||
npm run win:dev -- --clear # 卸载覆盖, 外壳回到内置前端
|
|
||||||
```
|
|
||||||
|
|
||||||
### 原理
|
|
||||||
|
|
||||||
外壳用 `tauri-plugin-hotswap`，启动时**先看覆盖目录有没有生效的前端包，没有才回退到 exe 内置的 `dist`**。
|
|
||||||
这和线上 OTA 走的是同一条路径，所以只要把新构建的 `dist` 写进覆盖目录再重启外壳即可：
|
|
||||||
|
|
||||||
```
|
|
||||||
%APPDATA%\com.iboard.app\hotswap\
|
|
||||||
current ← 文本文件, 内容为生效的目录名 (如 seq-1793068631298)
|
|
||||||
seq-1793068631298\ ← 本次前端 (dist 内容) + hotswap-meta.json
|
|
||||||
```
|
|
||||||
|
|
||||||
`hotswap-meta.json` 里有两个字段是**硬约束**，改错会导致覆盖包被丢弃或立刻回滚：
|
|
||||||
|
|
||||||
| 字段 | 取值 | 原因 |
|
|
||||||
| --- | --- | --- |
|
|
||||||
| `min_binary_version` | **必须等于**外壳版本（当前 `0.2.1`） | 默认策略 `DiscardOnUpgrade` 在 `binary > min` 时丢弃缓存；安全线又要求 `binary >= min`，故只能取等号 |
|
|
||||||
| `confirmed` | **必须为 `true`** | 默认策略 `SingleLaunch` 对未确认版本会在启动时立即回滚 |
|
|
||||||
|
|
||||||
另外 `sequence` 取 `Date.now()`（大值），让 OTA 检查认为"已是最新"，避免线上更新把本地版本顶掉。
|
|
||||||
|
|
||||||
### 注意
|
|
||||||
|
|
||||||
- 覆盖目录就是外壳**真实的 OTA 落地目录**，挂载期间"我的"页会显示本地版本（`0.2.1-local`）；
|
|
||||||
测完建议 `npm run win:dev -- --clear` 复原，避免影响后续正常 OTA。
|
|
||||||
- 脚本按 `src-tauri/tauri.conf.json` 的 `identifier` 推导覆盖目录，换 identifier 后无需改脚本。
|
|
||||||
- 这只适用于**前端**改动。改了 `src-tauri/`（Rust/原生层、权限、CSP）必须重新打包外壳。
|
|
||||||
- 想要带 HMR 的完整开发循环（改代码即时刷新、免手动重启）用 `npm run tauri:dev`，
|
|
||||||
代价是首次要编译一次 debug 版 Rust 二进制。
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,9 +0,0 @@
|
|||||||
# 生产环境变量 (deploy/prod/.env, 权限 600, 绝不入库)
|
|
||||||
# POWERSYNC_JWT_KEY_B64 = base64url(POWERSYNC_JWT_SECRET 的 UTF-8 字节)
|
|
||||||
# printf %s "$POWERSYNC_JWT_SECRET" | openssl base64 -A | tr '+/' '-_' | tr -d '='
|
|
||||||
PG_PASSWORD=change-me
|
|
||||||
PS_STORAGE_PASSWORD=change-me
|
|
||||||
JWT_SECRET=change-me
|
|
||||||
POWERSYNC_JWT_SECRET=change-me
|
|
||||||
POWERSYNC_JWT_KEY_B64=change-me
|
|
||||||
PUBLIC_URL=https://iboard.honor3.com
|
|
||||||
@@ -1,59 +0,0 @@
|
|||||||
# iBoard 0.2.1 生产部署 (单端口, 无独立同步端口)
|
|
||||||
|
|
||||||
```
|
|
||||||
pg (内网) ← app (3001 对外, /sync 反代) → powersync (内网)
|
|
||||||
```
|
|
||||||
|
|
||||||
对外只有 **3001** 一个端口，域名 `https://iboard.honor3.com` 由 NPM 反代到这里；
|
|
||||||
同步服务不再单独暴露端口（客户端拿到的 `POWERSYNC_URL` 是域名本身，请求经 app 的
|
|
||||||
`/sync`、`/socket` 反代进入内网 powersync）。
|
|
||||||
|
|
||||||
## 首次部署顺序 (关键: publication 要在建表之后)
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# 0) 目录: /app/iboard-prod (源码已上传), 镜像 iboard:latest 已构建
|
|
||||||
cd /app/iboard-prod/deploy/prod
|
|
||||||
cp .env.example .env && chmod 600 .env # 填真实密钥
|
|
||||||
mkdir -p data/pg data/cache
|
|
||||||
|
|
||||||
# 1) 先只起数据库
|
|
||||||
docker compose --env-file .env up -d pg
|
|
||||||
|
|
||||||
# 2) 跑迁移建表 (一次性)
|
|
||||||
docker run --rm --network iboard-prod_default \
|
|
||||||
-e DATABASE_URL="postgresql://iboard:<PG_PASSWORD>@pg:5432/iboard" \
|
|
||||||
iboard:latest npx prisma migrate deploy
|
|
||||||
|
|
||||||
# 3) 建逻辑复制 publication (表已存在)
|
|
||||||
docker compose --env-file .env exec -T pg \
|
|
||||||
psql -U iboard -d iboard -f /dev/stdin < sql/publication.sql
|
|
||||||
|
|
||||||
# 4) 起应用与同步服务
|
|
||||||
docker compose --env-file .env up -d app powersync
|
|
||||||
|
|
||||||
# 5) 验证
|
|
||||||
curl -s http://127.0.0.1:3001/api/health
|
|
||||||
docker compose logs --tail 20 powersync # 应看到 replication 激活
|
|
||||||
```
|
|
||||||
|
|
||||||
## 数据迁移 (从现网 MySQL 快照)
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# 只读源库; 目标必须是空库 (有数据会跳过, ETL_FORCE=1 强制)
|
|
||||||
docker run --rm --network iboard-prod_default \
|
|
||||||
-e DATABASE_URL="postgresql://iboard:<PG_PASSWORD>@pg:5432/iboard" \
|
|
||||||
-e SRC_DATABASE_URL="mysql://<user>:<pass>@<host>:3306/iboard" \
|
|
||||||
iboard:latest node scripts/etl-mariadb-to-pg.mjs
|
|
||||||
```
|
|
||||||
|
|
||||||
迁移后需要重启 powersync 让它重新快照：
|
|
||||||
|
|
||||||
```bash
|
|
||||||
docker compose --env-file .env restart powersync
|
|
||||||
```
|
|
||||||
|
|
||||||
## 版本与回滚
|
|
||||||
|
|
||||||
- 新版本: 构建新镜像 → `docker compose up -d app` (只重建 app, 数据卷不动)
|
|
||||||
- 回滚: 用上一次的镜像标签重新 `up -d app`
|
|
||||||
- 数据: `data/pg` 持久化; 变更前建议 `docker compose exec -T pg pg_dump -U iboard iboard > backup.sql`
|
|
||||||
@@ -1,82 +0,0 @@
|
|||||||
name: iboard-prod
|
|
||||||
|
|
||||||
# iBoard 0.2.1 生产栈 (单端口对外)
|
|
||||||
# - app : 3001 对外 (唯一入口), 内部把 /sync 反代到 powersync
|
|
||||||
# - pg : PostgreSQL 16, 仅容器内网 (逻辑复制供同步服务消费)
|
|
||||||
# - powersync : 同步服务, 仅容器内网 (不对外暴露端口)
|
|
||||||
#
|
|
||||||
# 与旧的生产方式区别: 不再依赖宿主 MySQL, 数据库与同步服务都在栈内;
|
|
||||||
# 对外只有 3001 一个端口, 域名 https://iboard.honor3.com (NPM 反代) 即可。
|
|
||||||
#
|
|
||||||
# 用法 (baihu:/app/iboard-prod):
|
|
||||||
# cp deploy/prod/.env.example deploy/prod/.env # 填密钥
|
|
||||||
# docker compose --env-file deploy/prod/.env -f deploy/prod/docker-compose.yml up -d
|
|
||||||
|
|
||||||
services:
|
|
||||||
pg:
|
|
||||||
image: postgres:16-alpine
|
|
||||||
restart: unless-stopped
|
|
||||||
command: ["postgres", "-c", "wal_level=logical"]
|
|
||||||
environment:
|
|
||||||
POSTGRES_USER: iboard
|
|
||||||
POSTGRES_PASSWORD: ${PG_PASSWORD:?PG_PASSWORD missing}
|
|
||||||
POSTGRES_DB: iboard
|
|
||||||
PS_STORAGE_PASSWORD: ${PS_STORAGE_PASSWORD:?PS_STORAGE_PASSWORD missing}
|
|
||||||
volumes:
|
|
||||||
- ./data/pg:/var/lib/postgresql/data
|
|
||||||
- ./initdb:/docker-entrypoint-initdb.d:ro
|
|
||||||
healthcheck:
|
|
||||||
test: ["CMD-SHELL", "pg_isready -U iboard -d iboard"]
|
|
||||||
interval: 5s
|
|
||||||
timeout: 5s
|
|
||||||
retries: 12
|
|
||||||
|
|
||||||
app:
|
|
||||||
image: iboard:latest
|
|
||||||
build:
|
|
||||||
context: ../..
|
|
||||||
dockerfile: Dockerfile
|
|
||||||
restart: unless-stopped
|
|
||||||
depends_on:
|
|
||||||
pg:
|
|
||||||
condition: service_healthy
|
|
||||||
environment:
|
|
||||||
DATABASE_URL: postgresql://iboard:${PG_PASSWORD}@pg:5432/iboard
|
|
||||||
PORT: "3001"
|
|
||||||
JWT_SECRET: ${JWT_SECRET:?JWT_SECRET missing}
|
|
||||||
POWERSYNC_JWT_SECRET: ${POWERSYNC_JWT_SECRET:?POWERSYNC_JWT_SECRET missing}
|
|
||||||
# 客户端拿到的同步地址 = 同域 (经由 app 的 /sync 反代)
|
|
||||||
POWERSYNC_URL: ${PUBLIC_URL:-https://iboard.honor3.com}
|
|
||||||
# app 内部转发同步请求到内网 powersync
|
|
||||||
POWERSYNC_UPSTREAM: http://powersync:8080
|
|
||||||
OTA_PUBLIC_BASE: ${PUBLIC_URL:-https://iboard.honor3.com}
|
|
||||||
OTA_PACKAGE_DIR: /app/ota-package
|
|
||||||
MIHOME_CACHE_DIR: /app/cache
|
|
||||||
volumes:
|
|
||||||
- ./data/cache:/app/cache
|
|
||||||
# OTA 热更包 (CI 构建产物, 由流水线写入宿主 data/ota)
|
|
||||||
- ./data/ota:/app/ota-package
|
|
||||||
ports:
|
|
||||||
- "${HOST_PORT:-3001}:3001"
|
|
||||||
healthcheck:
|
|
||||||
test: ["CMD-SHELL", "wget -qO- http://127.0.0.1:3001/api/health || exit 1"]
|
|
||||||
interval: 30s
|
|
||||||
timeout: 5s
|
|
||||||
retries: 5
|
|
||||||
start_period: 20s
|
|
||||||
|
|
||||||
powersync:
|
|
||||||
image: journeyapps/powersync-service:latest
|
|
||||||
restart: unless-stopped
|
|
||||||
depends_on:
|
|
||||||
pg:
|
|
||||||
condition: service_healthy
|
|
||||||
command: ["start", "-r", "unified"]
|
|
||||||
volumes:
|
|
||||||
- ./powersync/service.yaml:/config/service.yaml:ro
|
|
||||||
- ./powersync/sync-config.yaml:/config/sync-config.yaml:ro
|
|
||||||
environment:
|
|
||||||
POWERSYNC_CONFIG_PATH: /config/service.yaml
|
|
||||||
PS_SOURCE_URI: postgresql://iboard:${PG_PASSWORD}@pg:5432/iboard?sslmode=disable
|
|
||||||
PS_STORAGE_URI: postgresql://powersync_storage:${PS_STORAGE_PASSWORD}@pg:5432/iboard?sslmode=disable
|
|
||||||
PS_JWT_KEY_B64: ${POWERSYNC_JWT_KEY_B64:?POWERSYNC_JWT_KEY_B64 missing}
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
# 生产 PG 初始化: PowerSync bucket storage 专用用户
|
|
||||||
set -e
|
|
||||||
: "${PS_STORAGE_PASSWORD:?PS_STORAGE_PASSWORD missing}"
|
|
||||||
|
|
||||||
psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
|
|
||||||
DO \$\$
|
|
||||||
BEGIN
|
|
||||||
IF NOT EXISTS (SELECT 1 FROM pg_roles WHERE rolname = 'powersync_storage') THEN
|
|
||||||
CREATE USER powersync_storage WITH PASSWORD '$PS_STORAGE_PASSWORD';
|
|
||||||
END IF;
|
|
||||||
END
|
|
||||||
\$\$;
|
|
||||||
GRANT CREATE ON DATABASE $POSTGRES_DB TO powersync_storage;
|
|
||||||
EOSQL
|
|
||||||
|
|
||||||
echo '[initdb] powersync_storage ready.'
|
|
||||||
@@ -1,41 +0,0 @@
|
|||||||
# PowerSync Service 主配置 (0.2.1 验证部署)
|
|
||||||
# 参考: https://docs.powersync.com/configuration/powersync-service/self-hosted-instances
|
|
||||||
# 注意: !env 是 YAML 整值标签, 只能整个值替换变量, 不能内嵌在 URI 字符串中;
|
|
||||||
# 完整连接串由 docker-compose 以 PS_* 环境变量注入。
|
|
||||||
|
|
||||||
replication:
|
|
||||||
connections:
|
|
||||||
- type: postgresql
|
|
||||||
# 源库: 本栈 pg 容器 (0.2.1 独立实例), 复制走 iboard021 账号
|
|
||||||
uri: !env PS_SOURCE_URI
|
|
||||||
sslmode: disable
|
|
||||||
|
|
||||||
# bucket storage: 同实例 PG (16 >= 14 允许同库不同 schema, service 自建 powersync schema)
|
|
||||||
storage:
|
|
||||||
type: postgresql
|
|
||||||
uri: !env PS_STORAGE_URI
|
|
||||||
sslmode: disable
|
|
||||||
|
|
||||||
port: 8080
|
|
||||||
|
|
||||||
sync_config:
|
|
||||||
path: /config/sync-config.yaml
|
|
||||||
|
|
||||||
# 客户端鉴权: app 后端 /api/powersync/token 签发 HS256 JWT (aud=powersync)
|
|
||||||
# oct 密钥 k = base64url(POWERSYNC_JWT_SECRET)
|
|
||||||
client_auth:
|
|
||||||
jwks:
|
|
||||||
keys:
|
|
||||||
- kty: oct
|
|
||||||
k: !env PS_JWT_KEY_B64
|
|
||||||
alg: HS256
|
|
||||||
audience:
|
|
||||||
- powersync
|
|
||||||
|
|
||||||
telemetry:
|
|
||||||
disable_telemetry_sharing: true
|
|
||||||
|
|
||||||
system:
|
|
||||||
logging:
|
|
||||||
level: info
|
|
||||||
format: text
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
# Sync Streams (edition 3): 任务模块 6 表 + User (展示用)
|
|
||||||
# Sequential ID Mapping (见 docs/V0.2/离线编辑模块/0.2.1实施方案.md §3):
|
|
||||||
# - 客户端主键 = uuid 列 (离线新建行同步回填后 id 稳定); int 自增 id 不下发
|
|
||||||
# - 外键输出 uuid 镜像列, 别名回 projectId/columnId/parentId/taskId (客户端字段名不变)
|
|
||||||
# - 引号保留 PG PascalCase 标识; 可见性按 ProjectMember 过滤
|
|
||||||
|
|
||||||
config:
|
|
||||||
edition: 3
|
|
||||||
|
|
||||||
streams:
|
|
||||||
iboard_users:
|
|
||||||
auto_subscribe: true
|
|
||||||
query: SELECT CAST("id" AS TEXT) AS "id", "name", "email" FROM "User"
|
|
||||||
|
|
||||||
iboard_task_data:
|
|
||||||
auto_subscribe: true
|
|
||||||
with:
|
|
||||||
my_projects: SELECT "projectId" FROM "ProjectMember" WHERE CAST("userId" AS TEXT) = auth.user_id()
|
|
||||||
queries:
|
|
||||||
- SELECT "uuid" AS "id", "uuid", "code", "name", CAST("ownerId" AS TEXT) AS "ownerId", "isPersonal", "archived", "notes", "taskKinds", "icon", "autoArchive", "createdAt", "updatedAt" FROM "Project" WHERE "id" IN my_projects
|
|
||||||
- SELECT "uuid" AS "id", "uuid", "projectUuid" AS "projectId", CAST("userId" AS TEXT) AS "userId", "permission", "createdAt" FROM "ProjectMember" WHERE "projectId" IN my_projects
|
|
||||||
- SELECT "uuid" AS "id", "uuid", "projectUuid" AS "projectId", "name", "sortOrder", "boundStatus", "retention", "createdAt", "updatedAt" FROM "BoardColumn" WHERE "projectId" IN my_projects
|
|
||||||
- SELECT "uuid" AS "id", "uuid", "projectUuid" AS "projectId", "columnUuid" AS "columnId", "parentUuid" AS "parentId", "title", "description", "kind", "markDate", "status", "doneAt", CAST("assigneeId" AS TEXT) AS "assigneeId", CAST("creatorId" AS TEXT) AS "creatorId", "extras", "sortOrder", "number", "archived", "archivedAt", "archiveSource", "createdAt", "updatedAt" FROM "Task" WHERE "projectId" IN my_projects
|
|
||||||
- SELECT "uuid" AS "id", "uuid", "taskUuid" AS "taskId", CAST("userId" AS TEXT) AS "userId" FROM "TaskMember" WHERE "taskId" IN (SELECT "id" FROM "Task" WHERE "projectId" IN my_projects)
|
|
||||||
- SELECT "uuid" AS "id", "uuid", "taskUuid" AS "taskId", "name" FROM "TaskTag" WHERE "taskId" IN (SELECT "id" FROM "Task" WHERE "projectId" IN my_projects)
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
-- 生产 PG: PowerSync 逻辑复制 publication
|
|
||||||
-- 必须在 prisma migrate deploy 建表之后执行 (initdb 阶段表还不存在, 故不放 initdb 目录)。
|
|
||||||
-- 幂等: 已存在则跳过。
|
|
||||||
DO $$
|
|
||||||
BEGIN
|
|
||||||
IF NOT EXISTS (SELECT 1 FROM pg_publication WHERE pubname = 'powersync') THEN
|
|
||||||
CREATE PUBLICATION powersync FOR TABLE
|
|
||||||
"Project", "ProjectMember", "BoardColumn", "Task", "TaskMember", "TaskTag", "User";
|
|
||||||
END IF;
|
|
||||||
END
|
|
||||||
$$;
|
|
||||||
@@ -1,82 +0,0 @@
|
|||||||
-- iBoard 0.2.1: 外键 uuid 镜像列触发器
|
|
||||||
-- 由 0.2.1 验证库导出; 服务端写入时自动维护 projectUuid/columnUuid/parentUuid/taskUuid,
|
|
||||||
-- 同步流据此把镜像列以 projectId/columnId/parentId/taskId 的别名下发给客户端。
|
|
||||||
|
|
||||||
CREATE OR REPLACE FUNCTION public.func_boardcolumn_uuid_map()
|
|
||||||
RETURNS trigger
|
|
||||||
LANGUAGE plpgsql
|
|
||||||
AS $function$
|
|
||||||
BEGIN
|
|
||||||
SELECT "uuid" INTO NEW."projectUuid" FROM "Project" WHERE "id" = NEW."projectId";
|
|
||||||
IF NOT FOUND THEN RAISE EXCEPTION 'Project % 不存在', NEW."projectId"; END IF;
|
|
||||||
RETURN NEW;
|
|
||||||
END;
|
|
||||||
$function$
|
|
||||||
|
|
||||||
;
|
|
||||||
|
|
||||||
CREATE OR REPLACE FUNCTION public.func_projectmember_uuid_map()
|
|
||||||
RETURNS trigger
|
|
||||||
LANGUAGE plpgsql
|
|
||||||
AS $function$
|
|
||||||
BEGIN
|
|
||||||
SELECT "uuid" INTO NEW."projectUuid" FROM "Project" WHERE "id" = NEW."projectId";
|
|
||||||
IF NOT FOUND THEN RAISE EXCEPTION 'Project % 不存在', NEW."projectId"; END IF;
|
|
||||||
RETURN NEW;
|
|
||||||
END;
|
|
||||||
$function$
|
|
||||||
|
|
||||||
;
|
|
||||||
|
|
||||||
CREATE OR REPLACE FUNCTION public.func_task_uuid_map()
|
|
||||||
RETURNS trigger
|
|
||||||
LANGUAGE plpgsql
|
|
||||||
AS $function$
|
|
||||||
BEGIN
|
|
||||||
SELECT "uuid" INTO NEW."projectUuid" FROM "Project" WHERE "id" = NEW."projectId";
|
|
||||||
IF NOT FOUND THEN RAISE EXCEPTION 'Project % 不存在', NEW."projectId"; END IF;
|
|
||||||
SELECT "uuid" INTO NEW."columnUuid" FROM "BoardColumn" WHERE "id" = NEW."columnId";
|
|
||||||
IF NOT FOUND THEN RAISE EXCEPTION 'BoardColumn % 不存在', NEW."columnId"; END IF;
|
|
||||||
IF NEW."parentId" IS NULL THEN
|
|
||||||
NEW."parentUuid" := NULL;
|
|
||||||
ELSE
|
|
||||||
SELECT "uuid" INTO NEW."parentUuid" FROM "Task" WHERE "id" = NEW."parentId";
|
|
||||||
IF NOT FOUND THEN RAISE EXCEPTION 'Task % 不存在', NEW."parentId"; END IF;
|
|
||||||
END IF;
|
|
||||||
RETURN NEW;
|
|
||||||
END;
|
|
||||||
$function$
|
|
||||||
|
|
||||||
;
|
|
||||||
|
|
||||||
CREATE OR REPLACE FUNCTION public.func_taskmember_uuid_map()
|
|
||||||
RETURNS trigger
|
|
||||||
LANGUAGE plpgsql
|
|
||||||
AS $function$
|
|
||||||
BEGIN
|
|
||||||
SELECT "uuid" INTO NEW."taskUuid" FROM "Task" WHERE "id" = NEW."taskId";
|
|
||||||
IF NOT FOUND THEN RAISE EXCEPTION 'Task % 不存在', NEW."taskId"; END IF;
|
|
||||||
RETURN NEW;
|
|
||||||
END;
|
|
||||||
$function$
|
|
||||||
|
|
||||||
;
|
|
||||||
|
|
||||||
CREATE OR REPLACE FUNCTION public.func_tasktag_uuid_map()
|
|
||||||
RETURNS trigger
|
|
||||||
LANGUAGE plpgsql
|
|
||||||
AS $function$
|
|
||||||
BEGIN
|
|
||||||
SELECT "uuid" INTO NEW."taskUuid" FROM "Task" WHERE "id" = NEW."taskId";
|
|
||||||
IF NOT FOUND THEN RAISE EXCEPTION 'Task % 不存在', NEW."taskId"; END IF;
|
|
||||||
RETURN NEW;
|
|
||||||
END;
|
|
||||||
$function$
|
|
||||||
|
|
||||||
;
|
|
||||||
|
|
||||||
CREATE TRIGGER trg_boardcolumn_uuid_map BEFORE INSERT OR UPDATE ON public."BoardColumn" FOR EACH ROW EXECUTE FUNCTION func_boardcolumn_uuid_map();
|
|
||||||
CREATE TRIGGER trg_projectmember_uuid_map BEFORE INSERT OR UPDATE ON public."ProjectMember" FOR EACH ROW EXECUTE FUNCTION func_projectmember_uuid_map();
|
|
||||||
CREATE TRIGGER trg_task_uuid_map BEFORE INSERT OR UPDATE ON public."Task" FOR EACH ROW EXECUTE FUNCTION func_task_uuid_map();
|
|
||||||
CREATE TRIGGER trg_taskmember_uuid_map BEFORE INSERT OR UPDATE ON public."TaskMember" FOR EACH ROW EXECUTE FUNCTION func_taskmember_uuid_map();
|
|
||||||
CREATE TRIGGER trg_tasktag_uuid_map BEFORE INSERT OR UPDATE ON public."TaskTag" FOR EACH ROW EXECUTE FUNCTION func_tasktag_uuid_map();
|
|
||||||
-379
@@ -1,379 +0,0 @@
|
|||||||
# 0.2.1 发布任务 — 目标与现状
|
|
||||||
|
|
||||||
> 最后更新：2026-10-27 08:20
|
|
||||||
> 分支：`dev-0.2` 与 `master` 均已发布（`a1c267b`）
|
|
||||||
> 状态：**全部完成** —— 生产已切 0.2.1 单端口架构，master 发布 CI 通过，Android APK 与 Windows 安装包均已产出
|
|
||||||
|
|
||||||
## 零、执行结果速览（2026-10-27 已完成）
|
|
||||||
|
|
||||||
| 项目 | 结果 |
|
|
||||||
| --- | --- |
|
|
||||||
| 生产地址 | `https://iboard.honor3.com` → baihu **3001**（NPM + 有效证书） |
|
|
||||||
| 生产架构 | `iboard-prod-app-1`(3001 对外) + `iboard-prod-pg-1`(内网) + `iboard-prod-powersync-1`(内网) |
|
|
||||||
| 端口 | **只剩 3001**；13001 / 13002 / 13443 全部下线 |
|
|
||||||
| 数据迁移 | MySQL → PG 完成：Project 3、Task 25、BoardColumn 12、User 1、CheckIn 17、News 19、IndicatorPoint 245、Mihome 等全部迁入 |
|
|
||||||
| 旧生产 | 容器 `iboard` 已 **stop（未删除）**，`docker start iboard` 可秒级回滚 |
|
|
||||||
| 登录态 | `JWT_SECRET` 沿用 `iboard`，现有用户无需重新登录 |
|
|
||||||
| 米家凭证 | `/app/iboard/cache` → `deploy/prod/data/cache`（`auth.txt` + `apizero/`） |
|
|
||||||
| E2E 验证 | 在线：项目卡片 + `ADMIN-16`/`ADMIN-18` 编号；断网：徽标出现、任务页数据完整、无 fail fetch；恢复：徽标消失 |
|
|
||||||
| master 发布 | 已推 `master`（`a1c267b`）；CI `build-image` **10/10 步成功**（版本校验 / 前端 / OTA 签名包 / 镜像 / 部署步按设计跳过） |
|
|
||||||
| Android | `android-1.0` CI **16/16 步成功**，APK 20MB（versionName 0.2.1）已发布到 Gitea packages |
|
|
||||||
| Windows | 本地 `npm run build:win` 成功：NSIS 6.9MB + 便携 zip 7.9MB |
|
|
||||||
| OTA 热更 | **已打通**：`https://iboard.honor3.com/api/ota/check/0` 返回 `0.2.1-ota`、`min_binary_version: 0.2.1`、签名与下载地址齐全 |
|
|
||||||
|
|
||||||
### 迁移过程中踩到并修掉的坑
|
|
||||||
|
|
||||||
1. `prisma/migrations/` 是 **MySQL 语法**（反引号），PG 无法 `migrate deploy` → 改用 `prisma db push --accept-data-loss` 按 schema 建表。
|
|
||||||
2. `db push` 首次因参数不被识别而输出帮助（表结构停在旧 schema，缺 `autoArchive`）→ 去掉错误参数重跑，列已补齐。
|
|
||||||
3. 新库缺 **uuid 镜像触发器**（`projectUuid`/`columnUuid`/`parentUuid`/`taskUuid`）→ 从 0.2.1 验证库导出 5 个函数 + 5 个触发器，落库并入库 `deploy/prod/sql/uuid-triggers.sql`。
|
|
||||||
4. bash 把 `$$` 展开成 PID 导致 TRUNCATE 脚本报错 → 改用 SQL 文件传入。
|
|
||||||
5. baihu 上 `docker build` 缺 buildx → 改用 `docker compose build`。
|
|
||||||
6. **OTA 包此前完全没有**：手工构建的镜像内 `/app/ota-package` 只有 README（`ota-package/` 被 `.gitignore` 排除，CI 部署段又跳过），线上 OTA 接口返回空 → 已给 app 容器加 `data/ota` 挂载，并新增 CI 步骤用 `docker cp` 经 bind-mount 容器写入宿主（CI 在容器内无法直接写宿主文件）。
|
|
||||||
7. CI 首次写入路径多写了一层 `data/ota`（与 compose 的 `deploy/prod/data/ota` 不一致）→ 路径已对齐。
|
|
||||||
8. `OTA_MIN_BINARY` 由 `0.1.0` 提升到 **`0.2.1`**，防止旧外壳拉到新域名前端后被 CSP 拦截白屏。
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 一、任务目标（用户原始要求）
|
|
||||||
|
|
||||||
1. 域名 `iboard.honor3.com` 已指向 3000 端口、HTTPS 证书已配好 → 客户端全面切到该域名。
|
|
||||||
2. **Windows 外壳 + 离线编辑功能正式合并到 `dev-0.2`**，完整版本号 **0.2.1**。
|
|
||||||
3. 确保 **Android** 功能正常（通过 CI 编译验证，不在本地装 Android 工具链）。
|
|
||||||
4. 确保 **CI/CD** 正常。
|
|
||||||
5. Windows **本地打包正常**即可。
|
|
||||||
6. `dev-0.2` 更新完成后 **通过 `master` 分支发布**。
|
|
||||||
7. 追加要求：**不要再有 13002 这类独立端口**，所有版本合并成一套。
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 二、已完成
|
|
||||||
|
|
||||||
### 2.1 分支合并
|
|
||||||
|
|
||||||
| 内容 | 结果 |
|
|
||||||
| --- | --- |
|
|
||||||
| `dev-0.2.1`（离线编辑 + 项目编号 + PG/PowerSync）→ `dev-0.2` | 已合并 `e689e44` |
|
|
||||||
| `dev-windows-0.1`（Windows 外壳：托盘/悬浮球/吸附/自启动）→ `dev-0.2` | 已按路径迁入 `eef2969` |
|
|
||||||
| `dev-0.2` → `android-1.0`（触发 APK 构建） | 已合并 `4958359` |
|
|
||||||
| 冲突处理 | `projects.js`/`tasks.js`/`api/task.js` 手工合并，**两边功能都保留**（`autoArchive` 归档 + `code` 编号） |
|
|
||||||
| 归档功能补齐到本地库 | `src/api/task.js` 新增 `archive`/`unarchive`/`archivedList`；`schema.js` 加 `archived/archivedAt/archiveSource/autoArchive`；`sync-config.yaml` 与 upload 处理器同步 |
|
|
||||||
| Prisma 客户端补齐 | dev-0.2 原来缺任务模块 6 个模型，已重新 generate `fc23919` |
|
|
||||||
|
|
||||||
### 2.2 版本与域名
|
|
||||||
|
|
||||||
- 版本统一 **0.2.1**：`package.json` / `src-tauri/tauri.conf.json` / `Cargo.toml` / `Cargo.lock`（`scripts/ci/check-version.mjs` 通过）
|
|
||||||
- 域名切 `https://iboard.honor3.com`：
|
|
||||||
- `src/api/client.js` 注释、`.env.shell`、`scripts/wsl/build-apk.sh`、`.gitea/workflows/android-build.yml`、`.gitea/workflows/docker-build.yml`、`Dockerfile`（`OTA_PUBLIC_BASE`）、`tauri.conf.json`（OTA endpoint + CSP）
|
|
||||||
- 旧域名 `bh.vps.honor3.com:3001` 仅保留在 CSP 白名单里做滚动兼容
|
|
||||||
|
|
||||||
### 2.3 单端口架构（去掉 13002）
|
|
||||||
|
|
||||||
| 改动 | 位置 |
|
|
||||||
| --- | --- |
|
|
||||||
| Express 增加 `/sync`、`/socket` 同域反代到内网 powersync | `server/powersync-proxy.js` + `server/index.js`（挂在 `express.json()` 之前，支持长连接） |
|
|
||||||
| 生产编排：app(3001 对外) + pg(内网) + powersync(内网) | `deploy/prod/docker-compose.yml` |
|
|
||||||
| 生产部署脚本（幂等：迁移 → publication → 起栈 → 健康检查） | `scripts/deploy/prod.sh` |
|
|
||||||
| PG 初始化（powersync_storage 用户） | `deploy/prod/initdb/01-powersync-storage.sh` |
|
|
||||||
| 逻辑复制 publication（**建表后**执行） | `deploy/prod/sql/publication.sql` |
|
|
||||||
| 部署文档 | `deploy/prod/README.md`、`.env.example` |
|
|
||||||
| CI 部署段改为调用宿主脚本，未配 PG secrets 时自动跳过 | `.gitea/workflows/docker-build.yml` |
|
|
||||||
|
|
||||||
### 2.4 Windows 本地打包 — 通过 ✅
|
|
||||||
|
|
||||||
`npm run build:win` 全流程成功（本机需 Node 20.19+；已用便携 Node 20.18.1 之外的 Node 24 验证过 vite 构建）：
|
|
||||||
|
|
||||||
| 产物 | 路径 | 大小 |
|
|
||||||
| --- | --- | --- |
|
|
||||||
| 安装包 | `artifacts/windows/iBoard_0.2.1_x64-setup.exe` | 6.9 MB |
|
|
||||||
| 便携版 zip | `artifacts/windows/iBoard_0.2.1_x64-portable.zip` | 7.9 MB |
|
|
||||||
|
|
||||||
外壳能力（继承 dev-windows-0.1）：托盘、悬浮球吸附、自动隐藏、单实例、自启动、窗口尺寸单值配置
|
|
||||||
（`%APPDATA%\com.iboard.app\shell-config.json` 的 `window_width`，高度按 405:720 锁定推导）。
|
|
||||||
|
|
||||||
离线能力（继承 0.2.1）：GET 响应本地缓存、同步凭证持久化（离线不清库）、左上角「离线」徽标。
|
|
||||||
|
|
||||||
### 2.5 Android CI — 通过 ✅
|
|
||||||
|
|
||||||
- 触发：`android-1.0` 分支 push（`4ded8e3`）
|
|
||||||
- 结果：**16 个步骤全部 success**，`Build release APK` + `Publish APK to Gitea packages` 成功
|
|
||||||
- 产物：`app-universal-release.apk`（20 MB），versionName = **0.2.1**
|
|
||||||
已发布到 `http://git.honor3.com/api/packages/Fullstack/generic/iboard/1.0-4ded8e30/`
|
|
||||||
- 首次失败原因：runner 宿主机（baihu）磁盘 **95%** → `No space left on device`；
|
|
||||||
清理悬空镜像 + 构建缓存后释放 11.5 GB，重跑通过。**磁盘现已 60%（39 GB 可用）**
|
|
||||||
|
|
||||||
### 2.6 CI/CD 现状
|
|
||||||
|
|
||||||
| Workflow | 触发 | 状态 |
|
|
||||||
| --- | --- | --- |
|
|
||||||
| `docker-build.yml` | `master` push | 改造完成，未在 master 上验证（部署段会因缺 secrets 跳过） |
|
|
||||||
| `android-build.yml` | `android-*` push | **已验证通过** |
|
|
||||||
| `ota-build.yml` / `sync-registry.yml` | 参照原逻辑 | 未改动 |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 三、当前卡点（生产切换未执行）
|
|
||||||
|
|
||||||
生产镜像 **已构建成功**：`iboard:latest` = `db6b27b851b8`（924 MB，2026-10-26 22:53）
|
|
||||||
|
|
||||||
baihu 上当前跑着两套：
|
|
||||||
|
|
||||||
| 容器 | 用途 | 端口 |
|
|
||||||
| --- | --- | --- |
|
|
||||||
| `iboard`（旧） | **现网生产**，MySQL（宿主 3306） | 3001 |
|
|
||||||
| `iboard-021-app-1` 等 4 个 | 0.2.1 验证栈 | 13001 / 13002 / 13443 |
|
|
||||||
| （未启动）`iboard-prod` | **新生产栈**（PG + PowerSync + app） | 3001（计划） |
|
|
||||||
|
|
||||||
`/app/iboard-prod` 已上传源码、`deploy/prod/.env` 已生成（6 个密钥，600 权限）。
|
|
||||||
|
|
||||||
**剩余步骤（约 4 步）**：
|
|
||||||
|
|
||||||
1. 起新栈（先用 `HOST_PORT=13011` 灰度，不动现网）
|
|
||||||
2. 数据迁移：现网 MySQL → 新 PG（`scripts/etl-mariadb-to-pg.mjs`，只读源库）
|
|
||||||
3. 验证：健康检查、登录、任务列表、离线编辑（断网后仍可读）、同步回流
|
|
||||||
4. 切换：停 `iboard` 旧容器 → 新栈改绑 3001 → 域名 `iboard.honor3.com` 生效 → 下线验证栈（13001/13002/13443）
|
|
||||||
|
|
||||||
然后 `dev-0.2` → `master` 合并推送，触发 CI 发布。
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 四、需要确认的信息（阻塞项）
|
|
||||||
|
|
||||||
1. **Gitea Actions Secrets 是否要配 PG 密钥？**
|
|
||||||
需配：`PG_PASSWORD`、`PS_STORAGE_PASSWORD`、`JWT_SECRET`、`POWERSYNC_JWT_SECRET`、`POWERSYNC_JWT_KEY_B64`。
|
|
||||||
不配的话：master 的 CI 只构建镜像不部署，生产靠手工执行 `scripts/deploy/prod.sh`（当前默认路径）。
|
|
||||||
|
|
||||||
2. **生产数据迁移的时间窗口**：迁移需短暂停写（现网 MySQL 只读快照）。是否可以挑一个低峰时间、期间 (~10 分钟) 站点只读？
|
|
||||||
|
|
||||||
3. **现网 MySQL 里的米家凭证/缓存**：`/app/iboard/cache`（`auth.txt` 等）是否要一并搬到新栈的 `deploy/prod/data/cache`？
|
|
||||||
|
|
||||||
4. **用户密码**：迁移只搬数据，`JWT_SECRET` 若换新，所有人需重新登录；是否沿用现网 `JWT_SECRET`（`iboard`）以保持登录态？**建议换新**（当前值过弱）。
|
|
||||||
|
|
||||||
5. **域名端口说明**：`iboard.honor3.com` 实际反代到 baihu **3001**（NPM 配置：`114.134.187.170:3001`，SSL 强制）。
|
|
||||||
你提到"已转向 3000 端口"——请确认指的是 `honor3.com` 根域（→ homepage）而非 `iboard` 子域，
|
|
||||||
否则需要调整 NPM 的 forward_port。
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 五、关键路径与命令速查
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# 仓库
|
|
||||||
C:\Users\Rabbit\Documents\workbetch\iboard # dev-0.2 主工作区
|
|
||||||
C:\Users\Rabbit\Documents\workbetch\iboard-dev-0.2.1 # 研究分支 worktree
|
|
||||||
C:\Users\Rabbit\Documents\workbetch\iboard-dev-windows # Windows 外壳 worktree
|
|
||||||
|
|
||||||
# 服务器
|
|
||||||
ssh root@baihu # 生产 + CI runner（baihu 上跑 act_runner，注册名 baishe）
|
|
||||||
ssh root@baishe # 反代（NPM）、Gitea、homepage
|
|
||||||
|
|
||||||
# 生产目录
|
|
||||||
/app/iboard-prod/deploy/prod/{docker-compose.yml,.env,data/,powersync/,sql/,initdb/}
|
|
||||||
|
|
||||||
# 常用
|
|
||||||
docker compose -f /app/iboard-prod/deploy/prod/docker-compose.yml --env-file /app/iboard-prod/deploy/prod/.env ps
|
|
||||||
bash /app/iboard-prod/scripts/deploy/prod.sh
|
|
||||||
curl -s https://iboard.honor3.com/api/health
|
|
||||||
```
|
|
||||||
|
|
||||||
## 五之二、后续动作执行步骤（已确认方案，按序执行）
|
|
||||||
|
|
||||||
### 决策确认（2026-10-27）
|
|
||||||
|
|
||||||
| 项 | 决定 |
|
|
||||||
| --- | --- |
|
|
||||||
| PG 密钥 | **不进 Gitea Secrets**，直接写在服务器 `/app/iboard-prod/deploy/prod/.env`（600） |
|
|
||||||
| 迁移时机 | 立即执行 |
|
|
||||||
| 米家凭证 | 保留，`/app/iboard/cache` 搬到新栈 `deploy/prod/data/cache` |
|
|
||||||
| `JWT_SECRET` | 沿用现网值（`iboard`），保持现有登录态 |
|
|
||||||
| 域名 | `iboard.honor3.com` → baihu **3001**（NPM 已配好，SSL 强制） |
|
|
||||||
|
|
||||||
### 步骤 A：准备（不改动现网）
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# A1. 沿用现网 JWT_SECRET (其余密钥保持已生成的随机值)
|
|
||||||
cd /app/iboard-prod/deploy/prod
|
|
||||||
sed -i 's/^JWT_SECRET=.*/JWT_SECRET=iboard/' .env
|
|
||||||
|
|
||||||
# A2. 搬米家缓存 (auth.txt 等)
|
|
||||||
mkdir -p data/cache
|
|
||||||
rsync -a /app/iboard/cache/ data/cache/
|
|
||||||
|
|
||||||
# A3. 保留旧镜像用于回滚
|
|
||||||
docker tag iboard:latest iboard:mysql-final # 需在重新构建前执行; 若已覆盖见"回滚预案"
|
|
||||||
```
|
|
||||||
|
|
||||||
### 步骤 B：起灰度栈（不动现网 3001）
|
|
||||||
|
|
||||||
```bash
|
|
||||||
cd /app/iboard-prod/deploy/prod
|
|
||||||
HOST_PORT=13011 docker compose --project-name iboard-prod \
|
|
||||||
--env-file .env -f docker-compose.yml up -d pg
|
|
||||||
|
|
||||||
# 迁移建表
|
|
||||||
docker run --rm --network iboard-prod_default \
|
|
||||||
-e DATABASE_URL="postgresql://iboard:$(grep ^PG_PASSWORD .env | cut -d= -f2)@pg:5432/iboard" \
|
|
||||||
iboard:latest npx prisma migrate deploy
|
|
||||||
|
|
||||||
# 建 publication (必须在建表之后)
|
|
||||||
docker compose --project-name iboard-prod --env-file .env -f docker-compose.yml exec -T pg \
|
|
||||||
psql -U iboard -d iboard -v ON_ERROR_STOP=1 -f /dev/stdin < sql/publication.sql
|
|
||||||
|
|
||||||
# 起 app + powersync (只有 13011 对外)
|
|
||||||
HOST_PORT=13011 docker compose --project-name iboard-prod \
|
|
||||||
--env-file .env -f docker-compose.yml up -d app powersync
|
|
||||||
|
|
||||||
# 验收
|
|
||||||
curl -s http://127.0.0.1:13011/api/health # {"ok":true,...}
|
|
||||||
ss -tlnp | grep -E ':(13011|5432|8080)\b' # 只应看到 13011
|
|
||||||
```
|
|
||||||
|
|
||||||
### 步骤 C：数据迁移（MySQL → PG）
|
|
||||||
|
|
||||||
```bash
|
|
||||||
docker run --rm --network iboard-prod_default \
|
|
||||||
-e DATABASE_URL="postgresql://iboard:<PG_PASSWORD>@pg:5432/iboard" \
|
|
||||||
-e SRC_DATABASE_URL="mysql://root:<MYSQL_PASSWORD>@<host>:3306/iboard" \
|
|
||||||
iboard:latest node scripts/etl-mariadb-to-pg.mjs
|
|
||||||
|
|
||||||
# 迁移后重启同步服务重建快照
|
|
||||||
docker compose --project-name iboard-prod --env-file .env -f docker-compose.yml restart powersync
|
|
||||||
```
|
|
||||||
|
|
||||||
**验收**：项目 3 个（ADMIN / IBOARD / P3F921）、任务 ~22 条、用户 1 个（admin@iboard.local）；
|
|
||||||
`docker compose logs powersync` 显示 replication 已激活且无报错。
|
|
||||||
|
|
||||||
### 步骤 D：功能验证（13011）
|
|
||||||
|
|
||||||
- 登录 `admin@iboard.local`
|
|
||||||
- 任务页：项目卡片、任务编号（如 `ADMIN-16`）
|
|
||||||
- **离线验证**：断网后列表仍可读、左上角出现「离线」徽标，恢复网络自动同步回流
|
|
||||||
- 监控 / 宏观 / 打卡页有数据
|
|
||||||
|
|
||||||
### 步骤 E：切换生产
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# E1. 停旧容器 (MySQL 版)
|
|
||||||
docker rm -vf iboard || true
|
|
||||||
|
|
||||||
# E2. 新栈改绑 3001
|
|
||||||
cd /app/iboard-prod/deploy/prod
|
|
||||||
HOST_PORT=3001 docker compose --project-name iboard-prod \
|
|
||||||
--env-file .env -f docker-compose.yml up -d app
|
|
||||||
curl -s https://iboard.honor3.com/api/health # 经 NPM + 证书
|
|
||||||
|
|
||||||
# E3. 下线 0.2.1 验证栈 (释放 13001/13002/13443)
|
|
||||||
cd /app/iboard-0.2.1/deploy/0.2.1 && docker compose down
|
|
||||||
```
|
|
||||||
|
|
||||||
**验收**：`https://iboard.honor3.com` 可登录、任务正常、离线可编辑；
|
|
||||||
`ss -tlnp` 只剩 3001（外加仅供本机的 3306）。
|
|
||||||
|
|
||||||
### 步骤 F：发布
|
|
||||||
|
|
||||||
```bash
|
|
||||||
git checkout master && git merge dev-0.2 --no-edit
|
|
||||||
git push origin master # 触发 CI: 构建镜像 + OTA
|
|
||||||
```
|
|
||||||
|
|
||||||
CI 未配 PG secrets → 只构建不部署；生产已由步骤 B~E 手工就绪。
|
|
||||||
|
|
||||||
### 回滚预案
|
|
||||||
|
|
||||||
| 场景 | 动作 |
|
|
||||||
| --- | --- |
|
|
||||||
| 新栈起不来 | 旧容器未停，现网不受影响，回步骤 B 排查 |
|
|
||||||
| 迁移数据不对 | 清空 `deploy/prod/data/pg` 后重跑 ETL |
|
|
||||||
| 切换后严重故障 | **`docker start iboard`**（旧容器仍在，见 6.2 警告：旧镜像已被 prune，不能重建） |
|
|
||||||
|
|
||||||
## 六、遗留清单与清理建议（2026-10-27 实测）
|
|
||||||
|
|
||||||
### 6.1 本机（Windows）
|
|
||||||
|
|
||||||
| 路径 | 占用 | 建议 | 说明 |
|
|
||||||
| --- | --- | --- | --- |
|
|
||||||
| `workbetch/iboard`（主 worktree） | 3.81 GB | **保留** | 含 `node_modules` 0.49 GB + `src-tauri/target` 2.56 GB |
|
|
||||||
| `workbetch/iboard-dev-0.2.1` | 0.53 GB | **可删** | 内容已全部并入 `dev-0.2` |
|
|
||||||
| `workbetch/iboard-dev-windows` | 8.88 GB | **可删** | 同上，最大占用（含 Rust 编译产物） |
|
|
||||||
| `iboard/src-tauri/target` | 2.56 GB | 可选 `cargo clean` | 删后下次打包需重编译（约 8 分钟） |
|
|
||||||
| `iboard/artifacts/windows` | 32 MB | 保留最新安装包 | 0.2.1 exe/zip |
|
|
||||||
| `%TEMP%\node-portable` | 78 MB | **保留** | 本机无系统 Node/npm，`npm run build:win` 依赖它 |
|
|
||||||
| `%TEMP%\esbuild-*`（4 个） | 8 MB | 可删 | 构建残留 |
|
|
||||||
| `%TEMP%\iboard-e2e`、`iboard-shell-offline` | < 1 MB | 可删 | 验证截图 |
|
|
||||||
| `%TEMP%\edge-e2e-profile` | ~100 MB | 可删 | 无头浏览器测试配置 |
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# 删除 worktree 与已合并分支（内容已在 dev-0.2）
|
|
||||||
git worktree remove ../iboard-dev-0.2.1
|
|
||||||
git worktree remove ../iboard-dev-windows
|
|
||||||
git branch -d dev-0.2.1 dev-windows-0.1
|
|
||||||
git branch -D tmp-offline-edit
|
|
||||||
```
|
|
||||||
|
|
||||||
### 6.2 服务器 baihu
|
|
||||||
|
|
||||||
| 路径/对象 | 占用 | 建议 | 说明 |
|
|
||||||
| --- | --- | --- | --- |
|
|
||||||
| `/app/iboard-prod` | 72 MB | **保留** | 当前生产 |
|
|
||||||
| `/app/iboard` | 24 KB | 暂留 → 可删 | 旧生产只剩 `cache/`（`auth.txt` 已复制到新栈）+ `start.sh` |
|
|
||||||
| `/app/iboard-0.2.1` | 71 MB | **可删** | 验证栈已 down；其中 `deploy/0.2.1/data` 67 MB 是废弃 PG 数据 |
|
|
||||||
| `/app/cicd` | 36 KB | **保留** | act_runner 配置 |
|
|
||||||
| 容器 `iboard`（Exited） | — | **暂留** | 当前唯一回滚手段（见下方警告） |
|
|
||||||
| 镜像 `iboard-021-app:latest` | 924 MB | **可删** | 验证栈镜像 |
|
|
||||||
| 镜像 `iboard:latest` | 934 MB | 保留 | CI 构建产物 |
|
|
||||||
| 悬空镜像 + 构建缓存 | 18.7 GB + 2.4 GB | 可清 | `docker image prune -f && docker builder prune -af` |
|
|
||||||
|
|
||||||
> **⚠ 回滚能力警告（实测更正）**
|
|
||||||
> 原计划保留的 `iboard:mysql-final` 旧镜像**已被 `docker image prune` 清除** —— 旧镜像失去 tag 后成为悬空镜像被回收。
|
|
||||||
> 现在唯一回滚途径是重启仍存在的旧容器 `iboard`（镜像层随容器保留）：
|
|
||||||
>
|
|
||||||
> ```bash
|
|
||||||
> docker stop iboard-prod-app-1
|
|
||||||
> docker start iboard # 旧 MySQL 版立即恢复 3001
|
|
||||||
> ```
|
|
||||||
>
|
|
||||||
> **在再次执行 `docker image prune` 前，务必先确认旧容器仍在**；容器一旦删除，MySQL 版镜像只能从 git 历史重新构建。
|
|
||||||
|
|
||||||
### 6.3 代码与其他
|
|
||||||
|
|
||||||
- 临时测试脚本（`scripts/_prod-e2e.mjs`、`_browser-test.mjs`、`_shell-offline-test.mjs`）含真实口令，已加入 `.gitignore`（`scripts/_*.mjs`），**不要入库**
|
|
||||||
- `0.2.1` 验证库里的测试任务（如 `浏览器验证任务`）已按 MySQL 现状一并迁入 PG，如需清理直接在 PG 删除
|
|
||||||
- `prisma/migrations/` 仍是 MySQL 语法，**新环境建表必须用 `prisma db push --accept-data-loss`**（已写入 `deploy/prod/README.md`）
|
|
||||||
- `JWT_SECRET` 仍为弱值（`iboard`），建议择机换新（换新需全员重新登录）
|
|
||||||
- `node_modules` 在多个 Node 版本间切换过，遇 esbuild 权限报错时清空重装
|
|
||||||
|
|
||||||
## 七、外壳升级策略：必须整包升级，不能只靠 OTA
|
|
||||||
|
|
||||||
### 结论
|
|
||||||
|
|
||||||
| 平台 | 结论 | 关键原因 |
|
|
||||||
| --- | --- | --- |
|
|
||||||
| Windows 外壳（0.1.0） | **必须重装 exe** | ① CSP 白名单编译进原生二进制，0.1.0 不含 `https://iboard.honor3.com`；② 旧外壳 OTA 检查地址指向 `13001`，**该端口已下线**，连检查都失败 |
|
|
||||||
| Android（0.1.0 APK） | **必须换装 APK** | CSP 同样是原生配置；旧 APK 的 OTA 端点（3001）虽然有效，但拉到 0.2.1 前端会被 CSP 拦截 → 白屏 |
|
|
||||||
|
|
||||||
### 为什么 OTA 不够
|
|
||||||
|
|
||||||
`tauri-plugin-hotswap` 的 OTA 包内容只有 `bundle.tar.gz`（即 `dist/` 前端资源），**不触碰原生层**：
|
|
||||||
|
|
||||||
| 配置项 | 位置 | OTA 能否修改 |
|
|
||||||
| --- | --- | --- |
|
|
||||||
| CSP 白名单（`connect-src`） | `tauri.conf.json` → 编译期 `generate_context!` 注入二进制 | ❌ |
|
|
||||||
| OTA 检查 endpoint | 同上 | ❌ |
|
|
||||||
| 窗口尺寸/最小尺寸 | 同上（另可被 `shell-config.json` 覆盖） | ❌ |
|
|
||||||
| 托盘 / 悬浮球 / 自启动 | Rust `src-tauri/src/shell/*` | ❌ |
|
|
||||||
| 页面 JS/CSS/WASM（含离线编辑、徽标、编号展示） | `dist/` | ✅ |
|
|
||||||
|
|
||||||
因此旧外壳无法通过 OTA 获得访问新域名的能力。
|
|
||||||
|
|
||||||
### 已采取的保护措施
|
|
||||||
|
|
||||||
CI 的 `OTA_MIN_BINARY` 已从 `0.1.0` 提升到 **`0.2.1`**：
|
|
||||||
|
|
||||||
- 旧外壳（0.1.0 < 0.2.1）会被 hotswap 判定为不兼容 → **拒绝接收新前端**
|
|
||||||
- 旧外壳继续运行旧前端，仍访问 `http://bh.vps.honor3.com:3001`（该地址现指向新栈，`/api` 完全兼容）
|
|
||||||
- 结果：**旧外壳不会白屏**，只是缺少离线编辑、项目编号等 0.2.1 新能力
|
|
||||||
|
|
||||||
### 升级后
|
|
||||||
|
|
||||||
- 新外壳版本 0.2.1，CSP 含 `https://iboard.honor3.com`，OTA 恢复正常（后续纯前端改动可继续走 OTA）
|
|
||||||
- Windows 窗口尺寸通过 `%APPDATA%\com.iboard.app\shell-config.json` 的 `window_width` 单值配置
|
|
||||||
|
|
||||||
@@ -360,7 +360,7 @@
|
|||||||
| --- | --- |
|
| --- | --- |
|
||||||
| 任务 `⋯` 菜单 | 新增「归档」（`Dialog.confirm`，含子任务时提示连带条数）；成功后列表/看板乐观移除 |
|
| 任务 `⋯` 菜单 | 新增「归档」（`Dialog.confirm`，含子任务时提示连带条数）；成功后列表/看板乐观移除 |
|
||||||
| 项目管理 | 「归档设置」分区：`Selector` 四档（3 天后/一周后/一月后/永不），保存即生效 |
|
| 项目管理 | 「归档设置」分区：`Selector` 四档（3 天后/一周后/一月后/永不），保存即生效 |
|
||||||
| 项目视图头部 | 项目栏新增「已归档」入口 → 全屏弹层：过滤条（**关键词 / 看板列 / 归档时段**；时段含「本周 / 本月 / 本季度」快捷项与自定义区间；条件编辑后点「筛选」统一提交，另有「重置」；**不提供类型过滤**）+ 已应用条件标签（可单独撤销）与命中条数 + 分页「加载更多」+ 行内「恢复 / 删除」 |
|
| 项目视图头部 | 项目栏新增「已归档」入口 → 全屏弹层：过滤条（关键词/类型/列/归档时段）+ 分页「加载更多」+ 行内「恢复 / 删除」 |
|
||||||
| 主视图 | 列表/看板无需感知归档（数据源已排除）；恢复后经 `load()` 回到原位 |
|
| 主视图 | 列表/看板无需感知归档（数据源已排除）；恢复后经 `load()` 回到原位 |
|
||||||
|
|
||||||
### 15.5 边界
|
### 15.5 边界
|
||||||
|
|||||||
@@ -1,627 +0,0 @@
|
|||||||
<!DOCTYPE html>
|
|
||||||
<html lang="zh-CN">
|
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8" />
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
|
||||||
<title>已归档任务管理 · 界面重设计（原型待评审）</title>
|
|
||||||
<style>
|
|
||||||
:root{
|
|
||||||
--bg:#f0f2f5; --page:#fff; --card:#fff;
|
|
||||||
--text:#333; --muted:#666; --weak:#999; --line:#eee;
|
|
||||||
--primary:#1677ff; --danger:#ff3141; --success:#00b578;
|
|
||||||
--nav-h:45px; --tab-h:72px;
|
|
||||||
}
|
|
||||||
*{box-sizing:border-box;margin:0;padding:0}
|
|
||||||
body{
|
|
||||||
background:var(--bg); color:#1f2328; font-size:14px; line-height:1.6;
|
|
||||||
font-family:-apple-system,BlinkMacSystemFont,'Segoe UI','PingFang SC','Hiragino Sans GB','Microsoft YaHei',Roboto,sans-serif;
|
|
||||||
-webkit-font-smoothing:antialiased;
|
|
||||||
}
|
|
||||||
.wrap{max-width:1400px;margin:0 auto;padding:36px 24px 72px}
|
|
||||||
.doc-head{border-bottom:1px solid #e3e6ea;padding-bottom:20px;margin-bottom:28px}
|
|
||||||
.doc-head h1{font-size:26px;font-weight:700;letter-spacing:.5px}
|
|
||||||
.doc-head p{color:var(--muted);font-size:13px;margin-top:6px}
|
|
||||||
.meta{display:flex;flex-wrap:wrap;gap:8px;margin-top:14px}
|
|
||||||
.meta span{font-size:12px;background:#fff;border:1px solid #e3e6ea;border-radius:999px;padding:3px 12px;color:var(--muted)}
|
|
||||||
h2{font-size:19px;font-weight:700;margin:40px 0 6px;display:flex;align-items:center;gap:10px}
|
|
||||||
h2::before{content:"";width:4px;height:17px;background:var(--primary);border-radius:2px}
|
|
||||||
h2 .sub{font-size:12px;font-weight:400;color:var(--weak)}
|
|
||||||
p.desc{color:var(--muted);font-size:13px;margin-bottom:16px}
|
|
||||||
|
|
||||||
/* ---------- 改动要点 ---------- */
|
|
||||||
.changes{display:grid;grid-template-columns:repeat(auto-fit,minmax(260px,1fr));gap:14px}
|
|
||||||
.chg{background:#fff;border:1px solid #e6e8eb;border-radius:12px;padding:14px 16px}
|
|
||||||
.chg .k{font-size:11px;color:var(--primary);font-weight:700;letter-spacing:.6px}
|
|
||||||
.chg h4{font-size:14px;font-weight:700;margin:5px 0 6px}
|
|
||||||
.chg p{font-size:12.5px;color:var(--muted);line-height:1.65}
|
|
||||||
.chg .old{color:var(--danger);font-size:12px;text-decoration:line-through}
|
|
||||||
|
|
||||||
/* ---------- 手机框 ---------- */
|
|
||||||
.stage{display:flex;gap:34px;flex-wrap:wrap;align-items:flex-start;margin-top:18px}
|
|
||||||
.phone{
|
|
||||||
width:400px;height:812px;background:var(--page);position:relative;overflow:hidden;
|
|
||||||
border:1px solid #d8dde3;border-radius:22px;box-shadow:0 10px 24px rgba(15,23,42,.08);
|
|
||||||
display:flex;flex-direction:column;
|
|
||||||
}
|
|
||||||
.phone::after{content:"";position:absolute;top:8px;left:50%;transform:translateX(-50%);width:112px;height:19px;background:#111827;border-radius:12px;opacity:.9;z-index:5}
|
|
||||||
.phone.sm{width:340px;height:700px}
|
|
||||||
.phone .nav{
|
|
||||||
height:var(--nav-h);margin-top:26px;flex-shrink:0;display:flex;align-items:center;gap:10px;
|
|
||||||
padding:0 14px;background:#fff;border-bottom:1px solid var(--line);
|
|
||||||
}
|
|
||||||
.phone .nav .back{font-size:20px;color:#666;line-height:1;cursor:pointer}
|
|
||||||
.phone .nav .title{font-size:16px;font-weight:700}
|
|
||||||
.phone .nav .proj{margin-left:auto;font-size:11px;color:var(--weak);background:#f5f6f8;border-radius:999px;padding:2px 9px;max-width:130px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
|
|
||||||
.phone .body{flex:1;min-height:0;overflow-y:auto;background:#f5f5f5;padding-bottom:18px}
|
|
||||||
|
|
||||||
/* ---------- 筛选卡 ---------- */
|
|
||||||
.fcard{background:#fff;margin:10px 12px 0;border-radius:12px;padding:4px 14px 12px;box-shadow:0 1px 2px rgba(0,0,0,.04)}
|
|
||||||
.frow{display:flex;align-items:center;gap:10px;padding:10px 0;border-bottom:1px solid #f4f5f7}
|
|
||||||
.frow:last-of-type{border-bottom:0}
|
|
||||||
.frow > .lbl{width:56px;flex-shrink:0;font-size:12.5px;font-weight:600;color:var(--text)}
|
|
||||||
.frow > .ctl{flex:1;min-width:0}
|
|
||||||
/* 标题输入框前的提示 */
|
|
||||||
.kwbox{display:flex;align-items:center;gap:7px;background:#f7f8fa;border:1px solid #eceef1;border-radius:8px;padding:6px 9px}
|
|
||||||
.kwbox:focus-within{border-color:var(--primary);background:#fff}
|
|
||||||
.kwbox .ph{font-size:11.5px;color:var(--weak);flex-shrink:0}
|
|
||||||
.kwbox input{flex:1;min-width:0;border:0;background:transparent;font-size:13px;outline:none;color:var(--text)}
|
|
||||||
.kwbox input::placeholder{color:#c2c6cc}
|
|
||||||
.kwbox .clr{font-size:12px;color:#c2c6cc;cursor:pointer;flex-shrink:0}
|
|
||||||
|
|
||||||
.chips{display:flex;flex-wrap:wrap;gap:6px}
|
|
||||||
.chip{
|
|
||||||
font-size:12px;padding:4px 11px;border-radius:999px;border:1px solid #e6e8eb;
|
|
||||||
background:#fafbfc;color:var(--muted);cursor:pointer;white-space:nowrap;transition:.15s;
|
|
||||||
}
|
|
||||||
.chip:hover{border-color:#c9d3e0}
|
|
||||||
.chip.on{background:#eaf3ff;border-color:var(--primary);color:var(--primary);font-weight:600}
|
|
||||||
.chip .x{margin-left:5px;color:#9aa4b2}
|
|
||||||
|
|
||||||
.range{display:flex;align-items:center;gap:7px;margin-top:8px}
|
|
||||||
.range .dp{font-size:12px;padding:4px 10px;border:1px dashed #d9dee5;border-radius:7px;color:var(--weak);cursor:pointer;background:#fff}
|
|
||||||
.range .dp.on{color:var(--text);border-style:solid;border-color:#d9dee5}
|
|
||||||
.range .sep{color:#c2c6cc;font-size:12px}
|
|
||||||
|
|
||||||
.factions{display:flex;gap:9px;padding-top:12px}
|
|
||||||
.btn{flex:1;height:36px;border-radius:9px;border:0;font-size:13.5px;font-weight:600;cursor:pointer;transition:.15s}
|
|
||||||
.btn.ghost{background:#f4f5f7;color:var(--muted);flex:0 0 84px}
|
|
||||||
.btn.primary{background:var(--primary);color:#fff;box-shadow:0 2px 8px rgba(22,119,255,.26)}
|
|
||||||
.btn.primary:active{transform:translateY(1px)}
|
|
||||||
.btn .badge{display:inline-block;min-width:16px;height:16px;line-height:16px;border-radius:8px;background:rgba(255,255,255,.28);font-size:10.5px;margin-left:5px;padding:0 4px}
|
|
||||||
|
|
||||||
/* ---------- 已应用条件 ---------- */
|
|
||||||
.applied{display:flex;flex-wrap:wrap;gap:6px;align-items:center;padding:11px 14px 3px}
|
|
||||||
.applied .tag{font-size:11.5px;background:#eaf3ff;color:var(--primary);border-radius:6px;padding:2px 7px;display:flex;align-items:center;gap:5px}
|
|
||||||
.applied .tag b{font-weight:600}
|
|
||||||
.applied .tag .x{cursor:pointer;opacity:.6}
|
|
||||||
.applied .cnt{margin-left:auto;font-size:11.5px;color:var(--weak)}
|
|
||||||
|
|
||||||
/* ---------- 列表 ---------- */
|
|
||||||
.list{padding:8px 12px 0;display:flex;flex-direction:column;gap:8px}
|
|
||||||
.item{background:#fff;border-radius:10px;padding:11px 12px;box-shadow:0 1px 2px rgba(0,0,0,.04)}
|
|
||||||
.item .top{display:flex;gap:8px;align-items:flex-start}
|
|
||||||
.item .ttl{flex:1;min-width:0;font-size:13.5px;font-weight:600;line-height:1.42;word-break:break-word}
|
|
||||||
.item .num{font-size:10px;color:#9aa4b2;background:#f5f6f8;border-radius:4px;padding:1px 5px;flex-shrink:0;margin-top:1px}
|
|
||||||
.item .meta{display:flex;gap:7px;align-items:center;flex-wrap:wrap;margin-top:7px;font-size:10.5px;color:var(--weak)}
|
|
||||||
.item .meta .col{color:var(--muted)}
|
|
||||||
.item .meta .dot{width:3px;height:3px;border-radius:50%;background:#d5d9e0}
|
|
||||||
.item .acts{display:flex;gap:7px;justify-content:flex-end;margin-top:9px;padding-top:9px;border-top:1px dashed #f0f1f3}
|
|
||||||
.mini{font-size:11.5px;padding:3px 12px;border-radius:999px;border:1px solid var(--primary);color:var(--primary);background:#fff;cursor:pointer;white-space:nowrap}
|
|
||||||
.mini.danger{border-color:#ffd4d7;color:var(--danger)}
|
|
||||||
.kind{font-size:10px;line-height:1;font-weight:600;color:#fff;border-radius:4px;padding:3px 5px}
|
|
||||||
|
|
||||||
.empty{text-align:center;padding:56px 20px;color:#b8bcc4;font-size:13px}
|
|
||||||
.empty .ico{font-size:34px;opacity:.35;margin-bottom:10px}
|
|
||||||
.more{display:block;width:calc(100% - 24px);margin:12px auto 0;height:34px;border-radius:9px;border:1px solid #e6e8eb;background:#fff;color:var(--muted);font-size:12.5px;cursor:pointer}
|
|
||||||
|
|
||||||
.toast{
|
|
||||||
position:absolute;left:50%;bottom:56px;transform:translateX(-50%) translateY(8px);
|
|
||||||
background:rgba(0,0,0,.78);color:#fff;font-size:12.5px;padding:8px 16px;border-radius:8px;
|
|
||||||
opacity:0;transition:.22s;z-index:9;pointer-events:none;white-space:nowrap;
|
|
||||||
}
|
|
||||||
.toast.show{opacity:1;transform:translateX(-50%) translateY(0)}
|
|
||||||
|
|
||||||
.caption{margin-top:12px;background:#fff;border:1px solid #e6e8eb;border-radius:10px;padding:11px 14px;width:400px}
|
|
||||||
.caption b{font-size:13px;display:block;margin-bottom:4px}
|
|
||||||
.caption span{font-size:12px;color:var(--muted);line-height:1.65}
|
|
||||||
|
|
||||||
.notes{flex:1;min-width:300px;display:flex;flex-direction:column;gap:12px}
|
|
||||||
.note{background:#fff;border:1px solid #e6e8eb;border-radius:12px;padding:14px 16px}
|
|
||||||
.note h4{font-size:13px;font-weight:700;margin-bottom:7px;display:flex;align-items:center;gap:7px}
|
|
||||||
.note h4 i{width:18px;height:18px;border-radius:50%;background:#eaf3ff;color:var(--primary);font-size:11px;font-style:normal;display:flex;align-items:center;justify-content:center;font-weight:700}
|
|
||||||
.note ul{list-style:none;font-size:12.5px;color:var(--muted);line-height:1.85}
|
|
||||||
.note ul li::before{content:"·";color:#c2c6cc;margin-right:6px}
|
|
||||||
.note code{background:#f5f6f8;border-radius:4px;padding:1px 5px;font-size:11.5px;color:#c7254e}
|
|
||||||
|
|
||||||
table{width:100%;border-collapse:collapse;background:#fff;border-radius:12px;overflow:hidden;border:1px solid #e6e8eb;font-size:12.5px}
|
|
||||||
th,td{padding:10px 14px;text-align:left;border-bottom:1px solid #f0f1f3;vertical-align:top}
|
|
||||||
th{background:#fafbfc;font-size:12px;color:var(--muted);font-weight:600}
|
|
||||||
tr:last-child td{border-bottom:0}
|
|
||||||
td .no{color:var(--danger)}
|
|
||||||
td .yes{color:var(--success);font-weight:600}
|
|
||||||
.variants{display:flex;gap:26px;flex-wrap:wrap;margin-top:16px}
|
|
||||||
</style>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<div class="wrap">
|
|
||||||
|
|
||||||
<div class="doc-head">
|
|
||||||
<h1>已归档任务管理 · 界面重设计</h1>
|
|
||||||
<p>对应需求 T-ARC-04/05/06。本文件是<strong>评审用原型</strong>，不含业务代码改动；确认后再落地。</p>
|
|
||||||
<div class="meta">
|
|
||||||
<span>原型 · 待评审</span>
|
|
||||||
<span>2026-10-28</span>
|
|
||||||
<span>可交互：点预设 / 筛选 / 恢复</span>
|
|
||||||
<span>范围：任务模块 › 项目 › 已归档</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<h2>改动要点 <span class="sub">对照你提出的 4 点</span></h2>
|
|
||||||
<div class="changes">
|
|
||||||
<div class="chg">
|
|
||||||
<div class="k">01</div>
|
|
||||||
<h4>去掉「类型」过滤</h4>
|
|
||||||
<p>现版本的「全部类型」下拉整体移除。任务类型是弱维度，归档场景几乎不按类型找东西，反而占掉一横行高。</p>
|
|
||||||
<p class="old">全部类型 ▾</p>
|
|
||||||
</div>
|
|
||||||
<div class="chg">
|
|
||||||
<div class="k">02</div>
|
|
||||||
<h4>输入框前加提示</h4>
|
|
||||||
<p>关键词输入框前加固定标签「标题」，输入框内用灰字占位「输入关键词」——标签常驻，占位随输入消失，不会出现"不知道搜什么"。</p>
|
|
||||||
<p class="old">搜索任务标题（无标签）</p>
|
|
||||||
</div>
|
|
||||||
<div class="chg">
|
|
||||||
<div class="k">03</div>
|
|
||||||
<h4>归档时间快捷选择</h4>
|
|
||||||
<p>新增 <b>全部 / 本周 / 本月 / 本季度</b> 四个一键预设，选完自动算出起止日期并显示；需要精确区间时再选「自定义」。</p>
|
|
||||||
<p class="old">开始日期 ~ 结束日期（纯手点）</p>
|
|
||||||
</div>
|
|
||||||
<div class="chg">
|
|
||||||
<div class="k">04</div>
|
|
||||||
<h4>补上「筛选」按钮</h4>
|
|
||||||
<p>现版本改任何条件都立即查询、没有确认动作。改为：改条件 → 点<b>筛选</b>才生效，按钮上显示生效条件数；另给「重置」。</p>
|
|
||||||
<p class="old">无按钮（自动即时查询）</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<h2>主界面 <span class="sub">可交互 · 点一下试试</span></h2>
|
|
||||||
<div class="stage">
|
|
||||||
|
|
||||||
<div>
|
|
||||||
<div class="phone" id="phone">
|
|
||||||
<div class="nav">
|
|
||||||
<span class="back">‹</span>
|
|
||||||
<span class="title">已归档任务</span>
|
|
||||||
<span class="proj">Admin的任务</span>
|
|
||||||
</div>
|
|
||||||
<div class="body">
|
|
||||||
<!-- 筛选卡 -->
|
|
||||||
<div class="fcard">
|
|
||||||
<div class="frow">
|
|
||||||
<span class="lbl">标题</span>
|
|
||||||
<span class="ctl">
|
|
||||||
<span class="kwbox">
|
|
||||||
<input id="kw" placeholder="输入关键词" />
|
|
||||||
<span class="clr" id="kwClear" style="display:none">✕</span>
|
|
||||||
</span>
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="frow">
|
|
||||||
<span class="lbl">看板列</span>
|
|
||||||
<span class="ctl">
|
|
||||||
<span class="chips" id="colChips">
|
|
||||||
<span class="chip on" data-col="">全部</span>
|
|
||||||
<span class="chip" data-col="Plan">Plan</span>
|
|
||||||
<span class="chip" data-col="Doing">Doing</span>
|
|
||||||
<span class="chip" data-col="Done">Done</span>
|
|
||||||
</span>
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="frow">
|
|
||||||
<span class="lbl">归档时间</span>
|
|
||||||
<span class="ctl">
|
|
||||||
<span class="chips" id="timeChips">
|
|
||||||
<span class="chip on" data-t="all">全部</span>
|
|
||||||
<span class="chip" data-t="week">本周</span>
|
|
||||||
<span class="chip" data-t="month">本月</span>
|
|
||||||
<span class="chip" data-t="quarter">本季度</span>
|
|
||||||
<span class="chip" data-t="custom">自定义</span>
|
|
||||||
</span>
|
|
||||||
<span class="range" id="rangeRow" style="display:none">
|
|
||||||
<span class="dp" id="dpFrom">开始日期</span>
|
|
||||||
<span class="sep">~</span>
|
|
||||||
<span class="dp" id="dpTo">结束日期</span>
|
|
||||||
</span>
|
|
||||||
<div id="rangeHint" style="font-size:11px;color:#9aa4b2;margin-top:6px"></div>
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="factions">
|
|
||||||
<button class="btn ghost" id="resetBtn">重置</button>
|
|
||||||
<button class="btn primary" id="filterBtn">筛选</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- 已应用条件 -->
|
|
||||||
<div class="applied" id="appliedBar" style="display:none"></div>
|
|
||||||
|
|
||||||
<!-- 列表 -->
|
|
||||||
<div class="list" id="list"></div>
|
|
||||||
<button class="more" id="moreBtn">加载更多</button>
|
|
||||||
</div>
|
|
||||||
<div class="toast" id="toast"></div>
|
|
||||||
</div>
|
|
||||||
<div class="caption">
|
|
||||||
<b>主界面</b>
|
|
||||||
<span>筛选卡固定三行：标题 / 看板列 / 归档时间，外加操作行。改动不再即时生效，点「筛选」统一提交。</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="notes">
|
|
||||||
<div class="note">
|
|
||||||
<h4><i>1</i>为什么改成"点按钮才筛选"</h4>
|
|
||||||
<ul>
|
|
||||||
<li>现在每改一个条件就重查一次，连点三个条件就发三次请求</li>
|
|
||||||
<li>输入关键词时每敲一个字都可能触发（失焦也查），列表会闪</li>
|
|
||||||
<li>改成显式提交后，用户能先把条件填完整，再一次性看结果</li>
|
|
||||||
<li>按钮上带数字徽标，一眼知道当前生效了几个条件</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
<div class="note">
|
|
||||||
<h4><i>2</i>快捷时间怎么算</h4>
|
|
||||||
<ul>
|
|
||||||
<li><b>本周</b>：周一 00:00 ~ 今天（不跨到未来）</li>
|
|
||||||
<li><b>本月</b>：1 号 00:00 ~ 今天</li>
|
|
||||||
<li><b>本季度</b>：当季首月 1 号 00:00 ~ 今天</li>
|
|
||||||
<li>选完在下方灰字直接显示实际区间，避免"以为选的是整周"</li>
|
|
||||||
<li>「自定义」才展开两个日期选择器，默认收起</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
<div class="note">
|
|
||||||
<h4><i>3</i>已应用条件可单独撤销</h4>
|
|
||||||
<ul>
|
|
||||||
<li>筛选后在列表上方显示条件标签，每个带 <code>×</code> 可单独去掉</li>
|
|
||||||
<li>右侧显示命中条数，避免"筛完不知道有没有筛到"</li>
|
|
||||||
<li>无结果时给明确空状态，而不是一片留白</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
<div class="note">
|
|
||||||
<h4><i>4</i>列表行重排</h4>
|
|
||||||
<ul>
|
|
||||||
<li>标题独占一行（原来和类型/列/时间挤在下面）</li>
|
|
||||||
<li>元信息收成一行：<code>#编号</code> · 看板列 · 归档于 日期</li>
|
|
||||||
<li>「恢复 / 删除」从右侧竖排改到底部右侧横排，减少每行高度</li>
|
|
||||||
<li>类型标签保留展示（只是不再作为筛选项）</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<h2>状态变体</h2>
|
|
||||||
<div class="variants">
|
|
||||||
<div>
|
|
||||||
<div class="phone sm">
|
|
||||||
<div class="nav"><span class="back">‹</span><span class="title">已归档任务</span></div>
|
|
||||||
<div class="body">
|
|
||||||
<div class="fcard">
|
|
||||||
<div class="frow"><span class="lbl">标题</span><span class="ctl"><span class="kwbox"><input placeholder="输入关键词" /></span></span></div>
|
|
||||||
<div class="frow"><span class="lbl">看板列</span><span class="ctl"><span class="chips"><span class="chip on">全部</span><span class="chip">Plan</span><span class="chip">Done</span></span></span></div>
|
|
||||||
<div class="frow"><span class="lbl">归档时间</span><span class="ctl">
|
|
||||||
<span class="chips"><span class="chip">全部</span><span class="chip on">本周</span><span class="chip">本月</span><span class="chip">本季度</span><span class="chip">自定义</span></span>
|
|
||||||
<div style="font-size:11px;color:#9aa4b2;margin-top:6px">2026-10-26 ~ 2026-10-28</div>
|
|
||||||
</span></div>
|
|
||||||
<div class="factions"><button class="btn ghost">重置</button><button class="btn primary">筛选<span class="badge">2</span></button></div>
|
|
||||||
</div>
|
|
||||||
<div class="applied">
|
|
||||||
<span class="tag"><b>本周</b><span class="x">×</span></span>
|
|
||||||
<span class="tag"><b>Done</b><span class="x">×</span></span>
|
|
||||||
<span class="cnt">共 3 条</span>
|
|
||||||
</div>
|
|
||||||
<div class="list">
|
|
||||||
<div class="item">
|
|
||||||
<div class="top"><div class="ttl">任务详情页滚动优化</div><span class="num">#22</span></div>
|
|
||||||
<div class="meta"><span class="kind" style="background:#1677ff">优化</span><span class="col">Done</span><span class="dot"></span><span>归档于 10-27</span></div>
|
|
||||||
<div class="acts"><span class="mini">恢复</span><span class="mini danger">删除</span></div>
|
|
||||||
</div>
|
|
||||||
<div class="item">
|
|
||||||
<div class="top"><div class="ttl">桌面端。</div><span class="num">#5</span></div>
|
|
||||||
<div class="meta"><span class="kind" style="background:#fa8c16">需求</span><span class="col">Done</span><span class="dot"></span><span>归档于 10-26</span></div>
|
|
||||||
<div class="acts"><span class="mini">恢复</span><span class="mini danger">删除</span></div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="caption"><b>已应用条件 + 命中条数</b><span>条件可逐个撤销；时间预设自动显示实际区间。</span></div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div>
|
|
||||||
<div class="phone sm">
|
|
||||||
<div class="nav"><span class="back">‹</span><span class="title">已归档任务</span></div>
|
|
||||||
<div class="body">
|
|
||||||
<div class="fcard">
|
|
||||||
<div class="frow"><span class="lbl">标题</span><span class="ctl"><span class="kwbox"><input value="日报" /><span class="clr">✕</span></span></span></div>
|
|
||||||
<div class="frow"><span class="lbl">看板列</span><span class="ctl"><span class="chips"><span class="chip on">全部</span><span class="chip">Done</span></span></span></div>
|
|
||||||
<div class="frow"><span class="lbl">归档时间</span><span class="ctl">
|
|
||||||
<span class="chips"><span class="chip">全部</span><span class="chip">本周</span><span class="chip">本月</span><span class="chip">本季度</span><span class="chip on">自定义</span></span>
|
|
||||||
<span class="range"><span class="dp on">2026-09-01</span><span class="sep">~</span><span class="dp on">2026-09-30</span></span>
|
|
||||||
</span></div>
|
|
||||||
<div class="factions"><button class="btn ghost">重置</button><button class="btn primary">筛选<span class="badge">3</span></button></div>
|
|
||||||
</div>
|
|
||||||
<div class="applied">
|
|
||||||
<span class="tag"><b>标题: 日报</b><span class="x">×</span></span>
|
|
||||||
<span class="tag"><b>09-01~09-30</b><span class="x">×</span></span>
|
|
||||||
<span class="cnt">共 0 条</span>
|
|
||||||
</div>
|
|
||||||
<div class="empty"><div class="ico">🗂</div>没有符合条件的归档任务<br /><span style="font-size:11.5px;color:#c2c6cc">试试放宽时间范围或清空关键词</span></div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="caption"><b>自定义区间 + 空结果</b><span>选「自定义」才展开日期；空结果给可操作的建议文案。</span></div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div>
|
|
||||||
<div class="phone sm">
|
|
||||||
<div class="nav"><span class="back">‹</span><span class="title">已归档任务</span></div>
|
|
||||||
<div class="body">
|
|
||||||
<div class="fcard">
|
|
||||||
<div class="frow"><span class="lbl">标题</span><span class="ctl"><span class="kwbox"><input placeholder="输入关键词" /></span></span></div>
|
|
||||||
<div class="frow"><span class="lbl">看板列</span><span class="ctl"><span class="chips"><span class="chip on">全部</span><span class="chip">Plan</span><span class="chip">Doing</span><span class="chip">Done</span></span></span></div>
|
|
||||||
<div class="frow"><span class="lbl">归档时间</span><span class="ctl"><span class="chips"><span class="chip on">全部</span><span class="chip">本周</span><span class="chip">本月</span><span class="chip">本季度</span><span class="chip">自定义</span></span></span></div>
|
|
||||||
<div class="factions"><button class="btn ghost">重置</button><button class="btn primary">筛选</button></div>
|
|
||||||
</div>
|
|
||||||
<div class="empty"><div class="ico">📭</div>这个项目还没有归档任务<br /><span style="font-size:11.5px;color:#c2c6cc">任务完成后可在 ⋯ 菜单里归档</span></div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="caption"><b>初始空状态</b><span>一个都没归档时，告诉用户归档入口在哪。</span></div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<h2>与现版本对照</h2>
|
|
||||||
<table>
|
|
||||||
<thead>
|
|
||||||
<tr><th style="width:130px">项</th><th style="width:38%">现在</th><th>建议</th></tr>
|
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
<tr><td>类型过滤</td><td class="no">「全部类型」下拉 + 独占一行</td><td class="yes">移除</td></tr>
|
|
||||||
<tr><td>关键词</td><td class="no">无标签，占位「搜索任务标题」</td><td class="yes">左侧常驻标签「标题」+ 占位「输入关键词」</td></tr>
|
|
||||||
<tr><td>归档时间</td><td class="no">两个日期按钮，无快捷项</td><td class="yes">全部 / 本周 / 本月 / 本季度 / 自定义</td></tr>
|
|
||||||
<tr><td>查询触发</td><td class="no">改条件即时查询，无按钮</td><td class="yes">「重置 / 筛选」，按钮带生效条件数</td></tr>
|
|
||||||
<tr><td>条件可见性</td><td class="no">条件散在控件里，看不出生效了什么</td><td class="yes">列表上方条件标签 + 命中条数，可单独撤销</td></tr>
|
|
||||||
<tr><td>列表行</td><td class="no">标题与元信息挤在一起，右侧竖排两按钮</td><td class="yes">标题独占行；元信息一行；按钮移到底部右侧</td></tr>
|
|
||||||
<tr><td>空状态</td><td class="no">一行灰字「没有符合条件的归档任务」</td><td class="yes">区分「还没归档过」与「筛选无结果」，给出下一步建议</td></tr>
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
|
|
||||||
<h2>待你确认 <span class="sub">确认后我再改代码</span></h2>
|
|
||||||
<div class="notes" style="max-width:820px">
|
|
||||||
<div class="note">
|
|
||||||
<ul>
|
|
||||||
<li>「筛选」改为显式提交，是否符合你的使用习惯？（也可以保留"改预设即时生效、只有关键词需要点按钮"）</li>
|
|
||||||
<li>看板列是否也保留？还是只留 标题 + 归档时间 两个条件更清爽？</li>
|
|
||||||
<li>列表行的「恢复 / 删除」放底部右侧可以吗？还是希望点行进入详情/预览？</li>
|
|
||||||
<li>快捷时间是否需要再加「近 7 天 / 近 30 天」？</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<script>
|
|
||||||
(function(){
|
|
||||||
// ---- 原型状态 ----
|
|
||||||
const state = { kw:'', col:'', time:'all', from:'', to:'', applied:{ kw:'', col:'', time:'all', from:'', to:'' } }
|
|
||||||
|
|
||||||
const MOCK = [
|
|
||||||
{ id:1, title:'任务详情页滚动优化', num:'#22', kind:'优化', kindColor:'#1677ff', col:'Done', at:'2026-10-27' },
|
|
||||||
{ id:2, title:'桌面端。', num:'#5', kind:'需求', kindColor:'#fa8c16', col:'Done', at:'2026-10-26' },
|
|
||||||
{ id:3, title:'任务详情中切换看板列是提示不存在。', num:'#23', kind:'Bug', kindColor:'#ff3141', col:'Done', at:'2026-10-25' },
|
|
||||||
{ id:4, title:'windows 电脑加入监控', num:'#24', kind:'需求', kindColor:'#fa8c16', col:'Plan', at:'2026-10-21' },
|
|
||||||
{ id:5, title:'补日报', num:'#28', kind:'需求', kindColor:'#fa8c16', col:'Doing', at:'2026-10-12' },
|
|
||||||
]
|
|
||||||
let rows = MOCK.slice()
|
|
||||||
|
|
||||||
const $ = (id) => document.getElementById(id)
|
|
||||||
const toastEl = $('toast')
|
|
||||||
let toastTimer = null
|
|
||||||
function toast(msg){
|
|
||||||
toastEl.textContent = msg
|
|
||||||
toastEl.classList.add('show')
|
|
||||||
clearTimeout(toastTimer)
|
|
||||||
toastTimer = setTimeout(() => toastEl.classList.remove('show'), 1600)
|
|
||||||
}
|
|
||||||
|
|
||||||
// ---- 快捷时间区间 ----
|
|
||||||
function pad(n){ return String(n).padStart(2,'0') }
|
|
||||||
function fmt(d){ return `${d.getFullYear()}-${pad(d.getMonth()+1)}-${pad(d.getDate())}` }
|
|
||||||
function presetRange(t){
|
|
||||||
const now = new Date()
|
|
||||||
const today = new Date(now.getFullYear(), now.getMonth(), now.getDate())
|
|
||||||
if (t === 'week') {
|
|
||||||
const dow = (today.getDay() + 6) % 7 // 周一=0
|
|
||||||
const mon = new Date(today); mon.setDate(today.getDate() - dow)
|
|
||||||
return { from: fmt(mon), to: fmt(today) }
|
|
||||||
}
|
|
||||||
if (t === 'month') return { from: fmt(new Date(today.getFullYear(), today.getMonth(), 1)), to: fmt(today) }
|
|
||||||
if (t === 'quarter') {
|
|
||||||
const qm = Math.floor(today.getMonth() / 3) * 3
|
|
||||||
return { from: fmt(new Date(today.getFullYear(), qm, 1)), to: fmt(today) }
|
|
||||||
}
|
|
||||||
return { from:'', to:'' }
|
|
||||||
}
|
|
||||||
function rangeLabel(t){
|
|
||||||
if (t === 'custom') return ''
|
|
||||||
const r = presetRange(t)
|
|
||||||
return r.from ? `${r.from} ~ ${r.to}` : ''
|
|
||||||
}
|
|
||||||
|
|
||||||
// ---- 渲染 ----
|
|
||||||
function render(){
|
|
||||||
// 时间行
|
|
||||||
const custom = state.time === 'custom'
|
|
||||||
$('rangeRow').style.display = custom ? 'flex' : 'none'
|
|
||||||
const hint = rangeLabel(state.time)
|
|
||||||
$('rangeHint').textContent = hint
|
|
||||||
$('dpFrom').textContent = state.from || '开始日期'
|
|
||||||
$('dpTo').textContent = state.to || '结束日期'
|
|
||||||
$('dpFrom').classList.toggle('on', !!state.from)
|
|
||||||
$('dpTo').classList.toggle('on', !!state.to)
|
|
||||||
$('kwClear').style.display = state.kw ? 'block' : 'none'
|
|
||||||
|
|
||||||
// 生效条件数
|
|
||||||
const n = countApplied()
|
|
||||||
const btn = $('filterBtn')
|
|
||||||
btn.innerHTML = n ? `筛选<span class="badge">${n}</span>` : '筛选'
|
|
||||||
|
|
||||||
// 已应用条
|
|
||||||
const bar = $('appliedBar')
|
|
||||||
const tags = []
|
|
||||||
const a = state.applied
|
|
||||||
if (a.kw) tags.push(`<span class="tag"><b>标题: ${a.kw}</b><span class="x" data-clear="kw">×</span></span>`)
|
|
||||||
if (a.col) tags.push(`<span class="tag"><b>看板列: ${a.col}</b><span class="x" data-clear="col">×</span></span>`)
|
|
||||||
if (a.time === 'custom') {
|
|
||||||
if (a.from || a.to) tags.push(`<span class="tag"><b>${a.from || '…'} ~ ${a.to || '…'}</b><span class="x" data-clear="time">×</span></span>`)
|
|
||||||
} else if (a.time !== 'all') {
|
|
||||||
const name = { week:'本周', month:'本月', quarter:'本季度' }[a.time]
|
|
||||||
tags.push(`<span class="tag"><b>${name}</b><span class="x" data-clear="time">×</span></span>`)
|
|
||||||
}
|
|
||||||
if (tags.length) {
|
|
||||||
bar.style.display = 'flex'
|
|
||||||
bar.innerHTML = tags.join('') + `<span class="cnt">共 ${rows.length} 条</span>`
|
|
||||||
} else {
|
|
||||||
bar.style.display = 'none'
|
|
||||||
}
|
|
||||||
|
|
||||||
// 列表
|
|
||||||
const list = $('list')
|
|
||||||
if (!rows.length) {
|
|
||||||
const never = !tags.length
|
|
||||||
list.innerHTML = never
|
|
||||||
? `<div class="empty"><div class="ico">📭</div>这个项目还没有归档任务<br /><span style="font-size:11.5px;color:#c2c6cc">任务完成后可在 ⋯ 菜单里归档</span></div>`
|
|
||||||
: `<div class="empty"><div class="ico">🗂</div>没有符合条件的归档任务<br /><span style="font-size:11.5px;color:#c2c6cc">试试放宽时间范围或清空关键词</span></div>`
|
|
||||||
$('moreBtn').style.display = 'none'
|
|
||||||
} else {
|
|
||||||
$('moreBtn').style.display = 'block'
|
|
||||||
list.innerHTML = rows.map(r => `
|
|
||||||
<div class="item" data-id="${r.id}">
|
|
||||||
<div class="top"><div class="ttl">${r.title}</div><span class="num">${r.num}</span></div>
|
|
||||||
<div class="meta">
|
|
||||||
<span class="kind" style="background:${r.kindColor}">${r.kind}</span>
|
|
||||||
<span class="col">${r.col}</span><span class="dot"></span><span>归档于 ${r.at}</span>
|
|
||||||
</div>
|
|
||||||
<div class="acts"><span class="mini" data-act="restore">恢复</span><span class="mini danger" data-act="remove">删除</span></div>
|
|
||||||
</div>`).join('')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function countApplied(){
|
|
||||||
const a = state.applied
|
|
||||||
let n = 0
|
|
||||||
if (a.kw) n++
|
|
||||||
if (a.col) n++
|
|
||||||
if (a.time === 'custom') { if (a.from || a.to) n++ } else if (a.time !== 'all') n++
|
|
||||||
return n
|
|
||||||
}
|
|
||||||
|
|
||||||
function applyFilter(){
|
|
||||||
state.applied = { kw: state.kw, col: state.col, time: state.time, from: state.from, to: state.to }
|
|
||||||
const a = state.applied
|
|
||||||
rows = MOCK.filter(r => {
|
|
||||||
if (a.kw && !r.title.includes(a.kw)) return false
|
|
||||||
if (a.col && r.col !== a.col) return false
|
|
||||||
if (a.time !== 'custom' && a.time !== 'all') {
|
|
||||||
const rg = presetRange(a.time)
|
|
||||||
if (rg.from && (r.at < rg.from || r.at > rg.to)) return false
|
|
||||||
}
|
|
||||||
if (a.time === 'custom') {
|
|
||||||
if (a.from && r.at < a.from) return false
|
|
||||||
if (a.to && r.at > a.to) return false
|
|
||||||
}
|
|
||||||
return true
|
|
||||||
})
|
|
||||||
render()
|
|
||||||
toast(countApplied() ? `已应用 ${countApplied()} 个条件 · ${rows.length} 条` : `显示全部 ${rows.length} 条`)
|
|
||||||
}
|
|
||||||
|
|
||||||
// ---- 事件 ----
|
|
||||||
$('kw').addEventListener('input', (e) => { state.kw = e.target.value.trim(); $('kwClear').style.display = state.kw ? 'block' : 'none' })
|
|
||||||
$('kw').addEventListener('keydown', (e) => { if (e.key === 'Enter') applyFilter() })
|
|
||||||
$('kwClear').addEventListener('click', () => { state.kw = ''; $('kw').value = ''; render() })
|
|
||||||
|
|
||||||
document.querySelectorAll('#colChips .chip').forEach(el => {
|
|
||||||
el.addEventListener('click', () => {
|
|
||||||
document.querySelectorAll('#colChips .chip').forEach(x => x.classList.remove('on'))
|
|
||||||
el.classList.add('on')
|
|
||||||
state.col = el.dataset.col || ''
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
document.querySelectorAll('#timeChips .chip').forEach(el => {
|
|
||||||
el.addEventListener('click', () => {
|
|
||||||
document.querySelectorAll('#timeChips .chip').forEach(x => x.classList.remove('on'))
|
|
||||||
el.classList.add('on')
|
|
||||||
state.time = el.dataset.t
|
|
||||||
if (state.time !== 'custom') { state.from = ''; state.to = '' }
|
|
||||||
render()
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
$('dpFrom').addEventListener('click', () => {
|
|
||||||
const v = prompt('开始日期 (YYYY-MM-DD)', state.from || '2026-10-01')
|
|
||||||
if (v !== null) { state.from = v.trim(); render() }
|
|
||||||
})
|
|
||||||
$('dpTo').addEventListener('click', () => {
|
|
||||||
const v = prompt('结束日期 (YYYY-MM-DD)', state.to || '2026-10-28')
|
|
||||||
if (v !== null) { state.to = v.trim(); render() }
|
|
||||||
})
|
|
||||||
|
|
||||||
$('filterBtn').addEventListener('click', applyFilter)
|
|
||||||
|
|
||||||
$('resetBtn').addEventListener('click', () => {
|
|
||||||
state.kw = ''; state.col = ''; state.time = 'all'; state.from = ''; state.to = ''
|
|
||||||
state.applied = { kw:'', col:'', time:'all', from:'', to:'' }
|
|
||||||
$('kw').value = ''
|
|
||||||
document.querySelectorAll('#colChips .chip').forEach((x, i) => x.classList.toggle('on', i === 0))
|
|
||||||
document.querySelectorAll('#timeChips .chip').forEach((x, i) => x.classList.toggle('on', i === 0))
|
|
||||||
rows = MOCK.slice()
|
|
||||||
render()
|
|
||||||
toast('已重置')
|
|
||||||
})
|
|
||||||
|
|
||||||
$('appliedBar').addEventListener('click', (e) => {
|
|
||||||
const x = e.target.closest('.x'); if (!x) return
|
|
||||||
const k = x.dataset.clear
|
|
||||||
if (k === 'kw') state.applied.kw = ''
|
|
||||||
if (k === 'col') state.applied.col = ''
|
|
||||||
if (k === 'time') { state.applied.time = 'all'; state.applied.from = ''; state.applied.to = '' }
|
|
||||||
const a = state.applied
|
|
||||||
rows = MOCK.filter(r => {
|
|
||||||
if (a.kw && !r.title.includes(a.kw)) return false
|
|
||||||
if (a.col && r.col !== a.col) return false
|
|
||||||
return true
|
|
||||||
})
|
|
||||||
render()
|
|
||||||
toast('已移除该条件')
|
|
||||||
})
|
|
||||||
|
|
||||||
$('list').addEventListener('click', (e) => {
|
|
||||||
const btn = e.target.closest('[data-act]'); if (!btn) return
|
|
||||||
const item = btn.closest('.item')
|
|
||||||
const id = Number(item.dataset.id)
|
|
||||||
const row = rows.find(r => r.id === id)
|
|
||||||
if (btn.dataset.act === 'restore') {
|
|
||||||
toast(`已恢复「${row.title}」`)
|
|
||||||
} else {
|
|
||||||
toast(`已删除「${row.title}」（原型演示，不实际删除）`)
|
|
||||||
}
|
|
||||||
item.style.opacity = '.35'
|
|
||||||
item.style.pointerEvents = 'none'
|
|
||||||
})
|
|
||||||
|
|
||||||
$('moreBtn').addEventListener('click', () => toast('加载更多（原型演示）'))
|
|
||||||
|
|
||||||
render()
|
|
||||||
})()
|
|
||||||
</script>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@@ -1,312 +0,0 @@
|
|||||||
# 任务模块「即时同步」方案
|
|
||||||
|
|
||||||
> 状态：**方案设计，未实施**（本文只描述做法，不含代码改动）
|
|
||||||
> 范围：任务模块（Project / BoardColumn / Task / TaskMember / TaskTag）
|
|
||||||
> 相关文档：[0.2.1 实施方案](./0.2.1实施方案.md)、[PowerSync 可行性研究报告](./PowerSync可行性研究报告.md)
|
|
||||||
> 编写时间：2026-10-27
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 1. 问题与现状
|
|
||||||
|
|
||||||
### 1.1 现象
|
|
||||||
|
|
||||||
多端（Windows 外壳 / Android / Web）同时打开同一项目时：
|
|
||||||
|
|
||||||
- A 端点完成或改状态，**B 端不会自动更新**；
|
|
||||||
- 必须**切到别的页面再切回来**（组件重新挂载触发重新查询）才能看到；
|
|
||||||
- 看板分组（按 `columnId`）与详情状态（按 `status`）也会出现一段时间的显示不一致。
|
|
||||||
|
|
||||||
### 1.2 根因：不是"同步没到"，而是"到了没人通知界面"
|
|
||||||
|
|
||||||
PowerSync 的下行链路本身是**推送式**的（服务端 PG 逻辑复制 → sync service → WebSocket →
|
|
||||||
客户端写入本地 SQLite），延迟通常在亚秒级。问题出在**消费端**：
|
|
||||||
|
|
||||||
| 层 | 现状 | 结论 |
|
|
||||||
| --- | --- | --- |
|
|
||||||
| 传输层 | `PowerSyncProvider` 已在 `src/App.jsx` 挂载，连接正常 | ✅ 正常 |
|
|
||||||
| 数据层 | 变化已写入本地 SQLite | ✅ 正常 |
|
|
||||||
| **UI 层** | **全部是命令式读取**：`db().getAll(...)`，读完就不再看 | ❌ **断点在这** |
|
|
||||||
|
|
||||||
具体地：
|
|
||||||
|
|
||||||
- `src/api/task.js` 的 `projectApi.list/detail`、`taskApi.list` 都是一次性 `getAll()`，
|
|
||||||
且在 JS 里做二次装配（子任务、成员、标签、列），**没有任何订阅**；
|
|
||||||
- `src/lib/powersync/react.jsx` 虽然 re-export 了 `useQuery/useStatus`，
|
|
||||||
但**全项目一次都没用过**（`grep useQuery src` 只命中该文件的导出语句）；
|
|
||||||
- `src/pages/task/TaskPage.jsx`、`ProjectView.jsx` 只在 `useEffect(..., [load])` 里加载一次；
|
|
||||||
- 唯一的刷新机制是 `src/hooks/useRefreshOnVisible.js`（回前台/窗口聚焦时重查），
|
|
||||||
而且**任务模块这两个页面根本没有用它**（只有打卡 `MergedView/ListView` 与宏观各页在用）。
|
|
||||||
|
|
||||||
所以「切面板能刷新」只是因为它**重新挂载组件 → 重新执行一次 `load()`**。
|
|
||||||
|
|
||||||
### 1.3 现状刷新机制盘点
|
|
||||||
|
|
||||||
| 页面 | 首次加载 | 回前台刷新 | 数据变化实时反映 |
|
|
||||||
| --- | --- | --- | --- |
|
|
||||||
| `TaskPage` | `useEffect` | ❌ 无 | ❌ |
|
|
||||||
| `ProjectView` | `useEffect` | ❌ 无 | ❌（仅本地操作后手动 `load()`） |
|
|
||||||
| `TaskDetail` | 打开时传入快照 | — | ❌（快照可能过期） |
|
|
||||||
| `MergedView`（打卡） | `useEffect` | ✅ | ❌（且打卡走 REST，非 PowerSync） |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 2. 目标与非目标
|
|
||||||
|
|
||||||
### 2.1 目标
|
|
||||||
|
|
||||||
1. **跨端即时**：一端修改，其它端在 **≤1s** 内自动呈现（不含网络中断场景）；
|
|
||||||
2. **不打断操作**：正在输入的详情表单、正在拖拽的卡片**不被远端变更打断**；
|
|
||||||
3. **离线可用**：断网期间照常读写本地库，恢复后自动补齐并刷新；
|
|
||||||
4. **改动可控**：优先复用现有装配逻辑（`taskApi` 的 shape），不做大规模重写；
|
|
||||||
5. **可回滚**：通过开关或逐步替换，出问题能退回"手动刷新"。
|
|
||||||
|
|
||||||
### 2.2 非目标
|
|
||||||
|
|
||||||
- 不做**多人协同编辑**（同一字段并发写仍按 LWW 后到覆盖）；
|
|
||||||
- 不解决打卡/清单模块的实时性（它们走 REST，见 §7）；
|
|
||||||
- 不引入 WebSocket 之外的额外实时通道（如 SSE）。
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 3. 方案选型
|
|
||||||
|
|
||||||
| 方案 | 做法 | 优点 | 缺点 | 结论 |
|
|
||||||
| --- | --- | --- | --- | --- |
|
|
||||||
| **A. 轮询** | 定时（如 3s）重跑 `load()` | 改动最小 | 无谓查询、电量/流量、仍不"即时" | ❌ |
|
|
||||||
| **B. 全量响应式** | 把 `taskApi.list` 整体改成一条大 SQL + `useQuery` | 最"正统"，细粒度 | 现有装配（子任务/成员/标签）要在 SQL 里重写；改动面大、回归风险高 | ⏳ 后续 |
|
|
||||||
| **C. 变更信号 + 重算**（推荐） | 用 `db.watch()` 订阅一个**轻量"信号查询"**，信号变化时重跑现有 `load()` | 复用现有装配逻辑；改动集中且小；天然合并多次变更 | 每次重算一次列表（数据量小，可接受） | ✅ **P0 采用** |
|
|
||||||
| **D. 表级广播** | 监听"某表有变更"事件触发重查 | 实现最简单 | 无法区分项目/范围，易全页面重查 | 作为 C 的退化实现 |
|
|
||||||
|
|
||||||
**结论**：P0 用方案 C；跑稳后再评估把高频视图（看板）迁到 B 的增量查询。
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 4. 推荐方案详设（方案 C）
|
|
||||||
|
|
||||||
### 4.1 核心思路
|
|
||||||
|
|
||||||
```
|
|
||||||
本地 SQLite ←（PowerSync 下行写入）— 任一端/服务端变更
|
|
||||||
│
|
|
||||||
└─▶ db.watch(<信号查询>) ── 变化 ──▶ 节流合并 ──▶ 重跑 load()
|
|
||||||
└─▶ setState 渲染
|
|
||||||
```
|
|
||||||
|
|
||||||
**"信号查询"** 是一段**廉价但能覆盖所有相关表**的 SQL：只要任务域的任一相关行变化，
|
|
||||||
其结果就会变；它不承担业务语义，只负责触发。
|
|
||||||
|
|
||||||
### 4.2 订阅范围：用 SDK 的表级过滤（已实施）
|
|
||||||
|
|
||||||
> 初版设计是手写一段"信号 SQL"（count / sum / max(updatedAt) 汇总），
|
|
||||||
> 实施时发现 `db.watch()` 原生支持 **`tables` 表名过滤** 与 **`throttleMs` 节流**，
|
|
||||||
> 由 SDK 判断"结果是否真的变了"，比自己做汇总更可靠，因此改为表级过滤。
|
|
||||||
|
|
||||||
`CommonPowerSyncDatabase.watch(sql, params, handler, options)` 的 `options`：
|
|
||||||
|
|
||||||
| 选项 | 用途 |
|
|
||||||
| --- | --- |
|
|
||||||
| `tables: string[]` | 只关心这些表的变更，SDK 内部按表失效 |
|
|
||||||
| `throttleMs` | 两次回调之间的最小间隔，天然合并同一批同步写入 |
|
|
||||||
| `signal: AbortSignal` | 卸载时取消订阅 |
|
|
||||||
|
|
||||||
订阅内容（`src/lib/powersync/useDbSignal.js`）：
|
|
||||||
|
|
||||||
```js
|
|
||||||
db.watch('SELECT 1 AS s', [], { onResult, onError }, {
|
|
||||||
tables: ['Task', 'BoardColumn', 'TaskMember', 'TaskTag'],
|
|
||||||
throttleMs: 250,
|
|
||||||
signal: ac.signal,
|
|
||||||
})
|
|
||||||
```
|
|
||||||
|
|
||||||
查询本身（`SELECT 1`）没有业务含义，只借 watch 的变更通知能力。表名集合定义在
|
|
||||||
`src/api/task.js`：
|
|
||||||
|
|
||||||
| 常量 | 内容 | 用于 |
|
|
||||||
| --- | --- | --- |
|
|
||||||
| `TASK_TABLES` | `Task, BoardColumn, TaskMember, TaskTag` | 项目内任务列表 / 看板 |
|
|
||||||
| `PROJECT_TABLES` | `Project, ProjectMember` | 项目列表、成员 |
|
|
||||||
|
|
||||||
之所以不需要 `max(updatedAt)`：表级过滤关心的是"行有没有被写过"，
|
|
||||||
而不是"结果集内容是否变化"，所以改标题、改状态这类不增删的写入同样会触发。
|
|
||||||
|
|
||||||
### 4.3 UI 层接入
|
|
||||||
|
|
||||||
提供两个小工具，避免每个页面各写一套：
|
|
||||||
|
|
||||||
| 工具 | 位置（建议） | 作用 |
|
|
||||||
| --- | --- | --- |
|
|
||||||
| `useDbSignal(sql, params, onChange)` | `src/lib/powersync/useDbSignal.js`（新增） | 封装 `db.watch()` + 节流 + 卸载清理 |
|
|
||||||
| `useTaskListSignal(projectId, onChange)` | `src/api/task.js` 或同目录（新增） | 拼好上述信号 SQL，页面只关心"变了要干嘛" |
|
|
||||||
|
|
||||||
接入示意（`ProjectView`）：
|
|
||||||
|
|
||||||
```jsx
|
|
||||||
// 现状
|
|
||||||
useEffect(() => { setTasks(null); load() }, [load])
|
|
||||||
|
|
||||||
// 改造后（示意）
|
|
||||||
useEffect(() => { setTasks(null); load() }, [load])
|
|
||||||
useDbSignal(TASK_LIST_SIGNAL_SQL, [projectId, projectId, projectId, projectId, projectId, projectId], () => {
|
|
||||||
if (dragActiveRef.current) return // 见 §4.4
|
|
||||||
load()
|
|
||||||
})
|
|
||||||
```
|
|
||||||
|
|
||||||
`TaskPage` 同理，信号为项目表。
|
|
||||||
|
|
||||||
### 4.4 变更合并与"不打断"策略
|
|
||||||
|
|
||||||
这是本方案的关键，否则会出现「打字打到一半表单被重置」「拖到一半卡片跳走」。
|
|
||||||
|
|
||||||
| 场景 | 策略 |
|
|
||||||
| --- | --- |
|
|
||||||
| 连续多次变更（一次同步写多行） | `useDbSignal` 内部 **150~300ms 防抖**，合并成一次 `load()` |
|
|
||||||
| 看板/列表**拖拽进行中** | 用 `dragActiveRef` 跳过本次刷新；拖拽结束后补一次 `load()` |
|
|
||||||
| 任务**详情页打开中** | 不自动刷新表单；改为监听该任务是否变化，变化时在详情顶部显示「**该任务已在他端更新，点击刷新**」 |
|
|
||||||
| 正在编辑标题/描述 | 同上传：不覆盖输入框，只提示 |
|
|
||||||
| 本地乐观更新进行中（`updateTask` 未完成） | 以本地 patch 为准，`load()` 延后到请求结束（现有 `updateTask` 已有 snapshot 回滚，保留） |
|
|
||||||
|
|
||||||
### 4.5 同步状态指示
|
|
||||||
|
|
||||||
用已导出的 `useStatus()` 在任务页顶部显示一个极轻量的状态点：
|
|
||||||
|
|
||||||
| 状态 | 展示 |
|
|
||||||
| --- | --- |
|
|
||||||
| `connected && dataFlowStatus.connected` | 不显示（无干扰） |
|
|
||||||
| 正在下载/上传 | 细小的同步图标 |
|
|
||||||
| 离线 / 连接失败 | 「离线，改动将在联网后同步」 |
|
|
||||||
|
|
||||||
> 说明：当前外壳里 PowerSync 会打 `Multiple tab support is not enabled` 的提示，
|
|
||||||
> 属预期（已在 0.2.1 关闭多标签以避免 Windows reload 后本地库挂起），不影响本方案。
|
|
||||||
|
|
||||||
### 4.6 离线与重连
|
|
||||||
|
|
||||||
- 断网：`db.watch()` 仍监听**本地库**，本地写入照常触发刷新（体验一致）；
|
|
||||||
- 恢复：PowerSync 自动重连并回放，写入本地库后信号触发刷新，**无需额外逻辑**；
|
|
||||||
- 应用回到前台：保留 `useRefreshOnVisible` 作为**兜底**（WebView 可能挂起渲染线程），
|
|
||||||
与 `db.watch()` 并存不冲突（两者都只是调 `load()`）。
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 5. 改造清单（按文件）
|
|
||||||
|
|
||||||
| 文件 | 改动 | 状态 |
|
|
||||||
| --- | --- | --- |
|
|
||||||
| `src/lib/powersync/useDbSignal.js` | **新增**：`db.watch` + 表过滤 + 节流 + 卸载清理 | ✅ P0 已完成 |
|
|
||||||
| `src/api/task.js` | 新增 `TASK_TABLES` / `PROJECT_TABLES` 常量 | ✅ P0 |
|
|
||||||
| `src/pages/task/ProjectView.jsx` | 订阅任务域；拖拽中延后刷新；回前台兜底 | ✅ P0 |
|
|
||||||
| `src/pages/task/TaskPage.jsx` | 订阅项目域；回前台兜底 | ✅ P0 |
|
|
||||||
| `src/pages/task/BoardView.jsx` / `ListView.jsx` | 上报 `onDragActiveChange` | ✅ P0 |
|
|
||||||
| `src/pages/task/TaskDetail.jsx` | 「已在他端更新」提示（不覆盖表单） | ⏳ P1 |
|
|
||||||
| 同步状态指示 | 用 `useStatus()` 显示离线/同步中 | ⏳ P1 |
|
|
||||||
|
|
||||||
**不需要改动**：`server/`、`sync-config.yaml`、数据库结构。
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 6. 分期与验收
|
|
||||||
|
|
||||||
### 6.1 分期
|
|
||||||
|
|
||||||
| 阶段 | 内容 | 预估 |
|
|
||||||
| --- | --- | --- |
|
|
||||||
| **P0** | `useDbSignal` + `ProjectView`/`TaskPage` 接入 + 拖拽保护 | 0.5~1 天 |
|
|
||||||
| **P1** | 详情页「已在他端更新」提示 + 同步状态指示 | 0.5 天 |
|
|
||||||
| **P2** | 看板改增量查询（方案 B）；打卡/清单的实时性另议 | 按需 |
|
|
||||||
|
|
||||||
### 6.2 验收标准（可测）
|
|
||||||
|
|
||||||
1. **跨端延迟**：A 端改状态/拖列/改标题，B 端自动更新。实测 **约 1~2s**（数据进本地库约 1s，渲染 +0.3s，见 §7.0）；
|
|
||||||
2. **不打断**：B 端正在输入标题时，A 端改同任务描述 → B 端输入框内容**不被清空**，仅出现提示；
|
|
||||||
3. **拖拽安全**：B 端拖拽中收到远端变更 → 卡片**不跳位**，松手后列表更新；
|
|
||||||
4. **离线**：断网期间本地操作正常，恢复后自动补齐并刷新；
|
|
||||||
5. **回滚**：`localStorage['iboard_realtime'] = '0'` 后重启应用，退回"手动刷新"，无副作用；
|
|
||||||
6. **性能**：单项目 100 条任务、连续 20 次远端写入，页面无卡顿、无重复渲染风暴（可用 Performance 面板核对）。
|
|
||||||
|
|
||||||
### 6.3 度量
|
|
||||||
|
|
||||||
- 在 `load()` 内打点（可临时 `console.time`），统计重算耗时与触发次数；
|
|
||||||
- 目标：一次远端变更只触发 **1 次** 重算；100 条任务时单次重算 < 60ms。
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 7. 已知边界与后续
|
|
||||||
|
|
||||||
### 7.0 实测：端到端约 1~2s（达标）
|
|
||||||
|
|
||||||
P0 落地后在真实 Windows 外壳上实测，服务端直接改库模拟另一端：
|
|
||||||
|
|
||||||
| 项 | 结果 |
|
|
||||||
| --- | --- |
|
|
||||||
| 是否还需要切页面 | **不需要** —— 服务端改完，页面在无任何操作的情况下自动更新 ✅ |
|
|
||||||
| 端到端延迟 | **约 1~2s**（数据进本地库约 1s，渲染再 +0.3s）✅ |
|
|
||||||
|
|
||||||
**测量方法（关键：早期结论曾被测量方式误导两次，务必按此方法复测）**
|
|
||||||
|
|
||||||
测量必须在**页面内**自计时，不能用 CDP 轮询 DOM：
|
|
||||||
|
|
||||||
```js
|
|
||||||
// 页面内: 50ms 轮询本地库 + MutationObserver 观察 DOM, 各自记录 performance.now()
|
|
||||||
const P = { startedAt: performance.now(), dbAt: null, domAt: null }
|
|
||||||
setInterval(async () => {
|
|
||||||
if (P.dbAt !== null) return
|
|
||||||
const row = await window.__psdb.get('SELECT title FROM Task WHERE number = ?', [16])
|
|
||||||
if (row && row.title.includes(MARK)) P.dbAt = performance.now() - P.startedAt
|
|
||||||
}, 50)
|
|
||||||
new MutationObserver(check).observe(document.body, { childList: true, subtree: true })
|
|
||||||
```
|
|
||||||
|
|
||||||
一次干净测量的结果（已重载页面、无残留定时器）：
|
|
||||||
|
|
||||||
| 度量 | 数值 |
|
|
||||||
| --- | --- |
|
|
||||||
| `psql` 命令总耗时（ssh + docker exec + UPDATE） | 2138ms |
|
|
||||||
| 数据出现在客户端本地库（相对计时起点） | 2251ms → **≈ 命令返回后 113ms** |
|
|
||||||
| 界面更新（相对计时起点） | 2580ms |
|
|
||||||
| **同步数据到达 → 渲染完成** | **329ms** |
|
|
||||||
|
|
||||||
结论：**服务端改库到界面呈现约 1~2s（含 SSH/psql 开销在内的保守上界），其中 UI 渲染只占 ~0.33s**，
|
|
||||||
`useDbSignal` 的表级 watch 工作正常，无需改 `useQuery`。
|
|
||||||
|
|
||||||
**两次被推翻的中间结论（留档，避免重复踩坑）**
|
|
||||||
|
|
||||||
| 曾经的判断 | 为何是错的 |
|
|
||||||
| --- | --- |
|
|
||||||
| ① "nginx `proxy_buffering` 导致按批下发" | 加了 `proxy_buffering off` 等配置并热重载（`nginx -T` 确认生效），延迟毫无变化。**该配置已回滚**（`advanced_config` 清空、生效 conf 还原、nginx 已重载）—— 保留它反而会让 OTA 大包下载失去缓冲保护 |
|
|
||||||
| ② "同步数据早在服务端发出，客户端 `db.watch`/渲染滞后 15~30s" | 错在测量：用 CDP 反复读 `document.body.innerText`（长列表页上开销很大）轮询，且把 `ssh + docker exec` 的 ~6s 开销算进了延迟。改为页面内自计时后，实测只有 ~1~2s |
|
|
||||||
|
|
||||||
**服务端侧的旁证**（与上述一致）：powersync 日志 `checkpoint_complete` 与改库同一秒完成；
|
|
||||||
`stream_ms` 达 42 分钟、`close_reason: client closing stream`，长连接稳定，非频繁重连。
|
|
||||||
|
|
||||||
|
|
||||||
| 项 | 说明 |
|
|
||||||
| --- | --- |
|
|
||||||
| 打卡 / 清单 | 走 REST（`src/api/checkin.js`），不经过本地库，**本项目方案不覆盖**；如需实时，可复用现有 `useRefreshOnVisible` + 定时轮询，或后续把这些模块也迁到 PowerSync |
|
|
||||||
| 并发写冲突 | 仍为 LWW（`updatedAt` 后到覆盖）；本文不引入人工合并 |
|
|
||||||
| 排序并发 | `taskApi.reorder` 会整批重写 `sortOrder`，两端同时拖拽可能相互覆盖；建议 P2 再引入"版本号/操作序列" |
|
|
||||||
| 大列表 | 方案 C 每次全量重算，任务数极大（>1000）时需转方案 B 的增量查询 |
|
|
||||||
| WebView 后台节流 | 应用在后台时 `watch` 回调可能被延后，回前台由 `useRefreshOnVisible` 兜底 |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 8. 附：关键 API 备忘
|
|
||||||
|
|
||||||
| API | 来源 | 用途 |
|
|
||||||
| --- | --- | --- |
|
|
||||||
| `db.watch(sql, params, options)` | `@powersync/common` `CommonPowerSyncDatabase` | 订阅查询结果，返回 `AsyncIterable` |
|
|
||||||
| `useQuery(sql, params, options)` | `@powersync/react` | React 版订阅；`options.rowComparator` 可做**增量**更新（P2 用） |
|
|
||||||
| `useStatus()` | `@powersync/react` | 连接/同步状态 |
|
|
||||||
| `getPowersyncDb()` | `src/lib/powersync/db.js` | 本地库单例（当前唯一入口） |
|
|
||||||
|
|
||||||
> 注：`src/lib/powersync/react.jsx` 已 re-export `useQuery/useStatus/usePowerSync`，
|
|
||||||
> 本次改造**无需新增依赖**。
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 9. 结论
|
|
||||||
|
|
||||||
当前"必须切面板才刷新"**不是同步没到，而是 UI 从未订阅本地库变化**。
|
|
||||||
采用「**变更信号 + 复用现有装配重算**」（方案 C）可在改动面很小的情况下获得亚秒级跨端同步，
|
|
||||||
并把"不打断编辑/拖拽"作为硬性要求一并纳入。P0 约半天到一天即可上线验证。
|
|
||||||
@@ -27,6 +27,21 @@ export type User = Prisma.UserModel
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
export type Article = Prisma.ArticleModel
|
export type Article = Prisma.ArticleModel
|
||||||
|
/**
|
||||||
|
* Model Strategy
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
export type Strategy = Prisma.StrategyModel
|
||||||
|
/**
|
||||||
|
* Model Indicator
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
export type Indicator = Prisma.IndicatorModel
|
||||||
|
/**
|
||||||
|
* Model IndicatorPoint
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
export type IndicatorPoint = Prisma.IndicatorPointModel
|
||||||
/**
|
/**
|
||||||
* Model News
|
* Model News
|
||||||
*
|
*
|
||||||
@@ -62,6 +77,11 @@ export type Econ_SowInventory = Prisma.Econ_SowInventoryModel
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
export type ScraperCache = Prisma.ScraperCacheModel
|
export type ScraperCache = Prisma.ScraperCacheModel
|
||||||
|
/**
|
||||||
|
* Model OilPriceHistory
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
export type OilPriceHistory = Prisma.OilPriceHistoryModel
|
||||||
/**
|
/**
|
||||||
* Model MihomeAccount
|
* Model MihomeAccount
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -51,6 +51,21 @@ export type User = Prisma.UserModel
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
export type Article = Prisma.ArticleModel
|
export type Article = Prisma.ArticleModel
|
||||||
|
/**
|
||||||
|
* Model Strategy
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
export type Strategy = Prisma.StrategyModel
|
||||||
|
/**
|
||||||
|
* Model Indicator
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
export type Indicator = Prisma.IndicatorModel
|
||||||
|
/**
|
||||||
|
* Model IndicatorPoint
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
export type IndicatorPoint = Prisma.IndicatorPointModel
|
||||||
/**
|
/**
|
||||||
* Model News
|
* Model News
|
||||||
*
|
*
|
||||||
@@ -86,6 +101,11 @@ export type Econ_SowInventory = Prisma.Econ_SowInventoryModel
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
export type ScraperCache = Prisma.ScraperCacheModel
|
export type ScraperCache = Prisma.ScraperCacheModel
|
||||||
|
/**
|
||||||
|
* Model OilPriceHistory
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
export type OilPriceHistory = Prisma.OilPriceHistoryModel
|
||||||
/**
|
/**
|
||||||
* Model MihomeAccount
|
* Model MihomeAccount
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -99,6 +99,97 @@ export type DateTimeWithAggregatesFilter<$PrismaModel = never> = {
|
|||||||
_max?: Prisma.NestedDateTimeFilter<$PrismaModel>
|
_max?: Prisma.NestedDateTimeFilter<$PrismaModel>
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export type JsonFilter<$PrismaModel = never> =
|
||||||
|
| Prisma.PatchUndefined<
|
||||||
|
Prisma.Either<Required<JsonFilterBase<$PrismaModel>>, Exclude<keyof Required<JsonFilterBase<$PrismaModel>>, 'path'>>,
|
||||||
|
Required<JsonFilterBase<$PrismaModel>>
|
||||||
|
>
|
||||||
|
| Prisma.OptionalFlat<Omit<Required<JsonFilterBase<$PrismaModel>>, 'path'>>
|
||||||
|
|
||||||
|
export type JsonFilterBase<$PrismaModel = never> = {
|
||||||
|
equals?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel> | Prisma.JsonNullValueFilter
|
||||||
|
path?: string[]
|
||||||
|
mode?: Prisma.QueryMode | Prisma.EnumQueryModeFieldRefInput<$PrismaModel>
|
||||||
|
string_contains?: string | Prisma.StringFieldRefInput<$PrismaModel>
|
||||||
|
string_starts_with?: string | Prisma.StringFieldRefInput<$PrismaModel>
|
||||||
|
string_ends_with?: string | Prisma.StringFieldRefInput<$PrismaModel>
|
||||||
|
array_starts_with?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel> | null
|
||||||
|
array_ends_with?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel> | null
|
||||||
|
array_contains?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel> | null
|
||||||
|
lt?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel>
|
||||||
|
lte?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel>
|
||||||
|
gt?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel>
|
||||||
|
gte?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel>
|
||||||
|
not?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel> | Prisma.JsonNullValueFilter
|
||||||
|
}
|
||||||
|
|
||||||
|
export type JsonWithAggregatesFilter<$PrismaModel = never> =
|
||||||
|
| Prisma.PatchUndefined<
|
||||||
|
Prisma.Either<Required<JsonWithAggregatesFilterBase<$PrismaModel>>, Exclude<keyof Required<JsonWithAggregatesFilterBase<$PrismaModel>>, 'path'>>,
|
||||||
|
Required<JsonWithAggregatesFilterBase<$PrismaModel>>
|
||||||
|
>
|
||||||
|
| Prisma.OptionalFlat<Omit<Required<JsonWithAggregatesFilterBase<$PrismaModel>>, 'path'>>
|
||||||
|
|
||||||
|
export type JsonWithAggregatesFilterBase<$PrismaModel = never> = {
|
||||||
|
equals?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel> | Prisma.JsonNullValueFilter
|
||||||
|
path?: string[]
|
||||||
|
mode?: Prisma.QueryMode | Prisma.EnumQueryModeFieldRefInput<$PrismaModel>
|
||||||
|
string_contains?: string | Prisma.StringFieldRefInput<$PrismaModel>
|
||||||
|
string_starts_with?: string | Prisma.StringFieldRefInput<$PrismaModel>
|
||||||
|
string_ends_with?: string | Prisma.StringFieldRefInput<$PrismaModel>
|
||||||
|
array_starts_with?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel> | null
|
||||||
|
array_ends_with?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel> | null
|
||||||
|
array_contains?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel> | null
|
||||||
|
lt?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel>
|
||||||
|
lte?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel>
|
||||||
|
gt?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel>
|
||||||
|
gte?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel>
|
||||||
|
not?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel> | Prisma.JsonNullValueFilter
|
||||||
|
_count?: Prisma.NestedIntFilter<$PrismaModel>
|
||||||
|
_min?: Prisma.NestedJsonFilter<$PrismaModel>
|
||||||
|
_max?: Prisma.NestedJsonFilter<$PrismaModel>
|
||||||
|
}
|
||||||
|
|
||||||
|
export type BoolFilter<$PrismaModel = never> = {
|
||||||
|
equals?: boolean | Prisma.BooleanFieldRefInput<$PrismaModel>
|
||||||
|
not?: Prisma.NestedBoolFilter<$PrismaModel> | boolean
|
||||||
|
}
|
||||||
|
|
||||||
|
export type BoolWithAggregatesFilter<$PrismaModel = never> = {
|
||||||
|
equals?: boolean | Prisma.BooleanFieldRefInput<$PrismaModel>
|
||||||
|
not?: Prisma.NestedBoolWithAggregatesFilter<$PrismaModel> | boolean
|
||||||
|
_count?: Prisma.NestedIntFilter<$PrismaModel>
|
||||||
|
_min?: Prisma.NestedBoolFilter<$PrismaModel>
|
||||||
|
_max?: Prisma.NestedBoolFilter<$PrismaModel>
|
||||||
|
}
|
||||||
|
|
||||||
|
export type FloatFilter<$PrismaModel = never> = {
|
||||||
|
equals?: number | Prisma.FloatFieldRefInput<$PrismaModel>
|
||||||
|
in?: number[] | Prisma.ListFloatFieldRefInput<$PrismaModel>
|
||||||
|
notIn?: number[] | Prisma.ListFloatFieldRefInput<$PrismaModel>
|
||||||
|
lt?: number | Prisma.FloatFieldRefInput<$PrismaModel>
|
||||||
|
lte?: number | Prisma.FloatFieldRefInput<$PrismaModel>
|
||||||
|
gt?: number | Prisma.FloatFieldRefInput<$PrismaModel>
|
||||||
|
gte?: number | Prisma.FloatFieldRefInput<$PrismaModel>
|
||||||
|
not?: Prisma.NestedFloatFilter<$PrismaModel> | number
|
||||||
|
}
|
||||||
|
|
||||||
|
export type FloatWithAggregatesFilter<$PrismaModel = never> = {
|
||||||
|
equals?: number | Prisma.FloatFieldRefInput<$PrismaModel>
|
||||||
|
in?: number[] | Prisma.ListFloatFieldRefInput<$PrismaModel>
|
||||||
|
notIn?: number[] | Prisma.ListFloatFieldRefInput<$PrismaModel>
|
||||||
|
lt?: number | Prisma.FloatFieldRefInput<$PrismaModel>
|
||||||
|
lte?: number | Prisma.FloatFieldRefInput<$PrismaModel>
|
||||||
|
gt?: number | Prisma.FloatFieldRefInput<$PrismaModel>
|
||||||
|
gte?: number | Prisma.FloatFieldRefInput<$PrismaModel>
|
||||||
|
not?: Prisma.NestedFloatWithAggregatesFilter<$PrismaModel> | number
|
||||||
|
_count?: Prisma.NestedIntFilter<$PrismaModel>
|
||||||
|
_avg?: Prisma.NestedFloatFilter<$PrismaModel>
|
||||||
|
_sum?: Prisma.NestedFloatFilter<$PrismaModel>
|
||||||
|
_min?: Prisma.NestedFloatFilter<$PrismaModel>
|
||||||
|
_max?: Prisma.NestedFloatFilter<$PrismaModel>
|
||||||
|
}
|
||||||
|
|
||||||
export type StringNullableFilter<$PrismaModel = never> = {
|
export type StringNullableFilter<$PrismaModel = never> = {
|
||||||
equals?: string | Prisma.StringFieldRefInput<$PrismaModel> | null
|
equals?: string | Prisma.StringFieldRefInput<$PrismaModel> | null
|
||||||
in?: string[] | Prisma.ListStringFieldRefInput<$PrismaModel> | null
|
in?: string[] | Prisma.ListStringFieldRefInput<$PrismaModel> | null
|
||||||
@@ -137,33 +228,6 @@ export type StringNullableWithAggregatesFilter<$PrismaModel = never> = {
|
|||||||
_max?: Prisma.NestedStringNullableFilter<$PrismaModel>
|
_max?: Prisma.NestedStringNullableFilter<$PrismaModel>
|
||||||
}
|
}
|
||||||
|
|
||||||
export type FloatFilter<$PrismaModel = never> = {
|
|
||||||
equals?: number | Prisma.FloatFieldRefInput<$PrismaModel>
|
|
||||||
in?: number[] | Prisma.ListFloatFieldRefInput<$PrismaModel>
|
|
||||||
notIn?: number[] | Prisma.ListFloatFieldRefInput<$PrismaModel>
|
|
||||||
lt?: number | Prisma.FloatFieldRefInput<$PrismaModel>
|
|
||||||
lte?: number | Prisma.FloatFieldRefInput<$PrismaModel>
|
|
||||||
gt?: number | Prisma.FloatFieldRefInput<$PrismaModel>
|
|
||||||
gte?: number | Prisma.FloatFieldRefInput<$PrismaModel>
|
|
||||||
not?: Prisma.NestedFloatFilter<$PrismaModel> | number
|
|
||||||
}
|
|
||||||
|
|
||||||
export type FloatWithAggregatesFilter<$PrismaModel = never> = {
|
|
||||||
equals?: number | Prisma.FloatFieldRefInput<$PrismaModel>
|
|
||||||
in?: number[] | Prisma.ListFloatFieldRefInput<$PrismaModel>
|
|
||||||
notIn?: number[] | Prisma.ListFloatFieldRefInput<$PrismaModel>
|
|
||||||
lt?: number | Prisma.FloatFieldRefInput<$PrismaModel>
|
|
||||||
lte?: number | Prisma.FloatFieldRefInput<$PrismaModel>
|
|
||||||
gt?: number | Prisma.FloatFieldRefInput<$PrismaModel>
|
|
||||||
gte?: number | Prisma.FloatFieldRefInput<$PrismaModel>
|
|
||||||
not?: Prisma.NestedFloatWithAggregatesFilter<$PrismaModel> | number
|
|
||||||
_count?: Prisma.NestedIntFilter<$PrismaModel>
|
|
||||||
_avg?: Prisma.NestedFloatFilter<$PrismaModel>
|
|
||||||
_sum?: Prisma.NestedFloatFilter<$PrismaModel>
|
|
||||||
_min?: Prisma.NestedFloatFilter<$PrismaModel>
|
|
||||||
_max?: Prisma.NestedFloatFilter<$PrismaModel>
|
|
||||||
}
|
|
||||||
|
|
||||||
export type BigIntFilter<$PrismaModel = never> = {
|
export type BigIntFilter<$PrismaModel = never> = {
|
||||||
equals?: bigint | number | Prisma.BigIntFieldRefInput<$PrismaModel>
|
equals?: bigint | number | Prisma.BigIntFieldRefInput<$PrismaModel>
|
||||||
in?: bigint[] | number[] | Prisma.ListBigIntFieldRefInput<$PrismaModel>
|
in?: bigint[] | number[] | Prisma.ListBigIntFieldRefInput<$PrismaModel>
|
||||||
@@ -264,11 +328,6 @@ export type DateTimeNullableFilter<$PrismaModel = never> = {
|
|||||||
not?: Prisma.NestedDateTimeNullableFilter<$PrismaModel> | Date | string | null
|
not?: Prisma.NestedDateTimeNullableFilter<$PrismaModel> | Date | string | null
|
||||||
}
|
}
|
||||||
|
|
||||||
export type BoolFilter<$PrismaModel = never> = {
|
|
||||||
equals?: boolean | Prisma.BooleanFieldRefInput<$PrismaModel>
|
|
||||||
not?: Prisma.NestedBoolFilter<$PrismaModel> | boolean
|
|
||||||
}
|
|
||||||
|
|
||||||
export type IntNullableWithAggregatesFilter<$PrismaModel = never> = {
|
export type IntNullableWithAggregatesFilter<$PrismaModel = never> = {
|
||||||
equals?: number | Prisma.IntFieldRefInput<$PrismaModel> | null
|
equals?: number | Prisma.IntFieldRefInput<$PrismaModel> | null
|
||||||
in?: number[] | Prisma.ListIntFieldRefInput<$PrismaModel> | null
|
in?: number[] | Prisma.ListIntFieldRefInput<$PrismaModel> | null
|
||||||
@@ -299,14 +358,6 @@ export type DateTimeNullableWithAggregatesFilter<$PrismaModel = never> = {
|
|||||||
_max?: Prisma.NestedDateTimeNullableFilter<$PrismaModel>
|
_max?: Prisma.NestedDateTimeNullableFilter<$PrismaModel>
|
||||||
}
|
}
|
||||||
|
|
||||||
export type BoolWithAggregatesFilter<$PrismaModel = never> = {
|
|
||||||
equals?: boolean | Prisma.BooleanFieldRefInput<$PrismaModel>
|
|
||||||
not?: Prisma.NestedBoolWithAggregatesFilter<$PrismaModel> | boolean
|
|
||||||
_count?: Prisma.NestedIntFilter<$PrismaModel>
|
|
||||||
_min?: Prisma.NestedBoolFilter<$PrismaModel>
|
|
||||||
_max?: Prisma.NestedBoolFilter<$PrismaModel>
|
|
||||||
}
|
|
||||||
|
|
||||||
export type FloatNullableFilter<$PrismaModel = never> = {
|
export type FloatNullableFilter<$PrismaModel = never> = {
|
||||||
equals?: number | Prisma.FloatFieldRefInput<$PrismaModel> | null
|
equals?: number | Prisma.FloatFieldRefInput<$PrismaModel> | null
|
||||||
in?: number[] | Prisma.ListFloatFieldRefInput<$PrismaModel> | null
|
in?: number[] | Prisma.ListFloatFieldRefInput<$PrismaModel> | null
|
||||||
@@ -334,57 +385,6 @@ export type FloatNullableWithAggregatesFilter<$PrismaModel = never> = {
|
|||||||
_max?: Prisma.NestedFloatNullableFilter<$PrismaModel>
|
_max?: Prisma.NestedFloatNullableFilter<$PrismaModel>
|
||||||
}
|
}
|
||||||
|
|
||||||
export type JsonFilter<$PrismaModel = never> =
|
|
||||||
| Prisma.PatchUndefined<
|
|
||||||
Prisma.Either<Required<JsonFilterBase<$PrismaModel>>, Exclude<keyof Required<JsonFilterBase<$PrismaModel>>, 'path'>>,
|
|
||||||
Required<JsonFilterBase<$PrismaModel>>
|
|
||||||
>
|
|
||||||
| Prisma.OptionalFlat<Omit<Required<JsonFilterBase<$PrismaModel>>, 'path'>>
|
|
||||||
|
|
||||||
export type JsonFilterBase<$PrismaModel = never> = {
|
|
||||||
equals?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel> | Prisma.JsonNullValueFilter
|
|
||||||
path?: string[]
|
|
||||||
mode?: Prisma.QueryMode | Prisma.EnumQueryModeFieldRefInput<$PrismaModel>
|
|
||||||
string_contains?: string | Prisma.StringFieldRefInput<$PrismaModel>
|
|
||||||
string_starts_with?: string | Prisma.StringFieldRefInput<$PrismaModel>
|
|
||||||
string_ends_with?: string | Prisma.StringFieldRefInput<$PrismaModel>
|
|
||||||
array_starts_with?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel> | null
|
|
||||||
array_ends_with?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel> | null
|
|
||||||
array_contains?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel> | null
|
|
||||||
lt?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel>
|
|
||||||
lte?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel>
|
|
||||||
gt?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel>
|
|
||||||
gte?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel>
|
|
||||||
not?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel> | Prisma.JsonNullValueFilter
|
|
||||||
}
|
|
||||||
|
|
||||||
export type JsonWithAggregatesFilter<$PrismaModel = never> =
|
|
||||||
| Prisma.PatchUndefined<
|
|
||||||
Prisma.Either<Required<JsonWithAggregatesFilterBase<$PrismaModel>>, Exclude<keyof Required<JsonWithAggregatesFilterBase<$PrismaModel>>, 'path'>>,
|
|
||||||
Required<JsonWithAggregatesFilterBase<$PrismaModel>>
|
|
||||||
>
|
|
||||||
| Prisma.OptionalFlat<Omit<Required<JsonWithAggregatesFilterBase<$PrismaModel>>, 'path'>>
|
|
||||||
|
|
||||||
export type JsonWithAggregatesFilterBase<$PrismaModel = never> = {
|
|
||||||
equals?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel> | Prisma.JsonNullValueFilter
|
|
||||||
path?: string[]
|
|
||||||
mode?: Prisma.QueryMode | Prisma.EnumQueryModeFieldRefInput<$PrismaModel>
|
|
||||||
string_contains?: string | Prisma.StringFieldRefInput<$PrismaModel>
|
|
||||||
string_starts_with?: string | Prisma.StringFieldRefInput<$PrismaModel>
|
|
||||||
string_ends_with?: string | Prisma.StringFieldRefInput<$PrismaModel>
|
|
||||||
array_starts_with?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel> | null
|
|
||||||
array_ends_with?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel> | null
|
|
||||||
array_contains?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel> | null
|
|
||||||
lt?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel>
|
|
||||||
lte?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel>
|
|
||||||
gt?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel>
|
|
||||||
gte?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel>
|
|
||||||
not?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel> | Prisma.JsonNullValueFilter
|
|
||||||
_count?: Prisma.NestedIntFilter<$PrismaModel>
|
|
||||||
_min?: Prisma.NestedJsonFilter<$PrismaModel>
|
|
||||||
_max?: Prisma.NestedJsonFilter<$PrismaModel>
|
|
||||||
}
|
|
||||||
|
|
||||||
export type NestedIntFilter<$PrismaModel = never> = {
|
export type NestedIntFilter<$PrismaModel = never> = {
|
||||||
equals?: number | Prisma.IntFieldRefInput<$PrismaModel>
|
equals?: number | Prisma.IntFieldRefInput<$PrismaModel>
|
||||||
in?: number[] | Prisma.ListIntFieldRefInput<$PrismaModel>
|
in?: number[] | Prisma.ListIntFieldRefInput<$PrismaModel>
|
||||||
@@ -479,6 +479,59 @@ export type NestedDateTimeWithAggregatesFilter<$PrismaModel = never> = {
|
|||||||
_max?: Prisma.NestedDateTimeFilter<$PrismaModel>
|
_max?: Prisma.NestedDateTimeFilter<$PrismaModel>
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export type NestedJsonFilter<$PrismaModel = never> =
|
||||||
|
| Prisma.PatchUndefined<
|
||||||
|
Prisma.Either<Required<NestedJsonFilterBase<$PrismaModel>>, Exclude<keyof Required<NestedJsonFilterBase<$PrismaModel>>, 'path'>>,
|
||||||
|
Required<NestedJsonFilterBase<$PrismaModel>>
|
||||||
|
>
|
||||||
|
| Prisma.OptionalFlat<Omit<Required<NestedJsonFilterBase<$PrismaModel>>, 'path'>>
|
||||||
|
|
||||||
|
export type NestedJsonFilterBase<$PrismaModel = never> = {
|
||||||
|
equals?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel> | Prisma.JsonNullValueFilter
|
||||||
|
path?: string[]
|
||||||
|
mode?: Prisma.QueryMode | Prisma.EnumQueryModeFieldRefInput<$PrismaModel>
|
||||||
|
string_contains?: string | Prisma.StringFieldRefInput<$PrismaModel>
|
||||||
|
string_starts_with?: string | Prisma.StringFieldRefInput<$PrismaModel>
|
||||||
|
string_ends_with?: string | Prisma.StringFieldRefInput<$PrismaModel>
|
||||||
|
array_starts_with?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel> | null
|
||||||
|
array_ends_with?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel> | null
|
||||||
|
array_contains?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel> | null
|
||||||
|
lt?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel>
|
||||||
|
lte?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel>
|
||||||
|
gt?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel>
|
||||||
|
gte?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel>
|
||||||
|
not?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel> | Prisma.JsonNullValueFilter
|
||||||
|
}
|
||||||
|
|
||||||
|
export type NestedBoolFilter<$PrismaModel = never> = {
|
||||||
|
equals?: boolean | Prisma.BooleanFieldRefInput<$PrismaModel>
|
||||||
|
not?: Prisma.NestedBoolFilter<$PrismaModel> | boolean
|
||||||
|
}
|
||||||
|
|
||||||
|
export type NestedBoolWithAggregatesFilter<$PrismaModel = never> = {
|
||||||
|
equals?: boolean | Prisma.BooleanFieldRefInput<$PrismaModel>
|
||||||
|
not?: Prisma.NestedBoolWithAggregatesFilter<$PrismaModel> | boolean
|
||||||
|
_count?: Prisma.NestedIntFilter<$PrismaModel>
|
||||||
|
_min?: Prisma.NestedBoolFilter<$PrismaModel>
|
||||||
|
_max?: Prisma.NestedBoolFilter<$PrismaModel>
|
||||||
|
}
|
||||||
|
|
||||||
|
export type NestedFloatWithAggregatesFilter<$PrismaModel = never> = {
|
||||||
|
equals?: number | Prisma.FloatFieldRefInput<$PrismaModel>
|
||||||
|
in?: number[] | Prisma.ListFloatFieldRefInput<$PrismaModel>
|
||||||
|
notIn?: number[] | Prisma.ListFloatFieldRefInput<$PrismaModel>
|
||||||
|
lt?: number | Prisma.FloatFieldRefInput<$PrismaModel>
|
||||||
|
lte?: number | Prisma.FloatFieldRefInput<$PrismaModel>
|
||||||
|
gt?: number | Prisma.FloatFieldRefInput<$PrismaModel>
|
||||||
|
gte?: number | Prisma.FloatFieldRefInput<$PrismaModel>
|
||||||
|
not?: Prisma.NestedFloatWithAggregatesFilter<$PrismaModel> | number
|
||||||
|
_count?: Prisma.NestedIntFilter<$PrismaModel>
|
||||||
|
_avg?: Prisma.NestedFloatFilter<$PrismaModel>
|
||||||
|
_sum?: Prisma.NestedFloatFilter<$PrismaModel>
|
||||||
|
_min?: Prisma.NestedFloatFilter<$PrismaModel>
|
||||||
|
_max?: Prisma.NestedFloatFilter<$PrismaModel>
|
||||||
|
}
|
||||||
|
|
||||||
export type NestedStringNullableFilter<$PrismaModel = never> = {
|
export type NestedStringNullableFilter<$PrismaModel = never> = {
|
||||||
equals?: string | Prisma.StringFieldRefInput<$PrismaModel> | null
|
equals?: string | Prisma.StringFieldRefInput<$PrismaModel> | null
|
||||||
in?: string[] | Prisma.ListStringFieldRefInput<$PrismaModel> | null
|
in?: string[] | Prisma.ListStringFieldRefInput<$PrismaModel> | null
|
||||||
@@ -521,22 +574,6 @@ export type NestedIntNullableFilter<$PrismaModel = never> = {
|
|||||||
not?: Prisma.NestedIntNullableFilter<$PrismaModel> | number | null
|
not?: Prisma.NestedIntNullableFilter<$PrismaModel> | number | null
|
||||||
}
|
}
|
||||||
|
|
||||||
export type NestedFloatWithAggregatesFilter<$PrismaModel = never> = {
|
|
||||||
equals?: number | Prisma.FloatFieldRefInput<$PrismaModel>
|
|
||||||
in?: number[] | Prisma.ListFloatFieldRefInput<$PrismaModel>
|
|
||||||
notIn?: number[] | Prisma.ListFloatFieldRefInput<$PrismaModel>
|
|
||||||
lt?: number | Prisma.FloatFieldRefInput<$PrismaModel>
|
|
||||||
lte?: number | Prisma.FloatFieldRefInput<$PrismaModel>
|
|
||||||
gt?: number | Prisma.FloatFieldRefInput<$PrismaModel>
|
|
||||||
gte?: number | Prisma.FloatFieldRefInput<$PrismaModel>
|
|
||||||
not?: Prisma.NestedFloatWithAggregatesFilter<$PrismaModel> | number
|
|
||||||
_count?: Prisma.NestedIntFilter<$PrismaModel>
|
|
||||||
_avg?: Prisma.NestedFloatFilter<$PrismaModel>
|
|
||||||
_sum?: Prisma.NestedFloatFilter<$PrismaModel>
|
|
||||||
_min?: Prisma.NestedFloatFilter<$PrismaModel>
|
|
||||||
_max?: Prisma.NestedFloatFilter<$PrismaModel>
|
|
||||||
}
|
|
||||||
|
|
||||||
export type NestedBigIntFilter<$PrismaModel = never> = {
|
export type NestedBigIntFilter<$PrismaModel = never> = {
|
||||||
equals?: bigint | number | Prisma.BigIntFieldRefInput<$PrismaModel>
|
equals?: bigint | number | Prisma.BigIntFieldRefInput<$PrismaModel>
|
||||||
in?: bigint[] | number[] | Prisma.ListBigIntFieldRefInput<$PrismaModel>
|
in?: bigint[] | number[] | Prisma.ListBigIntFieldRefInput<$PrismaModel>
|
||||||
@@ -599,11 +636,6 @@ export type NestedDateTimeNullableFilter<$PrismaModel = never> = {
|
|||||||
not?: Prisma.NestedDateTimeNullableFilter<$PrismaModel> | Date | string | null
|
not?: Prisma.NestedDateTimeNullableFilter<$PrismaModel> | Date | string | null
|
||||||
}
|
}
|
||||||
|
|
||||||
export type NestedBoolFilter<$PrismaModel = never> = {
|
|
||||||
equals?: boolean | Prisma.BooleanFieldRefInput<$PrismaModel>
|
|
||||||
not?: Prisma.NestedBoolFilter<$PrismaModel> | boolean
|
|
||||||
}
|
|
||||||
|
|
||||||
export type NestedIntNullableWithAggregatesFilter<$PrismaModel = never> = {
|
export type NestedIntNullableWithAggregatesFilter<$PrismaModel = never> = {
|
||||||
equals?: number | Prisma.IntFieldRefInput<$PrismaModel> | null
|
equals?: number | Prisma.IntFieldRefInput<$PrismaModel> | null
|
||||||
in?: number[] | Prisma.ListIntFieldRefInput<$PrismaModel> | null
|
in?: number[] | Prisma.ListIntFieldRefInput<$PrismaModel> | null
|
||||||
@@ -645,14 +677,6 @@ export type NestedDateTimeNullableWithAggregatesFilter<$PrismaModel = never> = {
|
|||||||
_max?: Prisma.NestedDateTimeNullableFilter<$PrismaModel>
|
_max?: Prisma.NestedDateTimeNullableFilter<$PrismaModel>
|
||||||
}
|
}
|
||||||
|
|
||||||
export type NestedBoolWithAggregatesFilter<$PrismaModel = never> = {
|
|
||||||
equals?: boolean | Prisma.BooleanFieldRefInput<$PrismaModel>
|
|
||||||
not?: Prisma.NestedBoolWithAggregatesFilter<$PrismaModel> | boolean
|
|
||||||
_count?: Prisma.NestedIntFilter<$PrismaModel>
|
|
||||||
_min?: Prisma.NestedBoolFilter<$PrismaModel>
|
|
||||||
_max?: Prisma.NestedBoolFilter<$PrismaModel>
|
|
||||||
}
|
|
||||||
|
|
||||||
export type NestedFloatNullableWithAggregatesFilter<$PrismaModel = never> = {
|
export type NestedFloatNullableWithAggregatesFilter<$PrismaModel = never> = {
|
||||||
equals?: number | Prisma.FloatFieldRefInput<$PrismaModel> | null
|
equals?: number | Prisma.FloatFieldRefInput<$PrismaModel> | null
|
||||||
in?: number[] | Prisma.ListFloatFieldRefInput<$PrismaModel> | null
|
in?: number[] | Prisma.ListFloatFieldRefInput<$PrismaModel> | null
|
||||||
@@ -669,28 +693,4 @@ export type NestedFloatNullableWithAggregatesFilter<$PrismaModel = never> = {
|
|||||||
_max?: Prisma.NestedFloatNullableFilter<$PrismaModel>
|
_max?: Prisma.NestedFloatNullableFilter<$PrismaModel>
|
||||||
}
|
}
|
||||||
|
|
||||||
export type NestedJsonFilter<$PrismaModel = never> =
|
|
||||||
| Prisma.PatchUndefined<
|
|
||||||
Prisma.Either<Required<NestedJsonFilterBase<$PrismaModel>>, Exclude<keyof Required<NestedJsonFilterBase<$PrismaModel>>, 'path'>>,
|
|
||||||
Required<NestedJsonFilterBase<$PrismaModel>>
|
|
||||||
>
|
|
||||||
| Prisma.OptionalFlat<Omit<Required<NestedJsonFilterBase<$PrismaModel>>, 'path'>>
|
|
||||||
|
|
||||||
export type NestedJsonFilterBase<$PrismaModel = never> = {
|
|
||||||
equals?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel> | Prisma.JsonNullValueFilter
|
|
||||||
path?: string[]
|
|
||||||
mode?: Prisma.QueryMode | Prisma.EnumQueryModeFieldRefInput<$PrismaModel>
|
|
||||||
string_contains?: string | Prisma.StringFieldRefInput<$PrismaModel>
|
|
||||||
string_starts_with?: string | Prisma.StringFieldRefInput<$PrismaModel>
|
|
||||||
string_ends_with?: string | Prisma.StringFieldRefInput<$PrismaModel>
|
|
||||||
array_starts_with?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel> | null
|
|
||||||
array_ends_with?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel> | null
|
|
||||||
array_contains?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel> | null
|
|
||||||
lt?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel>
|
|
||||||
lte?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel>
|
|
||||||
gt?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel>
|
|
||||||
gte?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel>
|
|
||||||
not?: runtime.InputJsonValue | Prisma.JsonFieldRefInput<$PrismaModel> | Prisma.JsonNullValueFilter
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@@ -386,6 +386,9 @@ type FieldRefInputType<Model, FieldType> = Model extends never ? never : FieldRe
|
|||||||
export const ModelName = {
|
export const ModelName = {
|
||||||
User: 'User',
|
User: 'User',
|
||||||
Article: 'Article',
|
Article: 'Article',
|
||||||
|
Strategy: 'Strategy',
|
||||||
|
Indicator: 'Indicator',
|
||||||
|
IndicatorPoint: 'IndicatorPoint',
|
||||||
News: 'News',
|
News: 'News',
|
||||||
Alert: 'Alert',
|
Alert: 'Alert',
|
||||||
ServerNode: 'ServerNode',
|
ServerNode: 'ServerNode',
|
||||||
@@ -393,6 +396,7 @@ export const ModelName = {
|
|||||||
ServiceCheck: 'ServiceCheck',
|
ServiceCheck: 'ServiceCheck',
|
||||||
Econ_SowInventory: 'Econ_SowInventory',
|
Econ_SowInventory: 'Econ_SowInventory',
|
||||||
ScraperCache: 'ScraperCache',
|
ScraperCache: 'ScraperCache',
|
||||||
|
OilPriceHistory: 'OilPriceHistory',
|
||||||
MihomeAccount: 'MihomeAccount',
|
MihomeAccount: 'MihomeAccount',
|
||||||
MihomeHome: 'MihomeHome',
|
MihomeHome: 'MihomeHome',
|
||||||
MihomeDevice: 'MihomeDevice',
|
MihomeDevice: 'MihomeDevice',
|
||||||
@@ -424,7 +428,7 @@ export type TypeMap<ExtArgs extends runtime.Types.Extensions.InternalArgs = runt
|
|||||||
omit: GlobalOmitOptions
|
omit: GlobalOmitOptions
|
||||||
}
|
}
|
||||||
meta: {
|
meta: {
|
||||||
modelProps: "user" | "article" | "news" | "alert" | "serverNode" | "serverNodeHistory" | "serviceCheck" | "econ_SowInventory" | "scraperCache" | "mihomeAccount" | "mihomeHome" | "mihomeDevice" | "mihomeEnvSample" | "mihomeEnvHour" | "habit" | "checkIn" | "checkList" | "checkListItem" | "checkListTemplate" | "project" | "projectMember" | "boardColumn" | "task" | "taskMember" | "taskTag"
|
modelProps: "user" | "article" | "strategy" | "indicator" | "indicatorPoint" | "news" | "alert" | "serverNode" | "serverNodeHistory" | "serviceCheck" | "econ_SowInventory" | "scraperCache" | "oilPriceHistory" | "mihomeAccount" | "mihomeHome" | "mihomeDevice" | "mihomeEnvSample" | "mihomeEnvHour" | "habit" | "checkIn" | "checkList" | "checkListItem" | "checkListTemplate" | "project" | "projectMember" | "boardColumn" | "task" | "taskMember" | "taskTag"
|
||||||
txIsolationLevel: TransactionIsolationLevel
|
txIsolationLevel: TransactionIsolationLevel
|
||||||
}
|
}
|
||||||
model: {
|
model: {
|
||||||
@@ -576,6 +580,228 @@ export type TypeMap<ExtArgs extends runtime.Types.Extensions.InternalArgs = runt
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Strategy: {
|
||||||
|
payload: Prisma.$StrategyPayload<ExtArgs>
|
||||||
|
fields: Prisma.StrategyFieldRefs
|
||||||
|
operations: {
|
||||||
|
findUnique: {
|
||||||
|
args: Prisma.StrategyFindUniqueArgs<ExtArgs>
|
||||||
|
result: runtime.Types.Utils.PayloadToResult<Prisma.$StrategyPayload> | null
|
||||||
|
}
|
||||||
|
findUniqueOrThrow: {
|
||||||
|
args: Prisma.StrategyFindUniqueOrThrowArgs<ExtArgs>
|
||||||
|
result: runtime.Types.Utils.PayloadToResult<Prisma.$StrategyPayload>
|
||||||
|
}
|
||||||
|
findFirst: {
|
||||||
|
args: Prisma.StrategyFindFirstArgs<ExtArgs>
|
||||||
|
result: runtime.Types.Utils.PayloadToResult<Prisma.$StrategyPayload> | null
|
||||||
|
}
|
||||||
|
findFirstOrThrow: {
|
||||||
|
args: Prisma.StrategyFindFirstOrThrowArgs<ExtArgs>
|
||||||
|
result: runtime.Types.Utils.PayloadToResult<Prisma.$StrategyPayload>
|
||||||
|
}
|
||||||
|
findMany: {
|
||||||
|
args: Prisma.StrategyFindManyArgs<ExtArgs>
|
||||||
|
result: runtime.Types.Utils.PayloadToResult<Prisma.$StrategyPayload>[]
|
||||||
|
}
|
||||||
|
create: {
|
||||||
|
args: Prisma.StrategyCreateArgs<ExtArgs>
|
||||||
|
result: runtime.Types.Utils.PayloadToResult<Prisma.$StrategyPayload>
|
||||||
|
}
|
||||||
|
createMany: {
|
||||||
|
args: Prisma.StrategyCreateManyArgs<ExtArgs>
|
||||||
|
result: BatchPayload
|
||||||
|
}
|
||||||
|
createManyAndReturn: {
|
||||||
|
args: Prisma.StrategyCreateManyAndReturnArgs<ExtArgs>
|
||||||
|
result: runtime.Types.Utils.PayloadToResult<Prisma.$StrategyPayload>[]
|
||||||
|
}
|
||||||
|
delete: {
|
||||||
|
args: Prisma.StrategyDeleteArgs<ExtArgs>
|
||||||
|
result: runtime.Types.Utils.PayloadToResult<Prisma.$StrategyPayload>
|
||||||
|
}
|
||||||
|
update: {
|
||||||
|
args: Prisma.StrategyUpdateArgs<ExtArgs>
|
||||||
|
result: runtime.Types.Utils.PayloadToResult<Prisma.$StrategyPayload>
|
||||||
|
}
|
||||||
|
deleteMany: {
|
||||||
|
args: Prisma.StrategyDeleteManyArgs<ExtArgs>
|
||||||
|
result: BatchPayload
|
||||||
|
}
|
||||||
|
updateMany: {
|
||||||
|
args: Prisma.StrategyUpdateManyArgs<ExtArgs>
|
||||||
|
result: BatchPayload
|
||||||
|
}
|
||||||
|
updateManyAndReturn: {
|
||||||
|
args: Prisma.StrategyUpdateManyAndReturnArgs<ExtArgs>
|
||||||
|
result: runtime.Types.Utils.PayloadToResult<Prisma.$StrategyPayload>[]
|
||||||
|
}
|
||||||
|
upsert: {
|
||||||
|
args: Prisma.StrategyUpsertArgs<ExtArgs>
|
||||||
|
result: runtime.Types.Utils.PayloadToResult<Prisma.$StrategyPayload>
|
||||||
|
}
|
||||||
|
aggregate: {
|
||||||
|
args: Prisma.StrategyAggregateArgs<ExtArgs>
|
||||||
|
result: runtime.Types.Utils.Optional<Prisma.AggregateStrategy>
|
||||||
|
}
|
||||||
|
groupBy: {
|
||||||
|
args: Prisma.StrategyGroupByArgs<ExtArgs>
|
||||||
|
result: runtime.Types.Utils.Optional<Prisma.StrategyGroupByOutputType>[]
|
||||||
|
}
|
||||||
|
count: {
|
||||||
|
args: Prisma.StrategyCountArgs<ExtArgs>
|
||||||
|
result: runtime.Types.Utils.Optional<Prisma.StrategyCountAggregateOutputType> | number
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Indicator: {
|
||||||
|
payload: Prisma.$IndicatorPayload<ExtArgs>
|
||||||
|
fields: Prisma.IndicatorFieldRefs
|
||||||
|
operations: {
|
||||||
|
findUnique: {
|
||||||
|
args: Prisma.IndicatorFindUniqueArgs<ExtArgs>
|
||||||
|
result: runtime.Types.Utils.PayloadToResult<Prisma.$IndicatorPayload> | null
|
||||||
|
}
|
||||||
|
findUniqueOrThrow: {
|
||||||
|
args: Prisma.IndicatorFindUniqueOrThrowArgs<ExtArgs>
|
||||||
|
result: runtime.Types.Utils.PayloadToResult<Prisma.$IndicatorPayload>
|
||||||
|
}
|
||||||
|
findFirst: {
|
||||||
|
args: Prisma.IndicatorFindFirstArgs<ExtArgs>
|
||||||
|
result: runtime.Types.Utils.PayloadToResult<Prisma.$IndicatorPayload> | null
|
||||||
|
}
|
||||||
|
findFirstOrThrow: {
|
||||||
|
args: Prisma.IndicatorFindFirstOrThrowArgs<ExtArgs>
|
||||||
|
result: runtime.Types.Utils.PayloadToResult<Prisma.$IndicatorPayload>
|
||||||
|
}
|
||||||
|
findMany: {
|
||||||
|
args: Prisma.IndicatorFindManyArgs<ExtArgs>
|
||||||
|
result: runtime.Types.Utils.PayloadToResult<Prisma.$IndicatorPayload>[]
|
||||||
|
}
|
||||||
|
create: {
|
||||||
|
args: Prisma.IndicatorCreateArgs<ExtArgs>
|
||||||
|
result: runtime.Types.Utils.PayloadToResult<Prisma.$IndicatorPayload>
|
||||||
|
}
|
||||||
|
createMany: {
|
||||||
|
args: Prisma.IndicatorCreateManyArgs<ExtArgs>
|
||||||
|
result: BatchPayload
|
||||||
|
}
|
||||||
|
createManyAndReturn: {
|
||||||
|
args: Prisma.IndicatorCreateManyAndReturnArgs<ExtArgs>
|
||||||
|
result: runtime.Types.Utils.PayloadToResult<Prisma.$IndicatorPayload>[]
|
||||||
|
}
|
||||||
|
delete: {
|
||||||
|
args: Prisma.IndicatorDeleteArgs<ExtArgs>
|
||||||
|
result: runtime.Types.Utils.PayloadToResult<Prisma.$IndicatorPayload>
|
||||||
|
}
|
||||||
|
update: {
|
||||||
|
args: Prisma.IndicatorUpdateArgs<ExtArgs>
|
||||||
|
result: runtime.Types.Utils.PayloadToResult<Prisma.$IndicatorPayload>
|
||||||
|
}
|
||||||
|
deleteMany: {
|
||||||
|
args: Prisma.IndicatorDeleteManyArgs<ExtArgs>
|
||||||
|
result: BatchPayload
|
||||||
|
}
|
||||||
|
updateMany: {
|
||||||
|
args: Prisma.IndicatorUpdateManyArgs<ExtArgs>
|
||||||
|
result: BatchPayload
|
||||||
|
}
|
||||||
|
updateManyAndReturn: {
|
||||||
|
args: Prisma.IndicatorUpdateManyAndReturnArgs<ExtArgs>
|
||||||
|
result: runtime.Types.Utils.PayloadToResult<Prisma.$IndicatorPayload>[]
|
||||||
|
}
|
||||||
|
upsert: {
|
||||||
|
args: Prisma.IndicatorUpsertArgs<ExtArgs>
|
||||||
|
result: runtime.Types.Utils.PayloadToResult<Prisma.$IndicatorPayload>
|
||||||
|
}
|
||||||
|
aggregate: {
|
||||||
|
args: Prisma.IndicatorAggregateArgs<ExtArgs>
|
||||||
|
result: runtime.Types.Utils.Optional<Prisma.AggregateIndicator>
|
||||||
|
}
|
||||||
|
groupBy: {
|
||||||
|
args: Prisma.IndicatorGroupByArgs<ExtArgs>
|
||||||
|
result: runtime.Types.Utils.Optional<Prisma.IndicatorGroupByOutputType>[]
|
||||||
|
}
|
||||||
|
count: {
|
||||||
|
args: Prisma.IndicatorCountArgs<ExtArgs>
|
||||||
|
result: runtime.Types.Utils.Optional<Prisma.IndicatorCountAggregateOutputType> | number
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
IndicatorPoint: {
|
||||||
|
payload: Prisma.$IndicatorPointPayload<ExtArgs>
|
||||||
|
fields: Prisma.IndicatorPointFieldRefs
|
||||||
|
operations: {
|
||||||
|
findUnique: {
|
||||||
|
args: Prisma.IndicatorPointFindUniqueArgs<ExtArgs>
|
||||||
|
result: runtime.Types.Utils.PayloadToResult<Prisma.$IndicatorPointPayload> | null
|
||||||
|
}
|
||||||
|
findUniqueOrThrow: {
|
||||||
|
args: Prisma.IndicatorPointFindUniqueOrThrowArgs<ExtArgs>
|
||||||
|
result: runtime.Types.Utils.PayloadToResult<Prisma.$IndicatorPointPayload>
|
||||||
|
}
|
||||||
|
findFirst: {
|
||||||
|
args: Prisma.IndicatorPointFindFirstArgs<ExtArgs>
|
||||||
|
result: runtime.Types.Utils.PayloadToResult<Prisma.$IndicatorPointPayload> | null
|
||||||
|
}
|
||||||
|
findFirstOrThrow: {
|
||||||
|
args: Prisma.IndicatorPointFindFirstOrThrowArgs<ExtArgs>
|
||||||
|
result: runtime.Types.Utils.PayloadToResult<Prisma.$IndicatorPointPayload>
|
||||||
|
}
|
||||||
|
findMany: {
|
||||||
|
args: Prisma.IndicatorPointFindManyArgs<ExtArgs>
|
||||||
|
result: runtime.Types.Utils.PayloadToResult<Prisma.$IndicatorPointPayload>[]
|
||||||
|
}
|
||||||
|
create: {
|
||||||
|
args: Prisma.IndicatorPointCreateArgs<ExtArgs>
|
||||||
|
result: runtime.Types.Utils.PayloadToResult<Prisma.$IndicatorPointPayload>
|
||||||
|
}
|
||||||
|
createMany: {
|
||||||
|
args: Prisma.IndicatorPointCreateManyArgs<ExtArgs>
|
||||||
|
result: BatchPayload
|
||||||
|
}
|
||||||
|
createManyAndReturn: {
|
||||||
|
args: Prisma.IndicatorPointCreateManyAndReturnArgs<ExtArgs>
|
||||||
|
result: runtime.Types.Utils.PayloadToResult<Prisma.$IndicatorPointPayload>[]
|
||||||
|
}
|
||||||
|
delete: {
|
||||||
|
args: Prisma.IndicatorPointDeleteArgs<ExtArgs>
|
||||||
|
result: runtime.Types.Utils.PayloadToResult<Prisma.$IndicatorPointPayload>
|
||||||
|
}
|
||||||
|
update: {
|
||||||
|
args: Prisma.IndicatorPointUpdateArgs<ExtArgs>
|
||||||
|
result: runtime.Types.Utils.PayloadToResult<Prisma.$IndicatorPointPayload>
|
||||||
|
}
|
||||||
|
deleteMany: {
|
||||||
|
args: Prisma.IndicatorPointDeleteManyArgs<ExtArgs>
|
||||||
|
result: BatchPayload
|
||||||
|
}
|
||||||
|
updateMany: {
|
||||||
|
args: Prisma.IndicatorPointUpdateManyArgs<ExtArgs>
|
||||||
|
result: BatchPayload
|
||||||
|
}
|
||||||
|
updateManyAndReturn: {
|
||||||
|
args: Prisma.IndicatorPointUpdateManyAndReturnArgs<ExtArgs>
|
||||||
|
result: runtime.Types.Utils.PayloadToResult<Prisma.$IndicatorPointPayload>[]
|
||||||
|
}
|
||||||
|
upsert: {
|
||||||
|
args: Prisma.IndicatorPointUpsertArgs<ExtArgs>
|
||||||
|
result: runtime.Types.Utils.PayloadToResult<Prisma.$IndicatorPointPayload>
|
||||||
|
}
|
||||||
|
aggregate: {
|
||||||
|
args: Prisma.IndicatorPointAggregateArgs<ExtArgs>
|
||||||
|
result: runtime.Types.Utils.Optional<Prisma.AggregateIndicatorPoint>
|
||||||
|
}
|
||||||
|
groupBy: {
|
||||||
|
args: Prisma.IndicatorPointGroupByArgs<ExtArgs>
|
||||||
|
result: runtime.Types.Utils.Optional<Prisma.IndicatorPointGroupByOutputType>[]
|
||||||
|
}
|
||||||
|
count: {
|
||||||
|
args: Prisma.IndicatorPointCountArgs<ExtArgs>
|
||||||
|
result: runtime.Types.Utils.Optional<Prisma.IndicatorPointCountAggregateOutputType> | number
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
News: {
|
News: {
|
||||||
payload: Prisma.$NewsPayload<ExtArgs>
|
payload: Prisma.$NewsPayload<ExtArgs>
|
||||||
fields: Prisma.NewsFieldRefs
|
fields: Prisma.NewsFieldRefs
|
||||||
@@ -1094,6 +1320,80 @@ export type TypeMap<ExtArgs extends runtime.Types.Extensions.InternalArgs = runt
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
OilPriceHistory: {
|
||||||
|
payload: Prisma.$OilPriceHistoryPayload<ExtArgs>
|
||||||
|
fields: Prisma.OilPriceHistoryFieldRefs
|
||||||
|
operations: {
|
||||||
|
findUnique: {
|
||||||
|
args: Prisma.OilPriceHistoryFindUniqueArgs<ExtArgs>
|
||||||
|
result: runtime.Types.Utils.PayloadToResult<Prisma.$OilPriceHistoryPayload> | null
|
||||||
|
}
|
||||||
|
findUniqueOrThrow: {
|
||||||
|
args: Prisma.OilPriceHistoryFindUniqueOrThrowArgs<ExtArgs>
|
||||||
|
result: runtime.Types.Utils.PayloadToResult<Prisma.$OilPriceHistoryPayload>
|
||||||
|
}
|
||||||
|
findFirst: {
|
||||||
|
args: Prisma.OilPriceHistoryFindFirstArgs<ExtArgs>
|
||||||
|
result: runtime.Types.Utils.PayloadToResult<Prisma.$OilPriceHistoryPayload> | null
|
||||||
|
}
|
||||||
|
findFirstOrThrow: {
|
||||||
|
args: Prisma.OilPriceHistoryFindFirstOrThrowArgs<ExtArgs>
|
||||||
|
result: runtime.Types.Utils.PayloadToResult<Prisma.$OilPriceHistoryPayload>
|
||||||
|
}
|
||||||
|
findMany: {
|
||||||
|
args: Prisma.OilPriceHistoryFindManyArgs<ExtArgs>
|
||||||
|
result: runtime.Types.Utils.PayloadToResult<Prisma.$OilPriceHistoryPayload>[]
|
||||||
|
}
|
||||||
|
create: {
|
||||||
|
args: Prisma.OilPriceHistoryCreateArgs<ExtArgs>
|
||||||
|
result: runtime.Types.Utils.PayloadToResult<Prisma.$OilPriceHistoryPayload>
|
||||||
|
}
|
||||||
|
createMany: {
|
||||||
|
args: Prisma.OilPriceHistoryCreateManyArgs<ExtArgs>
|
||||||
|
result: BatchPayload
|
||||||
|
}
|
||||||
|
createManyAndReturn: {
|
||||||
|
args: Prisma.OilPriceHistoryCreateManyAndReturnArgs<ExtArgs>
|
||||||
|
result: runtime.Types.Utils.PayloadToResult<Prisma.$OilPriceHistoryPayload>[]
|
||||||
|
}
|
||||||
|
delete: {
|
||||||
|
args: Prisma.OilPriceHistoryDeleteArgs<ExtArgs>
|
||||||
|
result: runtime.Types.Utils.PayloadToResult<Prisma.$OilPriceHistoryPayload>
|
||||||
|
}
|
||||||
|
update: {
|
||||||
|
args: Prisma.OilPriceHistoryUpdateArgs<ExtArgs>
|
||||||
|
result: runtime.Types.Utils.PayloadToResult<Prisma.$OilPriceHistoryPayload>
|
||||||
|
}
|
||||||
|
deleteMany: {
|
||||||
|
args: Prisma.OilPriceHistoryDeleteManyArgs<ExtArgs>
|
||||||
|
result: BatchPayload
|
||||||
|
}
|
||||||
|
updateMany: {
|
||||||
|
args: Prisma.OilPriceHistoryUpdateManyArgs<ExtArgs>
|
||||||
|
result: BatchPayload
|
||||||
|
}
|
||||||
|
updateManyAndReturn: {
|
||||||
|
args: Prisma.OilPriceHistoryUpdateManyAndReturnArgs<ExtArgs>
|
||||||
|
result: runtime.Types.Utils.PayloadToResult<Prisma.$OilPriceHistoryPayload>[]
|
||||||
|
}
|
||||||
|
upsert: {
|
||||||
|
args: Prisma.OilPriceHistoryUpsertArgs<ExtArgs>
|
||||||
|
result: runtime.Types.Utils.PayloadToResult<Prisma.$OilPriceHistoryPayload>
|
||||||
|
}
|
||||||
|
aggregate: {
|
||||||
|
args: Prisma.OilPriceHistoryAggregateArgs<ExtArgs>
|
||||||
|
result: runtime.Types.Utils.Optional<Prisma.AggregateOilPriceHistory>
|
||||||
|
}
|
||||||
|
groupBy: {
|
||||||
|
args: Prisma.OilPriceHistoryGroupByArgs<ExtArgs>
|
||||||
|
result: runtime.Types.Utils.Optional<Prisma.OilPriceHistoryGroupByOutputType>[]
|
||||||
|
}
|
||||||
|
count: {
|
||||||
|
args: Prisma.OilPriceHistoryCountArgs<ExtArgs>
|
||||||
|
result: runtime.Types.Utils.Optional<Prisma.OilPriceHistoryCountAggregateOutputType> | number
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
MihomeAccount: {
|
MihomeAccount: {
|
||||||
payload: Prisma.$MihomeAccountPayload<ExtArgs>
|
payload: Prisma.$MihomeAccountPayload<ExtArgs>
|
||||||
fields: Prisma.MihomeAccountFieldRefs
|
fields: Prisma.MihomeAccountFieldRefs
|
||||||
@@ -2342,6 +2642,46 @@ export const ArticleScalarFieldEnum = {
|
|||||||
export type ArticleScalarFieldEnum = (typeof ArticleScalarFieldEnum)[keyof typeof ArticleScalarFieldEnum]
|
export type ArticleScalarFieldEnum = (typeof ArticleScalarFieldEnum)[keyof typeof ArticleScalarFieldEnum]
|
||||||
|
|
||||||
|
|
||||||
|
export const StrategyScalarFieldEnum = {
|
||||||
|
id: 'id',
|
||||||
|
name: 'name',
|
||||||
|
description: 'description',
|
||||||
|
data: 'data',
|
||||||
|
createdAt: 'createdAt',
|
||||||
|
updatedAt: 'updatedAt'
|
||||||
|
} as const
|
||||||
|
|
||||||
|
export type StrategyScalarFieldEnum = (typeof StrategyScalarFieldEnum)[keyof typeof StrategyScalarFieldEnum]
|
||||||
|
|
||||||
|
|
||||||
|
export const IndicatorScalarFieldEnum = {
|
||||||
|
id: 'id',
|
||||||
|
name: 'name',
|
||||||
|
groupName: 'groupName',
|
||||||
|
title: 'title',
|
||||||
|
unit: 'unit',
|
||||||
|
source: 'source',
|
||||||
|
frequency: 'frequency',
|
||||||
|
hidden: 'hidden',
|
||||||
|
createdAt: 'createdAt',
|
||||||
|
updatedAt: 'updatedAt'
|
||||||
|
} as const
|
||||||
|
|
||||||
|
export type IndicatorScalarFieldEnum = (typeof IndicatorScalarFieldEnum)[keyof typeof IndicatorScalarFieldEnum]
|
||||||
|
|
||||||
|
|
||||||
|
export const IndicatorPointScalarFieldEnum = {
|
||||||
|
id: 'id',
|
||||||
|
indicatorId: 'indicatorId',
|
||||||
|
period: 'period',
|
||||||
|
value: 'value',
|
||||||
|
createdAt: 'createdAt',
|
||||||
|
updatedAt: 'updatedAt'
|
||||||
|
} as const
|
||||||
|
|
||||||
|
export type IndicatorPointScalarFieldEnum = (typeof IndicatorPointScalarFieldEnum)[keyof typeof IndicatorPointScalarFieldEnum]
|
||||||
|
|
||||||
|
|
||||||
export const NewsScalarFieldEnum = {
|
export const NewsScalarFieldEnum = {
|
||||||
id: 'id',
|
id: 'id',
|
||||||
title: 'title',
|
title: 'title',
|
||||||
@@ -2461,6 +2801,19 @@ export const ScraperCacheScalarFieldEnum = {
|
|||||||
export type ScraperCacheScalarFieldEnum = (typeof ScraperCacheScalarFieldEnum)[keyof typeof ScraperCacheScalarFieldEnum]
|
export type ScraperCacheScalarFieldEnum = (typeof ScraperCacheScalarFieldEnum)[keyof typeof ScraperCacheScalarFieldEnum]
|
||||||
|
|
||||||
|
|
||||||
|
export const OilPriceHistoryScalarFieldEnum = {
|
||||||
|
id: 'id',
|
||||||
|
date: 'date',
|
||||||
|
province: 'province',
|
||||||
|
fuel: 'fuel',
|
||||||
|
price: 'price',
|
||||||
|
source: 'source',
|
||||||
|
createdAt: 'createdAt'
|
||||||
|
} as const
|
||||||
|
|
||||||
|
export type OilPriceHistoryScalarFieldEnum = (typeof OilPriceHistoryScalarFieldEnum)[keyof typeof OilPriceHistoryScalarFieldEnum]
|
||||||
|
|
||||||
|
|
||||||
export const MihomeAccountScalarFieldEnum = {
|
export const MihomeAccountScalarFieldEnum = {
|
||||||
id: 'id',
|
id: 'id',
|
||||||
key: 'key',
|
key: 'key',
|
||||||
@@ -2723,6 +3076,13 @@ export const SortOrder = {
|
|||||||
export type SortOrder = (typeof SortOrder)[keyof typeof SortOrder]
|
export type SortOrder = (typeof SortOrder)[keyof typeof SortOrder]
|
||||||
|
|
||||||
|
|
||||||
|
export const JsonNullValueInput = {
|
||||||
|
JsonNull: JsonNull
|
||||||
|
} as const
|
||||||
|
|
||||||
|
export type JsonNullValueInput = (typeof JsonNullValueInput)[keyof typeof JsonNullValueInput]
|
||||||
|
|
||||||
|
|
||||||
export const NullableJsonNullValueInput = {
|
export const NullableJsonNullValueInput = {
|
||||||
DbNull: DbNull,
|
DbNull: DbNull,
|
||||||
JsonNull: JsonNull
|
JsonNull: JsonNull
|
||||||
@@ -2731,13 +3091,6 @@ export const NullableJsonNullValueInput = {
|
|||||||
export type NullableJsonNullValueInput = (typeof NullableJsonNullValueInput)[keyof typeof NullableJsonNullValueInput]
|
export type NullableJsonNullValueInput = (typeof NullableJsonNullValueInput)[keyof typeof NullableJsonNullValueInput]
|
||||||
|
|
||||||
|
|
||||||
export const JsonNullValueInput = {
|
|
||||||
JsonNull: JsonNull
|
|
||||||
} as const
|
|
||||||
|
|
||||||
export type JsonNullValueInput = (typeof JsonNullValueInput)[keyof typeof JsonNullValueInput]
|
|
||||||
|
|
||||||
|
|
||||||
export const QueryMode = {
|
export const QueryMode = {
|
||||||
default: 'default',
|
default: 'default',
|
||||||
insensitive: 'insensitive'
|
insensitive: 'insensitive'
|
||||||
@@ -2746,14 +3099,6 @@ export const QueryMode = {
|
|||||||
export type QueryMode = (typeof QueryMode)[keyof typeof QueryMode]
|
export type QueryMode = (typeof QueryMode)[keyof typeof QueryMode]
|
||||||
|
|
||||||
|
|
||||||
export const NullsOrder = {
|
|
||||||
first: 'first',
|
|
||||||
last: 'last'
|
|
||||||
} as const
|
|
||||||
|
|
||||||
export type NullsOrder = (typeof NullsOrder)[keyof typeof NullsOrder]
|
|
||||||
|
|
||||||
|
|
||||||
export const JsonNullValueFilter = {
|
export const JsonNullValueFilter = {
|
||||||
DbNull: DbNull,
|
DbNull: DbNull,
|
||||||
JsonNull: JsonNull,
|
JsonNull: JsonNull,
|
||||||
@@ -2763,6 +3108,14 @@ export const JsonNullValueFilter = {
|
|||||||
export type JsonNullValueFilter = (typeof JsonNullValueFilter)[keyof typeof JsonNullValueFilter]
|
export type JsonNullValueFilter = (typeof JsonNullValueFilter)[keyof typeof JsonNullValueFilter]
|
||||||
|
|
||||||
|
|
||||||
|
export const NullsOrder = {
|
||||||
|
first: 'first',
|
||||||
|
last: 'last'
|
||||||
|
} as const
|
||||||
|
|
||||||
|
export type NullsOrder = (typeof NullsOrder)[keyof typeof NullsOrder]
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Field references
|
* Field references
|
||||||
@@ -2811,6 +3164,27 @@ export type ListDateTimeFieldRefInput<$PrismaModel> = FieldRefInputType<$PrismaM
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reference to a field of type 'Json'
|
||||||
|
*/
|
||||||
|
export type JsonFieldRefInput<$PrismaModel> = FieldRefInputType<$PrismaModel, 'Json'>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reference to a field of type 'QueryMode'
|
||||||
|
*/
|
||||||
|
export type EnumQueryModeFieldRefInput<$PrismaModel> = FieldRefInputType<$PrismaModel, 'QueryMode'>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reference to a field of type 'Boolean'
|
||||||
|
*/
|
||||||
|
export type BooleanFieldRefInput<$PrismaModel> = FieldRefInputType<$PrismaModel, 'Boolean'>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Reference to a field of type 'Float'
|
* Reference to a field of type 'Float'
|
||||||
*/
|
*/
|
||||||
@@ -2838,27 +3212,6 @@ export type BigIntFieldRefInput<$PrismaModel> = FieldRefInputType<$PrismaModel,
|
|||||||
export type ListBigIntFieldRefInput<$PrismaModel> = FieldRefInputType<$PrismaModel, 'BigInt[]'>
|
export type ListBigIntFieldRefInput<$PrismaModel> = FieldRefInputType<$PrismaModel, 'BigInt[]'>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Reference to a field of type 'Json'
|
|
||||||
*/
|
|
||||||
export type JsonFieldRefInput<$PrismaModel> = FieldRefInputType<$PrismaModel, 'Json'>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Reference to a field of type 'QueryMode'
|
|
||||||
*/
|
|
||||||
export type EnumQueryModeFieldRefInput<$PrismaModel> = FieldRefInputType<$PrismaModel, 'QueryMode'>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Reference to a field of type 'Boolean'
|
|
||||||
*/
|
|
||||||
export type BooleanFieldRefInput<$PrismaModel> = FieldRefInputType<$PrismaModel, 'Boolean'>
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Batch Payload for updateMany & deleteMany & createMany
|
* Batch Payload for updateMany & deleteMany & createMany
|
||||||
*/
|
*/
|
||||||
@@ -2956,6 +3309,9 @@ export type PrismaClientOptions = ({
|
|||||||
export type GlobalOmitConfig = {
|
export type GlobalOmitConfig = {
|
||||||
user?: Prisma.UserOmit
|
user?: Prisma.UserOmit
|
||||||
article?: Prisma.ArticleOmit
|
article?: Prisma.ArticleOmit
|
||||||
|
strategy?: Prisma.StrategyOmit
|
||||||
|
indicator?: Prisma.IndicatorOmit
|
||||||
|
indicatorPoint?: Prisma.IndicatorPointOmit
|
||||||
news?: Prisma.NewsOmit
|
news?: Prisma.NewsOmit
|
||||||
alert?: Prisma.AlertOmit
|
alert?: Prisma.AlertOmit
|
||||||
serverNode?: Prisma.ServerNodeOmit
|
serverNode?: Prisma.ServerNodeOmit
|
||||||
@@ -2963,6 +3319,7 @@ export type GlobalOmitConfig = {
|
|||||||
serviceCheck?: Prisma.ServiceCheckOmit
|
serviceCheck?: Prisma.ServiceCheckOmit
|
||||||
econ_SowInventory?: Prisma.Econ_SowInventoryOmit
|
econ_SowInventory?: Prisma.Econ_SowInventoryOmit
|
||||||
scraperCache?: Prisma.ScraperCacheOmit
|
scraperCache?: Prisma.ScraperCacheOmit
|
||||||
|
oilPriceHistory?: Prisma.OilPriceHistoryOmit
|
||||||
mihomeAccount?: Prisma.MihomeAccountOmit
|
mihomeAccount?: Prisma.MihomeAccountOmit
|
||||||
mihomeHome?: Prisma.MihomeHomeOmit
|
mihomeHome?: Prisma.MihomeHomeOmit
|
||||||
mihomeDevice?: Prisma.MihomeDeviceOmit
|
mihomeDevice?: Prisma.MihomeDeviceOmit
|
||||||
|
|||||||
@@ -53,6 +53,9 @@ export const AnyNull = runtime.AnyNull
|
|||||||
export const ModelName = {
|
export const ModelName = {
|
||||||
User: 'User',
|
User: 'User',
|
||||||
Article: 'Article',
|
Article: 'Article',
|
||||||
|
Strategy: 'Strategy',
|
||||||
|
Indicator: 'Indicator',
|
||||||
|
IndicatorPoint: 'IndicatorPoint',
|
||||||
News: 'News',
|
News: 'News',
|
||||||
Alert: 'Alert',
|
Alert: 'Alert',
|
||||||
ServerNode: 'ServerNode',
|
ServerNode: 'ServerNode',
|
||||||
@@ -60,6 +63,7 @@ export const ModelName = {
|
|||||||
ServiceCheck: 'ServiceCheck',
|
ServiceCheck: 'ServiceCheck',
|
||||||
Econ_SowInventory: 'Econ_SowInventory',
|
Econ_SowInventory: 'Econ_SowInventory',
|
||||||
ScraperCache: 'ScraperCache',
|
ScraperCache: 'ScraperCache',
|
||||||
|
OilPriceHistory: 'OilPriceHistory',
|
||||||
MihomeAccount: 'MihomeAccount',
|
MihomeAccount: 'MihomeAccount',
|
||||||
MihomeHome: 'MihomeHome',
|
MihomeHome: 'MihomeHome',
|
||||||
MihomeDevice: 'MihomeDevice',
|
MihomeDevice: 'MihomeDevice',
|
||||||
@@ -119,6 +123,46 @@ export const ArticleScalarFieldEnum = {
|
|||||||
export type ArticleScalarFieldEnum = (typeof ArticleScalarFieldEnum)[keyof typeof ArticleScalarFieldEnum]
|
export type ArticleScalarFieldEnum = (typeof ArticleScalarFieldEnum)[keyof typeof ArticleScalarFieldEnum]
|
||||||
|
|
||||||
|
|
||||||
|
export const StrategyScalarFieldEnum = {
|
||||||
|
id: 'id',
|
||||||
|
name: 'name',
|
||||||
|
description: 'description',
|
||||||
|
data: 'data',
|
||||||
|
createdAt: 'createdAt',
|
||||||
|
updatedAt: 'updatedAt'
|
||||||
|
} as const
|
||||||
|
|
||||||
|
export type StrategyScalarFieldEnum = (typeof StrategyScalarFieldEnum)[keyof typeof StrategyScalarFieldEnum]
|
||||||
|
|
||||||
|
|
||||||
|
export const IndicatorScalarFieldEnum = {
|
||||||
|
id: 'id',
|
||||||
|
name: 'name',
|
||||||
|
groupName: 'groupName',
|
||||||
|
title: 'title',
|
||||||
|
unit: 'unit',
|
||||||
|
source: 'source',
|
||||||
|
frequency: 'frequency',
|
||||||
|
hidden: 'hidden',
|
||||||
|
createdAt: 'createdAt',
|
||||||
|
updatedAt: 'updatedAt'
|
||||||
|
} as const
|
||||||
|
|
||||||
|
export type IndicatorScalarFieldEnum = (typeof IndicatorScalarFieldEnum)[keyof typeof IndicatorScalarFieldEnum]
|
||||||
|
|
||||||
|
|
||||||
|
export const IndicatorPointScalarFieldEnum = {
|
||||||
|
id: 'id',
|
||||||
|
indicatorId: 'indicatorId',
|
||||||
|
period: 'period',
|
||||||
|
value: 'value',
|
||||||
|
createdAt: 'createdAt',
|
||||||
|
updatedAt: 'updatedAt'
|
||||||
|
} as const
|
||||||
|
|
||||||
|
export type IndicatorPointScalarFieldEnum = (typeof IndicatorPointScalarFieldEnum)[keyof typeof IndicatorPointScalarFieldEnum]
|
||||||
|
|
||||||
|
|
||||||
export const NewsScalarFieldEnum = {
|
export const NewsScalarFieldEnum = {
|
||||||
id: 'id',
|
id: 'id',
|
||||||
title: 'title',
|
title: 'title',
|
||||||
@@ -238,6 +282,19 @@ export const ScraperCacheScalarFieldEnum = {
|
|||||||
export type ScraperCacheScalarFieldEnum = (typeof ScraperCacheScalarFieldEnum)[keyof typeof ScraperCacheScalarFieldEnum]
|
export type ScraperCacheScalarFieldEnum = (typeof ScraperCacheScalarFieldEnum)[keyof typeof ScraperCacheScalarFieldEnum]
|
||||||
|
|
||||||
|
|
||||||
|
export const OilPriceHistoryScalarFieldEnum = {
|
||||||
|
id: 'id',
|
||||||
|
date: 'date',
|
||||||
|
province: 'province',
|
||||||
|
fuel: 'fuel',
|
||||||
|
price: 'price',
|
||||||
|
source: 'source',
|
||||||
|
createdAt: 'createdAt'
|
||||||
|
} as const
|
||||||
|
|
||||||
|
export type OilPriceHistoryScalarFieldEnum = (typeof OilPriceHistoryScalarFieldEnum)[keyof typeof OilPriceHistoryScalarFieldEnum]
|
||||||
|
|
||||||
|
|
||||||
export const MihomeAccountScalarFieldEnum = {
|
export const MihomeAccountScalarFieldEnum = {
|
||||||
id: 'id',
|
id: 'id',
|
||||||
key: 'key',
|
key: 'key',
|
||||||
@@ -500,6 +557,13 @@ export const SortOrder = {
|
|||||||
export type SortOrder = (typeof SortOrder)[keyof typeof SortOrder]
|
export type SortOrder = (typeof SortOrder)[keyof typeof SortOrder]
|
||||||
|
|
||||||
|
|
||||||
|
export const JsonNullValueInput = {
|
||||||
|
JsonNull: JsonNull
|
||||||
|
} as const
|
||||||
|
|
||||||
|
export type JsonNullValueInput = (typeof JsonNullValueInput)[keyof typeof JsonNullValueInput]
|
||||||
|
|
||||||
|
|
||||||
export const NullableJsonNullValueInput = {
|
export const NullableJsonNullValueInput = {
|
||||||
DbNull: DbNull,
|
DbNull: DbNull,
|
||||||
JsonNull: JsonNull
|
JsonNull: JsonNull
|
||||||
@@ -508,13 +572,6 @@ export const NullableJsonNullValueInput = {
|
|||||||
export type NullableJsonNullValueInput = (typeof NullableJsonNullValueInput)[keyof typeof NullableJsonNullValueInput]
|
export type NullableJsonNullValueInput = (typeof NullableJsonNullValueInput)[keyof typeof NullableJsonNullValueInput]
|
||||||
|
|
||||||
|
|
||||||
export const JsonNullValueInput = {
|
|
||||||
JsonNull: JsonNull
|
|
||||||
} as const
|
|
||||||
|
|
||||||
export type JsonNullValueInput = (typeof JsonNullValueInput)[keyof typeof JsonNullValueInput]
|
|
||||||
|
|
||||||
|
|
||||||
export const QueryMode = {
|
export const QueryMode = {
|
||||||
default: 'default',
|
default: 'default',
|
||||||
insensitive: 'insensitive'
|
insensitive: 'insensitive'
|
||||||
@@ -523,14 +580,6 @@ export const QueryMode = {
|
|||||||
export type QueryMode = (typeof QueryMode)[keyof typeof QueryMode]
|
export type QueryMode = (typeof QueryMode)[keyof typeof QueryMode]
|
||||||
|
|
||||||
|
|
||||||
export const NullsOrder = {
|
|
||||||
first: 'first',
|
|
||||||
last: 'last'
|
|
||||||
} as const
|
|
||||||
|
|
||||||
export type NullsOrder = (typeof NullsOrder)[keyof typeof NullsOrder]
|
|
||||||
|
|
||||||
|
|
||||||
export const JsonNullValueFilter = {
|
export const JsonNullValueFilter = {
|
||||||
DbNull: DbNull,
|
DbNull: DbNull,
|
||||||
JsonNull: JsonNull,
|
JsonNull: JsonNull,
|
||||||
@@ -539,3 +588,11 @@ export const JsonNullValueFilter = {
|
|||||||
|
|
||||||
export type JsonNullValueFilter = (typeof JsonNullValueFilter)[keyof typeof JsonNullValueFilter]
|
export type JsonNullValueFilter = (typeof JsonNullValueFilter)[keyof typeof JsonNullValueFilter]
|
||||||
|
|
||||||
|
|
||||||
|
export const NullsOrder = {
|
||||||
|
first: 'first',
|
||||||
|
last: 'last'
|
||||||
|
} as const
|
||||||
|
|
||||||
|
export type NullsOrder = (typeof NullsOrder)[keyof typeof NullsOrder]
|
||||||
|
|
||||||
|
|||||||
@@ -10,6 +10,9 @@
|
|||||||
*/
|
*/
|
||||||
export type * from './models/User.ts'
|
export type * from './models/User.ts'
|
||||||
export type * from './models/Article.ts'
|
export type * from './models/Article.ts'
|
||||||
|
export type * from './models/Strategy.ts'
|
||||||
|
export type * from './models/Indicator.ts'
|
||||||
|
export type * from './models/IndicatorPoint.ts'
|
||||||
export type * from './models/News.ts'
|
export type * from './models/News.ts'
|
||||||
export type * from './models/Alert.ts'
|
export type * from './models/Alert.ts'
|
||||||
export type * from './models/ServerNode.ts'
|
export type * from './models/ServerNode.ts'
|
||||||
@@ -17,6 +20,7 @@ export type * from './models/ServerNodeHistory.ts'
|
|||||||
export type * from './models/ServiceCheck.ts'
|
export type * from './models/ServiceCheck.ts'
|
||||||
export type * from './models/Econ_SowInventory.ts'
|
export type * from './models/Econ_SowInventory.ts'
|
||||||
export type * from './models/ScraperCache.ts'
|
export type * from './models/ScraperCache.ts'
|
||||||
|
export type * from './models/OilPriceHistory.ts'
|
||||||
export type * from './models/MihomeAccount.ts'
|
export type * from './models/MihomeAccount.ts'
|
||||||
export type * from './models/MihomeHome.ts'
|
export type * from './models/MihomeHome.ts'
|
||||||
export type * from './models/MihomeDevice.ts'
|
export type * from './models/MihomeDevice.ts'
|
||||||
|
|||||||
@@ -480,14 +480,6 @@ export type AlertSumOrderByAggregateInput = {
|
|||||||
diffRatio?: Prisma.SortOrder
|
diffRatio?: Prisma.SortOrder
|
||||||
}
|
}
|
||||||
|
|
||||||
export type FloatFieldUpdateOperationsInput = {
|
|
||||||
set?: number
|
|
||||||
increment?: number
|
|
||||||
decrement?: number
|
|
||||||
multiply?: number
|
|
||||||
divide?: number
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
export type AlertSelect<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetSelect<{
|
export type AlertSelect<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetSelect<{
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -737,10 +737,6 @@ export type NullableDateTimeFieldUpdateOperationsInput = {
|
|||||||
set?: Date | string | null
|
set?: Date | string | null
|
||||||
}
|
}
|
||||||
|
|
||||||
export type BoolFieldUpdateOperationsInput = {
|
|
||||||
set?: boolean
|
|
||||||
}
|
|
||||||
|
|
||||||
export type MihomeDeviceCreateNestedOneWithoutSamplesInput = {
|
export type MihomeDeviceCreateNestedOneWithoutSamplesInput = {
|
||||||
create?: Prisma.XOR<Prisma.MihomeDeviceCreateWithoutSamplesInput, Prisma.MihomeDeviceUncheckedCreateWithoutSamplesInput>
|
create?: Prisma.XOR<Prisma.MihomeDeviceCreateWithoutSamplesInput, Prisma.MihomeDeviceUncheckedCreateWithoutSamplesInput>
|
||||||
connectOrCreate?: Prisma.MihomeDeviceCreateOrConnectWithoutSamplesInput
|
connectOrCreate?: Prisma.MihomeDeviceCreateOrConnectWithoutSamplesInput
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
+1
-1
@@ -5,7 +5,7 @@
|
|||||||
<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
|
<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, viewport-fit=cover" />
|
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, viewport-fit=cover" />
|
||||||
<meta name="theme-color" content="#1f2937" />
|
<meta name="theme-color" content="#1f2937" />
|
||||||
<title>iBoard - 个人看板</title>
|
<title>iBoard - 经济数据与策略</title>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<div id="root"></div>
|
<div id="root"></div>
|
||||||
|
|||||||
+2
-1
@@ -11,13 +11,14 @@
|
|||||||
"build:shell": "vite build --mode shell",
|
"build:shell": "vite build --mode shell",
|
||||||
"build:win": "node scripts/build-windows.mjs",
|
"build:win": "node scripts/build-windows.mjs",
|
||||||
"build:win:debug": "node scripts/build-windows.mjs --debug",
|
"build:win:debug": "node scripts/build-windows.mjs --debug",
|
||||||
"win:dev": "node scripts/dev-windows-live.mjs",
|
|
||||||
"build:ota": "node scripts/build-ota.mjs",
|
"build:ota": "node scripts/build-ota.mjs",
|
||||||
"preview": "vite preview",
|
"preview": "vite preview",
|
||||||
"start": "node --experimental-strip-types --no-warnings server/index.js",
|
"start": "node --experimental-strip-types --no-warnings server/index.js",
|
||||||
"db:migrate": "prisma migrate deploy",
|
"db:migrate": "prisma migrate deploy",
|
||||||
"db:seed": "node scripts/seed.cjs",
|
"db:seed": "node scripts/seed.cjs",
|
||||||
"registry:sync": "node scripts/sync-registry.mjs",
|
"registry:sync": "node scripts/sync-registry.mjs",
|
||||||
|
"data:refresh": "node --no-warnings scripts/refresh-indicators.cjs",
|
||||||
|
"data:discover": "node --no-warnings scripts/discover-mcp-tools.cjs",
|
||||||
"icons": "node scripts/generate-icons.mjs",
|
"icons": "node scripts/generate-icons.mjs",
|
||||||
"tauri:dev": "tauri dev",
|
"tauri:dev": "tauri dev",
|
||||||
"tauri:build": "tauri build",
|
"tauri:build": "tauri build",
|
||||||
|
|||||||
@@ -1,6 +0,0 @@
|
|||||||
-- V0.2.2: 宏观「经济数据 / 策略研究」迁至外接 ifinance 模块, 油模块下线
|
|
||||||
-- 彻底移除本地指标/策略/油价数据表 (数据源改由 tortoise/ifinance 承担)
|
|
||||||
DROP TABLE IF EXISTS "IndicatorPoint" CASCADE;
|
|
||||||
DROP TABLE IF EXISTS "Indicator" CASCADE;
|
|
||||||
DROP TABLE IF EXISTS "Strategy" CASCADE;
|
|
||||||
DROP TABLE IF EXISTS "OilPriceHistory" CASCADE;
|
|
||||||
+55
-1
@@ -44,6 +44,41 @@ model Article {
|
|||||||
updatedAt DateTime @updatedAt
|
updatedAt DateTime @updatedAt
|
||||||
}
|
}
|
||||||
|
|
||||||
|
model Strategy {
|
||||||
|
id Int @id @default(autoincrement())
|
||||||
|
name String
|
||||||
|
description String
|
||||||
|
data Json
|
||||||
|
createdAt DateTime @default(now())
|
||||||
|
updatedAt DateTime @updatedAt
|
||||||
|
}
|
||||||
|
|
||||||
|
model Indicator {
|
||||||
|
id Int @id @default(autoincrement())
|
||||||
|
name String @unique
|
||||||
|
groupName String
|
||||||
|
title String @default("")
|
||||||
|
unit String @default("")
|
||||||
|
source String @default("")
|
||||||
|
frequency String @default("month") // year | quarter | month | day
|
||||||
|
hidden Boolean @default(false) // true = 数据/脚本保留, 但不在前端展示
|
||||||
|
points IndicatorPoint[]
|
||||||
|
createdAt DateTime @default(now())
|
||||||
|
updatedAt DateTime @updatedAt
|
||||||
|
}
|
||||||
|
|
||||||
|
model IndicatorPoint {
|
||||||
|
id Int @id @default(autoincrement())
|
||||||
|
indicatorId Int
|
||||||
|
indicator Indicator @relation(fields: [indicatorId], references: [id], onDelete: Cascade)
|
||||||
|
period String // "2024" | "2024-Q1" | "2024-01" | "2024-01-15"
|
||||||
|
value Float
|
||||||
|
createdAt DateTime @default(now())
|
||||||
|
updatedAt DateTime @updatedAt
|
||||||
|
|
||||||
|
@@unique([indicatorId, period])
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// 新闻: 每天 3 点由 mx_finance_search_news 拉取, 按影响大小排序, 累加多日供首页无限滚动
|
// 新闻: 每天 3 点由 mx_finance_search_news 拉取, 按影响大小排序, 累加多日供首页无限滚动
|
||||||
model News {
|
model News {
|
||||||
@@ -61,7 +96,7 @@ model News {
|
|||||||
@@index([publishedAt])
|
@@index([publishedAt])
|
||||||
}
|
}
|
||||||
|
|
||||||
// 报警: 定时任务失败等异常写入 (展示于「监控」报警 tab)
|
// 报警: refresh 写库时比对同 (indicatorName, period) 的跨源数据, 差异超阈值记录
|
||||||
model Alert {
|
model Alert {
|
||||||
id Int @id @default(autoincrement())
|
id Int @id @default(autoincrement())
|
||||||
indicatorName String
|
indicatorName String
|
||||||
@@ -159,6 +194,25 @@ model ScraperCache {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
// 浙江省油价历史 (apizero price 接口每日抓取)
|
||||||
|
// 每天 04:00 cron 触发: 检查 schedule 里待定且 <= 昨天的调价日, 抓 price?province=浙江 存本表
|
||||||
|
// unique (date, province, fuel) 防重复
|
||||||
|
model OilPriceHistory {
|
||||||
|
id Int @id @default(autoincrement())
|
||||||
|
date DateTime // 调价日次日 (即数据实际抓取日)
|
||||||
|
province String // '浙江'
|
||||||
|
fuel String // '92' | '95' | '0'
|
||||||
|
price Float // 油价 (元/升, 4 位小数足够)
|
||||||
|
source String @default("apizero")
|
||||||
|
createdAt DateTime @default(now())
|
||||||
|
|
||||||
|
@@unique([date, province, fuel])
|
||||||
|
@@index([province, fuel, date])
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// ==================== 环境监控：米家 ====================
|
// ==================== 环境监控：米家 ====================
|
||||||
|
|
||||||
// 米家授权状态 (DiskCache 存凭证, 本表只存状态/错误供前端展示)
|
// 米家授权状态 (DiskCache 存凭证, 本表只存状态/错误供前端展示)
|
||||||
|
|||||||
@@ -1,347 +0,0 @@
|
|||||||
{
|
|
||||||
"schema": 2,
|
|
||||||
"name": "ifinance",
|
|
||||||
"version": "0.2.0",
|
|
||||||
"buildId": "20261030.1442",
|
|
||||||
"buildHash": "76353f01070db7938dd7225ea9719c004052f0f5c740d4bcddb13ca880328fe0",
|
|
||||||
"generatedAt": "2026-10-30T14:42:19+08:00",
|
|
||||||
"generator": "tortoise/tools/ifinance/build.py",
|
|
||||||
"source": {
|
|
||||||
"project": "tortoise",
|
|
||||||
"upstream": "iboard-prod-pg-1"
|
|
||||||
},
|
|
||||||
"cache": {
|
|
||||||
"mode": "hash",
|
|
||||||
"digest": "sha256",
|
|
||||||
"manifest": "files",
|
|
||||||
"key": "path",
|
|
||||||
"revalidate": "info.json"
|
|
||||||
},
|
|
||||||
"categories": [
|
|
||||||
{
|
|
||||||
"id": "econ",
|
|
||||||
"name": "经济数据",
|
|
||||||
"count": 8,
|
|
||||||
"items": [
|
|
||||||
{
|
|
||||||
"id": "china-bond-10y",
|
|
||||||
"kind": "indicator",
|
|
||||||
"title": "中国国债 10 年期收益率",
|
|
||||||
"group": "china-macro",
|
|
||||||
"unit": "%",
|
|
||||||
"frequency": "month",
|
|
||||||
"subtitle": "1.71% · 2026-08",
|
|
||||||
"points": 32,
|
|
||||||
"html": "public/econ/china-bond-10y.html",
|
|
||||||
"json": "public/econ/china-bond-10y.json",
|
|
||||||
"hash": "3b5fef761b59afb6869fa2a73fe117fb69dcbefea3d39d7cd1859004162a52e7",
|
|
||||||
"bytes": 5630,
|
|
||||||
"jsonHash": "72b493417070df9c772d6afc8604b6db99e5889d36c59d45bcd92f2dafa261ca"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "china-bond-1y",
|
|
||||||
"kind": "indicator",
|
|
||||||
"title": "中国国债 1 年期收益率",
|
|
||||||
"group": "china-macro",
|
|
||||||
"unit": "%",
|
|
||||||
"frequency": "month",
|
|
||||||
"subtitle": "1.17% · 2026-08",
|
|
||||||
"points": 32,
|
|
||||||
"html": "public/econ/china-bond-1y.html",
|
|
||||||
"json": "public/econ/china-bond-1y.json",
|
|
||||||
"hash": "7639c558bba083cc9a25f8a156419138937d8712612dee34ed2b89890a4d9fec",
|
|
||||||
"bytes": 5628,
|
|
||||||
"jsonHash": "1eb0575b5eac06c78104974b75b8f106cb92bc6d87113652f7f457ee5c988fc2"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "china-cpi",
|
|
||||||
"kind": "indicator",
|
|
||||||
"title": "中国 CPI",
|
|
||||||
"group": "china-macro",
|
|
||||||
"unit": "%",
|
|
||||||
"frequency": "year",
|
|
||||||
"subtitle": "0.06% · 2025",
|
|
||||||
"points": 11,
|
|
||||||
"html": "public/econ/china-cpi.html",
|
|
||||||
"json": "public/econ/china-cpi.json",
|
|
||||||
"hash": "9ff611705ff82a56acbbf96e337e0a79bfe2f2a22fc8c5b852928af85d7b3de2",
|
|
||||||
"bytes": 4236,
|
|
||||||
"jsonHash": "6007ad45542047c0e343c0cc590d9fcde63d9c820ff99f0a93f61a8560209ebf"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "china-cpi-yoy",
|
|
||||||
"kind": "indicator",
|
|
||||||
"title": "中国 CPI 同比",
|
|
||||||
"group": "china-macro",
|
|
||||||
"unit": "%",
|
|
||||||
"frequency": "month",
|
|
||||||
"subtitle": "1% · 2026-06",
|
|
||||||
"points": 36,
|
|
||||||
"html": "public/econ/china-cpi-yoy.html",
|
|
||||||
"json": "public/econ/china-cpi-yoy.json",
|
|
||||||
"hash": "cb51b54b2f6bf172aa3e87ac368ce67c7398dbc51e2f033b0eac0d367cb62a0e",
|
|
||||||
"bytes": 5627,
|
|
||||||
"jsonHash": "16735f992a47c448fe1b175abd15174c4c6a19df4e8f1084580f9d1882009d44"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "china-lpr-1y",
|
|
||||||
"kind": "indicator",
|
|
||||||
"title": "中国 LPR 1 年期",
|
|
||||||
"group": "china-macro",
|
|
||||||
"unit": "%",
|
|
||||||
"frequency": "month",
|
|
||||||
"subtitle": "3% · 2026-07",
|
|
||||||
"points": 31,
|
|
||||||
"html": "public/econ/china-lpr-1y.html",
|
|
||||||
"json": "public/econ/china-lpr-1y.json",
|
|
||||||
"hash": "5f7254dc86f98bf32cfd06d37d9b329bcff87513057583bdf669b8691a3f4bcf",
|
|
||||||
"bytes": 5327,
|
|
||||||
"jsonHash": "7300679627550b75fa2fae62888b79e6f12a8386d2d3f2dec9bd2925387d8aa7"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "china-lpr-5y",
|
|
||||||
"kind": "indicator",
|
|
||||||
"title": "中国 LPR 5 年期",
|
|
||||||
"group": "china-macro",
|
|
||||||
"unit": "%",
|
|
||||||
"frequency": "month",
|
|
||||||
"subtitle": "3.5% · 2026-07",
|
|
||||||
"points": 31,
|
|
||||||
"html": "public/econ/china-lpr-5y.html",
|
|
||||||
"json": "public/econ/china-lpr-5y.json",
|
|
||||||
"hash": "e32519d06f0ca7a601e933ce704d44d59a0ab3b2fb046a6754ad4ef3ed71b742",
|
|
||||||
"bytes": 5498,
|
|
||||||
"jsonHash": "99d4b4d900e5a99f60b294eb9fca87145ad20b44995ef2178061cc832c2599e8"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "us-bond-1y",
|
|
||||||
"kind": "indicator",
|
|
||||||
"title": "美国国债1年",
|
|
||||||
"group": "us-bond",
|
|
||||||
"unit": "%",
|
|
||||||
"frequency": "month",
|
|
||||||
"subtitle": "4.45% · 2024-06",
|
|
||||||
"points": 6,
|
|
||||||
"html": "public/econ/us-bond-1y.html",
|
|
||||||
"json": "public/econ/us-bond-1y.json",
|
|
||||||
"hash": "c972cd658b5db614ec94135dc8f7816366a8ed526360514cfb53c64f9df09dfa",
|
|
||||||
"bytes": 3736,
|
|
||||||
"jsonHash": "82a7af636dd597bde08bc9cb7e22ab4e9de6754ffc30614d78ba1a96e6715a4a"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "usa-cpi",
|
|
||||||
"kind": "indicator",
|
|
||||||
"title": "美国 CPI",
|
|
||||||
"group": "usa-macro",
|
|
||||||
"unit": "%",
|
|
||||||
"frequency": "year",
|
|
||||||
"subtitle": "2.95% · 2024",
|
|
||||||
"points": 10,
|
|
||||||
"html": "public/econ/usa-cpi.html",
|
|
||||||
"json": "public/econ/usa-cpi.json",
|
|
||||||
"hash": "f4aec9f8c2aee8835166e71a7799c87c8f0288f0fc9760b85620bc98c7bd9721",
|
|
||||||
"bytes": 4187,
|
|
||||||
"jsonHash": "0273f88e376d166528e60338beff1e0878e98336c26c759f36daa078acb92d87"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "strategy",
|
|
||||||
"name": "策略研究",
|
|
||||||
"count": 5,
|
|
||||||
"items": [
|
|
||||||
{
|
|
||||||
"id": "china-debt-gdp",
|
|
||||||
"kind": "strategy",
|
|
||||||
"title": "中国政府债务/GDP分析",
|
|
||||||
"subtitle": "债务/GDP 75.7% · 2024",
|
|
||||||
"points": 6,
|
|
||||||
"html": "public/strategy/china-debt-gdp.html",
|
|
||||||
"json": "public/strategy/china-debt-gdp.json",
|
|
||||||
"hash": "acffe06524dbfee764411b8690d02393bbaa1d7ad2275a58ac132fe256ff69c8",
|
|
||||||
"bytes": 7331,
|
|
||||||
"jsonHash": "6b2c3da5e4751c0c13dc2cc10d706c08ee6400eca8a9e6636ea0a25dca374590"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "us-debt-gdp",
|
|
||||||
"kind": "strategy",
|
|
||||||
"title": "美国政府债务/GDP分析",
|
|
||||||
"subtitle": "债务/GDP 123.9% · 2024",
|
|
||||||
"points": 6,
|
|
||||||
"html": "public/strategy/us-debt-gdp.html",
|
|
||||||
"json": "public/strategy/us-debt-gdp.json",
|
|
||||||
"hash": "cfb9ec15e457633e6d13689ab9802d646201a8fba9be3fb69710370a40ace365",
|
|
||||||
"bytes": 7477,
|
|
||||||
"jsonHash": "69d6d977057faac7ab10a5f43e4f5feb5e47539d6dc77e7fd93b533653abc50a"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "a500_chart",
|
|
||||||
"kind": "dashboard",
|
|
||||||
"title": "中证 A500 综合看板",
|
|
||||||
"subtitle": "价格 / PE-PB-股息率 四面板 + 持仓 + ETF",
|
|
||||||
"html": "public/dashboards/a500_chart.html",
|
|
||||||
"hash": "43d3a8849a6a83137f07d51602972b3f51226aa4ffaf765d4423b82298dd07c2",
|
|
||||||
"bytes": 1508412
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "cni_fcf_chart",
|
|
||||||
"kind": "dashboard",
|
|
||||||
"title": "国证自由现金流看板",
|
|
||||||
"subtitle": "980092 · 可与中证自由现金流叠加对比",
|
|
||||||
"html": "public/dashboards/cni_fcf_chart.html",
|
|
||||||
"hash": "9c239f41f525959a41594578efa041dfca5c76f652b0777fe79caae023643ed3",
|
|
||||||
"bytes": 1392856
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "csi_fcf_chart",
|
|
||||||
"kind": "dashboard",
|
|
||||||
"title": "中证自由现金流看板",
|
|
||||||
"subtitle": "932365 · 可与国证自由现金流叠加对比",
|
|
||||||
"html": "public/dashboards/csi_fcf_chart.html",
|
|
||||||
"hash": "4b0b6e24b01550ae7e1ab2d85237ff6cda9349d004ec35df73511d2a32bd88ec",
|
|
||||||
"bytes": 1344984
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"files": [
|
|
||||||
{
|
|
||||||
"path": "public/dashboards/a500_chart.html",
|
|
||||||
"hash": "43d3a8849a6a83137f07d51602972b3f51226aa4ffaf765d4423b82298dd07c2",
|
|
||||||
"bytes": 1508412,
|
|
||||||
"type": "text/html"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"path": "public/dashboards/cni_fcf_chart.html",
|
|
||||||
"hash": "9c239f41f525959a41594578efa041dfca5c76f652b0777fe79caae023643ed3",
|
|
||||||
"bytes": 1392856,
|
|
||||||
"type": "text/html"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"path": "public/dashboards/csi_fcf_chart.html",
|
|
||||||
"hash": "4b0b6e24b01550ae7e1ab2d85237ff6cda9349d004ec35df73511d2a32bd88ec",
|
|
||||||
"bytes": 1344984,
|
|
||||||
"type": "text/html"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"path": "public/econ/china-bond-10y.html",
|
|
||||||
"hash": "3b5fef761b59afb6869fa2a73fe117fb69dcbefea3d39d7cd1859004162a52e7",
|
|
||||||
"bytes": 5630,
|
|
||||||
"type": "text/html"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"path": "public/econ/china-bond-10y.json",
|
|
||||||
"hash": "72b493417070df9c772d6afc8604b6db99e5889d36c59d45bcd92f2dafa261ca",
|
|
||||||
"bytes": 1803,
|
|
||||||
"type": "application/json"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"path": "public/econ/china-bond-1y.html",
|
|
||||||
"hash": "7639c558bba083cc9a25f8a156419138937d8712612dee34ed2b89890a4d9fec",
|
|
||||||
"bytes": 5628,
|
|
||||||
"type": "text/html"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"path": "public/econ/china-bond-1y.json",
|
|
||||||
"hash": "1eb0575b5eac06c78104974b75b8f106cb92bc6d87113652f7f457ee5c988fc2",
|
|
||||||
"bytes": 1806,
|
|
||||||
"type": "application/json"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"path": "public/econ/china-cpi-yoy.html",
|
|
||||||
"hash": "cb51b54b2f6bf172aa3e87ac368ce67c7398dbc51e2f033b0eac0d367cb62a0e",
|
|
||||||
"bytes": 5627,
|
|
||||||
"type": "text/html"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"path": "public/econ/china-cpi-yoy.json",
|
|
||||||
"hash": "16735f992a47c448fe1b175abd15174c4c6a19df4e8f1084580f9d1882009d44",
|
|
||||||
"bytes": 1932,
|
|
||||||
"type": "application/json"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"path": "public/econ/china-cpi.html",
|
|
||||||
"hash": "9ff611705ff82a56acbbf96e337e0a79bfe2f2a22fc8c5b852928af85d7b3de2",
|
|
||||||
"bytes": 4236,
|
|
||||||
"type": "text/html"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"path": "public/econ/china-cpi.json",
|
|
||||||
"hash": "6007ad45542047c0e343c0cc590d9fcde63d9c820ff99f0a93f61a8560209ebf",
|
|
||||||
"bytes": 667,
|
|
||||||
"type": "application/json"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"path": "public/econ/china-lpr-1y.html",
|
|
||||||
"hash": "5f7254dc86f98bf32cfd06d37d9b329bcff87513057583bdf669b8691a3f4bcf",
|
|
||||||
"bytes": 5327,
|
|
||||||
"type": "text/html"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"path": "public/econ/china-lpr-1y.json",
|
|
||||||
"hash": "7300679627550b75fa2fae62888b79e6f12a8386d2d3f2dec9bd2925387d8aa7",
|
|
||||||
"bytes": 1664,
|
|
||||||
"type": "application/json"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"path": "public/econ/china-lpr-5y.html",
|
|
||||||
"hash": "e32519d06f0ca7a601e933ce704d44d59a0ab3b2fb046a6754ad4ef3ed71b742",
|
|
||||||
"bytes": 5498,
|
|
||||||
"type": "text/html"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"path": "public/econ/china-lpr-5y.json",
|
|
||||||
"hash": "99d4b4d900e5a99f60b294eb9fca87145ad20b44995ef2178061cc832c2599e8",
|
|
||||||
"bytes": 1693,
|
|
||||||
"type": "application/json"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"path": "public/econ/us-bond-1y.html",
|
|
||||||
"hash": "c972cd658b5db614ec94135dc8f7816366a8ed526360514cfb53c64f9df09dfa",
|
|
||||||
"bytes": 3736,
|
|
||||||
"type": "text/html"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"path": "public/econ/us-bond-1y.json",
|
|
||||||
"hash": "82a7af636dd597bde08bc9cb7e22ab4e9de6754ffc30614d78ba1a96e6715a4a",
|
|
||||||
"bytes": 444,
|
|
||||||
"type": "application/json"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"path": "public/econ/usa-cpi.html",
|
|
||||||
"hash": "f4aec9f8c2aee8835166e71a7799c87c8f0288f0fc9760b85620bc98c7bd9721",
|
|
||||||
"bytes": 4187,
|
|
||||||
"type": "text/html"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"path": "public/econ/usa-cpi.json",
|
|
||||||
"hash": "0273f88e376d166528e60338beff1e0878e98336c26c759f36daa078acb92d87",
|
|
||||||
"bytes": 616,
|
|
||||||
"type": "application/json"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"path": "public/strategy/china-debt-gdp.html",
|
|
||||||
"hash": "acffe06524dbfee764411b8690d02393bbaa1d7ad2275a58ac132fe256ff69c8",
|
|
||||||
"bytes": 7331,
|
|
||||||
"type": "text/html"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"path": "public/strategy/china-debt-gdp.json",
|
|
||||||
"hash": "6b2c3da5e4751c0c13dc2cc10d706c08ee6400eca8a9e6636ea0a25dca374590",
|
|
||||||
"bytes": 841,
|
|
||||||
"type": "application/json"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"path": "public/strategy/us-debt-gdp.html",
|
|
||||||
"hash": "cfb9ec15e457633e6d13689ab9802d646201a8fba9be3fb69710370a40ace365",
|
|
||||||
"bytes": 7477,
|
|
||||||
"type": "text/html"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"path": "public/strategy/us-debt-gdp.json",
|
|
||||||
"hash": "69d6d977057faac7ab10a5f43e4f5feb5e47539d6dc77e7fd93b533653abc50a",
|
|
||||||
"bytes": 843,
|
|
||||||
"type": "application/json"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,72 @@
|
|||||||
|
const fs = require('fs')
|
||||||
|
const content = `import cron from 'node-cron'
|
||||||
|
import { prisma } from './db.js'
|
||||||
|
import mysql from 'mysql2/promise'
|
||||||
|
import { fetchNewsList, persistNews } from '../scripts/fetchers/news.fetcher.js'
|
||||||
|
import { checkAfterRefresh } from './alert-engine.js'
|
||||||
|
|
||||||
|
function parseUrl(url) {
|
||||||
|
const u = new URL(url)
|
||||||
|
return { host: u.hostname, port: Number(u.port) || 3306, user: decodeURIComponent(u.username), password: decodeURIComponent(u.password), database: u.pathname.replace(/^\\//, '') }
|
||||||
|
}
|
||||||
|
|
||||||
|
async function openConn() {
|
||||||
|
return mysql.createConnection(parseUrl(process.env.DATABASE_URL))
|
||||||
|
}
|
||||||
|
|
||||||
|
// 每天凌晨 3:00 (本地时间) 拉取新闻 + 跑跨源对比
|
||||||
|
function scheduleNews() {
|
||||||
|
cron.schedule('0 3 * * *', async () => {
|
||||||
|
console.log('[cron] 3:00 触发')
|
||||||
|
try {
|
||||||
|
const list = await fetchNewsList()
|
||||||
|
const r = await persistNews(list)
|
||||||
|
console.log('[cron] 新闻入库: 新增 ' + r.inserted + ' / 跳过 ' + r.skipped)
|
||||||
|
const conn = await openConn()
|
||||||
|
try {
|
||||||
|
const a = await checkAfterRefresh(conn)
|
||||||
|
console.log('[cron] 报警检测: 新增 ' + a.inserted + ' 条 (扫描 ' + a.scanned + ')')
|
||||||
|
} finally { await conn.end() }
|
||||||
|
} catch (e) {
|
||||||
|
console.error('[cron] 任务失败:', e.message)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
console.log('[cron] 已注册: 每天 03:00 拉取新闻 + 跨源报警检测')
|
||||||
|
}
|
||||||
|
|
||||||
|
// 每 2 分钟: 拉取 komari 节点 + 服务自检
|
||||||
|
function scheduleMonitors() {
|
||||||
|
cron.schedule('*/2 * * * *', async () => {
|
||||||
|
try {
|
||||||
|
const k = require('./komari-monitor.cjs')
|
||||||
|
const r = await k.runOnce()
|
||||||
|
console.log('[cron] komari: nodes=' + r.nodes + ' snapshots=' + r.snapshots + ' history=' + r.history + ' failed=' + r.failed)
|
||||||
|
} catch (e) { console.error('[cron] komari 任务失败:', e.message) }
|
||||||
|
try {
|
||||||
|
const h = require('./health-check.cjs')
|
||||||
|
const arr = await h.runOnce()
|
||||||
|
const down = arr.filter(x => x.status !== 'up').map(x => x.name)
|
||||||
|
console.log('[cron] health: ' + arr.length + ' 项, down=' + (down.length ? down.join(',') : '无'))
|
||||||
|
} catch (e) { console.error('[cron] health 任务失败:', e.message) }
|
||||||
|
})
|
||||||
|
console.log('[cron] 已注册: 每 2 分钟 komari + 服务自检')
|
||||||
|
}
|
||||||
|
|
||||||
|
// 每小时: 清理 24h 前的 komari 历史
|
||||||
|
function scheduleMonitorCleanup() {
|
||||||
|
cron.schedule('0 * * * *', async () => {
|
||||||
|
try {
|
||||||
|
const k = require('./komari-monitor.cjs')
|
||||||
|
const n = await k.cleanupOld()
|
||||||
|
console.log('[cron] 监控历史清理: 删除 ' + n + ' 条')
|
||||||
|
} catch (e) { console.error('[cron] 监控清理失败:', e.message) }
|
||||||
|
})
|
||||||
|
console.log('[cron] 已注册: 每小时清理 24h 前监控历史')
|
||||||
|
}
|
||||||
|
|
||||||
|
scheduleNews()
|
||||||
|
scheduleMonitors()
|
||||||
|
scheduleMonitorCleanup()
|
||||||
|
`
|
||||||
|
fs.writeFileSync('server/cron.js', content, 'utf8')
|
||||||
|
console.log('OK len=' + content.length)
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
require('dotenv').config();
|
||||||
|
const mysql = require('mysql2/promise');
|
||||||
|
(async () => {
|
||||||
|
const u = new URL(process.env.DATABASE_URL);
|
||||||
|
const c = await mysql.createConnection({
|
||||||
|
host: u.hostname, port: Number(u.port),
|
||||||
|
user: decodeURIComponent(u.username),
|
||||||
|
password: decodeURIComponent(u.password),
|
||||||
|
database: u.pathname.replace(/^\//, ''),
|
||||||
|
});
|
||||||
|
// 保留 id 最小的, 删掉其余重名行
|
||||||
|
for (const t of ['Strategy', 'Indicator']) {
|
||||||
|
const [r] = await c.query('DELETE FROM ' + t + ' WHERE id NOT IN (SELECT min_id FROM (SELECT MIN(id) AS min_id FROM ' + t + ' GROUP BY name) AS keep)');
|
||||||
|
console.log('[' + t + '] 删除 ' + r.affectedRows + ' 条重复行');
|
||||||
|
}
|
||||||
|
await c.end();
|
||||||
|
})().catch(e=>{console.error(e);process.exit(1)});
|
||||||
@@ -1,70 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
# 0.2.1 生产部署 (master 分支 CI 调用; 也可在服务器手工执行)
|
|
||||||
#
|
|
||||||
# 架构: app(3001 对外) + pg(内网) + powersync(内网), 见 deploy/prod/
|
|
||||||
# 幂等: 迁移 -> publication -> 起栈; 任一环节失败则退出, 不切换流量
|
|
||||||
#
|
|
||||||
# 所需环境变量 (由 CI secrets 注入):
|
|
||||||
# PG_PASSWORD, PS_STORAGE_PASSWORD, JWT_SECRET, POWERSYNC_JWT_SECRET,
|
|
||||||
# POWERSYNC_JWT_KEY_B64, PUBLIC_URL(可选, 默认 https://iboard.honor3.com)
|
|
||||||
set -euo pipefail
|
|
||||||
|
|
||||||
ROOT="${ROOT:-/app/iboard-prod}"
|
|
||||||
COMPOSE_FILE="$ROOT/deploy/prod/docker-compose.yml"
|
|
||||||
ENV_FILE="$ROOT/deploy/prod/.env"
|
|
||||||
PROJECT="iboard-prod"
|
|
||||||
|
|
||||||
log() { echo "[deploy] $*"; }
|
|
||||||
die() { echo "[deploy][ERROR] $*" >&2; exit 1; }
|
|
||||||
|
|
||||||
for v in PG_PASSWORD PS_STORAGE_PASSWORD JWT_SECRET POWERSYNC_JWT_SECRET POWERSYNC_JWT_KEY_B64; do
|
|
||||||
[ -n "${!v:-}" ] || die "缺少环境变量 $v (请在 Gitea Actions secrets 配置)"
|
|
||||||
done
|
|
||||||
[ -f "$COMPOSE_FILE" ] || die "找不到 $COMPOSE_FILE (源码需上传到 $ROOT)"
|
|
||||||
|
|
||||||
log "写入 $ENV_FILE"
|
|
||||||
umask 077
|
|
||||||
cat > "$ENV_FILE" <<EOF
|
|
||||||
PG_PASSWORD=$PG_PASSWORD
|
|
||||||
PS_STORAGE_PASSWORD=$PS_STORAGE_PASSWORD
|
|
||||||
JWT_SECRET=$JWT_SECRET
|
|
||||||
POWERSYNC_JWT_SECRET=$POWERSYNC_JWT_SECRET
|
|
||||||
POWERSYNC_JWT_KEY_B64=$POWERSYNC_JWT_KEY_B64
|
|
||||||
PUBLIC_URL=${PUBLIC_URL:-https://iboard.honor3.com}
|
|
||||||
EOF
|
|
||||||
|
|
||||||
cd "$ROOT/deploy/prod"
|
|
||||||
mkdir -p data/pg data/cache
|
|
||||||
|
|
||||||
log "启动数据库"
|
|
||||||
docker compose --project-name "$PROJECT" --env-file "$ENV_FILE" -f "$COMPOSE_FILE" up -d pg
|
|
||||||
|
|
||||||
log "等待数据库就绪"
|
|
||||||
for i in $(seq 1 30); do
|
|
||||||
if docker compose --project-name "$PROJECT" --env-file "$ENV_FILE" -f "$COMPOSE_FILE" exec -T pg pg_isready -U iboard -d iboard >/dev/null 2>&1; then
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
sleep 2
|
|
||||||
done
|
|
||||||
|
|
||||||
log "执行数据库迁移"
|
|
||||||
docker run --rm --network "${PROJECT}_default" \
|
|
||||||
-e DATABASE_URL="postgresql://iboard:${PG_PASSWORD}@pg:5432/iboard" \
|
|
||||||
iboard:latest npx prisma migrate deploy
|
|
||||||
|
|
||||||
log "确保逻辑复制 publication 存在"
|
|
||||||
docker compose --project-name "$PROJECT" --env-file "$ENV_FILE" -f "$COMPOSE_FILE" exec -T pg \
|
|
||||||
psql -U iboard -d iboard -v ON_ERROR_STOP=1 -f /dev/stdin < sql/publication.sql
|
|
||||||
|
|
||||||
log "启动应用与同步服务"
|
|
||||||
docker compose --project-name "$PROJECT" --env-file "$ENV_FILE" -f "$COMPOSE_FILE" up -d app powersync
|
|
||||||
|
|
||||||
log "等待健康检查"
|
|
||||||
for i in $(seq 1 30); do
|
|
||||||
if curl -fsS --max-time 3 http://127.0.0.1:3001/api/health >/dev/null 2>&1; then
|
|
||||||
log "健康检查通过"
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
sleep 2
|
|
||||||
done
|
|
||||||
die "应用未通过健康检查, 请查看 docker compose logs"
|
|
||||||
@@ -1,172 +0,0 @@
|
|||||||
#!/usr/bin/env node
|
|
||||||
// Windows 外壳「本地实时预览」: 不打包, 直接把新前端挂到已安装外壳上跑
|
|
||||||
//
|
|
||||||
// 原理: 外壳用 tauri-plugin-hotswap, 启动时先看 %APPDATA%\<identifier>\hotswap\
|
|
||||||
// 是否有生效的覆盖包, 有就从该目录读前端资源, 没有才回退到 exe 内置的 dist。
|
|
||||||
// 所以只要构建 dist 并写进覆盖目录, 重启外壳即可看到改动 —— 无需 tauri build,
|
|
||||||
// 无需重打 NSIS/APK, 也不用重装。
|
|
||||||
//
|
|
||||||
// 用法:
|
|
||||||
// npm run win:dev # 构建(shell 模式) + 挂载 + 重启外壳
|
|
||||||
// npm run win:dev -- --no-build # 复用现有 dist, 只挂载+重启 (最快)
|
|
||||||
// npm run win:dev -- --no-launch # 只挂载, 不重启
|
|
||||||
// npm run win:dev -- --exe "D:\path\iBoard.exe"
|
|
||||||
// npm run win:dev -- --clear # 卸载覆盖, 外壳回到内置版本
|
|
||||||
//
|
|
||||||
// 覆盖目录里生成的东西 (全部可删):
|
|
||||||
// hotswap/seq-<时间戳>/ 本次前端 (dist 内容) + hotswap-meta.json
|
|
||||||
// hotswap/current 指向 seq-<时间戳> 的指针文件
|
|
||||||
//
|
|
||||||
// 注意: 覆盖目录是外壳的真实 OTA 落地目录, 挂载期间「我的」页会显示本地版本;
|
|
||||||
// --clear 会清掉本脚本产生的覆盖, 恢复正常 OTA 行为。
|
|
||||||
import { spawnSync } from 'node:child_process'
|
|
||||||
import fs from 'node:fs'
|
|
||||||
import os from 'node:os'
|
|
||||||
import path from 'node:path'
|
|
||||||
import { fileURLToPath } from 'node:url'
|
|
||||||
|
|
||||||
const root = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..')
|
|
||||||
const args = process.argv.slice(2)
|
|
||||||
const has = (f) => args.includes(f)
|
|
||||||
const val = (f, d) => { const i = args.indexOf(f); return i >= 0 && args[i + 1] ? args[i + 1] : d }
|
|
||||||
|
|
||||||
const CLEAR = has('--clear')
|
|
||||||
const NO_BUILD = has('--no-build')
|
|
||||||
const NO_LAUNCH = has('--no-launch')
|
|
||||||
|
|
||||||
const conf = JSON.parse(fs.readFileSync(path.join(root, 'src-tauri', 'tauri.conf.json'), 'utf8'))
|
|
||||||
const APP_ID = conf.identifier // 覆盖目录名 = 外壳 identifier
|
|
||||||
const BINARY_VERSION = conf.version // 外壳版本: min_binary_version 必须与它相等
|
|
||||||
const APP_VERSION = JSON.parse(fs.readFileSync(path.join(root, 'package.json'), 'utf8')).version
|
|
||||||
|
|
||||||
const HOTSWAP_DIR = path.join(os.homedir(), 'AppData', 'Roaming', APP_ID, 'hotswap')
|
|
||||||
|
|
||||||
function log(msg) { console.log(`[win:dev] ${msg}`) }
|
|
||||||
function die(msg) { console.error(`[win:dev] 错误: ${msg}`); process.exit(1) }
|
|
||||||
|
|
||||||
/** 找已安装的外壳 exe */
|
|
||||||
function findExe() {
|
|
||||||
const explicit = val('--exe', '')
|
|
||||||
if (explicit) return explicit
|
|
||||||
const candidates = [
|
|
||||||
'C:\\Program Files\\iboard\\iBoard.exe',
|
|
||||||
'C:\\Program Files\\iBoard\\iBoard.exe',
|
|
||||||
path.join(root, 'src-tauri', 'target', 'release', 'iBoard.exe'),
|
|
||||||
path.join(root, 'src-tauri', 'target', 'debug', 'iBoard.exe'),
|
|
||||||
]
|
|
||||||
return candidates.find((p) => fs.existsSync(p)) || ''
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 清掉覆盖目录里本脚本(或上次 OTA)留下的生效版本 */
|
|
||||||
function clearOverride() {
|
|
||||||
if (!fs.existsSync(HOTSWAP_DIR)) { log('覆盖目录不存在, 无需清理'); return }
|
|
||||||
const current = path.join(HOTSWAP_DIR, 'current')
|
|
||||||
if (fs.existsSync(current)) { fs.rmSync(current); log('已移除 current 指针') }
|
|
||||||
let n = 0
|
|
||||||
for (const e of fs.readdirSync(HOTSWAP_DIR)) {
|
|
||||||
if (/^seq-\d+$/.test(e)) { fs.rmSync(path.join(HOTSWAP_DIR, e), { recursive: true, force: true }); n++ }
|
|
||||||
}
|
|
||||||
log(`已移除 ${n} 个覆盖版本目录 -> 外壳将回退到内置前端`)
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 构建前端 (shell 模式: VITE_API_BASE 指向远端后端, 与打包口径一致) */
|
|
||||||
function buildFrontend() {
|
|
||||||
const vite = path.join(root, 'node_modules', 'vite', 'bin', 'vite.js')
|
|
||||||
if (!fs.existsSync(vite)) die('未找到 vite, 请先 npm install')
|
|
||||||
// esbuild 需要可写的临时目录; 指向仓库内, 避免系统 TEMP 权限问题
|
|
||||||
const tmp = path.join(root, '.esbuild-tmp')
|
|
||||||
fs.mkdirSync(tmp, { recursive: true })
|
|
||||||
log('构建前端 (vite build --mode shell) ...')
|
|
||||||
const r = spawnSync(process.execPath, [vite, 'build', '--mode', 'shell'], {
|
|
||||||
cwd: root,
|
|
||||||
stdio: 'inherit',
|
|
||||||
env: { ...process.env, TEMP: tmp, TMP: tmp },
|
|
||||||
})
|
|
||||||
if (r.status !== 0) die('前端构建失败')
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 把 dist 挂成生效的 hotswap 覆盖包 */
|
|
||||||
function installOverride() {
|
|
||||||
const dist = path.join(root, 'dist')
|
|
||||||
if (!fs.existsSync(path.join(dist, 'index.html'))) die('dist/index.html 不存在, 请先构建')
|
|
||||||
|
|
||||||
fs.mkdirSync(HOTSWAP_DIR, { recursive: true })
|
|
||||||
const seq = Date.now() // 单调递增; 取大值可让 OTA 检查认为"已是最新", 不会覆盖本次本地版本
|
|
||||||
const dirName = `seq-${seq}`
|
|
||||||
const dir = path.join(HOTSWAP_DIR, dirName)
|
|
||||||
|
|
||||||
fs.rmSync(dir, { recursive: true, force: true })
|
|
||||||
fs.mkdirSync(dir, { recursive: true })
|
|
||||||
fs.cpSync(dist, dir, { recursive: true })
|
|
||||||
|
|
||||||
// 元数据字段见 tauri-plugin-hotswap/src/manifest.rs
|
|
||||||
// min_binary_version 必须 == 外壳版本: 默认 DiscardOnUpgrade 策略在
|
|
||||||
// binary > min 时会丢弃缓存; 而安全线又要求 binary >= min, 故只能取等号
|
|
||||||
// confirmed 必须为 true: 默认 SingleLaunch 策略对未确认版本会在启动时立刻回滚
|
|
||||||
fs.writeFileSync(path.join(dir, 'hotswap-meta.json'), JSON.stringify({
|
|
||||||
version: `${APP_VERSION}-local`,
|
|
||||||
sequence: seq,
|
|
||||||
min_binary_version: BINARY_VERSION,
|
|
||||||
confirmed: true,
|
|
||||||
unconfirmed_launch_count: 0,
|
|
||||||
}, null, 2))
|
|
||||||
|
|
||||||
fs.writeFileSync(path.join(HOTSWAP_DIR, 'current'), dirName)
|
|
||||||
|
|
||||||
// 保留策略只留最近 2 个, 顺手清掉更早的本地版本
|
|
||||||
const olds = fs.readdirSync(HOTSWAP_DIR)
|
|
||||||
.filter((e) => /^seq-\d+$/.test(e) && e !== dirName)
|
|
||||||
.sort()
|
|
||||||
.slice(0, -1)
|
|
||||||
for (const o of olds) fs.rmSync(path.join(HOTSWAP_DIR, o), { recursive: true, force: true })
|
|
||||||
|
|
||||||
log(`已挂载覆盖包: ${dirName}`)
|
|
||||||
log(` 版本 ${APP_VERSION}-local (外壳 ${BINARY_VERSION})`)
|
|
||||||
return dirName
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 结束正在运行的外壳 (需要重启才会读取覆盖包) */
|
|
||||||
function stopRunning(exe) {
|
|
||||||
const r = spawnSync('tasklist', ['/FI', 'IMAGENAME eq iBoard.exe', '/NH'], { encoding: 'utf8' })
|
|
||||||
const out = r.stdout || ''
|
|
||||||
if (!/iBoard\.exe/i.test(out)) return false
|
|
||||||
log('检测到外壳正在运行, 结束它以便重启 ...')
|
|
||||||
spawnSync('taskkill', ['/IM', 'iBoard.exe', '/F'], { stdio: 'inherit' })
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
function launch(exe) {
|
|
||||||
if (!exe) {
|
|
||||||
log('未找到外壳 exe, 跳过启动。可用 --exe 指定路径, 或手动启动后再验证。')
|
|
||||||
return
|
|
||||||
}
|
|
||||||
log(`启动: ${exe}`)
|
|
||||||
// 用 Start-Process 让外壳脱离本进程, 脚本退出后应用继续运行
|
|
||||||
const ps = `Start-Process -FilePath '${exe.replace(/'/g, "''")}'`
|
|
||||||
const r = spawnSync('powershell.exe', ['-NoProfile', '-Command', ps], { stdio: 'inherit' })
|
|
||||||
if (r.status !== 0) log('启动命令返回非 0, 请手动启动外壳')
|
|
||||||
}
|
|
||||||
|
|
||||||
// ---------- main ----------
|
|
||||||
// --no-launch 表示"不碰外壳进程": 既不结束也不启动, 只改覆盖目录
|
|
||||||
if (CLEAR) {
|
|
||||||
if (!NO_LAUNCH) stopRunning()
|
|
||||||
clearOverride()
|
|
||||||
if (!NO_LAUNCH) launch(findExe())
|
|
||||||
else log('已清理。外壳下次启动即回到内置前端 (当前若在运行, 重启后生效)。')
|
|
||||||
process.exit(0)
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!NO_BUILD) buildFrontend()
|
|
||||||
installOverride()
|
|
||||||
|
|
||||||
const exe = findExe()
|
|
||||||
if (!NO_LAUNCH) {
|
|
||||||
stopRunning(exe)
|
|
||||||
launch(exe)
|
|
||||||
} else {
|
|
||||||
log('已挂载。外壳下次启动生效 (当前若在运行, 重启后生效)。')
|
|
||||||
}
|
|
||||||
|
|
||||||
log('完成。改完 UI 后重跑 `npm run win:dev` 即可看到新版本 (想更快可加 --no-build 复用 dist)。')
|
|
||||||
log('恢复到内置版本: `npm run win:dev -- --clear`')
|
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
/**
|
||||||
|
* 列出东方财富妙想 MCP 暴露的所有工具
|
||||||
|
* 用法: npm run data:discover
|
||||||
|
* 输出: tool 名称 + 描述 + 输入 schema
|
||||||
|
*/
|
||||||
|
require('dotenv').config()
|
||||||
|
|
||||||
|
async function main() {
|
||||||
|
if (!process.env.EM_API_KEY) {
|
||||||
|
console.error('缺少 EM_API_KEY (在 .env 配)')
|
||||||
|
process.exit(1)
|
||||||
|
}
|
||||||
|
const { listAvailableTools } = await import('./fetchers/eastmoney-mcp.fetcher.js')
|
||||||
|
console.log('[Discover] 调妙想 MCP tools/list...')
|
||||||
|
const tools = await listAvailableTools()
|
||||||
|
console.log(`[Discover] 找到 ${tools.length} 个工具\n`)
|
||||||
|
for (const t of tools) {
|
||||||
|
console.log(`── ${t.name} ${'─'.repeat(Math.max(0, 60 - t.name.length))}`)
|
||||||
|
if (t.description) console.log(` ${t.description}`)
|
||||||
|
if (t.inputSchema) {
|
||||||
|
console.log(' inputSchema:')
|
||||||
|
const s = JSON.stringify(t.inputSchema, null, 2)
|
||||||
|
s.split('\n').forEach((line) => console.log(' ' + line))
|
||||||
|
}
|
||||||
|
console.log('')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
main().catch((e) => {
|
||||||
|
console.error('[Discover] 失败:', e.message)
|
||||||
|
process.exit(1)
|
||||||
|
})
|
||||||
@@ -27,6 +27,9 @@ const TABLES = [
|
|||||||
['TaskMember', 'taskMember'],
|
['TaskMember', 'taskMember'],
|
||||||
['TaskTag', 'taskTag'],
|
['TaskTag', 'taskTag'],
|
||||||
['Article', 'article'],
|
['Article', 'article'],
|
||||||
|
['Strategy', 'strategy'],
|
||||||
|
['Indicator', 'indicator'],
|
||||||
|
['IndicatorPoint', 'indicatorPoint'],
|
||||||
['News', 'news'],
|
['News', 'news'],
|
||||||
['Alert', 'alert'],
|
['Alert', 'alert'],
|
||||||
['ServerNode', 'serverNode'],
|
['ServerNode', 'serverNode'],
|
||||||
@@ -34,6 +37,7 @@ const TABLES = [
|
|||||||
['ServiceCheck', 'serviceCheck'],
|
['ServiceCheck', 'serviceCheck'],
|
||||||
['Econ_SowInventory', 'econ_SowInventory'],
|
['Econ_SowInventory', 'econ_SowInventory'],
|
||||||
['ScraperCache', 'scraperCache'],
|
['ScraperCache', 'scraperCache'],
|
||||||
|
['OilPriceHistory', 'oilPriceHistory'],
|
||||||
['MihomeAccount', 'mihomeAccount'],
|
['MihomeAccount', 'mihomeAccount'],
|
||||||
['MihomeHome', 'mihomeHome'],
|
['MihomeHome', 'mihomeHome'],
|
||||||
['MihomeDevice', 'mihomeDevice'],
|
['MihomeDevice', 'mihomeDevice'],
|
||||||
|
|||||||
@@ -0,0 +1,79 @@
|
|||||||
|
|
||||||
|
import { spawn } from 'child_process';
|
||||||
|
|
||||||
|
async function runScraper(scraperPath, startDate, endDate) {
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
const args = [scraperPath];
|
||||||
|
if (startDate) {
|
||||||
|
args.push('--start', startDate);
|
||||||
|
}
|
||||||
|
if (endDate) {
|
||||||
|
args.push('--end', endDate);
|
||||||
|
}
|
||||||
|
|
||||||
|
const proc = spawn('bun', args, { stdio: 'inherit' });
|
||||||
|
proc.on('close', (code) => {
|
||||||
|
if (code === 0) {
|
||||||
|
resolve();
|
||||||
|
} else {
|
||||||
|
reject(new Error(`Process exited with code ${code}`));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
proc.on('error', (err) => {
|
||||||
|
reject(err);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async function fetchOneYearData() {
|
||||||
|
console.log('='.repeat(70));
|
||||||
|
console.log('📊 获取近一年数据');
|
||||||
|
console.log('='.repeat(70));
|
||||||
|
|
||||||
|
const currentDate = new Date();
|
||||||
|
const startDate = new Date(currentDate);
|
||||||
|
startDate.setFullYear(startDate.getFullYear() - 1);
|
||||||
|
|
||||||
|
const startDateStr = startDate.toISOString().split('T')[0];
|
||||||
|
const endDateStr = currentDate.toISOString().split('T')[0];
|
||||||
|
|
||||||
|
console.log(`时间范围: ${startDateStr} 至 ${endDateStr}`);
|
||||||
|
console.log('');
|
||||||
|
|
||||||
|
console.log('='.repeat(70));
|
||||||
|
console.log('💱 开始获取 USD-CNY 汇率数据...');
|
||||||
|
console.log('='.repeat(70));
|
||||||
|
|
||||||
|
let usdSuccess = false;
|
||||||
|
try {
|
||||||
|
await runScraper('./scraper/usd-cny-rate.scraper.js', startDateStr, endDateStr);
|
||||||
|
console.log(`✅ USD-CNY 汇率数据更新完成`);
|
||||||
|
usdSuccess = true;
|
||||||
|
} catch (error) {
|
||||||
|
console.error(`❌ USD-CNY 汇率数据更新失败:`, error.message);
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log('');
|
||||||
|
console.log('='.repeat(70));
|
||||||
|
console.log('📈 开始获取沪深300指数数据...');
|
||||||
|
console.log('='.repeat(70));
|
||||||
|
|
||||||
|
let sh300Success = false;
|
||||||
|
try {
|
||||||
|
await runScraper('./scraper/sh300.scraper.js', startDateStr, endDateStr);
|
||||||
|
console.log(`✅ 沪深300指数数据更新完成`);
|
||||||
|
sh300Success = true;
|
||||||
|
} catch (error) {
|
||||||
|
console.error(`❌ 沪深300指数数据更新失败:`, error.message);
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log('');
|
||||||
|
console.log('='.repeat(70));
|
||||||
|
console.log('📊 数据获取完成');
|
||||||
|
console.log('='.repeat(70));
|
||||||
|
console.log(`USD-CNY 汇率: ${usdSuccess ? '✅ 成功' : '❌ 失败'}`);
|
||||||
|
console.log(`沪深300指数: ${sh300Success ? '✅ 成功' : '❌ 失败'}`);
|
||||||
|
console.log('='.repeat(70));
|
||||||
|
}
|
||||||
|
|
||||||
|
fetchOneYearData();
|
||||||
@@ -0,0 +1,303 @@
|
|||||||
|
// 东方财富妙想 MCP 数据源
|
||||||
|
// 协议: StreamableHttp (MCP 2025-03-26 spec), HTTP POST + JSON-RPC 2.0
|
||||||
|
// - 认证: header `em_api_key: <EM_API_KEY>`
|
||||||
|
// - 妙想 MCP 是"自然语言驱动": 传 query 字符串, 内部 LLM 解析 + 调底层数据接口
|
||||||
|
// - 重要: 每次调用 5-20s + LLM token 成本, 必须配合"DB 优先" (refresh 时已存在的指标跳过)
|
||||||
|
//
|
||||||
|
// 需要的 .env:
|
||||||
|
// EM_API_KEY=xxx 必填
|
||||||
|
// EASTMONEY_MCP_BASE=... 可选, 默认 https://mxapi.eastmoney.com/mxds/mcp
|
||||||
|
//
|
||||||
|
// INDICATORS 数组: 配置要拉的指标
|
||||||
|
// 每项:
|
||||||
|
// name → Indicator.name (主键)
|
||||||
|
// groupName → Indicator.groupName
|
||||||
|
// title → data.title
|
||||||
|
// unit → data.unit
|
||||||
|
// tool → MCP tool 名
|
||||||
|
// query → 自然语言查询
|
||||||
|
// pickSheet(sheets) → 选一张 sheet (默认取第一张)
|
||||||
|
// parseSheet(sheet) → [{period, value}, ...] 默认按宽表转长表 (列=日期, 行=值)
|
||||||
|
|
||||||
|
import axios from 'axios'
|
||||||
|
|
||||||
|
const DEFAULT_BASE = 'https://mxapi.eastmoney.com/mxds/mcp'
|
||||||
|
const TIMEOUT = 60000
|
||||||
|
|
||||||
|
// ====== INDICATORS 配置 ======
|
||||||
|
// 跑 npm run data:discover 看可用 tool, 再加新指标
|
||||||
|
const INDICATORS = [
|
||||||
|
{
|
||||||
|
name: 'china-cpi-yoy',
|
||||||
|
groupName: 'china-macro',
|
||||||
|
title: '中国 CPI 同比',
|
||||||
|
unit: '%',
|
||||||
|
tool: 'mx_macro_data',
|
||||||
|
query: '查询中国 2015 年至今 CPI 月度同比数据，每一个月的数值',
|
||||||
|
pickSheet: (sheets) =>
|
||||||
|
sheets.find((s) => s.items?.[0]?.[0]?.includes('CPI') && s.items[0][0].includes('同比'))
|
||||||
|
|| sheets.find((s) => s.sheetName?.includes('宏观数据'))
|
||||||
|
|| sheets[0],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'china-gdp-yoy',
|
||||||
|
groupName: 'china-macro',
|
||||||
|
title: '中国 GDP 同比',
|
||||||
|
unit: '%',
|
||||||
|
tool: 'mx_macro_data',
|
||||||
|
query: '查询中国 2015-2025 年 GDP 不变价同比增速，季度数据，每一季度的数值',
|
||||||
|
pickSheet: (sheets) =>
|
||||||
|
sheets.find((s) => s.items?.[0]?.[0]?.includes('GDP') && s.items[0][0].includes('同比'))
|
||||||
|
|| sheets[0],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
// 国债收益率: MCP 返回日频, 用月末降采样成月频点
|
||||||
|
name: 'china-bond-10y',
|
||||||
|
groupName: 'china-macro',
|
||||||
|
title: '中国国债 10 年期收益率',
|
||||||
|
unit: '%',
|
||||||
|
frequency: 'month',
|
||||||
|
tool: 'mx_macro_data',
|
||||||
|
query: '查询中国10年期国债到期收益率 2024年至今 每日数据',
|
||||||
|
pickSheet: (sheets) =>
|
||||||
|
sheets.find((s) => s.items?.some?.((row) => String(row[0] || '').includes('国债到期收益率:10年')))
|
||||||
|
|| sheets[0],
|
||||||
|
parseSheet: (sheet) => monthEndSample(sheet, '国债到期收益率:10年'),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'china-bond-1y',
|
||||||
|
groupName: 'china-macro',
|
||||||
|
title: '中国国债 1 年期收益率',
|
||||||
|
unit: '%',
|
||||||
|
frequency: 'month',
|
||||||
|
tool: 'mx_macro_data',
|
||||||
|
query: '查询中国1年期国债到期收益率 2024年至今 每日数据',
|
||||||
|
pickSheet: (sheets) =>
|
||||||
|
sheets.find((s) => s.items?.some?.((row) => String(row[0] || '').includes('国债到期收益率:1年')))
|
||||||
|
|| sheets[0],
|
||||||
|
parseSheet: (sheet) => monthEndSample(sheet, '国债到期收益率:1年'),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'china-lpr-1y',
|
||||||
|
groupName: 'china-macro',
|
||||||
|
title: '中国 LPR 1 年期',
|
||||||
|
unit: '%',
|
||||||
|
frequency: 'month',
|
||||||
|
tool: 'mx_macro_data',
|
||||||
|
query: '查询中国LPR 1年期贷款市场报价利率 2024年至今 月度数据，每一个月的数值',
|
||||||
|
pickSheet: (sheets) =>
|
||||||
|
sheets.find((s) => s.sheetName?.includes('宏观数据（月）'))
|
||||||
|
|| sheets[0],
|
||||||
|
parseSheet: (sheet) => pickRowByKeyword(sheet, '(LPR):1年'),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'china-lpr-5y',
|
||||||
|
groupName: 'china-macro',
|
||||||
|
title: '中国 LPR 5 年期',
|
||||||
|
unit: '%',
|
||||||
|
frequency: 'month',
|
||||||
|
tool: 'mx_macro_data',
|
||||||
|
query: '查询中国LPR 5年期以上贷款市场报价利率 2024年至今 月度数据，每一个月的数值',
|
||||||
|
pickSheet: (sheets) =>
|
||||||
|
sheets.find((s) => s.sheetName?.includes('宏观数据（月）'))
|
||||||
|
|| sheets[0],
|
||||||
|
parseSheet: (sheet) => pickRowByKeyword(sheet, '(LPR):5年'),
|
||||||
|
},
|
||||||
|
]
|
||||||
|
|
||||||
|
export const META = {
|
||||||
|
name: 'eastmoney-mcp',
|
||||||
|
description: '东方财富妙想 MCP (StreamableHttp, NL 查询)',
|
||||||
|
docs: 'https://mxapi.eastmoney.com/mxds/doc/mcp-install.md',
|
||||||
|
}
|
||||||
|
|
||||||
|
// ====== StreamableHttp 客户端 ======
|
||||||
|
|
||||||
|
class McpClient {
|
||||||
|
constructor(baseUrl, apiKey) {
|
||||||
|
this.baseUrl = baseUrl
|
||||||
|
this.apiKey = apiKey
|
||||||
|
this.id = 0
|
||||||
|
}
|
||||||
|
async _request(method, params) {
|
||||||
|
const payload = { jsonrpc: '2.0', id: ++this.id, method, ...(params ? { params } : {}) }
|
||||||
|
const resp = await axios.post(this.baseUrl, payload, {
|
||||||
|
timeout: TIMEOUT,
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
'Accept': 'application/json, text/event-stream',
|
||||||
|
'em_api_key': this.apiKey,
|
||||||
|
},
|
||||||
|
responseType: 'text',
|
||||||
|
transformResponse: [(d) => d],
|
||||||
|
validateStatus: () => true,
|
||||||
|
})
|
||||||
|
if (resp.status >= 400) {
|
||||||
|
throw new Error(`HTTP ${resp.status}: ${String(resp.data).slice(0, 300)}`)
|
||||||
|
}
|
||||||
|
const parsed = parseMcpResponse(String(resp.data || ''))
|
||||||
|
// JSON-RPC 信封 {jsonrpc,id,result|error}, 统一解包 result
|
||||||
|
if (parsed.error) {
|
||||||
|
throw new Error(`MCP error ${parsed.error.code}: ${parsed.error.message}`)
|
||||||
|
}
|
||||||
|
return parsed.result || parsed
|
||||||
|
}
|
||||||
|
async listTools() {
|
||||||
|
const r = await this._request('tools/list')
|
||||||
|
return r.tools || []
|
||||||
|
}
|
||||||
|
async callTool(name, args = {}) {
|
||||||
|
const r = await this._request('tools/call', { name, arguments: args })
|
||||||
|
if (r.isError) {
|
||||||
|
const msg = (r.content || []).map((c) => c.text || '').join('; ')
|
||||||
|
throw new Error(`tool ${name} error: ${msg || JSON.stringify(r).slice(0, 200)}`)
|
||||||
|
}
|
||||||
|
return r
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 解析响应: JSON 或 SSE
|
||||||
|
function parseMcpResponse(text) {
|
||||||
|
const t = text.trim()
|
||||||
|
if (t.startsWith('{')) return JSON.parse(t)
|
||||||
|
if (t.startsWith('data:')) {
|
||||||
|
const lines = t.split('\n').filter((l) => l.startsWith('data:'))
|
||||||
|
let last = null
|
||||||
|
for (const line of lines) {
|
||||||
|
const json = line.slice(5).trim()
|
||||||
|
if (!json || json === '[DONE]') continue
|
||||||
|
try { last = JSON.parse(json) } catch { /* skip */ }
|
||||||
|
}
|
||||||
|
if (!last) throw new Error('SSE 无有效 data 块: ' + text.slice(0, 200))
|
||||||
|
return last
|
||||||
|
}
|
||||||
|
throw new Error('未知响应格式: ' + t.slice(0, 200))
|
||||||
|
}
|
||||||
|
|
||||||
|
// 默认 sheet 解析: 宽表 (列=日期, 行=值) → 长表
|
||||||
|
// 例: { columns:["指标","来源","2024-12","2024-11"], items:[["CPI","统计局","0.1","0.2"]] }
|
||||||
|
// → [{period:"2024-12", value:0.1}, {period:"2024-11", value:0.2}]
|
||||||
|
// 返回时反转成从老到新
|
||||||
|
function defaultParseSheet(sheet) {
|
||||||
|
if (!sheet || !sheet.columns || !sheet.items || !sheet.items[0]) return []
|
||||||
|
const cols = sheet.columns
|
||||||
|
const row = sheet.items[0]
|
||||||
|
const dates = cols.slice(2) // 跳过 [指标名, 来源]
|
||||||
|
const values = row.slice(2)
|
||||||
|
const out = []
|
||||||
|
for (let i = 0; i < dates.length; i++) {
|
||||||
|
const v = parseFloat(values[i])
|
||||||
|
if (!isNaN(v)) out.push({ period: dates[i], value: v })
|
||||||
|
}
|
||||||
|
return out.reverse() // 从老到新
|
||||||
|
}
|
||||||
|
|
||||||
|
// 宽表 → 长表, 指定 item 行 (按指标全名前缀匹配), 日频列降采样为月末值
|
||||||
|
// 例: columns=["指标","来源","2026-08-05","2026-08-04",...] → [{period:"2024-01",value},...]
|
||||||
|
function monthEndSample(sheet, keyword) {
|
||||||
|
if (!sheet || !sheet.columns || !sheet.items) return []
|
||||||
|
const row = sheet.items.find((r) => String(r[0] || '').includes(keyword))
|
||||||
|
if (!row) return []
|
||||||
|
const cols = sheet.columns
|
||||||
|
const dates = cols.slice(2) // 新 → 老
|
||||||
|
const values = row.slice(2)
|
||||||
|
const out = []
|
||||||
|
const seen = new Set()
|
||||||
|
for (let i = 0; i < dates.length; i++) {
|
||||||
|
const v = parseFloat(values[i])
|
||||||
|
const m = String(dates[i] || '').slice(0, 7) // "2024-01-02" → "2024-01"
|
||||||
|
if (!/^\d{4}-\d{2}$/.test(m) || Number.isNaN(v)) continue
|
||||||
|
if (seen.has(m)) continue // 列是降序, 第一次遇到的即当月最后一个交易日
|
||||||
|
seen.add(m)
|
||||||
|
out.push({ period: m, value: v })
|
||||||
|
}
|
||||||
|
return out.reverse() // 从老到新
|
||||||
|
}
|
||||||
|
|
||||||
|
// 宽表 → 长表, 指定 item 行 (按指标全名前缀匹配), 保留原频率 (月/季/年)
|
||||||
|
function pickRowByKeyword(sheet, keyword) {
|
||||||
|
if (!sheet || !sheet.columns || !sheet.items) return []
|
||||||
|
const row = sheet.items.find((r) => String(r[0] || '').includes(keyword))
|
||||||
|
if (!row) return []
|
||||||
|
const cols = sheet.columns
|
||||||
|
const dates = cols.slice(2)
|
||||||
|
const values = row.slice(2)
|
||||||
|
const out = []
|
||||||
|
for (let i = 0; i < dates.length; i++) {
|
||||||
|
const v = parseFloat(values[i])
|
||||||
|
if (!Number.isNaN(v)) out.push({ period: String(dates[i]), value: v })
|
||||||
|
}
|
||||||
|
return out.reverse() // 从老到新
|
||||||
|
}
|
||||||
|
|
||||||
|
// ====== fetcher 入口 ======
|
||||||
|
|
||||||
|
export async function listAvailableTools() {
|
||||||
|
const key = process.env.EM_API_KEY
|
||||||
|
if (!key) throw new Error('缺少 EM_API_KEY')
|
||||||
|
const base = process.env.EASTMONEY_MCP_BASE || DEFAULT_BASE
|
||||||
|
const client = new McpClient(base, key)
|
||||||
|
return client.listTools()
|
||||||
|
}
|
||||||
|
|
||||||
|
// opts.skipNames: Set<string> — DB 已存在的指标名, 跳过不调 MCP (省 token)
|
||||||
|
// opts.onlyNames: Set<string> — 白名单, 只跑这些 (用于补跑单个)
|
||||||
|
export async function fetchAll(opts = {}) {
|
||||||
|
if (INDICATORS.length === 0) {
|
||||||
|
throw new Error('eastmoney-mcp: INDICATORS 数组为空, 加新指标见文件顶部注释')
|
||||||
|
}
|
||||||
|
const skip = opts.skipNames || new Set()
|
||||||
|
const force = opts.forceNames || new Set()
|
||||||
|
const only = opts.onlyNames || null
|
||||||
|
|
||||||
|
const key = process.env.EM_API_KEY
|
||||||
|
if (!key) throw new Error('缺少 EM_API_KEY')
|
||||||
|
const base = process.env.EASTMONEY_MCP_BASE || DEFAULT_BASE
|
||||||
|
const client = new McpClient(base, key)
|
||||||
|
|
||||||
|
const results = []
|
||||||
|
for (const cfg of INDICATORS) {
|
||||||
|
if (skip.has(cfg.name) && !force.has(cfg.name)) {
|
||||||
|
console.log(`[MCP] ${cfg.name} 跳过 (DB 已存在)`)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if (only && !only.has(cfg.name)) continue
|
||||||
|
try {
|
||||||
|
console.log(`[MCP] ${cfg.name} 调用 ${cfg.tool}: ${cfg.query}`)
|
||||||
|
const r = await client.callTool(cfg.tool, { query: cfg.query })
|
||||||
|
const text = (r.content || []).map((c) => c.text || '').join('')
|
||||||
|
let payload
|
||||||
|
try { payload = JSON.parse(text) } catch { payload = { raw: text } }
|
||||||
|
const sheets = payload.data || (Array.isArray(payload) ? payload : [payload])
|
||||||
|
const sheet = cfg.pickSheet ? cfg.pickSheet(sheets) : sheets[0]
|
||||||
|
const parsed = cfg.parseSheet ? cfg.parseSheet(sheet) : defaultParseSheet(sheet)
|
||||||
|
if (parsed.length === 0) {
|
||||||
|
console.log(`[MCP] ${cfg.name} 返回空 rows, 跳过`)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
results.push({
|
||||||
|
name: cfg.name,
|
||||||
|
groupName: cfg.groupName,
|
||||||
|
data: {
|
||||||
|
unit: cfg.unit,
|
||||||
|
title: cfg.title,
|
||||||
|
source: 'eastmoney-mcp',
|
||||||
|
rows: parsed,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
console.log(`[MCP] ${cfg.name} OK, ${parsed.length} rows (${parsed[0]?.period}..${parsed.at(-1)?.period})`)
|
||||||
|
} catch (e) {
|
||||||
|
console.error(`[MCP] ${cfg.name} FAIL: ${e.message}`)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// 全部被 DB 优先跳过时, 返回显式标记而不是空数组 (避免被误判为失败)
|
||||||
|
if (results.length === 0 && INDICATORS.every((cfg) => skip.has(cfg.name) && !force.has(cfg.name))) {
|
||||||
|
return { skipped: true, reason: 'DB 已存在全部指标' }
|
||||||
|
}
|
||||||
|
return results
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -0,0 +1,83 @@
|
|||||||
|
// Fetcher 注册表: 列出所有启用的数据源
|
||||||
|
// 加新数据源只要:
|
||||||
|
// 1. 写一个 scripts/fetchers/<source>.fetcher.js, 导出 META + fetchAll
|
||||||
|
// 2. 在本文件 FETCHERS 数组里加一行
|
||||||
|
// 3. 完事, refresh 脚本会自动跑
|
||||||
|
|
||||||
|
// 每项的 schema:
|
||||||
|
// name: 数据源标识 (用于日志)
|
||||||
|
// module: fetcher 模块路径 (相对 scripts/fetchers/)
|
||||||
|
// enabled: true/false, 可由 env 关闭 (如 ENABLE_EASTMONEY_MCP=0)
|
||||||
|
// env: 需要的环境变量名列表, 缺一即跳过
|
||||||
|
export const FETCHERS = [
|
||||||
|
{
|
||||||
|
name: 'wb-indicators',
|
||||||
|
module: './wb-indicators.fetcher.js',
|
||||||
|
enabled: true,
|
||||||
|
env: [],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'eastmoney-mcp',
|
||||||
|
module: './eastmoney-mcp.fetcher.js',
|
||||||
|
// 默认开启, 有 APIKey 才真正能跑 (fetcher 内部会自检)
|
||||||
|
enabled: process.env.ENABLE_EASTMONEY_MCP !== '0',
|
||||||
|
env: ['EM_API_KEY'],
|
||||||
|
},
|
||||||
|
// 后续在这里追加:
|
||||||
|
// { name: 'fred', module: './fred.fetcher.js', enabled: true, env: ['FRED_API_KEY'] },
|
||||||
|
// { name: 'tushare', module: './tushare.fetcher.js', enabled: true, env: ['TUSHARE_TOKEN'] },
|
||||||
|
]
|
||||||
|
|
||||||
|
// 校验环境变量, 返回 { ok, missing[] }
|
||||||
|
export function checkEnv(required) {
|
||||||
|
const missing = required.filter((k) => !process.env[k] || !process.env[k].trim())
|
||||||
|
return { ok: missing.length === 0, missing }
|
||||||
|
}
|
||||||
|
|
||||||
|
// 加载并运行所有启用的 fetcher, 返回 [{ name, ok, items, error, skipped }]
|
||||||
|
// 错误隔离: 一个 fetcher 挂了不影响其他
|
||||||
|
// opts.skipNames: Set<string> — DB 优先, 已存在的指标名, 透传给 fetcher
|
||||||
|
// opts.forceNames: Set<string> — 强制刷新名单, 即使 skipNames 里有也照拉
|
||||||
|
export async function runFetchers(opts = {}) {
|
||||||
|
const results = []
|
||||||
|
for (const meta of FETCHERS) {
|
||||||
|
if (!meta.enabled) {
|
||||||
|
results.push({ name: meta.name, skipped: true, reason: 'disabled' })
|
||||||
|
console.log(`[Fetcher] ${meta.name} 跳过 (disabled)`)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
const envCheck = checkEnv(meta.env)
|
||||||
|
if (!envCheck.ok) {
|
||||||
|
results.push({ name: meta.name, skipped: true, reason: `缺少 env: ${envCheck.missing.join(', ')}` })
|
||||||
|
console.log(`[Fetcher] ${meta.name} 跳过 (${envCheck.missing.join(', ')})`)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
const mod = await import(meta.module)
|
||||||
|
if (!mod.META || !mod.fetchAll) {
|
||||||
|
throw new Error('fetcher 必须导出 META 和 fetchAll')
|
||||||
|
}
|
||||||
|
console.log(`[Fetcher] ${meta.name} 开始...`)
|
||||||
|
const out = await mod.fetchAll({ skipNames: opts.skipNames, onlyNames: opts.onlyNames, forceNames: opts.forceNames })
|
||||||
|
// fetcher 可返回 { skipped: true, reason } 表示"全部被 DB 优先跳过", 不算失败
|
||||||
|
if (out && out.skipped) {
|
||||||
|
results.push({ name: meta.name, skipped: true, reason: out.reason })
|
||||||
|
console.log(`[Fetcher] ${meta.name} 跳过 (${out.reason})`)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
const items = Array.isArray(out) ? out : []
|
||||||
|
// 校验返回结构
|
||||||
|
const valid = items.filter((it) => it && it.name && it.data && Array.isArray(it.data.rows))
|
||||||
|
if (valid.length === 0) {
|
||||||
|
throw new Error('fetcher 未返回任何有效指标 (需包含 name/data.rows)')
|
||||||
|
}
|
||||||
|
console.log(`[Fetcher] ${meta.name} 拉取 ${valid.length} 个指标`)
|
||||||
|
results.push({ name: meta.name, ok: true, items: valid })
|
||||||
|
} catch (e) {
|
||||||
|
results.push({ name: meta.name, ok: false, error: e.message })
|
||||||
|
console.error(`[Fetcher] ${meta.name} 失败: ${e.message}`)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return results
|
||||||
|
}
|
||||||
|
|
||||||
@@ -0,0 +1,168 @@
|
|||||||
|
import axios from 'axios';
|
||||||
|
import { fileURLToPath } from 'url';
|
||||||
|
|
||||||
|
async function fetch(startDate = null, endDate = null, retryCount = 3) {
|
||||||
|
try {
|
||||||
|
const currentDate = new Date();
|
||||||
|
|
||||||
|
if (!startDate) {
|
||||||
|
startDate = new Date(currentDate);
|
||||||
|
startDate.setDate(startDate.getDate() - 30);
|
||||||
|
startDate = startDate.toISOString().split('T')[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!endDate) {
|
||||||
|
endDate = currentDate.toISOString().split('T')[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log('正在获取沪深300指数数据...');
|
||||||
|
console.log(`时间范围: ${startDate} 至 ${endDate}`);
|
||||||
|
console.log(`数据源: 腾讯财经API`);
|
||||||
|
|
||||||
|
// 沪深300指数代码
|
||||||
|
const symbol = '000300';
|
||||||
|
|
||||||
|
// 使用腾讯财经的API端点获取历史数据
|
||||||
|
const response = await axios.get('https://web.ifzq.gtimg.cn/appstock/app/kline/kline?param=sh' + symbol + ',day,' + startDate + ',' + endDate + ',640', {
|
||||||
|
headers: {
|
||||||
|
'Accept': 'application/json',
|
||||||
|
'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36'
|
||||||
|
},
|
||||||
|
timeout: 10000 // 设置10秒超时
|
||||||
|
});
|
||||||
|
|
||||||
|
console.log(`\nAPI状态: ${response.status}`);
|
||||||
|
|
||||||
|
const data = response.data;
|
||||||
|
console.log(`响应数据:`, JSON.stringify(data, null, 2));
|
||||||
|
|
||||||
|
const allData = [];
|
||||||
|
|
||||||
|
if (data && data.data && data.data['sh' + symbol] && data.data['sh' + symbol].day) {
|
||||||
|
const klineData = data.data['sh' + symbol].day;
|
||||||
|
console.log(`数据条数: ${klineData.length}`);
|
||||||
|
|
||||||
|
for (const item of klineData) {
|
||||||
|
allData.push({
|
||||||
|
date: item[0],
|
||||||
|
open: parseFloat(item[1]),
|
||||||
|
close: parseFloat(item[2]),
|
||||||
|
high: parseFloat(item[3]),
|
||||||
|
low: parseFloat(item[4]),
|
||||||
|
volume: parseFloat(item[5]),
|
||||||
|
amount: 0, // 腾讯财经API没有返回成交额数据，设置为0
|
||||||
|
source: '腾讯财经API',
|
||||||
|
fetchTime: new Date().toISOString()
|
||||||
|
});
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
console.log('数据条数: 0');
|
||||||
|
}
|
||||||
|
|
||||||
|
allData.sort((a, b) => a.date.localeCompare(b.date));
|
||||||
|
|
||||||
|
console.log(`\n共获取到 ${allData.length} 条沪深300指数数据`);
|
||||||
|
|
||||||
|
return {
|
||||||
|
symbol: 'sh000300',
|
||||||
|
name: '沪深300指数',
|
||||||
|
startDate,
|
||||||
|
endDate,
|
||||||
|
count: allData.length,
|
||||||
|
data: allData,
|
||||||
|
fetchTime: new Date().toISOString(),
|
||||||
|
note: '数据来源: 腾讯财经API'
|
||||||
|
};
|
||||||
|
|
||||||
|
} catch (error) {
|
||||||
|
console.error('获取沪深300指数数据失败:', error.message);
|
||||||
|
if (error.response) {
|
||||||
|
console.error(`HTTP状态码: ${error.response.status}`);
|
||||||
|
console.error(`响应数据:`, error.response.data);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 重试机制
|
||||||
|
if (retryCount > 0) {
|
||||||
|
console.log(`正在重试... (剩余重试次数: ${retryCount - 1})`);
|
||||||
|
// 等待1秒后重试
|
||||||
|
await new Promise(resolve => setTimeout(resolve, 1000));
|
||||||
|
return fetch(startDate, endDate, retryCount - 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export {
|
||||||
|
fetch
|
||||||
|
};
|
||||||
|
|
||||||
|
const isMainModule = () => {
|
||||||
|
const currentFile = fileURLToPath(import.meta.url);
|
||||||
|
const mainFile = process.argv[1];
|
||||||
|
return currentFile === mainFile;
|
||||||
|
};
|
||||||
|
|
||||||
|
function parseCommandLineArgs() {
|
||||||
|
const args = process.argv.slice(2);
|
||||||
|
let startDate = null;
|
||||||
|
let endDate = null;
|
||||||
|
|
||||||
|
for (let i = 0; i < args.length; i++) {
|
||||||
|
if (args[i] === '--start' && i + 1 < args.length) {
|
||||||
|
startDate = args[i + 1];
|
||||||
|
i++;
|
||||||
|
} else if (args[i] === '--end' && i + 1 < args.length) {
|
||||||
|
endDate = args[i + 1];
|
||||||
|
i++;
|
||||||
|
} else if (args[i] === '--help') {
|
||||||
|
console.log('使用方法:');
|
||||||
|
console.log(' bun sh300.fetcher.js [选项]');
|
||||||
|
console.log('');
|
||||||
|
console.log('选项:');
|
||||||
|
console.log(' --start YYYY-MM-DD 指定开始日期（默认：30天前）');
|
||||||
|
console.log(' --end YYYY-MM-DD 指定结束日期（默认：今天）');
|
||||||
|
console.log(' --help 显示帮助信息');
|
||||||
|
console.log('');
|
||||||
|
console.log('示例:');
|
||||||
|
console.log(' bun sh300.fetcher.js');
|
||||||
|
console.log(' bun sh300.fetcher.js --start 2024-01-01 --end 2024-01-31');
|
||||||
|
process.exit(0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return { startDate, endDate };
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isMainModule()) {
|
||||||
|
const { startDate, endDate } = parseCommandLineArgs();
|
||||||
|
|
||||||
|
console.log('='.repeat(50));
|
||||||
|
console.log('沪深300指数数据获取脚本');
|
||||||
|
console.log('='.repeat(50));
|
||||||
|
|
||||||
|
fetch(startDate, endDate)
|
||||||
|
.then(result => {
|
||||||
|
console.log('\n' + '='.repeat(50));
|
||||||
|
console.log('获取结果:');
|
||||||
|
console.log(` 指数代码: ${result.symbol}`);
|
||||||
|
console.log(` 指数名称: ${result.name}`);
|
||||||
|
console.log(` 开始日期: ${result.startDate}`);
|
||||||
|
console.log(` 结束日期: ${result.endDate}`);
|
||||||
|
console.log(` 数据条数: ${result.count}`);
|
||||||
|
console.log(` 获取时间: ${result.fetchTime}`);
|
||||||
|
console.log(` 提示: ${result.note}`);
|
||||||
|
if (result.count > 0) {
|
||||||
|
console.log('-'.repeat(50));
|
||||||
|
console.log('指数数据:');
|
||||||
|
result.data.forEach(item => {
|
||||||
|
console.log(` ${item.date} 开盘: ${item.open} 最高: ${item.high} 最低: ${item.low} 收盘: ${item.close}`);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
console.log('='.repeat(50));
|
||||||
|
})
|
||||||
|
.catch(error => {
|
||||||
|
console.error('执行失败:', error);
|
||||||
|
process.exit(1);
|
||||||
|
});
|
||||||
|
}
|
||||||
@@ -0,0 +1,150 @@
|
|||||||
|
import axios from 'axios';
|
||||||
|
import { fileURLToPath } from 'url';
|
||||||
|
|
||||||
|
const FRANKFURTER_API = 'https://api.frankfurter.app';
|
||||||
|
|
||||||
|
async function fetch(startDate = null, endDate = null) {
|
||||||
|
try {
|
||||||
|
const currentDate = new Date();
|
||||||
|
|
||||||
|
if (!startDate) {
|
||||||
|
startDate = new Date(currentDate);
|
||||||
|
startDate.setDate(startDate.getDate() - 30);
|
||||||
|
startDate = startDate.toISOString().split('T')[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!endDate) {
|
||||||
|
endDate = currentDate.toISOString().split('T')[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log('正在获取人民币美元汇率数据...');
|
||||||
|
console.log(`时间范围: ${startDate} 至 ${endDate}`);
|
||||||
|
console.log(`数据源: Frankfurter API (欧洲央行汇率数据)`);
|
||||||
|
|
||||||
|
const response = await axios.get(`${FRANKFURTER_API}/${startDate}..${endDate}`, {
|
||||||
|
params: {
|
||||||
|
from: 'USD',
|
||||||
|
to: 'CNY'
|
||||||
|
},
|
||||||
|
headers: {
|
||||||
|
'Accept': 'application/json'
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
const data = response.data;
|
||||||
|
console.log(`\nAPI状态: ${response.status}`);
|
||||||
|
console.log(`数据条数: ${Object.keys(data.rates || {}).length}`);
|
||||||
|
|
||||||
|
const allRates = [];
|
||||||
|
|
||||||
|
if (data.rates) {
|
||||||
|
for (const [date, rateObj] of Object.entries(data.rates)) {
|
||||||
|
const rateValue = rateObj.CNY;
|
||||||
|
allRates.push({
|
||||||
|
date: date,
|
||||||
|
currency: 'USD/CNY',
|
||||||
|
centerPrice: parseFloat(rateValue.toFixed(4)),
|
||||||
|
sellingRate: parseFloat(rateValue.toFixed(4)),
|
||||||
|
buyingRate: parseFloat(rateValue.toFixed(4)),
|
||||||
|
source: '欧洲央行 (Frankfurter API)',
|
||||||
|
fetchTime: new Date().toISOString()
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
allRates.sort((a, b) => a.date.localeCompare(b.date));
|
||||||
|
|
||||||
|
console.log(`\n共获取到 ${allRates.length} 条汇率数据`);
|
||||||
|
|
||||||
|
return {
|
||||||
|
currency: 'USD/CNY',
|
||||||
|
startDate,
|
||||||
|
endDate,
|
||||||
|
count: allRates.length,
|
||||||
|
data: allRates,
|
||||||
|
fetchTime: new Date().toISOString(),
|
||||||
|
note: '数据来源: 欧洲央行, 通过 Frankfurter API 提供'
|
||||||
|
};
|
||||||
|
|
||||||
|
} catch (error) {
|
||||||
|
console.error('获取汇率数据失败:', error.message);
|
||||||
|
if (error.response) {
|
||||||
|
console.error(`HTTP状态码: ${error.response.status}`);
|
||||||
|
console.error(`响应数据:`, error.response.data);
|
||||||
|
}
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export {
|
||||||
|
fetch
|
||||||
|
};
|
||||||
|
|
||||||
|
const isMainModule = () => {
|
||||||
|
const currentFile = fileURLToPath(import.meta.url);
|
||||||
|
const mainFile = process.argv[1];
|
||||||
|
return currentFile === mainFile;
|
||||||
|
};
|
||||||
|
|
||||||
|
function parseCommandLineArgs() {
|
||||||
|
const args = process.argv.slice(2);
|
||||||
|
let startDate = null;
|
||||||
|
let endDate = null;
|
||||||
|
|
||||||
|
for (let i = 0; i < args.length; i++) {
|
||||||
|
if (args[i] === '--start' && i + 1 < args.length) {
|
||||||
|
startDate = args[i + 1];
|
||||||
|
i++;
|
||||||
|
} else if (args[i] === '--end' && i + 1 < args.length) {
|
||||||
|
endDate = args[i + 1];
|
||||||
|
i++;
|
||||||
|
} else if (args[i] === '--help') {
|
||||||
|
console.log('使用方法:');
|
||||||
|
console.log(' bun usd-cny-rate.fetcher.js [选项]');
|
||||||
|
console.log('');
|
||||||
|
console.log('选项:');
|
||||||
|
console.log(' --start YYYY-MM-DD 指定开始日期（默认：30天前）');
|
||||||
|
console.log(' --end YYYY-MM-DD 指定结束日期（默认：今天）');
|
||||||
|
console.log(' --help 显示帮助信息');
|
||||||
|
console.log('');
|
||||||
|
console.log('示例:');
|
||||||
|
console.log(' bun usd-cny-rate.fetcher.js');
|
||||||
|
console.log(' bun usd-cny-rate.fetcher.js --start 2024-01-01 --end 2024-01-31');
|
||||||
|
process.exit(0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return { startDate, endDate };
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isMainModule()) {
|
||||||
|
const { startDate, endDate } = parseCommandLineArgs();
|
||||||
|
|
||||||
|
console.log('='.repeat(50));
|
||||||
|
console.log('人民币美元汇率获取脚本');
|
||||||
|
console.log('='.repeat(50));
|
||||||
|
|
||||||
|
fetch(startDate, endDate)
|
||||||
|
.then(result => {
|
||||||
|
console.log('\n' + '='.repeat(50));
|
||||||
|
console.log('获取结果:');
|
||||||
|
console.log(` 货币对: ${result.currency}`);
|
||||||
|
console.log(` 开始日期: ${result.startDate}`);
|
||||||
|
console.log(` 结束日期: ${result.endDate}`);
|
||||||
|
console.log(` 数据条数: ${result.count}`);
|
||||||
|
console.log(` 获取时间: ${result.fetchTime}`);
|
||||||
|
console.log(` 提示: ${result.note}`);
|
||||||
|
if (result.count > 0) {
|
||||||
|
console.log('-'.repeat(50));
|
||||||
|
console.log('汇率数据:');
|
||||||
|
result.data.forEach(item => {
|
||||||
|
console.log(` ${item.date} 中间价: ${item.centerPrice}`);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
console.log('='.repeat(50));
|
||||||
|
})
|
||||||
|
.catch(error => {
|
||||||
|
console.error('执行失败:', error);
|
||||||
|
process.exit(1);
|
||||||
|
});
|
||||||
|
}
|
||||||
@@ -0,0 +1,113 @@
|
|||||||
|
import axios from 'axios'
|
||||||
|
|
||||||
|
// World Bank API 数据源
|
||||||
|
// 文档: https://datahelpdesk.worldbank.org/knowledgebase/articles/898581
|
||||||
|
// 优点: 官方、JSON、免 key、稳定, 中国数据滞后约 1 年 (这是全球宏观数据物理上限)
|
||||||
|
// 接口: GET /v2/country/{code}/indicator/{id}?format=json&date={startYear}:{endYear}&per_page=100
|
||||||
|
|
||||||
|
const WB_BASE = 'https://api.worldbank.org/v2'
|
||||||
|
const TIMEOUT = 15000
|
||||||
|
|
||||||
|
// 6 个核心宏观指标
|
||||||
|
// - 中国 GDP (现价美元) - 国民经济总规模
|
||||||
|
// - 中国 GDP 增速 - 增长动能
|
||||||
|
// - 中国 CPI 同比 - 通胀
|
||||||
|
// - 中国失业率 - 就业
|
||||||
|
// - 美国 GDP (现价美元) - 对标
|
||||||
|
// - 美国 CPI 同比 - 对标
|
||||||
|
export const WB_INDICATORS = [
|
||||||
|
{ id: 'NY.GDP.MKTP.CD', name: 'china-gdp-usd', groupName: 'china-macro', title: '中国 GDP', unit: '万亿美元', scale: 1e-8, digits: 2 },
|
||||||
|
{ id: 'NY.GDP.MKTP.KD.ZG',name: 'china-gdp-growth', groupName: 'china-macro', title: '中国 GDP 增速', unit: '%', scale: 1, digits: 2 },
|
||||||
|
{ id: 'FP.CPI.TOTL.ZG', name: 'china-cpi', groupName: 'china-macro', title: '中国 CPI', unit: '%', scale: 1, digits: 2 },
|
||||||
|
{ id: 'SL.UEM.TOTL.ZS', name: 'china-unemploy', groupName: 'china-macro', title: '中国失业率', unit: '%', scale: 1, digits: 2 },
|
||||||
|
{ id: 'NY.GDP.MKTP.CD', name: 'usa-gdp-usd', groupName: 'usa-macro', title: '美国 GDP', unit: '万亿美元', scale: 1e-8, digits: 2 },
|
||||||
|
{ id: 'FP.CPI.TOTL.ZG', name: 'usa-cpi', groupName: 'usa-macro', title: '美国 CPI', unit: '%', scale: 1, digits: 2 },
|
||||||
|
]
|
||||||
|
|
||||||
|
// World Bank 中国是 CHN, 美国是 USA
|
||||||
|
function countryCodeOf(name) {
|
||||||
|
if (name.startsWith('china-')) return 'CHN'
|
||||||
|
if (name.startsWith('usa-')) return 'USA'
|
||||||
|
throw new Error('Unknown country for ' + name)
|
||||||
|
}
|
||||||
|
|
||||||
|
// 拉单个指标从 startYear 到当前年
|
||||||
|
// 返回 { name, groupName, title, unit, rows: [{ year, value }] }
|
||||||
|
// 注意: WB 对连续请求会限流返回 400 Invalid value, 加 3 次退避重试
|
||||||
|
export async function fetchIndicator(meta, startYear = 2015) {
|
||||||
|
const country = countryCodeOf(meta.name)
|
||||||
|
const currentYear = new Date().getFullYear()
|
||||||
|
const url = `${WB_BASE}/country/${country}/indicator/${meta.id}?format=json&date=${startYear}:${currentYear}&per_page=200`
|
||||||
|
|
||||||
|
let resp
|
||||||
|
const delays = [0, 1500, 4000]
|
||||||
|
for (let attempt = 0; attempt < delays.length; attempt++) {
|
||||||
|
if (delays[attempt]) await new Promise((r) => setTimeout(r, delays[attempt]))
|
||||||
|
try {
|
||||||
|
resp = await axios.get(url, { timeout: TIMEOUT, headers: { 'User-Agent': 'iboard-refresh/1.0' } })
|
||||||
|
break
|
||||||
|
} catch (e) {
|
||||||
|
if (attempt === delays.length - 1) throw e
|
||||||
|
console.log(`[WB] ${meta.name} 请求失败, ${delays[attempt + 1] / 1000}s 后重试 (${e.message})`)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// WB 返回: [{page,pages,per_page,total,...}, [{indicator, country, value, date}, ...]]
|
||||||
|
const data = resp.data
|
||||||
|
if (!Array.isArray(data) || data.length < 2 || !Array.isArray(data[1])) {
|
||||||
|
throw new Error('World Bank 返回结构异常: ' + JSON.stringify(data).slice(0, 200))
|
||||||
|
}
|
||||||
|
const points = data[1]
|
||||||
|
.filter((p) => p.value !== null && p.value !== undefined)
|
||||||
|
.map((p) => ({
|
||||||
|
year: String(p.date),
|
||||||
|
value: Number((Number(p.value) * meta.scale).toFixed(meta.digits)),
|
||||||
|
}))
|
||||||
|
.sort((a, b) => Number(a.year) - Number(b.year))
|
||||||
|
|
||||||
|
return {
|
||||||
|
name: meta.name,
|
||||||
|
groupName: meta.groupName,
|
||||||
|
data: {
|
||||||
|
unit: meta.unit,
|
||||||
|
title: meta.title,
|
||||||
|
source: 'World Bank API',
|
||||||
|
rows: points,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export const META = {
|
||||||
|
name: 'wb-indicators',
|
||||||
|
description: 'World Bank 官方 API 宏观数据',
|
||||||
|
docs: 'https://datahelpdesk.worldbank.org/knowledgebase/articles/898581',
|
||||||
|
}
|
||||||
|
|
||||||
|
// 拉全部 (返回符合 fetcher 契约的 [{name, groupName, data}, ...])
|
||||||
|
// 错误隔离: 单个指标失败 -> 跳过 + 记日志, 不影响其他
|
||||||
|
// opts.skipNames: Set<string> — DB 已存在的指标名, 跳过不拉 (WB 免费但也要省请求)
|
||||||
|
export async function fetchAll(opts = {}) {
|
||||||
|
const skip = opts.skipNames || new Set()
|
||||||
|
const startYear = 2015
|
||||||
|
const results = []
|
||||||
|
for (const m of WB_INDICATORS) {
|
||||||
|
if (skip.has(m.name)) {
|
||||||
|
console.log(`[WB] ${m.name} 跳过 (DB 已存在)`)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
const r = await fetchIndicator(m, startYear)
|
||||||
|
console.log(`[WB] ${r.name} OK, ${r.data.rows.length} rows (${r.data.rows[0]?.year}..${r.data.rows.at(-1)?.year})`)
|
||||||
|
results.push(r)
|
||||||
|
} catch (e) {
|
||||||
|
console.error(`[WB] ${m.name} FAIL: ${e.message}`)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// 全部被 DB 优先跳过时, 返回显式标记而不是空数组 (避免被误判为失败)
|
||||||
|
if (results.length === 0 && WB_INDICATORS.every((m) => skip.has(m.name))) {
|
||||||
|
return { skipped: true, reason: 'DB 已存在全部指标' }
|
||||||
|
}
|
||||||
|
return results
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -0,0 +1,119 @@
|
|||||||
|
#!/usr/bin/env node
|
||||||
|
// 一次性导入浙江省油价历史 (2025-2026)
|
||||||
|
// 来源: 手工整理 (省发改委公告 / 潮新闻 / 钱江晚报 / 杭州日报 / 杭州网 等)
|
||||||
|
// 用法: node --experimental-strip-types --no-warnings scripts/import-oil-history.mjs [--dry]
|
||||||
|
|
||||||
|
import path from 'node:path'
|
||||||
|
import { fileURLToPath, pathToFileURL } from 'node:url'
|
||||||
|
import 'dotenv/config'
|
||||||
|
|
||||||
|
const __filename = fileURLToPath(import.meta.url)
|
||||||
|
const __dirname = path.dirname(__filename)
|
||||||
|
const ROOT = path.resolve(__dirname, '..')
|
||||||
|
|
||||||
|
// 接入 prisma (用 file:// URL 避免 Windows 绝对路径 import 报错)
|
||||||
|
const adapterMod = await import('@prisma/adapter-mariadb')
|
||||||
|
const clientPath = pathToFileURL(path.join(ROOT, 'generated/prisma/client.ts')).href
|
||||||
|
const { PrismaClient } = await import(clientPath)
|
||||||
|
|
||||||
|
const adapter = new adapterMod.PrismaMariaDb((() => {
|
||||||
|
const u = new URL(process.env.DATABASE_URL)
|
||||||
|
return {
|
||||||
|
host: u.hostname,
|
||||||
|
port: Number(u.port) || 3306,
|
||||||
|
user: decodeURIComponent(u.username),
|
||||||
|
password: decodeURIComponent(u.password),
|
||||||
|
database: u.pathname.replace(/^\//, ''),
|
||||||
|
}
|
||||||
|
})())
|
||||||
|
const prisma = new PrismaClient({ adapter })
|
||||||
|
|
||||||
|
// 数据: [调价日, 92, 95, 0, source]
|
||||||
|
const RAW = [
|
||||||
|
['2026-07-31', 7.94, 8.44, 7.62, 'manual'],
|
||||||
|
['2026-07-17', 7.39, 7.86, 7.06, 'manual'],
|
||||||
|
['2026-06-18', 7.91, 8.41, 7.59, 'manual'],
|
||||||
|
['2026-06-04', 8.32, 8.85, 8.02, 'manual'],
|
||||||
|
['2026-05-21', 8.74, 9.30, 8.45, 'manual'],
|
||||||
|
['2026-02-03', 6.91, 7.35, 6.56, 'manual'],
|
||||||
|
['2025-12-22', 6.68, 7.11, 6.32, 'manual'],
|
||||||
|
['2025-12-08', 6.82, 7.25, 6.46, 'manual'],
|
||||||
|
['2025-11-24', 6.86, null, null, 'manual'],
|
||||||
|
['2025-11-10', 6.92, 7.36, 6.57, 'manual'],
|
||||||
|
['2025-10-13', 7.03, 7.48, 6.68, 'manual'],
|
||||||
|
['2025-06-17', 7.15, 7.60, 6.81, 'manual'],
|
||||||
|
['2025-06-03', 6.94, 7.38, 6.59, 'manual'],
|
||||||
|
]
|
||||||
|
|
||||||
|
const PROVINCE = '浙江'
|
||||||
|
const FUEL_COLS = [
|
||||||
|
{ fuel: '92', idx: 1 },
|
||||||
|
{ fuel: '95', idx: 2 },
|
||||||
|
{ fuel: '0', idx: 3 },
|
||||||
|
]
|
||||||
|
|
||||||
|
const DRY = process.argv.includes('--dry')
|
||||||
|
|
||||||
|
async function main() {
|
||||||
|
console.log('=== 浙江省油价历史导入 ===')
|
||||||
|
console.log('dry run:', DRY)
|
||||||
|
console.log('')
|
||||||
|
|
||||||
|
let inserted = 0
|
||||||
|
let updated = 0
|
||||||
|
let skipped = 0
|
||||||
|
|
||||||
|
for (const row of RAW) {
|
||||||
|
const dateStr = row[0]
|
||||||
|
const source = row[4]
|
||||||
|
for (const { fuel, idx } of FUEL_COLS) {
|
||||||
|
const price = row[idx]
|
||||||
|
if (price == null || Number.isNaN(price)) {
|
||||||
|
console.log('[SKIP] ' + dateStr + ' ' + fuel + ': 价格为空')
|
||||||
|
skipped++
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
const date = new Date(dateStr + 'T00:00:00')
|
||||||
|
if (DRY) {
|
||||||
|
console.log('[DRY] ' + dateStr + ' ' + fuel + ' = ' + price + ' (source=' + source + ')')
|
||||||
|
inserted++
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
await prisma.oilPriceHistory.create({
|
||||||
|
data: { date, province: PROVINCE, fuel, price, source },
|
||||||
|
})
|
||||||
|
console.log('[OK] ' + dateStr + ' ' + fuel + ' = ' + price)
|
||||||
|
inserted++
|
||||||
|
} catch (e) {
|
||||||
|
if (e?.code === 'P2002') {
|
||||||
|
try {
|
||||||
|
await prisma.oilPriceHistory.update({
|
||||||
|
where: { date_province_fuel: { date, province: PROVINCE, fuel } },
|
||||||
|
data: { price, source },
|
||||||
|
})
|
||||||
|
console.log('[UPD] ' + dateStr + ' ' + fuel + ' = ' + price)
|
||||||
|
updated++
|
||||||
|
} catch (e2) {
|
||||||
|
console.log('[ERR] ' + dateStr + ' ' + fuel + ': ' + e2.message)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
console.log('[ERR] ' + dateStr + ' ' + fuel + ': ' + e.message)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log('')
|
||||||
|
console.log('=== 汇总 ===')
|
||||||
|
console.log('插入: ' + inserted)
|
||||||
|
console.log('更新: ' + updated)
|
||||||
|
console.log('跳过: ' + skipped)
|
||||||
|
|
||||||
|
await prisma.$disconnect()
|
||||||
|
}
|
||||||
|
|
||||||
|
main().catch((e) => {
|
||||||
|
console.error(e)
|
||||||
|
process.exit(1)
|
||||||
|
})
|
||||||
@@ -0,0 +1,84 @@
|
|||||||
|
/**
|
||||||
|
* 一次性数据迁移: 把 Indicator.data (JSON) 拆分到 IndicatorPoint 明细表
|
||||||
|
* 用法: 在迁移 A (建表+加列) 之后、迁移 B (删 data 列) 之前运行
|
||||||
|
* 幂等: 同 (indicatorId, period) 重复插入会更新 value, 可安全重跑
|
||||||
|
*/
|
||||||
|
require('dotenv').config()
|
||||||
|
const mysql = require('mysql2/promise')
|
||||||
|
|
||||||
|
function parseUrl(url) {
|
||||||
|
const u = new URL(url)
|
||||||
|
return {
|
||||||
|
host: u.hostname,
|
||||||
|
port: Number(u.port) || 3306,
|
||||||
|
user: decodeURIComponent(u.username),
|
||||||
|
password: decodeURIComponent(u.password),
|
||||||
|
database: u.pathname.replace(/^\//, ''),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 根据 row 的时间字段推断频率: year | quarter | month | day
|
||||||
|
function inferFrequency(row) {
|
||||||
|
if (row && row.month !== undefined) return 'month'
|
||||||
|
if (row && row.year !== undefined) return 'year'
|
||||||
|
const p = String((row && row.period) || '')
|
||||||
|
if (/^\d{4}$/.test(p)) return 'year'
|
||||||
|
if (/^\d{4}-Q[1-4]$/.test(p)) return 'quarter'
|
||||||
|
if (/^\d{4}-\d{2}$/.test(p)) return 'month'
|
||||||
|
if (/^\d{4}-\d{2}-\d{2}$/.test(p)) return 'day'
|
||||||
|
return 'month'
|
||||||
|
}
|
||||||
|
|
||||||
|
// 统一 row 的时间字段为 period
|
||||||
|
function periodOf(row) {
|
||||||
|
if (!row) return ''
|
||||||
|
return String(row.period !== undefined ? row.period : (row.month !== undefined ? row.month : row.year))
|
||||||
|
}
|
||||||
|
|
||||||
|
async function main() {
|
||||||
|
const conn = await mysql.createConnection(parseUrl(process.env.DATABASE_URL))
|
||||||
|
try {
|
||||||
|
const [rows] = await conn.execute('SELECT id, name, groupName, data FROM Indicator')
|
||||||
|
console.log('[Migrate] 读取', rows.length, '个 Indicator')
|
||||||
|
|
||||||
|
let points = 0, updated = 0
|
||||||
|
for (const ind of rows) {
|
||||||
|
// mysql2 对 JSON 列已自动解析为对象, 兼容字符串兜底
|
||||||
|
let data = ind.data
|
||||||
|
if (typeof data === 'string') {
|
||||||
|
try { data = JSON.parse(data) } catch { data = null }
|
||||||
|
}
|
||||||
|
const title = (data && data.title) || ind.name
|
||||||
|
const unit = (data && data.unit) || ''
|
||||||
|
const source = (data && data.source) || ''
|
||||||
|
const rowsArr = (data && Array.isArray(data.rows)) ? data.rows : []
|
||||||
|
const freq = rowsArr.length ? inferFrequency(rowsArr[0]) : 'month'
|
||||||
|
|
||||||
|
// 更新 Indicator 元数据列
|
||||||
|
await conn.execute(
|
||||||
|
'UPDATE Indicator SET title=?, unit=?, source=?, frequency=?, updatedAt=NOW(3) WHERE id=?',
|
||||||
|
[title, unit, source, freq, ind.id],
|
||||||
|
)
|
||||||
|
updated++
|
||||||
|
|
||||||
|
// 写入明细
|
||||||
|
for (const r of rowsArr) {
|
||||||
|
const period = periodOf(r)
|
||||||
|
const value = Number(r.value)
|
||||||
|
if (!period || Number.isNaN(value)) continue
|
||||||
|
const [res] = await conn.execute(
|
||||||
|
'INSERT INTO IndicatorPoint (indicatorId, period, value, createdAt, updatedAt) VALUES (?, ?, ?, NOW(3), NOW(3)) ' +
|
||||||
|
'ON DUPLICATE KEY UPDATE value=VALUES(value), updatedAt=NOW(3)',
|
||||||
|
[ind.id, period, value],
|
||||||
|
)
|
||||||
|
points += (res.affectedRows > 0 ? 1 : 0)
|
||||||
|
}
|
||||||
|
console.log('[Migrate]', ind.name, '->', rowsArr.length, '个点, 频率', freq)
|
||||||
|
}
|
||||||
|
console.log('[Migrate] 完成: 更新', updated, '个 Indicator, 写入/更新', points, '个明细点')
|
||||||
|
} finally {
|
||||||
|
await conn.end()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
main().catch((e) => { console.error('[Migrate] 失败:', e); process.exit(1) })
|
||||||
@@ -0,0 +1,185 @@
|
|||||||
|
/**
|
||||||
|
* 拉所有启用的数据源, upsert 到 Indicator + IndicatorPoint 明细表
|
||||||
|
* 用法:
|
||||||
|
* npm run data:refresh # 只拉 DB 里没有的指标
|
||||||
|
* npm run data:refresh -- --force a,b,c # 强制刷新指定指标 (忽略 DB 已有)
|
||||||
|
*
|
||||||
|
* 数据结构 (2026-08 重构):
|
||||||
|
* Indicator 元数据: name/groupName/title/unit/source/frequency/hidden
|
||||||
|
* IndicatorPoint 明细: (indicatorId, period, value), period 兼容年/季/月/日
|
||||||
|
*
|
||||||
|
* DB 优先策略:
|
||||||
|
* 1. 先从 DB 查已存在的 name 集合
|
||||||
|
* 2. 把集合传给每个 fetcher, fetcher 跳过已存在的
|
||||||
|
* 3. 只对 DB 没有的指标调远程拉取, 节省 token (尤其妙想 MCP 这种 LLM 接口)
|
||||||
|
*
|
||||||
|
* 加新数据源: 写 scripts/fetchers/<name>.fetcher.js 导出 META + fetchAll(opts),
|
||||||
|
* 然后在 scripts/fetchers/index.js 的 FETCHERS 注册
|
||||||
|
*/
|
||||||
|
require('dotenv').config()
|
||||||
|
const mysql = require('mysql2/promise')
|
||||||
|
|
||||||
|
// 隐藏指标: 数据与获取脚本保留, 但不参与前端展示 (API 过滤)
|
||||||
|
const HIDDEN_INDICATORS = new Set([
|
||||||
|
'china-gdp-usd', // 中国 GDP (现价美元)
|
||||||
|
'china-gdp-growth', // 中国 GDP 同比 (World Bank)
|
||||||
|
'china-gdp-yoy', // 中国 GDP 同比 (妙想季度)
|
||||||
|
'china-unemploy', // 中国失业率
|
||||||
|
'usa-gdp-usd', // 美国 GDP
|
||||||
|
])
|
||||||
|
|
||||||
|
function parseUrl(url) {
|
||||||
|
const u = new URL(url)
|
||||||
|
return {
|
||||||
|
host: u.hostname,
|
||||||
|
port: Number(u.port) || 3306,
|
||||||
|
user: decodeURIComponent(u.username),
|
||||||
|
password: decodeURIComponent(u.password),
|
||||||
|
database: u.pathname.replace(/^\//, ''),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function parseForceArg(argv) {
|
||||||
|
const i = argv.indexOf('--force')
|
||||||
|
if (i === -1) return new Set()
|
||||||
|
return new Set(String(argv[i + 1] || '').split(',').map((s) => s.trim()).filter(Boolean))
|
||||||
|
}
|
||||||
|
|
||||||
|
// 推断频率: year | quarter | month | day (优先用 fetcher 显式声明)
|
||||||
|
function inferFrequency(data) {
|
||||||
|
if (data && data.frequency) return data.frequency
|
||||||
|
const p = String(((data && data.rows) || [])[0]?.period || '')
|
||||||
|
if (/^\d{4}$/.test(p)) return 'year'
|
||||||
|
if (/^\d{4}-Q[1-4]$/.test(p)) return 'quarter'
|
||||||
|
if (/^\d{4}-\d{2}$/.test(p)) return 'month'
|
||||||
|
if (/^\d{4}-\d{2}-\d{2}$/.test(p)) return 'day'
|
||||||
|
return 'month'
|
||||||
|
}
|
||||||
|
|
||||||
|
// 写 Indicator 元数据 + 全量替换明细点 (每指标一个事务)
|
||||||
|
async function upsertIndicatorWithPoints(conn, payload) {
|
||||||
|
const { name, groupName, data, hidden } = payload
|
||||||
|
const title = data.title || name
|
||||||
|
const unit = data.unit || ''
|
||||||
|
const source = data.source || ''
|
||||||
|
const frequency = inferFrequency(data)
|
||||||
|
const rows = Array.isArray(data.rows) ? data.rows : []
|
||||||
|
|
||||||
|
await conn.beginTransaction()
|
||||||
|
try {
|
||||||
|
const [res] = await conn.execute(
|
||||||
|
'INSERT INTO `Indicator` (`name`, `groupName`, `title`, `unit`, `source`, `frequency`, `hidden`, `createdAt`, `updatedAt`) ' +
|
||||||
|
'VALUES (?, ?, ?, ?, ?, ?, ?, NOW(3), NOW(3)) ' +
|
||||||
|
'ON DUPLICATE KEY UPDATE `groupName` = VALUES(`groupName`), `title` = VALUES(`title`), ' +
|
||||||
|
'`unit` = VALUES(`unit`), `source` = VALUES(`source`), `frequency` = VALUES(`frequency`), ' +
|
||||||
|
'`hidden` = VALUES(`hidden`), `updatedAt` = NOW(3)',
|
||||||
|
[name, groupName, title, unit, source, frequency, hidden ? 1 : 0],
|
||||||
|
)
|
||||||
|
const indicatorId = res.insertId
|
||||||
|
|
||||||
|
// 明细: 先删旧点再插入新点 (全量替换, 保证与数据源一致)
|
||||||
|
await conn.execute('DELETE FROM `IndicatorPoint` WHERE `indicatorId` = ?', [indicatorId])
|
||||||
|
let points = 0
|
||||||
|
for (const r of rows) {
|
||||||
|
const period = String(r.period !== undefined ? r.period : (r.month !== undefined ? r.month : r.year))
|
||||||
|
const value = Number(r.value)
|
||||||
|
if (!period || Number.isNaN(value)) continue
|
||||||
|
await conn.execute(
|
||||||
|
'INSERT INTO `IndicatorPoint` (`indicatorId`, `period`, `value`, `createdAt`, `updatedAt`) VALUES (?, ?, ?, NOW(3), NOW(3))',
|
||||||
|
[indicatorId, period, value],
|
||||||
|
)
|
||||||
|
points++
|
||||||
|
}
|
||||||
|
await conn.commit()
|
||||||
|
return { indicatorId, points }
|
||||||
|
} catch (e) {
|
||||||
|
await conn.rollback()
|
||||||
|
throw e
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function fetchExistingNames(conn) {
|
||||||
|
const [rows] = await conn.execute('SELECT `name` FROM `Indicator`')
|
||||||
|
return new Set(rows.map((r) => r.name))
|
||||||
|
}
|
||||||
|
|
||||||
|
async function main() {
|
||||||
|
if (!process.env.DATABASE_URL) {
|
||||||
|
console.error('缺少 DATABASE_URL 环境变量')
|
||||||
|
process.exit(1)
|
||||||
|
}
|
||||||
|
const force = parseForceArg(process.argv.slice(2))
|
||||||
|
if (force.size) console.log('[Refresh] 强制刷新: ' + [...force].join(', '))
|
||||||
|
|
||||||
|
const conn = await mysql.createConnection(parseUrl(process.env.DATABASE_URL))
|
||||||
|
try {
|
||||||
|
// 1) 查 DB 已存在的指标名
|
||||||
|
const existing = await fetchExistingNames(conn)
|
||||||
|
console.log('[Refresh] DB 已有 ' + existing.size + ' 个指标: ' + ([...existing].join(', ') || '(空)'))
|
||||||
|
|
||||||
|
// 2) 跑所有 fetcher, 传入 existing + force (DB 优先, force 覆盖)
|
||||||
|
const { runFetchers } = await import('./fetchers/index.js')
|
||||||
|
const fetcherResults = await runFetchers({ skipNames: existing, forceNames: force })
|
||||||
|
|
||||||
|
// 3) 汇总: force 名单里的指标即使 DB 已有也写入
|
||||||
|
const allItems = []
|
||||||
|
let skipped = 0, failed = 0
|
||||||
|
for (const r of fetcherResults) {
|
||||||
|
if (r.skipped) { skipped++; continue }
|
||||||
|
if (!r.ok) { failed++; continue }
|
||||||
|
for (const it of r.items) {
|
||||||
|
if (existing.has(it.name) && !force.has(it.name)) continue
|
||||||
|
allItems.push(it)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
console.log('\n[Refresh] 汇总: ' + allItems.length + ' 个指标待写 (跳过 ' + skipped + ' 个数据源, 失败 ' + failed + ' 个, DB 已存在 ' + existing.size + ' 个)')
|
||||||
|
|
||||||
|
if (failed > 0) {
|
||||||
|
console.error('[Refresh] 警告: 有数据源失败, 仅写入成功的指标')
|
||||||
|
}
|
||||||
|
|
||||||
|
// 5) 同步隐藏标记: 即使指标被 DB 优先跳过, 名单内的也确保 hidden=true
|
||||||
|
if (HIDDEN_INDICATORS.size > 0) {
|
||||||
|
const names = [...HIDDEN_INDICATORS]
|
||||||
|
const ph = names.map(() => '?').join(',')
|
||||||
|
const sql = "UPDATE `Indicator` SET `hidden` = 1, `updatedAt` = NOW(3) WHERE `name` IN (" + ph + ")"
|
||||||
|
await conn.execute(sql, names)
|
||||||
|
console.log('[Refresh] 同步隐藏标记: ' + names.length + ' 个指标 hidden=true (数据保留, 不展示)')
|
||||||
|
}
|
||||||
|
|
||||||
|
// 6) 跨源对比报警: 全量跑一次 (即便无新指标也跑, 防止上次漏检)
|
||||||
|
try {
|
||||||
|
const m = await import('../server/alert-engine.js')
|
||||||
|
const a = await m.checkAfterRefresh(conn)
|
||||||
|
console.log('[Refresh] 报警检测: 新增 ' + a.inserted + ' 条 (扫描 ' + a.scanned + ')')
|
||||||
|
} catch (e) { console.error('[Refresh] 报警检测异常:', e.message) }
|
||||||
|
|
||||||
|
if (allItems.length === 0) {
|
||||||
|
console.log('[Refresh] 无指标待写, 不写库 (DB 优先策略生效)')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// 4) 写库
|
||||||
|
console.log('[Refresh] 写入数据库...')
|
||||||
|
let ins = 0, upd = 0, totalPoints = 0
|
||||||
|
for (const it of allItems) {
|
||||||
|
const hidden = HIDDEN_INDICATORS.has(it.name)
|
||||||
|
const { points } = await upsertIndicatorWithPoints(conn, { name: it.name, groupName: it.groupName, data: it.data, hidden })
|
||||||
|
if (points > 0) ins++
|
||||||
|
else upd++
|
||||||
|
totalPoints += points
|
||||||
|
console.log('[Refresh] ' + it.name + (hidden ? ' (hidden)' : '') + ': ' + points + ' 个明细点')
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
} finally {
|
||||||
|
await conn.end()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
main().catch((e) => {
|
||||||
|
console.error('[Refresh] 异常:', e)
|
||||||
|
process.exit(1)
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
@@ -0,0 +1,338 @@
|
|||||||
|
import { createPool } from 'mariadb';
|
||||||
|
import { fetch as fetchSH300Data } from '../fetchers/sh300.fetcher.js';
|
||||||
|
import fs from 'fs';
|
||||||
|
import path from 'path';
|
||||||
|
|
||||||
|
let pool;
|
||||||
|
|
||||||
|
function loadDatabaseConfig() {
|
||||||
|
const envPath = path.join(process.cwd(), '.env');
|
||||||
|
if (fs.existsSync(envPath)) {
|
||||||
|
console.log('读取 .env 文件...');
|
||||||
|
const envContent = fs.readFileSync(envPath, 'utf-8');
|
||||||
|
const lines = envContent.split('\n');
|
||||||
|
|
||||||
|
for (const line of lines) {
|
||||||
|
const trimmedLine = line.trim();
|
||||||
|
if (trimmedLine.startsWith('DATABASE_URL=')) {
|
||||||
|
const url = trimmedLine.substring('DATABASE_URL='.length).replace(/^"|"$/g, '');
|
||||||
|
console.log('从 .env 文件获取数据库配置成功!');
|
||||||
|
console.log(`DATABASE_URL: ${url}`);
|
||||||
|
|
||||||
|
// 解析URL
|
||||||
|
const parts = url.split('://')[1].split('@');
|
||||||
|
const auth = parts[0].split(':');
|
||||||
|
const hostAndDb = parts[1].split('/');
|
||||||
|
const hostAndPort = hostAndDb[0].split(':');
|
||||||
|
|
||||||
|
return {
|
||||||
|
user: auth[0],
|
||||||
|
password: auth[1],
|
||||||
|
host: hostAndPort[0],
|
||||||
|
port: parseInt(hostAndPort[1]),
|
||||||
|
database: hostAndDb[1]
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log('未找到 .env 文件或 DATABASE_URL 配置，使用默认配置');
|
||||||
|
return {
|
||||||
|
host: '192.168.111.111',
|
||||||
|
port: 3306,
|
||||||
|
user: 'root',
|
||||||
|
password: 'fullstack',
|
||||||
|
database: 'iboard'
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
async function initPool() {
|
||||||
|
if (!pool) {
|
||||||
|
console.log('初始化数据库连接池...');
|
||||||
|
const config = loadDatabaseConfig();
|
||||||
|
|
||||||
|
console.log('数据库配置:');
|
||||||
|
console.log(` 主机: ${config.host}`);
|
||||||
|
console.log(` 端口: ${config.port}`);
|
||||||
|
console.log(` 用户: ${config.user}`);
|
||||||
|
console.log(` 数据库: ${config.database}`);
|
||||||
|
|
||||||
|
pool = createPool({
|
||||||
|
host: config.host,
|
||||||
|
port: config.port,
|
||||||
|
user: config.user,
|
||||||
|
password: config.password,
|
||||||
|
database: config.database,
|
||||||
|
connectionLimit: 5
|
||||||
|
});
|
||||||
|
|
||||||
|
try {
|
||||||
|
const conn = await pool.getConnection();
|
||||||
|
console.log('数据库连接成功!');
|
||||||
|
conn.release();
|
||||||
|
} catch (error) {
|
||||||
|
console.error('数据库连接失败:', error.message);
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return pool;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function checkAndFillSH300Data(startDate = null, endDate = null) {
|
||||||
|
try {
|
||||||
|
await initPool();
|
||||||
|
|
||||||
|
console.log('='.repeat(60));
|
||||||
|
console.log('开始检查和补充沪深300指数数据...');
|
||||||
|
console.log('='.repeat(60));
|
||||||
|
|
||||||
|
const currentDate = new Date();
|
||||||
|
|
||||||
|
if (!startDate) {
|
||||||
|
startDate = new Date(currentDate);
|
||||||
|
startDate.setDate(startDate.getDate() - 30);
|
||||||
|
startDate = startDate.toISOString().split('T')[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!endDate) {
|
||||||
|
endDate = currentDate.toISOString().split('T')[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log(`检查时间范围: ${startDate} 至 ${endDate}`);
|
||||||
|
|
||||||
|
// 1. 检查数据库中是否存在沪深300指数数据表
|
||||||
|
const hasTable = await checkTableExists();
|
||||||
|
if (!hasTable) {
|
||||||
|
console.log('创建沪深300指数数据表...');
|
||||||
|
await createSH300Table();
|
||||||
|
}
|
||||||
|
|
||||||
|
// 2. 检查数据库中已有的数据
|
||||||
|
const existingData = await getExistingSH300Data(startDate, endDate);
|
||||||
|
console.log(`数据库中已有 ${existingData.length} 条数据`);
|
||||||
|
|
||||||
|
// 3. 计算缺失的日期
|
||||||
|
const missingDates = calculateMissingDates(startDate, endDate, existingData);
|
||||||
|
console.log(`缺失 ${missingDates.length} 天的数据`);
|
||||||
|
|
||||||
|
// 4. 如果有缺失，调用 fetcher 补足
|
||||||
|
if (missingDates.length > 0) {
|
||||||
|
console.log('\n开始获取缺失的沪深300指数数据...');
|
||||||
|
|
||||||
|
const firstMissingDate = missingDates[0];
|
||||||
|
const lastMissingDate = missingDates[missingDates.length - 1];
|
||||||
|
|
||||||
|
console.log(`获取范围: ${firstMissingDate} 至 ${lastMissingDate}`);
|
||||||
|
|
||||||
|
const fetchedData = await fetchSH300Data(firstMissingDate, lastMissingDate);
|
||||||
|
|
||||||
|
console.log(`\n获取到 ${fetchedData.count} 条数据`);
|
||||||
|
|
||||||
|
// 5. 存储新数据到数据库
|
||||||
|
const storedCount = await storeSH300Data(fetchedData.data);
|
||||||
|
console.log(`成功存储 ${storedCount} 条数据`);
|
||||||
|
} else {
|
||||||
|
console.log('\n数据库数据完整，无需补充');
|
||||||
|
}
|
||||||
|
|
||||||
|
// 6. 验证最终数据完整性
|
||||||
|
const finalData = await getExistingSH300Data(startDate, endDate);
|
||||||
|
console.log(`\n验证后的数据总量: ${finalData.length} 条`);
|
||||||
|
|
||||||
|
return {
|
||||||
|
startDate,
|
||||||
|
endDate,
|
||||||
|
existingCount: existingData.length,
|
||||||
|
missingCount: missingDates.length,
|
||||||
|
finalCount: finalData.length,
|
||||||
|
success: true
|
||||||
|
};
|
||||||
|
|
||||||
|
} catch (error) {
|
||||||
|
console.error('检查和补充沪深300指数数据失败:', error.message);
|
||||||
|
throw error;
|
||||||
|
} finally {
|
||||||
|
if (pool) {
|
||||||
|
await pool.end();
|
||||||
|
console.log('数据库连接池已关闭');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function checkTableExists() {
|
||||||
|
try {
|
||||||
|
console.log('检查沪深300指数数据表是否存在...');
|
||||||
|
const result = await pool.query('SHOW TABLES LIKE ?', ['econ_SH300Index']);
|
||||||
|
return result.length > 0;
|
||||||
|
} catch (error) {
|
||||||
|
console.error('检查表存在失败:', error.message);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function createSH300Table() {
|
||||||
|
try {
|
||||||
|
console.log('执行创建沪深300指数数据表SQL...');
|
||||||
|
await pool.query(`
|
||||||
|
CREATE TABLE IF NOT EXISTS econ_SH300Index (
|
||||||
|
id INT AUTO_INCREMENT PRIMARY KEY,
|
||||||
|
date DATE UNIQUE NOT NULL,
|
||||||
|
symbol VARCHAR(10) NOT NULL,
|
||||||
|
open DECIMAL(10,2) NOT NULL,
|
||||||
|
close DECIMAL(10,2) NOT NULL,
|
||||||
|
high DECIMAL(10,2) NOT NULL,
|
||||||
|
low DECIMAL(10,2) NOT NULL,
|
||||||
|
volume DECIMAL(20,2) NOT NULL,
|
||||||
|
amount DECIMAL(20,2) NOT NULL,
|
||||||
|
source VARCHAR(100) NOT NULL,
|
||||||
|
createdAt TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
updatedAt TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
|
||||||
|
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
|
||||||
|
`);
|
||||||
|
console.log('沪深300指数数据表创建成功');
|
||||||
|
} catch (error) {
|
||||||
|
console.error('创建沪深300指数数据表失败:', error.message);
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function getExistingSH300Data(startDate, endDate) {
|
||||||
|
try {
|
||||||
|
console.log('查询已有沪深300指数数据...');
|
||||||
|
const result = await pool.query(
|
||||||
|
'SELECT date FROM econ_SH300Index WHERE date BETWEEN ? AND ? ORDER BY date',
|
||||||
|
[startDate, endDate]
|
||||||
|
);
|
||||||
|
const dates = result.map(row => {
|
||||||
|
if (row.date instanceof Date) {
|
||||||
|
return row.date.toISOString().split('T')[0];
|
||||||
|
} else if (typeof row.date === 'string') {
|
||||||
|
return row.date;
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}).filter(Boolean);
|
||||||
|
console.log(`查询到 ${dates.length} 条数据`);
|
||||||
|
return dates;
|
||||||
|
} catch (error) {
|
||||||
|
console.error('查询已有沪深300指数数据失败:', error.message);
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function calculateMissingDates(startDate, endDate, existingDates) {
|
||||||
|
const existingSet = new Set(existingDates);
|
||||||
|
const missingDates = [];
|
||||||
|
|
||||||
|
const currentDate = new Date(startDate);
|
||||||
|
const finalDate = new Date(endDate);
|
||||||
|
|
||||||
|
while (currentDate <= finalDate) {
|
||||||
|
const dateStr = currentDate.toISOString().split('T')[0];
|
||||||
|
const dayOfWeek = currentDate.getDay();
|
||||||
|
|
||||||
|
// 跳过周末（周末没有股市数据）
|
||||||
|
if (dayOfWeek !== 0 && dayOfWeek !== 6) {
|
||||||
|
if (!existingSet.has(dateStr)) {
|
||||||
|
missingDates.push(dateStr);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
currentDate.setDate(currentDate.getDate() + 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
return missingDates;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function storeSH300Data(data) {
|
||||||
|
let storedCount = 0;
|
||||||
|
|
||||||
|
for (const item of data) {
|
||||||
|
try {
|
||||||
|
await pool.query(
|
||||||
|
'INSERT INTO econ_SH300Index (date, symbol, open, close, high, low, volume, amount, source) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?) ON DUPLICATE KEY UPDATE open = VALUES(open), close = VALUES(close), high = VALUES(high), low = VALUES(low), volume = VALUES(volume), amount = VALUES(amount), source = VALUES(source)',
|
||||||
|
[item.date, 'sh000300', item.open, item.close, item.high, item.low, item.volume, item.amount, item.source]
|
||||||
|
);
|
||||||
|
storedCount++;
|
||||||
|
} catch (error) {
|
||||||
|
console.error(`存储沪深300指数数据 ${item.date} 失败:`, error.message);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return storedCount;
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function trigger(startDate = null, endDate = null) {
|
||||||
|
return await checkAndFillSH300Data(startDate, endDate);
|
||||||
|
}
|
||||||
|
|
||||||
|
function parseCommandLineArgs() {
|
||||||
|
const args = process.argv.slice(2);
|
||||||
|
let startDate = null;
|
||||||
|
let endDate = null;
|
||||||
|
|
||||||
|
for (let i = 0; i < args.length; i++) {
|
||||||
|
if (args[i] === '--start' && i + 1 < args.length) {
|
||||||
|
startDate = args[i + 1];
|
||||||
|
i++;
|
||||||
|
} else if (args[i] === '--end' && i + 1 < args.length) {
|
||||||
|
endDate = args[i + 1];
|
||||||
|
i++;
|
||||||
|
} else if (args[i] === '--help') {
|
||||||
|
console.log('使用方法:');
|
||||||
|
console.log(' bun sh300.scraper.js [选项]');
|
||||||
|
console.log('');
|
||||||
|
console.log('选项:');
|
||||||
|
console.log(' --start YYYY-MM-DD 指定开始日期');
|
||||||
|
console.log(' --end YYYY-MM-DD 指定结束日期');
|
||||||
|
console.log(' --help 显示帮助信息');
|
||||||
|
console.log('');
|
||||||
|
console.log('示例:');
|
||||||
|
console.log(' bun sh300.scraper.js');
|
||||||
|
console.log(' bun sh300.scraper.js --start 2024-01-01 --end 2024-01-31');
|
||||||
|
process.exit(0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return { startDate, endDate };
|
||||||
|
}
|
||||||
|
|
||||||
|
async function runTest() {
|
||||||
|
console.log('='.repeat(60));
|
||||||
|
console.log('测试 sh300.scraper.js');
|
||||||
|
console.log('='.repeat(60));
|
||||||
|
|
||||||
|
const { startDate, endDate } = parseCommandLineArgs();
|
||||||
|
|
||||||
|
if (startDate) {
|
||||||
|
console.log(`\n使用命令行参数:`);
|
||||||
|
console.log(` 开始日期: ${startDate}`);
|
||||||
|
console.log(` 结束日期: ${endDate || '默认'}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log('\n测试数据库配置读取...');
|
||||||
|
const config = loadDatabaseConfig();
|
||||||
|
console.log('配置读取结果:');
|
||||||
|
console.log(` 主机: ${config.host}`);
|
||||||
|
console.log(` 端口: ${config.port}`);
|
||||||
|
console.log(` 用户: ${config.user}`);
|
||||||
|
console.log(` 数据库: ${config.database}`);
|
||||||
|
console.log('配置读取测试完成!');
|
||||||
|
|
||||||
|
try {
|
||||||
|
const result = await trigger(startDate, endDate);
|
||||||
|
console.log('\n' + '='.repeat(60));
|
||||||
|
console.log('测试结果:');
|
||||||
|
console.log(` 开始日期: ${result.startDate}`);
|
||||||
|
console.log(` 结束日期: ${result.endDate}`);
|
||||||
|
console.log(` 原有数据: ${result.existingCount} 条`);
|
||||||
|
console.log(` 缺失数据: ${result.missingCount} 条`);
|
||||||
|
console.log(` 最终数据: ${result.finalCount} 条`);
|
||||||
|
console.log(` 操作成功: ${result.success}`);
|
||||||
|
console.log('='.repeat(60));
|
||||||
|
} catch (error) {
|
||||||
|
console.error('测试失败:', error);
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
runTest();
|
||||||
@@ -0,0 +1,335 @@
|
|||||||
|
import { createPool } from 'mariadb';
|
||||||
|
import { fetch as fetchUSDToCNYRate } from '../fetchers/usd-cny-rate.fetcher.js';
|
||||||
|
import fs from 'fs';
|
||||||
|
import path from 'path';
|
||||||
|
|
||||||
|
let pool;
|
||||||
|
|
||||||
|
function loadDatabaseConfig() {
|
||||||
|
const envPath = path.join(process.cwd(), '.env');
|
||||||
|
if (fs.existsSync(envPath)) {
|
||||||
|
console.log('读取 .env 文件...');
|
||||||
|
const envContent = fs.readFileSync(envPath, 'utf-8');
|
||||||
|
const lines = envContent.split('\n');
|
||||||
|
|
||||||
|
for (const line of lines) {
|
||||||
|
const trimmedLine = line.trim();
|
||||||
|
if (trimmedLine.startsWith('DATABASE_URL=')) {
|
||||||
|
const url = trimmedLine.substring('DATABASE_URL='.length).replace(/^"|"$/g, '');
|
||||||
|
console.log('从 .env 文件获取数据库配置成功!');
|
||||||
|
console.log(`DATABASE_URL: ${url}`);
|
||||||
|
|
||||||
|
// 解析URL
|
||||||
|
const parts = url.split('://')[1].split('@');
|
||||||
|
const auth = parts[0].split(':');
|
||||||
|
const hostAndDb = parts[1].split('/');
|
||||||
|
const hostAndPort = hostAndDb[0].split(':');
|
||||||
|
|
||||||
|
return {
|
||||||
|
user: auth[0],
|
||||||
|
password: auth[1],
|
||||||
|
host: hostAndPort[0],
|
||||||
|
port: parseInt(hostAndPort[1]),
|
||||||
|
database: hostAndDb[1]
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log('未找到 .env 文件或 DATABASE_URL 配置，使用默认配置');
|
||||||
|
return {
|
||||||
|
host: '192.168.111.111',
|
||||||
|
port: 3306,
|
||||||
|
user: 'root',
|
||||||
|
password: 'fullstack',
|
||||||
|
database: 'iboard'
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
async function initPool() {
|
||||||
|
if (!pool) {
|
||||||
|
console.log('初始化数据库连接池...');
|
||||||
|
const config = loadDatabaseConfig();
|
||||||
|
|
||||||
|
console.log('数据库配置:');
|
||||||
|
console.log(` 主机: ${config.host}`);
|
||||||
|
console.log(` 端口: ${config.port}`);
|
||||||
|
console.log(` 用户: ${config.user}`);
|
||||||
|
console.log(` 数据库: ${config.database}`);
|
||||||
|
|
||||||
|
pool = createPool({
|
||||||
|
host: config.host,
|
||||||
|
port: config.port,
|
||||||
|
user: config.user,
|
||||||
|
password: config.password,
|
||||||
|
database: config.database,
|
||||||
|
connectionLimit: 5
|
||||||
|
});
|
||||||
|
|
||||||
|
try {
|
||||||
|
const conn = await pool.getConnection();
|
||||||
|
console.log('数据库连接成功!');
|
||||||
|
conn.release();
|
||||||
|
} catch (error) {
|
||||||
|
console.error('数据库连接失败:', error.message);
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return pool;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function checkAndFillUSDCNYRate(startDate = null, endDate = null) {
|
||||||
|
try {
|
||||||
|
await initPool();
|
||||||
|
|
||||||
|
console.log('='.repeat(60));
|
||||||
|
console.log('开始检查和补充人民币美元汇率数据...');
|
||||||
|
console.log('='.repeat(60));
|
||||||
|
|
||||||
|
const currentDate = new Date();
|
||||||
|
|
||||||
|
if (!startDate) {
|
||||||
|
startDate = new Date(currentDate);
|
||||||
|
startDate.setDate(startDate.getDate() - 30);
|
||||||
|
startDate = startDate.toISOString().split('T')[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!endDate) {
|
||||||
|
endDate = currentDate.toISOString().split('T')[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log(`检查时间范围: ${startDate} 至 ${endDate}`);
|
||||||
|
|
||||||
|
// 1. 检查数据库中是否存在汇率数据表
|
||||||
|
const hasTable = await checkTableExists();
|
||||||
|
if (!hasTable) {
|
||||||
|
console.log('创建汇率数据表...');
|
||||||
|
await createExchangeRateTable();
|
||||||
|
}
|
||||||
|
|
||||||
|
// 2. 检查数据库中已有的数据
|
||||||
|
const existingData = await getExistingExchangeRates(startDate, endDate);
|
||||||
|
console.log(`数据库中已有 ${existingData.length} 条数据`);
|
||||||
|
|
||||||
|
// 3. 计算缺失的日期
|
||||||
|
const missingDates = calculateMissingDates(startDate, endDate, existingData);
|
||||||
|
console.log(`缺失 ${missingDates.length} 天的数据`);
|
||||||
|
|
||||||
|
// 4. 如果有缺失，调用 fetcher 补足
|
||||||
|
if (missingDates.length > 0) {
|
||||||
|
console.log('\n开始获取缺失的汇率数据...');
|
||||||
|
|
||||||
|
const firstMissingDate = missingDates[0];
|
||||||
|
const lastMissingDate = missingDates[missingDates.length - 1];
|
||||||
|
|
||||||
|
console.log(`获取范围: ${firstMissingDate} 至 ${lastMissingDate}`);
|
||||||
|
|
||||||
|
const fetchedData = await fetchUSDToCNYRate(firstMissingDate, lastMissingDate);
|
||||||
|
|
||||||
|
console.log(`\n获取到 ${fetchedData.count} 条数据`);
|
||||||
|
|
||||||
|
// 5. 存储新数据到数据库
|
||||||
|
const storedCount = await storeExchangeRates(fetchedData.data);
|
||||||
|
console.log(`成功存储 ${storedCount} 条数据`);
|
||||||
|
} else {
|
||||||
|
console.log('\n数据库数据完整，无需补充');
|
||||||
|
}
|
||||||
|
|
||||||
|
// 6. 验证最终数据完整性
|
||||||
|
const finalData = await getExistingExchangeRates(startDate, endDate);
|
||||||
|
console.log(`\n验证后的数据总量: ${finalData.length} 条`);
|
||||||
|
|
||||||
|
return {
|
||||||
|
startDate,
|
||||||
|
endDate,
|
||||||
|
existingCount: existingData.length,
|
||||||
|
missingCount: missingDates.length,
|
||||||
|
finalCount: finalData.length,
|
||||||
|
success: true
|
||||||
|
};
|
||||||
|
|
||||||
|
} catch (error) {
|
||||||
|
console.error('检查和补充汇率数据失败:', error.message);
|
||||||
|
throw error;
|
||||||
|
} finally {
|
||||||
|
if (pool) {
|
||||||
|
await pool.end();
|
||||||
|
console.log('数据库连接池已关闭');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function checkTableExists() {
|
||||||
|
try {
|
||||||
|
console.log('检查汇率数据表是否存在...');
|
||||||
|
const result = await pool.query('SHOW TABLES LIKE ?', ['econ_ExchangeRate']);
|
||||||
|
return result.length > 0;
|
||||||
|
} catch (error) {
|
||||||
|
console.error('检查表存在失败:', error.message);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function createExchangeRateTable() {
|
||||||
|
try {
|
||||||
|
console.log('执行创建汇率数据表SQL...');
|
||||||
|
await pool.query(`
|
||||||
|
CREATE TABLE IF NOT EXISTS econ_ExchangeRate (
|
||||||
|
id INT AUTO_INCREMENT PRIMARY KEY,
|
||||||
|
date DATE UNIQUE NOT NULL,
|
||||||
|
currency VARCHAR(10) NOT NULL,
|
||||||
|
centerPrice DECIMAL(10,4) NOT NULL,
|
||||||
|
sellingRate DECIMAL(10,4) NOT NULL,
|
||||||
|
buyingRate DECIMAL(10,4) NOT NULL,
|
||||||
|
source VARCHAR(100) NOT NULL,
|
||||||
|
createdAt TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
updatedAt TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
|
||||||
|
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
|
||||||
|
`);
|
||||||
|
console.log('汇率数据表创建成功');
|
||||||
|
} catch (error) {
|
||||||
|
console.error('创建汇率数据表失败:', error.message);
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function getExistingExchangeRates(startDate, endDate) {
|
||||||
|
try {
|
||||||
|
console.log('查询已有汇率数据...');
|
||||||
|
const result = await pool.query(
|
||||||
|
'SELECT date FROM econ_ExchangeRate WHERE date BETWEEN ? AND ? ORDER BY date',
|
||||||
|
[startDate, endDate]
|
||||||
|
);
|
||||||
|
const dates = result.map(row => {
|
||||||
|
if (row.date instanceof Date) {
|
||||||
|
return row.date.toISOString().split('T')[0];
|
||||||
|
} else if (typeof row.date === 'string') {
|
||||||
|
return row.date;
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}).filter(Boolean);
|
||||||
|
console.log(`查询到 ${dates.length} 条数据`);
|
||||||
|
return dates;
|
||||||
|
} catch (error) {
|
||||||
|
console.error('查询已有汇率数据失败:', error.message);
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function calculateMissingDates(startDate, endDate, existingDates) {
|
||||||
|
const existingSet = new Set(existingDates);
|
||||||
|
const missingDates = [];
|
||||||
|
|
||||||
|
const currentDate = new Date(startDate);
|
||||||
|
const finalDate = new Date(endDate);
|
||||||
|
|
||||||
|
while (currentDate <= finalDate) {
|
||||||
|
const dateStr = currentDate.toISOString().split('T')[0];
|
||||||
|
const dayOfWeek = currentDate.getDay();
|
||||||
|
|
||||||
|
// 跳过周末（周末没有汇率数据）
|
||||||
|
if (dayOfWeek !== 0 && dayOfWeek !== 6) {
|
||||||
|
if (!existingSet.has(dateStr)) {
|
||||||
|
missingDates.push(dateStr);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
currentDate.setDate(currentDate.getDate() + 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
return missingDates;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function storeExchangeRates(rates) {
|
||||||
|
let storedCount = 0;
|
||||||
|
|
||||||
|
for (const rate of rates) {
|
||||||
|
try {
|
||||||
|
await pool.query(
|
||||||
|
'INSERT INTO econ_ExchangeRate (date, currency, centerPrice, sellingRate, buyingRate, source) VALUES (?, ?, ?, ?, ?, ?) ON DUPLICATE KEY UPDATE centerPrice = VALUES(centerPrice), sellingRate = VALUES(sellingRate), buyingRate = VALUES(buyingRate), source = VALUES(source)',
|
||||||
|
[rate.date, rate.currency, rate.centerPrice, rate.sellingRate, rate.buyingRate, rate.source]
|
||||||
|
);
|
||||||
|
storedCount++;
|
||||||
|
} catch (error) {
|
||||||
|
console.error(`存储汇率数据 ${rate.date} 失败:`, error.message);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return storedCount;
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function trigger(startDate = null, endDate = null) {
|
||||||
|
return await checkAndFillUSDCNYRate(startDate, endDate);
|
||||||
|
}
|
||||||
|
|
||||||
|
function parseCommandLineArgs() {
|
||||||
|
const args = process.argv.slice(2);
|
||||||
|
let startDate = null;
|
||||||
|
let endDate = null;
|
||||||
|
|
||||||
|
for (let i = 0; i < args.length; i++) {
|
||||||
|
if (args[i] === '--start' && i + 1 < args.length) {
|
||||||
|
startDate = args[i + 1];
|
||||||
|
i++;
|
||||||
|
} else if (args[i] === '--end' && i + 1 < args.length) {
|
||||||
|
endDate = args[i + 1];
|
||||||
|
i++;
|
||||||
|
} else if (args[i] === '--help') {
|
||||||
|
console.log('使用方法:');
|
||||||
|
console.log(' bun usd-cny-rate.scraper.js [选项]');
|
||||||
|
console.log('');
|
||||||
|
console.log('选项:');
|
||||||
|
console.log(' --start YYYY-MM-DD 指定开始日期');
|
||||||
|
console.log(' --end YYYY-MM-DD 指定结束日期');
|
||||||
|
console.log(' --help 显示帮助信息');
|
||||||
|
console.log('');
|
||||||
|
console.log('示例:');
|
||||||
|
console.log(' bun usd-cny-rate.scraper.js');
|
||||||
|
console.log(' bun usd-cny-rate.scraper.js --start 2024-01-01 --end 2024-01-31');
|
||||||
|
process.exit(0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return { startDate, endDate };
|
||||||
|
}
|
||||||
|
|
||||||
|
async function runTest() {
|
||||||
|
console.log('='.repeat(60));
|
||||||
|
console.log('测试 usd-cny-rate.scraper.js');
|
||||||
|
console.log('='.repeat(60));
|
||||||
|
|
||||||
|
const { startDate, endDate } = parseCommandLineArgs();
|
||||||
|
|
||||||
|
if (startDate) {
|
||||||
|
console.log(`\n使用命令行参数:`);
|
||||||
|
console.log(` 开始日期: ${startDate}`);
|
||||||
|
console.log(` 结束日期: ${endDate || '默认'}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log('\n测试数据库配置读取...');
|
||||||
|
const config = loadDatabaseConfig();
|
||||||
|
console.log('配置读取结果:');
|
||||||
|
console.log(` 主机: ${config.host}`);
|
||||||
|
console.log(` 端口: ${config.port}`);
|
||||||
|
console.log(` 用户: ${config.user}`);
|
||||||
|
console.log(` 数据库: ${config.database}`);
|
||||||
|
console.log('配置读取测试完成!');
|
||||||
|
|
||||||
|
try {
|
||||||
|
const result = await trigger(startDate, endDate);
|
||||||
|
console.log('\n' + '='.repeat(60));
|
||||||
|
console.log('测试结果:');
|
||||||
|
console.log(` 开始日期: ${result.startDate}`);
|
||||||
|
console.log(` 结束日期: ${result.endDate}`);
|
||||||
|
console.log(` 原有数据: ${result.existingCount} 条`);
|
||||||
|
console.log(` 缺失数据: ${result.missingCount} 条`);
|
||||||
|
console.log(` 最终数据: ${result.finalCount} 条`);
|
||||||
|
console.log(` 操作成功: ${result.success}`);
|
||||||
|
console.log('='.repeat(60));
|
||||||
|
} catch (error) {
|
||||||
|
console.error('测试失败:', error);
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
runTest();
|
||||||
File diff suppressed because one or more lines are too long
+132
-86
@@ -1,87 +1,133 @@
|
|||||||
/**
|
/**
|
||||||
* iBoard 基础数据初始化脚本
|
* iBoard 基础数据初始化脚本
|
||||||
* 用法: npm run db:seed
|
* 用法: npm run db:seed
|
||||||
* 幂等: 主键/唯一键冲突跳过
|
* 幂等: 主键/唯一键冲突跳过, Strategy/Indicator 按 name 存在则更新
|
||||||
*/
|
*/
|
||||||
|
|
||||||
require('dotenv').config();
|
require('dotenv').config();
|
||||||
const crypto = require('crypto');
|
const crypto = require('crypto');
|
||||||
const mysql = require('mysql2/promise');
|
const mysql = require('mysql2/promise');
|
||||||
|
|
||||||
function hashPassword(plain) {
|
function hashPassword(plain) {
|
||||||
const salt = crypto.randomBytes(16).toString('hex');
|
const salt = crypto.randomBytes(16).toString('hex');
|
||||||
const hash = crypto.scryptSync(plain, salt, 64).toString('hex');
|
const hash = crypto.scryptSync(plain, salt, 64).toString('hex');
|
||||||
return 'scrypt$' + salt + '$' + hash;
|
return 'scrypt$' + salt + '$' + hash;
|
||||||
}
|
}
|
||||||
|
|
||||||
function parseUrl(url) {
|
function parseUrl(url) {
|
||||||
const u = new URL(url);
|
const u = new URL(url);
|
||||||
return {
|
return {
|
||||||
host: u.hostname,
|
host: u.hostname,
|
||||||
port: Number(u.port) || 3306,
|
port: Number(u.port) || 3306,
|
||||||
user: decodeURIComponent(u.username),
|
user: decodeURIComponent(u.username),
|
||||||
password: decodeURIComponent(u.password),
|
password: decodeURIComponent(u.password),
|
||||||
database: u.pathname.replace(/^\//, ''),
|
database: u.pathname.replace(/^\//, ''),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
async function insertIgnore(conn, sql, params) {
|
async function insertIgnore(conn, sql, params) {
|
||||||
try {
|
try {
|
||||||
const [r] = await conn.execute(sql, params);
|
const [r] = await conn.execute(sql, params);
|
||||||
return r.affectedRows;
|
return r.affectedRows;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
if (e.code === 'ER_DUP_ENTRY') return 0;
|
if (e.code === 'ER_DUP_ENTRY') return 0;
|
||||||
throw e;
|
throw e;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function main() {
|
async function upsertByName(conn, table, payload, keyField) {
|
||||||
const cfg = parseUrl(process.env.DATABASE_URL);
|
const fields = Object.keys(payload);
|
||||||
if (!cfg.host) throw new Error('DATABASE_URL 未配置或解析失败');
|
const placeholders = fields.map(() => '?').join(', ');
|
||||||
const conn = await mysql.createConnection(cfg);
|
const updateClause = fields
|
||||||
console.log('已连接:', cfg.host + ':' + cfg.port + '/' + cfg.database);
|
.filter((f) => f !== keyField)
|
||||||
|
.map((f) => '`' + f + '` = VALUES(`' + f + '`)')
|
||||||
const adminPwd = hashPassword('admin123');
|
.join(', ');
|
||||||
const n1 = await insertIgnore(
|
const sql = 'INSERT INTO `' + table + '` (' + fields.map((f) => '`' + f + '`').join(', ') + ') VALUES (' + placeholders + ') ON DUPLICATE KEY UPDATE ' + updateClause;
|
||||||
conn,
|
const params = fields.map((f) => payload[f]);
|
||||||
'INSERT INTO `User` (name, email, password, createdAt, updatedAt) VALUES (?, ?, ?, NOW(3), NOW(3))',
|
const [r] = await conn.execute(sql, params);
|
||||||
['Admin', 'admin@iboard.local', adminPwd],
|
return r.affectedRows;
|
||||||
);
|
}
|
||||||
console.log('[User] 新增管理员: ' + n1 + ' 行 (admin@iboard.local / admin123)');
|
|
||||||
|
async function main() {
|
||||||
const article = {
|
const cfg = parseUrl(process.env.DATABASE_URL);
|
||||||
title: '欢迎使用 iBoard',
|
if (!cfg.host) throw new Error('DATABASE_URL 未配置或解析失败');
|
||||||
slug: 'welcome-to-iboard',
|
const conn = await mysql.createConnection(cfg);
|
||||||
content: 'iBoard 用于收集和整理经济数据，以策略为主体重新组织。\n\n本文为示例条目，正式文章仍由 content/articles/*.md 文件承载。',
|
console.log('已连接:', cfg.host + ':' + cfg.port + '/' + cfg.database);
|
||||||
date: '2026-08-03',
|
|
||||||
};
|
const adminPwd = hashPassword('admin123');
|
||||||
const n4 = await insertIgnore(
|
const n1 = await insertIgnore(
|
||||||
conn,
|
conn,
|
||||||
'INSERT INTO `Article` (title, slug, content, date, createdAt, updatedAt) VALUES (?, ?, ?, ?, NOW(3), NOW(3))',
|
'INSERT INTO `User` (name, email, password, createdAt, updatedAt) VALUES (?, ?, ?, NOW(3), NOW(3))',
|
||||||
[article.title, article.slug, article.content, article.date],
|
['Admin', 'admin@iboard.local', adminPwd],
|
||||||
);
|
);
|
||||||
console.log('[Article] 新增示例文章: ' + n4 + ' 行');
|
console.log('[User] 新增管理员: ' + n1 + ' 行 (admin@iboard.local / admin123)');
|
||||||
|
|
||||||
const sowRows = [
|
const strategies = [
|
||||||
{ month: '2024-01', inventory: 4067 },
|
{ name: 'us-debt-gdp', description: '美国政府债务/GDP分析',
|
||||||
{ month: '2024-02', inventory: 4042 },
|
data: { source: 'strategy.js', unit: '万亿美元', rows: [
|
||||||
{ month: '2024-03', inventory: 3992 },
|
{ year: '2019', debt: 22.7, gdp: 21.4, debtToGdp: 106.1, interestToGdp: 1.8 },
|
||||||
{ month: '2024-04', inventory: 3986 },
|
{ year: '2020', debt: 26.9, gdp: 20.9, debtToGdp: 128.7, interestToGdp: 1.6 },
|
||||||
{ month: '2024-05', inventory: 3996 },
|
{ year: '2021', debt: 28.4, gdp: 23.0, debtToGdp: 123.5, interestToGdp: 1.5 },
|
||||||
{ month: '2024-06', inventory: 4038 },
|
{ year: '2022', debt: 30.9, gdp: 25.4, debtToGdp: 121.6, interestToGdp: 1.6 },
|
||||||
];
|
{ year: '2023', debt: 33.1, gdp: 26.9, debtToGdp: 123.0, interestToGdp: 1.9 },
|
||||||
let n5 = 0;
|
{ year: '2024', debt: 35.3, gdp: 28.5, debtToGdp: 123.9, interestToGdp: 2.1 },
|
||||||
for (const r of sowRows) {
|
]},
|
||||||
n5 += await insertIgnore(
|
},
|
||||||
conn,
|
{ name: 'china-debt-gdp', description: '中国政府债务/GDP分析',
|
||||||
'INSERT INTO `Econ_SowInventory` (month, inventory, createdAt, updatedAt) VALUES (?, ?, NOW(3), NOW(3))',
|
data: { source: 'strategy.js', unit: '万亿美元', rows: [
|
||||||
[r.month, r.inventory],
|
{ year: '2019', debt: 8.8, gdp: 14.3, debtToGdp: 61.5, interestToGdp: 1.9 },
|
||||||
);
|
{ year: '2020', debt: 10.3, gdp: 14.7, debtToGdp: 70.1, interestToGdp: 1.8 },
|
||||||
}
|
{ year: '2021', debt: 11.7, gdp: 16.1, debtToGdp: 72.7, interestToGdp: 1.7 },
|
||||||
console.log('[Econ_SowInventory] 新增: ' + n5 + ' 行');
|
{ year: '2022', debt: 13.1, gdp: 17.9, debtToGdp: 73.2, interestToGdp: 1.6 },
|
||||||
|
{ year: '2023', debt: 14.5, gdp: 19.4, debtToGdp: 74.7, interestToGdp: 1.6 },
|
||||||
await conn.end();
|
{ year: '2024', debt: 15.9, gdp: 21.0, debtToGdp: 75.7, interestToGdp: 1.5 },
|
||||||
console.log('\nSeed 完成.');
|
]},
|
||||||
}
|
},
|
||||||
|
];
|
||||||
|
let n2 = 0;
|
||||||
|
for (const s of strategies) {
|
||||||
|
n2 += await upsertByName(conn, 'Strategy',
|
||||||
|
{ name: s.name, description: s.description, data: JSON.stringify(s.data), updatedAt: new Date() },
|
||||||
|
'name');
|
||||||
|
}
|
||||||
|
console.log('[Strategy] upsert 策略: ' + n2 + ' 行 (1=新增, 2=更新)');
|
||||||
|
|
||||||
|
// Indicator 表: 改由 scripts/refresh-indicators.cjs 管理 (2026-08 重构后数据存 IndicatorPoint 明细表)
|
||||||
|
// 本脚本不再写入 Indicator, 如需初始化指标请运行 npm run data:refresh
|
||||||
|
|
||||||
|
const article = {
|
||||||
|
title: '欢迎使用 iBoard',
|
||||||
|
slug: 'welcome-to-iboard',
|
||||||
|
content: 'iBoard 用于收集和整理经济数据，以策略为主体重新组织。\n\n本文为示例条目，正式文章仍由 content/articles/*.md 文件承载。',
|
||||||
|
date: '2026-08-03',
|
||||||
|
};
|
||||||
|
const n4 = await insertIgnore(
|
||||||
|
conn,
|
||||||
|
'INSERT INTO `Article` (title, slug, content, date, createdAt, updatedAt) VALUES (?, ?, ?, ?, NOW(3), NOW(3))',
|
||||||
|
[article.title, article.slug, article.content, article.date],
|
||||||
|
);
|
||||||
|
console.log('[Article] 新增示例文章: ' + n4 + ' 行');
|
||||||
|
|
||||||
|
const sowRows = [
|
||||||
|
{ month: '2024-01', inventory: 4067 },
|
||||||
|
{ month: '2024-02', inventory: 4042 },
|
||||||
|
{ month: '2024-03', inventory: 3992 },
|
||||||
|
{ month: '2024-04', inventory: 3986 },
|
||||||
|
{ month: '2024-05', inventory: 3996 },
|
||||||
|
{ month: '2024-06', inventory: 4038 },
|
||||||
|
];
|
||||||
|
let n5 = 0;
|
||||||
|
for (const r of sowRows) {
|
||||||
|
n5 += await insertIgnore(
|
||||||
|
conn,
|
||||||
|
'INSERT INTO `Econ_SowInventory` (month, inventory, createdAt, updatedAt) VALUES (?, ?, NOW(3), NOW(3))',
|
||||||
|
[r.month, r.inventory],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
console.log('[Econ_SowInventory] 新增: ' + n5 + ' 行');
|
||||||
|
|
||||||
|
await conn.end();
|
||||||
|
console.log('\nSeed 完成.');
|
||||||
|
}
|
||||||
|
|
||||||
main().catch((e) => { console.error('Seed 失败:', e); process.exit(1); });
|
main().catch((e) => { console.error('Seed 失败:', e); process.exit(1); });
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
require('dotenv').config();
|
||||||
|
const mysql = require('mysql2/promise');
|
||||||
|
(async () => {
|
||||||
|
const u = new URL(process.env.DATABASE_URL);
|
||||||
|
const c = await mysql.createConnection({
|
||||||
|
host: u.hostname, port: Number(u.port),
|
||||||
|
user: decodeURIComponent(u.username),
|
||||||
|
password: decodeURIComponent(u.password),
|
||||||
|
database: u.pathname.replace(/^\//, ''),
|
||||||
|
});
|
||||||
|
const [users] = await c.query('SELECT id,name,email,LEFT(password,20) AS pwd_prefix,createdAt FROM User');
|
||||||
|
console.log('User:'); console.table(users);
|
||||||
|
const [sow] = await c.query('SELECT * FROM Econ_SowInventory ORDER BY month');
|
||||||
|
console.log('Econ_SowInventory:'); console.table(sow);
|
||||||
|
const [str] = await c.query('SELECT id,name,description,JSON_LENGTH(data,"$.rows") AS row_count FROM Strategy');
|
||||||
|
console.log('Strategy:'); console.table(str);
|
||||||
|
const [ind] = await c.query('SELECT id,name,groupName,JSON_LENGTH(data,"$.rows") AS row_count FROM Indicator');
|
||||||
|
console.log('Indicator:'); console.table(ind);
|
||||||
|
const [art] = await c.query('SELECT id,title,slug,date FROM Article');
|
||||||
|
console.log('Article:'); console.table(art);
|
||||||
|
await c.end();
|
||||||
|
})().catch(e=>{console.error(e);process.exit(1)});
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
import 'dotenv/config'
|
||||||
|
import { PrismaMariaDb } from '@prisma/adapter-mariadb'
|
||||||
|
import { PrismaClient } from '../generated/prisma/client.ts'
|
||||||
|
|
||||||
|
function parseDatabaseUrl(url) {
|
||||||
|
const u = new URL(url)
|
||||||
|
return {
|
||||||
|
host: u.hostname,
|
||||||
|
port: Number(u.port) || 3306,
|
||||||
|
user: decodeURIComponent(u.username),
|
||||||
|
password: decodeURIComponent(u.password),
|
||||||
|
database: u.pathname.replace(/^\//, ''),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const p = new PrismaClient({ adapter: new PrismaMariaDb(parseDatabaseUrl(process.env.DATABASE_URL)) })
|
||||||
|
try {
|
||||||
|
const users = await p.user.findMany()
|
||||||
|
console.log('User count:', users.length, '->', users.map((u) => u.email).join(','))
|
||||||
|
const strategies = await p.strategy.findMany({ select: { id: true, name: true } })
|
||||||
|
console.log('Strategy count:', strategies.length, '->', strategies.map((s) => s.name).join(','))
|
||||||
|
const indicators = await p.indicator.findMany({ select: { id: true, name: true } })
|
||||||
|
console.log('Indicator count:', indicators.length, '->', indicators.map((i) => i.name).join(','))
|
||||||
|
const sow = await p.econ_SowInventory.findMany({ orderBy: { month: 'asc' } })
|
||||||
|
console.log('SowInventory count:', sow.length, '->', sow.map((s) => s.month + '=' + s.inventory).join(','))
|
||||||
|
} catch (e) {
|
||||||
|
console.error('ERR:', e.message)
|
||||||
|
process.exitCode = 1
|
||||||
|
} finally {
|
||||||
|
await p.$disconnect()
|
||||||
|
}
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
require('dotenv').config();
|
||||||
|
const mysql = require('mysql2/promise');
|
||||||
|
|
||||||
|
(async () => {
|
||||||
|
const url = new URL(process.env.DATABASE_URL);
|
||||||
|
const conn = await mysql.createConnection({
|
||||||
|
host: url.hostname,
|
||||||
|
port: Number(url.port),
|
||||||
|
user: decodeURIComponent(url.username),
|
||||||
|
password: decodeURIComponent(url.password),
|
||||||
|
database: url.pathname.replace(/^\//, ''),
|
||||||
|
});
|
||||||
|
const [tables] = await conn.query('SHOW TABLES');
|
||||||
|
console.log('TABLES:');
|
||||||
|
for (const row of tables) console.log(' -', Object.values(row)[0]);
|
||||||
|
const tableNames = ['User', 'Article', 'Strategy', 'Indicator', 'Econ_SowInventory'];
|
||||||
|
for (const t of tableNames) {
|
||||||
|
const [r] = await conn.query('SELECT COUNT(*) AS c FROM ' + t + '');
|
||||||
|
console.log(t + ': ' + r[0].c + ' rows');
|
||||||
|
}
|
||||||
|
await conn.end();
|
||||||
|
})().catch((e) => { console.error('ERR:', e.message); process.exit(1); });
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
const { PrismaClient } = require('../generated/prisma');
|
||||||
|
(async () => {
|
||||||
|
const p = new PrismaClient();
|
||||||
|
const tables = await p.$queryRawUnsafe('SHOW TABLES');
|
||||||
|
console.log('TABLES:', JSON.stringify(tables, null, 2));
|
||||||
|
const counts = {
|
||||||
|
User: await p.user.count(),
|
||||||
|
Article: await p.article.count(),
|
||||||
|
Strategy: await p.strategy.count(),
|
||||||
|
Indicator: await p.indicator.count(),
|
||||||
|
Econ_SowInventory: await p.econ_SowInventory.count(),
|
||||||
|
};
|
||||||
|
console.log('COUNTS:', JSON.stringify(counts, null, 2));
|
||||||
|
await p.$disconnect();
|
||||||
|
})().catch((e) => { console.error(e); process.exit(1); });
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
import 'dotenv/config';
|
||||||
|
import { PrismaClient } from '../generated/prisma/client.ts';
|
||||||
|
|
||||||
|
const url = process.env.DATABASE_URL;
|
||||||
|
const p = new PrismaClient({ datasourceUrl: url });
|
||||||
|
try {
|
||||||
|
const tables = await p.$queryRawUnsafe('SHOW TABLES');
|
||||||
|
console.log('TABLES:', JSON.stringify(tables, null, 2));
|
||||||
|
const counts = {
|
||||||
|
User: await p.user.count(),
|
||||||
|
Article: await p.article.count(),
|
||||||
|
Strategy: await p.strategy.count(),
|
||||||
|
Indicator: await p.indicator.count(),
|
||||||
|
Econ_SowInventory: await p.econ_SowInventory.count(),
|
||||||
|
};
|
||||||
|
console.log('COUNTS:', JSON.stringify(counts, null, 2));
|
||||||
|
} catch (e) {
|
||||||
|
console.error('ERR:', e.message);
|
||||||
|
process.exitCode = 1;
|
||||||
|
} finally {
|
||||||
|
await p.$disconnect();
|
||||||
|
}
|
||||||
@@ -0,0 +1,46 @@
|
|||||||
|
import { prisma } from './db.js'
|
||||||
|
|
||||||
|
// 跨源对比: 同 (indicatorName, period) 多源数据差异超阈值则插 Alert
|
||||||
|
// conn: mysql2 连接
|
||||||
|
// 阈值: 绝对差 >= 0.01 且 相对差 >= 1%
|
||||||
|
// 返回 { inserted, scanned }
|
||||||
|
const ABS_TOL = 0.01
|
||||||
|
const REL_TOL = 0.01
|
||||||
|
|
||||||
|
export async function checkAfterRefresh(conn) {
|
||||||
|
// conn 是 mysql2 连接, 走原始 SQL
|
||||||
|
const [rows] = await conn.execute(`
|
||||||
|
SELECT ia.name AS indicatorName, a.period, ia.source, a.value
|
||||||
|
FROM IndicatorPoint a
|
||||||
|
JOIN Indicator ia ON a.indicatorId = ia.id
|
||||||
|
ORDER BY ia.name, a.period
|
||||||
|
`)
|
||||||
|
const groups = new Map()
|
||||||
|
for (const r of rows) {
|
||||||
|
const k = r.indicatorName + '|' + r.period
|
||||||
|
if (!groups.has(k)) groups.set(k, [])
|
||||||
|
groups.get(k).push({ source: r.source, value: Number(r.value) })
|
||||||
|
}
|
||||||
|
let inserted = 0
|
||||||
|
for (const [k, arr] of groups) {
|
||||||
|
if (arr.length < 2) continue
|
||||||
|
const sources = new Set(arr.map((x) => x.source))
|
||||||
|
if (sources.size < 2) continue
|
||||||
|
for (let i = 0; i < arr.length; i++) {
|
||||||
|
for (let j = i + 1; j < arr.length; j++) {
|
||||||
|
const A = arr[i], B = arr[j]
|
||||||
|
const diff = Math.abs(A.value - B.value)
|
||||||
|
const base = Math.max(Math.abs(A.value), Math.abs(B.value), 1e-9)
|
||||||
|
const ratio = diff / base
|
||||||
|
if (diff < ABS_TOL || ratio < REL_TOL) continue
|
||||||
|
const [name, period] = k.split('|')
|
||||||
|
const [r] = await conn.execute(
|
||||||
|
'INSERT INTO `Alert` (`indicatorName`, `period`, `valueA`, `valueB`, `sourceA`, `sourceB`, `diff`, `diffRatio`, `createdAt`) VALUES (?, ?, ?, ?, ?, ?, ?, ?, NOW(3))',
|
||||||
|
[name, period, A.value, B.value, A.source, B.source, diff, ratio],
|
||||||
|
)
|
||||||
|
if (r.affectedRows === 1) inserted++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return { inserted, scanned: rows.length }
|
||||||
|
}
|
||||||
@@ -0,0 +1,46 @@
|
|||||||
|
// apizero 接口的文件缓存
|
||||||
|
// - 按 key 存 JSON 到磁盘: <APIZERO_CACHE_DIR>/<key>.json
|
||||||
|
// - 存在性检查: 文件在即视为有效 (用户要求: "同一个年份只要存在就不再调用接口")
|
||||||
|
// - 不做 TTL: 用户没要求, 也避免误命中过期数据
|
||||||
|
//
|
||||||
|
// 环境变量:
|
||||||
|
// APIZERO_CACHE_DIR 缓存目录 (默认 <cwd>/cache/apizero)
|
||||||
|
//
|
||||||
|
// 未来若要加 TTL / DB 后端, 替换本文件即可, 上层调用方不变.
|
||||||
|
import fs from 'node:fs'
|
||||||
|
import path from 'node:path'
|
||||||
|
|
||||||
|
function dir() {
|
||||||
|
return process.env.APIZERO_CACHE_DIR
|
||||||
|
? path.resolve(process.env.APIZERO_CACHE_DIR)
|
||||||
|
: path.resolve(process.cwd(), 'cache', 'apizero')
|
||||||
|
}
|
||||||
|
|
||||||
|
// 读缓存, 不存在返回 null
|
||||||
|
export function read(key) {
|
||||||
|
const p = path.join(dir(), key + '.json')
|
||||||
|
if (!fs.existsSync(p)) return null
|
||||||
|
try {
|
||||||
|
const raw = fs.readFileSync(p, 'utf8')
|
||||||
|
return JSON.parse(raw)
|
||||||
|
} catch (e) {
|
||||||
|
console.warn(`[apizero-cache] 读 ${key} 失败, 忽略:`, e.message)
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 写缓存 (原子: 先写 .tmp 再 rename)
|
||||||
|
export function write(key, data) {
|
||||||
|
const d = dir()
|
||||||
|
fs.mkdirSync(d, { recursive: true })
|
||||||
|
const final = path.join(d, key + '.json')
|
||||||
|
const tmp = final + '.tmp.' + process.pid
|
||||||
|
fs.writeFileSync(tmp, JSON.stringify(data), 'utf8')
|
||||||
|
fs.renameSync(tmp, final)
|
||||||
|
return final
|
||||||
|
}
|
||||||
|
|
||||||
|
// 存在性检查
|
||||||
|
export function has(key) {
|
||||||
|
return fs.existsSync(path.join(dir(), key + '.json'))
|
||||||
|
}
|
||||||
@@ -0,0 +1,77 @@
|
|||||||
|
// apizero (https://apizero.cn) 通用 HTTP 客户端
|
||||||
|
// - 统一从 env APIZERO_KEY 读取 API key (test key 也能用)
|
||||||
|
// - 统一 QPS 节流 (apizero 限制 3 req/s)
|
||||||
|
// - 统一错误格式: 抛出 ApizeroError(code, message, httpStatus)
|
||||||
|
// - 所有 apizero 接口都进这一层, 后续新增模块复用
|
||||||
|
//
|
||||||
|
// 依赖: 原生 fetch (Node 18+)
|
||||||
|
|
||||||
|
// 简易令牌桶, 限速 3 req/s
|
||||||
|
let lastCallAt = 0
|
||||||
|
const MIN_INTERVAL_MS = 1000 / 3 // ~333ms
|
||||||
|
|
||||||
|
async function throttle() {
|
||||||
|
const now = Date.now()
|
||||||
|
const wait = lastCallAt + MIN_INTERVAL_MS - now
|
||||||
|
if (wait > 0) await new Promise((r) => setTimeout(r, wait))
|
||||||
|
lastCallAt = Date.now()
|
||||||
|
}
|
||||||
|
|
||||||
|
// apizero 标准错误
|
||||||
|
export class ApizeroError extends Error {
|
||||||
|
constructor(code, message, httpStatus) {
|
||||||
|
super(message || `apizero error code=${code}`)
|
||||||
|
this.name = 'ApizeroError'
|
||||||
|
this.code = code
|
||||||
|
this.httpStatus = httpStatus
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const BASE_URL = 'https://v1.apizero.cn/api'
|
||||||
|
|
||||||
|
// 读 key: 优先 env APIZERO_KEY, 否则用空 (匿名调用, 配额更小)
|
||||||
|
function getKey() {
|
||||||
|
return process.env.APIZERO_KEY || ''
|
||||||
|
}
|
||||||
|
|
||||||
|
// 通用 GET 入口
|
||||||
|
// - endpoint: 'oil-price-forecast' (不带 /api 前缀)
|
||||||
|
// - params: 普通对象
|
||||||
|
// 返回: apizero 的 data 字段 (已解一层)
|
||||||
|
export async function get(endpoint, params = {}) {
|
||||||
|
await throttle()
|
||||||
|
|
||||||
|
const qs = new URLSearchParams()
|
||||||
|
for (const [k, v] of Object.entries(params)) {
|
||||||
|
if (v !== undefined && v !== null && v !== '') qs.set(k, String(v))
|
||||||
|
}
|
||||||
|
const key = getKey()
|
||||||
|
if (key) qs.set('key', key)
|
||||||
|
|
||||||
|
const url = `${BASE_URL}/${endpoint}?${qs.toString()}`
|
||||||
|
let res
|
||||||
|
try {
|
||||||
|
res = await fetch(url, { method: 'GET', headers: { 'Accept': 'application/json' } })
|
||||||
|
} catch (e) {
|
||||||
|
throw new ApizeroError('NETWORK', `apizero 网络错误: ${e.message}`, 0)
|
||||||
|
}
|
||||||
|
|
||||||
|
// HTTP 层错误
|
||||||
|
if (!res.ok) {
|
||||||
|
let body = ''
|
||||||
|
try { body = await res.text() } catch { /* ignore */ }
|
||||||
|
throw new ApizeroError('HTTP', `apizero HTTP ${res.status}: ${body.substring(0, 200)}`, res.status)
|
||||||
|
}
|
||||||
|
|
||||||
|
// 解析 body
|
||||||
|
let json
|
||||||
|
try { json = await res.json() }
|
||||||
|
catch (e) { throw new ApizeroError('PARSE', 'apizero 响应非 JSON: ' + e.message, res.status) }
|
||||||
|
|
||||||
|
// apizero 业务层错误: code !== 0
|
||||||
|
if (json && typeof json.code === 'number' && json.code !== 0) {
|
||||||
|
throw new ApizeroError(json.code, json.msg || 'apizero 业务错误', res.status)
|
||||||
|
}
|
||||||
|
|
||||||
|
return json && json.data !== undefined ? json.data : json
|
||||||
|
}
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
// apizero 模块统一出口
|
||||||
|
// 后续新增 apizero 接口就在这里再 export 一行
|
||||||
|
export * as oil from './oil-price-forecast.js'
|
||||||
|
export * as history from './oil-history.js'
|
||||||
|
export { ApizeroError } from './client.js'
|
||||||
|
|
||||||
@@ -0,0 +1,87 @@
|
|||||||
|
// 浙江省油价历史: 走 Prisma 落库 + apizero price 接口写入
|
||||||
|
// 设计:
|
||||||
|
// - 每天 04:00 cron 检查 schedule, 待定且 <= 昨天的调价日 -> 抓 price?province=浙江 存本表
|
||||||
|
// - unique (date, province, fuel) 防重复
|
||||||
|
// - 查询 API: 取某省某油品最近 N 天 (默认 180)
|
||||||
|
import { prisma } from '../db.js'
|
||||||
|
import * as client from './client.js'
|
||||||
|
|
||||||
|
const PROVINCE = '浙江'
|
||||||
|
// 油品 -> apizero prices 对象里的 key (price action 返回 "92号汽油" 这种带后缀的 key)
|
||||||
|
const FUEL_KEYS = {
|
||||||
|
'92': '92号汽油',
|
||||||
|
'95': '95号汽油',
|
||||||
|
'0': '0号柴油',
|
||||||
|
}
|
||||||
|
|
||||||
|
// 解析 apizero price action 返回的 prices (中文 key) -> 标准 fuel code
|
||||||
|
function parsePrice(data) {
|
||||||
|
if (!data || !data.prices) throw new Error('apizero 响应无 prices 字段')
|
||||||
|
const out = {}
|
||||||
|
for (const [fuel, label] of Object.entries(FUEL_KEYS)) {
|
||||||
|
const raw = data.prices[label]
|
||||||
|
if (typeof raw === 'string') {
|
||||||
|
// "7.64 元/升" -> 7.64
|
||||||
|
const m = raw.match(/^([\d.]+)/)
|
||||||
|
if (m) out[fuel] = parseFloat(m[1])
|
||||||
|
} else if (typeof raw === 'number') {
|
||||||
|
out[fuel] = raw
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
// 抓一次浙江当前价并入库 (date = 今日)
|
||||||
|
// 返回 { inserted, skipped } (按 unique 约束: 已存在则 skip)
|
||||||
|
export async function fetchAndStore() {
|
||||||
|
const data = await client.get('oil-price-forecast', { action: 'price', province: PROVINCE })
|
||||||
|
const prices = parsePrice(data)
|
||||||
|
if (Object.keys(prices).length === 0) {
|
||||||
|
throw new Error('apizero 返回价格为空')
|
||||||
|
}
|
||||||
|
const date = new Date()
|
||||||
|
// 抹掉时分秒, 便于按天比较
|
||||||
|
date.setHours(0, 0, 0, 0)
|
||||||
|
|
||||||
|
let inserted = 0
|
||||||
|
let skipped = 0
|
||||||
|
for (const [fuel, price] of Object.entries(prices)) {
|
||||||
|
try {
|
||||||
|
await prisma.oilPriceHistory.create({
|
||||||
|
data: { date, province: PROVINCE, fuel, price, source: 'apizero' },
|
||||||
|
})
|
||||||
|
inserted++
|
||||||
|
} catch (e) {
|
||||||
|
// P2002: unique 冲突 -> 跳过
|
||||||
|
if (e?.code === 'P2002') skipped++
|
||||||
|
else throw e
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return { inserted, skipped, date: date.toISOString().slice(0, 10) }
|
||||||
|
}
|
||||||
|
|
||||||
|
// 查询某省某油品最近 N 天
|
||||||
|
// province 必填, 默认 浙江
|
||||||
|
// fuel 可选, 留空返回 4 个油品
|
||||||
|
// days 默认 180
|
||||||
|
export async function query({ province = PROVINCE, fuel, days = 180 }) {
|
||||||
|
const since = new Date()
|
||||||
|
since.setDate(since.getDate() - days)
|
||||||
|
since.setHours(0, 0, 0, 0)
|
||||||
|
|
||||||
|
const where = { province, date: { gte: since } }
|
||||||
|
if (fuel) where.fuel = fuel
|
||||||
|
|
||||||
|
const rows = await prisma.oilPriceHistory.findMany({
|
||||||
|
where,
|
||||||
|
orderBy: [{ date: 'asc' }],
|
||||||
|
})
|
||||||
|
|
||||||
|
// 整形: Decimal -> number
|
||||||
|
return rows.map((r) => ({
|
||||||
|
date: r.date.toISOString().slice(0, 10),
|
||||||
|
province: r.province,
|
||||||
|
fuel: r.fuel,
|
||||||
|
price: Number(r.price),
|
||||||
|
}))
|
||||||
|
}
|
||||||
@@ -0,0 +1,41 @@
|
|||||||
|
// apizero: 今日油价 (oil-price-forecast)
|
||||||
|
// 4 个 action:
|
||||||
|
// forecast - 油价 + 国际原油 + 下次调价预测 (每次都查实时, 不缓存)
|
||||||
|
// price - 单省油价
|
||||||
|
// price-all - 32 省全部油价
|
||||||
|
// schedule - 某年调价日历 (按 year 缓存到文件, 同年份不重复调)
|
||||||
|
//
|
||||||
|
// 文档: https://apizero.cn/aidocs/oil-price-forecast/raw.md
|
||||||
|
import * as client from './client.js'
|
||||||
|
import * as cache from './cache.js'
|
||||||
|
|
||||||
|
// 调价日历: 按年份缓存, 文件存在即视为有效, 不重复调用
|
||||||
|
// cache key 形如 "oil-schedule-2026"
|
||||||
|
export async function getSchedule(year) {
|
||||||
|
const y = Number(year)
|
||||||
|
if (!Number.isInteger(y) || y < 2025 || y > 2026) {
|
||||||
|
throw new client.ApizeroError(4000, `year 不在 2025-2026 范围: ${year}`, 400)
|
||||||
|
}
|
||||||
|
const cacheKey = `oil-schedule-${y}`
|
||||||
|
const hit = cache.read(cacheKey)
|
||||||
|
if (hit) return { ...hit, _cached: true }
|
||||||
|
const data = await client.get('oil-price-forecast', { action: 'schedule', year: y })
|
||||||
|
cache.write(cacheKey, data)
|
||||||
|
return { ...data, _cached: false }
|
||||||
|
}
|
||||||
|
|
||||||
|
// 实时: 国际原油 + 下次调价预测
|
||||||
|
export async function getForecast() {
|
||||||
|
return client.get('oil-price-forecast', { action: 'forecast' })
|
||||||
|
}
|
||||||
|
|
||||||
|
// 单省油价
|
||||||
|
export async function getPrice(province) {
|
||||||
|
if (!province) throw new client.ApizeroError(4000, 'province 必填', 400)
|
||||||
|
return client.get('oil-price-forecast', { action: 'price', province })
|
||||||
|
}
|
||||||
|
|
||||||
|
// 32 省全部油价
|
||||||
|
export async function getPriceAll() {
|
||||||
|
return client.get('oil-price-forecast', { action: 'price-all' })
|
||||||
|
}
|
||||||
+110
-52
@@ -1,52 +1,110 @@
|
|||||||
import cron from 'node-cron'
|
import cron from 'node-cron'
|
||||||
|
import { prisma } from './db.js'
|
||||||
// scripts/ 下的可选脚本模块 (部署容器可能缺失或依赖不全): 惰性加载,
|
import mysql from 'mysql2/promise'
|
||||||
// 单个 fetcher 缺失只降级对应任务, 不拖垮 cron 整体注册。
|
import { checkAfterRefresh } from './alert-engine.js'
|
||||||
async function importNewsFetcher() {
|
import { ApizeroError, oil, history } from './apizero/index.js'
|
||||||
const mod = await import('../scripts/fetchers/news.fetcher.js')
|
|
||||||
return { fetchNewsList: mod.fetchNewsList, persistNews: mod.persistNews }
|
// scripts/ 下的可选脚本模块 (部署容器可能缺失或依赖不全): 惰性加载,
|
||||||
}
|
// 单个 fetcher 缺失只降级对应任务, 不拖垮 cron 整体注册。
|
||||||
|
async function importNewsFetcher() {
|
||||||
async function alertError(taskName, message) {
|
const mod = await import('../scripts/fetchers/news.fetcher.js')
|
||||||
try {
|
return { fetchNewsList: mod.fetchNewsList, persistNews: mod.persistNews }
|
||||||
const { insertCronAlert } = await import('../scripts/lib/cron-alert.js')
|
}
|
||||||
await insertCronAlert(taskName, message)
|
|
||||||
} catch (e) {
|
async function alertError(taskName, message) {
|
||||||
console.error('[cron] 报警写入失败(忽略):', e.message)
|
try {
|
||||||
}
|
const { insertCronAlert } = await import('../scripts/lib/cron-alert.js')
|
||||||
}
|
await insertCronAlert(taskName, message)
|
||||||
|
} catch (e) {
|
||||||
// 每天 6:00 (Asia/Shanghai) 拉取新闻, 出错生成报警
|
console.error('[cron] 报警写入失败(忽略):', e.message)
|
||||||
function scheduleNews() {
|
}
|
||||||
cron.schedule('0 6 * * *', async () => {
|
}
|
||||||
console.log('[cron] 6:00 触发')
|
|
||||||
try {
|
function parseUrl(url) {
|
||||||
const { fetchNewsList, persistNews } = await importNewsFetcher()
|
const u = new URL(url)
|
||||||
const list = await fetchNewsList()
|
return { host: u.hostname, port: Number(u.port) || 3306, user: decodeURIComponent(u.username), password: decodeURIComponent(u.password), database: u.pathname.replace(/^\//, '') }
|
||||||
const r = await persistNews(list)
|
}
|
||||||
console.log('[cron] 新闻入库: 新增 ' + r.inserted + ' / 跳过 ' + r.skipped)
|
|
||||||
} catch (e) {
|
async function openConn() {
|
||||||
console.error('[cron] 任务失败:', e.message)
|
return mysql.createConnection(parseUrl(process.env.DATABASE_URL))
|
||||||
await alertError('新闻拉取', e.message)
|
}
|
||||||
}
|
|
||||||
}, { timezone: 'Asia/Shanghai' })
|
// 每天 6:00 (Asia/Shanghai) 拉取新闻 + 跑跨源对比, 出错生成报警
|
||||||
console.log('[cron] 已注册: 每天 06:00 拉取新闻')
|
function scheduleNews() {
|
||||||
}
|
cron.schedule('0 6 * * *', async () => {
|
||||||
|
console.log('[cron] 6:00 触发')
|
||||||
// 每小时兜底: 任务自动归档扫描 (T-ARC-02; 项目加载时另有读时惰性执行)
|
try {
|
||||||
function scheduleAutoArchive() {
|
const { fetchNewsList, persistNews } = await importNewsFetcher()
|
||||||
cron.schedule('30 * * * *', async () => {
|
const list = await fetchNewsList()
|
||||||
try {
|
const r = await persistNews(list)
|
||||||
const { runAutoArchiveSweep } = await import('./task-domain/archive.js')
|
console.log('[cron] 新闻入库: 新增 ' + r.inserted + ' / 跳过 ' + r.skipped)
|
||||||
const n = await runAutoArchiveSweep()
|
const conn = await openConn()
|
||||||
if (n > 0) console.log('[cron] 自动归档:', n, '条')
|
try {
|
||||||
} catch (e) {
|
const a = await checkAfterRefresh(conn)
|
||||||
console.error('[cron] 自动归档失败:', e.message)
|
console.log('[cron] 报警检测: 新增 ' + a.inserted + ' 条 (扫描 ' + a.scanned + ')')
|
||||||
await alertError('任务自动归档', e.message)
|
} finally { await conn.end() }
|
||||||
}
|
} catch (e) {
|
||||||
}, { timezone: 'Asia/Shanghai' })
|
console.error('[cron] 任务失败:', e.message)
|
||||||
console.log('[cron] 已注册: 每小时 30 分 任务自动归档扫描')
|
await alertError('新闻拉取+报警检测', e.message)
|
||||||
}
|
}
|
||||||
|
}, { timezone: 'Asia/Shanghai' })
|
||||||
scheduleNews()
|
console.log('[cron] 已注册: 每天 06:00 拉取新闻 + 跨源报警检测')
|
||||||
scheduleAutoArchive()
|
}
|
||||||
|
|
||||||
|
// 每天 6:10 (Asia/Shanghai) 抓浙江油价历史, 出错生成报警
|
||||||
|
// 逻辑: 拉今年 schedule, 检查待定且 <= 昨天的调价日, 命中就抓 price?province=浙江 存库
|
||||||
|
// - 0 命中: 不调 apizero (省配额)
|
||||||
|
// - >0 命中: 调一次, 4 个油品批量入库 (unique 兜底去重)
|
||||||
|
function scheduleOilHistory() {
|
||||||
|
cron.schedule('10 6 * * *', async () => {
|
||||||
|
console.log('[cron] 6:10 油价历史触发')
|
||||||
|
try {
|
||||||
|
const year = new Date().getFullYear()
|
||||||
|
const sched = await oil.getSchedule(year)
|
||||||
|
const list = sched.schedule || []
|
||||||
|
// 待定 且 日期 <= 昨天 (用 Asia/Shanghai 时区推导, 与 cron 触发时区对齐)
|
||||||
|
const todayStr = new Date().toLocaleDateString('en-CA', { timeZone: 'Asia/Shanghai' })
|
||||||
|
const today = new Date(todayStr + 'T00:00:00+08:00')
|
||||||
|
const yesterdayMs = today.getTime() - 86400000
|
||||||
|
const pendingPast = list.filter((it) => {
|
||||||
|
if (it.status !== '待定') return false
|
||||||
|
const t = new Date(it.date + 'T00:00:00').getTime()
|
||||||
|
return Number.isFinite(t) && t <= yesterdayMs
|
||||||
|
})
|
||||||
|
console.log('[cron] 待定且已过的调价日: ' + pendingPast.length + ' 个')
|
||||||
|
if (pendingPast.length === 0) {
|
||||||
|
console.log('[cron] 油价历史: 0 命中, 跳过 apizero 调用')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
const r = await history.fetchAndStore()
|
||||||
|
console.log('[cron] 油价历史入库: 新增 ' + r.inserted + ' / 跳过 ' + r.skipped + ' (date=' + r.date + ')')
|
||||||
|
} catch (e) {
|
||||||
|
if (e instanceof ApizeroError) {
|
||||||
|
console.error('[cron] 油价历史 apizero 错误: code=' + e.code + ' msg=' + e.message)
|
||||||
|
} else {
|
||||||
|
console.error('[cron] 油价历史任务失败:', e.message)
|
||||||
|
}
|
||||||
|
await alertError('浙江油价历史抓取', e.message)
|
||||||
|
}
|
||||||
|
}, { timezone: 'Asia/Shanghai' })
|
||||||
|
console.log('[cron] 已注册: 每天 06:10 浙江油价历史抓取')
|
||||||
|
}
|
||||||
|
|
||||||
|
// 每小时兜底: 任务自动归档扫描 (T-ARC-02; 项目加载时另有读时惰性执行)
|
||||||
|
function scheduleAutoArchive() {
|
||||||
|
cron.schedule('30 * * * *', async () => {
|
||||||
|
try {
|
||||||
|
const { runAutoArchiveSweep } = await import('./task-domain/archive.js')
|
||||||
|
const n = await runAutoArchiveSweep()
|
||||||
|
if (n > 0) console.log('[cron] 自动归档:', n, '条')
|
||||||
|
} catch (e) {
|
||||||
|
console.error('[cron] 自动归档失败:', e.message)
|
||||||
|
await alertError('任务自动归档', e.message)
|
||||||
|
}
|
||||||
|
}, { timezone: 'Asia/Shanghai' })
|
||||||
|
console.log('[cron] 已注册: 每小时 30 分 任务自动归档扫描')
|
||||||
|
}
|
||||||
|
|
||||||
|
scheduleNews()
|
||||||
|
scheduleOilHistory()
|
||||||
|
scheduleAutoArchive()
|
||||||
|
|||||||
+2
-3
@@ -9,6 +9,7 @@ import newsRouter from './routes/news.js'
|
|||||||
import alertsRouter from './routes/alerts.js'
|
import alertsRouter from './routes/alerts.js'
|
||||||
import articlesRouter from './routes/articles.js'
|
import articlesRouter from './routes/articles.js'
|
||||||
import otaRouter from './routes/ota.js'
|
import otaRouter from './routes/ota.js'
|
||||||
|
import apizeroRouter from './routes/apizero.js'
|
||||||
import monitorsRouter from './routes/monitors.js'
|
import monitorsRouter from './routes/monitors.js'
|
||||||
import mihomeRouter from './routes/mihome.js'
|
import mihomeRouter from './routes/mihome.js'
|
||||||
import checkinRouter from './routes/checkin.js'
|
import checkinRouter from './routes/checkin.js'
|
||||||
@@ -16,15 +17,12 @@ import checklistsRouter from './routes/checklists.js'
|
|||||||
import projectsRouter, { columnRouter } from './routes/projects.js'
|
import projectsRouter, { columnRouter } from './routes/projects.js'
|
||||||
import tasksRouter from './routes/tasks.js'
|
import tasksRouter from './routes/tasks.js'
|
||||||
import powersyncRouter from './routes/powersync.js'
|
import powersyncRouter from './routes/powersync.js'
|
||||||
import { powersyncProxy } from './powersync-proxy.js'
|
|
||||||
|
|
||||||
const PORT = Number(process.env.PORT) || 3001
|
const PORT = Number(process.env.PORT) || 3001
|
||||||
const DIST_DIR = path.join(process.cwd(), 'dist')
|
const DIST_DIR = path.join(process.cwd(), 'dist')
|
||||||
const HAS_DIST = fs.existsSync(DIST_DIR)
|
const HAS_DIST = fs.existsSync(DIST_DIR)
|
||||||
|
|
||||||
const app = express()
|
const app = express()
|
||||||
// 同步服务同域反代必须最先挂载 (流式长连接, 不能经过 json/cors 中间件)
|
|
||||||
app.use(powersyncProxy())
|
|
||||||
app.use(cors())
|
app.use(cors())
|
||||||
app.use(express.json())
|
app.use(express.json())
|
||||||
|
|
||||||
@@ -42,6 +40,7 @@ app.use('/api', dataRouter)
|
|||||||
app.use('/api', newsRouter)
|
app.use('/api', newsRouter)
|
||||||
app.use('/api', alertsRouter)
|
app.use('/api', alertsRouter)
|
||||||
app.use('/api', articlesRouter)
|
app.use('/api', articlesRouter)
|
||||||
|
app.use('/api', apizeroRouter)
|
||||||
app.use('/api', monitorsRouter)
|
app.use('/api', monitorsRouter)
|
||||||
app.use('/api/mihome', mihomeRouter)
|
app.use('/api/mihome', mihomeRouter)
|
||||||
// V0.2 打卡 / 日历 / 清单
|
// V0.2 打卡 / 日历 / 清单
|
||||||
|
|||||||
@@ -1,54 +0,0 @@
|
|||||||
// PowerSync 同域反代 (0.2.1): 把 /sync、/socket 转发到内网同步服务,
|
|
||||||
// 对外只暴露应用本身一个端口 (无需单独的 powersync 端口)。
|
|
||||||
// - 未配置 POWERSYNC_UPSTREAM 时直接跳过 (本地开发/无同步服务时行为不变)
|
|
||||||
// - 必须挂在 express.json()/cors 之前: 同步走长连接流式响应, 不能被 body 解析打断
|
|
||||||
import http from 'node:http'
|
|
||||||
import https from 'node:https'
|
|
||||||
|
|
||||||
const PREFIXES = ['/sync', '/socket']
|
|
||||||
|
|
||||||
export function powersyncProxy() {
|
|
||||||
const upstream = process.env.POWERSYNC_UPSTREAM
|
|
||||||
if (!upstream) return (_req, _res, next) => next()
|
|
||||||
|
|
||||||
let target
|
|
||||||
try {
|
|
||||||
target = new URL(upstream)
|
|
||||||
} catch {
|
|
||||||
console.error('[powersync-proxy] POWERSYNC_UPSTREAM 非法:', upstream)
|
|
||||||
return (_req, _res, next) => next()
|
|
||||||
}
|
|
||||||
const transport = target.protocol === 'https:' ? https : http
|
|
||||||
const basePort = Number(target.port) || (target.protocol === 'https:' ? 443 : 80)
|
|
||||||
console.log('[powersync-proxy] 同步请求转发到', target.origin)
|
|
||||||
|
|
||||||
return (req, res, next) => {
|
|
||||||
if (!PREFIXES.some((p) => req.url === p || req.url.startsWith(p + '/') || req.url.startsWith(p + '?'))) {
|
|
||||||
return next()
|
|
||||||
}
|
|
||||||
const headers = { ...req.headers, host: target.host }
|
|
||||||
const upstreamReq = transport.request(
|
|
||||||
{
|
|
||||||
protocol: target.protocol,
|
|
||||||
hostname: target.hostname,
|
|
||||||
port: basePort,
|
|
||||||
method: req.method,
|
|
||||||
path: req.url,
|
|
||||||
headers,
|
|
||||||
},
|
|
||||||
(upstreamRes) => {
|
|
||||||
res.writeHead(upstreamRes.statusCode || 502, upstreamRes.headers)
|
|
||||||
upstreamRes.pipe(res)
|
|
||||||
},
|
|
||||||
)
|
|
||||||
upstreamReq.on('error', (e) => {
|
|
||||||
console.error('[powersync-proxy] 转发失败:', e.message)
|
|
||||||
if (!res.headersSent) res.writeHead(502, { 'content-type': 'text/plain' })
|
|
||||||
res.end('powersync upstream error')
|
|
||||||
})
|
|
||||||
// 长连接: 客户端断开时同步断开上游
|
|
||||||
req.on('aborted', () => upstreamReq.destroy())
|
|
||||||
res.on('close', () => upstreamReq.destroy())
|
|
||||||
req.pipe(upstreamReq)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,63 @@
|
|||||||
|
// apizero 代理路由 (前端不直接调 apizero, 一律走后端, key 不外泄)
|
||||||
|
//
|
||||||
|
// GET /api/apizero/oil/forecast - 油价 + 预测 (实时)
|
||||||
|
// GET /api/apizero/oil/price-all - 32 省油价
|
||||||
|
// GET /api/apizero/oil/price?province= - 单省油价
|
||||||
|
// GET /api/apizero/oil/schedule?year= - 某年调价日历 (按年缓存)
|
||||||
|
//
|
||||||
|
// 错误: apizero 错误统一包成 502 (上游错误) 或 400 (参数错误)
|
||||||
|
import { Router } from 'express'
|
||||||
|
import { authRequired } from '../middleware.js'
|
||||||
|
import { ApizeroError, oil, history } from '../apizero/index.js'
|
||||||
|
|
||||||
|
const router = Router()
|
||||||
|
router.use(authRequired)
|
||||||
|
|
||||||
|
function handleApizeroError(e, res, next) {
|
||||||
|
if (e instanceof ApizeroError) {
|
||||||
|
// 参数错 -> 400, 上游错 -> 502, QPS 限流 / 额度用完 -> 503
|
||||||
|
if (e.httpStatus === 400) return res.status(400).json({ error: e.message, apizero_code: e.code })
|
||||||
|
if (e.code === 4029 || e.code === 4030) return res.status(503).json({ error: e.message, apizero_code: e.code })
|
||||||
|
return res.status(502).json({ error: e.message, apizero_code: e.code })
|
||||||
|
}
|
||||||
|
next(e)
|
||||||
|
}
|
||||||
|
|
||||||
|
// 实时: 油价 + 国际原油 + 下次调价预测
|
||||||
|
router.get('/apizero/oil/forecast', async (req, res, next) => {
|
||||||
|
try { res.json(await oil.getForecast()) }
|
||||||
|
catch (e) { handleApizeroError(e, res, next) }
|
||||||
|
})
|
||||||
|
|
||||||
|
// 32 省油价
|
||||||
|
router.get('/apizero/oil/price-all', async (req, res, next) => {
|
||||||
|
try { res.json(await oil.getPriceAll()) }
|
||||||
|
catch (e) { handleApizeroError(e, res, next) }
|
||||||
|
})
|
||||||
|
|
||||||
|
// 单省油价
|
||||||
|
router.get('/apizero/oil/price', async (req, res, next) => {
|
||||||
|
try { res.json(await oil.getPrice(req.query.province)) }
|
||||||
|
catch (e) { handleApizeroError(e, res, next) }
|
||||||
|
})
|
||||||
|
|
||||||
|
// 调价日历 (按年缓存)
|
||||||
|
router.get('/apizero/oil/schedule', async (req, res, next) => {
|
||||||
|
try { res.json(await oil.getSchedule(req.query.year)) }
|
||||||
|
catch (e) { handleApizeroError(e, res, next) }
|
||||||
|
})
|
||||||
|
|
||||||
|
export default router
|
||||||
|
|
||||||
|
// 浙江省油价历史 (DB)
|
||||||
|
// GET /api/apizero/oil/history?fuel=92&days=180
|
||||||
|
// - fuel: 92 / 95 / 0 (留空 = 3 个油品都返回)
|
||||||
|
// - days: 默认 180 (半年)
|
||||||
|
router.get('/apizero/oil/history', async (req, res, next) => {
|
||||||
|
try {
|
||||||
|
const fuel = req.query.fuel ? String(req.query.fuel) : undefined
|
||||||
|
const days = Math.max(1, Math.min(Number(req.query.days) || 180, 730))
|
||||||
|
const items = await history.query({ fuel, days })
|
||||||
|
res.json({ items, fuel: fuel || 'all', days })
|
||||||
|
} catch (e) { next(e) }
|
||||||
|
})
|
||||||
@@ -122,15 +122,11 @@ router.get('/habits', async (req, res, next) => {
|
|||||||
const userId = req.user.sub
|
const userId = req.user.sub
|
||||||
const today = toDateStr()
|
const today = toDateStr()
|
||||||
const date = normDate(req.query.date)
|
const date = normDate(req.query.date)
|
||||||
const habits = (await loadActiveHabits(userId))
|
const habits = await loadActiveHabits(userId)
|
||||||
// 回看历史日期时, 当天还不存在的打卡项不应出现 (与 /calendar 口径一致)
|
|
||||||
.filter((h) => toDateStr(h.createdAt) <= date)
|
|
||||||
const ranges = habits.map((h) => periodRange(h.period, date))
|
const ranges = habits.map((h) => periodRange(h.period, date))
|
||||||
const grouped = await loadRecords(userId, habits, ranges.length ? ranges : [{ start: date, end: date }])
|
const grouped = await loadRecords(userId, habits, ranges.length ? ranges : [{ start: date, end: date }])
|
||||||
const items = habits.map((h) => buildItem(h, grouped.get(h.id) || new Map(), date, today))
|
const items = habits.map((h) => buildItem(h, grouped.get(h.id) || new Map(), date, today))
|
||||||
// summary 是"当天进度": 按当日份额 (countOnDate >= expectedPerDay) 统计,
|
const doneCount = items.filter((i) => i.completed).length
|
||||||
// 不能用 completed (周期完成度), 否则历史日期会把同周期后续日期的打卡算进来。
|
|
||||||
const doneCount = items.filter((i) => i.dayDone).length
|
|
||||||
res.json({ today, date, items, summary: { total: items.length, done: doneCount } })
|
res.json({ today, date, items, summary: { total: items.length, done: doneCount } })
|
||||||
} catch (e) { next(e) }
|
} catch (e) { next(e) }
|
||||||
})
|
})
|
||||||
@@ -295,14 +291,7 @@ router.get('/calendar', async (req, res, next) => {
|
|||||||
try {
|
try {
|
||||||
const userId = req.user.sub
|
const userId = req.user.sub
|
||||||
const today = toDateStr()
|
const today = toDateStr()
|
||||||
// 兼容旧版客户端: addMonths 曾把 "YYYY-MM" 算成 "YYYY-MM-01", 请求月份带了日号,
|
const month = MONTH_RE.test(String(req.query.month || '')) ? String(req.query.month) : today.slice(0, 7)
|
||||||
// 旧逻辑判为非法后静默回退到本月, 导致切到上月时看不到任何记录。这里截回月份。
|
|
||||||
const rawMonth = String(req.query.month || '')
|
|
||||||
const month = MONTH_RE.test(rawMonth)
|
|
||||||
? rawMonth
|
|
||||||
: DATE_RE.test(rawMonth)
|
|
||||||
? rawMonth.slice(0, 7)
|
|
||||||
: today.slice(0, 7)
|
|
||||||
const start = month + '-01'
|
const start = month + '-01'
|
||||||
const end = addDays(monthStartNext(month), -1)
|
const end = addDays(monthStartNext(month), -1)
|
||||||
const habits = await prisma.habit.findMany({ where: { userId }, orderBy: [{ sortOrder: 'asc' }, { id: 'asc' }] })
|
const habits = await prisma.habit.findMany({ where: { userId }, orderBy: [{ sortOrder: 'asc' }, { id: 'asc' }] })
|
||||||
|
|||||||
+31
-2
@@ -6,7 +6,36 @@ const router = Router()
|
|||||||
|
|
||||||
router.use(authRequired)
|
router.use(authRequired)
|
||||||
|
|
||||||
// 能繁母猪存栏 (独立抓取域, 不属于宏观「经济数据」外接模块)
|
// 指标列表: 元数据 + 明细点, 过滤 hidden (数据与脚本保留, 仅不展示)
|
||||||
|
router.get('/indicators', async (_req, res, next) => {
|
||||||
|
try {
|
||||||
|
const rows = await prisma.indicator.findMany({
|
||||||
|
where: { hidden: false },
|
||||||
|
include: { points: { orderBy: { period: 'asc' } } },
|
||||||
|
orderBy: [{ groupName: 'asc' }, { name: 'asc' }],
|
||||||
|
})
|
||||||
|
// 组装前端友好结构: points 保持从老到新
|
||||||
|
const indicators = rows.map((r) => ({
|
||||||
|
id: r.id,
|
||||||
|
name: r.name,
|
||||||
|
groupName: r.groupName,
|
||||||
|
title: r.title,
|
||||||
|
unit: r.unit,
|
||||||
|
source: r.source,
|
||||||
|
frequency: r.frequency,
|
||||||
|
points: r.points.map((p) => ({ period: p.period, value: p.value })),
|
||||||
|
}))
|
||||||
|
res.json({ indicators })
|
||||||
|
} catch (e) { next(e) }
|
||||||
|
})
|
||||||
|
|
||||||
|
router.get('/strategies', async (_req, res, next) => {
|
||||||
|
try {
|
||||||
|
const rows = await prisma.strategy.findMany({ orderBy: { name: 'asc' } })
|
||||||
|
res.json({ strategies: rows })
|
||||||
|
} catch (e) { next(e) }
|
||||||
|
})
|
||||||
|
|
||||||
router.get('/sow', async (_req, res, next) => {
|
router.get('/sow', async (_req, res, next) => {
|
||||||
try {
|
try {
|
||||||
const rows = await prisma.econ_SowInventory.findMany({ orderBy: { month: 'asc' } })
|
const rows = await prisma.econ_SowInventory.findMany({ orderBy: { month: 'asc' } })
|
||||||
@@ -14,4 +43,4 @@ router.get('/sow', async (_req, res, next) => {
|
|||||||
} catch (e) { next(e) }
|
} catch (e) { next(e) }
|
||||||
})
|
})
|
||||||
|
|
||||||
export default router
|
export default router
|
||||||
@@ -7,7 +7,6 @@ import jwt from 'jsonwebtoken'
|
|||||||
import { prisma } from '../db.js'
|
import { prisma } from '../db.js'
|
||||||
import { JWT_SECRET, authRequired } from '../middleware.js'
|
import { JWT_SECRET, authRequired } from '../middleware.js'
|
||||||
import { genUuid, normProjectCode, allocProjectCode, withTaskNumber } from '../task-domain/identity.js'
|
import { genUuid, normProjectCode, allocProjectCode, withTaskNumber } from '../task-domain/identity.js'
|
||||||
import { resolveTaskUpload } from '../task-domain/resolveStatus.js'
|
|
||||||
|
|
||||||
const router = Router()
|
const router = Router()
|
||||||
|
|
||||||
@@ -97,17 +96,6 @@ async function applyPut(op, ctx) {
|
|||||||
if (d.taskKinds !== undefined) {
|
if (d.taskKinds !== undefined) {
|
||||||
data.taskKinds = Array.isArray(d.taskKinds) ? d.taskKinds.map((k) => String(k).slice(0, 20)).filter(Boolean) : null
|
data.taskKinds = Array.isArray(d.taskKinds) ? d.taskKinds.map((k) => String(k).slice(0, 20)).filter(Boolean) : null
|
||||||
}
|
}
|
||||||
// 项目图标: data URL (客户端已裁剪为 96x96 JPEG); 校验口径同 REST 写接口
|
|
||||||
if (d.icon !== undefined) {
|
|
||||||
if (d.icon === null || d.icon === '') {
|
|
||||||
data.icon = null
|
|
||||||
} else {
|
|
||||||
const s = String(d.icon)
|
|
||||||
if (!s.startsWith('data:image/')) throw new Error('图标格式非法')
|
|
||||||
if (s.length > 300_000) throw new Error('图标过大')
|
|
||||||
data.icon = s
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (Object.keys(data).length) await prisma.project.update({ where: { uuid }, data })
|
if (Object.keys(data).length) await prisma.project.update({ where: { uuid }, data })
|
||||||
return {}
|
return {}
|
||||||
}
|
}
|
||||||
@@ -195,43 +183,18 @@ async function applyPut(op, ctx) {
|
|||||||
if (d.extras !== undefined) data.extras = cleanExtras(d.extras)
|
if (d.extras !== undefined) data.extras = cleanExtras(d.extras)
|
||||||
if (d.sortOrder !== undefined) data.sortOrder = Number(d.sortOrder) || 0
|
if (d.sortOrder !== undefined) data.sortOrder = Number(d.sortOrder) || 0
|
||||||
if (d.assigneeId !== undefined) data.assigneeId = d.assigneeId ? Number(d.assigneeId) : null
|
if (d.assigneeId !== undefined) data.assigneeId = d.assigneeId ? Number(d.assigneeId) : null
|
||||||
|
if (d.doneAt !== undefined) data.doneAt = isoTime(d.doneAt)
|
||||||
// 归档状态 (T-ARC): 客户端本地归档/恢复走这里
|
// 归档状态 (T-ARC): 客户端本地归档/恢复走这里
|
||||||
if (d.archived !== undefined) data.archived = !!d.archived
|
if (d.archived !== undefined) data.archived = !!d.archived
|
||||||
if (d.archivedAt !== undefined) data.archivedAt = isoTime(d.archivedAt)
|
if (d.archivedAt !== undefined) data.archivedAt = isoTime(d.archivedAt)
|
||||||
if (d.archiveSource !== undefined) {
|
if (d.archiveSource !== undefined) {
|
||||||
data.archiveSource = ['manual', 'auto'].includes(d.archiveSource) ? d.archiveSource : null
|
data.archiveSource = ['manual', 'auto'].includes(d.archiveSource) ? d.archiveSource : null
|
||||||
}
|
}
|
||||||
|
|
||||||
// 列 / 状态: 复用 REST 写接口的同一裁决口径 (server/task-domain/resolveStatus.js)
|
|
||||||
// 客户端上行的是本地整行 (含 status 与 columnId), 变更检测与裁决
|
|
||||||
// 统一封装在 resolveTaskUpload 里 (那边有详细注释与用例)
|
|
||||||
let nextColumnId
|
|
||||||
if (d.columnId !== undefined) {
|
if (d.columnId !== undefined) {
|
||||||
const col = await prisma.boardColumn.findUnique({ where: { uuid: d.columnId } })
|
const col = await prisma.boardColumn.findUnique({ where: { uuid: d.columnId } })
|
||||||
if (!col || col.projectId !== existing.projectId) throw new Error('看板列不存在')
|
if (!col || col.projectId !== existing.projectId) throw new Error('看板列不存在')
|
||||||
nextColumnId = col.id
|
data.columnId = col.id
|
||||||
}
|
}
|
||||||
if (d.status !== undefined && !TASK_STATUSES.includes(d.status)) {
|
|
||||||
throw new Error('任务状态取值非法')
|
|
||||||
}
|
|
||||||
const resolved = resolveTaskUpload(
|
|
||||||
existing,
|
|
||||||
{ columnId: nextColumnId, status: d.status },
|
|
||||||
await ctx.loadColumns(existing.projectId),
|
|
||||||
)
|
|
||||||
if (resolved) {
|
|
||||||
data.status = resolved.status
|
|
||||||
data.columnId = resolved.columnId
|
|
||||||
// doneAt 与最终状态保持一致 (口径同 REST 写接口): 进入 done 记时, 离开 done 清空
|
|
||||||
if (resolved.status === 'done') {
|
|
||||||
if (existing.status !== 'done') data.doneAt = isoTime(d.doneAt) || new Date()
|
|
||||||
} else {
|
|
||||||
data.doneAt = null
|
|
||||||
}
|
|
||||||
} else if (d.doneAt !== undefined) {
|
|
||||||
data.doneAt = isoTime(d.doneAt)
|
|
||||||
}
|
|
||||||
|
|
||||||
if (d.parentId !== undefined) {
|
if (d.parentId !== undefined) {
|
||||||
if (!d.parentId) {
|
if (!d.parentId) {
|
||||||
data.parentId = null
|
data.parentId = null
|
||||||
@@ -392,19 +355,7 @@ router.post('/upload', authRequired, async (req, res, next) => {
|
|||||||
memberCache.set(projectId, ok)
|
memberCache.set(projectId, ok)
|
||||||
return ok
|
return ok
|
||||||
}
|
}
|
||||||
// 项目列缓存: 列/状态裁决需要全部列; 同批内按项目缓存 (ops 已按表序排列,
|
const ctx = { userId, assertMember }
|
||||||
// BoardColumn 先于 Task 落地, 故 Task 阶段读到的列是本次批次的最终结果)
|
|
||||||
const columnCache = new Map()
|
|
||||||
const loadColumns = async (projectId) => {
|
|
||||||
if (columnCache.has(projectId)) return columnCache.get(projectId)
|
|
||||||
const rows = await prisma.boardColumn.findMany({
|
|
||||||
where: { projectId },
|
|
||||||
orderBy: [{ sortOrder: 'asc' }, { id: 'asc' }],
|
|
||||||
})
|
|
||||||
columnCache.set(projectId, rows)
|
|
||||||
return rows
|
|
||||||
}
|
|
||||||
const ctx = { userId, assertMember, loadColumns }
|
|
||||||
|
|
||||||
// 依赖顺序: 父表先落地 (Project → BoardColumn → ProjectMember → Task → TaskMember/TaskTag); 删除反向
|
// 依赖顺序: 父表先落地 (Project → BoardColumn → ProjectMember → Task → TaskMember/TaskTag); 删除反向
|
||||||
const rank = (o) => TABLE_RANK[o?.table] ?? 99
|
const rank = (o) => TABLE_RANK[o?.table] ?? 99
|
||||||
|
|||||||
@@ -83,32 +83,3 @@ export function resolveTaskWrite(task, patch, columns) {
|
|||||||
|
|
||||||
return { status, columnId }
|
return { status, columnId }
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 离线同步上传路径专用: 客户端上行的是**本地整行**, 字段总是存在, 因此不能用
|
|
||||||
* "字段是否存在"判断变更 —— 必须先与服务端现值比较, 得出"这次真正改了什么",
|
|
||||||
* 再交给 resolveTaskWrite 裁决。
|
|
||||||
*
|
|
||||||
* 不这样做会踩的坑 (T-BD-16): 任务从 Plan 拖到未绑定状态的 Action 列, 客户端
|
|
||||||
* 整行里 status 仍是 todo; 若把 status 当作"本次变更"提交, 场景 B 会把任务从
|
|
||||||
* Action 归位回第一个绑定 todo 的 Plan —— 用户拖到 Action 又被弹回去。
|
|
||||||
*
|
|
||||||
* @param {object} existing 服务端现有任务 (含 columnId/status/parentId)
|
|
||||||
* @param {object} incoming 本次上行值 { columnId?: number, status?: string }
|
|
||||||
* 外键需调用方先由 uuid 解析为内部 int id
|
|
||||||
* @param {object[]} columns 项目全部列
|
|
||||||
* @returns {{ status: string, columnId: number } | null} null = 列/状态无变化
|
|
||||||
*/
|
|
||||||
export function resolveTaskUpload(existing, incoming, columns) {
|
|
||||||
const nextColumnId = incoming?.columnId !== undefined ? incoming.columnId : existing.columnId
|
|
||||||
const patch = {}
|
|
||||||
if (nextColumnId !== existing.columnId) patch.columnId = nextColumnId
|
|
||||||
if (incoming?.status !== undefined && incoming.status !== existing.status) patch.status = incoming.status
|
|
||||||
if (!Object.keys(patch).length) return null
|
|
||||||
|
|
||||||
// task.column 必须与 columnId 一起指向目标列, 否则场景 B 的
|
|
||||||
// "当前列已匹配该状态" 会拿旧列判断, 同样导致误归位
|
|
||||||
const targetCol = (columns || []).find((c) => c.id === nextColumnId) || null
|
|
||||||
const r = resolveTaskWrite({ ...existing, columnId: nextColumnId, column: targetCol }, patch, columns)
|
|
||||||
return { status: r.status, columnId: r.columnId }
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -32,7 +32,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"security": {
|
"security": {
|
||||||
"csp": "default-src 'self' ipc: http://ipc.localhost; img-src 'self' data: blob: asset: http://asset.localhost https://*.honor3.com http://*.honor3.com; connect-src 'self' ipc: http://ipc.localhost https://iboard.honor3.com http://bh.vps.honor3.com:3001 https://bh.vps.honor3.com:3001 https://ifinance.honor3.com http://ifinance.honor3.com https://*.honor3.com https://*.honor3.com:* http://*.honor3.com http://*.honor3.com:*; frame-src 'self' https://ifinance.honor3.com http://ifinance.honor3.com https://*.honor3.com https://*.honor3.com:* http://*.honor3.com http://*.honor3.com:*; style-src 'self' 'unsafe-inline'; script-src 'self'"
|
"csp": "default-src 'self' ipc: http://ipc.localhost; img-src 'self' data: blob: asset: http://asset.localhost; connect-src 'self' ipc: http://ipc.localhost https://iboard.honor3.com http://bh.vps.honor3.com:3001 https://bh.vps.honor3.com:3001; style-src 'self' 'unsafe-inline'; script-src 'self'"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"bundle": {
|
"bundle": {
|
||||||
|
|||||||
+1
-1
@@ -43,7 +43,7 @@ export default function App() {
|
|||||||
<Route path="/task" element={<TaskPage />} />
|
<Route path="/task" element={<TaskPage />} />
|
||||||
<Route path="/task/list" element={<TaskPage />} />
|
<Route path="/task/list" element={<TaskPage />} />
|
||||||
<Route path="/task/:pid" element={<TaskPage />} />
|
<Route path="/task/:pid" element={<TaskPage />} />
|
||||||
{/* 宏观: 新闻 / 经济文章 + 外接 ifinance 分类 (动态 tab); 报警已迁至监控 (V0.2.2) */}
|
{/* 宏观: 报警 / 新闻 / 油价 / 经济数据 / 策略研究 / 经济文章 (V0.2 原首页并入, 默认新闻) */}
|
||||||
<Route path="/macro" element={<Navigate to="/macro/news" replace />} />
|
<Route path="/macro" element={<Navigate to="/macro/news" replace />} />
|
||||||
<Route path="/macro/*" element={<MacroPage />} />
|
<Route path="/macro/*" element={<MacroPage />} />
|
||||||
<Route path="/monitor" element={<MonitorPage />} />
|
<Route path="/monitor" element={<MonitorPage />} />
|
||||||
|
|||||||
@@ -0,0 +1,32 @@
|
|||||||
|
// 前端油价 API: 一律走后端 /api/apizero/oil/*, 不直接调 apizero (key 不外泄)
|
||||||
|
import { api, getApiBase } from './client.js'
|
||||||
|
|
||||||
|
// 实时: 油价 + 国际原油 + 下次调价预测
|
||||||
|
export async function getOilForecast() {
|
||||||
|
return api('/apizero/oil/forecast')
|
||||||
|
}
|
||||||
|
|
||||||
|
// 32 省油价 (可暂未在 UI 用, 留作 API 暴露)
|
||||||
|
export async function getOilPriceAll() {
|
||||||
|
return api('/apizero/oil/price-all')
|
||||||
|
}
|
||||||
|
|
||||||
|
// 单省油价
|
||||||
|
export async function getOilPrice(province) {
|
||||||
|
return api('/apizero/oil/price?province=' + encodeURIComponent(province))
|
||||||
|
}
|
||||||
|
|
||||||
|
// 某年调价日历 (后端按年缓存, 同年份不会重复调 apizero)
|
||||||
|
export async function getOilSchedule(year) {
|
||||||
|
return api('/apizero/oil/schedule?year=' + encodeURIComponent(year))
|
||||||
|
}
|
||||||
|
|
||||||
|
// 浙江省油价历史 (走 DB, 由 cron 每天 04:00 抓取并落库)
|
||||||
|
// fuel: '92' | '95' | '0' | undefined (留空 = 3 个油品)
|
||||||
|
// days: 默认 180 (半年)
|
||||||
|
export async function getOilHistory({ fuel, days = 180 } = {}) {
|
||||||
|
const qs = new URLSearchParams()
|
||||||
|
if (fuel) qs.set('fuel', fuel)
|
||||||
|
qs.set('days', String(days))
|
||||||
|
return api('/apizero/oil/history?' + qs.toString())
|
||||||
|
}
|
||||||
+9
-42
@@ -35,13 +35,6 @@ const DEFAULT_COLUMNS = [
|
|||||||
export const DEFAULT_TASK_KINDS = ['需求', 'Bug', 'FEATURE', '优化']
|
export const DEFAULT_TASK_KINDS = ['需求', 'Bug', 'FEATURE', '优化']
|
||||||
const MAX_NAME = 20
|
const MAX_NAME = 20
|
||||||
|
|
||||||
// 即时同步: 订阅用的本地表集合 (见 docs/V0.2/离线编辑模块/即时同步方案.md)
|
|
||||||
// TASK_TABLES 影响"某项目的任务列表/看板"的内容
|
|
||||||
// PROJECT_TABLES 影响"项目列表"的内容
|
|
||||||
// 只用于变更通知, 不参与查询; 表名必须与 PowerSync 客户端 schema 一致。
|
|
||||||
export const TASK_TABLES = ['Task', 'BoardColumn', 'TaskMember', 'TaskTag']
|
|
||||||
export const PROJECT_TABLES = ['Project', 'ProjectMember']
|
|
||||||
|
|
||||||
function normTaskKinds(v) {
|
function normTaskKinds(v) {
|
||||||
if (!Array.isArray(v)) return null
|
if (!Array.isArray(v)) return null
|
||||||
const out = []
|
const out = []
|
||||||
@@ -142,8 +135,6 @@ function projectSummary(p, memberCount, taskCount) {
|
|||||||
updatedAt: p.updatedAt,
|
updatedAt: p.updatedAt,
|
||||||
taskKinds: normTaskKinds(parseJson(p.taskKinds, null)) || DEFAULT_TASK_KINDS,
|
taskKinds: normTaskKinds(parseJson(p.taskKinds, null)) || DEFAULT_TASK_KINDS,
|
||||||
icon: p.icon || null,
|
icon: p.icon || null,
|
||||||
// 自动归档档位 (T-ARC-02): 必须回传给前端, 否则该设置在界面上永远显示默认的「永不」
|
|
||||||
autoArchive: p.autoArchive || 'never',
|
|
||||||
memberCount,
|
memberCount,
|
||||||
taskCount,
|
taskCount,
|
||||||
}
|
}
|
||||||
@@ -277,11 +268,6 @@ export const projectApi = {
|
|||||||
content: String(n?.content ?? '').slice(0, 20000),
|
content: String(n?.content ?? '').slice(0, 20000),
|
||||||
})))
|
})))
|
||||||
}
|
}
|
||||||
if (body?.autoArchive !== undefined) {
|
|
||||||
// 自动归档档位 (T-ARC-02): 与服务端 AUTO_ARCHIVE_OPTIONS 同口径
|
|
||||||
if (!['3d', '1w', '1m', 'never'].includes(body.autoArchive)) throw new Error('自动归档档位非法')
|
|
||||||
data.autoArchive = body.autoArchive
|
|
||||||
}
|
|
||||||
const sets = Object.keys(data).map((k) => `"${k}" = ?`)
|
const sets = Object.keys(data).map((k) => `"${k}" = ?`)
|
||||||
if (sets.length) {
|
if (sets.length) {
|
||||||
await db().execute(
|
await db().execute(
|
||||||
@@ -550,17 +536,10 @@ export const taskApi = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 列 / 状态联动裁决 (与 server/task-domain/resolveStatus.js 同口径)
|
// 列 / 状态联动裁决 (与 server/task-domain/resolveStatus.js 同口径)
|
||||||
// 本地库主键是 uuid 字符串: 若调用方把 id 过了一道 Number() 会变成 NaN / "NaN",
|
|
||||||
// 这里直接拦下并给出可定位的错误, 而不是让后续比对静默失败
|
|
||||||
let status = task.status
|
let status = task.status
|
||||||
let columnId = String(task.columnId)
|
let columnId = String(task.columnId)
|
||||||
const patch = {}
|
const patch = {}
|
||||||
if (body?.columnId !== undefined) {
|
if (body?.columnId !== undefined) patch.columnId = String(body.columnId)
|
||||||
const cid = body.columnId === null ? '' : String(body.columnId)
|
|
||||||
if (!cid) throw new Error('看板列不能为空')
|
|
||||||
if (cid === 'NaN' || cid === 'undefined') throw new Error('看板列无效（编号已损坏）')
|
|
||||||
patch.columnId = cid
|
|
||||||
}
|
|
||||||
if (body?.status !== undefined) {
|
if (body?.status !== undefined) {
|
||||||
if (!['todo', 'doing', 'done'].includes(body.status)) throw new Error('任务状态取值非法')
|
if (!['todo', 'doing', 'done'].includes(body.status)) throw new Error('任务状态取值非法')
|
||||||
patch.status = body.status
|
patch.status = body.status
|
||||||
@@ -715,16 +694,14 @@ export const taskApi = {
|
|||||||
archive: async (id) => {
|
archive: async (id) => {
|
||||||
const task = await db().getOptional('SELECT * FROM Task WHERE id = ?', [String(id)])
|
const task = await db().getOptional('SELECT * FROM Task WHERE id = ?', [String(id)])
|
||||||
if (!task) throw new Error('任务不存在或无权限')
|
if (!task) throw new Error('任务不存在或无权限')
|
||||||
// 不能写 const now = now(): 同名 const 会遮蔽模块级 now, 右侧求值落入 TDZ,
|
const now = now()
|
||||||
// 压缩后报 "Cannot access 'a' before initialization"
|
|
||||||
const ts = now()
|
|
||||||
await db().writeTransaction(async (tx) => {
|
await db().writeTransaction(async (tx) => {
|
||||||
const kids = await tx.getAll('SELECT id FROM Task WHERE parentId = ?', [String(task.id)])
|
const kids = await tx.getAll('SELECT id FROM Task WHERE parentId = ?', [String(task.id)])
|
||||||
const ids = [String(task.id), ...kids.map((k) => String(k.id))]
|
const ids = [String(task.id), ...kids.map((k) => String(k.id))]
|
||||||
const ph = ids.map(() => '?').join(',')
|
const ph = ids.map(() => '?').join(',')
|
||||||
await tx.execute(
|
await tx.execute(
|
||||||
`UPDATE Task SET archived = 1, archivedAt = ?, archiveSource = 'manual', updatedAt = ? WHERE id IN (${ph})`,
|
`UPDATE Task SET archived = 1, archivedAt = ?, archiveSource = 'manual', updatedAt = ? WHERE id IN (${ph})`,
|
||||||
[ts, ts, ...ids],
|
[now, now, ...ids],
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
return { ok: true, count: 1 }
|
return { ok: true, count: 1 }
|
||||||
@@ -734,14 +711,14 @@ export const taskApi = {
|
|||||||
unarchive: async (id) => {
|
unarchive: async (id) => {
|
||||||
const task = await db().getOptional('SELECT * FROM Task WHERE id = ?', [String(id)])
|
const task = await db().getOptional('SELECT * FROM Task WHERE id = ?', [String(id)])
|
||||||
if (!task) throw new Error('任务不存在或无权限')
|
if (!task) throw new Error('任务不存在或无权限')
|
||||||
const ts = now()
|
const now = now()
|
||||||
await db().writeTransaction(async (tx) => {
|
await db().writeTransaction(async (tx) => {
|
||||||
const kids = await tx.getAll('SELECT id FROM Task WHERE parentId = ?', [String(task.id)])
|
const kids = await tx.getAll('SELECT id FROM Task WHERE parentId = ?', [String(task.id)])
|
||||||
const ids = [String(task.id), ...kids.map((k) => String(k.id))]
|
const ids = [String(task.id), ...kids.map((k) => String(k.id))]
|
||||||
const ph = ids.map(() => '?').join(',')
|
const ph = ids.map(() => '?').join(',')
|
||||||
await tx.execute(
|
await tx.execute(
|
||||||
`UPDATE Task SET archived = 0, archivedAt = NULL, archiveSource = NULL, updatedAt = ? WHERE id IN (${ph})`,
|
`UPDATE Task SET archived = 0, archivedAt = NULL, archiveSource = NULL, updatedAt = ? WHERE id IN (${ph})`,
|
||||||
[ts, ...ids],
|
[now, ...ids],
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
return { ok: true, count: 1 }
|
return { ok: true, count: 1 }
|
||||||
@@ -770,23 +747,13 @@ export const taskApi = {
|
|||||||
where.push('columnId = ?')
|
where.push('columnId = ?')
|
||||||
args.push(String(p.columnId))
|
args.push(String(p.columnId))
|
||||||
}
|
}
|
||||||
// 日期边界: 传 'YYYY-MM-DD' 时按**本地时区**的那一天换算成 UTC 瞬时再比较。
|
|
||||||
// (原来直接拼 'T00:00:00Z', 本地选的日期会偏移 8 小时, 导致当天凌晨的归档被漏掉)
|
|
||||||
const dayToIso = (v, endOfDay) => {
|
|
||||||
const s = String(v)
|
|
||||||
if (s.includes('T')) return s // 已带时间的 ISO, 原样使用
|
|
||||||
const d = new Date(`${s}T00:00:00`) // 本地 00:00
|
|
||||||
if (Number.isNaN(d.getTime())) return null
|
|
||||||
if (endOfDay) d.setHours(23, 59, 59, 999)
|
|
||||||
return d.toISOString()
|
|
||||||
}
|
|
||||||
if (p.from) {
|
if (p.from) {
|
||||||
const iso = dayToIso(p.from, false)
|
where.push('archivedAt >= ?')
|
||||||
if (iso) { where.push('archivedAt >= ?'); args.push(iso) }
|
args.push(String(p.from) + 'T00:00:00+08:00'.replace('+08:00', 'Z'))
|
||||||
}
|
}
|
||||||
if (p.to) {
|
if (p.to) {
|
||||||
const iso = dayToIso(p.to, true)
|
where.push('archivedAt <= ?')
|
||||||
if (iso) { where.push('archivedAt <= ?'); args.push(iso) }
|
args.push(String(p.to) + 'T23:59:59.999Z')
|
||||||
}
|
}
|
||||||
if (p.cursor) {
|
if (p.cursor) {
|
||||||
const [ts, cid] = String(p.cursor).split('|')
|
const [ts, cid] = String(p.cursor).split('|')
|
||||||
|
|||||||
@@ -0,0 +1,54 @@
|
|||||||
|
// 趋势徽标: 上升 / 下降 / 持平 / 震荡
|
||||||
|
// props:
|
||||||
|
// trend: 'up' | 'down' | 'flat' | 'volatile'
|
||||||
|
// showText: 是否显示文字 (默认 true)
|
||||||
|
const META = {
|
||||||
|
up: { icon: '\u2191', text: '上升' },
|
||||||
|
down: { icon: '\u2193', text: '下降' },
|
||||||
|
flat: { icon: '=', text: '持平' },
|
||||||
|
volatile: { icon: '\u223F', text: '震荡' },
|
||||||
|
}
|
||||||
|
|
||||||
|
// 根据最近 N 个数据点计算趋势:
|
||||||
|
// - 数据不足 2 个 → flat
|
||||||
|
// - 取最近 6 个点的变化, 整体涨幅 < 1% → flat
|
||||||
|
// - 单调递增 → up, 单调递减 → down
|
||||||
|
// - 其余 (有升有降) → volatile
|
||||||
|
// 返回: { trend, change } (change 为百分比变化, 保留 1 位小数)
|
||||||
|
export function calcTrend(rows) {
|
||||||
|
if (!rows || rows.length < 2) return { trend: 'flat', change: 0 }
|
||||||
|
const N = Math.min(6, rows.length)
|
||||||
|
const recent = rows.slice(-N).map((r) => r.value).filter((v) => typeof v === 'number')
|
||||||
|
if (recent.length < 2) return { trend: 'flat', change: 0 }
|
||||||
|
const first = recent[0]
|
||||||
|
const last = recent[recent.length - 1]
|
||||||
|
const change = first === 0 ? 0 : ((last - first) / Math.abs(first)) * 100
|
||||||
|
if (Math.abs(change) < 1) return { trend: 'flat', change }
|
||||||
|
let up = 0, down = 0
|
||||||
|
for (let i = 1; i < recent.length; i++) {
|
||||||
|
if (recent[i] > recent[i - 1]) up++
|
||||||
|
else if (recent[i] < recent[i - 1]) down++
|
||||||
|
}
|
||||||
|
if (up === recent.length - 1) return { trend: 'up', change }
|
||||||
|
if (down === recent.length - 1) return { trend: 'down', change }
|
||||||
|
return { trend: 'volatile', change }
|
||||||
|
}
|
||||||
|
|
||||||
|
// 取数据序列最后一个有效点: { month, value } 或 null
|
||||||
|
export function lastPoint(data) {
|
||||||
|
const rows = (data && data.rows) || []
|
||||||
|
for (let i = rows.length - 1; i >= 0; i--) {
|
||||||
|
if (rows[i] && typeof rows[i].value === 'number') return rows[i]
|
||||||
|
}
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
||||||
|
export default function TrendBadge({ trend, showText = true }) {
|
||||||
|
const m = META[trend] || META.flat
|
||||||
|
return (
|
||||||
|
<span className={'trend-badge trend-' + (trend || 'flat')}>
|
||||||
|
<span className="trend-icon">{m.icon}</span>
|
||||||
|
{showText && <span>{m.text}</span>}
|
||||||
|
</span>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -1,66 +0,0 @@
|
|||||||
// 打卡日历的日期标记: 环形进度 (F-CL-06)
|
|
||||||
//
|
|
||||||
// 为什么是环而不是圆点:
|
|
||||||
// 旧实现是 4px 小圆点, 只按状态上色 —— 3/5 和 5/5 都是同一个绿点,
|
|
||||||
// 看不出"当天做到几成"。改成环形后 **弧长 = 当天完成比例**, 颜色表状态:
|
|
||||||
// 0 < actual < expected -> 弧长按比例 (部分完成)
|
|
||||||
// actual >= expected -> 整圈 (全部完成)
|
|
||||||
// actual = 0 且 expected > 0 -> 只有底环 (未开始)
|
|
||||||
// expected = 0 由父组件判断, 不渲染本组件 (当天没有应打卡项)
|
|
||||||
//
|
|
||||||
// 颜色分级 (4 档, 由 CSS 按 `.mv-day` 作用域上色, 各视图可各自调色板):
|
|
||||||
// 小半 (ratio < 0.5) -> 红
|
|
||||||
// 大半 (0.5 <= r < 1) -> 橘
|
|
||||||
// 完成 (r = 1) -> 蓝
|
|
||||||
// 超额 -> 绿
|
|
||||||
// 注意: 服务端统计时把 actual 封顶在 expected (`Math.min(cnt, exp)`),
|
|
||||||
// 所以 ratio 永远 <= 1, **超额只能靠 status === 'over' 判断**, 不能看比例。
|
|
||||||
const DEFAULT_SIZE = 30
|
|
||||||
const DEFAULT_STROKE = 2.5
|
|
||||||
|
|
||||||
/** 4 档分级: 小半 / 大半 / 完成 / 超额 */
|
|
||||||
function tierOf(status, p) {
|
|
||||||
if (status === 'over') return 'over'
|
|
||||||
if (status === 'full') return 'full'
|
|
||||||
if (p <= 0) return 'empty'
|
|
||||||
if (p >= 1) return 'full'
|
|
||||||
return p < 0.5 ? 'low' : 'high'
|
|
||||||
}
|
|
||||||
|
|
||||||
export default function DayRing({
|
|
||||||
status = 'partial',
|
|
||||||
ratio = 0,
|
|
||||||
size = DEFAULT_SIZE,
|
|
||||||
stroke = DEFAULT_STROKE,
|
|
||||||
}) {
|
|
||||||
const p = Math.max(0, Math.min(1, Number(ratio) || 0))
|
|
||||||
const tier = tierOf(status, p)
|
|
||||||
const r = (size - stroke) / 2
|
|
||||||
const c = 2 * Math.PI * r
|
|
||||||
const half = size / 2
|
|
||||||
return (
|
|
||||||
<svg
|
|
||||||
className="day-ring"
|
|
||||||
width={size}
|
|
||||||
height={size}
|
|
||||||
viewBox={`0 0 ${size} ${size}`}
|
|
||||||
aria-hidden="true"
|
|
||||||
>
|
|
||||||
<circle
|
|
||||||
className="day-ring-bg"
|
|
||||||
cx={half} cy={half} r={r}
|
|
||||||
fill="none" strokeWidth={stroke}
|
|
||||||
/>
|
|
||||||
{p > 0 && (
|
|
||||||
<circle
|
|
||||||
className={'day-ring-bar ' + tier}
|
|
||||||
cx={half} cy={half} r={r}
|
|
||||||
fill="none" strokeWidth={stroke}
|
|
||||||
strokeDasharray={c}
|
|
||||||
strokeDashoffset={c * (1 - p)}
|
|
||||||
transform={`rotate(-90 ${half} ${half})`}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
</svg>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -1,7 +1,6 @@
|
|||||||
import StatusDot from './StatusDot.jsx'
|
import StatusDot from './StatusDot.jsx'
|
||||||
import Avatar from './Avatar.jsx'
|
import Avatar from './Avatar.jsx'
|
||||||
import { kindColor } from '../../pages/task/kind.js'
|
import { kindColor } from '../../pages/task/kind.js'
|
||||||
import { taskShortId } from '../../pages/task/date.js'
|
|
||||||
|
|
||||||
// 看板卡片 (T-UI-02): 轻量化
|
// 看板卡片 (T-UI-02): 轻量化
|
||||||
// - 标题 + 状态点 (T-ST-09)
|
// - 标题 + 状态点 (T-ST-09)
|
||||||
@@ -10,13 +9,11 @@ import { taskShortId } from '../../pages/task/date.js'
|
|||||||
const MAX_SUB = 3
|
const MAX_SUB = 3
|
||||||
|
|
||||||
export default function TaskCard({
|
export default function TaskCard({
|
||||||
task, bindDrag, onClick, onToggleSub, onToggle, onMore, dragging = false, highlight = false,
|
task, codePrefix, bindDrag, onClick, onToggleSub, onToggle, onMore, dragging = false, highlight = false,
|
||||||
}) {
|
}) {
|
||||||
const children = task.children || []
|
const children = task.children || []
|
||||||
const shown = children.slice(0, MAX_SUB)
|
const shown = children.slice(0, MAX_SUB)
|
||||||
const rest = children.length - shown.length
|
const rest = children.length - shown.length
|
||||||
// 编号只显示 `#序号`; 完整编号 (项目编号-序号) 放详情页 (见 TaskDetail)
|
|
||||||
const shortId = taskShortId(task)
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
@@ -50,7 +47,9 @@ export default function TaskCard({
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="bmeta">
|
<div className="bmeta">
|
||||||
{shortId && <span className="num-tag">{shortId}</span>}
|
{codePrefix && task.number != null && (
|
||||||
|
<span className="num-tag">{codePrefix}-{task.number}</span>
|
||||||
|
)}
|
||||||
{task.markDate && (
|
{task.markDate && (
|
||||||
<span className="date-tag">{task.markDate.slice(5, 10).replace('-', '/')}</span>
|
<span className="date-tag">{task.markDate.slice(5, 10).replace('-', '/')}</span>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
import StatusDot from './StatusDot.jsx'
|
import StatusDot from './StatusDot.jsx'
|
||||||
import Avatar from './Avatar.jsx'
|
import Avatar from './Avatar.jsx'
|
||||||
import { kindColor } from '../../pages/task/kind.js'
|
import { kindColor } from '../../pages/task/kind.js'
|
||||||
import { taskShortId } from '../../pages/task/date.js'
|
|
||||||
|
|
||||||
const statusLabel = (s) => (s === 'done' ? '完成' : s === 'doing' ? '执行中' : '未开始')
|
const statusLabel = (s) => (s === 'done' ? '完成' : s === 'doing' ? '执行中' : '未开始')
|
||||||
|
|
||||||
@@ -11,11 +10,9 @@ const statusLabel = (s) => (s === 'done' ? '完成' : s === 'doing' ? '执行中
|
|||||||
// 复选框 / ⋯ 是独立控件: pointerdown 不冒泡, 不发起拖动,
|
// 复选框 / ⋯ 是独立控件: pointerdown 不冒泡, 不发起拖动,
|
||||||
// 避免长按行后抬手时合成的 click 落在控件上误触状态切换
|
// 避免长按行后抬手时合成的 click 落在控件上误触状态切换
|
||||||
export default function TaskRow({
|
export default function TaskRow({
|
||||||
task, onToggle, onClick, onMore, bindDrag, bindDragHandle, dragging = false, dragOver, indent = false, children,
|
task, codePrefix, onToggle, onClick, onMore, bindDrag, bindDragHandle, dragging = false, dragOver, indent = false, children,
|
||||||
}) {
|
}) {
|
||||||
const done = task.status === 'done'
|
const done = task.status === 'done'
|
||||||
// 编号只显示 `#序号`; 完整编号 (项目编号-序号) 放详情页 (见 TaskDetail)
|
|
||||||
const shortId = indent ? null : taskShortId(task)
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<div
|
<div
|
||||||
@@ -55,7 +52,9 @@ export default function TaskRow({
|
|||||||
<div className="task-title">{task.title}</div>
|
<div className="task-title">{task.title}</div>
|
||||||
{/* 无类型/成员也保留该行, 与有标签的行等高 */}
|
{/* 无类型/成员也保留该行, 与有标签的行等高 */}
|
||||||
<div className="task-meta">
|
<div className="task-meta">
|
||||||
{shortId && <span className="num-tag">{shortId}</span>}
|
{codePrefix && task.number != null && (
|
||||||
|
<span className="num-tag">{codePrefix}-{task.number}</span>
|
||||||
|
)}
|
||||||
{task.markDate && (
|
{task.markDate && (
|
||||||
<span className="date-tag">{task.markDate.slice(5, 10).replace('-', '/')}</span>
|
<span className="date-tag">{task.markDate.slice(5, 10).replace('-', '/')}</span>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
import { useCallback, useEffect, useRef, useState } from 'react'
|
import { useCallback, useEffect, useRef, useState } from 'react'
|
||||||
import { datasetId, sameId } from '../../pages/task/ids.js'
|
|
||||||
|
|
||||||
// 看板卡片列拖动 (重点设计 §7.1)
|
// 看板卡片列拖动 (重点设计 §7.1)
|
||||||
// 方案要点:
|
// 方案要点:
|
||||||
@@ -61,11 +60,10 @@ export default function useColumnDrag({ onDrop, scrollSelector = '.board-wrap' }
|
|||||||
/** 拖动刚结束 (350ms 内): 抑制松手合成的 click 误开详情页 */
|
/** 拖动刚结束 (350ms 内): 抑制松手合成的 click 误开详情页 */
|
||||||
const justEnded = useCallback(() => Date.now() - lastEnd.current < 350, [])
|
const justEnded = useCallback(() => Date.now() - lastEnd.current < 350, [])
|
||||||
|
|
||||||
// 命中列 id: 本地库列 id 是 uuid 字符串, 不能 Number() (会变 NaN -> 落不下去)
|
|
||||||
const hitColumn = (x, y) => {
|
const hitColumn = (x, y) => {
|
||||||
const el = document.elementFromPoint(x, y)
|
const el = document.elementFromPoint(x, y)
|
||||||
const colEl = el?.closest?.('[data-column-id]')
|
const colEl = el?.closest?.('[data-column-id]')
|
||||||
return colEl ? datasetId(colEl.dataset.columnId) : null
|
return colEl ? Number(colEl.dataset.columnId) : null
|
||||||
}
|
}
|
||||||
|
|
||||||
// 边缘自动滚动 (±36px 触发, 每帧 10px)
|
// 边缘自动滚动 (±36px 触发, 每帧 10px)
|
||||||
@@ -107,7 +105,7 @@ export default function useColumnDrag({ onDrop, scrollSelector = '.board-wrap' }
|
|||||||
if (s.active) {
|
if (s.active) {
|
||||||
lastEnd.current = Date.now()
|
lastEnd.current = Date.now()
|
||||||
const col = hitColumn(ev.clientX, ev.clientY)
|
const col = hitColumn(ev.clientX, ev.clientY)
|
||||||
if (col && s.task && !sameId(col, s.task.columnId)) onDropRef.current?.(s.task, col)
|
if (col && s.task && col !== s.task.columnId) onDropRef.current?.(s.task, col)
|
||||||
}
|
}
|
||||||
cleanup()
|
cleanup()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
|
import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
|
||||||
import { datasetId, sameId } from '../../pages/task/ids.js'
|
|
||||||
|
|
||||||
// 列表视图任务行拖动: 组间换列 + 组内排序
|
// 列表视图任务行拖动: 组间换列 + 组内排序
|
||||||
// 触发: 行长按 400ms, 或按住行首 ⠿ 把手 (touch-action:none + touchstart
|
// 触发: 行长按 400ms, 或按住行首 ⠿ 把手 (touch-action:none + touchstart
|
||||||
@@ -79,15 +78,15 @@ export default function useRowDrag({ columns, onDrop, onReorder }) {
|
|||||||
moveGhost(ev.clientX, ev.clientY)
|
moveGhost(ev.clientX, ev.clientY)
|
||||||
|
|
||||||
// 组内落点: 命中本组 ([data-column-id]=当前列) 的某条顶层行
|
// 组内落点: 命中本组 ([data-column-id]=当前列) 的某条顶层行
|
||||||
// 本地库的列/任务 id 均为 uuid 字符串 -> 一律按字符串比对, 不要 Number()
|
|
||||||
const hitEl = document.elementFromPoint(ev.clientX, ev.clientY)
|
const hitEl = document.elementFromPoint(ev.clientX, ev.clientY)
|
||||||
const rowEl = hitEl?.closest?.('[data-task-id]')
|
const rowEl = hitEl?.closest?.('[data-task-id]')
|
||||||
const colEl = hitEl?.closest?.('[data-column-id]')
|
const colEl = hitEl?.closest?.('[data-column-id]')
|
||||||
const colId = colEl ? datasetId(colEl.dataset.columnId) : null
|
const colId = colEl ? Number(colEl.dataset.columnId) : null
|
||||||
|
const curCol = orderedRef.current[s.toIdx]?.id
|
||||||
|
|
||||||
if (rowEl && sameId(colId, s.task.columnId)) {
|
if (rowEl && colId === s.task.columnId) {
|
||||||
const id = datasetId(rowEl.dataset.taskId)
|
const id = Number(rowEl.dataset.taskId)
|
||||||
if (id && !sameId(id, s.task.id)) {
|
if (id !== s.task.id) {
|
||||||
const r = rowEl.getBoundingClientRect()
|
const r = rowEl.getBoundingClientRect()
|
||||||
const hit = { id, after: ev.clientY > r.top + r.height / 2 }
|
const hit = { id, after: ev.clientY > r.top + r.height / 2 }
|
||||||
if (!s.over || s.over.id !== hit.id || s.over.after !== hit.after) {
|
if (!s.over || s.over.id !== hit.id || s.over.after !== hit.after) {
|
||||||
@@ -101,7 +100,7 @@ export default function useRowDrag({ columns, onDrop, onReorder }) {
|
|||||||
|
|
||||||
// 换列: 手指划到哪个分组就是目标列, 划出所有分组时保持上一目标
|
// 换列: 手指划到哪个分组就是目标列, 划出所有分组时保持上一目标
|
||||||
if (colId != null) {
|
if (colId != null) {
|
||||||
const to = orderedRef.current.findIndex((c) => sameId(c.id, colId))
|
const to = orderedRef.current.findIndex((c) => c.id === colId)
|
||||||
if (to >= 0 && to !== s.toIdx) {
|
if (to >= 0 && to !== s.toIdx) {
|
||||||
s.toIdx = to
|
s.toIdx = to
|
||||||
setDrag({ task: s.task, fromIdx: s.fromIdx, toIdx: to })
|
setDrag({ task: s.task, fromIdx: s.fromIdx, toIdx: to })
|
||||||
@@ -117,7 +116,7 @@ export default function useRowDrag({ columns, onDrop, onReorder }) {
|
|||||||
onReorderRef.current?.(s.task, s.over.id, s.over.after)
|
onReorderRef.current?.(s.task, s.over.id, s.over.after)
|
||||||
} else {
|
} else {
|
||||||
const target = orderedRef.current[s.toIdx]
|
const target = orderedRef.current[s.toIdx]
|
||||||
if (target && !sameId(target.id, s.task.columnId)) onDropRef.current?.(s.task, target.id)
|
if (target && target.id !== s.task.columnId) onDropRef.current?.(s.task, target.id)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
cleanup()
|
cleanup()
|
||||||
@@ -153,7 +152,7 @@ export default function useRowDrag({ columns, onDrop, onReorder }) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const startDrag = (ev, task, instant) => {
|
const startDrag = (ev, task, instant) => {
|
||||||
const fromIdx = orderedRef.current.findIndex((c) => sameId(c.id, task.columnId))
|
const fromIdx = orderedRef.current.findIndex((c) => c.id === task.columnId)
|
||||||
if (fromIdx < 0) return // 不在任何列 (如「其他」组) 的任务不支持拖动
|
if (fromIdx < 0) return // 不在任何列 (如「其他」组) 的任务不支持拖动
|
||||||
st.current = {
|
st.current = {
|
||||||
...st.current, startX: ev.clientX, startY: ev.clientY, task, fromIdx, toIdx: fromIdx,
|
...st.current, startX: ev.clientX, startY: ev.clientY, task, fromIdx, toIdx: fromIdx,
|
||||||
|
|||||||
@@ -1,116 +0,0 @@
|
|||||||
// ifinance 外接模块 (宿主侧)
|
|
||||||
// ------------------------------------------------------------
|
|
||||||
// ifinance 是静态托管模块包, 唯一索引是 info.json。宿主约定:
|
|
||||||
// - 根地址固定为 https://ifinance.honor3.com (宿主常量, 不写进 info.json)
|
|
||||||
// - 没有统一入口页, 每个 html 都是独立入口 (在 WebView/iframe 中打开)
|
|
||||||
// - categories[] 对应 App 的 tab, items[] 是条目; 未知字段忽略
|
|
||||||
//
|
|
||||||
// 本模块采用「纯前端直连」方式: 直接 fetch 远端 info.json, 条目 HTML 直接
|
|
||||||
// 用 iframe 加载远端地址, 不做端上文件缓存 (始终最新)。
|
|
||||||
// 开发环境 (vite dev) 走 /ifinance-api 代理以规避跨域; 生产环境直连。
|
|
||||||
// 若远端 info.json 拉取失败, 依次回退: 同源内置快照 (public/ifinance-info.json)
|
|
||||||
// → localStorage 上次成功快照, 保证分类 tab 仍可渲染。
|
|
||||||
import { useEffect, useState } from 'react'
|
|
||||||
|
|
||||||
// 根地址: 生产直连; 开发用 vite 代理前缀 (见 vite.config.js)
|
|
||||||
export const FINANCE_BASE = import.meta.env.DEV
|
|
||||||
? '/ifinance-api'
|
|
||||||
: 'https://ifinance.honor3.com'
|
|
||||||
|
|
||||||
// 同源兜底快照 (构建时由 ifinance/info.json 拷贝到 public/, 仅在远端不可用时使用)
|
|
||||||
const FALLBACK_INFO_URL = '/ifinance-info.json'
|
|
||||||
|
|
||||||
const INFO_CACHE_KEY = 'ifinance_info_v1'
|
|
||||||
|
|
||||||
// 模块级缓存: 一次会话内多处 (宏观页 / 详情页) 共享, 避免重复请求
|
|
||||||
let memoInfo = null
|
|
||||||
let inflight = null
|
|
||||||
|
|
||||||
// 拼接 info.json 中给出的相对路径 (如 public/econ/x.html) 为可加载的绝对 URL
|
|
||||||
export function financeUrl(relPath) {
|
|
||||||
const p = String(relPath || '').replace(/^\/+/, '')
|
|
||||||
return FINANCE_BASE + '/' + p
|
|
||||||
}
|
|
||||||
|
|
||||||
// 条目 HTML 地址: Cloudflare Pages 走 clean URL, 去掉 .html 后缀直达 (避免 307 重定向)
|
|
||||||
export function financePageUrl(relPath) {
|
|
||||||
return financeUrl(String(relPath || '').replace(/\.html?$/i, ''))
|
|
||||||
}
|
|
||||||
|
|
||||||
function readLocalInfo() {
|
|
||||||
try {
|
|
||||||
const raw = localStorage.getItem(INFO_CACHE_KEY)
|
|
||||||
if (!raw) return null
|
|
||||||
const parsed = JSON.parse(raw)
|
|
||||||
if (parsed && parsed.info && Array.isArray(parsed.info.categories)) return parsed.info
|
|
||||||
} catch { /* ignore */ }
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
|
|
||||||
function writeLocalInfo(info) {
|
|
||||||
try {
|
|
||||||
localStorage.setItem(INFO_CACHE_KEY, JSON.stringify({ ts: Date.now(), info }))
|
|
||||||
} catch { /* 配额满等忽略 */ }
|
|
||||||
}
|
|
||||||
|
|
||||||
async function fetchInfoFrom(url) {
|
|
||||||
const res = await fetch(url, { cache: 'no-cache' })
|
|
||||||
if (!res.ok) throw new Error('ifinance 索引加载失败 (' + res.status + ')')
|
|
||||||
const info = await res.json()
|
|
||||||
if (!info || !Array.isArray(info.categories)) throw new Error('ifinance 索引格式无效')
|
|
||||||
return info
|
|
||||||
}
|
|
||||||
|
|
||||||
// 拉取 (并缓存) info.json: 远端优先, 失败回退同源内置快照
|
|
||||||
export async function fetchIfinanceInfo() {
|
|
||||||
if (inflight) return inflight
|
|
||||||
inflight = (async () => {
|
|
||||||
let info
|
|
||||||
try {
|
|
||||||
info = await fetchInfoFrom(financeUrl('info.json'))
|
|
||||||
} catch (remoteErr) {
|
|
||||||
// 兜底: 同源内置快照 (ifinance 未开 CORS / 临时不可达时仍可渲染分类)
|
|
||||||
try {
|
|
||||||
info = await fetchInfoFrom(FALLBACK_INFO_URL)
|
|
||||||
} catch {
|
|
||||||
throw remoteErr
|
|
||||||
}
|
|
||||||
}
|
|
||||||
memoInfo = info
|
|
||||||
writeLocalInfo(info)
|
|
||||||
return info
|
|
||||||
})()
|
|
||||||
try {
|
|
||||||
return await inflight
|
|
||||||
} finally {
|
|
||||||
inflight = null
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// React Hook: 获取分类索引。优先内存 → localStorage 快照 → 远端
|
|
||||||
export function useIfinanceInfo() {
|
|
||||||
const [state, setState] = useState(() => {
|
|
||||||
if (memoInfo) return { info: memoInfo, loading: false, error: '' }
|
|
||||||
const cached = readLocalInfo()
|
|
||||||
return { info: cached, loading: true, error: '' }
|
|
||||||
})
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
let alive = true
|
|
||||||
setState((s) => ({ ...s, loading: true }))
|
|
||||||
fetchIfinanceInfo()
|
|
||||||
.then((info) => { if (alive) setState({ info, loading: false, error: '' }) })
|
|
||||||
.catch((e) => {
|
|
||||||
if (!alive) return
|
|
||||||
const cached = readLocalInfo()
|
|
||||||
setState({
|
|
||||||
info: cached,
|
|
||||||
loading: false,
|
|
||||||
error: cached ? '' : (e?.message || '外接模块加载失败'),
|
|
||||||
})
|
|
||||||
})
|
|
||||||
return () => { alive = false }
|
|
||||||
}, [])
|
|
||||||
|
|
||||||
return state
|
|
||||||
}
|
|
||||||
@@ -13,13 +13,6 @@ export function getPowersyncDb() {
|
|||||||
database: {
|
database: {
|
||||||
// 默认 IDBBatchAtomicVFS (IndexedDB), 兼容性最广; WebView2 (Chromium) 后续可切 OPFS 加速
|
// 默认 IDBBatchAtomicVFS (IndexedDB), 兼容性最广; WebView2 (Chromium) 后续可切 OPFS 加速
|
||||||
dbFilename: 'iboard-powersync.db',
|
dbFilename: 'iboard-powersync.db',
|
||||||
// 关闭多标签支持 —— 否则桌面端 (WebView2/Chromium) 会启用 **共享 IndexedDB worker**:
|
|
||||||
// enableMultiTabs 默认为 true (桌面且有 SharedWorker 时), 该 SharedWorker 会跨页面
|
|
||||||
// reload 存活; OTA 升级后 reload 的新页面连上去时本地库读取会永久挂起
|
|
||||||
// (无异常、纯 pending) —— 表现为任务页一直「加载中」, 其它不碰本地库的页面正常。
|
|
||||||
// Android WebView 不支持 SharedWorker, 因此只有 Windows 外壳命中。
|
|
||||||
// 本应用是单窗口外壳 (dock.html 不访问本地库), 不需要多标签同步。
|
|
||||||
enableMultiTabs: false,
|
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,70 +0,0 @@
|
|||||||
// 本地库变更订阅 (任务模块即时同步, 见 docs/V0.2/离线编辑模块/即时同步方案.md)
|
|
||||||
//
|
|
||||||
// 作用: 当指定表在本地 SQLite 里发生变化时回调 —— 变化可能来自
|
|
||||||
// 1) 本端写入 (乐观更新之后)
|
|
||||||
// 2) PowerSync 下行推送 (其它端 / 服务端改动)
|
|
||||||
// 两者最终都落到本地库, 所以订阅本地库即可覆盖跨端场景, 且离线时同样有效。
|
|
||||||
//
|
|
||||||
// 为什么不用手写"信号 SQL"求和: SDK 的 watch 已支持按表名过滤 (tables)
|
|
||||||
// + 节流 (throttleMs), 由 SDK 判断是否真的变化, 比自己做 count/max 汇总可靠。
|
|
||||||
//
|
|
||||||
// 用法:
|
|
||||||
// useDbSignal(['Task', 'BoardColumn'], () => load())
|
|
||||||
// useDbSignal(TASK_TABLES, onChange, { throttleMs: 300, enabled: someFlag })
|
|
||||||
import { useEffect, useRef } from 'react'
|
|
||||||
import { getPowersyncDb } from './db.js'
|
|
||||||
|
|
||||||
// 无意义的占位查询: 只借 watch 的"变更通知"能力, 不关心结果
|
|
||||||
const SIGNAL_SQL = 'SELECT 1 AS s'
|
|
||||||
|
|
||||||
export default function useDbSignal(tables, onChange, options = {}) {
|
|
||||||
const { throttleMs = 250, enabled = true } = options
|
|
||||||
|
|
||||||
// 回调走 ref, 避免调用方每次渲染都重新订阅
|
|
||||||
const cbRef = useRef(onChange)
|
|
||||||
cbRef.current = onChange
|
|
||||||
|
|
||||||
// 表名数组每帧都是新引用, 用内容做依赖
|
|
||||||
const tablesKey = Array.isArray(tables) ? tables.join(',') : ''
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
// 回滚开关: localStorage['iboard_realtime'] = '0' 时完全不订阅, 退回"手动刷新"行为,
|
|
||||||
// 用于线上出问题时的快速止损 (改完需重启应用生效)
|
|
||||||
let realtimeOff = false
|
|
||||||
try { realtimeOff = localStorage.getItem('iboard_realtime') === '0' } catch { /* ignore */ }
|
|
||||||
if (!enabled || !tablesKey || realtimeOff) return undefined
|
|
||||||
|
|
||||||
const db = getPowersyncDb()
|
|
||||||
const ac = new AbortController()
|
|
||||||
let disposed = false
|
|
||||||
// watch 订阅成功后会立刻给出一次当前结果, 而调用方挂载时已经主动 load 过,
|
|
||||||
// 这里跳过首次通知, 避免重复请求
|
|
||||||
let first = true
|
|
||||||
|
|
||||||
try {
|
|
||||||
db.watch(
|
|
||||||
SIGNAL_SQL,
|
|
||||||
[],
|
|
||||||
{
|
|
||||||
onResult: () => {
|
|
||||||
if (disposed) return
|
|
||||||
if (first) { first = false; return }
|
|
||||||
cbRef.current?.()
|
|
||||||
},
|
|
||||||
onError: (e) => {
|
|
||||||
if (!disposed) console.warn('[db-signal] watch 出错:', e)
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{ tables: tablesKey.split(','), throttleMs, signal: ac.signal },
|
|
||||||
)
|
|
||||||
} catch (e) {
|
|
||||||
// 订阅失败不应影响页面主流程 (退化为"手动刷新")
|
|
||||||
console.warn('[db-signal] 订阅失败:', e)
|
|
||||||
}
|
|
||||||
|
|
||||||
return () => {
|
|
||||||
disposed = true
|
|
||||||
ac.abort()
|
|
||||||
}
|
|
||||||
}, [tablesKey, throttleMs, enabled])
|
|
||||||
}
|
|
||||||
+55
-47
@@ -1,31 +1,43 @@
|
|||||||
|
import { useState } from 'react'
|
||||||
import { useNavigate, useLocation, Routes, Route } from 'react-router-dom'
|
import { useNavigate, useLocation, Routes, Route } from 'react-router-dom'
|
||||||
|
import { Badge } from 'antd-mobile'
|
||||||
import PageHeader from '../components/PageHeader.jsx'
|
import PageHeader from '../components/PageHeader.jsx'
|
||||||
import SwipeTabs from '../components/SwipeTabs.jsx'
|
import SwipeTabs from '../components/SwipeTabs.jsx'
|
||||||
|
import DataView from './macro/DataView.jsx'
|
||||||
|
import StrategyView from './macro/StrategyView.jsx'
|
||||||
import ArticlesView from './macro/ArticlesView.jsx'
|
import ArticlesView from './macro/ArticlesView.jsx'
|
||||||
import ArticleDetail from './macro/ArticleDetail.jsx'
|
import ArticleDetail from './macro/ArticleDetail.jsx'
|
||||||
|
import OilPage from './macro/OilPage.jsx'
|
||||||
|
import AlertsView from './macro/AlertsView.jsx'
|
||||||
import NewsView from './macro/NewsView.jsx'
|
import NewsView from './macro/NewsView.jsx'
|
||||||
import NewsDetail from './news/NewsDetail.jsx'
|
import NewsDetail from './news/NewsDetail.jsx'
|
||||||
import FinanceCategoryView from './macro/FinanceCategoryView.jsx'
|
|
||||||
import FinanceItemView from './macro/FinanceItemView.jsx'
|
|
||||||
import { useIfinanceInfo } from '../lib/ifinance.js'
|
|
||||||
|
|
||||||
// 宏观: 本地固定 2 个 tab (新闻 / 经济文章) + 外接 ifinance 分类动态挂载为 tab
|
// 宏观: 顶栏 6 tab, 默认 新闻
|
||||||
// /macro/news → 新闻 (默认)
|
// /macro → 显示 news tab (activeFromPath 决定)
|
||||||
// /macro/articles → 经济文章
|
// /macro/alerts → 报警 (V0.2: 原「首页」tab 合并进来, 置最左)
|
||||||
// /macro/finance/:catId → 外接分类 (经济数据 / 策略研究 / …)
|
// /macro/news → 新闻 (V0.2: 原「首页」tab 合并进来, 置第二并作为默认)
|
||||||
// 详情: /macro/news/:id · /macro/articles/:slug · /macro/finance/:catId/:itemId
|
// /macro/oil → 油价
|
||||||
// 说明: 外接分类不写死, 由 info.json 的 categories[] 决定; ifinance 新增分类后
|
// /macro/data → 经济数据
|
||||||
// 本页自动多出新 tab, 宿主无需改代码。报警已迁到「监控」。
|
// /macro/strategy → 策略研究
|
||||||
const BASE_TABS = [
|
// /macro/articles → 经济文章
|
||||||
|
// 详情: /macro/data/:name · /macro/strategy/:name · /macro/articles/:slug · /macro/news/:id
|
||||||
|
// 说明: tab 数量已超出屏宽, SwipeTabs 会在右侧显示渐变 + 箭头提示可继续滑动
|
||||||
|
const TABS = [
|
||||||
|
{ key: 'alerts', label: '报警', path: '/macro/alerts' },
|
||||||
{ key: 'news', label: '新闻', path: '/macro/news' },
|
{ key: 'news', label: '新闻', path: '/macro/news' },
|
||||||
|
{ key: 'oil', label: '油价', path: '/macro/oil' },
|
||||||
|
{ key: 'data', label: '经济数据', path: '/macro/data' },
|
||||||
|
{ key: 'strategy', label: '策略研究', path: '/macro/strategy' },
|
||||||
{ key: 'articles', label: '经济文章', path: '/macro/articles' },
|
{ key: 'articles', label: '经济文章', path: '/macro/articles' },
|
||||||
]
|
]
|
||||||
|
|
||||||
function activeFromPath(pathname) {
|
function activeFromPath(pathname) {
|
||||||
|
if (pathname.startsWith('/macro/alerts')) return 'alerts'
|
||||||
if (pathname.startsWith('/macro/news')) return 'news'
|
if (pathname.startsWith('/macro/news')) return 'news'
|
||||||
|
if (pathname.startsWith('/macro/oil')) return 'oil'
|
||||||
|
if (pathname.startsWith('/macro/data')) return 'data'
|
||||||
|
if (pathname.startsWith('/macro/strategy')) return 'strategy'
|
||||||
if (pathname.startsWith('/macro/articles')) return 'articles'
|
if (pathname.startsWith('/macro/articles')) return 'articles'
|
||||||
const m = pathname.match(/^\/macro\/finance\/([^/]+)/)
|
|
||||||
if (m) return 'finance:' + m[1]
|
|
||||||
// 父路由 /macro 走默认 tab (新闻)
|
// 父路由 /macro 走默认 tab (新闻)
|
||||||
return 'news'
|
return 'news'
|
||||||
}
|
}
|
||||||
@@ -33,47 +45,43 @@ function activeFromPath(pathname) {
|
|||||||
export default function MacroPage() {
|
export default function MacroPage() {
|
||||||
const location = useLocation()
|
const location = useLocation()
|
||||||
const navigate = useNavigate()
|
const navigate = useNavigate()
|
||||||
const { info } = useIfinanceInfo()
|
|
||||||
const active = activeFromPath(location.pathname)
|
const active = activeFromPath(location.pathname)
|
||||||
const categories = info?.categories || []
|
// 报警角标: 由 AlertsView 回传总数
|
||||||
|
const [alertCount, setAlertCount] = useState(0)
|
||||||
|
|
||||||
// 详情页单独走 React Router 渲染 (需要 Route 提供 params), 不参与滑屏
|
const tabs = TABS.map((t) => ({
|
||||||
const p = location.pathname
|
key: t.key,
|
||||||
const isNewsDetail = /^\/macro\/news\/[^/]+$/.test(p)
|
label: t.key === 'alerts'
|
||||||
const isArticleDetail = /^\/macro\/articles\/[^/]+$/.test(p)
|
? <span className="tab-label">报警{alertCount > 0 && <Badge content={alertCount} />}</span>
|
||||||
const isFinanceDetail = /^\/macro\/finance\/[^/]+\/[^/]+$/.test(p)
|
: t.label,
|
||||||
if (isNewsDetail || isArticleDetail || isFinanceDetail) {
|
render: () => {
|
||||||
return (
|
if (t.key === 'oil') return <OilPage />
|
||||||
<Routes>
|
if (t.key === 'data') return <DataView />
|
||||||
<Route path="news/:id" element={<NewsDetail />} />
|
if (t.key === 'strategy') return <StrategyView />
|
||||||
<Route path="articles/:slug" element={<ArticleDetail />} />
|
if (t.key === 'articles') return <ArticlesView />
|
||||||
<Route path="finance/:catId/:itemId" element={<FinanceItemView />} />
|
if (t.key === 'alerts') return <AlertsView onCount={setAlertCount} />
|
||||||
</Routes>
|
if (t.key === 'news') return <NewsView />
|
||||||
)
|
return null
|
||||||
}
|
},
|
||||||
|
}))
|
||||||
const tabs = [
|
|
||||||
...BASE_TABS.map((t) => ({
|
|
||||||
key: t.key,
|
|
||||||
label: t.label,
|
|
||||||
render: () => (t.key === 'news' ? <NewsView /> : <ArticlesView />),
|
|
||||||
})),
|
|
||||||
...categories.map((c) => ({
|
|
||||||
key: 'finance:' + c.id,
|
|
||||||
label: c.name,
|
|
||||||
render: () => <FinanceCategoryView category={c} />,
|
|
||||||
})),
|
|
||||||
]
|
|
||||||
|
|
||||||
function onChange(key) {
|
function onChange(key) {
|
||||||
if (key.startsWith('finance:')) {
|
const next = TABS.find((t) => t.key === key)
|
||||||
navigate('/macro/finance/' + key.slice('finance:'.length))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
const next = BASE_TABS.find((t) => t.key === key)
|
|
||||||
if (next) navigate(next.path)
|
if (next) navigate(next.path)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 详情页单独走 React Router 渲染, 不参与滑屏
|
||||||
|
if (location.pathname.match(/^\/macro\/(articles|data|strategy|news)\/[^/]+$/)) {
|
||||||
|
return (
|
||||||
|
<Routes>
|
||||||
|
<Route path="data/:name" element={<DataView />} />
|
||||||
|
<Route path="strategy/:name" element={<StrategyView />} />
|
||||||
|
<Route path="articles/:slug" element={<ArticleDetail />} />
|
||||||
|
<Route path="news/:id" element={<NewsDetail />} />
|
||||||
|
</Routes>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="page-with-navbar">
|
<div className="page-with-navbar">
|
||||||
<PageHeader title="宏观" />
|
<PageHeader title="宏观" />
|
||||||
|
|||||||
@@ -1,18 +1,15 @@
|
|||||||
import { useEffect, useState, useCallback } from 'react'
|
import { useEffect, useState, useCallback } from 'react'
|
||||||
import { useNavigate } from 'react-router-dom'
|
import { useNavigate } from 'react-router-dom'
|
||||||
import { Badge, Card, Empty, DotLoading } from 'antd-mobile'
|
import { Card, Empty, DotLoading } from 'antd-mobile'
|
||||||
import { api } from '../api/client.js'
|
import { api } from '../api/client.js'
|
||||||
import PageHeader from '../components/PageHeader.jsx'
|
import PageHeader from '../components/PageHeader.jsx'
|
||||||
import SwipeTabs from '../components/SwipeTabs.jsx'
|
import SwipeTabs from '../components/SwipeTabs.jsx'
|
||||||
import useRefreshOnVisible from '../hooks/useRefreshOnVisible.js'
|
import useRefreshOnVisible from '../hooks/useRefreshOnVisible.js'
|
||||||
import EnvView from './monitor/EnvView.jsx'
|
import EnvView from './monitor/EnvView.jsx'
|
||||||
import AlertsView from './monitor/AlertsView.jsx'
|
|
||||||
|
|
||||||
// 监控页: 四个横向分类
|
// 监控页: 两个横向分类
|
||||||
// - 主机监控: 实时数据来自 komari (服务端实时代理, 不落库), 点击节点看 24h 时序
|
// - 主机监控: 实时数据来自 komari (服务端实时代理, 不落库), 点击节点看 24h 时序
|
||||||
// - 服务监控: 暂留空占位
|
// - 服务监控: 暂留空占位
|
||||||
// - 环境监控: 米家温湿度
|
|
||||||
// - 报警: V0.2.2 从「宏观」迁入, 数据差异/任务异常按时间倒序
|
|
||||||
function fmtTime(s) {
|
function fmtTime(s) {
|
||||||
if (!s) return ''
|
if (!s) return ''
|
||||||
const d = new Date(s)
|
const d = new Date(s)
|
||||||
@@ -43,21 +40,10 @@ function pct(used, total) {
|
|||||||
|
|
||||||
export default function MonitorPage() {
|
export default function MonitorPage() {
|
||||||
const [active, setActive] = useState('servers')
|
const [active, setActive] = useState('servers')
|
||||||
// 报警角标: 由 AlertsView 回传总数
|
|
||||||
const [alertCount, setAlertCount] = useState(0)
|
|
||||||
const tabs = [
|
const tabs = [
|
||||||
{ key: 'servers', label: '主机监控', render: () => <ServerView /> },
|
{ key: 'servers', label: '主机监控', render: () => <ServerView /> },
|
||||||
{ key: 'services', label: '服务监控', render: () => <ServiceView /> },
|
{ key: 'services', label: '服务监控', render: () => <ServiceView /> },
|
||||||
{ key: 'env', label: '环境监控', render: () => <EnvView /> },
|
{ key: 'env', label: '环境监控', render: () => <EnvView /> },
|
||||||
{
|
|
||||||
key: 'alerts',
|
|
||||||
label: (
|
|
||||||
<span className="tab-label">
|
|
||||||
报警{alertCount > 0 && <Badge content={alertCount} />}
|
|
||||||
</span>
|
|
||||||
),
|
|
||||||
render: () => <AlertsView onCount={setAlertCount} />,
|
|
||||||
},
|
|
||||||
]
|
]
|
||||||
return (
|
return (
|
||||||
<div className="page-with-navbar">
|
<div className="page-with-navbar">
|
||||||
|
|||||||
@@ -0,0 +1,173 @@
|
|||||||
|
import { useCallback, useEffect, useMemo, useState } from 'react'
|
||||||
|
import { Button, DotLoading, Empty, Segmented, Toast } from 'antd-mobile'
|
||||||
|
import { Celebrate } from '../../components/RingProgress.jsx'
|
||||||
|
import { checkinApi } from '../../api/checkin.js'
|
||||||
|
import useRefreshOnVisible from '../../hooks/useRefreshOnVisible.js'
|
||||||
|
import {
|
||||||
|
toDateStr, addDays, addMonths, monthGrid, weekdayLabels, dayLabel, fmtMonth,
|
||||||
|
} from './date.js'
|
||||||
|
|
||||||
|
// 日历视图: 月历网格 + 今天/昨天/明天 三视图 + 日期标记 (F-CL-*)
|
||||||
|
export default function CalendarView({ date, onDateChange }) {
|
||||||
|
const today = toDateStr()
|
||||||
|
const [month, setMonth] = useState(() => date.slice(0, 7))
|
||||||
|
const [cal, setCal] = useState(null) // 月历数据
|
||||||
|
const [detail, setDetail] = useState(null) // 选中日详情
|
||||||
|
const [err, setErr] = useState('')
|
||||||
|
const [bursts, setBursts] = useState({})
|
||||||
|
|
||||||
|
const loadCal = useCallback((silent) => {
|
||||||
|
if (!silent) setErr('')
|
||||||
|
checkinApi.calendar(month)
|
||||||
|
.then(setCal)
|
||||||
|
.catch((e) => { if (!silent) setErr(e.message) })
|
||||||
|
}, [month])
|
||||||
|
|
||||||
|
const loadDetail = useCallback((silent) => {
|
||||||
|
checkinApi.day(date).then(setDetail).catch(() => {})
|
||||||
|
}, [date])
|
||||||
|
|
||||||
|
useEffect(() => { loadCal(false) }, [loadCal])
|
||||||
|
useEffect(() => { setDetail(null); loadDetail(false) }, [loadDetail])
|
||||||
|
useRefreshOnVisible(() => { loadCal(true); loadDetail(true) })
|
||||||
|
|
||||||
|
// 切换日期时, 若跨月则同步月份
|
||||||
|
useEffect(() => {
|
||||||
|
const m = date.slice(0, 7)
|
||||||
|
setMonth((cur) => (cur === m ? cur : m))
|
||||||
|
}, [date])
|
||||||
|
|
||||||
|
const days = useMemo(() => monthGrid(month), [month])
|
||||||
|
const byDate = useMemo(() => {
|
||||||
|
const map = new Map()
|
||||||
|
;(cal?.days || []).forEach((d) => map.set(d.date, d))
|
||||||
|
return map
|
||||||
|
}, [cal])
|
||||||
|
|
||||||
|
const quickValue = useMemo(() => {
|
||||||
|
if (date === today) return 0
|
||||||
|
if (date === addDays(today, -1)) return -1
|
||||||
|
if (date === addDays(today, 1)) return 1
|
||||||
|
return null
|
||||||
|
}, [date, today])
|
||||||
|
|
||||||
|
async function checkFromCalendar(item) {
|
||||||
|
if (!item.canCheck) return
|
||||||
|
const snapshot = detail
|
||||||
|
setDetail((d) => ({
|
||||||
|
...d,
|
||||||
|
items: d.items.map((x) => {
|
||||||
|
if (x.id !== item.id) return x
|
||||||
|
const done = x.done + 1
|
||||||
|
const countOnDate = (x.countOnDate || 0) + 1
|
||||||
|
return {
|
||||||
|
...x, done, countOnDate,
|
||||||
|
percent: Math.min(1, done / x.target),
|
||||||
|
completed: done >= x.target,
|
||||||
|
over: Math.max(0, done - x.target),
|
||||||
|
dayDone: countOnDate >= x.expectedPerDay,
|
||||||
|
}
|
||||||
|
}),
|
||||||
|
}))
|
||||||
|
try {
|
||||||
|
const res = await checkinApi.check(item.id, date)
|
||||||
|
const fresh = await checkinApi.day(date)
|
||||||
|
setDetail(fresh)
|
||||||
|
if (res.item.completed) setBursts((m) => ({ ...m, [item.id]: (m[item.id] || 0) + 1 }))
|
||||||
|
loadCal(true)
|
||||||
|
} catch (e) {
|
||||||
|
setDetail(snapshot)
|
||||||
|
Toast.show({ content: e.message || '打卡失败' })
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const items = detail?.items || []
|
||||||
|
const isFuture = !!detail?.isFuture
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="calendar-view">
|
||||||
|
<div className="cal-month-bar">
|
||||||
|
<span className="cal-arrow" onClick={() => setMonth((m) => addMonths(m, -1))}>‹</span>
|
||||||
|
<span className="cal-month">{fmtMonth(month)}</span>
|
||||||
|
<span className="cal-arrow" onClick={() => setMonth((m) => addMonths(m, 1))}>›</span>
|
||||||
|
<span className="cal-today-btn" onClick={() => onDateChange(today)}>回到今天</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="cal-quick">
|
||||||
|
<Segmented
|
||||||
|
options={[
|
||||||
|
{ label: '昨天', value: -1 },
|
||||||
|
{ label: '今天', value: 0 },
|
||||||
|
{ label: '明天', value: 1 },
|
||||||
|
]}
|
||||||
|
value={quickValue}
|
||||||
|
onChange={(v) => onDateChange(addDays(today, Number(v)))}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{err && <div className="error-banner">{err}<span className="retry-link" onClick={() => loadCal(false)}>重试</span></div>}
|
||||||
|
|
||||||
|
<div className="cal-grid">
|
||||||
|
<div className="cal-weekday">
|
||||||
|
{weekdayLabels().map((w) => <span key={w}>{w}</span>)}
|
||||||
|
</div>
|
||||||
|
<div className="cal-days">
|
||||||
|
{days.map((d) => {
|
||||||
|
const info = byDate.get(d)
|
||||||
|
const inMonth = d.slice(0, 7) === month
|
||||||
|
const status = info?.status || 'empty'
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
key={d}
|
||||||
|
className={
|
||||||
|
'cal-day' + (inMonth ? '' : ' out') + (d === date ? ' selected' : '') +
|
||||||
|
(info?.isToday ? ' today' : '') + (info?.isFuture ? ' future' : '')
|
||||||
|
}
|
||||||
|
onClick={() => onDateChange(d)}
|
||||||
|
>
|
||||||
|
<span className="cal-day-num">{Number(d.slice(8, 10))}</span>
|
||||||
|
{inMonth && status !== 'empty' && (
|
||||||
|
<span className={'cal-dot ' + status} />
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
})}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{cal && (
|
||||||
|
<div className="cal-rate">本月完成率 <strong>{Math.round((cal.rate || 0) * 100)}%</strong></div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
<div className="cal-detail">
|
||||||
|
<div className="cal-detail-title">
|
||||||
|
{dayLabel(date, today)} · {date}
|
||||||
|
{isFuture && <span className="habit-badge">计划（不可打卡）</span>}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{detail === null && <div className="monitor-loading"><DotLoading /> 加载中...</div>}
|
||||||
|
{detail !== null && items.length === 0 && <Empty description="当天没有打卡项" />}
|
||||||
|
|
||||||
|
{items.map((item) => (
|
||||||
|
<div key={item.id} className={'cal-item' + (item.completed ? ' done' : '')}>
|
||||||
|
<span className="cal-item-dot" style={{ background: item.color }} />
|
||||||
|
<span className="cal-item-name">{item.name}</span>
|
||||||
|
<span className="cal-item-meta">
|
||||||
|
{item.periodLabel} {item.target} 次 · 当日 {item.countOnDate || 0}/{item.expectedPerDay}
|
||||||
|
</span>
|
||||||
|
<span className="cal-item-right">
|
||||||
|
{item.canCheck ? (
|
||||||
|
<Button size="mini" color={item.dayDone ? 'default' : 'primary'} onClick={() => checkFromCalendar(item)}>
|
||||||
|
{item.dayDone ? '已达标' : '打卡'}
|
||||||
|
</Button>
|
||||||
|
) : (
|
||||||
|
<span className="cal-item-plan">{item.dayDone ? '计划' : '待办'}</span>
|
||||||
|
)}
|
||||||
|
</span>
|
||||||
|
<Celebrate fire={bursts[item.id] || 0} color={item.color} />
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -0,0 +1,338 @@
|
|||||||
|
import { useCallback, useEffect, useMemo, useState } from 'react'
|
||||||
|
import {
|
||||||
|
Button, Dialog, DotLoading, Empty, Input, Popup, Selector, Stepper, Toast,
|
||||||
|
} from 'antd-mobile'
|
||||||
|
import RingProgress, { Celebrate } from '../../components/RingProgress.jsx'
|
||||||
|
import useHabitDrag from '../../components/checkin/useHabitDrag.js'
|
||||||
|
import { checkinApi } from '../../api/checkin.js'
|
||||||
|
import useRefreshOnVisible from '../../hooks/useRefreshOnVisible.js'
|
||||||
|
import { toDateStr, dayLabel } from './date.js'
|
||||||
|
|
||||||
|
const PERIOD_OPTIONS = [
|
||||||
|
{ label: '每天', value: 'day' },
|
||||||
|
{ label: '每周', value: 'week' },
|
||||||
|
{ label: '每月', value: 'month' },
|
||||||
|
{ label: '每年', value: 'year' },
|
||||||
|
]
|
||||||
|
|
||||||
|
const COLORS = ['#1677ff', '#00b578', '#ff8f1f', '#ff3141', '#a855f7', '#14b8a6', '#f43f9e']
|
||||||
|
|
||||||
|
const EMPTY_FORM = { id: null, name: '', period: 'day', target: 1, color: COLORS[0], note: '' }
|
||||||
|
|
||||||
|
// 打卡视图: 今日待办列表 + 环形进度 + 打卡/撤销 + 新建/编辑
|
||||||
|
export default function HabitView({ date, onDateChange }) {
|
||||||
|
const [data, setData] = useState(null) // { today, date, items, summary }
|
||||||
|
const [err, setErr] = useState('')
|
||||||
|
const [bursts, setBursts] = useState({}) // { habitId: 触发计数 }
|
||||||
|
const [form, setForm] = useState(EMPTY_FORM)
|
||||||
|
const [showForm, setShowForm] = useState(false)
|
||||||
|
|
||||||
|
const load = useCallback((silent) => {
|
||||||
|
if (!silent) setErr('')
|
||||||
|
checkinApi.habits(date)
|
||||||
|
.then((d) => setData(d))
|
||||||
|
.catch((e) => { if (!silent) setErr(e.message) })
|
||||||
|
}, [date])
|
||||||
|
|
||||||
|
useEffect(() => { load(false) }, [load])
|
||||||
|
useRefreshOnVisible(() => load(true))
|
||||||
|
|
||||||
|
const items = useMemo(() => {
|
||||||
|
const list = data?.items || []
|
||||||
|
// 手动排序优先 (sortOrder), 拖动排序后覆盖 F-CK-16 的"未完成在前"
|
||||||
|
return [...list].sort((a, b) => (a.sortOrder ?? 0) - (b.sortOrder ?? 0) || a.id - b.id)
|
||||||
|
}, [data])
|
||||||
|
|
||||||
|
// 按周期分组 (每天/每周/每月/每年), 组内顺序 = 手动排序
|
||||||
|
const groups = useMemo(() => {
|
||||||
|
const out = []
|
||||||
|
for (const p of PERIOD_OPTIONS) {
|
||||||
|
const list = items.filter((i) => i.period === p.value)
|
||||||
|
if (list.length) out.push({ key: p.value, label: p.label, list })
|
||||||
|
}
|
||||||
|
const known = new Set(PERIOD_OPTIONS.map((p) => p.value))
|
||||||
|
const rest = items.filter((i) => !known.has(i.period))
|
||||||
|
if (rest.length) out.push({ key: 'other', label: '其他', list: rest })
|
||||||
|
return out
|
||||||
|
}, [items])
|
||||||
|
|
||||||
|
const drag = useHabitDrag({ onDrop: reorderHabit })
|
||||||
|
|
||||||
|
// 组内拖动落位: 重排后按展平顺序整体重写 sortOrder
|
||||||
|
async function reorderHabit(dragged, targetId, after) {
|
||||||
|
const snapshot = data
|
||||||
|
const g = groups.find((x) => x.key === dragged.period)
|
||||||
|
if (!g) return
|
||||||
|
const rest = g.list.filter((i) => i.id !== dragged.id)
|
||||||
|
const ti = rest.findIndex((i) => i.id === targetId)
|
||||||
|
if (ti < 0) return
|
||||||
|
rest.splice(after ? ti + 1 : ti, 0, dragged)
|
||||||
|
const flat = groups.map((x) => (x.key === g.key ? rest : x.list)).flat()
|
||||||
|
const withOrder = flat.map((it, i) => ({ ...it, sortOrder: i }))
|
||||||
|
setData((d) => ({ ...d, items: withOrder }))
|
||||||
|
try {
|
||||||
|
await checkinApi.reorderHabits(flat.map((i) => i.id))
|
||||||
|
} catch (e) {
|
||||||
|
setData(snapshot)
|
||||||
|
Toast.show({ content: e.message || '排序保存失败' })
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const fireBurst = (id) => setBursts((m) => ({ ...m, [id]: (m[id] || 0) + 1 }))
|
||||||
|
|
||||||
|
// 乐观更新: 先本地 +1, 成功用服务端结果覆盖, 失败回滚 (F-SY-06/E-02)
|
||||||
|
async function doCheck(item) {
|
||||||
|
const before = data
|
||||||
|
const patch = (it) => {
|
||||||
|
const done = it.done + 1
|
||||||
|
return {
|
||||||
|
...it,
|
||||||
|
done,
|
||||||
|
remaining: Math.max(0, it.target - done),
|
||||||
|
percent: Math.min(1, done / it.target),
|
||||||
|
completed: done >= it.target,
|
||||||
|
over: Math.max(0, done - it.target),
|
||||||
|
countOnDate: (it.countOnDate || 0) + 1,
|
||||||
|
dayDone: (it.countOnDate || 0) + 1 >= it.expectedPerDay,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
setData((d) => ({ ...d, items: d.items.map((x) => (x.id === item.id ? patch(x) : x)) }))
|
||||||
|
try {
|
||||||
|
const res = await checkinApi.check(item.id, date)
|
||||||
|
setData((d) => ({ ...d, items: d.items.map((x) => (x.id === item.id ? res.item : x)) }))
|
||||||
|
if (res.item.completed) fireBurst(item.id)
|
||||||
|
} catch (e) {
|
||||||
|
setData(before)
|
||||||
|
Toast.show({ content: e.message || '打卡失败' })
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function doUncheck(item) {
|
||||||
|
const before = data
|
||||||
|
setData((d) => ({
|
||||||
|
...d,
|
||||||
|
items: d.items.map((x) => {
|
||||||
|
if (x.id !== item.id) return x
|
||||||
|
const done = Math.max(0, x.done - 1)
|
||||||
|
return {
|
||||||
|
...x,
|
||||||
|
done,
|
||||||
|
remaining: Math.max(0, x.target - done),
|
||||||
|
percent: Math.min(1, done / x.target),
|
||||||
|
completed: done >= x.target,
|
||||||
|
over: Math.max(0, done - x.target),
|
||||||
|
countOnDate: Math.max(0, (x.countOnDate || 0) - 1),
|
||||||
|
}
|
||||||
|
}),
|
||||||
|
}))
|
||||||
|
try {
|
||||||
|
const res = await checkinApi.uncheck(item.id, date)
|
||||||
|
setData((d) => ({ ...d, items: d.items.map((x) => (x.id === item.id ? res.item : x)) }))
|
||||||
|
} catch (e) {
|
||||||
|
setData(before)
|
||||||
|
Toast.show({ content: e.message || '撤销失败' })
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function submitForm() {
|
||||||
|
const name = String(form.name || '').trim()
|
||||||
|
if (!name) return Toast.show({ content: '请填写名称' })
|
||||||
|
if (name.length > 20) return Toast.show({ content: '名称不能超过 20 个字' })
|
||||||
|
const payload = { name, period: form.period, target: Number(form.target) || 1, color: form.color, note: form.note }
|
||||||
|
try {
|
||||||
|
if (form.id) await checkinApi.updateHabit(form.id, payload)
|
||||||
|
else await checkinApi.createHabit(payload)
|
||||||
|
setShowForm(false)
|
||||||
|
setForm(EMPTY_FORM)
|
||||||
|
load(true)
|
||||||
|
} catch (e) {
|
||||||
|
Toast.show({ content: e.message || '保存失败' })
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function removeHabit(item) {
|
||||||
|
const ok = await Dialog.confirm({
|
||||||
|
content: `归档「${item.name}」？归档后不再出现在待办，历史记录保留。`,
|
||||||
|
confirmText: '归档',
|
||||||
|
cancelText: '取消',
|
||||||
|
})
|
||||||
|
if (!ok) return
|
||||||
|
try {
|
||||||
|
await checkinApi.deleteHabit(item.id)
|
||||||
|
Toast.show({ content: '已归档' })
|
||||||
|
load(true)
|
||||||
|
} catch (e) {
|
||||||
|
Toast.show({ content: e.message || '操作失败' })
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const summary = data?.summary || { total: 0, done: 0 }
|
||||||
|
const isToday = data ? data.date === data.today : true
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="habit-view">
|
||||||
|
<div className="habit-head">
|
||||||
|
<div className="habit-head-left">
|
||||||
|
<div className="habit-date">{dayLabel(date, data?.today || toDateStr())}</div>
|
||||||
|
<div className="habit-summary">
|
||||||
|
已完成 <strong>{summary.done}</strong> / {summary.total}
|
||||||
|
{!isToday && <span className="habit-badge">非今天</span>}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="habit-head-right">
|
||||||
|
<Button size="mini" color="primary" onClick={() => { setForm(EMPTY_FORM); setShowForm(true) }}>
|
||||||
|
+ 新建
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{err && (
|
||||||
|
<div className="error-banner">
|
||||||
|
{err}
|
||||||
|
<span className="retry-link" onClick={() => load(false)}>重试</span>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{data === null && !err && <div className="monitor-loading"><DotLoading /> 加载中...</div>}
|
||||||
|
|
||||||
|
{data !== null && !err && items.length === 0 && (
|
||||||
|
<div className="checkin-empty">
|
||||||
|
<Empty description="还没有打卡项" />
|
||||||
|
<Button color="primary" size="small" onClick={() => { setForm(EMPTY_FORM); setShowForm(true) }}>
|
||||||
|
创建第一个打卡项
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
<div className="habit-list">
|
||||||
|
{groups.map((g) => (
|
||||||
|
<div key={g.key}>
|
||||||
|
<div className="habit-group-title">
|
||||||
|
{g.label}
|
||||||
|
<span className="cnt">{g.list.length}</span>
|
||||||
|
</div>
|
||||||
|
{g.list.map((item) => (
|
||||||
|
<div
|
||||||
|
key={item.id}
|
||||||
|
data-habit-row
|
||||||
|
data-habit-id={item.id}
|
||||||
|
className={
|
||||||
|
'habit-card'
|
||||||
|
+ (item.completed ? ' done' : '')
|
||||||
|
+ (drag.dragItem?.id === item.id ? ' dragging' : '')
|
||||||
|
+ (drag.over?.id === item.id ? ` dragover ${drag.over.after ? 'after' : 'before'}` : '')
|
||||||
|
}
|
||||||
|
{...drag.bind(item)}
|
||||||
|
>
|
||||||
|
<RingProgress
|
||||||
|
percent={item.percent}
|
||||||
|
done={item.done}
|
||||||
|
target={item.target}
|
||||||
|
over={item.over}
|
||||||
|
completed={item.completed}
|
||||||
|
color={item.color}
|
||||||
|
onClick={() => { if (!drag.justEnded()) doCheck(item) }}
|
||||||
|
/>
|
||||||
|
<div className="habit-main">
|
||||||
|
<div className="habit-name">{item.name}</div>
|
||||||
|
<div className="habit-meta">
|
||||||
|
{item.periodLabel} {item.target} 次
|
||||||
|
{item.streak > 0 && <span className="habit-streak">连续 {item.streak}</span>}
|
||||||
|
</div>
|
||||||
|
{item.note && <div className="habit-note">{item.note}</div>}
|
||||||
|
<div className="habit-range">
|
||||||
|
{item.periodStart === item.periodEnd
|
||||||
|
? '今日'
|
||||||
|
: `${item.periodStart.slice(5)} ~ ${item.periodEnd.slice(5)}`}
|
||||||
|
{item.over > 0 && <span className="habit-over">超额 {item.over}</span>}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="habit-actions">
|
||||||
|
<Button
|
||||||
|
size="mini"
|
||||||
|
color={item.completed ? 'default' : 'primary'}
|
||||||
|
onClick={() => { if (!drag.justEnded()) doCheck(item) }}
|
||||||
|
>
|
||||||
|
{item.completed ? '再打一次' : '打卡'}
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
<div className="habit-foot">
|
||||||
|
{item.done > 0 && (
|
||||||
|
<span className="habit-link" onClick={() => { if (!drag.justEnded()) doUncheck(item) }}>撤销</span>
|
||||||
|
)}
|
||||||
|
<span
|
||||||
|
className="habit-link"
|
||||||
|
onClick={() => {
|
||||||
|
if (drag.justEnded()) return
|
||||||
|
setForm({ id: item.id, name: item.name, period: item.period, target: item.target, color: item.color, note: item.note })
|
||||||
|
setShowForm(true)
|
||||||
|
}}
|
||||||
|
>编辑</span>
|
||||||
|
<span className="habit-link danger" onClick={() => { if (!drag.justEnded()) removeHabit(item) }}>归档</span>
|
||||||
|
</div>
|
||||||
|
<Celebrate fire={bursts[item.id] || 0} color={item.color} />
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* 新建 / 编辑 */}
|
||||||
|
<Popup
|
||||||
|
visible={showForm}
|
||||||
|
onMaskClick={() => setShowForm(false)}
|
||||||
|
bodyStyle={{ borderTopLeftRadius: 12, borderTopRightRadius: 12, paddingBottom: 16 }}
|
||||||
|
>
|
||||||
|
<div className="form-popup">
|
||||||
|
<div className="form-title">{form.id ? '编辑打卡项' : '新建打卡项'}</div>
|
||||||
|
<div className="form-field">
|
||||||
|
<label>名称</label>
|
||||||
|
<Input
|
||||||
|
placeholder="例如：喝水 / 健身 / 读书"
|
||||||
|
value={form.name}
|
||||||
|
maxLength={20}
|
||||||
|
onChange={(v) => setForm((f) => ({ ...f, name: v }))}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div className="form-field">
|
||||||
|
<label>周期</label>
|
||||||
|
<Selector
|
||||||
|
options={PERIOD_OPTIONS}
|
||||||
|
value={[form.period]}
|
||||||
|
onChange={(v) => setForm((f) => ({ ...f, period: v[0] }))}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div className="form-field">
|
||||||
|
<label>目标次数（周期内）</label>
|
||||||
|
<Stepper min={1} max={999} value={form.target} onChange={(v) => setForm((f) => ({ ...f, target: v }))} />
|
||||||
|
</div>
|
||||||
|
<div className="form-field">
|
||||||
|
<label>颜色</label>
|
||||||
|
<div className="color-row">
|
||||||
|
{COLORS.map((c) => (
|
||||||
|
<span
|
||||||
|
key={c}
|
||||||
|
className={'color-dot' + (form.color === c ? ' active' : '')}
|
||||||
|
style={{ background: c }}
|
||||||
|
onClick={() => setForm((f) => ({ ...f, color: c }))}
|
||||||
|
/>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="form-field">
|
||||||
|
<label>备注（可选）</label>
|
||||||
|
<Input
|
||||||
|
placeholder="补充说明"
|
||||||
|
value={form.note}
|
||||||
|
onChange={(v) => setForm((f) => ({ ...f, note: v }))}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div className="form-actions">
|
||||||
|
<Button block color="primary" onClick={submitForm}>保存</Button>
|
||||||
|
<Button block fill="outline" onClick={() => setShowForm(false)} style={{ marginTop: 8 }}>取消</Button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</Popup>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -9,7 +9,6 @@ import {
|
|||||||
Button, Dialog, DotLoading, Empty, Input, Popup, Selector, Stepper, Toast,
|
Button, Dialog, DotLoading, Empty, Input, Popup, Selector, Stepper, Toast,
|
||||||
} from 'antd-mobile'
|
} from 'antd-mobile'
|
||||||
import RingProgress, { Celebrate } from '../../components/RingProgress.jsx'
|
import RingProgress, { Celebrate } from '../../components/RingProgress.jsx'
|
||||||
import DayRing from '../../components/checkin/DayRing.jsx'
|
|
||||||
import useHabitDrag from '../../components/checkin/useHabitDrag.js'
|
import useHabitDrag from '../../components/checkin/useHabitDrag.js'
|
||||||
import { checkinApi } from '../../api/checkin.js'
|
import { checkinApi } from '../../api/checkin.js'
|
||||||
import useRefreshOnVisible from '../../hooks/useRefreshOnVisible.js'
|
import useRefreshOnVisible from '../../hooks/useRefreshOnVisible.js'
|
||||||
@@ -130,14 +129,7 @@ export default function MergedView({ date, onDateChange }) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 当日进度 = 当天已打卡项 / 当天打卡项. 用 dayDone 而非 completed:
|
const summary = detail?.summary || { total: 0, done: 0 }
|
||||||
// completed 是"周期目标已达成" (每周/每月项可能在本周期其他天完成), 放到
|
|
||||||
// 历史日期的标题上会把当天之后、同周期内的打卡也算进来。按 items 现算还能
|
|
||||||
// 让乐观更新 (打卡/撤销) 立即反映到标题, 不必等 /habits 重新拉取。
|
|
||||||
const summary = useMemo(
|
|
||||||
() => ({ total: items.length, done: items.filter((i) => i.dayDone).length }),
|
|
||||||
[items],
|
|
||||||
)
|
|
||||||
const fireBurst = (id) => setBursts((m) => ({ ...m, [id]: (m[id] || 0) + 1 }))
|
const fireBurst = (id) => setBursts((m) => ({ ...m, [id]: (m[id] || 0) + 1 }))
|
||||||
|
|
||||||
// ---------- 打卡 / 撤销 (乐观更新) ----------
|
// ---------- 打卡 / 撤销 (乐观更新) ----------
|
||||||
@@ -263,7 +255,7 @@ export default function MergedView({ date, onDateChange }) {
|
|||||||
<span className="arrow" onClick={() => setMonth((m) => addMonths(m, -1))}>‹</span>
|
<span className="arrow" onClick={() => setMonth((m) => addMonths(m, -1))}>‹</span>
|
||||||
<b>{fmtMonth(month)}</b>
|
<b>{fmtMonth(month)}</b>
|
||||||
<span className="arrow" onClick={() => setMonth((m) => addMonths(m, 1))}>›</span>
|
<span className="arrow" onClick={() => setMonth((m) => addMonths(m, 1))}>›</span>
|
||||||
<span className="today" onClick={() => { setMonth(today.slice(0, 7)); onDateChange(today) }}>回到今天</span>
|
<span className="today" onClick={() => onDateChange(today)}>回到今天</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="mv-grid mv-wd">
|
<div className="mv-grid mv-wd">
|
||||||
@@ -274,8 +266,6 @@ export default function MergedView({ date, onDateChange }) {
|
|||||||
const info = byDate.get(d)
|
const info = byDate.get(d)
|
||||||
const inMonth = d.slice(0, 7) === month
|
const inMonth = d.slice(0, 7) === month
|
||||||
const status = info?.status || 'empty'
|
const status = info?.status || 'empty'
|
||||||
// 环的弧长 = 当天完成比例 (F-CL-06); 未来日期不画环 (计划 != 未完成)
|
|
||||||
const showRing = inMonth && !!info && !info.isFuture && (info.expected || 0) > 0
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
key={d}
|
key={d}
|
||||||
@@ -285,12 +275,8 @@ export default function MergedView({ date, onDateChange }) {
|
|||||||
}
|
}
|
||||||
onClick={() => onDateChange(d)}
|
onClick={() => onDateChange(d)}
|
||||||
>
|
>
|
||||||
<span className="mv-day-inner">
|
<span>{Number(d.slice(8, 10))}</span>
|
||||||
{showRing && (
|
{inMonth && status !== 'empty' && <i className={status} />}
|
||||||
<DayRing status={status} ratio={(info.actual || 0) / info.expected} size={26} stroke={2.2} />
|
|
||||||
)}
|
|
||||||
<span>{Number(d.slice(8, 10))}</span>
|
|
||||||
</span>
|
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
})}
|
})}
|
||||||
@@ -298,14 +284,8 @@ export default function MergedView({ date, onDateChange }) {
|
|||||||
|
|
||||||
{cal && (
|
{cal && (
|
||||||
<div className="mv-rate">
|
<div className="mv-rate">
|
||||||
<span>本月完成率 <b>{Math.round((cal.rate || 0) * 100)}%</b></span>
|
<span>本月完成率</span>
|
||||||
{/* 图例: 弧长=完成比例, 颜色=4 档 (小半/大半/完成/超额) */}
|
<b>{Math.round((cal.rate || 0) * 100)}%</b>
|
||||||
<span className="mv-legend">
|
|
||||||
<i className="low" />小半
|
|
||||||
<i className="high" />大半
|
|
||||||
<i className="full" />完成
|
|
||||||
<i className="over" />超额
|
|
||||||
</span>
|
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -25,22 +25,13 @@ export function addDays(s, n) {
|
|||||||
return fromUTC(d)
|
return fromUTC(d)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 月份加减. 同时接受月粒度 "YYYY-MM" 与日粒度 "YYYY-MM-DD":
|
|
||||||
* - 月粒度必须原样返回 "YYYY-MM", 不能变成 "YYYY-MM-01" —— 否则
|
|
||||||
* `/checkin/calendar?month=2026-10-01` 会被服务端 MONTH_RE 判为非法并回退到当月,
|
|
||||||
* 日历切到上个月时就会"看不到任何记录"。
|
|
||||||
* - 日粒度保留原日号, 超出目标月天数时收敛到月末。
|
|
||||||
*/
|
|
||||||
export function addMonths(s, n) {
|
export function addMonths(s, n) {
|
||||||
const str = String(s)
|
const [y, m] = String(s).split('-').map(Number)
|
||||||
const [y, m, d] = str.split('-').map(Number)
|
|
||||||
const day = d || 1
|
|
||||||
const first = new Date(Date.UTC(y, (m || 1) - 1 + n, 1))
|
const first = new Date(Date.UTC(y, (m || 1) - 1 + n, 1))
|
||||||
|
const day = Number(String(s).slice(8, 10)) || 1
|
||||||
const lastDay = new Date(Date.UTC(first.getUTCFullYear(), first.getUTCMonth() + 1, 0)).getUTCDate()
|
const lastDay = new Date(Date.UTC(first.getUTCFullYear(), first.getUTCMonth() + 1, 0)).getUTCDate()
|
||||||
first.setUTCDate(Math.min(day, lastDay))
|
first.setUTCDate(Math.min(day, lastDay))
|
||||||
const out = fromUTC(first)
|
return fromUTC(first)
|
||||||
return str.length === 7 ? out.slice(0, 7) : out
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 周一为一周第一天 */
|
/** 周一为一周第一天 */
|
||||||
|
|||||||
@@ -4,10 +4,10 @@ import { api } from '../../api/client.js'
|
|||||||
import useRefreshOnVisible from '../../hooks/useRefreshOnVisible.js'
|
import useRefreshOnVisible from '../../hooks/useRefreshOnVisible.js'
|
||||||
import { fmtDateTime } from '../../utils/format.js'
|
import { fmtDateTime } from '../../utils/format.js'
|
||||||
|
|
||||||
// 报警 (V0.2.2 从「宏观」迁到「监控」第 4 个 tab)
|
// 报警 (V0.2 从「首页」并入「宏观」Tab)
|
||||||
// - 数据: 跨源同 (指标, 周期) 数据差异超阈值 / cron 任务异常, 按时间倒序
|
// - 数据: World Bank 与妙想 MCP 跨源同 (指标, 周期) 数据差异超阈值, 按时间倒序
|
||||||
// - 无限滚动: 触底自动加载下一页
|
// - 无限滚动: 触底自动加载下一页
|
||||||
// - onCount: 把总数回传给父级 (监控的报警 tab 上显示角标)
|
// - onCount: 把总数回传给父级 (宏观 Tab 上显示角标)
|
||||||
export default function AlertsView({ onCount }) {
|
export default function AlertsView({ onCount }) {
|
||||||
const [items, setItems] = useState([])
|
const [items, setItems] = useState([])
|
||||||
const [loading, setLoading] = useState(false)
|
const [loading, setLoading] = useState(false)
|
||||||
@@ -0,0 +1,133 @@
|
|||||||
|
import { useEffect, useState, useCallback } from 'react'
|
||||||
|
import { useParams, useNavigate } from 'react-router-dom'
|
||||||
|
import { LineChart, Line, XAxis, YAxis, CartesianGrid, Tooltip, Legend, ResponsiveContainer } from 'recharts'
|
||||||
|
import { Card, List, NavBar } from 'antd-mobile'
|
||||||
|
import { api } from '../../api/client.js'
|
||||||
|
import TrendBadge, { calcTrend, lastPoint } from '../../components/TrendBadge.jsx'
|
||||||
|
import useRefreshOnVisible from '../../hooks/useRefreshOnVisible.js'
|
||||||
|
|
||||||
|
// 经济数据
|
||||||
|
// 列表态 (默认): 列出所有指标, 每行显示最新值 + 趋势徽标, 点击进入详情
|
||||||
|
// 详情态: 顶部 NavBar (返回) + 折线图 + 数据表
|
||||||
|
// 频率中文标签 (对应 Indicator.frequency)
|
||||||
|
const FREQ_LABEL = { year: '年', quarter: '季', month: '月', day: '日' }
|
||||||
|
|
||||||
|
// 统一数据行的时间字段: 兼容 {month}/{year}/{period} 三种存储形状
|
||||||
|
function periodOf(r) {
|
||||||
|
return (r && (r.period || r.month || r.year)) || ''
|
||||||
|
}
|
||||||
|
|
||||||
|
export default function DataView() {
|
||||||
|
const [indicators, setIndicators] = useState([])
|
||||||
|
const [err, setErr] = useState('')
|
||||||
|
const [loading, setLoading] = useState(true)
|
||||||
|
// 路由驱动: /macro/data 列表, /macro/data/:name 详情, 浏览器/手机返回键天然可用
|
||||||
|
const { name } = useParams()
|
||||||
|
const navigate = useNavigate()
|
||||||
|
|
||||||
|
const load = useCallback(() => {
|
||||||
|
setLoading(true)
|
||||||
|
api('/indicators')
|
||||||
|
.then((data) => { setErr(''); setIndicators(data.indicators || []) })
|
||||||
|
.catch((e) => setErr(e.message))
|
||||||
|
.finally(() => setLoading(false))
|
||||||
|
}, [])
|
||||||
|
|
||||||
|
useEffect(() => { load() }, [load])
|
||||||
|
// 后台回前台时重新拉取
|
||||||
|
useRefreshOnVisible(load)
|
||||||
|
|
||||||
|
if (loading) return <div className="loading">加载中...</div>
|
||||||
|
if (err) return <div className="error-banner">{err}</div>
|
||||||
|
if (!indicators.length) return <div className="empty">暂无指标数据, 请先执行 npm run db:seed</div>
|
||||||
|
|
||||||
|
// 详情态 (路径 /macro/data/:name)
|
||||||
|
if (name) {
|
||||||
|
const cur = indicators.find((i) => i.name === name)
|
||||||
|
if (cur) return <DataDetail indicator={cur} onBack={() => navigate('/macro/data')} />
|
||||||
|
}
|
||||||
|
|
||||||
|
// 列表态
|
||||||
|
const labelOf = (i) => i.title || i.name
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="list-page">
|
||||||
|
<div className="page-title">经济数据</div>
|
||||||
|
<List>
|
||||||
|
{indicators.map((i) => {
|
||||||
|
const lp = lastPoint({ rows: i.points || [] })
|
||||||
|
const { trend, change } = calcTrend(i.points || [])
|
||||||
|
const unit = i.unit || ''
|
||||||
|
return (
|
||||||
|
<List.Item
|
||||||
|
key={i.name}
|
||||||
|
title={labelOf(i)}
|
||||||
|
description={lp ? <><b>{lp.value}{unit}</b> · {periodOf(lp)}</> : '暂无数据'}
|
||||||
|
extra={<TrendBadge trend={trend} />}
|
||||||
|
|
||||||
|
arrowIcon
|
||||||
|
clickable
|
||||||
|
onClick={() => navigate('/macro/data/' + i.name)}
|
||||||
|
/>
|
||||||
|
)
|
||||||
|
})}
|
||||||
|
</List>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
// 详情: 折线图 + 数据表
|
||||||
|
function DataDetail({ indicator, onBack }) {
|
||||||
|
const i = indicator
|
||||||
|
const rows = (i.points || [])
|
||||||
|
// 图表 X 轴统一用 period 字段
|
||||||
|
const chartRows = rows.map((r) => ({ ...r, period: periodOf(r) }))
|
||||||
|
// 表格按时间反序: 最新在前
|
||||||
|
const tableRows = [...rows].reverse()
|
||||||
|
const [showAll, setShowAll] = useState(false)
|
||||||
|
const visibleRows = showAll ? tableRows : tableRows.slice(0, 10)
|
||||||
|
const lp = lastPoint({ rows })
|
||||||
|
const { trend } = calcTrend(rows)
|
||||||
|
const title = i.title || i.name
|
||||||
|
return (
|
||||||
|
<div className="detail-page">
|
||||||
|
<NavBar onBack={onBack}>{title}</NavBar>
|
||||||
|
<Card className="detail-card">
|
||||||
|
<div className="detail-meta">
|
||||||
|
单位 {i.unit || '-'} · 频率 {FREQ_LABEL[i.frequency] || i.frequency || '-'} · 来源 {i.source || 'seed'} ·
|
||||||
|
{lp && <> 最新 <b style={{ color: 'var(--color-text)' }}>{lp.value}{i.unit || ''}</b> ({periodOf(lp)}) </>}
|
||||||
|
<TrendBadge trend={trend} />
|
||||||
|
</div>
|
||||||
|
<div className="chart-wrap">
|
||||||
|
<ResponsiveContainer width="100%" height={260}>
|
||||||
|
<LineChart data={chartRows} margin={{ top: 10, right: 16, left: 0, bottom: 0 }}>
|
||||||
|
<CartesianGrid strokeDasharray="3 3" />
|
||||||
|
<XAxis dataKey="period" tick={{ fontSize: 11 }} />
|
||||||
|
<YAxis tick={{ fontSize: 11 }} />
|
||||||
|
<Tooltip />
|
||||||
|
<Legend />
|
||||||
|
<Line type="monotone" dataKey="value" name={i.unit || '值'} stroke="#1677ff" strokeWidth={2} dot={{ r: 3 }} />
|
||||||
|
</LineChart>
|
||||||
|
</ResponsiveContainer>
|
||||||
|
</div>
|
||||||
|
<div className={'data-table-wrap' + (showAll ? ' scroll' : '')}>
|
||||||
|
<table className="data-table">
|
||||||
|
<thead>
|
||||||
|
<tr><th>月份</th><th style={{ textAlign: 'right' }}>数值</th></tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
{visibleRows.map((r) => (
|
||||||
|
<tr key={periodOf(r)}><td>{periodOf(r)}</td><td style={{ textAlign: 'right' }}>{r.value}</td></tr>
|
||||||
|
))}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
{tableRows.length > 10 && !showAll && (
|
||||||
|
<div className="table-more" onClick={() => setShowAll(true)}>
|
||||||
|
展开全部（共 {tableRows.length} 行）
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</Card>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -1,39 +0,0 @@
|
|||||||
import { useNavigate } from 'react-router-dom'
|
|
||||||
import { List, DotLoading } from 'antd-mobile'
|
|
||||||
import { useIfinanceInfo } from '../../lib/ifinance.js'
|
|
||||||
|
|
||||||
// 外接模块分类列表 (ifinance categories[].items[])
|
|
||||||
// - 数据来源: info.json (运行时动态拉取), 当前分类由 MacroPage 传入
|
|
||||||
// - 点击条目 → /macro/finance/:catId/:itemId 打开该条目独立 HTML
|
|
||||||
const KIND_LABEL = { indicator: '指标', strategy: '策略', dashboard: '看板' }
|
|
||||||
|
|
||||||
export default function FinanceCategoryView({ category }) {
|
|
||||||
const navigate = useNavigate()
|
|
||||||
const { info, loading, error } = useIfinanceInfo()
|
|
||||||
|
|
||||||
// MacroPage 拿到的 category 可能来自缓存; 若为空则用 hook 里的最新数据兜底
|
|
||||||
const cat = category || (info?.categories || []).find((c) => c.id === category?.id)
|
|
||||||
const items = cat?.items || []
|
|
||||||
|
|
||||||
if (!cat && loading) return <div className="loading"><DotLoading /> 加载中...</div>
|
|
||||||
if (!cat && error) return <div className="error-banner">{error}</div>
|
|
||||||
if (!items.length) return <div className="empty">暂无内容</div>
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="list-page">
|
|
||||||
<List>
|
|
||||||
{items.map((it) => (
|
|
||||||
<List.Item
|
|
||||||
key={it.id}
|
|
||||||
title={it.title || it.id}
|
|
||||||
description={it.subtitle || ''}
|
|
||||||
extra={<span className="finance-kind">{KIND_LABEL[it.kind] || it.kind || ''}</span>}
|
|
||||||
arrowIcon
|
|
||||||
clickable
|
|
||||||
onClick={() => navigate('/macro/finance/' + cat.id + '/' + it.id)}
|
|
||||||
/>
|
|
||||||
))}
|
|
||||||
</List>
|
|
||||||
</div>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
import { useNavigate, useParams } from 'react-router-dom'
|
|
||||||
import { NavBar, DotLoading } from 'antd-mobile'
|
|
||||||
import { useIfinanceInfo, financePageUrl } from '../../lib/ifinance.js'
|
|
||||||
|
|
||||||
// 外接条目详情: 用 iframe 加载 ifinance 生成的独立 HTML。
|
|
||||||
// - 页面本身无导航/头部 (符合 ifinance 规范), 由宿主提供 NavBar 返回
|
|
||||||
// - 直接指向远端地址 (纯前端直连, 不做端上缓存)
|
|
||||||
export default function FinanceItemView() {
|
|
||||||
const { catId, itemId } = useParams()
|
|
||||||
const navigate = useNavigate()
|
|
||||||
const { info, loading, error } = useIfinanceInfo()
|
|
||||||
|
|
||||||
const cat = (info?.categories || []).find((c) => c.id === catId)
|
|
||||||
const item = (cat?.items || []).find((i) => i.id === itemId)
|
|
||||||
const title = item?.title || '详情'
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="finance-item-page">
|
|
||||||
<NavBar onBack={() => navigate('/macro/finance/' + catId)}>{title}</NavBar>
|
|
||||||
{loading && !item && <div className="loading"><DotLoading /> 加载中...</div>}
|
|
||||||
{!loading && error && <div className="error-banner">{error}</div>}
|
|
||||||
{!loading && !error && !item && <div className="empty">内容不存在</div>}
|
|
||||||
{item?.html && (
|
|
||||||
<iframe
|
|
||||||
className="finance-frame"
|
|
||||||
title={title}
|
|
||||||
src={financePageUrl(item.html)}
|
|
||||||
loading="lazy"
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,250 @@
|
|||||||
|
import { useEffect, useMemo, useState } from 'react'
|
||||||
|
import { Card, DotLoading, Empty, ErrorBlock } from 'antd-mobile'
|
||||||
|
import {
|
||||||
|
CartesianGrid,
|
||||||
|
Legend,
|
||||||
|
Line,
|
||||||
|
LineChart,
|
||||||
|
ResponsiveContainer,
|
||||||
|
Tooltip,
|
||||||
|
XAxis,
|
||||||
|
YAxis,
|
||||||
|
} from 'recharts'
|
||||||
|
import { getOilForecast, getOilHistory, getOilSchedule } from '../../api/oil.js'
|
||||||
|
|
||||||
|
// 油价页 (新):
|
||||||
|
// - 上: 下次调价预测 (无 WTI / 无柱状图)
|
||||||
|
// - 中: 浙江省最近半年价格走势 (3 油品折线, 一张图)
|
||||||
|
// - 下: 调价日历 (按年切换)
|
||||||
|
// 数据源:
|
||||||
|
// - 预测/日历: apizero 实时 (后端代理)
|
||||||
|
// - 走势: DB oil_price_history 表 (cron 每天 04:00 抓浙江 3 油品入库)
|
||||||
|
|
||||||
|
const FUEL_LABELS = {
|
||||||
|
'92': '92# 汽油',
|
||||||
|
'95': '95# 汽油',
|
||||||
|
'0': '0# 柴油',
|
||||||
|
}
|
||||||
|
// 3 油品各自配色 (与原柱状图色调保持一致)
|
||||||
|
const FUEL_COLORS = {
|
||||||
|
'92': '#1677ff',
|
||||||
|
'95': '#52c41a',
|
||||||
|
'0': '#888',
|
||||||
|
}
|
||||||
|
|
||||||
|
function n(v, d = 2) { return Number.isFinite(Number(v)) ? Number(v).toFixed(d) : '-' }
|
||||||
|
|
||||||
|
// 调价预测 (保留, 但不显示 WTI / 布伦特)
|
||||||
|
function ForecastPanel() {
|
||||||
|
const [forecast, setForecast] = useState(null)
|
||||||
|
const [loading, setLoading] = useState(true)
|
||||||
|
const [err, setErr] = useState('')
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
let cancelled = false
|
||||||
|
setLoading(true)
|
||||||
|
setErr('')
|
||||||
|
getOilForecast()
|
||||||
|
.then((d) => { if (!cancelled) setForecast(d) })
|
||||||
|
.catch((e) => !cancelled && setErr(e.message || '加载失败'))
|
||||||
|
.finally(() => !cancelled && setLoading(false))
|
||||||
|
return () => { cancelled = true }
|
||||||
|
}, [])
|
||||||
|
|
||||||
|
if (loading) return <div className="monitor-loading"><DotLoading /> 加载中...</div>
|
||||||
|
if (err) return <ErrorBlock status="default" title="加载失败" description={err} />
|
||||||
|
|
||||||
|
const p = forecast?.prediction
|
||||||
|
return (
|
||||||
|
<Card className="oil-card">
|
||||||
|
<div className="oil-card-title">下次调价预测</div>
|
||||||
|
<div className="oil-prediction">
|
||||||
|
<div className="oil-pred-row">
|
||||||
|
<span className="oil-pred-label">调价日</span>
|
||||||
|
<span className="oil-pred-value">{forecast?.next_adjust_date || '-'}</span>
|
||||||
|
<span className="oil-pred-tag">剩 {forecast?.days_remaining ?? '-'} 天</span>
|
||||||
|
</div>
|
||||||
|
<div className="oil-pred-row">
|
||||||
|
<span className="oil-pred-label">方向</span>
|
||||||
|
<span className={'oil-pred-direction ' + (p?.direction || '')}>
|
||||||
|
{p?.direction_emoji || ''} {p?.direction || '-'}
|
||||||
|
</span>
|
||||||
|
<span className="oil-pred-tag">置信度 {p?.confidence || '-'}</span>
|
||||||
|
</div>
|
||||||
|
<div className="oil-pred-row">
|
||||||
|
<span className="oil-pred-label">预计幅度</span>
|
||||||
|
<span className="oil-pred-value">
|
||||||
|
{p?.estimated_change_per_ton != null
|
||||||
|
? `${p.estimated_change_per_ton > 0 ? '+' : ''}${p.estimated_change_per_ton} 元/吨`
|
||||||
|
: '-'}
|
||||||
|
{p?.estimated_change_per_liter != null && (
|
||||||
|
<span className="oil-pred-sub"> ({p.estimated_change_per_liter > 0 ? '+' : ''}{p.estimated_change_per_liter} 元/升)</span>
|
||||||
|
)}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
{p?.analysis && (
|
||||||
|
<div className="oil-pred-analysis">{p.analysis}</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</Card>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
// 浙江省最近半年价格走势
|
||||||
|
function HistoryPanel() {
|
||||||
|
const [data, setData] = useState([])
|
||||||
|
const [loading, setLoading] = useState(true)
|
||||||
|
const [err, setErr] = useState('')
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
let cancelled = false
|
||||||
|
setLoading(true)
|
||||||
|
setErr('')
|
||||||
|
getOilHistory({ days: 180 })
|
||||||
|
.then((d) => { if (!cancelled) setData(d.items || []) })
|
||||||
|
.catch((e) => !cancelled && setErr(e.message || '加载失败'))
|
||||||
|
.finally(() => !cancelled && setLoading(false))
|
||||||
|
return () => { cancelled = true }
|
||||||
|
}, [])
|
||||||
|
|
||||||
|
// 整形: rows = [{date, fuel, price}] -> 3 油品并排
|
||||||
|
// pivot: [{date, 92, 95, 0}]
|
||||||
|
const chartData = useMemo(() => {
|
||||||
|
const m = new Map()
|
||||||
|
for (const r of data) {
|
||||||
|
if (!m.has(r.date)) m.set(r.date, { date: r.date })
|
||||||
|
m.get(r.date)[r.fuel] = r.price
|
||||||
|
}
|
||||||
|
return Array.from(m.values()).sort((a, b) => a.date.localeCompare(b.date))
|
||||||
|
}, [data])
|
||||||
|
|
||||||
|
// 3 油品都有数据?
|
||||||
|
const hasData = chartData.length > 0
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Card className="oil-card">
|
||||||
|
<div className="oil-card-title">浙江省最近半年价格走势</div>
|
||||||
|
{loading && <div className="monitor-loading"><DotLoading /> 加载中...</div>}
|
||||||
|
{err && <ErrorBlock status="default" title="加载失败" description={err} />}
|
||||||
|
{!loading && !err && !hasData && (
|
||||||
|
<Empty description="暂无历史数据 (每天 04:00 自动抓取, 调价次日入库)" />
|
||||||
|
)}
|
||||||
|
{!loading && !err && hasData && (
|
||||||
|
<>
|
||||||
|
<div className="oil-chart">
|
||||||
|
<ResponsiveContainer width="100%" height={260}>
|
||||||
|
<LineChart data={chartData} margin={{ top: 10, right: 10, left: -10, bottom: 0 }}>
|
||||||
|
<CartesianGrid strokeDasharray="3 3" stroke="#eee" />
|
||||||
|
<XAxis dataKey="date" tick={{ fontSize: 10 }} />
|
||||||
|
<YAxis tick={{ fontSize: 10 }} domain={['dataMin - 0.1', 'dataMax + 0.1']} unit="" />
|
||||||
|
<Tooltip formatter={(v) => `${Number(v).toFixed(3)} 元/升`} />
|
||||||
|
<Legend wrapperStyle={{ fontSize: 11 }} />
|
||||||
|
{Object.keys(FUEL_LABELS).map((k) => (
|
||||||
|
<Line
|
||||||
|
key={k}
|
||||||
|
type="monotone"
|
||||||
|
dataKey={k}
|
||||||
|
name={FUEL_LABELS[k]}
|
||||||
|
stroke={FUEL_COLORS[k]}
|
||||||
|
strokeWidth={2}
|
||||||
|
dot={{ r: 3 }}
|
||||||
|
connectNulls
|
||||||
|
/>
|
||||||
|
))}
|
||||||
|
</LineChart>
|
||||||
|
</ResponsiveContainer>
|
||||||
|
</div>
|
||||||
|
<div className="oil-chart-tip">共 {chartData.length} 个数据点 (调价次日入库)</div>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</Card>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
// 调价日历 (不变)
|
||||||
|
function SchedulePanel() {
|
||||||
|
const [year, setYear] = useState(new Date().getFullYear())
|
||||||
|
const [data, setData] = useState(null)
|
||||||
|
const [loading, setLoading] = useState(true)
|
||||||
|
const [err, setErr] = useState('')
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
let cancelled = false
|
||||||
|
setLoading(true)
|
||||||
|
setErr('')
|
||||||
|
getOilSchedule(year)
|
||||||
|
.then((d) => { if (!cancelled) setData(d) })
|
||||||
|
.catch((e) => !cancelled && setErr(e.message || '加载失败'))
|
||||||
|
.finally(() => !cancelled && setLoading(false))
|
||||||
|
return () => { cancelled = true }
|
||||||
|
}, [year])
|
||||||
|
|
||||||
|
const byMonth = useMemo(() => {
|
||||||
|
const m = {}
|
||||||
|
if (!data?.schedule) return m
|
||||||
|
for (const it of data.schedule) {
|
||||||
|
const mm = it.date.slice(0, 7)
|
||||||
|
if (!m[mm]) m[mm] = []
|
||||||
|
m[mm].push(it)
|
||||||
|
}
|
||||||
|
return m
|
||||||
|
}, [data])
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Card className="oil-card">
|
||||||
|
<div className="oil-card-title-row">
|
||||||
|
<div className="oil-card-title">调价日历</div>
|
||||||
|
<div className="oil-year-tabs">
|
||||||
|
{[2025, 2026].map((y) => (
|
||||||
|
<button
|
||||||
|
key={y}
|
||||||
|
className={'oil-year-tab ' + (y === year ? 'active' : '')}
|
||||||
|
onClick={() => setYear(y)}
|
||||||
|
>
|
||||||
|
{y}
|
||||||
|
</button>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{data?._cached && <div className="oil-cache-hint">本次来自本地缓存, 不消耗 apizero 配额</div>}
|
||||||
|
{loading && <div className="monitor-loading"><DotLoading /> 加载中...</div>}
|
||||||
|
{err && <ErrorBlock status="default" title="加载失败" description={err} />}
|
||||||
|
{!loading && !err && data && (
|
||||||
|
<>
|
||||||
|
<div className="oil-schedule-meta">
|
||||||
|
{data.year} 年共 <b>{data.total_adjustments}</b> 个调价窗口
|
||||||
|
{data.next_adjust_date && (
|
||||||
|
<span className="oil-pred-tag">下一个: {data.next_adjust_date} (剩 {data.days_remaining} 天)</span>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
<div className="oil-schedule-list">
|
||||||
|
{Object.keys(byMonth).sort().map((m) => (
|
||||||
|
<div key={m} className="oil-month">
|
||||||
|
<div className="oil-month-label">{m}</div>
|
||||||
|
<div className="oil-month-items">
|
||||||
|
{byMonth[m].map((it) => (
|
||||||
|
<div key={it.date} className={'oil-day ' + (it.status === '已过' ? 'past' : 'future')}>
|
||||||
|
<div className="oil-day-date">{it.date.slice(8)}</div>
|
||||||
|
<div className="oil-day-status">{it.status}</div>
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</Card>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
// 油价页入口: 预测 + 走势 + 日历
|
||||||
|
export default function OilPage() {
|
||||||
|
return (
|
||||||
|
<div className="oil-page">
|
||||||
|
<ForecastPanel />
|
||||||
|
<HistoryPanel />
|
||||||
|
<SchedulePanel />
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -0,0 +1,141 @@
|
|||||||
|
import { useEffect, useState } from 'react'
|
||||||
|
import { useParams, useNavigate } from 'react-router-dom'
|
||||||
|
import { LineChart, Line, XAxis, YAxis, CartesianGrid, Tooltip, Legend, ResponsiveContainer } from 'recharts'
|
||||||
|
import { Card, List, NavBar } from 'antd-mobile'
|
||||||
|
import { api } from '../../api/client.js'
|
||||||
|
import TrendBadge, { calcTrend } from '../../components/TrendBadge.jsx'
|
||||||
|
|
||||||
|
// 策略研究
|
||||||
|
// 列表态 (默认): 列出所有策略, 每行显示主指标 (债务/GDP) 最新值 + 趋势
|
||||||
|
// 详情态: 顶部 NavBar (返回) + 4 张图 (debt/gdp/debtToGdp/interestToGdp) + 表格
|
||||||
|
const SERIES = [
|
||||||
|
{ key: 'debt', label: '政府债务 (万亿美元)', color: '#8884d8' },
|
||||||
|
{ key: 'gdp', label: 'GDP (万亿美元)', color: '#3cb44b' },
|
||||||
|
{ key: 'debtToGdp', label: '债务/GDP (%)', color: '#4363d8' },
|
||||||
|
{ key: 'interestToGdp', label: '债务利息/GDP (%)', color: '#f58231' },
|
||||||
|
]
|
||||||
|
|
||||||
|
// 取最后一个有效数据点
|
||||||
|
function lastRow(rows) {
|
||||||
|
for (let i = rows.length - 1; i >= 0; i--) {
|
||||||
|
if (rows[i] && typeof rows[i].debtToGdp === 'number') return rows[i]
|
||||||
|
}
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
||||||
|
export default function StrategyView() {
|
||||||
|
const [strategies, setStrategies] = useState([])
|
||||||
|
const [err, setErr] = useState('')
|
||||||
|
const [loading, setLoading] = useState(true)
|
||||||
|
// 路由驱动: /macro/strategy 列表, /macro/strategy/:name 详情, 浏览器/手机返回键天然可用
|
||||||
|
const { name } = useParams()
|
||||||
|
const navigate = useNavigate()
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
let cancelled = false
|
||||||
|
setLoading(true)
|
||||||
|
api('/strategies')
|
||||||
|
.then((data) => { if (!cancelled) setStrategies(data.strategies || []) })
|
||||||
|
.catch((e) => !cancelled && setErr(e.message))
|
||||||
|
.finally(() => !cancelled && setLoading(false))
|
||||||
|
return () => { cancelled = true }
|
||||||
|
}, [])
|
||||||
|
|
||||||
|
if (loading) return <div className="loading">加载中...</div>
|
||||||
|
if (err) return <div className="error-banner">{err}</div>
|
||||||
|
if (!strategies.length) return <div className="empty">暂无策略数据</div>
|
||||||
|
|
||||||
|
// 详情态 (路径 /macro/strategy/:name)
|
||||||
|
if (name) {
|
||||||
|
const cur = strategies.find((s) => s.name === name)
|
||||||
|
if (cur) return <StrategyDetail strategy={cur} onBack={() => navigate('/macro/strategy')} />
|
||||||
|
}
|
||||||
|
|
||||||
|
// 列表态: 主指标 = 债务/GDP, 趋势基于其最近变化
|
||||||
|
return (
|
||||||
|
<div className="list-page">
|
||||||
|
<div className="page-title">策略研究</div>
|
||||||
|
<List>
|
||||||
|
{strategies.map((s) => {
|
||||||
|
const rows = (s.data && s.data.rows) || []
|
||||||
|
const last = lastRow(rows)
|
||||||
|
const { trend, change } = calcTrend(rows)
|
||||||
|
return (
|
||||||
|
<List.Item
|
||||||
|
key={s.name}
|
||||||
|
title={s.description || s.name}
|
||||||
|
description={last
|
||||||
|
? <><b>{last.debtToGdp}%</b> · 债务利息/GDP {last.interestToGdp}% · {last.year}</>
|
||||||
|
: '暂无数据'}
|
||||||
|
extra={<TrendBadge trend={trend} />}
|
||||||
|
arrowIcon
|
||||||
|
clickable
|
||||||
|
onClick={() => navigate('/macro/strategy/' + s.name)}
|
||||||
|
/>
|
||||||
|
)
|
||||||
|
})}
|
||||||
|
</List>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
// 详情: 4 张图 + 表格
|
||||||
|
function StrategyDetail({ strategy, onBack }) {
|
||||||
|
const s = strategy
|
||||||
|
const rows = (s.data && s.data.rows) || []
|
||||||
|
const last = lastRow(rows)
|
||||||
|
const { trend } = calcTrend(rows)
|
||||||
|
return (
|
||||||
|
<div className="detail-page">
|
||||||
|
<NavBar onBack={onBack}>{s.description || s.name}</NavBar>
|
||||||
|
<Card className="detail-card">
|
||||||
|
<div className="detail-meta">
|
||||||
|
数据 {rows.length} 条 · 来源 {s.data.source || 'seed'} ·
|
||||||
|
{last && <> 最新 <b style={{ color: 'var(--color-text)' }}>{last.year}</b> 债务/GDP <b style={{ color: 'var(--color-text)' }}>{last.debtToGdp}%</b> </>}
|
||||||
|
<TrendBadge trend={trend} />
|
||||||
|
</div>
|
||||||
|
{SERIES.map((s2) => (
|
||||||
|
<div key={s2.key} style={{ marginBottom: 12 }}>
|
||||||
|
<div style={{ fontSize: 13, fontWeight: 500, marginBottom: 4 }}>{s2.label}</div>
|
||||||
|
<div className="chart-wrap">
|
||||||
|
<ResponsiveContainer width="100%" height={220}>
|
||||||
|
<LineChart data={rows} margin={{ top: 8, right: 12, left: 0, bottom: 0 }}>
|
||||||
|
<CartesianGrid strokeDasharray="3 3" />
|
||||||
|
<XAxis dataKey="year" tick={{ fontSize: 11 }} />
|
||||||
|
<YAxis tick={{ fontSize: 11 }} />
|
||||||
|
<Tooltip />
|
||||||
|
<Legend />
|
||||||
|
<Line type="monotone" dataKey={s2.key} name={s2.label} stroke={s2.color} strokeWidth={2} dot={{ r: 3 }} />
|
||||||
|
</LineChart>
|
||||||
|
</ResponsiveContainer>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
<div style={{ maxHeight: 220, overflow: 'auto', marginTop: 8 }}>
|
||||||
|
<table className="data-table">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th>年份</th>
|
||||||
|
<th style={{ textAlign: 'right' }}>债务</th>
|
||||||
|
<th style={{ textAlign: 'right' }}>GDP</th>
|
||||||
|
<th style={{ textAlign: 'right' }}>债务/GDP</th>
|
||||||
|
<th style={{ textAlign: 'right' }}>利息/GDP</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
{rows.map((r) => (
|
||||||
|
<tr key={r.year}>
|
||||||
|
<td>{r.year}</td>
|
||||||
|
<td style={{ textAlign: 'right' }}>{r.debt}</td>
|
||||||
|
<td style={{ textAlign: 'right' }}>{r.gdp}</td>
|
||||||
|
<td style={{ textAlign: 'right' }}>{r.debtToGdp}</td>
|
||||||
|
<td style={{ textAlign: 'right' }}>{r.interestToGdp}</td>
|
||||||
|
</tr>
|
||||||
|
))}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</Card>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -1,67 +1,29 @@
|
|||||||
import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
|
import { useCallback, useEffect, useRef, useState } from 'react'
|
||||||
import { Button, DatePicker, Dialog, DotLoading, Input, Popup, Toast } from 'antd-mobile'
|
import { Button, DatePicker, Dialog, DotLoading, Input, Popup, Selector, Toast } from 'antd-mobile'
|
||||||
import { taskApi } from '../../api/task.js'
|
import { taskApi } from '../../api/task.js'
|
||||||
import { kindColor } from './kind.js'
|
import { kindColor } from './kind.js'
|
||||||
|
|
||||||
// 已归档任务查询 (T-ARC-04/05/06)
|
// 已归档任务查询 (T-ARC-04/05/06)
|
||||||
// 过滤: 关键词(标题) / 看板列 / 归档时间 (含 本周/本月/本季度 快捷项)
|
// 过滤: 关键词(标题) / 任务类型 / 看板列 / 归档时间范围
|
||||||
// 交互: 条件先编辑 -> 点「筛选」才提交
|
|
||||||
// (原实现改任一条件就即时重查, 连点会连发请求, 输关键词时还会闪)
|
|
||||||
// 游标分页: 「加载更多」追加; 行内 恢复 / 彻底删除
|
// 游标分页: 「加载更多」追加; 行内 恢复 / 彻底删除
|
||||||
// 不再提供「任务类型」过滤: 类型是弱维度, 归档场景几乎不按类型检索
|
|
||||||
const LIMIT = 20
|
const LIMIT = 20
|
||||||
|
|
||||||
const EMPTY = { keyword: '', columnId: '', time: 'all', from: '', to: '' }
|
|
||||||
|
|
||||||
const TIME_OPTIONS = [
|
|
||||||
{ key: 'all', label: '全部' },
|
|
||||||
{ key: 'week', label: '本周' },
|
|
||||||
{ key: 'month', label: '本月' },
|
|
||||||
{ key: 'quarter', label: '本季度' },
|
|
||||||
{ key: 'custom', label: '自定义' },
|
|
||||||
]
|
|
||||||
const TIME_LABEL = { week: '本周', month: '本月', quarter: '本季度' }
|
|
||||||
|
|
||||||
const pad = (n) => String(n).padStart(2, '0')
|
|
||||||
const fmtDate = (d) => `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())}`
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 快捷时间 -> [from, to]。本地日期，区间截止到今天（不跨到未来）。
|
|
||||||
* 纯函数，便于单测。
|
|
||||||
*/
|
|
||||||
export function presetRange(key, now = new Date()) {
|
|
||||||
const today = new Date(now.getFullYear(), now.getMonth(), now.getDate())
|
|
||||||
if (key === 'week') {
|
|
||||||
const dow = (today.getDay() + 6) % 7 // 周一为 0
|
|
||||||
const mon = new Date(today)
|
|
||||||
mon.setDate(today.getDate() - dow)
|
|
||||||
return [fmtDate(mon), fmtDate(today)]
|
|
||||||
}
|
|
||||||
if (key === 'month') {
|
|
||||||
return [fmtDate(new Date(today.getFullYear(), today.getMonth(), 1)), fmtDate(today)]
|
|
||||||
}
|
|
||||||
if (key === 'quarter') {
|
|
||||||
const qm = Math.floor(today.getMonth() / 3) * 3 // 当季首月
|
|
||||||
return [fmtDate(new Date(today.getFullYear(), qm, 1)), fmtDate(today)]
|
|
||||||
}
|
|
||||||
return ['', '']
|
|
||||||
}
|
|
||||||
|
|
||||||
export default function ArchivedTasks({ project, visible, onClose, onChanged }) {
|
export default function ArchivedTasks({ project, visible, onClose, onChanged }) {
|
||||||
const [items, setItems] = useState(null)
|
const [items, setItems] = useState(null)
|
||||||
const [nextCursor, setNextCursor] = useState(null)
|
const [nextCursor, setNextCursor] = useState(null)
|
||||||
const [loading, setLoading] = useState(false)
|
const [loading, setLoading] = useState(false)
|
||||||
const [draft, setDraft] = useState(EMPTY) // 表单里正在编辑的条件
|
const [filters, setFilters] = useState({ keyword: '', kind: '', columnId: '', from: '', to: '' })
|
||||||
const [applied, setApplied] = useState(EMPTY) // 已提交、真正参与查询的条件
|
|
||||||
const [fromVisible, setFromVisible] = useState(false)
|
const [fromVisible, setFromVisible] = useState(false)
|
||||||
const [toVisible, setToVisible] = useState(false)
|
const [toVisible, setToVisible] = useState(false)
|
||||||
const cursorRef = useRef('')
|
const cursorRef = useRef('')
|
||||||
|
|
||||||
const columns = project?.columns || []
|
const columns = project?.columns || []
|
||||||
|
const kinds = project?.taskKinds || []
|
||||||
|
|
||||||
const buildParams = (f, cursor) => {
|
const buildParams = (f, cursor) => {
|
||||||
const p = { limit: LIMIT }
|
const p = { limit: LIMIT }
|
||||||
if (f.keyword) p.keyword = f.keyword
|
if (f.keyword.trim()) p.keyword = f.keyword.trim()
|
||||||
|
if (f.kind) p.kind = f.kind
|
||||||
if (f.columnId) p.columnId = f.columnId
|
if (f.columnId) p.columnId = f.columnId
|
||||||
if (f.from) p.from = f.from
|
if (f.from) p.from = f.from
|
||||||
if (f.to) p.to = f.to
|
if (f.to) p.to = f.to
|
||||||
@@ -73,7 +35,7 @@ export default function ArchivedTasks({ project, visible, onClose, onChanged })
|
|||||||
setLoading(true)
|
setLoading(true)
|
||||||
try {
|
try {
|
||||||
const cursor = reset ? '' : cursorRef.current
|
const cursor = reset ? '' : cursorRef.current
|
||||||
const r = await taskApi.archivedList(project.id, buildParams(applied, cursor))
|
const r = await taskApi.archivedList(project.id, buildParams(filters, cursor))
|
||||||
setItems((prev) => (reset || !prev ? r.items : [...prev, ...r.items]))
|
setItems((prev) => (reset || !prev ? r.items : [...prev, ...r.items]))
|
||||||
cursorRef.current = r.nextCursor || ''
|
cursorRef.current = r.nextCursor || ''
|
||||||
setNextCursor(r.nextCursor || null)
|
setNextCursor(r.nextCursor || null)
|
||||||
@@ -83,7 +45,7 @@ export default function ArchivedTasks({ project, visible, onClose, onChanged })
|
|||||||
setLoading(false)
|
setLoading(false)
|
||||||
}
|
}
|
||||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||||
}, [project.id, applied])
|
}, [project.id, filters])
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!visible) return
|
if (!visible) return
|
||||||
@@ -92,51 +54,7 @@ export default function ArchivedTasks({ project, visible, onClose, onChanged })
|
|||||||
load(true)
|
load(true)
|
||||||
}, [visible, load])
|
}, [visible, load])
|
||||||
|
|
||||||
const setD = (patch) => setDraft((p) => ({ ...p, ...patch }))
|
const setF = (patch) => setFilters((p) => ({ ...p, ...patch }))
|
||||||
const colName = (id) => columns.find((c) => String(c.id) === String(id))?.name || ''
|
|
||||||
const fmt = (iso) => (iso ? String(iso).slice(0, 10) : '')
|
|
||||||
|
|
||||||
const activeCount =
|
|
||||||
(applied.keyword ? 1 : 0) + (applied.columnId ? 1 : 0) + (applied.time !== 'all' ? 1 : 0)
|
|
||||||
|
|
||||||
const appliedTags = useMemo(() => {
|
|
||||||
const tags = []
|
|
||||||
if (applied.keyword) tags.push({ key: 'keyword', text: `标题: ${applied.keyword}` })
|
|
||||||
if (applied.columnId) tags.push({ key: 'columnId', text: `看板列: ${colName(applied.columnId)}` })
|
|
||||||
if (applied.time === 'custom') {
|
|
||||||
if (applied.from || applied.to) {
|
|
||||||
tags.push({ key: 'time', text: `${applied.from || '…'} ~ ${applied.to || '…'}` })
|
|
||||||
}
|
|
||||||
} else if (applied.time !== 'all') {
|
|
||||||
tags.push({ key: 'time', text: TIME_LABEL[applied.time] })
|
|
||||||
}
|
|
||||||
return tags
|
|
||||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
||||||
}, [applied, columns])
|
|
||||||
|
|
||||||
function submit() {
|
|
||||||
const [f, t] = draft.time === 'custom' ? [draft.from, draft.to] : presetRange(draft.time)
|
|
||||||
setApplied({ ...draft, keyword: draft.keyword.trim(), from: f, to: t })
|
|
||||||
}
|
|
||||||
|
|
||||||
function reset() {
|
|
||||||
setDraft(EMPTY)
|
|
||||||
setApplied(EMPTY)
|
|
||||||
}
|
|
||||||
|
|
||||||
// 去掉某一条生效条件 (即时生效, 不必再点按钮)
|
|
||||||
function dropTag(key) {
|
|
||||||
const nextA = { ...applied }
|
|
||||||
const nextD = { ...draft }
|
|
||||||
if (key === 'keyword') { nextA.keyword = ''; nextD.keyword = '' }
|
|
||||||
if (key === 'columnId') { nextA.columnId = ''; nextD.columnId = '' }
|
|
||||||
if (key === 'time') {
|
|
||||||
nextA.time = 'all'; nextA.from = ''; nextA.to = ''
|
|
||||||
nextD.time = 'all'; nextD.from = ''; nextD.to = ''
|
|
||||||
}
|
|
||||||
setApplied(nextA)
|
|
||||||
setDraft(nextD)
|
|
||||||
}
|
|
||||||
|
|
||||||
async function doRestore(item) {
|
async function doRestore(item) {
|
||||||
try {
|
try {
|
||||||
@@ -144,6 +62,7 @@ export default function ArchivedTasks({ project, visible, onClose, onChanged })
|
|||||||
Toast.show({ content: '已恢复' })
|
Toast.show({ content: '已恢复' })
|
||||||
setItems((prev) => (prev || []).filter((x) => x.id !== item.id))
|
setItems((prev) => (prev || []).filter((x) => x.id !== item.id))
|
||||||
onChanged?.()
|
onChanged?.()
|
||||||
|
load(true)
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
Toast.show({ content: e.message || '恢复失败' })
|
Toast.show({ content: e.message || '恢复失败' })
|
||||||
}
|
}
|
||||||
@@ -152,9 +71,7 @@ export default function ArchivedTasks({ project, visible, onClose, onChanged })
|
|||||||
async function doRemove(item) {
|
async function doRemove(item) {
|
||||||
const subs = item.children?.length || 0
|
const subs = item.children?.length || 0
|
||||||
const ok = await Dialog.confirm({
|
const ok = await Dialog.confirm({
|
||||||
content: subs
|
content: subs ? `彻底删除「${item.title}」？将一并删除 ${subs} 条子任务，不可恢复。` : `彻底删除「${item.title}」？不可恢复。`,
|
||||||
? `彻底删除「${item.title}」？将一并删除 ${subs} 条子任务，不可恢复。`
|
|
||||||
: `彻底删除「${item.title}」？不可恢复。`,
|
|
||||||
confirmText: '删除',
|
confirmText: '删除',
|
||||||
})
|
})
|
||||||
if (!ok) return
|
if (!ok) return
|
||||||
@@ -168,7 +85,8 @@ export default function ArchivedTasks({ project, visible, onClose, onChanged })
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const draftRange = draft.time === 'custom' ? ['', ''] : presetRange(draft.time)
|
const fmt = (iso) => (iso ? iso.slice(0, 10) : '')
|
||||||
|
const colName = (id) => columns.find((c) => c.id === id)?.name || ''
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Popup
|
<Popup
|
||||||
@@ -181,77 +99,43 @@ export default function ArchivedTasks({ project, visible, onClose, onChanged })
|
|||||||
<div className="navbar-sub">
|
<div className="navbar-sub">
|
||||||
<span className="back" onClick={onClose}>‹</span>
|
<span className="back" onClick={onClose}>‹</span>
|
||||||
<span className="title">已归档任务</span>
|
<span className="title">已归档任务</span>
|
||||||
{project?.name ? <span className="arc-proj">{project.name}</span> : null}
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* 筛选卡 */}
|
<div style={{ padding: '12px 14px', display: 'flex', flexDirection: 'column', gap: 8 }}>
|
||||||
<div className="arc-fcard">
|
<Input
|
||||||
<div className="arc-frow">
|
placeholder="搜索任务标题"
|
||||||
<span className="lbl">标题</span>
|
value={filters.keyword}
|
||||||
<span className="ctl">
|
clearable
|
||||||
<span className="arc-kw">
|
onEnter={() => load(true)}
|
||||||
<Input
|
onChange={(v) => setF({ keyword: v })}
|
||||||
placeholder="输入关键词"
|
onBlur={() => load(true)}
|
||||||
value={draft.keyword}
|
/>
|
||||||
clearable
|
<div style={{ display: 'flex', gap: 8 }}>
|
||||||
onChange={(v) => setD({ keyword: v })}
|
<div style={{ flex: 1 }}>
|
||||||
onEnter={submit}
|
<Selector
|
||||||
/>
|
options={[{ label: '全部类型', value: '' }, ...kinds.map((k) => ({ label: k, value: k }))]}
|
||||||
</span>
|
value={[filters.kind]}
|
||||||
</span>
|
onSelect={(_, ext) => { setF({ kind: ext.items[0].value }); setTimeout(() => load(true), 0) }}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<Selector
|
||||||
<div className="arc-frow">
|
options={[{ label: '全部看板列', value: '' }, ...columns.map((c) => ({ label: c.name, value: String(c.id) }))]}
|
||||||
<span className="lbl">看板列</span>
|
value={[filters.columnId]}
|
||||||
<span className="ctl">
|
onSelect={(_, ext) => { setF({ columnId: ext.items[0].value }); setTimeout(() => load(true), 0) }}
|
||||||
<span className="arc-chips">
|
/>
|
||||||
<span
|
<div style={{ display: 'flex', gap: 8, alignItems: 'center', fontSize: 12, color: '#999' }}>
|
||||||
className={'arc-chip' + (draft.columnId === '' ? ' on' : '')}
|
<span>归档</span>
|
||||||
onClick={() => setD({ columnId: '' })}
|
<span className="mini-btn" style={{ padding: '3px 10px' }} onClick={() => setFromVisible(true)}>
|
||||||
>全部</span>
|
{filters.from || '开始日期'}
|
||||||
{columns.map((c) => (
|
|
||||||
<span
|
|
||||||
key={c.id}
|
|
||||||
className={'arc-chip' + (String(draft.columnId) === String(c.id) ? ' on' : '')}
|
|
||||||
onClick={() => setD({ columnId: String(c.id) })}
|
|
||||||
>{c.name}</span>
|
|
||||||
))}
|
|
||||||
</span>
|
|
||||||
</span>
|
</span>
|
||||||
</div>
|
<span>~</span>
|
||||||
|
<span className="mini-btn" style={{ padding: '3px 10px' }} onClick={() => setToVisible(true)}>
|
||||||
<div className="arc-frow">
|
{filters.to || '结束日期'}
|
||||||
<span className="lbl">归档时间</span>
|
|
||||||
<span className="ctl">
|
|
||||||
<span className="arc-chips">
|
|
||||||
{TIME_OPTIONS.map((o) => (
|
|
||||||
<span
|
|
||||||
key={o.key}
|
|
||||||
className={'arc-chip' + (draft.time === o.key ? ' on' : '')}
|
|
||||||
onClick={() => setD({ time: o.key, ...(o.key === 'custom' ? {} : { from: '', to: '' }) })}
|
|
||||||
>{o.label}</span>
|
|
||||||
))}
|
|
||||||
</span>
|
|
||||||
{draft.time === 'custom' && (
|
|
||||||
<span className="arc-range">
|
|
||||||
<span className={'dp' + (draft.from ? ' on' : '')} onClick={() => setFromVisible(true)}>
|
|
||||||
{draft.from || '开始日期'}
|
|
||||||
</span>
|
|
||||||
<span className="sep">~</span>
|
|
||||||
<span className={'dp' + (draft.to ? ' on' : '')} onClick={() => setToVisible(true)}>
|
|
||||||
{draft.to || '结束日期'}
|
|
||||||
</span>
|
|
||||||
</span>
|
|
||||||
)}
|
|
||||||
{draftRange[0] && <div className="arc-hint">{draftRange[0]} ~ {draftRange[1]}</div>}
|
|
||||||
</span>
|
</span>
|
||||||
</div>
|
{(filters.from || filters.to) && (
|
||||||
|
<span className="link" onClick={() => { setF({ from: '', to: '' }); setTimeout(() => load(true), 0) }}>清除</span>
|
||||||
<div className="arc-actions">
|
)}
|
||||||
<button type="button" className="arc-btn ghost" onClick={reset}>重置</button>
|
|
||||||
<button type="button" className="arc-btn primary" onClick={submit}>
|
|
||||||
筛选{activeCount ? <span className="badge">{activeCount}</span> : null}
|
|
||||||
</button>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -259,72 +143,61 @@ export default function ArchivedTasks({ project, visible, onClose, onChanged })
|
|||||||
visible={fromVisible}
|
visible={fromVisible}
|
||||||
onClose={() => setFromVisible(false)}
|
onClose={() => setFromVisible(false)}
|
||||||
precision="day"
|
precision="day"
|
||||||
onConfirm={(d) => { setD({ from: fmtDate(d) }); setFromVisible(false) }}
|
onConfirm={(d) => {
|
||||||
|
const p = (n) => String(n).padStart(2, '0')
|
||||||
|
setF({ from: `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())}` })
|
||||||
|
setFromVisible(false)
|
||||||
|
setTimeout(() => load(true), 0)
|
||||||
|
}}
|
||||||
/>
|
/>
|
||||||
<DatePicker
|
<DatePicker
|
||||||
visible={toVisible}
|
visible={toVisible}
|
||||||
onClose={() => setToVisible(false)}
|
onClose={() => setToVisible(false)}
|
||||||
precision="day"
|
precision="day"
|
||||||
onConfirm={(d) => { setD({ to: fmtDate(d) }); setToVisible(false) }}
|
onConfirm={(d) => {
|
||||||
|
const p = (n) => String(n).padStart(2, '0')
|
||||||
|
setF({ to: `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())}` })
|
||||||
|
setToVisible(false)
|
||||||
|
setTimeout(() => load(true), 0)
|
||||||
|
}}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
{/* 已应用条件 (可单独撤销) */}
|
<div style={{ padding: '0 14px 24px', display: 'flex', flexDirection: 'column', gap: 7 }}>
|
||||||
{appliedTags.length > 0 && (
|
{items === null && loading && <div style={{ textAlign: 'center', padding: 30 }}><DotLoading /> 加载中...</div>}
|
||||||
<div className="arc-applied">
|
|
||||||
{appliedTags.map((t) => (
|
|
||||||
<span key={t.key} className="tag">
|
|
||||||
{t.text}
|
|
||||||
<span className="x" onClick={() => dropTag(t.key)}>✕</span>
|
|
||||||
</span>
|
|
||||||
))}
|
|
||||||
<span className="cnt">共 {items?.length || 0} 条</span>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
<div className="arc-list">
|
|
||||||
{items === null && loading && (
|
|
||||||
<div className="arc-empty"><DotLoading /> 加载中…</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{items !== null && items.length === 0 && !loading && (
|
{items !== null && items.length === 0 && !loading && (
|
||||||
appliedTags.length === 0 ? (
|
<div style={{ textAlign: 'center', color: '#b8bcc4', padding: 40 }}>没有符合条件的归档任务</div>
|
||||||
<div className="arc-empty">
|
|
||||||
<div className="ico">📭</div>
|
|
||||||
这个项目还没有归档任务
|
|
||||||
<div className="sub">任务完成后可在它的 ⋯ 菜单里归档</div>
|
|
||||||
</div>
|
|
||||||
) : (
|
|
||||||
<div className="arc-empty">
|
|
||||||
<div className="ico">🗂</div>
|
|
||||||
没有符合条件的归档任务
|
|
||||||
<div className="sub">试试放宽时间范围或清空关键词</div>
|
|
||||||
</div>
|
|
||||||
)
|
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{(items || []).map((t) => (
|
{(items || []).map((t) => (
|
||||||
<div key={t.id} className="arc-item">
|
<div
|
||||||
<div className="top">
|
key={t.id}
|
||||||
<div className="ttl">{t.title}</div>
|
style={{
|
||||||
{t.number != null && <span className="num-tag">#{t.number}</span>}
|
background: '#fff', borderRadius: 9, padding: '10px 12px', display: 'flex', gap: 10, alignItems: 'flex-start',
|
||||||
|
boxShadow: '0 1px 2px rgba(0,0,0,.04)',
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<div style={{ flex: 1, minWidth: 0 }}>
|
||||||
|
<div style={{ fontSize: 13.5, fontWeight: 600, wordBreak: 'break-word' }}>{t.title}</div>
|
||||||
|
<div style={{ fontSize: 10.5, color: '#999', marginTop: 4, display: 'flex', gap: 6, alignItems: 'center', flexWrap: 'wrap' }}>
|
||||||
|
{t.kind && <span className="kind-tag" style={{ background: kindColor(t.kind) }}>{t.kind}</span>}
|
||||||
|
<span>{colName(t.columnId)}</span>
|
||||||
|
<span>归档于 {fmt(t.archivedAt)}</span>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div className="meta">
|
<div style={{ display: 'flex', flexDirection: 'column', gap: 5, flexShrink: 0 }}>
|
||||||
{t.kind && (
|
<Button size="mini" color="primary" fill="outline" onClick={() => doRestore(t)}>恢复</Button>
|
||||||
<span className="kind-tag" style={{ background: kindColor(t.kind) }}>{t.kind}</span>
|
<Button size="mini" color="danger" fill="none" onClick={() => doRemove(t)}>删除</Button>
|
||||||
)}
|
|
||||||
{colName(t.columnId) && <span className="col">{colName(t.columnId)}</span>}
|
|
||||||
<span className="dot" />
|
|
||||||
<span>归档于 {fmt(t.archivedAt)}</span>
|
|
||||||
</div>
|
|
||||||
<div className="acts">
|
|
||||||
<span className="mini" onClick={() => doRestore(t)}>恢复</span>
|
|
||||||
<span className="mini danger" onClick={() => doRemove(t)}>删除</span>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
))}
|
))}
|
||||||
|
|
||||||
{nextCursor && (
|
{nextCursor && (
|
||||||
<Button block fill="outline" size="small" loading={loading} onClick={() => load(false)}>
|
<Button
|
||||||
|
block
|
||||||
|
fill="outline"
|
||||||
|
size="small"
|
||||||
|
loading={loading}
|
||||||
|
onClick={() => load(false)}
|
||||||
|
style={{ marginTop: 4 }}
|
||||||
|
>
|
||||||
加载更多
|
加载更多
|
||||||
</Button>
|
</Button>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -36,15 +36,10 @@ function ScrollBody({ children }) {
|
|||||||
// 横向滚列; 列内独立纵向滚动, 列头固定, 滚动时右缘显示滚动条
|
// 横向滚列; 列内独立纵向滚动, 列头固定, 滚动时右缘显示滚动条
|
||||||
// 不做"拖到卡片上转子任务" —— 统一走详情页「转为子任务」
|
// 不做"拖到卡片上转子任务" —— 统一走详情页「转为子任务」
|
||||||
export default function BoardView({
|
export default function BoardView({
|
||||||
tasks, columns, onMoveColumn, onOpen, onToggleSub, onToggle, onMore, onQuickAdd, onDragActiveChange,
|
tasks, columns, codePrefix, onMoveColumn, onOpen, onToggleSub, onToggle, onMore, onQuickAdd,
|
||||||
}) {
|
}) {
|
||||||
const drag = useColumnDrag({ onDrop: onMoveColumn })
|
const drag = useColumnDrag({ onDrop: onMoveColumn })
|
||||||
|
|
||||||
// 把"是否正在拖拽"上报给容器: 拖拽期间收到远端变更时, 容器会延后刷新,
|
|
||||||
// 避免卡片在手中跳位 (见 docs/V0.2/离线编辑模块/即时同步方案.md §4.4)
|
|
||||||
const dragging = !!drag.dragTask
|
|
||||||
useEffect(() => { onDragActiveChange?.(dragging) }, [dragging, onDragActiveChange])
|
|
||||||
|
|
||||||
const ordered = [...(columns || [])].sort((a, b) => a.sortOrder - b.sortOrder)
|
const ordered = [...(columns || [])].sort((a, b) => a.sortOrder - b.sortOrder)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@@ -74,6 +69,7 @@ export default function BoardView({
|
|||||||
<TaskCard
|
<TaskCard
|
||||||
key={t.id}
|
key={t.id}
|
||||||
task={t}
|
task={t}
|
||||||
|
codePrefix={codePrefix}
|
||||||
dragging={drag.dragTask?.id === t.id}
|
dragging={drag.dragTask?.id === t.id}
|
||||||
bindDrag={drag.bind}
|
bindDrag={drag.bind}
|
||||||
onClick={() => { if (!drag.dragTask && !drag.justEnded()) onOpen?.(t) }}
|
onClick={() => { if (!drag.dragTask && !drag.justEnded()) onOpen?.(t) }}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { useEffect, useState } from 'react'
|
import { useState } from 'react'
|
||||||
import TaskRow from '../../components/task/TaskRow.jsx'
|
import TaskRow from '../../components/task/TaskRow.jsx'
|
||||||
import useRowDrag from '../../components/task/useRowDrag.js'
|
import useRowDrag from '../../components/task/useRowDrag.js'
|
||||||
|
|
||||||
@@ -7,15 +7,11 @@ import useRowDrag from '../../components/task/useRowDrag.js'
|
|||||||
// 换列: 行/把手拖动, 跟手浮层, 手指划到哪个分组松手就落到哪 (与看板一致)
|
// 换列: 行/把手拖动, 跟手浮层, 手指划到哪个分组松手就落到哪 (与看板一致)
|
||||||
// (列表只展示有任务的列, 空列需到看板视图拖入)
|
// (列表只展示有任务的列, 空列需到看板视图拖入)
|
||||||
export default function ListView({
|
export default function ListView({
|
||||||
tasks, columns, onToggle, onOpen, onMore, onMoveColumn, onReorder, onDragActiveChange,
|
tasks, columns, codePrefix, onToggle, onOpen, onMore, onMoveColumn, onReorder,
|
||||||
}) {
|
}) {
|
||||||
const [collapsed, setCollapsed] = useState({})
|
const [collapsed, setCollapsed] = useState({})
|
||||||
const drag = useRowDrag({ columns, onDrop: onMoveColumn, onReorder })
|
const drag = useRowDrag({ columns, onDrop: onMoveColumn, onReorder })
|
||||||
|
|
||||||
// 拖拽期间延后远端变更触发的刷新, 避免行在手中跳位
|
|
||||||
const dragging = !!drag.drag
|
|
||||||
useEffect(() => { onDragActiveChange?.(dragging) }, [dragging, onDragActiveChange])
|
|
||||||
|
|
||||||
if (!tasks || tasks.length === 0) {
|
if (!tasks || tasks.length === 0) {
|
||||||
return (
|
return (
|
||||||
<div className="empty" style={{ paddingTop: 90 }}>
|
<div className="empty" style={{ paddingTop: 90 }}>
|
||||||
@@ -53,6 +49,7 @@ export default function ListView({
|
|||||||
<div key={t.id}>
|
<div key={t.id}>
|
||||||
<TaskRow
|
<TaskRow
|
||||||
task={t}
|
task={t}
|
||||||
|
codePrefix={codePrefix}
|
||||||
onToggle={onToggle}
|
onToggle={onToggle}
|
||||||
onClick={() => { if (!drag.justEnded()) onOpen(t) }}
|
onClick={() => { if (!drag.justEnded()) onOpen(t) }}
|
||||||
onMore={onMore}
|
onMore={onMore}
|
||||||
|
|||||||
@@ -1,10 +1,7 @@
|
|||||||
import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
|
import { useCallback, useEffect, useMemo, useState } from 'react'
|
||||||
import { ActionSheet, Dialog, DotLoading, Toast } from 'antd-mobile'
|
import { ActionSheet, Dialog, DotLoading, Toast } from 'antd-mobile'
|
||||||
import { projectApi, taskApi, TASK_TABLES } from '../../api/task.js'
|
import { projectApi, taskApi } from '../../api/task.js'
|
||||||
import useDbSignal from '../../lib/powersync/useDbSignal.js'
|
|
||||||
import useRefreshOnVisible from '../../hooks/useRefreshOnVisible.js'
|
|
||||||
import { filterVisible, msToNextBoundary } from './date.js'
|
import { filterVisible, msToNextBoundary } from './date.js'
|
||||||
import { sameId } from './ids.js'
|
|
||||||
import { getViewMode, setViewMode } from './prefs.js'
|
import { getViewMode, setViewMode } from './prefs.js'
|
||||||
import { parseTimePrefix, splitTitle } from './quickAdd.js'
|
import { parseTimePrefix, splitTitle } from './quickAdd.js'
|
||||||
import ListView from './ListView.jsx'
|
import ListView from './ListView.jsx'
|
||||||
@@ -42,28 +39,6 @@ export default function ProjectView({ projectId, onProjectChanged, onProjectExit
|
|||||||
|
|
||||||
useEffect(() => { setTasks(null); load() }, [load])
|
useEffect(() => { setTasks(null); load() }, [load])
|
||||||
|
|
||||||
// ---- 即时同步 (docs/V0.2/离线编辑模块/即时同步方案.md) ----
|
|
||||||
// 任务域任一相关表在本地库变化 -> 重算。变化来源既包括本端写入, 也包括
|
|
||||||
// PowerSync 从其它端推下来的改动, 所以跨端状态无需切页面即可刷新。
|
|
||||||
const draggingRef = useRef(false)
|
|
||||||
const pendingRef = useRef(false) // 拖拽期间收到的变更, 松手后补一次
|
|
||||||
const onDragActiveChange = useCallback((active) => {
|
|
||||||
draggingRef.current = active
|
|
||||||
if (!active && pendingRef.current) {
|
|
||||||
pendingRef.current = false
|
|
||||||
load()
|
|
||||||
}
|
|
||||||
}, [load])
|
|
||||||
|
|
||||||
useDbSignal(TASK_TABLES, () => {
|
|
||||||
// 拖拽中不刷新: 否则卡片会在手指下跳位
|
|
||||||
if (draggingRef.current) { pendingRef.current = true; return }
|
|
||||||
load()
|
|
||||||
})
|
|
||||||
|
|
||||||
// 兜底: 应用回到前台/窗口聚焦时补一次 (WebView 在后台可能节流订阅回调)
|
|
||||||
useRefreshOnVisible(() => { if (!draggingRef.current) load() })
|
|
||||||
|
|
||||||
// 切换视图并记忆 (T-VW-02/03/06)
|
// 切换视图并记忆 (T-VW-02/03/06)
|
||||||
const switchMode = (next) => {
|
const switchMode = (next) => {
|
||||||
setMode(next)
|
setMode(next)
|
||||||
@@ -96,13 +71,6 @@ export default function ProjectView({ projectId, onProjectChanged, onProjectExit
|
|||||||
|
|
||||||
const replaceTask = (fresh) => setTasks((prev) => (prev || []).map((t) => (t.id === fresh.id ? fresh : t)))
|
const replaceTask = (fresh) => setTasks((prev) => (prev || []).map((t) => (t.id === fresh.id ? fresh : t)))
|
||||||
|
|
||||||
/** 详情页保存后: 先就地替换该行, 再回源刷新 (不回源也能立刻看到编号/列变更) */
|
|
||||||
const handleSaved = (fresh) => {
|
|
||||||
if (fresh?.id) replaceTask(fresh)
|
|
||||||
setOpenTask(null)
|
|
||||||
load()
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 更新任务(列/状态/字段), 服务端裁决后以返回值为准 */
|
/** 更新任务(列/状态/字段), 服务端裁决后以返回值为准 */
|
||||||
async function updateTask(id, patch) {
|
async function updateTask(id, patch) {
|
||||||
const snapshot = tasks
|
const snapshot = tasks
|
||||||
@@ -125,12 +93,10 @@ export default function ProjectView({ projectId, onProjectChanged, onProjectExit
|
|||||||
|
|
||||||
/** 拖拽换列 (T-BD-04/07) */
|
/** 拖拽换列 (T-BD-04/07) */
|
||||||
const moveToColumn = async (task, columnId) => {
|
const moveToColumn = async (task, columnId) => {
|
||||||
// columnId 来自拖动落点 (uuid 字符串); 空值直接忽略, 不要把坏 id 写进本地库
|
const col = columns.find((c) => c.id === columnId)
|
||||||
if (columnId === null || columnId === undefined || columnId === '') return
|
|
||||||
const col = columns.find((c) => sameId(c.id, columnId))
|
|
||||||
try {
|
try {
|
||||||
await updateTask(task.id, { columnId })
|
await updateTask(task.id, { columnId })
|
||||||
const target = columns.find((c) => sameId(c.id, columnId))
|
const target = columns.find((c) => c.id === columnId)
|
||||||
if (target?.boundStatus && target.boundStatus !== task.status) {
|
if (target?.boundStatus && target.boundStatus !== task.status) {
|
||||||
Toast.show({ content: `已移入 ${col?.name}，状态改为「${target.boundStatus === 'done' ? '完成' : target.boundStatus === 'doing' ? '执行中' : '未开始'}」` })
|
Toast.show({ content: `已移入 ${col?.name}，状态改为「${target.boundStatus === 'done' ? '完成' : target.boundStatus === 'doing' ? '执行中' : '未开始'}」` })
|
||||||
} else {
|
} else {
|
||||||
@@ -143,11 +109,11 @@ export default function ProjectView({ projectId, onProjectChanged, onProjectExit
|
|||||||
const reorderTask = async (task, targetId, after) => {
|
const reorderTask = async (task, targetId, after) => {
|
||||||
const snapshot = tasks
|
const snapshot = tasks
|
||||||
const orderedCols = [...(columns || [])].sort((a, b) => a.sortOrder - b.sortOrder)
|
const orderedCols = [...(columns || [])].sort((a, b) => a.sortOrder - b.sortOrder)
|
||||||
const groups = orderedCols.map((c) => (tasks || []).filter((t) => sameId(t.columnId, c.id))).filter((l) => l.length)
|
const groups = orderedCols.map((c) => (tasks || []).filter((t) => t.columnId === c.id)).filter((l) => l.length)
|
||||||
const g = groups.find((l) => l.some((t) => sameId(t.id, task.id)))
|
const g = groups.find((l) => l.some((t) => t.id === task.id))
|
||||||
if (!g) return
|
if (!g) return
|
||||||
const rest = g.filter((t) => !sameId(t.id, task.id))
|
const rest = g.filter((t) => t.id !== task.id)
|
||||||
const ti = rest.findIndex((t) => sameId(t.id, targetId))
|
const ti = rest.findIndex((t) => t.id === targetId)
|
||||||
if (ti < 0) return
|
if (ti < 0) return
|
||||||
rest.splice(after ? ti + 1 : ti, 0, task)
|
rest.splice(after ? ti + 1 : ti, 0, task)
|
||||||
const flat = groups.map((l) => (l === g ? rest : l)).flat()
|
const flat = groups.map((l) => (l === g ? rest : l)).flat()
|
||||||
@@ -170,9 +136,9 @@ export default function ProjectView({ projectId, onProjectChanged, onProjectExit
|
|||||||
const changeStatus = async (task, status) => {
|
const changeStatus = async (task, status) => {
|
||||||
try {
|
try {
|
||||||
const fresh = await updateTask(task.id, { status })
|
const fresh = await updateTask(task.id, { status })
|
||||||
const moved = fresh && !sameId(fresh.columnId, task.columnId)
|
const moved = fresh && fresh.columnId !== task.columnId
|
||||||
if (moved) {
|
if (moved) {
|
||||||
const col = columns.find((c) => sameId(c.id, fresh.columnId))
|
const col = columns.find((c) => c.id === fresh.columnId)
|
||||||
Toast.show({ content: `已移至 ${col?.name || '目标列'}` })
|
Toast.show({ content: `已移至 ${col?.name || '目标列'}` })
|
||||||
}
|
}
|
||||||
} catch { /* ignore */ }
|
} catch { /* ignore */ }
|
||||||
@@ -310,23 +276,23 @@ export default function ProjectView({ projectId, onProjectChanged, onProjectExit
|
|||||||
<ListView
|
<ListView
|
||||||
tasks={visibleTasks}
|
tasks={visibleTasks}
|
||||||
columns={columns}
|
columns={columns}
|
||||||
|
codePrefix={project?.code}
|
||||||
onToggle={toggleDone}
|
onToggle={toggleDone}
|
||||||
onOpen={(t) => setOpenTask(t)}
|
onOpen={(t) => setOpenTask(t)}
|
||||||
onMore={openTaskMenu}
|
onMore={openTaskMenu}
|
||||||
onMoveColumn={moveToColumn}
|
onMoveColumn={moveToColumn}
|
||||||
onReorder={reorderTask}
|
onReorder={reorderTask}
|
||||||
onDragActiveChange={onDragActiveChange}
|
|
||||||
/>
|
/>
|
||||||
) : (
|
) : (
|
||||||
<BoardView
|
<BoardView
|
||||||
tasks={visibleTasks}
|
tasks={visibleTasks}
|
||||||
columns={columns}
|
columns={columns}
|
||||||
|
codePrefix={project?.code}
|
||||||
onMoveColumn={moveToColumn}
|
onMoveColumn={moveToColumn}
|
||||||
onOpen={(t) => setOpenTask(t)}
|
onOpen={(t) => setOpenTask(t)}
|
||||||
onToggleSub={(c) => toggleDone(c)}
|
onToggleSub={(c) => toggleDone(c)}
|
||||||
onToggle={(t) => toggleDone(t)}
|
onToggle={(t) => toggleDone(t)}
|
||||||
onMore={openTaskMenu}
|
onMore={openTaskMenu}
|
||||||
onDragActiveChange={onDragActiveChange}
|
|
||||||
onQuickAdd={() => { setAdding(true) }}
|
onQuickAdd={() => { setAdding(true) }}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
@@ -335,13 +301,12 @@ export default function ProjectView({ projectId, onProjectChanged, onProjectExit
|
|||||||
{openTask && (
|
{openTask && (
|
||||||
<TaskDetail
|
<TaskDetail
|
||||||
task={openTask}
|
task={openTask}
|
||||||
projectCode={project.code}
|
|
||||||
columns={columns}
|
columns={columns}
|
||||||
members={project.members || []}
|
members={project.members || []}
|
||||||
tasks={tasks || []}
|
tasks={tasks || []}
|
||||||
taskKinds={project.taskKinds}
|
taskKinds={project.taskKinds}
|
||||||
onClose={() => setOpenTask(null)}
|
onClose={() => setOpenTask(null)}
|
||||||
onSaved={handleSaved}
|
onSaved={() => { setOpenTask(null); load() }}
|
||||||
onChanged={load}
|
onChanged={load}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user