@qingflow-tech/qingflow-cli 1.1.51 → 1.1.53

package/src/qingflow_mcp/solution/executor.py

@@ -36,6 +36,7 @@ class SolutionExecutor:
         app_tools: AppTools,
         record_tools: RecordTools,
         view_tools: ViewTools,
+        view_writer: "ViewWriter | None" = None,
         chart_tools: QingbiReportTools,
         portal_tools: PortalTools,
         navigation_tools: NavigationTools,
@@ -47,6 +48,7 @@ class SolutionExecutor:
         self.app_tools = app_tools
         self.record_tools = record_tools
         self.view_tools = view_tools
+        self.view_writer = view_writer
         self.chart_tools = chart_tools
         self.portal_tools = portal_tools
         self.navigation_tools = navigation_tools
@@ -460,6 +462,20 @@ class SolutionExecutor:
             "Pass {app_key, spec} to solution_build_flow or use qingflow builder flow apply."
         )
 
+    def _create_view_via_writer(self, *, profile: str, payload: dict[str, Any]) -> dict[str, Any]:
+        """视图创建唯一落点:共享 ViewWriter(POST /view/viewConfig)。
+
+        solution DSL 内部创建路径不再直接调用 ViewTools.view_create(该方法已删除);
+        未注入 writer 的旧调用方退化为直接经 ViewTools 同一会话执行同一端点。
+        """
+        if self.view_writer is not None:
+            return self.view_writer.create_view(profile=profile, payload=payload)
+        from ..tools.view_writer import ViewWriter as _FallbackViewWriter
+
+        return _FallbackViewWriter(self.view_tools.sessions, self.view_tools.backend).create_view(
+            profile=profile, payload=payload
+        )
+
     def _build_views(self, profile: str, entity: CompiledEntity, store: RunArtifactStore) -> None:
         app_key = self._get_app_key(store, entity.entity_id)
         field_meta = store.get_artifact("field_maps", entity.entity_id, {})
@@ -474,7 +490,7 @@ class SolutionExecutor:
                 schema=schema,
                 group_by_field_id=view_plan["group_by_field_id"],
             )
-            result = self.view_tools.view_create(profile=profile, payload=create_payload)
+            result = self._create_view_via_writer(profile=profile, payload=create_payload)
             view_result = result.get("result")
             view_key = ((view_result or {}) if isinstance(view_result, dict) else {}).get("viewgraphKey")
             if not view_key and isinstance(view_result, str):
@@ -895,13 +911,14 @@ class SolutionExecutor:
         data.setdefault("asosChartConfig", {"limitType": 1, "asosChartIdList": []})
         data.setdefault("viewgraphGanttConfigVO", None)
         data.setdefault("viewgraphHierarchyConfigVO", None)
+        data.setdefault("viewgraphCalendarConfigVO", None)
         data.setdefault("viewgraphLimitFormula", "")
         data.setdefault("buttonConfigDTOList", [])
         if not data.get("viewgraphQuestions"):
             data["viewgraphQuestions"] = _build_viewgraph_questions(schema, visible_que_ids)
         if not data.get("viewgraphSorts"):
             data["viewgraphSorts"] = [{"queId": 0, "beingSortAscend": True, "queType": 8}]
-        if data.get("viewgraphType") in {"cardView", "boardView", "ganttView", "hierarchyView"}:
+        if data.get("viewgraphType") in {"cardView", "boardView", "ganttView", "hierarchyView", "calendarView"}:
             data["titleQue"] = visible_que_ids[0] if visible_que_ids else None
         else:
             data.setdefault("titleQue", None)
@@ -2218,6 +2235,7 @@ def _portal_view_type(store: RunArtifactStore, entity_id: str, view_id: str) ->
         "board": "boardView",
         "gantt": "ganttView",
         "hierarchy": "hierarchyView",
+        "calendar": "calendarView",
     }
     for entity in store.data.get("normalized_solution_spec", {}).get("entities", []):
         if entity["entity_id"] != entity_id:
