Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| fb87ae4de9 | |||
| d8826152c6 |
@@ -0,0 +1,5 @@
|
||||
# v0.1.42 · 回放预缓冲调整
|
||||
|
||||
- 允许有限录像片段提前完成转换,减少逐秒限速造成的播放器缓冲等待。
|
||||
- 继续使用最多 5 分钟的分段播放、自动续播、两路转换并发、单线程处理及有界临时缓存。
|
||||
- 保留家谱全屏稳定性修复、30 天录像保留上限、磁盘容量保护和长暂停后的原位置恢复。
|
||||
@@ -0,0 +1,28 @@
|
||||
# v0.1.43 · 本地图表与五代维护边界
|
||||
|
||||
## 界面与图表
|
||||
|
||||
- Vue 页面统一使用本地 Bootstrap 5.3.8;新增本地 Apache ECharts 6.1.0,生产页面不依赖远程 CDN、字体或地图资源。
|
||||
- 首页展示已授权场所、设备及区域数量,以及空间分布和各场所设备柱图。场所总览展示设备类型和网络接入方式;不推算没有数据依据的在线率或历史趋势。
|
||||
- 平台总拓扑仅展示已授权家庭、办公与工厂;场所内部网络图根据已登记上级关系生成,支持平移、缩放、重置及点击进入设备档案。详情列表保留键盘操作入口。
|
||||
- 图表按需加载、离开页面释放,相同数据刷新不重新布局。手机首页默认收起详细统计,可展开;表单、卡片和导航沿用 Bootstrap 响应式布局。
|
||||
- 视频与家谱等既有业务控制器保留兼容层,避免重建播放节点;本版没有宣称全部业务已改为 Vue 状态管理。
|
||||
|
||||
## 族谱维护权限
|
||||
|
||||
- 所有角色(包括超级管理员)均以账号关联的本人为准,只能维护本人及上下各五代以内的已连接亲属资料。
|
||||
- 例如第 32 代可维护第 27 至第 37 代,第 26、38 代及第 5 代不能修改;原有查看权限不变,不截断远代人物。
|
||||
- 人物、亲属关系、关联人物记事、归档和历史恢复统一经后端范围检查。切换查看参照人物不改变维护范围。
|
||||
- 本人关联设置后固定;不允许通过解除关联、更换本人、断开再重接世系或改变已确认代际位置扩大维护范围。代际冲突时暂停维护。
|
||||
- 没有关联本人的账号先关联已有本人人物;本人尚未录入时,可建立自己的档案并绑定。其他新增人物须关联可维护亲属,人物与关系原子保存,超出第六代时不会留下孤立人物。
|
||||
- 平台账号与各家庭成员结构的全面重构不在本次发布内。
|
||||
|
||||
## 验证
|
||||
|
||||
- 后端 190 项测试、前端 154 项测试通过。
|
||||
- Edge 本机测试:第五代边界编辑保存、远代只读、变更参照人物不扩权、ECharts 渲染及节点进入设备、390 像素手机显示。
|
||||
- 本地开发数据与生产资料分离,未替用户指定或更换真实人物关联。
|
||||
|
||||
## 发布
|
||||
|
||||
部署前创建一致性数据库备份;原子切换版本,仅重启 Web 服务,保留视频服务。无数据库结构迁移。
|
||||
@@ -0,0 +1,43 @@
|
||||
"""Generation-based write boundaries. Viewing and role grants are separate."""
|
||||
from collections import deque
|
||||
|
||||
LIMIT = 5
|
||||
|
||||
|
||||
def generations(people, links, self_id):
|
||||
ids = {p['id'] for p in people}
|
||||
if self_id not in ids:
|
||||
return {}, False
|
||||
graph = {key: [] for key in ids}
|
||||
for edge in links:
|
||||
a, b = edge.get('fromId'), edge.get('toId')
|
||||
if not edge.get('active') or a not in ids or b not in ids:
|
||||
continue
|
||||
delta = 1 if edge.get('kind') == 'parent' else 0
|
||||
if edge.get('kind') not in ('parent', 'spouse'):
|
||||
continue
|
||||
graph[a].append((b, delta))
|
||||
graph[b].append((a, -delta))
|
||||
levels, pending, conflict = {self_id: 0}, deque([self_id]), False
|
||||
while pending:
|
||||
current = pending.popleft()
|
||||
for other, delta in graph[current]:
|
||||
level = levels[current] + delta
|
||||
if other in levels:
|
||||
conflict |= levels[other] != level
|
||||
else:
|
||||
levels[other] = level
|
||||
pending.append(other)
|
||||
return levels, conflict
|
||||
|
||||
|
||||
def within(levels, person_id):
|
||||
return person_id in levels and abs(levels[person_id]) <= LIMIT
|
||||
|
||||
|
||||
def targets(kind, item):
|
||||
if kind == 'person':
|
||||
return [item['id']]
|
||||
if kind == 'link':
|
||||
return [item['fromId'], item['toId']]
|
||||
return item.get('personIds', [])
|
||||
+5
-1
@@ -1,6 +1,6 @@
|
||||
# 赵府 Vue 前端
|
||||
|
||||
Vue 3 + Vite + Bootstrap 5。Python 服务提供 API 和本地静态资源;生产主机无需安装 Node。
|
||||
Vue 3 + Vite + Bootstrap 5 + Apache ECharts。Python 服务提供 API 和本地静态资源;生产主机无需安装 Node。
|
||||
|
||||
## 构建
|
||||
|
||||
@@ -19,12 +19,16 @@ pnpm --dir frontend build
|
||||
- `HomeExplorer`:账号独立的卡片布局、分页、排序及场所总拓扑。
|
||||
- `DeviceCollection`、`NetworkMap`:同一设备目录的卡片和拓扑视图。
|
||||
- `NetworkStatus`:授权设备的实时网络检查与后台入口,清理定时器并丢弃过期响应。
|
||||
- `LocalChart`、`HomeInsights`、`ScopeInsights`:本地 ECharts 场所及设备统计;按需加载,关闭页面释放实例,相同数据刷新不重排。手机首页默认收起详细统计。
|
||||
- `NetworkDiagram`:固定坐标网络图,支持平移、缩放和点击设备;下方详情提供键盘及读屏操作。平台总拓扑与设备拓扑只使用当前账号已授权数据,不虚构在线率或历史曲线。
|
||||
- `Workspace`、`RuntimeOverlays`:现有业务页面与表单模板。
|
||||
- `composables/bridge.js`、`web/vue-bridge.js`:Vue 与现有业务控制器的状态边界。
|
||||
- `compat/scripts.json`:旧业务控制器依赖顺序,按顺序加载。视频播放器、家谱、记事等复杂交互暂时保留原控制器;尚未全部迁为 Vue 状态管理。
|
||||
|
||||
Vue 管理家庭卡片、设备列表、网络拓扑的 DOM;旧控制器只发布数据,不再覆盖这些容器。表单及播放器的兼容容器由原控制器管理,Vue 不重建其内部节点,避免轮询时重建视频。`web/index.html` 已移除,模板以 Vue 组件为准。
|
||||
|
||||
ECharts 使用 npm 包按需打包饼图、柱图、关系图和 Canvas 渲染器。生产 `/ui/assets/` 内包含全部框架、样式和图表代码;没有远程 CDN、远程字体或地图服务依赖。外部媒体与设备后台链接仍按业务配置访问。原有播放器和家谱关系图保留现有控制器。许可证及 NOTICE 收录于 `THIRD-PARTY-LICENSES.txt`。
|
||||
|
||||
## 网络状态
|
||||
|
||||
`GET /api/devices/network?source=device|camera|recorder&id=...` 只允许当前家庭管理员与超级管理员检查本归属下的已登记设备。端口探测与 Tailscale 节点状态分别显示,30 秒缓存、并发限制;用户输入不能指定任意检查目标。只连接 TCP 端口,不修改设备、不发送登录密码。
|
||||
|
||||
@@ -44,3 +44,279 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
THE SOFTWARE.
|
||||
|
||||
|
||||
echarts
|
||||
|
||||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
|
||||
1. Definitions.
|
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction,
|
||||
and distribution as defined by Sections 1 through 9 of this document.
|
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by
|
||||
the copyright owner that is granting the License.
|
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all
|
||||
other entities that control, are controlled by, or are under common
|
||||
control with that entity. For the purposes of this definition,
|
||||
"control" means (i) the power, direct or indirect, to cause the
|
||||
direction or management of such entity, whether by contract or
|
||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity
|
||||
exercising permissions granted by this License.
|
||||
|
||||
"Source" form shall mean the preferred form for making modifications,
|
||||
including but not limited to software source code, documentation
|
||||
source, and configuration files.
|
||||
|
||||
"Object" form shall mean any form resulting from mechanical
|
||||
transformation or translation of a Source form, including but
|
||||
not limited to compiled object code, generated documentation,
|
||||
and conversions to other media types.
|
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or
|
||||
Object form, made available under the License, as indicated by a
|
||||
copyright notice that is included in or attached to the work
|
||||
(an example is provided in the Appendix below).
|
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object
|
||||
form, that is based on (or derived from) the Work and for which the
|
||||
editorial revisions, annotations, elaborations, or other modifications
|
||||
represent, as a whole, an original work of authorship. For the purposes
|
||||
of this License, Derivative Works shall not include works that remain
|
||||
separable from, or merely link (or bind by name) to the interfaces of,
|
||||
the Work and Derivative Works thereof.
|
||||
|
||||
"Contribution" shall mean any work of authorship, including
|
||||
the original version of the Work and any modifications or additions
|
||||
to that Work or Derivative Works thereof, that is intentionally
|
||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||
or by an individual or Legal Entity authorized to submit on behalf of
|
||||
the copyright owner. For the purposes of this definition, "submitted"
|
||||
means any form of electronic, verbal, or written communication sent
|
||||
to the Licensor or its representatives, including but not limited to
|
||||
communication on electronic mailing lists, source code control systems,
|
||||
and issue tracking systems that are managed by, or on behalf of, the
|
||||
Licensor for the purpose of discussing and improving the Work, but
|
||||
excluding communication that is conspicuously marked or otherwise
|
||||
designated in writing by the copyright owner as "Not a Contribution."
|
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||
on behalf of whom a Contribution has been received by Licensor and
|
||||
subsequently incorporated within the Work.
|
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
copyright license to reproduce, prepare Derivative Works of,
|
||||
publicly display, publicly perform, sublicense, and distribute the
|
||||
Work and such Derivative Works in Source or Object form.
|
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
(except as stated in this section) patent license to make, have made,
|
||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||
where such license applies only to those patent claims licensable
|
||||
by such Contributor that are necessarily infringed by their
|
||||
Contribution(s) alone or by combination of their Contribution(s)
|
||||
with the Work to which such Contribution(s) was submitted. If You
|
||||
institute patent litigation against any entity (including a
|
||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||
or a Contribution incorporated within the Work constitutes direct
|
||||
or contributory patent infringement, then any patent licenses
|
||||
granted to You under this License for that Work shall terminate
|
||||
as of the date such litigation is filed.
|
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the
|
||||
Work or Derivative Works thereof in any medium, with or without
|
||||
modifications, and in Source or Object form, provided that You
|
||||
meet the following conditions:
|
||||
|
||||
(a) You must give any other recipients of the Work or
|
||||
Derivative Works a copy of this License; and
|
||||
|
||||
(b) You must cause any modified files to carry prominent notices
|
||||
stating that You changed the files; and
|
||||
|
||||
(c) You must retain, in the Source form of any Derivative Works
|
||||
that You distribute, all copyright, patent, trademark, and
|
||||
attribution notices from the Source form of the Work,
|
||||
excluding those notices that do not pertain to any part of
|
||||
the Derivative Works; and
|
||||
|
||||
(d) If the Work includes a "NOTICE" text file as part of its
|
||||
distribution, then any Derivative Works that You distribute must
|
||||
include a readable copy of the attribution notices contained
|
||||
within such NOTICE file, excluding those notices that do not
|
||||
pertain to any part of the Derivative Works, in at least one
|
||||
of the following places: within a NOTICE text file distributed
|
||||
as part of the Derivative Works; within the Source form or
|
||||
documentation, if provided along with the Derivative Works; or,
|
||||
within a display generated by the Derivative Works, if and
|
||||
wherever such third-party notices normally appear. The contents
|
||||
of the NOTICE file are for informational purposes only and
|
||||
do not modify the License. You may add Your own attribution
|
||||
notices within Derivative Works that You distribute, alongside
|
||||
or as an addendum to the NOTICE text from the Work, provided
|
||||
that such additional attribution notices cannot be construed
|
||||
as modifying the License.
|
||||
|
||||
You may add Your own copyright statement to Your modifications and
|
||||
may provide additional or different license terms and conditions
|
||||
for use, reproduction, or distribution of Your modifications, or
|
||||
for any such Derivative Works as a whole, provided Your use,
|
||||
reproduction, and distribution of the Work otherwise complies with
|
||||
the conditions stated in this License.
|
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||
any Contribution intentionally submitted for inclusion in the Work
|
||||
by You to the Licensor shall be under the terms and conditions of
|
||||
this License, without any additional terms or conditions.
|
||||
Notwithstanding the above, nothing herein shall supersede or modify
|
||||
the terms of any separate license agreement you may have executed
|
||||
with Licensor regarding such Contributions.
|
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade
|
||||
names, trademarks, service marks, or product names of the Licensor,
|
||||
except as required for reasonable and customary use in describing the
|
||||
origin of the Work and reproducing the content of the NOTICE file.
|
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||
agreed to in writing, Licensor provides the Work (and each
|
||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
implied, including, without limitation, any warranties or conditions
|
||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||
appropriateness of using or redistributing the Work and assume any
|
||||
risks associated with Your exercise of permissions under this License.
|
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory,
|
||||
whether in tort (including negligence), contract, or otherwise,
|
||||
unless required by applicable law (such as deliberate and grossly
|
||||
negligent acts) or agreed to in writing, shall any Contributor be
|
||||
liable to You for damages, including any direct, indirect, special,
|
||||
incidental, or consequential damages of any character arising as a
|
||||
result of this License or out of the use or inability to use the
|
||||
Work (including but not limited to damages for loss of goodwill,
|
||||
work stoppage, computer failure or malfunction, or any and all
|
||||
other commercial damages or losses), even if such Contributor
|
||||
has been advised of the possibility of such damages.
|
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing
|
||||
the Work or Derivative Works thereof, You may choose to offer,
|
||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||
or other liability obligations and/or rights consistent with this
|
||||
License. However, in accepting such obligations, You may act only
|
||||
on Your own behalf and on Your sole responsibility, not on behalf
|
||||
of any other Contributor, and only if You agree to indemnify,
|
||||
defend, and hold each Contributor harmless for any liability
|
||||
incurred by, or claims asserted against, such Contributor by reason
|
||||
of your accepting any such warranty or additional liability.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
APPENDIX: How to apply the Apache License to your work.
|
||||
|
||||
To apply the Apache License to your work, attach the following
|
||||
boilerplate notice, with the fields enclosed by brackets "[]"
|
||||
replaced with your own identifying information. (Don't include
|
||||
the brackets!) The text should be enclosed in the appropriate
|
||||
comment syntax for the file format. We also recommend that a
|
||||
file or class name and description of purpose be included on the
|
||||
same "printed page" as the copyright notice for easier
|
||||
identification within third-party archives.
|
||||
|
||||
Copyright [yyyy] [name of copyright owner]
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
========================================================================
|
||||
Apache ECharts Subcomponents:
|
||||
|
||||
The Apache ECharts project contains subcomponents with separate copyright
|
||||
notices and license terms. Your use of the source code for these
|
||||
subcomponents is also subject to the terms and conditions of the following
|
||||
licenses.
|
||||
|
||||
BSD 3-Clause (d3.js):
|
||||
The following files embed [d3.js](https://github.com/d3/d3) BSD 3-Clause:
|
||||
`/src/chart/treemap/treemapLayout.ts`,
|
||||
`/src/chart/tree/layoutHelper.ts`,
|
||||
`/src/chart/graph/forceHelper.ts`,
|
||||
`/src/util/number.ts`
|
||||
See `/licenses/LICENSE-d3` for details of the license.
|
||||
|
||||
Apache ECharts
|
||||
Copyright 2017-2026 The Apache Software Foundation
|
||||
|
||||
This product includes software developed at
|
||||
The Apache Software Foundation (https://www.apache.org/).
|
||||
|
||||
zrender
|
||||
BSD 3-Clause License
|
||||
|
||||
Copyright (c) 2017, Baidu Inc.
|
||||
All rights reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions are met:
|
||||
|
||||
* Redistributions of source code must retain the above copyright notice, this
|
||||
list of conditions and the following disclaimer.
|
||||
|
||||
* Redistributions in binary form must reproduce the above copyright notice,
|
||||
this list of conditions and the following disclaimer in the documentation
|
||||
and/or other materials provided with the distribution.
|
||||
|
||||
* Neither the name of the copyright holder nor the names of its
|
||||
contributors may be used to endorse or promote products derived from
|
||||
this software without specific prior written permission.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
|
||||
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
||||
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
||||
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
||||
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
tslib
|
||||
Copyright (c) Microsoft Corporation.
|
||||
|
||||
Permission to use, copy, modify, and/or distribute this software for any
|
||||
purpose with or without fee is hereby granted.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
|
||||
REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
|
||||
AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
|
||||
INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
|
||||
LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
|
||||
OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
||||
PERFORMANCE OF THIS SOFTWARE.
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "zhao-steward-ui",
|
||||
"private": true,
|
||||
"version": "0.1.41",
|
||||
"version": "0.1.43",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"build": "vite build",
|
||||
@@ -9,6 +9,7 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"bootstrap": "5.3.8",
|
||||
"echarts": "6.1.0",
|
||||
"vue": "^3.5.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
|
||||
Generated
+23
@@ -11,6 +11,9 @@ importers:
|
||||
bootstrap:
|
||||
specifier: 5.3.8
|
||||
version: 5.3.8(@popperjs/core@2.11.8)
|
||||
echarts:
|
||||
specifier: 6.1.0
|
||||
version: 6.1.0
|
||||
vue:
|
||||
specifier: ^3.5.0
|
||||
version: 3.5.43
|
||||
@@ -396,6 +399,9 @@ packages:
|
||||
csstype@3.2.3:
|
||||
resolution: {integrity: sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==}
|
||||
|
||||
echarts@6.1.0:
|
||||
resolution: {integrity: sha512-q0yaFPggC9FUdsWH4blavRWFmxdrIodbkoKNAjJudAI6CA9gNPxHtV2RcZNEepZVlk4yvBYkOkbk6HIVpIyHZA==}
|
||||
|
||||
entities@7.0.1:
|
||||
resolution: {integrity: sha512-TWrgLOFUQTH994YUyl1yT4uyavY5nNB5muff+RtWaqNVCAK408b5ZnnbNAUEWLTCpum9w6arT70i1XdQ4UeOPA==}
|
||||
engines: {node: '>=0.12'}
|
||||
@@ -454,6 +460,9 @@ packages:
|
||||
resolution: {integrity: sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g==}
|
||||
engines: {node: '>=12.0.0'}
|
||||
|
||||
tslib@2.3.0:
|
||||
resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==}
|
||||
|
||||
vite@7.3.6:
|
||||
resolution: {integrity: sha512-4XP60spRGjSZFf1qYH+dJIkK2znL3zQfl9KkOV9MkkRR/3Dls0dxaBsQPTloEc5BLXWPL9vsOxopxyKoMmDueg==}
|
||||
engines: {node: ^20.19.0 || >=22.12.0}
|
||||
@@ -502,6 +511,9 @@ packages:
|
||||
typescript:
|
||||
optional: true
|
||||
|
||||
zrender@6.1.0:
|
||||
resolution: {integrity: sha512-oEGMDB6pOP2S6OwRR4PdVv610zrjnA3Bh+JnSG12fYJlBKjtNAoEb5fSUoCOOINlH96I2fU38/A2UpRKs67xYQ==}
|
||||
|
||||
snapshots:
|
||||
|
||||
'@babel/helper-string-parser@7.29.7': {}
|
||||
@@ -747,6 +759,11 @@ snapshots:
|
||||
|
||||
csstype@3.2.3: {}
|
||||
|
||||
echarts@6.1.0:
|
||||
dependencies:
|
||||
tslib: 2.3.0
|
||||
zrender: 6.1.0
|
||||
|
||||
entities@7.0.1: {}
|
||||
|
||||
esbuild@0.28.2:
|
||||
@@ -842,6 +859,8 @@ snapshots:
|
||||
fdir: 6.5.0(picomatch@4.0.7)
|
||||
picomatch: 4.0.7
|
||||
|
||||
tslib@2.3.0: {}
|
||||
|
||||
vite@7.3.6:
|
||||
dependencies:
|
||||
esbuild: 0.28.2
|
||||
@@ -860,3 +879,7 @@ snapshots:
|
||||
'@vue/runtime-dom': 3.5.43
|
||||
'@vue/server-renderer': 3.5.43
|
||||
'@vue/shared': 3.5.43
|
||||
|
||||
zrender@6.1.0:
|
||||
dependencies:
|
||||
tslib: 2.3.0
|
||||
|
||||
@@ -15,6 +15,6 @@ export function enhance(root){
|
||||
export async function loadControllers(){
|
||||
enhance(document.getElementById('app'))
|
||||
new MutationObserver(records=>{for(const record of records)for(const node of record.addedNodes)enhance(node)}).observe(document.getElementById('app'),{childList:true,subtree:true})
|
||||
for(const path of [...scripts,'/vue-bridge.js'])await new Promise((resolve,reject)=>{const script=document.createElement('script');script.src=path+'?ui=0.1.41';script.onload=resolve;script.onerror=()=>reject(new Error('Could not load '+path));document.head.append(script)})
|
||||
for(const path of [...scripts,'/vue-bridge.js'])await new Promise((resolve,reject)=>{const script=document.createElement('script');script.src=path+'?ui=0.1.43';script.onload=resolve;script.onerror=()=>reject(new Error('Could not load '+path));document.head.append(script)})
|
||||
await window.ZhaoVue.boot()
|
||||
}
|
||||
|
||||
@@ -3,6 +3,8 @@ import { computed, ref, watch } from "vue";
|
||||
import { snapshot, bridge, accessLabel } from "../composables/bridge.js";
|
||||
import AppIcon from "./AppIcon.vue";
|
||||
import HomeInsights from "./HomeInsights.vue";
|
||||
import LocalChart from "./LocalChart.vue";
|
||||
import { platformChart } from "../composables/charts.mjs";
|
||||
const draft = ref({
|
||||
revision: 0,
|
||||
columns: 2,
|
||||
@@ -369,6 +371,9 @@ async function enter(h, network = false) {
|
||||
<p class="description">
|
||||
平台与场所的管理关系;进入场所查看内部设备及网络。
|
||||
</p>
|
||||
<div v-if="homes.length" class="chart-network-surface mb-3">
|
||||
<LocalChart :option="platformChart(homes, snapshot.brandName || '赵府')" :active="snapshot.loggedIn && snapshot.page === 'households' && mode === 'topology'" :height="340" label="平台及已授权场所关系图;点击场所进入内部网络,下面也可通过卡片进入。" @select="id => enter({id}, true)" />
|
||||
</div>
|
||||
<div class="platform-place-grid">
|
||||
<button
|
||||
v-for="h in homes"
|
||||
|
||||
@@ -1,33 +1,33 @@
|
||||
<script setup>
|
||||
import { computed } from 'vue';
|
||||
import { computed, ref } from 'vue';
|
||||
import { snapshot } from '../composables/bridge.js';
|
||||
import { summarizeHomes } from '../composables/insights.mjs';
|
||||
import { distribution, bars } from '../composables/charts.mjs';
|
||||
import LocalChart from './LocalChart.vue';
|
||||
import AppIcon from './AppIcon.vue';
|
||||
const summary = computed(() => summarizeHomes(snapshot.value.state.households));
|
||||
const expanded = ref(false);
|
||||
const active = computed(() => snapshot.value.loggedIn && snapshot.value.page === 'households');
|
||||
const places = computed(() => (snapshot.value.state.households || []).map(h => ({ label: h.name, count: h.deviceCount || 0 })).sort((a,b) => b.count-a.count).slice(0, 8));
|
||||
</script>
|
||||
<template>
|
||||
<section class="home-insights" aria-label="已授权场所概览">
|
||||
<article class="insight-welcome">
|
||||
<section class="dashboard-grid row g-3 mb-4" :class="{'charts-expanded':expanded}" aria-label="已授权场所概览">
|
||||
<div class="col-12 col-xl-4"><article class="dashboard-welcome h-100">
|
||||
<span class="insight-kicker">一处相连 · 各有归属</span>
|
||||
<h2>家与日常,尽在掌握</h2>
|
||||
<p>从一个空间出发,照看设备,也珍藏生活。</p>
|
||||
<h2>家与日常,尽在掌握</h2><p>从一处灯火,连接生活的每个空间。</p>
|
||||
<div class="dashboard-totals"><div><strong>{{ summary.total }}</strong><span>家庭与场所</span></div><div><strong>{{ summary.devices }}</strong><span>已登记设备</span></div><div><strong>{{ summary.areas }}</strong><span>区域空间</span></div></div>
|
||||
<div class="insight-scope"><AppIcon name="shield" /> 仅汇总你有权访问的家庭与场所</div>
|
||||
</article>
|
||||
<article class="insight-number">
|
||||
<span class="insight-icon"><AppIcon name="devices" /></span>
|
||||
<span class="insight-label">已登记设备</span>
|
||||
<strong>{{ summary.devices }}<small>台</small></strong>
|
||||
<span class="insight-foot">分布在 {{ summary.areas }} 处区域</span>
|
||||
</article>
|
||||
<article class="insight-distribution">
|
||||
<div class="insight-donut">
|
||||
<svg viewBox="0 0 120 120" role="img" :aria-label="'场所分布:' + (summary.kinds.map(k => k.label + k.count + '个').join(',') || '暂无场所')">
|
||||
<circle class="donut-track" cx="60" cy="60" r="48" fill="none" stroke-width="10" />
|
||||
<circle v-for="kind in summary.kinds" :key="kind.key" cx="60" cy="60" r="48" fill="none" stroke-width="10" pathLength="100" :stroke="kind.color" :stroke-dasharray="`${kind.share} ${100 - kind.share}`" :stroke-dashoffset="-kind.offset" transform="rotate(-90 60 60)" />
|
||||
</svg>
|
||||
<div aria-hidden="true"><strong>{{ summary.total }}</strong><small>家庭与场所</small></div>
|
||||
</div>
|
||||
<div class="insight-legend"><h3>空间分布</h3><span v-for="kind in summary.kinds" :key="kind.key"><i :style="{ background: kind.color }"></i>{{ kind.label }}<b>{{ kind.count }}</b></span><span v-if="!summary.total">等待添加空间</span></div>
|
||||
</article>
|
||||
</article></div>
|
||||
<div class="col-12 d-md-none"><button class="btn btn-outline-secondary w-100" :aria-expanded="expanded" @click="expanded=!expanded">{{ expanded?'收起图表统计':'展开图表统计' }}</button></div>
|
||||
<div class="col-12 col-md-5 col-xl-3 dashboard-chart-column"><article class="chart-card h-100"><div class="chart-heading"><h3>空间分布</h3><span class="badge">{{ summary.total }} 处</span></div>
|
||||
<LocalChart v-if="summary.total" :option="distribution(summary.kinds)" :active="active" :height="160" :label="'场所分布:'+summary.kinds.map(k=>k.label+k.count+'个').join(',')" />
|
||||
<p v-else class="chart-empty">添加家庭或场所后显示分布</p>
|
||||
<div class="chart-legend"><span v-for="k in summary.kinds" :key="k.key"><i :style="{background:k.color}"></i>{{ k.label }} <b>{{ k.count }}</b></span></div>
|
||||
</article></div>
|
||||
<div class="col-12 col-md-7 col-xl-5 dashboard-chart-column"><article class="chart-card h-100"><div class="chart-heading"><h3>设备分布</h3><span class="small text-secondary">按场所 · 最多显示 8 处</span></div>
|
||||
<LocalChart v-if="places.length" :option="bars(places)" :active="active" :height="190" :label="'各场所已登记设备:'+places.map(x=>x.label+x.count+'台').join(',')" />
|
||||
<p v-else class="chart-empty">暂无已授权场所</p>
|
||||
<details v-if="places.length" class="chart-data"><summary>查看统计数字</summary><ul><li v-for="p in places" :key="p.label">{{ p.label }}:{{ p.count }} 台</li></ul></details>
|
||||
</article></div>
|
||||
</section>
|
||||
</template>
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
<script setup>
|
||||
import { ref, onMounted, onBeforeUnmount, watch } from 'vue';
|
||||
const props = defineProps({ option: { type: Object, required: true }, label: String, active: { type: Boolean, default: true }, height: { type: Number, default: 260 } });
|
||||
const emit = defineEmits(['select']);
|
||||
const host = ref(null), failed = ref(false);
|
||||
let chart, resizeObserver, themeObserver, frame, alive = true, loading = false, last = '', size = '';
|
||||
function dispose() { chart?.dispose(); chart = null; last = ''; size = ''; }
|
||||
function queue() { if (!frame && alive) frame = requestAnimationFrame(() => { frame = null; render(); }); }
|
||||
async function render() {
|
||||
if (!alive || !host.value || !props.active) { dispose(); return; }
|
||||
const width = Math.floor(host.value.clientWidth), height = Math.floor(host.value.clientHeight);
|
||||
if (!width || !height) return;
|
||||
if (!chart) {
|
||||
if (loading) return;
|
||||
loading = true;
|
||||
try {
|
||||
const runtime = await import('../composables/charts-runtime.js');
|
||||
if (!alive || !props.active || !host.value) return;
|
||||
chart = runtime.init(host.value, null, { renderer: 'canvas', devicePixelRatio: Math.min(window.devicePixelRatio || 1, 2) });
|
||||
chart.on('click', value => { if (value.data?.targetId) emit('select', value.data.targetId); });
|
||||
failed.value = false;
|
||||
} catch (error) { failed.value = true; console.error('Local chart unavailable', error); return; }
|
||||
finally { loading = false; }
|
||||
}
|
||||
const css = getComputedStyle(document.documentElement), ink = css.getPropertyValue('--ink').trim() || '#253b46', muted = css.getPropertyValue('--ui-muted').trim() || '#627485', line = css.getPropertyValue('--ui-line').trim() || '#e3e9ef';
|
||||
const fingerprint = JSON.stringify(props.option) + ink + muted + line;
|
||||
// Periodic status refreshes must not restart chart layout/animation.
|
||||
if (fingerprint !== last) {
|
||||
const option = { ...props.option, animation: false, backgroundColor: 'transparent', textStyle: { color: ink, fontFamily: 'system-ui, Microsoft YaHei, sans-serif' }, aria: { enabled: true, description: props.label }, tooltip: { trigger: 'item', renderMode: 'richText', confine: true, ...props.option.tooltip } };
|
||||
for (const axis of ['xAxis', 'yAxis']) if (option[axis]) option[axis] = { ...option[axis], axisLabel: { color: muted, ...option[axis].axisLabel }, splitLine: { lineStyle: { color: line } } };
|
||||
option.series = (option.series || []).map(series => ({ ...series, label: { color: ink, ...series.label } }));
|
||||
chart.setOption(option, { notMerge: true, lazyUpdate: false }); last = fingerprint;
|
||||
}
|
||||
const nextSize = width + ':' + height;
|
||||
if (nextSize !== size) { chart.resize({ width, height }); size = nextSize; }
|
||||
}
|
||||
watch(() => [props.option, props.active], queue, { deep: true, flush: 'post' });
|
||||
onMounted(() => {
|
||||
resizeObserver = new ResizeObserver(queue); resizeObserver.observe(host.value);
|
||||
themeObserver = new MutationObserver(queue); themeObserver.observe(document.documentElement, { attributes: true, attributeFilter: ['data-theme', 'data-density'] });
|
||||
queue();
|
||||
});
|
||||
onBeforeUnmount(() => { alive = false; cancelAnimationFrame(frame); resizeObserver?.disconnect(); themeObserver?.disconnect(); dispose(); });
|
||||
</script>
|
||||
<template>
|
||||
<div class="local-chart-wrap">
|
||||
<div ref="host" class="local-chart" role="img" :aria-label="label" :style="{ height: height + 'px' }"></div>
|
||||
<p v-if="failed" class="small text-secondary px-3" role="status">图表暂未加载,可查看下方数据。</p>
|
||||
</div>
|
||||
</template>
|
||||
@@ -1,31 +1,18 @@
|
||||
<script setup>
|
||||
import { computed, ref, watch } from 'vue';
|
||||
import { deviceView, snapshot, bridge, accessLabel } from '../composables/bridge.js';
|
||||
import { layoutNetwork } from '../composables/insights.mjs';
|
||||
const zoom = ref(1);
|
||||
const graph = computed(() => layoutNetwork(deviceView.value.rows));
|
||||
watch(() => snapshot.value.session + ':' + snapshot.value.state.familyId, () => { zoom.value = 1; });
|
||||
const open = node => bridge().enterDevice(node.device.source, node.device.id, 'device');
|
||||
import { deviceView, snapshot, bridge } from '../composables/bridge.js';
|
||||
import { networkChart } from '../composables/charts.mjs';
|
||||
import LocalChart from './LocalChart.vue';
|
||||
const resetKey = ref(0);
|
||||
const option = computed(() => networkChart(deviceView.value.rows, bridge().location));
|
||||
const active = computed(() => snapshot.value.loggedIn && snapshot.value.page === 'objects' && deviceView.value.mode === 'topology');
|
||||
watch(() => snapshot.value.session + ':' + snapshot.value.state.familyId, () => resetKey.value++);
|
||||
function open(id) { const row = deviceView.value.rows.find(r => r.device.id === id); if (row) bridge().enterDevice(row.device.source, id, 'device'); }
|
||||
</script>
|
||||
<template>
|
||||
<div v-if="graph.nodes.length" class="network-diagram">
|
||||
<div class="diagram-toolbar">
|
||||
<div><span class="diagram-dot"></span><strong>设备连接图</strong><span class="small text-secondary">{{ graph.nodes.length }} 台设备 · {{ graph.edges.length }} 条已登记连接</span></div>
|
||||
<label>缩放<select v-model.number="zoom" class="form-select form-select-sm" aria-label="网络图缩放"><option :value="0.75">75%</option><option :value="1">100%</option><option :value="1.25">125%</option></select></label>
|
||||
</div>
|
||||
<div class="diagram-scroll" tabindex="0" role="region" aria-label="设备连接图,可滚动查看;点击设备打开档案">
|
||||
<svg :width="graph.width * zoom" :height="graph.height * zoom" :viewBox="`0 0 ${graph.width} ${graph.height}`" class="network-svg" role="group" aria-label="已登记的网络连接">
|
||||
<path v-for="edge in graph.edges" :key="edge.id" :d="edge.path" class="network-edge" fill="none" />
|
||||
<g v-for="node in graph.nodes" :key="node.device.id" :transform="`translate(${node.x},${node.y})`" class="diagram-node" role="button" tabindex="0" :aria-label="node.device.name + ',打开设备档案'" @click="open(node)" @keydown.enter.prevent="open(node)" @keydown.space.prevent="open(node)">
|
||||
<title>{{ node.device.name }} · {{ node.device.deviceType }} · {{ (node.device.networkHosts || []).join(' / ') || 'IP 待填写' }}</title>
|
||||
<rect width="244" height="88" rx="12" class="diagram-node-bg" />
|
||||
<rect x="12" y="16" width="4" height="54" rx="2" :fill="node.device.source === 'camera' ? '#5c83cb' : '#258b76'" />
|
||||
<text x="28" y="26" class="diagram-node-type">{{ node.device.deviceType }} · {{ accessLabel(node.device.networkAccess) }}</text>
|
||||
<text x="28" y="48" class="diagram-node-title">{{ node.device.name.length > 14 ? node.device.name.slice(0, 14) + '…' : node.device.name }}</text>
|
||||
<text x="28" y="70" class="diagram-node-ip">{{ (node.device.networkHosts || [])[0] || 'IP 待填写' }}</text>
|
||||
</g>
|
||||
</svg>
|
||||
</div>
|
||||
<p class="diagram-note">点击节点查看名称、位置与网络详情。未登记上级的设备独立显示。</p>
|
||||
<div v-if="deviceView.rows.length" class="network-diagram">
|
||||
<div class="diagram-toolbar"><div><span class="diagram-dot"></span><strong>设备连接图</strong><span class="small text-secondary">{{ deviceView.rows.length }} 台设备 · {{ option.series[0].links.length }} 条已登记连接</span></div><button class="btn btn-sm btn-outline-secondary" @click="resetKey++">重置视图</button></div>
|
||||
<div class="chart-network-surface"><LocalChart :key="resetKey" :option="option" :active="active" :height="400" label="已登记设备连接图,可拖动缩放;下方设备详情提供相同信息及操作。" @select="open" /></div>
|
||||
<p class="diagram-note">拖动平移、滚轮或双指缩放;点击节点打开档案。未登记上级的设备独立显示;接入方式不代表在线状态。</p>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -0,0 +1,14 @@
|
||||
<script setup>
|
||||
import { computed } from 'vue';
|
||||
import { snapshot } from '../composables/bridge.js';
|
||||
import { summarizeDevices, bars, distribution, palette } from '../composables/charts.mjs';
|
||||
import LocalChart from './LocalChart.vue';
|
||||
const summary = computed(() => summarizeDevices(snapshot.value.state));
|
||||
const active = computed(() => snapshot.value.loggedIn && snapshot.value.page === 'overview');
|
||||
</script>
|
||||
<template>
|
||||
<section class="row g-3 mb-4" aria-label="当前场所设备统计" v-if="active && summary.total">
|
||||
<div class="col-12 col-lg-7"><article class="chart-card h-100"><div class="chart-heading"><h3>设备类型</h3><span class="small text-secondary">{{ summary.total }} 台已授权设备</span></div><LocalChart :option="bars(summary.types.slice(0,8))" :height="220" :label="'设备类型:'+summary.types.map(x=>x.label+x.count+'台').join(',')" /><details class="chart-data"><summary>查看全部类型</summary><ul><li v-for="x in summary.types" :key="x.label">{{ x.label }}:{{ x.count }} 台</li></ul></details></article></div>
|
||||
<div class="col-12 col-lg-5"><article class="chart-card h-100"><div class="chart-heading"><h3>网络接入</h3><span class="small text-secondary">来自设备档案</span></div><LocalChart :option="distribution(summary.networks)" :height="190" :label="'登记的网络接入方式:'+summary.networks.map(x=>x.label+x.count+'台').join(',')" /><div class="chart-legend"><span v-for="(x,i) in summary.networks" :key="x.label"><i :style="{background:palette[i]}"></i>{{ x.label }} <b>{{ x.count }}</b></span></div><p class="small text-secondary mt-2 mb-0">接入方式不代表设备在线状态。</p></article></div>
|
||||
</section>
|
||||
</template>
|
||||
@@ -3,6 +3,7 @@ import HomeExplorer from './HomeExplorer.vue'
|
||||
import DeviceCollection from './DeviceCollection.vue'
|
||||
import NetworkMap from './NetworkMap.vue'
|
||||
import DeviceNetworkPanel from './DeviceNetworkPanel.vue'
|
||||
import ScopeInsights from './ScopeInsights.vue'
|
||||
</script>
|
||||
<template>
|
||||
|
||||
@@ -29,7 +30,7 @@ import DeviceNetworkPanel from './DeviceNetworkPanel.vue'
|
||||
<form id="journal-filter" class="panel journal-filters"><label>查看方式<select id="journal-mode"><option value="feed">家庭/场所动态</option><option value="mine">我的个人阅历</option><option value="person">某个人的阅历</option></select></label><label id="journal-person-label" hidden>人物<select id="journal-person"></select></label><label>分类<select id="journal-category"><option value="">全部分类</option><option>日常</option><option>成长</option><option>家庭</option><option>旅行</option><option>工作</option><option>其他</option></select></label><label>关键词<input id="journal-search" type="search" maxlength="120" placeholder="在文字中查找"></label><label>开始日期<input id="journal-from" type="date"></label><label>结束日期<input id="journal-to" type="date"></label><button type="submit">查询阅历</button><button id="journal-filter-clear" type="button" class="quiet">清除筛选</button></form><p class="description">个人阅历保留同一条记事的文字、附件和互动;查看他人时只展示其分享给当前家庭/场所的内容。删除记事或移出附件列表不会删除网盘原文件。</p><div class="section-head"><p id="journal-query-status" role="status"></p><div><button id="journal-prev" class="quiet">上一页</button><button id="journal-next" class="quiet">下一页</button></div></div><div id="journal-list" class="journal-feed"></div>
|
||||
</section>
|
||||
|
||||
<section id="page-overview" class="page" hidden><div id="scope-overview"></div></section><section id="page-device" class="page" hidden><DeviceNetworkPanel /><div id="device-detail"></div></section><section id="page-heritage" class="page" hidden><div id="heritage-home"></div></section>
|
||||
<section id="page-overview" class="page" hidden><ScopeInsights /><div id="scope-overview"></div></section><section id="page-device" class="page" hidden><DeviceNetworkPanel /><div id="device-detail"></div></section><section id="page-heritage" class="page" hidden><div id="heritage-home"></div></section>
|
||||
<section id="page-live" class="page"><div class="section-head"><h2 id="live-heading">本场所监控墙</h2><div><label>清晰度 <select id="quality"><option value="hd">主码流</option><option value="compat">子码流</option></select></label></div></div><details class="live-help"><summary>画面与清晰度说明</summary><p id="wall-context" class="description">这里汇总当前场所内已授权的镜头;点击摄像头详情可进入单台设备。</p><p class="description" id="quality-note">主码流画面更清晰,最高 1920×1080;子码流更流畅,最高 768×432,适合网络较慢时使用。</p></details><div class="wall-toolbar"><label>分屏 <select id="wall-layout"><option value="auto">自适应</option><option value="1">1 画面</option><option value="2">2 画面</option><option value="4">4 画面</option><option value="6">6 画面</option><option value="9">9 画面</option><option value="16">16 画面</option></select></label><label class="check"><input id="wall-arrange" type="checkbox">调整顺序</label><div class="wall-paging"><button id="wall-prev" class="quiet" aria-label="上一组画面">‹</button><span id="wall-page"></span><button id="wall-next" class="quiet" aria-label="下一组画面">›</button></div><span id="wall-clock"></span><button id="wall-fullscreen">全屏监控</button></div><div id="live-grid" class="live-grid"></div><section id="ptz-panel" class="ptz-panel" hidden><div><strong id="ptz-title">云台</strong><p id="ptz-status" role="status"></p></div><div class="ptz-pad"><button data-ptz-action="up" aria-label="云台向上">↑</button><button data-ptz-action="left" aria-label="云台向左">←</button><button data-ptz-action="stop">停止</button><button data-ptz-action="right" aria-label="云台向右">→</button><button data-ptz-action="down" aria-label="云台向下">↓</button></div><div id="ptz-presets"><div class="section-head"><strong>常用位置 <small id="preset-count"></small></strong><button id="preset-reload" class="quiet">重新读取</button></div><p id="preset-status" role="status"></p><div id="preset-list"></div><p class="description">调整位置后可另存为新预置位。本版不覆盖已有位置,避免设备固件拒绝或误改。</p><form id="preset-form" hidden><label>当前位置名称<input id="preset-name" required maxlength="40" placeholder="例如:大门、院子"></label><button type="submit">保存当前位置</button></form><div id="preset-confirmation" hidden><p id="preset-confirm-text"></p><button id="preset-confirm-yes">确认</button><button id="preset-confirm-cancel" class="quiet">取消</button></div></div><button id="ptz-close" class="quiet">收起云台</button></section></section>
|
||||
<section id="page-playback" class="page" hidden>
|
||||
<div class="section-head"><h2>回到那一刻 <small>光阴</small></h2></div>
|
||||
@@ -48,7 +49,7 @@ import DeviceNetworkPanel from './DeviceNetworkPanel.vue'
|
||||
<section id="page-family" class="page" hidden>
|
||||
<div class="section-head"><h2>家族的来处与延续 <small>世系 · 传承</small></h2><div><button id="family-reload" class="quiet">重新载入</button><button id="family-export" class="quiet">导出家谱</button><button id="new-person">+ 录入人物</button></div></div>
|
||||
<p class="description">从祖辈到后辈,一张图看全家。点击人物查看档案,暖金色卡片是当前账号关联的本人。</p>
|
||||
<div class="panel family-toolbar"><label>关系参照人物<select id="family-reference"></select></label><label>查找人物<input id="family-search" type="search" placeholder="姓名、别名或籍贯"></label><button id="family-find" class="quiet" hidden>定位搜索结果</button><label class="check"><input id="family-archived" type="checkbox">显示归档人物</label><span id="family-count"></span></div>
|
||||
<p id="family-edit-note" class="alert alert-info" role="status"></p><div class="panel family-toolbar"><label>关系参照人物<select id="family-reference"></select></label><label>查找人物<input id="family-search" type="search" placeholder="姓名、别名或籍贯"></label><button id="family-find" class="quiet" hidden>定位搜索结果</button><label class="check"><input id="family-archived" type="checkbox">显示归档人物</label><span id="family-count"></span></div>
|
||||
<div id="family-error" class="form-error" role="status"></div>
|
||||
<div id="family-workspace" class="family-workspace">
|
||||
<section id="family-canvas-panel" class="family-canvas-panel" aria-label="全家关系图">
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
// Bundled locally by Vite. No remote scripts, fonts, maps or CDN fallback.
|
||||
import { init, use } from 'echarts/core';
|
||||
import { PieChart, BarChart, GraphChart } from 'echarts/charts';
|
||||
import { TooltipComponent, GridComponent, AriaComponent } from 'echarts/components';
|
||||
import { CanvasRenderer } from 'echarts/renderers';
|
||||
use([PieChart, BarChart, GraphChart, TooltipComponent, GridComponent, AriaComponent, CanvasRenderer]);
|
||||
export { init };
|
||||
@@ -0,0 +1,32 @@
|
||||
// These builders accept only the current server-authorized snapshot.
|
||||
export const palette = ['#268575', '#648bcc', '#c49b5b', '#8e82b5', '#899aa5'];
|
||||
const count = value => Math.max(0, Math.floor(Number(value) || 0));
|
||||
export function distribution(items = []) {
|
||||
return { series: [{ type: 'pie', radius: ['62%', '84%'], center: ['50%', '50%'], avoidLabelOverlap: true, label: { show: false }, emphasis: { scale: false }, data: items.map((item, i) => ({ name: item.label, value: count(item.count), itemStyle: { color: item.color || palette[i % palette.length], borderRadius: 4 } })) }] };
|
||||
}
|
||||
export function bars(items = []) {
|
||||
return { grid: { left: 12, right: 35, top: 10, bottom: 12, containLabel: true }, xAxis: { type: 'value', minInterval: 1, axisTick: { show: false } }, yAxis: { type: 'category', inverse: true, axisTick: { show: false }, axisLine: { show: false }, axisLabel: { width: 90, overflow: 'truncate' }, data: items.map(x => x.label) }, series: [{ type: 'bar', barMaxWidth: 20, label: { show: true, position: 'right' }, data: items.map((x, i) => ({ value: count(x.count), itemStyle: { color: x.color || palette[i % palette.length], borderRadius: [0, 5, 5, 0] } })) }] };
|
||||
}
|
||||
export function summarizeDevices(state = {}) {
|
||||
const all = [...(state.assets || []).map(x => ({ ...x, deviceType: '摄像机' })), ...(state.recorders || []).map(x => ({ ...x, deviceType: '录像机' })), ...(state.devices || [])];
|
||||
const byType = new Map(), byNetwork = new Map();
|
||||
const names = { lan: '局域网', tailscale: 'Tailscale', public: '公网', unknown: '待登记' };
|
||||
for (const device of all) {
|
||||
const type = device.deviceType || '其他', network = names[device.networkAccess] || names.unknown;
|
||||
byType.set(type, (byType.get(type) || 0) + 1); byNetwork.set(network, (byNetwork.get(network) || 0) + 1);
|
||||
}
|
||||
const list = map => [...map].map(([label, count]) => ({ label, count })).sort((a,b) => b.count-a.count || a.label.localeCompare(b.label));
|
||||
return { total: all.length, types: list(byType), networks: list(byNetwork) };
|
||||
}
|
||||
export function graphOption(nodes, edges) {
|
||||
return { tooltip: { formatter: item => item.dataType === 'edge' ? '已登记的上级连接' : item.data.detail || item.name }, series: [{ type: 'graph', layout: 'none', roam: true, draggable: false, scaleLimit: { min: .2, max: 4 }, symbol: 'roundRect', symbolSize: [145, 60], edgeSymbol: ['none', 'arrow'], edgeSymbolSize: 6, label: { show: true, fontSize: 11, width: 128, overflow: 'truncate', formatter: item => item.data.caption || item.name }, lineStyle: { color: '#8aa99f', width: 2, curveness: .08 }, emphasis: { focus: 'adjacency', lineStyle: { width: 3 } }, data: nodes, links: edges }] };
|
||||
}
|
||||
export function networkChart(rows = [], location = () => '') {
|
||||
const ids = new Map(rows.map(r => [r.device.id, r]));
|
||||
const nodes = rows.map((r, i) => ({ id: r.device.id, targetId: r.device.id, name: r.device.name, caption: r.device.name + '\n' + ((r.device.networkHosts || [])[0] || 'IP 待填写'), detail: [r.device.name, r.device.deviceType, location(r.device.siteId) || '位置待登记', (r.device.networkHosts || []).join(' / ') || 'IP 待填写', { lan: '局域网', tailscale: 'Tailscale', public: '公网' }[r.device.networkAccess] || '接入待确认'].join('\n'), x: Math.max(0, r.depth || 0) * 280, y: i * 105, itemStyle: { color: r.device.source === 'camera' ? '#e1ebfb' : '#dceddf', borderColor: r.device.source === 'camera' ? '#648bcc' : '#468b73', borderWidth: 1 }, label: { color: '#213f48' } }));
|
||||
const edges = rows.flatMap(r => { const parent = ids.get(r.device.uplinkId); return parent && parent.depth + 1 === r.depth ? [{ source: parent.device.id, target: r.device.id }] : []; });
|
||||
return graphOption(nodes, edges);
|
||||
}
|
||||
export function platformChart(homes = [], name = '赵府') {
|
||||
return graphOption([{ id: 'platform', name, x: 0, y: 0, symbolSize: [160, 65], itemStyle: { color: '#286d5d' }, label: { color: '#fff' } }, ...homes.map((h, i) => ({ id: 'home:' + h.id, targetId: h.id, name: h.name, caption: h.name + '\n' + count(h.deviceCount) + ' 台设备', detail: [h.name, {home:'家庭',office:'办公',factory:'工厂'}[h.kind || 'home'] || '场所', [h.province,h.city,h.district].filter(Boolean).join(' · '), count(h.deviceCount) + ' 台已授权设备'].filter(Boolean).join('\n'), x: 300, y: (i - (homes.length-1)/2) * 120, itemStyle: { color: '#e3efe8', borderColor: '#8ebaa6', borderWidth: 1 }, label: { color: '#213f48' } }))], homes.map(h => ({ source: 'platform', target: 'home:' + h.id })));
|
||||
}
|
||||
@@ -0,0 +1,54 @@
|
||||
/* Shared local Bootstrap presentation for desktop and phones. */
|
||||
:root { --ui-shadow: 0 4px 22px #223d500a; --bs-body-font-family: system-ui,"Microsoft YaHei",sans-serif; }
|
||||
html[data-theme="paper"] { --ui-bg: #f5f5f1; --ui-soft: #f4f6f2; }
|
||||
.dashboard-grid { margin-top: 4px; }
|
||||
.dashboard-grid > div, .row > div { min-width: 0; }
|
||||
.dashboard-welcome { position: relative; overflow: hidden; padding: 28px; border-radius: 16px; background: linear-gradient(140deg,#234a49,#2e7964); color:#fff; }
|
||||
.dashboard-welcome::after { content:''; position:absolute; right:-85px; top:-95px; width:260px; height:260px; border:40px solid #ffffff07; border-radius:50%; pointer-events:none; }
|
||||
.dashboard-welcome h2 { font-size:clamp(21px,2vw,26px)!important; color:#fff!important; margin:16px 0 8px; letter-spacing:.2px; }
|
||||
.dashboard-welcome > p { color:#d3e7df; font-size:12px; }
|
||||
.dashboard-totals { display:flex; gap:28px; margin:22px 0; }
|
||||
.dashboard-totals > div { display:flex; flex-direction:column; }
|
||||
.dashboard-totals strong { color:#fff; font-size:32px; font-weight:600; line-height:1.3; font-variant-numeric:tabular-nums; }
|
||||
.dashboard-totals span { color:#d3e7df; font-size:11px; margin-top:5px; }
|
||||
.chart-card { padding:22px; border:1px solid var(--ui-line); border-radius:16px; background:var(--ui-surface); box-shadow:var(--ui-shadow); min-width:0; }
|
||||
.chart-heading { display:flex; gap:12px; align-items:center; justify-content:space-between; flex-wrap:wrap; margin-bottom:10px; }
|
||||
.chart-heading h3 { font-size:15px!important; font-weight:650; margin:0; }
|
||||
.chart-heading .small { font-size:11px; }
|
||||
.chart-legend { display:flex; gap:10px 18px; flex-wrap:wrap; justify-content:center; padding-top:8px; }
|
||||
.chart-legend span { display:flex; align-items:center; gap:6px; font-size:12px; color:var(--ui-muted); }
|
||||
.chart-legend i { width:8px; height:8px; border-radius:3px; }
|
||||
.chart-legend b { color:var(--ink); font-variant-numeric:tabular-nums; }
|
||||
.chart-data { color:var(--ui-muted); font-size:11px; margin-top:8px; }
|
||||
.chart-data summary { cursor:pointer; padding:6px 0; }
|
||||
.chart-data ul { padding-left:20px; margin:8px 0 0; }
|
||||
.chart-empty { min-height:150px; display:grid; place-items:center; color:var(--ui-muted); margin:0; font-size:13px; }
|
||||
.local-chart-wrap,.local-chart { width:100%; min-width:0; }
|
||||
.chart-network-surface { background:var(--ui-soft); border-radius:12px; background-image:radial-gradient(var(--ui-line) 1px,transparent 1px); background-size:20px 20px; overflow:hidden; }
|
||||
.chart-network-surface .local-chart { touch-action:none; }
|
||||
.household-context { border-left:3px solid #488b76!important; }
|
||||
.section-head > div > .description { margin-top:7px; }
|
||||
.home-toolbar,.device-view-controls,.playback-controls { box-shadow:var(--ui-shadow); }
|
||||
.home-card .card-body { padding:22px; }
|
||||
.home-cover { height:200px; }
|
||||
.form-grid label { align-items:stretch; }
|
||||
dialog .dialog-heading { position:sticky; top:0; background:var(--ui-surface); z-index:2; padding-block:12px; }
|
||||
dialog .dialog-footer { padding-top:18px; border-top:1px solid var(--ui-line); }
|
||||
html[data-theme="ink"] .chart-card { color:var(--ink); }
|
||||
html[data-theme="ink"] .chart-heading .badge { background:#2c493e!important; color:#c2e9d7!important; }
|
||||
@media(max-width:767px) {
|
||||
.dashboard-grid:not(.charts-expanded) .dashboard-chart-column { display:none; }
|
||||
.dashboard-welcome { padding:22px; }
|
||||
.dashboard-welcome h2 { font-size:22px!important; }
|
||||
.dashboard-totals { justify-content:space-between; gap:14px; margin:18px 0 14px; }
|
||||
.dashboard-welcome .insight-scope { display:flex; font-size:10px; }
|
||||
.chart-card { padding:18px; }
|
||||
.dashboard-grid .chart-card { height:auto!important; }
|
||||
.chart-network-surface .local-chart { max-height:340px; }
|
||||
.diagram-toolbar { flex-wrap:wrap; }
|
||||
.diagram-toolbar .btn { min-height:40px; }
|
||||
.household-context { padding:14px!important; }
|
||||
.section-head { gap:12px; flex-wrap:wrap; }
|
||||
.dialog-footer button { flex:1; }
|
||||
.table-wrap { overscroll-behavior-x:contain; }
|
||||
}
|
||||
@@ -5,6 +5,7 @@ import '../../web/chinese-theme.css'
|
||||
import 'bootstrap/dist/css/bootstrap.min.css'
|
||||
import './theme.css'
|
||||
import './bootstrap-polish.css'
|
||||
import './dashboard.css'
|
||||
import App from './App.vue'
|
||||
import './composables/bridge.js'
|
||||
createApp(App).mount('#app')
|
||||
|
||||
+84
-4
@@ -3,6 +3,7 @@ import geography
|
||||
import datetime as dt
|
||||
import json
|
||||
import secrets
|
||||
import family_permissions as permissions
|
||||
from urllib.parse import urlsplit
|
||||
|
||||
|
||||
@@ -34,14 +35,59 @@ class Family:
|
||||
with self.a.LOCK:
|
||||
can_edit = self.a.HOUSEHOLDS.manager(user) or user.get('familyAccess') == 'edit'
|
||||
people = self.a.HOUSEHOLDS.objects(user, 'people')
|
||||
links = self.a.HOUSEHOLDS.objects(user, 'family_links')
|
||||
scope = self.edit_scope(user, people, links)
|
||||
return {'revision': self.a.setting(self.a.HOUSEHOLDS.revision_key(user), 0), 'people': people,
|
||||
'links': self.a.HOUSEHOLDS.objects(user, 'family_links'),
|
||||
'links': links,
|
||||
'events': [e for e in self.a.HOUSEHOLDS.objects(user, 'family_events')
|
||||
if can_edit or (e.get('status') == 'published' and not e.get('archived'))],
|
||||
'canEdit': can_edit,
|
||||
'selfId': user.get('personId', '') if any(p['id'] == user.get('personId') for p in people) else '',
|
||||
'canEdit': can_edit and bool(scope['levels']) and not scope['conflict'],
|
||||
'editScope': scope,
|
||||
'selfId': scope['selfId'],
|
||||
'familyId': self.a.HOUSEHOLDS.scope(user)}
|
||||
|
||||
def edit_scope(self, user, people=None, links=None):
|
||||
a = self.a
|
||||
people = a.HOUSEHOLDS.objects(user, 'people') if people is None else people
|
||||
links = a.HOUSEHOLDS.objects(user, 'family_links') if links is None else links
|
||||
# Always use the account's binding, never a selected graph reference or submitted ID.
|
||||
account = a.get_object('users', user.get('id')) if user.get('id') else None
|
||||
self_id = (account or user).get('personId', '')
|
||||
levels, conflict = permissions.generations(people, links, self_id)
|
||||
granted = a.HOUSEHOLDS.manager(user) or user.get('familyAccess') == 'edit'
|
||||
editable = [key for key in levels if permissions.within(levels, key)] if granted and not conflict else []
|
||||
note = ('族谱维护限本人上下各五代,所有角色(含超级管理员)相同;远代仍可按权限查看。'
|
||||
if levels else '尚未关联本家庭族谱中的本人,暂不能维护。请在成员与权限中关联本人。')
|
||||
if conflict:
|
||||
note = '亲属关系存在代际冲突,无法可靠确定五代范围,已暂时锁定维护。'
|
||||
can_start = bool(granted and account and not account.get('personId')
|
||||
and a.HOUSEHOLDS.family_of(account) == a.HOUSEHOLDS.scope(user))
|
||||
return dict(limit=permissions.LIMIT, selfId=self_id if levels else '', levels=levels,
|
||||
conflict=conflict, editablePersonIds=editable, canCreateSelf=can_start, note=note)
|
||||
|
||||
def check_write(self, user, kind, item, old=None, proposed_people=None, proposed_links=None):
|
||||
scope = self.edit_scope(user)
|
||||
if not scope['levels'] or scope['conflict']:
|
||||
raise self.a.Problem(scope['note'], 403)
|
||||
levels = scope['levels']
|
||||
if old and any(not permissions.within(levels, key) for key in permissions.targets(kind, old)):
|
||||
raise self.a.Problem('该资料超出本人上下五代维护范围,所有角色均只能查看', 403)
|
||||
if (kind == 'person' and old is not None) or kind == 'event':
|
||||
if any(not permissions.within(levels, key) for key in permissions.targets(kind, item)):
|
||||
raise self.a.Problem('只能维护本人上下五代内且已连接的亲属资料', 403)
|
||||
if proposed_links is not None:
|
||||
next_levels, conflict = permissions.generations(proposed_people, proposed_links, scope['selfId'])
|
||||
if conflict:
|
||||
raise self.a.Problem('这条关系会产生代际冲突,不能据此确定维护范围', 409)
|
||||
# Prevent moving/disconnecting an existing branch and reattaching it closer
|
||||
# to oneself to circumvent the five-generation rule.
|
||||
if any(next_levels.get(key) != value for key, value in levels.items()):
|
||||
raise self.a.Problem('不能改变已确认人物的代际位置或断开其世系;请先补充同代的正确关系', 403)
|
||||
if any(not permissions.within(next_levels, key) for key in permissions.targets(kind, item)):
|
||||
raise self.a.Problem('新增关系或人物超出本人上下五代维护范围', 403)
|
||||
if kind == 'link' and not any(permissions.within(levels, key) for key in permissions.targets(kind, item)):
|
||||
raise self.a.Problem('请从本人上下五代内的已知亲属连接关系', 403)
|
||||
|
||||
def save(self, kind, data, user, restored_from=None):
|
||||
self.authorize(user, True)
|
||||
a = self.a
|
||||
@@ -63,6 +109,32 @@ class Family:
|
||||
raise a.Problem('家谱记录不存在', 404)
|
||||
item = {'person': self.person, 'link': self.link, 'event': self.event}[kind](data, old)
|
||||
item.update(familyId=family_id, updatedAt=dt.datetime.now(dt.timezone.utc).isoformat(), updatedBy=user['username'])
|
||||
added_link = None
|
||||
bind_self = data.get('asSelf', False)
|
||||
if not isinstance(bind_self, bool):
|
||||
raise a.Problem('本人关联设置不正确')
|
||||
if bind_self and (kind != 'person' or old or not self.edit_scope(user)['canCreateSelf']):
|
||||
raise a.Problem('已有本人关联,不能用另一个人物切换维护范围', 403)
|
||||
people = a.HOUSEHOLDS.objects(user, 'people')
|
||||
links = a.HOUSEHOLDS.objects(user, 'family_links')
|
||||
if kind == 'person' and not old and not bind_self:
|
||||
relative = data.get('relativeId')
|
||||
a.HOUSEHOLDS.owns(user, a.get_object('people', relative))
|
||||
relation = data.get('relativeKind')
|
||||
if relation not in ('parent', 'child', 'spouse'):
|
||||
raise a.Problem('新增人物时请选择与已有亲属的关系')
|
||||
if relative not in self.edit_scope(user)['editablePersonIds']:
|
||||
raise a.Problem('请选择本人上下五代内可维护的亲属', 403)
|
||||
added_link = dict(id=secrets.token_hex(8), fromId=item['id'] if relation == 'parent' else relative,
|
||||
toId=relative if relation == 'parent' else item['id'],
|
||||
kind='spouse' if relation == 'spouse' else 'parent', active=True,
|
||||
lineage='unspecified', note='', familyId=family_id,
|
||||
updatedAt=item['updatedAt'], updatedBy=user['username'])
|
||||
self.check_write(user, kind, item, proposed_people=people+[item], proposed_links=links+[added_link])
|
||||
elif kind == 'link':
|
||||
self.check_write(user, kind, item, old, people, [e for e in links if e['id'] != item['id']]+[item])
|
||||
elif not bind_self:
|
||||
self.check_write(user, kind, item, old)
|
||||
if kind == 'event':
|
||||
item.update(createdAt=old.get('createdAt', item['updatedAt']) if old else item['updatedAt'],
|
||||
createdBy=old.get('createdBy', user['username']) if old else user['username'])
|
||||
@@ -79,8 +151,16 @@ class Family:
|
||||
a.DB.execute('INSERT INTO family_changes VALUES (?,?,?,?,?,?,?,?)',
|
||||
(change_revision, kind, item['id'], json.dumps(old) if old else None,
|
||||
json.dumps(item), user['username'], item['updatedAt'], restored_from))
|
||||
if added_link:
|
||||
a.DB.execute('INSERT INTO family_links VALUES (?,?)', (added_link['id'], json.dumps(added_link)))
|
||||
a.DB.execute('INSERT INTO family_changes VALUES (?,?,?,?,?,?,?,?)',
|
||||
(change_revision+1, 'link', added_link['id'], None, json.dumps(added_link),
|
||||
user['username'], item['updatedAt'], None))
|
||||
if bind_self:
|
||||
account = dict(a.get_object('users', user['id']), personId=item['id'])
|
||||
a.DB.execute('UPDATE users SET body=? WHERE id=?', (json.dumps(account), user['id']))
|
||||
a.audit({'person': '更新家谱人物', 'link': '更新家谱关系', 'event': '更新家族记事'}[kind], user['username'])
|
||||
return {'item': item, 'revision': revision + 1}
|
||||
return {'item': item, 'revision': revision + 1, 'changeRevision': change_revision}
|
||||
|
||||
def history(self, user, kind, target_id, before=None):
|
||||
# Previous drafts and withdrawn text are visible only to family editors.
|
||||
|
||||
+3
-1
@@ -102,7 +102,9 @@ class Accounts:
|
||||
if actor and actor['id'] == uid and (disabled or role != actor['role']):
|
||||
raise a.Problem('不能停用或降低当前登录账号的管理权限')
|
||||
related = a.clean_text(data.get('relatedToId', ''), 32)
|
||||
person = a.clean_text(data.get('personId', ''), 32)
|
||||
person = a.clean_text(data.get('personId', (old or {}).get('personId', '')), 32)
|
||||
if old and old.get('personId') and person != old['personId']:
|
||||
raise a.Problem('本人关联已固定,不能通过更换或解除关联绕过五代维护范围', 403)
|
||||
if related and related != uid and not a.get_object('users', related):
|
||||
raise a.Problem('关系参照账号不存在')
|
||||
if related and related != uid:
|
||||
|
||||
+1
-1
@@ -73,7 +73,7 @@ def command(source, authorization, duration):
|
||||
'-tune', 'zerolatency', '-profile:v', 'baseline', '-pix_fmt', 'yuv420p',
|
||||
'-crf', '26', '-g', '20', '-bf', '0']
|
||||
input_options = (['-rw_timeout', '15000000', '-headers', 'Authorization: ' + authorization + '\r\n']
|
||||
if authorization else ['-readrate', '1'])
|
||||
if authorization else [])
|
||||
return [executable, '-hide_banner', '-loglevel', 'error', '-nostdin',
|
||||
'-threads', '1', '-filter_threads', '1'] + acceleration + input_options + [
|
||||
'-analyzeduration', '1000000', '-probesize', '1000000',
|
||||
|
||||
+39
-30
@@ -25,6 +25,9 @@ class WebTests(unittest.TestCase):
|
||||
def setUpClass(cls):
|
||||
app.initialize()
|
||||
cls.admin = app.ACCOUNTS.save({'username': 'admin', 'password': 'test-password', 'role': 'admin'}, None)
|
||||
person = dict(app.FAMILY.person({'name': 'Test account self'}, None), familyId=cls.admin['familyId'])
|
||||
app.save_object('people', person)
|
||||
cls.admin = app.ACCOUNTS.save(dict(cls.admin, personId=person['id']), cls.admin)
|
||||
cls.server = app.ThreadingHTTPServer(('127.0.0.1', 0), app.Handler)
|
||||
cls.thread = threading.Thread(target=cls.server.serve_forever, daemon=True)
|
||||
cls.thread.start()
|
||||
@@ -192,12 +195,11 @@ class WebTests(unittest.TestCase):
|
||||
|
||||
def test_family_graph_validation_and_revision(self):
|
||||
def save(kind,data):
|
||||
return app.FAMILY.save(kind,dict(data,revision=app.setting('familyRevision',0)),self.admin)['item']
|
||||
return self.family_save(kind,data)['item']
|
||||
p=save('person',{'name':'祖辈','biography':'第一行\n第二行'})
|
||||
q=save('person',{'name':'子辈'})
|
||||
r=save('person',{'name':'孙辈'})
|
||||
first=save('link',{'fromId':p['id'],'toId':q['id'],'kind':'parent'})
|
||||
save('link',{'fromId':q['id'],'toId':r['id'],'kind':'parent'})
|
||||
q=save('person',{'name':'子辈','relativeId':p['id']})
|
||||
r=save('person',{'name':'孙辈','relativeId':q['id']})
|
||||
first=next(e for e in app.objects('family_links') if e['fromId']==p['id'] and e['toId']==q['id'])
|
||||
for value in [{'fromId':r['id'],'toId':p['id'],'kind':'parent'},
|
||||
{'fromId':p['id'],'toId':p['id'],'kind':'parent'},
|
||||
{'fromId':p['id'],'toId':r['id'],'kind':'spouse'},
|
||||
@@ -209,9 +211,8 @@ class WebTests(unittest.TestCase):
|
||||
save('person',{'name':'错误日期','birthDate':'2026-02-30'})
|
||||
with self.assertRaises(app.Problem):
|
||||
save('person',{'name':'错误日期','birthDate':'2020-01-01','deathDate':'1900-01-01','lifeStatus':'deceased'})
|
||||
save('link',dict(first,active=False))
|
||||
self.assertFalse(app.get_object('family_links',first['id'])['active'])
|
||||
save('link',dict(first,active=True))
|
||||
with self.assertRaises(app.Problem):save('link',dict(first,active=False))
|
||||
self.assertTrue(app.get_object('family_links',first['id'])['active'])
|
||||
save('person',dict(p,archived=True))
|
||||
self.assertTrue(app.get_object('people',p['id'])['archived'])
|
||||
save('person',dict(p,archived=False))
|
||||
@@ -281,7 +282,7 @@ class WebTests(unittest.TestCase):
|
||||
def test_family_event_draft_publish_archive_and_restore(self):
|
||||
def save(data):
|
||||
return app.FAMILY.save('event',dict(data,revision=app.setting('familyRevision',0)),self.admin)['item']
|
||||
p=app.FAMILY.save('person',{'name':'Event person','revision':app.setting('familyRevision',0)},self.admin)['item']
|
||||
p=self.family_save('person',{'name':'Event person'})['item']
|
||||
reader={'role':'member','familyAccess':'read','personId':p['id']}
|
||||
e=save({'title':'First event','eventDate':'2024-02-10','summary':'Summary','body':'Line one\nLine two','personIds':[p['id'],p['id']]})
|
||||
self.assertEqual(e['status'],'draft');self.assertEqual(e['personIds'],[p['id']])
|
||||
@@ -337,16 +338,18 @@ class WebTests(unittest.TestCase):
|
||||
self.assertEqual(event['publishedAt'],published);self.assertEqual(event['createdAt'],created)
|
||||
|
||||
def test_biological_birth_order_checked_on_link_and_person_changes(self):
|
||||
def save(kind,data):return app.FAMILY.save(kind,dict(data,revision=app.setting('familyRevision',0)),self.admin)['item']
|
||||
def save(kind,data):return self.family_save(kind,data)['item']
|
||||
parent=save('person',{'name':'Parent','birthDate':'1980-01-01'})
|
||||
child=save('person',{'name':'Child','birthDate':'2000-01-01'})
|
||||
relation=save('link',{'fromId':parent['id'],'toId':child['id'],'kind':'parent','lineage':'biological'})
|
||||
child=save('person',{'name':'Child','birthDate':'2000-01-01','relativeId':parent['id']})
|
||||
edge=next(e for e in app.objects('family_links') if e['toId']==child['id'])
|
||||
relation=save('link',dict(edge,lineage='biological'))
|
||||
for person,date in [(parent,'2000-01-01'),(parent,'2001-01-01'),(child,'1979-01-01')]:
|
||||
revision=app.setting('familyRevision',0)
|
||||
with self.assertRaises(app.Problem):save('person',dict(person,birthDate=date))
|
||||
self.assertEqual(app.setting('familyRevision',0),revision)
|
||||
self.assertEqual(app.get_object('people',person['id'])['birthDate'],person['birthDate'])
|
||||
save('link',dict(relation,active=False))
|
||||
# Legacy inactive data can exist; seed it to exercise current birth validation.
|
||||
app.save_object('family_links',dict(relation,lineage='adoptive'))
|
||||
save('person',dict(parent,birthDate='2001-01-01'))
|
||||
with self.assertRaises(app.Problem):save('link',dict(relation,active=True))
|
||||
save('link',dict(relation,active=True,lineage='adoptive'))
|
||||
@@ -440,28 +443,30 @@ class WebTests(unittest.TestCase):
|
||||
self.assertEqual(app.recording_state(camera, True, True), 'paused')
|
||||
|
||||
def family_save(self, kind, data):
|
||||
if kind == 'person' and not data.get('id'):
|
||||
data = dict({'relativeId':self.admin['personId'], 'relativeKind':'child'}, **data)
|
||||
return app.FAMILY.save(kind, dict(data, revision=app.setting('familyRevision', 0)), self.admin)
|
||||
|
||||
def test_history_records_before_after_and_restore_as_new_version(self):
|
||||
first = self.family_save('person', {'name': 'History original', 'biography': 'Original story'})
|
||||
second = self.family_save('person', dict(first['item'], name='History changed'))
|
||||
change = app.FAMILY.change(self.admin, second['revision'])
|
||||
change = app.FAMILY.change(self.admin, second['changeRevision'])
|
||||
self.assertEqual(change['before']['name'], 'History original')
|
||||
self.assertEqual(change['after']['name'], 'History changed')
|
||||
restored = app.FAMILY.restore({'changeRevision': second['revision'], 'side': 'before',
|
||||
restored = app.FAMILY.restore({'changeRevision': second['changeRevision'], 'side': 'before',
|
||||
'revision': app.setting('familyRevision')}, self.admin)
|
||||
self.assertEqual(restored['item']['name'], 'History original')
|
||||
self.assertGreater(restored['revision'], second['revision'])
|
||||
entries = app.FAMILY.history(self.admin, 'person', first['item']['id'])['items']
|
||||
self.assertEqual(len(entries), 3)
|
||||
self.assertEqual(entries[0]['restoredFrom'], second['revision'])
|
||||
self.assertEqual(app.FAMILY.change(self.admin, second['revision']), change)
|
||||
self.assertEqual(entries[0]['restoredFrom'], second['changeRevision'])
|
||||
self.assertEqual(app.FAMILY.change(self.admin, second['changeRevision']), change)
|
||||
|
||||
def test_history_rejects_stale_restore_without_writing(self):
|
||||
first = self.family_save('person', {'name': 'Stale restore'})
|
||||
second = self.family_save('person', dict(first['item'], name='Latest'))
|
||||
with self.assertRaises(app.Problem) as caught:
|
||||
app.FAMILY.restore(dict(changeRevision=first['revision'], side='after', revision=first['revision']), self.admin)
|
||||
app.FAMILY.restore(dict(changeRevision=first['changeRevision'], side='after', revision=first['revision']), self.admin)
|
||||
self.assertEqual(caught.exception.status, 409)
|
||||
self.assertEqual(app.get_object('people', first['item']['id'])['name'], 'Latest')
|
||||
self.assertEqual(app.setting('familyRevision'), second['revision'])
|
||||
@@ -469,32 +474,36 @@ class WebTests(unittest.TestCase):
|
||||
def test_restore_revalidates_current_birth_order(self):
|
||||
old = self.family_save('person', {'name': 'Restore parent', 'birthDate': '1980-01-01'})
|
||||
parent = self.family_save('person', dict(old['item'], birthDate='1960-01-01'))['item']
|
||||
child = self.family_save('person', {'name': 'Restore child', 'birthDate': '1970-01-01'})['item']
|
||||
self.family_save('link', dict(fromId=parent['id'], toId=child['id'], kind='parent', lineage='biological'))
|
||||
child = self.family_save('person', {'name': 'Restore child', 'birthDate': '1970-01-01', 'relativeId':parent['id']})['item']
|
||||
edge=next(e for e in app.objects('family_links') if e['toId']==child['id'])
|
||||
self.family_save('link', dict(edge, lineage='biological'))
|
||||
with self.assertRaises(app.Problem):
|
||||
app.FAMILY.restore(dict(changeRevision=old['revision'], side='after', revision=app.setting('familyRevision')), self.admin)
|
||||
app.FAMILY.restore(dict(changeRevision=old['changeRevision'], side='after', revision=app.setting('familyRevision')), self.admin)
|
||||
self.assertEqual(app.get_object('people', parent['id'])['birthDate'], '1960-01-01')
|
||||
|
||||
def test_restore_link_cannot_create_new_cycle(self):
|
||||
a = self.family_save('person', {'name': 'Cycle A'})['item']
|
||||
b = self.family_save('person', {'name': 'Cycle B'})['item']
|
||||
old = self.family_save('link', dict(fromId=a['id'], toId=b['id'], kind='parent'))
|
||||
self.family_save('link', dict(old['item'], active=False))
|
||||
self.family_save('link', dict(fromId=b['id'], toId=a['id'], kind='parent'))
|
||||
b = self.family_save('person', {'name': 'Cycle B','relativeId':a['id']})['item']
|
||||
edge=next(e for e in app.objects('family_links') if e['toId']==b['id'])
|
||||
old = self.family_save('link', dict(edge, note='History'))
|
||||
# Seed a changed legacy graph; the current API disallows this displacement.
|
||||
app.save_object('family_links',dict(old['item'],active=False))
|
||||
inverse=app.FAMILY.link(dict(fromId=b['id'],toId=a['id'],kind='parent'),None)
|
||||
app.save_object('family_links',dict(inverse,familyId=self.admin['familyId']))
|
||||
with self.assertRaises(app.Problem):
|
||||
app.FAMILY.restore(dict(changeRevision=old['revision'], side='after', revision=app.setting('familyRevision')), self.admin)
|
||||
app.FAMILY.restore(dict(changeRevision=old['changeRevision'], side='after', revision=app.setting('familyRevision')), self.admin)
|
||||
self.assertFalse(app.get_object('family_links', old['item']['id'])['active'])
|
||||
|
||||
def test_restore_event_preserves_first_publication_and_validates_scope(self):
|
||||
draft = self.family_save('event', dict(title='Restored story', eventDate='2020-01-01', body='Draft', status='draft'))
|
||||
published = self.family_save('event', dict(draft['item'], body='Published', status='published'))
|
||||
restored = app.FAMILY.restore(dict(changeRevision=draft['revision'], side='after', revision=app.setting('familyRevision')), self.admin)
|
||||
restored = app.FAMILY.restore(dict(changeRevision=draft['changeRevision'], side='after', revision=app.setting('familyRevision')), self.admin)
|
||||
self.assertEqual(restored['item']['status'], 'draft')
|
||||
self.assertEqual(restored['item']['publishedAt'], published['item']['publishedAt'])
|
||||
self.assertNotIn(draft['item']['id'], [e['id'] for e in app.FAMILY.snapshot(dict(role='member', familyAccess='read'))['events']])
|
||||
for side in ['before', 'invalid']:
|
||||
with self.assertRaises(app.Problem):
|
||||
app.FAMILY.restore(dict(changeRevision=draft['revision'], side=side, revision=app.setting('familyRevision')), self.admin)
|
||||
app.FAMILY.restore(dict(changeRevision=draft['changeRevision'], side=side, revision=app.setting('familyRevision')), self.admin)
|
||||
|
||||
def test_history_pagination_is_complete_and_omits_story_bodies(self):
|
||||
item = self.family_save('person', {'name': 'Pagination', 'biography': 'Private full story'})['item']
|
||||
@@ -515,7 +524,7 @@ class WebTests(unittest.TestCase):
|
||||
app.DB.execute('INSERT INTO sessions VALUES (?,?,?)', (hashlib.sha256(token.encode()).hexdigest(), time.time()+3600, reader['id']))
|
||||
app.DB.commit()
|
||||
path = '/api/family/history?kind=person&id=' + item['item']['id']
|
||||
for target in [path, '/api/family/change?revision=' + str(item['revision'])]:
|
||||
for target in [path, '/api/family/change?revision=' + str(item['changeRevision'])]:
|
||||
self.assertEqual(self.request(target, token=token)[0], 403)
|
||||
self.assertEqual(self.request(target, authenticated=False)[0], 401)
|
||||
self.assertEqual(self.request(target)[0], 200)
|
||||
@@ -541,7 +550,7 @@ class WebTests(unittest.TestCase):
|
||||
revision = app.setting('familyRevision', 0); barrier = threading.Barrier(2)
|
||||
def save(index):
|
||||
barrier.wait()
|
||||
try:app.FAMILY.save('person', dict(name='Concurrent '+str(index), revision=revision), self.admin);return 200
|
||||
try:app.FAMILY.save('person', dict(name='Concurrent '+str(index), revision=revision, relativeId=self.admin['personId'], relativeKind='child'), self.admin);return 200
|
||||
except app.Problem as e:return e.status
|
||||
with ThreadPoolExecutor(max_workers=2) as pool:self.assertEqual(sorted(pool.map(save, range(2))), [200, 409])
|
||||
self.assertEqual(app.setting('familyRevision'), revision+1)
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
const test=require('node:test'),assert=require('node:assert/strict'),fs=require('node:fs');
|
||||
const charts=()=>import('./frontend/src/composables/charts.mjs');
|
||||
test('dashboard counts physical devices once, not lenses; handles missing network metadata',async()=>{
|
||||
const {summarizeDevices}=await charts();
|
||||
assert.equal(summarizeDevices().total,0);
|
||||
const result=summarizeDevices({assets:[{id:'camera',networkAccess:'tailscale'}],cameras:[{assetId:'camera'},{assetId:'camera'}],recorders:[{networkAccess:'lan'}],devices:[{deviceType:'灯'}, {deviceType:'灯',networkAccess:'lan'}]});
|
||||
assert.equal(result.total,4); assert.equal(result.types.find(x=>x.label==='灯').count,2);
|
||||
assert.equal(result.networks.find(x=>x.label==='待登记').count,1);
|
||||
});
|
||||
test('chart aggregates remain numerical and empty charts are valid',async()=>{
|
||||
const {bars,distribution}=await charts();
|
||||
assert.deepEqual(bars().series[0].data,[]);
|
||||
assert.equal(distribution([{label:'a',count:-2}]).series[0].data[0].value,0);
|
||||
assert.equal(bars([{label:'a',count:'3'}]).series[0].data[0].value,3);
|
||||
});
|
||||
test('network chart cannot draw phantom parent or cyclic connections',async()=>{
|
||||
const {networkChart}=await charts();
|
||||
const option=networkChart([{device:{id:'r',name:'路由',source:'device'},depth:0},{device:{id:'c',name:'摄像头',uplinkId:'r',networkHosts:['192.168.8.160']},depth:1},{device:{id:'x',name:'独立',uplinkId:'missing'},depth:0}]);
|
||||
assert.deepEqual(option.series[0].links,[{source:'r',target:'c'}]);
|
||||
assert.equal(option.series[0].data.length,3);assert.equal(option.series[0].data[1].targetId,'c');
|
||||
assert.match(option.series[0].data[1].caption,/192\.168\.8\.160/);
|
||||
assert.equal(option.series[0].layout,'none');
|
||||
});
|
||||
test('platform graph only includes supplied authorized households and no device leakage',async()=>{
|
||||
const {platformChart}=await charts();
|
||||
const series=platformChart([{id:'one',name:'家庭A',deviceCount:2}],'本平台').series[0];
|
||||
assert.deepEqual(series.data.map(x=>x.id),['platform','home:one']);
|
||||
assert.equal(series.data[1].targetId,'one');assert.equal(series.links.length,1);
|
||||
});
|
||||
test('ECharts runtime is local, lazy, deterministic and releases resources',()=>{
|
||||
const runtime=fs.readFileSync('frontend/src/composables/charts-runtime.js','utf8'),widget=fs.readFileSync('frontend/src/components/LocalChart.vue','utf8');
|
||||
assert.match(runtime,/echarts\/core/);assert.doesNotMatch(runtime,/https?:\/\//);
|
||||
assert.match(widget,/import\('\.\.\/composables\/charts-runtime\.js'\)/);
|
||||
assert.match(widget,/animation: false/);assert.match(widget,/fingerprint !== last/);
|
||||
assert.match(widget,/renderMode: 'richText'/);assert.match(widget,/onBeforeUnmount/);
|
||||
assert.match(widget,/resizeObserver\?\.disconnect/);assert.match(widget,/chart\?\.dispose/);
|
||||
});
|
||||
test('deployed entry and controller dependencies have no remote CDN references',()=>{
|
||||
const html=fs.readFileSync('web/ui/index.html','utf8');
|
||||
for(const match of html.matchAll(/(?:src|href)="([^"]+)"/g))assert.ok(match[1].startsWith('/'),match[1]);
|
||||
const scripts=JSON.parse(fs.readFileSync('frontend/src/compat/scripts.json','utf8'));
|
||||
for(const script of scripts){assert.ok(script.startsWith('/')&&!script.startsWith('//'));assert.ok(fs.existsSync('web'+script));}
|
||||
for(const file of ['frontend/src/main.js','frontend/src/dashboard.css','frontend/src/theme.css','frontend/src/bootstrap-polish.css'])assert.doesNotMatch(fs.readFileSync(file,'utf8'),/(?:@import\s+|(?:src|href)\s*=\s*|url\(\s*['"]?)https?:\/\//);
|
||||
});
|
||||
@@ -0,0 +1,153 @@
|
||||
"""Real storage and HTTP regressions for the universal five-generation boundary."""
|
||||
import hashlib
|
||||
import http.client
|
||||
import json
|
||||
import secrets
|
||||
import sqlite3
|
||||
import tempfile
|
||||
import threading
|
||||
import time
|
||||
import unittest
|
||||
from pathlib import Path
|
||||
from unittest.mock import patch
|
||||
from test_app import app
|
||||
from family_permissions import generations
|
||||
|
||||
|
||||
class FamilyPermissionTests(unittest.TestCase):
|
||||
def setUp(self):
|
||||
self.temp = tempfile.TemporaryDirectory(); self.addCleanup(self.temp.cleanup)
|
||||
db = sqlite3.connect(':memory:', check_same_thread=False); db.row_factory = sqlite3.Row
|
||||
self.addCleanup(db.close)
|
||||
db.executescript('CREATE TABLE settings (key TEXT PRIMARY KEY,value TEXT NOT NULL);'
|
||||
'CREATE TABLE sessions (hash TEXT PRIMARY KEY,expires REAL NOT NULL);'
|
||||
'CREATE TABLE audit (id INTEGER PRIMARY KEY,at TEXT,action TEXT,name TEXT);')
|
||||
for table in ('sites', 'assets', 'recorders', 'cameras'):
|
||||
db.execute('CREATE TABLE '+table+' (id TEXT PRIMARY KEY,body TEXT NOT NULL)')
|
||||
for key, value in [('DB', db), ('DATA', Path(self.temp.name)), ('write_media_config', lambda: None)]:
|
||||
p = patch.object(app, key, value); p.start(); self.addCleanup(p.stop)
|
||||
app.initialize()
|
||||
self.actor = app.ACCOUNTS.save(dict(username='admin', password='fixture-only', role='admin'), None)
|
||||
self.home = self.actor['familyId']
|
||||
self.people = {}
|
||||
for generation in range(5, 40):
|
||||
person = dict(app.FAMILY.person(dict(name='第'+str(generation)+'代'), None), familyId=self.home)
|
||||
app.save_object('people', person); self.people[generation] = person
|
||||
for generation in range(5, 39):
|
||||
edge = dict(id=secrets.token_hex(8), fromId=self.people[generation]['id'],
|
||||
toId=self.people[generation+1]['id'], kind='parent', lineage='unspecified',
|
||||
active=True, note='', familyId=self.home)
|
||||
app.save_object('family_links', edge)
|
||||
self.actor = app.ACCOUNTS.save(dict(self.actor, personId=self.people[32]['id']), self.actor)
|
||||
|
||||
def save(self, kind, item, **extra):
|
||||
return app.FAMILY.save(kind, dict(item, revision=app.setting('familyRevision', 0), **extra), self.actor)
|
||||
|
||||
def test_all_roles_can_edit_fifth_but_not_sixth_or_ancient_generation(self):
|
||||
for role in ('admin', 'family_admin', 'member'):
|
||||
self.actor = dict(self.actor, role=role, familyAccess='edit')
|
||||
for generation in (27, 32, 37):
|
||||
self.save('person', dict(self.people[generation], note=role))
|
||||
for generation in (5, 26, 38):
|
||||
with self.subTest(role=role, generation=generation), self.assertRaises(app.Problem) as caught:
|
||||
self.save('person', dict(self.people[generation], note='denied'))
|
||||
self.assertEqual(caught.exception.status, 403)
|
||||
self.assertEqual(app.get_object('people', self.people[generation]['id'])['note'], '')
|
||||
|
||||
def test_view_contains_all_generations_and_reference_cannot_change_scope(self):
|
||||
view = app.FAMILY.snapshot(self.actor)
|
||||
self.assertEqual(len(view['people']), 35)
|
||||
self.assertEqual(view['editScope']['levels'][self.people[5]['id']], -27)
|
||||
self.assertNotIn(self.people[5]['id'], view['editScope']['editablePersonIds'])
|
||||
self.assertEqual(len(view['editScope']['editablePersonIds']), 11)
|
||||
with self.assertRaises(app.Problem):
|
||||
app.FAMILY.save('person', dict(self.people[5], note='forged', revision=0, selfId=self.people[5]['id']),
|
||||
dict(self.actor, personId=self.people[5]['id']))
|
||||
|
||||
def test_new_relative_is_atomic_and_sixth_leaves_no_orphan(self):
|
||||
before = len(app.objects('people'))
|
||||
for relative, kind in ((27, 'parent'), (37, 'child')):
|
||||
with self.assertRaises(app.Problem) as caught:
|
||||
self.save('person', dict(name='Outside'), relativeId=self.people[relative]['id'], relativeKind=kind)
|
||||
self.assertEqual(caught.exception.status, 403)
|
||||
self.assertEqual(len(app.objects('people')), before)
|
||||
result = self.save('person', dict(name='A sibling'), relativeId=self.people[31]['id'], relativeKind='child')
|
||||
self.assertEqual(app.FAMILY.snapshot(self.actor)['editScope']['levels'][result['item']['id']], 0)
|
||||
self.assertTrue(any(e['toId'] == result['item']['id'] for e in app.objects('family_links')))
|
||||
|
||||
def test_relationship_rewrite_and_disconnect_cannot_launder_scope(self):
|
||||
with self.assertRaises(app.Problem):
|
||||
self.save('link', dict(fromId=self.people[32]['id'], toId=self.people[5]['id'], kind='spouse'))
|
||||
edge = next(e for e in app.objects('family_links') if e['fromId'] == self.people[30]['id'])
|
||||
with self.assertRaises(app.Problem): self.save('link', dict(edge, active=False))
|
||||
self.assertTrue(app.get_object('family_links', edge['id'])['active'])
|
||||
with self.assertRaises(app.Problem):
|
||||
self.save('link', dict(fromId=self.people[28]['id'], toId=self.people[30]['id'], kind='parent'))
|
||||
|
||||
def test_old_event_cannot_be_retargeted_to_self_to_gain_write_access(self):
|
||||
event = dict(app.FAMILY.event(dict(title='Old ancestor', eventDate='1900-01-01',
|
||||
body='untouched', personIds=[self.people[5]['id']], status='published'), None), familyId=self.home)
|
||||
app.save_object('family_events', event)
|
||||
with self.assertRaises(app.Problem): self.save('event', dict(event, personIds=[self.people[32]['id']], body='denied'))
|
||||
self.assertEqual(app.get_object('family_events', event['id'])['body'], 'untouched')
|
||||
self.assertIn(event['id'], [e['id'] for e in app.FAMILY.snapshot(self.actor)['events']])
|
||||
|
||||
def test_history_restore_cannot_change_far_person(self):
|
||||
person = self.people[5]
|
||||
app.DB.execute('INSERT INTO family_changes VALUES (?,?,?,?,?,?,?,?)',
|
||||
(1, 'person', person['id'], None, json.dumps(dict(person, note='old text')), 'fixture', '2026-10-01', None))
|
||||
app.DB.commit()
|
||||
with self.assertRaises(app.Problem) as caught:
|
||||
app.FAMILY.restore(dict(changeRevision=1, side='after', revision=0), self.actor)
|
||||
self.assertEqual(caught.exception.status, 403)
|
||||
self.assertEqual(app.get_object('people', person['id'])['note'], '')
|
||||
|
||||
def test_binding_cannot_be_cleared_or_changed_even_by_super_admin(self):
|
||||
for person in ('', self.people[5]['id']):
|
||||
with self.assertRaises(app.Problem) as caught:
|
||||
app.ACCOUNTS.save(dict(self.actor, personId=person), self.actor)
|
||||
self.assertEqual(caught.exception.status, 403)
|
||||
|
||||
def test_unbound_account_can_create_only_its_own_starting_record(self):
|
||||
account = app.ACCOUNTS.save(dict(username='unbound', password='fixture-only', familyAccess='edit'), self.actor)
|
||||
self.assertFalse(app.FAMILY.snapshot(account)['canEdit'])
|
||||
with self.assertRaises(app.Problem):
|
||||
app.FAMILY.save('person', dict(self.people[32], note='denied', revision=0), account)
|
||||
result = app.FAMILY.save('person', dict(name='New self', asSelf=True, revision=0), account)
|
||||
self.assertEqual(app.get_object('users', account['id'])['personId'], result['item']['id'])
|
||||
with self.assertRaises(app.Problem):
|
||||
app.FAMILY.save('person', dict(name='Another self', asSelf=True, revision=1), account)
|
||||
|
||||
def test_conflicting_generations_fail_closed(self):
|
||||
edge = dict(id=secrets.token_hex(8), fromId=self.people[27]['id'], toId=self.people[29]['id'],
|
||||
kind='parent', active=True, familyId=self.home)
|
||||
app.save_object('family_links', edge)
|
||||
self.assertTrue(app.FAMILY.snapshot(self.actor)['editScope']['conflict'])
|
||||
self.assertFalse(app.FAMILY.snapshot(self.actor)['canEdit'])
|
||||
with self.assertRaises(app.Problem): self.save('person', dict(self.people[32], note='denied'))
|
||||
|
||||
def test_http_direct_write_is_denied_for_super_admin(self):
|
||||
token = 'a'*64
|
||||
app.DB.execute('INSERT INTO sessions VALUES (?,?,?)', (hashlib.sha256(token.encode()).hexdigest(), time.time()+60, self.actor['id']))
|
||||
app.DB.commit()
|
||||
server = app.ThreadingHTTPServer(('127.0.0.1', 0), app.Handler)
|
||||
thread = threading.Thread(target=server.serve_forever, daemon=True); thread.start()
|
||||
try:
|
||||
c = http.client.HTTPConnection(*server.server_address, timeout=3)
|
||||
c.request('POST', '/api/family/person', json.dumps(dict(self.people[5], note='denied', revision=0)),
|
||||
{'Cookie': 'vision='+token, 'Content-Type': 'application/json'})
|
||||
response = c.getresponse(); response.read(); c.close()
|
||||
self.assertEqual(response.status, 403)
|
||||
finally:
|
||||
server.shutdown(); server.server_close(); thread.join()
|
||||
|
||||
def test_offsets_are_generation_difference_not_number_of_clicks(self):
|
||||
spouse = dict(app.FAMILY.person({'name':'spouse'}, None), familyId=self.home)
|
||||
app.save_object('people', spouse)
|
||||
app.save_object('family_links', dict(id=secrets.token_hex(8), fromId=self.people[32]['id'],
|
||||
toId=spouse['id'], kind='spouse', active=True, familyId=self.home))
|
||||
levels, conflict = generations(app.objects('people'), app.objects('family_links'), self.people[32]['id'])
|
||||
self.assertFalse(conflict); self.assertEqual(levels[spouse['id']], 0)
|
||||
|
||||
|
||||
if __name__ == '__main__': unittest.main()
|
||||
+2
-2
@@ -157,8 +157,8 @@ class HouseholdTests(unittest.TestCase):
|
||||
self.assertEqual(self.request('/api/households',self.members[self.aid],{'name':'unauthorized'})[0],403)
|
||||
|
||||
def test_genealogy_revisions_history_restore_and_refs_isolated(self):
|
||||
a = app.FAMILY.save('person',dict(name='A private',revision=0),self.owner)['item']
|
||||
b = app.FAMILY.save('person',dict(name='B private',revision=0),self.other)['item']
|
||||
a = app.FAMILY.save('person',dict(name='A private',revision=0,asSelf=True),self.owner)['item']
|
||||
b = app.FAMILY.save('person',dict(name='B private',revision=0,asSelf=True),self.other)['item']
|
||||
self.assertEqual(self.request('/api/family')[1]['revision'],1)
|
||||
self.assertEqual([p['name'] for p in self.request('/api/family')[1]['people']],['A private'])
|
||||
revision=app.FAMILY.history(self.other,'person',b['id'])['items'][0]['revision']
|
||||
|
||||
@@ -53,10 +53,10 @@ class PlaybackCacheTests(unittest.TestCase):
|
||||
self.assertEqual((fresh/'source.mp4').read_bytes(),b'active')
|
||||
self.assertEqual(unrelated.read_text(),'keep')
|
||||
|
||||
def test_local_converter_is_paced_and_has_no_credentials(self):
|
||||
def test_local_converter_can_buffer_ahead_and_has_no_credentials(self):
|
||||
with patch('playback.shutil.which', return_value='ffmpeg'), patch('playback.os.access', return_value=False):
|
||||
cmd=playback.command('/tmp/private/source.mp4', '', 300)
|
||||
self.assertIn('-readrate', cmd)
|
||||
self.assertNotIn('-readrate', cmd)
|
||||
self.assertNotIn('-headers', cmd)
|
||||
self.assertIn('libx264', cmd)
|
||||
self.assertEqual(cmd[cmd.index('-threads')+1], '1')
|
||||
|
||||
+9
-1
@@ -4,6 +4,14 @@ const source=name=>fs.readFileSync('web/'+name,'utf8');
|
||||
function section(file,start,end){const s=source(file),a=s.indexOf(start),b=s.indexOf(end,a+start.length);assert.ok(a>=0&&b>a);return s.slice(a,b);}
|
||||
const apiSource=section('app.js','async function api(','function toast(');
|
||||
const refreshSource=section('app.js','async function refresh(','async function auth(');
|
||||
test('genealogy UI applies write scope independently of viewing reference',()=>{
|
||||
const family={canEdit:true,editScope:{limit:5,levels:{self:0,near:-5,far:-6},editablePersonIds:['self','near']},links:[{id:'edge',fromId:'near',toId:'far'}],events:[{id:'event',personIds:['far']}]};
|
||||
const c=vm.createContext({family});vm.runInContext(section('family.js','function familyEditable(','function editablePeopleOptions('),c);
|
||||
assert.equal(c.familyEditable('person','near'),true);assert.equal(c.familyEditable('person','far'),false);
|
||||
assert.equal(c.familyEditable('link','edge'),false);assert.equal(c.familyEditable('event','event'),false);
|
||||
assert.match(c.familyScopeLabel('far'),/只读/);family.selfId='far';assert.equal(c.familyEditable('person','far'),false);
|
||||
family.canEdit=false;assert.equal(c.familyEditable('person','near'),false);
|
||||
});
|
||||
function context(extra={}){return vm.createContext({sessionGeneration:0,refreshGeneration:0,authGeneration:0,loggedIn:true,currentUser:{id:'a'},state:{},Error,...extra});}
|
||||
function deferred(){let resolve,reject;const promise=new Promise((a,b)=>{resolve=a;reject=b;});return {promise,resolve,reject};}
|
||||
|
||||
@@ -57,7 +65,7 @@ test('archived person reached from an event is revealed before graph location',(
|
||||
test('event default save preserves published state and exposes explicit withdrawal',()=>{
|
||||
const controls=new Map(),form={dataset:{},querySelector:s=>{if(!controls.has(s))controls.set(s,{});return controls.get(s);}};
|
||||
const elements=new Map([['#event-form',form]]);const $=s=>{if(!elements.has(s))elements.set(s,{showModal(){},close(){}});return elements.get(s);};
|
||||
const c=context({family:{canEdit:true,revision:3,people:[],events:[{id:'published',status:'published',personIds:[]}]},$,fillForm:()=>{},initDateFields:()=>{},esc:String});
|
||||
const c=context({family:{canEdit:true,revision:3,people:[],events:[{id:'published',status:'published',personIds:[]}]},familyEditable:()=>true,$,fillForm:()=>{},initDateFields:()=>{},esc:String});
|
||||
vm.runInContext(section('family-events.js','function editFamilyEvent(',"$('#event-form').addEventListener"),c);
|
||||
c.editFamilyEvent('published');assert.equal(form.querySelector('[data-save-event]').value,'published');assert.equal(form.querySelector('[data-save-event]').textContent,'保存修改');assert.equal(form.querySelector('[data-publish-event]').hidden,true);assert.equal(form.querySelector('[data-withdraw-event]').hidden,false);
|
||||
c.editFamilyEvent();assert.equal(form.querySelector('[data-save-event]').value,'draft');assert.equal(form.querySelector('[data-withdraw-event]').hidden,true);
|
||||
|
||||
@@ -29,22 +29,22 @@ function renderFamilyEvents(){
|
||||
function showPersonEvents(id){familyView='timeline';renderFamily();$('#family-event-person').value=id;$('#family-event-year').value='';$('#family-event-search').value='';$('#family-event-relatives').checked=false;$('#family-event-state').value='published';renderFamilyEvents();$('#family-events').scrollIntoView({behavior:'smooth',block:'start'});}
|
||||
function personEventSummary(id){
|
||||
const events=(family.events||[]).filter(e=>e.personIds.includes(id)&&!e.archived&&e.status==='published').sort((a,b)=>b.eventDate.localeCompare(a.eventDate));
|
||||
return `<section class="person-events"><div class="section-head"><h3>相关重大记事 <small>${events.length}</small></h3>${family.canEdit?`<button class="quiet" data-new-person-event="${id}">+ 记一件事</button>`:''}</div>${(familyView==='timeline'?events.slice(0,3):[]).map(e=>`<button class="person-event-link" data-view-event="${e.id}"><time>${esc(e.eventDate)}</time><span>${esc(e.title)}</span></button>`).join('')||(familyView==='timeline'?'<p class="description">尚无已发布的相关记事。</p>':'')}<button class="quiet" data-person-events="${id}">在时间线追溯 →</button></section>`;
|
||||
return `<section class="person-events"><div class="section-head"><h3>相关重大记事 <small>${events.length}</small></h3>${familyEditable('person',id)?`<button class="quiet" data-new-person-event="${id}">+ 记一件事</button>`:''}</div>${(familyView==='timeline'?events.slice(0,3):[]).map(e=>`<button class="person-event-link" data-view-event="${e.id}"><time>${esc(e.eventDate)}</time><span>${esc(e.title)}</span></button>`).join('')||(familyView==='timeline'?'<p class="description">尚无已发布的相关记事。</p>':'')}<button class="quiet" data-person-events="${id}">在时间线追溯 →</button></section>`;
|
||||
}
|
||||
function openFamilyEvent(id){
|
||||
const e=(family.events||[]).find(e=>e.id===id);if(!e)return;
|
||||
// All content is plain text. External reports are links, never embedded HTML.
|
||||
const safeSource=/^https?:\/\//i.test(e.sourceUrl||'')?e.sourceUrl:'';
|
||||
$('#event-detail-content').innerHTML=`<div class="event-detail-meta"><time>${esc(ZhaoCalendar.describe(e.eventDate))}</time><span class="badge">${esc(eventStatus(e))}</span></div><h2 id="event-detail-title">${esc(e.title)}</h2>${e.summary?`<p class="event-lead">${esc(e.summary)}</p>`:''}<div class="event-associated"><span class="description">关联人物</span>${e.personIds.length?e.personIds.map(id=>`<button class="quiet" data-event-person="${esc(id)}">${esc(personName(id))} ↗</button>`).join(''):'<span>全家记事</span>'}</div><div class="family-prose event-article">${esc(e.body||'此条记事暂未填写详细正文。')}</div>${safeSource?`<a class="button secondary event-source" href="${esc(safeSource)}" target="_blank" rel="noopener noreferrer">阅读原始报道${e.sourceName?' · '+esc(e.sourceName):''} ↗</a>`:e.sourceName?`<p class="description">资料来源:${esc(e.sourceName)}</p>`:''}<p class="description event-updated">最近整理:${esc(new Date(e.updatedAt).toLocaleString())}</p>${family.canEdit?`<button data-edit-event="${e.id}">编辑这条记事</button><button class="quiet" data-history-kind="event" data-history-id="${e.id}">修改记录</button>`:''}`;
|
||||
$('#event-detail-content').innerHTML=`<div class="event-detail-meta"><time>${esc(ZhaoCalendar.describe(e.eventDate))}</time><span class="badge">${esc(eventStatus(e))}</span></div><h2 id="event-detail-title">${esc(e.title)}</h2>${e.summary?`<p class="event-lead">${esc(e.summary)}</p>`:''}<div class="event-associated"><span class="description">关联人物</span>${e.personIds.length?e.personIds.map(id=>`<button class="quiet" data-event-person="${esc(id)}">${esc(personName(id))} ↗</button>`).join(''):'<span>全家记事</span>'}</div><div class="family-prose event-article">${esc(e.body||'此条记事暂未填写详细正文。')}</div>${safeSource?`<a class="button secondary event-source" href="${esc(safeSource)}" target="_blank" rel="noopener noreferrer">阅读原始报道${e.sourceName?' · '+esc(e.sourceName):''} ↗</a>`:e.sourceName?`<p class="description">资料来源:${esc(e.sourceName)}</p>`:''}<p class="description event-updated">最近整理:${esc(new Date(e.updatedAt).toLocaleString())}</p>${familyEditable('event',e.id)?`<button data-edit-event="${e.id}">编辑这条记事</button><button class="quiet" data-history-kind="event" data-history-id="${e.id}">修改记录</button>`:''}`;
|
||||
$('#event-detail-dialog').showModal();
|
||||
}
|
||||
function editFamilyEvent(id,personId=''){
|
||||
if(!family.canEdit)return;
|
||||
if(!family.canEdit||id&&!familyEditable('event',id))return;
|
||||
const e=(family.events||[]).find(e=>e.id===id),f=$('#event-form');
|
||||
fillForm(f,{...(e||{}),revision:family.revision});
|
||||
$('#event-editor-title').textContent=e?'编辑家族记事':'写一则家族记事';
|
||||
const selected=new Set(e?.personIds||(personId?[personId]:[]));
|
||||
$('#event-person-choices').innerHTML=family.people.map(p=>`<label class="check"><input type="checkbox" name="personIds" value="${esc(p.id)}" ${selected.has(p.id)?'checked':''}>${esc(p.name)}${p.archived?'(已归档)':''}</label>`).join('')||'<p class="description">家谱尚无人名,此条记事将记为全家记事。</p>';
|
||||
$('#event-person-choices').innerHTML=family.people.filter(p=>familyEditable('person',p.id)).map(p=>`<label class="check"><input type="checkbox" name="personIds" value="${esc(p.id)}" ${selected.has(p.id)?'checked':''}>${esc(p.name)}${p.archived?'(已归档)':''}</label>`).join('')||'<p class="description">家谱尚无人名,此条记事将记为全家记事。</p>';
|
||||
$('#event-person-search').value='';f.dataset.status=e?.status||'draft';
|
||||
f.querySelector('[data-save-event]').value=f.dataset.status;f.querySelector('[data-save-event]').textContent=e?'保存修改':'保存草稿';
|
||||
f.querySelector('[data-publish-event]').hidden=f.dataset.status==='published';f.querySelector('[data-withdraw-event]').hidden=f.dataset.status!=='published';
|
||||
|
||||
+36
-8
@@ -9,6 +9,20 @@ function clearFamilyState(){if(typeof clearFamilyHistory==='function')clearFamil
|
||||
function personLocation(p,prefix){return [ZhaoGeography.describe(p,prefix),...['Town','Community','Address'].map(k=>p[prefix+k])].filter(Boolean).join(' · ');}
|
||||
function personSearch(p){return [p.name,p.alias,p.birthplace,personLocation(p,'native'),personLocation(p,'birth')].join(' ').toLowerCase();}
|
||||
function personName(id){return family.people.find(p=>p.id===id)?.name||'未关联';}
|
||||
function familyEditable(kind,id){
|
||||
if(!family.canEdit)return false;
|
||||
if(!family.editScope)return true;
|
||||
const allowed=new Set(family.editScope.editablePersonIds||[]);
|
||||
if(kind==='person')return allowed.has(id);
|
||||
const row=(kind==='link'?family.links:family.events||[]).find(x=>x.id===id);
|
||||
return !!row&&(kind==='link'?[row.fromId,row.toId]:row.personIds||[]).every(key=>allowed.has(key));
|
||||
}
|
||||
function familyScopeLabel(id){
|
||||
const scope=family.editScope;if(!scope)return '';
|
||||
const n=scope.levels?.[id],position=n===0?'与本人同代':n<0?`本人上 ${-n} 代`:n>0?`本人下 ${n} 代`:'与本人的世系尚未连接';
|
||||
return position+' · '+(familyEditable('person',id)?'可维护':Number.isFinite(n)&&Math.abs(n)>scope.limit?'只读,超出五代范围':'只读');
|
||||
}
|
||||
function editablePeopleOptions(){return family.people.filter(p=>familyEditable('person',p.id)).map(p=>`<option value="${p.id}">${esc(p.name)}</option>`).join('');}
|
||||
function peopleOptions(blank=true){return (blank?'<option value="">尚未关联</option>':'')+family.people.map(p=>`<option value="${p.id}">${esc(p.name+(p.archived?'(已归档)':''))}</option>`).join('');}
|
||||
function fillForm(form,data){resetEditorForm(form);form.querySelector('.form-error').textContent='';for(const [k,v]of Object.entries(data)){const e=form.elements[k];if(!e)continue;if(e.type==='checkbox')e.checked=!!v;else e.value=v??'';}}
|
||||
function familyFormError(form,error){
|
||||
@@ -35,14 +49,17 @@ function renderFamily(){
|
||||
const people=family.people.filter(p=>($('#family-archived').checked||!p.archived)&&personSearch(p).includes(term));
|
||||
$('#family-count').textContent=family.people.filter(p=>!p.archived).length+' 位人物 · '+family.links.filter(e=>e.active).length+' 条关系'+(term?' · 找到 '+people.length+' 位':'');
|
||||
$('#family-find').hidden=!term;$('#family-find').disabled=!people.length;
|
||||
$('#new-person').hidden=!family.canEdit;
|
||||
$('#new-person').hidden=!family.canEdit&&!family.editScope?.canCreateSelf;
|
||||
$('#new-person').textContent=family.editScope?.canCreateSelf?'+ 建立我的人物档案':'+ 录入亲属';
|
||||
$('#family-edit-note').textContent=family.editScope?.note||'';
|
||||
$('#family-people').innerHTML=people.map(p=>`<button class="person-card ${p.id===focusPerson?'selected':''} ${p.id===family.selfId?'self':''}" data-person="${p.id}" aria-pressed="${p.id===focusPerson}"><strong>${esc(p.name)} ${p.id===family.selfId?'<span class="self-badge">本人</span>':''}</strong><span>${esc(p.id===reference&&p.id!==family.selfId?'参照人物':ZhaoKinship.describe(family.people,family.links,reference,p.id))}</span><small>${esc(p.birthDate||'出生待考')}${p.archived?' · 已归档':''}</small></button>`).join('')||empty(term?'没有找到这个人物':'从一个人物开始',term?'可换用姓名、别名或籍贯查找。':'可先录入自己,再逐步补齐父母、祖先和后辈。');
|
||||
renderFamilyTree();
|
||||
const p=family.people.find(p=>p.id===focusPerson);
|
||||
$('#family-detail').classList.toggle('is-self',p?.id===family.selfId&&!!p);
|
||||
if(!p){$('#family-detail').innerHTML='<h3>人物档案</h3><p class="description">点击图中的人物查看生平,或录入第一位人物。</p>';return;}
|
||||
const edges=family.links.filter(e=>e.fromId===p.id||e.toId===p.id);
|
||||
$('#family-detail').innerHTML=`<div class="section-head"><div><span class="eyebrow">人物档案</span><h2>${esc(p.name)}</h2></div>${family.canEdit?`<button data-edit-person="${p.id}" class="quiet">编辑人物</button><button class="quiet" data-history-kind="person" data-history-id="${p.id}">修改记录</button>`:''}</div><p class="description">相对于 ${esc(personName(reference))}:${esc(p.id===reference&&p.id!==family.selfId?'参照人物':ZhaoKinship.describe(family.people,family.links,reference,p.id))}</p><dl>${[['别名',p.alias],['性别',{male:'男',female:'女',unknown:'待确认'}[p.gender]],['在世情况',{alive:'在世',deceased:'已故',unknown:'待确认'}[p.lifeStatus]],['出生日期',ZhaoCalendar.describe(p.birthDate)],...(p.lifeStatus==='deceased'?[['去世日期',ZhaoCalendar.describe(p.deathDate)]]:[]),['籍贯(祖籍)',personLocation(p,'native')],['出生地',personLocation(p,'birth')],...(p.birthplace?[['原地域记录',p.birthplace]]:[])].map(([k,v])=>`<div><dt>${k}</dt><dd>${esc(v||'待补充')}</dd></div>`).join('')}</dl><h3>生平与记载</h3><p class="family-prose">${esc(p.biography||'尚未记录生平')}</p><p class="description family-prose">${esc(p.note||'')}</p><div class="section-head"><h3>亲属关系</h3>${family.canEdit?'<button id="add-relation" class="quiet">+ 连接亲属</button>':''}</div>${edges.map(e=>`<div class="family-link"><span>${esc(relationText(e))}<small>${esc(({biological:'亲生',adoptive:'收养',step:'继亲',unspecified:''}[e.lineage]||'')+' '+(e.note||''))}</small></span>${family.canEdit?`<button class="quiet" data-edit-relation="${e.id}">编辑</button><button class="quiet" data-history-kind="link" data-history-id="${e.id}">历史</button>`:''}</div>`).join('')||'<p class="description">尚未连接亲属。</p>'}`;
|
||||
$('#family-detail').innerHTML=`<div class="section-head"><div><span class="eyebrow">人物档案</span><h2>${esc(p.name)}</h2></div>${familyEditable('person',p.id)?`<button data-edit-person="${p.id}" class="quiet">编辑人物</button><button class="quiet" data-history-kind="person" data-history-id="${p.id}">修改记录</button>`:''}</div><p class="description">相对于 ${esc(personName(reference))}:${esc(p.id===reference&&p.id!==family.selfId?'参照人物':ZhaoKinship.describe(family.people,family.links,reference,p.id))}</p><dl>${[['别名',p.alias],['性别',{male:'男',female:'女',unknown:'待确认'}[p.gender]],['在世情况',{alive:'在世',deceased:'已故',unknown:'待确认'}[p.lifeStatus]],['出生日期',ZhaoCalendar.describe(p.birthDate)],...(p.lifeStatus==='deceased'?[['去世日期',ZhaoCalendar.describe(p.deathDate)]]:[]),['籍贯(祖籍)',personLocation(p,'native')],['出生地',personLocation(p,'birth')],...(p.birthplace?[['原地域记录',p.birthplace]]:[])].map(([k,v])=>`<div><dt>${k}</dt><dd>${esc(v||'待补充')}</dd></div>`).join('')}</dl><h3>生平与记载</h3><p class="family-prose">${esc(p.biography||'尚未记录生平')}</p><p class="description family-prose">${esc(p.note||'')}</p><div class="section-head"><h3>亲属关系</h3>${familyEditable('person',p.id)?'<button id="add-relation" class="quiet">+ 连接亲属</button>':''}</div>${edges.map(e=>`<div class="family-link"><span>${esc(relationText(e))}<small>${esc(({biological:'亲生',adoptive:'收养',step:'继亲',unspecified:''}[e.lineage]||'')+' '+(e.note||''))}</small></span>${familyEditable('link',e.id)?`<button class="quiet" data-edit-relation="${e.id}">编辑</button><button class="quiet" data-history-kind="link" data-history-id="${e.id}">历史</button>`:''}</div>`).join('')||'<p class="description">尚未连接亲属。</p>'}`;
|
||||
$('#family-detail').insertAdjacentHTML('afterbegin',`<p class="alert alert-light border">${esc(familyScopeLabel(p.id))}</p>`);
|
||||
if(typeof personEventSummary==='function')$('#family-detail').insertAdjacentHTML('beforeend',personEventSummary(p.id));
|
||||
$('#family-detail').insertAdjacentHTML('afterbegin',`${p.id===family.selfId?'<div class="family-self-heading">◎ 本人 · 当前账号关联人物</div>':''}<button type="button" id="family-show-person" class="quiet family-back-to-map">在图中定位</button>`);
|
||||
}
|
||||
@@ -56,27 +73,38 @@ function renderFamilyTree(){
|
||||
familyMap.render({...family,focusId:focusPerson,reference:$('#family-reference').value,term:$('#family-search').value.trim().toLowerCase(),showArchived:$('#family-archived').checked});
|
||||
}
|
||||
function selectFamilyPerson(id,locate=false){focusPerson=id;if(locate){familyView='tree';if(family.people.find(p=>p.id===id)?.archived)$('#family-archived').checked=true;}renderFamily();if(locate)familyMap.locate(id);if(window.innerWidth<=1000&&!document.fullscreenElement)$('#family-detail').scrollIntoView({behavior:'smooth',block:'start'});}
|
||||
function openPerson(id){if(!family.canEdit)return;const p=family.people.find(p=>p.id===id)||{};fillForm($('#person-form'),{...p,revision:family.revision});ZhaoGeography.fill($('#person-form'),p);$('#person-legacy-place').hidden=!p.birthplace;initDateFields();$('#person-dialog').showModal();}
|
||||
function openRelation(id){if(!family.canEdit)return;if(family.people.length<2){toast('请先录入另一位亲属,再连接关系');return;}const f=$('#relation-form');f.elements.fromId.innerHTML=peopleOptions(false);f.elements.toId.innerHTML=peopleOptions(false);const edge=family.links.find(e=>e.id===id);fillForm(f,{...(edge||{fromId:focusPerson,active:true}),revision:family.revision});if(!edge)f.elements.toId.value=family.people.find(p=>p.id!==focusPerson)?.id||'';$('#relation-dialog').showModal();}
|
||||
function openPerson(id){
|
||||
const self=!id&&family.editScope?.canCreateSelf;
|
||||
if(id?!familyEditable('person',id):!family.canEdit&&!self)return;
|
||||
const p=family.people.find(p=>p.id===id)||{},f=$('#person-form');
|
||||
f.elements.relativeId.innerHTML=editablePeopleOptions();
|
||||
fillForm(f,{...p,revision:family.revision});f.dataset.asSelf=String(!!self);
|
||||
$('#person-relative-fields').hidden=!!id||!!self;f.elements.relativeId.required=!id&&!self;
|
||||
if(!id&&!self)f.elements.relativeId.value=familyEditable('person',focusPerson)?focusPerson:family.selfId;
|
||||
$('#person-self-note').hidden=!self;
|
||||
if(self)f.elements.name.value=currentUser?.name||'';
|
||||
ZhaoGeography.fill(f,p);$('#person-legacy-place').hidden=!p.birthplace;initDateFields();$('#person-dialog').showModal();
|
||||
}
|
||||
function openRelation(id){if(!family.canEdit||id&&!familyEditable('link',id))return;if(family.people.length<2){toast('请先录入另一位亲属,再连接关系');return;}const f=$('#relation-form');f.elements.fromId.innerHTML=peopleOptions(false);f.elements.toId.innerHTML=peopleOptions(false);const edge=family.links.find(e=>e.id===id);fillForm(f,{...(edge||{fromId:focusPerson,active:true}),revision:family.revision});if(!edge)f.elements.toId.value=family.people.find(p=>p.id!==focusPerson)?.id||'';$('#relation-dialog').showModal();}
|
||||
for(const [name,path]of [['person','person'],['relation','link']]){
|
||||
$('#'+name+'-form').addEventListener('submit',async e=>{
|
||||
e.preventDefault();const f=e.currentTarget,b=f.querySelector('[type=submit]');b.disabled=true;
|
||||
try{const d=formValues(f);d.revision=Number(d.revision);if(name==='person'){syncDateFields(true);Object.assign(d,formValues(f));d.revision=Number(d.revision);d.archived=f.elements.archived.checked;}else d.active=f.elements.active.checked;
|
||||
const result=await api('/api/family/'+path,d);if(name==='person')focusPerson=result.item.id;f.closest('dialog').close();const loaded=await loadFamily();if(loggedIn)toast(loaded?'家谱已保存':'家谱已保存,读取最新资料失败,请重新载入');
|
||||
try{const d=formValues(f);d.revision=Number(d.revision);if(name==='person'){syncDateFields(true);Object.assign(d,formValues(f));d.revision=Number(d.revision);d.archived=f.elements.archived.checked;d.asSelf=f.dataset.asSelf==='true';}else d.active=f.elements.active.checked;
|
||||
const result=await api('/api/family/'+path,d);if(name==='person')focusPerson=result.item.id;f.closest('dialog').close();if(d.asSelf){await auth();if(loggedIn){showPage('family');toast('本人人物已建立,维护范围已生效');}}else{const loaded=await loadFamily();if(loggedIn)toast(loaded?'家谱已保存':'家谱已保存,读取最新资料失败,请重新载入');}
|
||||
}catch(err){familyFormError(f,err);}finally{b.disabled=false;}
|
||||
});
|
||||
}
|
||||
async function loadUsers(){
|
||||
if(!isAdmin())return;const id=currentUser.id;
|
||||
try{const [u,f]=await Promise.all([api('/api/users'),api('/api/family')]);if(!loggedIn||currentUser?.id!==id)return;users=u.users;family=f;
|
||||
$('#user-list').innerHTML=`<div class="table-wrap"><table class="device-table"><thead><tr><th>账号</th><th>角色 / 状态</th><th>人物关系</th><th>家谱 / 传承资料</th><th>摄像头空间</th><th></th></tr></thead><tbody>${users.map(u=>`<tr><td>${esc(u.name)}<small>${esc(u.username)}</small></td><td>${roleName(u)}${u.disabled?' · 已停用':''}</td><td>${u.relationship==='本人'&&u.relatedToId===u.id?'本人':u.relationship?esc(u.name+' 是 '+(users.find(x=>x.id===u.relatedToId)?.name||'(参照待指定)')+' 的 '+u.relationship):'未设置'}<small>家谱:${esc(personName(u.personId))}</small></td><td>${u.role!=='member'?'管理本归属':({none:'不可访问',read:'查看',edit:'录入和维护'}[u.familyAccess])}<small>文化与财产:${u.role!=='member'?'管理':({none:'不可访问',read:'查看',edit:'维护'}[u.heritageAccess||'none'])}</small></td><td>${u.role!=='member'?'本归属全部区域':esc((u.siteIds.map(siteName).join('、')||'未授权')+(u.includeSubspaces?'(含下级区域)':''))}</td><td><button class="quiet" data-edit-user="${u.id}">编辑账号</button></td></tr>`).join('')}</tbody></table></div>`;
|
||||
$('#user-list').innerHTML=`<div class="table-wrap"><table class="device-table"><thead><tr><th>账号</th><th>角色 / 状态</th><th>人物关系</th><th>家谱 / 传承资料</th><th>摄像头空间</th><th></th></tr></thead><tbody>${users.map(u=>`<tr><td>${esc(u.name)}<small>${esc(u.username)}</small></td><td>${roleName(u)}${u.disabled?' · 已停用':''}</td><td>${u.relationship==='本人'&&u.relatedToId===u.id?'本人':u.relationship?esc(u.name+' 是 '+(users.find(x=>x.id===u.relatedToId)?.name||'(参照待指定)')+' 的 '+u.relationship):'未设置'}<small>家谱:${esc(personName(u.personId))}</small></td><td>${u.role!=='member'||u.familyAccess==='edit'?(u.personId?'维护本人上下五代':'查看 · 待关联本人'):({none:'不可访问',read:'查看'}[u.familyAccess])}<small>文化与财产:${u.role!=='member'?'管理':({none:'不可访问',read:'查看',edit:'维护'}[u.heritageAccess||'none'])}</small></td><td>${u.role!=='member'?'本归属全部区域':esc((u.siteIds.map(siteName).join('、')||'未授权')+(u.includeSubspaces?'(含下级区域)':''))}</td><td><button class="quiet" data-edit-user="${u.id}">编辑账号</button></td></tr>`).join('')}</tbody></table></div>`;
|
||||
return true;
|
||||
}catch(e){if(!e.stale)toast(e.message);return false;}
|
||||
}
|
||||
function openUser(id){
|
||||
if(!isAdmin())return;const f=$('#user-form'),u=users.find(u=>u.id===id)||{};
|
||||
f.elements.personId.innerHTML=peopleOptions();f.elements.relatedToId.innerHTML='<option value="">尚未指定</option>'+users.map(u=>`<option value="${u.id}">${esc(u.name+' / '+u.username)}</option>`).join('');
|
||||
fillForm(f,u);f.elements.password.required=!u.id;
|
||||
fillForm(f,u);f.elements.password.required=!u.id;f.elements.personId.disabled=!!u.personId;
|
||||
f.elements.role.querySelector('[value=admin]').hidden=!isPlatformAdmin();
|
||||
$('#user-sites').innerHTML=state.sites.map(s=>`<label class="check"><input type="checkbox" name="siteIds" value="${s.id}" ${(u.siteIds||[]).includes(s.id)?'checked':''}>${esc(siteName(s.id))}</label>`).join('');$('#user-dialog').showModal();
|
||||
}
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+2
-2
@@ -1,3 +1,3 @@
|
||||
<!doctype html><html lang="zh-CN"><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1"><meta name="theme-color" content="#244d43"><link rel="icon" href="/zhao-icon.png"><link rel="apple-touch-icon" href="/zhao-icon.png"><title>赵府 · 智能数字管家</title> <script type="module" crossorigin src="/ui/assets/index-F3a-FbDz.js"></script>
|
||||
<link rel="stylesheet" crossorigin href="/ui/assets/index-B2d9n-y0.css">
|
||||
<!doctype html><html lang="zh-CN"><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1"><meta name="theme-color" content="#244d43"><link rel="icon" href="/zhao-icon.png"><link rel="apple-touch-icon" href="/zhao-icon.png"><title>赵府 · 智能数字管家</title> <script type="module" crossorigin src="/ui/assets/index-OX4XEEVF.js"></script>
|
||||
<link rel="stylesheet" crossorigin href="/ui/assets/index-BOIfNXlB.css">
|
||||
</head><body><div id="app"></div></body></html>
|
||||
|
||||
Reference in New Issue
Block a user