e10-data 0.1.7 → 0.1.8

package/README.md

@@ -53,6 +53,44 @@ e10-data attend statis                          # 查当前登录用户当月假
 e10-data attend statis --user 6264843388578732287 --begin 2026-09-01 --end 2026-09-30
 ```
 
+## ds --where 过滤条件（v0.1.8 起支持树形 OR）
+
+`e10-data ds list|chart|stat|count --where` 接收**条件数组**或**完整条件树**，均可递归嵌套表达 AND/OR：
+
+```bash
+# ① 数组 = AND 根（旧写法，行为不变）：满足全部条件的记录
+e10-data ds count --group <gid> --table <tid> \
+  --where '[{"fieldId":"fieldA","compareType":"range","conditionValue":"2026-09~2026-10"},{"fieldId":"fieldB","compareType":"eq","conditionValue":"1"}]'
+
+# ② 对象 = 完整条件树：relationship "0"=OR、"1"=AND（缺省 AND），conditionList 内可再嵌套条件组
+e10-data ds count --group <gid> --table <tid> \
+  --where '{"relationship":"0","conditionList":[{"fieldId":"fieldA","compareType":"range","conditionValue":"2026-09~2026-10"},{"fieldId":"fieldB","compareType":"range","conditionValue":"2026-09~2026-10"}]}'
+
+# ③ 数组元素内嵌条件组 → 复杂组合，如 (A AND B) OR (C AND D)
+e10-data ds list --group <gid> --table <tid> --fields a,b \
+  --where @cond.json   # 内容见下
+```
+
+```json
+// cond.json —— 组合条件示例
+[
+  { "relationship": "1", "conditionList": [
+      { "fieldId": "A", "compareType": "eq", "conditionValue": "x" },
+      { "fieldId": "B", "compareType": "eq", "conditionValue": "y" } ] },
+  { "relationship": "0", "conditionList": [
+      { "fieldId": "C", "compareType": "eq", "conditionValue": "m" },
+      { "fieldId": "D", "compareType": "eq", "conditionValue": "n" } ] }
+]
+```
+
+要点：
+
+- **叶子字段键**：`fieldId` 与 `conditionId` 均可（fieldId 优先），旧树形 `conditionId` 写法兼容；
+- **relationship**：`"0"`/`0`/`false` = OR，其余 = AND；子节点关系作用于其自身 `conditionList`；
+- 数组顶层恒为 AND 根，需要整体 OR 请用对象形态 `{"relationship":"0","conditionList":[...]}`；
+- 叶子缺少字段会**直接报错**（v0.1.8 起，不再静默产生空条件导致误返回全表）；
+- 其余条件属性（conditionType/compareType/conditionValue/objId/mainField/ignoreCaseMark 等）照旧透传。
+
 ## exp pull 智能拉取（v0.1.4 新增，防本地修改被覆盖）`exp pull` 不再盲目覆盖。CLI 在专家包本地目录维护基线文件 `.sync-state.json`（记录上次同步的 commitId/headRevision 与每文件 sha256），拉取时逐文件三方对比：
 
 | 场景 | 判定 | 处理 |

package/bin/e10-data.mjs

@@ -321,21 +321,43 @@ function dyn() {
 function baseDto(tableId, groupId, pageNo, pageSize, queryType) {
   return { tableId: String(tableId), groupId, pageNo, pageSize, queryType, containDetailTable: false, needFormat: true, dynamicParams: dyn() };
 }
+// 条件树（conditionTrees）协议：根/组节点 { key, relationship("1"=AND|"0"=OR), isParent:true, parentNode, conditionList:[...] }
+// 叶子节点 { key, relationship:"1", isParent:false, parentNode, conditionId, conditionType, compareType, conditionValue, ... }
+// v0.1.8 起 parseWhere 支持递归树（OR）；向后兼容：数组=AND 根、叶子键 fieldId 优先（conditionId 兼容兜底）
+function normRel(r) { return (r === "0" || r === 0 || r === false) ? "0" : "1"; }
+function isCondGroup(c) { return !!c && Array.isArray(c.conditionList) && c.conditionList.length > 0; }
+function buildCondNode(c, key, parentKey) {
+  if (isCondGroup(c)) {
+    return {
+      key, relationship: normRel(c.relationship), isParent: true, parentNode: parentKey,
+      mainField: c.mainField !== false,
+      conditionList: c.conditionList.map((k, i) => buildCondNode(k, key + "_" + i, key)),
+    };
+  }
+  const fid = (c && (c.fieldId || c.conditionId)) || "";
+  if (!fid) throw new Error("--where 条件缺少字段：叶子须提供 fieldId（或 conditionId），条件组须提供非空 conditionList");
+  return {
+    key, relationship: "1", isParent: false, parentNode: parentKey,
+    objId: c.objId || "", conditionId: fid, fieldName: c.fieldName || fid,
+    conditionType: c.conditionType || "", compareType: c.compareType, conditionValue: c.conditionValue ?? "",
+    fieldValue: c.fieldValue || "", mainField: c.mainField !== false, ignoreCaseMark: c.ignoreCaseMark || false,
+  };
+}
 function parseWhere(val) {
   if (!val) return null;
-  const arr = readJsonArg(val, "--where");
-  const list = Array.isArray(arr) ? arr : (arr.conditionList || []);
-  if (!list.length) return null;
+  const raw = readJsonArg(val, "--where");
+  if (!raw) return null;
   const ts = Date.now(), rootKey = "root_" + ts;
-  return {
-    key: rootKey, relationship: "1", isParent: true, parentNode: "", mainField: true,
-    conditionList: list.map((c, i) => ({
-      key: rootKey + "_" + i, relationship: "1", isParent: false, parentNode: rootKey,
-      objId: c.objId || "", conditionId: c.fieldId, fieldName: c.fieldName || c.fieldId,
-      conditionType: c.conditionType || "", compareType: c.compareType, conditionValue: c.conditionValue ?? "",
-      fieldValue: c.fieldValue || "", mainField: c.mainField !== false, ignoreCaseMark: c.ignoreCaseMark || false,
-    })),
-  };
+  if (Array.isArray(raw)) { // 数组 → AND 根（元素可为叶子或内嵌条件组，组自带 relationship）
+    const kids = [];
+    raw.forEach((c, i) => { if (c && typeof c === "object") kids.push(buildCondNode(c, rootKey + "_" + i, rootKey)); });
+    if (!kids.length) return null;
+    return { key: rootKey, relationship: "1", isParent: true, parentNode: "", mainField: true, conditionList: kids };
+  }
+  if (typeof raw !== "object") throw new Error("--where 须为条件数组或条件树对象");
+  // 对象形态 = 完整条件树（{relationship, conditionList:[...]}，缺省 AND）；无 conditionList 视为无条件
+  if (!Array.isArray(raw.conditionList) || !raw.conditionList.length) return null;
+  return buildCondNode(raw, rootKey, "");
 }
 function parseStat(val) {
   const arr = readJsonArg(val, "--stat");
@@ -1133,6 +1155,11 @@ ds      数据源（业务模块）取数与元数据
   ds stat    --group <gid> --table <tid> --stat '[...]' [--where ...]
   ds count   --group <gid> --table <tid> [--where ...]
   （ds 通用 --source-type LOGIC|ETEAMS，默认 LOGIC）
+  --where 过滤条件（v0.1.8 起支持树形 OR，递归）：
+    数组 = AND 根： [{"fieldId":"f1","conditionType":"Date","compareType":"range","conditionValue":"2026-09~2026-10"},{"fieldId":"f2",...}]
+    对象 = 完整树： {"relationship":"0","conditionList":[{"fieldId":"f1",...},{"fieldId":"f2",...}]}   # "0"=OR、"1"=AND，缺省 AND
+    数组元素可内嵌条件组 {"relationship":"0","conditionList":[...]} 实现 (A AND B) OR (C AND D)
+    叶子键 fieldId/conditionId 均可（fieldId 优先）；缺少字段的叶子会直接报错（不再静默当全表）
 doc     文档查询
   doc count  [--name 关键词] [--creator id1,id2] [--author id1,id2] [--content-type office] [--time "起~止"] [--last-time "起~止"] [--folder id,id|--folder-neq id,id]
   doc list   [同上条件] [--all 翻页到底] [--page N] [--size 100]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "e10-data",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "description": "泛微 E10 数据接口统一 CLI（data-assistant 专家配套）：DSL 查询/数据源/文档/词库/关联字段翻译/环境参数配置中心(conf)/专家包版本管理，认证复用 weaver-e10-login 登录态",
   "author": "e10-dw",
   "license": "MIT",