@epoint-testtech/ep-stage-skill 0.0.11 → 0.0.13

package/dist/src/testcase/contract-testcase-assembler.d.ts

@@ -43,6 +43,12 @@ export type CrudCaseStage = {
     actionKind: GlueActionKind;
     queryKeyLabel: string;
     component: 'input' | 'listbox';
+    /**
+     * 条件性删除（如"草稿可删、在用不可删"）时的删除用例变体：
+     * draft_success = 满足可删条件（草稿）删除成功；blocked = 不满足条件（在用）被业务规则阻断。
+     * 仅 actionKind='delete' 且条件性规则时出现；无条件阻断/正常可删不设置（保持原有用例形态）。
+     */
+    deleteVariant?: 'draft_success' | 'blocked';
 };
 /**
  * 按查询字段推导 CRUD 用例阶段序列。
@@ -50,15 +56,18 @@ export type CrudCaseStage = {
  * 规则：在新增表单中出现的查询字段（可写）产出完整 create/read/update/delete 四条；
  * 不在表单中的字段（如系统管理的状态）只产出 read 一条。
  * export 不在此计划内，由装配器单独追加。
+ * 条件性删除规则（conditionalDelete=true）时，可写键的 delete 由一条变两条：
+ * 草稿删除成功（draft_success）在前、在用删除阻断（blocked）在后。
  *
  * @param searchFields - 列表页查询字段（有序）。
  * @param formFieldLabels - 新增表单字段标签集合。
+ * @param conditionalDelete - 删除是否为条件性（businessRules 的 delete 规则带 deletableCondition）。
  * @returns 有序阶段计划，顺序与 buildGlueCases 产出的用例顺序一一对应。
  */
 export declare function planCrudCaseStages(searchFields: Array<{
     label: string;
     component: 'input' | 'listbox';
-}>, formFieldLabels: string[]): CrudCaseStage[];
+}>, formFieldLabels: string[], conditionalDelete?: boolean): CrudCaseStage[];
 /**
  * 装配 contract + testcase + inference-trace 账本。
  *

package/dist/src/testcase/contract-testcase-assembler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contract-testcase-assembler.d.ts","sourceRoot":"","sources":["../../../src/testcase/contract-testcase-assembler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,sBAAsB,EAA2E,MAAM,kCAAkC,CAAC;AACxJ,OAAO,KAAK,EAAE,sBAAsB,EAAqB,MAAM,kCAAkC,CAAC;AAElG,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AASrE,oBAAoB;AACpB,MAAM,MAAM,aAAa,GAAG;IAC1B,iCAAiC;IACjC,QAAQ,EAAE,sBAAsB,CAAC;IACjC,qCAAqC;IACrC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,wCAAwC;IACxC,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,gEAAgE;AAChE,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,EAAE,sBAAsB,CAAC;IACjC,QAAQ,EAAE,sBAAsB,CAAC;IACjC,mEAAmE;IACnE,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACzC,CAAC;AAkZF,mBAAmB;AACnB,KAAK,cAAc,GAAG,QAAQ,GAAG,MAAM,GAAG,QAAQ,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAEzE;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B,UAAU,EAAE,cAAc,CAAC;IAC3B,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,OAAO,GAAG,SAAS,CAAC;CAChC,CAAC;AAEF;;;;;;;;;;GAUG;AACH,wBAAgB,kBAAkB,CAChC,YAAY,EAAE,KAAK,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,OAAO,GAAG,SAAS,CAAA;CAAE,CAAC,EACtE,eAAe,EAAE,MAAM,EAAE,GACxB,aAAa,EAAE,CAejB;AAkaD;;;;;GAKG;AACH,wBAAgB,gCAAgC,CAAC,KAAK,EAAE,aAAa,GAAG,cAAc,CA8KrF"}
+{"version":3,"file":"contract-testcase-assembler.d.ts","sourceRoot":"","sources":["../../../src/testcase/contract-testcase-assembler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,sBAAsB,EAA2E,MAAM,kCAAkC,CAAC;AACxJ,OAAO,KAAK,EAAE,sBAAsB,EAAqB,MAAM,kCAAkC,CAAC;AAElG,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AASrE,oBAAoB;AACpB,MAAM,MAAM,aAAa,GAAG;IAC1B,iCAAiC;IACjC,QAAQ,EAAE,sBAAsB,CAAC;IACjC,qCAAqC;IACrC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,wCAAwC;IACxC,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,gEAAgE;AAChE,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,EAAE,sBAAsB,CAAC;IACjC,QAAQ,EAAE,sBAAsB,CAAC;IACjC,mEAAmE;IACnE,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACzC,CAAC;AAwZF,mBAAmB;AACnB,KAAK,cAAc,GAAG,QAAQ,GAAG,MAAM,GAAG,QAAQ,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAEzE;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B,UAAU,EAAE,cAAc,CAAC;IAC3B,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,OAAO,GAAG,SAAS,CAAC;IAC/B;;;;OAIG;IACH,aAAa,CAAC,EAAE,eAAe,GAAG,SAAS,CAAC;CAC7C,CAAC;AAEF;;;;;;;;;;;;;GAaG;AACH,wBAAgB,kBAAkB,CAChC,YAAY,EAAE,KAAK,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,OAAO,GAAG,SAAS,CAAA;CAAE,CAAC,EACtE,eAAe,EAAE,MAAM,EAAE,EACzB,iBAAiB,UAAQ,GACxB,aAAa,EAAE,CAsBjB;AAmbD;;;;;GAKG;AACH,wBAAgB,gCAAgC,CAAC,KAAK,EAAE,aAAa,GAAG,cAAc,CA6LrF"}

package/dist/src/testcase/contract-testcase-assembler.js

@@ -49,7 +49,7 @@ const DEFAULT_LOCATORS = {
  * @param listPage - code_list.pages[role=list]。
  * @returns 覆盖 StageSkeletonCrudFlowSlots.locators 全部字段的定位表达式。
  */
