e10-data 0.1.7 → 0.1.9

package/README.md

@@ -19,7 +19,7 @@ e10-data ds      tables|fields|list|chart|stat|count   数据源（业务模块
 e10-data doc     count|list                            文档查询（documentListCount + documentList）
 e10-data noun    list --skill <skillKey>               词库查询（可带 --source-type/--source-group/--source-table 三参数）
 e10-data field   id2name|name2id                       关联字段翻译（testRemoteBrowser / complete）
-e10-data conf    get|batch|batch-file|resolve|resolve-file|add|add-file|update|delete   环境参数配置中心（chatBi config map，替代 config-resolve 脚本 URL 直连；confType 默认按 CONN_/DS_/WF_ 前缀推导，可 --type 显式）
+e10-data conf    get|batch|batch-file|group|group-file|resolve|resolve-file|add|add-file|update|delete   环境参数配置中心（chatBi config map，替代 config-resolve 脚本 URL 直连；confType 默认按 CONN_/DS_/WF_/API_ 前缀推导，可 --type 显式；confType=api 时支持 confGroup 分组，见下）
 e10-data exp     status|manifest|commits|file|pull|init|commit|lock|release|rollback   专家包版本管理
 e10-data attend  statis   考勤假期余额统计 getAttendInfoStatis（hr-attendance 病假/事假等，v0.1.5 新增）
 ```
@@ -47,12 +47,109 @@ e10-data conf get CONN_EC_EDCAPP                                     # 读配置
 e10-data conf resolve '{"connId":"#{CONN_EC_EDCAPP}"}'                # 占位符替换为真实值
 e10-data conf add CONN_EC_EDCAPP --value 10 --name "说明" --attrs '{"schema":"ec_edcapp"}'
 e10-data conf delete CONN_EC_EDCAPP
+# confType=api + confGroup 分组（v0.1.9 新增）
+e10-data conf group api workflow                                     # 按 类型+分组 批量查全部配置
+e10-data conf get GET_WORKFLOW_LIST --type api --group workflow       # 单查（组内定位）
+e10-data conf add GET_WORKFLOW_LIST --type api --group workflow --value /api/workflow/getList --name 查询流程列表 --attrs '{"request":{"pageNo":"页码"},"response":{"list":"流程列表"}}'
+e10-data conf add-file @api-items.json                                # 批量新增（元素含 confGroup，见下）
+e10-data conf update GET_WORKFLOW_LIST --type api --group workflow --value /api/workflow/queryList
+e10-data conf delete GET_WORKFLOW_LIST --type api --group workflow
 e10-data exp status --expert data-assistant
 e10-data exp pull --expert data-assistant --dir <本地专家包目录> [--dry-run] [--force]
 e10-data attend statis                          # 查当前登录用户当月假期余额（病假/事假/年假）
 e10-data attend statis --user 6264843388578732287 --begin 2026-09-01 --end 2026-09-30
 ```
 
