From 46dbf09d81af6a91375950f225c74044f3555b80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Wed, 13 Aug 2025 05:03:13 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=88=A0=E9=99=A4=20docs=20?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=9A=84=E5=85=A8=E9=83=A8=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除了 DocsContentController、DocsController、DocsUserController 三个控制器
- 删除了 DocsContent、Docs、DocsUser三个实体类
- 移除了 DocsContentMapper、DocsMapper、DocsUserMapper 三个 Mapper 接口
- 删除了 DocsContentParam、DocsParam、DocsUserParam 三个查询参数类
- 移除了 DocsContentServiceImpl 服务实现类- 删除了相关的 XML 映射文件
---
 .../controller/ShopArticleController.java     |  2 +-
 .../gxwebsoft/shop/entity/ShopArticle.java    |  2 +-
 .../shop/mapper/ShopArticleMapper.java        |  2 +-
 .../shop/param/ShopArticleParam.java          |  2 +-
 .../shop/service/ShopArticleService.java      |  2 +-
 .../service/impl/ShopArticleServiceImpl.java  |  2 +-
 .../generator/templates/index.vue.btl         | 62 ++++++++-----------
 7 files changed, 33 insertions(+), 41 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopArticleController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopArticleController.java
index 98eb6da..477e8fb 100644
--- a/src/main/java/com/gxwebsoft/shop/controller/ShopArticleController.java
+++ b/src/main/java/com/gxwebsoft/shop/controller/ShopArticleController.java
@@ -22,7 +22,7 @@ import java.util.List;
  * 商品文章控制器
  *
  * @author 科技小王子
- * @since 2025-08-13 04:38:36
+ * @since 2025-08-13 05:01:55
  */
 @Tag(name = "商品文章管理")
 @RestController
diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopArticle.java b/src/main/java/com/gxwebsoft/shop/entity/ShopArticle.java
index 2a6543e..33fa28b 100644
--- a/src/main/java/com/gxwebsoft/shop/entity/ShopArticle.java
+++ b/src/main/java/com/gxwebsoft/shop/entity/ShopArticle.java
@@ -14,7 +14,7 @@ import lombok.EqualsAndHashCode;
  * 商品文章
  *
  * @author 科技小王子
- * @since 2025-08-13 04:38:36
+ * @since 2025-08-13 05:01:54
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
diff --git a/src/main/java/com/gxwebsoft/shop/mapper/ShopArticleMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/ShopArticleMapper.java
index 72b5ef0..09a2fc4 100644
--- a/src/main/java/com/gxwebsoft/shop/mapper/ShopArticleMapper.java
+++ b/src/main/java/com/gxwebsoft/shop/mapper/ShopArticleMapper.java
@@ -12,7 +12,7 @@ import java.util.List;
  * 商品文章Mapper
  *
  * @author 科技小王子
- * @since 2025-08-13 04:38:36
+ * @since 2025-08-13 05:01:54
  */
 public interface ShopArticleMapper extends BaseMapper<ShopArticle> {
 
diff --git a/src/main/java/com/gxwebsoft/shop/param/ShopArticleParam.java b/src/main/java/com/gxwebsoft/shop/param/ShopArticleParam.java
index 9bfcec4..f822819 100644
--- a/src/main/java/com/gxwebsoft/shop/param/ShopArticleParam.java
+++ b/src/main/java/com/gxwebsoft/shop/param/ShopArticleParam.java
@@ -13,7 +13,7 @@ import lombok.EqualsAndHashCode;
  * 商品文章查询参数
  *
  * @author 科技小王子
- * @since 2025-08-13 04:38:35
+ * @since 2025-08-13 05:01:53
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
diff --git a/src/main/java/com/gxwebsoft/shop/service/ShopArticleService.java b/src/main/java/com/gxwebsoft/shop/service/ShopArticleService.java
index 0ed617c..e3625e7 100644
--- a/src/main/java/com/gxwebsoft/shop/service/ShopArticleService.java
+++ b/src/main/java/com/gxwebsoft/shop/service/ShopArticleService.java
@@ -11,7 +11,7 @@ import java.util.List;
  * 商品文章Service
  *
  * @author 科技小王子
- * @since 2025-08-13 04:38:36
+ * @since 2025-08-13 05:01:55
  */
 public interface ShopArticleService extends IService<ShopArticle> {
 
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopArticleServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopArticleServiceImpl.java
index 475dfbd..ea47132 100644
--- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopArticleServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopArticleServiceImpl.java
@@ -15,7 +15,7 @@ import java.util.List;
  * 商品文章Service实现
  *
  * @author 科技小王子
- * @since 2025-08-13 04:38:36
+ * @since 2025-08-13 05:01:55
  */
 @Service
 public class ShopArticleServiceImpl extends ServiceImpl<ShopArticleMapper, ShopArticle> implements ShopArticleService {
diff --git a/src/test/java/com/gxwebsoft/generator/templates/index.vue.btl b/src/test/java/com/gxwebsoft/generator/templates/index.vue.btl
index a66c9e3..2722d13 100644
--- a/src/test/java/com/gxwebsoft/generator/templates/index.vue.btl
+++ b/src/test/java/com/gxwebsoft/generator/templates/index.vue.btl
@@ -49,7 +49,7 @@
 </template>
 
 <script lang="ts" setup>
-  import { createVNode, ref } from 'vue';
+  import { createVNode, ref, computed } from 'vue';
   import { message, Modal } from 'ant-design-vue';
   import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
   import type { EleProTable } from 'ele-admin-pro';
@@ -97,54 +97,26 @@
     });
   };
 
