@shundoo-ai/dsh-cosmic 1.0.21 → 1.0.22

package/skills/cosmic-build/scripts/test/test_cosmic_sdk_examples.py

@@ -47,6 +47,9 @@ import kd.bos.entity.report.FilterInfo;
 import kd.bos.dataentity.entity.DynamicObject;
 import kd.bos.dataentity.entity.DynamicObjectCollection;
 import kd.bos.dataentity.metadata.dynamicobject.DynamicObjectType;
+import kd.bos.dataentity.metadata.dynamicobject.DynamicSimpleProperty;
+import kd.bos.orm.query.QFilter;
+import kd.bos.orm.query.QCP;
 import java.util.Arrays;
 import java.util.Date;
 public class ReportFilterCheck {
@@ -71,10 +74,34 @@ public class ReportFilterCheck {
         reject(() -> CosmicReportFilters.date(filter, "bad_date"));
         reject(() -> CosmicReportFilters.numbers(10L));
         if (!CosmicReportFilters.numbers(null).isEmpty()) throw new AssertionError("empty F7");
+        CosmicReportFilters.require(0, "zero"); CosmicReportFilters.require(false, "false");
+        reject(() -> CosmicReportFilters.require(null, "missing"));
+        reject(() -> CosmicReportFilters.require(Arrays.asList(), "missing"));
+        reject(() -> CosmicReportFilters.require("   ", "missing"));
+        QFilter equal = CosmicReportFilters.comparison("status", "=", "01");
+        if (!"status".equals(equal.getProperty()) || !QCP.equals.equals(equal.getCP())
+                || !"01".equals(equal.getValue())) throw new AssertionError("equality");
+        QFilter multi = CosmicReportFilters.comparison("status", "in", Arrays.asList("0", "01"));
+        if (!QCP.in.equals(multi.getCP()) || !Arrays.equals((Object[]) multi.getValue(), new Object[]{"0", "01"}))
+            throw new AssertionError("in values");
+        reject(() -> CosmicReportFilters.comparison("status", "=", Arrays.asList("1", "2")));
+        reject(() -> CosmicReportFilters.comparison("status", "in", Arrays.asList("1", null)));
+        reject(() -> CosmicReportFilters.comparison("status", "in", "1"));
+        reject(() -> CosmicReportFilters.comparison("status", "unknown", null));
+        if (CosmicReportFilters.comparison("status", "in", Arrays.asList()) != null) throw new AssertionError("optional");
+        Date end = new Date(2000L);
+        java.util.List<QFilter> range = CosmicReportFilters.rangeFilters("created", start, end, false);
+        if (range.size() != 2 || !QCP.large_equals.equals(range.get(0).getCP())
+                || !QCP.less_than.equals(range.get(1).getCP()) || !end.equals(range.get(1).getValue()))
+            throw new AssertionError("half-open between");
+        if (CosmicReportFilters.rangeFilters("created", null, end, true).size() != 1) throw new AssertionError("open start");
+        if (CosmicReportFilters.rangeFilters("created", start, null, true).size() != 1) throw new AssertionError("open end");
+        reject(() -> CosmicReportFilters.rangeFilters("created", end, start, true));
         if (args.length == 0) { System.out.println("report filter SDK checks passed"); return; }
         DynamicObjectType type = new DynamicObjectType("supplier");
         type.registerProperty("number", String.class, null, false);
-        type.registerProperty("id", Long.class, null, false);
+        DynamicSimpleProperty pk = new DynamicSimpleProperty("id", Long.class, null);
+        pk.setPrimaryKey(true); type.registerSimpleProperty(pk);
         DynamicObject first = new DynamicObject(type);
         first.set("number", "0012"); first.set("id", 10L);
         DynamicObject second = new DynamicObject(type);
@@ -85,6 +112,36 @@ public class ReportFilterCheck {
         if (!CosmicReportFilters.numbers(values).equals(Arrays.asList("0012"))) throw new AssertionError("assigned ids differ");
         second.set("number", "0034");
         if (!CosmicReportFilters.numbers(values).equals(Arrays.asList("0012", "0034"))) throw new AssertionError("multi F7");
+        if (!CosmicReportFilters.ids(values).equals(Arrays.asList(10L, 20L))) throw new AssertionError("direct ids");
+        DynamicObjectType wrapperType = new DynamicObjectType("supplier_link");
+        DynamicSimpleProperty wrapperPk = new DynamicSimpleProperty("pkid", Long.class, null);
+        wrapperPk.setPrimaryKey(true); wrapperType.registerSimpleProperty(wrapperPk);
+        wrapperType.registerProperty("fbasedataid", DynamicObject.class, null, false);
+        wrapperType.registerProperty("fbasedataid_id", Long.class, null, false);
+        DynamicObject firstLink = new DynamicObject(wrapperType);
+        firstLink.set("pkid", 9001L); firstLink.set("fbasedataid", first);
+        DynamicObject secondLink = new DynamicObject(wrapperType);
+        secondLink.set("pkid", 9002L); secondLink.set("fbasedataid", second);
+        DynamicObjectCollection links = new DynamicObjectCollection(wrapperType, null);
+        links.add(firstLink); links.add(secondLink);
+        if (!CosmicReportFilters.ids(links).equals(Arrays.asList(10L, 20L))) throw new AssertionError("wrapper ids");
+        if (!CosmicReportFilters.numbers(links).equals(Arrays.asList("0012", "0034"))) throw new AssertionError("wrapper numbers");
+        QFilter idFilter = CosmicReportFilters.idFilter("supplier", links);
+        if (!"supplier".equals(idFilter.getProperty()) || !Arrays.equals((Object[]) idFilter.getValue(), new Long[]{10L, 20L}))
+            throw new AssertionError("id QFilter");
+        secondLink.set("fbasedataid", null);
+        reject(() -> CosmicReportFilters.ids(links));
+        secondLink.set("fbasedataid_id", 20L);
+        if (!CosmicReportFilters.ids(links).equals(Arrays.asList(10L, 20L))) throw new AssertionError("shadow ids");
+        reject(() -> CosmicReportFilters.numbers(links));
+        secondLink.set("fbasedataid", first);
+        reject(() -> CosmicReportFilters.ids(links));
+        DynamicObjectType shadowType = new DynamicObjectType("supplier_shadow_link");
+        shadowType.registerProperty("fbasedataid_id", Long.class, null, false);
+        DynamicObject shadowRow = new DynamicObject(shadowType);
+        shadowRow.set("fbasedataid_id", 30L);
+        if (!CosmicReportFilters.ids(shadowRow).equals(Arrays.asList(30L))) throw new AssertionError("shadow-only row");
+        reject(() -> CosmicReportFilters.numbers(shadowRow));
         second.set("number", ""); reject(() -> CosmicReportFilters.numbers(values));
         System.out.println("report filter SDK checks passed");
     }

package/skills/cosmic-build/scripts/test/test_data_model_contract.py

@@ -3942,3 +3942,22 @@ def test_emit_entrypoint_writes_structured_contract_failure(
         and issue["path"] == "$.artifact.entities"
         for issue in report["errors"]
     )
+
+
+def test_list_presentation_properties_survive_authoring_and_key_binding():
+    properties = {"Summary": "合计", "ZeroShow": False, "ColumnOrderAndFilter": "0"}
+    main = {"bizName": "probe", "listConfiguration": {"columns": [{"fieldRef": "count", "properties": properties}]}}
+    actual = _compile_list_configuration(main, {("probe", "count"): "real_persisted_count"}, preset_field_keys=set())
+    assert actual == {"columns": [{"fieldKey": "real_persisted_count", "properties": properties}]}
+    actual["columns"][0]["properties"]["Summary"] = 0
+    assert properties["Summary"] == "合计"
+
+
+@pytest.mark.parametrize("properties,valid", [({"Summary": "合计", "ZeroShow": False}, True), ({}, False), ([], False)])
+def test_new_form_list_properties_shape_is_validated(properties, valid):
+    data = _valid_authoring()
+    main = data["artifact"]["entities"][0]
+    main["listConfiguration"] = {"columns": [{"fieldRef": main["fields"][0]["bizWord"], "properties": properties}]}
+    issues = validate_authoring_contract(data)
+    property_issues = [issue for issue in issues if ".properties" in issue.path]
+    assert (not property_issues) is valid