diff --git a/RuoYi-Vue/easycode-web/src/components/FrontendPageDesigner.vue b/RuoYi-Vue/easycode-web/src/components/FrontendPageDesigner.vue
new file mode 100644
index 0000000..b340d85
--- /dev/null
+++ b/RuoYi-Vue/easycode-web/src/components/FrontendPageDesigner.vue
@@ -0,0 +1,2589 @@
+<template>
+  <section class="page-designer">
+    <header v-if="showHeader" class="panel-header database-header designer-head">
+      <div>
+        <h2 class="panel-title">{{ designerCopy.title }}</h2>
+        <p class="muted designer-desc">{{ designerCopy.description }}</p>
+      </div>
+      <div class="head-actions">
+        <el-button :loading="initializing" @click="$emit('init-designs')">{{ designerCopy.initButtonLabel }}</el-button>
+        <el-button type="primary" :disabled="!draft" :loading="saving" @click="saveCurrent">保存设计</el-button>
+      </div>
+    </header>
+
+    <div class="page-designer-body">
+      <el-empty
+        v-if="!designs.length"
+        class="designer-empty"
+        :description="designerCopy.emptyDescription"
+        :image-size="96"
+      >
+        <el-button type="primary" :loading="initializing" @click="$emit('init-designs')">{{ designerCopy.initButtonLabel }}</el-button>
+      </el-empty>
+
+      <div v-else class="designer-shell">
+        <div class="designer-grid">
+          <aside class="material-pane">
+            <div class="add-content-materials">
+              <div class="matrix-head">
+                <strong>添加内容</strong>
+                <small>页面、字段、按钮和业务块</small>
+              </div>
+              <div class="quick-actions">
+                <button type="button" @click="addPageDesign('primary')">新增一级菜单</button>
+                <button type="button" @click="addPageDesign('secondary')">新增二级页面</button>
+                <button type="button" @click="selectMenuConfig">配置菜单</button>
+              </div>
+            </div>
+
+            <div v-if="visibleAssociatedPages.length" class="associated-page-materials">
+              <div class="matrix-head">
+                <strong>关联页面</strong>
+                <small>不展示在最终菜单</small>
+              </div>
+              <div class="associated-page-list">
+                <button
+                  v-for="design in visibleAssociatedPages"
+                  :key="`associated-${design.designId || design.pageCode}`"
+                  type="button"
+                  :class="{ active: designKey(design) === selectedKey }"
+                  @click="selectAssociatedPage(design)"
+                >
+                  <span>{{ design.pageName || design.pageCode }}</span>
+                  <small>{{ design.routePath || '-' }}</small>
+                </button>
+              </div>
+            </div>
+
+            <div v-if="!isBusinessBlockLayout" class="material-section region-materials">
+              <div class="matrix-head">
+                <strong>页面结构</strong>
+                <small>恢复布局区域</small>
+              </div>
+              <div class="palette-list">
+                <button
+                  v-for="item in hiddenRegions"
+                  :key="`region-material-${item.id}`"
+                  type="button"
+                  @click="setRegionVisible(item.id, true)"
+                >
+                  {{ item.label }}
+                </button>
+                <span v-if="!hiddenRegions.length" class="material-empty">布局区域已显示</span>
+              </div>
+            </div>
+
+            <div v-if="!isBusinessBlockLayout" class="material-section field-materials">
+              <div class="matrix-head">
+                <strong>字段池</strong>
+                <small>拖入布局区域</small>
+              </div>
+              <div class="palette-list">
+                <button
+                  v-for="column in currentColumns"
+                  :key="`palette-${fieldKey(column)}`"
+                  type="button"
+                  draggable="true"
+                  @dragstart="startPaletteField(fieldKey(column))"
+                >
+                  {{ column.columnComment || column.javaField || column.columnName }}
+                </button>
+              </div>
+            </div>
+
+            <div v-if="!isBusinessBlockLayout" class="material-section action-materials">
+              <div class="matrix-head">
+                <strong>按钮池</strong>
+                <small>拖入按钮区域</small>
+              </div>
+              <div class="palette-list action-palette">
+                <button
+                  v-for="action in actionPalette"
+                  :key="`action-palette-${action.code}`"
+                  type="button"
+                  draggable="true"
+                  @dragstart="startPaletteAction(action.code)"
+                >
+                  {{ action.label }}
+                </button>
+              </div>
+            </div>
+
+            <div v-if="!isBusinessBlockLayout && embeddedBlockDefinitions.length" class="material-section embedded-business-materials">
+              <div class="matrix-head">
+                <strong>业务块</strong>
+                <small>拖入页面区域</small>
+              </div>
+              <BlockPalette
+                :definitions="embeddedBlockDefinitions"
+                @add-block="addEmbeddedBusinessBlock($event, 'top')"
+                @drag-block="startBusinessBlockDrag"
+              />
+            </div>
+
+            <div v-if="isBusinessBlockLayout" class="material-section business-materials">
+              <div class="matrix-head">
+                <strong>业务块</strong>
+                <small>点击加入页面</small>
+              </div>
+              <BlockPalette :definitions="blockDefinitions" @add-block="addBusinessBlock" @drag-block="startBusinessBlockDrag" />
+            </div>
+          </aside>
+
+        <main class="canvas">
+          <header
+            class="canvas-page-menu"
+            :class="{ active: selectedConfigType === 'menu' }"
+            @click="selectMenuConfig"
+          >
+            <div class="canvas-menu-brand">
+              <span>{{ activeMode() === 'admin' ? 'ADM' : 'APP' }}</span>
+              <strong>{{ activeMode() === 'admin' ? '后台管理' : '前台门户' }}</strong>
+            </div>
+            <nav class="canvas-page-menu-bar" aria-label="画布页面菜单">
+              <div
+                v-for="group in pageMenuGroups"
+                :key="group.key"
+                class="canvas-menu-group"
+                :class="{ open: isMenuGroupOpen(group), active: isMenuGroupActive(group), 'has-children': group.children.length }"
+              >
+                <button type="button" class="canvas-menu-parent" @click.stop="selectMenuGroup(group)">
+                  {{ group.label }}
+                </button>
+                <button
+                  v-if="group.children.length"
+                  type="button"
+                  class="canvas-menu-toggle"
+                  :aria-expanded="isMenuGroupOpen(group)"
+                  @click.stop="toggleMenuGroup(group.key)"
+                >
+                  <el-icon><ArrowDown /></el-icon>
+                </button>
+                <div v-if="group.children.length" class="canvas-menu-dropdown">
+                  <button
+                    v-for="child in group.children"
+                    :key="child.designId || child.pageCode"
+                    type="button"
+                    class="canvas-menu-child"
+                    :class="{ active: designKey(child) === selectedKey }"
+                    @click.stop="selectMenuPage(child)"
+                  >
+                    <span>{{ child.pageName || child.pageCode }}</span>
+                    <small>{{ child.routePath || '-' }}</small>
+                  </button>
+                </div>
+              </div>
+              <span v-if="!pageMenuGroups.length" class="canvas-menu-empty">暂无菜单页面</span>
+            </nav>
+          </header>
+
+          <div class="layout-preview-head">
+            <div>
+              <strong>{{ currentLayoutOption.label }}</strong>
+              <span>{{ currentLayoutOption.description }}</span>
+            </div>
+            <el-tag size="small" effect="plain">{{ pageTypeLabel }}</el-tag>
+          </div>
+
+          <BusinessBlockDesigner
+            v-if="isBusinessBlockLayout"
+            ref="businessBlockDesignerRef"
+            :layout-json="layoutJson"
+            :block-definitions="blockDefinitions"
+            :tables="tables"
+            :show-config="false"
+            :show-palette="false"
+            @select-block="handleBusinessBlockSelect"
+            @update:layout-json="applyBusinessBlockLayoutJson"
+          />
+
+          <template v-else>
+          <section
+            class="canvas-band embedded-block-band"
+            @dragover.prevent
+            @drop="dropEmbeddedBusinessBlock('top')"
+          >
+            <div class="band-title">
+              <span>顶部业务块</span>
+              <small>{{ embeddedBusinessBlocks('top').length }} 个</small>
+            </div>
+            <div class="embedded-block-list drop-zone" :class="{ empty: !embeddedBusinessBlocks('top').length }">
+              <button
+                v-for="(block, index) in embeddedBusinessBlocks('top')"
+                :key="`top-embedded-${block.id || index}`"
+                type="button"
+                class="embedded-block-chip"
+                :class="{ active: selectedBusinessBlock?.id === block.id }"
+                draggable="true"
+                @click="selectEmbeddedBusinessBlock(block, 'top')"
+                @dragstart="startEmbeddedBlockInstanceDrag('top', index)"
+                @dragover.prevent
+                @drop.stop="dropEmbeddedBusinessBlock('top', index)"
+              >
+                <span>{{ embeddedBlockLabel(block) }}</span>
+                <span
+                  class="chip-remove"
+                  role="button"
+                  tabindex="-1"
+                  title="删除业务块"
+                  @click.stop="removeEmbeddedBusinessBlock('top', index)"
+                  @mousedown.stop
+                >
+                  <el-icon><Close /></el-icon>
+                </span>
+              </button>
+              <span v-if="!embeddedBusinessBlocks('top').length" class="drop-hint">拖入公告、轮播等可嵌入业务块</span>
+            </div>
+          </section>
+
+          <section
+            v-if="regionVisible('query')"
+            class="canvas-band query-band"
+            @dragover.prevent
+            @drop="dropPaletteField('query')"
+          >
+            <div class="band-title">
+              <span>查询区</span>
+              <div class="band-tools">
+                <small>{{ regionFields('query').length }} 字段</small>
+                <el-button size="small" text type="danger" @click="setRegionVisible('query', false)">删除区域</el-button>
+              </div>
+            </div>
+            <div class="chip-row drop-zone" :class="{ empty: !regionFields('query').length }">
+              <button
+                v-for="(field, index) in regionFields('query')"
+                :key="`query-${field}`"
+                type="button"
+                class="field-chip"
+                draggable="true"
+                @dragstart="startRegionFieldDrag('query', index)"
+                @dragover.prevent
+                @drop.stop="dropPaletteField('query', index)"
+              >
+                <span>{{ fieldLabel(field) }}</span>
+                <span
+                  class="chip-remove"
+                  role="button"
+                  tabindex="-1"
+                  title="删除字段"
+                  @click.stop="removeRegionField('query', index)"
+                  @mousedown.stop
+                >
+                  <el-icon><Close /></el-icon>
+                </span>
+              </button>
+              <span v-if="!regionFields('query').length" class="drop-hint">把字段拖到这里生成查询条件</span>
+            </div>
+          </section>
+
+          <section
+            v-if="regionVisible('toolbar')"
+            class="canvas-band toolbar-band"
+            @dragover.prevent
+            @drop="dropAction('toolbar')"
+          >
+            <div class="band-title">
+              <span>工具栏按钮</span>
+              <div class="band-tools">
+                <small>{{ toolbarActions.length }} 按钮</small>
+                <el-button size="small" text type="danger" @click="setRegionVisible('toolbar', false)">删除区域</el-button>
+              </div>
+            </div>
+            <div class="action-row drop-zone" :class="{ empty: !toolbarActions.length }">
+              <button
+                v-for="(code, index) in toolbarActions"
+                :key="`toolbar-${code}`"
+                type="button"
+                class="action-chip"
+                draggable="true"
+                @dragstart="startRegionActionDrag('toolbar', index)"
+                @dragover.prevent
+                @drop.stop="dropAction('toolbar', index)"
+              >
+                <span>{{ actionLabel(code) }}</span>
+                <span
+                  class="chip-remove"
+                  role="button"
+                  tabindex="-1"
+                  title="删除按钮"
+                  @click.stop="removeAction('toolbar', index)"
+                  @mousedown.stop
+                >
+                  <el-icon><Close /></el-icon>
+                </span>
+              </button>
+              <span v-if="!toolbarActions.length" class="drop-hint">把按钮拖到这里生成顶部操作</span>
+            </div>
+          </section>
+
+          <section class="canvas-band table-band" :class="layoutPreviewClass">
+            <div class="band-title">
+              <span>{{ isCardLayout ? '卡片布局' : '列表布局' }}</span>
+              <small>{{ activeMainFields.length }} 字段</small>
+            </div>
+
+            <div
+              v-if="isCardLayout"
+              class="card-canvas"
+              @dragover.prevent
+              @drop="dropPaletteField('card')"
+            >
+              <article v-for="index in 3" :key="`card-preview-${index}`" class="card-preview-item">
+                <div
+                  v-if="cardImageField"
+                  class="card-image-slot"
+                  draggable="true"
+                  @dragstart="startCardSpecialFieldDrag('imageField')"
+                  @dragover.prevent
+                  @drop.stop="dropCardSpecialField('imageField')"
+                >
+                  {{ fieldLabel(cardImageField) }}
+                </div>
+                <div
+                  v-else
+                  class="card-image-slot empty"
+                  @dragover.prevent
+                  @drop.stop="dropCardSpecialField('imageField')"
+                >
+                  拖入图片字段
+                </div>
+                <strong
+                  class="card-title-slot"
+                  draggable="true"
+                  @dragstart="startCardSpecialFieldDrag('titleField')"
+                  @dragover.prevent
+                  @drop.stop="dropCardSpecialField('titleField')"
+                >
+                  {{ fieldLabel(cardTitleField) || '拖入主标题字段' }}
+                </strong>
+                <div class="card-field-list drop-zone" :class="{ empty: !cardFields.length }">
+                  <span
+                    v-for="(field, fieldIndex) in cardFields"
+                    :key="`card-${index}-${field}`"
+                    class="card-field-chip"
+                    draggable="true"
+                    @dragstart="startRegionFieldDrag('card', fieldIndex)"
+                    @dragover.prevent
+                    @drop.stop="dropPaletteField('card', fieldIndex)"
+                  >
+                    <span>{{ fieldLabel(field) }}</span>
+                    <span
+                      class="chip-remove"
+                      role="button"
+                      tabindex="-1"
+                      title="删除字段"
+                      @click.stop="removeRegionField('card', fieldIndex)"
+                      @mousedown.stop
+                    >
+                      <el-icon><Close /></el-icon>
+                    </span>
+                  </span>
+                  <em v-if="!cardFields.length">拖入卡片展示字段</em>
+                </div>
+                <div
+                  class="card-actions drop-zone"
+                  :class="{ empty: !cardActions.length }"
+                  @dragover.prevent
+                  @drop.stop="dropAction('cardActions')"
+                >
+                  <button
+                    v-for="(code, actionIndex) in cardActions"
+                    :key="`card-action-${index}-${code}`"
+                    type="button"
+                    draggable="true"
+                    @dragstart="startRegionActionDrag('cardActions', actionIndex)"
+                    @dragover.prevent
+                    @drop.stop="dropAction('cardActions', actionIndex)"
+                  >
+                    <span>{{ actionLabel(code) }}</span>
+                    <span
+                      class="chip-remove"
+                      role="button"
+                      tabindex="-1"
+                      title="删除按钮"
+                      @click.stop="removeAction('cardActions', actionIndex)"
+                      @mousedown.stop
+                    >
+                      <el-icon><Close /></el-icon>
+                    </span>
+                  </button>
+                  <em v-if="!cardActions.length">拖入卡片按钮</em>
+                </div>
+              </article>
+            </div>
+
+            <div v-else-if="isSplitLayout" class="split-preview">
+              <div
+                class="split-sidebar drop-zone"
+                @dragover.prevent
+                @drop="dropPaletteField('query')"
+              >
+                <span v-for="field in regionFields('query').slice(0, 4)" :key="`split-${field}`">{{ fieldLabel(field) }}</span>
+                <em v-if="!regionFields('query').length">拖入左侧筛选字段</em>
+              </div>
+              <div
+                class="table-preview drop-zone"
+                @dragover.prevent
+                @drop="dropPaletteField('table')"
+              >
+                <span
+                  v-for="(field, index) in regionFields('table')"
+                  :key="`table-${field}`"
+                  draggable="true"
+                  @dragstart="startRegionFieldDrag('table', index)"
+                  @dragover.prevent
+                  @drop.stop="dropPaletteField('table', index)"
+                >
+                  <span>{{ fieldLabel(field) }}</span>
+                  <span
+                    class="chip-remove"
+                    role="button"
+                    tabindex="-1"
+                    title="删除字段"
+                    @click.stop="removeRegionField('table', index)"
+                    @mousedown.stop
+                  >
+                    <el-icon><Close /></el-icon>
+                  </span>
+                </span>
+                <div
+                  class="table-actions drop-zone"
+                  :class="{ empty: !rowActions.length }"
+                  @dragover.prevent
+                  @drop.stop="dropAction('table')"
+                >
+                  <button
+                    v-for="(code, actionIndex) in rowActions"
+                    :key="`split-table-action-${code}-${actionIndex}`"
+                    type="button"
+                    draggable="true"
+                    @dragstart="startRegionActionDrag('table', actionIndex)"
+                    @dragover.prevent
+                    @drop.stop="dropAction('table', actionIndex)"
+                  >
+                    <span>{{ actionLabel(code) }}</span>
+                    <span
+                      class="chip-remove"
+                      role="button"
+                      tabindex="-1"
+                      title="删除按钮"
+                      @click.stop="removeAction('table', actionIndex)"
+                      @mousedown.stop
+                    >
+                      <el-icon><Close /></el-icon>
+                    </span>
+                  </button>
+                  <em v-if="!rowActions.length">拖入行按钮</em>
+                </div>
+                <em v-if="!regionFields('table').length">拖入列表字段</em>
+              </div>
+            </div>
+
+            <div
+              v-else
+              class="table-preview drop-zone"
+              @dragover.prevent
+              @drop="dropPaletteField('table')"
+            >
+              <span
+                v-for="(field, index) in regionFields('table')"
+                :key="`table-${field}`"
+                draggable="true"
+                @dragstart="startRegionFieldDrag('table', index)"
+                @dragover.prevent
+                @drop.stop="dropPaletteField('table', index)"
+              >
+                <span>{{ fieldLabel(field) }}</span>
+                <span
+                  class="chip-remove"
+                  role="button"
+                  tabindex="-1"
+                  title="删除字段"
+                  @click.stop="removeRegionField('table', index)"
+                  @mousedown.stop
+                >
+                  <el-icon><Close /></el-icon>
+                </span>
+              </span>
+              <div
+                class="table-actions drop-zone"
+                :class="{ empty: !rowActions.length }"
+                @dragover.prevent
+                @drop.stop="dropAction('table')"
+              >
+                <button
+                  v-for="(code, actionIndex) in rowActions"
+                  :key="`table-action-${code}-${actionIndex}`"
+                  type="button"
+                  draggable="true"
+                  @dragstart="startRegionActionDrag('table', actionIndex)"
+                  @dragover.prevent
+                  @drop.stop="dropAction('table', actionIndex)"
+                >
+                  <span>{{ actionLabel(code) }}</span>
+                  <span
+                    class="chip-remove"
+                    role="button"
+                    tabindex="-1"
+                    title="删除按钮"
+                    @click.stop="removeAction('table', actionIndex)"
+                    @mousedown.stop
+                  >
+                    <el-icon><Close /></el-icon>
+                  </span>
+                </button>
+                <em v-if="!rowActions.length">拖入行按钮</em>
+              </div>
+              <em v-if="!regionFields('table').length">拖入表格字段</em>
+            </div>
+          </section>
+
+          <section
+            v-if="regionVisible('form')"
+            class="canvas-band"
+            @dragover.prevent
+            @drop="dropPaletteField('form')"
+          >
+            <div class="band-title">
+              <span>表单字段</span>
+              <div class="band-tools">
+                <small>{{ regionFields('form').length }} 字段</small>
+                <el-button size="small" text type="danger" @click="setRegionVisible('form', false)">删除区域</el-button>
+              </div>
+            </div>
+            <div class="form-preview drop-zone" :class="{ empty: !regionFields('form').length }">
+              <label
+                v-for="(field, index) in regionFields('form')"
+                :key="`form-${field}`"
+                draggable="true"
+                @dragstart="startRegionFieldDrag('form', index)"
+                @dragover.prevent
+                @drop.stop="dropPaletteField('form', index)"
+              >
+                <span>{{ fieldLabel(field) }}</span>
+                <el-input disabled placeholder="生成后录入" />
+                <span
+                  class="chip-remove"
+                  role="button"
+                  tabindex="-1"
+                  title="删除字段"
+                  @click.stop.prevent="removeRegionField('form', index)"
+                  @mousedown.stop
+                >
+                  <el-icon><Close /></el-icon>
+                </span>
+              </label>
+              <span v-if="!regionFields('form').length" class="drop-hint">把字段拖到这里生成表单项</span>
+            </div>
+          </section>
+
+          <section
+            class="canvas-band embedded-block-band"
+            @dragover.prevent
+            @drop="dropEmbeddedBusinessBlock('bottom')"
+          >
+            <div class="band-title">
+              <span>底部业务块</span>
+              <small>{{ embeddedBusinessBlocks('bottom').length }} 个</small>
+            </div>
+            <div class="embedded-block-list drop-zone" :class="{ empty: !embeddedBusinessBlocks('bottom').length }">
+              <button
+                v-for="(block, index) in embeddedBusinessBlocks('bottom')"
+                :key="`bottom-embedded-${block.id || index}`"
+                type="button"
+                class="embedded-block-chip"
+                :class="{ active: selectedBusinessBlock?.id === block.id }"
+                draggable="true"
+                @click="selectEmbeddedBusinessBlock(block, 'bottom')"
+                @dragstart="startEmbeddedBlockInstanceDrag('bottom', index)"
+                @dragover.prevent
+                @drop.stop="dropEmbeddedBusinessBlock('bottom', index)"
+              >
+                <span>{{ embeddedBlockLabel(block) }}</span>
+                <span
+                  class="chip-remove"
+                  role="button"
+                  tabindex="-1"
+                  title="删除业务块"
+                  @click.stop="removeEmbeddedBusinessBlock('bottom', index)"
+                  @mousedown.stop
+                >
+                  <el-icon><Close /></el-icon>
+                </span>
+              </button>
+              <span v-if="!embeddedBusinessBlocks('bottom').length" class="drop-hint">拖入公告、轮播等可嵌入业务块</span>
+            </div>
+          </section>
+          </template>
+        </main>
+
+        <aside class="property-pane">
+          <div v-if="selectedConfigType === 'menu'" class="canvas-menu-config">
+            <div class="matrix-head">
+              <strong>菜单配置</strong>
+              <small>一级 / 二级页面菜单</small>
+            </div>
+            <el-form label-position="top">
+              <el-form-item label="菜单来源">
+                <el-select :model-value="navigationConfig.source" @change="setNavigationConfig('source', $event)">
+                  <el-option label="页面列表自动生成" value="pageDesigns" />
+                  <el-option label="自定义菜单" value="custom" />
+                  <el-option label="权限菜单" value="permission" />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="菜单位置">
+                <el-select :model-value="navigationConfig.position" @change="setNavigationConfig('position', $event)">
+                  <el-option label="画布顶部横向菜单" value="top" />
+                  <el-option label="左侧竖向菜单" value="side" />
+                  <el-option label="移动端折叠菜单" value="mobile" />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="二级菜单显示">
+                <el-select :model-value="navigationConfig.display" @change="setNavigationConfig('display', $event)">
+                  <el-option label="悬浮下拉" value="dropdown" />
+                  <el-option label="直接展开" value="expanded" />
+                </el-select>
+              </el-form-item>
+            </el-form>
+            <div class="menu-config-list">
+              <div v-for="group in pageMenuGroups" :key="`config-${group.key}`" class="menu-config-row">
+                <span>{{ group.label }}</span>
+                <small>{{ group.children.length }} 个页面</small>
+              </div>
+            </div>
+          </div>
+
+          <el-form v-else-if="draft" label-position="top">
+            <el-form-item label="页面名称">
+              <el-input v-model="draft.pageName" @input="markDirty" />
+            </el-form-item>
+            <el-form-item label="路由路径">
+              <el-input v-model="draft.routePath" @input="markDirty" />
+            </el-form-item>
+            <el-form-item label="页面类型">
+              <el-select v-model="draft.pageType" @change="syncLayoutForPageType">
+                <el-option
+                  v-for="option in pageTypeOptions"
+                  :key="option.value"
+                  :label="option.label"
+                  :value="option.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="显示在菜单">
+              <el-switch
+                v-model="navigationConfig.showInMenu"
+                active-text="显示"
+                inactive-text="隐藏"
+                @change="syncJson"
+              />
+              <p class="layout-help">关闭后页面仍会生成路由，可通过列表、卡片、按钮或业务块跳转进入。</p>
+            </el-form-item>
+            <el-form-item v-if="navigationConfig.showInMenu" label="菜单层级">
+              <el-segmented :model-value="currentMenuLevel" :options="menuLevelOptions" @change="setMenuLevel" />
+            </el-form-item>
+            <el-form-item v-if="navigationConfig.showInMenu && currentMenuLevel === 'primary'" label="菜单显示名称">
+              <el-input v-model="navigationConfig.menuName" placeholder="为空时使用页面名称" @input="syncJson" />
+            </el-form-item>
+            <el-form-item v-if="navigationConfig.showInMenu && currentMenuLevel === 'secondary'" label="所属一级菜单">
+              <el-select :model-value="currentParentMenuCode" @change="setParentMenuGroup">
+                <el-option
+                  v-for="group in parentMenuOptions"
+                  :key="group.key"
+                  :label="group.label"
+                  :value="group.key"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="布局类型">
+              <el-select :model-value="layoutCanvas" @change="selectLayout">
+                <el-option
+                  v-for="option in layoutOptions"
+                  :key="option.value"
+                  :label="option.label"
+                  :value="option.value"
+                />
+              </el-select>
+              <p class="layout-help">{{ currentLayoutOption.description }}</p>
+            </el-form-item>
+            <el-form-item v-if="isCardLayout" label="图片字段">
+              <el-select :model-value="cardImageField" clearable @change="setCardField('imageField', $event)">
+                <el-option
+                  v-for="column in currentColumns"
+                  :key="fieldKey(column)"
+                  :label="column.columnComment || column.javaField || column.columnName"
+                  :value="fieldKey(column)"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item v-if="isCardLayout" label="主标题字段">
+              <el-select :model-value="cardTitleField" clearable @change="setCardField('titleField', $event)">
+                <el-option
+                  v-for="column in currentColumns"
+                  :key="fieldKey(column)"
+                  :label="column.columnComment || column.javaField || column.columnName"
+                  :value="fieldKey(column)"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item v-if="!isBusinessBlockLayout" label="绑定数据表">
+              <el-select v-model="draft.tableName" filterable clearable @change="resetLayoutForTable">
+                <el-option v-for="table in tables" :key="table.tableName" :label="table.tableComment || table.tableName" :value="table.tableName" />
+              </el-select>
+            </el-form-item>
+            <el-form-item v-if="canDeletePage(draft)">
+              <el-button type="danger" plain @click="deletePageDesign(draft)">删除当前页面</el-button>
+            </el-form-item>
+          </el-form>
+
+          <div v-if="selectedBusinessBlock || isBusinessBlockLayout" class="palette-panel business-block-config-panel">
+            <div class="matrix-head">
+              <strong>业务块配置</strong>
+              <small>{{ selectedBusinessBlockDefinition?.name || selectedBusinessBlock?.blockCode || '请选择业务块' }}</small>
+            </div>
+            <BlockConfigForm
+              :definition="selectedBusinessBlockDefinition"
+              :model-value="selectedBusinessBlock?.config || {}"
+              :tables="tables"
+              @update:model-value="updateSelectedBusinessBlockConfig"
+            />
+          </div>
+
+          <el-collapse>
+            <el-collapse-item title="JSON">
+              <el-input v-model="layoutJson" type="textarea" :rows="8" @input="markDirty" @blur="applyLayoutJson" />
+              <el-input v-model="actionJson" class="json-input" type="textarea" :rows="5" @input="markDirty" @blur="applyActionJson" />
+            </el-collapse-item>
+          </el-collapse>
+        </aside>
+      </div>
+      </div>
+    </div>
+  </section>
+</template>
+
+<script setup>
+import { computed, nextTick, ref, watch } from 'vue'
+import { ElMessage } from 'element-plus'
+import { ArrowDown, Close } from '@element-plus/icons-vue'
+import BusinessBlockDesigner from '@/components/business-blocks/BusinessBlockDesigner.vue'
+import BlockConfigForm from '@/components/business-blocks/BlockConfigForm.vue'
+import BlockPalette from '@/components/business-blocks/BlockPalette.vue'
+import { updateBlockConfig } from '@/components/business-blocks/blockLayout.js'
+import {
+  buildPageMenuGroups,
+  isAssociatedPageType,
+  pageGroupKey as resolvePageGroupKey,
+  pageGroupLabel as resolvePageGroupLabel,
+  pageMenuLevel,
+  readNavigationConfig,
+  shouldShowInMenu
+} from '@/utils/pageDesignerMenu.js'
+
+const props = defineProps({
+  designs: { type: Array, default: () => [] },
+  database: { type: Object, default: () => ({ tables: [] }) },
+  blockDefinitions: { type: Array, default: () => [] },
+  mode: { type: String, default: 'frontend' },
+  showHeader: { type: Boolean, default: true },
+  saving: Boolean,
+  initializing: Boolean
+})
+
+const emit = defineEmits(['update:designs', 'init-designs', 'save-design', 'create-design', 'delete-design', 'dirty-change'])
+const selectedKey = ref('')
+const draft = ref(null)
+const layout = ref(defaultLayout())
+const actions = ref(defaultActions())
+const layoutJson = ref(formatJson(defaultLayout()))
+const actionJson = ref(formatJson(defaultActions()))
+const suppressDirty = ref(false)
+const dragging = ref(null)
+const selectedBusinessBlock = ref(null)
+const selectedBusinessBlockDefinition = ref(null)
+const selectedBusinessBlockZone = ref('')
+const businessBlockDesignerRef = ref(null)
+const pendingSelectPageCode = ref('')
+const selectedConfigType = ref('page')
+const openMenuGroupKey = ref('')
+
+const designerCopyByMode = {
+  frontend: {
+    title: '前台页面设计',
+    description: '配置生成页面的字段、查询区、表格列、表单字段和按钮。',
+    emptyDescription: '先从系统模块蓝图初始化前台页面设计',
+    initButtonLabel: '初始化页面'
+  },
+  admin: {
+    title: '后台页面设计',
+    description: '配置后台管理页的查询区、工具栏、表格列、弹窗表单、批量操作和行按钮。',
+    emptyDescription: '先从后台菜单和数据表初始化后台页面设计',
+    initButtonLabel: '初始化后台页面'
+  }
+}
+
+const layoutOptionsByPageType = {
+  list: [
+    { value: 'frontend-list-v1', label: '标准表格', description: '查询区、工具栏、表格和弹窗表单，适合后台维护型列表。' },
+    { value: 'frontend-list-card-v1', label: '卡片列表', description: '用卡片展示记录，适合商品、内容、活动等需要更强浏览感的页面。' },
+    { value: 'frontend-list-split-v1', label: '分栏列表', description: '左侧条件分组，右侧数据列表，适合分类筛选明显的页面。' }
+  ],
+  current_user_list: [
+    { value: 'frontend-current-user-list-v1', label: '我的列表', description: '面向当前登录用户的记录列表，保留表格效率。' },
+    { value: 'frontend-current-user-card-v1', label: '我的卡片', description: '面向个人中心的卡片式记录，适合订单、申请、收藏。' }
+  ],
+  detail: [
+    { value: 'frontend-detail-v1', label: '基础详情', description: '字段分组展示，适合普通详情页。' },
+    { value: 'frontend-detail-media-v1', label: '图文详情', description: '突出主图或封面，再展示详情字段。' }
+  ],
+  form: [
+    { value: 'frontend-form-v1', label: '单页表单', description: '所有字段集中录入，适合轻量新增或申请页。' },
+    { value: 'frontend-form-group-v1', label: '分组表单', description: '字段按区域分组，适合字段较多的录入页。' }
+  ],
+  business_block: [
+    { value: 'business-blocks-v1', label: '业务块页面', description: '拖入购物车、公告、轮播等完整业务块，只配置块需要的数据表和字段。' }
+  ]
+}
+
+const adminLayoutOptionsByPageType = {
+  list: [
+    { value: 'admin-list-v1', label: '标准管理表格', description: '查询区、工具栏、数据表格和弹窗表单，适合后台 CRUD 管理。' },
+    { value: 'admin-list-dense-v1', label: '高密度表格', description: '压缩字段间距并保留批量操作，适合运营高频维护页面。' },
+    { value: 'admin-list-split-v1', label: '分栏管理', description: '左侧筛选或分类，右侧表格维护，适合分类层级明显的后台页面。' }
+  ],
+  detail: [
+    { value: 'admin-detail-v1', label: '后台详情', description: '字段分组展示，适合审核、巡检和查看记录详情。' }
+  ],
+  form: [
+    { value: 'admin-form-v1', label: '后台表单', description: '后台录入表单，适合独立新增、编辑和审核场景。' },
+    { value: 'admin-form-group-v1', label: '分组表单', description: '把字段按业务区域分组，适合字段较多的后台录入页。' }
+  ]
+}
+
+const pageTypeLabels = {
+  list: '列表页',
+  current_user_list: '当前用户列表',
+  detail: '详情页',
+  form: '表单页',
+  business_block: '业务块页面'
+}
+
+const pageTypeOptionsByMode = {
+  frontend: [
+    { label: '列表页', value: 'list' },
+    { label: '详情页', value: 'detail' },
+    { label: '表单页', value: 'form' },
+    { label: '当前用户列表', value: 'current_user_list' },
+    { label: '业务块页面', value: 'business_block' }
+  ],
+  admin: [
+    { label: '后台列表页', value: 'list' },
+    { label: '后台详情页', value: 'detail' },
+    { label: '后台表单页', value: 'form' }
+  ]
+}
+
+const frontendBuiltinActionPalette = [
+  { code: 'create', label: '新增' },
+  { code: 'batchDelete', label: '批量删除' },
+  { code: 'view', label: '查看' },
+  { code: 'edit', label: '编辑' },
+  { code: 'delete', label: '删除' }
+]
+
+const adminBuiltinActionPalette = [
+  { code: 'create', label: '新增' },
+  { code: 'export', label: '导出' },
+  { code: 'batchDelete', label: '批量删除' },
+  { code: 'view', label: '查看' },
+  { code: 'edit', label: '编辑' },
+  { code: 'delete', label: '删除' }
+]
+
+const designerCopy = computed(() => designerCopyByMode[activeMode()] || designerCopyByMode.frontend)
+const pageTypeOptions = computed(() => pageTypeOptionsByMode[activeMode()] || pageTypeOptionsByMode.frontend)
+const builtinActionPalette = computed(() => {
+  const source = activeMode() === 'admin' ? adminBuiltinActionPalette : frontendBuiltinActionPalette
+  return source.filter((action) => actionAllowedForCurrentTable(action.code))
+})
+
+const businessActionPalette = computed(() => {
+  const businessActions = Array.isArray(props.database?.businessActions) ? props.database.businessActions : []
+  return businessActions
+    .filter((action) => action?.code)
+    .map((action) => ({
+      code: businessActionCode(action),
+      label: action.name || action.code,
+      business: true,
+      matchesCurrentTable: businessActionMatchesCurrentTable(action)
+    }))
+    .sort(sortBusinessActionPalette)
+})
+
+const actionPalette = computed(() => [...builtinActionPalette.value, ...businessActionPalette.value])
+const embeddedBlockDefinitions = computed(() => props.blockDefinitions.filter((definition) => isEmbeddedBlockDefinition(definition)))
+
+const optionalRegions = [
+  { id: 'query', label: '查询区' },
+  { id: 'toolbar', label: '工具栏按钮' },
+  { id: 'form', label: '表单字段' }
+]
+
+const embeddedBlockZones = ['top', 'bottom']
+
+const tables = computed(() => Array.isArray(props.database?.tables) ? props.database.tables : [])
+const currentTable = computed(() => tables.value.find((table) => table.tableName === draft.value?.tableName) || null)
+const currentColumns = computed(() => Array.isArray(currentTable.value?.columns) ? currentTable.value.columns : [])
+const toolbarActions = computed(() => regionActions('toolbar', 'actions'))
+const rowActions = computed(() => regionActions('table', 'rowActions'))
+const cardActions = computed(() => regionActions('cardActions', 'actions'))
+const currentPageType = computed(() => draft.value?.pageType || 'list')
+const pageTypeLabel = computed(() => pageTypeLabels[currentPageType.value] || currentPageType.value)
+const layoutOptions = computed(() => layoutOptionsForPageType(currentPageType.value))
+const layoutCanvas = computed(() => normalizeLayoutCanvas(layout.value?.canvas, currentPageType.value))
+const isBusinessBlockLayout = computed(() => layoutCanvas.value === 'business-blocks-v1' || draft.value?.pageType === 'business_block')
+const currentLayoutOption = computed(() => layoutOptions.value.find((option) => option.value === layoutCanvas.value) || layoutOptions.value[0])
+const isCardLayout = computed(() => layoutCanvas.value.includes('card'))
+const isSplitLayout = computed(() => layoutCanvas.value.includes('split'))
+const activeMainRegionId = computed(() => isCardLayout.value ? 'card' : 'table')
+const activeMainFields = computed(() => regionFields(activeMainRegionId.value))
+const cardFields = computed(() => regionFields('card'))
+const cardImageField = computed(() => cardRegion().imageField || '')
+const cardTitleField = computed(() => cardRegion().titleField || '')
+const hiddenRegions = computed(() => optionalRegions.filter((item) => !regionVisible(item.id)))
+const layoutPreviewClass = computed(() => ({
+  'layout-preview-card': isCardLayout.value,
+  'layout-preview-split': isSplitLayout.value
+}))
+const navigationConfig = computed(() => ensureNavigationConfig())
+const pageMenuDesigns = computed(() => {
+  if (!draft.value || !selectedKey.value) return props.designs
+  const current = {
+    ...draft.value,
+    layoutJson: formatJson(layout.value)
+  }
+  const hasSelected = props.designs.some((design) => designKey(design) === selectedKey.value)
+  const designs = hasSelected
+    ? props.designs.map((design) => designKey(design) === selectedKey.value ? current : design)
+    : props.designs.concat(current)
+  return designs
+})
+const editableMenuPages = computed(() => pageMenuDesigns.value.filter(shouldShowInMenu))
+const associatedPages = computed(() => pageMenuDesigns.value.filter((design) => !shouldShowInMenu(design)))
+const pageMenuGroups = computed(() => buildPageMenuGroups(editableMenuPages.value, { mode: activeMode() }))
+const selectedMenuGroup = computed(() => pageMenuGroups.value.find((group) => {
+  return designKey(group.primary) === selectedKey.value || group.children.some((child) => designKey(child) === selectedKey.value)
+}) || null)
+const visibleAssociatedPages = computed(() => {
+  if (selectedConfigType.value !== 'page') return []
+  if (selectedMenuGroup.value?.children.length) return []
+  return associatedPages.value
+})
+const parentMenuOptions = computed(() => {
+  const groups = pageMenuGroups.value.filter((group) => designKey(group.primary) !== selectedKey.value)
+  return groups.length ? groups : pageMenuGroups.value
+})
+const currentMenuLevel = computed(() => {
+  if (!draft.value) return 'primary'
+  const explicitLevel = pageMenuLevel(draft.value)
+  if (explicitLevel) return explicitLevel
+  return pageMenuGroups.value.some((group) => designKey(group.primary) === selectedKey.value) ? 'primary' : 'secondary'
+})
+const currentParentMenuCode = computed(() => {
+  if (!draft.value) return ''
+  return ensureNavigationConfig().parentMenuCode || pageGroupKey(draft.value)
+})
+
+const menuLevelOptions = [
+  { label: '一级菜单', value: 'primary' },
+  { label: '二级页面', value: 'secondary' }
+]
+
+watch(
+  () => props.designs,
+  () => {
+    if (!props.designs.length) {
+      selectedKey.value = ''
+      draft.value = null
+      return
+    }
+    const pending = pendingSelectPageCode.value
+      ? props.designs.find((item) => item?.pageCode === pendingSelectPageCode.value)
+      : null
+    if (pending) {
+      pendingSelectPageCode.value = ''
+    }
+    const selected = pending || props.designs.find((item) => designKey(item) === selectedKey.value) || props.designs[0]
+    selectDesign(selected, false)
+  },
+  { immediate: true, deep: true }
+)
+
+function designKey(design) {
+  return String(design?.designId || design?.pageCode || '')
+}
+
+function activeMode() {
+  return props.mode === 'admin' ? 'admin' : 'frontend'
+}
+
+function pageGroupKey(design) {
+  return resolvePageGroupKey(design, activeMode())
+}
+
+function pageGroupLabel(design) {
+  return resolvePageGroupLabel(design, activeMode())
+}
+
+function isMenuGroupOpen(group) {
+  return openMenuGroupKey.value === group.key
+}
+
+function isMenuGroupActive(group) {
+  return designKey(group.primary) === selectedKey.value || group.children.some((child) => designKey(child) === selectedKey.value)
+}
+
+function toggleMenuGroup(key) {
+  openMenuGroupKey.value = openMenuGroupKey.value === key ? '' : key
+}
+
+function selectMenuGroup(group) {
+  if (group?.primary) {
+    openMenuGroupKey.value = ''
+    selectDesign(group.primary)
+    return
+  }
+  if (group?.children?.length) {
+    toggleMenuGroup(group.key)
+    selectMenuConfig()
+    return
+  }
+  toggleMenuGroup(group.key)
+  selectMenuConfig()
+}
+
+function selectMenuPage(design) {
+  openMenuGroupKey.value = ''
+  selectedConfigType.value = 'page'
+  selectDesign(design)
+}
+
+function selectAssociatedPage(design) {
+  selectedConfigType.value = 'page'
+  selectDesign(design)
+}
+
+function selectMenuConfig() {
+  selectedConfigType.value = 'menu'
+  handleBusinessBlockSelect(null)
+}
+
+function selectDesign(design, shouldCommit = true) {
+  const nextKey = designKey(design)
+  if (shouldCommit && draft.value && selectedKey.value && nextKey !== selectedKey.value) {
+    commitCurrentDraft()
+  }
+  suppressDirty.value = true
+  try {
+    selectedKey.value = nextKey
+    draft.value = JSON.parse(JSON.stringify(design || {}))
+    selectedConfigType.value = 'page'
+    handleBusinessBlockSelect(null)
+    layout.value = parseJson(draft.value.layoutJson, defaultLayout(draft.value?.pageType || 'list'))
+    actions.value = parseJson(draft.value.actionJson, defaultActions())
+    syncLayoutForPageType()
+    syncJson({ silent: true })
+  } finally {
+    suppressDirty.value = false
+  }
+}
+
+function addPageDesign(menuLevel = 'primary') {
+  const tableName = draft.value?.tableName || tables.value[0]?.tableName || ''
+  if (!tableName) {
+    ElMessage.warning('请先配置至少一张数据表')
+    return
+  }
+  commitCurrentDraft()
+  const pageNumber = props.designs.length + 1
+  const pageCode = uniquePageCode(`custom_page_${pageNumber}`)
+  const isSecondary = menuLevel === 'secondary'
+  const parentGroup = isSecondary ? defaultParentMenuGroup() : null
+  const pageName = isSecondary ? `新页面${pageNumber}` : `新一级菜单${pageNumber}`
+  const layoutPayload = newPageLayoutJson(isSecondary ? 'secondary' : 'primary', pageCode, pageName, parentGroup)
+  pendingSelectPageCode.value = pageCode
+  emit('create-design', {
+    pageScope: activeMode(),
+    pageCode,
+    menuCode: isSecondary && parentGroup ? parentGroup.key : pageCode,
+    pageName,
+    routePath: `/${pageCode.replace(/_/g, '-')}`,
+    pageType: 'list',
+    tableName,
+    layoutJson: layoutPayload,
+    status: '0'
+  })
+}
+
+function defaultParentMenuGroup() {
+  const selectedGroup = pageMenuGroups.value.find((group) => isMenuGroupActive(group))
+  return selectedGroup || pageMenuGroups.value[0] || null
+}
+
+function newPageLayoutJson(menuLevel, pageCode, pageName, parentGroup) {
+  const nextLayout = defaultLayout('list')
+  nextLayout.navigation = {
+    ...defaultNavigationConfig('list'),
+    showInMenu: true,
+    menuLevel
+  }
+  if (menuLevel === 'primary') {
+    nextLayout.navigation.menuCode = pageCode
+    nextLayout.navigation.menuName = pageName
+  } else if (parentGroup) {
+    nextLayout.navigation.parentMenuCode = parentGroup.key
+    nextLayout.navigation.parentMenuName = parentGroup.label
+  }
+  return formatJson(nextLayout)
+}
+
+function deletePageDesign(design) {
+  if (!design?.designId) return
+  emit('delete-design', design)
+}
+
+function canDeletePage(design) {
+  const pageCode = String(design?.pageCode || '')
+  return pageCode.startsWith('custom_page_')
+}
+
+function uniquePageCode(baseCode) {
+  const usedCodes = new Set(props.designs.map((item) => item?.pageCode).filter(Boolean))
+  let code = baseCode
+  let index = 1
+  while (usedCodes.has(code)) {
+    index += 1
+    code = `${baseCode}_${index}`
+  }
+  return code
+}
+
+async function addBusinessBlock(definition) {
+  if (!definition || !draft.value) return
+  if (!isBusinessBlockLayout.value) {
+    draft.value.pageType = 'business_block'
+    layout.value = { canvas: 'business-blocks-v1', blocks: [] }
+    handleBusinessBlockSelect(null)
+    syncJson()
+    await nextTick()
+  }
+  businessBlockDesignerRef.value?.addBlock?.(definition)
+}
+
+function addEmbeddedBusinessBlock(definition, zone = 'top') {
+  if (!definition || !draft.value) return
+  if (!isEmbeddedBlockDefinition(definition)) {
+    ElMessage.warning('该业务块只能放在业务块页面')
+    return
+  }
+  ensureEmbeddedBlocks()
+  const blocks = embeddedBusinessBlocks(zone)
+  const instance = {
+    id: nextBusinessBlockId(definition.code),
+    blockCode: definition.code,
+    name: definition.name || definition.code,
+    config: {}
+  }
+  blocks.push(instance)
+  selectEmbeddedBusinessBlock(instance, zone)
+  syncJson()
+}
+
+function startBusinessBlockDrag(definition) {
+  if (!definition) return
+  dragging.value = { type: 'businessBlock', definition }
+}
+
+function startEmbeddedBlockInstanceDrag(zone, index) {
+  const blocks = embeddedBusinessBlocks(zone)
+  dragging.value = { type: 'embeddedBusinessBlock', sourceZone: zone, index, block: blocks[index] }
+}
+
+function dropEmbeddedBusinessBlock(zone, index) {
+  if (!dragging.value) return
+  ensureEmbeddedBlocks()
+  if (dragging.value.type === 'businessBlock') {
+    addEmbeddedBusinessBlock(dragging.value.definition, zone)
+    dragging.value = null
+    return
+  }
+  if (dragging.value.type !== 'embeddedBusinessBlock' || !dragging.value.block) return
+  const sourceBlocks = embeddedBusinessBlocks(dragging.value.sourceZone)
+  const targetBlocks = embeddedBusinessBlocks(zone)
+  const [moved] = sourceBlocks.splice(dragging.value.index, 1)
+  if (!moved) {
+    dragging.value = null
+    return
+  }
+  let insertAt = Number.isInteger(index) ? index : targetBlocks.length
+  if (dragging.value.sourceZone === zone && dragging.value.index < insertAt) {
+    insertAt -= 1
+  }
+  targetBlocks.splice(Math.max(0, insertAt), 0, moved)
+  selectEmbeddedBusinessBlock(moved, zone)
+  dragging.value = null
+  syncJson()
+}
+
+function removeEmbeddedBusinessBlock(zone, index) {
+  const blocks = embeddedBusinessBlocks(zone)
+  if (!Number.isInteger(index) || index < 0 || index >= blocks.length) return
+  const [removed] = blocks.splice(index, 1)
+  if (removed?.id && selectedBusinessBlock.value?.id === removed.id) {
+    handleBusinessBlockSelect(null)
+  }
+  syncJson()
+}
+
+function selectEmbeddedBusinessBlock(block, zone) {
+  selectedBusinessBlock.value = block || null
+  selectedBusinessBlockDefinition.value = blockDefinition(block?.blockCode)
+  selectedBusinessBlockZone.value = block ? zone : ''
+  if (block) {
+    selectedConfigType.value = 'businessBlock'
+  }
+}
+
+function embeddedBusinessBlocks(zone) {
+  ensureEmbeddedBlocks()
+  return layout.value.embeddedBlocks[zone] || []
+}
+
+function embeddedBlockLabel(block) {
+  const definition = blockDefinition(block?.blockCode)
+  return block?.name || definition?.name || block?.blockCode || '业务块'
+}
+
+function blockDefinition(code) {
+  return props.blockDefinitions.find((definition) => definition?.code === code) || null
+}
+
+function isEmbeddedBlockDefinition(definition) {
+  return definition?.placement === 'embedded'
+}
+
+function nextBusinessBlockId(code) {
+  const blocks = []
+  if (Array.isArray(layout.value?.blocks)) {
+    blocks.push(...layout.value.blocks)
+  }
+  ensureEmbeddedBlocks()
+  embeddedBlockZones.forEach((zone) => blocks.push(...embeddedBusinessBlocks(zone)))
+  const count = blocks.filter((block) => block?.blockCode === code).length + 1
+  return `${code}_${String(count).padStart(3, '0')}`
+}
+
+function defaultLayout(pageType = 'list') {
+  return {
+    canvas: activeMode() === 'admin' ? 'admin-list-v1' : 'frontend-list-v1',
+    navigation: defaultNavigationConfig(pageType),
+    regions: [
+      { id: 'query', type: 'query', visible: true, fields: [] },
+      { id: 'toolbar', type: 'toolbar', visible: true, actions: ['create'] },
+      { id: 'table', type: 'table', fields: [], rowActions: ['edit', 'delete'] },
+      { id: 'form', type: 'dialogForm', visible: true, fields: [] }
+    ],
+    embeddedBlocks: { top: [], bottom: [] }
+  }
+}
+
+function defaultNavigationConfig(pageType = currentPageType.value) {
+  return {
+    source: 'pageDesigns',
+    position: 'top',
+    display: 'dropdown',
+    showInMenu: !isAssociatedPageType(pageType)
+  }
+}
+
+function ensureNavigationConfig() {
+  if (!layout.value || typeof layout.value !== 'object') {
+    layout.value = defaultLayout()
+  }
+  if (!layout.value.navigation || typeof layout.value.navigation !== 'object' || Array.isArray(layout.value.navigation)) {
+    layout.value.navigation = defaultNavigationConfig(currentPageType.value)
+  }
+  layout.value.navigation = {
+    ...defaultNavigationConfig(currentPageType.value),
+    ...layout.value.navigation
+  }
+  return layout.value.navigation
+}
+
+function setNavigationConfig(key, value) {
+  const config = ensureNavigationConfig()
+  config[key] = value
+  syncJson()
+}
+
+function setMenuLevel(value) {
+  const level = value === 'secondary' ? 'secondary' : 'primary'
+  const config = ensureNavigationConfig()
+  config.menuLevel = level
+  if (level === 'primary') {
+    config.menuCode = draft.value?.pageCode || config.menuCode
+    config.menuName = draft.value?.pageName || config.menuName
+    delete config.parentMenuCode
+    delete config.parentMenuName
+    if (draft.value?.pageCode) {
+      draft.value.menuCode = draft.value.pageCode
+    }
+  } else {
+    const parent = defaultParentMenuGroup()
+    if (parent) {
+      config.parentMenuCode = parent.key
+      config.parentMenuName = parent.label
+      if (draft.value) {
+        draft.value.menuCode = parent.key
+      }
+    }
+    delete config.menuName
+  }
+  syncJson()
+}
+
+function setParentMenuGroup(key) {
+  const parent = pageMenuGroups.value.find((group) => group.key === key)
+  if (!parent) return
+  const config = ensureNavigationConfig()
+  config.menuLevel = 'secondary'
+  config.parentMenuCode = parent.key
+  config.parentMenuName = parent.label
+  delete config.menuName
+  if (draft.value) {
+    draft.value.menuCode = parent.key
+  }
+  syncJson()
+}
+
+function layoutOptionsForPageType(pageType) {
+  const optionsByPageType = activeMode() === 'admin' ? adminLayoutOptionsByPageType : layoutOptionsByPageType
+  return optionsByPageType[pageType] || optionsByPageType.list
+}
+
+function defaultCanvasForPageType(pageType) {
+  return layoutOptionsForPageType(pageType)[0].value
+}
+
+function normalizeLayoutCanvas(canvas, pageType) {
+  const options = layoutOptionsForPageType(pageType)
+  return options.some((option) => option.value === canvas) ? canvas : options[0].value
+}
+
+function syncLayoutForPageType() {
+  if (!layout.value || typeof layout.value !== 'object') {
+    layout.value = defaultLayout()
+  }
+  layout.value.canvas = normalizeLayoutCanvas(layout.value.canvas, currentPageType.value)
+  ensureNavigationConfig()
+  if (layout.value.canvas === 'business-blocks-v1') {
+    if (!Array.isArray(layout.value.blocks)) {
+      layout.value.blocks = []
+    }
+    syncJson()
+    return
+  }
+  ensureEmbeddedBlocks()
+  ensureLayoutRegions()
+  syncJson()
+}
+
+function selectLayout(value) {
+  const options = layoutOptionsForPageType(currentPageType.value)
+  layout.value.canvas = options.some((option) => option.value === value) ? value : defaultCanvasForPageType(currentPageType.value)
+  ensureNavigationConfig()
+  if (layout.value.canvas === 'business-blocks-v1') {
+    if (!Array.isArray(layout.value.blocks)) {
+      layout.value.blocks = []
+    }
+    syncJson()
+    return
+  }
+  ensureEmbeddedBlocks()
+  ensureLayoutRegions()
+  syncJson()
+}
+
+function ensureEmbeddedBlocks() {
+  if (!layout.value || typeof layout.value !== 'object') {
+    layout.value = defaultLayout()
+  }
+  if (!layout.value.embeddedBlocks || typeof layout.value.embeddedBlocks !== 'object' || Array.isArray(layout.value.embeddedBlocks)) {
+    layout.value.embeddedBlocks = { top: [], bottom: [] }
+  }
+  embeddedBlockZones.forEach((zone) => {
+    if (!Array.isArray(layout.value.embeddedBlocks[zone])) {
+      layout.value.embeddedBlocks[zone] = []
+    }
+  })
+}
+
+function ensureLayoutRegions() {
+  region('query')
+  region('toolbar')
+  region('table')
+  region('form')
+  if (isCardLayout.value) {
+    const card = cardRegion()
+    const fields = currentColumns.value.map(fieldKey).filter(Boolean)
+    if (!Array.isArray(card.fields) || !card.fields.length) {
+      card.fields = fields.slice(0, 4)
+    }
+    if (!card.titleField) {
+      card.titleField = fields[0] || ''
+    }
+    if (!card.imageField) {
+      const imageColumn = currentColumns.value.find((column) => ['imageUpload', 'avatar'].includes(column.htmlType))
+      card.imageField = imageColumn ? fieldKey(imageColumn) : ''
+    }
+    const actionsRegion = region('cardActions')
+    if (!Array.isArray(actionsRegion.actions)) {
+      actionsRegion.actions = ['edit', 'delete']
+    }
+  }
+}
+
+function defaultActions() {
+  const toolbarActions = [{ code: 'create', label: '新增', type: 'primary', builtin: true }]
+  if (activeMode() === 'admin') {
+    toolbarActions.push({ code: 'export', label: '导出', builtin: true })
+  }
+  return {
+    toolbarActions,
+    rowActions: [
+      { code: 'view', label: '查看', builtin: true },
+      { code: 'edit', label: '编辑', builtin: true },
+      { code: 'delete', label: '删除', type: 'danger', builtin: true }
+    ]
+  }
+}
+
+function parseJson(value, fallback) {
+  if (!value) return JSON.parse(JSON.stringify(fallback))
+  try {
+    return typeof value === 'string' ? JSON.parse(value) : JSON.parse(JSON.stringify(value))
+  } catch (error) {
+    return JSON.parse(JSON.stringify(fallback))
+  }
+}
+
+function formatJson(value) {
+  return JSON.stringify(value || {}, null, 2)
+}
+
+function markDirty() {
+  if (!suppressDirty.value) {
+    emit('dirty-change', true)
+  }
+}
+
+function syncJson(options = {}) {
+  layoutJson.value = formatJson(layout.value)
+  actionJson.value = formatJson(actions.value)
+  if (!options?.silent) {
+    markDirty()
+  }
+}
+
+function actionAllowedForCurrentTable(code) {
+  const table = currentTable.value
+  if (!table) return true
+  if (code === 'create') return table.allowAdd !== '0'
+  if (code === 'edit') return table.allowEdit !== '0'
+  if (code === 'delete' || code === 'batchDelete') return table.allowRemove !== '0'
+  return true
+}
+
+function pruneUnavailableActions() {
+  region('toolbar').actions = regionActions('toolbar', 'actions').filter(actionAllowedForCurrentTable)
+  region('table').rowActions = regionActions('table', 'rowActions').filter(actionAllowedForCurrentTable)
+  region('cardActions').actions = regionActions('cardActions', 'actions').filter(actionAllowedForCurrentTable)
+}
+
+function region(id) {
+  const regions = Array.isArray(layout.value?.regions) ? layout.value.regions : []
+  let item = regions.find((entry) => entry.id === id || entry.type === id)
+  if (!item) {
+    item = defaultRegion(id)
+    regions.push(item)
+    layout.value.regions = regions
+  }
+  return item
+}
+
+function defaultRegion(id) {
+  if (id === 'form') return { id: 'form', type: 'dialogForm', visible: true, fields: [] }
+  if (id === 'card') return { id: 'card', type: 'cardList', fields: [], titleField: '', imageField: '' }
+  if (id === 'cardActions') return { id: 'cardActions', type: 'actions', actions: ['edit', 'delete'] }
+  if (id === 'toolbar') return { id: 'toolbar', type: 'toolbar', visible: true, actions: ['create'] }
+  if (id === 'table') return { id: 'table', type: 'table', fields: [], rowActions: ['edit', 'delete'] }
+  return { id, type: id, visible: true, fields: [] }
+}
+
+function regionFields(id) {
+  const item = region(id)
+  if (!Array.isArray(item.fields)) item.fields = []
+  return item.fields
+}
+
+function regionActions(regionId, key) {
+  const item = region(regionId)
+  if (!Array.isArray(item[key])) item[key] = []
+  return item[key]
+}
+
+function cardRegion() {
+  return region('card')
+}
+
+function regionVisible(id) {
+  return region(id).visible !== false
+}
+
+function setRegionVisible(id, visible) {
+  region(id).visible = visible
+  syncJson()
+}
+
+function fieldKey(column) {
+  return column?.javaField || column?.columnName || ''
+}
+
+function fieldLabel(field) {
+  const column = currentColumns.value.find((item) => fieldKey(item) === field || item.columnName === field)
+  return column?.columnComment || column?.javaField || field
+}
+
+function hasField(regionId, field) {
+  return regionFields(regionId).includes(field)
+}
+
+function toggleField(regionId, field) {
+  const fields = regionFields(regionId)
+  const index = fields.indexOf(field)
+  if (index >= 0) {
+    fields.splice(index, 1)
+  } else {
+    fields.push(field)
+  }
+  syncJson()
+}
+
+function removeRegionField(regionId, index) {
+  const fields = regionFields(regionId)
+  if (!Number.isInteger(index) || index < 0 || index >= fields.length) return
+  fields.splice(index, 1)
+  syncJson()
+}
+
+function startPaletteField(field) {
+  dragging.value = { type: 'field', field }
+}
+
+function startRegionFieldDrag(regionId, index) {
+  dragging.value = { type: 'field', sourceRegionId: regionId, index, field: regionFields(regionId)[index] }
+}
+
+function startCardSpecialFieldDrag(key) {
+  const field = cardRegion()[key]
+  if (field) {
+    dragging.value = { type: 'field', field, sourceCardKey: key }
+  }
+}
+
+function dropCardSpecialField(key) {
+  if (!dragging.value || dragging.value.type !== 'field' || !dragging.value.field) return
+  cardRegion()[key] = dragging.value.field
+  dragging.value = null
+  syncJson()
+}
+
+function dropPaletteField(regionId, index) {
+  if (!dragging.value || dragging.value.type !== 'field' || !dragging.value.field) return
+  const targetFields = regionFields(regionId)
+  let field = dragging.value.field
+  if (dragging.value.sourceRegionId) {
+    const sourceFields = regionFields(dragging.value.sourceRegionId)
+    const [moved] = sourceFields.splice(dragging.value.index, 1)
+    field = moved
+  }
+  const existingIndex = targetFields.indexOf(field)
+  if (existingIndex >= 0) {
+    targetFields.splice(existingIndex, 1)
+  }
+  const insertAt = Number.isInteger(index) ? index : targetFields.length
+  targetFields.splice(insertAt, 0, field)
+  dragging.value = null
+  syncJson()
+}
+
+function startPaletteAction(code) {
+  dragging.value = { type: 'action', code }
+}
+
+function startRegionActionDrag(regionId, index) {
+  const key = actionKeyForRegion(regionId)
+  dragging.value = { type: 'action', sourceRegionId: regionId, index, code: regionActions(regionId, key)[index] }
+}
+
+function dropAction(regionId, index) {
+  if (!dragging.value || dragging.value.type !== 'action' || !dragging.value.code) return
+  const key = actionKeyForRegion(regionId)
+  const targetActions = regionActions(regionId, key)
+  let code = dragging.value.code
+  if (dragging.value.sourceRegionId) {
+    const sourceKey = actionKeyForRegion(dragging.value.sourceRegionId)
+    const sourceActions = regionActions(dragging.value.sourceRegionId, sourceKey)
+    const [moved] = sourceActions.splice(dragging.value.index, 1)
+    code = moved
+  }
+  const existingIndex = targetActions.indexOf(code)
+  if (existingIndex >= 0) {
+    targetActions.splice(existingIndex, 1)
+  }
+  const insertAt = Number.isInteger(index) ? index : targetActions.length
+  targetActions.splice(insertAt, 0, code)
+  dragging.value = null
+  syncJson()
+}
+
+function removeAction(regionId, index) {
+  const key = actionKeyForRegion(regionId)
+  const values = regionActions(regionId, key)
+  if (!Number.isInteger(index) || index < 0 || index >= values.length) return
+  values.splice(index, 1)
+  syncJson()
+}
+
+function actionKeyForRegion(regionId) {
+  return regionId === 'table' ? 'rowActions' : 'actions'
+}
+
+function businessActionCode(action) {
+  return `business:${action.code}`
+}
+
+function businessActionMatchesCurrentTable(action) {
+  const currentTableName = draft.value?.tableName || ''
+  const ownerTable = action?.ownerTable || ''
+  return !currentTableName || !ownerTable || ownerTable === currentTableName
+}
+
+function sortBusinessActionPalette(left, right) {
+  const tableRank = Number(right.matchesCurrentTable) - Number(left.matchesCurrentTable)
+  if (tableRank !== 0) return tableRank
+  return left.label.localeCompare(right.label, 'zh-CN')
+}
+
+function actionLabel(code) {
+  const action = actionPalette.value.find((item) => item.code === code)
+  if (action) return action.label
+  return String(code || '').replace(/^business:/, '')
+}
+
+function toggleAction(kind, code) {
+  const regionId = kind === 'toolbar' ? 'toolbar' : 'table'
+  const key = kind === 'toolbar' ? 'actions' : 'rowActions'
+  const values = regionActions(regionId, key)
+  const index = values.indexOf(code)
+  if (index >= 0) {
+    values.splice(index, 1)
+  } else {
+    values.push(code)
+  }
+  syncJson()
+}
+
+function setCardField(key, value) {
+  cardRegion()[key] = value || ''
+  syncJson()
+}
+
+function resetLayoutForTable() {
+  const fields = currentColumns.value.map(fieldKey).filter(Boolean)
+  region('query').fields = currentColumns.value.filter((column) => column.isQuery === '1').map(fieldKey).filter(Boolean)
+  region('table').fields = fields.filter((field) => field)
+  region('form').fields = fields.filter((field) => field)
+  const card = cardRegion()
+  card.fields = fields.slice(0, 4)
+  card.titleField = fields[0] || ''
+  const imageColumn = currentColumns.value.find((column) => ['imageUpload', 'avatar'].includes(column.htmlType))
+  card.imageField = imageColumn ? fieldKey(imageColumn) : ''
+  pruneUnavailableActions()
+  syncJson()
+}
+
+function applyLayoutJson() {
+  try {
+    layout.value = JSON.parse(layoutJson.value || '{}')
+    syncLayoutForPageType()
+    ElMessage.success('布局 JSON 已应用')
+  } catch (error) {
+    ElMessage.warning('布局 JSON 格式不正确')
+    syncJson()
+  }
+}
+
+function applyBusinessBlockLayoutJson(value) {
+  try {
+    layoutJson.value = value
+    layout.value = JSON.parse(value || '{}')
+    syncLayoutForPageType()
+  } catch (error) {
+    layout.value = { canvas: 'business-blocks-v1', blocks: [] }
+    syncJson()
+  }
+}
+
+function handleBusinessBlockSelect(payload) {
+  selectedBusinessBlock.value = payload?.block || null
+  selectedBusinessBlockDefinition.value = payload?.definition || null
+  selectedBusinessBlockZone.value = ''
+  if (payload?.block) {
+    selectedConfigType.value = 'businessBlock'
+  }
+}
+
+function updateSelectedBusinessBlockConfig(config) {
+  if (!selectedBusinessBlock.value) return
+  if (selectedBusinessBlockZone.value) {
+    const blocks = embeddedBusinessBlocks(selectedBusinessBlockZone.value)
+    const target = blocks.find((block) => block.id === selectedBusinessBlock.value.id)
+    if (target) {
+      target.config = { ...(config || {}) }
+      selectedBusinessBlock.value = target
+      syncJson()
+    }
+    return
+  }
+  const nextLayout = updateBlockConfig(layout.value, selectedBusinessBlock.value.id, config)
+  applyBusinessBlockLayoutJson(formatJson(nextLayout))
+}
+
+function applyActionJson() {
+  try {
+    actions.value = JSON.parse(actionJson.value || '{}')
+    syncJson()
+    ElMessage.success('按钮 JSON 已应用')
+  } catch (error) {
+    ElMessage.warning('按钮 JSON 格式不正确')
+    syncJson()
+  }
+}
+
+function saveCurrent() {
+  const payload = commitCurrentDraft()
+  if (payload) {
+    emit('save-design', payload)
+  }
+}
+
+function commitCurrentDraft() {
+  const payload = buildCurrentPayload()
+  if (!payload) return null
+  const exists = props.designs.some((item) => designKey(item) === selectedKey.value)
+  const nextDesigns = exists
+    ? props.designs.map((item) => designKey(item) === selectedKey.value ? payload : item)
+    : props.designs.concat(payload)
+  emit('update:designs', nextDesigns)
+  return payload
+}
+
+function buildCurrentPayload() {
+  if (!draft.value) return null
+  return {
+    ...draft.value,
+    pageScope: draft.value.pageScope || activeMode(),
+    layoutJson: formatJson(layout.value),
+    actionJson: formatJson(actions.value)
+  }
+}
+
+defineExpose({ commitCurrentDraft })
+</script>
+
+<style scoped lang="scss">
+.page-designer {
+  display: block;
+}
+
+.designer-head,
+.band-title,
+.matrix-head,
+.head-actions,
+.band-tools {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 12px;
+}
+
+.designer-desc {
+  margin: 4px 0 0;
+  font-size: 14px;
+  line-height: 1.45;
+}
+
+.head-actions {
+  flex-wrap: wrap;
+  justify-content: flex-end;
+}
+
+.page-designer-body {
+  padding: 20px;
+}
+
+.designer-empty {
+  min-height: 280px;
+  padding: 24px 0;
+}
+
+:deep(.designer-empty .el-empty__description) {
+  margin-top: 4px;
+}
+
+:deep(.designer-empty .el-empty__bottom) {
+  margin-top: 18px;
+}
+
+.designer-shell {
+  display: grid;
+  gap: 16px;
+}
+
+.page-menu {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  min-width: 0;
+  overflow-x: auto;
+  padding: 4px 2px 8px;
+}
+
+.page-menu-item {
+  position: relative;
+  flex: 0 0 auto;
+  min-width: 144px;
+  max-width: 220px;
+}
+
+.page-menu-select,
+.page-menu-add {
+  display: grid;
+  gap: 4px;
+  width: 100%;
+  min-height: 58px;
+  padding: 10px 12px;
+  border: 1px solid #e7ecf3;
+  border-radius: 8px;
+  background: #fbfdff;
+  color: #303133;
+  text-align: left;
+  cursor: pointer;
+  transition: border-color 0.15s ease, background 0.15s ease, box-shadow 0.15s ease;
+}
+
+.page-menu-item.active .page-menu-select {
+  border-color: #409eff;
+  background: #ecf5ff;
+  box-shadow: 0 0 0 2px rgba(64, 158, 255, 0.08);
+}
+
+.page-menu-select span {
+  overflow: hidden;
+  color: #909399;
+  font-size: 12px;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.page-menu-delete {
+  position: absolute;
+  top: 6px;
+  right: 6px;
+  display: inline-grid;
+  place-items: center;
+  width: 22px;
+  height: 22px;
+  padding: 0;
+  border: 0;
+  border-radius: 50%;
+  background: transparent;
+  color: #98a2b3;
+  opacity: 0;
+  cursor: pointer;
+}
+
+.page-menu-item:hover .page-menu-delete,
+.page-menu-delete:focus-visible {
+  opacity: 1;
+}
+
+.page-menu-delete:hover {
+  background: #fee2e2;
+  color: #d92d20;
+}
+
+.page-menu-add {
+  place-items: center;
+  min-width: 110px;
+  color: #2563eb;
+  font-weight: 600;
+}
+
+.designer-grid {
+  display: grid;
+  grid-template-columns: 240px minmax(0, 1fr) 320px;
+  gap: 16px;
+}
+
+.material-pane,
+.canvas,
+.property-pane {
+  min-width: 0;
+}
+
+.material-pane {
+  display: grid;
+  align-content: start;
+  gap: 12px;
+}
+
+.quick-actions,
+.associated-page-list,
+.menu-config-list {
+  display: grid;
+  gap: 8px;
+}
+
+.associated-page-list button,
+.quick-actions button {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 8px;
+  min-height: 36px;
+  padding: 8px 10px;
+  border: 1px solid #e7ecf3;
+  border-radius: 6px;
+  background: #fff;
+  color: #303133;
+  text-align: left;
+  cursor: pointer;
+}
+
+.associated-page-list small {
+  color: #909399;
+  white-space: nowrap;
+}
+
+.associated-page-list button {
+  display: grid;
+  justify-content: stretch;
+  gap: 3px;
+}
+
+.associated-page-list button span,
+.associated-page-list button small {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.associated-page-list button.active {
+  border-color: #409eff;
+  background: #ecf5ff;
+  color: #1d4ed8;
+}
+
+.quick-actions {
+  grid-template-columns: repeat(2, minmax(0, 1fr));
+}
+
+.quick-actions button {
+  justify-content: center;
+  color: #2563eb;
+  font-weight: 700;
+}
+
+.band-title small,
+.matrix-head small {
+  color: #909399;
+  font-size: 12px;
+}
+
+.canvas {
+  display: grid;
+  align-content: start;
+  gap: 12px;
+  overflow: visible;
+}
+
+.canvas-page-menu {
+  position: relative;
+  z-index: 5;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 16px;
+  min-height: 64px;
+  padding: 10px 14px;
+  border: 1px solid #e7ecf3;
+  border-radius: 8px;
+  background: #fff;
+  box-shadow: 0 10px 24px rgba(15, 23, 42, 0.06);
+  cursor: pointer;
+}
+
+.canvas-page-menu.active {
+  border-color: #409eff;
+  box-shadow: 0 0 0 2px rgba(64, 158, 255, 0.12);
+}
+
+.canvas-menu-brand {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  min-width: 126px;
+  white-space: nowrap;
+}
+
+.canvas-menu-brand span {
+  display: inline-grid;
+  place-items: center;
+  width: 32px;
+  height: 32px;
+  border-radius: 8px;
+  background: #14532d;
+  color: #fff;
+  font-size: 12px;
+  font-weight: 800;
+}
+
+.canvas-menu-brand strong {
+  color: #172033;
+  font-size: 15px;
+}
+
+.canvas-page-menu-bar {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 4px;
+  min-width: 0;
+  flex: 1;
+}
+
+.canvas-menu-group {
+  display: inline-flex;
+  align-items: center;
+  position: relative;
+  border-radius: 6px;
+}
+
+.canvas-menu-parent,
+.canvas-menu-toggle {
+  min-height: 38px;
+  border: 0;
+  background: transparent;
+  color: #344054;
+  font-weight: 700;
+  white-space: nowrap;
+}
+
+.canvas-menu-parent {
+  padding: 0 12px;
+  border-radius: 6px;
+}
+
+.canvas-menu-group.has-children .canvas-menu-parent {
+  border-radius: 6px 0 0 6px;
+}
+
+.canvas-menu-toggle {
+  display: inline-grid;
+  width: 30px;
+  place-items: center;
+  border-radius: 0 6px 6px 0;
+}
+
+.canvas-menu-group.active .canvas-menu-parent,
+.canvas-menu-parent:hover,
+.canvas-menu-toggle:hover {
+  background: #eef6ff;
+  color: #2563eb;
+}
+
+.canvas-menu-dropdown {
+  position: absolute;
+  top: 44px;
+  left: 0;
+  display: none;
+  min-width: 190px;
+  padding: 8px;
+  border: 1px solid #e7ecf3;
+  border-radius: 8px;
+  background: #fff;
+  box-shadow: 0 16px 36px rgba(15, 23, 42, 0.14);
+}
+
+.canvas-menu-group.open .canvas-menu-dropdown {
+  display: grid;
+  gap: 4px;
+}
+
+.canvas-menu-child {
+  display: grid;
+  gap: 2px;
+  width: 100%;
+  min-height: 38px;
+  padding: 6px 10px;
+  border: 0;
+  border-radius: 6px;
+  background: #fff;
+  color: #344054;
+  text-align: left;
+}
+
+.canvas-menu-child.active,
+.canvas-menu-child:hover {
+  background: #ecf5ff;
+  color: #1d4ed8;
+}
+
+.canvas-menu-child span,
+.canvas-menu-child small {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.canvas-menu-child small {
+  color: #909399;
+}
+
+.canvas-menu-empty {
+  color: #98a2b3;
+  font-size: 12px;
+  white-space: nowrap;
+}
+
+.layout-preview-head,
+.restore-bar {
+  display: flex;
+  align-items: flex-start;
+  justify-content: space-between;
+  gap: 12px;
+  padding: 12px 14px;
+  border: 1px solid #e7ecf3;
+  border-radius: 8px;
+  background: #fff;
+}
+
+.restore-bar {
+  align-items: center;
+  justify-content: flex-start;
+  flex-wrap: wrap;
+}
+
+.restore-bar > span {
+  color: #667085;
+  font-size: 12px;
+}
+
+.layout-preview-head > div {
+  display: grid;
+  gap: 4px;
+}
+
+.layout-preview-head strong {
+  color: #172033;
+  font-size: 14px;
+}
+
+.layout-preview-head span,
+.layout-help {
+  margin: 0;
+  color: #667085;
+  font-size: 12px;
+  line-height: 1.5;
+}
+
+.canvas-band,
+.property-pane,
+.material-section,
+.add-content-materials,
+.associated-page-materials,
+.canvas-menu-config,
+.palette-panel {
+  padding: 16px;
+  border: 1px solid #e7ecf3;
+  border-radius: 8px;
+  background: #fbfdff;
+}
+
+.chip-row,
+.table-preview,
+.action-row,
+.table-actions {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+  margin-top: 12px;
+}
+
+.drop-zone.empty {
+  min-height: 42px;
+  align-items: center;
+  justify-content: center;
+  border: 1px dashed #cbd5e1;
+  border-radius: 8px;
+  color: #94a3b8;
+}
+
+.drop-hint,
+.drop-zone em {
+  color: #94a3b8;
+  font-size: 12px;
+  font-style: normal;
+}
+
+.field-chip,
+.table-preview > span,
+.action-chip,
+.card-field-chip,
+.card-actions button,
+.table-actions button,
+.material-section :deep(.palette-item),
+.palette-list button {
+  min-height: 32px;
+  padding: 6px 10px;
+  border: 1px solid #dcdfe6;
+  border-radius: 4px;
+  background: #fff;
+  color: #303133;
+  cursor: grab;
+}
+
+.field-chip,
+.table-preview > span,
+.card-field-chip {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  gap: 6px;
+}
+
+.action-chip,
+.card-actions button,
+.table-actions button {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  gap: 6px;
+}
+
+.table-actions {
+  width: 100%;
+  padding: 8px;
+  border: 1px dashed #d8e1ec;
+  border-radius: 8px;
+  background: #f8fbff;
+}
+
+.table-actions button {
+  min-width: 88px;
+}
+
+.chip-remove {
+  display: inline-grid;
+  flex: 0 0 auto;
+  place-items: center;
+  width: 16px;
+  height: 16px;
+  border-radius: 50%;
+  color: #98a2b3;
+  cursor: pointer;
+}
+
+.chip-remove:hover {
+  background: #fee2e2;
+  color: #d92d20;
+}
+
+.chip-remove .el-icon {
+  font-size: 12px;
+}
+
+.table-band {
+  min-height: 180px;
+}
+
+.layout-preview-card {
+  background: #f9fbff;
+}
+
+.card-canvas {
+  display: grid;
+  grid-template-columns: repeat(3, minmax(0, 1fr));
+  gap: 10px;
+  margin-top: 12px;
+}
+
+.card-preview-item {
+  display: grid;
+  gap: 8px;
+  min-height: 210px;
+  padding: 12px;
+  border: 1px solid #e7ecf3;
+  border-radius: 8px;
+  background: #fff;
+}
+
+.card-image-slot {
+  display: grid;
+  place-items: center;
+  min-height: 72px;
+  border-radius: 6px;
+  background: #e8f3ff;
+  color: #2563eb;
+  font-size: 12px;
+}
+
+.card-image-slot.empty {
+  border: 1px dashed #cbd5e1;
+  background: #f8fafc;
+  color: #94a3b8;
+}
+
+.card-title-slot {
+  color: #172033;
+  font-size: 14px;
+  cursor: grab;
+}
+
+.card-field-list,
+.card-actions {
+  display: grid;
+  gap: 6px;
+}
+
+.card-field-chip {
+  color: #667085;
+  font-size: 12px;
+  cursor: grab;
+}
+
+.card-actions {
+  grid-template-columns: repeat(2, minmax(0, 1fr));
+}
+
+.split-preview {
+  display: grid;
+  grid-template-columns: 130px minmax(0, 1fr);
+  gap: 10px;
+  margin-top: 12px;
+}
+
+.split-sidebar {
+  display: grid;
+  align-content: start;
+  gap: 8px;
+  padding: 10px;
+  border: 1px solid #e7ecf3;
+  border-radius: 8px;
+  background: #fff;
+}
+
+.split-sidebar span {
+  overflow: hidden;
+  color: #667085;
+  font-size: 12px;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.form-preview {
+  display: grid;
+  gap: 10px;
+  margin-top: 12px;
+}
+
+.form-preview label {
+  display: grid;
+  grid-template-columns: 110px minmax(0, 1fr) auto;
+  align-items: center;
+  gap: 10px;
+  cursor: grab;
+}
+
+.property-pane {
+  display: grid;
+  align-content: start;
+  gap: 14px;
+}
+
+.field-matrix,
+.action-editor,
+.material-section,
+.add-content-materials,
+.associated-page-materials,
+.canvas-menu-config,
+.palette-panel {
+  display: grid;
+  gap: 10px;
+}
+
+.business-block-config-panel {
+  background: #fff;
+}
+
+.canvas-menu-config {
+  background: #fff;
+}
+
+.menu-config-row {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 10px;
+  min-height: 36px;
+  padding: 8px 10px;
+  border: 1px solid #e7ecf3;
+  border-radius: 6px;
+  background: #fbfdff;
+}
+
+.menu-config-row span {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.menu-config-row small {
+  color: #909399;
+  white-space: nowrap;
+}
+
+.embedded-block-band {
+  background: #fff;
+}
+
+.embedded-block-list {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+  margin-top: 12px;
+}
+
+.embedded-block-chip {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  gap: 8px;
+  min-height: 34px;
+  padding: 7px 10px;
+  border: 1px solid #dcdfe6;
+  border-radius: 4px;
+  background: #fff;
+  color: #303133;
+  cursor: grab;
+}
+
+.embedded-block-chip.active {
+  border-color: #409eff;
+  background: #ecf5ff;
+  color: #1d4ed8;
+}
+
+.palette-list {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+}
+
+.material-empty {
+  color: #98a2b3;
+  font-size: 12px;
+  line-height: 32px;
+}
+
+.business-materials :deep(.block-palette) {
+  gap: 10px;
+}
+
+.business-materials :deep(.palette-title) {
+  display: none;
+}
+
+.action-palette button {
+  color: #2563eb;
+}
+
+.field-row {
+  display: grid;
+  grid-template-columns: minmax(0, 1fr) 42px 42px 42px;
+  align-items: center;
+  gap: 6px;
+}
+
+.field-row > span {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.json-input {
+  margin-top: 10px;
+}
+
+@media (max-width: 1180px) {
+  .designer-grid {
+    grid-template-columns: 200px minmax(0, 1fr);
+  }
+
+  .property-pane {
+    grid-column: 1 / -1;
+  }
+}
+
+@media (max-width: 760px) {
+  .designer-grid {
+    grid-template-columns: 1fr;
+  }
+
+  .canvas-page-menu {
+    align-items: stretch;
+    flex-direction: column;
+  }
+
+  .canvas-page-menu-bar {
+    justify-content: flex-start;
+    overflow-x: auto;
+  }
+
+  .card-canvas,
+  .split-preview {
+    grid-template-columns: 1fr;
+  }
+
+  .designer-head {
+    align-items: stretch;
+    flex-direction: column;
+  }
+
+  .head-actions {
+    justify-content: flex-start;
+  }
+}
+</style>
diff --git a/RuoYi-Vue/easycode-web/src/components/frontendPageDesigner.test.mjs b/RuoYi-Vue/easycode-web/src/components/frontendPageDesigner.test.mjs
new file mode 100644
index 0000000..d42e3fa
--- /dev/null
+++ b/RuoYi-Vue/easycode-web/src/components/frontendPageDesigner.test.mjs
@@ -0,0 +1,267 @@
+import test from 'node:test'
+import assert from 'node:assert/strict'
+import { existsSync, readFileSync } from 'node:fs'
+import { fileURLToPath } from 'node:url'
+import { dirname, resolve } from 'node:path'
+
+const currentDir = dirname(fileURLToPath(import.meta.url))
+const srcDir = resolve(currentDir, '..')
+
+function readSource(relativePath) {
+  return readFileSync(resolve(srcDir, relativePath), 'utf8')
+}
+
+test('project api exposes frontend page design endpoints', () => {
+  const source = readSource('api/project.js')
+
+  assert.equal(source.includes('export function listPageDesigns'), true)
+  assert.equal(source.includes('export function initPageDesigns'), true)
+  assert.equal(source.includes('export function createPageDesign'), true)
+  assert.equal(source.includes('export function getPageDesign'), true)
+  assert.equal(source.includes('export function savePageDesign'), true)
+  assert.equal(source.includes('export function deletePageDesign'), true)
+  assert.equal(source.includes('export function listBusinessBlocks'), true)
+  assert.equal(source.includes('/page-designs/init'), true)
+  assert.equal(source.includes('url: `/front/project/${projectId}/page-designs`'), true)
+  assert.equal(source.includes('/business-blocks'), true)
+  assert.equal(source.includes('scope = \'frontend\''), true)
+  assert.equal(source.includes('params: { scope }'), true)
+})
+
+test('frontend page designer edits layouts and emits saves', () => {
+  assert.equal(existsSync(resolve(srcDir, 'components/FrontendPageDesigner.vue')), true)
+  const source = readSource('components/FrontendPageDesigner.vue')
+
+  assert.equal(source.includes('defineEmits'), true)
+  assert.equal(source.includes('update:designs'), true)
+  assert.equal(source.includes('dirty-change'), true)
+  assert.equal(source.includes('save-design'), true)
+  assert.equal(source.includes('create-design'), true)
+  assert.equal(source.includes('delete-design'), true)
+  assert.equal(source.includes('init-designs'), true)
+  assert.equal(source.includes('layoutJson'), true)
+  assert.equal(source.includes('actionJson'), true)
+  assert.equal(source.includes('draggable="true"'), true)
+  assert.equal(source.includes('function commitCurrentDraft'), true)
+  assert.equal(source.includes('defineExpose'), true)
+})
+
+test('frontend page designer reports local draft edits as dirty before commit', () => {
+  const source = readSource('components/FrontendPageDesigner.vue')
+
+  assert.equal(source.includes('function markDirty'), true)
+  assert.equal(source.includes("emit('dirty-change', true)"), true)
+  assert.equal(source.includes('const suppressDirty = ref(false)'), true)
+  assert.equal(source.includes('syncJson({ silent: true })'), true)
+  assert.equal(source.includes('v-model="draft.pageName" @input="markDirty"'), true)
+  assert.equal(source.includes('v-model="draft.routePath" @input="markDirty"'), true)
+})
+
+test('frontend page designer renders page navigation as a normal menu inside the canvas', () => {
+  const source = readSource('components/FrontendPageDesigner.vue')
+
+  assert.equal(source.includes('<nav class="page-menu"'), false)
+  assert.equal(source.includes('class="canvas-page-menu"'), true)
+  assert.equal(source.includes('class="canvas-page-menu-bar"'), true)
+  assert.equal(source.includes('v-for="group in pageMenuGroups"'), true)
+  assert.equal(source.includes('@click.stop="selectMenuPage(child)"'), true)
+  assert.equal(source.includes('@click.stop="selectMenuGroup(group)"'), true)
+  assert.equal(source.includes('@click.stop="toggleMenuGroup(group.key)"'), true)
+  assert.equal(source.includes('class="canvas-menu-config"'), true)
+  assert.equal(source.includes('function selectMenuConfig'), true)
+  assert.equal(source.includes('const pageMenuGroups = computed'), true)
+})
+
+test('frontend page designer hides associated pages from the final menu while keeping them editable', () => {
+  const source = readSource('components/FrontendPageDesigner.vue')
+
+  assert.equal(source.includes('const editableMenuPages = computed'), true)
+  assert.equal(source.includes('const associatedPages = computed'), true)
+  assert.equal(source.includes('const visibleAssociatedPages = computed'), true)
+  assert.equal(source.includes('selectedMenuGroup.value?.children.length'), true)
+  assert.equal(source.includes('shouldShowInMenu'), true)
+  assert.equal(source.includes('isAssociatedPageType'), true)
+  assert.equal(readSource('utils/pageDesignerMenu.js').includes('pageType === \'detail\''), true)
+  assert.equal(source.includes('v-for="group in pageMenuGroups"'), true)
+  assert.equal(source.includes('buildPageMenuGroups(editableMenuPages.value, { mode: activeMode() })'), true)
+  assert.equal(source.includes('关联页面'), true)
+  assert.equal(source.includes('v-for="design in visibleAssociatedPages"'), true)
+  assert.equal(source.includes('v-model="navigationConfig.showInMenu"'), true)
+  assert.equal(source.includes('显示在菜单'), true)
+})
+
+test('frontend page designer selects primary page from menu label while arrow toggles children', () => {
+  const source = readSource('components/FrontendPageDesigner.vue')
+  const functionStart = source.indexOf('function selectMenuGroup(group)')
+  const functionEnd = source.indexOf('function selectMenuPage', functionStart)
+  const functionBody = source.slice(functionStart, functionEnd)
+
+  assert.equal(source.includes('@click.stop="selectMenuGroup(group)"'), true)
+  assert.equal(source.includes('@click.stop="toggleMenuGroup(group.key)"'), true)
+  assert.match(functionBody, /if \(group\?\.primary\)[\s\S]*?selectDesign\(group\.primary\)[\s\S]*?return/)
+  assert.equal(functionBody.indexOf('if (group?.primary)') < functionBody.indexOf('if (group?.children?.length)'), true)
+})
+
+test('frontend page designer keeps menu display name separate from page name', () => {
+  const source = readSource('components/FrontendPageDesigner.vue')
+
+  assert.equal(source.includes('菜单显示名称'), true)
+  assert.equal(source.includes('v-model="navigationConfig.menuName"'), true)
+  assert.equal(source.includes("currentMenuLevel === 'primary'"), true)
+})
+
+test('frontend page designer keeps left side focused on adding materials', () => {
+  const source = readSource('components/FrontendPageDesigner.vue')
+
+  assert.equal(source.includes('class="add-content-materials"'), true)
+  assert.equal(source.includes('@click="addPageDesign(\'primary\')"'), true)
+  assert.equal(source.includes('@click="addPageDesign(\'secondary\')"'), true)
+  assert.equal(source.includes('class="material-pane"'), true)
+  assert.equal(source.includes('class="material-section field-materials"'), true)
+  assert.equal(source.includes('class="material-section action-materials"'), true)
+  assert.equal(source.includes('v-if="isBusinessBlockLayout" class="material-section business-materials"'), true)
+  assert.equal(source.includes('<aside class="page-list">'), false)
+})
+
+test('frontend page designer removes redundant structure and canvas action blocks', () => {
+  const source = readSource('components/FrontendPageDesigner.vue')
+
+  assert.equal(source.includes('class="structure-materials"'), false)
+  assert.equal(source.includes('当前页面结构'), false)
+  assert.equal(source.includes('v-for="item in pageStructureItems"'), false)
+  assert.equal(source.includes('class="canvas-menu-actions"'), false)
+  assert.equal(source.includes('.canvas-menu-actions'), false)
+})
+
+test('frontend page designer does not commit stale draft while reconciling deleted pages', () => {
+  const source = readSource('components/FrontendPageDesigner.vue')
+
+  assert.equal(source.includes('function selectDesign(design, shouldCommit = true)'), true)
+  assert.equal(source.includes('if (shouldCommit && draft.value && selectedKey.value && nextKey !== selectedKey.value)'), true)
+  assert.equal(source.includes('selectDesign(selected, false)'), true)
+})
+
+test('frontend page designer keeps right pane focused on selected configuration', () => {
+  const source = readSource('components/FrontendPageDesigner.vue')
+  const propertyPaneStart = source.indexOf('<aside class="property-pane">')
+  const propertyPaneEnd = source.indexOf('</aside>', propertyPaneStart)
+  const propertyPane = source.slice(propertyPaneStart, propertyPaneEnd)
+
+  assert.equal(propertyPane.includes('field-matrix'), false)
+  assert.equal(propertyPane.includes('action-editor'), false)
+  assert.equal(propertyPane.includes('字段池'), false)
+  assert.equal(propertyPane.includes('按钮池'), false)
+  assert.equal(source.includes('function addPageDesign'), true)
+  assert.equal(source.includes('pendingSelectPageCode'), true)
+})
+
+test('frontend page designer delegates business block pages without replacing normal layouts', () => {
+  const source = readSource('components/FrontendPageDesigner.vue')
+
+  assert.equal(source.includes("import BusinessBlockDesigner from '@/components/business-blocks/BusinessBlockDesigner.vue'"), true)
+  assert.equal(source.includes("import BlockConfigForm from '@/components/business-blocks/BlockConfigForm.vue'"), true)
+  assert.equal(source.includes("blockDefinitions: { type: Array, default: () => [] }"), true)
+  assert.equal(source.includes('business-blocks-v1'), true)
+  assert.equal(source.includes('isBusinessBlockLayout'), true)
+  assert.equal(source.includes('<BusinessBlockDesigner'), true)
+  assert.equal(source.includes(':show-config="false"'), true)
+  assert.equal(source.includes(':show-palette="false"'), true)
+  assert.equal(source.includes('@select-block="handleBusinessBlockSelect"'), true)
+  assert.equal(source.includes('addBusinessBlock'), true)
+  assert.equal(source.includes('business-block-config-panel'), true)
+  assert.equal(source.includes('updateSelectedBusinessBlockConfig'), true)
+  assert.equal(source.includes('applyBusinessBlockLayoutJson'), true)
+})
+
+test('frontend page designer supports embedded business blocks on normal pages', () => {
+  const source = readSource('components/FrontendPageDesigner.vue')
+
+  assert.equal(source.includes('embedded-business-materials'), true)
+  assert.equal(source.includes('embedded-block-band'), true)
+  assert.equal(source.includes('embeddedBlocks'), true)
+  assert.equal(source.includes('embeddedBlockDefinitions'), true)
+  assert.equal(source.includes('function addEmbeddedBusinessBlock'), true)
+  assert.equal(source.includes('function dropEmbeddedBusinessBlock'), true)
+  assert.equal(source.includes('function removeEmbeddedBusinessBlock'), true)
+  assert.equal(source.includes('selectedBusinessBlockZone'), true)
+  assert.equal(source.includes("placement === 'embedded'"), true)
+  assert.equal(source.includes('v-if="selectedBusinessBlock || isBusinessBlockLayout"'), true)
+})
+
+test('frontend page designer can switch copy and defaults for admin mode', () => {
+  const source = readSource('components/FrontendPageDesigner.vue')
+
+  assert.equal(source.includes('mode: { type: String, default: \'frontend\' }'), true)
+  assert.equal(source.includes('后台页面设计'), true)
+  assert.equal(source.includes('先从后台菜单和数据表初始化后台页面设计'), true)
+  assert.equal(source.includes('admin-list-v1'), true)
+  assert.equal(source.includes('admin-list-dense-v1'), true)
+  assert.equal(source.includes('designerCopy'), true)
+})
+
+test('frontend page designer exposes page-type scoped layout choices', () => {
+  const source = readSource('components/FrontendPageDesigner.vue')
+
+  assert.equal(source.includes('布局类型'), true)
+  assert.equal(source.includes('layoutOptionsByPageType'), true)
+  assert.equal(source.includes('frontend-list-card-v1'), true)
+  assert.equal(source.includes('frontend-current-user-card-v1'), true)
+  assert.equal(source.includes('frontend-detail-media-v1'), true)
+  assert.equal(source.includes('frontend-form-group-v1'), true)
+  assert.equal(source.includes('@change="selectLayout"'), true)
+})
+
+test('frontend page designer supports visual canvas regions and palette dragging', () => {
+  const source = readSource('components/FrontendPageDesigner.vue')
+
+  assert.equal(source.includes('字段池'), true)
+  assert.equal(source.includes('按钮池'), true)
+  assert.equal(source.includes('删除区域'), true)
+  assert.equal(source.includes('region-materials'), true)
+  assert.equal(source.includes('图片字段'), true)
+  assert.equal(source.includes('dropPaletteField'), true)
+  assert.equal(source.includes('dropAction'), true)
+  assert.equal(source.includes('cardRegion'), true)
+  assert.equal(source.includes('setRegionVisible'), true)
+})
+
+test('frontend page designer lets placed action buttons be removed', () => {
+  const source = readSource('components/FrontendPageDesigner.vue')
+
+  assert.equal(source.includes('function removeAction'), true)
+  assert.equal(source.includes("removeAction('toolbar', index)"), true)
+  assert.equal(source.includes("removeAction('cardActions', actionIndex)"), true)
+  assert.equal(source.includes("removeAction('table', actionIndex)"), true)
+  assert.equal(source.includes('class="chip-remove"'), true)
+})
+
+test('frontend page designer lets placed fields be removed from canvas regions', () => {
+  const source = readSource('components/FrontendPageDesigner.vue')
+
+  assert.equal(source.includes('function removeRegionField'), true)
+  assert.equal(source.includes("removeRegionField('query', index)"), true)
+  assert.equal(source.includes("removeRegionField('table', index)"), true)
+  assert.equal(source.includes("removeRegionField('card', fieldIndex)"), true)
+  assert.equal(source.includes("removeRegionField('form', index)"), true)
+  assert.equal(source.includes('title="删除字段"'), true)
+})
+
+test('frontend page designer exposes row action drop zones in non-card layouts', () => {
+  const source = readSource('components/FrontendPageDesigner.vue')
+
+  assert.equal(source.includes('class="table-actions drop-zone"'), true)
+  assert.equal(source.includes("dropAction('table')"), true)
+  assert.equal(source.includes("dropAction('table', actionIndex)"), true)
+  assert.equal(source.includes("startRegionActionDrag('table', actionIndex)"), true)
+})
+
+test('frontend page designer exposes business actions in the draggable action palette', () => {
+  const source = readSource('components/FrontendPageDesigner.vue')
+
+  assert.equal(source.includes('businessActionPalette'), true)
+  assert.equal(source.includes('sortBusinessActionPalette'), true)
+  assert.equal(source.includes('businessActionCode(action)'), true)
+  assert.equal(source.includes("`business:${action.code}`"), true)
+  assert.equal(source.includes('props.database?.businessActions'), true)
+  assert.equal(source.includes('action.ownerTable === draft.value?.tableName'), false)
+})
diff --git a/RuoYi-Vue/easycode-web/src/views/PageDesignerView.vue b/RuoYi-Vue/easycode-web/src/views/PageDesignerView.vue
new file mode 100644
index 0000000..1adb7e6
--- /dev/null
+++ b/RuoYi-Vue/easycode-web/src/views/PageDesignerView.vue
@@ -0,0 +1,464 @@
+<template>
+  <section class="designer-shell-page" v-loading="loading">
+    <header class="designer-topbar">
+      <div class="designer-title">
+        <span class="breadcrumb">{{ projectName || '项目' }} / 页面设计器</span>
+        <h1>{{ scopeTitle }}</h1>
+        <p>{{ scopeDescription }}</p>
+      </div>
+      <div class="designer-actions">
+        <span v-if="hasUnsavedChanges" class="dirty-badge">有未保存修改</span>
+        <el-button :disabled="!projectId" :loading="previewing" @click="handlePreview">预览页面</el-button>
+        <el-button type="primary" :disabled="!projectId" :loading="saving" @click="saveAllDesigns">保存设计</el-button>
+        <el-button @click="handleBack">返回工作台</el-button>
+      </div>
+    </header>
+
+    <section class="designer-toolbar">
+      <el-segmented v-model="scopeProxy" :options="scopeOptions" />
+      <div class="toolbar-meta">
+        <span>{{ pageDesigns.length }} 个页面</span>
+        <span>{{ database.tables.length }} 张数据表</span>
+      </div>
+    </section>
+
+    <el-alert
+      v-if="errorMessage"
+      class="designer-alert"
+      type="warning"
+      :title="errorMessage"
+      show-icon
+      :closable="false"
+    />
+
+    <div class="designer-card">
+      <FrontendPageDesigner
+        ref="designerRef"
+        :designs="pageDesigns"
+        :database="database"
+        :block-definitions="scope === 'frontend' ? businessBlockDefinitions : []"
+        :mode="scope"
+        :show-header="false"
+        :saving="saving"
+        :initializing="initializing"
+        @update:designs="handleDesignsUpdate"
+        @dirty-change="handleDirtyChange"
+        @init-designs="handleInitPageDesigns"
+        @create-design="handleCreatePageDesign"
+        @delete-design="handleDeletePageDesign"
+        @save-design="handleSavePageDesign"
+      />
+    </div>
+  </section>
+</template>
+
+<script setup>
+import { computed, onMounted, ref, watch } from 'vue'
+import { onBeforeRouteLeave, onBeforeRouteUpdate, useRoute, useRouter } from 'vue-router'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import FrontendPageDesigner from '@/components/FrontendPageDesigner.vue'
+import {
+  createPageDesign,
+  deletePageDesign,
+  generateProject,
+  getDatabase,
+  getProject,
+  initPageDesigns,
+  listBusinessBlocks,
+  listPageDesigns,
+  savePageDesign
+} from '@/api/project'
+
+const route = useRoute()
+const router = useRouter()
+
+const designerRef = ref(null)
+const loading = ref(false)
+const saving = ref(false)
+const initializing = ref(false)
+const previewing = ref(false)
+const errorMessage = ref('')
+const projectName = ref('')
+const database = ref({ tables: [], sql: '', erDiagram: emptyErDiagram(), businessActions: [] })
+const pageDesigns = ref([])
+const businessBlockDefinitions = ref([])
+const hasUnsavedChanges = ref(false)
+
+const projectId = computed(() => normalizeProjectId(route.params.projectId || route.query.projectId))
+const scope = computed(() => route.query.scope === 'admin' ? 'admin' : 'frontend')
+const scopeProxy = computed({
+  get: () => scope.value,
+  set: (value) => {
+    router.replace({
+      path: `/project/${projectId.value}/page-designer`,
+      query: { ...route.query, scope: value }
+    })
+  }
+})
+
+const scopeOptions = [
+  { label: '前台', value: 'frontend' },
+  { label: '后台', value: 'admin' }
+]
+
+const scopeTitle = computed(() => scope.value === 'admin' ? '后台页面设计' : '前台页面设计')
+const scopeDescription = computed(() => scope.value === 'admin'
+  ? '配置后台管理页的查询区、工具栏、表格列、表单字段、批量操作和行按钮。'
+  : '配置前台页面的字段、查询区、卡片列表、按钮和公告、轮播等业务块。')
+
+function emptyErDiagram() {
+  return {
+    positions: {},
+    relations: [],
+    deletedEdgeIds: []
+  }
+}
+
+function normalizeProjectId(value) {
+  const id = Number(value)
+  return Number.isFinite(id) && id > 0 ? id : null
+}
+
+function normalizeErDiagram(value) {
+  const source = value && typeof value === 'object' ? value : {}
+  return {
+    positions: source.positions && typeof source.positions === 'object' ? source.positions : {},
+    relations: Array.isArray(source.relations) ? source.relations : [],
+    deletedEdgeIds: Array.isArray(source.deletedEdgeIds) ? source.deletedEdgeIds : []
+  }
+}
+
+function normalizeDatabase(payload) {
+  const data = payload?.data || payload || {}
+  return {
+    tables: Array.isArray(data.tables) ? data.tables : [],
+    sql: data.sql || '',
+    erDiagram: normalizeErDiagram(data.erDiagram),
+    businessActions: Array.isArray(data.businessActions) ? data.businessActions : []
+  }
+}
+
+async function loadDesignerData() {
+  if (!projectId.value) {
+    errorMessage.value = '缺少项目 ID，请从工作台重新进入页面设计器'
+    return
+  }
+  loading.value = true
+  errorMessage.value = ''
+  try {
+    const [projectResult, databaseResult, designResult, blockResult] = await Promise.all([
+      getProject(projectId.value),
+      getDatabase(projectId.value),
+      listPageDesigns(projectId.value, scope.value),
+      listBusinessBlocks(projectId.value)
+    ])
+    projectName.value = projectResult?.projectName || ''
+    database.value = normalizeDatabase(databaseResult)
+    pageDesigns.value = Array.isArray(designResult) ? designResult : []
+    businessBlockDefinitions.value = Array.isArray(blockResult) ? blockResult : []
+    hasUnsavedChanges.value = false
+  } catch (error) {
+    errorMessage.value = error.message || '加载页面设计器失败'
+  } finally {
+    loading.value = false
+  }
+}
+
+function handleDesignsUpdate(designs) {
+  pageDesigns.value = Array.isArray(designs) ? designs : []
+  hasUnsavedChanges.value = true
+}
+
+function handleDirtyChange(isDirty) {
+  if (isDirty) {
+    hasUnsavedChanges.value = true
+  }
+}
+
+async function handleInitPageDesigns() {
+  if (!projectId.value) return
+  initializing.value = true
+  errorMessage.value = ''
+  try {
+    const result = await initPageDesigns(projectId.value, scope.value)
+    pageDesigns.value = Array.isArray(result?.designs) ? result.designs : []
+    if (!pageDesigns.value.length) {
+      const refreshed = await listPageDesigns(projectId.value, scope.value)
+      pageDesigns.value = Array.isArray(refreshed) ? refreshed : []
+    }
+    hasUnsavedChanges.value = false
+    ElMessage.success(`${scopeTitle.value}已初始化`)
+  } catch (error) {
+    errorMessage.value = error.message || `初始化${scopeTitle.value}失败`
+  } finally {
+    initializing.value = false
+  }
+}
+
+async function handleCreatePageDesign(design) {
+  if (!projectId.value) return
+  const wasDirty = hasUnsavedChanges.value
+  saving.value = true
+  errorMessage.value = ''
+  try {
+    const saved = await createPageDesign(projectId.value, design, scope.value)
+    pageDesigns.value = pageDesigns.value.concat(saved)
+    hasUnsavedChanges.value = wasDirty
+    ElMessage.success('页面已新增')
+  } catch (error) {
+    errorMessage.value = error.message || '新增页面失败'
+  } finally {
+    saving.value = false
+  }
+}
+
+async function handleSavePageDesign(design) {
+  if (!projectId.value || !design?.designId) return
+  saving.value = true
+  errorMessage.value = ''
+  try {
+    const saved = await savePageDesign(projectId.value, design.designId, design, scope.value)
+    replacePageDesign(saved)
+    hasUnsavedChanges.value = false
+    ElMessage.success('页面设计已保存')
+  } catch (error) {
+    errorMessage.value = error.message || '保存页面设计失败'
+  } finally {
+    saving.value = false
+  }
+}
+
+async function handleDeletePageDesign(design) {
+  if (!projectId.value || !design?.designId) return
+  const confirmed = await confirmDeletePage(design)
+  if (!confirmed) return
+  const wasDirty = hasUnsavedChanges.value
+  saving.value = true
+  errorMessage.value = ''
+  try {
+    await deletePageDesign(projectId.value, design.designId, scope.value)
+    removePageDesign(design)
+    hasUnsavedChanges.value = wasDirty
+    ElMessage.success('页面已删除')
+  } catch (error) {
+    if (shouldRemoveMissingPage(error)) {
+      removePageDesign(design)
+      ElMessage.warning('页面已不存在，已从列表移除')
+      return
+    }
+    errorMessage.value = error.message || '删除页面失败'
+  } finally {
+    saving.value = false
+  }
+}
+
+function replacePageDesign(saved) {
+  pageDesigns.value = pageDesigns.value.map((item) => {
+    const sameDesign = String(item.designId || item.pageCode) === String(saved.designId || saved.pageCode)
+    return sameDesign ? saved : item
+  })
+}
+
+function removePageDesign(deleted) {
+  pageDesigns.value = pageDesigns.value.filter((item) => {
+    return String(item.designId || item.pageCode) !== String(deleted.designId || deleted.pageCode)
+  })
+}
+
+function shouldRemoveMissingPage(error) {
+  const message = String(error?.message || '')
+  return message.includes('不存在') || message.includes('无权限') || message.includes('404')
+}
+
+async function confirmDeletePage(design) {
+  try {
+    await ElMessageBox.confirm(`确认删除页面“${design.pageName || design.pageCode}”？`, '删除页面', {
+      type: 'warning',
+      confirmButtonText: '删除',
+      cancelButtonText: '取消'
+    })
+    return true
+  } catch (error) {
+    return false
+  }
+}
+
+async function saveAllDesigns() {
+  if (!projectId.value) return
+  designerRef.value?.commitCurrentDraft?.()
+  const pendingDesigns = pageDesigns.value.filter((design) => design?.designId)
+  if (!pendingDesigns.length) {
+    hasUnsavedChanges.value = false
+    return
+  }
+  saving.value = true
+  errorMessage.value = ''
+  try {
+    for (const design of pendingDesigns) {
+      const saved = await savePageDesign(projectId.value, design.designId, design, scope.value)
+      replacePageDesign(saved)
+    }
+    hasUnsavedChanges.value = false
+    ElMessage.success('页面设计已保存')
+  } catch (error) {
+    errorMessage.value = error.message || '保存页面设计失败'
+    throw error
+  } finally {
+    saving.value = false
+  }
+}
+
+async function handlePreview() {
+  if (!projectId.value) return
+  previewing.value = true
+  try {
+    await saveAllDesigns()
+    await generateProject(projectId.value)
+    router.push(`/project/${projectId.value}/preview`)
+  } catch (error) {
+    errorMessage.value = error.message || '生成预览失败'
+  } finally {
+    previewing.value = false
+  }
+}
+
+async function confirmLeaveDirty() {
+  if (!hasUnsavedChanges.value) return true
+  try {
+    await ElMessageBox.confirm('当前页面设计有未保存修改，确认离开吗？', '未保存修改', {
+      type: 'warning',
+      confirmButtonText: '离开',
+      cancelButtonText: '继续编辑'
+    })
+    return true
+  } catch (error) {
+    return false
+  }
+}
+
+async function handleBack() {
+  router.push({ path: '/generate', query: { projectId: projectId.value } })
+}
+
+watch(
+  () => [projectId.value, scope.value],
+  () => {
+    loadDesignerData()
+  }
+)
+
+onMounted(loadDesignerData)
+
+onBeforeRouteLeave(async () => {
+  return confirmLeaveDirty()
+})
+
+onBeforeRouteUpdate(async () => {
+  return confirmLeaveDirty()
+})
+</script>
+
+<style scoped lang="scss">
+.designer-shell-page {
+  display: grid;
+  gap: 14px;
+  min-height: calc(100vh - 76px);
+  padding: 20px;
+  background: #f4f7fb;
+}
+
+.designer-topbar,
+.designer-toolbar,
+.designer-card {
+  border: 1px solid #dfe6f0;
+  border-radius: 8px;
+  background: #fff;
+}
+
+.designer-topbar {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 18px;
+  padding: 16px 18px;
+}
+
+.designer-title {
+  display: grid;
+  gap: 4px;
+}
+
+.breadcrumb {
+  color: #667085;
+  font-size: 13px;
+}
+
+.designer-title h1 {
+  margin: 0;
+  color: #172033;
+  font-size: 22px;
+}
+
+.designer-title p {
+  margin: 0;
+  color: #667085;
+  line-height: 1.45;
+}
+
+.designer-actions,
+.designer-toolbar,
+.toolbar-meta {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  flex-wrap: wrap;
+}
+
+.designer-actions {
+  justify-content: flex-end;
+}
+
+.designer-toolbar {
+  justify-content: space-between;
+  padding: 10px 14px;
+}
+
+.toolbar-meta {
+  color: #667085;
+  font-size: 13px;
+}
+
+.dirty-badge {
+  padding: 5px 9px;
+  border-radius: 999px;
+  background: #fff8e6;
+  color: #b7791f;
+  font-size: 12px;
+  font-weight: 700;
+}
+
+.designer-alert {
+  border-radius: 8px;
+}
+
+.designer-card {
+  min-height: 0;
+  overflow: hidden;
+}
+
+.designer-card :deep(.page-designer-body) {
+  padding: 16px;
+}
+
+@media (max-width: 860px) {
+  .designer-topbar,
+  .designer-toolbar {
+    align-items: stretch;
+    flex-direction: column;
+  }
+
+  .designer-actions {
+    justify-content: flex-start;
+  }
+}
+</style>
diff --git a/RuoYi-Vue/easycode-web/src/views/pageDesignerView.test.mjs b/RuoYi-Vue/easycode-web/src/views/pageDesignerView.test.mjs
new file mode 100644
index 0000000..fea2222
--- /dev/null
+++ b/RuoYi-Vue/easycode-web/src/views/pageDesignerView.test.mjs
@@ -0,0 +1,64 @@
+import test from 'node:test'
+import assert from 'node:assert/strict'
+import { existsSync, readFileSync } from 'node:fs'
+import { fileURLToPath } from 'node:url'
+import { dirname, resolve } from 'node:path'
+
+const currentDir = dirname(fileURLToPath(import.meta.url))
+const srcDir = resolve(currentDir, '..')
+
+function readSource(relativePath) {
+  return readFileSync(resolve(srcDir, relativePath), 'utf8')
+}
+
+test('router exposes standalone page designer route', () => {
+  const routerSource = readSource('router/index.js')
+
+  assert.equal(routerSource.includes("import PageDesignerView from '@/views/PageDesignerView.vue'"), true)
+  assert.equal(routerSource.includes("path: '/project/:projectId/page-designer'"), true)
+  assert.equal(routerSource.includes("name: 'page-designer'"), true)
+  assert.equal(routerSource.includes('component: PageDesignerView'), true)
+})
+
+test('standalone page designer wraps the focused designer component', () => {
+  assert.equal(existsSync(resolve(srcDir, 'views/PageDesignerView.vue')), true)
+  const source = readSource('views/PageDesignerView.vue')
+
+  assert.equal(source.includes("import FrontendPageDesigner from '@/components/FrontendPageDesigner.vue'"), true)
+  assert.equal(source.includes('<FrontendPageDesigner'), true)
+  assert.equal(source.includes(':show-header="false"'), true)
+  assert.equal(source.includes('designer-shell-page'), true)
+  assert.equal(source.includes('designer-topbar'), true)
+  assert.equal(source.includes('保存设计'), true)
+  assert.equal(source.includes('返回工作台'), true)
+  assert.equal(source.includes('预览页面'), true)
+})
+
+test('standalone page designer loads scope-specific designs and business blocks', () => {
+  const source = readSource('views/PageDesignerView.vue')
+
+  assert.equal(source.includes('const scope = computed'), true)
+  assert.equal(source.includes("route.query.scope === 'admin'"), true)
+  assert.equal(source.includes('listPageDesigns(projectId.value, scope.value)'), true)
+  assert.equal(source.includes('listBusinessBlocks(projectId.value)'), true)
+  assert.equal(source.includes('initPageDesigns(projectId.value, scope.value)'), true)
+  assert.equal(source.includes('createPageDesign(projectId.value, design, scope.value)'), true)
+  assert.equal(source.includes('savePageDesign(projectId.value, design.designId, design, scope.value)'), true)
+  assert.equal(source.includes('deletePageDesign(projectId.value, design.designId, scope.value)'), true)
+})
+
+test('standalone page designer guards dirty local edits across scope route changes', () => {
+  const source = readSource('views/PageDesignerView.vue')
+
+  assert.equal(source.includes('@dirty-change="handleDirtyChange"'), true)
+  assert.equal(source.includes('function handleDirtyChange'), true)
+  assert.equal(source.includes('onBeforeRouteUpdate'), true)
+  assert.equal(source.includes('return confirmLeaveDirty()'), true)
+})
+
+test('frontend page designer can hide its internal header when hosted by standalone page', () => {
+  const source = readSource('components/FrontendPageDesigner.vue')
+
+  assert.equal(source.includes('showHeader: { type: Boolean, default: true }'), true)
+  assert.equal(source.includes('v-if="showHeader"'), true)
+})
diff --git a/RuoYi-Vue/ruoyi-generator/src/main/java/com/ruoyi/generator/service/BusinessBlockGenerationService.java b/RuoYi-Vue/ruoyi-generator/src/main/java/com/ruoyi/generator/service/BusinessBlockGenerationService.java
new file mode 100644
index 0000000..6f94ee3
--- /dev/null
+++ b/RuoYi-Vue/ruoyi-generator/src/main/java/com/ruoyi/generator/service/BusinessBlockGenerationService.java
@@ -0,0 +1,759 @@
+package com.ruoyi.generator.service;
+
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.generator.domain.GenProject;
+import com.ruoyi.generator.domain.GenTable;
+import com.ruoyi.generator.domain.GenTableColumn;
+import com.ruoyi.generator.domain.GeneratedBusinessBlockFile;
+import com.ruoyi.generator.domain.front.FrontProjectPageDesign;
+import com.ruoyi.generator.domain.front.dto.BusinessActionDesign;
+import com.ruoyi.generator.domain.front.dto.block.BusinessBlockConfigField;
+import com.ruoyi.generator.domain.front.dto.block.BusinessBlockDefinition;
+import com.ruoyi.generator.domain.front.dto.block.BusinessBlockInstance;
+import com.ruoyi.generator.domain.front.dto.block.BusinessBlockTemplateFile;
+import com.ruoyi.generator.domain.front.dto.block.PageBusinessBlockLayout;
+import com.ruoyi.generator.service.front.BusinessBlockRegistryService;
+import com.ruoyi.generator.util.VelocityInitializer;
+import com.ruoyi.generator.util.VelocityUtils;
+import org.apache.velocity.Template;
+import org.apache.velocity.VelocityContext;
+import org.apache.velocity.app.Velocity;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class BusinessBlockGenerationService
+{
+    private static final String PAGE_TEMPLATE_RESOURCE = "business-blocks/page/business-block-page.vue.vm";
+    private static final String FRONTEND_PAGE_TEMPLATE_RESOURCE = "qing/index.vue.vm";
+    private static final String BUSINESS_BLOCK_CATEGORY_PREFIX = "business-block:";
+    private static final String PAGE_DESIGN_CATEGORY_PREFIX = "page-design:";
+
+    @Autowired
+    private BusinessBlockRegistryService businessBlockRegistryService;
+
+    public List<GeneratedBusinessBlockFile> listFiles(GenProject project, String templateType)
+    {
+        if (project == null || StringUtils.isEmpty(project.getPageDesigns()))
+        {
+            return Collections.emptyList();
+        }
+        List<GeneratedBusinessBlockFile> files = new ArrayList<GeneratedBusinessBlockFile>();
+        for (FrontProjectPageDesign pageDesign : project.getPageDesigns())
+        {
+            if (pageDesign == null || "admin".equals(pageDesign.getPageScope()))
+            {
+                continue;
+            }
+            int index = 1;
+            if (isFrontendBusinessBlockPage(pageDesign))
+            {
+                PageBusinessBlockLayout layout = registry().parseLayout(pageDesign.getLayoutJson());
+                if (BusinessBlockRegistryService.BUSINESS_BLOCK_CANVAS.equals(layout.getCanvas()))
+                {
+                    if ("frontend".equals(templateType))
+                    {
+                        files.add(pageFile(pageDesign));
+                    }
+                    index = appendBlockFiles(files, project, pageDesign, safeBlocks(layout), templateType, index);
+                }
+            }
+            else if ("frontend".equals(templateType) && isFrontendDesignedPage(pageDesign))
+            {
+                files.add(frontendPageFile(pageDesign));
+            }
+            appendBlockFiles(files, project, pageDesign, embeddedBlocks(pageDesign), templateType, index);
+        }
+        return files;
+    }
+
+    private int appendBlockFiles(List<GeneratedBusinessBlockFile> files, GenProject project,
+            FrontProjectPageDesign pageDesign, List<BusinessBlockInstance> instances, String templateType, int startIndex)
+    {
+        int index = startIndex;
+        for (BusinessBlockInstance instance : instances)
+        {
+            if (instance == null || StringUtils.isEmpty(instance.getBlockCode()))
+            {
+                continue;
+            }
+            BusinessBlockDefinition definition = registry().findDefinition(instance.getBlockCode());
+            if (StringUtils.isEmpty(definition.getTemplates()))
+            {
+                continue;
+            }
+            for (BusinessBlockTemplateFile templateFile : definition.getTemplates())
+            {
+                String fileTemplateType = templateType(templateFile);
+                if (!StringUtils.equals(fileTemplateType, templateType))
+                {
+                    continue;
+                }
+                files.add(blockFile(project, pageDesign, definition, instance, templateFile, index));
+            }
+            index++;
+        }
+        return index;
+    }
+
+    public GeneratedBusinessBlockFile findFile(GenProject project, String templateType, String keyword)
+    {
+        if (StringUtils.isEmpty(keyword))
+        {
+            return null;
+        }
+        String normalizedKeyword = normalizePath(keyword);
+        for (GeneratedBusinessBlockFile file : listFiles(project, templateType))
+        {
+            if (StringUtils.equals(keyword, file.getCategory())
+                    || StringUtils.equals(normalizedKeyword, normalizePath(file.getOutputPath()))
+                    || StringUtils.equals(normalizedKeyword, fileName(file.getOutputPath())))
+            {
+                return file;
+            }
+        }
+        return null;
+    }
+
+    public String renderFile(GenProject project, GeneratedBusinessBlockFile file)
+    {
+        if (file == null)
+        {
+            throw new ServiceException("涓氬姟鍧楁枃浠朵笉瀛樺湪");
+        }
+        if ("frontendPage".equals(file.getTemplateKey()))
+        {
+            return renderFrontendPageDesignFile(project, file);
+        }
+        try
+        {
+            VelocityInitializer.initVelocity();
+            VelocityContext context = VelocityUtils.prepareContextProject(project);
+            putFileContext(context, project, file);
+            Template template = Velocity.getTemplate(file.getTemplateResource(), "UTF-8");
+            StringWriter writer = new StringWriter();
+            template.merge(context, writer);
+            return writer.toString();
+        }
+        catch (RuntimeException e)
+        {
+            throw new ServiceException("渲染业务块模板失败: " + file.getCategory() + " - "
+                    + e.getClass().getSimpleName() + ": " + StringUtils.defaultString(e.getMessage()));
+        }
+    }
+
+    public boolean isBusinessBlockCategory(String category)
+    {
+        return StringUtils.isNotEmpty(category) && category.startsWith(BUSINESS_BLOCK_CATEGORY_PREFIX);
+    }
+
+    private String renderFrontendPageDesignFile(GenProject project, GeneratedBusinessBlockFile file)
+    {
+        FrontProjectPageDesign pageDesign = file.getPageDesign();
+        GenTable table = findTable(project, pageDesign == null ? null : pageDesign.getTableName());
+        if (table == null)
+        {
+            throw new ServiceException("页面设计绑定的数据表不存在: " + file.getPageCode());
+        }
+        if (project != null)
+        {
+            table.setPackageName(project.getPackageName());
+        }
+        if (StringUtils.isEmpty(table.getModuleName()))
+        {
+            table.setModuleName("app");
+        }
+        if (StringUtils.isEmpty(table.getBusinessName()))
+        {
+            table.setBusinessName(StringUtils.defaultIfEmpty(StringUtils.uncapitalize(table.getClassName()),
+                    StringUtils.defaultString(table.getTableName())));
+        }
+        if (StringUtils.isEmpty(table.getFunctionName()))
+        {
+            table.setFunctionName(StringUtils.defaultIfEmpty(table.getTableComment(), table.getClassName()));
+        }
+        VelocityInitializer.initVelocity();
+        VelocityContext context = VelocityUtils.prepareContext(table);
+        VelocityUtils.putPageDesignVelocityContext(context, project, table, "frontend", file.getPageCode());
+        putEmbeddedBlockVelocityContext(context, project, pageDesign);
+        putPageDesignBusinessActions(context, project);
+        Template template = Velocity.getTemplate(file.getTemplateResource(), "UTF-8");
+        StringWriter writer = new StringWriter();
+        template.merge(context, writer);
+        return writer.toString();
+    }
+
+    private void putPageDesignBusinessActions(VelocityContext context, GenProject project)
+    {
+        List<BusinessActionDesign> candidates = project == null || StringUtils.isEmpty(project.getBusinessActions())
+                ? Collections.<BusinessActionDesign>emptyList() : project.getBusinessActions();
+        List<BusinessActionDesign> toolbarBusinessActions = filterPageDesignBusinessActions(
+                candidates, context.get("pageDesignToolbarActionCodes"));
+        List<BusinessActionDesign> rowBusinessActions = filterPageDesignBusinessActions(
+                candidates, context.get("pageDesignRowActionCodes"));
+        List<BusinessActionDesign> allActions = mergeBusinessActions(toolbarBusinessActions, rowBusinessActions);
+        context.put("pageDesignToolbarBusinessActions", toolbarBusinessActions);
+        context.put("hasPageDesignToolbarBusinessActions", StringUtils.isNotEmpty(toolbarBusinessActions));
+        context.put("pageDesignRowBusinessActions", rowBusinessActions);
+        context.put("hasPageDesignRowBusinessActions", StringUtils.isNotEmpty(rowBusinessActions));
+        context.put("pageDesignBusinessActions", allActions);
+        context.put("hasPageDesignBusinessActions", StringUtils.isNotEmpty(allActions));
+    }
+
+    @SuppressWarnings("unchecked")
+    private List<BusinessActionDesign> filterPageDesignBusinessActions(List<BusinessActionDesign> candidates,
+            Object actionCodesObject)
+    {
+        if (StringUtils.isEmpty(candidates) || !(actionCodesObject instanceof List))
+        {
+            return Collections.emptyList();
+        }
+        List<String> requestedCodes = new ArrayList<String>();
+        for (Object actionCode : (List<Object>) actionCodesObject)
+        {
+            String code = StringUtils.defaultString(String.valueOf(actionCode));
+            if (code.startsWith("business:"))
+            {
+                requestedCodes.add(code.substring("business:".length()));
+            }
+        }
+        if (requestedCodes.isEmpty())
+        {
+            return Collections.emptyList();
+        }
+        List<BusinessActionDesign> result = new ArrayList<BusinessActionDesign>();
+        for (String requestedCode : requestedCodes)
+        {
+            for (BusinessActionDesign candidate : candidates)
+            {
+                if (candidate != null && StringUtils.equals(requestedCode, candidate.getCode())
+                        && !result.contains(candidate))
+                {
+                    result.add(candidate);
+                }
+            }
+        }
+        return result;
+    }
+
+    private List<BusinessActionDesign> mergeBusinessActions(List<BusinessActionDesign> first,
+            List<BusinessActionDesign> second)
+    {
+        List<BusinessActionDesign> result = new ArrayList<BusinessActionDesign>();
+        if (first != null)
+        {
+            result.addAll(first);
+        }
+        if (second != null)
+        {
+            for (BusinessActionDesign action : second)
+            {
+                if (action != null && !result.contains(action))
+                {
+                    result.add(action);
+                }
+            }
+        }
+        return result;
+    }
+
+    private GeneratedBusinessBlockFile pageFile(FrontProjectPageDesign pageDesign)
+    {
+        GeneratedBusinessBlockFile file = new GeneratedBusinessBlockFile();
+        String pageCode = safePageCode(pageDesign);
+        file.setCategory(BUSINESS_BLOCK_CATEGORY_PREFIX + "frontend:" + pageCode + ":page");
+        file.setTemplateType("frontend");
+        file.setOutputPath("src/views/pages/" + pageCode + "/index.vue");
+        file.setTemplateResource(PAGE_TEMPLATE_RESOURCE);
+        file.setPageCode(pageCode);
+        file.setTemplateKey("page");
+        file.setPageDesign(pageDesign);
+        return file;
+    }
+
+    private GeneratedBusinessBlockFile frontendPageFile(FrontProjectPageDesign pageDesign)
+    {
+        GeneratedBusinessBlockFile file = new GeneratedBusinessBlockFile();
+        String pageCode = safePageCode(pageDesign);
+        file.setCategory(PAGE_DESIGN_CATEGORY_PREFIX + "frontend:" + pageCode + ":page");
+        file.setTemplateType("frontend");
+        file.setOutputPath("src/views/pages/" + pageCode + "/index.vue");
+        file.setTemplateResource(FRONTEND_PAGE_TEMPLATE_RESOURCE);
+        file.setPageCode(pageCode);
+        file.setTemplateKey("frontendPage");
+        file.setPageDesign(pageDesign);
+        return file;
+    }
+
+    private GeneratedBusinessBlockFile blockFile(GenProject project, FrontProjectPageDesign pageDesign,
+            BusinessBlockDefinition definition, BusinessBlockInstance instance, BusinessBlockTemplateFile templateFile,
+            int index)
+    {
+        String pageCode = safePageCode(pageDesign);
+        String blockCode = StringUtils.defaultString(instance.getBlockCode());
+        String instanceCode = instanceCode(instance, blockCode, index);
+        String instanceClassName = toPascalCase(instanceCode) + "Block";
+        String fileTemplateType = templateType(templateFile);
+        GeneratedBusinessBlockFile file = new GeneratedBusinessBlockFile();
+        file.setCategory(BUSINESS_BLOCK_CATEGORY_PREFIX + fileTemplateType + ":" + pageCode + ":" + instanceCode
+                + ":" + StringUtils.defaultString(templateFile.getKey()));
+        file.setTemplateType(fileTemplateType);
+        file.setOutputPath(resolveOutputPath(project, pageCode, blockCode, instanceCode, instanceClassName,
+                templateFile.getOutputPath()));
+        file.setTemplateResource("business-blocks/" + blockCode + "/" + normalizePath(templateFile.getTemplate()));
+        file.setPageCode(pageCode);
+        file.setBlockCode(blockCode);
+        file.setInstanceCode(instanceCode);
+        file.setInstanceClassName(instanceClassName);
+        file.setTemplateKey(templateFile.getKey());
+        file.setPageDesign(pageDesign);
+        file.setDefinition(definition);
+        file.setInstance(instance);
+        file.setTemplateFile(templateFile);
+        return file;
+    }
+
+    private void putFileContext(VelocityContext context, GenProject project, GeneratedBusinessBlockFile file)
+    {
+        FrontProjectPageDesign pageDesign = file.getPageDesign();
+        context.put("pageDesign", pageDesign);
+        context.put("pageCode", file.getPageCode());
+        context.put("pageName", pageDesign == null ? "" : StringUtils.defaultString(pageDesign.getPageName()));
+        context.put("routePath", pageDesign == null ? "" : StringUtils.defaultString(pageDesign.getRoutePath()));
+        context.put("pageComponentName", toPascalCase(file.getPageCode()));
+        context.put("businessBlocks", pageBlocks(project, pageDesign));
+
+        BusinessBlockInstance instance = file.getInstance();
+        if (instance == null)
+        {
+            return;
+        }
+        Map<String, String> config = instance.getConfig() == null
+                ? Collections.<String, String>emptyMap() : instance.getConfig();
+        Map<String, String> renderConfig = renderConfig(project, file.getDefinition(), config);
+        context.put("definition", file.getDefinition());
+        context.put("instance", instance);
+        context.put("config", renderConfig);
+        context.put("rawConfig", config);
+        context.put("blockCode", file.getBlockCode());
+        context.put("instanceCode", file.getInstanceCode());
+        context.put("InstanceClassName", file.getInstanceClassName());
+        context.put("instanceClassName", StringUtils.uncapitalize(file.getInstanceClassName()));
+        context.put("apiBasePath", "/business-blocks/" + file.getInstanceCode());
+        context.put("apiModulePath", "@/api/business-blocks/" + file.getInstanceCode());
+        context.put("cartPkColumn", pkColumnName(project, renderConfig.get("cartTable")));
+        context.put("noticePkColumn", pkColumnName(project, renderConfig.get("noticeTable")));
+        context.put("carouselPkColumn", pkColumnName(project, renderConfig.get("carouselTable")));
+        context.put("orderPkColumn", pkColumnName(project, renderConfig.get("orderTable")));
+        context.put("orderItemPkColumn", pkColumnName(project, renderConfig.get("orderItemTable")));
+        context.put("productPkColumn", pkColumnName(project, renderConfig.get("productTable")));
+        context.put("masterPkColumn", pkColumnName(project, renderConfig.get("masterTable")));
+        context.put("detailPkColumn", pkColumnName(project, renderConfig.get("detailTable")));
+        context.put("hasProductImage", StringUtils.isNotEmpty(renderConfig.get("productImage")));
+        context.put("hasStock", StringUtils.isNotEmpty(renderConfig.get("stock")));
+        context.put("hasNoticeStatus", StringUtils.isNotEmpty(renderConfig.get("status")));
+        context.put("hasNoticePublishTime", StringUtils.isNotEmpty(renderConfig.get("publishTime")));
+        context.put("hasCarouselLink", StringUtils.isNotEmpty(renderConfig.get("link")));
+        context.put("hasCarouselSort", StringUtils.isNotEmpty(renderConfig.get("sort")));
+        context.put("hasCarouselStatus", StringUtils.isNotEmpty(renderConfig.get("status")));
+        context.put("hasOrderCreateTime", StringUtils.isNotEmpty(renderConfig.get("orderCreateTime")));
+        context.put("hasOrderProductImage", StringUtils.isNotEmpty(renderConfig.get("productImage")));
+        context.put("hasMasterDescription", StringUtils.isNotEmpty(renderConfig.get("masterDescription")));
+        context.put("hasDetailValue", StringUtils.isNotEmpty(renderConfig.get("detailValue")));
+        context.put("hasDetailTime", StringUtils.isNotEmpty(renderConfig.get("detailTime")));
+        for (Map.Entry<String, String> entry : renderConfig.entrySet())
+        {
+            context.put(entry.getKey(), entry.getValue());
+        }
+    }
+
+    private Map<String, String> renderConfig(GenProject project, BusinessBlockDefinition definition,
+            Map<String, String> config)
+    {
+        Map<String, String> renderConfig = new LinkedHashMap<String, String>();
+        if (config != null)
+        {
+            renderConfig.putAll(config);
+        }
+        List<BusinessBlockConfigField> fields = definition == null || definition.getConfigs() == null
+                ? Collections.<BusinessBlockConfigField>emptyList() : definition.getConfigs();
+        for (BusinessBlockConfigField field : fields)
+        {
+            if (field == null || !"field".equals(field.getType()))
+            {
+                continue;
+            }
+            String value = config == null ? null : config.get(field.getKey());
+            if (StringUtils.isEmpty(value))
+            {
+                continue;
+            }
+            String tableName = config == null ? null : config.get(field.getTable());
+            renderConfig.put(field.getKey(), columnName(project, tableName, value));
+        }
+        return renderConfig;
+    }
+
+    public void putEmbeddedBlockVelocityContext(VelocityContext context, GenProject project,
+            FrontProjectPageDesign pageDesign)
+    {
+        List<Map<String, Object>> topBlocks = embeddedPageBlocks(project, pageDesign, "top");
+        List<Map<String, Object>> bottomBlocks = embeddedPageBlocks(project, pageDesign, "bottom");
+        List<Map<String, Object>> allBlocks = new ArrayList<Map<String, Object>>();
+        allBlocks.addAll(topBlocks);
+        allBlocks.addAll(bottomBlocks);
+        context.put("pageDesignTopBusinessBlocks", topBlocks);
+        context.put("pageDesignBottomBusinessBlocks", bottomBlocks);
+        context.put("pageDesignEmbeddedBusinessBlocks", allBlocks);
+        context.put("hasPageDesignTopBusinessBlocks", StringUtils.isNotEmpty(topBlocks));
+        context.put("hasPageDesignBottomBusinessBlocks", StringUtils.isNotEmpty(bottomBlocks));
+        context.put("hasPageDesignEmbeddedBusinessBlocks", StringUtils.isNotEmpty(allBlocks));
+    }
+
+    private List<Map<String, Object>> pageBlocks(GenProject project, FrontProjectPageDesign pageDesign)
+    {
+        if (pageDesign == null)
+        {
+            return Collections.emptyList();
+        }
+        PageBusinessBlockLayout layout = registry().parseLayout(pageDesign.getLayoutJson());
+        GeneratedBusinessBlockFile pageFile = pageFile(pageDesign);
+        return blockViewModels(project, pageDesign, safeBlocks(layout), parentPath(pageFile.getOutputPath()), false);
+    }
+
+    private List<Map<String, Object>> embeddedPageBlocks(GenProject project, FrontProjectPageDesign pageDesign,
+            String zone)
+    {
+        Map<String, List<BusinessBlockInstance>> zones = registry().parseEmbeddedBlockZones(
+                pageDesign == null ? null : pageDesign.getLayoutJson());
+        List<BusinessBlockInstance> instances = zones.get(zone);
+        return blockViewModels(project, pageDesign, instances, null, true);
+    }
+
+    private List<Map<String, Object>> blockViewModels(GenProject project, FrontProjectPageDesign pageDesign,
+            List<BusinessBlockInstance> instances, String pageDir, boolean useVueAlias)
+    {
+        List<Map<String, Object>> blocks = new ArrayList<Map<String, Object>>();
+        int index = 1;
+        for (BusinessBlockInstance instance : instances == null
+                ? Collections.<BusinessBlockInstance>emptyList() : instances)
+        {
+            if (instance == null || StringUtils.isEmpty(instance.getBlockCode()))
+            {
+                continue;
+            }
+            BusinessBlockDefinition definition = registry().findDefinition(instance.getBlockCode());
+            BusinessBlockTemplateFile templateFile = frontendComponentTemplate(definition);
+            if (templateFile == null)
+            {
+                continue;
+            }
+            GeneratedBusinessBlockFile blockFile = blockFile(project, pageDesign, definition, instance, templateFile, index);
+            Map<String, Object> block = new LinkedHashMap<String, Object>();
+            block.put("componentName", blockFile.getInstanceClassName());
+            block.put("relativeImportPath", useVueAlias
+                    ? vueAliasImportPath(blockFile.getOutputPath())
+                    : relativeImportPath(pageDir, blockFile.getOutputPath()));
+            block.put("instanceCode", blockFile.getInstanceCode());
+            block.put("blockCode", blockFile.getBlockCode());
+            block.put("name", StringUtils.defaultIfEmpty(instance.getName(), definition.getName()));
+            blocks.add(block);
+            index++;
+        }
+        return blocks;
+    }
+
+    private BusinessBlockTemplateFile frontendComponentTemplate(BusinessBlockDefinition definition)
+    {
+        if (definition == null || StringUtils.isEmpty(definition.getTemplates()))
+        {
+            return null;
+        }
+        for (BusinessBlockTemplateFile templateFile : definition.getTemplates())
+        {
+            if ("frontendComponent".equals(templateFile.getKey()))
+            {
+                return templateFile;
+            }
+        }
+        for (BusinessBlockTemplateFile templateFile : definition.getTemplates())
+        {
+            if ("frontend".equals(templateType(templateFile)) && normalizePath(templateFile.getOutputPath()).endsWith(".vue"))
+            {
+                return templateFile;
+            }
+        }
+        return null;
+    }
+
+    private String resolveOutputPath(GenProject project, String pageCode, String blockCode, String instanceCode,
+            String instanceClassName, String outputPath)
+    {
+        String path = normalizePath(outputPath);
+        String packageName = project == null ? "" : StringUtils.defaultString(project.getPackageName());
+        path = path.replace("${pageCode}", pageCode);
+        path = path.replace("${blockCode}", blockCode);
+        path = path.replace("${instanceCode}", instanceCode);
+        path = path.replace("${InstanceClassName}", instanceClassName);
+        path = path.replace("${instanceClassName}", StringUtils.uncapitalize(instanceClassName));
+        path = path.replace("${packageName}", packageName);
+        path = path.replace("${packagePath}", packageName.replace('.', '/'));
+        while (path.startsWith("/"))
+        {
+            path = path.substring(1);
+        }
+        return path;
+    }
+
+    private String templateType(BusinessBlockTemplateFile templateFile)
+    {
+        String template = normalizePath(templateFile == null ? null : templateFile.getTemplate());
+        String outputPath = normalizePath(templateFile == null ? null : templateFile.getOutputPath());
+        if (template.contains("/frontend/") || outputPath.startsWith("src/views/") || outputPath.startsWith("src/api/"))
+        {
+            return "frontend";
+        }
+        return "backend";
+    }
+
+    private boolean isFrontendBusinessBlockPage(FrontProjectPageDesign pageDesign)
+    {
+        if (pageDesign == null || "admin".equals(pageDesign.getPageScope()))
+        {
+            return false;
+        }
+        if ("business_block".equals(pageDesign.getPageType()))
+        {
+            return true;
+        }
+        return StringUtils.isNotEmpty(pageDesign.getLayoutJson())
+                && pageDesign.getLayoutJson().contains(BusinessBlockRegistryService.BUSINESS_BLOCK_CANVAS);
+    }
+
+    private boolean isFrontendDesignedPage(FrontProjectPageDesign pageDesign)
+    {
+        return pageDesign != null && !"admin".equals(pageDesign.getPageScope())
+                && StringUtils.isNotEmpty(pageDesign.getPageCode())
+                && StringUtils.isNotEmpty(pageDesign.getTableName());
+    }
+
+    private List<BusinessBlockInstance> safeBlocks(PageBusinessBlockLayout layout)
+    {
+        return layout == null || layout.getBlocks() == null
+                ? Collections.<BusinessBlockInstance>emptyList() : layout.getBlocks();
+    }
+
+    private List<BusinessBlockInstance> embeddedBlocks(FrontProjectPageDesign pageDesign)
+    {
+        Map<String, List<BusinessBlockInstance>> zones = registry().parseEmbeddedBlockZones(
+                pageDesign == null ? null : pageDesign.getLayoutJson());
+        List<BusinessBlockInstance> blocks = new ArrayList<BusinessBlockInstance>();
+        for (List<BusinessBlockInstance> zoneBlocks : zones.values())
+        {
+            if (zoneBlocks != null)
+            {
+                blocks.addAll(zoneBlocks);
+            }
+        }
+        return blocks;
+    }
+
+    private String safePageCode(FrontProjectPageDesign pageDesign)
+    {
+        return sanitizeIdentifier(pageDesign == null ? "business_page" : pageDesign.getPageCode(), "business_page");
+    }
+
+    private String instanceCode(BusinessBlockInstance instance, String blockCode, int index)
+    {
+        String raw = instance == null ? null : instance.getId();
+        if (StringUtils.isEmpty(raw))
+        {
+            raw = StringUtils.defaultIfEmpty(blockCode, "block") + "_" + index;
+        }
+        return sanitizeIdentifier(raw, "block_" + index);
+    }
+
+    private String sanitizeIdentifier(String value, String fallback)
+    {
+        String normalized = StringUtils.defaultString(value).replaceAll("[^A-Za-z0-9_-]", "_");
+        return StringUtils.isEmpty(normalized) ? fallback : normalized;
+    }
+
+    private String toPascalCase(String value)
+    {
+        String source = StringUtils.defaultString(value);
+        StringBuilder result = new StringBuilder();
+        boolean upperNext = true;
+        for (int i = 0; i < source.length(); i++)
+        {
+            char ch = source.charAt(i);
+            if (!Character.isLetterOrDigit(ch))
+            {
+                upperNext = true;
+                continue;
+            }
+            if (result.length() == 0 && !Character.isJavaIdentifierStart(ch))
+            {
+                result.append("Block");
+            }
+            result.append(upperNext ? Character.toUpperCase(ch) : ch);
+            upperNext = false;
+        }
+        return result.length() == 0 ? "BusinessBlock" : result.toString();
+    }
+
+    private String pkColumnName(GenProject project, String tableName)
+    {
+        GenTable table = findTable(project, tableName);
+        if (table == null)
+        {
+            return "id";
+        }
+        if (table.getPkColumn() != null && StringUtils.isNotEmpty(table.getPkColumn().getColumnName()))
+        {
+            return table.getPkColumn().getColumnName();
+        }
+        if (StringUtils.isNotEmpty(table.getColumns()))
+        {
+            for (GenTableColumn column : table.getColumns())
+            {
+                if (column != null && "1".equals(column.getIsPk()) && StringUtils.isNotEmpty(column.getColumnName()))
+                {
+                    return column.getColumnName();
+                }
+            }
+            for (GenTableColumn column : table.getColumns())
+            {
+                if (column != null && "id".equals(column.getColumnName()))
+                {
+                    return "id";
+                }
+            }
+        }
+        return "id";
+    }
+
+    private String columnName(GenProject project, String tableName, String fieldName)
+    {
+        GenTable table = findTable(project, tableName);
+        if (table == null || StringUtils.isEmpty(table.getColumns()) || StringUtils.isEmpty(fieldName))
+        {
+            return fieldName;
+        }
+        for (GenTableColumn column : table.getColumns())
+        {
+            if (column == null)
+            {
+                continue;
+            }
+            if (StringUtils.equals(fieldName, column.getColumnName())
+                    || StringUtils.equals(fieldName, column.getJavaField()))
+            {
+                return StringUtils.defaultIfEmpty(column.getColumnName(), fieldName);
+            }
+        }
+        return fieldName;
+    }
+
+    private GenTable findTable(GenProject project, String tableName)
+    {
+        if (project == null || StringUtils.isEmpty(project.getTables()) || StringUtils.isEmpty(tableName))
+        {
+            return null;
+        }
+        for (GenTable table : project.getTables())
+        {
+            if (table != null && StringUtils.equals(tableName, table.getTableName()))
+            {
+                return table;
+            }
+        }
+        return null;
+    }
+
+    private String relativeImportPath(String fromDir, String targetPath)
+    {
+        String[] from = normalizePath(fromDir).split("/");
+        String[] target = normalizePath(targetPath).split("/");
+        int common = 0;
+        while (common < from.length && common < target.length && from[common].equals(target[common]))
+        {
+            common++;
+        }
+        StringBuilder result = new StringBuilder();
+        for (int i = common; i < from.length; i++)
+        {
+            if (from[i].length() > 0)
+            {
+                result.append("../");
+            }
+        }
+        for (int i = common; i < target.length; i++)
+        {
+            if (target[i].length() == 0)
+            {
+                continue;
+            }
+            if (result.length() > 0 && !result.toString().endsWith("/"))
+            {
+                result.append("/");
+            }
+            result.append(target[i]);
+        }
+        if (result.length() == 0)
+        {
+            return "./";
+        }
+        if (!result.toString().startsWith("."))
+        {
+            result.insert(0, "./");
+        }
+        return result.toString();
+    }
+
+    private String vueAliasImportPath(String targetPath)
+    {
+        String normalized = normalizePath(targetPath);
+        int index = normalized.indexOf("src/");
+        if (index >= 0)
+        {
+            normalized = normalized.substring(index + 4);
+        }
+        return normalized.startsWith("@/") ? normalized : "@/" + normalized;
+    }
+
+    private String parentPath(String path)
+    {
+        String normalized = normalizePath(path);
+        int index = normalized.lastIndexOf('/');
+        return index < 0 ? "" : normalized.substring(0, index);
+    }
+
+    private String fileName(String path)
+    {
+        String normalized = normalizePath(path);
+        int index = normalized.lastIndexOf('/');
+        return index < 0 ? normalized : normalized.substring(index + 1);
+    }
+
+    private String normalizePath(String path)
+    {
+        return StringUtils.defaultString(path).replace('\\', '/').replaceAll("/{2,}", "/");
+    }
+
+    private BusinessBlockRegistryService registry()
+    {
+        if (businessBlockRegistryService == null)
+        {
+            businessBlockRegistryService = new BusinessBlockRegistryService();
+        }
+        return businessBlockRegistryService;
+    }
+}
diff --git a/RuoYi-Vue/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenProjectServiceImpl.java b/RuoYi-Vue/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenProjectServiceImpl.java
index 10b1df1..a2976e2 100644
--- a/RuoYi-Vue/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenProjectServiceImpl.java
+++ b/RuoYi-Vue/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenProjectServiceImpl.java
@@ -11,7 +11,11 @@ import com.ruoyi.generator.domain.SysProjectStructure;
 import com.ruoyi.generator.domain.SysProjectTemplate;
 import com.ruoyi.generator.domain.Template;
 import com.ruoyi.generator.domain.TemplateFile;
+import com.ruoyi.generator.domain.GeneratedBusinessBlockFile;
+import com.ruoyi.generator.domain.front.FrontProjectPageDesign;
+import com.ruoyi.generator.domain.front.dto.AppPageDesign;
 import com.ruoyi.generator.domain.front.dto.BusinessActionDesign;
+import com.ruoyi.generator.domain.front.dto.BusinessActionUiBindingDesign;
 import com.ruoyi.generator.mapper.GenProjectMapper;
 import com.ruoyi.generator.mapper.GenTableMapper;
 import com.ruoyi.generator.util.VelocityInitializer;
@@ -23,6 +27,7 @@ import org.springframework.stereotype.Service;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.StringWriter;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
@@ -36,6 +41,16 @@ import java.util.zip.ZipOutputStream;
 
 @Service
 public class GenProjectServiceImpl implements IGenProjectService {
+    private static final String SQL_TEMPLATE_TYPE = "sql";
+    private static final String SQL_CATEGORY = "sql";
+    private static final Long RUNNABLE_BACKEND_TEMPLATE_ID = 9201L;
+    private static final Long RUNNABLE_ADMIN_FRONTEND_TEMPLATE_ID = 9202L;
+    private static final Long RUNNABLE_FRONTEND_TEMPLATE_ID = 9203L;
+    private static final String BACKEND_CONTROLLER_TEMPLATE_FILE = "controller.java.vm";
+    private static final String BUNDLED_BACKEND_CONTROLLER_TEMPLATE = "qing/controller.java.vm";
+    private static final String FRONTEND_INDEX_TEMPLATE_FILE = "frontend-index.vue.vm";
+    private static final String BUNDLED_FRONTEND_INDEX_TEMPLATE = "qing/index.vue.vm";
+
     @Autowired
     private GenProjectMapper genProjectMapper;
     @Autowired
@@ -52,6 +67,8 @@ public class GenProjectServiceImpl implements IGenProjectService {
     private ISysProjectTemplateService sysProjectTemplateService;
     @Autowired
     private ISysProjectStructureService sysProjectStructureService;
+    @Autowired
+    private BusinessBlockGenerationService businessBlockGenerationService;
 
     @Override
     public GenProject selectGenProjectById(Long projectId) {
@@ -100,6 +117,9 @@ public class GenProjectServiceImpl implements IGenProjectService {
             projectTables = new ArrayList<GenTable>();
             project.setTables(projectTables);
         }
+        if (isSqlType(type)) {
+            return getSqlProjectStructure(project);
+        }
 
         List<Map<String, Object>> structure = new ArrayList<Map<String, Object>>();
         SysProjectTemplate projectTemplate = resolveProjectTemplate(project, type);
@@ -136,6 +156,7 @@ public class GenProjectServiceImpl implements IGenProjectService {
                 addNodeToParent(structure, nodeData, node, nodeMap, sourceNodeMap, null);
             }
         }
+        appendBusinessBlockFiles(structure, project, type);
         return structure;
     }
 
@@ -207,7 +228,15 @@ public class GenProjectServiceImpl implements IGenProjectService {
         if (project == null) {
             throw new ServiceException("项目信息不能为空");
         }
+        if (isSqlType(type)) {
+            return previewSqlCode(project, tableId, keyword);
+        }
         Map<String, String> dataMap = new LinkedHashMap<String, String>();
+        GeneratedBusinessBlockFile businessBlockFile = findBusinessBlockFile(project, type, keyword);
+        if (businessBlockFile != null) {
+            dataMap.put(businessBlockFile.getOutputPath(), businessBlockService().renderFile(project, businessBlockFile));
+            return dataMap;
+        }
         List<SysProjectModule> modules = getProjectModules(project);
 
         VelocityInitializer.initVelocity();
@@ -225,6 +254,14 @@ public class GenProjectServiceImpl implements IGenProjectService {
         if (project == null) {
             throw new ServiceException("项目信息不能为空");
         }
+        if (isSqlType(type) || SQL_CATEGORY.equals(category)) {
+            GenTable table = getRequiredTable(project, tableId);
+            return getSqlFileContent(table);
+        }
+        GeneratedBusinessBlockFile businessBlockFile = findBusinessBlockFile(project, type, category);
+        if (businessBlockFile != null) {
+            return businessBlockService().renderFile(project, businessBlockFile);
+        }
         List<SysProjectModule> modules = getProjectModules(project);
 
         VelocityInitializer.initVelocity();
@@ -242,6 +279,93 @@ public class GenProjectServiceImpl implements IGenProjectService {
         throw new ServiceException("未找到模板文件：" + category);
     }
 
+    private boolean isSqlType(String type) {
+        return SQL_TEMPLATE_TYPE.equals(type);
+    }
+
+    private GeneratedBusinessBlockFile findBusinessBlockFile(GenProject project, String type, String keyword) {
+        return businessBlockService().findFile(project, type, keyword);
+    }
+
+    private BusinessBlockGenerationService businessBlockService() {
+        if (businessBlockGenerationService == null) {
+            businessBlockGenerationService = new BusinessBlockGenerationService();
+        }
+        return businessBlockGenerationService;
+    }
+
+    private List<Map<String, Object>> getSqlProjectStructure(GenProject project) {
+        Map<String, Object> sqlFolder = new LinkedHashMap<String, Object>();
+        sqlFolder.put("id", SQL_TEMPLATE_TYPE);
+        sqlFolder.put("name", "sql");
+        sqlFolder.put("type", "folder");
+        sqlFolder.put("category", SQL_CATEGORY);
+        List<Map<String, Object>> children = new ArrayList<Map<String, Object>>();
+        sqlFolder.put("children", children);
+
+        if (StringUtils.isNotEmpty(project.getTables())) {
+            for (GenTable table : project.getTables()) {
+                Map<String, Object> fileNode = new LinkedHashMap<String, Object>();
+                String fileName = getSqlFileName(table);
+                fileNode.put("id", SQL_TEMPLATE_TYPE + "-" + table.getTableId());
+                fileNode.put("name", fileName);
+                fileNode.put("type", "file");
+                fileNode.put("category", SQL_CATEGORY);
+                fileNode.put("tableId", table.getTableId());
+                children.add(fileNode);
+            }
+        }
+        return Collections.singletonList(sqlFolder);
+    }
+
+    private Map<String, String> previewSqlCode(GenProject project, Long tableId, String keyword) {
+        Map<String, String> dataMap = new LinkedHashMap<String, String>();
+        if (StringUtils.isEmpty(project.getTables())) {
+            return dataMap;
+        }
+        for (GenTable table : project.getTables()) {
+            String fileName = getSqlFileName(table);
+            if (matchesSqlFile(table, tableId, keyword, fileName)) {
+                dataMap.put(fileName, getSqlFileContent(table));
+            }
+        }
+        return dataMap;
+    }
+
+    private boolean matchesSqlFile(GenTable table, Long tableId, String keyword, String fileName) {
+        if (tableId != null && tableId != -1) {
+            return tableId.equals(table.getTableId());
+        }
+        if (StringUtils.isEmpty(keyword) || SQL_CATEGORY.equals(keyword)) {
+            return true;
+        }
+        String normalizedKeyword = keyword.replace('\\', '/');
+        return fileName.equals(normalizedKeyword) || normalizedKeyword.endsWith("/" + fileName);
+    }
+
+    private String getSqlFileName(GenTable table) {
+        String name = table == null ? "" : StringUtils.defaultString(table.getBusinessName());
+        if (StringUtils.isEmpty(name) && table != null) {
+            name = StringUtils.defaultString(table.getTableName());
+        }
+        if (StringUtils.isEmpty(name)) {
+            name = "schema";
+        }
+        name = name.trim().replaceAll("[\\\\/:*?\"<>|]", "_").replaceAll("\\s+", "_");
+        if (StringUtils.isEmpty(name)) {
+            name = "schema";
+        }
+        return name.endsWith(".sql") ? name : name + ".sql";
+    }
+
+    private String getSqlFileContent(GenTable table) {
+        String sql = table == null ? "" : StringUtils.defaultString(table.getCreateTableSql());
+        if (StringUtils.isEmpty(sql)) {
+            return "-- 未生成建表 SQL";
+        }
+        return sql.endsWith("\n") ? sql : sql + "\n";
+    }
+
     private List<SysProjectModule> getProjectModules(GenProject project) {
         if (project.isFrontDraft()) {
             return project.getModules() == null ? new ArrayList<SysProjectModule>() : project.getModules();
@@ -275,19 +399,46 @@ public class GenProjectServiceImpl implements IGenProjectService {
         templateFilter.setTemplateType(type);
         List<Template> templates = templateService.selectTemplateList(templateFilter);
         if (StringUtils.isNotEmpty(templates)) {
+            Template firstActiveTemplate = null;
+            Long preferredTemplateId = preferredRunnableTemplateId(type);
             for (Template template : templates) {
                 if (template != null && template.getTemplateId() != null && Long.valueOf(0L).equals(template.getTemplateStatus())) {
-                    SysProjectTemplate fallbackTemplate = new SysProjectTemplate();
-                    fallbackTemplate.setProjectId(projectId);
-                    fallbackTemplate.setTemplateId(template.getTemplateId());
-                    fallbackTemplate.setTemplateType(type);
-                    return fallbackTemplate;
+                    if (preferredTemplateId != null && preferredTemplateId.equals(template.getTemplateId())) {
+                        return toProjectTemplate(projectId, type, template);
+                    }
+                    if (firstActiveTemplate == null) {
+                        firstActiveTemplate = template;
+                    }
                 }
             }
+            if (firstActiveTemplate != null) {
+                return toProjectTemplate(projectId, type, firstActiveTemplate);
+            }
         }
         throw new ServiceException("未配置可用模板：" + type);
     }
 
+    private Long preferredRunnableTemplateId(String type) {
+        if ("backend".equals(type)) {
+            return RUNNABLE_BACKEND_TEMPLATE_ID;
+        }
+        if ("admin_frontend".equals(type)) {
+            return RUNNABLE_ADMIN_FRONTEND_TEMPLATE_ID;
+        }
+        if ("frontend".equals(type)) {
+            return RUNNABLE_FRONTEND_TEMPLATE_ID;
+        }
+        return null;
+    }
+
+    private SysProjectTemplate toProjectTemplate(Long projectId, String type, Template template) {
+        SysProjectTemplate fallbackTemplate = new SysProjectTemplate();
+        fallbackTemplate.setProjectId(projectId);
+        fallbackTemplate.setTemplateId(template.getTemplateId());
+        fallbackTemplate.setTemplateType(type);
+        return fallbackTemplate;
+    }
+
     private List<SysProjectStructure> selectStructureNodes(GenProject project, SysProjectTemplate projectTemplate) {
         if (project.isFrontDraft()) {
             SysProjectStructure query = new SysProjectStructure();
@@ -341,7 +492,10 @@ public class GenProjectServiceImpl implements IGenProjectService {
         }
         String result = nodeName;
         result = result.replace("{projectName}", StringUtils.defaultString(project.getProjectFileName()));
-        result = result.replace("{packageName}", StringUtils.defaultString(project.getPackageName()));
+        result = result.replace("{projectClassName}", toProjectClassName(project.getProjectFileName()));
+        String packageName = StringUtils.defaultString(project.getPackageName());
+        result = result.replace("{packageName}", packageName);
+        result = result.replace("{packagePath}", packageName.replace('.', '/'));
         if (table != null) {
             result = result.replace("{moduleName}", StringUtils.defaultString(table.getModuleName()));
             result = result.replace("{ClassName}", StringUtils.defaultString(table.getClassName()));
@@ -352,6 +506,28 @@ public class GenProjectServiceImpl implements IGenProjectService {
         return result;
     }
 
+    private String toProjectClassName(String projectFileName) {
+        String source = StringUtils.defaultString(projectFileName);
+        StringBuilder result = new StringBuilder();
+        boolean uppercaseNext = true;
+        for (int i = 0; i < source.length(); i++) {
+            char ch = source.charAt(i);
+            if (!Character.isLetterOrDigit(ch)) {
+                uppercaseNext = true;
+                continue;
+            }
+            if (result.length() == 0 && !Character.isJavaIdentifierStart(ch)) {
+                result.append("App");
+            }
+            result.append(uppercaseNext ? Character.toUpperCase(ch) : ch);
+            uppercaseNext = false;
+        }
+        if (result.length() == 0) {
+            return "GeneratedProject";
+        }
+        return result.toString();
+    }
+
     private Map<String, Object> mergeTableScopedFolderNode(Map<String, Map<String, Object>> mergedFolderMap,
                                                            SysProjectStructure node, GenProject project, GenTable table,
                                                            Map<Long, SysProjectStructure> sourceNodeMap,
@@ -425,6 +601,81 @@ public class GenProjectServiceImpl implements IGenProjectService {
         nodes.add(nodeData);
     }
 
+    private void appendBusinessBlockFiles(List<Map<String, Object>> structure, GenProject project, String type) {
+        List<GeneratedBusinessBlockFile> files = businessBlockService().listFiles(project, type);
+        if (StringUtils.isEmpty(files)) {
+            return;
+        }
+        for (GeneratedBusinessBlockFile file : files) {
+            addGeneratedFileNode(structure, file);
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private void addGeneratedFileNode(List<Map<String, Object>> structure, GeneratedBusinessBlockFile file) {
+        if (file == null || StringUtils.isEmpty(file.getOutputPath())) {
+            return;
+        }
+        List<Map<String, Object>> current = generatedFileRoot(structure);
+        String[] parts = file.getOutputPath().replace('\\', '/').split("/");
+        StringBuilder path = new StringBuilder();
+        for (int i = 0; i < parts.length; i++) {
+            String part = parts[i];
+            if (StringUtils.isEmpty(part)) {
+                continue;
+            }
+            if (path.length() > 0) {
+                path.append("/");
+            }
+            path.append(part);
+            boolean last = i == parts.length - 1;
+            if (last) {
+                if (findChildNode(current, part, "file") == null) {
+                    Map<String, Object> fileNode = new LinkedHashMap<String, Object>();
+                    fileNode.put("id", file.getCategory());
+                    fileNode.put("name", part);
+                    fileNode.put("type", "file");
+                    fileNode.put("category", file.getCategory());
+                    fileNode.put("tableId", null);
+                    current.add(fileNode);
+                }
+            } else {
+                Map<String, Object> folderNode = findChildNode(current, part, "folder");
+                if (folderNode == null) {
+                    folderNode = new LinkedHashMap<String, Object>();
+                    folderNode.put("id", "business-block-folder:" + path.toString());
+                    folderNode.put("name", part);
+                    folderNode.put("type", "folder");
+                    folderNode.put("category", null);
+                    folderNode.put("tableId", null);
+                    folderNode.put("children", new ArrayList<Map<String, Object>>());
+                    current.add(folderNode);
+                }
+                current = (List<Map<String, Object>>) folderNode.get("children");
+            }
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private List<Map<String, Object>> generatedFileRoot(List<Map<String, Object>> structure) {
+        if (structure.size() == 1 && "folder".equals(structure.get(0).get("type"))) {
+            Object children = structure.get(0).get("children");
+            if (children instanceof List) {
+                return (List<Map<String, Object>>) children;
+            }
+        }
+        return structure;
+    }
+
+    private Map<String, Object> findChildNode(List<Map<String, Object>> nodes, String name, String type) {
+        for (Map<String, Object> node : nodes) {
+            if (StringUtils.equals(name, (String) node.get("name")) && StringUtils.equals(type, (String) node.get("type"))) {
+                return node;
+            }
+        }
+        return null;
+    }
+
     private boolean matchesTemplateFile(TemplateFile templateFile, String templateFileName) {
         if (templateFile == null || StringUtils.isEmpty(templateFileName)) {
             return false;
@@ -436,10 +687,74 @@ public class GenProjectServiceImpl implements IGenProjectService {
     private String renderTemplate(GenProject project, Long tableId, List<SysProjectModule> modules, TemplateFile templateFile) {
         VelocityContext context = prepareVelocityContext(project, tableId, modules, templateFile);
         StringWriter sw = new StringWriter();
-        Velocity.evaluate(context, sw, "", StringUtils.defaultString(templateFile.getFileContent()));
+        Velocity.evaluate(context, sw, "", resolveTemplateContent(templateFile));
         return sw.toString();
     }
 
+    private String resolveTemplateContent(TemplateFile templateFile) {
+        String content = StringUtils.defaultString(templateFile.getFileContent());
+        if (shouldUseBundledBackendControllerTemplate(templateFile, content)) {
+            String bundledContent = readClasspathTemplate(BUNDLED_BACKEND_CONTROLLER_TEMPLATE);
+            if (StringUtils.isNotEmpty(bundledContent)) {
+                return bundledContent;
+            }
+        }
+        if (shouldUseBundledFrontendIndexTemplate(templateFile, content)) {
+            String bundledContent = readClasspathTemplate(BUNDLED_FRONTEND_INDEX_TEMPLATE);
+            if (StringUtils.isNotEmpty(bundledContent)) {
+                return bundledContent;
+            }
+        }
+        return content;
+    }
+
+    private boolean shouldUseBundledBackendControllerTemplate(TemplateFile templateFile, String content) {
+        if (templateFile == null || !RUNNABLE_BACKEND_TEMPLATE_ID.equals(templateFile.getTemplateId())) {
+            return false;
+        }
+        boolean isControllerTemplate = StringUtils.equals(BACKEND_CONTROLLER_TEMPLATE_FILE, templateFile.getFileName())
+                || StringUtils.equals(BACKEND_CONTROLLER_TEMPLATE_FILE, templateFile.getFilePath());
+        String templateContent = StringUtils.defaultString(content);
+        return isControllerTemplate && !templateContent.contains("__currentUserOnly");
+    }
+
+    private boolean shouldUseBundledFrontendIndexTemplate(TemplateFile templateFile, String content) {
+        if (templateFile == null || !RUNNABLE_FRONTEND_TEMPLATE_ID.equals(templateFile.getTemplateId())) {
+            return false;
+        }
+        boolean isFrontendIndexTemplate = StringUtils.equals(FRONTEND_INDEX_TEMPLATE_FILE, templateFile.getFileName())
+                || StringUtils.equals(FRONTEND_INDEX_TEMPLATE_FILE, templateFile.getFilePath());
+        String templateContent = StringUtils.defaultString(content);
+        return isFrontendIndexTemplate && (!templateContent.contains("$hasCurrentFrontendPageDesign")
+                || !templateContent.contains("businessActionMap")
+                || !templateContent.contains("$renderForm")
+                || !templateContent.contains("handleView(row)")
+                || !templateContent.contains("__currentUserOnly"));
+    }
+
+    private String readClasspathTemplate(String resourceName) {
+        InputStream inputStream = GenProjectServiceImpl.class.getClassLoader().getResourceAsStream(resourceName);
+        if (inputStream == null) {
+            return null;
+        }
+        try {
+            ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+            byte[] buffer = new byte[4096];
+            int length;
+            while ((length = inputStream.read(buffer)) != -1) {
+                outputStream.write(buffer, 0, length);
+            }
+            return new String(outputStream.toByteArray(), StandardCharsets.UTF_8);
+        } catch (IOException e) {
+            return null;
+        } finally {
+            try {
+                inputStream.close();
+            } catch (IOException ignored) {
+            }
+        }
+    }
+
     private VelocityContext prepareVelocityContext(GenProject project, Long tableId, List<SysProjectModule> modules, TemplateFile templateFile) {
         if (tableId != null && tableId != -1) {
             GenTable table = getRequiredTable(project, tableId);
@@ -448,6 +763,13 @@ public class GenProjectServiceImpl implements IGenProjectService {
             setSubTable(table);
             setPkColumn(table);
             VelocityContext context = VelocityUtils.prepareContext(table);
+            String pageDesignScope = RUNNABLE_ADMIN_FRONTEND_TEMPLATE_ID.equals(templateFile.getTemplateId())
+                    ? "admin" : "frontend";
+            VelocityUtils.putPageDesignVelocityContext(context, project, table, pageDesignScope);
+            if ("frontend".equals(pageDesignScope)) {
+                businessBlockService().putEmbeddedBlockVelocityContext(context, project,
+                        (FrontProjectPageDesign) context.get("currentPageDesign"));
+            }
             putTableBusinessActions(context, project, table);
             putSnippetVariables(context, table, modules, templateFile);
             return context;
@@ -459,6 +781,29 @@ public class GenProjectServiceImpl implements IGenProjectService {
         List<BusinessActionDesign> tableBusinessActions = filterTableBusinessActions(project, table);
         context.put("tableBusinessActions", tableBusinessActions);
         context.put("hasTableBusinessActions", StringUtils.isNotEmpty(tableBusinessActions));
+        Map<String, List<BusinessActionDesign>> slotBusinessActions = buildSlotBusinessActions(tableBusinessActions);
+        context.put("slotBusinessActions", slotBusinessActions);
+        context.put("hasSlotBusinessActions", !slotBusinessActions.isEmpty());
+        List<BusinessActionDesign> listRowBusinessActions = filterTableSlotActions(project, table, tableBusinessActions, "list.rowActions");
+        List<BusinessActionDesign> detailPrimaryBusinessActions = filterTableSlotActions(project, table, tableBusinessActions, "detail.primaryActions");
+        context.put("listRowBusinessActions", listRowBusinessActions);
+        context.put("hasListRowBusinessActions", StringUtils.isNotEmpty(listRowBusinessActions));
+        context.put("detailPrimaryBusinessActions", detailPrimaryBusinessActions);
+        context.put("hasDetailPrimaryBusinessActions", StringUtils.isNotEmpty(detailPrimaryBusinessActions));
+        List<BusinessActionDesign> pageDesignCandidateActions = project == null || StringUtils.isEmpty(project.getBusinessActions())
+                ? Collections.<BusinessActionDesign>emptyList()
+                : project.getBusinessActions();
+        List<BusinessActionDesign> toolbarBusinessActions = filterPageDesignBusinessActions(
+                pageDesignCandidateActions, context.get("pageDesignToolbarActionCodes"));
+        List<BusinessActionDesign> rowBusinessActions = filterPageDesignBusinessActions(
+                pageDesignCandidateActions, context.get("pageDesignRowActionCodes"));
+        List<BusinessActionDesign> pageDesignBusinessActions = mergeBusinessActions(toolbarBusinessActions, rowBusinessActions);
+        context.put("pageDesignToolbarBusinessActions", toolbarBusinessActions);
+        context.put("hasPageDesignToolbarBusinessActions", StringUtils.isNotEmpty(toolbarBusinessActions));
+        context.put("pageDesignRowBusinessActions", rowBusinessActions);
+        context.put("hasPageDesignRowBusinessActions", StringUtils.isNotEmpty(rowBusinessActions));
+        context.put("pageDesignBusinessActions", pageDesignBusinessActions);
+        context.put("hasPageDesignBusinessActions", StringUtils.isNotEmpty(pageDesignBusinessActions));
     }
 
     private List<BusinessActionDesign> filterTableBusinessActions(GenProject project, GenTable table) {
@@ -474,6 +819,134 @@ public class GenProjectServiceImpl implements IGenProjectService {
         return tableBusinessActions;
     }
 
+    private Map<String, List<BusinessActionDesign>> buildSlotBusinessActions(List<BusinessActionDesign> actions) {
+        Map<String, List<BusinessActionDesign>> slotActions = new LinkedHashMap<String, List<BusinessActionDesign>>();
+        if (StringUtils.isEmpty(actions)) {
+            return slotActions;
+        }
+        for (BusinessActionDesign action : actions) {
+            if (action == null || StringUtils.isEmpty(action.getUiBindings())) {
+                continue;
+            }
+            for (BusinessActionUiBindingDesign binding : action.getUiBindings()) {
+                if (binding == null || StringUtils.isEmpty(binding.getPageCode()) || StringUtils.isEmpty(binding.getSlot())) {
+                    continue;
+                }
+                String key = binding.getPageCode() + ":" + binding.getSlot();
+                List<BusinessActionDesign> grouped = slotActions.get(key);
+                if (grouped == null) {
+                    grouped = new ArrayList<BusinessActionDesign>();
+                    slotActions.put(key, grouped);
+                }
+                grouped.add(action);
+            }
+        }
+        return slotActions;
+    }
+
+    private List<BusinessActionDesign> filterPageDesignBusinessActions(List<BusinessActionDesign> tableBusinessActions,
+            Object actionCodesObject) {
+        if (StringUtils.isEmpty(tableBusinessActions) || !(actionCodesObject instanceof List)) {
+            return Collections.emptyList();
+        }
+        Map<String, BusinessActionDesign> actionsByCode = new LinkedHashMap<String, BusinessActionDesign>();
+        for (BusinessActionDesign action : tableBusinessActions) {
+            if (action != null && StringUtils.isNotEmpty(action.getCode())) {
+                actionsByCode.put(action.getCode(), action);
+            }
+        }
+        List<BusinessActionDesign> result = new ArrayList<BusinessActionDesign>();
+        for (Object codeObject : (List<?>) actionCodesObject) {
+            String rawCode = StringUtils.defaultString(String.valueOf(codeObject));
+            if (StringUtils.isEmpty(rawCode)) {
+                continue;
+            }
+            boolean explicitBusinessAction = rawCode.startsWith("business:");
+            String actionCode = explicitBusinessAction ? rawCode.substring("business:".length()) : rawCode;
+            if (!explicitBusinessAction && isBuiltinPageAction(actionCode)) {
+                continue;
+            }
+            BusinessActionDesign action = actionsByCode.get(actionCode);
+            if (action != null && !result.contains(action)) {
+                result.add(action);
+            }
+        }
+        return result;
+    }
+
+    private List<BusinessActionDesign> mergeBusinessActions(List<BusinessActionDesign> first, List<BusinessActionDesign> second) {
+        Map<String, BusinessActionDesign> merged = new LinkedHashMap<String, BusinessActionDesign>();
+        for (BusinessActionDesign action : first) {
+            if (action != null && StringUtils.isNotEmpty(action.getCode())) {
+                merged.put(action.getCode(), action);
+            }
+        }
+        for (BusinessActionDesign action : second) {
+            if (action != null && StringUtils.isNotEmpty(action.getCode())) {
+                merged.put(action.getCode(), action);
+            }
+        }
+        return new ArrayList<BusinessActionDesign>(merged.values());
+    }
+
+    private boolean isBuiltinPageAction(String actionCode) {
+        String normalized = StringUtils.defaultString(actionCode).toLowerCase();
+        return "create".equals(normalized) || "add".equals(normalized)
+                || "batchdelete".equals(normalized) || "batch_delete".equals(normalized)
+                || "view".equals(normalized) || "detail".equals(normalized)
+                || "edit".equals(normalized) || "update".equals(normalized)
+                || "delete".equals(normalized) || "remove".equals(normalized);
+    }
+
+    private List<BusinessActionDesign> filterTableSlotActions(GenProject project, GenTable table,
+            List<BusinessActionDesign> tableBusinessActions, String slot) {
+        if (StringUtils.isEmpty(tableBusinessActions)) {
+            return Collections.emptyList();
+        }
+        List<BusinessActionDesign> slotActions = new ArrayList<BusinessActionDesign>();
+        for (BusinessActionDesign action : tableBusinessActions) {
+            if (action == null || StringUtils.isEmpty(action.getUiBindings())) {
+                continue;
+            }
+            for (BusinessActionUiBindingDesign binding : action.getUiBindings()) {
+                if (binding != null && StringUtils.equals(slot, binding.getSlot())
+                        && bindingMatchesTablePage(project, table, binding, slot)) {
+                    slotActions.add(action);
+                    break;
+                }
+            }
+        }
+        if (StringUtils.isNotEmpty(slotActions)) {
+            return slotActions;
+        }
+        return Collections.emptyList();
+    }
+
+    private boolean bindingMatchesTablePage(GenProject project, GenTable table, BusinessActionUiBindingDesign binding, String slot) {
+        if (project == null || table == null || binding == null) {
+            return false;
+        }
+        if (StringUtils.isEmpty(project.getFrontendPages())) {
+            return true;
+        }
+        for (AppPageDesign page : project.getFrontendPages()) {
+            if (page == null || !StringUtils.equals(page.getCode(), binding.getPageCode())) {
+                continue;
+            }
+            if (!StringUtils.equals(page.getTableName(), table.getTableName())) {
+                return false;
+            }
+            if (slot != null && slot.startsWith("detail.")) {
+                return "detail".equals(page.getPageType());
+            }
+            if (slot != null && slot.startsWith("list.")) {
+                return "list".equals(page.getPageType()) || "current_user_list".equals(page.getPageType());
+            }
+            return true;
+        }
+        return false;
+    }
+
     private GenTable getRequiredTable(GenProject project, Long tableId) {
         if (project != null && StringUtils.isNotEmpty(project.getTables())) {
             for (GenTable projectTable : project.getTables()) {
diff --git a/RuoYi-Vue/ruoyi-generator/src/main/java/com/ruoyi/generator/service/front/FrontendPageDesignService.java b/RuoYi-Vue/ruoyi-generator/src/main/java/com/ruoyi/generator/service/front/FrontendPageDesignService.java
new file mode 100644
index 0000000..3855483
--- /dev/null
+++ b/RuoYi-Vue/ruoyi-generator/src/main/java/com/ruoyi/generator/service/front/FrontendPageDesignService.java
@@ -0,0 +1,1126 @@
+package com.ruoyi.generator.service.front;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.generator.domain.GenTable;
+import com.ruoyi.generator.domain.GenTableColumn;
+import com.ruoyi.generator.domain.front.FrontProject;
+import com.ruoyi.generator.domain.front.FrontProjectColumn;
+import com.ruoyi.generator.domain.front.FrontProjectPageDesign;
+import com.ruoyi.generator.domain.front.FrontProjectTable;
+import com.ruoyi.generator.domain.front.dto.AppBlueprintDesign;
+import com.ruoyi.generator.domain.front.dto.AppMenuDesign;
+import com.ruoyi.generator.domain.front.dto.AppPageDesign;
+import com.ruoyi.generator.domain.front.dto.FrontendPageDesignInitResponse;
+import com.ruoyi.generator.domain.front.dto.FrontendPageDesignRequest;
+import com.ruoyi.generator.domain.front.dto.FrontendPageDesignResponse;
+import com.ruoyi.generator.mapper.front.FrontProjectColumnMapper;
+import com.ruoyi.generator.mapper.front.FrontProjectPageDesignMapper;
+import com.ruoyi.generator.mapper.front.FrontProjectTableMapper;
+
+@Service
+public class FrontendPageDesignService
+{
+    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
+    private static final Set<String> PAGE_TYPES = new HashSet<String>(
+            Arrays.asList("list", "detail", "form", "current_user_list", "business_block"));
+    private static final Set<String> REGION_TYPES = new HashSet<String>(
+            Arrays.asList("query", "toolbar", "table", "dialogForm", "detail", "form", "cardList", "actions"));
+    private static final Set<String> BUILTIN_ACTIONS = new HashSet<String>(
+            Arrays.asList("create", "batchDelete", "view", "edit", "delete", "export"));
+    private static final Map<String, Set<String>> LAYOUT_CANVASES_BY_PAGE_TYPE = layoutCanvasesByPageType();
+    private static final String FRONTEND_SCOPE = "frontend";
+    private static final String ADMIN_SCOPE = "admin";
+
+    @Autowired
+    private IFrontProjectService frontProjectService;
+    @Autowired
+    private FrontProjectPageDesignMapper pageDesignMapper;
+    @Autowired
+    private FrontProjectTableMapper frontProjectTableMapper;
+    @Autowired
+    private FrontProjectColumnMapper frontProjectColumnMapper;
+    @Autowired
+    private BusinessBlockRegistryService businessBlockRegistryService;
+
+    public List<FrontendPageDesignResponse> listPageDesigns(Long userId, Long projectId)
+    {
+        return listPageDesigns(userId, projectId, FRONTEND_SCOPE);
+    }
+
+    public List<FrontendPageDesignResponse> listPageDesigns(Long userId, Long projectId, String scope)
+    {
+        frontProjectService.getProject(userId, projectId);
+        return toResponses(pageDesignMapper.selectDesignsByProjectIdAndScope(projectId, normalizeScope(scope)));
+    }
+
+    public FrontendPageDesignResponse getPageDesign(Long userId, Long projectId, Long designId)
+    {
+        return getPageDesign(userId, projectId, designId, FRONTEND_SCOPE);
+    }
+
+    public FrontendPageDesignResponse getPageDesign(Long userId, Long projectId, Long designId, String scope)
+    {
+        frontProjectService.getProject(userId, projectId);
+        return FrontendPageDesignResponse.from(requireDesign(projectId, designId, normalizeScope(scope)));
+    }
+
+    @Transactional
+    public FrontendPageDesignInitResponse initializePageDesigns(Long userId, Long projectId)
+    {
+        return initializePageDesigns(userId, projectId, FRONTEND_SCOPE);
+    }
+
+    @Transactional
+    public FrontendPageDesignInitResponse initializePageDesigns(Long userId, Long projectId, String scope)
+    {
+        String normalizedScope = normalizeScope(scope);
+        if (ADMIN_SCOPE.equals(normalizedScope))
+        {
+            return initializeAdminPageDesigns(userId, projectId);
+        }
+        return initializeFrontendPageDesigns(userId, projectId);
+    }
+
+    private FrontendPageDesignInitResponse initializeFrontendPageDesigns(Long userId, Long projectId)
+    {
+        FrontProject project = frontProjectService.getProject(userId, projectId);
+        AppBlueprintDesign blueprint = readAppBlueprint(project.getAppBlueprint());
+        if (blueprint.getFrontendPages() == null || blueprint.getFrontendPages().isEmpty())
+        {
+            throw new ServiceException("请先生成并确认前台页面蓝图");
+        }
+
+        List<FrontProjectPageDesign> existing = safeDesigns(pageDesignMapper.selectDesignsByProjectIdAndScope(projectId, FRONTEND_SCOPE));
+        Map<String, FrontProjectPageDesign> existingByPageCode = new LinkedHashMap<String, FrontProjectPageDesign>();
+        for (FrontProjectPageDesign design : existing)
+        {
+            if (StringUtils.isNotEmpty(design.getPageCode()))
+            {
+                existingByPageCode.put(design.getPageCode(), design);
+            }
+        }
+
+        Map<String, TableBundle> tablesByName = loadTables(projectId);
+        List<FrontProjectPageDesign> merged = new ArrayList<FrontProjectPageDesign>();
+        Set<String> blueprintPageCodes = new LinkedHashSet<String>();
+        for (AppPageDesign page : blueprint.getFrontendPages())
+        {
+            if (page == null || StringUtils.isEmpty(page.getCode()))
+            {
+                continue;
+            }
+            blueprintPageCodes.add(page.getCode());
+            FrontProjectPageDesign design = existingByPageCode.get(page.getCode());
+            if (design == null)
+            {
+                design = newDefaultDesign(projectId, userId, FRONTEND_SCOPE, page, tablesByName.get(page.getTableName()));
+                pageDesignMapper.insertFrontProjectPageDesign(design);
+            }
+            merged.add(design);
+        }
+
+        List<FrontendPageDesignResponse> detached = new ArrayList<FrontendPageDesignResponse>();
+        for (FrontProjectPageDesign design : existing)
+        {
+            if (!blueprintPageCodes.contains(design.getPageCode()))
+            {
+                detached.add(FrontendPageDesignResponse.from(design));
+            }
+        }
+
+        FrontendPageDesignInitResponse response = new FrontendPageDesignInitResponse();
+        response.setDesigns(toResponses(merged));
+        response.setDetachedDesigns(detached);
+        return response;
+    }
+
+    private FrontendPageDesignInitResponse initializeAdminPageDesigns(Long userId, Long projectId)
+    {
+        FrontProject project = frontProjectService.getProject(userId, projectId);
+        AppBlueprintDesign blueprint = readAppBlueprint(project.getAppBlueprint());
+        Map<String, TableBundle> tablesByName = loadTables(projectId);
+        if ((blueprint.getAdminMenus() == null || blueprint.getAdminMenus().isEmpty()) && tablesByName.isEmpty())
+        {
+            throw new ServiceException("请先生成后台菜单或数据库表");
+        }
+
+        List<FrontProjectPageDesign> existing = safeDesigns(pageDesignMapper.selectDesignsByProjectIdAndScope(projectId, ADMIN_SCOPE));
+        Map<String, FrontProjectPageDesign> existingByPageCode = new LinkedHashMap<String, FrontProjectPageDesign>();
+        for (FrontProjectPageDesign design : existing)
+        {
+            if (StringUtils.isNotEmpty(design.getPageCode()))
+            {
+                existingByPageCode.put(design.getPageCode(), design);
+            }
+        }
+
+        Map<String, TableBundle> unmatchedTables = new LinkedHashMap<String, TableBundle>(tablesByName);
+        List<FrontProjectPageDesign> merged = new ArrayList<FrontProjectPageDesign>();
+        Set<String> expectedPageCodes = new LinkedHashSet<String>();
+        if (blueprint.getAdminMenus() != null)
+        {
+            for (AppMenuDesign menu : blueprint.getAdminMenus())
+            {
+                if (menu == null || StringUtils.isEmpty(menu.getCode()))
+                {
+                    continue;
+                }
+                TableBundle table = findAdminMenuTable(menu, unmatchedTables);
+                if (table == null)
+                {
+                    continue;
+                }
+                unmatchedTables.remove(table.table.getTableName());
+                AppPageDesign page = adminPageFromMenu(menu, table.table);
+                expectedPageCodes.add(page.getCode());
+                FrontProjectPageDesign design = existingByPageCode.get(page.getCode());
+                if (design == null)
+                {
+                    design = newDefaultDesign(projectId, userId, ADMIN_SCOPE, page, table);
+                    pageDesignMapper.insertFrontProjectPageDesign(design);
+                }
+                merged.add(design);
+            }
+        }
+
+        for (TableBundle table : unmatchedTables.values())
+        {
+            AppPageDesign page = adminPageFromTable(table.table);
+            expectedPageCodes.add(page.getCode());
+            FrontProjectPageDesign design = existingByPageCode.get(page.getCode());
+            if (design == null)
+            {
+                design = newDefaultDesign(projectId, userId, ADMIN_SCOPE, page, table);
+                pageDesignMapper.insertFrontProjectPageDesign(design);
+            }
+            merged.add(design);
+        }
+
+        List<FrontendPageDesignResponse> detached = new ArrayList<FrontendPageDesignResponse>();
+        for (FrontProjectPageDesign design : existing)
+        {
+            if (!expectedPageCodes.contains(design.getPageCode()))
+            {
+                detached.add(FrontendPageDesignResponse.from(design));
+            }
+        }
+
+        FrontendPageDesignInitResponse response = new FrontendPageDesignInitResponse();
+        response.setDesigns(toResponses(merged));
+        response.setDetachedDesigns(detached);
+        return response;
+    }
+
+    @Transactional
+    public FrontendPageDesignResponse createPageDesign(Long userId, Long projectId, FrontendPageDesignRequest request)
+    {
+        return createPageDesign(userId, projectId, request, FRONTEND_SCOPE);
+    }
+
+    @Transactional
+    public FrontendPageDesignResponse createPageDesign(Long userId, Long projectId, FrontendPageDesignRequest request,
+            String scope)
+    {
+        if (request == null)
+        {
+            throw new ServiceException("页面设计参数不能为空");
+        }
+        frontProjectService.getProject(userId, projectId);
+        String normalizedScope = normalizeScope(scope);
+
+        FrontProjectPageDesign create = new FrontProjectPageDesign();
+        create.setProjectId(projectId);
+        create.setUserId(userId);
+        create.setPageScope(defaultText(request.getPageScope(), normalizedScope));
+        create.setPageCode(request.getPageCode());
+        create.setMenuCode(defaultText(request.getMenuCode(), request.getPageCode()));
+        create.setPageName(request.getPageName());
+        create.setRoutePath(request.getRoutePath());
+        create.setPageType(defaultText(request.getPageType(), "list"));
+        create.setTableName(request.getTableName());
+        create.setStatus(defaultText(request.getStatus(), "0"));
+        create.setRemark(request.getRemark());
+        create.setVersion(1);
+
+        validatePageMeta(create);
+        ensureUniquePageCode(projectId, create.getPageCode(), normalizedScope);
+
+        Map<String, TableBundle> tablesByName = loadTables(projectId);
+        TableBundle table = null;
+        if (StringUtils.isNotEmpty(create.getTableName()))
+        {
+            table = tablesByName.get(create.getTableName());
+            if (table == null)
+            {
+                throw new ServiceException("页面绑定的数据表不存在: " + create.getTableName());
+            }
+        }
+        String layoutJson = defaultText(request.getLayoutJson(),
+                defaultLayoutJson(create.getPageType(), table, normalizedScope));
+        String actionJson = defaultText(request.getActionJson(), defaultActionJson(table, normalizedScope));
+        create.setLayoutJson(normalizeLayout(layoutJson, table, create.getPageType(), create.getPageScope(), tablesByName));
+        create.setActionJson(normalizeAction(actionJson, table, create.getPageScope()));
+        pageDesignMapper.insertFrontProjectPageDesign(create);
+        return FrontendPageDesignResponse.from(create);
+    }
+
+    @Transactional
+    public FrontendPageDesignResponse updatePageDesign(Long userId, Long projectId, Long designId,
+            FrontendPageDesignRequest request)
+    {
+        return updatePageDesign(userId, projectId, designId, request, FRONTEND_SCOPE);
+    }
+
+    @Transactional
+    public FrontendPageDesignResponse updatePageDesign(Long userId, Long projectId, Long designId,
+            FrontendPageDesignRequest request, String scope)
+    {
+        if (request == null)
+        {
+            throw new ServiceException("页面设计参数不能为空");
+        }
+        frontProjectService.getProject(userId, projectId);
+        String normalizedScope = normalizeScope(scope);
+        FrontProjectPageDesign current = requireDesign(projectId, designId, normalizedScope);
+        int currentVersion = current.getVersion() == null ? 1 : current.getVersion().intValue();
+        if (request.getVersion() != null && request.getVersion().intValue() != currentVersion)
+        {
+            throw new ServiceException("页面设计已被更新，请刷新后重试");
+        }
+
+        FrontProjectPageDesign update = new FrontProjectPageDesign();
+        update.setDesignId(designId);
+        update.setProjectId(projectId);
+        update.setUserId(userId);
+        update.setPageScope(defaultText(request.getPageScope(), current.getPageScope()));
+        update.setPageScope(defaultText(update.getPageScope(), normalizedScope));
+        update.setPageCode(defaultText(request.getPageCode(), current.getPageCode()));
+        update.setMenuCode(defaultText(request.getMenuCode(), current.getMenuCode()));
+        update.setPageName(defaultText(request.getPageName(), current.getPageName()));
+        update.setRoutePath(defaultText(request.getRoutePath(), current.getRoutePath()));
+        update.setPageType(defaultText(request.getPageType(), current.getPageType()));
+        update.setTableName(defaultText(request.getTableName(), current.getTableName()));
+        update.setStatus(defaultText(request.getStatus(), current.getStatus()));
+        update.setRemark(defaultText(request.getRemark(), current.getRemark()));
+        update.setVersion(currentVersion + 1);
+
+        validatePageMeta(update);
+        Map<String, TableBundle> tablesByName = loadTables(projectId);
+        TableBundle table = null;
+        if (StringUtils.isNotEmpty(update.getTableName()))
+        {
+            table = tablesByName.get(update.getTableName());
+            if (table == null)
+            {
+                throw new ServiceException("页面绑定的数据表不存在: " + update.getTableName());
+            }
+        }
+        update.setLayoutJson(normalizeLayout(defaultText(request.getLayoutJson(), current.getLayoutJson()), table,
+                update.getPageType(), update.getPageScope(), tablesByName));
+        update.setActionJson(normalizeAction(defaultText(request.getActionJson(), current.getActionJson()), table,
+                update.getPageScope()));
+        pageDesignMapper.updateFrontProjectPageDesign(update);
+        return FrontendPageDesignResponse.from(update);
+    }
+
+    @Transactional
+    public void deletePageDesign(Long userId, Long projectId, Long designId, String scope)
+    {
+        frontProjectService.getProject(userId, projectId);
+        String normalizedScope = normalizeScope(scope);
+        requireDesign(projectId, designId, normalizedScope);
+        pageDesignMapper.deleteFrontProjectPageDesignById(designId);
+    }
+
+    private FrontProjectPageDesign requireDesign(Long projectId, Long designId)
+    {
+        return requireDesign(projectId, designId, FRONTEND_SCOPE);
+    }
+
+    private FrontProjectPageDesign requireDesign(Long projectId, Long designId, String scope)
+    {
+        FrontProjectPageDesign design = pageDesignMapper.selectFrontProjectPageDesignById(designId);
+        if (design == null || design.getProjectId() == null || !design.getProjectId().equals(projectId)
+                || !scopeMatches(design.getPageScope(), scope))
+        {
+            throw new ServiceException("页面设计不存在或无权限");
+        }
+        return design;
+    }
+
+    private void ensureUniquePageCode(Long projectId, String pageCode, String scope)
+    {
+        List<FrontProjectPageDesign> existing = safeDesigns(pageDesignMapper.selectDesignsByProjectIdAndScope(projectId, scope));
+        for (FrontProjectPageDesign design : existing)
+        {
+            if (design != null && pageCode.equals(design.getPageCode()))
+            {
+                throw new ServiceException("页面编码已存在: " + pageCode);
+            }
+        }
+    }
+
+    private FrontProjectPageDesign newDefaultDesign(Long projectId, Long userId, String scope, AppPageDesign page, TableBundle table)
+    {
+        FrontProjectPageDesign design = new FrontProjectPageDesign();
+        design.setProjectId(projectId);
+        design.setUserId(userId);
+        design.setPageScope(scope);
+        design.setPageCode(page.getCode());
+        design.setMenuCode(page.getMenuCode());
+        design.setPageName(defaultText(page.getName(), page.getCode()));
+        design.setRoutePath(defaultText(page.getPath(), "/" + page.getCode()));
+        design.setPageType(defaultText(page.getPageType(), "list"));
+        design.setTableName(page.getTableName());
+        design.setLayoutJson(defaultLayoutJson(defaultText(page.getPageType(), "list"), table, scope));
+        design.setActionJson(defaultActionJson(table, scope));
+        design.setStatus("0");
+        design.setVersion(1);
+        return design;
+    }
+
+    private AppPageDesign adminPageFromMenu(AppMenuDesign menu, FrontProjectTable table)
+    {
+        AppPageDesign page = new AppPageDesign();
+        page.setCode(menu.getCode());
+        page.setMenuCode(menu.getCode());
+        page.setName(defaultText(menu.getName(), defaultAdminPageName(table)));
+        page.setPath(defaultText(menu.getPath(), adminRoutePath(table)));
+        page.setPageType("list");
+        page.setTableName(table.getTableName());
+        return page;
+    }
+
+    private AppPageDesign adminPageFromTable(FrontProjectTable table)
+    {
+        AppPageDesign page = new AppPageDesign();
+        page.setCode("admin_" + table.getTableName());
+        page.setMenuCode("admin_" + table.getTableName());
+        page.setName(defaultAdminPageName(table));
+        page.setPath(adminRoutePath(table));
+        page.setPageType("list");
+        page.setTableName(table.getTableName());
+        return page;
+    }
+
+    private TableBundle findAdminMenuTable(AppMenuDesign menu, Map<String, TableBundle> tablesByName)
+    {
+        if (menu == null || tablesByName == null || tablesByName.isEmpty())
+        {
+            return null;
+        }
+        String menuName = normalizeMatchText(menu.getName());
+        String menuCode = normalizeMatchText(menu.getCode());
+        String menuPath = normalizeMatchText(menu.getPath());
+        for (TableBundle table : tablesByName.values())
+        {
+            if (table == null || table.table == null)
+            {
+                continue;
+            }
+            String adminMenuName = normalizeMatchText(table.table.getAdminMenuName());
+            String tableName = normalizeMatchText(table.table.getTableName());
+            String businessName = normalizeMatchText(table.table.getBusinessName());
+            if (StringUtils.isNotEmpty(adminMenuName) && (adminMenuName.equals(menuName) || adminMenuName.equals(menuCode)))
+            {
+                return table;
+            }
+            if (StringUtils.isNotEmpty(tableName) && (menuPath.contains(tableName) || menuCode.contains(tableName)))
+            {
+                return table;
+            }
+            if (StringUtils.isNotEmpty(businessName) && (menuPath.contains(businessName) || menuCode.contains(businessName)))
+            {
+                return table;
+            }
+        }
+        return null;
+    }
+
+    private void validatePageMeta(FrontProjectPageDesign design)
+    {
+        if (!FRONTEND_SCOPE.equals(design.getPageScope()) && !ADMIN_SCOPE.equals(design.getPageScope()))
+        {
+            throw new ServiceException("页面范围不支持: " + design.getPageScope());
+        }
+        if (StringUtils.isEmpty(design.getPageCode()))
+        {
+            throw new ServiceException("页面编码不能为空");
+        }
+        if (StringUtils.isEmpty(design.getPageName()))
+        {
+            throw new ServiceException("页面名称不能为空");
+        }
+        if (StringUtils.isEmpty(design.getRoutePath()))
+        {
+            throw new ServiceException("页面路由不能为空");
+        }
+        if (!PAGE_TYPES.contains(design.getPageType()))
+        {
+            throw new ServiceException("页面类型不支持: " + design.getPageType());
+        }
+        if (StringUtils.isEmpty(design.getTableName()) && !"business_block".equals(design.getPageType()))
+        {
+            throw new ServiceException("页面必须绑定数据表");
+        }
+    }
+
+    private Map<String, TableBundle> loadTables(Long projectId)
+    {
+        Map<String, TableBundle> result = new LinkedHashMap<String, TableBundle>();
+        List<FrontProjectTable> tables = frontProjectTableMapper.selectTablesByProjectId(projectId);
+        if (tables == null)
+        {
+            return result;
+        }
+        for (FrontProjectTable table : tables)
+        {
+            if (table == null || StringUtils.isEmpty(table.getTableName()))
+            {
+                continue;
+            }
+            TableBundle bundle = new TableBundle();
+            bundle.table = table;
+            List<FrontProjectColumn> columns = table.getTableId() == null
+                    ? new ArrayList<FrontProjectColumn>()
+                    : frontProjectColumnMapper.selectColumnsByTableId(table.getTableId());
+            bundle.columns = columns == null ? new ArrayList<FrontProjectColumn>() : columns;
+            result.put(table.getTableName(), bundle);
+        }
+        return result;
+    }
+
+    private String defaultLayoutJson(String pageType, TableBundle table, String scope)
+    {
+        if ("business_block".equals(pageType))
+        {
+            Map<String, Object> businessLayout = new LinkedHashMap<String, Object>();
+            businessLayout.put("canvas", BusinessBlockRegistryService.BUSINESS_BLOCK_CANVAS);
+            businessLayout.put("blocks", new ArrayList<Object>());
+            return writeJson(businessLayout);
+        }
+        Map<String, Object> layout = new LinkedHashMap<String, Object>();
+        layout.put("canvas", defaultLayoutCanvas(pageType, scope));
+        List<Map<String, Object>> regions = new ArrayList<Map<String, Object>>();
+        regions.add(region("query", "query", queryFields(table), null, null));
+        regions.add(region("toolbar", "toolbar", null, toolbarActions(table, scope), null));
+        regions.add(region("table", "table", listFields(table), null, rowActions(table)));
+        regions.add(region("form", "dialogForm", formFields(table), null, null));
+        layout.put("regions", regions);
+        return writeJson(layout);
+    }
+
+    private Map<String, Object> region(String id, String type, List<String> fields,
+            List<String> actions, List<String> rowActions)
+    {
+        Map<String, Object> region = new LinkedHashMap<String, Object>();
+        region.put("id", id);
+        region.put("type", type);
+        if (fields != null)
+        {
+            region.put("fields", fields);
+        }
+        if (actions != null)
+        {
+            region.put("actions", actions);
+        }
+        if (rowActions != null)
+        {
+            region.put("rowActions", rowActions);
+        }
+        return region;
+    }
+
+    private String defaultActionJson(TableBundle table, String scope)
+    {
+        Map<String, Object> action = new LinkedHashMap<String, Object>();
+        List<Map<String, Object>> toolbarActions = new ArrayList<Map<String, Object>>();
+        if (table == null || !"0".equals(table.table.getAllowAdd()))
+        {
+            toolbarActions.add(action("create", "新增", "primary", true));
+        }
+        if (ADMIN_SCOPE.equals(scope))
+        {
+            toolbarActions.add(action("export", "导出", "default", true));
+        }
+        List<Map<String, Object>> rowActions = new ArrayList<Map<String, Object>>();
+        rowActions.add(action("view", "查看", "default", true));
+        if (table == null || !"0".equals(table.table.getAllowEdit()))
+        {
+            rowActions.add(action("edit", "编辑", "primary", true));
+        }
+        if (table == null || !"0".equals(table.table.getAllowRemove()))
+        {
+            rowActions.add(action("delete", "删除", "danger", true));
+        }
+        action.put("toolbarActions", toolbarActions);
+        action.put("rowActions", rowActions);
+        return writeJson(action);
+    }
+
+    private Map<String, Object> action(String code, String label, String type, boolean builtin)
+    {
+        Map<String, Object> action = new LinkedHashMap<String, Object>();
+        action.put("code", code);
+        action.put("label", label);
+        action.put("type", type);
+        action.put("builtin", builtin);
+        return action;
+    }
+
+    private List<String> queryFields(TableBundle table)
+    {
+        return collectFields(table, "query");
+    }
+
+    private List<String> listFields(TableBundle table)
+    {
+        return collectFields(table, "list");
+    }
+
+    private List<String> formFields(TableBundle table)
+    {
+        return collectFields(table, "form");
+    }
+
+    private List<String> collectFields(TableBundle table, String usage)
+    {
+        List<String> fields = new ArrayList<String>();
+        if (table == null)
+        {
+            return fields;
+        }
+        for (FrontProjectColumn column : table.columns)
+        {
+            String field = javaField(column);
+            if (StringUtils.isEmpty(field))
+            {
+                continue;
+            }
+            if ("query".equals(usage) && !"1".equals(column.getIsQuery()))
+            {
+                continue;
+            }
+            if ("list".equals(usage) && "0".equals(column.getIsList()))
+            {
+                continue;
+            }
+            if ("form".equals(usage) && "0".equals(column.getIsInsert()) && "0".equals(column.getIsEdit()))
+            {
+                continue;
+            }
+            fields.add(field);
+        }
+        return fields;
+    }
+
+    private List<String> toolbarActions(TableBundle table, String scope)
+    {
+        List<String> actions = new ArrayList<String>();
+        if (table == null || !"0".equals(table.table.getAllowAdd()))
+        {
+            actions.add("create");
+        }
+        if (ADMIN_SCOPE.equals(scope))
+        {
+            actions.add("export");
+        }
+        return actions;
+    }
+
+    private List<String> rowActions(TableBundle table)
+    {
+        List<String> actions = new ArrayList<String>();
+        actions.add("view");
+        if (table == null || !"0".equals(table.table.getAllowEdit()))
+        {
+            actions.add("edit");
+        }
+        if (table == null || !"0".equals(table.table.getAllowRemove()))
+        {
+            actions.add("delete");
+        }
+        return actions;
+    }
+
+    @SuppressWarnings("unchecked")
+    private String normalizeLayout(String layoutJson, TableBundle table, String pageType, String scope,
+            Map<String, TableBundle> tablesByName)
+    {
+        if (StringUtils.isEmpty(layoutJson))
+        {
+            return defaultLayoutJson(pageType, table, scope);
+        }
+        Map<String, Object> layout = readMap(layoutJson, "页面布局JSON格式错误");
+        String canvas = defaultText(stringValue(layout.get("canvas")), defaultLayoutCanvas(pageType, scope));
+        if (!layoutCanvasAllowed(pageType, canvas, scope))
+        {
+            throw new ServiceException("页面布局不支持当前页面类型: " + canvas);
+        }
+        layout.put("canvas", canvas);
+        if (BusinessBlockRegistryService.BUSINESS_BLOCK_CANVAS.equals(canvas))
+        {
+            String normalizedLayout = writeJson(layout);
+            businessBlockRegistryService.validateLayout(normalizedLayout, toGenTables(tablesByName));
+            return normalizedLayout;
+        }
+        Object regionsObject = layout.get("regions");
+        if (!(regionsObject instanceof List))
+        {
+            throw new ServiceException("页面布局必须包含 regions");
+        }
+        Map<String, String> aliases = fieldAliases(table);
+        Set<String> regionIds = new HashSet<String>();
+        for (Object regionObject : (List<Object>) regionsObject)
+        {
+            if (!(regionObject instanceof Map))
+            {
+                throw new ServiceException("页面区域格式错误");
+            }
+            Map<String, Object> region = (Map<String, Object>) regionObject;
+            String id = stringValue(region.get("id"));
+            String type = stringValue(region.get("type"));
+            if (StringUtils.isEmpty(id) || !regionIds.add(id))
+            {
+                throw new ServiceException("页面区域ID不能为空且不能重复");
+            }
+            if (!REGION_TYPES.contains(type))
+            {
+                throw new ServiceException("页面区域类型不支持: " + type);
+            }
+            normalizeFieldList(region, "fields", aliases);
+            normalizeSingleField(region, "titleField", aliases);
+            normalizeSingleField(region, "imageField", aliases);
+            normalizeActionCodeList(region, "actions", table, scope);
+            normalizeActionCodeList(region, "rowActions", table, scope);
+        }
+        businessBlockRegistryService.validateEmbeddedBlocks(writeJson(layout), toGenTables(tablesByName));
+        return writeJson(layout);
+    }
+
+    private void normalizeSingleField(Map<String, Object> region, String key, Map<String, String> aliases)
+    {
+        Object value = region.get(key);
+        if (value == null || StringUtils.isEmpty(stringValue(value)))
+        {
+            return;
+        }
+        String normalized = aliases.get(stringValue(value));
+        if (normalized == null)
+        {
+            throw new ServiceException("页面字段不存在: " + value);
+        }
+        region.put(key, normalized);
+    }
+
+    private static Map<String, Set<String>> layoutCanvasesByPageType()
+    {
+        Map<String, Set<String>> result = new LinkedHashMap<String, Set<String>>();
+        result.put("list", new LinkedHashSet<String>(Arrays.asList(
+                "frontend-list-v1",
+                "frontend-list-card-v1",
+                "frontend-list-split-v1",
+                "admin-list-v1",
+                "admin-list-dense-v1",
+                "admin-list-split-v1")));
+        result.put("current_user_list", new LinkedHashSet<String>(Arrays.asList(
+                "frontend-current-user-list-v1",
+                "frontend-current-user-card-v1")));
+        result.put("detail", new LinkedHashSet<String>(Arrays.asList(
+                "frontend-detail-v1",
+                "frontend-detail-media-v1",
+                "admin-detail-v1")));
+        result.put("form", new LinkedHashSet<String>(Arrays.asList(
+                "frontend-form-v1",
+                "frontend-form-group-v1",
+                "admin-form-v1",
+                "admin-form-group-v1")));
+        result.put("business_block", new LinkedHashSet<String>(Arrays.asList(
+                BusinessBlockRegistryService.BUSINESS_BLOCK_CANVAS)));
+        return result;
+    }
+
+    private String defaultLayoutCanvas(String pageType, String scope)
+    {
+        if (ADMIN_SCOPE.equals(scope))
+        {
+            if ("detail".equals(pageType))
+            {
+                return "admin-detail-v1";
+            }
+            if ("form".equals(pageType))
+            {
+                return "admin-form-v1";
+            }
+            return "admin-list-v1";
+        }
+        Set<String> canvases = LAYOUT_CANVASES_BY_PAGE_TYPE.get(defaultText(pageType, "list"));
+        if (canvases == null || canvases.isEmpty())
+        {
+            return "frontend-list-v1";
+        }
+        return canvases.iterator().next();
+    }
+
+    private boolean layoutCanvasAllowed(String pageType, String canvas, String scope)
+    {
+        if (ADMIN_SCOPE.equals(scope) && canvas != null && !canvas.startsWith("admin-"))
+        {
+            return false;
+        }
+        if (FRONTEND_SCOPE.equals(scope) && canvas != null && canvas.startsWith("admin-"))
+        {
+            return false;
+        }
+        Set<String> canvases = LAYOUT_CANVASES_BY_PAGE_TYPE.get(defaultText(pageType, "list"));
+        return canvases != null && canvases.contains(canvas);
+    }
+
+    @SuppressWarnings("unchecked")
+    private void normalizeFieldList(Map<String, Object> region, String key, Map<String, String> aliases)
+    {
+        Object value = region.get(key);
+        if (value == null)
+        {
+            return;
+        }
+        if (!(value instanceof List))
+        {
+            throw new ServiceException("页面字段配置必须是数组");
+        }
+        List<String> fields = new ArrayList<String>();
+        for (Object item : (List<Object>) value)
+        {
+            String field = stringValue(item);
+            String normalized = aliases.get(field);
+            if (normalized == null)
+            {
+                throw new ServiceException("页面字段不存在: " + field);
+            }
+            fields.add(normalized);
+        }
+        region.put(key, fields);
+    }
+
+    private String normalizeAction(String actionJson, TableBundle table, String scope)
+    {
+        if (StringUtils.isEmpty(actionJson))
+        {
+            return "{\"toolbarActions\":[],\"rowActions\":[]}";
+        }
+        Map<String, Object> action = readMap(actionJson, "页面按钮JSON格式错误");
+        normalizeActionConfigList(action, "toolbarActions", table, scope);
+        normalizeActionConfigList(action, "rowActions", table, scope);
+        return writeJson(action);
+    }
+
+    @SuppressWarnings("unchecked")
+    private void normalizeActionCodeList(Map<String, Object> region, String key, TableBundle table, String scope)
+    {
+        Object value = region.get(key);
+        if (value == null)
+        {
+            return;
+        }
+        if (!(value instanceof List))
+        {
+            throw new ServiceException("页面按钮配置必须是数组");
+        }
+        List<String> actions = new ArrayList<String>();
+        for (Object item : (List<Object>) value)
+        {
+            String code = stringValue(item);
+            validateActionCode(code, table, scope);
+            actions.add(code);
+        }
+        region.put(key, actions);
+    }
+
+    @SuppressWarnings("unchecked")
+    private void normalizeActionConfigList(Map<String, Object> action, String key, TableBundle table, String scope)
+    {
+        Object value = action.get(key);
+        if (value == null)
+        {
+            return;
+        }
+        if (!(value instanceof List))
+        {
+            throw new ServiceException("页面按钮配置必须是数组");
+        }
+        for (Object item : (List<Object>) value)
+        {
+            String code = null;
+            if (item instanceof Map)
+            {
+                code = stringValue(((Map<String, Object>) item).get("code"));
+            }
+            else
+            {
+                code = stringValue(item);
+            }
+            validateActionCode(code, table, scope);
+        }
+    }
+
+    private void validateActionCode(String code, TableBundle table, String scope)
+    {
+        if (StringUtils.isEmpty(code))
+        {
+            throw new ServiceException("页面按钮编码不能为空");
+        }
+        if (code.startsWith("business:"))
+        {
+            if (code.length() == "business:".length())
+            {
+                throw new ServiceException("页面业务按钮编码不能为空");
+            }
+            return;
+        }
+        if (!BUILTIN_ACTIONS.contains(code))
+        {
+            throw new ServiceException("页面按钮不支持: " + code);
+        }
+        if ("create".equals(code) && table != null && "0".equals(table.table.getAllowAdd()))
+        {
+            throw new ServiceException("页面按钮 create 需要开启新增权限");
+        }
+        if ("edit".equals(code) && table != null && "0".equals(table.table.getAllowEdit()))
+        {
+            throw new ServiceException("页面按钮 edit 需要开启编辑权限");
+        }
+        if (("delete".equals(code) || "batchDelete".equals(code))
+                && table != null && "0".equals(table.table.getAllowRemove()))
+        {
+            throw new ServiceException("页面按钮 " + code + " 需要开启删除权限");
+        }
+        if ("export".equals(code) && !ADMIN_SCOPE.equals(normalizeScope(scope)))
+        {
+            throw new ServiceException("页面按钮 export 仅支持后台页面");
+        }
+    }
+
+    private Map<String, String> fieldAliases(TableBundle table)
+    {
+        Map<String, String> aliases = new HashMap<String, String>();
+        if (table == null)
+        {
+            return aliases;
+        }
+        for (FrontProjectColumn column : table.columns)
+        {
+            String field = javaField(column);
+            if (StringUtils.isEmpty(field))
+            {
+                continue;
+            }
+            aliases.put(field, field);
+            if (StringUtils.isNotEmpty(column.getColumnName()))
+            {
+                aliases.put(column.getColumnName(), field);
+            }
+        }
+        return aliases;
+    }
+
+    private List<GenTable> toGenTables(Map<String, TableBundle> tablesByName)
+    {
+        List<GenTable> tables = new ArrayList<GenTable>();
+        if (tablesByName == null)
+        {
+            return tables;
+        }
+        for (TableBundle bundle : tablesByName.values())
+        {
+            if (bundle == null || bundle.table == null)
+            {
+                continue;
+            }
+            GenTable table = new GenTable();
+            table.setTableId(bundle.table.getTableId());
+            table.setTableName(bundle.table.getTableName());
+            table.setTableComment(bundle.table.getTableComment());
+            List<GenTableColumn> columns = new ArrayList<GenTableColumn>();
+            for (FrontProjectColumn source : bundle.columns)
+            {
+                if (source == null)
+                {
+                    continue;
+                }
+                GenTableColumn column = new GenTableColumn();
+                column.setColumnName(source.getColumnName());
+                column.setJavaField(source.getJavaField());
+                column.setColumnComment(source.getColumnComment());
+                columns.add(column);
+            }
+            table.setColumns(columns);
+            tables.add(table);
+        }
+        return tables;
+    }
+
+    private String javaField(FrontProjectColumn column)
+    {
+        if (column == null)
+        {
+            return null;
+        }
+        if (StringUtils.isNotEmpty(column.getJavaField()))
+        {
+            return column.getJavaField();
+        }
+        return toCamelCase(column.getColumnName());
+    }
+
+    private String toCamelCase(String value)
+    {
+        if (StringUtils.isEmpty(value))
+        {
+            return value;
+        }
+        StringBuilder builder = new StringBuilder();
+        boolean upperNext = false;
+        for (int i = 0; i < value.length(); i++)
+        {
+            char c = value.charAt(i);
+            if (c == '_')
+            {
+                upperNext = true;
+                continue;
+            }
+            builder.append(upperNext ? Character.toUpperCase(c) : c);
+            upperNext = false;
+        }
+        return builder.toString();
+    }
+
+    private AppBlueprintDesign readAppBlueprint(String json)
+    {
+        if (StringUtils.isEmpty(json))
+        {
+            return new AppBlueprintDesign();
+        }
+        try
+        {
+            AppBlueprintDesign blueprint = OBJECT_MAPPER.readValue(json, AppBlueprintDesign.class);
+            return blueprint == null ? new AppBlueprintDesign() : blueprint;
+        }
+        catch (Exception e)
+        {
+            throw new ServiceException("前台页面蓝图JSON格式错误");
+        }
+    }
+
+    private Map<String, Object> readMap(String json, String message)
+    {
+        try
+        {
+            return OBJECT_MAPPER.readValue(json, new TypeReference<Map<String, Object>>() { });
+        }
+        catch (Exception e)
+        {
+            throw new ServiceException(message);
+        }
+    }
+
+    private String writeJson(Object value)
+    {
+        try
+        {
+            return OBJECT_MAPPER.writeValueAsString(value);
+        }
+        catch (Exception e)
+        {
+            throw new ServiceException("页面设计JSON序列化失败");
+        }
+    }
+
+    private List<FrontProjectPageDesign> safeDesigns(List<FrontProjectPageDesign> designs)
+    {
+        return designs == null ? new ArrayList<FrontProjectPageDesign>() : designs;
+    }
+
+    private List<FrontendPageDesignResponse> toResponses(List<FrontProjectPageDesign> designs)
+    {
+        List<FrontendPageDesignResponse> responses = new ArrayList<FrontendPageDesignResponse>();
+        for (FrontProjectPageDesign design : safeDesigns(designs))
+        {
+            responses.add(FrontendPageDesignResponse.from(design));
+        }
+        return responses;
+    }
+
+    private String stringValue(Object value)
+    {
+        return value == null ? null : String.valueOf(value);
+    }
+
+    private String defaultText(String value, String fallback)
+    {
+        return StringUtils.isEmpty(value) ? fallback : value;
+    }
+
+    private String normalizeScope(String scope)
+    {
+        return ADMIN_SCOPE.equals(scope) ? ADMIN_SCOPE : FRONTEND_SCOPE;
+    }
+
+    private boolean scopeMatches(String designScope, String expectedScope)
+    {
+        String normalizedDesignScope = StringUtils.isEmpty(designScope) ? FRONTEND_SCOPE : designScope;
+        return normalizeScope(expectedScope).equals(normalizedDesignScope);
+    }
+
+    private String defaultAdminPageName(FrontProjectTable table)
+    {
+        if (table == null)
+        {
+            return "后台管理";
+        }
+        if (StringUtils.isNotEmpty(table.getAdminMenuName()))
+        {
+            return table.getAdminMenuName();
+        }
+        if (StringUtils.isNotEmpty(table.getTableComment()))
+        {
+            return table.getTableComment();
+        }
+        return table.getTableName();
+    }
+
+    private String adminRoutePath(FrontProjectTable table)
+    {
+        String name = table == null ? "manage" : defaultText(table.getBusinessName(), table.getTableName());
+        return "/admin/" + name.replace("_", "-");
+    }
+
+    private String normalizeMatchText(String value)
+    {
+        if (StringUtils.isEmpty(value))
+        {
+            return "";
+        }
+        return value.toLowerCase().replace("_", "").replace("-", "").replace("/", "").replace(" ", "");
+    }
+
+    private static class TableBundle
+    {
+        private FrontProjectTable table;
+        private List<FrontProjectColumn> columns = new ArrayList<FrontProjectColumn>();
+    }
+}
diff --git a/RuoYi-Vue/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java b/RuoYi-Vue/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
index c8fbe0f..0a1f617 100644
--- a/RuoYi-Vue/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
+++ b/RuoYi-Vue/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
@@ -2,11 +2,17 @@ package com.ruoyi.generator.util;
 
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 
 import com.ruoyi.generator.domain.*;
+import com.ruoyi.generator.domain.front.FrontProjectPageDesign;
+import com.ruoyi.generator.domain.front.dto.AppMenuDesign;
+import com.ruoyi.generator.domain.front.dto.AppPageDesign;
 import org.apache.velocity.VelocityContext;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
@@ -41,6 +47,7 @@ public class VelocityUtils {
      * @return 模板列表
      */
     public static VelocityContext prepareContext(GenTable genTable) {
+        TableOperationResolver.applyDefaults(genTable);
         String moduleName = genTable.getModuleName();
         String businessName = genTable.getBusinessName();
         String packageName = genTable.getPackageName();
@@ -65,7 +72,20 @@ public class VelocityUtils {
         velocityContext.put("permissionPrefix", getPermissionPrefix(moduleName, businessName));
         velocityContext.put("columns", genTable.getColumns());
         velocityContext.put("table", genTable);
+        velocityContext.put("adminMenuName", genTable.getAdminMenuName());
+        velocityContext.put("allowAdd", genTable.getAllowAdd());
+        velocityContext.put("allowEdit", genTable.getAllowEdit());
+        velocityContext.put("allowRemove", genTable.getAllowRemove());
+        velocityContext.put("removeType", genTable.getRemoveType());
+        velocityContext.put("operationNote", genTable.getOperationNote());
         velocityContext.put("dicts", getDicts(genTable));
+        List<Map<String, String>> qingRemoteSelects = getQingRemoteSelects(genTable);
+        velocityContext.put("qingRemoteSelects", qingRemoteSelects);
+        velocityContext.put("qingRemoteSelectFields", getQingRemoteSelectFields(qingRemoteSelects));
+        GenTableColumn qingCurrentUserColumn = getQingCurrentUserColumn(genTable);
+        velocityContext.put("qingCurrentUserColumn", qingCurrentUserColumn);
+        velocityContext.put("hasQingCurrentUserColumn", qingCurrentUserColumn != null);
+        putPageDesignDefaults(velocityContext);
         setMenuVelocityContext(velocityContext, genTable);
         if (GenConstants.TPL_TREE.equals(tplCategory)) {
             setTreeVelocityContext(velocityContext, genTable);
@@ -124,9 +144,20 @@ public class VelocityUtils {
      */
     public static VelocityContext prepareContextProject(GenProject genProject) {
         VelocityContext velocityContext = new VelocityContext();
-        velocityContext.put("packageName", genProject.getPackageName());
-        velocityContext.put("projectName", genProject.getProjectName());
-        velocityContext.put("projectFileName", genProject.getProjectFileName());
+        String packageName = StringUtils.defaultString(genProject.getPackageName());
+        String projectName = StringUtils.defaultString(genProject.getProjectName());
+        String projectFileName = StringUtils.defaultString(genProject.getProjectFileName());
+        String projectClassName = toProjectClassName(projectFileName);
+
+        velocityContext.put("packageName", packageName);
+        velocityContext.put("projectName", projectName);
+        velocityContext.put("projectFileName", projectFileName);
+        velocityContext.put("projectClassName", projectClassName);
+        velocityContext.put("functionName", StringUtils.isNotEmpty(projectName) ? projectName : projectFileName);
+        velocityContext.put("businessName", StringUtils.isNotEmpty(projectFileName) ? projectFileName : projectName);
+        velocityContext.put("BusinessName", projectClassName);
+        velocityContext.put("ClassName", projectClassName);
+        velocityContext.put("className", StringUtils.uncapitalize(projectClassName));
         List<GenTable> tables = genProject.getTables() == null
                 ? Collections.<GenTable>emptyList() : genProject.getTables();
         velocityContext.put("tables", tables);
@@ -138,17 +169,65 @@ public class VelocityUtils {
                 ? Collections.emptyList() : genProject.getFrontendMenus();
         List<?> adminMenus = genProject.getAdminMenus() == null
                 ? Collections.emptyList() : genProject.getAdminMenus();
+        List<FrontProjectPageDesign> pageDesigns = genProject.getPageDesigns() == null
+                ? Collections.<FrontProjectPageDesign>emptyList() : genProject.getPageDesigns();
+        List<FrontProjectPageDesign> frontendPageDesigns = new ArrayList<FrontProjectPageDesign>();
+        List<FrontProjectPageDesign> adminPageDesigns = new ArrayList<FrontProjectPageDesign>();
+        Map<String, FrontProjectPageDesign> pageDesignsByCode = new LinkedHashMap<String, FrontProjectPageDesign>();
+        Map<String, FrontProjectPageDesign> pageDesignsByTable = new LinkedHashMap<String, FrontProjectPageDesign>();
+        Map<String, FrontProjectPageDesign> adminPageDesignsByCode = new LinkedHashMap<String, FrontProjectPageDesign>();
+        Map<String, FrontProjectPageDesign> adminPageDesignsByTable = new LinkedHashMap<String, FrontProjectPageDesign>();
+        for (FrontProjectPageDesign pageDesign : pageDesigns) {
+            if (pageDesign == null) {
+                continue;
+            }
+            enrichPageDesign(pageDesign);
+            boolean adminScope = "admin".equals(pageDesign.getPageScope());
+            List<FrontProjectPageDesign> scopedDesigns = adminScope ? adminPageDesigns : frontendPageDesigns;
+            Map<String, FrontProjectPageDesign> scopedByCode = adminScope ? adminPageDesignsByCode : pageDesignsByCode;
+            Map<String, FrontProjectPageDesign> scopedByTable = adminScope ? adminPageDesignsByTable : pageDesignsByTable;
+            scopedDesigns.add(pageDesign);
+            if (StringUtils.isNotEmpty(pageDesign.getPageCode())) {
+                scopedByCode.put(pageDesign.getPageCode(), pageDesign);
+            }
+            if (StringUtils.isNotEmpty(pageDesign.getTableName()) && !scopedByTable.containsKey(pageDesign.getTableName())) {
+                scopedByTable.put(pageDesign.getTableName(), pageDesign);
+            }
+        }
+        List<AppPageDesign> blueprintFrontendPages = genProject.getFrontendPages() == null
+                ? Collections.<AppPageDesign>emptyList() : genProject.getFrontendPages();
+        List<AppPageDesign> frontendPages = mergeFrontendPageDesigns(blueprintFrontendPages, frontendPageDesigns);
+        List<Map<String, Object>> frontendNavItems = buildFrontendNavItems(
+                genProject.getFrontendMenus(), frontendPages, tables, pageDesignsByCode);
+        List<Map<String, Object>> frontendRouteItems = buildFrontendRouteItems(
+                frontendNavItems, frontendPages, tables, pageDesignsByCode);
+        List<Map<String, Object>> frontendRouteComponents = buildFrontendRouteComponents(frontendRouteItems);
         velocityContext.put("appRoles", appRoles);
         velocityContext.put("frontendMenus", frontendMenus);
         velocityContext.put("adminMenus", adminMenus);
+        velocityContext.put("frontendPages", frontendPages);
+        velocityContext.put("frontendNavItems", frontendNavItems);
+        velocityContext.put("frontendRouteItems", frontendRouteItems);
+        velocityContext.put("frontendRouteComponents", frontendRouteComponents);
+        velocityContext.put("defaultFrontendPath", resolveDefaultFrontendPath(frontendNavItems, frontendRouteItems));
         velocityContext.put("hasAppBlueprint", genProject.getAppBlueprint() != null);
         velocityContext.put("hasAppRoles", StringUtils.isNotEmpty(appRoles));
         velocityContext.put("hasFrontendMenus", StringUtils.isNotEmpty(frontendMenus));
+        velocityContext.put("hasFrontendNavItems", StringUtils.isNotEmpty(frontendNavItems));
+        velocityContext.put("hasFrontendRouteItems", StringUtils.isNotEmpty(frontendRouteItems));
         velocityContext.put("hasAdminMenus", StringUtils.isNotEmpty(adminMenus));
         List<?> businessActions = genProject.getBusinessActions() == null
                 ? Collections.emptyList() : genProject.getBusinessActions();
         velocityContext.put("businessActions", businessActions);
         velocityContext.put("hasBusinessActions", StringUtils.isNotEmpty(businessActions));
+        velocityContext.put("frontendPageDesigns", frontendPageDesigns);
+        velocityContext.put("frontendPageDesignsByCode", pageDesignsByCode);
+        velocityContext.put("frontendPageDesignsByTable", pageDesignsByTable);
+        velocityContext.put("hasFrontendPageDesigns", StringUtils.isNotEmpty(frontendPageDesigns));
+        velocityContext.put("adminPageDesigns", adminPageDesigns);
+        velocityContext.put("adminPageDesignsByCode", adminPageDesignsByCode);
+        velocityContext.put("adminPageDesignsByTable", adminPageDesignsByTable);
+        velocityContext.put("hasAdminPageDesigns", StringUtils.isNotEmpty(adminPageDesigns));
         StringBuffer createTableSql = new StringBuffer();
         for (GenTable table : tables) {
             createTableSql.append("\n");
@@ -159,6 +238,779 @@ public class VelocityUtils {
         return velocityContext;
     }
 
+    @SuppressWarnings("unchecked")
+    private static void enrichPageDesign(FrontProjectPageDesign pageDesign) {
+        if (pageDesign.getLayout() == null && StringUtils.isNotEmpty(pageDesign.getLayoutJson())) {
+            try {
+                pageDesign.setLayout(JSON.parseObject(pageDesign.getLayoutJson(), Map.class));
+            } catch (RuntimeException e) {
+                pageDesign.setLayout(Collections.<String, Object>emptyMap());
+            }
+        }
+        if (pageDesign.getAction() == null && StringUtils.isNotEmpty(pageDesign.getActionJson())) {
+            try {
+                pageDesign.setAction(JSON.parseObject(pageDesign.getActionJson(), Map.class));
+            } catch (RuntimeException e) {
+                pageDesign.setAction(Collections.<String, Object>emptyMap());
+            }
+        }
+    }
+
+    private static List<AppPageDesign> mergeFrontendPageDesigns(List<AppPageDesign> pages,
+                                                                List<FrontProjectPageDesign> pageDesigns) {
+        Map<String, AppPageDesign> pagesByCode = new LinkedHashMap<String, AppPageDesign>();
+        if (StringUtils.isNotEmpty(pages)) {
+            for (AppPageDesign page : pages) {
+                if (page == null || StringUtils.isEmpty(page.getCode())) {
+                    continue;
+                }
+                AppPageDesign copy = copyPageDesign(page);
+                pagesByCode.put(copy.getCode(), copy);
+            }
+        }
+        if (StringUtils.isNotEmpty(pageDesigns)) {
+            for (FrontProjectPageDesign pageDesign : pageDesigns) {
+                if (pageDesign == null || StringUtils.isEmpty(pageDesign.getPageCode())
+                        || "admin".equals(pageDesign.getPageScope())) {
+                    continue;
+                }
+                AppPageDesign page = pagesByCode.get(pageDesign.getPageCode());
+                if (page == null) {
+                    page = new AppPageDesign();
+                    page.setCode(pageDesign.getPageCode());
+                    pagesByCode.put(page.getCode(), page);
+                }
+                page.setMenuCode(StringUtils.defaultIfEmpty(pageDesign.getMenuCode(), page.getMenuCode()));
+                page.setName(StringUtils.defaultIfEmpty(pageDesign.getPageName(), page.getName()));
+                page.setPath(StringUtils.defaultIfEmpty(pageDesign.getRoutePath(), page.getPath()));
+                page.setPageType(isFrontendBusinessBlockPageDesign(pageDesign)
+                        ? "business_block" : StringUtils.defaultIfEmpty(pageDesign.getPageType(), page.getPageType()));
+                page.setTableName(StringUtils.defaultIfEmpty(pageDesign.getTableName(), page.getTableName()));
+            }
+        }
+        return new ArrayList<AppPageDesign>(pagesByCode.values());
+    }
+
+    private static AppPageDesign copyPageDesign(AppPageDesign source) {
+        AppPageDesign copy = new AppPageDesign();
+        copy.setCode(source.getCode());
+        copy.setMenuCode(source.getMenuCode());
+        copy.setName(source.getName());
+        copy.setPath(source.getPath());
+        copy.setPageType(source.getPageType());
+        copy.setTableName(source.getTableName());
+        copy.setParentPageCode(source.getParentPageCode());
+        return copy;
+    }
+
+    private static boolean isFrontendBusinessBlockPageDesign(FrontProjectPageDesign pageDesign) {
+        if (pageDesign == null || StringUtils.isEmpty(pageDesign.getPageCode()) || "admin".equals(pageDesign.getPageScope())) {
+            return false;
+        }
+        if ("business_block".equals(pageDesign.getPageType())) {
+            return true;
+        }
+        return StringUtils.isNotEmpty(pageDesign.getLayoutJson()) && pageDesign.getLayoutJson().contains("business-blocks-v1");
+    }
+
+    public static void putPageDesignVelocityContext(VelocityContext context, GenProject project, GenTable table) {
+        putPageDesignVelocityContext(context, project, table, "frontend");
+    }
+
+    public static void putPageDesignVelocityContext(VelocityContext context, GenProject project, GenTable table, String scope) {
+        putPageDesignVelocityContext(context, project, table, scope, null);
+    }
+
+    public static void putPageDesignVelocityContext(VelocityContext context, GenProject project, GenTable table,
+                                                    String scope, String pageCode) {
+        FrontProjectPageDesign pageDesign = findPageDesign(project, table, scope, pageCode);
+        putPageDesignDefaults(context);
+        context.put("currentFrontendPageDesign", pageDesign);
+        context.put("currentPageDesign", pageDesign);
+        context.put("hasCurrentFrontendPageDesign", pageDesign != null);
+        context.put("hasCurrentPageDesign", pageDesign != null);
+        if (pageDesign == null) {
+            return;
+        }
+        enrichPageDesign(pageDesign);
+        String canvas = resolvePageDesignCanvas(pageDesign);
+        context.put("pageDesignCanvas", canvas);
+        context.put("pageDesignIsCardList", canvas.contains("card"));
+        context.put("pageDesignIsSplitList", canvas.contains("split"));
+        context.put("pageDesignIsCurrentUserList", "current_user_list".equals(pageDesign.getPageType()));
+        Map<String, GenTableColumn> columnsByField = buildColumnsByField(table);
+        Map<String, Object> queryRegion = findLayoutRegion(pageDesign, "query");
+        Map<String, Object> toolbarRegion = findLayoutRegion(pageDesign, "toolbar");
+        Map<String, Object> tableRegion = findLayoutRegion(pageDesign, "table");
+        Map<String, Object> cardRegion = findLayoutRegion(pageDesign, "cardList");
+        if (cardRegion == null) {
+            cardRegion = findLayoutRegion(pageDesign, "card");
+        }
+        Map<String, Object> cardActionsRegion = findLayoutRegion(pageDesign, "cardActions");
+        Map<String, Object> formRegion = findLayoutRegion(pageDesign, "dialogForm");
+        if (formRegion == null) {
+            formRegion = findLayoutRegion(pageDesign, "form");
+        }
+        List<String> toolbarActionCodes = stringList(toolbarRegion == null ? null : toolbarRegion.get("actions"));
+        List<String> rowActionCodes = stringList(tableRegion == null ? null : tableRegion.get("rowActions"));
+        List<String> cardActionCodes = stringList(cardActionsRegion == null ? null : cardActionsRegion.get("actions"));
+        if (cardActionCodes.isEmpty()) {
+            cardActionCodes = rowActionCodes;
+        }
+
+        context.put("pageDesignQueryColumns", columnsFromRegion(queryRegion, columnsByField));
+        context.put("pageDesignTableColumns", columnsFromRegion(tableRegion, columnsByField));
+        context.put("pageDesignFormColumns", columnsFromRegion(formRegion, columnsByField));
+        context.put("pageDesignCardColumns", cardColumnsFromRegion(cardRegion, columnsByField));
+        context.put("pageDesignCardTitleColumn", columnFromRegionField(cardRegion, "titleField", columnsByField));
+        context.put("pageDesignCardImageColumn", columnFromRegionField(cardRegion, "imageField", columnsByField));
+        context.put("pageDesignToolbarActionCodes", toolbarActionCodes);
+        context.put("pageDesignRowActionCodes", pageDesign.getLayout() != null && canvas.contains("card") ? cardActionCodes : rowActionCodes);
+        context.put("pageDesignShowQuery", regionVisible(queryRegion));
+        context.put("pageDesignShowToolbar", regionVisible(toolbarRegion));
+        context.put("pageDesignShowForm", regionVisible(formRegion));
+        context.put("pageDesignAllowAdd", containsAny(toolbarActionCodes, "create", "add"));
+        context.put("pageDesignAllowBatchDelete", containsAny(toolbarActionCodes, "batchDelete", "batch_delete"));
+        context.put("pageDesignAllowView", containsAny(canvas.contains("card") ? cardActionCodes : rowActionCodes, "view", "detail"));
+        context.put("pageDesignAllowEdit", containsAny(canvas.contains("card") ? cardActionCodes : rowActionCodes, "edit", "update"));
+        context.put("pageDesignAllowDelete", containsAny(canvas.contains("card") ? cardActionCodes : rowActionCodes, "delete", "remove"));
+    }
+
+    private static void putPageDesignDefaults(VelocityContext context) {
+        context.put("currentFrontendPageDesign", null);
+        context.put("currentPageDesign", null);
+        context.put("hasCurrentFrontendPageDesign", false);
+        context.put("hasCurrentPageDesign", false);
+        context.put("pageDesignCanvas", "frontend-list-v1");
+        context.put("pageDesignIsCardList", false);
+        context.put("pageDesignIsSplitList", false);
+        context.put("pageDesignIsCurrentUserList", false);
+        context.put("pageDesignShowQuery", true);
+        context.put("pageDesignShowToolbar", true);
+        context.put("pageDesignShowForm", true);
+        context.put("pageDesignCardColumns", Collections.<GenTableColumn>emptyList());
+        context.put("pageDesignCardTitleColumn", null);
+        context.put("pageDesignCardImageColumn", null);
+        context.put("pageDesignToolbarActionCodes", Collections.<String>emptyList());
+        context.put("pageDesignRowActionCodes", Collections.<String>emptyList());
+        context.put("pageDesignAllowView", false);
+        context.put("pageDesignAllowAdd", false);
+        context.put("pageDesignAllowBatchDelete", false);
+        context.put("pageDesignAllowEdit", false);
+        context.put("pageDesignAllowDelete", false);
+        context.put("pageDesignToolbarBusinessActions", Collections.emptyList());
+        context.put("hasPageDesignToolbarBusinessActions", false);
+        context.put("pageDesignRowBusinessActions", Collections.emptyList());
+        context.put("hasPageDesignRowBusinessActions", false);
+        context.put("pageDesignBusinessActions", Collections.emptyList());
+        context.put("hasPageDesignBusinessActions", false);
+        context.put("pageDesignTopBusinessBlocks", Collections.emptyList());
+        context.put("pageDesignBottomBusinessBlocks", Collections.emptyList());
+        context.put("pageDesignEmbeddedBusinessBlocks", Collections.emptyList());
+        context.put("hasPageDesignTopBusinessBlocks", false);
+        context.put("hasPageDesignBottomBusinessBlocks", false);
+        context.put("hasPageDesignEmbeddedBusinessBlocks", false);
+    }
+
+    private static String resolvePageDesignCanvas(FrontProjectPageDesign pageDesign) {
+        if (pageDesign == null || pageDesign.getLayout() == null) {
+            return "frontend-list-v1";
+        }
+        Object canvas = pageDesign.getLayout().get("canvas");
+        return canvas == null || StringUtils.isEmpty(String.valueOf(canvas))
+                ? "frontend-list-v1" : String.valueOf(canvas);
+    }
+
+    private static FrontProjectPageDesign findPageDesign(GenProject project, GenTable table, String scope) {
+        return findPageDesign(project, table, scope, null);
+    }
+
+    private static FrontProjectPageDesign findPageDesign(GenProject project, GenTable table, String scope, String pageCode) {
+        if (project == null || table == null || StringUtils.isEmpty(project.getPageDesigns())) {
+            return null;
+        }
+        if (StringUtils.isNotEmpty(pageCode)) {
+            for (FrontProjectPageDesign pageDesign : project.getPageDesigns()) {
+                if (pageDesign != null && pageDesignScopeMatches(pageDesign, scope)
+                        && StringUtils.equals(pageCode, pageDesign.getPageCode())
+                        && StringUtils.equals(pageDesign.getTableName(), table.getTableName())) {
+                    return pageDesign;
+                }
+            }
+        }
+        for (FrontProjectPageDesign pageDesign : project.getPageDesigns()) {
+            if (pageDesign == null) {
+                continue;
+            }
+            if (pageDesignScopeMatches(pageDesign, scope) && StringUtils.equals(pageDesign.getTableName(), table.getTableName())) {
+                return pageDesign;
+            }
+        }
+        return null;
+    }
+
+    private static boolean pageDesignScopeMatches(FrontProjectPageDesign pageDesign, String scope) {
+        String expectedScope = "admin".equals(scope) ? "admin" : "frontend";
+        String actualScope = StringUtils.isEmpty(pageDesign.getPageScope()) ? "frontend" : pageDesign.getPageScope();
+        return expectedScope.equals(actualScope);
+    }
+
+    private static Map<String, GenTableColumn> buildColumnsByField(GenTable table) {
+        Map<String, GenTableColumn> result = new LinkedHashMap<String, GenTableColumn>();
+        if (table == null || StringUtils.isEmpty(table.getColumns())) {
+            return result;
+        }
+        for (GenTableColumn column : table.getColumns()) {
+            if (column == null) {
+                continue;
+            }
+            if (StringUtils.isNotEmpty(column.getJavaField())) {
+                result.put(column.getJavaField(), column);
+            }
+            if (StringUtils.isNotEmpty(column.getColumnName())) {
+                result.put(column.getColumnName(), column);
+            }
+        }
+        return result;
+    }
+
+    @SuppressWarnings("unchecked")
+    private static Map<String, Object> findLayoutRegion(FrontProjectPageDesign pageDesign, String type) {
+        if (pageDesign == null || pageDesign.getLayout() == null) {
+            return null;
+        }
+        Object regionsObject = pageDesign.getLayout().get("regions");
+        if (!(regionsObject instanceof List)) {
+            return null;
+        }
+        for (Object regionObject : (List<Object>) regionsObject) {
+            if (!(regionObject instanceof Map)) {
+                continue;
+            }
+            Map<String, Object> region = (Map<String, Object>) regionObject;
+            Object regionType = region.get("type");
+            Object regionId = region.get("id");
+            if (type.equals(regionType) || type.equals(regionId)) {
+                return region;
+            }
+        }
+        return null;
+    }
+
+    private static List<GenTableColumn> columnsFromRegion(Map<String, Object> region, Map<String, GenTableColumn> columnsByField) {
+        List<GenTableColumn> columns = new ArrayList<GenTableColumn>();
+        if (region == null || columnsByField == null) {
+            return columns;
+        }
+        for (String field : stringList(region.get("fields"))) {
+            GenTableColumn column = columnsByField.get(field);
+            if (column != null && !columns.contains(column)) {
+                columns.add(column);
+            }
+        }
+        return columns;
+    }
+
+    private static List<GenTableColumn> cardColumnsFromRegion(Map<String, Object> region, Map<String, GenTableColumn> columnsByField) {
+        List<GenTableColumn> columns = columnsFromRegion(region, columnsByField);
+        GenTableColumn imageColumn = columnFromRegionField(region, "imageField", columnsByField);
+        if (imageColumn != null) {
+            columns.remove(imageColumn);
+        }
+        return columns;
+    }
+
+    private static GenTableColumn columnFromRegionField(Map<String, Object> region, String key, Map<String, GenTableColumn> columnsByField) {
+        if (region == null || columnsByField == null) {
+            return null;
+        }
+        Object field = region.get(key);
+        if (field == null) {
+            return null;
+        }
+        return columnsByField.get(String.valueOf(field));
+    }
+
+    private static boolean regionVisible(Map<String, Object> region) {
+        if (region == null || !region.containsKey("visible")) {
+            return true;
+        }
+        Object visible = region.get("visible");
+        if (visible instanceof Boolean) {
+            return ((Boolean) visible).booleanValue();
+        }
+        return !"false".equalsIgnoreCase(String.valueOf(visible));
+    }
+
+    @SuppressWarnings("unchecked")
+    private static List<String> stringList(Object value) {
+        List<String> result = new ArrayList<String>();
+        if (!(value instanceof List)) {
+            return result;
+        }
+        for (Object item : (List<Object>) value) {
+            if (item != null) {
+                result.add(String.valueOf(item));
+            }
+        }
+        return result;
+    }
+
+    private static boolean containsAny(List<String> values, String... expectedValues) {
+        if (values == null || values.isEmpty()) {
+            return false;
+        }
+        Set<String> normalized = new HashSet<String>();
+        for (String value : values) {
+            normalized.add(StringUtils.defaultString(value).toLowerCase());
+        }
+        for (String expected : expectedValues) {
+            if (normalized.contains(StringUtils.defaultString(expected).toLowerCase())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private static List<Map<String, Object>> buildFrontendNavItems(List<AppMenuDesign> menus,
+                                                                   List<AppPageDesign> pages,
+                                                                   List<GenTable> tables,
+                                                                   Map<String, FrontProjectPageDesign> pageDesignsByCode) {
+        List<Map<String, Object>> items = new ArrayList<Map<String, Object>>();
+        Set<String> paths = new HashSet<String>();
+        if (StringUtils.isNotEmpty(menus)) {
+            int index = 1;
+            for (AppMenuDesign menu : menus) {
+                if (menu == null) {
+                    continue;
+                }
+                AppPageDesign page = findMenuPage(menu, pages);
+                if (page != null && !shouldShowPageInMenu(page, pageDesignsByCode)) {
+                    index++;
+                    continue;
+                }
+                Map<String, Object> item = frontendRouteItemForMenu(menu, page, pages, tables,
+                        pageDesignsByCode, index);
+                if (item == null) {
+                    index++;
+                    continue;
+                }
+                addRouteItemIfAbsent(items, paths, item);
+                index++;
+            }
+        }
+        if (StringUtils.isNotEmpty(pages)) {
+            int index = 1;
+            for (AppPageDesign page : pages) {
+                if (!shouldShowPageInMenu(page, pageDesignsByCode)) {
+                    index++;
+                    continue;
+                }
+                Map<String, Object> item = frontendRouteItemForPage(page, tables, true, pageDesignsByCode, index);
+                addRouteItemIfAbsent(items, paths, item);
+                index++;
+            }
+        }
+        if (items.isEmpty() && StringUtils.isEmpty(menus) && StringUtils.isEmpty(pages)) {
+            items.addAll(buildTableRouteItems(tables));
+        }
+        return items;
+    }
+
+    private static List<Map<String, Object>> buildFrontendRouteItems(List<Map<String, Object>> navItems,
+                                                                     List<AppPageDesign> pages,
+                                                                     List<GenTable> tables,
+                                                                     Map<String, FrontProjectPageDesign> pageDesignsByCode) {
+        List<Map<String, Object>> items = new ArrayList<Map<String, Object>>();
+        Set<String> paths = new HashSet<String>();
+        for (Map<String, Object> navItem : navItems) {
+            addRouteItemIfAbsent(items, paths, navItem);
+        }
+        if (StringUtils.isNotEmpty(pages)) {
+            int index = 1;
+            for (AppPageDesign page : pages) {
+                Map<String, Object> pageItem = frontendRouteItemForPage(page, tables, true, pageDesignsByCode, index);
+                addRouteItemIfAbsent(items, paths, pageItem);
+                index++;
+            }
+        }
+        for (Map<String, Object> tableItem : buildTableRouteItems(tables)) {
+            addRouteItemIfAbsent(items, paths, tableItem);
+        }
+        return items;
+    }
+
+    private static Map<String, Object> frontendRouteItemForMenu(AppMenuDesign menu, AppPageDesign page,
+                                                                 List<AppPageDesign> pages, List<GenTable> tables,
+                                                                 Map<String, FrontProjectPageDesign> pageDesignsByCode,
+                                                                 int index) {
+        if (page != null) {
+            Map<String, Object> item = frontendRouteItemForPage(page, tables,
+                    Boolean.TRUE.equals(menu.getRequiresLogin()), pageDesignsByCode, index);
+            if (item != null) {
+                item.put("code", sanitizeRouteName(StringUtils.defaultIfEmpty(menu.getCode(), page.getCode()), null));
+                item.put("name", StringUtils.defaultIfEmpty(menu.getName(), page.getName()));
+                item.put("path", normalizeFrontendPath(StringUtils.defaultIfEmpty(menu.getPath(), page.getPath()),
+                        defaultPagePath(page)));
+            }
+            return item;
+        }
+        GenTable table = resolveMenuTable(menu, pages, tables);
+        if (table == null) {
+            return null;
+        }
+        return frontendRouteItem(
+                StringUtils.defaultIfEmpty(menu.getCode(), "frontend_menu_" + index),
+                StringUtils.defaultIfEmpty(menu.getName(), table.getFunctionName()),
+                normalizeFrontendPath(menu.getPath(), defaultTablePath(table)),
+                Boolean.TRUE.equals(menu.getRequiresLogin()),
+                table);
+    }
+
+    private static Map<String, Object> frontendRouteItemForPage(AppPageDesign page, List<GenTable> tables,
+                                                                boolean requiresLogin,
+                                                                Map<String, FrontProjectPageDesign> pageDesignsByCode,
+                                                                int index) {
+        if (page == null) {
+            return null;
+        }
+        if (isBusinessBlockPage(page)) {
+            return frontendDesignedPageRouteItem(
+                    StringUtils.defaultIfEmpty(page.getCode(), "business_block_" + index),
+                    StringUtils.defaultIfEmpty(page.getName(), page.getCode()),
+                    normalizeFrontendPath(page.getPath(), defaultBusinessBlockPagePath(page)),
+                    requiresLogin,
+                    page);
+        }
+        GenTable table = findTableByName(tables, page.getTableName());
+        if (hasPageDesign(page, pageDesignsByCode)) {
+            return frontendDesignedPageRouteItem(
+                    StringUtils.defaultIfEmpty(page.getCode(), "frontend_page_" + index),
+                    StringUtils.defaultIfEmpty(page.getName(), table == null ? page.getCode() : table.getFunctionName()),
+                    normalizeFrontendPath(page.getPath(), table == null ? defaultPagePath(page) : defaultTablePath(table)),
+                    requiresLogin,
+                    page);
+        }
+        if (table == null) {
+            return null;
+        }
+        return frontendRouteItem(
+                StringUtils.defaultIfEmpty(page.getCode(), "frontend_page_" + index),
+                StringUtils.defaultIfEmpty(page.getName(), table.getFunctionName()),
+                normalizeFrontendPath(page.getPath(), defaultTablePath(table)),
+                requiresLogin,
+                table);
+    }
+
+    private static boolean addRouteItemIfAbsent(List<Map<String, Object>> items, Set<String> paths,
+                                                Map<String, Object> item) {
+        if (item == null) {
+            return false;
+        }
+        String path = StringUtils.defaultString((String) item.get("path"));
+        if (paths.add(path)) {
+            items.add(item);
+            return true;
+        }
+        return false;
+    }
+
+    private static List<Map<String, Object>> buildTableRouteItems(List<GenTable> tables) {
+        List<Map<String, Object>> items = new ArrayList<Map<String, Object>>();
+        if (StringUtils.isEmpty(tables)) {
+            return items;
+        }
+        int index = 1;
+        for (GenTable table : tables) {
+            if (table == null) {
+                continue;
+            }
+            items.add(frontendRouteItem(
+                    StringUtils.defaultIfEmpty(table.getBusinessName(), "table_" + index),
+                    StringUtils.defaultIfEmpty(table.getFunctionName(), table.getBusinessName()),
+                    defaultTablePath(table),
+                    true,
+                    table));
+            index++;
+        }
+        return items;
+    }
+
+    private static List<Map<String, Object>> buildFrontendRouteComponents(List<Map<String, Object>> routeItems) {
+        List<Map<String, Object>> components = new ArrayList<Map<String, Object>>();
+        Set<String> componentNames = new HashSet<String>();
+        for (Map<String, Object> routeItem : routeItems) {
+            String componentName = (String) routeItem.get("componentName");
+            if (StringUtils.isNotEmpty(componentName) && componentNames.add(componentName)) {
+                Map<String, Object> component = new LinkedHashMap<String, Object>();
+                component.put("componentName", componentName);
+                component.put("componentPath", routeItem.get("componentPath"));
+                components.add(component);
+            }
+        }
+        return components;
+    }
+
+    private static Map<String, Object> frontendRouteItem(String code, String name, String path,
+                                                         boolean requiresLogin, GenTable table) {
+        Map<String, Object> item = new LinkedHashMap<String, Object>();
+        item.put("code", sanitizeRouteName(code, table));
+        item.put("name", StringUtils.defaultIfEmpty(name, StringUtils.defaultString(table.getFunctionName())));
+        item.put("path", normalizeFrontendPath(path, defaultTablePath(table)));
+        item.put("requiresLogin", requiresLogin);
+        item.put("componentName", table.getClassName());
+        item.put("componentPath", "@/views/" + table.getModuleName() + "/" + table.getBusinessName() + "/index.vue");
+        return item;
+    }
+
+    private static Map<String, Object> frontendDesignedPageRouteItem(String code, String name, String path,
+                                                                     boolean requiresLogin, AppPageDesign page) {
+        Map<String, Object> item = new LinkedHashMap<String, Object>();
+        String pageCode = StringUtils.defaultIfEmpty(page == null ? null : page.getCode(), "frontend_page");
+        item.put("code", sanitizeRouteName(code, null));
+        item.put("name", StringUtils.defaultIfEmpty(name, pageCode));
+        item.put("path", normalizeFrontendPath(path, defaultPagePath(page)));
+        item.put("requiresLogin", requiresLogin);
+        item.put("componentName", toProjectClassName(pageCode));
+        item.put("componentPath", "@/views/pages/" + pageCode + "/index.vue");
+        return item;
+    }
+
+    private static boolean hasPageDesign(AppPageDesign page, Map<String, FrontProjectPageDesign> pageDesignsByCode) {
+        return page != null && pageDesignsByCode != null && pageDesignsByCode.containsKey(page.getCode());
+    }
+
+    private static boolean shouldShowPageInMenu(AppPageDesign page,
+                                                Map<String, FrontProjectPageDesign> pageDesignsByCode) {
+        if (page == null) {
+            return false;
+        }
+        FrontProjectPageDesign pageDesign = pageDesignsByCode == null ? null : pageDesignsByCode.get(page.getCode());
+        Object explicit = navigationValue(pageDesign, "showInMenu");
+        if (explicit instanceof Boolean) {
+            return ((Boolean) explicit).booleanValue();
+        }
+        if (explicit != null) {
+            return !"false".equalsIgnoreCase(String.valueOf(explicit));
+        }
+        return !isAssociatedPageType(page.getPageType());
+    }
+
+    @SuppressWarnings("unchecked")
+    private static Object navigationValue(FrontProjectPageDesign pageDesign, String key) {
+        if (pageDesign == null) {
+            return null;
+        }
+        enrichPageDesign(pageDesign);
+        if (pageDesign.getLayout() == null) {
+            return null;
+        }
+        Object navigation = pageDesign.getLayout().get("navigation");
+        if (!(navigation instanceof Map)) {
+            return null;
+        }
+        return ((Map<String, Object>) navigation).get(key);
+    }
+
+    private static AppPageDesign findMenuPage(AppMenuDesign menu, List<AppPageDesign> pages) {
+        if (menu == null || StringUtils.isEmpty(pages)) {
+            return null;
+        }
+        for (AppPageDesign page : pages) {
+            if (page != null && matchesMenuPage(menu, page)) {
+                return page;
+            }
+        }
+        return null;
+    }
+
+    private static boolean isBusinessBlockPage(AppPageDesign page) {
+        return page != null && "business_block".equals(page.getPageType());
+    }
+
+    private static boolean isAssociatedPageType(String pageType) {
+        return "detail".equals(pageType) || "form".equals(pageType);
+    }
+
+    private static GenTable resolveMenuTable(AppMenuDesign menu, List<AppPageDesign> pages, List<GenTable> tables) {
+        if (StringUtils.isEmpty(tables)) {
+            return null;
+        }
+        GenTable table = resolveMenuTableByPage(menu, pages, tables);
+        if (table != null) {
+            return table;
+        }
+        String menuKey = normalizeIdentifier(StringUtils.defaultString(menu.getCode()) + " "
+                + StringUtils.defaultString(menu.getPath()) + " " + StringUtils.defaultString(menu.getName()));
+        for (GenTable candidate : tables) {
+            if (matchesMenuTableKey(menuKey, candidate)) {
+                return candidate;
+            }
+        }
+        return tables.get(0);
+    }
+
+    private static GenTable resolveMenuTableByPage(AppMenuDesign menu, List<AppPageDesign> pages, List<GenTable> tables) {
+        if (menu == null || StringUtils.isEmpty(pages)) {
+            return null;
+        }
+        for (AppPageDesign page : pages) {
+            if (page == null || !matchesMenuPage(menu, page)) {
+                continue;
+            }
+            GenTable table = findTableByName(tables, page.getTableName());
+            if (table != null) {
+                return table;
+            }
+        }
+        return null;
+    }
+
+    private static boolean matchesMenuPage(AppMenuDesign menu, AppPageDesign page) {
+        return StringUtils.isNotEmpty(menu.getPageCode()) && menu.getPageCode().equals(page.getCode())
+                || StringUtils.isNotEmpty(menu.getCode()) && menu.getCode().equals(page.getMenuCode());
+    }
+
+    private static GenTable findTableByName(List<GenTable> tables, String tableName) {
+        String expected = normalizeIdentifier(tableName);
+        if (StringUtils.isEmpty(expected)) {
+            return null;
+        }
+        for (GenTable table : tables) {
+            if (table == null) {
+                continue;
+            }
+            if (expected.equals(normalizeIdentifier(table.getTableName()))
+                    || expected.equals(normalizeIdentifier(table.getBusinessName()))
+                    || expected.equals(normalizeIdentifier(table.getClassName()))) {
+                return table;
+            }
+        }
+        return null;
+    }
+
+    private static boolean matchesMenuTableKey(String menuKey, GenTable table) {
+        if (StringUtils.isEmpty(menuKey) || table == null) {
+            return false;
+        }
+        List<String> tableKeys = new ArrayList<String>();
+        tableKeys.add(table.getBusinessName());
+        tableKeys.add(table.getTableName());
+        tableKeys.add(table.getClassName());
+        tableKeys.add(table.getFunctionName());
+        for (String tableKey : tableKeys) {
+            String normalized = normalizeIdentifier(tableKey);
+            if (StringUtils.isEmpty(normalized)) {
+                continue;
+            }
+            if (menuKey.contains(normalized) || normalized.contains(menuKey)) {
+                return true;
+            }
+            for (String token : splitIdentifierTokens(tableKey)) {
+                if (token.length() >= 4 && menuKey.contains(token)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    private static List<String> splitIdentifierTokens(String value) {
+        String source = StringUtils.defaultString(value).replaceAll("([a-z])([A-Z])", "$1 $2");
+        String[] parts = source.split("[^A-Za-z0-9]+");
+        List<String> tokens = new ArrayList<String>();
+        for (String part : parts) {
+            String token = normalizeIdentifier(part);
+            if (StringUtils.isNotEmpty(token)) {
+                tokens.add(token);
+            }
+        }
+        return tokens;
+    }
+
+    private static String resolveDefaultFrontendPath(List<Map<String, Object>> navItems,
+                                                     List<Map<String, Object>> routeItems) {
+        if (StringUtils.isNotEmpty(navItems)) {
+            return (String) navItems.get(0).get("path");
+        }
+        if (StringUtils.isNotEmpty(routeItems)) {
+            return (String) routeItems.get(0).get("path");
+        }
+        return "/empty";
+    }
+
+    private static String defaultTablePath(GenTable table) {
+        if (table == null) {
+            return "/empty";
+        }
+        return "/" + StringUtils.defaultString(table.getModuleName()) + "/" + StringUtils.defaultString(table.getBusinessName());
+    }
+
+    private static String defaultBusinessBlockPagePath(AppPageDesign page) {
+        if (page == null || StringUtils.isEmpty(page.getCode())) {
+            return "/business-block";
+        }
+        return "/" + page.getCode().replace("_", "-");
+    }
+
+    private static String defaultPagePath(AppPageDesign page) {
+        if (isBusinessBlockPage(page)) {
+            return defaultBusinessBlockPagePath(page);
+        }
+        if (page == null || StringUtils.isEmpty(page.getCode())) {
+            return "/page";
+        }
+        return "/" + page.getCode().replace("_", "-");
+    }
+
+    private static String normalizeFrontendPath(String path, String fallback) {
+        String value = StringUtils.defaultString(path).trim();
+        if (StringUtils.isEmpty(value)) {
+            value = fallback;
+        }
+        if (!value.startsWith("/")) {
+            value = "/" + value;
+        }
+        return value.replaceAll("/{2,}", "/");
+    }
+
+    private static String sanitizeRouteName(String code, GenTable table) {
+        String value = StringUtils.defaultString(code).replaceAll("[^A-Za-z0-9_]", "_");
+        if (StringUtils.isEmpty(value)) {
+            value = table == null ? "GeneratedRoute" : StringUtils.defaultString(table.getClassName());
+        }
+        if (!Character.isLetter(value.charAt(0)) && value.charAt(0) != '_') {
+            value = "_" + value;
+        }
+        return value;
+    }
+
+    private static String normalizeIdentifier(String value) {
+        return StringUtils.defaultString(value).toLowerCase().replaceAll("[^a-z0-9]", "");
+    }
+
+    private static String toProjectClassName(String projectFileName) {
+        String source = projectFileName == null ? "" : projectFileName;
+        StringBuilder result = new StringBuilder();
+        boolean uppercaseNext = true;
+        for (int i = 0; i < source.length(); i++) {
+            char ch = source.charAt(i);
+            if (!Character.isLetterOrDigit(ch)) {
+                uppercaseNext = true;
+                continue;
+            }
+            if (result.length() == 0 && !Character.isJavaIdentifierStart(ch)) {
+                result.append("App");
+            }
+            result.append(uppercaseNext ? Character.toUpperCase(ch) : ch);
+            uppercaseNext = false;
+        }
+        if (result.length() == 0) {
+            return "GeneratedProject";
+        }
+        return result.toString();
+    }
+
     public static void setMenuVelocityContext(VelocityContext context, GenTable genTable) {
         String options = genTable.getOptions();
         JSONObject paramsObj = JSON.parseObject(options);
@@ -279,7 +1131,8 @@ public class VelocityUtils {
      */
     public static void addDicts(Set<String> dicts, List<GenTableColumn> columns) {
         for (GenTableColumn column : columns) {
-            if (!column.isSuperColumn() && StringUtils.isNotEmpty(column.getDictType()) && StringUtils.equalsAny(
+            if (!column.isSuperColumn() && StringUtils.isNotEmpty(column.getDictType())
+                    && !isQingRemoteDictType(column.getDictType()) && StringUtils.equalsAny(
                     column.getHtmlType(),
                     new String[]{GenConstants.HTML_SELECT, GenConstants.HTML_RADIO, GenConstants.HTML_CHECKBOX})) {
                 dicts.add("'" + column.getDictType() + "'");
@@ -287,6 +1140,70 @@ public class VelocityUtils {
         }
     }
 
+    private static List<Map<String, String>> getQingRemoteSelects(GenTable genTable) {
+        List<Map<String, String>> remoteSelects = new ArrayList<Map<String, String>>();
+        List<GenTableColumn> columns = genTable.getColumns();
+        if (columns == null) {
+            return remoteSelects;
+        }
+        for (GenTableColumn column : columns) {
+            if (column == null || !isQingRemoteDictType(column.getDictType())) {
+                continue;
+            }
+            Map<String, String> remoteSelect = parseQingRemoteSelect(genTable, column);
+            if (!remoteSelect.isEmpty()) {
+                remoteSelects.add(remoteSelect);
+            }
+        }
+        return remoteSelects;
+    }
+
+    private static Set<String> getQingRemoteSelectFields(List<Map<String, String>> remoteSelects) {
+        Set<String> fields = new HashSet<String>();
+        for (Map<String, String> remoteSelect : remoteSelects) {
+            fields.add(remoteSelect.get("field"));
+        }
+        return fields;
+    }
+
+    private static GenTableColumn getQingCurrentUserColumn(GenTable genTable) {
+        if (genTable == null || genTable.getColumns() == null) {
+            return null;
+        }
+        for (GenTableColumn column : genTable.getColumns()) {
+            if (column == null) {
+                continue;
+            }
+            if ("userId".equals(column.getJavaField()) || "user_id".equals(column.getColumnName())) {
+                return column;
+            }
+        }
+        return null;
+    }
+
+    private static Map<String, String> parseQingRemoteSelect(GenTable genTable, GenTableColumn column) {
+        Map<String, String> remoteSelect = new LinkedHashMap<String, String>();
+        String[] parts = StringUtils.split(column.getDictType(), ":");
+        if (parts == null || parts.length < 4) {
+            return remoteSelect;
+        }
+        String remoteTable = parts[1];
+        String valueField = StringUtils.toCamelCase(parts[2]);
+        String labelField = StringUtils.toCamelCase(parts[3]);
+        if (StringUtils.isAnyEmpty(remoteTable, valueField, labelField)) {
+            return remoteSelect;
+        }
+        remoteSelect.put("field", column.getJavaField());
+        remoteSelect.put("path", "/" + genTable.getModuleName() + "/" + StringUtils.toCamelCase(remoteTable) + "/page");
+        remoteSelect.put("valueField", valueField);
+        remoteSelect.put("labelField", labelField);
+        return remoteSelect;
+    }
+
+    private static boolean isQingRemoteDictType(String dictType) {
+        return StringUtils.defaultString(dictType).startsWith("remote:");
+    }
+
     /**
      * 获取权限前缀
      *
diff --git a/RuoYi-Vue/ruoyi-generator/src/main/resources/qing/controller.java.vm b/RuoYi-Vue/ruoyi-generator/src/main/resources/qing/controller.java.vm
index 7ae2383..778d2c3 100644
--- a/RuoYi-Vue/ruoyi-generator/src/main/resources/qing/controller.java.vm
+++ b/RuoYi-Vue/ruoyi-generator/src/main/resources/qing/controller.java.vm
@@ -1,32 +1,41 @@
 package ${packageName}.controller;
 
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.poi.excel.ExcelUtil;
 import cn.hutool.poi.excel.ExcelReader;
+import cn.hutool.poi.excel.ExcelUtil;
 import cn.hutool.poi.excel.ExcelWriter;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletOutputStream;
-import java.net.URLEncoder;
-import java.util.Map;
-import org.apache.commons.lang3.StringUtils;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import java.io.InputStream;
-import java.util.List;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.example.springboot.common.Result;
-import org.springframework.web.multipart.MultipartFile;
-import com.example.springboot.entity.User;
-import com.example.springboot.utils.TokenUtils;
-import com.example.springboot.service.IUserService;
-
-import ${packageName}.service.I${ClassName}Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import ${packageName}.common.Result;
 import ${packageName}.entity.${ClassName};
+#if($hasQingCurrentUserColumn)
+import ${packageName}.entity.PortalUser;
+import ${packageName}.security.PortalAuthTokenStore;
+#end
+import ${packageName}.service.I${ClassName}Service;
+import java.io.InputStream;
+import java.net.URLEncoder;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Resource;
+import javax.servlet.ServletOutputStream;
+#if($hasQingCurrentUserColumn)
+import javax.servlet.http.HttpServletRequest;
+#end
+import javax.servlet.http.HttpServletResponse;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * ${functionName}Controller
- * 
+ *
  * @author ${author}
  * @date ${datetime}
  */
@@ -37,93 +46,108 @@ public class ${ClassName}Controller
     @Resource
     private I${ClassName}Service ${className}Service;
 
-    private final String now = DateUtil.now();
+#if($hasQingCurrentUserColumn)
+    @Resource
+    private PortalAuthTokenStore tokenStore;
 
-    // 新增或者更新
+#end
+
+    #if($allowAdd == '1' || $allowEdit == '1')
     @PostMapping
-    public Result save(@RequestBody ${ClassName} ${className}) {
-        if (${className}.getId() == null) {
-            //${className}.setTime(DateUtil.now());
-            //${className}.setUser(TokenUtils.getCurrentUser().getNickname());
-            //${className}.setUserid(TokenUtils.getCurrentUser().getId());
-        }
+    public Result<Void> save(@RequestBody ${ClassName} ${className})
+    {
+        #if($allowAdd == '1' && $allowEdit == '1')
         ${className}Service.saveOrUpdate(${className});
+        #elseif($allowAdd == '1')
+        ${className}Service.save(${className});
+        #else
+        ${className}Service.updateById(${className});
+        #end
         return Result.success();
     }
+    #end
 
-    @DeleteMapping("/{id}")
-    public Result delete(@PathVariable Integer id) {
-        ${className}Service.removeById(id);
+    #if($allowRemove == '1')
+    @DeleteMapping("/{${pkColumn.javaField}}")
+    public Result<Void> delete(@PathVariable ${pkColumn.javaType} ${pkColumn.javaField})
+    {
+        ${className}Service.removeById(${pkColumn.javaField});
         return Result.success();
     }
 
     @PostMapping("/del/batch")
-    public Result deleteBatch(@RequestBody List<Integer> ids) {
-        ${className}Service.removeByIds(ids);
+    public Result<Void> deleteBatch(@RequestBody List<${pkColumn.javaType}> ${pkColumn.javaField}s)
+    {
+        ${className}Service.removeByIds(${pkColumn.javaField}s);
         return Result.success();
     }
+    #end
 
     @GetMapping
-    public Result findAll() {
+    public Result<List<${ClassName}>> findAll()
+    {
         return Result.success(${className}Service.list());
     }
 
-    @GetMapping("/{id}")
-    public Result findOne(@PathVariable Integer id) {
-        return Result.success(${className}Service.getById(id));
+    @GetMapping("/{${pkColumn.javaField}}")
+    public Result<${ClassName}> findOne(@PathVariable ${pkColumn.javaType} ${pkColumn.javaField})
+    {
+        return Result.success(${className}Service.getById(${pkColumn.javaField}));
     }
 
     @GetMapping("/page")
-    public Result findPage(@RequestParam(required = false) Integer pageNum,
-                          @RequestParam(required = false) Integer pageSize,
-                          @RequestParam(required = false) Map<String, Object> params) {
-        if (pageNum == null) {
-            pageNum = 1;
+    public Result<Page<${ClassName}>> findPage(@RequestParam(required = false, defaultValue = "1") Integer pageNum,
+                                               @RequestParam(required = false, defaultValue = "10") Integer pageSize,
+                                               @RequestParam(required = false) Map<String, Object> params#if($hasQingCurrentUserColumn),
+                                               HttpServletRequest request#end)
+    {
+        QueryWrapper<${ClassName}> queryWrapper = new QueryWrapper<${ClassName}>();
+#if($hasQingCurrentUserColumn)
+        if (isCurrentUserOnly(params))
+        {
+            PortalUser currentUser = tokenStore.getPortalUser(resolveToken(request));
+            if (currentUser == null)
+            {
+                return Result.success(new Page<${ClassName}>(pageNum, pageSize));
+            }
+            queryWrapper.eq("${qingCurrentUserColumn.columnName}", currentUser.getUserId());
         }
-        if (pageSize == null) {
-            pageSize = 10;
-        }
-        QueryWrapper<${ClassName}> queryWrapper = new QueryWrapper<>();
+#end
 #foreach ($column in $columns)
 #if($column.isQuery == "1")
 #set($queryType=$column.queryType)
 #set($javaField=$column.javaField)
 #set($columnName=$column.columnName)
-#if($column.queryType == "EQ")
-        queryWrapper.eq(StringUtils.isNotEmpty((String)params.get("${javaField}")), "${columnName}", params.get("${javaField}"));
+#if($queryType == "EQ")
+        queryWrapper.eq(hasValue(params.get("${javaField}")), "${columnName}", params.get("${javaField}"));
 #elseif($queryType == "NE")
-        queryWrapper.ne(StringUtils.isNotEmpty((String)params.get("${javaField}")), "${columnName}", params.get("${javaField}"));
+        queryWrapper.ne(hasValue(params.get("${javaField}")), "${columnName}", params.get("${javaField}"));
 #elseif($queryType == "GT")
-        queryWrapper.gt(StringUtils.isNotEmpty((String)params.get("${javaField}")), "${columnName}", params.get("${javaField}"));
+        queryWrapper.gt(hasValue(params.get("${javaField}")), "${columnName}", params.get("${javaField}"));
 #elseif($queryType == "GTE")
-        queryWrapper.ge(StringUtils.isNotEmpty((String)params.get("${javaField}")), "${columnName}", params.get("${javaField}"));
+        queryWrapper.ge(hasValue(params.get("${javaField}")), "${columnName}", params.get("${javaField}"));
 #elseif($queryType == "LT")
-        queryWrapper.lt(StringUtils.isNotEmpty((String)params.get("${javaField}")), "${columnName}", params.get("${javaField}"));
+        queryWrapper.lt(hasValue(params.get("${javaField}")), "${columnName}", params.get("${javaField}"));
 #elseif($queryType == "LTE")
-        queryWrapper.le(StringUtils.isNotEmpty((String)params.get("${javaField}")), "${columnName}", params.get("${javaField}"));
+        queryWrapper.le(hasValue(params.get("${javaField}")), "${columnName}", params.get("${javaField}"));
 #elseif($queryType == "LIKE")
-        queryWrapper.like(StringUtils.isNotEmpty((String)params.get("${javaField}")), "${columnName}", params.get("${javaField}"));
+        queryWrapper.like(hasValue(params.get("${javaField}")), "${columnName}", params.get("${javaField}"));
+#else
+        queryWrapper.eq(hasValue(params.get("${javaField}")), "${columnName}", params.get("${javaField}"));
 #end
 #end
 #end
         queryWrapper.orderByDesc("${pkColumn.columnName}");
-        return Result.success(${className}Service.page(new Page<>(pageNum, pageSize), queryWrapper));
+        return Result.success(${className}Service.page(new Page<${ClassName}>(pageNum, pageSize), queryWrapper));
     }
 
-    /**
-    * 导出接口
-    */
     @GetMapping("/export")
-    public void export(HttpServletResponse response) throws Exception {
-        // 从数据库查询出所有的数据
+    public void export(HttpServletResponse response) throws Exception
+    {
         List<${ClassName}> list = ${className}Service.list();
-        // 在内存操作，写出到浏览器
         ExcelWriter writer = ExcelUtil.getWriter(true);
-
-        // 一次性写出list内的对象到excel，使用默认样式，强制输出标题
         writer.write(list, true);
 
-        // 设置浏览器响应的格式
         response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8");
         String fileName = URLEncoder.encode("${functionName}信息表", "UTF-8");
         response.setHeader("Content-Disposition", "attachment;filename=" + fileName + ".xlsx");
@@ -134,19 +158,37 @@ public class ${ClassName}Controller
         writer.close();
     }
 
-    /**
-     * excel 导入
-     * @param file
-     * @throws Exception
-     */
+    #if($allowAdd == '1')
     @PostMapping("/import")
-    public Result imp(MultipartFile file) throws Exception {
+    public Result<Void> imp(MultipartFile file) throws Exception
+    {
         InputStream inputStream = file.getInputStream();
         ExcelReader reader = ExcelUtil.getReader(inputStream);
-        // 通过 javabean的方式读取Excel内的对象，但是要求表头必须是英文，跟javabean的属性要对应起来
         List<${ClassName}> list = reader.readAll(${ClassName}.class);
-
         ${className}Service.saveBatch(list);
         return Result.success();
     }
+    #end
+
+    private boolean hasValue(Object value)
+    {
+        return value != null && StringUtils.isNotBlank(String.valueOf(value));
+    }
+
+#if($hasQingCurrentUserColumn)
+    private boolean isCurrentUserOnly(Map<String, Object> params)
+    {
+        return params != null && "true".equalsIgnoreCase(String.valueOf(params.get("__currentUserOnly")));
+    }
+
+    private String resolveToken(HttpServletRequest request)
+    {
+        String authorization = request.getHeader("Authorization");
+        if (authorization != null && authorization.startsWith("Bearer "))
+        {
+            return authorization.substring("Bearer ".length());
+        }
+        return request.getHeader("X-Portal-Token");
+    }
+#end
 }
diff --git a/RuoYi-Vue/ruoyi-generator/src/main/resources/qing/index.vue.vm b/RuoYi-Vue/ruoyi-generator/src/main/resources/qing/index.vue.vm
index aa21f76..6a6118d 100644
--- a/RuoYi-Vue/ruoyi-generator/src/main/resources/qing/index.vue.vm
+++ b/RuoYi-Vue/ruoyi-generator/src/main/resources/qing/index.vue.vm
@@ -1,281 +1,1071 @@
 <template>
-  <div>
-    <!-- 搜索区域 -->
-    <div style="margin: 10px 0">
-#foreach ($column in $columns)
-#if($column.isQuery == "1")
-#set($javaField=$column.javaField)
-#set($columnComment=$column.columnComment)
-#if($column.htmlType == "input")
-      <el-input style="width: 200px" placeholder="请输入${columnComment}" suffix-icon="el-icon-search" v-model="queryParams.${javaField}"></el-input>
-#elseif($column.htmlType == "select" || $column.htmlType == "radio")
-      <el-select v-model="queryParams.${javaField}" placeholder="请选择${columnComment}" style="width: 200px" class="ml-5">
-        <el-option
-          v-for="item in _dict.getDictDataByType('${column.dictType}')"
-          :key="item.value"
-          :label="item.name"
-          :value="item.value">
-        </el-option>
-      </el-select>
-#elseif($column.htmlType == "datetime")
-      <el-date-picker style="width: 200px" v-model="queryParams.${javaField}" type="date" value-format="yyyy-MM-dd" placeholder="选择${columnComment}"></el-date-picker>
+#set($designed = $hasCurrentFrontendPageDesign)
+#set($queryColumns = $columns)
+#set($tableColumns = $columns)
+#set($formColumns = $columns)
+#set($cardColumns = $columns)
+#set($cardTitleColumn = false)
+#set($cardImageColumn = false)
+#set($showAdd = false)
+#set($showBatchDelete = false)
+#set($showView = false)
+#set($showEdit = false)
+#set($showDelete = false)
+#set($isCardListLayout = false)
+#set($isSplitListLayout = false)
+#set($showQuery = true)
+#set($showToolbar = true)
+#set($showForm = true)
+#set($renderForm = true)
+#set($currentUserOnly = false)
+#set($toolbarBusinessActions = $pageDesignToolbarBusinessActions)
+#set($rowBusinessActions = $pageDesignRowBusinessActions)
+#set($allPageBusinessActions = $pageDesignBusinessActions)
+#set($hasToolbarBusinessActions = $hasPageDesignToolbarBusinessActions)
+#set($hasRowBusinessActions = $hasPageDesignRowBusinessActions)
+#set($topBusinessBlocks = $pageDesignTopBusinessBlocks)
+#set($bottomBusinessBlocks = $pageDesignBottomBusinessBlocks)
+#set($embeddedBusinessBlocks = $pageDesignEmbeddedBusinessBlocks)
+#if($allowAdd == '1')
+#set($showAdd = true)
 #end
+#if($allowRemove == '1')
+#set($showBatchDelete = true)
+#set($showDelete = true)
 #end
+#if($allowEdit == '1')
+#set($showEdit = true)
+#end
+#if($designed)
+#set($queryColumns = $pageDesignQueryColumns)
+#set($tableColumns = $pageDesignTableColumns)
+#set($formColumns = $pageDesignFormColumns)
+#set($cardColumns = $pageDesignCardColumns)
+#set($cardTitleColumn = $pageDesignCardTitleColumn)
+#set($cardImageColumn = $pageDesignCardImageColumn)
+#set($showAdd = $pageDesignAllowAdd)
+#set($showBatchDelete = $pageDesignAllowBatchDelete)
+#set($showView = $pageDesignAllowView)
+#set($showEdit = $pageDesignAllowEdit)
+#set($showDelete = $pageDesignAllowDelete)
+#set($isCardListLayout = $pageDesignIsCardList)
+#set($isSplitListLayout = $pageDesignIsSplitList)
+#set($showQuery = $pageDesignShowQuery)
+#set($showToolbar = $pageDesignShowToolbar)
+#set($showForm = $pageDesignShowForm)
+#set($currentUserOnly = $pageDesignIsCurrentUserList)
+#end
+#if(!$showToolbar)
+#set($showAdd = false)
+#set($showBatchDelete = false)
+#end
+#set($renderForm = $showForm)
+#if($showAdd || $showEdit)
+#set($renderForm = true)
+#end
+  <section class="portal-page">
+#if($hasPageDesignTopBusinessBlocks)
+    <section class="embedded-business-blocks top-business-blocks">
+#foreach($block in $topBusinessBlocks)
+      <${block.componentName} />
+#end
+    </section>
 #end
-      <el-button class="ml-5" type="primary" @click="load">搜索</el-button>
-      <el-button type="warning" @click="reset">重置</el-button>
-    </div>
 
-    <!-- 操作按钮区域 -->
-    <div style="margin: 10px 0">
-      <el-button type="primary" @click="handleAdd">新增 <i class="el-icon-circle-plus-outline"></i></el-button>
-      <el-popconfirm
-          class="ml-5"
-          confirm-button-text='确定'
-          cancel-button-text='我再想想'
-          icon="el-icon-info"
-          icon-color="red"
-          title="您确定批量删除这些数据吗？"
-          @confirm="delBatch"
-      >
-        <el-button type="danger" slot="reference">批量删除 <i class="el-icon-remove-outline"></i></el-button>
-      </el-popconfirm>
-    </div>
+    <section class="content-board">
+      <div class="feature-card">
+        <div class="feature-illustration" aria-hidden="true">
+          <div class="device-face">
+            <span></span>
+            <span></span>
+          </div>
+        </div>
+        <div class="feature-copy">
+          <span>精选推荐</span>
+          <h2>${functionName}</h2>
+          <p>围绕资源管理、活动公告和玩家社区内容，快速维护当前模块的数据。</p>
+        </div>
+      </div>
 
-    <!-- 表格区域 -->
-    <el-table :data="${businessName}List" border stripe :header-cell-class-name="'headerBg'" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55"></el-table-column>
-      <el-table-column prop="${pkColumn.javaField}" label="ID" width="80"></el-table-column>
-#foreach ($column in $columns)
-#if($column.isList == "1")
-#set($javaField=$column.javaField)
-#set($columnComment=$column.columnComment)
-#if($column.htmlType == "datetime")
-      <el-table-column prop="${javaField}" label="${columnComment}" align="center" width="180">
-        <template slot-scope="scope">
-          <span>{{ scope.row.${javaField} }}</span>
-        </template>
-      </el-table-column>
-#elseif($column.htmlType == "imageUpload")
-      <el-table-column prop="${javaField}" label="${columnComment}" align="center" width="100">
-        <template slot-scope="scope">
-          <el-image 
-            style="width: 50px; height: 50px"
-            :src="scope.row.${javaField}"
-            :preview-src-list="[scope.row.${javaField}]">
-          </el-image>
-        </template>
-      </el-table-column>
-#elseif($column.htmlType == "select" || $column.htmlType == "radio")
-      <el-table-column prop="${javaField}" label="${columnComment}" align="center">
-        <template slot-scope="scope">
-          {{ _dict.getDictLabel('${column.dictType}', scope.row.${javaField}) }}
-        </template>
-      </el-table-column>
-#else
-      <el-table-column prop="${javaField}" label="${columnComment}" align="center"></el-table-column>
-#end
-#end
-#end
-      <el-table-column label="操作" width="200" align="center">
-        <template slot-scope="scope">
-          <el-button type="success" @click="handleEdit(scope.row)">编辑 <i class="el-icon-edit"></i></el-button>
+      <aside class="notice-panel">
+        <div class="notice-tabs">
+          <button
+            v-for="tab in noticeTabs"
+            :key="tab"
+            type="button"
+            :class="{ active: activeTab === tab }"
+            @click="activeTab = tab">
+            {{ tab }}
+          </button>
+        </div>
+        <ul class="notice-list">
+          <li v-for="notice in notices" :key="notice.title">
+            <strong>{{ notice.title }}</strong>
+            <span><i class="el-icon-time"></i>{{ notice.time }}</span>
+          </li>
+        </ul>
+      </aside>
+    </section>
+
+    <section class="data-panel#if($isSplitListLayout) split-data-panel#end">
+      <div class="panel-heading">
+        <div>
+          <span class="section-kicker">资源数据</span>
+          <h2>${functionName}管理</h2>
+        </div>
+        <div class="panel-actions">
+          #if($showToolbar)
+          #if($showAdd)
+          <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>
+          #end
+          #if($showBatchDelete)
           <el-popconfirm
-              class="ml-5"
-              confirm-button-text='确定'
-              cancel-button-text='我再想想'
+            confirm-button-text="确定"
+            cancel-button-text="取消"
+            icon="el-icon-info"
+            icon-color="red"
+            title="确定批量删除选中的数据吗？"
+            @confirm="delBatch">
+            <el-button slot="reference" type="danger" icon="el-icon-delete">批量删除</el-button>
+          </el-popconfirm>
+          #end
+          #foreach($action in $toolbarBusinessActions)
+          <el-button type="primary" plain icon="el-icon-position" @click="handleBusinessAction('${action.code}')">${action.name}</el-button>
+          #end
+          #end
+        </div>
+      </div>
+
+      #if($showQuery)
+      <div class="filter-bar">
+#foreach ($column in $queryColumns)
+#set($renderQueryField = false)
+#if($designed)
+#set($renderQueryField = true)
+#elseif($column.isQuery == "1")
+#set($renderQueryField = true)
+#end
+#if($renderQueryField)
+#set($javaField=$column.javaField)
+#set($columnComment=$column.columnComment)
+#set($remoteSelect=$qingRemoteSelectFields.contains($javaField))
+#if($column.htmlType == "input")
+        <el-input class="filter-item" placeholder="请输入${columnComment}" clearable v-model="queryParams.${javaField}" @keyup.enter.native="load" />
+#elseif($column.htmlType == "select" || $column.htmlType == "radio")
+        <el-select class="filter-item" v-model="queryParams.${javaField}" placeholder="请选择${columnComment}" clearable>
+#if($remoteSelect)
+          <el-option
+            v-for="item in getSelectOptions('${javaField}')"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value" />
+#else
+          <el-option
+            v-for="item in _dict.getDictDataByType('${column.dictType}')"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value" />
+#end
+        </el-select>
+#elseif($column.htmlType == "datetime")
+        <el-date-picker class="filter-item" v-model="queryParams.${javaField}" type="date" value-format="yyyy-MM-dd" placeholder="选择${columnComment}" />
+#end
+#end
+#end
+        <el-button type="primary" icon="el-icon-search" @click="load">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="reset">重置</el-button>
+      </div>
+      #end
+
+#if($isCardListLayout)
+      <div class="resource-card-grid">
+        <article v-for="item in ${businessName}List" :key="item.${pkColumn.javaField}" class="resource-card-item">
+          #if($showBatchDelete)
+          <el-checkbox class="resource-card-check" v-model="item.__checked" @change="handleCardSelectionChange" />
+          #end
+          <div class="resource-card-body">
+#if($cardImageColumn)
+            <el-image
+              v-if="item.${cardImageColumn.javaField}"
+              class="resource-card-image"
+              :src="item.${cardImageColumn.javaField}"
+              :preview-src-list="[item.${cardImageColumn.javaField}]" />
+#end
+#if($cardTitleColumn)
+            <h3 class="resource-card-title">{{ item.${cardTitleColumn.javaField} || '-' }}</h3>
+#end
+#foreach ($column in $cardColumns)
+#set($renderCardField = false)
+#if($designed)
+#set($renderCardField = true)
+#elseif($column.isList == "1")
+#set($renderCardField = true)
+#end
+#if($renderCardField)
+#set($javaField=$column.javaField)
+#set($columnComment=$column.columnComment)
+#set($remoteSelect=$qingRemoteSelectFields.contains($javaField))
+#if($column.htmlType == "imageUpload")
+            <el-image
+              v-if="item.${javaField}"
+              class="resource-card-image"
+              :src="item.${javaField}"
+              :preview-src-list="[item.${javaField}]" />
+#elseif($column.htmlType == "select" || $column.htmlType == "radio")
+            <div class="resource-card-field">
+              <span>${columnComment}</span>
+#if($remoteSelect)
+              <strong>{{ getOptionLabel('${javaField}', item.${javaField}) }}</strong>
+#else
+              <strong>{{ _dict.getDictLabel('${column.dictType}', item.${javaField}) || '-' }}</strong>
+#end
+            </div>
+#else
+            <div class="resource-card-field">
+              <span>${columnComment}</span>
+              <strong>{{ item.${javaField} || '-' }}</strong>
+            </div>
+#end
+#end
+#end
+          </div>
+          #if($showView || $showEdit || $showDelete || $hasRowBusinessActions)
+          <div class="resource-card-actions">
+            #if($showView)
+            <el-button type="text" icon="el-icon-view" @click="handleView(item)">查看</el-button>
+            #end
+            #if($showEdit)
+            <el-button type="text" icon="el-icon-edit" @click="handleEdit(item)">编辑</el-button>
+            #end
+            #if($showDelete)
+            <el-popconfirm
+              confirm-button-text="确定"
+              cancel-button-text="取消"
               icon="el-icon-info"
               icon-color="red"
-              title="您确定删除吗？"
-              @confirm="del(scope.row.${pkColumn.javaField})"
-          >
-            <el-button type="danger" slot="reference">删除 <i class="el-icon-remove-outline"></i></el-button>
-          </el-popconfirm>
-        </template>
-      </el-table-column>
-    </el-table>
-    <div style="padding: 10px 0">
-      <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page="queryParams.pageNum"
-          :page-sizes="[2, 5, 10, 20]"
-          :page-size="queryParams.pageSize"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="total">
-      </el-pagination>
-    </div>
-
-    <!-- 新增/编辑对话框 -->
-    <el-dialog :title="form.${pkColumn.javaField} ? '编辑' : '新增'" :visible.sync="dialogFormVisible" width="30%">
-      <el-form ref="form" :model="form" label-width="80px" size="small">
-#foreach ($column in $columns)
-#if($column.isEdit == "1")
+              title="确定删除这条数据吗？"
+              @confirm="del(item.${pkColumn.javaField})">
+              <el-button slot="reference" type="text" icon="el-icon-delete" class="danger-text">删除</el-button>
+            </el-popconfirm>
+            #end
+            #foreach($action in $rowBusinessActions)
+            <el-button type="text" icon="el-icon-position" @click="handleBusinessAction('${action.code}', item)">${action.name}</el-button>
+            #end
+          </div>
+          #end
+        </article>
+      </div>
+#else
+      <el-table :data="${businessName}List" border stripe class="resource-table" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" />
+#if(!$designed)
+        <el-table-column prop="${pkColumn.javaField}" label="ID" width="90" />
+#end
+#foreach ($column in $tableColumns)
+#set($renderTableField = false)
+#if($designed)
+#set($renderTableField = true)
+#elseif($column.isList == "1")
+#set($renderTableField = true)
+#end
+#if($renderTableField)
 #set($javaField=$column.javaField)
 #set($columnComment=$column.columnComment)
+#set($remoteSelect=$qingRemoteSelectFields.contains($javaField))
+#if($column.htmlType == "datetime")
+        <el-table-column prop="${javaField}" label="${columnComment}" align="center" width="180" />
+#elseif($column.htmlType == "imageUpload")
+        <el-table-column prop="${javaField}" label="${columnComment}" align="center" width="110">
+          <template slot-scope="scope">
+            <el-image
+              v-if="scope.row.${javaField}"
+              class="table-image"
+              :src="scope.row.${javaField}"
+              :preview-src-list="[scope.row.${javaField}]" />
+            <span v-else>-</span>
+          </template>
+        </el-table-column>
+#elseif($column.htmlType == "select" || $column.htmlType == "radio")
+        <el-table-column prop="${javaField}" label="${columnComment}" align="center">
+          <template slot-scope="scope">
+#if($remoteSelect)
+            {{ getOptionLabel('${javaField}', scope.row.${javaField}) }}
+#else
+            {{ _dict.getDictLabel('${column.dictType}', scope.row.${javaField}) }}
+#end
+          </template>
+        </el-table-column>
+#else
+        <el-table-column prop="${javaField}" label="${columnComment}" align="center" />
+#end
+#end
+#end
+        #if($showView || $showEdit || $showDelete || $hasRowBusinessActions)
+        <el-table-column label="操作" width="230" align="center">
+          <template slot-scope="scope">
+            #if($showView)
+            <el-button type="text" icon="el-icon-view" @click="handleView(scope.row)">查看</el-button>
+            #end
+            #if($showEdit)
+            <el-button type="text" icon="el-icon-edit" @click="handleEdit(scope.row)">编辑</el-button>
+            #end
+            #if($showDelete)
+            <el-popconfirm
+              confirm-button-text="确定"
+              cancel-button-text="取消"
+              icon="el-icon-info"
+              icon-color="red"
+              title="确定删除这条数据吗？"
+              @confirm="del(scope.row.${pkColumn.javaField})">
+              <el-button slot="reference" type="text" icon="el-icon-delete" class="danger-text">删除</el-button>
+            </el-popconfirm>
+            #end
+            #foreach($action in $rowBusinessActions)
+            <el-button type="text" icon="el-icon-position" @click="handleBusinessAction('${action.code}', scope.row)">${action.name}</el-button>
+            #end
+          </template>
+        </el-table-column>
+        #end
+      </el-table>
+#end
+
+      <el-pagination
+        class="pagination"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="queryParams.pageNum"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="queryParams.pageSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total" />
+    </section>
+
+#if($hasPageDesignBottomBusinessBlocks)
+    <section class="embedded-business-blocks bottom-business-blocks">
+#foreach($block in $bottomBusinessBlocks)
+      <${block.componentName} />
+#end
+    </section>
+#end
+
+    #if($renderForm)
+    <el-dialog :title="viewing ? '查看${functionName}' : (form.${pkColumn.javaField} ? '编辑${functionName}' : '新增${functionName}')" :visible.sync="dialogFormVisible" width="520px">
+      <el-form ref="form" :model="form" label-width="110px" size="small" :disabled="viewing">
+#foreach ($column in $formColumns)
+#set($renderFormField = false)
+#if($designed)
+#set($renderFormField = true)
+#elseif($column.isEdit == "1")
+#set($renderFormField = true)
+#end
+#if($renderFormField)
+#set($javaField=$column.javaField)
+#set($columnComment=$column.columnComment)
+#set($remoteSelect=$qingRemoteSelectFields.contains($javaField))
         <el-form-item label="${columnComment}" prop="${javaField}"#if($column.isRequired == "1") :rules="[{ required: true, message: '${columnComment}不能为空', trigger: #if($column.htmlType == "select")'change'#else'blur'#end }]"#end>
 #if($column.htmlType == "input")
-          <el-input v-model="form.${javaField}" placeholder="请输入${columnComment}"></el-input>
+          <el-input v-model="form.${javaField}" placeholder="请输入${columnComment}" />
 #elseif($column.htmlType == "textarea")
-          <el-input v-model="form.${javaField}" type="textarea" placeholder="请输入${columnComment}"></el-input>
+          <el-input v-model="form.${javaField}" type="textarea" placeholder="请输入${columnComment}" />
 #elseif($column.htmlType == "select" || $column.htmlType == "radio")
-          <el-select v-model="form.${javaField}" placeholder="请选择${columnComment}">
+          <el-select v-model="form.${javaField}" placeholder="请选择${columnComment}" clearable>
+#if($remoteSelect)
+            <el-option
+              v-for="item in getSelectOptions('${javaField}')"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value" />
+#else
             <el-option
               v-for="item in _dict.getDictDataByType('${column.dictType}')"
               :key="item.value"
               :label="item.name"
-              :value="item.value">
-            </el-option>
+              :value="item.value" />
+#end
           </el-select>
 #elseif($column.htmlType == "datetime")
-          <el-date-picker v-model="form.${javaField}" type="date" value-format="yyyy-MM-dd" placeholder="选择${columnComment}"></el-date-picker>
+          <el-date-picker v-model="form.${javaField}" type="date" value-format="yyyy-MM-dd" placeholder="选择${columnComment}" />
 #elseif($column.htmlType == "imageUpload")
           <el-upload
             class="avatar-uploader"
-            action="/file/uploadImg"
+            action="/api/files/upload"
             :show-file-list="false"
-            :key="uploadKey"
-            :on-success="imgSuccess">
-            <img v-if="form.${javaField}" :src="form.${javaField}" class="avatar">
+            :on-success="(res) => uploadSuccess('${javaField}', res)">
+            <img v-if="form.${javaField}" :src="form.${javaField}" class="avatar" />
             <i v-else class="el-icon-plus avatar-uploader-icon"></i>
           </el-upload>
 #elseif($column.htmlType == "fileUpload")
           <el-upload
-            class="upload-demo"
-            action="/file/upload"
-            :key="uploadKey"
-            :on-success="fileSuccess">
+            action="/api/files/upload"
+            :on-success="(res) => uploadSuccess('${javaField}', res)">
             <el-button size="small" type="primary">点击上传</el-button>
           </el-upload>
+          <div v-if="form.${javaField}" class="file-link">{{ form.${javaField} }}</div>
 #end
         </el-form-item>
 #end
 #end
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogFormVisible = false">取 消</el-button>
-        <el-button type="primary" @click="save">确 定</el-button>
+        <el-button @click="dialogFormVisible = false">取消</el-button>
+        <el-button v-if="!viewing" type="primary" @click="save">确定</el-button>
       </div>
     </el-dialog>
-  </div>
+    #end
+  </section>
 </template>
 
 <script>
+#foreach($block in $embeddedBusinessBlocks)
+import ${block.componentName} from "${block.relativeImportPath}"
+#end
+
 export default {
   name: "${BusinessName}",
+#if($hasPageDesignEmbeddedBusinessBlocks)
+  components: {
+#foreach($block in $embeddedBusinessBlocks)
+    ${block.componentName}#if($foreach.hasNext),#end
+#end
+  },
+#end
   data() {
     return {
+      ${businessName}List: [],
       total: 0,
-      newsList:[],
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-#foreach ($column in $columns)
-#if($column.isQuery == "1")
-        $column.javaField: undefined#if($foreach.count != $columns.size()),#end
-
+#if($currentUserOnly)
+        __currentUserOnly: true,
+#end
+#foreach ($column in $queryColumns)
+#set($renderQueryParam = false)
+#if(!$showQuery)
+#set($renderQueryParam = false)
+#elseif($designed)
+#set($renderQueryParam = true)
+#elseif($column.isQuery == "1")
+#set($renderQueryParam = true)
+#end
+#if($renderQueryParam)
+        ${column.javaField}: undefined,
 #end
 #end
       },
       form: {},
+      viewing: false,
       dialogFormVisible: false,
-      multipleSelection: []
+      multipleSelection: [],
+      remoteOptionMap: {},
+      remoteSelectConfig: {
+#foreach($remote in $qingRemoteSelects)
+        ${remote.field}: {
+          path: "${remote.path}",
+          valueField: "${remote.valueField}",
+          labelField: "${remote.labelField}"
+        }#if($foreach.hasNext),#end
+#end
+      },
+      activeTab: "最新公告",
+      noticeTabs: ["最新公告", "热门赛事", "热门攻略", "热门帖子"],
+      notices: [
+        { title: "《${functionName}》资源内容更新与支持", time: "2025-06-24 16:50:40" },
+        { title: "社区活动与资源维护窗口预告", time: "2025-06-24 16:48:30" },
+        { title: "新内容发布和玩家反馈整理", time: "2025-06-24 10:30:24" },
+        { title: "版本资料、攻略和周边内容同步", time: "2025-06-23 19:20:12" }
+      ],
+      businessActionMap: {
+#foreach($action in $allPageBusinessActions)
+        "${action.code}": {
+          method: "${action.method}",
+          path: "${action.path}",
+          requestFields: [#foreach($field in $action.requestFields)"${field}"#if($foreach.count != $action.requestFields.size()), #end#end]
+        }#if($foreach.count != $allPageBusinessActions.size()),#end
+#end
+      }
     }
   },
   created() {
+    this.loadRemoteOptions()
     this.load()
   },
   methods: {
+    loadRemoteOptions() {
+      Object.keys(this.remoteSelectConfig).forEach(field => {
+        const config = this.remoteSelectConfig[field]
+        this.request.get(config.path, {
+          params: { pageNum: 1, pageSize: 999 }
+        }).then(res => {
+          const data = res.data || {}
+          const records = Array.isArray(data) ? data : (data.records || [])
+          const options = records.map(item => ({
+            value: item[config.valueField],
+            label: item[config.labelField]
+          }))
+          this.#[[$set]]#(this.remoteOptionMap, field, options)
+        })
+      })
+    },
+    getSelectOptions(field) {
+      return this.remoteOptionMap[field] || []
+    },
+    getOptionLabel(field, value) {
+      const option = this.getSelectOptions(field).find(item => String(item.value) === String(value))
+      if (option) {
+        return option.label
+      }
+      return value === undefined || value === null || value === "" ? "-" : value
+    },
     load() {
       this.request.get("/${moduleName}/${businessName}/page", {
         params: this.queryParams
       }).then(res => {
-        this.${businessName}List = res.data.records
-        this.total = res.data.total        
+        const page = res.data || {}
+        this.${businessName}List = page.records || []
+        this.total = page.total || 0
       })
     },
     save() {
-      this.request.post("/${moduleName}/${businessName}", this.form).then(res => {
-        if (res.code === '200') {
-          this.$message.success("保存成功")
-          this.dialogFormVisible = false
-          this.load()
-        } else {
-          this.$message.error("保存失败")
+      this.#[[$refs]]#.form.validate(valid => {
+        if (!valid) {
+          return
         }
+        this.request.post("/${moduleName}/${businessName}", this.form).then(res => {
+          if (res.code === "200") {
+            this.#[[$message]]#.success("保存成功")
+            this.dialogFormVisible = false
+            this.load()
+          } else {
+            this.#[[$message]]#.error(res.msg || "保存失败")
+          }
+        })
       })
     },
     handleAdd() {
-      this.dialogFormVisible = true
       this.form = {}
+      this.viewing = false
+      this.dialogFormVisible = true
+      this.#[[$nextTick]]#(() => this.#[[$refs]]#.form && this.#[[$refs]]#.form.clearValidate())
+    },
+    handleView(row) {
+      this.form = JSON.parse(JSON.stringify(row))
+      this.viewing = true
+      this.dialogFormVisible = true
     },
     handleEdit(row) {
       this.form = JSON.parse(JSON.stringify(row))
+      this.viewing = false
       this.dialogFormVisible = true
+      this.#[[$nextTick]]#(() => this.#[[$refs]]#.form && this.#[[$refs]]#.form.clearValidate())
     },
     del(${pkColumn.javaField}) {
       this.request.delete("/${moduleName}/${businessName}/" + ${pkColumn.javaField}).then(res => {
-        if (res.code === '200') {
-          this.$message.success("删除成功")
+        if (res.code === "200") {
+          this.#[[$message]]#.success("删除成功")
           this.load()
         } else {
-          this.$message.error("删除失败")
+          this.#[[$message]]#.error(res.msg || "删除失败")
         }
       })
     },
     handleSelectionChange(val) {
       this.multipleSelection = val
     },
+    handleCardSelectionChange() {
+      this.multipleSelection = this.${businessName}List.filter(item => item.__checked)
+    },
     delBatch() {
-      let ids = this.multipleSelection.map(v => v.${pkColumn.javaField})
-      this.request.delete("/${moduleName}/${businessName}/" + ids.join(",")).then(res => {
-        if (res.code === '200') {
-          this.$message.success("批量删除成功")
+      const ids = this.multipleSelection.map(item => item.${pkColumn.javaField})
+      if (!ids.length) {
+        this.#[[$message]]#.warning("请先选择要删除的数据")
+        return
+      }
+      this.request.post("/${moduleName}/${businessName}/del/batch", ids).then(res => {
+        if (res.code === "200") {
+          this.#[[$message]]#.success("批量删除成功")
           this.load()
         } else {
-          this.$message.error("批量删除失败")
+          this.#[[$message]]#.error(res.msg || "批量删除失败")
         }
       })
     },
     reset() {
       this.queryParams = {
         pageNum: 1,
-        pageSize: 10
+        pageSize: 10#if($currentUserOnly),
+        __currentUserOnly: true#end
       }
       this.load()
     },
+    handleBusinessAction(code, row) {
+      const action = this.businessActionMap[code]
+      if (!action || !action.path) {
+        this.#[[$message]]#.warning("动作未配置")
+        return
+      }
+      const payload = this.buildBusinessActionPayload(action, row)
+      const method = String(action.method || "POST").toLowerCase()
+      const request = method === "get"
+        ? this.request.get(action.path, { params: payload })
+        : this.request[method] ? this.request[method](action.path, payload) : this.request.post(action.path, payload)
+      request.then(res => {
+        if (res.code === "200") {
+          this.#[[$message]]#.success("操作成功")
+          this.load()
+        } else {
+          this.#[[$message]]#.error(res.msg || "操作失败")
+        }
+      })
+    },
+    buildBusinessActionPayload(action, row) {
+      const payload = {}
+      ;(action.requestFields || []).forEach(field => {
+        const value = this.resolvePayloadValue(field, row)
+        if (value !== undefined) {
+          payload[field] = value
+        }
+      })
+      return payload
+    },
+    resolvePayloadValue(field, row) {
+      const camelField = this.toCamelCase(field)
+      const sources = [row, this.form, this.queryParams]
+      for (const source of sources) {
+        if (!source) {
+          continue
+        }
+        if (source[field] !== undefined) {
+          return source[field]
+        }
+        if (source[camelField] !== undefined) {
+          return source[camelField]
+        }
+      }
+      return undefined
+    },
+    toCamelCase(value) {
+      return String(value || "").replace(/_([a-zA-Z0-9])/g, (_, char) => char.toUpperCase())
+    },
     handleSizeChange(pageSize) {
-      console.log(pageSize)
       this.queryParams.pageSize = pageSize
       this.load()
     },
     handleCurrentChange(pageNum) {
-      console.log(pageNum)
       this.queryParams.pageNum = pageNum
       this.load()
     },
-    imgSuccess(res) {
-      if (res && res.data && res.data[0] && res.data[0].url) {
-        this.form.newsPhoto = res.data[0].url;
-        this.uploadKey += 1;
+    uploadSuccess(field, res) {
+      if (res && res.code === "200" && res.data && res.data.url) {
+        this.#[[$set]]#(this.form, field, res.data.url)
       } else {
-        this.$message.error('上传失败，请重试');
+        this.#[[$message]]#.error("上传失败，请重试")
       }
-    },
-    fileSuccess(res) {
-      if (res) {
-        this.form.newsPhoto = res;
-        this.uploadKey += 1;
-      } else {
-        this.$message.error('上传失败，请重试');
-      }
-    },
+    }
   }
 }
 </script>
 
-<style>
-.headerBg {
-  background: #eee!important;
+<style scoped>
+.portal-page {
+  display: grid;
+  gap: 22px;
 }
-</style>
\ No newline at end of file
+
+.embedded-business-blocks {
+  display: grid;
+  gap: 16px;
+}
+
+.content-board {
+  display: grid;
+  grid-template-columns: minmax(0, 1.36fr) minmax(320px, 0.64fr);
+  gap: 24px;
+  align-items: stretch;
+}
+
+.feature-card {
+  position: relative;
+  min-height: 270px;
+  overflow: hidden;
+  background: #ffffff;
+}
+
+.feature-illustration {
+  position: absolute;
+  inset: 0;
+  background:
+    linear-gradient(135deg, rgba(10, 66, 99, 0.92), rgba(255, 126, 86, 0.9)),
+    #184967;
+}
+
+.feature-illustration::before,
+.feature-illustration::after {
+  position: absolute;
+  display: block;
+  content: "";
+}
+
+.feature-illustration::before {
+  left: 8%;
+  top: 18%;
+  width: 48%;
+  height: 42%;
+  border: 8px solid rgba(255, 255, 255, 0.8);
+  border-radius: 6px;
+  transform: rotate(-8deg);
+}
+
+.feature-illustration::after {
+  right: 9%;
+  bottom: -12%;
+  width: 290px;
+  height: 290px;
+  border-radius: 50%;
+  background:
+    radial-gradient(circle at 36% 38%, #ffffff 0 10px, transparent 11px),
+    radial-gradient(circle at 64% 38%, #ffffff 0 10px, transparent 11px),
+    radial-gradient(circle at 50% 58%, transparent 0 38px, #153d58 39px 45px, transparent 46px),
+    #39a6d8;
+  box-shadow: 0 20px 0 #133c58;
+}
+
+.device-face {
+  position: absolute;
+  left: 24%;
+  bottom: 20%;
+  display: grid;
+  grid-template-columns: repeat(2, 36px);
+  gap: 18px;
+  padding: 18px;
+  border-radius: 48px;
+  background: rgba(21, 62, 88, 0.9);
+  transform: rotate(7deg);
+}
+
+.device-face span {
+  width: 36px;
+  height: 36px;
+  border: 5px solid #f7ebe0;
+  border-radius: 50%;
+}
+
+.feature-copy {
+  position: absolute;
+  left: 28px;
+  bottom: 24px;
+  max-width: 420px;
+  color: #ffffff;
+}
+
+.feature-copy span {
+  display: inline-block;
+  margin-bottom: 8px;
+  color: #ffe1b6;
+  font-size: 13px;
+  font-weight: 700;
+}
+
+.feature-copy h2,
+.feature-copy p,
+.panel-heading h2 {
+  margin: 0;
+  letter-spacing: 0;
+}
+
+.feature-copy h2 {
+  font-size: 28px;
+  line-height: 1.25;
+}
+
+.feature-copy p {
+  margin-top: 8px;
+  color: rgba(255, 255, 255, 0.88);
+  line-height: 1.7;
+}
+
+.notice-panel {
+  min-width: 0;
+  background: #ffffff;
+}
+
+.notice-tabs {
+  display: grid;
+  grid-template-columns: repeat(4, minmax(0, 1fr));
+  gap: 10px;
+  border-bottom: 1px solid #edf0f5;
+}
+
+.notice-tabs button {
+  position: relative;
+  min-height: 38px;
+  border: 0;
+  color: #475569;
+  background: transparent;
+  cursor: pointer;
+}
+
+.notice-tabs button.active {
+  color: #19a6ad;
+  font-weight: 700;
+}
+
+.notice-tabs button.active::after {
+  position: absolute;
+  right: 8px;
+  bottom: -1px;
+  left: 8px;
+  height: 2px;
+  background: #19a6ad;
+  content: "";
+}
+
+.notice-list {
+  display: grid;
+  gap: 18px;
+  margin: 16px 0 0;
+  padding: 0;
+  list-style: none;
+}
+
+.notice-list li {
+  display: grid;
+  gap: 7px;
+}
+
+.notice-list strong {
+  color: #172033;
+  font-size: 15px;
+  font-weight: 500;
+  line-height: 1.55;
+}
+
+.notice-list span {
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+  color: #7b8493;
+  font-size: 13px;
+}
+
+.data-panel,
+.notice-panel {
+  padding: 20px;
+  border: 1px solid #edf0f5;
+  border-radius: 4px;
+}
+
+.data-panel {
+  background: #ffffff;
+}
+
+.split-data-panel {
+  display: grid;
+  grid-template-columns: 260px minmax(0, 1fr);
+  gap: 16px;
+}
+
+.split-data-panel .panel-heading {
+  grid-column: 1 / -1;
+  margin-bottom: 0;
+}
+
+.split-data-panel .filter-bar {
+  align-content: flex-start;
+  align-self: start;
+  flex-direction: column;
+  margin-bottom: 0;
+  padding: 14px;
+  border: 1px solid #edf0f5;
+  border-radius: 4px;
+  background: #f8fafc;
+}
+
+.split-data-panel .filter-item,
+.split-data-panel .filter-bar .el-button {
+  width: 100%;
+}
+
+.split-data-panel .resource-table,
+.split-data-panel .resource-card-grid,
+.split-data-panel .pagination {
+  grid-column: 2;
+}
+
+.panel-heading {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 16px;
+  margin-bottom: 18px;
+}
+
+.section-kicker {
+  color: #19a6ad;
+  font-size: 13px;
+  font-weight: 700;
+}
+
+.panel-heading h2 {
+  margin-top: 6px;
+  color: #172033;
+  font-size: 22px;
+}
+
+.panel-actions,
+.filter-bar {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 10px;
+}
+
+.filter-bar {
+  margin-bottom: 14px;
+}
+
+.filter-item {
+  width: 220px;
+}
+
+.resource-table {
+  width: 100%;
+}
+
+.resource-card-grid {
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(240px, 1fr));
+  gap: 14px;
+}
+
+.resource-card-item {
+  position: relative;
+  display: grid;
+  gap: 12px;
+  min-height: 180px;
+  padding: 16px;
+  border: 1px solid #edf0f5;
+  border-radius: 4px;
+  background: #ffffff;
+}
+
+.resource-card-check {
+  position: absolute;
+  top: 12px;
+  right: 12px;
+}
+
+.resource-card-body {
+  display: grid;
+  gap: 10px;
+}
+
+.resource-card-field {
+  display: grid;
+  gap: 4px;
+}
+
+.resource-card-title {
+  margin: 0;
+  color: #172033;
+  font-size: 17px;
+  line-height: 1.35;
+}
+
+.resource-card-field span {
+  color: #7b8493;
+  font-size: 12px;
+}
+
+.resource-card-field strong {
+  color: #172033;
+  font-size: 14px;
+  font-weight: 600;
+  line-height: 1.45;
+  word-break: break-word;
+}
+
+.resource-card-image {
+  width: 100%;
+  height: 132px;
+  border-radius: 4px;
+  object-fit: cover;
+}
+
+.resource-card-actions {
+  display: flex;
+  justify-content: flex-end;
+  gap: 8px;
+  padding-top: 4px;
+  border-top: 1px solid #edf0f5;
+}
+
+.pagination {
+  margin-top: 14px;
+  text-align: right;
+}
+
+.danger-text {
+  color: #f56c6c;
+}
+
+.table-image {
+  width: 52px;
+  height: 52px;
+  border-radius: 4px;
+}
+
+.avatar-uploader .avatar {
+  display: block;
+  width: 96px;
+  height: 96px;
+  object-fit: cover;
+}
+
+.avatar-uploader-icon {
+  width: 96px;
+  height: 96px;
+  border: 1px dashed #d9d9d9;
+  border-radius: 4px;
+  color: #8c939d;
+  line-height: 96px;
+  text-align: center;
+}
+
+.file-link {
+  margin-top: 6px;
+  color: #606266;
+  word-break: break-all;
+}
+
+@media (max-width: 980px) {
+  .content-board {
+    grid-template-columns: 1fr;
+  }
+}
+
+@media (max-width: 720px) {
+  .split-data-panel {
+    grid-template-columns: 1fr;
+  }
+
+  .split-data-panel .panel-heading,
+  .split-data-panel .resource-table,
+  .split-data-panel .resource-card-grid,
+  .split-data-panel .pagination {
+    grid-column: 1;
+  }
+
+  .panel-heading {
+    align-items: flex-start;
+    flex-direction: column;
+  }
+
+  .filter-item {
+    width: 100%;
+  }
+
+  .notice-tabs {
+    grid-template-columns: repeat(2, minmax(0, 1fr));
+  }
+}
+</style>
diff --git a/RuoYi-Vue/ruoyi-generator/src/test/java/com/ruoyi/generator/service/BusinessBlockGenerationServiceTest.java b/RuoYi-Vue/ruoyi-generator/src/test/java/com/ruoyi/generator/service/BusinessBlockGenerationServiceTest.java
new file mode 100644
index 0000000..4d079a9
--- /dev/null
+++ b/RuoYi-Vue/ruoyi-generator/src/test/java/com/ruoyi/generator/service/BusinessBlockGenerationServiceTest.java
@@ -0,0 +1,463 @@
+package com.ruoyi.generator.service;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.lang.reflect.Field;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import org.apache.velocity.VelocityContext;
+import org.junit.Before;
+import org.junit.Test;
+import com.ruoyi.generator.domain.GenProject;
+import com.ruoyi.generator.domain.GenTable;
+import com.ruoyi.generator.domain.GenTableColumn;
+import com.ruoyi.generator.domain.GeneratedBusinessBlockFile;
+import com.ruoyi.generator.domain.front.FrontProjectPageDesign;
+import com.ruoyi.generator.service.front.BusinessBlockRegistryService;
+
+public class BusinessBlockGenerationServiceTest
+{
+    private BusinessBlockGenerationService service;
+
+    @Before
+    public void setUp() throws Exception
+    {
+        service = new BusinessBlockGenerationService();
+        setField("businessBlockRegistryService", new BusinessBlockRegistryService());
+    }
+
+    @Test
+    public void listFilesCreatesFrontendPageAndBlockFiles()
+    {
+        List<GeneratedBusinessBlockFile> files = service.listFiles(project(), "frontend");
+
+        assertTrue(containsPath(files, "src/views/pages/cart_page/index.vue"));
+        assertTrue(containsPath(files, "src/views/pages/cart_page/blocks/cart_001/CartBlock.vue"));
+        assertTrue(containsPath(files, "src/api/business-blocks/cart_001.js"));
+    }
+
+    @Test
+    public void listFilesCreatesBackendFilesWithPackagePath()
+    {
+        List<GeneratedBusinessBlockFile> files = service.listFiles(project(), "backend");
+
+        assertTrue(containsPath(files, "src/main/java/com/example/demo/controller/block/Cart001BlockController.java"));
+        assertTrue(containsPath(files, "src/main/java/com/example/demo/service/block/ICart001BlockService.java"));
+        assertTrue(containsPath(files, "src/main/java/com/example/demo/service/block/impl/Cart001BlockServiceImpl.java"));
+        assertTrue(containsPath(files, "src/main/java/com/example/demo/mapper/block/Cart001BlockMapper.java"));
+        assertTrue(containsPath(files, "src/main/resources/mapper/block/Cart001BlockMapper.xml"));
+    }
+
+    @Test
+    public void renderFileUsesBusinessBlockContext()
+    {
+        GenProject project = project();
+        GeneratedBusinessBlockFile pageFile = findPath(service.listFiles(project, "frontend"),
+                "src/views/pages/cart_page/index.vue");
+        GeneratedBusinessBlockFile blockFile = findPath(service.listFiles(project, "frontend"),
+                "src/views/pages/cart_page/blocks/cart_001/CartBlock.vue");
+        GeneratedBusinessBlockFile apiFile = findPath(service.listFiles(project, "frontend"),
+                "src/api/business-blocks/cart_001.js");
+        GeneratedBusinessBlockFile controllerFile = findPath(service.listFiles(project, "backend"),
+                "src/main/java/com/example/demo/controller/block/Cart001BlockController.java");
+
+        String pageContent = service.renderFile(project, pageFile);
+        String blockContent = service.renderFile(project, blockFile);
+        String apiContent = service.renderFile(project, apiFile);
+        String controllerContent = service.renderFile(project, controllerFile);
+
+        assertTrue(pageContent.contains("import Cart001Block from \"./blocks/cart_001/CartBlock.vue\""));
+        assertTrue(pageContent.contains("<Cart001Block />"));
+        assertTrue(blockContent.contains("listCart001BlockItems"));
+        assertTrue(blockContent.contains("@/api/business-blocks/cart_001"));
+        assertTrue(apiContent.contains("url: \"/business-blocks/cart_001/\" + id + \"/quantity\""));
+        assertTrue(apiContent.contains("url: \"/business-blocks/cart_001/\" + id"));
+        assertTrue(controllerContent.contains("class Cart001BlockController"));
+        assertTrue(controllerContent.contains("@RequestMapping(\"/business-blocks/cart_001\")"));
+    }
+
+    @Test
+    public void renderFileConvertsConfiguredJavaFieldsToSqlColumns()
+    {
+        GenProject project = project();
+        GeneratedBusinessBlockFile mapperFile = findPath(service.listFiles(project, "backend"),
+                "src/main/resources/mapper/block/Cart001BlockMapper.xml");
+
+        String mapperContent = service.renderFile(project, mapperFile);
+
+        assertTrue(mapperContent.contains("left join shop_product p on c.product_id = p.id"));
+        assertTrue(mapperContent.contains("where c.user_id = #{userId}"));
+        assertTrue(mapperContent.contains("set quantity = #{quantity}"));
+    }
+
+    @Test
+    public void listFilesCreatesBundledBusinessBlockFiles()
+    {
+        List<GeneratedBusinessBlockFile> files = service.listFiles(businessBlocksProject(), "frontend");
+
+        assertTrue(containsPath(files, "src/views/pages/business_page/blocks/notice_001/NoticeBlock.vue"));
+        assertTrue(containsPath(files, "src/views/pages/business_page/blocks/carousel_001/CarouselBlock.vue"));
+        assertTrue(containsPath(files, "src/views/pages/business_page/blocks/order_001/OrderBlock.vue"));
+        assertTrue(containsPath(files, "src/views/pages/business_page/blocks/master_detail_001/MasterDetailBlock.vue"));
+        assertTrue(containsPath(files, "src/api/business-blocks/notice_001.js"));
+        assertTrue(containsPath(files, "src/api/business-blocks/carousel_001.js"));
+        assertTrue(containsPath(files, "src/api/business-blocks/order_001.js"));
+        assertTrue(containsPath(files, "src/api/business-blocks/master_detail_001.js"));
+    }
+
+    @Test
+    public void renderFileSupportsBundledBusinessBlocks()
+    {
+        GenProject project = businessBlocksProject();
+        String noticeMapper = service.renderFile(project, findPath(service.listFiles(project, "backend"),
+                "src/main/resources/mapper/block/Notice001BlockMapper.xml"));
+        String carouselComponent = service.renderFile(project, findPath(service.listFiles(project, "frontend"),
+                "src/views/pages/business_page/blocks/carousel_001/CarouselBlock.vue"));
+        String orderMapper = service.renderFile(project, findPath(service.listFiles(project, "backend"),
+                "src/main/resources/mapper/block/Order001BlockMapper.xml"));
+        String orderComponent = service.renderFile(project, findPath(service.listFiles(project, "frontend"),
+                "src/views/pages/business_page/blocks/order_001/OrderBlock.vue"));
+        String masterDetailMapper = service.renderFile(project, findPath(service.listFiles(project, "backend"),
+                "src/main/resources/mapper/block/MasterDetail001BlockMapper.xml"));
+
+        assertTrue(noticeMapper.contains("from sys_notice n"));
+        assertTrue(noticeMapper.contains("n.notice_title as title"));
+        assertTrue(carouselComponent.contains("listCarousel001BlockCarouselItems"));
+        assertTrue(orderMapper.contains("insert into shop_order"));
+        assertTrue(orderMapper.contains("left join shop_product p on i.product_id = p.id"));
+        assertTrue(orderComponent.contains("this.$message.success(\"订单已提交\")"));
+        assertTrue(masterDetailMapper.contains("from library_book m"));
+        assertTrue(masterDetailMapper.contains("where d.book_id = #{masterId}"));
+    }
+
+    @Test
+    public void renderFileRendersEveryBundledBusinessBlockFile()
+    {
+        GenProject project = businessBlocksProject();
+        assertRenderedFiles(project, service.listFiles(project, "frontend"));
+        assertRenderedFiles(project, service.listFiles(project, "backend"));
+    }
+
+    @Test
+    public void listFilesCreatesEmbeddedBlockFilesWithNormalPage()
+    {
+        List<GeneratedBusinessBlockFile> files = service.listFiles(embeddedBlocksProject(), "frontend");
+
+        assertTrue(containsPath(files, "src/views/pages/book_catalog/index.vue"));
+        assertTrue(containsPath(files, "src/views/pages/book_catalog/blocks/notice_001/NoticeBlock.vue"));
+        assertTrue(containsPath(files, "src/views/pages/book_catalog/blocks/carousel_001/CarouselBlock.vue"));
+        assertTrue(containsPath(files, "src/api/business-blocks/notice_001.js"));
+        assertTrue(containsPath(files, "src/api/business-blocks/carousel_001.js"));
+    }
+
+    @Test
+    public void renderFileUsesExactNormalPageDesignContext()
+    {
+        GenProject project = embeddedBlocksProject();
+        GeneratedBusinessBlockFile pageFile = findPath(service.listFiles(project, "frontend"),
+                "src/views/pages/book_catalog/index.vue");
+
+        String pageContent = service.renderFile(project, pageFile);
+
+        assertTrue(pageContent.contains("portal-page"));
+        assertTrue(pageContent.contains("import Notice001Block from \"@/views/pages/book_catalog/blocks/notice_001/NoticeBlock.vue\""));
+        assertTrue(pageContent.contains("<Notice001Block />"));
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    public void putEmbeddedBlockVelocityContextExposesTopAndBottomBlockImports()
+    {
+        GenProject project = embeddedBlocksProject();
+        VelocityContext context = new VelocityContext();
+
+        service.putEmbeddedBlockVelocityContext(context, project, project.getPageDesigns().get(0));
+
+        List<Map<String, Object>> topBlocks = (List<Map<String, Object>>) context.get("pageDesignTopBusinessBlocks");
+        List<Map<String, Object>> bottomBlocks = (List<Map<String, Object>>) context.get("pageDesignBottomBusinessBlocks");
+
+        assertEquals(1, topBlocks.size());
+        assertEquals(1, bottomBlocks.size());
+        assertEquals("Notice001Block", topBlocks.get(0).get("componentName"));
+        assertEquals("@/views/pages/book_catalog/blocks/notice_001/NoticeBlock.vue",
+                topBlocks.get(0).get("relativeImportPath"));
+        assertEquals("Carousel001Block", bottomBlocks.get(0).get("componentName"));
+        assertEquals(Boolean.TRUE, context.get("hasPageDesignEmbeddedBusinessBlocks"));
+    }
+
+    @Test
+    public void findFileMatchesCategoryOrPath()
+    {
+        GenProject project = project();
+        GeneratedBusinessBlockFile file = findPath(service.listFiles(project, "frontend"),
+                "src/api/business-blocks/cart_001.js");
+
+        assertEquals(file.getOutputPath(), service.findFile(project, "frontend", file.getCategory()).getOutputPath());
+        assertEquals(file.getCategory(), service.findFile(project, "frontend", file.getOutputPath()).getCategory());
+    }
+
+    private void setField(String name, Object value) throws Exception
+    {
+        Field field = BusinessBlockGenerationService.class.getDeclaredField(name);
+        field.setAccessible(true);
+        field.set(service, value);
+    }
+
+    private boolean containsPath(List<GeneratedBusinessBlockFile> files, String outputPath)
+    {
+        return findPath(files, outputPath) != null;
+    }
+
+    private GeneratedBusinessBlockFile findPath(List<GeneratedBusinessBlockFile> files, String outputPath)
+    {
+        for (GeneratedBusinessBlockFile file : files)
+        {
+            if (outputPath.equals(file.getOutputPath()))
+            {
+                return file;
+            }
+        }
+        return null;
+    }
+
+    private void assertRenderedFiles(GenProject project, List<GeneratedBusinessBlockFile> files)
+    {
+        for (GeneratedBusinessBlockFile file : files)
+        {
+            String content = service.renderFile(project, file);
+            assertTrue(file.getOutputPath(), content.trim().length() > 0);
+        }
+    }
+
+    private GenProject project()
+    {
+        GenProject project = new GenProject();
+        project.setProjectId(10L);
+        project.setProjectName("Demo");
+        project.setProjectFileName("demo");
+        project.setPackageName("com.example.demo");
+        project.setTables(Arrays.asList(cartTable(), productTable()));
+        project.setPageDesigns(Arrays.asList(cartPageDesign()));
+        return project;
+    }
+
+    private GenProject businessBlocksProject()
+    {
+        GenProject project = new GenProject();
+        project.setProjectId(11L);
+        project.setProjectName("BusinessBlocks");
+        project.setProjectFileName("business-blocks");
+        project.setPackageName("com.example.demo");
+        project.setTables(Arrays.asList(
+                noticeTable(),
+                carouselTable(),
+                orderTable(),
+                orderItemTable(),
+                productTable(),
+                masterTable(),
+                detailTable()));
+        project.setPageDesigns(Arrays.asList(businessBlocksPageDesign()));
+        return project;
+    }
+
+    private GenProject embeddedBlocksProject()
+    {
+        GenProject project = new GenProject();
+        project.setProjectId(12L);
+        project.setProjectName("EmbeddedBlocks");
+        project.setProjectFileName("embedded-blocks");
+        project.setPackageName("com.example.demo");
+        project.setTables(Arrays.asList(noticeTable(), carouselTable(), masterTable()));
+        project.setPageDesigns(Arrays.asList(embeddedBlocksPageDesign()));
+        return project;
+    }
+
+    private FrontProjectPageDesign cartPageDesign()
+    {
+        FrontProjectPageDesign design = new FrontProjectPageDesign();
+        design.setPageCode("cart_page");
+        design.setPageName("Cart");
+        design.setPageScope("frontend");
+        design.setPageType("business_block");
+        design.setRoutePath("/cart");
+        design.setTableName("shop_cart");
+        design.setLayoutJson("{\"canvas\":\"business-blocks-v1\",\"blocks\":[{\"id\":\"cart_001\",\"blockCode\":\"cart\",\"config\":{"
+                + "\"cartTable\":\"shop_cart\","
+                + "\"productTable\":\"shop_product\","
+                + "\"cartProductId\":\"productId\","
+                + "\"productId\":\"id\","
+                + "\"productName\":\"name\","
+                + "\"price\":\"price\","
+                + "\"quantity\":\"quantity\","
+                + "\"userId\":\"userId\","
+                + "\"stock\":\"stock\""
+                + "}}]}");
+        return design;
+    }
+
+    private FrontProjectPageDesign businessBlocksPageDesign()
+    {
+        FrontProjectPageDesign design = new FrontProjectPageDesign();
+        design.setPageCode("business_page");
+        design.setPageName("Business Blocks");
+        design.setPageScope("frontend");
+        design.setPageType("business_block");
+        design.setRoutePath("/business");
+        design.setLayoutJson("{\"canvas\":\"business-blocks-v1\",\"blocks\":["
+                + "{\"id\":\"notice_001\",\"blockCode\":\"notice\",\"config\":{"
+                + "\"noticeTable\":\"sys_notice\",\"title\":\"noticeTitle\",\"content\":\"noticeContent\",\"status\":\"status\",\"publishTime\":\"createTime\"}},"
+                + "{\"id\":\"carousel_001\",\"blockCode\":\"carousel\",\"config\":{"
+                + "\"carouselTable\":\"home_banner\",\"image\":\"imageUrl\",\"title\":\"title\",\"link\":\"linkUrl\",\"sort\":\"sortNo\",\"status\":\"status\"}},"
+                + "{\"id\":\"order_001\",\"blockCode\":\"order\",\"config\":{"
+                + "\"orderTable\":\"shop_order\",\"orderItemTable\":\"shop_order_item\",\"productTable\":\"shop_product\","
+                + "\"orderUserId\":\"userId\",\"orderNo\":\"orderNo\",\"orderAmount\":\"totalAmount\",\"orderStatus\":\"status\",\"orderCreateTime\":\"createTime\","
+                + "\"itemOrderId\":\"orderId\",\"itemProductId\":\"productId\",\"itemQuantity\":\"quantity\",\"itemPrice\":\"price\","
+                + "\"productId\":\"id\",\"productName\":\"name\",\"productImage\":\"imageUrl\",\"productPrice\":\"price\"}},"
+                + "{\"id\":\"master_detail_001\",\"blockCode\":\"master_detail\",\"config\":{"
+                + "\"masterTable\":\"library_book\",\"detailTable\":\"library_borrowing\","
+                + "\"masterId\":\"id\",\"detailMasterId\":\"bookId\",\"masterTitle\":\"bookName\",\"masterDescription\":\"description\","
+                + "\"detailTitle\":\"borrowerName\",\"detailValue\":\"status\",\"detailTime\":\"createTime\"}}"
+                + "]}");
+        return design;
+    }
+
+    private FrontProjectPageDesign embeddedBlocksPageDesign()
+    {
+        FrontProjectPageDesign design = new FrontProjectPageDesign();
+        design.setPageCode("book_catalog");
+        design.setPageName("Book Catalog");
+        design.setPageScope("frontend");
+        design.setPageType("list");
+        design.setRoutePath("/books");
+        design.setTableName("library_book");
+        design.setLayoutJson("{\"canvas\":\"frontend-list-v1\",\"regions\":[{\"id\":\"table\",\"type\":\"table\",\"fields\":[\"bookName\"]}],"
+                + "\"embeddedBlocks\":{\"top\":[{\"id\":\"notice_001\",\"blockCode\":\"notice\",\"config\":{"
+                + "\"noticeTable\":\"sys_notice\",\"title\":\"noticeTitle\",\"content\":\"noticeContent\",\"publishTime\":\"createTime\"}}],"
+                + "\"bottom\":[{\"id\":\"carousel_001\",\"blockCode\":\"carousel\",\"config\":{"
+                + "\"carouselTable\":\"home_banner\",\"image\":\"imageUrl\",\"title\":\"title\",\"link\":\"linkUrl\"}}]}}");
+        return design;
+    }
+
+    private GenTable cartTable()
+    {
+        GenTable table = table(201L, "shop_cart", "ShopCart");
+        table.setColumns(Arrays.asList(
+                column("id", "id", "1"),
+                column("product_id", "productId", "0"),
+                column("quantity", "quantity", "0"),
+                column("user_id", "userId", "0")));
+        table.setPkColumn(table.getColumns().get(0));
+        return table;
+    }
+
+    private GenTable productTable()
+    {
+        GenTable table = table(202L, "shop_product", "ShopProduct");
+        table.setColumns(Arrays.asList(
+                column("id", "id", "1"),
+                column("name", "name", "0"),
+                column("image_url", "imageUrl", "0"),
+                column("price", "price", "0"),
+                column("stock", "stock", "0")));
+        table.setPkColumn(table.getColumns().get(0));
+        return table;
+    }
+
+    private GenTable noticeTable()
+    {
+        GenTable table = table(203L, "sys_notice", "SysNotice");
+        table.setColumns(Arrays.asList(
+                column("id", "id", "1"),
+                column("notice_title", "noticeTitle", "0"),
+                column("notice_content", "noticeContent", "0"),
+                column("status", "status", "0"),
+                column("create_time", "createTime", "0")));
+        table.setPkColumn(table.getColumns().get(0));
+        return table;
+    }
+
+    private GenTable carouselTable()
+    {
+        GenTable table = table(204L, "home_banner", "HomeBanner");
+        table.setColumns(Arrays.asList(
+                column("id", "id", "1"),
+                column("image_url", "imageUrl", "0"),
+                column("title", "title", "0"),
+                column("link_url", "linkUrl", "0"),
+                column("sort_no", "sortNo", "0"),
+                column("status", "status", "0")));
+        table.setPkColumn(table.getColumns().get(0));
+        return table;
+    }
+
+    private GenTable orderTable()
+    {
+        GenTable table = table(205L, "shop_order", "ShopOrder");
+        table.setColumns(Arrays.asList(
+                column("id", "id", "1"),
+                column("user_id", "userId", "0"),
+                column("order_no", "orderNo", "0"),
+                column("total_amount", "totalAmount", "0"),
+                column("status", "status", "0"),
+                column("create_time", "createTime", "0")));
+        table.setPkColumn(table.getColumns().get(0));
+        return table;
+    }
+
+    private GenTable orderItemTable()
+    {
+        GenTable table = table(206L, "shop_order_item", "ShopOrderItem");
+        table.setColumns(Arrays.asList(
+                column("id", "id", "1"),
+                column("order_id", "orderId", "0"),
+                column("product_id", "productId", "0"),
+                column("quantity", "quantity", "0"),
+                column("price", "price", "0")));
+        table.setPkColumn(table.getColumns().get(0));
+        return table;
+    }
+
+    private GenTable masterTable()
+    {
+        GenTable table = table(207L, "library_book", "LibraryBook");
+        table.setColumns(Arrays.asList(
+                column("id", "id", "1"),
+                column("book_name", "bookName", "0"),
+                column("description", "description", "0")));
+        table.setPkColumn(table.getColumns().get(0));
+        return table;
+    }
+
+    private GenTable detailTable()
+    {
+        GenTable table = table(208L, "library_borrowing", "LibraryBorrowing");
+        table.setColumns(Arrays.asList(
+                column("id", "id", "1"),
+                column("book_id", "bookId", "0"),
+                column("borrower_name", "borrowerName", "0"),
+                column("status", "status", "0"),
+                column("create_time", "createTime", "0")));
+        table.setPkColumn(table.getColumns().get(0));
+        return table;
+    }
+
+    private GenTable table(Long tableId, String tableName, String className)
+    {
+        GenTable table = new GenTable();
+        table.setTableId(tableId);
+        table.setTableName(tableName);
+        table.setClassName(className);
+        return table;
+    }
+
+    private GenTableColumn column(String columnName, String javaField, String isPk)
+    {
+        GenTableColumn column = new GenTableColumn();
+        column.setColumnName(columnName);
+        column.setJavaField(javaField);
+        column.setIsPk(isPk);
+        return column;
+    }
+}
diff --git a/RuoYi-Vue/ruoyi-generator/src/test/java/com/ruoyi/generator/service/GenProjectServiceImplTest.java b/RuoYi-Vue/ruoyi-generator/src/test/java/com/ruoyi/generator/service/GenProjectServiceImplTest.java
index 5de5c56..5b48fa8 100644
--- a/RuoYi-Vue/ruoyi-generator/src/test/java/com/ruoyi/generator/service/GenProjectServiceImplTest.java
+++ b/RuoYi-Vue/ruoyi-generator/src/test/java/com/ruoyi/generator/service/GenProjectServiceImplTest.java
@@ -10,9 +10,13 @@ import com.ruoyi.generator.domain.SysProjectStructure;
 import com.ruoyi.generator.domain.SysProjectTemplate;
 import com.ruoyi.generator.domain.Template;
 import com.ruoyi.generator.domain.TemplateFile;
+import com.ruoyi.generator.domain.GeneratedBusinessBlockFile;
+import com.ruoyi.generator.domain.front.FrontProjectPageDesign;
 import com.ruoyi.generator.domain.front.dto.BusinessActionDesign;
+import com.ruoyi.generator.domain.front.dto.BusinessActionUiBindingDesign;
 import com.ruoyi.generator.mapper.GenProjectMapper;
 import com.ruoyi.generator.mapper.GenTableMapper;
+import com.ruoyi.generator.service.front.BusinessBlockRegistryService;
 import com.ruoyi.generator.util.VelocityInitializer;
 import com.ruoyi.generator.util.VelocityUtils;
 import org.apache.velocity.VelocityContext;
@@ -24,14 +28,20 @@ import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
 import java.lang.reflect.Field;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
 import java.io.StringWriter;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -73,6 +83,10 @@ public class GenProjectServiceImplTest {
         setField("sysProjectModuleService", sysProjectModuleService);
         setField("sysProjectTemplateService", sysProjectTemplateService);
         setField("sysProjectStructureService", sysProjectStructureService);
+        BusinessBlockGenerationService businessBlockGenerationService = new BusinessBlockGenerationService();
+        setObjectField(businessBlockGenerationService, BusinessBlockGenerationService.class,
+                "businessBlockRegistryService", new BusinessBlockRegistryService());
+        trySetField("businessBlockGenerationService", businessBlockGenerationService);
     }
 
     @Test
@@ -178,6 +192,158 @@ public class GenProjectServiceImplTest {
         assertFalse(content.contains("return_book"));
     }
 
+    @Test
+    public void previewCodeGroupsBusinessActionsByFrontendPageSlot() {
+        GenProject project = project();
+        project.setBusinessActions(Arrays.asList(
+                businessActionWithBinding("borrow_book", "sys_user", "book_detail_page", "detail.primaryActions"),
+                businessActionWithBinding("return_book", "sys_user", "my_borrows_page", "list.rowActions")
+        ));
+        GenTable table = table(11L, "sys_user", "User");
+
+        when(genProjectMapper.selectGenProjectById(1L)).thenReturn(project);
+        when(genTableMapper.selectGenTablesByProjectId(1L)).thenReturn(Arrays.asList(table));
+        when(genTableMapper.selectGenTableById(11L)).thenReturn(table);
+        when(sysProjectModuleService.selectSysProjectModuleList(any(SysProjectModule.class))).thenReturn(Arrays.asList(projectModule(1L)));
+        when(codeSnippetService.selectSysCodeSnippetList(any(SysCodeSnippet.class))).thenReturn(Arrays.asList());
+        when(sysProjectTemplateService.selectSysProjectTemplateByProjectAndType(1L, "frontend")).thenReturn(projectTemplate(100L));
+        when(templateFileService.selectTemplateFilesByTemplateId(100L)).thenReturn(Arrays.asList(
+                templateFile("detail.vue.vm", "#set($actions = $slotBusinessActions.get(\"book_detail_page:detail.primaryActions\"))#foreach($action in $actions)${action.code} #end")
+        ));
+
+        Map<String, String> preview = service.previewCode(1L, 11L, "detail.vue.vm", "frontend");
+
+        String content = preview.get("detail.vue.vm");
+        assertTrue(content.contains("borrow_book"));
+        assertFalse(content.contains("return_book"));
+    }
+
+    @Test
+    public void previewCodeUsesPageDesignActionPositionsForBusinessActionButtons() {
+        GenProject project = project();
+        project.setBusinessActions(Arrays.asList(
+                businessAction("approve_book", "sys_user"),
+                businessAction("return_book", "sys_user"),
+                businessAction("sync_role", "sys_role")
+        ));
+        project.setPageDesigns(Arrays.asList(pageDesign("user_page", "sys_user",
+                "{\"canvas\":\"frontend-list-v1\",\"regions\":["
+                        + "{\"id\":\"toolbar\",\"type\":\"toolbar\",\"actions\":[\"create\",\"business:approve_book\"]},"
+                        + "{\"id\":\"table\",\"type\":\"table\",\"fields\":[\"id\"],\"rowActions\":[\"edit\",\"business:return_book\"]},"
+                        + "{\"id\":\"form\",\"type\":\"dialogForm\",\"fields\":[\"id\"]}"
+                        + "]}")));
+        GenTable table = table(11L, "sys_user", "User");
+
+        when(genProjectMapper.selectGenProjectById(1L)).thenReturn(project);
+        when(genTableMapper.selectGenTablesByProjectId(1L)).thenReturn(Arrays.asList(table));
+        when(genTableMapper.selectGenTableById(11L)).thenReturn(table);
+        when(sysProjectModuleService.selectSysProjectModuleList(any(SysProjectModule.class))).thenReturn(Arrays.asList(projectModule(1L)));
+        when(codeSnippetService.selectSysCodeSnippetList(any(SysCodeSnippet.class))).thenReturn(Arrays.asList());
+        when(sysProjectTemplateService.selectSysProjectTemplateByProjectAndType(1L, "frontend")).thenReturn(projectTemplate(100L));
+        when(templateFileService.selectTemplateFilesByTemplateId(100L)).thenReturn(Arrays.asList(
+                templateFile("list.vue.vm",
+                        "#foreach($action in $pageDesignToolbarBusinessActions)toolbar:${action.code}:${action.path};#end"
+                                + "#foreach($action in $pageDesignRowBusinessActions)row:${action.code}:${action.path};#end"
+                                + "#foreach($action in $pageDesignBusinessActions)all:${action.code};#end")
+        ));
+
+        Map<String, String> preview = service.previewCode(1L, 11L, "list.vue.vm", "frontend");
+
+        String content = preview.get("list.vue.vm");
+        assertTrue(content.contains("toolbar:approve_book:/approve_book;"));
+        assertTrue(content.contains("row:return_book:/return_book;"));
+        assertTrue(content.contains("all:approve_book;"));
+        assertTrue(content.contains("all:return_book;"));
+        assertFalse(content.contains("sync_role"));
+    }
+
+    @Test
+    public void previewCodeUsesPageDesignedBusinessActionsFromOtherOwnerTables() {
+        GenProject project = project();
+        project.setBusinessActions(Arrays.asList(
+                businessAction("borrow_book", "borrow_record"),
+                businessAction("reserve_book", "reservation")
+        ));
+        project.setPageDesigns(Arrays.asList(pageDesign("book_catalog_page", "book",
+                "{\"canvas\":\"frontend-list-card-v1\",\"regions\":["
+                        + "{\"id\":\"card\",\"type\":\"cardList\",\"fields\":[\"id\"]},"
+                        + "{\"id\":\"cardActions\",\"type\":\"actions\",\"actions\":[\"business:borrow_book\",\"delete\"]}"
+                        + "]}")));
+        GenTable table = table(11L, "book", "Book");
+
+        when(genProjectMapper.selectGenProjectById(1L)).thenReturn(project);
+        when(genTableMapper.selectGenTablesByProjectId(1L)).thenReturn(Arrays.asList(table));
+        when(genTableMapper.selectGenTableById(11L)).thenReturn(table);
+        when(sysProjectModuleService.selectSysProjectModuleList(any(SysProjectModule.class))).thenReturn(Arrays.asList(projectModule(1L)));
+        when(codeSnippetService.selectSysCodeSnippetList(any(SysCodeSnippet.class))).thenReturn(Arrays.asList());
+        when(sysProjectTemplateService.selectSysProjectTemplateByProjectAndType(1L, "frontend")).thenReturn(projectTemplate(100L));
+        when(templateFileService.selectTemplateFilesByTemplateId(100L)).thenReturn(Arrays.asList(
+                templateFile("list.vue.vm",
+                        "#foreach($action in $pageDesignRowBusinessActions)row:${action.code}:${action.ownerTable};#end"
+                                + "#foreach($action in $pageDesignBusinessActions)all:${action.code};#end")
+        ));
+
+        Map<String, String> preview = service.previewCode(1L, 11L, "list.vue.vm", "frontend");
+
+        String content = preview.get("list.vue.vm");
+        assertTrue(content.contains("row:borrow_book:borrow_record;"));
+        assertTrue(content.contains("all:borrow_book;"));
+        assertFalse(content.contains("reserve_book"));
+    }
+
+    @Test
+    public void previewCodeUsesBundledFrontendIndexWhenDefaultRunnableTemplateIsStale() {
+        GenProject project = project();
+        GenTable table = table(11L, "sys_user", "User");
+        TemplateFile staleTemplate = templateFile("frontend-index.vue.vm",
+                "#set($designed = $hasCurrentFrontendPageDesign)\n"
+                        + "<template><div>old page design template</div></template>\n"
+                        + "<script>export default { data() { return { businessActionMap: {} } } }</script>");
+        staleTemplate.setTemplateId(9203L);
+
+        when(genProjectMapper.selectGenProjectById(1L)).thenReturn(project);
+        when(genTableMapper.selectGenTablesByProjectId(1L)).thenReturn(Arrays.asList(table));
+        when(genTableMapper.selectGenTableById(11L)).thenReturn(table);
+        when(sysProjectModuleService.selectSysProjectModuleList(any(SysProjectModule.class))).thenReturn(Arrays.asList());
+        when(codeSnippetService.selectSysCodeSnippetList(any(SysCodeSnippet.class))).thenReturn(Arrays.asList());
+        when(sysProjectTemplateService.selectSysProjectTemplateByProjectAndType(1L, "frontend")).thenReturn(projectTemplate(9203L));
+        when(templateFileService.selectTemplateFilesByTemplateId(9203L)).thenReturn(Arrays.asList(staleTemplate));
+
+        Map<String, String> preview = service.previewCode(1L, 11L, "frontend-index.vue.vm", "frontend");
+
+        String content = preview.get("frontend-index.vue.vm");
+        assertFalse(content.contains("old page design template"));
+        assertTrue(content.contains("portal-page"));
+        assertTrue(content.contains("content-board"));
+        assertTrue(content.contains("businessActionMap"));
+    }
+
+    @Test
+    public void previewCodeUsesBundledControllerWhenDefaultRunnableTemplateIsStale() {
+        GenProject project = project();
+        GenTable table = table(11L, "sys_user", "User");
+        table.setColumns(Arrays.asList(pkColumn(11L), column(11L, "user_id", "userId")));
+        table.setPkColumn(table.getColumns().get(0));
+        TemplateFile staleTemplate = templateFile("controller.java.vm",
+                "package ${packageName}.controller; public class ${ClassName}Controller {}");
+        staleTemplate.setTemplateId(9201L);
+
+        when(genProjectMapper.selectGenProjectById(1L)).thenReturn(project);
+        when(genTableMapper.selectGenTablesByProjectId(1L)).thenReturn(Arrays.asList(table));
+        when(genTableMapper.selectGenTableById(11L)).thenReturn(table);
+        when(sysProjectModuleService.selectSysProjectModuleList(any(SysProjectModule.class))).thenReturn(Arrays.asList());
+        when(codeSnippetService.selectSysCodeSnippetList(any(SysCodeSnippet.class))).thenReturn(Arrays.asList());
+        when(sysProjectTemplateService.selectSysProjectTemplateByProjectAndType(1L, "backend")).thenReturn(projectTemplate(9201L));
+        when(templateFileService.selectTemplateFilesByTemplateId(9201L)).thenReturn(Arrays.asList(staleTemplate));
+
+        Map<String, String> preview = service.previewCode(1L, 11L, "controller.java.vm", "backend");
+
+        String content = preview.get("controller.java.vm");
+        assertFalse(content.contains("public class UserController {}"));
+        assertTrue(content.contains("@GetMapping(\"/page\")"));
+        assertTrue(content.contains("__currentUserOnly"));
+    }
+
     @Test
     public void businessBlueprintSqlTemplateGeneratesExecutableActionEffects() throws Exception {
         Path sqlPath = Paths.get("sql/business_blueprint_templates.sql");
@@ -217,6 +383,66 @@ public class GenProjectServiceImplTest {
         assertFalse(sql.contains("insert into generated_menu"));
     }
 
+    @Test
+    public void businessBlueprintSqlVueTemplatesRenderFrontendActionSlots() throws Exception {
+        String sql = readBusinessBlueprintSql();
+
+        assertTrue(sql.contains("@click.stop=\"openDetail(row)\""));
+        assertTrue(sql.contains("\u67e5\u770b\u8be6\u60c5"));
+        assertTrue(sql.contains("$hasListRowBusinessActions"));
+        assertTrue(sql.contains("$listRowBusinessActions"));
+        assertTrue(sql.contains("$hasDetailPrimaryBusinessActions"));
+        assertTrue(sql.contains("$detailPrimaryBusinessActions"));
+        assertTrue(sql.contains("resolveSlotActions"));
+    }
+
+    @Test
+    public void businessBlueprintBackendTemplateGeneratesRunnableSpringBootProject() throws Exception {
+        String sql = readBusinessBlueprintSql();
+
+        assertTrue(sql.contains("<artifactId>spring-boot-starter-parent</artifactId>"));
+        assertTrue(sql.contains("<ruoyi.version>3.8.8</ruoyi.version>"));
+        assertTrue(sql.contains("<version>${ruoyi.version}</version>"));
+        assertTrue(sql.contains("<artifactId>mysql-connector-java</artifactId>"));
+        assertTrue(sql.contains("<artifactId>spring-boot-maven-plugin</artifactId>"));
+        assertTrue(sql.contains("Application.java.vm"));
+        assertTrue(sql.contains("@MapperScan(\"${packageName}.mapper\")"));
+        assertTrue(sql.contains("SecurityAutoConfiguration.class"));
+        assertTrue(sql.contains("SpringApplication.run(${projectClassName}Application.class, args);"));
+        assertTrue(sql.contains("port: ${d}{SERVER_PORT:8080}"));
+        assertTrue(sql.contains("url: ${d}{DB_URL:jdbc:mysql://localhost:3306/vip?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8}"));
+        assertTrue(sql.contains("mapperLocations: classpath:mapper/**/*.xml"));
+        assertFalse(sql.contains("mapperLocations: classpath*:mapper/**/*.xml"));
+    }
+
+    @Test
+    public void businessBlueprintAdminTemplateGeneratesRunnableVueCliProject() throws Exception {
+        String sql = readBusinessBlueprintSql();
+        String packageJson = extractTemplateSqlContent(sql, "910201");
+
+        assertTrue(packageJson.contains("\"dev\": \"vue-cli-service serve --host 0.0.0.0\""));
+        assertTrue(packageJson.contains("\"@vue/cli-service\":"));
+        assertTrue(packageJson.contains("\"@vue/cli-plugin-babel\":"));
+        assertTrue(packageJson.contains("\"vue-template-compiler\":"));
+        assertTrue(packageJson.contains("\"axios\":"));
+        assertTrue(packageJson.contains("\"core-js\":"));
+
+        for (String templateFileId : Arrays.asList("910206", "910207", "910208", "910209", "910210", "910211", "910212", "910213")) {
+            assertFalse(extractTemplateSqlContent(sql, templateFileId).trim().isEmpty());
+        }
+
+        assertTrue(sql.contains("'public', 'folder', NULL, 9102"));
+        assertTrue(sql.contains("'index.html', 'file', NULL, 9102, -1, 'index.html.vm'"));
+        assertTrue(sql.contains("'main.js', 'file', NULL, 9102, -1, 'main.js.vm'"));
+        assertTrue(sql.contains("'App.vue', 'file', NULL, 9102, -1, 'App.vue.vm'"));
+        assertTrue(sql.contains("'router', 'folder', NULL, 9102"));
+        assertTrue(sql.contains("'index.js', 'file', NULL, 9102, -1, 'router.js.vm'"));
+        assertTrue(sql.contains("'utils', 'folder', NULL, 9102"));
+        assertTrue(sql.contains("'request.js', 'file', NULL, 9102, -1, 'request.js.vm'"));
+        assertTrue(sql.contains("'components', 'folder', NULL, 9102"));
+        assertTrue(sql.contains("'Pagination.vue', 'file', NULL, 9102, -1, 'Pagination.vue.vm'"));
+    }
+
     @Test
     public void businessBlueprintSqlVueTemplatesAreVelocityParseable() throws Exception {
         String sql = readBusinessBlueprintSql();
@@ -235,6 +461,41 @@ public class GenProjectServiceImplTest {
         }
     }
 
+    @Test
+    public void businessBlueprintAdminShellTemplatesAreVelocityParseable() throws Exception {
+        String sql = readBusinessBlueprintSql();
+        GenProject project = project();
+        VelocityContext context = VelocityUtils.prepareContextProject(project);
+        VelocityInitializer.initVelocity();
+
+        for (String templateFileId : Arrays.asList("910206", "910207", "910208", "910209", "910210", "910211", "910212", "910213")) {
+            StringWriter output = new StringWriter();
+            Velocity.evaluate(context, output, "", extractTemplateSqlContent(sql, templateFileId));
+            assertFalse(output.toString().trim().isEmpty());
+        }
+    }
+
+    @Test
+    public void qingControllerUsesAddOnlySaveWhenEditDisabled() throws Exception {
+        GenTable table = table(11L, "order_info", "Order");
+        table.setPackageName("com.example.demo");
+        table.setPkColumn(table.getColumns().get(0));
+        table.setAllowAdd("1");
+        table.setAllowEdit("0");
+        table.setAllowRemove("0");
+        table.setRemoveType("none");
+        VelocityInitializer.initVelocity();
+
+        StringWriter output = new StringWriter();
+        Velocity.evaluate(VelocityUtils.prepareContext(table), output, "", readQingControllerTemplate());
+
+        String content = output.toString();
+        assertTrue(content.contains("orderService.save(order);"));
+        assertFalse(content.contains("saveOrUpdate"));
+        assertFalse(content.contains("updateById"));
+        assertFalse(content.contains("@DeleteMapping"));
+    }
+
     @Test
     public void getProjectStructureForDraftProjectUsesFirstActiveTemplateWithoutLoadingProject() {
         GenProject project = project();
@@ -297,6 +558,31 @@ public class GenProjectServiceImplTest {
         assertEquals("0", structureCaptor.getValue().getStatus());
     }
 
+    @Test
+    public void frontDraftProjectStructurePrefersRunnableFrontendTemplateWhenAvailable() {
+        GenProject project = project();
+        project.setFrontDraft(true);
+        project.setTables(Arrays.asList(table(11L, "sys_user", "User")));
+
+        when(templateService.selectTemplateList(any(Template.class))).thenReturn(Arrays.asList(
+                template(9103L, 0L),
+                template(9203L, 0L)
+        ));
+        when(sysProjectStructureService.selectSysProjectStructureList(any(SysProjectStructure.class))).thenReturn(Arrays.asList(
+                structure(1L, 0L, "{projectName}", "folder", null, null),
+                structure(2L, 1L, "index.vue", "file", null, "frontend-index.vue.vm")
+        ));
+
+        List<Map<String, Object>> structure = service.getProjectStructure(project, "frontend");
+
+        assertEquals("demo-app", structure.get(0).get("name"));
+
+        ArgumentCaptor<SysProjectStructure> structureCaptor = ArgumentCaptor.forClass(SysProjectStructure.class);
+        verify(sysProjectStructureService).selectSysProjectStructureList(structureCaptor.capture());
+        assertEquals(Long.valueOf(9203L), structureCaptor.getValue().getTemplateId());
+        assertEquals("0", structureCaptor.getValue().getStatus());
+    }
+
     @Test
     public void getProjectStructureReplacesAndGroupsTableScopedModuleFolders() {
         GenProject project = project();
@@ -380,6 +666,135 @@ public class GenProjectServiceImplTest {
         verify(sysProjectModuleService, never()).selectSysProjectModuleList(any(SysProjectModule.class));
     }
 
+    @Test
+    public void sqlProjectStructureShowsSqlFilesUnderSqlFolder() {
+        GenProject project = project();
+        project.setFrontDraft(true);
+        GenTable table = table(11L, "sys_user", "User");
+        table.setBusinessName("user");
+        table.setCreateTableSql("create table sys_user (id bigint);");
+        project.setTables(Arrays.asList(table));
+
+        List<Map<String, Object>> structure = service.getProjectStructure(project, "sql");
+
+        Map<String, Object> sqlFolder = structure.get(0);
+        assertEquals("sql", sqlFolder.get("name"));
+        assertEquals("folder", sqlFolder.get("type"));
+        Map<String, Object> sqlFile = child(sqlFolder, 0);
+        assertEquals("user.sql", sqlFile.get("name"));
+        assertEquals("file", sqlFile.get("type"));
+        assertEquals("sql", sqlFile.get("category"));
+        assertEquals(Long.valueOf(11L), sqlFile.get("tableId"));
+    }
+
+    @Test
+    public void sqlPreviewReturnsCreateTableSqlForSelectedTable() {
+        GenProject project = project();
+        project.setFrontDraft(true);
+        GenTable table = table(11L, "sys_user", "User");
+        table.setBusinessName("user");
+        table.setCreateTableSql("create table sys_user (id bigint);");
+        project.setTables(Arrays.asList(table));
+
+        Map<String, String> preview = service.previewCode(project, 11L, "user.sql", "sql");
+
+        assertEquals(1, preview.size());
+        assertTrue(preview.get("user.sql").contains("create table sys_user"));
+    }
+
+    @Test
+    public void sqlDownloadPackagesFilesUnderSqlFolder() throws Exception {
+        GenProject project = project();
+        project.setFrontDraft(true);
+        GenTable table = table(11L, "sys_user", "User");
+        table.setBusinessName("user");
+        table.setCreateTableSql("create table sys_user (id bigint);");
+        project.setTables(Arrays.asList(table));
+
+        byte[] data = service.downloadStructure(project, "sql");
+
+        Set<String> entries = zipEntries(data);
+        assertTrue(entries.contains("sql/user.sql"));
+        assertFalse(entries.contains("user.sql"));
+    }
+
+    @Test
+    public void getProjectStructureAddsBusinessBlockFrontendFiles() {
+        GenProject project = businessBlockProject();
+        project.setFrontDraft(true);
+
+        when(templateService.selectTemplateList(any(Template.class))).thenReturn(Arrays.asList(template(9203L, 0L)));
+        when(sysProjectStructureService.selectSysProjectStructureList(any(SysProjectStructure.class))).thenReturn(Arrays.asList(
+                structure(1L, 0L, "{projectName}", "folder", null, null),
+                structure(2L, 1L, "src", "folder", null, null)
+        ));
+
+        List<Map<String, Object>> structure = service.getProjectStructure(project, "frontend");
+
+        Set<String> paths = structurePaths(structure);
+        assertTrue(paths.contains("demo-app/src/views/pages/cart_page/index.vue"));
+        assertTrue(paths.contains("demo-app/src/views/pages/cart_page/blocks/cart_001/CartBlock.vue"));
+        assertTrue(paths.contains("demo-app/src/api/business-blocks/cart_001.js"));
+    }
+
+    @Test
+    public void getProjectStructureAddsNormalFrontendPageDesignFiles() {
+        GenProject project = project();
+        project.setFrontDraft(true);
+        FrontProjectPageDesign design = pageDesign("book_catalog_page", "sys_user",
+                "{\"navigation\":{\"showInMenu\":true},\"regions\":[{\"id\":\"table\",\"type\":\"table\",\"fields\":[\"id\"],\"rowActions\":[\"view\"]}]}");
+        design.setPageName("Books");
+        design.setRoutePath("/books");
+        project.setPageDesigns(Arrays.asList(design));
+
+        when(templateService.selectTemplateList(any(Template.class))).thenReturn(Arrays.asList(template(9203L, 0L)));
+        when(sysProjectStructureService.selectSysProjectStructureList(any(SysProjectStructure.class))).thenReturn(Arrays.asList(
+                structure(1L, 0L, "{projectName}", "folder", null, null),
+                structure(2L, 1L, "src", "folder", null, null)
+        ));
+
+        List<Map<String, Object>> structure = service.getProjectStructure(project, "frontend");
+
+        Set<String> paths = structurePaths(structure);
+        assertTrue(paths.contains("demo-app/src/views/pages/book_catalog_page/index.vue"));
+    }
+
+    @Test
+    public void previewCodeReturnsBusinessBlockFileByCategory() {
+        GenProject project = businessBlockProject();
+        project.setFrontDraft(true);
+        BusinessBlockGenerationService generationService = new BusinessBlockGenerationService();
+        setObjectFieldUnchecked(generationService, BusinessBlockGenerationService.class,
+                "businessBlockRegistryService", new BusinessBlockRegistryService());
+        GeneratedBusinessBlockFile file = findBusinessBlockPath(generationService.listFiles(project, "frontend"),
+                "src/views/pages/cart_page/blocks/cart_001/CartBlock.vue");
+
+        Map<String, String> preview = service.previewCode(project, null, file.getCategory(), "frontend");
+
+        assertEquals(1, preview.size());
+        assertTrue(preview.containsKey(file.getOutputPath()));
+        assertTrue(preview.get(file.getOutputPath()).contains("listCart001BlockItems"));
+    }
+
+    @Test
+    public void downloadStructurePackagesBusinessBlockFiles() throws Exception {
+        GenProject project = businessBlockProject();
+        project.setFrontDraft(true);
+
+        when(templateService.selectTemplateList(any(Template.class))).thenReturn(Arrays.asList(template(9203L, 0L)));
+        when(sysProjectStructureService.selectSysProjectStructureList(any(SysProjectStructure.class))).thenReturn(Arrays.asList(
+                structure(1L, 0L, "{projectName}", "folder", null, null),
+                structure(2L, 1L, "src", "folder", null, null)
+        ));
+
+        byte[] data = service.downloadStructure(project, "frontend");
+
+        Set<String> entries = zipEntries(data);
+        assertTrue(entries.contains("demo-app/src/views/pages/cart_page/index.vue"));
+        assertTrue(entries.contains("demo-app/src/views/pages/cart_page/blocks/cart_001/CartBlock.vue"));
+        assertTrue(entries.contains("demo-app/src/api/business-blocks/cart_001.js"));
+    }
+
     @SuppressWarnings("unchecked")
     private Map<String, Object> child(Map<String, Object> node, int index) {
         return children(node).get(index);
@@ -396,6 +811,27 @@ public class GenProjectServiceImplTest {
         field.set(service, value);
     }
 
+    private void trySetField(String name, Object value) throws Exception {
+        try {
+            setField(name, value);
+        } catch (NoSuchFieldException ignored) {
+        }
+    }
+
+    private void setObjectField(Object target, Class<?> targetClass, String name, Object value) throws Exception {
+        Field field = targetClass.getDeclaredField(name);
+        field.setAccessible(true);
+        field.set(target, value);
+    }
+
+    private void setObjectFieldUnchecked(Object target, Class<?> targetClass, String name, Object value) {
+        try {
+            setObjectField(target, targetClass, name, value);
+        } catch (Exception e) {
+            throw new AssertionError(e);
+        }
+    }
+
     private GenProject project() {
         GenProject project = new GenProject();
         project.setProjectId(1L);
@@ -500,6 +936,109 @@ public class GenProjectServiceImplTest {
         return action;
     }
 
+    private BusinessActionDesign businessActionWithBinding(String code, String ownerTable, String pageCode, String slot) {
+        BusinessActionDesign action = businessAction(code, ownerTable);
+        BusinessActionUiBindingDesign binding = new BusinessActionUiBindingDesign();
+        binding.setTarget("frontend");
+        binding.setPageCode(pageCode);
+        binding.setSlot(slot);
+        binding.setComponent("button");
+        action.setUiBindings(Arrays.asList(binding));
+        return action;
+    }
+
+    private FrontProjectPageDesign pageDesign(String pageCode, String tableName, String layoutJson) {
+        FrontProjectPageDesign design = new FrontProjectPageDesign();
+        design.setProjectId(1L);
+        design.setPageCode(pageCode);
+        design.setPageName(pageCode);
+        design.setPageType("list");
+        design.setTableName(tableName);
+        design.setLayoutJson(layoutJson);
+        design.setActionJson("{\"toolbarActions\":[],\"rowActions\":[]}");
+        return design;
+    }
+
+    private GenProject businessBlockProject() {
+        GenProject project = project();
+        GenTable cart = table(201L, "shop_cart", "ShopCart");
+        cart.setColumns(Arrays.asList(
+                pkColumn(201L),
+                column(201L, "product_id", "productId"),
+                column(201L, "quantity", "quantity"),
+                column(201L, "user_id", "userId")));
+        cart.setPkColumn(cart.getColumns().get(0));
+        GenTable product = table(202L, "shop_product", "ShopProduct");
+        product.setColumns(Arrays.asList(
+                pkColumn(202L),
+                column(202L, "name", "name"),
+                column(202L, "price", "price"),
+                column(202L, "stock", "stock")));
+        product.setPkColumn(product.getColumns().get(0));
+        project.setTables(Arrays.asList(cart, product));
+        project.setPageDesigns(Arrays.asList(businessBlockPageDesign()));
+        return project;
+    }
+
+    private FrontProjectPageDesign businessBlockPageDesign() {
+        FrontProjectPageDesign design = pageDesign("cart_page", "shop_cart",
+                "{\"canvas\":\"business-blocks-v1\",\"blocks\":[{\"id\":\"cart_001\",\"blockCode\":\"cart\",\"config\":{"
+                        + "\"cartTable\":\"shop_cart\","
+                        + "\"productTable\":\"shop_product\","
+                        + "\"cartProductId\":\"product_id\","
+                        + "\"productId\":\"id\","
+                        + "\"productName\":\"name\","
+                        + "\"price\":\"price\","
+                        + "\"quantity\":\"quantity\","
+                        + "\"userId\":\"user_id\","
+                        + "\"stock\":\"stock\""
+                        + "}}]}");
+        design.setPageName("Cart");
+        design.setPageType("business_block");
+        design.setRoutePath("/cart");
+        return design;
+    }
+
+    private GenTableColumn column(Long tableId, String columnName, String javaField) {
+        GenTableColumn column = new GenTableColumn();
+        column.setTableId(tableId);
+        column.setColumnName(columnName);
+        column.setColumnType("varchar");
+        column.setJavaType("String");
+        column.setJavaField(javaField);
+        column.setIsPk("0");
+        return column;
+    }
+
+    private GeneratedBusinessBlockFile findBusinessBlockPath(List<GeneratedBusinessBlockFile> files, String outputPath) {
+        for (GeneratedBusinessBlockFile file : files) {
+            if (outputPath.equals(file.getOutputPath())) {
+                return file;
+            }
+        }
+        throw new AssertionError("Missing business block file: " + outputPath);
+    }
+
+    private Set<String> structurePaths(List<Map<String, Object>> structure) {
+        Set<String> paths = new HashSet<String>();
+        collectStructurePaths(paths, "", structure);
+        return paths;
+    }
+
+    @SuppressWarnings("unchecked")
+    private void collectStructurePaths(Set<String> paths, String prefix, List<Map<String, Object>> nodes) {
+        if (nodes == null) {
+            return;
+        }
+        for (Map<String, Object> node : nodes) {
+            String path = prefix.length() == 0 ? (String) node.get("name") : prefix + "/" + node.get("name");
+            if ("file".equals(node.get("type"))) {
+                paths.add(path);
+            }
+            collectStructurePaths(paths, path, (List<Map<String, Object>>) node.get("children"));
+        }
+    }
+
     private String readBusinessBlueprintSql() throws Exception {
         Path sqlPath = Paths.get("sql/business_blueprint_templates.sql");
         if (!Files.exists(sqlPath)) {
@@ -508,6 +1047,14 @@ public class GenProjectServiceImplTest {
         return new String(Files.readAllBytes(sqlPath), StandardCharsets.UTF_8);
     }
 
+    private String readQingControllerTemplate() throws Exception {
+        Path templatePath = Paths.get("ruoyi-generator/src/main/resources/qing/controller.java.vm");
+        if (!Files.exists(templatePath)) {
+            templatePath = Paths.get("src/main/resources/qing/controller.java.vm");
+        }
+        return new String(Files.readAllBytes(templatePath), StandardCharsets.UTF_8);
+    }
+
     private String extractTemplateSqlContent(String sql, String templateFileId) {
         String marker = "(" + templateFileId + ",";
         int rowStart = sql.indexOf(marker);
@@ -519,4 +1066,16 @@ public class GenProjectServiceImplTest {
         assertTrue("Template content end not found: " + templateFileId, contentEnd >= 0);
         return sql.substring(contentStart, contentEnd);
     }
+
+    private Set<String> zipEntries(byte[] data) throws IOException {
+        Set<String> entries = new HashSet<String>();
+        ZipInputStream zip = new ZipInputStream(new ByteArrayInputStream(data));
+        ZipEntry entry;
+        while ((entry = zip.getNextEntry()) != null) {
+            entries.add(entry.getName());
+            zip.closeEntry();
+        }
+        zip.close();
+        return entries;
+    }
 }
diff --git a/RuoYi-Vue/ruoyi-generator/src/test/java/com/ruoyi/generator/service/front/FrontendPageDesignServiceTest.java b/RuoYi-Vue/ruoyi-generator/src/test/java/com/ruoyi/generator/service/front/FrontendPageDesignServiceTest.java
new file mode 100644
index 0000000..a25e6e1
--- /dev/null
+++ b/RuoYi-Vue/ruoyi-generator/src/test/java/com/ruoyi/generator/service/front/FrontendPageDesignServiceTest.java
@@ -0,0 +1,564 @@
+package com.ruoyi.generator.service.front;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.lang.reflect.Field;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.generator.domain.front.FrontProject;
+import com.ruoyi.generator.domain.front.FrontProjectColumn;
+import com.ruoyi.generator.domain.front.FrontProjectPageDesign;
+import com.ruoyi.generator.domain.front.FrontProjectTable;
+import com.ruoyi.generator.domain.front.dto.FrontendPageDesignInitResponse;
+import com.ruoyi.generator.domain.front.dto.FrontendPageDesignRequest;
+import com.ruoyi.generator.domain.front.dto.FrontendPageDesignResponse;
+import com.ruoyi.generator.mapper.front.FrontProjectColumnMapper;
+import com.ruoyi.generator.mapper.front.FrontProjectPageDesignMapper;
+import com.ruoyi.generator.mapper.front.FrontProjectTableMapper;
+
+public class FrontendPageDesignServiceTest
+{
+    private FrontendPageDesignService service;
+
+    @Mock
+    private IFrontProjectService frontProjectService;
+    @Mock
+    private FrontProjectPageDesignMapper pageDesignMapper;
+    @Mock
+    private FrontProjectTableMapper frontProjectTableMapper;
+    @Mock
+    private FrontProjectColumnMapper frontProjectColumnMapper;
+
+    @Before
+    public void setUp() throws Exception
+    {
+        MockitoAnnotations.initMocks(this);
+        service = new FrontendPageDesignService();
+        setField("frontProjectService", frontProjectService);
+        setField("pageDesignMapper", pageDesignMapper);
+        setField("frontProjectTableMapper", frontProjectTableMapper);
+        setField("frontProjectColumnMapper", frontProjectColumnMapper);
+        setField("businessBlockRegistryService", new BusinessBlockRegistryService());
+    }
+
+    @Test
+    public void initializeCreatesMissingDesignFromFrontendPages()
+    {
+        when(frontProjectService.getProject(7L, 10L)).thenReturn(project());
+        when(pageDesignMapper.selectDesignsByProjectId(10L)).thenReturn(Collections.<FrontProjectPageDesign>emptyList());
+        when(frontProjectTableMapper.selectTablesByProjectId(10L)).thenReturn(Collections.singletonList(bookTable()));
+        when(frontProjectColumnMapper.selectColumnsByTableId(99L)).thenReturn(Arrays.asList(column("title", "title", "1", "1", "1"),
+                column("status", "status", "1", "1", "1")));
+
+        FrontendPageDesignInitResponse response = service.initializePageDesigns(7L, 10L);
+
+        List<FrontendPageDesignResponse> designs = response.getDesigns();
+        assertEquals(1, designs.size());
+        assertEquals("book_catalog_page", designs.get(0).getPageCode());
+        assertTrue(designs.get(0).getLayoutJson().contains("\"type\":\"query\""));
+        assertTrue(designs.get(0).getLayoutJson().contains("\"title\""));
+        verify(pageDesignMapper).insertFrontProjectPageDesign(any(FrontProjectPageDesign.class));
+    }
+
+    @Test
+    public void initializeAdminDesignsMergesAdminMenusAndTables()
+    {
+        when(frontProjectService.getProject(7L, 10L)).thenReturn(projectWithAdminMenu());
+        when(pageDesignMapper.selectDesignsByProjectId(10L)).thenReturn(Collections.<FrontProjectPageDesign>emptyList());
+        FrontProjectTable bookTable = bookTable();
+        bookTable.setAdminMenuName("Book Admin");
+        FrontProjectTable customerTable = customerTable();
+        when(frontProjectTableMapper.selectTablesByProjectId(10L)).thenReturn(Arrays.asList(bookTable, customerTable));
+        when(frontProjectColumnMapper.selectColumnsByTableId(99L)).thenReturn(Arrays.asList(column("title", "title", "1", "1", "1")));
+        when(frontProjectColumnMapper.selectColumnsByTableId(100L)).thenReturn(Arrays.asList(column("customer_name", "customerName", "1", "1", "1")));
+
+        FrontendPageDesignInitResponse response = service.initializePageDesigns(7L, 10L, "admin");
+
+        List<FrontendPageDesignResponse> designs = response.getDesigns();
+        assertEquals(2, designs.size());
+        assertEquals("admin", designs.get(0).getPageScope());
+        assertEquals("book_admin", designs.get(0).getPageCode());
+        assertEquals("book_info", designs.get(0).getTableName());
+        assertEquals("admin_customer_info", designs.get(1).getPageCode());
+        assertEquals("customer_info", designs.get(1).getTableName());
+        assertTrue(designs.get(1).getLayoutJson().contains("\"canvas\":\"admin-list-v1\""));
+    }
+
+    @Test
+    public void createPageDesignPersistsNewFrontendPage()
+    {
+        when(frontProjectService.getProject(7L, 10L)).thenReturn(project());
+        when(pageDesignMapper.selectDesignsByProjectIdAndScope(10L, "frontend"))
+                .thenReturn(Collections.<FrontProjectPageDesign>emptyList());
+        when(frontProjectTableMapper.selectTablesByProjectId(10L)).thenReturn(Collections.singletonList(bookTable()));
+        when(frontProjectColumnMapper.selectColumnsByTableId(99L)).thenReturn(Arrays.asList(
+                column("book_title", "bookTitle", "1", "1", "1"),
+                column("author", "author", "0", "1", "1")));
+        FrontendPageDesignRequest request = new FrontendPageDesignRequest();
+        request.setPageCode("custom_books");
+        request.setPageName("Custom Books");
+        request.setRoutePath("/custom-books");
+        request.setPageType("list");
+        request.setTableName("book_info");
+
+        service.createPageDesign(7L, 10L, request, "frontend");
+
+        ArgumentCaptor<FrontProjectPageDesign> captor = ArgumentCaptor.forClass(FrontProjectPageDesign.class);
+        verify(pageDesignMapper).insertFrontProjectPageDesign(captor.capture());
+        assertEquals("frontend", captor.getValue().getPageScope());
+        assertEquals("custom_books", captor.getValue().getPageCode());
+        assertEquals("custom_books", captor.getValue().getMenuCode());
+        assertEquals(Integer.valueOf(1), captor.getValue().getVersion());
+        assertTrue(captor.getValue().getLayoutJson().contains("\"canvas\":\"frontend-list-v1\""));
+        assertTrue(captor.getValue().getLayoutJson().contains("bookTitle"));
+    }
+
+    @Test
+    public void deletePageDesignRemovesOwnedDesign()
+    {
+        FrontProjectPageDesign current = currentDesign();
+        when(frontProjectService.getProject(7L, 10L)).thenReturn(project());
+        when(pageDesignMapper.selectFrontProjectPageDesignById(88L)).thenReturn(current);
+
+        service.deletePageDesign(7L, 10L, 88L, "frontend");
+
+        verify(pageDesignMapper).deleteFrontProjectPageDesignById(88L);
+    }
+
+    @Test
+    public void updateRejectsUnknownLayoutField()
+    {
+        FrontProjectPageDesign current = currentDesign();
+        when(frontProjectService.getProject(7L, 10L)).thenReturn(project());
+        when(pageDesignMapper.selectFrontProjectPageDesignById(88L)).thenReturn(current);
+        when(frontProjectTableMapper.selectTablesByProjectId(10L)).thenReturn(Collections.singletonList(bookTable()));
+        when(frontProjectColumnMapper.selectColumnsByTableId(99L)).thenReturn(Collections.singletonList(column("title", "title", "1", "1", "1")));
+        FrontendPageDesignRequest request = new FrontendPageDesignRequest();
+        request.setVersion(1);
+        request.setLayoutJson("{\"regions\":[{\"id\":\"table\",\"type\":\"table\",\"fields\":[\"missingField\"]}]}");
+        request.setActionJson("{\"toolbarActions\":[],\"rowActions\":[]}");
+
+        ServiceException exception = expectServiceException(new ThrowingRunnable()
+        {
+            @Override
+            public void run()
+            {
+                service.updatePageDesign(7L, 10L, 88L, request);
+            }
+        });
+
+        assertTrue(exception.getMessage().contains("missingField"));
+    }
+
+    @Test
+    public void updatePersistsValidLayoutAndIncrementsVersion()
+    {
+        FrontProjectPageDesign current = currentDesign();
+        when(frontProjectService.getProject(7L, 10L)).thenReturn(project());
+        when(pageDesignMapper.selectFrontProjectPageDesignById(88L)).thenReturn(current);
+        when(frontProjectTableMapper.selectTablesByProjectId(10L)).thenReturn(Collections.singletonList(bookTable()));
+        when(frontProjectColumnMapper.selectColumnsByTableId(99L)).thenReturn(Arrays.asList(column("book_title", "bookTitle", "1", "1", "1")));
+        FrontendPageDesignRequest request = new FrontendPageDesignRequest();
+        request.setVersion(1);
+        request.setPageName("Books");
+        request.setRoutePath("/books");
+        request.setPageType("list");
+        request.setTableName("book_info");
+        request.setLayoutJson("{\"regions\":[{\"id\":\"table\",\"type\":\"table\",\"fields\":[\"book_title\"]}]}");
+        request.setActionJson("{\"toolbarActions\":[{\"code\":\"create\"}],\"rowActions\":[{\"code\":\"view\"}]}");
+
+        service.updatePageDesign(7L, 10L, 88L, request);
+
+        ArgumentCaptor<FrontProjectPageDesign> captor = ArgumentCaptor.forClass(FrontProjectPageDesign.class);
+        verify(pageDesignMapper).updateFrontProjectPageDesign(captor.capture());
+        assertEquals(Long.valueOf(88L), captor.getValue().getDesignId());
+        assertEquals(Integer.valueOf(2), captor.getValue().getVersion());
+        assertTrue(captor.getValue().getLayoutJson().contains("bookTitle"));
+    }
+
+    @Test
+    public void updateRejectsDisabledBuiltinLayoutAction()
+    {
+        FrontProjectPageDesign current = currentDesign();
+        FrontProjectTable table = bookTable();
+        table.setAllowRemove("0");
+        when(frontProjectService.getProject(7L, 10L)).thenReturn(project());
+        when(pageDesignMapper.selectFrontProjectPageDesignById(88L)).thenReturn(current);
+        when(frontProjectTableMapper.selectTablesByProjectId(10L)).thenReturn(Collections.singletonList(table));
+        when(frontProjectColumnMapper.selectColumnsByTableId(99L)).thenReturn(Collections.singletonList(column("book_title", "bookTitle", "1", "1", "1")));
+        FrontendPageDesignRequest request = new FrontendPageDesignRequest();
+        request.setVersion(1);
+        request.setPageType("list");
+        request.setTableName("book_info");
+        request.setLayoutJson("{\"regions\":[{\"id\":\"table\",\"type\":\"table\",\"fields\":[\"book_title\"],\"rowActions\":[\"delete\"]}]}");
+        request.setActionJson("{\"toolbarActions\":[],\"rowActions\":[]}");
+
+        ServiceException exception = expectServiceException(new ThrowingRunnable()
+        {
+            @Override
+            public void run()
+            {
+                service.updatePageDesign(7L, 10L, 88L, request);
+            }
+        });
+
+        assertTrue(exception.getMessage().contains("delete"));
+    }
+
+    @Test
+    public void updateRejectsDisabledBuiltinActionJson()
+    {
+        FrontProjectPageDesign current = currentDesign();
+        FrontProjectTable table = bookTable();
+        table.setAllowAdd("0");
+        when(frontProjectService.getProject(7L, 10L)).thenReturn(project());
+        when(pageDesignMapper.selectFrontProjectPageDesignById(88L)).thenReturn(current);
+        when(frontProjectTableMapper.selectTablesByProjectId(10L)).thenReturn(Collections.singletonList(table));
+        when(frontProjectColumnMapper.selectColumnsByTableId(99L)).thenReturn(Collections.singletonList(column("book_title", "bookTitle", "1", "1", "1")));
+        FrontendPageDesignRequest request = new FrontendPageDesignRequest();
+        request.setVersion(1);
+        request.setPageType("list");
+        request.setTableName("book_info");
+        request.setLayoutJson("{\"regions\":[{\"id\":\"table\",\"type\":\"table\",\"fields\":[\"book_title\"],\"rowActions\":[]}]}");
+        request.setActionJson("{\"toolbarActions\":[{\"code\":\"create\"}],\"rowActions\":[]}");
+
+        ServiceException exception = expectServiceException(new ThrowingRunnable()
+        {
+            @Override
+            public void run()
+            {
+                service.updatePageDesign(7L, 10L, 88L, request);
+            }
+        });
+
+        assertTrue(exception.getMessage().contains("create"));
+    }
+
+    @Test
+    public void updateRejectsLayoutCanvasOutsidePageType()
+    {
+        FrontProjectPageDesign current = currentDesign();
+        when(frontProjectService.getProject(7L, 10L)).thenReturn(project());
+        when(pageDesignMapper.selectFrontProjectPageDesignById(88L)).thenReturn(current);
+        when(frontProjectTableMapper.selectTablesByProjectId(10L)).thenReturn(Collections.singletonList(bookTable()));
+        when(frontProjectColumnMapper.selectColumnsByTableId(99L)).thenReturn(Collections.singletonList(column("book_title", "bookTitle", "1", "1", "1")));
+        FrontendPageDesignRequest request = new FrontendPageDesignRequest();
+        request.setVersion(1);
+        request.setPageType("list");
+        request.setLayoutJson("{\"canvas\":\"frontend-form-group-v1\",\"regions\":[{\"id\":\"table\",\"type\":\"table\",\"fields\":[\"bookTitle\"]}]}");
+        request.setActionJson("{\"toolbarActions\":[],\"rowActions\":[]}");
+
+        ServiceException exception = expectServiceException(new ThrowingRunnable()
+        {
+            @Override
+            public void run()
+            {
+                service.updatePageDesign(7L, 10L, 88L, request);
+            }
+        });
+
+        assertTrue(exception.getMessage().contains("布局"));
+    }
+
+    @Test
+    public void updatePersistsLayoutCanvasForMatchingPageType()
+    {
+        FrontProjectPageDesign current = currentDesign();
+        when(frontProjectService.getProject(7L, 10L)).thenReturn(project());
+        when(pageDesignMapper.selectFrontProjectPageDesignById(88L)).thenReturn(current);
+        when(frontProjectTableMapper.selectTablesByProjectId(10L)).thenReturn(Collections.singletonList(bookTable()));
+        when(frontProjectColumnMapper.selectColumnsByTableId(99L)).thenReturn(Collections.singletonList(column("book_title", "bookTitle", "1", "1", "1")));
+        FrontendPageDesignRequest request = new FrontendPageDesignRequest();
+        request.setVersion(1);
+        request.setPageType("list");
+        request.setLayoutJson("{\"canvas\":\"frontend-list-card-v1\",\"regions\":[{\"id\":\"table\",\"type\":\"table\",\"fields\":[\"book_title\"]}]}");
+        request.setActionJson("{\"toolbarActions\":[],\"rowActions\":[]}");
+
+        service.updatePageDesign(7L, 10L, 88L, request);
+
+        ArgumentCaptor<FrontProjectPageDesign> captor = ArgumentCaptor.forClass(FrontProjectPageDesign.class);
+        verify(pageDesignMapper).updateFrontProjectPageDesign(captor.capture());
+        assertTrue(captor.getValue().getLayoutJson().contains("\"canvas\":\"frontend-list-card-v1\""));
+        assertTrue(captor.getValue().getLayoutJson().contains("bookTitle"));
+    }
+
+    @Test
+    public void updateNormalizesCardRegionFieldsAndImageField()
+    {
+        FrontProjectPageDesign current = currentDesign();
+        when(frontProjectService.getProject(7L, 10L)).thenReturn(project());
+        when(pageDesignMapper.selectFrontProjectPageDesignById(88L)).thenReturn(current);
+        when(frontProjectTableMapper.selectTablesByProjectId(10L)).thenReturn(Collections.singletonList(bookTable()));
+        when(frontProjectColumnMapper.selectColumnsByTableId(99L)).thenReturn(Arrays.asList(
+                column("book_title", "bookTitle", "1", "1", "1"),
+                column("cover_url", "coverUrl", "0", "1", "1")));
+        FrontendPageDesignRequest request = new FrontendPageDesignRequest();
+        request.setVersion(1);
+        request.setPageType("list");
+        request.setLayoutJson("{\"canvas\":\"frontend-list-card-v1\",\"regions\":["
+                + "{\"id\":\"query\",\"type\":\"query\",\"visible\":false,\"fields\":[\"book_title\"]},"
+                + "{\"id\":\"card\",\"type\":\"cardList\",\"titleField\":\"book_title\",\"imageField\":\"cover_url\",\"fields\":[\"book_title\"]},"
+                + "{\"id\":\"cardActions\",\"type\":\"actions\",\"actions\":[\"edit\"]}"
+                + "]}");
+        request.setActionJson("{\"toolbarActions\":[],\"rowActions\":[{\"code\":\"edit\"}]}");
+
+        service.updatePageDesign(7L, 10L, 88L, request);
+
+        ArgumentCaptor<FrontProjectPageDesign> captor = ArgumentCaptor.forClass(FrontProjectPageDesign.class);
+        verify(pageDesignMapper).updateFrontProjectPageDesign(captor.capture());
+        assertTrue(captor.getValue().getLayoutJson().contains("\"titleField\":\"bookTitle\""));
+        assertTrue(captor.getValue().getLayoutJson().contains("\"imageField\":\"coverUrl\""));
+        assertTrue(captor.getValue().getLayoutJson().contains("\"visible\":false"));
+    }
+
+    @Test
+    public void updatePersistsValidBusinessBlockLayout()
+    {
+        FrontProjectPageDesign current = currentBusinessBlockDesign();
+        when(frontProjectService.getProject(7L, 10L)).thenReturn(project());
+        when(pageDesignMapper.selectFrontProjectPageDesignById(88L)).thenReturn(current);
+        when(frontProjectTableMapper.selectTablesByProjectId(10L)).thenReturn(Arrays.asList(cartTable(), productTable()));
+        when(frontProjectColumnMapper.selectColumnsByTableId(201L)).thenReturn(Arrays.asList(
+                column("id", "id", "0", "1", "1"),
+                column("product_id", "productId", "0", "1", "1"),
+                column("quantity", "quantity", "0", "1", "1"),
+                column("user_id", "userId", "0", "1", "1")));
+        when(frontProjectColumnMapper.selectColumnsByTableId(202L)).thenReturn(Arrays.asList(
+                column("id", "id", "0", "1", "1"),
+                column("name", "name", "0", "1", "1"),
+                column("price", "price", "0", "1", "1"),
+                column("stock", "stock", "0", "1", "1")));
+        FrontendPageDesignRequest request = businessBlockRequest(validBusinessBlockLayout());
+
+        service.updatePageDesign(7L, 10L, 88L, request);
+
+        ArgumentCaptor<FrontProjectPageDesign> captor = ArgumentCaptor.forClass(FrontProjectPageDesign.class);
+        verify(pageDesignMapper).updateFrontProjectPageDesign(captor.capture());
+        assertTrue(captor.getValue().getLayoutJson().contains("\"canvas\":\"business-blocks-v1\""));
+        assertTrue(captor.getValue().getLayoutJson().contains("\"blockCode\":\"cart\""));
+    }
+
+    @Test
+    public void updateRejectsBusinessBlockMissingRequiredConfig()
+    {
+        ServiceException exception = expectBusinessBlockUpdateFailure("{\"canvas\":\"business-blocks-v1\",\"blocks\":[{\"id\":\"cart_001\",\"blockCode\":\"cart\",\"config\":{\"productTable\":\"shop_product\"}}]}");
+
+        assertTrue(exception.getMessage().contains("cartTable"));
+    }
+
+    @Test
+    public void updateRejectsBusinessBlockUnknownTable()
+    {
+        String layout = validBusinessBlockLayout().replace("\"shop_cart\"", "\"missing_cart\"");
+
+        ServiceException exception = expectBusinessBlockUpdateFailure(layout);
+
+        assertTrue(exception.getMessage().contains("missing_cart"));
+    }
+
+    @Test
+    public void updateRejectsBusinessBlockUnknownField()
+    {
+        String layout = validBusinessBlockLayout().replace("\"name\"", "\"missing_name\"");
+
+        ServiceException exception = expectBusinessBlockUpdateFailure(layout);
+
+        assertTrue(exception.getMessage().contains("missing_name"));
+    }
+
+    private void setField(String name, Object value) throws Exception
+    {
+        Field field = FrontendPageDesignService.class.getDeclaredField(name);
+        field.setAccessible(true);
+        field.set(service, value);
+    }
+
+    private FrontProject project()
+    {
+        FrontProject project = new FrontProject();
+        project.setProjectId(10L);
+        project.setUserId(7L);
+        project.setAppBlueprint("{\"frontendPages\":[{\"code\":\"book_catalog_page\",\"name\":\"Book Catalog\",\"menuCode\":\"book_catalog\",\"path\":\"/books\",\"pageType\":\"list\",\"tableName\":\"book_info\"}]}");
+        return project;
+    }
+
+    private FrontProject projectWithAdminMenu()
+    {
+        FrontProject project = new FrontProject();
+        project.setProjectId(10L);
+        project.setUserId(7L);
+        project.setAppBlueprint("{\"adminMenus\":[{\"code\":\"book_admin\",\"name\":\"Book Admin\",\"path\":\"/admin/books\",\"requiresLogin\":true,\"visibleRoles\":[\"admin\"],\"dataScope\":\"ROLE\"}]}");
+        return project;
+    }
+
+    private FrontProjectTable bookTable()
+    {
+        FrontProjectTable table = new FrontProjectTable();
+        table.setTableId(99L);
+        table.setProjectId(10L);
+        table.setTableName("book_info");
+        table.setAllowAdd("1");
+        table.setAllowEdit("1");
+        table.setAllowRemove("1");
+        return table;
+    }
+
+    private FrontProjectTable customerTable()
+    {
+        FrontProjectTable table = new FrontProjectTable();
+        table.setTableId(100L);
+        table.setProjectId(10L);
+        table.setTableName("customer_info");
+        table.setTableComment("Customer info");
+        table.setAdminMenuName("Customer Management");
+        table.setAllowAdd("1");
+        table.setAllowEdit("1");
+        table.setAllowRemove("1");
+        return table;
+    }
+
+    private FrontProjectTable cartTable()
+    {
+        FrontProjectTable table = new FrontProjectTable();
+        table.setTableId(201L);
+        table.setProjectId(10L);
+        table.setTableName("shop_cart");
+        table.setAllowAdd("1");
+        table.setAllowEdit("1");
+        table.setAllowRemove("1");
+        return table;
+    }
+
+    private FrontProjectTable productTable()
+    {
+        FrontProjectTable table = new FrontProjectTable();
+        table.setTableId(202L);
+        table.setProjectId(10L);
+        table.setTableName("shop_product");
+        table.setAllowAdd("1");
+        table.setAllowEdit("1");
+        table.setAllowRemove("1");
+        return table;
+    }
+
+    private FrontProjectColumn column(String columnName, String javaField, String isQuery, String isList, String isEdit)
+    {
+        FrontProjectColumn column = new FrontProjectColumn();
+        column.setColumnName(columnName);
+        column.setJavaField(javaField);
+        column.setIsQuery(isQuery);
+        column.setIsList(isList);
+        column.setIsEdit(isEdit);
+        column.setIsInsert(isEdit);
+        return column;
+    }
+
+    private FrontProjectPageDesign currentDesign()
+    {
+        FrontProjectPageDesign design = new FrontProjectPageDesign();
+        design.setDesignId(88L);
+        design.setProjectId(10L);
+        design.setUserId(7L);
+        design.setPageCode("book_catalog_page");
+        design.setPageScope("frontend");
+        design.setPageName("Book Catalog");
+        design.setRoutePath("/books");
+        design.setPageType("list");
+        design.setTableName("book_info");
+        design.setVersion(1);
+        return design;
+    }
+
+    private FrontProjectPageDesign currentBusinessBlockDesign()
+    {
+        FrontProjectPageDesign design = currentDesign();
+        design.setPageType("business_block");
+        design.setTableName("shop_cart");
+        design.setLayoutJson("{\"canvas\":\"business-blocks-v1\",\"blocks\":[]}");
+        return design;
+    }
+
+    private FrontendPageDesignRequest businessBlockRequest(String layoutJson)
+    {
+        FrontendPageDesignRequest request = new FrontendPageDesignRequest();
+        request.setVersion(1);
+        request.setPageName("Cart");
+        request.setRoutePath("/cart");
+        request.setPageType("business_block");
+        request.setTableName("shop_cart");
+        request.setLayoutJson(layoutJson);
+        request.setActionJson("{\"toolbarActions\":[],\"rowActions\":[]}");
+        return request;
+    }
+
+    private String validBusinessBlockLayout()
+    {
+        return "{\"canvas\":\"business-blocks-v1\",\"blocks\":[{\"id\":\"cart_001\",\"blockCode\":\"cart\",\"config\":{"
+                + "\"cartTable\":\"shop_cart\","
+                + "\"productTable\":\"shop_product\","
+                + "\"cartProductId\":\"product_id\","
+                + "\"productId\":\"id\","
+                + "\"productName\":\"name\","
+                + "\"price\":\"price\","
+                + "\"quantity\":\"quantity\","
+                + "\"userId\":\"user_id\","
+                + "\"stock\":\"stock\""
+                + "}}]}";
+    }
+
+    private ServiceException expectBusinessBlockUpdateFailure(String layoutJson)
+    {
+        FrontProjectPageDesign current = currentBusinessBlockDesign();
+        when(frontProjectService.getProject(7L, 10L)).thenReturn(project());
+        when(pageDesignMapper.selectFrontProjectPageDesignById(88L)).thenReturn(current);
+        when(frontProjectTableMapper.selectTablesByProjectId(10L)).thenReturn(Arrays.asList(cartTable(), productTable()));
+        when(frontProjectColumnMapper.selectColumnsByTableId(201L)).thenReturn(Arrays.asList(
+                column("id", "id", "0", "1", "1"),
+                column("product_id", "productId", "0", "1", "1"),
+                column("quantity", "quantity", "0", "1", "1"),
+                column("user_id", "userId", "0", "1", "1")));
+        when(frontProjectColumnMapper.selectColumnsByTableId(202L)).thenReturn(Arrays.asList(
+                column("id", "id", "0", "1", "1"),
+                column("name", "name", "0", "1", "1"),
+                column("price", "price", "0", "1", "1"),
+                column("stock", "stock", "0", "1", "1")));
+        final FrontendPageDesignRequest request = businessBlockRequest(layoutJson);
+        return expectServiceException(new ThrowingRunnable()
+        {
+            @Override
+            public void run()
+            {
+                service.updatePageDesign(7L, 10L, 88L, request);
+            }
+        });
+    }
+
+    private ServiceException expectServiceException(ThrowingRunnable runnable)
+    {
+        try
+        {
+            runnable.run();
+        }
+        catch (ServiceException e)
+        {
+            return e;
+        }
+        throw new AssertionError("Expected ServiceException");
+    }
+
+    private interface ThrowingRunnable
+    {
+        void run();
+    }
+}
diff --git a/RuoYi-Vue/ruoyi-generator/src/test/java/com/ruoyi/generator/util/QingTemplateSupportTest.java b/RuoYi-Vue/ruoyi-generator/src/test/java/com/ruoyi/generator/util/QingTemplateSupportTest.java
new file mode 100644
index 0000000..357520f
--- /dev/null
+++ b/RuoYi-Vue/ruoyi-generator/src/test/java/com/ruoyi/generator/util/QingTemplateSupportTest.java
@@ -0,0 +1,1029 @@
+package com.ruoyi.generator.util;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import com.ruoyi.generator.domain.GenTable;
+import com.ruoyi.generator.domain.GenTableColumn;
+import com.ruoyi.generator.domain.GenProject;
+import com.ruoyi.generator.domain.front.FrontProjectPageDesign;
+import com.ruoyi.generator.domain.front.dto.AppMenuDesign;
+import com.ruoyi.generator.domain.front.dto.AppPageDesign;
+import com.ruoyi.generator.service.GenTableServiceImpl;
+import com.ruoyi.generator.service.GenProjectServiceImpl;
+import java.lang.reflect.Method;
+import java.io.StringWriter;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.apache.velocity.Template;
+import org.apache.velocity.VelocityContext;
+import org.apache.velocity.app.Velocity;
+import org.junit.Test;
+
+public class QingTemplateSupportTest
+{
+    @Test
+    public void qingTemplateListIncludesRunnableProjectFiles() throws Exception
+    {
+        List<String> templates = TemplateUtils.getTemplateList("crud", "/qing");
+
+        assertTrue(templates.contains("qing/pom.xml.vm"));
+        assertTrue(templates.contains("qing/application.yml.vm"));
+        assertTrue(templates.contains("qing/application.java.vm"));
+        assertTrue(templates.contains("qing/result.java.vm"));
+        assertTrue(templates.contains("qing/mybatisPlusConfig.java.vm"));
+        assertTrue(templates.contains("qing/adminUser.java.vm"));
+        assertTrue(templates.contains("qing/adminUserMapper.java.vm"));
+        assertTrue(templates.contains("qing/portalUser.java.vm"));
+        assertTrue(templates.contains("qing/portalUserMapper.java.vm"));
+        assertTrue(templates.contains("qing/portalAuthTokenStore.java.vm"));
+        assertTrue(templates.contains("qing/portalAuthInterceptor.java.vm"));
+        assertTrue(templates.contains("qing/adminAuthController.java.vm"));
+        assertTrue(templates.contains("qing/portalAuthController.java.vm"));
+        assertTrue(templates.contains("qing/sql.vm"));
+        assertTrue(templates.contains("qing/vue-package.json.vm"));
+        assertTrue(templates.contains("qing/vue-main.js.vm"));
+        assertTrue(templates.contains("qing/vue-request.js.vm"));
+        assertTrue(templates.contains("qing/index.vue.vm"));
+        assertTrue(templates.contains("qing/vue-login.vue.vm"));
+
+        Path resourceRoot = repoRoot().resolve("ruoyi-generator/src/main/resources");
+        for (String template : templates)
+        {
+            assertTrue("Missing qing template file: " + template, Files.exists(resourceRoot.resolve(template)));
+        }
+    }
+
+    @Test
+    public void qingTemplatesAllResolveRunnableOutputFileNames()
+    {
+        GenTable table = table();
+
+        for (String template : TemplateUtils.getTemplateList("crud", "/qing"))
+        {
+            String fileName = FileNameUtils.getFileName(template, table, "/qing");
+            assertFalse("Qing template should resolve output path: " + template, fileName.isEmpty());
+        }
+
+        assertEquals("pom.xml", FileNameUtils.getFileName("qing/pom.xml.vm", table, "/qing"));
+        assertEquals("src/main/resources/application.yml",
+                FileNameUtils.getFileName("qing/application.yml.vm", table, "/qing"));
+        assertEquals("src/main/java/com/example/demo/DemoProductApplication.java",
+                FileNameUtils.getFileName("qing/application.java.vm", table, "/qing"));
+        assertEquals("src/main/java/com/example/demo/entity/DemoProduct.java",
+                FileNameUtils.getFileName("qing/entity.java.vm", table, "/qing"));
+        assertEquals("src/main/java/com/example/demo/entity/AdminUser.java",
+                FileNameUtils.getFileName("qing/adminUser.java.vm", table, "/qing"));
+        assertEquals("src/main/java/com/example/demo/mapper/AdminUserMapper.java",
+                FileNameUtils.getFileName("qing/adminUserMapper.java.vm", table, "/qing"));
+        assertEquals("src/main/java/com/example/demo/entity/PortalUser.java",
+                FileNameUtils.getFileName("qing/portalUser.java.vm", table, "/qing"));
+        assertEquals("src/main/java/com/example/demo/mapper/PortalUserMapper.java",
+                FileNameUtils.getFileName("qing/portalUserMapper.java.vm", table, "/qing"));
+        assertEquals("src/main/java/com/example/demo/security/PortalAuthTokenStore.java",
+                FileNameUtils.getFileName("qing/portalAuthTokenStore.java.vm", table, "/qing"));
+        assertEquals("src/main/java/com/example/demo/security/PortalAuthInterceptor.java",
+                FileNameUtils.getFileName("qing/portalAuthInterceptor.java.vm", table, "/qing"));
+        assertEquals("src/main/java/com/example/demo/controller/AdminAuthController.java",
+                FileNameUtils.getFileName("qing/adminAuthController.java.vm", table, "/qing"));
+        assertEquals("src/main/java/com/example/demo/controller/PortalAuthController.java",
+                FileNameUtils.getFileName("qing/portalAuthController.java.vm", table, "/qing"));
+        assertEquals("vue/src/views/demo/product/index.vue",
+                FileNameUtils.getFileName("qing/index.vue.vm", table, "/qing"));
+        assertEquals("vue/src/views/login/index.vue",
+                FileNameUtils.getFileName("qing/vue-login.vue.vm", table, "/qing"));
+    }
+
+    @Test
+    public void qingDefaultGenerationPathDoesNotNestSrcTwice()
+    {
+        GenTable table = table();
+        table.setGenPath("/");
+
+        String path = GenTableServiceImpl.getGenPath(table, "qing/entity.java.vm", "/qing")
+                .replace('\\', '/');
+
+        assertTrue(path.endsWith("/src/main/java/com/example/demo/entity/DemoProduct.java"));
+        assertFalse(path.contains("/src/src/main/"));
+    }
+
+    @Test
+    public void qingControllerUsesGeneratedPackageContracts() throws Exception
+    {
+        String controllerTemplate = read(repoRoot().resolve(
+                "ruoyi-generator/src/main/resources/qing/controller.java.vm"));
+
+        assertFalse(controllerTemplate.contains("com.example.springboot"));
+        assertFalse(controllerTemplate.contains(".getId()"));
+        assertTrue(controllerTemplate.contains("${packageName}.common.Result"));
+        assertTrue(controllerTemplate.contains("@PathVariable ${pkColumn.javaType} ${pkColumn.javaField}"));
+        assertTrue(controllerTemplate.contains("${className}Service.saveOrUpdate(${className})"));
+    }
+
+    @Test
+    public void qingTemplatesRenderWithSampleCrudTable()
+    {
+        GenTable table = renderTable();
+        VelocityInitializer.initVelocity();
+        VelocityContext context = VelocityUtils.prepareContext(table);
+
+        for (String templateName : TemplateUtils.getTemplateList("crud", "/qing"))
+        {
+            Template template = Velocity.getTemplate(templateName, "UTF-8");
+            StringWriter writer = new StringWriter();
+            template.merge(context, writer);
+            String rendered = writer.toString();
+            assertFalse("Rendered template should not keep hard-coded demo package: " + templateName,
+                    rendered.contains("com.example.springboot"));
+            assertFalse("Rendered template should not contain raw Velocity literal marker: " + templateName,
+                    rendered.contains("#[["));
+            assertFalse("Rendered template should not contain raw Velocity literal marker: " + templateName,
+                    rendered.contains("]]#"));
+
+            if ("qing/vue-main.js.vm".equals(templateName))
+            {
+                assertTrue(rendered.contains("}).$mount(\"#app\")"));
+            }
+            if ("qing/vue-app.vue.vm".equals(templateName))
+            {
+                assertTrue(rendered.contains("class=\"portal-shell\""));
+                assertTrue(rendered.contains("class=\"hero-banner\""));
+                assertTrue(rendered.contains("localStorage.getItem(\"portal-user\")"));
+                assertTrue(rendered.contains("localStorage.removeItem(\"portal-token\")"));
+            }
+            if ("qing/vue-router.js.vm".equals(templateName))
+            {
+                assertTrue(rendered.contains("path: \"/login\""));
+                assertTrue(rendered.contains("meta: { requiresAuth: true }"));
+                assertTrue(rendered.contains("localStorage.getItem(\"portal-token\")"));
+            }
+            if ("qing/vue-request.js.vm".equals(templateName))
+            {
+                assertTrue(rendered.contains("Authorization"));
+                assertTrue(rendered.contains("portal-token"));
+                assertFalse(rendered.contains("portalLoggedIn"));
+            }
+            if ("qing/vue-login.vue.vm".equals(templateName))
+            {
+                assertTrue(rendered.contains("class=\"portal-login\""));
+                assertTrue(rendered.contains("username: \"user\""));
+                assertTrue(rendered.contains("password: \"123456\""));
+                assertTrue(rendered.contains("this.request.post(\"/auth/login\""));
+                assertTrue(rendered.contains("localStorage.setItem(\"portal-token\""));
+                assertTrue(rendered.contains("this.$router.push(redirect)"));
+            }
+            if ("qing/adminUser.java.vm".equals(templateName))
+            {
+                assertTrue(rendered.contains("@TableName(\"t_admin\")"));
+                assertTrue(rendered.contains("@TableId(value = \"admin_id\""));
+            }
+            if ("qing/portalUser.java.vm".equals(templateName))
+            {
+                assertTrue(rendered.contains("@TableName(\"t_user\")"));
+                assertTrue(rendered.contains("@TableId(value = \"user_id\""));
+            }
+            if ("qing/portalAuthTokenStore.java.vm".equals(templateName))
+            {
+                assertTrue(rendered.contains("Map<String, Object>"));
+                assertTrue(rendered.contains("getPortalUser"));
+                assertTrue(rendered.contains("getAdminUser"));
+            }
+            if ("qing/adminAuthController.java.vm".equals(templateName))
+            {
+                assertTrue(rendered.contains("@RequestMapping(\"/auth/admin\")"));
+                assertTrue(rendered.contains("AdminUserMapper"));
+                assertTrue(rendered.contains("tokenStore.issue"));
+            }
+            if ("qing/portalAuthController.java.vm".equals(templateName))
+            {
+                assertTrue(rendered.contains("@PostMapping(\"/login\")"));
+                assertTrue(rendered.contains("PortalUserMapper"));
+                assertTrue(rendered.contains("passwordHash"));
+                assertTrue(rendered.contains("tokenStore.issue"));
+                assertTrue(rendered.contains("tokenStore.getPortalUser"));
+            }
+            if ("qing/portalAuthInterceptor.java.vm".equals(templateName))
+            {
+                assertTrue(rendered.contains("Authorization"));
+                assertTrue(rendered.contains("Bearer "));
+                assertTrue(rendered.contains("response.setStatus(401)"));
+            }
+            if ("qing/corsConfig.java.vm".equals(templateName))
+            {
+                assertTrue(rendered.contains("addInterceptors"));
+                assertTrue(rendered.contains("PortalAuthInterceptor"));
+                assertTrue(rendered.contains("excludePathPatterns(\"/auth/login\""));
+                assertTrue(rendered.contains("\"/auth/admin/login\""));
+            }
+            if ("qing/sql.vm".equals(templateName))
+            {
+                assertTrue(rendered.contains("create table if not exists t_admin"));
+                assertTrue(rendered.contains("insert into t_admin"));
+                assertTrue(rendered.contains("select 'admin'"));
+                assertTrue(rendered.contains("where not exists (select 1 from t_admin where username = 'admin')"));
+                assertTrue(rendered.contains("create table if not exists t_user"));
+                assertTrue(rendered.contains("insert into t_user"));
+                assertTrue(rendered.contains("select 'user'"));
+                assertTrue(rendered.contains("where not exists (select 1 from t_user where username = 'user')"));
+                assertTrue(rendered.contains("password_hash"));
+                assertTrue(rendered.contains("8d969eef6ecad3c29a3a629280e686cf"));
+                assertFalse(rendered.contains("portal_user"));
+            }
+            if ("qing/index.vue.vm".equals(templateName))
+            {
+                assertTrue(rendered.contains("this.$refs.form.validate"));
+                assertTrue(rendered.contains("this.$message.success"));
+                assertTrue(rendered.contains("this.$set(this.form, field, res.data.url)"));
+            }
+        }
+    }
+
+    @Test
+    public void qingIndexTemplateRendersRemoteSelectConfiguration()
+    {
+        GenTable table = renderTable();
+        GenTableColumn category = column("category_id", "鍒嗙被", "Long", "categoryId",
+                "0", "1", "1", "1", "EQ", "select");
+        category.setDictType("remote:book_category:id:category_name");
+        List<GenTableColumn> columns = new ArrayList<GenTableColumn>(table.getColumns());
+        columns.add(category);
+        table.setColumns(columns);
+
+        VelocityInitializer.initVelocity();
+        String rendered = render("qing/index.vue.vm", VelocityUtils.prepareContext(table));
+
+        assertTrue(rendered.contains("remoteOptionMap: {}"));
+        assertTrue(rendered.contains("categoryId: {"));
+        assertTrue(rendered.contains("path: \"/demo/bookCategory/page\""));
+        assertTrue(rendered.contains("valueField: \"id\""));
+        assertTrue(rendered.contains("labelField: \"categoryName\""));
+        assertTrue(rendered.contains("v-for=\"item in getSelectOptions('categoryId')\""));
+        assertTrue(rendered.contains("{{ getOptionLabel('categoryId', scope.row.categoryId) }}"));
+    }
+
+    @Test
+    public void qingProjectTemplatesRenderWithSampleProject()
+    {
+        GenProject project = project();
+        VelocityInitializer.initVelocity();
+        VelocityContext context = VelocityUtils.prepareContextProject(project);
+
+        for (String templateName : Arrays.asList(
+                "qing/pom.xml.vm",
+                "qing/application.yml.vm",
+                "qing/application.java.vm",
+                "qing/readme.md.vm",
+                "qing/vue-index.html.vm"))
+        {
+            Template template = Velocity.getTemplate(templateName, "UTF-8");
+            StringWriter writer = new StringWriter();
+            template.merge(context, writer);
+            String rendered = writer.toString();
+
+            assertFalse("Rendered project template should not keep raw businessName placeholder: " + templateName,
+                    rendered.contains("${businessName}"));
+            assertFalse("Rendered project template should not keep raw BusinessName placeholder: " + templateName,
+                    rendered.contains("${BusinessName}"));
+            assertFalse("Rendered project template should not keep raw ClassName placeholder: " + templateName,
+                    rendered.contains("${ClassName}"));
+            assertFalse("Rendered project template should not keep raw functionName placeholder: " + templateName,
+                    rendered.contains("${functionName}"));
+
+            if ("qing/pom.xml.vm".equals(templateName))
+            {
+                assertTrue(rendered.contains("<artifactId>demo-app-service</artifactId>"));
+            }
+            if ("qing/application.yml.vm".equals(templateName))
+            {
+                assertTrue(rendered.contains("name: demo-app-service"));
+            }
+            if ("qing/application.java.vm".equals(templateName))
+            {
+                assertTrue(rendered.contains("public class DemoAppApplication"));
+            }
+            if ("qing/readme.md.vm".equals(templateName))
+            {
+                assertTrue(rendered.contains("# Demo App"));
+                assertTrue(rendered.contains("sql/demo-app.sql"));
+            }
+            if ("qing/vue-index.html.vm".equals(templateName))
+            {
+                assertTrue(rendered.contains("<title>Demo App</title>"));
+            }
+        }
+    }
+
+    @Test
+    public void qingPortalProjectTemplatesUseProjectNameAndFrontendMenus()
+    {
+        GenProject project = project();
+        project.setProjectName("Library Portal");
+        GenTable book = table();
+        book.setTableName("book");
+        book.setModuleName("system");
+        book.setBusinessName("book");
+        book.setClassName("Book");
+        book.setFunctionName("Book Catalog");
+        GenTable borrow = table();
+        borrow.setTableName("borrow_record");
+        borrow.setModuleName("system");
+        borrow.setBusinessName("borrowRecord");
+        borrow.setClassName("BorrowRecord");
+        borrow.setFunctionName("Borrow Records");
+        project.setTables(Arrays.asList(book, borrow));
+        project.setFrontendMenus(Arrays.asList(
+                menu("book_catalog", "Catalog", "/books", false),
+                menu("my_borrows", "My Borrows", "/my-borrows", true)));
+
+        VelocityInitializer.initVelocity();
+        VelocityContext context = VelocityUtils.prepareContextProject(project);
+
+        String app = render("qing/vue-app.vue.vm", context);
+        assertTrue(app.contains("Library Portal"));
+        assertTrue(app.contains("Catalog"));
+        assertTrue(app.contains("My Borrows"));
+        assertTrue(app.contains("to=\"/books\""));
+        assertTrue(app.contains("to=\"/my-borrows\""));
+        assertFalse(app.contains("游戏资源平台"));
+        assertFalse(app.contains("游戏攻略"));
+
+        String router = render("qing/vue-router.js.vm", context);
+        assertTrue(router.contains("redirect: \"/books\""));
+        assertTrue(router.contains("path: \"/books\""));
+        assertTrue(router.contains("path: \"/my-borrows\""));
+        assertTrue(router.contains("component: Book"));
+        assertTrue(router.contains("component: BorrowRecord"));
+        assertTrue(router.contains("meta: { requiresAuth: false }"));
+        assertTrue(router.contains("meta: { requiresAuth: true }"));
+
+        String login = render("qing/vue-login.vue.vm", context);
+        assertTrue(login.contains("Library Portal"));
+        assertFalse(login.contains("游戏资源平台"));
+    }
+
+    @Test
+    public void qingPortalRoutesBusinessBlockPagesToGeneratedPageComponent()
+    {
+        GenProject project = project();
+        GenTable cart = table();
+        cart.setTableName("shop_cart");
+        cart.setModuleName("shop");
+        cart.setBusinessName("cart");
+        cart.setClassName("ShopCart");
+        cart.setFunctionName("Cart");
+        project.setTables(Arrays.asList(cart));
+        AppMenuDesign cartMenu = menu("cart_menu", "Cart", "/cart", true);
+        cartMenu.setPageCode("cart_page");
+        project.setFrontendMenus(Arrays.asList(cartMenu));
+        AppPageDesign cartPage = new AppPageDesign();
+        cartPage.setCode("cart_page");
+        cartPage.setMenuCode("cart_menu");
+        cartPage.setName("Cart");
+        cartPage.setPath("/cart");
+        cartPage.setPageType("list");
+        cartPage.setTableName("shop_cart");
+        project.setFrontendPages(Arrays.asList(cartPage));
+        FrontProjectPageDesign cartDesign = new FrontProjectPageDesign();
+        cartDesign.setPageCode("cart_page");
+        cartDesign.setMenuCode("cart_menu");
+        cartDesign.setPageName("Cart");
+        cartDesign.setRoutePath("/cart");
+        cartDesign.setPageScope("frontend");
+        cartDesign.setPageType("business_block");
+        cartDesign.setTableName("shop_cart");
+        cartDesign.setLayoutJson("{\"canvas\":\"business-blocks-v1\",\"blocks\":[]}");
+        project.setPageDesigns(Arrays.asList(cartDesign));
+
+        VelocityInitializer.initVelocity();
+        VelocityContext context = VelocityUtils.prepareContextProject(project);
+
+        String router = render("qing/vue-router.js.vm", context);
+        assertTrue(router.contains("import CartPage from \"@/views/pages/cart_page/index.vue\""));
+        assertTrue(router.contains("path: \"/cart\""));
+        assertTrue(router.contains("component: CartPage"));
+    }
+
+    @Test
+    public void qingPortalUsesPageDesignNavigationToHideMenuAndKeepRoute()
+    {
+        GenProject project = project();
+        GenTable book = table();
+        book.setTableName("book_info");
+        book.setModuleName("library");
+        book.setBusinessName("book");
+        book.setClassName("Book");
+        book.setFunctionName("Books");
+        project.setTables(Arrays.asList(book));
+        AppMenuDesign menu = menu("book_catalog", "Catalog", "/books", true);
+        menu.setPageCode("book_catalog_page");
+        project.setFrontendMenus(Arrays.asList(menu));
+        AppPageDesign page = new AppPageDesign();
+        page.setCode("book_catalog_page");
+        page.setMenuCode("book_catalog");
+        page.setName("Books");
+        page.setPath("/books");
+        page.setPageType("list");
+        page.setTableName("book_info");
+        project.setFrontendPages(Arrays.asList(page));
+        FrontProjectPageDesign design = new FrontProjectPageDesign();
+        design.setPageCode("book_catalog_page");
+        design.setMenuCode("book_catalog");
+        design.setPageName("Books");
+        design.setRoutePath("/books");
+        design.setPageScope("frontend");
+        design.setPageType("list");
+        design.setTableName("book_info");
+        design.setLayoutJson("{\"navigation\":{\"showInMenu\":false},\"regions\":[]}");
+        project.setPageDesigns(Arrays.asList(design));
+
+        VelocityInitializer.initVelocity();
+        VelocityContext context = VelocityUtils.prepareContextProject(project);
+
+        String app = render("qing/vue-app.vue.vm", context);
+        assertFalse(app.contains("Catalog"));
+
+        String router = render("qing/vue-router.js.vm", context);
+        assertTrue(router.contains("import BookCatalogPage from \"@/views/pages/book_catalog_page/index.vue\""));
+        assertTrue(router.contains("path: \"/books\""));
+        assertTrue(router.contains("component: BookCatalogPage"));
+    }
+
+    @Test
+    public void qingPortalRoutesVisibleNormalPageDesignsToGeneratedPageComponent()
+    {
+        GenProject project = project();
+        GenTable book = table();
+        book.setTableName("book_info");
+        book.setModuleName("library");
+        book.setBusinessName("book");
+        book.setClassName("Book");
+        book.setFunctionName("Books");
+        project.setTables(Arrays.asList(book));
+        FrontProjectPageDesign design = new FrontProjectPageDesign();
+        design.setPageCode("book_catalog_page");
+        design.setMenuCode("book_catalog_page");
+        design.setPageName("Books");
+        design.setRoutePath("/books");
+        design.setPageScope("frontend");
+        design.setPageType("list");
+        design.setTableName("book_info");
+        design.setLayoutJson("{\"navigation\":{\"showInMenu\":true},\"regions\":[]}");
+        project.setPageDesigns(Arrays.asList(design));
+
+        VelocityInitializer.initVelocity();
+        VelocityContext context = VelocityUtils.prepareContextProject(project);
+
+        String app = render("qing/vue-app.vue.vm", context);
+        assertTrue(app.contains("to=\"/books\""));
+
+        String router = render("qing/vue-router.js.vm", context);
+        assertTrue(router.contains("import BookCatalogPage from \"@/views/pages/book_catalog_page/index.vue\""));
+        assertTrue(router.contains("component: BookCatalogPage"));
+    }
+
+    @Test
+    public void qingIndexTemplateUsesFrontendPageDesignFields()
+    {
+        GenTable table = renderTable();
+        GenProject project = project();
+        project.setTables(Arrays.asList(table));
+        FrontProjectPageDesign design = new FrontProjectPageDesign();
+        design.setPageCode("product_page");
+        design.setTableName("demo_product");
+        design.setLayoutJson("{\"regions\":["
+                + "{\"id\":\"query\",\"type\":\"query\",\"fields\":[\"productName\"]},"
+                + "{\"id\":\"toolbar\",\"type\":\"toolbar\",\"actions\":[\"create\"]},"
+                + "{\"id\":\"table\",\"type\":\"table\",\"fields\":[\"productName\"],\"rowActions\":[\"edit\"]},"
+                + "{\"id\":\"form\",\"type\":\"dialogForm\",\"fields\":[\"productName\"]}"
+                + "]}");
+        design.setActionJson("{\"toolbarActions\":[{\"code\":\"create\",\"label\":\"Create\",\"type\":\"primary\"}],"
+                + "\"rowActions\":[{\"code\":\"edit\",\"label\":\"Edit\",\"type\":\"primary\"}]}");
+        project.setPageDesigns(Arrays.asList(design));
+        VelocityInitializer.initVelocity();
+        VelocityContext context = VelocityUtils.prepareContext(table);
+        VelocityUtils.putPageDesignVelocityContext(context, project, table);
+
+        String rendered = render("qing/index.vue.vm", context);
+
+        assertTrue(rendered.contains("prop=\"productName\""));
+        assertFalse(rendered.contains("prop=\"productId\" label=\"ID\""));
+        assertTrue(rendered.contains("@click=\"handleAdd\""));
+        assertTrue(rendered.contains("@click=\"handleEdit(scope.row)\""));
+        assertFalse(rendered.contains("@confirm=\"del(scope.row.productId)\""));
+    }
+
+    @Test
+    public void qingIndexTemplateRendersDesignedViewAction()
+    {
+        GenTable table = renderTable();
+        GenProject project = project();
+        project.setTables(Arrays.asList(table));
+        FrontProjectPageDesign design = new FrontProjectPageDesign();
+        design.setPageCode("product_page");
+        design.setTableName("demo_product");
+        design.setLayoutJson("{\"regions\":["
+                + "{\"id\":\"table\",\"type\":\"table\",\"fields\":[\"productName\"],\"rowActions\":[\"view\"]},"
+                + "{\"id\":\"form\",\"type\":\"dialogForm\",\"fields\":[\"productName\"]}"
+                + "]}");
+        project.setPageDesigns(Arrays.asList(design));
+        VelocityInitializer.initVelocity();
+        VelocityContext context = VelocityUtils.prepareContext(table);
+        VelocityUtils.putPageDesignVelocityContext(context, project, table);
+
+        String rendered = render("qing/index.vue.vm", context);
+
+        assertTrue(rendered.contains("@click=\"handleView(scope.row)\""));
+        assertTrue(rendered.contains("viewing: false"));
+        assertTrue(rendered.contains("handleView(row)"));
+        assertTrue(rendered.contains(":disabled=\"viewing\""));
+    }
+
+    @Test
+    public void qingCurrentUserListAddsUserFilterFlagAndControllerFilter()
+    {
+        GenTable table = renderTable();
+        GenTableColumn userId = column("user_id", "用户ID", "Long", "userId", "0", "1", "1", "1", "EQ", "input");
+        List<GenTableColumn> columns = new ArrayList<GenTableColumn>(table.getColumns());
+        columns.add(userId);
+        table.setColumns(columns);
+        GenProject project = project();
+        project.setTables(Arrays.asList(table));
+        FrontProjectPageDesign design = new FrontProjectPageDesign();
+        design.setPageCode("my_products_page");
+        design.setPageType("current_user_list");
+        design.setTableName("demo_product");
+        design.setLayoutJson("{\"canvas\":\"frontend-current-user-list-v1\",\"regions\":["
+                + "{\"id\":\"table\",\"type\":\"table\",\"fields\":[\"productName\"],\"rowActions\":[\"view\"]}"
+                + "]}");
+        project.setPageDesigns(Arrays.asList(design));
+        VelocityInitializer.initVelocity();
+        VelocityContext context = VelocityUtils.prepareContext(table);
+        VelocityUtils.putPageDesignVelocityContext(context, project, table);
+
+        String page = render("qing/index.vue.vm", context);
+        assertTrue(page.contains("__currentUserOnly: true"));
+
+        String controller = render("qing/controller.java.vm", context);
+        assertTrue(controller.contains("PortalAuthTokenStore"));
+        assertTrue(controller.contains("HttpServletRequest request"));
+        assertTrue(controller.contains("queryWrapper.eq(\"user_id\", currentUser.getUserId())"));
+    }
+
+    @Test
+    public void qingIndexTemplateUsesCardLayoutFromFrontendPageDesign()
+    {
+        GenTable table = renderTable();
+        GenProject project = project();
+        project.setTables(Arrays.asList(table));
+        FrontProjectPageDesign design = new FrontProjectPageDesign();
+        design.setPageCode("product_page");
+        design.setPageType("list");
+        design.setTableName("demo_product");
+        design.setLayoutJson("{\"canvas\":\"frontend-list-card-v1\",\"regions\":["
+                + "{\"id\":\"query\",\"type\":\"query\",\"fields\":[\"productName\"]},"
+                + "{\"id\":\"toolbar\",\"type\":\"toolbar\",\"actions\":[\"create\"]},"
+                + "{\"id\":\"table\",\"type\":\"table\",\"fields\":[\"productName\"],\"rowActions\":[\"edit\",\"delete\"]},"
+                + "{\"id\":\"form\",\"type\":\"dialogForm\",\"fields\":[\"productName\"]}"
+                + "]}");
+        design.setActionJson("{\"toolbarActions\":[{\"code\":\"create\",\"label\":\"Create\",\"type\":\"primary\"}],"
+                + "\"rowActions\":[{\"code\":\"edit\",\"label\":\"Edit\",\"type\":\"primary\"},{\"code\":\"delete\",\"label\":\"Delete\",\"type\":\"danger\"}]}");
+        project.setPageDesigns(Arrays.asList(design));
+        VelocityInitializer.initVelocity();
+        VelocityContext context = VelocityUtils.prepareContext(table);
+        VelocityUtils.putPageDesignVelocityContext(context, project, table);
+
+        String rendered = render("qing/index.vue.vm", context);
+
+        assertEquals("frontend-list-card-v1", context.get("pageDesignCanvas"));
+        assertTrue(rendered.contains("class=\"resource-card-grid\""));
+        assertTrue(rendered.contains("class=\"resource-card-item\""));
+        assertFalse(rendered.contains("class=\"resource-table\""));
+        assertTrue(rendered.contains("@click=\"handleEdit(item)\""));
+        assertTrue(rendered.contains("@confirm=\"del(item.productId)\""));
+    }
+
+    @Test
+    public void qingIndexTemplateUsesCardRegionAndHiddenQueryFromFrontendPageDesign()
+    {
+        GenTable table = renderTable();
+        GenTableColumn cover = column("cover_url", "封面", "String", "coverUrl", "0", "1", "1", "1", "EQ", "imageUpload");
+        List<GenTableColumn> columns = new ArrayList<GenTableColumn>(table.getColumns());
+        columns.add(cover);
+        table.setColumns(columns);
+        GenProject project = project();
+        project.setTables(Arrays.asList(table));
+        FrontProjectPageDesign design = new FrontProjectPageDesign();
+        design.setPageCode("product_page");
+        design.setPageType("list");
+        design.setTableName("demo_product");
+        design.setLayoutJson("{\"canvas\":\"frontend-list-card-v1\",\"regions\":["
+                + "{\"id\":\"query\",\"type\":\"query\",\"visible\":false,\"fields\":[\"productName\"]},"
+                + "{\"id\":\"toolbar\",\"type\":\"toolbar\",\"actions\":[\"create\"]},"
+                + "{\"id\":\"card\",\"type\":\"cardList\",\"titleField\":\"productName\",\"imageField\":\"coverUrl\",\"fields\":[\"productName\"]},"
+                + "{\"id\":\"cardActions\",\"type\":\"actions\",\"actions\":[\"edit\"]},"
+                + "{\"id\":\"form\",\"type\":\"dialogForm\",\"fields\":[\"productName\"]}"
+                + "]}");
+        design.setActionJson("{\"toolbarActions\":[{\"code\":\"create\",\"label\":\"Create\",\"type\":\"primary\"}],"
+                + "\"rowActions\":[{\"code\":\"edit\",\"label\":\"Edit\",\"type\":\"primary\"}]}");
+        project.setPageDesigns(Arrays.asList(design));
+        VelocityInitializer.initVelocity();
+        VelocityContext context = VelocityUtils.prepareContext(table);
+        VelocityUtils.putPageDesignVelocityContext(context, project, table);
+
+        String rendered = render("qing/index.vue.vm", context);
+
+        assertEquals(false, context.get("pageDesignShowQuery"));
+        assertEquals(cover, context.get("pageDesignCardImageColumn"));
+        assertTrue(rendered.contains("class=\"resource-card-image\""));
+        assertTrue(rendered.contains(":src=\"item.coverUrl\""));
+        assertFalse(rendered.contains("class=\"filter-bar\""));
+        assertFalse(rendered.contains("productName: undefined"));
+        assertTrue(rendered.contains("@click=\"handleEdit(item)\""));
+    }
+
+    @Test
+    public void qingIndexTemplateKeepsExplicitCardEditWhenFormRegionHidden()
+    {
+        GenTable table = renderTable();
+        GenProject project = project();
+        project.setTables(Arrays.asList(table));
+        FrontProjectPageDesign design = new FrontProjectPageDesign();
+        design.setPageCode("product_page");
+        design.setPageType("list");
+        design.setTableName("demo_product");
+        design.setLayoutJson("{\"canvas\":\"frontend-list-card-v1\",\"regions\":["
+                + "{\"id\":\"card\",\"type\":\"cardList\",\"titleField\":\"productName\",\"fields\":[\"productName\"]},"
+                + "{\"id\":\"cardActions\",\"type\":\"actions\",\"actions\":[\"edit\",\"delete\"]},"
+                + "{\"id\":\"form\",\"type\":\"dialogForm\",\"visible\":false,\"fields\":[\"productName\"]}"
+                + "]}");
+        project.setPageDesigns(Arrays.asList(design));
+        VelocityInitializer.initVelocity();
+        VelocityContext context = VelocityUtils.prepareContext(table);
+        VelocityUtils.putPageDesignVelocityContext(context, project, table);
+
+        String rendered = render("qing/index.vue.vm", context);
+
+        assertEquals(false, context.get("pageDesignShowForm"));
+        assertTrue(rendered.contains("@click=\"handleEdit(item)\""));
+        assertTrue(rendered.contains("@confirm=\"del(item.productId)\""));
+        assertTrue(rendered.contains("<el-dialog"));
+    }
+
+    @Test
+    public void qingResourceTemplatesUseAssignedPorts() throws Exception
+    {
+        Path resourceRoot = repoRoot().resolve("ruoyi-generator/src/main/resources/qing");
+        String applicationYml = normalizeNewlines(read(resourceRoot.resolve("application.yml.vm")));
+        String vueConfig = normalizeNewlines(read(resourceRoot.resolve("vue-config.js.vm")));
+        String readme = normalizeNewlines(read(resourceRoot.resolve("readme.md.vm")));
+
+        assertTrue("Qing backend template should allow preview to override the port",
+                applicationYml.contains("server:\n  port: ${d}{SERVER_PORT:8080}"));
+        assertFalse("Qing backend template should not keep the old 9090 port",
+                applicationYml.contains("port: 9090"));
+
+        assertTrue("Qing admin frontend template should allow preview to override the port",
+                vueConfig.contains("const port = process.env.PORT || 8081"));
+        assertTrue("Qing frontend proxy should allow preview to override the backend URL",
+                vueConfig.contains("const apiBaseUrl = process.env.VUE_APP_API_BASE_URL || \"http://localhost:8080\""));
+        assertTrue("Qing frontend proxy should use the resolved backend URL",
+                vueConfig.contains("target: apiBaseUrl"));
+        assertFalse("Qing frontend proxy should not target the old backend port 9090",
+                vueConfig.contains("http://localhost:9090"));
+
+        assertTrue("Qing README should document backend port 8080",
+                readme.contains("http://localhost:8080"));
+        assertFalse("Qing README should not document the old backend port 9090",
+                readme.contains("http://localhost:9090"));
+    }
+
+    @Test
+    public void qingDatabaseScriptRegistersTemplateAndFiles() throws Exception
+    {
+        Path script = repoRoot().resolve("sql/qing_templates.sql");
+        assertTrue("qing template SQL script should exist", Files.exists(script));
+        String sql = read(script);
+
+        assertTrue(sql.contains("INSERT INTO sys_template"));
+        assertTrue(sql.contains("'Runnable Backend Template'"));
+        assertTrue(sql.contains("'Runnable Admin Frontend Template'"));
+        assertTrue(sql.contains("'Runnable Portal Frontend Template'"));
+        assertTrue(sql.contains("'/runnable/backend'"));
+        assertTrue(sql.contains("'/runnable/admin_frontend'"));
+        assertTrue(sql.contains("'/runnable/frontend'"));
+        assertTrue(sql.contains("'backend'"));
+        assertTrue(sql.contains("'admin_frontend'"));
+        assertTrue(sql.contains("'frontend'"));
+        assertTrue(sql.contains("INSERT INTO sys_template_file"));
+        assertTrue(sql.contains("INSERT INTO sys_project_structure"));
+        assertFalse("Database template file names and paths should not include qing/",
+                sql.contains("qing/"));
+
+        assertTrue(sql.contains("'Application.java.vm'"));
+        assertTrue(sql.contains("'Result.java.vm'"));
+        assertTrue(sql.contains("'MybatisPlusConfig.java.vm'"));
+        assertTrue(sql.contains("'FileController.java.vm'"));
+        assertTrue(sql.contains("'AdminUser.java.vm'"));
+        assertTrue(sql.contains("'AdminUserMapper.java.vm'"));
+        assertTrue(sql.contains("'PortalUser.java.vm'"));
+        assertTrue(sql.contains("'PortalUserMapper.java.vm'"));
+        assertTrue(sql.contains("'PortalAuthTokenStore.java.vm'"));
+        assertTrue(sql.contains("'PortalAuthInterceptor.java.vm'"));
+        assertTrue(sql.contains("'AdminAuthController.java.vm'"));
+        assertTrue(sql.contains("'PortalAuthController.java.vm'"));
+        assertTrue(sql.contains("create table if not exists t_admin"));
+        assertTrue(sql.contains("insert into t_admin"));
+        assertTrue(sql.contains("select ''admin''"));
+        assertTrue(sql.contains("where not exists (select 1 from t_admin where username = ''admin'')"));
+        assertTrue(sql.contains("create table if not exists t_user"));
+        assertTrue(sql.contains("insert into t_user"));
+        assertTrue(sql.contains("select ''user''"));
+        assertTrue(sql.contains("where not exists (select 1 from t_user where username = ''user'')"));
+        assertTrue(sql.contains("password_hash"));
+        assertFalse(sql.contains("portal_user"));
+        assertTrue(sql.contains("'entity.java.vm'"));
+        assertTrue(sql.contains("'controller.java.vm'"));
+        assertTrue(sql.contains("'mapper.xml.vm'"));
+        assertTrue(sql.contains("'package.json.vm'"));
+        assertTrue(sql.contains("'admin-main.js.vm'"));
+        assertTrue(sql.contains("'admin-router.js.vm'"));
+        assertTrue(sql.contains("'admin-login.vue.vm'"));
+        assertTrue(sql.contains("'admin-index.vue.vm'"));
+        assertTrue(sql.contains("class=\"admin-shell\""));
+        assertTrue(sql.contains("class=\"admin-sidebar\""));
+        assertTrue(sql.contains("path: \"/login\""));
+        assertTrue(sql.contains("this.request.post(\"/auth/admin/login\""));
+        assertTrue(sql.contains("localStorage.setItem(\"admin-token\""));
+        assertTrue(sql.contains("localStorage.getItem(\"admin-token\")"));
+        assertTrue(sql.contains("Authorization"));
+        assertTrue(sql.contains("this.request.post(\"/auth/admin/logout\""));
+        assertFalse(sql.contains("adminLoggedIn"));
+        assertTrue(sql.contains("欢迎登录${projectName}后台"));
+        assertTrue(sql.contains("'frontend-main.js.vm'"));
+        assertTrue(sql.contains("'frontend-router.js.vm'"));
+        assertTrue(sql.contains("'frontend-login.vue.vm'"));
+        assertTrue(sql.contains("'frontend-index.vue.vm'"));
+        assertTrue("Frontend SQL template should include page design context variables",
+                sql.contains("$hasCurrentFrontendPageDesign"));
+        assertTrue("Frontend SQL template should include card layout rendering",
+                sql.contains("resource-card-grid"));
+        assertTrue("Frontend SQL template should support hidden query regions",
+                sql.contains("$pageDesignShowQuery"));
+        assertTrue("Frontend SQL template should render page-designed business buttons",
+                sql.contains("handleBusinessAction"));
+        assertTrue("Frontend SQL template should serialize page-designed business actions",
+                sql.contains("businessActionMap"));
+        assertTrue(sql.contains("${projectName}"));
+        assertTrue(sql.contains("#foreach($item in $frontendNavItems)"));
+        assertTrue(sql.contains("frontendRouteItems"));
+        assertFalse(sql.contains("游戏资源平台"));
+        assertFalse(sql.contains("游戏攻略"));
+        assertTrue(sql.contains("class=\"portal-login\""));
+        assertTrue(sql.contains("this.request.post(\"/auth/login\""));
+        assertTrue(sql.contains("localStorage.setItem(\"portal-token\""));
+        assertTrue(sql.contains("'Vue2 + Element UI runnable portal frontend'"));
+        assertTrue(sql.contains("\"vue\": \"^2.6.14\""));
+        assertTrue(sql.contains("\"vue-router\": \"^3.6.5\""));
+        assertTrue(sql.contains("\"element-ui\": \"^2.15.14\""));
+        assertTrue(sql.contains("new Vue({"));
+        assertTrue(sql.contains("Vue.use(Router)"));
+        assertFalse(sql.contains("Vue3"));
+        assertFalse(sql.contains("vite.config.js"));
+        assertFalse(sql.contains("@vitejs/plugin-vue"));
+        assertFalse(sql.contains("createApp("));
+        assertFalse(sql.contains("createWebHashHistory"));
+        assertVueCli4ConfigCompatible(sql, "sql/qing_templates.sql");
+        assertRunnableTemplatePorts(sql, "sql/qing_templates.sql");
+
+        assertTrue(sql.contains("'{projectName}-backend'"));
+        assertTrue(sql.contains("'{projectName}-admin'"));
+        assertTrue(sql.contains("'{projectName}-web'"));
+        assertTrue(sql.contains("'{packagePath}'"));
+        assertTrue(sql.contains("'{businessName}.sql'"));
+        assertTrue(sql.contains("'{projectClassName}Application.java'"));
+        assertTrue(sql.contains("'index.vue'"));
+        assertFalse(sql.contains("'src/main/java/{packageName}/Application.java'"));
+        assertFalse(sql.contains("'src/views/{moduleName}/{businessName}/index.vue'"));
+        assertProjectStructureNodeNamesFitSchema(sql);
+        assertTrue("SQL should escape template backslashes for MySQL string literals",
+                sql.contains("filename=\\\\\""));
+
+        String dbSql = read(repoRoot().resolve("sql/db.sql"));
+        assertTrue("db.sql should include runnable backend template",
+                dbSql.contains("'Runnable Backend Template'"));
+        assertTrue("db.sql should include runnable admin frontend template",
+                dbSql.contains("'Runnable Admin Frontend Template'"));
+        assertTrue("db.sql should include runnable portal frontend template",
+                dbSql.contains("'Runnable Portal Frontend Template'"));
+        assertTrue("db.sql should include Vue2 portal frontend template",
+                dbSql.contains("'Vue2 + Element UI runnable portal frontend'"));
+        assertTrue("db.sql should include runnable portal login template",
+                dbSql.contains("'frontend-login.vue.vm'"));
+        assertTrue("db.sql should include page design-aware frontend template",
+                dbSql.contains("$hasCurrentFrontendPageDesign"));
+        assertTrue("db.sql should include card layout frontend template",
+                dbSql.contains("resource-card-grid"));
+        assertTrue("db.sql should include page-designed business buttons",
+                dbSql.contains("handleBusinessAction"));
+        assertTrue("db.sql should include runnable portal auth backend",
+                dbSql.contains("'PortalAuthController.java.vm'"));
+        assertTrue("db.sql should include fixed admin table",
+                dbSql.contains("create table if not exists t_admin"));
+        assertTrue("db.sql should include default admin account",
+                dbSql.contains("select ''admin''"));
+        assertTrue("db.sql should seed admin only when missing",
+                dbSql.contains("where not exists (select 1 from t_admin where username = ''admin'')"));
+        assertTrue("db.sql should include portal user auth table",
+                dbSql.contains("create table if not exists t_user"));
+        assertTrue("db.sql should include default portal user account",
+                dbSql.contains("select ''user''"));
+        assertTrue("db.sql should seed portal user only when missing",
+                dbSql.contains("where not exists (select 1 from t_user where username = ''user'')"));
+        assertFalse("db.sql should not keep portal_user auth table",
+                dbSql.contains("portal_user"));
+        assertTrue("db.sql should include admin login page template",
+                dbSql.contains("'admin-login.vue.vm'"));
+        assertTrue("db.sql should include uploaded-image-like admin shell layout",
+                dbSql.contains("class=\"admin-shell\""));
+        assertTrue("db.sql should route to admin login",
+                dbSql.contains("path: \"/login\""));
+        assertTrue("db.sql should include real admin login call",
+                dbSql.contains("this.request.post(\"/auth/admin/login\""));
+        assertTrue("db.sql should store admin auth token",
+                dbSql.contains("localStorage.setItem(\"admin-token\""));
+        assertFalse("db.sql should not keep local fake admin login flag",
+                dbSql.contains("adminLoggedIn"));
+        assertTrue("db.sql should include runnable project structures",
+                dbSql.contains("node_id BETWEEN 920100 AND 920399"));
+        assertVueCli4ConfigCompatible(dbSql, "sql/db.sql");
+        assertRunnableTemplatePorts(dbSql, "sql/db.sql");
+    }
+
+    @Test
+    public void projectStructurePackagePathPlaceholderBuildsJavaDirectories() throws Exception
+    {
+        GenProject project = new GenProject();
+        project.setProjectFileName("demo-product");
+        project.setPackageName("com.example.demo");
+
+        Method replaceNodeName = GenProjectServiceImpl.class.getDeclaredMethod(
+                "replaceNodeName", String.class, GenProject.class, GenTable.class);
+        replaceNodeName.setAccessible(true);
+
+        assertEquals("com/example/demo", replaceNodeName.invoke(
+                new GenProjectServiceImpl(), "{packagePath}", project, null));
+    }
+
+    private GenTable table()
+    {
+        GenTable table = new GenTable();
+        table.setPackageName("com.example.demo");
+        table.setModuleName("demo");
+        table.setClassName("DemoProduct");
+        table.setBusinessName("product");
+        return table;
+    }
+
+    private GenProject project()
+    {
+        GenProject project = new GenProject();
+        project.setProjectId(1L);
+        project.setProjectName("Demo App");
+        project.setProjectFileName("demo-app");
+        project.setPackageName("com.example.demo");
+        return project;
+    }
+
+    private AppMenuDesign menu(String code, String name, String path, boolean requiresLogin)
+    {
+        AppMenuDesign menu = new AppMenuDesign();
+        menu.setCode(code);
+        menu.setName(name);
+        menu.setPath(path);
+        menu.setRequiresLogin(requiresLogin);
+        return menu;
+    }
+
+    private GenTable renderTable()
+    {
+        GenTable table = table();
+        table.setTableName("demo_product");
+        table.setFunctionName("演示商品");
+        table.setFunctionAuthor("Codex");
+        table.setTplCategory("crud");
+        table.setOptions("{}");
+        table.setCreateTableSql("CREATE TABLE demo_product (product_id bigint primary key, product_name varchar(100));");
+
+        GenTableColumn pk = column("product_id", "商品ID", "Long", "productId", "1", "0", "0", "0", "EQ", "input");
+        GenTableColumn name = column("product_name", "商品名称", "String", "productName", "0", "1", "1", "1", "LIKE", "input");
+        table.setPkColumn(pk);
+        table.setColumns(Arrays.asList(pk, name));
+        return table;
+    }
+
+    private GenTableColumn column(String columnName, String comment, String javaType, String javaField,
+                                  String isPk, String isInsert, String isEdit, String isList,
+                                  String queryType, String htmlType)
+    {
+        GenTableColumn column = new GenTableColumn();
+        column.setColumnName(columnName);
+        column.setColumnComment(comment);
+        column.setJavaType(javaType);
+        column.setJavaField(javaField);
+        column.setIsPk(isPk);
+        column.setIsIncrement(isPk);
+        column.setIsRequired("0");
+        column.setIsInsert(isInsert);
+        column.setIsEdit(isEdit);
+        column.setIsList(isList);
+        column.setIsQuery(isList);
+        column.setQueryType(queryType);
+        column.setHtmlType(htmlType);
+        column.setDictType("");
+        return column;
+    }
+
+    private Path repoRoot()
+    {
+        Path cwd = Paths.get("").toAbsolutePath();
+        if ("ruoyi-generator".equals(cwd.getFileName().toString()))
+        {
+            return cwd.getParent();
+        }
+        return cwd;
+    }
+
+    private String read(Path path) throws Exception
+    {
+        return new String(Files.readAllBytes(path), StandardCharsets.UTF_8);
+    }
+
+    private String render(String templateName, VelocityContext context)
+    {
+        Template template = Velocity.getTemplate(templateName, "UTF-8");
+        StringWriter writer = new StringWriter();
+        template.merge(context, writer);
+        return writer.toString();
+    }
+
+    private String normalizeNewlines(String text)
+    {
+        return text.replace("\r\n", "\n");
+    }
+
+    private void assertProjectStructureNodeNamesFitSchema(String sql)
+    {
+        Matcher matcher = Pattern.compile("^\\(\\d+, \\d+, '([^']*)', '", Pattern.MULTILINE).matcher(sql);
+        int nodeCount = 0;
+        while (matcher.find())
+        {
+            nodeCount++;
+            String nodeName = matcher.group(1);
+            assertTrue("Project structure node_name must fit varchar(50): " + nodeName,
+                    nodeName.length() <= 50);
+        }
+        assertTrue("Should find project structure rows", nodeCount > 0);
+    }
+
+    private void assertVueCli4ConfigCompatible(String sql, String label)
+    {
+        assertFalse(label + " should not use defineConfig in Vue CLI 4 vue.config.js templates",
+                sql.contains("defineConfig"));
+        assertFalse(label + " should not use boolean transpileDependencies in Vue CLI 4 vue.config.js templates",
+                sql.contains("transpileDependencies: true"));
+        assertTrue(label + " should use array transpileDependencies in Vue CLI 4 vue.config.js templates",
+                sql.contains("transpileDependencies: []"));
+    }
+
+    private void assertRunnableTemplatePorts(String sql, String label)
+    {
+        String normalized = normalizeNewlines(sql);
+        assertTrue(label + " backend template should allow preview to override port 8080",
+                normalized.contains("(920108, 9201, 'application.yml.vm', NULL, 'application.yml.vm', '#set($d = ''$'')\nserver:\n  port: ${d}{SERVER_PORT:8080}"));
+        assertTrue(label + " backend README should document port 8080",
+                normalized.contains("The service starts at `http://localhost:8080`."));
+        assertTrue(label + " admin frontend template should allow preview to override port 8081",
+                normalized.contains("const port = process.env.PORT || 8081"));
+        assertTrue(label + " portal frontend template should allow preview to override port 8082",
+                normalized.contains("const port = process.env.PORT || 8082"));
+        assertTrue(label + " frontend templates should allow preview to override backend proxy",
+                normalized.contains("const apiBaseUrl = process.env.VUE_APP_API_BASE_URL || \"http://localhost:8080\""));
+        assertTrue(label + " frontend templates should use the resolved backend proxy",
+                normalized.contains("target: apiBaseUrl"));
+
+        assertFalse(label + " should not keep old backend port 9090",
+                normalized.contains("port: 9090"));
+        assertFalse(label + " should not proxy to old backend port 9090",
+                normalized.contains("http://localhost:9090"));
+        assertFalse(label + " should not keep old portal frontend port 5173",
+                normalized.contains("port: 5173"));
+    }
+}