+## conf 配置中心与 confGroup 分组（v0.1.9 新增）
+
+`conf` 系列对接 chatBi config map 接口，`confGroup` 是**可选**的二级分组维度：后端在 `confType=api` 时按 `confType + confGroup + confKey` 定位配置（如 `api/workflow/GET_WORKFLOW_LIST`），用于把同类 API 定义归档到同一分组。
+
+**下发规则（重要）**：只有 `confType` 为 `api`（或显式传了 `--group`）时，CLI 才会在请求体/查询串里带上 `confGroup`；其他 confType 一律不带该字段，避免污染既有配置类型。
+
+| 操作 | 命令 | 对应接口 |
+|---|---|---|
+| 新增（批量，可含分组） | `conf add <key> --value v [--type api] [--group g]` / `conf add-file @items.json` | `POST /api/dw/newetl/chatBi/batchAddChatBiConfigMap` |
+| 单查 | `conf get <key> [--type api] [--group g]` | `GET /api/dw/newetl/chatBi/getChatBiConfigMap?confType=&confGroup=&confKey=` |
+| 批量查（按 key） | `conf batch <k1> <k2> ...` / `conf batch-file @items.json` | `POST /api/dw/newetl/chatBi/batchGetChatBiConfigMap` |
+| 批量查（按类型+分组） | `conf group <confType> <confGroup> [--key k]` / `conf group-file @items.json` | `POST /api/dw/newetl/chatBi/batchGetChatBiConfigMapByTypeAndGroup` |
+| 更新 | `conf update <key> [--value v] [--name n] [--attrs a] [--group g]` | `POST /api/dw/newetl/chatBi/updateChatBiConfigMap` |
+| 删除 | `conf delete <key> [--type api] [--group g]` | `DELETE /api/dw/newetl/chatBi/deleteChatBiConfigMap?confType=&confGroup=&confKey=` |
+
+批量新增文件 `api-items.json`（`confType=api` 时元素带 `confGroup`）：
+
+```json
+[
+  {
+    "confType": "api",
+    "confGroup": "workflow",
+    "confKey": "GET_WORKFLOW_LIST",
+    "confValue": "/api/workflow/getList",
+    "confName": "查询流程列表",
+    "confAttrs": "{\"request\":{\"pageNo\":\"页码\",\"pageSize\":\"每页数量\"},\"response\":{\"list\":\"流程列表\"}}"
+  },
+  {
+    "confType": "api",
+    "confGroup": "workflow",
+    "confKey": "GET_WORKFLOW_DETAIL",
+    "confValue": "/api/workflow/getDetail",
+    "confName": "查询流程详情",
+    "confAttrs": "{\"request\":{\"id\":\"流程ID\"},\"response\":{\"id\":\"流程ID\",\"name\":\"流程名称\"}}"
+  }
+]
+```
+
+```bash
+e10-data conf add-file @api-items.json                   # 批量新增（逐条判重：同 组+键 已存在则跳过）
+e10-data conf group api workflow                         # 取回 workflow 分组下全部 API 配置
+e10-data conf group-file @groups.json                    # 多分组一次取回，@groups.json = [{"confType":"api","confGroup":"workflow"}]
+e10-data conf update GET_WORKFLOW_LIST --type api --group workflow --value /api/workflow/queryList
+e10-data conf delete GET_WORKFLOW_LIST --type api --group workflow
+```
+
+补充说明：
+
+- `confKey` 前缀推导 confType：`CONN_→conn`、`DS_→ds`、`WF_→wf`、`API_→api`；其余类型用 `--type` 显式指定（`--type` 与 `--group` 可同时使用）。
+- 同一 `confKey` 可存在于多个 `confGroup`；`conf batch` / `batch-file` 的返回映射在带分组时以 `组|键` 为键，不会互相覆盖。
+- `--json` 输出：`conf group` 返回配置数组（带 `--key` 时返回单条），`conf batch` 返回映射对象。
+
+## 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

@@ -9,8 +9,9 @@
  *   e10-data doc    count|list   文档查询 documentListCount / documentList
  *   e10-data noun   list         词库 getChatDocsBySkillKey
  *   e10-data field  id2name|name2id  关联字段翻译 testRemoteBrowser / complete
- *   e10-data conf   get|batch|batch-file|resolve|resolve-file|add|add-file|update|delete
- *                              环境参数配置中心（chatBi config map，替代 config-resolve 脚本 URL 直连）
+ *   e10-data conf   get|batch|batch-file|group|group-file|resolve|resolve-file|add|add-file|update|delete
+ *                              环境参数配置中心（chatBi config map，替代 config-resolve 脚本 URL 直连；
+ *                              confType=api 时支持 confGroup 分组二级定位，见 --group）
  *   e10-data attend statis     考勤假期余额统计 getAttendInfoStatis（hr-attendance 病假/事假，2026-09-07）
  *
  * 通用：--json 原样输出；复杂 JSON 参数支持 @文件 或 内联（中文走 @文件 更稳）
@@ -265,6 +266,11 @@ function readJsonArg(val, label) {
   return parseJsonSafe(raw, label);
 }
 function need(arg, args) { if (!args[arg]) throw new Error("缺少必填参数 --" + arg); return args[arg]; }
