worsoft-frontend-codegen-local-mcp 0.1.88 → 0.1.89

package/assets/templates/master_child_jump/form.tpl

@@ -22,15 +22,11 @@
         </div>
       </template>
       <!-- 主子表表单：按 PRD 表单显隐和顺序渲染字段 -->
-      <el-form ref="dataFormRef" :model="form" :rules="dataRules" :disabled="detail" v-loading="loading">
-        <!-- 主表字段区：字段级注释由 MCP 根据字段名称生成 -->
-        <el-row :gutter="24">
-{{FORM_FIELDS}}
-        </el-row>
-        <!-- 子表明细区：按 children 配置渲染多个子表 -->
-        <el-row :gutter="24">
+      <el-form ref="dataFormRef" :model="form" :rules="dataRules" :disabled="detail" v-loading="loading" label-width="120px">
+        <el-collapse v-model="activeCollapseNames">
+{{FORM_COLLAPSE_SECTIONS}}
 {{CHILD_SECTIONS}}
-        </el-row>
+        </el-collapse>
       </el-form>
     </el-card>
   </div>
@@ -72,6 +68,7 @@ const pageI18nKey = '{{I18N_NAMESPACE}}';
 
 // 表单引用
 const dataFormRef = ref();
+const activeCollapseNames = ref({{ACTIVE_COLLAPSE_NAMES}});
 // 页面加载状态
 const loading = ref(false);
 // 是否详情模式

package/assets/templates/single_table_jump/form.tpl

@@ -22,11 +22,10 @@
         </div>
       </template>
       <!-- 主表表单：按 PRD 表单显隐和顺序渲染字段 -->
-      <el-form ref="dataFormRef" :model="form" :rules="dataRules" :disabled="detail" v-loading="loading">
-        <!-- 主表字段区：字段级注释由 MCP 根据字段名称生成 -->
-        <el-row :gutter="24">
-{{FORM_FIELDS}}
-        </el-row>
+      <el-form ref="dataFormRef" :model="form" :rules="dataRules" :disabled="detail" v-loading="loading" label-width="120px">
+        <el-collapse v-model="activeCollapseNames">
+{{FORM_COLLAPSE_SECTIONS}}
+        </el-collapse>
       </el-form>
     </el-card>
   </div>
@@ -63,6 +62,7 @@ const { closeCurrentPage } = useCloseCurrentPage();
 
 // 表单引用
 const dataFormRef = ref();
+const activeCollapseNames = ref({{ACTIVE_COLLAPSE_NAMES}});
 // 页面加载状态
 const loading = ref(false);
 // 是否详情模式

package/mcp_server.js

@@ -5,7 +5,7 @@ const fs = require('fs');
 const path = require('path');
 
 const SERVER_NAME = 'worsoft-codegen-local';
-const SERVER_VERSION = '0.1.88';
+const SERVER_VERSION = '0.1.89';
 const PROTOCOL_VERSION = '2024-11-05';
 const TOOL_NAME = 'worsoft_codegen_local_generate_frontend';
 const STYLE_CATALOG_PATH = path.join(__dirname, 'assets', 'style-catalog.json');
@@ -1228,13 +1228,19 @@ function readUtf8File(filePath) {
   return stripBom(fs.readFileSync(filePath, 'utf8'));
 }
 
