weaver-e10-builder 1.7.1 → 1.7.2

package/dist/commands/form-association-manage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form-association-manage.d.ts","sourceRoot":"","sources":["../../src/commands/form-association-manage.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAoBpC,wBAAgB,iCAAiC,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CA4DxF"}
+{"version":3,"file":"form-association-manage.d.ts","sourceRoot":"","sources":["../../src/commands/form-association-manage.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA6BpC,wBAAgB,iCAAiC,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CAgHxF"}

package/dist/commands/form-association-manage.js

@@ -1,7 +1,7 @@
 import { readFileSync } from 'node:fs';
 import { AuthSession } from '../core/auth.js';
 import { ApiClient } from '../core/client.js';
-import { AssociationService } from '../services/form-association.js';
+import { AssociationService, groupNameText, parseSeclevel } from '../services/form-association.js';
 function readArray(input, label) {
     const parsed = JSON.parse(input.startsWith('@') ? readFileSync(input.slice(1), 'utf-8') : input);
     if (!Array.isArray(parsed))
@@ -11,8 +11,19 @@ function readArray(input, label) {
 function options(raw) {
     if (raw.enabled !== undefined && !['true', 'false'].includes(raw.enabled))
         throw new Error('--enabled 仅支持 true / false');
+    if (raw.selected !== undefined && !['true', 'false'].includes(raw.selected))
+        throw new Error('--selected 仅支持 true / false');
+    let order;
+    if (raw.order !== undefined) {
+        order = Number(raw.order);
+        if (!Number.isInteger(order) || order < 1)
+            throw new Error('--order 需为 1 或正整数');
+    }
     return { name: raw.name, view: raw.view, targetApp: raw.targetApp, layouts: raw.layouts, terminals: raw.terminals,
         enabled: raw.enabled === undefined ? undefined : raw.enabled === 'true', action: raw.action,
+        order,
+        selected: raw.selected === undefined ? undefined : raw.selected === 'true',
+        group: raw.group === undefined ? undefined : (['none', '无', '0'].includes(String(raw.group)) ? null : String(raw.group)),
         mappings: raw.mappings === undefined ? undefined : readArray(raw.mappings, '--mappings'),
         permissions: raw.permissions === undefined ? undefined : readArray(raw.permissions, '--permissions') };
 }
@@ -37,6 +48,10 @@ export function registerAssociationManageCommands(assoc, program) {
         .option('--layouts <layout...>', '显示/show/0、新建/create/1、编辑/edit/2；none 表示均不显示。修改时替换布局集合')
         .option('--terminals <terminal...>', 'PC / MOBILE，修改时替换终端集合')
         .option('--enabled <true|false>', '是否启用关联页签')
+        .option('--order <n>', '显示顺序（1 起）')
+        .option('--selected <true|false>', '是否默认选中该页签；true 时平台会取消其它页签的默认选中')
+        .option('--group <id|name|none>', '关联分组 ID / 唯一名称；none 表示移出分组')
+        .option('--permissions <json|@file>', '关联权限数组（整组替换；每项含 selectedType/dataid/levelScope/condition 等）')
         .option('--mappings <json|@file>', '筛选映射数组 [{targetField,sourceField}]，字段 ID 或唯一名称；替换目标动作的全部筛选映射');
     base('views', '列出可关联的目标视图（含视图 ID、所属表单）')
         .option('--target-app <id>', '目标应用，默认当前应用')
@@ -50,8 +65,7 @@ export function registerAssociationManageCommands(assoc, program) {
     }));
     settings(base('create', '创建关联页签并绑定目标视图，回读验证；默认显示布局、PC+MOBILE、启用')
         .argument('<name>', '页签名称')
-        .requiredOption('--view <id|name>', '目标视图 ID 或唯一名称')
-        .requiredOption('--permissions <json|@file>', '明确指定关联权限数组；如 [{"selectedType":"all","dataid":"0","condition":{"rootdata":""}}]'))
+        .requiredOption('--view <id|name>', '目标视图 ID 或唯一名称'))
         .action((objId, appId, name, raw) => run(objId, appId, service => service.create({ ...options(raw), name })));
     settings(base('update', '更新关联页签，保留未指定设置、动作及权限；回读验证')
         .argument('<associationId>', '关联页签 ID')
@@ -59,8 +73,10 @@ export function registerAssociationManageCommands(assoc, program) {
         .option('--view <id|name>', '切换目标视图')
         .option('--action <id>', '多动作时指定目标视图动作 ID'))
         .action((objId, appId, id, raw) => run(objId, appId, service => {
-        if (![raw.name, raw.view, raw.layouts, raw.terminals, raw.enabled, raw.mappings].some(v => v !== undefined))
+        if (![raw.name, raw.view, raw.layouts, raw.terminals, raw.enabled, raw.mappings,
+            raw.order, raw.selected, raw.group, raw.permissions].some(v => v !== undefined)) {
             throw new Error('请至少指定一项要修改的配置');
+        }
         return service.update(id, options(raw));
     }));
     base('delete', '删除关联页签（ID 或唯一名称），删完回读确认已消失')
@@ -75,5 +91,42 @@ export function registerAssociationManageCommands(assoc, program) {
         .argument('<associationId>', '关联页签 ID')
         .option('--action <id>', '多动作时指定动作 ID')
         .action((objId, appId, id, raw) => run(objId, appId, service => service.update(id, { mappings: [], action: raw.action })));
+    base('reorder', '按给定顺序重排全部关联页签（必须给出本表单全部关联 ID）')
+        .argument('<associationIds...>', '按目标显示顺序排列的关联页签 ID')
+        .action((objId, appId, ids) => run(objId, appId, service => service.reorder(ids)));
+    base('set-seclevel', '修改关联某条权限的安全级别（读整行回写，30-100 等）')
+        .argument('<associationId>', '关联页签 ID')
+        .requiredOption('--perm <n|type>', '目标权限：1-based 序号 或 selectedType(user/all 等)')
+        .requiredOption('--seclevel <min>-<max>', '安全级别范围，如 30-100（0~100）')
+        .action((objId, appId, id, raw) => run(objId, appId, service => service.setSecurityLevel(id, String(raw.perm), parseSeclevel(String(raw.seclevel)))));
+    const groupCmd = assoc.command('group').description('关联页签分组（增删改查）');
+    const groupBase = (name, description) => groupCmd.command(name).description(description)
+        .argument('<objId>', '所属表单 ID').argument('<appId>', '应用 ID');
+    const orderArg = (value) => {
+        if (value === undefined)
+            return undefined;
+        const n = Number(value);
+        if (!Number.isInteger(n) || n < 1)
+            throw new Error('--order 需为 1 或正整数');
+        return n;
+    };
+    groupBase('list', '查看关联页签分组列表')
+        .action((objId, appId) => run(objId, appId, async (service) => ({
+        groups: (await service.listGroups()).map(g => ({
+            id: String(g.id), name: groupNameText(g.groupName), showOrder: g.showOrder,
+        })),
+    })));
+    groupBase('add', '新增关联页签分组')
+        .argument('<name>', '分组名称')
+        .option('--order <n>', '在分组列表中的位置（1 起；缺省追加到末尾）')
+        .action((objId, appId, name, raw) => run(objId, appId, service => service.addGroup(name, orderArg(raw.order))));
+    groupBase('update', '修改关联页签分组名称或顺序')
+        .argument('<groupIdOrName>', '分组 ID 或唯一名称')
+        .option('--name <name>', '新分组名称')
+        .option('--order <n>', '在分组列表中的新位置（1 起）')
+        .action((objId, appId, selector, raw) => run(objId, appId, service => service.updateGroup(selector, { name: raw.name, order: orderArg(raw.order) })));
+    groupBase('delete', '删除关联页签分组（分组内页签不会被删除，会变成未分组）')
+        .argument('<groupIdOrName>', '分组 ID 或唯一名称')
+        .action((objId, appId, selector) => run(objId, appId, service => service.deleteGroup(selector)));
 }
 //# sourceMappingURL=form-association-manage.js.map

package/dist/commands/form-association-manage.js.map

@@ -1 +1 @@
-{"version":3,"file":"form-association-manage.js","sourceRoot":"","sources":["../../src/commands/form-association-manage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEvC,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAE9C,OAAO,EAAE,kBAAkB,EAA2B,MAAM,iCAAiC,CAAC;AAE9F,SAAS,SAAS,CAAC,KAAa,EAAE,KAAa;IAC7C,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IACjG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,GAAG,KAAK,cAAc,CAAC,CAAC;IACpE,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,OAAO,CAAC,GAAQ;IACvB,IAAI,GAAG,CAAC,OAAO,KAAK,SAAS,IAAI,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;IACzH,OAAO,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,SAAS,EAAE,GAAG,CAAC,SAAS;QAC/G,OAAO,EAAE,GAAG,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,KAAK,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM;QAC3F,QAAQ,EAAE,GAAG,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,EAAE,YAAY,CAAC;QACxF,WAAW,EAAE,GAAG,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,EAAE,eAAe,CAAC,EAAE,CAAC;AAC3G,CAAC;AAED,MAAM,UAAU,iCAAiC,CAAC,KAAc,EAAE,OAAgB;IAChF,KAAK,UAAU,GAAG,CAAC,KAAa,EAAE,KAAa,EAAE,SAAwD;QACvG,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,EAAiB,CAAC,CAAC;YAC1E,IAAI,CAAC,IAAI;gBAAE,MAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,CAAC;YACrC,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,IAAI,kBAAkB,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,UAAU,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;YAC7G,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAC/C,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAAC,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;QAAC,CAAC;IAC9E,CAAC;IACD,MAAM,IAAI,GAAG,CAAC,IAAY,EAAE,WAAmB,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,WAAW,CAAC,WAAW,CAAC;SAC7F,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAC/D,MAAM,QAAQ,GAAG,CAAC,OAAgB,EAAE,EAAE,CAAC,OAAO;SAC3C,MAAM,CAAC,mBAAmB,EAAE,iBAAiB,CAAC;SAC9C,MAAM,CAAC,uBAAuB,EAAE,uDAAuD,CAAC;SACxF,MAAM,CAAC,2BAA2B,EAAE,uBAAuB,CAAC;SAC5D,MAAM,CAAC,wBAAwB,EAAE,UAAU,CAAC;SAC5C,MAAM,CAAC,yBAAyB,EAAE,8DAA8D,CAAC,CAAC;IAErG,IAAI,CAAC,OAAO,EAAE,yBAAyB,CAAC;SACrC,MAAM,CAAC,mBAAmB,EAAE,aAAa,CAAC;SAC1C,MAAM,CAAC,CAAC,KAAa,EAAE,KAAa,EAAE,GAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IAElH,IAAI,CAAC,QAAQ,EAAE,uBAAuB,CAAC;SACpC,cAAc,CAAC,kBAAkB,EAAE,eAAe,CAAC;SACnD,MAAM,CAAC,mBAAmB,EAAE,aAAa,CAAC;SAC1C,MAAM,CAAC,CAAC,KAAa,EAAE,KAAa,EAAE,GAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAC,OAAO,EAAC,EAAE;QACpF,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC;QAChE,OAAO,EAAE,IAAI,EAAE,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;IACjD,CAAC,CAAC,CAAC,CAAC;IAEN,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,wCAAwC,CAAC;SAC9D,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;SAC1B,cAAc,CAAC,kBAAkB,EAAE,eAAe,CAAC;SACnD,cAAc,CAAC,4BAA4B,EAAE,gFAAgF,CAAC,CAAC;SAC/H,MAAM,CAAC,CAAC,KAAa,EAAE,KAAa,EAAE,IAAY,EAAE,GAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IAE7I,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,2BAA2B,CAAC;SACjD,QAAQ,CAAC,iBAAiB,EAAE,SAAS,CAAC;SACtC,MAAM,CAAC,eAAe,EAAE,OAAO,CAAC;SAChC,MAAM,CAAC,kBAAkB,EAAE,QAAQ,CAAC;SACpC,MAAM,CAAC,eAAe,EAAE,iBAAiB,CAAC,CAAC;SAC3C,MAAM,CAAC,CAAC,KAAa,EAAE,KAAa,EAAE,EAAU,EAAE,GAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE;QAC1F,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,SAAS,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;QAC9I,OAAO,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC,CAAC;IAEN,IAAI,CAAC,QAAQ,EAAE,4BAA4B,CAAC;SACzC,QAAQ,CAAC,iBAAiB,EAAE,eAAe,CAAC;SAC5C,MAAM,CAAC,CAAC,KAAa,EAAE,KAAa,EAAE,QAAgB,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAEtH,IAAI,CAAC,YAAY,EAAE,yCAAyC,CAAC;SAC1D,QAAQ,CAAC,iBAAiB,EAAE,SAAS,CAAC;SACtC,cAAc,CAAC,yBAAyB,EAAE,2CAA2C,CAAC;SACtF,MAAM,CAAC,eAAe,EAAE,aAAa,CAAC;SACtC,MAAM,CAAC,CAAC,KAAa,EAAE,KAAa,EAAE,EAAU,EAAE,GAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAElI,IAAI,CAAC,cAAc,EAAE,wBAAwB,CAAC;SAC3C,QAAQ,CAAC,iBAAiB,EAAE,SAAS,CAAC;SACtC,MAAM,CAAC,eAAe,EAAE,aAAa,CAAC;SACtC,MAAM,CAAC,CAAC,KAAa,EAAE,KAAa,EAAE,EAAU,EAAE,GAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;AAC5J,CAAC"}
+{"version":3,"file":"form-association-manage.js","sourceRoot":"","sources":["../../src/commands/form-association-manage.ts"],"names":[],"mappings":"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"}

package/dist/commands/form-association.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form-association.d.ts","sourceRoot":"","sources":["../../src/commands/form-association.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAwFpC,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CA8LrF"}
+{"version":3,"file":"form-association.d.ts","sourceRoot":"","sources":["../../src/commands/form-association.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAwFpC,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CAgMrF"}

package/dist/commands/form-association.js

@@ -2,7 +2,7 @@ import { existsSync, readFileSync } from 'node:fs';
 import { AuthSession } from '../core/auth.js';
 import { ApiClient } from '../core/client.js';
 import { registerAssociationManageCommands } from './form-association-manage.js';
-import { AssociationService, withConditionLogic } from '../services/form-association.js';
+import { AssociationService, groupNameText, withConditionLogic } from '../services/form-association.js';
 import { lzwCompress } from '../core/lzw.js';
 import { losslessParse } from '../core/client.js';
 import { fetchFields, buildConditionTree, resolveValueFieldRefs } from './form-list-utils.js';
@@ -107,7 +107,8 @@ export function registerFormAssociationCommands(form, program) {
             }
             console.log(`共 ${datas.length} 个关联页签:`);
             for (const d of datas) {
-                console.log(`  [${d.id}] ${d.pageName || '(未命名)'}  open=${d.open}  order=${d.order ?? ''}  selected=${d.selected}`);
+                const group = d.group ? `  group=${groupNameText(d.group.groupName) || d.group.id}` : '';
+                console.log(`  [${d.id}] ${d.pageName || '(未命名)'}  open=${d.open}  order=${d.order ?? ''}  selected=${d.selected}${group}`);
             }
         }
         catch (e) {
@@ -141,6 +142,7 @@ export function registerFormAssociationCommands(form, program) {
             }
             console.log(`关联 [${d.id}] ${d.pageName}  open=${d.open}  objId=${d.objId}`);
             console.log(`显示布局: ${d.showLayout}（0=显示，2=编辑）  终端: ${(d.applicable || []).join(',')}`);
+            console.log(`顺序: ${d.order ?? ''}  默认选中: ${d.selected ? '是' : '否'}  分组: ${d.group ? `${groupNameText(d.group.groupName) || d.group.id}(${d.group.id})` : '未分组'}`);
             for (const action of d.associationActions || []) {
                 if (action.actionType !== 'openpage')
                     continue;

package/dist/commands/form-association.js.map

@@ -1 +1 @@
-{"version":3,"file":"form-association.js","sourceRoot":"","sources":["../../src/commands/form-association.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"form-association.js","sourceRoot":"","sources":["../../src/commands/form-association.ts"],"names":[],"mappings":"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"}

package/dist/commands/form-button-actions-cmd.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form-button-actions-cmd.d.ts","sourceRoot":"","sources":["../../src/commands/form-button-actions-cmd.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAyHpC,wBAAgB,gCAAgC,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CAiLxF"}
+{"version":3,"file":"form-button-actions-cmd.d.ts","sourceRoot":"","sources":["../../src/commands/form-button-actions-cmd.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAsMpC,wBAAgB,gCAAgC,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI,CAuPxF"}

package/dist/commands/form-button-actions-cmd.js

@@ -4,9 +4,10 @@ import { ApiClient } from '../core/client.js';
 import { fetchFields } from './form-list-utils.js';
 import { readButtonContext } from '../services/form-button-context.js';
 import { saveButtonState, assertUntouched } from '../services/form-button-save.js';
-import { buildPlatformButtonAction, buildUrlButtonAction, buildConfirmBoxAction, buildJsCodeAction, buildEditFieldValueAction, buildExecLogicFlowAction, buildFieldEditEntry, normalizeActionIndexes, actionLabel, mappingInputs, verifyButtonAction, decodeEcode, } from '../services/form-button-action.js';
+import { buildPlatformButtonAction, buildUrlButtonAction, buildConfirmBoxAction, buildJsCodeAction, buildEditFieldValueAction, buildExecLogicFlowAction, buildFieldEditEntry, normalizeActionIndexes, actionLabel, mappingInputs, verifyButtonAction, decodeEcode, buildReplyAction, buildViewLogsAction, buildClosePageAction, buildScanUploadAction, } from '../services/form-button-action.js';
 import { AssociationService, buildUrlActionParams } from '../services/form-association.js';
 import { resolveLogicFlow } from '../services/form-button-logicflow.js';
+import { fieldIdOf, fieldDisplayName, fetchFieldOptions, fetchFormId, isOptionComponent, resolveOptionSelections, } from '../services/form-field-options.js';
 /** MSYS 会把 `/sp/...` 这种相对路径改写成 `D:/Program Files/Git/sp/...`，这里掰回来。 */
 function fixMsysPath(url) {
     const match = url.match(/^[A-Za-z]:[/\\].+?(\/(?:sp|page)\/.+)$/);
@@ -54,21 +55,69 @@ function describeAction(action) {
             return '';
         }
     }
+    if (type === 'viewLogs') {
+        try {
+            const types = JSON.parse(action?.logTypes || '[]');
+            return Array.isArray(types) ? types.join(',') : '';
+        }
+        catch {
+            return '';
+        }
+    }
     return '';
 }
-/** 「编辑字段值」的字段：给 fieldId 或字段标题都行。 */
-function resolveFieldId(fields, token) {
+/** 「编辑字段值」的字段：给 fieldId 或字段标题都行（返回完整元数据，选项字段还要用它）。 */
+function resolveField(fields, token) {
     const raw = String(token).trim();
-    const byId = fields.find((f) => String(f.id) === raw);
+    const byId = fields.find((f) => fieldIdOf(f) === raw);
     if (byId)
-        return String(byId.id);
-    const byTitle = fields.filter((f) => String(f.text ?? f.title ?? '') === raw);
+        return byId;
+    const byTitle = fields.filter((f) => fieldDisplayName(f) === raw);
     if (byTitle.length === 1)
-        return String(byTitle[0].id);
+        return byTitle[0];
     if (byTitle.length > 1)
         throw new Error(`字段「${raw}」重名，请改用 fieldId`);
     throw new Error(`字段「${raw}」不存在（给 fieldId 或字段标题）`);
 }
+/** 「查看日志」的记录类型：1查阅情况 / 2操作日志 / 3表单修改日志 / 4打印日志。 */
+function parseLogTypes(raw) {
+    const text = String(raw ?? '').trim();
+    if (!text)
+        return ['1', '2', '3', '4'];
+    let tokens;
+    if (text.startsWith('[')) {
+        let parsed;
+        try {
+            parsed = JSON.parse(text);
+        }
+        catch {
+            throw new Error(`--log-types「${text}」不是合法 JSON 数组`);
+        }
+        if (!Array.isArray(parsed) || !parsed.length)
+            throw new Error('--log-types 需要非空数组');
+        tokens = parsed.map((item) => String(item).trim());
+    }
+    else {
+        tokens = text.split(/[,，]/).map((item) => item.trim()).filter(Boolean);
+    }
+    const aliases = {
+        '1': '1', '查阅': '1', '查阅情况': '1',
+        '2': '2', '操作': '2', '操作日志': '2',
+        '3': '3', '表单修改': '3', '表单修改日志': '3',
+        '4': '4', '打印': '4', '打印日志': '4',
+    };
+    const types = [];
+    for (const token of tokens) {
+        const type = aliases[token];
+        if (!type)
+            throw new Error(`--log-types 只支持 1/2/3/4（查阅/操作/表单修改/打印），收到「${token}」`);
+        if (!types.includes(type))
+            types.push(type);
+    }
+    if (!types.length)
+        throw new Error('--log-types 至少选一个类型');
+    return types;
+}
 /**
  * 回读校验：先比动作**类型序列**（对得上说明没有多一条少一条），
  * 再按类型比各自的稳定键。平台会重排 `index`、给新动作分配正式 id，这两样不比。
@@ -97,8 +146,17 @@ function verifyActions(expected, actual) {
                     throw new Error('已提交，但 JavaScript 脚本回读不一致');
                 break;
             case 'editFieldValue': {
-                // 平台可能重排键序，比语义不比字面
-                const sig = (raw) => JSON.stringify((JSON.parse(raw || '[]') || []).map((e) => [String(e.fieldId), String(e.optionType), JSON.stringify(e.value)]));
+                // 平台可能重排键序/补充 value 上的额外键，比语义不比字面：
+                // fieldId、optionType、以及每个值的 (valueKey, content) 集合。
+                const sig = (raw) => JSON.stringify((JSON.parse(raw || '[]') || [])
+                    .map((e) => [
+                    String(e.fieldId),
+                    String(e.optionType),
+                    (Array.isArray(e.value) ? e.value : [])
+                        .map((v) => `${String(v?.value ?? '')}|${String(v?.content ?? '')}`)
+                        .sort(),
+                ])
+                    .sort((a, b) => String(a[0]).localeCompare(String(b[0]))));
                 if (sig(want.fieldEditConfig) !== sig(got.fieldEditConfig))
                     throw new Error('已提交，但编辑字段值配置回读不一致');
                 break;
@@ -110,14 +168,43 @@ function verifyActions(expected, actual) {
                     throw new Error('已提交，但触发逻辑流回读不一致');
                 break;
             }
+            case 'reply':
+                for (const key of ['openType', 'showReplyNum', 'params']) {
+                    if (String(want[key] ?? '') !== String(got[key] ?? ''))
+                        throw new Error(`已提交，但评论动作 ${key} 回读不一致`);
+                }
+                break;
+            case 'viewLogs': {
+                for (const key of ['openType', 'showReplyNum', 'params']) {
+                    if (String(want[key] ?? '') !== String(got[key] ?? ''))
+                        throw new Error(`已提交，但查看日志动作 ${key} 回读不一致`);
+                }
+                const typesOf = (raw) => {
+                    try {
+                        const parsed = JSON.parse(String(raw ?? '[]'));
+                        return Array.isArray(parsed) ? parsed.map(String).sort().join(',') : '';
+                    }
+                    catch {
+                        return '';
+                    }
+                };
+                if (typesOf(want.logTypes) !== typesOf(got.logTypes))
+                    throw new Error('已提交，但查看日志的记录类型回读不一致');
+                break;
+            }
             default:
                 break;
         }
+        // 只校验显式打开的开关；平台默认 0 的不做反向断言，避免把历史动作的缺省差异当失败。
+        if (Number(want?.executeSelectedDatas ?? 0) === 1
+            && Number(got?.executeSelectedDatas ?? 0) !== 1) {
+            throw new Error('已提交，但「按勾选数据执行」回读不一致');
+        }
     }
 }
 export function registerFormButtonActionCommands(btnCmd, program) {
     btnCmd.command('action')
-        .description('按钮动作管理（可挂多个）：打开页面 / 确认框 / JavaScript / 编辑字段值 / 触发逻辑流；不带选项时列出')
+        .description('按钮动作管理（可挂多个）：打开页面 / 确认框 / JavaScript / 编辑字段值 / 评论和日志 / 查看日志 / 关闭页面 / 扫描上传 / 触发逻辑流；不带选项时列出')
         .argument('<objId>', '表单 objId')
         .argument('<appId>', '应用 ID')
         .argument('<buttonId>', '按钮 ID')
@@ -140,8 +227,14 @@ export function registerFormButtonActionCommands(btnCmd, program) {
         .option('--add-js', '加「JavaScript」动作')
         .option('--code <源码|@文件>', 'JavaScript 源码（@文件 从文件读，避免命令行转义）')
         .option('--add-edit-field <field:value...>', '加「编辑字段值」（固定值），可给多个；字段写 fieldId 或字段标题')
+        .option('--add-reply', '加「评论和日志」动作')
+        .option('--add-view-logs', '加「查看日志」动作')
+        .option('--log-types <types>', '查看日志的记录类型：1查阅/2操作/3表单修改/4打印，逗号分隔，缺省全部')
+        .option('--add-close-page', '加「关闭页面」动作')
+        .option('--add-scan-upload', '加「扫描上传」动作')
         .option('--add-logic <逻辑流>', '加「触发逻辑流」（绑现有逻辑流，名称或 ID）')
         .option('--logic-ecode-id <id>', '逻辑流的 ecodeId（运行时不消费，缺省沿用旧绑定/留空）')
+        .option('--execute-selected', '本次新增的动作按勾选数据执行（executeSelectedDatas=1；「打开页面」动作不适用）')
         .option('--dry-run', '只打印将要提交的报文，不保存')
         .option('--json', 'JSON 输出')
         .action(async (objId, appId, buttonId, o) => {
@@ -158,8 +251,10 @@ export function registerFormButtonActionCommands(btnCmd, program) {
             const context = await readButtonContext(client, baseUrl, appId, objId, buttonId);
             const current = context.details.actions;
             const hasAdd = Boolean(o.addUrl || o.addView || o.addLayout || o.addStartWorkflow
-                || o.addConfirm || o.addJs || o.addEditField?.length || o.addLogic);
-            const editing = hasAdd || Boolean(o.clear) || o.remove !== undefined;
+                || o.addConfirm || o.addJs || o.addEditField?.length || o.addLogic
+                || o.addReply || o.addViewLogs || o.addClosePage || o.addScanUpload);
+            const editing = hasAdd || Boolean(o.clear) || o.remove !== undefined
+                || Boolean(o.executeSelected) || o.logTypes !== undefined;
             if (!editing) {
                 if (isJson) {
                     console.log(JSON.stringify(current, null, 2));
@@ -195,6 +290,7 @@ export function registerFormButtonActionCommands(btnCmd, program) {
                 }
             }
             // ---- 追加（固定顺序：URL → 视图 → 布局 → 流程 → 确认框 → JS → 编辑字段值 → 逻辑流）----
+            const addedStart = next.length;
             if (o.addUrl) {
                 const url = fixMsysPath(o.addUrl);
                 let params = [];
@@ -236,14 +332,40 @@ export function registerFormButtonActionCommands(btnCmd, program) {
             else if (o.code !== undefined) {
                 throw new Error('--code 只在 --add-js 时才有意义');
             }
+            let mergedEditIndex = -1;
             if (o.addEditField?.length) {
                 const fields = await fetchFields(client, baseUrl, objId);
-                const assignments = o.addEditField.map((item) => {
+                // 选项字段要读选项拿 valueKey；同一字段只查一次。只有真遇到选项字段才取 formId。
+                const optionCache = new Map();
+                let formId = '';
+                const assignments = [];
+                for (const item of o.addEditField) {
                     const idx = item.indexOf(':');
                     if (idx <= 0 || idx === item.length - 1)
                         throw new Error(`--add-edit-field「${item}」格式错误，应为 "字段:值"`);
-                    return { fieldId: resolveFieldId(fields, item.slice(0, idx)), value: item.slice(idx + 1) };
-                });
+                    const field = resolveField(fields, item.slice(0, idx));
+                    const fieldId = fieldIdOf(field);
+                    if (!fieldId)
+                        throw new Error(`字段「${item.slice(0, idx)}」没有 fieldId`);
+                    const rawValue = item.slice(idx + 1);
+                    const optionField = isOptionComponent(field)
+                        || (Array.isArray(field.fieldOptions) && field.fieldOptions.length > 0);
+                    if (!optionField) {
+                        assignments.push({ fieldId, field, values: rawValue });
+                        continue;
+                    }
+                    if (!formId)
+                        formId = await fetchFormId(client, baseUrl, objId, appId);
+                    if (!formId)
+                        throw new Error(`无法获取表单 formId，不能解析字段「${fieldDisplayName(field)}」的选项 valueKey`);
+                    if (!optionCache.has(fieldId)) {
+                        optionCache.set(fieldId, await fetchFieldOptions(client, baseUrl, formId, fieldId));
+                    }
+                    assignments.push({
+                        fieldId, field,
+                        values: resolveOptionSelections(rawValue, optionCache.get(fieldId), field),
+                    });
+                }
                 // 已经有「编辑字段值」动作就并进它（设计器里也是所有字段放一条动作），否则新建一条
                 const existingIndex = next.findIndex((a) => a?.actionType === 'editFieldValue');
                 if (existingIndex >= 0) {
@@ -256,20 +378,44 @@ export function registerFormButtonActionCommands(btnCmd, program) {
                     }
                     for (const a of assignments) {
                         const i = entries.findIndex((e) => String(e?.fieldId) === a.fieldId);
-                        const entry = buildFieldEditEntry(a.fieldId, a.value);
+                        const entry = buildFieldEditEntry(a.fieldId, a.values);
                         if (i >= 0)
                             entries[i] = entry;
                         else
                             entries.push(entry);
                     }
-                    next[existingIndex] = buildEditFieldValueAction({ entries, id: next[existingIndex].id });
+                    // **不要整条重建**：重建会把已有的 executeSelectedDatas/name 等设置重置成默认值。
+                    next[existingIndex] = { ...next[existingIndex], fieldEditConfig: JSON.stringify(entries) };
+                    mergedEditIndex = existingIndex;
                     changes.push(`~ 编辑字段值（现 ${entries.length} 个字段）`);
                 }
                 else {
-                    next.push(buildEditFieldValueAction({ entries: assignments.map((a) => buildFieldEditEntry(a.fieldId, a.value)) }));
+                    next.push(buildEditFieldValueAction({
+                        entries: assignments.map((a) => buildFieldEditEntry(a.fieldId, a.values)),
+                    }));
                     changes.push(`+ 编辑字段值（${assignments.length} 个字段）`);
                 }
             }
+            if (o.addReply) {
+                next.push(buildReplyAction());
+                changes.push('+ 评论和日志');
+            }
+            if (o.addViewLogs) {
+                const types = parseLogTypes(o.logTypes);
+                next.push(buildViewLogsAction({ logTypes: types }));
+                changes.push(`+ 查看日志(${types.join(',')})`);
+            }
+            else if (o.logTypes !== undefined) {
+                throw new Error('--log-types 只在 --add-view-logs 时才有意义');
+            }
+            if (o.addClosePage) {
+                next.push(buildClosePageAction());
+                changes.push('+ 关闭页面');
+            }
+            if (o.addScanUpload) {
+                next.push(buildScanUploadAction());
+                changes.push('+ 扫描上传');
+            }
             if (o.addLogic) {
                 const flow = await resolveLogicFlow(client, baseUrl, o.targetApp || appId, o.addLogic);
                 // ecodeId 运行时不消费：优先用显式给的，其次沿用同一逻辑流旧绑定里的值，都没有就留空
@@ -280,6 +426,22 @@ export function registerFormButtonActionCommands(btnCmd, program) {
                 next.push(buildExecLogicFlowAction({ id: flow.id, name: flow.name }, buttonId, { ecodeId: o.logicEcodeId ?? previous?.ecodeId ?? '' }));
                 changes.push(`+ 触发逻辑流(${flow.name})`);
             }
+            // 「按勾选数据执行」是**动作级**开关：只作用于本次新增/合并的动作，不碰已有动作。
+            if (o.executeSelected) {
+                const candidates = new Set();
+                for (let i = addedStart; i < next.length; i += 1)
+                    candidates.add(i);
+                if (mergedEditIndex >= 0)
+                    candidates.add(mergedEditIndex);
+                const targets = [...candidates].filter((i) => next[i] && next[i].actionType !== 'openpage');
+                if (!targets.length) {
+                    throw new Error('--execute-selected 只适用于非「打开页面」动作；本次没有这类动作');
+                }
+                for (const i of targets) {
+                    next[i] = { ...next[i], executeSelectedDatas: 1 };
+                }
+                changes.push('按勾选数据执行');
+            }
             next = normalizeActionIndexes(next);
             if (!changes.length)
                 throw new Error('没有指定任何要改的动作（--add-url / --add-confirm / --add-js / --add-edit-field / --add-logic …）');