-  // 表格列配置 - 使用 hideInTable 控制默认显示
-  const columns = ref<ColumnItem[]>([
-  <% var coreFieldCount = 0; %>
+  // 完整的列配置（包含所有字段）
+  const allColumns = ref<ColumnItem[]>([
   <% for(field in table.fields) { %>
     <% if(field.propertyName != 'tenantId'){ %>
-    <%
-      // 判断是否为核心字段（默认显示）
-      var isCoreField = field.keyFlag ||
-                       field.propertyName == 'name' ||
-                       field.propertyName == 'title' ||
-                       field.propertyName == 'code' ||
-                       field.propertyName == 'status' ||
-                       field.propertyName == 'sort' ||
-                       field.propertyName == 'createTime';
-
-      // 限制核心字段数量，避免显示过多列
-      if(isCoreField && coreFieldCount >= 5) {
-        isCoreField = false;
-      }
-      if(isCoreField) {
-        coreFieldCount = coreFieldCount + 1;
-      }
-    %>
     {
       title: '${field.comment!field.propertyName}',
       dataIndex: '${field.propertyName}',
       key: '${field.propertyName}',
-      align: 'center',
-      <% if(!isCoreField){ %>
-      hideInTable: true, // 非核心字段默认隐藏，用户可通过列设置显示
-      <% } %>
       <% if(field.keyFlag){ %>
       width: 90,
       <% } else if(field.propertyName == 'createTime' || field.propertyName == 'updateTime'){ %>
-      width: 120,
+      width: 200,
+      align: 'center',
       sorter: true,
       ellipsis: true,
-      customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd')
-      <% } else if(field.propertyType == 'String' && (field.propertyName.contains('remark') || field.propertyName.contains('description') || field.propertyName.contains('content'))){ %>
-      width: 200,
-      ellipsis: true
+      customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd HH:mm:ss')
       <% } else if(field.propertyType == 'String'){ %>
-      width: 150,
       ellipsis: true
       <% } else if(field.propertyName == 'status'){ %>
-      width: 80
-      <% } else if(field.propertyName == 'sort'){ %>
-      width: 80
+      width: 120
       <% } else { %>
       width: 120
       <% } %>
@@ -161,6 +133,26 @@
     }
   ]);
 
+  // 默认显示的核心列（最多5个主要字段）
+  const defaultVisibleColumns = [
+  <% var count = 0; %>
+  <% for(field in table.fields) { %>
+    <% if(field.keyFlag || field.propertyName == 'name' || field.propertyName == 'title' || field.propertyName == 'status' || field.propertyName == 'createTime'){ %>
+    '${field.propertyName}',
+    <% count = count + 1; %>
+    <% if(count >= 5) break; %>
+    <% } %>
+  <% } %>
+    'action'
+  ];
+
+  // 根据默认可见列过滤显示的列
+  const columns = computed(() => {
+    return allColumns.value.filter(col =>
+      defaultVisibleColumns.includes(col.dataIndex) || col.key === 'action'
+    );
+  });
+
   /* 搜索 */
   const reload = (where?: ${entity}Param) => {
     selection.value = [];