From 8863431c5af07559dc6888af37ef13e21208e486 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 17 二月 2024 15:09:13 +0800
Subject: [PATCH] #
---
zy-asrs-framework/src/main/resources/templates/react/Index.txt | 61 --------------------
zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/BetterGenerator.java | 83 ++++++++++++++++++++++++++-
2 files changed, 81 insertions(+), 63 deletions(-)
diff --git a/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/BetterGenerator.java b/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/BetterGenerator.java
index 95075dd..2ba3ccc 100644
--- a/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/BetterGenerator.java
+++ b/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/BetterGenerator.java
@@ -70,6 +70,7 @@
private String systemPackagePath;
private String systemPackage;
private String itemName;
+ private String tableColumns;
public void build() throws Exception {
init();
@@ -161,6 +162,7 @@
}
}
itemName = packagePathSplit[packagePathSplit.length - 1];
+ tableColumns = createTableColumns();
}
private String readFile(String template){
@@ -209,6 +211,7 @@
.replaceAll("@\\{PRIMARYKEYCOLUMN0}", GeneratorUtils.firstCharConvert(primaryKeyColumn, true))
.replaceAll("@\\{UPCASEMARJORCOLUMN}", GeneratorUtils.firstCharConvert(primaryKeyColumn, false))
.replaceAll("@\\{SYSTEMPACKAGE}",systemPackage)
+ .replaceAll("@\\{TABLECOLUMNS}", tableColumns)
;
writerFile.createNewFile();
BufferedWriter writer=new BufferedWriter(new FileWriter(writerFile));
@@ -753,10 +756,84 @@
/************************************** Index鍔ㄦ�佸瓧娈� *******************************************/
/**********************************************************************************************/
+ private String createTableColumns() {
+ StringBuilder sb = new StringBuilder();
+ for (Column column : columns) {
+ if (column.isPrimaryKey()
+ || column.getHumpName().equals("deleted")
+ || column.getHumpName().equals("hostId")
+ ) {
+ continue;
+ }
+ sb.append(" {\n")
+ .append(" title: '").append(column.getComment()).append("',\n")
+ .append(" dataIndex: '");
+ if ("Date".equals(column.getType()) || !Cools.isEmpty(column.getEnums()) || !Cools.isEmpty(column.getForeignKeyMajor())){
+ // 鏃堕棿銆佹灇涓� 鏍煎紡鍖� 涓婚敭淇グ
+ sb.append(column.getHumpName()).append("\\$");
+ } else {
+ sb.append(column.getHumpName());
+ }
+ sb.append("',\n")
+ .append(" valueType: 'text',\n");
+ if (column.isMajor()) {
+ sb.append(" copyable: true,\n");
+ }
+ sb.append(" filterDropdown: (props) => <").append(getAntProFilterType(column)).append("\n")
+ .append(" name='").append(column.getHumpName()).append("'\n")
+ .append(" {...props}\n")
+ .append(" actionRef={actionRef}\n")
+ .append(" setSearchParam={setSearchParam}\n");
+ if (!Cools.isEmpty(column.getEnums())) {
+ sb.append(" data={[\n");
+ for (Map<String, Object> map : column.getEnums()) {
+ for (Map.Entry<String, Object> entry : map.entrySet()){
+ sb.append(" { label: '").append(entry.getValue()).append("', value: ").append(entry.getKey()).append(" },\n");
+ }
+ }
+ sb.append(" ]}\n");
+ }
+ sb.append(" />,\n")
+ .append(" },\n");
+ }
+ return sb.toString();
+ }
-
-
-
+ private String getAntProFilterType(Column column){
+ String filter = "TextFilter";
+ switch (column.getType()) {
+ case "Boolean":
+ filter = "TextFilter";
+ break;
+ case "Short":
+ filter = "TextFilter";
+ break;
+ case "Integer":
+ filter = "TextFilter";
+ break;
+ case "Long":
+ filter = "TextFilter";
+ break;
+ case "Double":
+ filter = "TextFilter";
+ break;
+ case "String":
+ filter = "TextFilter";
+ break;
+ case "Date":
+ filter = "DatetimeRangeFilter";
+ break;
+ default:
+ break;
+ }
+ if (!Cools.isEmpty(column.getEnums())) {
+ filter = "SelectFilter";
+ }
+ if (!Cools.isEmpty(column.getForeignKey())) {
+ filter = "LinkFilter";
+ }
+ return filter;
+ }
/**********************************************************************************************/
/************************************** Edit鍔ㄦ�佸瓧娈� ********************************************/
diff --git a/zy-asrs-framework/src/main/resources/templates/react/Index.txt b/zy-asrs-framework/src/main/resources/templates/react/Index.txt
index 67a4a35..292a3cb 100644
--- a/zy-asrs-framework/src/main/resources/templates/react/Index.txt
+++ b/zy-asrs-framework/src/main/resources/templates/react/Index.txt
@@ -106,66 +106,7 @@
valueType: 'indexBorder',
width: 48,
},
- {
- title: '濮撳悕',
- dataIndex: 'name',
- valueType: 'text',
- copyable: true,
- filterDropdown: (props) => <TextFilter
- name='name'
- {...props}
- actionRef={actionRef}
- setSearchParam={setSearchParam}
- />,
- },
- {
- title: '鏍囪瘑',
- dataIndex: 'code',
- valueType: 'text',
- filterDropdown: (props) => <TextFilter
- name='code'
- {...props}
- actionRef={actionRef}
- setSearchParam={setSearchParam}
- />,
- },
- {
- title: '鏈烘瀯',
- dataIndex: 'hostId$',
- valueType: 'text',
- filterDropdown: (props) => <LinkFilter
- name='hostId'
- {...props}
- actionRef={actionRef}
- setSearchParam={setSearchParam}
- />,
- },
- {
- title: '鐘舵��',
- dataIndex: 'status$',
- valueType: 'text',
- filterDropdown: (props) => <SelectFilter
- name='status'
- {...props}
- actionRef={actionRef}
- setSearchParam={setSearchParam}
- data={[
- { label: '姝e父', value: 1 },
- { label: '绂佺敤', value: 0 },
- ]}
- />,
- },
- {
- title: '淇敼鏃堕棿',
- dataIndex: 'updateTime$',
- valueType: 'text',
- filterDropdown: (props) => <DatetimeRangeFilter
- name='updateTime'
- {...props}
- actionRef={actionRef}
- setSearchParam={setSearchParam}
- />,
- },
+@{TABLECOLUMNS}
{
title: '鎿嶄綔',
dataIndex: 'option',
--
Gitblit v1.9.1