byteplan-cli 1.3.5 → 1.3.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "byteplan-cli",
-  "version": "1.3.5",
+  "version": "1.3.7",
   "description": "BytePlan CLI - Command line tool for BytePlan API",
   "keywords": [
     "byteplan",

package/skills/byteplan-api/scripts/api.js

@@ -627,34 +627,26 @@ export async function queryModels(token, options = {}) {
  * @param {Object} params.customQuery - 自定义查询条件
  * @param {string[]} params.groupFields - 分组字段
  * @param {Array} params.functions - 聚合函数
+ * @param {number} params.page - 页码（从 0 开始）
+ * @param {number} params.pageSize - 每页条数
  * @param {object} options - 可选配置
  * @param {object} options.menuHeaders - 自定义 menu headers
- * @returns {Promise<any>}
+ * @returns {Promise<{data: Array}>} 返回数据数组，无 total 字段
  */
 export async function getModelData(token, modelCode, params = {}, options = {}) {
-  const { customQuery, groupFields, functions } = params;
+  const { customQuery, groupFields, functions, page = 0, pageSize = 100 } = params;
   const { menuHeaders = {} } = options;
 
   // CLI 模式（仅支持简单查询）
   if (useCliMode && !token && !customQuery && !groupFields && !functions) {
     await ensureCliInstalled();
-    const pageNum = params.pageNum || 0;
-    const pageSize = params.pageSize || 100;
     try {
-      const result = await execCli(['data', 'query', modelCode, '-p', String(pageNum), '-s', String(pageSize)]);
+      const result = await execCli(['data', 'query', modelCode, '-p', String(page), '-s', String(pageSize)]);
       if (result.error) {
         throw new Error(result.message || '查询数据失败');
       }
-      // 将 CLI 结果转换为原有格式
-      return {
-        data: {
-          headers: result.headers || [],
-          data: result.data || [],
-          pageNum: result.pagination?.pageNum || pageNum,
-          pageSize: result.pagination?.pageSize || pageSize,
-          total: result.pagination?.total || 0,
-        }
-      };
+      // CLI 返回格式: { data: [], pagination: { page, pageSize, total } }
+      return { data: result.data || [] };
     } catch (e) {
       console.warn(`⚠️  CLI 查询数据失败，回退到直接 API: ${e.message}`);
       useCliMode = false;
@@ -676,22 +668,14 @@ export async function getModelData(token, modelCode, params = {}, options = {})
 
   const body = {
     modelCode,
-    params: {},
+    groupFields: groupFields || [],
+    functions: functions || [],
+    customQuery: customQuery || {},
+    page,
+    pageSize,
   };
 
-  if (customQuery) {
-    body.params.customQuery = customQuery;
-  }
-
-  if (groupFields && groupFields.length > 0) {
-    body.params.groupFields = groupFields;
-  }
-
-  if (functions && functions.length > 0) {
-    body.params.functions = functions;
-  }
-
-  const response = await fetch(`${baseUrl}/foresight/api/bi/multdim/anls/ai/query`, {
+  const response = await fetch(`${baseUrl}/foresight/api/bi/multdim/anls/ai/query/by/co`, {
     method: 'POST',
     headers,
     body: JSON.stringify(body),

package/src/api.js

@@ -30,7 +30,7 @@ const BASIC_AUTH = 'Basic UEM6bkxDbndkSWhpeldieWtIeXVaTTZUcFFEZDdLd0s5SVhESzhMR3
 
 const DEFAULT_MENU_HEADERS = {
   'x-menu-code': 'AI_REPORT',
-  'x-menu-id': '2008425412219936770',
+  'x-menu-id': '2009191076595752963',
   'x-menu-params': 'null',
   'x-page-code': 'ai_report',
 };
@@ -326,7 +326,7 @@ export async function getModelColumns(token, modelCodes) {
 // 查询模型数据
 export async function getModelData(token, modelCode, params = {}) {
   const baseUrl = getBaseUrl();
-  const response = await fetch(baseUrl + '/foresight/api/bi/multdim/anls/ai/query', {
+  const response = await fetch(baseUrl + '/foresight/api/bi/multdim/anls/ai/query/by/co', {
     method: 'POST',
     headers: {
       'accept': 'application/json, text/plain, */*',
@@ -336,11 +336,11 @@ export async function getModelData(token, modelCode, params = {}) {
     },
     body: JSON.stringify({
       modelCode,
-      params: {
-        pageNum: params.pageNum || 0,
-        pageSize: params.pageSize || 100,
-        ...params,
-      },
+      groupFields: params.groupFields || [],
+      functions: params.functions || [],
+      customQuery: params.customQuery || {},
+      page: params.page || params.pageNum || 0,
+      pageSize: params.pageSize || 100,
     }),
   });
 

package/src/cli.js

@@ -246,7 +246,7 @@ userCmd
       const userInfo = await getUserInfo();
 
       const tenants = (userInfo.tenantList || []).map(t => ({
-        tenantId: t.tenantId,
+        tenantId: t.id,          // API 返回的字段名是 id
         tenantName: t.tenantName,
         tenantCode: t.tenantCode,
         isCurrent: t.tenantCode === userInfo.user?.tenantCode,
@@ -256,6 +256,7 @@ userCmd
         tenants,
         total: tenants.length,
         currentTenantCode: userInfo.user?.tenantCode || '',
+        currentTenantId: userInfo.user?.tenantId || '',
       });
     } catch (error) {
       printError(error);
@@ -371,23 +372,118 @@ dataCmd
   .description('Query data from a model')
   .option('-p, --page <number>', 'Page number (starting from 0)', '0')
   .option('-s, --size <number>', 'Page size', '100')
+  .option('-q, --query <json>', 'Query condition (JSON format)')
+  .option('-g, --group <fields>', 'Group fields (comma separated)')
+  .option('-f, --functions <json>', 'Aggregation functions (JSON array)')
+  .addHelpText('after', `
+Examples:
+  # Simple query
+  byteplan data query CBEC_PRODUCT -p 0 -s 10
+
+  # With filter condition
+  byteplan data query CBEC_PRODUCT -q '{"type":"condition","field":"category","operator":"=","value":"饮料"}'
+
+  # With multiple conditions (AND)
+  byteplan data query CBEC_PRODUCT -q '{"type":"group","logic":"AND","children":[{"type":"condition","field":"category","operator":"=","value":"饮料"},{"type":"condition","field":"selling_price","operator":">","value":"5"}]}'
+
+  # With grouping
+  byteplan data query CBEC_PRODUCT -g category,subcategory
+
+  # With aggregation functions
+  byteplan data query CBEC_ORDER -g product_id -f '[{"func":"sum","field":"quantity","alias":"total_qty"},{"func":"avg","field":"unit_price","alias":"avg_price"}]'
+
+  # Complete aggregation example
+  byteplan data query CBEC_ORDER -g product_id -q '{"type":"condition","field":"order_date","operator":"BETWEEN","value":["2024-01-01","2024-12-31"]}' -f '[{"func":"sum","field":"amount","alias":"total_amount"},{"func":"count","field":"id","alias":"order_count"}]'
+
+Query Syntax:
+
+  1. Single Condition:
+     {
+       "type": "condition",
+       "field": "字段名",
+       "operator": "=",
+       "value": "值"
+     }
+
+  2. Condition Group (AND/OR):
+     {
+       "type": "group",
+       "logic": "AND",
+       "children": [
+         { "type": "condition", "field": "field1", "operator": "=", "value": "value1" },
+         { "type": "condition", "field": "field2", "operator": ">", "value": "value2" }
+       ]
+     }
+
+  Operators: =, !=, >, <, >=, <=, LIKE, IN, BETWEEN
+
+  Special Fields (DIM/LIST/LOV/LEVEL):
+    - Use field name directly (no .code or .name suffix)
+    - Use code value for filtering
+
+  Group Fields (-g):
+    Comma-separated field names for aggregation grouping
+    Example: -g category,subcategory
+
+  Aggregation Functions (-f):
+    JSON array of function objects:
+    [
+      { "func": "sum", "field": "数值字段", "alias": "别名" },
+      { "func": "avg", "field": "数值字段", "alias": "别名" },
+      { "func": "count", "field": "任意字段", "alias": "别名" },
+      { "func": "max", "field": "字段", "alias": "别名" },
+      { "func": "min", "field": "字段", "alias": "别名" }
+    ]
+
+    Supported functions: sum, avg, count, max, min
+
+    Note: When using aggregation functions, -g (group) is usually needed.
+    Without grouping, aggregation returns a single summary row.
+`)
   .action(async (modelCode, options) => {
     try {
       await loginWithEnv();
-      const result = await getModelData(null, modelCode, {
-        pageNum: parseInt(options.page),
+
+      const params = {
+        page: parseInt(options.page),
         pageSize: parseInt(options.size),
-      });
+      };
+
+      // 解析查询条件
+      if (options.query) {
+        try {
+          params.customQuery = JSON.parse(options.query);
+        } catch (e) {
+          printJSON({ error: true, message: 'Invalid JSON query: ' + e.message });
+          process.exit(1);
+        }
+      }
 
-      // result.data 可能是数组（直接数据）或对象（包含 data 子字段）
-      const rows = Array.isArray(result.data) ? result.data : (result.data?.data || []);
+      // 解析分组字段
+      if (options.group) {
+        params.groupFields = options.group.split(',').map(f => f.trim());
+      }
+
+      // 解析聚合函数
+      if (options.functions) {
+        try {
+          params.functions = JSON.parse(options.functions);
+        } catch (e) {
+          printJSON({ error: true, message: 'Invalid JSON functions: ' + e.message });
+          process.exit(1);
+        }
+      }
+
+      const result = await getModelData(null, modelCode, params);
+
+      // result.data 是数据数组
+      const rows = Array.isArray(result.data) ? result.data : [];
       printJSON({
-        headers: result.headers || result.data?.headers || [],
         data: rows,
         pagination: {
-          pageNum: result.pageNum || result.data?.pageNum || parseInt(options.page),
-          pageSize: result.pageSize || result.data?.pageSize || parseInt(options.size),
-          total: result.total || result.data?.total || 0,
+          page: parseInt(options.page),
+          pageSize: parseInt(options.size),
+          total: rows.length,
         },
       });
     } catch (error) {