-function buildCrudLocators(listPage) {
+function buildCrudLocators(listPage, addOrEditPage, conditionalDelete = false) {
     const gridId = 'datagrid';
     const createLabel = listPage.buttons?.find((b) => b.action === 'create')?.label ?? '新增';
     const deleteLabel = listPage.buttons?.find((b) => b.action === 'delete')?.label ?? '删除选定';
@@ -59,6 +59,10 @@ function buildCrudLocators(listPage) {
     })?.label ?? '修改';
     const miniButton = (label) => `xpath=//a[contains(@class,'mini-button')][normalize-space()='${label}']`;
     const gridCell = `xpath=//*[@id='${gridId}']//div[text()='{{value}}']`;
+    // 条件性删除需要「草稿删除成功」用例：新增页保存草稿按钮（action=save，如「保存」）
+    // 与关闭按钮（action=cancel，草稿保存后弹窗不关闭，需显式关闭回列表页）。
+    const draftSaveLabel = addOrEditPage?.buttons?.find((b) => b.action === 'save')?.label;
+    const dialogCloseLabel = addOrEditPage?.buttons?.find((b) => b.action === 'cancel')?.label;
     return {
         createButton: miniButton(createLabel),
         addAutofillTrigger: `xpath=//*[@title='默认填充']`,
@@ -70,6 +74,8 @@ function buildCrudLocators(listPage) {
         listRowSelectLocatorTemplate: gridCell,
         listDeleteButton: miniButton(deleteLabel),
         deleteConfirmButton: 'text=确定',
+        ...(conditionalDelete && draftSaveLabel ? { addDraftSaveButton: miniButton(draftSaveLabel) } : {}),
+        ...(conditionalDelete && dialogCloseLabel ? { addDialogCloseButton: miniButton(dialogCloseLabel) } : {}),
     };
 }
 /**
@@ -365,16 +371,25 @@ function normalizeQueryComponent(fieldInfo) {
  * 规则：在新增表单中出现的查询字段（可写）产出完整 create/read/update/delete 四条；
  * 不在表单中的字段（如系统管理的状态）只产出 read 一条。
  * export 不在此计划内，由装配器单独追加。
+ * 条件性删除规则（conditionalDelete=true）时，可写键的 delete 由一条变两条：
+ * 草稿删除成功（draft_success）在前、在用删除阻断（blocked）在后。
  *
  * @param searchFields - 列表页查询字段（有序）。
  * @param formFieldLabels - 新增表单字段标签集合。
+ * @param conditionalDelete - 删除是否为条件性（businessRules 的 delete 规则带 deletableCondition）。
  * @returns 有序阶段计划，顺序与 buildGlueCases 产出的用例顺序一一对应。
  */
-export function planCrudCaseStages(searchFields, formFieldLabels) {
+export function planCrudCaseStages(searchFields, formFieldLabels, conditionalDelete = false) {
     const stages = [];
     for (const field of searchFields) {
         if (formFieldLabels.includes(field.label)) {
-            stages.push({ actionKind: 'create', queryKeyLabel: field.label, component: field.component }, { actionKind: 'read', queryKeyLabel: field.label, component: field.component }, { actionKind: 'update', queryKeyLabel: field.label, component: field.component }, { actionKind: 'delete', queryKeyLabel: field.label, component: field.component });
+            stages.push({ actionKind: 'create', queryKeyLabel: field.label, component: field.component }, { actionKind: 'read', queryKeyLabel: field.label, component: field.component }, { actionKind: 'update', queryKeyLabel: field.label, component: field.component });
+            if (conditionalDelete) {
+                stages.push({ actionKind: 'delete', queryKeyLabel: field.label, component: field.component, deleteVariant: 'draft_success' }, { actionKind: 'delete', queryKeyLabel: field.label, component: field.component, deleteVariant: 'blocked' });
+            }
+            else {
+                stages.push({ actionKind: 'delete', queryKeyLabel: field.label, component: field.component });
+            }
         }
         else {
             stages.push({ actionKind: 'read', queryKeyLabel: field.label, component: field.component });
@@ -425,7 +440,7 @@ function pickQueryKeyLabel(label, searchFieldLabels, dataKeyLabel) {
  *   仅 delete 用例消费；缺省按 success_delete 出文案。
  * @returns testcase 执行字段。
  */
-function buildGlueExecutionFields(actionKind, queryKeyLabel, queryComponent, queryKeyInForm, searchFieldLabels, dataKeyLabel, deleteOutcome) {
+function buildGlueExecutionFields(actionKind, queryKeyLabel, queryComponent, queryKeyInForm, searchFieldLabels, dataKeyLabel, deleteOutcome, deleteVariant) {
     const queryKey = actionKind === 'export'
         ? pickQueryKeyLabel(dataKeyLabel ?? searchFieldLabels[0] ?? '不适用', searchFieldLabels, dataKeyLabel)
         : pickQueryKeyLabel(queryKeyLabel, searchFieldLabels, dataKeyLabel);
@@ -493,8 +508,18 @@ function buildGlueExecutionFields(actionKind, queryKeyLabel, queryComponent, que
         ].join(' ');
         // 断言文案必须与 skeletonSlots.assertions.deletePolicy 同源：
         // 业务规则阻断删除时若仍写「列表应无匹配记录」，用例描述会与脚本实际执行（断言阻断文案）相悖。
-        if (deleteOutcome?.deletePolicy === 'blocked_by_business_rule') {
-            const blockMessage = deleteOutcome.blockedDeleteMessage ?? '不允许删除';
+        // 条件性删除（如"草稿可删、在用不可删"）按 deleteVariant 分叉：
+        // draft_success = 草稿数据删除成功；blocked = 在用数据删除被阻断。
+        if (deleteVariant === 'draft_success') {
+            return {
+                queryKey,
+                precondition: `${smokeEntry} 2. 已基于${queryKey}完成一条测试数据新增（仅保存，数据为草稿状态）。`,
+                steps: deleteSteps,
+                assertion: `删除后再次按${queryKey}搜索该数据，列表应无匹配记录。`,
+            };
+        }
+        if (deleteVariant === 'blocked' || deleteOutcome?.deletePolicy === 'blocked_by_business_rule') {
+            const blockMessage = deleteOutcome?.blockedDeleteMessage ?? '不允许删除';
             return {
                 queryKey,
                 precondition: `${smokeEntry} 2. 已基于${queryKey}完成一条测试数据新增（保存并关闭，数据为在用状态）。`,
@@ -529,23 +554,25 @@ function buildGlueExecutionFields(actionKind, queryKeyLabel, queryComponent, que
  * @param dataKeyLabel - dataKey 对应的中文标签。
  * @returns cases 数组（generationStrategy 全 glue）。
  */
-function buildGlueCases(moduleName, searchFields, formFieldLabels, sequence, dataKeyLabel, deleteOutcome) {
+function buildGlueCases(moduleName, searchFields, formFieldLabels, sequence, dataKeyLabel, deleteOutcome, conditionalDelete = false) {
     const searchFieldLabels = searchFields.map((fieldInfo) => fieldInfo.label);
     const componentForLabel = (label) => searchFields.find((fieldInfo) => fieldInfo.label === label)?.component ?? 'input';
     const queryKeyInForm = (label) => formFieldLabels.includes(label);
-    const mk = (actionKind, queryKeyLabel, coverageStatus) => ({
+    // 条件性删除的标题后缀：spec 生成器按此后缀识别删除变体（parseCrudCaseTitle 同步解析）。
+    const deleteTitleSuffix = (variant) => variant === 'draft_success' ? '-草稿' : variant === 'blocked' ? '-在用' : '';
+    const mk = (actionKind, queryKeyLabel, coverageStatus, deleteVariant) => ({
         caseId: nextCaseId(sequence),
         title: actionKind === 'export'
             ? `${moduleName} export`
-            : `${moduleName} ${actionKind}（${queryKeyLabel}）`,
+            : `${moduleName} ${actionKind}（${queryKeyLabel}${deleteTitleSuffix(deleteVariant)}）`,
         generationStrategy: 'glue',
         coverageStatus,
         reviewStatus: 'confirmed',
-        ...buildGlueExecutionFields(actionKind, queryKeyLabel, componentForLabel(queryKeyLabel), queryKeyInForm(queryKeyLabel), searchFieldLabels, dataKeyLabel, deleteOutcome),
+        ...buildGlueExecutionFields(actionKind, queryKeyLabel, componentForLabel(queryKeyLabel), queryKeyInForm(queryKeyLabel), searchFieldLabels, dataKeyLabel, deleteOutcome, deleteVariant),
     });
     // 计划驱动：保证用例条数/顺序与 spec 生成器逐条渲染的 test 一一对应。
     // listbox 键的 read 已由骨架强制断言行锚点命中，不再是 partial。
-    const cases = planCrudCaseStages(searchFields, formFieldLabels).map((stage) => mk(stage.actionKind, stage.queryKeyLabel, 'covered'));
+    const cases = planCrudCaseStages(searchFields, formFieldLabels, conditionalDelete).map((stage) => mk(stage.actionKind, stage.queryKeyLabel, 'covered', stage.deleteVariant));
     cases.push(mk('export', dataKeyLabel ?? searchFieldLabels[0] ?? '不适用', 'covered'));
     return cases;
 }
@@ -738,11 +765,17 @@ export function assembleJson5ContractAndTestcase(input) {
         ?? deleteScopedRules[0];
     const deletePolicy = deleteRule ? 'blocked_by_business_rule' : 'success_delete';
     const blockedDeleteMessage = deleteRule ? readHint(deleteRule) : undefined;
+    // 条件性删除（如"草稿可删、在用不可删"）：规则带 deletableCondition 时，
+    // 每个可写查询主键产出两类删除用例（草稿删除成功 + 在用删除阻断）。
+    const deletableCondition = deleteRule
+        ? deleteRule.deletableCondition
+        : undefined;
+    const conditionalDelete = Boolean(deleteRule) && typeof deletableCondition === 'string' && deletableCondition.trim().length > 0;
     const skeletonSlotsCrud = {
         moduleId: module,
         searchConditions: buildSearchConditionSlots(codeList, listPage, addOrEditPage),
         frames: resolveFrameKeywords(codeList),
-        locators: buildCrudLocators(listPage),
+        locators: buildCrudLocators(listPage, addOrEditPage, conditionalDelete),
         assertions: {
             deletePolicy,
             blockedDeleteMessage,
@@ -791,7 +824,7 @@ export function assembleJson5ContractAndTestcase(input) {
     const cases = buildGlueCases(moduleName, searchFields, formFieldLabels, caseIdSequence, dataKeyLabel, {
         deletePolicy,
         blockedDeleteMessage,
-    });
+    }, conditionalDelete);
     const childGridCases = childGridSlots ? buildChildGridCases(childGridSlots, firstRole, caseIdSequence) : [];
     cases.push(...childGridCases);
     const buttonInferences = inferButtonInteractions(codeList, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@epoint-testtech/ep-stage-skill",
-  "version": "0.0.11",
+  "version": "0.0.13",
   "type": "module",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",