@qingflow-tech/qingflow-cli 1.1.61 → 1.1.62-beta.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +3 -3
- package/package.json +2 -1
- package/pyproject.toml +4 -1
- package/skills/qingflow-cli/SKILL.md +112 -3
- package/skills/qingflow-cli/reference/QINGFLOW_CLI_BUILDER_CHARTS_WORKFLOW.md +1 -1
- package/skills/qingflow-cli/reference/QINGFLOW_CLI_BUILDER_PORTAL_WORKFLOW.md +6 -258
- package/skills/qingflow-cli/reference/builder/20-build-complete-system.md +2 -2
- package/skills/qingflow-cli/reference/builder/30-schema-fields.md +22 -5
- package/skills/qingflow-cli/reference/builder/70-portal.md +111 -36
- package/skills/qingflow-cli/reference/builder/reference/app-delivery-sop.md +3 -3
- package/skills/qingflow-cli/reference/examples/portal/portal_apply_v1alpha1.example.json +100 -0
- package/skills/qingflow-cli/reference/examples/portal/portal_sections_all_types.example.json +22 -6
- package/src/qingflow_mcp/app_form_compat.py +3 -0
- package/src/qingflow_mcp/app_form_validator.py +89 -20
- package/src/qingflow_mcp/builder_facade/app_form.py +629 -112
- package/src/qingflow_mcp/builder_facade/models.py +213 -15
- package/src/qingflow_mcp/builder_facade/portals_schema.py +397 -0
- package/src/qingflow_mcp/builder_facade/schemas/app_form/manifest.json +15 -1
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/complete.json +112 -38
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/address.json +31 -8
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/ai_content_classification.json +146 -0
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/ai_content_extraction.json +146 -0
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/ai_content_generation.json +146 -0
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/ai_document_parsing.json +146 -0
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/ai_image_generation.json +146 -0
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/ai_image_recognition.json +146 -0
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/ai_machine_translation.json +146 -0
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/ai_text_summary.json +146 -0
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/amount.json +6 -10
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/attachment.json +33 -10
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/code_block.json +6 -10
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/data_relation.json +11 -18
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/date.json +4 -8
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/date_duration.json +146 -0
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/datetime.json +4 -8
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/department.json +6 -10
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/email.json +4 -8
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/embed_field.json +146 -0
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/image_select.json +146 -0
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/link.json +4 -8
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/location.json +146 -0
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/long_text.json +4 -8
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/member.json +6 -10
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/multi_select.json +4 -8
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/number.json +6 -10
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/ocr.json +146 -0
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/phone.json +4 -8
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/q_linker.json +8 -12
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/relation.json +73 -15
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/rich_text.json +146 -0
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/single_choice.json +4 -8
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/single_select.json +4 -8
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/subtable.json +90 -29
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/fields/text.json +4 -8
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/formula.json +43 -0
- package/src/qingflow_mcp/builder_facade/schemas/app_form/v1alpha1/summary.json +27 -19
- package/src/qingflow_mcp/builder_facade/schemas/portals/manifest.json +59 -0
- package/src/qingflow_mcp/builder_facade/schemas/portals/v1alpha1/complete.json +1397 -0
- package/src/qingflow_mcp/builder_facade/schemas/portals/v1alpha1/components/carousel.json +193 -0
- package/src/qingflow_mcp/builder_facade/schemas/portals/v1alpha1/components/chart.json +643 -0
- package/src/qingflow_mcp/builder_facade/schemas/portals/v1alpha1/components/favourite.json +203 -0
- package/src/qingflow_mcp/builder_facade/schemas/portals/v1alpha1/components/filter.json +331 -0
- package/src/qingflow_mcp/builder_facade/schemas/portals/v1alpha1/components/grid.json +265 -0
- package/src/qingflow_mcp/builder_facade/schemas/portals/v1alpha1/components/link.json +131 -0
- package/src/qingflow_mcp/builder_facade/schemas/portals/v1alpha1/components/task.json +199 -0
- package/src/qingflow_mcp/builder_facade/schemas/portals/v1alpha1/components/text.json +123 -0
- package/src/qingflow_mcp/builder_facade/schemas/portals/v1alpha1/components/view.json +196 -0
- package/src/qingflow_mcp/builder_facade/schemas/portals/v1alpha1/summary.json +800 -0
- package/src/qingflow_mcp/builder_facade/schemas/views/v1alpha1/complete.json +1 -1
- package/src/qingflow_mcp/builder_facade/schemas/views/v1alpha1/details/display.json +1 -1
- package/src/qingflow_mcp/builder_facade/schemas/views/v1alpha1/summary.json +1 -1
- package/src/qingflow_mcp/builder_facade/service.py +1367 -92
- package/src/qingflow_mcp/cli/commands/builder.py +120 -5
- package/src/qingflow_mcp/cli/formatters.py +11 -0
- package/src/qingflow_mcp/cli/main.py +90 -2
- package/src/qingflow_mcp/cli/permission_gate.py +59 -0
- package/src/qingflow_mcp/cloud_context.py +16 -1
- package/src/qingflow_mcp/entity_permissions.py +10 -0
- package/src/qingflow_mcp/permission_catalog.json +1210 -0
- package/src/qingflow_mcp/public_surface.py +69 -8
- package/src/qingflow_mcp/response_trim.py +2 -1
- package/src/qingflow_mcp/server.py +12 -6
- package/src/qingflow_mcp/server_app_builder.py +43 -10
- package/src/qingflow_mcp/server_app_user.py +9 -5
- package/src/qingflow_mcp/server_cloud.py +43 -7
- package/src/qingflow_mcp/session_store.py +14 -1
- package/src/qingflow_mcp/solution/compiler/icon_utils.py +73 -0
- package/src/qingflow_mcp/solution/executor.py +5 -2
- package/src/qingflow_mcp/tool_catalog.py +388 -0
- package/src/qingflow_mcp/tool_catalog_i18n.py +184 -0
- package/src/qingflow_mcp/tool_policy.py +191 -0
- package/src/qingflow_mcp/tools/ai_builder_tools.py +118 -20
- package/src/qingflow_mcp/tools/portal_tools.py +4 -54
- package/src/qingflow_mcp/tools/portal_writer.py +59 -0
- package/src/qingflow_mcp/tools/solution_tools.py +2 -0
|
@@ -2,7 +2,7 @@ from __future__ import annotations
|
|
|
2
2
|
|
|
3
3
|
import re
|
|
4
4
|
from enum import Enum
|
|
5
|
-
from typing import Any, Union
|
|
5
|
+
from typing import Any, Literal, Union
|
|
6
6
|
|
|
7
7
|
from pydantic import AliasChoices, Field, model_validator
|
|
8
8
|
|
|
@@ -2508,14 +2508,20 @@ class PortalInlineChartPatch(ChartUpsertPatch):
|
|
|
2508
2508
|
|
|
2509
2509
|
|
|
2510
2510
|
class PortalComponentPositionPatch(StrictModel):
|
|
2511
|
-
|
|
2512
|
-
|
|
2513
|
-
|
|
2514
|
-
|
|
2515
|
-
|
|
2516
|
-
|
|
2517
|
-
|
|
2518
|
-
|
|
2511
|
+
# 后端语义(DashSvcImpl 读/写链):position 各坐标可为 null——生产数据中筛选组件
|
|
2512
|
+
# (type=6)的 x/y/cols/rows 原生为 NULL,读面透传 null、写链 setPosition 直存 null。
|
|
2513
|
+
# 因此显式 null 必须原样透传(round-trip 保真);仅键缺省时才回落布局默认值。
|
|
2514
|
+
pc_x: int | None = Field(default=0, validation_alias=AliasChoices("pc_x", "pcX", "x"))
|
|
2515
|
+
pc_y: int | None = Field(default=0, validation_alias=AliasChoices("pc_y", "pcY", "y"))
|
|
2516
|
+
# 宽高别名同时接受 w/h 与嵌套形态词汇 cols/rows:真实使用反馈显示 agent 常把
|
|
2517
|
+
# 嵌套词汇(cols/rows)与平铺词汇(x/y)混写(position: {"x":0,"y":0,"cols":24,"rows":5}),
|
|
2518
|
+
# 词汇表分裂是位写出错的高频形态(schema 描述同步说明)。
|
|
2519
|
+
pc_w: int | None = Field(default=12, validation_alias=AliasChoices("pc_w", "pcW", "w", "cols"))
|
|
2520
|
+
pc_h: int | None = Field(default=8, validation_alias=AliasChoices("pc_h", "pcH", "h", "rows"))
|
|
2521
|
+
mobile_x: int | None = Field(default=0, validation_alias=AliasChoices("mobile_x", "mobileX"))
|
|
2522
|
+
mobile_y: int | None = Field(default=0, validation_alias=AliasChoices("mobile_y", "mobileY"))
|
|
2523
|
+
mobile_w: int | None = Field(default=6, validation_alias=AliasChoices("mobile_w", "mobileW"))
|
|
2524
|
+
mobile_h: int | None = Field(default=8, validation_alias=AliasChoices("mobile_h", "mobileH"))
|
|
2519
2525
|
mobile_provided: bool = Field(default=False, exclude=True)
|
|
2520
2526
|
|
|
2521
2527
|
@model_validator(mode="before")
|
|
@@ -2554,6 +2560,10 @@ class PortalChartRefPatch(StrictModel):
|
|
|
2554
2560
|
app_key: str | None = None
|
|
2555
2561
|
chart_id: str | None = None
|
|
2556
2562
|
chart_name: str | None = None
|
|
2563
|
+
# 引用面判别:后端有两类图表组件——轻流报表(DASH_CONTENT_TYPE_CHART=1,chart 表唯一键
|
|
2564
|
+
# chartKey,写链 addChartInfos 按 chartKey 解析)与轻析 BI 报表(DASH_CONTENT_TYPE_BICHART=9,
|
|
2565
|
+
# bi_chart 表整型 chart_id,写链 addBiChartInfo 直存)。缺省 bi_chart(向后兼容既有声明)。
|
|
2566
|
+
ref_kind: Literal["chart", "bi_chart"] | None = None
|
|
2557
2567
|
|
|
2558
2568
|
@model_validator(mode="before")
|
|
2559
2569
|
@classmethod
|
|
@@ -2573,12 +2583,18 @@ class PortalChartRefPatch(StrictModel):
|
|
|
2573
2583
|
payload["chart_name"] = payload.pop("name")
|
|
2574
2584
|
if "appKey" in payload and "app_key" not in payload:
|
|
2575
2585
|
payload["app_key"] = payload.pop("appKey")
|
|
2586
|
+
if "refKind" in payload and "ref_kind" not in payload:
|
|
2587
|
+
payload["ref_kind"] = payload.pop("refKind")
|
|
2588
|
+
if "kind" in payload and "ref_kind" not in payload:
|
|
2589
|
+
payload["ref_kind"] = payload.pop("kind")
|
|
2576
2590
|
return payload
|
|
2577
2591
|
|
|
2578
2592
|
@model_validator(mode="after")
|
|
2579
2593
|
def validate_target(self) -> "PortalChartRefPatch":
|
|
2580
2594
|
if not (self.chart_id or self.chart_name):
|
|
2581
2595
|
raise ValueError("chart_ref requires chart_id or chart_name")
|
|
2596
|
+
if self.ref_kind == "chart" and not self.chart_id:
|
|
2597
|
+
raise ValueError("chart_ref with ref_kind=chart requires chart_id (chart 表唯一键 chartKey)")
|
|
2582
2598
|
if self.chart_name and not self.chart_id and not self.app_key:
|
|
2583
2599
|
raise ValueError("chart_ref.app_key is required when resolving by chart_name")
|
|
2584
2600
|
return self
|
|
@@ -2604,17 +2620,49 @@ class PortalViewRefPatch(StrictModel):
|
|
|
2604
2620
|
|
|
2605
2621
|
|
|
2606
2622
|
class PortalSectionPatch(StrictModel):
|
|
2607
|
-
title
|
|
2623
|
+
# title 语义=组件显示标题(draft_dash_chart.component_title / grid_config.gridTitle 等),
|
|
2624
|
+
# 生产存量存在空标题形态(显示标题开但标题空,读链回退视图名/图表名)——None=不设标题,
|
|
2625
|
+
# 编译对 None 不落库(后端透传 NULL),round-trip 保真;手写声明缺省 title=None(不设)。
|
|
2626
|
+
title: str | None = None
|
|
2608
2627
|
source_type: str = Field(validation_alias=AliasChoices("source_type", "sourceType"))
|
|
2609
2628
|
role: str | None = Field(default=None, validation_alias=AliasChoices("role", "zone", "section_role", "sectionRole"))
|
|
2629
|
+
# 显示标题开关(draft_dash_chart.being_show_title):提取侧读面必有值(True/False);
|
|
2630
|
+
# 声明缺省 None 时编译回落产品默认 True(与既有创建语义兼容)。
|
|
2631
|
+
show_title: bool | None = Field(
|
|
2632
|
+
default=None,
|
|
2633
|
+
validation_alias=AliasChoices("show_title", "showTitle", "being_show_title", "beingShowTitle"),
|
|
2634
|
+
)
|
|
2610
2635
|
position: PortalComponentPositionPatch | None = None
|
|
2611
|
-
dash_style_config: dict[str, Any] | None = Field(
|
|
2636
|
+
dash_style_config: dict[str, Any] | None = Field(
|
|
2637
|
+
default=None,
|
|
2638
|
+
validation_alias=AliasChoices("dash_style_config", "style_config", "dashStyleConfigBO", "dashStyleConfig"),
|
|
2639
|
+
)
|
|
2612
2640
|
config: dict[str, Any] = Field(default_factory=dict)
|
|
2613
2641
|
chart_ref: PortalChartRefPatch | None = None
|
|
2614
2642
|
chart: PortalInlineChartPatch | None = Field(default=None, validation_alias=AliasChoices("chart", "inline_chart", "inlineChart", "create_chart", "createChart"))
|
|
2615
2643
|
view_ref: PortalViewRefPatch | None = None
|
|
2644
|
+
view_display: dict[str, Any] | None = Field(
|
|
2645
|
+
default=None,
|
|
2646
|
+
validation_alias=AliasChoices("view_display", "viewDisplay"),
|
|
2647
|
+
)
|
|
2616
2648
|
text: str | None = None
|
|
2617
2649
|
url: str | None = None
|
|
2650
|
+
login_auth: bool | None = Field(
|
|
2651
|
+
default=None,
|
|
2652
|
+
validation_alias=AliasChoices("login_auth", "loginAuth", "being_login_auth", "beingLoginAuth"),
|
|
2653
|
+
)
|
|
2654
|
+
carousel: dict[str, Any] | None = Field(
|
|
2655
|
+
default=None,
|
|
2656
|
+
validation_alias=AliasChoices("carousel", "carousel_config", "carouselConfig"),
|
|
2657
|
+
)
|
|
2658
|
+
task: dict[str, Any] | None = Field(
|
|
2659
|
+
default=None,
|
|
2660
|
+
validation_alias=AliasChoices("task", "task_config", "taskConfig"),
|
|
2661
|
+
)
|
|
2662
|
+
favourite: dict[str, Any] | None = Field(
|
|
2663
|
+
default=None,
|
|
2664
|
+
validation_alias=AliasChoices("favourite", "favourite_config", "favouriteConfig"),
|
|
2665
|
+
)
|
|
2618
2666
|
|
|
2619
2667
|
@model_validator(mode="before")
|
|
2620
2668
|
@classmethod
|
|
@@ -2659,7 +2707,7 @@ class PortalSectionPatch(StrictModel):
|
|
|
2659
2707
|
|
|
2660
2708
|
@model_validator(mode="after")
|
|
2661
2709
|
def validate_shape(self) -> "PortalSectionPatch":
|
|
2662
|
-
supported = {"chart", "view", "grid", "filter", "text", "link"}
|
|
2710
|
+
supported = {"chart", "view", "grid", "filter", "text", "link", "carousel", "task", "favourite"}
|
|
2663
2711
|
if self.source_type not in supported:
|
|
2664
2712
|
raise ValueError(f"unsupported portal source_type '{self.source_type}'")
|
|
2665
2713
|
if self.source_type == "chart" and self.chart_ref is None and self.chart is None:
|
|
@@ -2670,6 +2718,40 @@ class PortalSectionPatch(StrictModel):
|
|
|
2670
2718
|
raise ValueError("text section requires text")
|
|
2671
2719
|
if self.source_type == "link" and self.url is None:
|
|
2672
2720
|
raise ValueError("link section requires url")
|
|
2721
|
+
if self.source_type == "carousel" and self.carousel is None:
|
|
2722
|
+
raise ValueError("carousel section requires carousel")
|
|
2723
|
+
if self.source_type == "task" and self.task is None:
|
|
2724
|
+
raise ValueError("task section requires task")
|
|
2725
|
+
if self.source_type == "favourite" and self.favourite is None:
|
|
2726
|
+
raise ValueError("favourite section requires favourite")
|
|
2727
|
+
if self.source_type == "filter":
|
|
2728
|
+
# 后端读面(DashSvcImpl#getComponentFilter)按筛选组(dash_filter_group 行)
|
|
2729
|
+
# 反查筛选组件:空规则的 filter 组件行虽会写入,但读面枚举不到——表现为
|
|
2730
|
+
# 「apply 成功但回读缺 type:6」(实测反馈「filter 不落库」的真身)。
|
|
2731
|
+
# 在模型咽喉(apply/validate 共同路径)阻断,不给静默不可见留门。
|
|
2732
|
+
filter_payload = self.config or {}
|
|
2733
|
+
rule_groups = filter_payload.get("rules", filter_payload.get("filterConfig"))
|
|
2734
|
+
if not isinstance(rule_groups, list) or not rule_groups:
|
|
2735
|
+
raise ValueError(
|
|
2736
|
+
"filter section requires config.rules with at least one rule group; "
|
|
2737
|
+
"an empty-rules filter is written but invisible in portal get readback"
|
|
2738
|
+
)
|
|
2739
|
+
# 筛选项的后端持久化键是 dftJudgeType/dftJudgeValue/filterCondition;历史
|
|
2740
|
+
# 文档的声明键 que/judge 不被后端 FilterGroupConfig DTO 识别,静默丢弃后
|
|
2741
|
+
# 落库只剩 filterItemName——前端筛选条件渲染为空(实测首建全空真身)。
|
|
2742
|
+
# 同在模型咽喉阻断,把静默丢键变成显式报错。
|
|
2743
|
+
for group in rule_groups:
|
|
2744
|
+
if not isinstance(group, dict):
|
|
2745
|
+
continue
|
|
2746
|
+
for item in group.get("filterGroupConfig") or []:
|
|
2747
|
+
if isinstance(item, dict) and ("que" in item or "judge" in item):
|
|
2748
|
+
raise ValueError(
|
|
2749
|
+
"filter rule items must use backend persistence keys "
|
|
2750
|
+
"(filterItemName/dftJudgeType/dftJudgeValue/filterCondition); "
|
|
2751
|
+
"the declaration keys 'que'/'judge' are silently dropped by the "
|
|
2752
|
+
"backend and leave the frontend filter condition empty "
|
|
2753
|
+
"(see 70-portal.md section 3.4)"
|
|
2754
|
+
)
|
|
2673
2755
|
return self
|
|
2674
2756
|
|
|
2675
2757
|
|
|
@@ -2685,8 +2767,20 @@ class PortalApplyRequest(StrictModel):
|
|
|
2685
2767
|
icon: str | None = None
|
|
2686
2768
|
color: str | None = None
|
|
2687
2769
|
hide_copyright: bool | None = Field(default=None, validation_alias=AliasChoices("hide_copyright", "hideCopyright"))
|
|
2688
|
-
|
|
2770
|
+
global_config: dict[str, Any] | None = Field(
|
|
2771
|
+
default=None,
|
|
2772
|
+
validation_alias=AliasChoices("global_config", "globalConfig", "dash_global_config", "dashGlobalConfig"),
|
|
2773
|
+
)
|
|
2774
|
+
style_template_id: int | None = Field(
|
|
2775
|
+
default=None,
|
|
2776
|
+
validation_alias=AliasChoices("style_template_id", "styleTemplateId"),
|
|
2777
|
+
)
|
|
2778
|
+
overall_style: dict[str, Any] | None = Field(
|
|
2779
|
+
default=None,
|
|
2780
|
+
validation_alias=AliasChoices("overall_style", "overallStyle", "overallConfigBO"),
|
|
2781
|
+
)
|
|
2689
2782
|
config: dict[str, Any] = Field(default_factory=dict)
|
|
2783
|
+
schema_version: str | None = Field(default=None, validation_alias=AliasChoices("schema_version", "schemaVersion"))
|
|
2690
2784
|
|
|
2691
2785
|
@model_validator(mode="before")
|
|
2692
2786
|
@classmethod
|
|
@@ -2694,8 +2788,30 @@ class PortalApplyRequest(StrictModel):
|
|
|
2694
2788
|
if not isinstance(value, dict):
|
|
2695
2789
|
return value
|
|
2696
2790
|
payload = dict(value)
|
|
2697
|
-
|
|
2698
|
-
|
|
2791
|
+
payload.pop("schema_version", None)
|
|
2792
|
+
payload.pop("schemaVersion", None)
|
|
2793
|
+
# 不发布场景已移除(负责人决策):apply 一律发布。显式 false 明确拒绝,
|
|
2794
|
+
# true/缺省按键消费走默认行为(publish 字段恒 true,仅保留内部默认)。
|
|
2795
|
+
if payload.get("publish") is False:
|
|
2796
|
+
raise ValueError(
|
|
2797
|
+
"portal apply always publishes; the draft-only (publish=false) scenario has been "
|
|
2798
|
+
"removed — delete the publish field from the declaration"
|
|
2799
|
+
)
|
|
2800
|
+
payload.pop("publish", None)
|
|
2801
|
+
# schema 文档声明的别名补全(dashKey/dashName):此前条件判断里出现了 dashName
|
|
2802
|
+
# 却从未消费,别名声明撞上 StrictModel 被拒,形成 validate 提示与 apply 行为
|
|
2803
|
+
# 不一致的观感(实测反馈失败二)。canonical 键优先;别名始终被消费(与 canonical
|
|
2804
|
+
# 同传时静默让位,不留残键触发 extra_forbidden)。
|
|
2805
|
+
if "dashKey" in payload:
|
|
2806
|
+
payload.setdefault("dash_key", payload.pop("dashKey"))
|
|
2807
|
+
if "name" in payload:
|
|
2808
|
+
payload.setdefault("dash_name", payload.pop("name"))
|
|
2809
|
+
if "dashName" in payload:
|
|
2810
|
+
payload.setdefault("dash_name", payload.pop("dashName"))
|
|
2811
|
+
if "dash_global_config" in payload and "global_config" not in payload:
|
|
2812
|
+
payload["global_config"] = payload.pop("dash_global_config")
|
|
2813
|
+
elif "dashGlobalConfig" in payload and "global_config" not in payload:
|
|
2814
|
+
payload["global_config"] = payload.pop("dashGlobalConfig")
|
|
2699
2815
|
if "sections" not in payload and "pages" in payload:
|
|
2700
2816
|
pages = payload.pop("pages")
|
|
2701
2817
|
if not isinstance(pages, list):
|
|
@@ -2730,6 +2846,88 @@ class PortalApplyRequest(StrictModel):
|
|
|
2730
2846
|
return self
|
|
2731
2847
|
|
|
2732
2848
|
|
|
2849
|
+
def _public_portal_section_payload(section: PortalSectionPatch) -> dict[str, Any]:
|
|
2850
|
+
"""Dump one portal section with canonical naming for schema validation."""
|
|
2851
|
+
payload: dict[str, Any] = {
|
|
2852
|
+
"title": section.title,
|
|
2853
|
+
"source_type": section.source_type,
|
|
2854
|
+
}
|
|
2855
|
+
if section.role is not None:
|
|
2856
|
+
payload["role"] = section.role
|
|
2857
|
+
if section.position is not None:
|
|
2858
|
+
payload["position"] = {
|
|
2859
|
+
"pc": {
|
|
2860
|
+
"x": section.position.pc_x,
|
|
2861
|
+
"y": section.position.pc_y,
|
|
2862
|
+
"cols": section.position.pc_w,
|
|
2863
|
+
"rows": section.position.pc_h,
|
|
2864
|
+
},
|
|
2865
|
+
}
|
|
2866
|
+
if section.position.mobile_provided:
|
|
2867
|
+
payload["position"]["mobile"] = {
|
|
2868
|
+
"x": section.position.mobile_x,
|
|
2869
|
+
"y": section.position.mobile_y,
|
|
2870
|
+
"cols": section.position.mobile_w,
|
|
2871
|
+
"rows": section.position.mobile_h,
|
|
2872
|
+
}
|
|
2873
|
+
if section.dash_style_config is not None:
|
|
2874
|
+
payload["style_config"] = section.dash_style_config
|
|
2875
|
+
if section.chart_ref is not None:
|
|
2876
|
+
payload["chart_ref"] = section.chart_ref.model_dump(mode="json", exclude_none=True)
|
|
2877
|
+
if section.chart is not None:
|
|
2878
|
+
payload["chart"] = section.chart.model_dump(mode="json", exclude_none=True)
|
|
2879
|
+
if section.view_ref is not None:
|
|
2880
|
+
payload["view_ref"] = section.view_ref.model_dump(mode="json", exclude_none=True)
|
|
2881
|
+
if section.view_display is not None:
|
|
2882
|
+
payload["view_display"] = section.view_display
|
|
2883
|
+
if section.text is not None:
|
|
2884
|
+
payload["text"] = section.text
|
|
2885
|
+
if section.url is not None:
|
|
2886
|
+
payload["url"] = section.url
|
|
2887
|
+
if section.login_auth is not None:
|
|
2888
|
+
payload["login_auth"] = section.login_auth
|
|
2889
|
+
if section.carousel is not None:
|
|
2890
|
+
payload["carousel"] = section.carousel
|
|
2891
|
+
if section.task is not None:
|
|
2892
|
+
payload["task"] = section.task
|
|
2893
|
+
if section.favourite is not None:
|
|
2894
|
+
payload["favourite"] = section.favourite
|
|
2895
|
+
if section.config:
|
|
2896
|
+
payload["config"] = section.config
|
|
2897
|
+
return payload
|
|
2898
|
+
|
|
2899
|
+
|
|
2900
|
+
def public_portal_apply_payload(request: PortalApplyRequest) -> dict[str, Any]:
|
|
2901
|
+
"""Canonical-named portal declaration used for schema validation."""
|
|
2902
|
+
payload: dict[str, Any] = {}
|
|
2903
|
+
if request.dash_key:
|
|
2904
|
+
payload["dash_key"] = request.dash_key
|
|
2905
|
+
if request.dash_name is not None:
|
|
2906
|
+
payload["name"] = request.dash_name
|
|
2907
|
+
if request.package_tag_id is not None:
|
|
2908
|
+
payload["package_tag_id"] = request.package_tag_id
|
|
2909
|
+
payload["publish"] = request.publish
|
|
2910
|
+
if request.sections is not None:
|
|
2911
|
+
payload["sections"] = [_public_portal_section_payload(section) for section in request.sections]
|
|
2912
|
+
if request.layout_preset is not None:
|
|
2913
|
+
payload["layout_preset"] = request.layout_preset
|
|
2914
|
+
if request.visibility is not None:
|
|
2915
|
+
payload["visibility"] = request.visibility.model_dump(mode="json", exclude_none=True)
|
|
2916
|
+
if request.icon is not None:
|
|
2917
|
+
payload["icon"] = request.icon
|
|
2918
|
+
if request.color is not None:
|
|
2919
|
+
payload["color"] = request.color
|
|
2920
|
+
if request.hide_copyright is not None:
|
|
2921
|
+
payload["hide_copyright"] = request.hide_copyright
|
|
2922
|
+
if request.global_config is not None:
|
|
2923
|
+
payload["global_config"] = request.global_config
|
|
2924
|
+
if request.style_template_id is not None:
|
|
2925
|
+
payload["style_template_id"] = request.style_template_id
|
|
2926
|
+
if request.overall_style is not None:
|
|
2927
|
+
payload["overall_style"] = request.overall_style
|
|
2928
|
+
return payload
|
|
2929
|
+
|
|
2930
|
+
|
|
2733
2931
|
FieldPatch.model_rebuild()
|
|
2734
2932
|
FieldMutation.model_rebuild()
|
|
2735
2933
|
FieldUpdatePatch.model_rebuild()
|