worsoft-frontend-codegen-local-mcp 0.1.59 → 0.1.62

package/assets/templates/master_child_jump/index.tpl

@@ -1,3 +1,4 @@
+<!-- 功能名称：{{FEATURE_TITLE}} -->
 <template>
   <div class="layout-padding">
     <div class="layout-padding-auto layout-padding-view flex h-full flex-col">

package/assets/templates/single_table_dialog/index.tpl

@@ -1,3 +1,4 @@
+<!-- 功能名称：{{FEATURE_TITLE}} -->
 <template>
   <div class="layout-padding">
     <div class="layout-padding-auto layout-padding-view flex h-full flex-col">

package/assets/templates/single_table_jump/index.tpl

@@ -1,3 +1,4 @@
+<!-- 功能名称：{{FEATURE_TITLE}} -->
 <template>
   <div class="layout-padding">
     <div class="layout-padding-auto layout-padding-view flex h-full flex-col">

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.59';
+const SERVER_VERSION = '0.1.62';
 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');
@@ -178,6 +178,7 @@ const TOOL_SCHEMA = {
                   show: { type: ['boolean', 'string'], description: 'Whether the field is shown on the page.' },
                   listShow: { type: ['boolean', 'string'], description: 'Whether the field is shown on the list page.' },
                   formShow: { type: ['boolean', 'string'], description: 'Whether the field is shown on the form page.' },
+                  formOrder: { type: ['number', 'string'], description: 'Generation-only form field order from PRD detail/form table. This is not emitted to options.ts.' },
                   smart: { type: ['boolean', 'string'], description: 'Whether the field participates in smart keyword search. This must come from PRD, not inferred from type.' },
           queryType: { type: ['string', 'number'], description: 'Structured query type for list filtering, for example 20 for date ranges or 30 for dictionary filters.' },
           dictType: { type: 'string', description: 'Dictionary type code from structured metadata.' },
@@ -220,6 +221,7 @@ const TOOL_SCHEMA = {
                         show: { type: ['boolean', 'string'], description: 'Whether the field is shown on the page.' },
                         listShow: { type: ['boolean', 'string'], description: 'Whether the field is shown on the list page.' },
                         formShow: { type: ['boolean', 'string'], description: 'Whether the field is shown on the form page.' },
+                        formOrder: { type: ['number', 'string'], description: 'Generation-only form field order from PRD detail/form table. This is not emitted to options.ts.' },
                         smart: { type: ['boolean', 'string'], description: 'Whether the field participates in smart keyword search. This must come from PRD, not inferred from type.' },
                 queryType: { type: ['string', 'number'], description: 'Structured query type for list filtering, for example 20 for date ranges or 30 for dictionary filters.' },
                 dictType: { type: 'string', description: 'Dictionary type code from structured metadata.' },
@@ -278,6 +280,7 @@ const TOOL_SCHEMA = {
                               show: { type: ['boolean', 'string'], description: 'Whether the field is shown on the page.' },
                               listShow: { type: ['boolean', 'string'], description: 'Whether the field is shown on the list page.' },
                               formShow: { type: ['boolean', 'string'], description: 'Whether the field is shown on the form page.' },
+                              formOrder: { type: ['number', 'string'], description: 'Generation-only form field order from PRD detail/form table. This is not emitted to options.ts.' },
                               smart: { type: ['boolean', 'string'], description: 'Whether the field participates in smart keyword search. This must come from PRD, not inferred from type.' },
                       queryType: { type: ['string', 'number'], description: 'Structured query type for list filtering, for example 20 for date ranges or 30 for dictionary filters.' },
                       dictType: { type: 'string', description: 'Dictionary type code from structured metadata.' },
@@ -1139,16 +1142,50 @@ function normalizeStructuredSqlType(value) {
   if (['LOCALDATETIME', 'DATETIME', 'TIMESTAMP'].includes(upper) || ['\u65e5\u671f\u65f6\u95f4', '\u65f6\u95f4\u6233'].includes(normalized)) return 'DATETIME';
   return upper;
 }
-function normalizeStructuredLengthAndScale(lengthValue, scaleValue) {
-  const parsed = splitLength(lengthValue);
-  const normalizedScale = scaleValue === undefined || scaleValue === null || scaleValue === '' ? parsed.scale : String(scaleValue).trim();
-  return {
-    length: parsed.length,
-    scale: normalizedScale || '',
-  };
-}
-
-function normalizeStructuredField(inputField, index, contextLabel) {
+function normalizeStructuredLengthAndScale(lengthValue, scaleValue) {
+  const parsed = splitLength(lengthValue);
+  const normalizedScale = scaleValue === undefined || scaleValue === null || scaleValue === '' ? parsed.scale : String(scaleValue).trim();
+  return {
+    length: parsed.length,
+    scale: normalizedScale || '',
+  };
+}
+
+function parseOptionalOrder(value, label) {
+  if (value === undefined || value === null || value === '') return undefined;
+  const order = Number.parseInt(String(value), 10);
+  if (Number.isNaN(order) || order < 0) {
+    throw new Error(`${label} must be a non-negative integer when provided`);
+  }
+  return order;
+}
+
+function sortFieldsForForm(fields) {
+  const seenOrders = new Map();
+  fields.forEach((field) => {
+    if (field.formOrder === undefined) return;
+    const existing = seenOrders.get(field.formOrder);
+    if (existing) {
+      throw new Error(`Duplicate formOrder ${field.formOrder} on fields ${existing} and ${field.fieldName}`);
+    }
+    seenOrders.set(field.formOrder, field.fieldName);
+  });
+  return fields
+    .map((field, index) => ({ field, index }))
+    .sort((left, right) => {
+      const leftOrder = left.field.formOrder;
+      const rightOrder = right.field.formOrder;
+      if (leftOrder !== undefined && rightOrder !== undefined && leftOrder !== rightOrder) {
+        return leftOrder - rightOrder;
+      }
+      if (leftOrder !== undefined && rightOrder === undefined) return -1;
+      if (leftOrder === undefined && rightOrder !== undefined) return 1;
+      return left.index - right.index;
+    })
+    .map((item) => item.field);
+}
+
+function normalizeStructuredField(inputField, index, contextLabel) {
   if (!inputField || typeof inputField !== 'object') {
     throw new Error(contextLabel + '[' + index + '] must be an object');
   }
@@ -1177,6 +1214,7 @@ function normalizeStructuredField(inputField, index, contextLabel) {
   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 {
     fieldName,
@@ -1195,6 +1233,7 @@ function normalizeStructuredField(inputField, index, contextLabel) {
     show,
     listShow,
     formShow,
+    formOrder,
     smart: parseBooleanLike(inputField.smart, false),
     queryType: Number.isNaN(explicitQueryType)
       ? undefined
@@ -1450,7 +1489,7 @@ function normalizeExtraApis(inputExtraApis, currentTargetApiModule) {
     if (!['get', 'post', 'put', 'delete'].includes(method)) {
       throw new Error('extraApis[' + index + '].method must be one of get, post, put, delete');
     }
-    const url = String(item.url || '').trim();
+    const url = normalizeExtraApiUrl(String(item.url || '').trim(), currentTargetApiModule);
     if (!url) {
       throw new Error('extraApis[' + index + '].url is required');
     }
@@ -1474,7 +1513,7 @@ function normalizeExtraApis(inputExtraApis, currentTargetApiModule) {
     return {
       functionName,
       description,
-      url: url.startsWith('/') ? url : '/' + url,
+      url,
       method,
       requestType,
       targetApiModule,
@@ -1484,6 +1523,17 @@ function normalizeExtraApis(inputExtraApis, currentTargetApiModule) {
   });
 }
 
+function normalizeExtraApiUrl(rawUrl, currentTargetApiModule) {
+  if (!rawUrl) return '';
+  if (/^https?:\/\//i.test(rawUrl)) return rawUrl;
+  let url = rawUrl.startsWith('/') ? rawUrl : '/' + rawUrl;
+  const moduleRoot = String(currentTargetApiModule || '').split('/')[0] || '';
+  if (moduleRoot && !url.startsWith('/' + moduleRoot + '/')) {
+    url = '/' + moduleRoot + url;
+  }
+  return url;
+}
+
 function ensureFieldExists(fields, fieldName, tableName, role) {
   const field = fields.find((item) => item.fieldName === fieldName);
   if (!field) throw new Error(role + ' field "' + fieldName + '" was not found on table ' + tableName);
@@ -1508,7 +1558,7 @@ function buildMultiLevelModule(moduleInput, levelIndex) {
     ? ensureFieldExists(fields, moduleInput.primaryKey, moduleInput.tableName, 'Primary key')
     : findPrimaryKeyFromStructuredFields(fields);
   const optionFields = fields.filter((field) => field.fieldName !== normalizedPk.fieldName && !field.isAudit);
-  const visibleFields = optionFields.filter((field) => field.formShow !== false);
+  const visibleFields = sortFieldsForForm(optionFields.filter((field) => field.formShow !== false));
   const listFields = optionFields.filter((field) => field.listShow !== false);
   const statusField = detectStatusField(fields, moduleInput.statusField);
   const apiPath = moduleInput.apiPath || toCamelCase(moduleInput.tableName);
@@ -1631,7 +1681,7 @@ function buildChildModels(safeArgs, mainFields, mainPk) {
     const childOptionFields = childFields.filter(
       (field) => field.fieldName !== childPk.fieldName && !field.isAudit && field.fieldName !== relation.childField
     );
-    const childVisibleFields = childOptionFields.filter((field) => field.formShow !== false);
+    const childVisibleFields = sortFieldsForForm(childOptionFields.filter((field) => field.formShow !== false));
     const payloadField = relation.payloadField;
     const listName = payloadField;
 
@@ -1664,7 +1714,7 @@ function buildModel(safeArgs) {
     fields: safeArgs.fields,
   });
   const optionFields = fields.filter((field) => field.fieldName !== pkField.fieldName && !field.isAudit);
-  const visibleFields = optionFields.filter((field) => field.formShow !== false);
+  const visibleFields = sortFieldsForForm(optionFields.filter((field) => field.formShow !== false));
   const listFields = optionFields.filter((field) => field.listShow !== false);
   const gridFields = listFields.slice(0, 8);
   const statusField = detectStatusField(fields, safeArgs.statusField);
@@ -2405,7 +2455,7 @@ function renderMultiLevelFormVue(model, moduleModel) {
     `  tenantId: Session.getTenant(),`,
   ].join('\n');
   const rules = renderFormRulesV2(moduleModel.visibleFields);
-  return `<template>
+  return `<template>
   <el-dialog v-model="visible" :title="form.${moduleModel.pk.attrName} ? t('common.editBtn') : t('common.addBtn')" :close-on-click-modal="false" draggable>
     <el-form ref="dataFormRef" :model="form" :rules="dataRules" label-width="100px" v-loading="loading">
       <el-row :gutter="24">
@@ -2666,10 +2716,10 @@ function renderMultiLevelIndexVue(model) {
     )
     .join('\n');
 
-  return `<template>
-  <div class="layout-padding">
-    <!-- \u529f\u80fd\u540d\u79f0\uFF1A${model.featureTitle.replace(/--/g, '')} -->
-    <div class="multi-level-dict-layout">
+  return `<!-- 功能名称：${sanitizeHtmlComment(model.featureTitle)} -->
+<template>
+  <div class="layout-padding">
+    <div class="multi-level-dict-layout">
       <div class="multi-level-left">
 ${renderMultiLevelSchemaListSlot('level1Config', 'activeLevel1Key', 'activeLevel1Module')}
       </div>
@@ -3057,6 +3107,10 @@ function sanitizeComment(value) {
   return String(value || '').replace(/\*\//g, '* /').replace(/\r?\n/g, ' ').trim();
 }
 
+function sanitizeHtmlComment(value) {
+  return String(value || '').replace(/--/g, '').replace(/\r?\n/g, ' ').trim();
+}
+
 function renderExtraApiFunctions(model) {
   if (!Array.isArray(model.extraApis) || !model.extraApis.length) return '';
   return model.extraApis

package/package.json

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