+// 文件/JSON 参数取值：兼容 --flag <v> 与位置参数 <v>（如 conf add-file @items.json / --add-file @items.json）
+function flagOrPos(args, flag, keys) {
+  if (args[flag] !== undefined) return args[flag];
+  return keys && keys.length ? keys[0] : undefined;
+}
 
 // ---------------- 展示 ----------------
 function fmt(v) {
@@ -321,21 +327,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");
@@ -531,13 +559,21 @@ async function cmdFieldName2id(args, json) {
 }
 
 // ---------------- conf：环境参数配置中心（chatBi config map） ----------------
-// 覆盖 config-resolve 原 resolve_config.py 的 URL 直连调用：get/batch/batch-file/resolve/resolve-file
+// 覆盖 config-resolve 原 resolve_config.py 的 URL 直连调用：get/batch/batch-file/group/group-file/resolve/resolve-file
 // 与管理 add/add-file/update/delete。认证复用进程内登录缓存（完整 Cookie + eteamsid，同 query/ds/doc），
 // 无内置令牌；baseUrl 取登录缓存（与 executeQueryDsl 同域）。confType 默认由 key 前缀推导
-// （CONN_→conn / DS_→ds / WF_→wf），可用 --type 显式指定任意大类（如 data-source-query / system-config）。
-const CONF_PREFIX_TYPE = [["CONN_", "conn"], ["DS_", "ds"], ["WF_", "wf"]];
+// （CONN_→conn / DS_→ds / WF_→wf / API_→api），可用 --type 显式指定任意大类（如 data-source-query / system-config）。
+//
+// v0.1.9 confGroup（配置分组，可选）：
+//   后端在 confType=api 时支持按分组二次分层（如 api/workflow、api/hr），定位维度变为
+//   「confType + confGroup + confKey」。本 CLI 统一用 --group 传分组：
+//     · confType 为 api（或显式传了 --group）时，新增/更新/删除/单查 才下发 confGroup 字段，
+//       其他 confType 一律不带该字段，避免污染既有（无分组列）的配置类型。
+//     · conf group <confType> <confGroup> 走 batchGetChatBiConfigMapByTypeAndGroup 按类型+分组批量取回。
+const CONF_PREFIX_TYPE = [["CONN_", "conn"], ["DS_", "ds"], ["WF_", "wf"], ["API_", "api"]];
 const CONF_GET_PATH = "/api/dw/newetl/chatBi/getChatBiConfigMap";
 const CONF_BATCH_PATH = "/api/dw/newetl/chatBi/batchGetChatBiConfigMap";
+const CONF_BATCH_GROUP_PATH = "/api/dw/newetl/chatBi/batchGetChatBiConfigMapByTypeAndGroup";
 const CONF_ADD_PATH = "/api/dw/newetl/chatBi/batchAddChatBiConfigMap";
 const CONF_UPDATE_PATH = "/api/dw/newetl/chatBi/updateChatBiConfigMap";
 const CONF_DELETE_PATH = "/api/dw/newetl/chatBi/deleteChatBiConfigMap";
@@ -545,7 +581,25 @@ const CONF_TOKEN_RE = /#\{([A-Z][A-Z0-9_]{2,})\}/g;
 function confKeyType(key, explicitType) {
   if (explicitType) return explicitType;
   for (const [p, t] of CONF_PREFIX_TYPE) if (key.startsWith(p)) return t;
-  throw new Error("无法由 confKey 推导 confType（需 CONN_/DS_/WF_ 前缀或显式 --type）: " + key);
+  throw new Error("无法由 confKey 推导 confType（需 CONN_/DS_/WF_/API_ 前缀或显式 --type）: " + key);
+}
+// confGroup 仅在 confType=api 或调用方显式指定时下发（见上方说明）
+function confUseGroup(ctype, group) {
+  return ctype === "api" || (group !== undefined && group !== null && group !== "");
+}
+function confPutGroup(body, ctype, group) {
+  if (confUseGroup(ctype, group)) body.confGroup = group === undefined || group === null ? "" : String(group);
+  return body;
+}
+function confGroupSuffix(ctype, group) { // GET/DELETE 用的 query 后缀
+  return confUseGroup(ctype, group) ? "&confGroup=" + encodeURIComponent(group === undefined || group === null ? "" : String(group)) : "";
+}
+function confItemId(it) { // 同 confKey 可分布在多个 confGroup，带分组时用「组|键」做映射键，避免互相覆盖
+  const g = it && it.confGroup;
+  return g ? g + "|" + (it.confKey || "") : ((it && it.confKey) || "");
+}
+function confLookup(map, it) { // 兼容后端回包是否带 confGroup：先按「组|键」取，再退化到 confKey
+  return map[confItemId(it)] || map[it.confKey];
 }
 function confFail(j, url) {
   const m = (j && (j.msg || (j.actionMsg && j.actionMsg.message))) || "";
@@ -570,51 +624,62 @@ async function confRequest(method, url, bodyObj) {
   checkAuthFail(resp, text, j);
   return j;
 }
-async function confGetData(ctype, key, silent) {
-  const url = CONF_GET_PATH + "?confType=" + encodeURIComponent(ctype) + "&confKey=" + encodeURIComponent(key);
+async function confGetData(ctype, key, silent, group) {
+  const url = CONF_GET_PATH + "?confType=" + encodeURIComponent(ctype) + "&confKey=" + encodeURIComponent(key) + confGroupSuffix(ctype, group);
   let r;
   try { r = await confRequest("GET", url); }
   catch (e) { if (silent) return null; throw e; }
   const data = (r && r.data) || null;
   if (!silent && (!data || data.confValue === undefined || data.confValue === null || data.confValue === "")) {
-    throw new Error("配置不存在或为空: confType=" + ctype + " confKey=" + key);
+    throw new Error("配置不存在或为空: confType=" + ctype + (group ? " confGroup=" + group : "") + " confKey=" + key);
   }
   return data;
 }
 function confNormalizeBatch(payload) {
   const data = (payload && payload.data) || null;
   const out = {};
-  if (Array.isArray(data)) {
-    for (const row of data) {
-      if (!row || typeof row !== "object") continue;
-      const k = row.confKey || row.conf_key;
-      if (k) out[k] = row;
-    }
-  } else if (data && typeof data === "object") {
-    for (const [k, v] of Object.entries(data)) {
-      if (v && typeof v === "object" && !v.confKey) v.confKey = k;
-      out[k] = v;
-    }
-  }
+  const put = (row, fallbackKey) => {
+    if (!row || typeof row !== "object") return;
+    const k = row.confKey || row.conf_key || fallbackKey;
+    if (!k) return;
+    if (row.confGroup === undefined) { const g = row.conf_group; if (g !== undefined && g !== null && g !== "") row.confGroup = g; }
+    out[confItemId({ confGroup: row.confGroup, confKey: k })] = row;
+  };
+  if (Array.isArray(data)) for (const row of data) put(row);
+  else if (data && typeof data === "object") for (const [k, v] of Object.entries(data)) put(v, k);
   return out;
 }
+// 按类型+分组批量取回（batchGetChatBiConfigMapByTypeAndGroup），payload = [{confType, confGroup}...]
+async function confBatchByTypeAndGroup(pairs) {
+  const payload = pairs.map((p) => ({ confType: p.confType, confGroup: p.confGroup === undefined || p.confGroup === null ? "" : String(p.confGroup) }));
+  const r = await confRequest("POST", CONF_BATCH_GROUP_PATH, payload);
+  return confNormalizeBatch(r);
+}
 async function cmdConfGet(args, json, keys) {
   const key = keys[0];
-  if (!key) throw new Error("conf get 缺少 confKey（用法: conf get <key> [--type t]）");
+  if (!key) throw new Error("conf get 缺少 confKey（用法: conf get <key> [--type t] [--group g]）");
   const ctype = confKeyType(key, args.type);
-  const data = await confGetData(ctype, key);
+  let data;
+  try {
+    data = await confGetData(ctype, key, false, args.group);
+  } catch (e) {
+    if (ctype === "api" && !args.group) {
+      throw new Error(e.message + "（confType=api 建议用 --group 指定分组，如 --group workflow；或用 conf group api <分组> 查看该分组下全部配置）");
+    }
+    throw e;
+  }
   if (json) return data;
   console.log(JSON.stringify(data, null, 1));
 }
 async function cmdConfBatch(args, json, keys) {
-  if (!keys.length) throw new Error("conf batch 缺少 confKey 列表（用法: conf batch <key1> [key2 ...]）");
-  const items = keys.map((k) => ({ confType: confKeyType(k, args.type), confKey: k }));
+  if (!keys.length) throw new Error("conf batch 缺少 confKey 列表（用法: conf batch <key1> [key2 ...] [--type t] [--group g]）");
+  const items = keys.map((k) => { const t = confKeyType(k, args.type); return confPutGroup({ confType: t, confKey: k }, t, args.group); });
   let map = {};
   try {
     const r = await confRequest("POST", CONF_BATCH_PATH, items);
     map = confNormalizeBatch(r);
     for (const it of items) {
-      const c = map[it.confKey];
+      const c = confLookup(map, it);
       if (!c || c.confValue === undefined || c.confValue === null || c.confValue === "") {
         throw new Error("批量响应缺失 confKey=" + it.confKey);
       }
@@ -623,43 +688,82 @@ async function cmdConfBatch(args, json, keys) {
     if (String(e.message).indexOf("批量响应缺失") === 0) throw e;
     console.error("[config-resolve] 批量接口不可用，降级逐条单查: " + e.message);
     map = {};
-    for (const it of items) map[it.confKey] = await confGetData(it.confType, it.confKey);
+    for (const it of items) map[confItemId(it)] = await confGetData(it.confType, it.confKey, false, it.confGroup);
   }
   if (json) return map;
-  printHuman("配置 " + items.length + " 条", keys.map((k) => ({ key: k, confType: items.find((x) => x.confKey === k).confType, confValue: (map[k] || {}).confValue ?? "", confName: (map[k] || {}).confName ?? "" })), ["key", "confType", "confValue", "confName"]);
-}
-async function cmdConfBatchFile(args, json) {
-  if (!args["batch-file"]) throw new Error("conf batch-file 缺少参数（用法: conf batch-file @items.json）");
-  const items = readJsonArg(args["batch-file"], "--batch-file");
+  printHuman("配置 " + items.length + " 条", keys.map((k) => {
+    const it = items.find((x) => x.confKey === k);
+    const c = confLookup(map, it) || {};
+    return { key: k, confType: it.confType, confGroup: it.confGroup ?? "", confValue: c.confValue ?? "", confName: c.confName ?? "" };
+  }), ["key", "confType", "confGroup", "confValue", "confName"]);
+}
+async function cmdConfBatchFile(args, json, keys) {
+  const val = flagOrPos(args, "batch-file", keys);
+  if (val === undefined) throw new Error("conf batch-file 缺少参数（用法: conf batch-file @items.json）");
+  const items = readJsonArg(String(val), "--batch-file");
   const list = Array.isArray(items) ? items : [items];
   const map = {};
+  const meta = {};
   for (const it of list) {
     if (!it.confKey || !it.confType) continue;
-    map[it.confKey] = await confGetData(it.confType, it.confKey);
+    const id = confItemId(it);
+    map[id] = await confGetData(it.confType, it.confKey, false, it.confGroup);
+    meta[id] = it;
   }
   if (json) return map;
-  printHuman("配置 " + Object.keys(map).length + " 条", Object.keys(map).map((k) => ({ key: k, confValue: (map[k] || {}).confValue ?? "", confName: (map[k] || {}).confName ?? "" })), ["key", "confValue", "confName"]);
+  printHuman("配置 " + Object.keys(map).length + " 条", Object.keys(map).map((id) => ({ key: meta[id].confKey, confGroup: meta[id].confGroup ?? "", confValue: (map[id] || {}).confValue ?? "", confName: (map[id] || {}).confName ?? "" })), ["key", "confGroup", "confValue", "confName"]);
+}
+// 按类型+分组批量查（batchGetChatBiConfigMapByTypeAndGroup）：pairs = [{confType, confGroup}...]
+async function cmdConfGroup(args, json, keys) {
+  const ctype = keys[0] || args.type;
+  const group = keys[1] !== undefined ? keys[1] : args.group;
+  if (!ctype) throw new Error("conf group 缺少 confType（用法: conf group <confType> <confGroup> | --type api --group workflow）");
+  if (group === undefined) throw new Error("conf group 缺少 confGroup（用法: conf group <confType> <confGroup>）");
+  const map = await confBatchByTypeAndGroup([{ confType: ctype, confGroup: group }]);
+  const rows = Object.values(map);
+  const onlyKey = args.key;
+  const filtered = onlyKey ? rows.filter((r) => (r.confKey || r.conf_key) === onlyKey) : rows;
+  if (json) return onlyKey ? (filtered[0] ?? null) : filtered;
+  if (onlyKey && !filtered.length) throw new Error("配置不存在: confType=" + ctype + " confGroup=" + group + " confKey=" + onlyKey);
+  printHuman("confType=" + ctype + " confGroup=" + group + " 配置 " + filtered.length + " 条",
+    filtered.map((r) => ({ confKey: r.confKey || r.conf_key || "", confValue: r.confValue ?? "", confName: r.confName ?? "", confAttrs: r.confAttrs ?? "" })),
+    ["confKey", "confValue", "confName", "confAttrs"]);
+  return filtered;
+}
+async function cmdConfGroupFile(args, json, keys) {
+  const val = flagOrPos(args, "group-file", keys);
+  if (val === undefined) throw new Error("conf group-file 缺少参数（用法: conf group-file @items.json，形如 [{\"confType\":\"api\",\"confGroup\":\"workflow\"}]）");
+  const pairs = readJsonArg(String(val), "--group-file");
+  const list = (Array.isArray(pairs) ? pairs : [pairs]).filter((p) => p && p.confType);
+  if (!list.length) throw new Error("conf group-file 内容为空或缺少 confType");
+  const map = await confBatchByTypeAndGroup(list);
+  const rows = Object.values(map);
+  if (json) return map;
+  printHuman("批量分组配置 " + rows.length + " 条",
+    rows.map((r) => ({ confType: r.confType ?? "", confGroup: r.confGroup ?? "", confKey: r.confKey || r.conf_key || "", confValue: r.confValue ?? "", confName: r.confName ?? "" })),
+    ["confType", "confGroup", "confKey", "confValue", "confName"]);
+  return map;
 }
-async function confResolveAll(keys) {
+async function confResolveAll(keys, group) {
   // 多占位符：先批量预取一轮（失败降级逐条单查），返回 {key: data}
-  const items = keys.map((k) => ({ confType: confKeyType(k, ""), confKey: k }));
+  const items = keys.map((k) => confPutGroup({ confType: confKeyType(k, ""), confKey: k }, confKeyType(k, ""), group));
   const map = {};
   try {
     const r = await confRequest("POST", CONF_BATCH_PATH, items);
     const got = confNormalizeBatch(r);
     for (const it of items) {
-      const c = got[it.confKey];
+      const c = confLookup(got, it);
       if (!c || c.confValue === undefined || c.confValue === null || c.confValue === "") throw new Error("缺失 " + it.confKey);
       map[it.confKey] = c;
     }
   } catch {
-    for (const it of items) map[it.confKey] = await confGetData(it.confType, it.confKey);
+    for (const it of items) map[it.confKey] = await confGetData(it.confType, it.confKey, false, it.confGroup);
   }
   return map;
 }
-async function confResolveText(text, json) {
+async function confResolveText(text, json, group) {
   const found = [...new Set([...text.matchAll(CONF_TOKEN_RE)].map((m) => m[1]))];
-  const map = found.length ? await confResolveAll(found) : {};
+  const map = found.length ? await confResolveAll(found, group) : {};
   const out = text.replace(CONF_TOKEN_RE, (m0, k) => {
     const cfg = map[k];
     if (!cfg) throw new Error("配置不存在或为空: " + k);
@@ -670,45 +774,47 @@ async function confResolveText(text, json) {
 }
 async function cmdConfResolve(args, json, keys) {
   let text = keys[0];
-  if (!text) throw new Error("conf resolve 缺少文本（用法: conf resolve '<含#{KEY}文本>' | @file.txt）");
+  if (!text) throw new Error("conf resolve 缺少文本（用法: conf resolve '<含#{KEY}文本>' | @file.txt [--group g]）");
   if (text.startsWith("@")) text = fs.readFileSync(text.slice(1), "utf-8");
-  const out = await confResolveText(text, json);
+  const out = await confResolveText(text, json, args.group);
   if (json) { console.log(JSON.stringify(out, null, 1)); return out; }
   process.stdout.write(out + "\n");
 }
-async function cmdConfResolveFile(args, json) {
-  const p = args["resolve-file"];
-  if (!p) throw new Error("conf resolve-file 缺少文件路径（用法: conf resolve-file <文件路径>）");
+async function cmdConfResolveFile(args, json, keys) {
+  const p = flagOrPos(args, "resolve-file", keys);
+  if (!p) throw new Error("conf resolve-file 缺少文件路径（用法: conf resolve-file <文件路径> [--group g]）");
   if (!fs.existsSync(p)) throw new Error("文件不存在: " + p);
   const text = fs.readFileSync(p, "utf-8");
-  const out = await confResolveText(text, json);
+  const out = await confResolveText(text, json, args.group);
   if (json) { console.log(JSON.stringify(out, null, 1)); return out; }
   process.stdout.write(out + "\n");
 }
 async function cmdConfAdd(args, json, keys) {
   const key = keys[0];
-  if (!key || args.value === undefined) throw new Error("conf add 缺少 confKey/confValue（用法: conf add <key> --value <真实值> [--name] [--attrs] [--type] [--force]）");
+  if (!key || args.value === undefined) throw new Error("conf add 缺少 confKey/confValue（用法: conf add <key> --value <真实值> [--name] [--attrs] [--type] [--group] [--force]）");
   const ctype = confKeyType(key, args.type);
-  if (!args.force && await confGetData(ctype, key, true)) {
+  if (!args.force && await confGetData(ctype, key, true, args.group)) {
     console.error("[config-resolve] 配置已存在，跳过新增（如需修改请用 conf update；确需重建可先 conf delete）: " + key);
     return null;
   }
-  const item = { confType: ctype, confKey: key, confValue: String(args.value), confAttrs: args.attrs || "", confName: args.name || "" };
+  const item = confPutGroup({ confType: ctype, confKey: key, confValue: String(args.value), confAttrs: args.attrs || "", confName: args.name || "" }, ctype, args.group);
   const r = await confRequest("POST", CONF_ADD_PATH, [item]);
   if (json) return r;
-  console.log("新增成功: " + key + " = " + item.confValue);
+  console.log("新增成功: " + (item.confGroup ? item.confGroup + "/" : "") + key + " = " + item.confValue);
 }
-async function cmdConfAddFile(args, json) {
-  if (args["add-file"] === undefined) throw new Error("conf add-file 缺少参数（用法: conf add-file @items.json）");
-  const items = readJsonArg(args["add-file"], "--add-file");
+async function cmdConfAddFile(args, json, keys) {
+  const val = flagOrPos(args, "add-file", keys);
+  if (val === undefined) throw new Error("conf add-file 缺少参数（用法: conf add-file @items.json，元素形如 {confType,confGroup,confKey,confValue,confName,confAttrs}）");
+  const items = readJsonArg(String(val), "--add-file");
   const list = Array.isArray(items) ? items : [items];
   const toAdd = [];
   for (const it of list) {
     if (!it.confKey || it.confValue === undefined) continue;
     const ctype = it.confType || confKeyType(it.confKey, args.type);
-    const dup = await confGetData(ctype, it.confKey, true);
+    const group = it.confGroup !== undefined ? it.confGroup : args.group;
+    const dup = await confGetData(ctype, it.confKey, true, group);
     if (dup) { console.error("[config-resolve] 已存在跳过: " + it.confKey); continue; }
-    toAdd.push({ confType: ctype, confKey: it.confKey, confValue: String(it.confValue), confAttrs: it.confAttrs || "", confName: it.confName || "" });
+    toAdd.push(confPutGroup({ confType: ctype, confKey: it.confKey, confValue: String(it.confValue), confAttrs: it.confAttrs || "", confName: it.confName || "" }, ctype, group));
   }
   if (!toAdd.length) { console.log("全部已存在，无新增"); return null; }
   const r = await confRequest("POST", CONF_ADD_PATH, toAdd);
@@ -717,37 +823,40 @@ async function cmdConfAddFile(args, json) {
 }
 async function cmdConfUpdate(args, json, keys) {
   const key = keys[0];
-  if (!key) throw new Error("conf update 缺少 confKey（用法: conf update <key> [--value v] [--name n] [--attrs a] [--type t]）");
+  if (!key) throw new Error("conf update 缺少 confKey（用法: conf update <key> [--value v] [--name n] [--attrs a] [--type t] [--group g]）");
   if (args.value === undefined && args.name === undefined && args.attrs === undefined) {
     throw new Error("conf update 至少需提供 --value / --name / --attrs 之一");
   }
-  const body = { confType: confKeyType(key, args.type), confKey: key };
+  const ctype = confKeyType(key, args.type);
+  const body = confPutGroup({ confType: ctype, confKey: key }, ctype, args.group);
   if (args.value !== undefined) body.confValue = String(args.value);
   if (args.name !== undefined) body.confName = args.name;
   if (args.attrs !== undefined) body.confAttrs = args.attrs;
   const r = await confRequest("POST", CONF_UPDATE_PATH, body);
   if (json) return r;
-  console.log("更新成功: " + key);
+  console.log("更新成功: " + (body.confGroup ? body.confGroup + "/" : "") + key);
 }
 async function cmdConfDelete(args, json, keys) {
   const key = keys[0];
-  if (!key) throw new Error("conf delete 缺少 confKey（用法: conf delete <key> [--type t]）");
+  if (!key) throw new Error("conf delete 缺少 confKey（用法: conf delete <key> [--type t] [--group g]）");
   const ctype = confKeyType(key, args.type);
-  const url = CONF_DELETE_PATH + "?confType=" + encodeURIComponent(ctype) + "&confKey=" + encodeURIComponent(key);
+  const url = CONF_DELETE_PATH + "?confType=" + encodeURIComponent(ctype) + "&confKey=" + encodeURIComponent(key) + confGroupSuffix(ctype, args.group);
   const r = await confRequest("DELETE", url);
   if (json) return r;
-  console.log("删除成功: " + key);
+  console.log("删除成功: " + (confUseGroup(ctype, args.group) && args.group ? args.group + "/" : "") + key);
 }
 async function cmdConf(sub, args, json, pos) {
   const keys = pos.slice(2);
   switch (sub) {
     case "get": return cmdConfGet(args, json, keys);
     case "batch": return cmdConfBatch(args, json, keys);
-    case "batch-file": return cmdConfBatchFile(args, json);
+    case "batch-file": return cmdConfBatchFile(args, json, keys);
+    case "group": return cmdConfGroup(args, json, keys);
+    case "group-file": return cmdConfGroupFile(args, json, keys);
     case "resolve": return cmdConfResolve(args, json, keys);
-    case "resolve-file": return cmdConfResolveFile(args, json);
+    case "resolve-file": return cmdConfResolveFile(args, json, keys);
     case "add": return cmdConfAdd(args, json, keys);
-    case "add-file": return cmdConfAddFile(args, json);
+    case "add-file": return cmdConfAddFile(args, json, keys);
     case "update": return cmdConfUpdate(args, json, keys);
     case "delete": return cmdConfDelete(args, json, keys);
     default: usage(); process.exit(1);
@@ -1133,6 +1242,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]
@@ -1141,16 +1255,21 @@ noun    词库查询
 field   关联字段翻译
   field id2name  --module <m> --type <t> --ids id1,id2 [--form-param '{"fieldId":"..","module":"ebuilderform"}'|--eb-browser-param '{..}'|--property-type x]
   field name2id  --module <m> --type <t> --name 名称 [同上附加参数]
-conf    环境参数配置中心（chatBi config map，替代 config-resolve 脚本 URL 直连；confType 默认由 CONN_/DS_/WF_ 前缀推导，可 --type 显式）
-  conf get <key> [--type t]                       # 单查（confValue/confAttrs/confName 全量 JSON）
-  conf batch <key1> [key2 ...]                    # 批量查（批量接口异常自动降级逐条单查）
-  conf batch-file @items.json                     # 按 [{confType,confKey}..] 显式批量查（支持任意 confType）
-  conf resolve '<含#{KEY}文本>'|@file.txt         # 文本占位符替换为真实值（含中文建议 @file）
-  conf resolve-file <文件路径>                     # 读文件替换全部占位符并打印（不改写原文件）
-  conf add <key> --value <真实值> [--name 说明] [--attrs '{"schema":..}'] [--type t] [--force]  # 新增（默认判重，已存在跳过）
-  conf add-file @items.json                       # JSON 数组批量新增（逐条判重）
-  conf update <key> [--value v] [--name n] [--attrs a] [--type t]   # 更新（confType+confKey 定位，传哪个字段更哪个）
-  conf delete <key> [--type t]                    # 删除
+conf    环境参数配置中心（chatBi config map，替代 config-resolve 脚本 URL 直连；confType 默认由 CONN_/DS_/WF_/API_ 前缀推导，可 --type 显式）
+        confGroup（配置分组，v0.1.9 新增，可选）：confType=api 时后端支持二级分层（如 api/workflow），
+        定位维度 = confType+confGroup+confKey；仅 confType=api（或显式传 --group）时才下发 confGroup，其他类型不带该字段
+  conf get <key> [--type t] [--group g]           # 单查（confValue/confAttrs/confName 全量 JSON）
+  conf batch <key1> [key2 ...] [--type t] [--group g]   # 批量查（批量接口异常自动降级逐条单查）
+  conf batch-file @items.json                     # 按 [{confType,confGroup,confKey}..] 显式批量查（支持任意 confType）
+  conf group <confType> <confGroup> [--key k]     # 按类型+分组批量查（batchGetChatBiConfigMapByTypeAndGroup）
+  conf group-file @items.json                     # 按 [{"confType":"api","confGroup":"workflow"}..] 多分组批量查
+  conf resolve '<含#{KEY}文本>'|@file.txt [--group g]   # 文本占位符替换为真实值（含中文建议 @file）
+  conf resolve-file <文件路径> [--group g]          # 读文件替换全部占位符并打印（不改写原文件）
+  conf add <key> --value <真实值> [--name 说明] [--attrs '{"request":..,"response":..}'] [--type t] [--group g] [--force]  # 新增（默认判重，已存在跳过）
+  conf add-file @items.json                       # JSON 数组批量新增（逐条判重，元素可带 confGroup）
+  conf update <key> [--value v] [--name n] [--attrs a] [--type t] [--group g]   # 更新（confType+confGroup+confKey 定位，传哪个字段更哪个）
+  conf delete <key> [--type t] [--group g]        # 删除
+  示例: conf group api workflow | conf add GET_WORKFLOW_LIST --type api --group workflow --value /api/workflow/getList --name 查询流程列表
 exp     专家包版本管理（expert-repository/v1，响应以 data.actionMsg.code=0 判成功）
   exp status    --expert <code> [--branch main]                       # 仓库状态（headCommitId/headRevision=提交基线）
   exp manifest  --expert <code> [--commit <id>]                       # 文件清单（sha256）

package/package.json

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