-function normalizeDictType(value) {
-  const normalized = String(value || '').trim();
-  if (!normalized || normalized === '-' || normalized === '/') {
-    return null;
-  }
-  return normalized.replace(/^['"`]+|['"`]+$/g, '');
-}
+function normalizeDictType(value) {
+  const normalized = String(value || '').trim();
+  if (!normalized || normalized === '-' || normalized === '/') {
+    return null;
+  }
+  return normalized.replace(/^['"`]+|['"`]+$/g, '');
+}
+
+function normalizeDictTypeFromSourceLabel(value) {
+  const normalized = normalizeDictType(value);
+  if (!normalized) return null;
+  return /^[a-z][a-z0-9_]*$/.test(normalized) ? normalized : null;
+}
 
 function stripDictAnnotation(label) {
   const text = String(label || '').trim();
@@ -1433,29 +1439,33 @@ function normalizeStructuredField(inputField, index, contextLabel) {
     throw new Error(contextLabel + '[' + index + '] is missing required field: type');
   }
 
-  const { length, scale } = normalizeStructuredLengthAndScale(inputField.length ?? inputField.maxLength, inputField.scale);
-  const explicitFormType = normalizeStructuredFormType(inputField.formType || inputField.componentType);
-  const formType = explicitFormType;
-  const explicitQueryType =
-    inputField.queryType === undefined || inputField.queryType === null || inputField.queryType === ''
-      ? undefined
+  const { length, scale } = normalizeStructuredLengthAndScale(inputField.length ?? inputField.maxLength, inputField.scale);
+  const explicitFormType = normalizeStructuredFormType(inputField.formType || inputField.componentType);
+  const formType = explicitFormType;
+  const dictType = normalizeDictType(inputField.dictType) || normalizeDictTypeFromSourceLabel(inputField.sourceDictLabel);
+  const explicitQueryType =
+    inputField.queryType === undefined || inputField.queryType === null || inputField.queryType === ''
+      ? undefined
       : Number.parseInt(String(inputField.queryType), 10);
   const show = parseBooleanLike(inputField.show, true);
-  const listShow = parseBooleanLike(inputField.listShow, show);
-  const formShow = parseBooleanLike(inputField.formShow, show);
-  const formOrder = parseOptionalOrder(inputField.formOrder, contextLabel + '[' + index + '].formOrder');
-
-  return {
+  const listShow = parseBooleanLike(inputField.listShow, show);
+  const formShow = parseBooleanLike(inputField.formShow, show);
+  const formOrder = parseOptionalOrder(inputField.formOrder, contextLabel + '[' + index + '].formOrder');
+  if (formShow === false && formOrder !== undefined) {
+    throw new Error(`${contextLabel}[${index}].formOrder must be empty when formShow=false`);
+  }
+
+  return {
     fieldName,
     attrName: toCamelCase(fieldName),
     sqlType: type,
     length,
     scale,
     comment: label,
-    label,
-    description: String(inputField.description || '').trim(),
-    formType,
-    dictType: normalizeDictType(inputField.dictType),
+    label,
+    description: String(inputField.description || '').trim(),
+    formType,
+    dictType,
     notNull: parseBooleanLike(inputField.required, false),
     defaultValue: normalizeDefaultValue(inputField.defaultValue),
     readonly: parseBooleanLike(inputField.readonly, false),
@@ -1465,13 +1475,13 @@ function normalizeStructuredField(inputField, index, contextLabel) {
     formOrder,
     width: normalizeOptionWidth(inputField.width),
     smart: parseBooleanLike(inputField.smart, false),
-    queryType: Number.isNaN(explicitQueryType)
-      ? undefined
-      : explicitQueryType !== undefined
-        ? explicitQueryType
-        : normalizeDictType(inputField.dictType) && listShow
-          ? 30
-          : undefined,
+    queryType: Number.isNaN(explicitQueryType)
+      ? undefined
+      : explicitQueryType !== undefined
+        ? explicitQueryType
+        : dictType && listShow
+          ? 30
+          : undefined,
     sourceKind: normalizeStructuredSourceKind(inputField.sourceKind),
     primary: parseBooleanLike(inputField.primary, fieldName === 'id'),
   };
@@ -1714,6 +1724,73 @@ function assertParseResultPayloadConsistency(parseResult, mcpPayload, parseResul
   }
 }
 
+function collectPayloadFieldGroups(mcpPayload) {
+  const groups = [];
+  if (Array.isArray(mcpPayload.fields)) {
+    groups.push({ path: 'mcpPayload.fields', fields: mcpPayload.fields });
+  }
+  if (Array.isArray(mcpPayload.children)) {
+    mcpPayload.children.forEach((child, childIndex) => {
+      if (Array.isArray(child.fields)) {
+        groups.push({ path: `mcpPayload.children[${childIndex}].fields`, fields: child.fields });
+      }
+    });
+  }
+  if (Array.isArray(mcpPayload.levels)) {
+    mcpPayload.levels.forEach((level, levelIndex) => {
+      if (!Array.isArray(level.modules)) return;
+      level.modules.forEach((module, moduleIndex) => {
+        if (Array.isArray(module.fields)) {
+          groups.push({ path: `mcpPayload.levels[${levelIndex}].modules[${moduleIndex}].fields`, fields: module.fields });
+        }
+      });
+    });
+  }
+  return groups;
+}
+
+function normalizeFieldSet(values) {
+  if (!Array.isArray(values)) return new Set();
+  return new Set(
+    values
+      .map((item) => (typeof item === 'string' ? item : item && (item.fieldName || item.name)))
+      .filter(Boolean)
+      .map((item) => String(item).trim())
+  );
+}
+
+function assertVisibilityMatrixConsistency(parseResult, mcpPayload, parseResultPath) {
+  if (!parseResult.visibilityMatrix || typeof parseResult.visibilityMatrix !== 'object') return;
+  const matrixGroups = Array.isArray(parseResult.visibilityMatrix.groups) ? parseResult.visibilityMatrix.groups : [];
+  const fallbackVisibleFields = normalizeFieldSet(parseResult.visibilityMatrix.visibleFormFields);
+  const fallbackHiddenFields = normalizeFieldSet(parseResult.visibilityMatrix.explicitHiddenFormFields || parseResult.visibilityMatrix.hiddenFormFields);
+  if (!matrixGroups.length && !fallbackVisibleFields.size && !fallbackHiddenFields.size) return;
+
+  const issues = [];
+  for (const group of collectPayloadFieldGroups(mcpPayload)) {
+    const matrixGroup = matrixGroups.find((item) => item && item.path === group.path);
+    const visibleFields = matrixGroup ? normalizeFieldSet(matrixGroup.visibleFormFields) : fallbackVisibleFields;
+    const hiddenFields = matrixGroup ? normalizeFieldSet(matrixGroup.explicitHiddenFormFields || matrixGroup.hiddenFormFields) : fallbackHiddenFields;
+    if (!visibleFields.size && !hiddenFields.size) continue;
+
+    for (const field of group.fields) {
+      if (!field || typeof field !== 'object' || !field.fieldName) continue;
+      const fieldName = String(field.fieldName);
+      const expectedFormShow = visibleFields.has(fieldName) && !hiddenFields.has(fieldName);
+      if (Boolean(field.formShow) !== expectedFormShow) {
+        issues.push(`${group.path}.${fieldName}.formShow expected ${expectedFormShow} from visibilityMatrix, got ${field.formShow}`);
+      }
+      if (!expectedFormShow && field.formOrder !== undefined && field.formOrder !== null && field.formOrder !== '') {
+        issues.push(`${group.path}.${fieldName}.formOrder must be empty when visibilityMatrix marks it hidden`);
+      }
+    }
+  }
+
+  if (issues.length) {
+    throw new Error(`parseResult visibilityMatrix conflicts with mcpPayload in ${parseResultPath}: ${issues.join('; ')}`);
+  }
+}
+
 function resolveGenerationInput(input) {
   if (!input.parseResultPath) {
     return { generationInput: input, parseResultPath: '' };
@@ -1744,6 +1821,7 @@ function resolveGenerationInput(input) {
     'moduleName',
   ]);
   assertParseResultPayloadConsistency(parseResult, generationInput, parsed.path);
+  assertVisibilityMatrixConsistency(parseResult, generationInput, parsed.path);
 
   for (const key of ['frontendPath', 'moduleName', 'writeToDisk', 'overwrite', 'writeSupportFiles', 'mergeI18nZh']) {
     if (Object.prototype.hasOwnProperty.call(input, key)) {
@@ -2344,23 +2422,24 @@ function renderChildSection(childModel, childCount) {
   const deleteExpression = `deleteChild(obj, '${childModel.pk.attrName}')`;
 
   return [
-    '          <el-col :span="24" class="mb20">',
-    `            <!-- 子表区域：${sanitizeHtmlComment(childModel.comment || childModel.tableName)} -->`,
-    '            <div class="mb10" style="display:flex;justify-content:space-between;align-items:center;">',
-    `              <span style="font-weight: 600;">{{ childSectionTitle('${childModel.listName}') }}</span>`,
-    '              <div style="display:flex;align-items:center;gap:8px;">',
+    `        <el-collapse-item :title="childSectionTitle('${childModel.listName}')" name="child-${childModel.listName}">`,
+    '          <el-row :gutter="24">',
+    '            <el-col :span="24" class="mb20">',
+    `              <!-- 子表区域：${sanitizeHtmlComment(childModel.comment || childModel.tableName)} -->`,
+    '              <div class="mb10" style="display:flex;justify-content:flex-end;align-items:center;gap:8px;">',
     `                <el-button icon="Plus" type="primary" :disabled="detail" @click="handleAddChild('${childModel.listName}')">{{ t('common.addBtn') }}</el-button>`,
     `                <el-button icon="Delete" type="danger" plain :disabled="detail || !getSelectedChildRows('${childModel.listName}').length" @click="handleDeleteSelectedChild('${childModel.listName}', '${childModel.pk.attrName}')">{{ t('common.delBtn') }}</el-button>`,
     '              </div>',
-    '            </div>',
-    '            <!-- 子表编辑表格：新增/删除按钮外置，表格内部隐藏新增、删除和序号控制列 -->',
-    `            <sc-form-table :ref="(el) => setChildTableRef('${childModel.listName}', el)" v-model="form.${childModel.listName}" :addTemplate="childTemp${childModel.className}" hide-index hide-add hide-delete @delete="(obj) => ${deleteExpression}" :placeholder="t('common.noData')" @selection-change="(rows) => handleChildSelectionChange('${childModel.listName}', rows)">`,
-    '            <el-table-column type="selection" width="55" :selectable="() => !detail" />',
+    '              <!-- 子表编辑表格：新增/删除按钮外置，表格内部隐藏新增、删除和序号控制列 -->',
+    `              <sc-form-table :ref="(el) => setChildTableRef('${childModel.listName}', el)" v-model="form.${childModel.listName}" :addTemplate="childTemp${childModel.className}" hide-index hide-add hide-delete @delete="(obj) => ${deleteExpression}" :placeholder="t('common.noData')" @selection-change="(rows) => handleChildSelectionChange('${childModel.listName}', rows)">`,
+    '              <el-table-column type="selection" width="55" :selectable="() => !detail" />',
     childModel.visibleFields.map((field) => renderChildTableColumn(field, childModel.listName)).join('\n'),
-    '            </sc-form-table>',
-    '          </el-col>',
-  ].join('\n');
-}
+    '              </sc-form-table>',
+    '            </el-col>',
+    '          </el-row>',
+    '        </el-collapse-item>',
+  ].join('\n');
+}
 
 function renderChildFormListDefaults(children) {
   if (!children.length) return '';
@@ -2485,7 +2564,7 @@ function renderFieldCommentV2(field, indent = '          ') {
   return indent + '<!-- ' + label + ' -->';
 }
 
-function renderFormFieldV2(field) {
+function renderFormFieldV2(field) {
   const prop = field.attrName;
   const labelExpr = `getMasterFieldLabel('${prop}')`;
   const dictExpr = `getMasterFieldMeta('${prop}')?.dictType`;
@@ -2584,10 +2663,58 @@ function renderFormFieldV2(field) {
     `              <el-input v-model="form.${prop}" :placeholder="formInputPlaceholder(${labelExpr}, ${disabledBool})"${maxlengthAttr}${disabledAttr} />`,
     '            </el-form-item>',
     '          </el-col>',
-  ].join('\n');
-}
-
-function renderMultiLevelOptionField(field, model, moduleModel, dictRegistryRefs, indent = '      ') {
+  ].join('\n');
+}
+
+const FILL_REPORT_FIELD_NAMES = new Set(['createBy', 'createTime', 'finishedTime']);
+const FILL_REPORT_FIELD_ORDER = ['createBy', 'createTime', 'finishedTime'];
+
+function isFillReportField(field) {
+  return FILL_REPORT_FIELD_NAMES.has(String(field?.attrName || field?.fieldName || ''));
+}
+
+function renderBusinessFormCollapseItem(title, name, fields) {
+  return [
+    `        <el-collapse-item title="${title}" name="${name}">`,
+    '          <el-row :gutter="24">',
+    fields.map(renderFormFieldV2).join('\n'),
+    '          </el-row>',
+    '        </el-collapse-item>',
+  ].join('\n');
+}
+
+function splitBusinessFormFields(fields) {
+  const fillReportFields = fields
+    .filter(isFillReportField)
+    .sort((left, right) => FILL_REPORT_FIELD_ORDER.indexOf(left.attrName) - FILL_REPORT_FIELD_ORDER.indexOf(right.attrName));
+  if (!fillReportFields.length) {
+    return { basicFields: fields, fillReportFields: [] };
+  }
+  return {
+    basicFields: fields.filter((field) => !isFillReportField(field)),
+    fillReportFields,
+  };
+}
+
+function renderBusinessFormCollapseSections(model) {
+  const fields = model.pageType === 'ledger' ? model.visibleFields.map(asReadonlyField) : model.visibleFields;
+  const { basicFields, fillReportFields } = splitBusinessFormFields(fields);
+  const sections = [renderBusinessFormCollapseItem('基本信息', '0', basicFields)];
+  if (fillReportFields.length) {
+    sections.push(renderBusinessFormCollapseItem('填报信息', '1', fillReportFields));
+  }
+  return sections.join('\n');
+}
+
+function renderActiveCollapseNames(model) {
+  const fields = model.pageType === 'ledger' ? model.visibleFields.map(asReadonlyField) : model.visibleFields;
+  const names = ['0'];
+  if (fields.some(isFillReportField)) names.push('1');
+  model.children.forEach((childModel) => names.push(`child-${childModel.listName}`));
+  return `[${names.map((name) => `'${name}'`).join(', ')}]`;
+}
+
+function renderMultiLevelOptionField(field, model, moduleModel, dictRegistryRefs, indent = '      ') {
   const parts = [
     `key: '${field.attrName}'`,
     `labelKey: '${buildMultiLevelFieldLabelKey(model, moduleModel, field)}'`,
@@ -4250,10 +4377,12 @@ function buildReplacements(model, sharedSupport) {
       BUSINESS_FORM_KEEP_ALIVE_COLUMN: model.pageType === 'business' ? ', keep_alive' : '',
       BUSINESS_FORM_KEEP_ALIVE_VALUE: model.pageType === 'business' ? ", '1'" : '',
       BILL_CODE: deriveBillCode(model),
-      GENERATED_AT: new Date().toISOString(),
-      FORM_FIELDS: (model.pageType === 'ledger' ? model.visibleFields.map(asReadonlyField) : model.visibleFields).map(renderFormFieldV2).join('\n'),
-      TABLE_COLUMNS: model.gridFields.map((field) => renderTableColumn(field, dictRegistryRefs)).join('\n'),
-      FORM_DEFAULTS: renderFormDefaults(model),
+      GENERATED_AT: new Date().toISOString(),
+      FORM_FIELDS: (model.pageType === 'ledger' ? model.visibleFields.map(asReadonlyField) : model.visibleFields).map(renderFormFieldV2).join('\n'),
+      FORM_COLLAPSE_SECTIONS: renderBusinessFormCollapseSections(model),
+      ACTIVE_COLLAPSE_NAMES: renderActiveCollapseNames(model),
+      TABLE_COLUMNS: model.gridFields.map((field) => renderTableColumn(field, dictRegistryRefs)).join('\n'),
+      FORM_DEFAULTS: renderFormDefaults(model),
       DICT_REGISTRY_IMPORT_BLOCK: model.dictTypes.length ? "import { DictRegistry } from '/@/enums/dict-registry';" : '',
       MASTER_OPTION_FIELDS: model.optionFields.map((field) => renderOptionFieldV2(field, buildFieldLabelKey(model, field), dictRegistryRefs)).join('\n'),
       CHILD_OPTION_GROUPS: model.children.map((childModel) => renderChildOptionGroupV2(model, childModel, dictRegistryRefs)).join('\n'),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "worsoft-frontend-codegen-local-mcp",
-  "version": "0.1.88",
+  "version": "0.1.89",
   "description": "Worsoft frontend local-template code generation MCP server.",
   "license": "UNLICENSED",
   "author": "worsoft <sw@worsoft.vip>",