@@ -2324,36 +2342,106 @@ def _resolve_package_item_insert_index(tag_items: list[dict[str, Any]], ordinal:
     return max(0, min(len(tag_items), ordinal - 1))
 
 
-def _build_viewgraph_questions(schema: dict[str, Any], visible_que_ids: list[int]) -> list[dict[str, Any]]:
+def _flatten_viewgraph_questions(entries: list[Any] | None) -> dict[int, dict[str, Any]]:
+    """把读面的 viewgraphQuestions(含 subQues/innerQues 嵌套)按 queId 展平。"""
+    flat: dict[int, dict[str, Any]] = {}
+
+    def walk(entry: Any) -> None:
+        if not isinstance(entry, dict):
+            return
+        que_id = entry.get("queId")
+        if isinstance(que_id, int) and que_id not in flat:
+            flat[que_id] = entry
+        for key in ("subQues", "innerQues"):
+            for child in entry.get(key) or []:
+                if isinstance(child, list):
+                    for inner in child:
+                        walk(inner)
+                else:
+                    walk(child)
+
+    for entry in entries or []:
+        if isinstance(entry, list):
+            for inner in entry:
+                walk(inner)
+        else:
+            walk(entry)
+    return flat
+
+
+def _build_viewgraph_questions(
+    schema: dict[str, Any],
+    visible_que_ids: list[int],
+    *,
+    existing_by_que_id: dict[int, dict[str, Any]] | None = None,
+) -> list[dict[str, Any]]:
+    """重建业务列行；更新时原样保留已配置的系统列。
+
+    existing_by_que_id(读面展平行)存在时,以读面行为基底只更新可见性/序号——
+    保留列级权限(queAuth/beingAddRow/beingDeleteRow/beingEditRow/beingDownload 等),
+    否则重建会把这些标志归默认值,破坏既有列权限配置。
+    系统列读面占位对象不写回；existing_by_que_id=None 表示新建。
+    """
     visible_map = {que_id: index for index, que_id in enumerate(visible_que_ids, start=1)}
+    existing = existing_by_que_id or {}
     questions: list[dict[str, Any]] = []
     for base_question in schema.get("baseQues", []):
-        question = _build_viewgraph_question(base_question, visible_map, default_auth=3)
+        question = _build_viewgraph_question(base_question, visible_map, default_auth=3, existing=existing_by_que_id)
         if question is not None:
             questions.append(question)
     for line in schema.get("formQues", []):
         for question in line:
-            resolved = _build_viewgraph_question(question, visible_map, default_auth=1)
+            resolved = _build_viewgraph_question(question, visible_map, default_auth=1, existing=existing_by_que_id)
             if resolved is not None:
                 questions.append(resolved)
+    # 某些系统列只在视图读面出现，不属于表单 schema。
+    emitted_que_ids = _flatten_viewgraph_questions(questions)
+    for que_id, prior in existing.items():
+        if que_id <= 5 and que_id not in emitted_que_ids:
+            preserved = _build_viewgraph_question(prior, visible_map, default_auth=3, existing=existing)
+            if preserved is not None:
+                questions.append(preserved)
     return questions
 
 
-def _build_viewgraph_question(question: dict[str, Any], visible_map: dict[int, int], *, default_auth: int) -> dict[str, Any] | None:
+def _build_viewgraph_question(
+    question: dict[str, Any],
+    visible_map: dict[int, int],
+    *,
+    default_auth: int,
+    existing: dict[int, dict[str, Any]] | None = None,
+) -> dict[str, Any] | None:
     que_id = question.get("queId")
     if que_id is None:
         return None
+    if isinstance(que_id, int) and que_id <= 5 and existing is not None:
+        prior = existing.get(que_id)
+        # 后端会生成未落库的系统字段占位对象；只有落库配置才带这些列状态。
+        if prior is None or all(prior.get(key) is None for key in (
+            "beingListDisplay", "displayOrdinal", "beingAddRow", "beingEditRow", "beingDeleteRow",
+        )):
+            return None
+        return deepcopy(prior)
     sub_questions = [
         resolved
         for sub_question in question.get("subQuestions", []) or []
-        if (resolved := _build_viewgraph_question(sub_question, visible_map, default_auth=1)) is not None
+        if (resolved := _build_viewgraph_question(sub_question, visible_map, default_auth=1, existing=existing)) is not None
     ]
     inner_questions = [
         resolved
         for inner_row in question.get("innerQuestions", []) or []
         for inner_question in inner_row or []
-        if (resolved := _build_viewgraph_question(inner_question, visible_map, default_auth=1)) is not None
+        if (resolved := _build_viewgraph_question(inner_question, visible_map, default_auth=1, existing=existing)) is not None
     ]
+    prior = (existing or {}).get(que_id) if isinstance(que_id, int) else None
+    if prior is not None:
+        # 读面行为基底:保留全部列级标志,只更新可见性/序号;嵌套子项同样融合
+        merged = deepcopy(prior)
+        merged["beingListDisplay"] = que_id in visible_map
+        merged["displayOrdinal"] = visible_map.get(que_id, -1)
+        merged["subQues"] = sub_questions
+        merged["innerQues"] = inner_questions
+        return merged
     return {
         "queId": que_id,
         "queTitle": question.get("queTitle"),

package/src/qingflow_mcp/solution/spec_models.py

@@ -56,6 +56,7 @@ class ViewType(str, Enum):
     board = "board"
     gantt = "gantt"
     hierarchy = "hierarchy"
+    calendar = "calendar"
 
 
 class ChartType(str, Enum):