@qingflow-tech/qingflow-cli 1.1.61 → 1.1.62
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 +1 -1
- package/pyproject.toml +3 -1
- 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 +71 -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 +6 -7
- 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 +197 -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 +249 -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 +1359 -92
- package/src/qingflow_mcp/cli/commands/builder.py +120 -5
- package/src/qingflow_mcp/public_surface.py +2 -0
- package/src/qingflow_mcp/server_app_builder.py +34 -5
- 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/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
|
@@ -18,6 +18,7 @@ from ..tools.app_tools import AppTools
|
|
|
18
18
|
from ..tools.package_tools import PackageTools
|
|
19
19
|
from .app_form_schema import AppFormContractError, AppFormSchemaContext, AppFormSchemaRegistry
|
|
20
20
|
from .service import (
|
|
21
|
+
AmbiguousFieldSelector,
|
|
21
22
|
_coerce_any_int,
|
|
22
23
|
_compile_code_block_binding_fields,
|
|
23
24
|
_compile_q_linker_binding_fields,
|
|
@@ -45,6 +46,7 @@ QUE_TYPE_TO_CANONICAL = {
|
|
|
45
46
|
11: "single_select",
|
|
46
47
|
12: "multi_select",
|
|
47
48
|
13: "attachment",
|
|
49
|
+
16: "rich_text",
|
|
48
50
|
18: "subtable",
|
|
49
51
|
19: "data_relation",
|
|
50
52
|
20: "q_linker",
|
|
@@ -52,10 +54,29 @@ QUE_TYPE_TO_CANONICAL = {
|
|
|
52
54
|
22: "department",
|
|
53
55
|
25: "relation",
|
|
54
56
|
26: "code_block",
|
|
57
|
+
# 透传型字段(r10 读面 65 app 缺口):声明层 EmptyConfig,round-trip 经后端
|
|
58
|
+
# 模板保真(选项/技能配置列随模板透传);语义 = QuestionTypeEnum 14/15/17/23
|
|
59
|
+
# 与 Constants QUE_TYPE_EMBED_FIELD(27)、AI 系 30-37(AI_CONTENT_GENERATION
|
|
60
|
+
# /EXTRACTION/CLASSIFICATION、AI_MACHINE_TRANSLATION、AI_IMAGE_RECOGNITION
|
|
61
|
+
# /GENERATION、AI_DOCUMENT_PARSING、AI_TEXT_SUMMARY)
|
|
62
|
+
14: "date_duration",
|
|
63
|
+
15: "image_select",
|
|
64
|
+
17: "location",
|
|
65
|
+
23: "ocr",
|
|
66
|
+
27: "embed_field",
|
|
67
|
+
30: "ai_content_generation",
|
|
68
|
+
31: "ai_content_extraction",
|
|
69
|
+
32: "ai_content_classification",
|
|
70
|
+
33: "ai_machine_translation",
|
|
71
|
+
34: "ai_image_recognition",
|
|
72
|
+
35: "ai_image_generation",
|
|
73
|
+
36: "ai_document_parsing",
|
|
74
|
+
37: "ai_text_summary",
|
|
55
75
|
}
|
|
56
76
|
CANONICAL_TO_QUE_TYPE = {
|
|
57
77
|
"text": 2,
|
|
58
78
|
"long_text": 3,
|
|
79
|
+
"rich_text": 16,
|
|
59
80
|
"number": 8,
|
|
60
81
|
"amount": 8,
|
|
61
82
|
"link": 9,
|
|
@@ -75,13 +96,29 @@ CANONICAL_TO_QUE_TYPE = {
|
|
|
75
96
|
"data_relation": 19,
|
|
76
97
|
"relation": 25,
|
|
77
98
|
"subtable": 18,
|
|
99
|
+
|
|
100
|
+
"date_duration": 14,
|
|
101
|
+
"image_select": 15,
|
|
102
|
+
"location": 17,
|
|
103
|
+
"ocr": 23,
|
|
104
|
+
"embed_field": 27,
|
|
105
|
+
"ai_content_generation": 30,
|
|
106
|
+
"ai_content_extraction": 31,
|
|
107
|
+
"ai_content_classification": 32,
|
|
108
|
+
"ai_machine_translation": 33,
|
|
109
|
+
"ai_image_recognition": 34,
|
|
110
|
+
"ai_image_generation": 35,
|
|
111
|
+
"ai_document_parsing": 36,
|
|
112
|
+
"ai_text_summary": 37,
|
|
78
113
|
}
|
|
79
114
|
SUBFIELD_TYPES = {
|
|
80
115
|
"text",
|
|
81
116
|
"long_text",
|
|
82
117
|
"number",
|
|
118
|
+
"amount",
|
|
83
119
|
"link",
|
|
84
120
|
"date",
|
|
121
|
+
"datetime",
|
|
85
122
|
"phone",
|
|
86
123
|
"email",
|
|
87
124
|
"single_choice",
|
|
@@ -94,6 +131,43 @@ SUBFIELD_TYPES = {
|
|
|
94
131
|
"department",
|
|
95
132
|
}
|
|
96
133
|
CHOICE_TYPES = {"single_choice", "single_select", "multi_select"}
|
|
134
|
+
|
|
135
|
+
# 数据关联筛选 dynamic_range 操作数的动态范围枚举(id → 名称),与后端
|
|
136
|
+
# Constants.DYNAMIC_TYPE(apaas-common Constants.java:4674)单一来源同步:
|
|
137
|
+
# 提取侧 judgeValueDetails.value 即此名称形态(实测 id=7 value="今年"),写回侧
|
|
138
|
+
# 按名称恢复 id——后端 checkRelationMatchRules(FormSvcImpl:10445)对 judgeType=8
|
|
139
|
+
# 校验 judgeValueDetails 非空且 id 非 null,丢失 id 即 400「筛选条件配置有误」。
|
|
140
|
+
# id=22「自定义」在 data_relation 筛选存量里未见(value 形态非固定),不映射名称。
|
|
141
|
+
DYNAMIC_RANGE_NAME_TO_ID = {
|
|
142
|
+
"今日": 1,
|
|
143
|
+
"昨日": 2,
|
|
144
|
+
"本周 (周日 ~ 周六)": 3,
|
|
145
|
+
"上周 (周日 ~ 周六)": 4,
|
|
146
|
+
"本月": 5,
|
|
147
|
+
"上月": 6,
|
|
148
|
+
"今年": 7,
|
|
149
|
+
"去年": 8,
|
|
150
|
+
"近7天": 9,
|
|
151
|
+
"近30天": 10,
|
|
152
|
+
"近90天": 11,
|
|
153
|
+
"本周 (周一 ~ 周日)": 12,
|
|
154
|
+
"上周 (周一 ~ 周日)": 13,
|
|
155
|
+
"明天": 14,
|
|
156
|
+
"下周(周日 ~ 周六)": 15,
|
|
157
|
+
"下月": 16,
|
|
158
|
+
"本季度": 17,
|
|
159
|
+
"下季度": 18,
|
|
160
|
+
"上季度": 19,
|
|
161
|
+
"明年": 20,
|
|
162
|
+
"下周 (周一 ~ 周日)": 21,
|
|
163
|
+
}
|
|
164
|
+
# 名称宽松匹配(剔内嵌空白)兜底:后端数组存在带/不带空格的变体(如 15 与 3/12 形态不一),
|
|
165
|
+
# 归一后仍唯一命中才采用,避免歧义名称误映射。
|
|
166
|
+
_DYNAMIC_RANGE_NORMALIZED = {}
|
|
167
|
+
for _name, _id in DYNAMIC_RANGE_NAME_TO_ID.items():
|
|
168
|
+
_key = "".join(_name.split())
|
|
169
|
+
_DYNAMIC_RANGE_NORMALIZED.setdefault(_key, _id)
|
|
170
|
+
|
|
97
171
|
INTEGRATION_TARGET_TYPES = {
|
|
98
172
|
"text",
|
|
99
173
|
"long_text",
|
|
@@ -662,8 +736,9 @@ class AppFormNormalizer:
|
|
|
662
736
|
]
|
|
663
737
|
if fields:
|
|
664
738
|
rows.append({"fields": fields})
|
|
665
|
-
|
|
666
|
-
|
|
739
|
+
# 空 section 是合法存量形态:后端 updateFormInfo 对空 innerQuestions 仅产出
|
|
740
|
+
# 零行 draft_section_question(段落本身作为 queType=24 question 照常保存),
|
|
741
|
+
# 读面 getFormInfoByAppKey 同样返回空 innerQuestions——按声明原样写,空↔空稳定。
|
|
667
742
|
body.append(
|
|
668
743
|
{
|
|
669
744
|
"kind": "section",
|
|
@@ -680,14 +755,26 @@ class AppFormNormalizer:
|
|
|
680
755
|
]
|
|
681
756
|
if fields:
|
|
682
757
|
body.append({"kind": "row", "fields": fields})
|
|
758
|
+
# 空表单 + 悬空 dataTitleQueId/dataCoverQueId(模板安装出的空壳应用常见:
|
|
759
|
+
# 后端 GET 原样吐出指向已不存在字段的 id)读面 canonical 化为 null——
|
|
760
|
+
# 写回 null 后端 normalizeDataTitleQueId 兜底、空表单落库等价,避免
|
|
761
|
+
# validate/apply 的 INVALID_DATA_TITLE_FIELD 拒掉自家写面(round-trip 断裂)。
|
|
762
|
+
has_fields = any(
|
|
763
|
+
bool(block.get("fields")) for block in body if block.get("kind") == "row"
|
|
764
|
+
) or any(
|
|
765
|
+
bool(row.get("fields"))
|
|
766
|
+
for block in body
|
|
767
|
+
if block.get("kind") == "section"
|
|
768
|
+
for row in block.get("rows") or []
|
|
769
|
+
)
|
|
683
770
|
resource = {
|
|
684
771
|
"apiVersion": context.api_version,
|
|
685
772
|
"appKey": app_key,
|
|
686
773
|
"spec": {
|
|
687
774
|
"appName": _compat_label(form.get("formTitle"), "App", app_key),
|
|
688
775
|
"appDescription": form.get("formDesc") or None,
|
|
689
|
-
"dataTitleField": _selector(title_id, field_names.get(title_id or 0)) if title_id is not None else None,
|
|
690
|
-
"dataCoverField": _selector(cover_id, field_names.get(cover_id or 0)) if cover_id is not None else None,
|
|
776
|
+
"dataTitleField": _selector(title_id, field_names.get(title_id or 0)) if title_id is not None and has_fields else None,
|
|
777
|
+
"dataCoverField": _selector(cover_id, field_names.get(cover_id or 0)) if cover_id is not None and has_fields else None,
|
|
691
778
|
"attachments": self._attachments(form.get("formAttach")),
|
|
692
779
|
"serialNumber": self._serial_number(form.get("serialNumType"), form.get("serialNumConfig")),
|
|
693
780
|
"body": body,
|
|
@@ -919,8 +1006,6 @@ class AppFormNormalizer:
|
|
|
919
1006
|
reference = question.get("referenceConfig") if isinstance(question.get("referenceConfig"), dict) else {}
|
|
920
1007
|
refer_questions = [item for item in reference.get("referQuestions") or [] if isinstance(item, dict)]
|
|
921
1008
|
display_id = _positive_int(reference.get("referQueId"))
|
|
922
|
-
display = next((item for item in refer_questions if _positive_int(item.get("queId")) == display_id), None)
|
|
923
|
-
visible = [item for item in refer_questions if _positive_int(item.get("queAuth")) != 2]
|
|
924
1009
|
target_app_key = str(reference.get("referAppKey") or "")
|
|
925
1010
|
if not target_app_key.strip():
|
|
926
1011
|
raise AppFormFailure(
|
|
@@ -932,25 +1017,37 @@ class AppFormNormalizer:
|
|
|
932
1017
|
relation_config: JSONObject = {
|
|
933
1018
|
"targetAppKey": target_app_key,
|
|
934
1019
|
"relationMode": "multiple" if _positive_int(reference.get("optionalDataNum")) not in {None, 1} else "single",
|
|
935
|
-
"
|
|
936
|
-
|
|
937
|
-
|
|
938
|
-
|
|
939
|
-
|
|
940
|
-
|
|
941
|
-
|
|
942
|
-
|
|
943
|
-
|
|
944
|
-
|
|
945
|
-
|
|
946
|
-
|
|
1020
|
+
"displayFields": [
|
|
1021
|
+
{
|
|
1022
|
+
"field": _require_selector(
|
|
1023
|
+
item.get("queId"),
|
|
1024
|
+
item.get("queTitle"),
|
|
1025
|
+
message="relation display field cannot be normalized",
|
|
1026
|
+
details={"queId": que_id, "path": "/config/displayFields"},
|
|
1027
|
+
),
|
|
1028
|
+
"auth": {1: "editable", 2: "hidden", 3: "visible"}.get(
|
|
1029
|
+
_positive_int(item.get("queAuth")), "visible"
|
|
1030
|
+
),
|
|
1031
|
+
}
|
|
1032
|
+
for item in sorted(
|
|
1033
|
+
refer_questions,
|
|
1034
|
+
key=lambda item: (
|
|
1035
|
+
item.get("ordinal") is None,
|
|
1036
|
+
item.get("ordinal") if isinstance(item.get("ordinal"), int) else 0,
|
|
1037
|
+
),
|
|
947
1038
|
)
|
|
948
|
-
for item in visible
|
|
949
1039
|
],
|
|
950
1040
|
"beingDefaultFormulaAutoFillEnabled": reference.get("beingDefaultFormulaAutoFillEnabled"),
|
|
951
1041
|
"defaultValueMatchRules": reference.get("defaultValueMatchRules"),
|
|
952
1042
|
"defaultValues": question.get("queDefaultValues") if isinstance(question.get("queDefaultValues"), dict) else None,
|
|
953
1043
|
}
|
|
1044
|
+
if display_id is not None:
|
|
1045
|
+
relation_config["twoWayBoundField"] = _require_selector(
|
|
1046
|
+
display_id,
|
|
1047
|
+
next((item.get("queTitle") for item in refer_questions if _positive_int(item.get("queId")) == display_id), None),
|
|
1048
|
+
message="relation two-way bound field cannot be normalized",
|
|
1049
|
+
details={"queId": que_id, "path": "/config/twoWayBoundField"},
|
|
1050
|
+
)
|
|
954
1051
|
if supports_reference_default_formula:
|
|
955
1052
|
formula = reference.get("defaultValueFormula")
|
|
956
1053
|
relation_config["defaultValueFormula"] = formula if not isinstance(formula, str) or formula.strip() else None
|
|
@@ -1162,11 +1259,20 @@ class AppFormNormalizer:
|
|
|
1162
1259
|
name = match.group("name").strip()
|
|
1163
1260
|
if name:
|
|
1164
1261
|
token = match.group("token").strip()
|
|
1262
|
+
# 名字两侧 strip 匹配:存量字段名带尾随空格(如 am4oh08v2401
|
|
1263
|
+
# 「答:Answer 」),模板引用名无空格——严格相等会丢 queId 锚定
|
|
1165
1264
|
matching_ids = [
|
|
1166
1265
|
que_id
|
|
1167
1266
|
for que_id, field_name in field_names.items()
|
|
1168
|
-
if field_name == name and _encrypt_question_id(que_id) == token
|
|
1267
|
+
if str(field_name).strip() == name and _encrypt_question_id(que_id) == token
|
|
1169
1268
|
]
|
|
1269
|
+
if not matching_ids:
|
|
1270
|
+
# 悬空引用(字段已删/改名,模板仍留旧引用):原文透传——占位符
|
|
1271
|
+
# 化会丢 token 无法复原(加密不可逆),后端写链对模板原样落库;
|
|
1272
|
+
# 不注册 input(声明无此输入,写回与 B0 模板逐字一致,
|
|
1273
|
+
# r10 实测 9gtommb3ng01 等 6 app「inputs[N].field could not
|
|
1274
|
+
# be resolved」即此形态)
|
|
1275
|
+
return match.group(0)
|
|
1170
1276
|
json_path_inputs.setdefault(
|
|
1171
1277
|
name,
|
|
1172
1278
|
{
|
|
@@ -1179,11 +1285,21 @@ class AppFormNormalizer:
|
|
|
1179
1285
|
|
|
1180
1286
|
request_values[request_key] = Q_LINKER_VALUE_REFERENCE_RE.sub(replace_reference, raw_value)
|
|
1181
1287
|
inputs.extend(json_path_inputs.values())
|
|
1182
|
-
|
|
1183
|
-
|
|
1184
|
-
|
|
1185
|
-
|
|
1186
|
-
|
|
1288
|
+
# URL 空容忍边界(#208③):后端写链仅 configMode=1(自定义)校验 url/method/
|
|
1289
|
+
# resultType 非空(FormQuestionSvcImpl.createQuestionRemoteLookUp:444 抛
|
|
1290
|
+
# REMOTE_LOOK_UP_SETTING_WRONG);configMode=2 插件模板 / 3 连接中心 /
|
|
1291
|
+
# 4 轻翼智能体的 URL 由模板侧提供,本表 url 空 是合法存量形态——非自定义
|
|
1292
|
+
# 模式放行空 URL 透传(写回走模板透传,round-trip 保真;r12 归因 27 app;
|
|
1293
|
+
# 自定义模式 url 空的 2 app 脓数据仍拒绝,入排除账本)。
|
|
1294
|
+
config_mode = _positive_int(config.get("configMode")) or 1
|
|
1295
|
+
if config_mode == 1:
|
|
1296
|
+
request_url = _required_text(
|
|
1297
|
+
request_values["url"],
|
|
1298
|
+
message="Q-Linker request URL is empty",
|
|
1299
|
+
details={"queId": source_id, "path": "/config/qLinkerBinding/request/url"},
|
|
1300
|
+
)
|
|
1301
|
+
else:
|
|
1302
|
+
request_url = str(request_values["url"] or "")
|
|
1187
1303
|
request = _without_none(
|
|
1188
1304
|
{
|
|
1189
1305
|
"url": request_url,
|
|
@@ -1292,7 +1408,12 @@ class AppFormNormalizer:
|
|
|
1292
1408
|
que_id = _positive_int(question.get("queId"))
|
|
1293
1409
|
relation = next((item for item in relations if _positive_int(item.get("queId")) == que_id), None)
|
|
1294
1410
|
if relation is None:
|
|
1295
|
-
|
|
1411
|
+
# 后端 GET 读面会过滤 displayed 目标缺失的 relation 行(FormSvcImpl#getQuestionRelationsBeans
|
|
1412
|
+
# 对 displayedForm/displayedQuestion 为 null 的行 continue,40013 存量实证:displayed_que_id=0
|
|
1413
|
+
# 共 264 行、displayed_form/que 闭包外 98/116 行)。此时字段本体仍在 formQues 中,
|
|
1414
|
+
# 但关联配置不可回读——保留字段并回读空 config(source 省略);写回侧不重建该字段的
|
|
1415
|
+
# relation 行,与后端读面行为对称。库表级 diff 将此类行归入「历史数据保全」单列。
|
|
1416
|
+
return {}
|
|
1296
1417
|
relation_type = _positive_int(relation.get("relationType")) or 1
|
|
1297
1418
|
displayed = relation.get("displayedQueInfo") if isinstance(relation.get("displayedQueInfo"), dict) else {}
|
|
1298
1419
|
alias = relation.get("aliasConfig") if isinstance(relation.get("aliasConfig"), dict) else {}
|
|
@@ -1393,15 +1514,25 @@ class AppFormNormalizer:
|
|
|
1393
1514
|
if isinstance(judge_type, bool) or not isinstance(judge_type, int) or judge_type not in BACKEND_TO_JUDGE_TYPE:
|
|
1394
1515
|
raise AppFormFailure("UNSUPPORTED_FIELD_CONFIG", "data_relation judgeType cannot be normalized", "NORMALIZE", details={"queId": que_id, "judgeType": judge_type})
|
|
1395
1516
|
condition: JSONObject = {
|
|
1396
|
-
"sourceField":
|
|
1517
|
+
"sourceField": _selector(value.get("queId"), value.get("queTitle")) or None,
|
|
1397
1518
|
"operator": BACKEND_TO_JUDGE_TYPE[judge_type],
|
|
1398
1519
|
}
|
|
1520
|
+
if condition["sourceField"] is None:
|
|
1521
|
+
# 存量读回形态:后端反解析出的条件源字段缺失(queId=0 且无名称,原公式
|
|
1522
|
+
# 如 #queId_0$)。省略 sourceField 保留 operator/operand 语义,写回时以
|
|
1523
|
+
# queId=0 透传(后端 matchRulesToFormula 重新生成 #queId_0$,往返对称)。
|
|
1524
|
+
del condition["sourceField"]
|
|
1399
1525
|
match_type = _positive_int(value.get("matchType")) or 1
|
|
1400
1526
|
if match_type == 1:
|
|
1401
1527
|
details = value.get("judgeValueDetails")
|
|
1402
1528
|
if isinstance(details, list):
|
|
1529
|
+
# value 为空串且 id 非空 → 悬空选项引用(选项已被删,id 仍指向已删
|
|
1530
|
+
# optId):以 id 形态保留(写回时透传为悬空引用,往返对称;约束 2:
|
|
1531
|
+
# 语义保真优先于「apply 通过」——不产出不可写回的空串声明)。
|
|
1403
1532
|
literal_values = [
|
|
1404
|
-
str(item
|
|
1533
|
+
str(item["id"])
|
|
1534
|
+
if item.get("value") in (None, "") and item.get("id") is not None
|
|
1535
|
+
else str(item.get("value"))
|
|
1405
1536
|
for item in details
|
|
1406
1537
|
if isinstance(item, dict) and (item.get("value") is not None or item.get("id") is not None)
|
|
1407
1538
|
]
|
|
@@ -1652,7 +1783,10 @@ class AppFormCompiler:
|
|
|
1652
1783
|
selected = [field for field in target_fields if selector_id is not None and _positive_int(field.get("queId")) == selector_id]
|
|
1653
1784
|
if len(selected) == 1:
|
|
1654
1785
|
target_spec[key] = _selector(selected[0].get("queId"), selected[0].get("name"))
|
|
1655
|
-
|
|
1786
|
+
# target 层面同样放行 dataTitleField=null:后端写链
|
|
1787
|
+
# FormSvcImpl.normalizeDataTitleQueId 会兑底到第一个可用字段,
|
|
1788
|
+
# current 与 declared 均为 null 时 target 保持 null 合法。
|
|
1789
|
+
data_title, data_cover = self._validate_target(target_spec, allow_missing_data_title=True)
|
|
1656
1790
|
target_spec["dataTitleField"] = _selector(data_title.get("queId"), data_title.get("name")) if data_title is not None else None
|
|
1657
1791
|
target_spec["dataCoverField"] = _selector(data_cover.get("queId"), data_cover.get("name")) if data_cover is not None else None
|
|
1658
1792
|
return {"apiVersion": context.api_version, "appKey": app_key, "spec": target_spec}
|
|
@@ -1673,6 +1807,8 @@ class AppFormCompiler:
|
|
|
1673
1807
|
relation_context["questionRelations"] = relations
|
|
1674
1808
|
internal_fields, relations = _compile_q_linker_binding_fields(fields=internal_fields, current_schema=relation_context)
|
|
1675
1809
|
self._validate_unique_relation_targets(relations, internal_fields)
|
|
1810
|
+
except AmbiguousFieldSelector as error:
|
|
1811
|
+
raise AppFormFailure("AMBIGUOUS_FIELD_SELECTOR", str(error), "CONTRACT_PRECHECK", details={"candidateQueIds": error.candidates}) from error
|
|
1676
1812
|
except (KeyError, ValueError) as error:
|
|
1677
1813
|
raise AppFormFailure("UNSUPPORTED_FIELD_CONFIG", str(error), "CONTRACT_PRECHECK") from error
|
|
1678
1814
|
self._assign_subfield_temp_ids(internal_fields)
|
|
@@ -1686,7 +1822,9 @@ class AppFormCompiler:
|
|
|
1686
1822
|
if not isinstance(item, dict) or item.get("source") != "json_path":
|
|
1687
1823
|
continue
|
|
1688
1824
|
selected = _resolve_internal_selector(item.get("field") or {}, internal_fields, f"qLinkerBinding.inputs[{index}].field")
|
|
1689
|
-
|
|
1825
|
+
# 两侧 strip:模板引用名提取时已 strip(存量字段名带尾随空格,
|
|
1826
|
+
# 如 r10 am4oh08v2401「答:Answer 」),严格相等误报 key 不一致
|
|
1827
|
+
if str(item.get("key") or "").strip() != str(selected.get("name") or "").strip():
|
|
1690
1828
|
raise AppFormFailure(
|
|
1691
1829
|
"UNSUPPORTED_FIELD_CONFIG",
|
|
1692
1830
|
"json_path input key must equal the selected field name for lossless readback",
|
|
@@ -1978,10 +2116,13 @@ class AppFormCompiler:
|
|
|
1978
2116
|
if any(present) and not all(present):
|
|
1979
2117
|
raise AppFormFailure("INVALID_ROW_WIDTH", "all fields in a row must provide width together", "CONTRACT_PRECHECK")
|
|
1980
2118
|
if all(present):
|
|
1981
|
-
|
|
1982
|
-
|
|
1983
|
-
|
|
1984
|
-
|
|
2119
|
+
# 宽度取值:任意 1-100 整数(后端 html_width 无取值校验,存量存在
|
|
2120
|
+
# 33/34/20/30 等值,33+33+34=100 的三等分历史布局);仅保留
|
|
2121
|
+
# 「全有或全无」约束。行总和不强制 =100:后端写链无总和校验
|
|
2122
|
+
# (QuestionConstant.DEFAULT_QUE_WIDTH=100 仅为新建默认值),存量
|
|
2123
|
+
# 数据存在字段删除后留白的行,get 读出的原布局必须能原样 apply。
|
|
2124
|
+
if any(not (isinstance(field.get("width"), int) and 1 <= field["width"] <= 100) for field in fields):
|
|
2125
|
+
raise AppFormFailure("INVALID_ROW_WIDTH", "field widths must be an integer between 1 and 100", "CONTRACT_PRECHECK")
|
|
1985
2126
|
return
|
|
1986
2127
|
widths = {
|
|
1987
2128
|
1: [100],
|
|
@@ -2000,24 +2141,23 @@ class AppFormCompiler:
|
|
|
2000
2141
|
) -> tuple[JSONObject | None, JSONObject | None]:
|
|
2001
2142
|
body = spec.get("body") or []
|
|
2002
2143
|
fields = list(_iter_fields(body))
|
|
2003
|
-
|
|
2144
|
+
# 方案 A(duplicate-field-name):同父级允许同名——后端以 queId 为字段身份
|
|
2145
|
+
# (40013 实测 1624 组同名),get 提出的合法形态必须能写回;name 解析的
|
|
2146
|
+
# 歧义由各 selector resolver 以 AMBIGUOUS_FIELD_SELECTOR 显式拒绝,
|
|
2147
|
+
# 不在目标校验层做 name 唯一性强校验。
|
|
2004
2148
|
for field in fields:
|
|
2005
|
-
name = str(field.get("name") or "")
|
|
2006
|
-
if name in names:
|
|
2007
|
-
raise AppFormFailure("DUPLICATE_FIELD_NAME", f"duplicate top-level field name: {name}", "CONTRACT_PRECHECK")
|
|
2008
|
-
names.add(name)
|
|
2009
2149
|
if _field_type(field) == "subtable":
|
|
2010
|
-
sub_names: set[str] = set()
|
|
2011
2150
|
for subfield in field.get("subfields") or []:
|
|
2012
2151
|
if _field_type(subfield) not in SUBFIELD_TYPES:
|
|
2013
2152
|
raise AppFormFailure("INVALID_SPEC", "unsupported subtable field type", "CONTRACT_PRECHECK", details={"allowedTypes": sorted(SUBFIELD_TYPES)})
|
|
2014
|
-
if subfield.get("name") in sub_names:
|
|
2015
|
-
raise AppFormFailure("DUPLICATE_FIELD_NAME", f"duplicate subtable field name: {subfield.get('name')}", "CONTRACT_PRECHECK")
|
|
2016
|
-
sub_names.add(str(subfield.get("name") or ""))
|
|
2017
2153
|
title_selector = spec.get("dataTitleField")
|
|
2018
2154
|
data_title: JSONObject | None = None
|
|
2019
2155
|
if fields:
|
|
2020
|
-
|
|
2156
|
+
# dataTitleField=null(键存在值为空)与省略键同权放行:后端写链
|
|
2157
|
+
# FormSvcImpl.normalizeDataTitleQueId 对 null 自动 fallback 到第一个
|
|
2158
|
+
# 可用字段(findDefaultDataTitleQueId),apply 侧缺省完全合法;
|
|
2159
|
+
# get 读面在后端 dataTitleQueId 未设置时原样输出 null,round-trip 必须接受。
|
|
2160
|
+
if title_selector is None and allow_missing_data_title:
|
|
2021
2161
|
pass
|
|
2022
2162
|
elif not isinstance(title_selector, dict):
|
|
2023
2163
|
raise AppFormFailure(
|
|
@@ -2068,6 +2208,8 @@ class AppFormCompiler:
|
|
|
2068
2208
|
relation_context["questionRelations"] = relations
|
|
2069
2209
|
internal_fields, relations = _compile_q_linker_binding_fields(fields=internal_fields, current_schema=relation_context)
|
|
2070
2210
|
self._validate_unique_relation_targets(relations, internal_fields)
|
|
2211
|
+
except AmbiguousFieldSelector as error:
|
|
2212
|
+
raise AppFormFailure("AMBIGUOUS_FIELD_SELECTOR", str(error), "COMPILE", details={"candidateQueIds": error.candidates}) from error
|
|
2071
2213
|
except (KeyError, ValueError) as error:
|
|
2072
2214
|
raise AppFormFailure("UNSUPPORTED_FIELD_CONFIG", str(error), "COMPILE") from error
|
|
2073
2215
|
self._assign_subfield_temp_ids(internal_fields)
|
|
@@ -2124,7 +2266,8 @@ class AppFormCompiler:
|
|
|
2124
2266
|
rows.append([section])
|
|
2125
2267
|
payload["formQues"] = rows
|
|
2126
2268
|
self._validate_unique_temp_ids(rows)
|
|
2127
|
-
|
|
2269
|
+
target_data_title_selector = target["spec"]["dataTitleField"]
|
|
2270
|
+
data_title = _resolve_canonical_selector(target_data_title_selector, target_fields, "dataTitleField") if target_fields and isinstance(target_data_title_selector, dict) else None
|
|
2128
2271
|
data_cover_selector = target["spec"].get("dataCoverField")
|
|
2129
2272
|
data_cover = _resolve_canonical_selector(data_cover_selector, target_fields, "dataCoverField") if isinstance(data_cover_selector, dict) else None
|
|
2130
2273
|
payload["dataTitleQueId"] = self._field_runtime_id(data_title, internal_fields)
|
|
@@ -2331,6 +2474,16 @@ class AppFormCompiler:
|
|
|
2331
2474
|
{
|
|
2332
2475
|
"target_app_key": config.get("targetAppKey"),
|
|
2333
2476
|
"relation_mode": config.get("relationMode") or "single",
|
|
2477
|
+
"two_way_bound_field": _snake_selector(config.get("twoWayBoundField")),
|
|
2478
|
+
"display_fields": [
|
|
2479
|
+
{
|
|
2480
|
+
"field": _snake_selector(item.get("field")),
|
|
2481
|
+
"auth": item.get("auth") or "visible",
|
|
2482
|
+
}
|
|
2483
|
+
for item in config.get("displayFields") or []
|
|
2484
|
+
if isinstance(item, dict)
|
|
2485
|
+
],
|
|
2486
|
+
# Deprecated input names stay available to the compiler compatibility translator.
|
|
2334
2487
|
"display_field": _snake_selector(config.get("displayField")),
|
|
2335
2488
|
"visible_fields": [_snake_selector(item) for item in config.get("visibleFields") or []],
|
|
2336
2489
|
"reference_default_formula_auto_fill": config.get("beingDefaultFormulaAutoFillEnabled"),
|
|
@@ -2349,7 +2502,18 @@ class AppFormCompiler:
|
|
|
2349
2502
|
def _question(self, profile: str, app_key: str, field: JSONObject, internal: JSONObject, temp_id: int, relations: list[JSONObject]) -> JSONObject:
|
|
2350
2503
|
field_type = _field_type(field)
|
|
2351
2504
|
que_type = CANONICAL_TO_QUE_TYPE[field_type]
|
|
2352
|
-
build_type =
|
|
2505
|
+
build_type = (
|
|
2506
|
+
"boolean" if field_type == "single_choice"
|
|
2507
|
+
else "text" if field_type in {
|
|
2508
|
+
"link", "data_relation", "rich_text",
|
|
2509
|
+
# 透传型新类型(r10 读面覆盖):build 走 text 兜底,类型/配置经模板保真
|
|
2510
|
+
"date_duration", "image_select", "location", "ocr", "embed_field",
|
|
2511
|
+
"ai_content_generation", "ai_content_extraction", "ai_content_classification",
|
|
2512
|
+
"ai_machine_translation", "ai_image_recognition", "ai_image_generation",
|
|
2513
|
+
"ai_document_parsing", "ai_text_summary",
|
|
2514
|
+
}
|
|
2515
|
+
else field_type
|
|
2516
|
+
)
|
|
2353
2517
|
built_internal = deepcopy(internal)
|
|
2354
2518
|
built_internal["type"] = build_type
|
|
2355
2519
|
if build_type == "subtable":
|
|
@@ -2506,18 +2670,24 @@ class AppFormCompiler:
|
|
|
2506
2670
|
config = field.get("config") or {}
|
|
2507
2671
|
related_que_id = _positive_int(internal.get("data_relation_related_que_id"))
|
|
2508
2672
|
if related_que_id is None:
|
|
2509
|
-
|
|
2673
|
+
# 存量读回形态(后端 GET 不回传该字段的 relation):模板里保留着后端
|
|
2674
|
+
# 镜像字段(relatedQueId/queOriginType),透传保持字段级语义不失真。
|
|
2675
|
+
template_related = _positive_int((template or {}).get("relatedQueId"))
|
|
2676
|
+
if template_related is not None:
|
|
2677
|
+
question["relatedQueId"] = template_related
|
|
2678
|
+
else:
|
|
2679
|
+
question.pop("relatedQueId", None)
|
|
2510
2680
|
else:
|
|
2511
2681
|
question["relatedQueId"] = related_que_id
|
|
2512
2682
|
que_origin_type = _positive_int(internal.get("data_relation_origin_type"))
|
|
2513
2683
|
if que_origin_type is None:
|
|
2514
|
-
|
|
2515
|
-
|
|
2516
|
-
"
|
|
2517
|
-
|
|
2518
|
-
|
|
2519
|
-
|
|
2520
|
-
|
|
2684
|
+
template_origin = _positive_int((template or {}).get("queOriginType"))
|
|
2685
|
+
if template_origin is not None:
|
|
2686
|
+
question["queOriginType"] = template_origin
|
|
2687
|
+
else:
|
|
2688
|
+
question.pop("queOriginType", None)
|
|
2689
|
+
else:
|
|
2690
|
+
question["queOriginType"] = que_origin_type
|
|
2521
2691
|
aggregation = config.get("aggregation")
|
|
2522
2692
|
if aggregation is None:
|
|
2523
2693
|
question.pop("aggreType", None)
|
|
@@ -2532,23 +2702,76 @@ class AppFormCompiler:
|
|
|
2532
2702
|
|
|
2533
2703
|
def _reference_config(self, profile: str, config: JSONObject, template: JSONObject | None = None) -> JSONObject:
|
|
2534
2704
|
target_app_key = str(config.get("targetAppKey") or "")
|
|
2535
|
-
|
|
2536
|
-
|
|
2537
|
-
|
|
2538
|
-
|
|
2539
|
-
|
|
2540
|
-
|
|
2705
|
+
candidates, _target_form = self._target_form_candidates(profile, target_app_key)
|
|
2706
|
+
explicit_display = isinstance(config.get("displayFields"), list)
|
|
2707
|
+
deprecated_keys = [
|
|
2708
|
+
key
|
|
2709
|
+
for key in ("displayField", "display_field", "visibleFields", "visible_fields")
|
|
2710
|
+
if key in config and config.get(key) is not None
|
|
2711
|
+
]
|
|
2712
|
+
if explicit_display and deprecated_keys:
|
|
2713
|
+
raise AppFormFailure(
|
|
2714
|
+
"INVALID_SPEC",
|
|
2715
|
+
"relation cannot mix displayFields with deprecated displayField/visibleFields",
|
|
2716
|
+
"CONTRACT_PRECHECK",
|
|
2717
|
+
)
|
|
2718
|
+
if explicit_display:
|
|
2719
|
+
# 显式 displayFields(含空列表)按声明原样写:空列表 = 无展示字段,round-trip 空↔空稳定。
|
|
2720
|
+
# 后端语义(2026-09-23 沿源码定案):FormQuestionSvcImpl.creteOrUpdateReference 对空
|
|
2721
|
+
# referQuestions 走 CollectionUtils.isNotEmpty 跳过插入,读面 getReferenceConfig
|
|
2722
|
+
# 同样容忍空——空列表是合法存量形态(双向绑定 referQueId 非空、未配展示字段)。
|
|
2723
|
+
display_entries = [item for item in config["displayFields"] if isinstance(item, dict)]
|
|
2724
|
+
elif deprecated_keys:
|
|
2725
|
+
# v1alpha1 compatibility: the old displayField was both the main display field and the binding field.
|
|
2726
|
+
legacy_display = config.get("displayField") or config.get("display_field") or {}
|
|
2727
|
+
legacy_visible = config.get("visibleFields") or config.get("visible_fields") or []
|
|
2728
|
+
display_entries = [{"field": legacy_display, "auth": "visible"}]
|
|
2729
|
+
display_entries.extend({"field": item, "auth": "visible"} for item in legacy_visible if isinstance(item, dict))
|
|
2730
|
+
else:
|
|
2731
|
+
raise AppFormFailure(
|
|
2732
|
+
"INVALID_SPEC",
|
|
2733
|
+
"relation config requires displayFields (explicit empty list allowed for fields without display fields)",
|
|
2734
|
+
"CONTRACT_PRECHECK",
|
|
2735
|
+
)
|
|
2736
|
+
resolved_display = []
|
|
2737
|
+
seen_ids = set()
|
|
2738
|
+
for index, entry in enumerate(display_entries):
|
|
2739
|
+
selector = entry.get("field") if isinstance(entry, dict) else {}
|
|
2740
|
+
item = _resolve_backend_selector(selector or {}, candidates, f"displayFields[{index}].field")
|
|
2741
|
+
if item["queId"] in seen_ids:
|
|
2742
|
+
raise AppFormFailure(
|
|
2743
|
+
"INVALID_SPEC",
|
|
2744
|
+
f"displayFields[{index}].field resolves to duplicate queId {item['queId']}",
|
|
2745
|
+
"CONTRACT_PRECHECK",
|
|
2746
|
+
)
|
|
2747
|
+
seen_ids.add(item["queId"])
|
|
2748
|
+
auth = (entry.get("auth") if isinstance(entry, dict) else None) or "visible"
|
|
2749
|
+
auth_code = {"editable": 1, "hidden": 2, "visible": 3}.get(auth)
|
|
2750
|
+
if auth_code is None:
|
|
2751
|
+
raise AppFormFailure("INVALID_SPEC", "displayFields auth must be editable, hidden, or visible", "CONTRACT_PRECHECK")
|
|
2752
|
+
resolved_display.append((item, auth_code))
|
|
2753
|
+
two_way = config.get("twoWayBoundField") or config.get("two_way_bound_field")
|
|
2754
|
+
if two_way is None and (config.get("displayField") or config.get("display_field")):
|
|
2755
|
+
two_way = config.get("displayField") or config.get("display_field")
|
|
2756
|
+
resolved_two_way = _resolve_backend_selector(two_way, candidates, "twoWayBoundField") if two_way else None
|
|
2757
|
+
template_auth = (template or {}).get("referAuthQues") if isinstance((template or {}).get("referAuthQues"), list) else None
|
|
2541
2758
|
result = deepcopy(template or {})
|
|
2542
2759
|
result.update(
|
|
2543
2760
|
{
|
|
2544
2761
|
"referAppKey": target_app_key,
|
|
2545
|
-
"referQueId":
|
|
2762
|
+
"referQueId": resolved_two_way.get("queId") if resolved_two_way else None,
|
|
2546
2763
|
"optionalDataNum": 1 if config.get("relationMode", "single") == "single" else 2,
|
|
2547
2764
|
"referQuestions": [
|
|
2548
|
-
|
|
2549
|
-
|
|
2765
|
+
{"queId": item["queId"], "queTitle": item["queTitle"], "queType": item["queType"], "queAuth": auth, "ordinal": index}
|
|
2766
|
+
for index, (item, auth) in enumerate(resolved_display)
|
|
2550
2767
|
],
|
|
2551
|
-
|
|
2768
|
+
# 选择引用数据时的列表权限轴(draft_reference_que_auth,含 section/parent 结构)
|
|
2769
|
+
# 与展示字段轴(referQuestions)独立;声明未建模该轴,已有配置原样透传
|
|
2770
|
+
# (空列表同样原样保留——被默认值覆盖会改变存量语义,历史数据保全红线),
|
|
2771
|
+
# 仅新建字段(无模板)按展示字段默认 editable,避免删除重建丢权限配置。
|
|
2772
|
+
"referAuthQues": deepcopy(template_auth)
|
|
2773
|
+
if template_auth is not None
|
|
2774
|
+
else [{"queId": item["queId"], "queAuth": 1} for item, _ in resolved_display],
|
|
2552
2775
|
"beingDefaultFormulaAutoFillEnabled": config.get("beingDefaultFormulaAutoFillEnabled"),
|
|
2553
2776
|
"defaultValueFormula": config.get("defaultValueFormula"),
|
|
2554
2777
|
"defaultValueMatchRules": deepcopy(config.get("defaultValueMatchRules")),
|
|
@@ -2566,8 +2789,7 @@ class AppFormCompiler:
|
|
|
2566
2789
|
target_app_key = str(relation.get("targetAppKey") or "")
|
|
2567
2790
|
if not target_app_key:
|
|
2568
2791
|
raise AppFormFailure("UNSUPPORTED_FIELD_CONFIG", "select scope relation requires targetAppKey", "COMPILE")
|
|
2569
|
-
target_form = self.
|
|
2570
|
-
candidates = _backend_question_candidates(target_form)
|
|
2792
|
+
candidates, target_form = self._target_form_candidates(profile, target_app_key)
|
|
2571
2793
|
displayed = _resolve_backend_selector(relation.get("displayedField") or {}, candidates, "selectScopeRelation.displayedField")
|
|
2572
2794
|
payload: JSONObject = {
|
|
2573
2795
|
"queId": _positive_int(internal.get("que_id")) or int(internal.get("que_temp_id") or 0),
|
|
@@ -2589,14 +2811,27 @@ class AppFormCompiler:
|
|
|
2589
2811
|
def _resolve_subfield_runtime_id(selector: JSONObject, internal_fields: list[JSONObject], location: str) -> int:
|
|
2590
2812
|
if not isinstance(selector, dict):
|
|
2591
2813
|
raise AppFormFailure("INVALID_FIELD_SELECTOR", f"{location} must be an object", "COMPILE")
|
|
2814
|
+
# 同 _resolve_backend_selector:name 两侧 strip(存量字段名带前后空格,queId 兜底唯一性)。
|
|
2592
2815
|
que_id = _positive_int(selector.get("queId"))
|
|
2593
|
-
name = str(selector.get("name") or "")
|
|
2816
|
+
name = str(selector.get("name") or "").strip()
|
|
2594
2817
|
matches = [
|
|
2595
2818
|
item for item in internal_fields
|
|
2596
2819
|
if (que_id is None or _positive_int(item.get("que_id")) == que_id)
|
|
2597
|
-
and (not name or str(item.get("name") or "") == name)
|
|
2820
|
+
and (not name or str(item.get("name") or "").strip() == name)
|
|
2598
2821
|
]
|
|
2599
2822
|
if len(matches) != 1:
|
|
2823
|
+
if que_id is None and matches:
|
|
2824
|
+
raise AppFormFailure(
|
|
2825
|
+
"AMBIGUOUS_FIELD_SELECTOR",
|
|
2826
|
+
f"{location} matches multiple subfields with the same name; use queId to disambiguate",
|
|
2827
|
+
"COMPILE",
|
|
2828
|
+
details={
|
|
2829
|
+
"selector": selector,
|
|
2830
|
+
"candidateQueIds": sorted(
|
|
2831
|
+
{_positive_int(item.get("que_id")) or 0 for item in matches}
|
|
2832
|
+
),
|
|
2833
|
+
},
|
|
2834
|
+
)
|
|
2600
2835
|
raise AppFormFailure("INVALID_FIELD_SELECTOR", f"{location} must resolve to exactly one subfield", "COMPILE", details={"selector": selector, "matches": len(matches)})
|
|
2601
2836
|
return _positive_int(matches[0].get("que_id")) or int(matches[0].get("que_temp_id") or 0)
|
|
2602
2837
|
|
|
@@ -2627,6 +2862,13 @@ class AppFormCompiler:
|
|
|
2627
2862
|
continue
|
|
2628
2863
|
config = field.get("config") or {}
|
|
2629
2864
|
source = config.get("source") or {}
|
|
2865
|
+
if not source.get("kind"):
|
|
2866
|
+
# 存量读回形态:后端 GET 不回传该字段的关联配置(displayed 目标缺失被
|
|
2867
|
+
# getQuestionRelationsBeans continue 过滤)。normalizer 提取为无 source 的
|
|
2868
|
+
# 空 config;写回侧保持对称——不重建 relation 行(后端删除重建后自然无行)。
|
|
2869
|
+
internal.pop("data_relation_related_que_id", None)
|
|
2870
|
+
internal.pop("data_relation_origin_type", None)
|
|
2871
|
+
continue
|
|
2630
2872
|
field_id = _positive_int(internal.get("que_id")) or int(internal.get("que_temp_id") or 0) or None
|
|
2631
2873
|
relation: JSONObject = {
|
|
2632
2874
|
"queId": field_id,
|
|
@@ -2641,10 +2883,23 @@ class AppFormCompiler:
|
|
|
2641
2883
|
source_fields = available_internal_fields
|
|
2642
2884
|
source_fields_are_backend = False
|
|
2643
2885
|
if source.get("kind") == "app":
|
|
2644
|
-
|
|
2645
|
-
source_fields = _backend_question_candidates(target_form)
|
|
2886
|
+
source_fields, _target_form = self._target_form_candidates(profile, str(source.get("appKey") or ""))
|
|
2646
2887
|
source_fields_are_backend = True
|
|
2647
|
-
|
|
2888
|
+
# 展示字段同样按后端语义透传:写链对 displayedQueId 无存在性校验
|
|
2889
|
+
# 原样落库(fillMatchRulesList 读链按全局 question∪draft_question
|
|
2890
|
+
# 解析)。解析不到时 queType=None → 写侧 origin_type 回退 current
|
|
2891
|
+
# 模板值(见 data_relation relatedQueId/queOriginType 组装)。
|
|
2892
|
+
try:
|
|
2893
|
+
target = _resolve_backend_selector(source.get("field") or {}, source_fields, "source.field")
|
|
2894
|
+
except AppFormFailure as error:
|
|
2895
|
+
if error.error_code != "INVALID_FIELD_SELECTOR" or _positive_int((source.get("field") or {}).get("queId")) is None:
|
|
2896
|
+
raise
|
|
2897
|
+
target = {
|
|
2898
|
+
"queId": _positive_int(source["field"].get("queId")),
|
|
2899
|
+
"queTitle": str(source["field"].get("name") or "").strip() or None,
|
|
2900
|
+
"queType": None,
|
|
2901
|
+
"_app_form_unresolved": True,
|
|
2902
|
+
}
|
|
2648
2903
|
relation.update(
|
|
2649
2904
|
{
|
|
2650
2905
|
"displayedQueId": target["queId"],
|
|
@@ -2758,25 +3013,32 @@ class AppFormCompiler:
|
|
|
2758
3013
|
current_fields: list[JSONObject],
|
|
2759
3014
|
source_fields_are_backend: bool,
|
|
2760
3015
|
) -> JSONObject:
|
|
2761
|
-
|
|
2762
|
-
|
|
2763
|
-
|
|
2764
|
-
|
|
2765
|
-
|
|
2766
|
-
|
|
3016
|
+
source_selector = condition.get("sourceField") or {}
|
|
3017
|
+
if source_selector.get("queId") or str(source_selector.get("name") or "").strip():
|
|
3018
|
+
source = cls._resolve_data_relation_source_field(
|
|
3019
|
+
source_selector,
|
|
3020
|
+
source_fields=source_fields,
|
|
3021
|
+
source_fields_are_backend=source_fields_are_backend,
|
|
3022
|
+
location="sourceField",
|
|
3023
|
+
)
|
|
3024
|
+
else:
|
|
3025
|
+
# 存量读回形态:无源字段(原公式 #queId_0$)。以 queId=0 透传,后端
|
|
3026
|
+
# matchRulesToFormula 重新生成 #queId_0$,与原始库内公式往返对称。
|
|
3027
|
+
source = {}
|
|
2767
3028
|
operand = condition.get("operand") or {}
|
|
2768
3029
|
operator = str(condition.get("operator") or "")
|
|
2769
3030
|
cls._validate_data_relation_operator(source, operator, operand)
|
|
2770
3031
|
payload: JSONObject = {
|
|
2771
|
-
"queId": cls._data_relation_field_ref(source),
|
|
2772
|
-
"queTitle": cls._data_relation_field_name(source),
|
|
2773
|
-
"queType": cls._data_relation_que_type(source),
|
|
3032
|
+
"queId": cls._data_relation_field_ref(source) or 0,
|
|
3033
|
+
"queTitle": cls._data_relation_field_name(source) or None,
|
|
3034
|
+
"queType": cls._data_relation_que_type(source) if source else None,
|
|
2774
3035
|
"judgeType": JUDGE_TYPE_TO_BACKEND[operator],
|
|
2775
3036
|
}
|
|
2776
3037
|
if operand.get("kind") == "literal":
|
|
2777
3038
|
judge_values, judge_value_details = cls._data_relation_literal_values(
|
|
2778
3039
|
source,
|
|
2779
3040
|
deepcopy(operand.get("values") or []),
|
|
3041
|
+
operator=operator,
|
|
2780
3042
|
)
|
|
2781
3043
|
payload.update(
|
|
2782
3044
|
{
|
|
@@ -2802,7 +3064,7 @@ class AppFormCompiler:
|
|
|
2802
3064
|
return payload
|
|
2803
3065
|
|
|
2804
3066
|
@staticmethod
|
|
2805
|
-
def _data_relation_literal_values(source: JSONObject, values: list[Any]) -> tuple[list[str], list[JSONObject]]:
|
|
3067
|
+
def _data_relation_literal_values(source: JSONObject, values: list[Any], *, operator: str = "") -> tuple[list[str], list[JSONObject]]:
|
|
2806
3068
|
field_type = _canonical_backend_field_type(source)
|
|
2807
3069
|
options = [item for item in source.get("options") or [] if isinstance(item, dict)]
|
|
2808
3070
|
option_by_name = {
|
|
@@ -2832,6 +3094,13 @@ class AppFormCompiler:
|
|
|
2832
3094
|
if field_type in CHOICE_TYPES and options:
|
|
2833
3095
|
option = option_by_name.get(text) or option_by_id.get(text)
|
|
2834
3096
|
if option is None:
|
|
3097
|
+
# 悬空选项引用(选项已被删,id 仍指向已删 optId):透传为存量
|
|
3098
|
+
# 同构的悬空引用(judgeValues=[optId], details=[{id,value:""}]),
|
|
3099
|
+
# 后端接受该形态(生产库存量即如此),往返对称;不是选项校验失败。
|
|
3100
|
+
if text.isdigit() and _positive_int(text) is not None:
|
|
3101
|
+
judge_values.append(text)
|
|
3102
|
+
details.append({"id": int(text), "value": ""})
|
|
3103
|
+
continue
|
|
2835
3104
|
raise AppFormFailure(
|
|
2836
3105
|
"UNSUPPORTED_FIELD_CONFIG",
|
|
2837
3106
|
f"literal value {text!r} is not an option of data_relation source field "
|
|
@@ -2844,6 +3113,28 @@ class AppFormCompiler:
|
|
|
2844
3113
|
judge_values.append(str(option_id) if option_id is not None else option_name)
|
|
2845
3114
|
details.append(_without_none({"id": option_id, "value": option_name}))
|
|
2846
3115
|
continue
|
|
3116
|
+
if operator == "dynamic_range":
|
|
3117
|
+
# 动态范围(judgeType=8):后端 checkRelationMatchRules 要求
|
|
3118
|
+
# judgeValueDetails 非空且 id 非_null;提取侧 values 取自
|
|
3119
|
+
# judgeValueDetails.value(动态范围名称),写回必须恢复 id——
|
|
3120
|
+
# 名称→id 映射对齐 Constants.DYNAMIC_TYPE;数字字符串直通(id 形态)。
|
|
3121
|
+
range_id = DYNAMIC_RANGE_NAME_TO_ID.get(text)
|
|
3122
|
+
if range_id is None and text.isdigit():
|
|
3123
|
+
range_id = _positive_int(text)
|
|
3124
|
+
if range_id is None:
|
|
3125
|
+
# 宽松匹配(剔内嵌空白)兜底:数组存在带/不带空格变体
|
|
3126
|
+
range_id = _DYNAMIC_RANGE_NORMALIZED.get("".join(text.split()))
|
|
3127
|
+
if range_id is None:
|
|
3128
|
+
raise AppFormFailure(
|
|
3129
|
+
"UNSUPPORTED_FIELD_CONFIG",
|
|
3130
|
+
f"literal value {text!r} is not a known dynamic range of data_relation "
|
|
3131
|
+
f"source field {AppFormCompiler._data_relation_field_name(source)!r}",
|
|
3132
|
+
"CONTRACT_PRECHECK",
|
|
3133
|
+
details={"value": text, "allowedValues": sorted(DYNAMIC_RANGE_NAME_TO_ID)},
|
|
3134
|
+
)
|
|
3135
|
+
judge_values.append(str(range_id))
|
|
3136
|
+
details.append({"id": range_id, "value": text})
|
|
3137
|
+
continue
|
|
2847
3138
|
judge_values.append(text)
|
|
2848
3139
|
details.append({"value": text})
|
|
2849
3140
|
return judge_values, details
|
|
@@ -2857,7 +3148,23 @@ class AppFormCompiler:
|
|
|
2857
3148
|
location: str,
|
|
2858
3149
|
) -> JSONObject:
|
|
2859
3150
|
if source_fields_are_backend:
|
|
2860
|
-
|
|
3151
|
+
try:
|
|
3152
|
+
return _resolve_backend_selector(selector, source_fields, location)
|
|
3153
|
+
except AppFormFailure as error:
|
|
3154
|
+
# 目标表单候选集(草稿∪发布 formQues)解析不到、但 selector 带正
|
|
3155
|
+
# queId:按后端语义透传——读链 fillMatchRulesList 按 queId 查
|
|
3156
|
+
# question∪draft_question 全局表,查不到容忍置空(new Question());
|
|
3157
|
+
# 写链 updateFormInfo 对 matchRules/sortConfig 源 queId 无存在性
|
|
3158
|
+
# 校验、原样落库。存量里该形态 = 引用指向目标表单 GET 响应之外
|
|
3159
|
+
# 的字段(跨表/已删,如 r8 实测 00e0e0d8 筛选源),严格拒绝即
|
|
3160
|
+
# round-trip 断裂。queType 置 None 与后端「查不到置空」同构。
|
|
3161
|
+
if error.error_code == "INVALID_FIELD_SELECTOR" and _positive_int(selector.get("queId")) is not None:
|
|
3162
|
+
return {
|
|
3163
|
+
"queId": _positive_int(selector.get("queId")),
|
|
3164
|
+
"queTitle": str(selector.get("name") or "").strip() or None,
|
|
3165
|
+
"_app_form_unresolved": True,
|
|
3166
|
+
}
|
|
3167
|
+
raise
|
|
2861
3168
|
return _resolve_internal_selector(selector, source_fields, location)
|
|
2862
3169
|
|
|
2863
3170
|
@staticmethod
|
|
@@ -2866,10 +3173,20 @@ class AppFormCompiler:
|
|
|
2866
3173
|
|
|
2867
3174
|
@staticmethod
|
|
2868
3175
|
def _data_relation_field_name(field: JSONObject) -> str:
|
|
2869
|
-
|
|
3176
|
+
# matchRules 筛选源字段的 queTitle 在存量里对表格子字段带父表名前缀
|
|
3177
|
+
# (「父表·子字段」):写回按同形态组装,与提取(后端拼接的 queTitle)对称。
|
|
3178
|
+
title = str(field.get("queTitle") or field.get("name") or "")
|
|
3179
|
+
sup_title = str(field.get("_sup_que_title") or "")
|
|
3180
|
+
if sup_title and title:
|
|
3181
|
+
return f"{sup_title}·{title}"
|
|
3182
|
+
return title
|
|
2870
3183
|
|
|
2871
3184
|
@staticmethod
|
|
2872
|
-
def _data_relation_que_type(field: JSONObject) -> int:
|
|
3185
|
+
def _data_relation_que_type(field: JSONObject) -> int | None:
|
|
3186
|
+
if field.get("_app_form_unresolved"):
|
|
3187
|
+
# 透传形态(目标表单候选集解析不到):后端 fillMatchRulesList 对查
|
|
3188
|
+
# 不到的 queId 置空 queType 继续出参,写链不校验——同构置 None。
|
|
3189
|
+
return None
|
|
2873
3190
|
backend_type = _positive_int(field.get("queType"))
|
|
2874
3191
|
if backend_type is not None:
|
|
2875
3192
|
return backend_type
|
|
@@ -2923,10 +3240,25 @@ class AppFormCompiler:
|
|
|
2923
3240
|
ordered_ops = common | {"greater_than", "greater_or_equal", "less_than", "less_or_equal", "dynamic_range", "decimal_range"}
|
|
2924
3241
|
organization_ops = common | {"belongs_to", "not_belongs_to", "subordinate_to", "not_subordinate_to", "subordinate_included", "subordinate_not_included", "contains_any", "contains_all"}
|
|
2925
3242
|
field_type = _canonical_backend_field_type(source)
|
|
2926
|
-
if
|
|
2927
|
-
|
|
3243
|
+
if source.get("_app_form_unresolved"):
|
|
3244
|
+
# 透传形态:源字段类型不可知(后端读链查不到置空),后端写链对
|
|
3245
|
+
# operator×源类型组合无校验——跳过类型白名单,仅保留 operand 形状
|
|
3246
|
+
# 校验(下方),与「读面保留、写面透传」的存量形态处理同口径。
|
|
3247
|
+
allowed = common | text_ops | ordered_ops | organization_ops
|
|
3248
|
+
elif field_type in {"number", "amount", "date", "datetime"}:
|
|
3249
|
+
# date/datetime 补 belongs_to/not_belongs_to:后端 judgeType=13(JUDGE_BELONG_TO)
|
|
3250
|
+
# 对时间字段的存量语义是「属于时间范围」(judgeValues 形如
|
|
3251
|
+
# "2025-01-30 14:20:59~2026-01-30 14:20:59"),与组织字段的属于语义
|
|
3252
|
+
# 共用同一 judgeType——存量实证(如 82d9379e 申请时间筛选)。
|
|
3253
|
+
allowed = ordered_ops | ({"belongs_to", "not_belongs_to"} if field_type in {"date", "datetime"} else set())
|
|
2928
3254
|
elif field_type in {"member", "department"}:
|
|
2929
3255
|
allowed = organization_ops
|
|
3256
|
+
elif field_type in {"text", "multi_select"}:
|
|
3257
|
+
# text/multi_select 补 belongs_to/not_belongs_to:judgeType=13 同为多态
|
|
3258
|
+
# 语义(选项「属于」集合),后端写链对 operator×源类型无校验——存量
|
|
3259
|
+
# 实证 r8:bjqj2bge2g02(multi_select 资产类型 belongs_to 当前字段)、
|
|
3260
|
+
# e4f644fe(text 客户等级 belongs_to literal ["BC"])。
|
|
3261
|
+
allowed = text_ops | {"belongs_to", "not_belongs_to"}
|
|
2930
3262
|
else:
|
|
2931
3263
|
allowed = text_ops
|
|
2932
3264
|
if operator not in allowed:
|
|
@@ -2940,7 +3272,10 @@ class AppFormCompiler:
|
|
|
2940
3272
|
if operator in EMPTY_OPERATORS:
|
|
2941
3273
|
if operand.get("kind") != "literal" or values not in ([], None):
|
|
2942
3274
|
raise AppFormFailure("UNSUPPORTED_FIELD_CONFIG", "empty-value operators require an empty literal operand", "CONTRACT_PRECHECK")
|
|
2943
|
-
elif operand.get("kind") == "literal" and not values:
|
|
3275
|
+
elif operand.get("kind") == "literal" and not values and operator not in {"subordinate_to", "not_subordinate_to"}:
|
|
3276
|
+
# subordinate 两算子放行空 literal:存量「设置后清空」形态(r13 实证
|
|
3277
|
+
# 41ce0ad8)——后端写链仅校验 dynamic_range(checkRelationMatchRules),
|
|
3278
|
+
# formula 对空 judgeValueDetails 渲染 [],读回解析对称,往返保真
|
|
2944
3279
|
raise AppFormFailure("UNSUPPORTED_FIELD_CONFIG", "literal data_relation operands must contain at least one value", "CONTRACT_PRECHECK")
|
|
2945
3280
|
|
|
2946
3281
|
@staticmethod
|
|
@@ -3036,6 +3371,42 @@ class AppFormCompiler:
|
|
|
3036
3371
|
raise AppFormFailure("FORM_READ_FAILED", "backend returned an invalid form", "READ")
|
|
3037
3372
|
return value
|
|
3038
3373
|
|
|
3374
|
+
def _target_form_candidates(self, profile: str, app_key: str) -> tuple[list[JSONObject], JSONObject]:
|
|
3375
|
+
"""跨表引用解析候选集:目标表 草稿∪发布 并集(queId 为 key,草稿覆盖)。
|
|
3376
|
+
|
|
3377
|
+
后端写链对跨表 queId(referQuestions/displayedQueId/matchRules 源字段)无
|
|
3378
|
+
存在性校验、原样落库(FormSvcImpl.updateFormInfo);链上唯一读目标字段的
|
|
3379
|
+
Formula.matchRulesToFormula 取 question∪draft_question 且草稿覆盖,编辑器
|
|
3380
|
+
候选接口(/question/{appKey}/relation)同样支持 beingDraft 草稿态。get 按
|
|
3381
|
+
草稿姿态提取声明,apply 只读发布会漏掉目标表「只加在草稿、从未发布」的字段
|
|
3382
|
+
(round-trip 断裂);只读草稿又会漏掉发布后草稿里删掉的旧字段——并集与
|
|
3383
|
+
后端写链语义一致。草稿读失败(目标表无草稿等)退回仅发布态。
|
|
3384
|
+
"""
|
|
3385
|
+
draft_form: JSONObject = {}
|
|
3386
|
+
try:
|
|
3387
|
+
draft_form = self._read_form(profile, app_key, being_draft=True)
|
|
3388
|
+
except AppFormFailure:
|
|
3389
|
+
draft_form = {}
|
|
3390
|
+
published_form = self._read_form(profile, app_key, being_draft=False)
|
|
3391
|
+
merged: list[JSONObject] = []
|
|
3392
|
+
seen: set[int] = set()
|
|
3393
|
+
for item in [*_backend_question_candidates(draft_form), *_backend_question_candidates(published_form)]:
|
|
3394
|
+
raw_id = item.get("queId")
|
|
3395
|
+
if isinstance(raw_id, int) and not isinstance(raw_id, bool):
|
|
3396
|
+
# queId 是字段身份,身份语义覆盖 0 与负数:0 是系统「编号」虚拟行
|
|
3397
|
+
# (que_type=8,GET 草稿/发布两态各带一行)、负数是系统行(-1 数据来源
|
|
3398
|
+
# 等,补导后物理在表)。只按正整数去重会让 queId=0 的「编号」在
|
|
3399
|
+
# 并集里出现两次,by_name 引用恒定命中 2 个候选 → AMBIGUOUS_
|
|
3400
|
+
# FIELD_SELECTOR(r13 103 app data_relation/relation 深层配置写回
|
|
3401
|
+
# 全量失败根因)。同 queId 即同字段,草稿优先(与正整数身份同
|
|
3402
|
+
# 语义);同名不同 queId 的真实用户字段仍双候选保留,by_name 歧义
|
|
3403
|
+
# 照常显式拒绝(存量脏形态不消歧,禁止静默取第一个)。
|
|
3404
|
+
if raw_id in seen:
|
|
3405
|
+
continue
|
|
3406
|
+
seen.add(raw_id)
|
|
3407
|
+
merged.append(item)
|
|
3408
|
+
return merged, (draft_form or published_form)
|
|
3409
|
+
|
|
3039
3410
|
|
|
3040
3411
|
class AppFormReconciler:
|
|
3041
3412
|
RUNTIME_VERSION = "v1alpha1"
|
|
@@ -3202,7 +3573,17 @@ class AppFormReconciler:
|
|
|
3202
3573
|
)
|
|
3203
3574
|
publish_needed = not _published_equal(current, published)
|
|
3204
3575
|
except (QingflowApiError, RuntimeError, AppFormFailure) as error:
|
|
3205
|
-
|
|
3576
|
+
if self._is_published_metadata_gap(error):
|
|
3577
|
+
# published 侧元数据缺行(段落归属/自定义编号配置):发布动作
|
|
3578
|
+
# 会从 draft 侧复制自愈,推定需要发布而不是失败。
|
|
3579
|
+
publish_needed = True
|
|
3580
|
+
warnings.append({"code": "PUBLISHED_METADATA_GAP", "detail": str(error.message)})
|
|
3581
|
+
elif self._is_form_not_published(error):
|
|
3582
|
+
# 应用从未发布(40026):published 域不存在,对比跳过——
|
|
3583
|
+
# draft 一致即达标,不擅自发布从未发布的应用。
|
|
3584
|
+
warnings.append({"code": "APP_NOT_PUBLISHED", "detail": "published comparison skipped: application was never published"})
|
|
3585
|
+
else:
|
|
3586
|
+
raise AppFormFailure("PUBLISHED_FORM_READ_FAILED", str(error), "PRECHECK_PUBLISHED_READ") from error
|
|
3206
3587
|
diagnostics["diff"] = self._diff(current, target)
|
|
3207
3588
|
|
|
3208
3589
|
if not form_changed and not publish_needed:
|
|
@@ -3303,7 +3684,9 @@ class AppFormReconciler:
|
|
|
3303
3684
|
details={"remainingDiff": deepcopy(diagnostics["remainingDiff"])},
|
|
3304
3685
|
)
|
|
3305
3686
|
|
|
3306
|
-
|
|
3687
|
+
# precheck 阶段推定的 publish_needed(published 元数据缺口)必须保留:
|
|
3688
|
+
# 发布自愈前任何一次 published 读都会失败,重读不会需得新证据。
|
|
3689
|
+
publish_needed = created or wrote_form or publish_needed
|
|
3307
3690
|
if not publish_needed:
|
|
3308
3691
|
try:
|
|
3309
3692
|
published = self._published_resource(
|
|
@@ -3315,14 +3698,20 @@ class AppFormReconciler:
|
|
|
3315
3698
|
diagnostics["published"] = _published_equal(draft, published)
|
|
3316
3699
|
publish_needed = not diagnostics["published"]
|
|
3317
3700
|
except (QingflowApiError, RuntimeError, AppFormFailure) as error:
|
|
3318
|
-
self.
|
|
3319
|
-
|
|
3320
|
-
"
|
|
3321
|
-
|
|
3322
|
-
"
|
|
3323
|
-
|
|
3324
|
-
|
|
3325
|
-
|
|
3701
|
+
if self._is_published_metadata_gap(error):
|
|
3702
|
+
publish_needed = True
|
|
3703
|
+
warnings.append({"code": "PUBLISHED_METADATA_GAP", "detail": str(error.message)})
|
|
3704
|
+
elif self._is_form_not_published(error):
|
|
3705
|
+
warnings.append({"code": "APP_NOT_PUBLISHED", "detail": "published comparison skipped: application was never published"})
|
|
3706
|
+
else:
|
|
3707
|
+
self._finish_edit(profile, app_key, edit_version_no, diagnostics)
|
|
3708
|
+
raise AppFormFailure(
|
|
3709
|
+
"PUBLISHED_FORM_READ_FAILED",
|
|
3710
|
+
str(error),
|
|
3711
|
+
"AUTHORITATIVE_PUBLISHED_READ",
|
|
3712
|
+
status="partial_success",
|
|
3713
|
+
details=diagnostics,
|
|
3714
|
+
) from error
|
|
3326
3715
|
|
|
3327
3716
|
if publish_needed:
|
|
3328
3717
|
self._publish_and_verify(
|
|
@@ -3704,6 +4093,52 @@ class AppFormReconciler:
|
|
|
3704
4093
|
diagnostics["publishResponseAccepted"] = True
|
|
3705
4094
|
diagnostics["publishCount"] += 1
|
|
3706
4095
|
|
|
4096
|
+
@staticmethod
|
|
4097
|
+
def _is_published_metadata_gap(error: Exception) -> bool:
|
|
4098
|
+
"""Published 读面因 published 侧元数据缺行而无法归一化的已知形态。
|
|
4099
|
+
|
|
4100
|
+
后端发布链路(FormSvcImpl.publish)把 draft 侧元数据复制到 published 侧
|
|
4101
|
+
(section_question 先删后建、form_custom_serial_num_set 按 id 三分离)。
|
|
4102
|
+
published 侧对应表缺行时(dataset 闭包漏导/迁移中间态),published GET 呈现:
|
|
4103
|
+
- 段落(queType=24)与段内字段同行、innerQuestions 为空
|
|
4104
|
+
→ UNSUPPORTED_FIELD_TYPE queType=24(段落归属信息在 published 侧丢失);
|
|
4105
|
+
- serialNumType=2 但 serialNumConfig 无组件
|
|
4106
|
+
→ UNSUPPORTED_FIELD_CONFIG "custom serial number has no components"。
|
|
4107
|
+
属数据缺口而非声明不可表达:推定需要发布,由发布动作自愈元数据
|
|
4108
|
+
(draft 读面不受影响——draft 形态段落恒为独立行)。
|
|
4109
|
+
"""
|
|
4110
|
+
if not isinstance(error, AppFormFailure) or error.phase != "NORMALIZE":
|
|
4111
|
+
return False
|
|
4112
|
+
details = error.details if isinstance(error.details, dict) else {}
|
|
4113
|
+
if error.error_code == "UNSUPPORTED_FIELD_TYPE" and _positive_int(details.get("queType")) == 24:
|
|
4114
|
+
return True
|
|
4115
|
+
return error.error_code == "UNSUPPORTED_FIELD_CONFIG" and "custom serial number has no components" in str(error.message)
|
|
4116
|
+
|
|
4117
|
+
@staticmethod
|
|
4118
|
+
def _is_form_not_published(error: Exception) -> bool:
|
|
4119
|
+
"""published 读面因应用从未发布而 40026。
|
|
4120
|
+
|
|
4121
|
+
后端语义(FormSvcImpl.getFormInfo):appPublishStatus == PUBLISH_STATUS_CREATED
|
|
4122
|
+
时 published GET 恒抛 FORM_NOT_PUBLISHED(40026)——合法存量形态(应用创建后
|
|
4123
|
+
从未发布),draft 域恒可读、published 域不存在。此时 published 对比应跳过:
|
|
4124
|
+
draft 一致即达标,apply 不擅自发布从未发布的应用(发布是独立产品动作,
|
|
4125
|
+
由使用者显式决定)。"""
|
|
4126
|
+
if isinstance(error, QingflowApiError):
|
|
4127
|
+
return str(error.backend_code) == "40026"
|
|
4128
|
+
if isinstance(error, AppFormFailure):
|
|
4129
|
+
details = error.details if isinstance(error.details, dict) else {}
|
|
4130
|
+
transport = details.get("transportError") if isinstance(details.get("transportError"), dict) else details
|
|
4131
|
+
return str(transport.get("backend_code")) == "40026" or str(transport.get("code")) == "40026"
|
|
4132
|
+
if isinstance(error, RuntimeError):
|
|
4133
|
+
# tools 层经 raise_tool_error 把 QingflowApiError 包成 RuntimeError,
|
|
4134
|
+
# message 是 as_json 字符串(含 backend_code);解析识别,不吞其他错误。
|
|
4135
|
+
try:
|
|
4136
|
+
payload = json.loads(str(error))
|
|
4137
|
+
except ValueError:
|
|
4138
|
+
return False
|
|
4139
|
+
return isinstance(payload, dict) and str(payload.get("backend_code")) == "40026"
|
|
4140
|
+
return False
|
|
4141
|
+
|
|
3707
4142
|
def _published_matches(
|
|
3708
4143
|
self,
|
|
3709
4144
|
profile: str,
|
|
@@ -4130,19 +4565,46 @@ def _snake_code_block(value: JSONObject) -> JSONObject:
|
|
|
4130
4565
|
|
|
4131
4566
|
|
|
4132
4567
|
def _backend_question_candidates(form: JSONObject) -> list[JSONObject]:
|
|
4133
|
-
|
|
4568
|
+
"""目标表字段的解析候选集(含表格子字段及其「父表·子字段」前缀变体)。
|
|
4569
|
+
|
|
4570
|
+
遍历与后端对齐:FormSvcImpl.fillMatchRulesList 按 supId 全局解析父表标题、
|
|
4571
|
+
不看容器嵌套层级,FormQuestionSvcImpl 的候选集同样把段落内字段展开——因此
|
|
4572
|
+
表格(queType=18)无论位于 formQues 顶层、baseQues 还是段落(queType=24)
|
|
4573
|
+
内部,其 subQuestions 都是合法候选;段落本身不作为候选。
|
|
4574
|
+
"""
|
|
4575
|
+
result: list[JSONObject] = []
|
|
4576
|
+
|
|
4577
|
+
def _visit(item: JSONObject) -> None:
|
|
4578
|
+
que_type = _positive_int(item.get("queType"))
|
|
4579
|
+
if que_type == 24:
|
|
4580
|
+
for inner in item.get("innerQuestions") or []:
|
|
4581
|
+
for nested in inner if isinstance(inner, list) else []:
|
|
4582
|
+
if isinstance(nested, dict):
|
|
4583
|
+
_visit(nested)
|
|
4584
|
+
return
|
|
4585
|
+
result.append(item)
|
|
4586
|
+
# 表格(queType=18)子字段同样是合法的目标字段:后端 data_relation
|
|
4587
|
+
# 运行时按 queId 解析目标字段并把表格子字段纳入 targetQuestionMap
|
|
4588
|
+
# (DataRelationCalService 先按 queId 查 question、再把表格的
|
|
4589
|
+
# subQuestions 合入)。displayedQueId 指向表格子字段是存量合法
|
|
4590
|
+
# 配置,提取能读出、编译必须能写回(两闸门同口径)。
|
|
4591
|
+
# matchRules 的筛选源字段(sourceField)在存量里带父表名前缀
|
|
4592
|
+
# (「父表·子字段」,_data_relation_field_name 按同形态写回)。
|
|
4593
|
+
if que_type == 18:
|
|
4594
|
+
table_title = str(item.get("queTitle") or "")
|
|
4595
|
+
for sub in item.get("subQuestions") or []:
|
|
4596
|
+
if isinstance(sub, dict):
|
|
4597
|
+
prefixed = dict(sub)
|
|
4598
|
+
prefixed["_sup_que_title"] = table_title
|
|
4599
|
+
result.append(prefixed)
|
|
4600
|
+
|
|
4134
4601
|
for item in form.get("baseQues") or []:
|
|
4135
4602
|
if isinstance(item, dict):
|
|
4136
|
-
|
|
4603
|
+
_visit(item)
|
|
4137
4604
|
for row in form.get("formQues") or []:
|
|
4138
4605
|
for item in row if isinstance(row, list) else []:
|
|
4139
|
-
if
|
|
4140
|
-
|
|
4141
|
-
if _positive_int(item.get("queType")) == 24:
|
|
4142
|
-
for inner in item.get("innerQuestions") or []:
|
|
4143
|
-
result.extend(nested for nested in inner if isinstance(inner, list) and isinstance(nested, dict))
|
|
4144
|
-
else:
|
|
4145
|
-
result.append(item)
|
|
4606
|
+
if isinstance(item, dict):
|
|
4607
|
+
_visit(item)
|
|
4146
4608
|
return result
|
|
4147
4609
|
|
|
4148
4610
|
|
|
@@ -4158,30 +4620,72 @@ def _canonical_backend_field_type(field: JSONObject) -> str:
|
|
|
4158
4620
|
return QUE_TYPE_TO_CANONICAL.get(que_type or -1, "")
|
|
4159
4621
|
|
|
4160
4622
|
|
|
4623
|
+
def _backend_selector_titles(item: JSONObject) -> list[str]:
|
|
4624
|
+
"""后端匹配规则里该字段可能出现的 queTitle 形态。
|
|
4625
|
+
|
|
4626
|
+
matchRules 的筛选源字段(表格子字段)在存量里带父表名前缀("父表·子字段",
|
|
4627
|
+
FormSvcImpl 组装 judgeQueDetail/queTitle 时拼接),顶层字段无前缀。
|
|
4628
|
+
"""
|
|
4629
|
+
titles = [str(item.get("queTitle") or "")]
|
|
4630
|
+
sup_title = str(item.get("_sup_que_title") or "")
|
|
4631
|
+
if sup_title:
|
|
4632
|
+
titles.append(f"{sup_title}·{titles[0]}")
|
|
4633
|
+
return titles
|
|
4634
|
+
|
|
4635
|
+
|
|
4161
4636
|
def _resolve_backend_selector(selector: JSONObject, candidates: list[JSONObject], location: str) -> JSONObject:
|
|
4637
|
+
# name 比较两侧 strip:存量字段名带前导/尾随空格(后端无空白校验),声明里的
|
|
4638
|
+
# name 与候选 queTitle 一个空格即失配;queId 已同时给出,空格差异不构成歧义。
|
|
4162
4639
|
que_id = _positive_int(selector.get("queId"))
|
|
4163
|
-
name = str(selector.get("name") or "")
|
|
4640
|
+
name = str(selector.get("name") or "").strip()
|
|
4164
4641
|
matches = [
|
|
4165
4642
|
item
|
|
4166
4643
|
for item in candidates
|
|
4167
4644
|
if (que_id is None or _positive_int(item.get("queId")) == que_id)
|
|
4168
|
-
and (not name or
|
|
4645
|
+
and (not name or name in {title.strip() for title in _backend_selector_titles(item)})
|
|
4169
4646
|
]
|
|
4170
4647
|
if len(matches) != 1:
|
|
4648
|
+
# 方案 A:后端允许同父级同名(queId 为身份)。name-only 命中多个时显式报
|
|
4649
|
+
# 歧义并给出候选 queId,禁止静默取第一个。
|
|
4650
|
+
if que_id is None and matches:
|
|
4651
|
+
raise AppFormFailure(
|
|
4652
|
+
"AMBIGUOUS_FIELD_SELECTOR",
|
|
4653
|
+
f"{location} matches multiple fields with the same name; use queId to disambiguate",
|
|
4654
|
+
"CONTRACT_PRECHECK",
|
|
4655
|
+
details={
|
|
4656
|
+
"selector": selector,
|
|
4657
|
+
"candidateQueIds": sorted(
|
|
4658
|
+
{_positive_int(item.get("queId")) or 0 for item in matches}
|
|
4659
|
+
),
|
|
4660
|
+
},
|
|
4661
|
+
)
|
|
4171
4662
|
raise AppFormFailure("INVALID_FIELD_SELECTOR", f"{location} must resolve to exactly one field", "CONTRACT_PRECHECK", details={"selector": selector, "matches": len(matches)})
|
|
4172
4663
|
return matches[0]
|
|
4173
4664
|
|
|
4174
4665
|
|
|
4175
4666
|
def _resolve_canonical_selector(selector: JSONObject, candidates: list[JSONObject], location: str) -> JSONObject:
|
|
4667
|
+
# 同 _resolve_backend_selector:name 两侧 strip(存量字段名带前后空格,queId 兜底唯一性)。
|
|
4176
4668
|
que_id = _positive_int(selector.get("queId"))
|
|
4177
|
-
name = str(selector.get("name") or "")
|
|
4669
|
+
name = str(selector.get("name") or "").strip()
|
|
4178
4670
|
matches = [
|
|
4179
4671
|
item
|
|
4180
4672
|
for item in candidates
|
|
4181
4673
|
if (que_id is None or _positive_int(item.get("queId")) == que_id)
|
|
4182
|
-
and (not name or str(item.get("name") or "") == name)
|
|
4674
|
+
and (not name or str(item.get("name") or "").strip() == name)
|
|
4183
4675
|
]
|
|
4184
4676
|
if len(matches) != 1:
|
|
4677
|
+
if que_id is None and matches:
|
|
4678
|
+
raise AppFormFailure(
|
|
4679
|
+
"AMBIGUOUS_FIELD_SELECTOR",
|
|
4680
|
+
f"{location} matches multiple fields with the same name; use queId to disambiguate",
|
|
4681
|
+
"CONTRACT_PRECHECK",
|
|
4682
|
+
details={
|
|
4683
|
+
"selector": selector,
|
|
4684
|
+
"candidateQueIds": sorted(
|
|
4685
|
+
{_positive_int(item.get("queId")) or 0 for item in matches}
|
|
4686
|
+
),
|
|
4687
|
+
},
|
|
4688
|
+
)
|
|
4185
4689
|
raise AppFormFailure(
|
|
4186
4690
|
"INVALID_FIELD_SELECTOR",
|
|
4187
4691
|
f"{location} must resolve to exactly one top-level field",
|
|
@@ -4192,14 +4696,27 @@ def _resolve_canonical_selector(selector: JSONObject, candidates: list[JSONObjec
|
|
|
4192
4696
|
|
|
4193
4697
|
|
|
4194
4698
|
def _resolve_internal_selector(selector: JSONObject, fields: list[JSONObject], location: str) -> JSONObject:
|
|
4699
|
+
# 同 _resolve_backend_selector:name 两侧 strip(存量字段名带前后空格,queId 兜底唯一性)。
|
|
4195
4700
|
que_id = _positive_int(selector.get("queId") or selector.get("que_id"))
|
|
4196
|
-
name = str(selector.get("name") or "")
|
|
4701
|
+
name = str(selector.get("name") or "").strip()
|
|
4197
4702
|
matches = [
|
|
4198
4703
|
item
|
|
4199
4704
|
for item in fields
|
|
4200
4705
|
if (que_id is None or _positive_int(item.get("que_id")) == que_id)
|
|
4201
|
-
and (not name or str(item.get("name") or "") == name)
|
|
4706
|
+
and (not name or str(item.get("name") or "").strip() == name)
|
|
4202
4707
|
]
|
|
4203
4708
|
if len(matches) != 1:
|
|
4709
|
+
if que_id is None and matches:
|
|
4710
|
+
raise AppFormFailure(
|
|
4711
|
+
"AMBIGUOUS_FIELD_SELECTOR",
|
|
4712
|
+
f"{location} matches multiple fields with the same name; use queId to disambiguate",
|
|
4713
|
+
"COMPILE",
|
|
4714
|
+
details={
|
|
4715
|
+
"selector": selector,
|
|
4716
|
+
"candidateQueIds": sorted(
|
|
4717
|
+
{_positive_int(item.get("que_id")) or 0 for item in matches}
|
|
4718
|
+
),
|
|
4719
|
+
},
|
|
4720
|
+
)
|
|
4204
4721
|
raise AppFormFailure("INVALID_FIELD_SELECTOR", f"{location} must resolve to exactly one field", "COMPILE", details={"selector": selector, "matches": len(matches)})
|
|
4205
4722
|
return matches[0]
|