优化

Former-commit-id: 82006385cb40cf364bc49f8c89ce10b0d19f86d2

src/main/java/xyz/wbsite/dbtool/javafx/JavaFxApplication.java

@@ -53,6 +53,7 @@ import xyz.wbsite.dbtool.javafx.po.FieldType;
 import xyz.wbsite.dbtool.javafx.po.Frame;
 import xyz.wbsite.dbtool.javafx.po.Module;
 import xyz.wbsite.dbtool.javafx.po.Project;
+import xyz.wbsite.dbtool.javafx.po.SelectItem;
 import xyz.wbsite.dbtool.javafx.po.Table;
 import xyz.wbsite.dbtool.javafx.tool.Dialog;
 import xyz.wbsite.dbtool.javafx.tool.Tool;
@@ -165,6 +166,13 @@ public class JavaFxApplication extends Application {
                             new MenuItem("编辑选项"),
                             new MenuItem("向上调整"),
                             new MenuItem("向下调整"));
+                } else if (field.getFieldType().equals(FieldType.Boolean.name())) {
+                    con = new ContextMenu(
+                            new MenuItem("新增"),
+                            new MenuItem("删除"),
+                            new MenuItem("编辑是否"),
+                            new MenuItem("向上调整"),
+                            new MenuItem("向下调整"));
                 } else {
                     con = new ContextMenu(
                             new MenuItem("新增"),
@@ -205,6 +213,28 @@ public class JavaFxApplication extends Application {
                                         fields.remove(index + 2);
                                     }
                                     break;
+                                case "编辑是否": {
+                                    Field field = fields.get(index);
+                                    if (field.getSelectItems().size() == 2){
+
+                                    }else {
+                                        {
+                                            SelectItem selectItem = new SelectItem();
+                                            selectItem.setValue("true");
+                                            selectItem.setLabel("是");
+                                            field.getSelectItems().add(selectItem);
+                                        }
+                                        {
+                                            SelectItem selectItem = new SelectItem();
+                                            selectItem.setValue("false");
+                                            selectItem.setLabel("否");
+                                            field.getSelectItems().add(selectItem);
+                                        }
+
+                                    }
+                                    Dialog.showSelectEdit(field);
+                                }
+                                break;
                                 case "编辑字典": {
                                     Field field = fields.get(index);
                                     Dialog.showDictEdit(field);

src/main/java/xyz/wbsite/dbtool/javafx/manger/ProjectManager.java

@@ -125,6 +125,8 @@ public class ProjectManager {
                 table.setFind(true);
                 table.setGet(false);
                 table.setSearch(false);
+                table.setAjax(true);
+                table.setHtml(true);
                 checkSysFields(table);// 检查或移除系统字段
                 md.putTable(table);
                 return table;
@@ -230,6 +232,7 @@ public class ProjectManager {
                 Module md = new Module(name);
                 md.setModuleName(name);
                 md.setModuleComment("注释");
+                md.setNeedGenerate(true);
                 project.putModule(md);
                 return name;
             }

src/main/java/xyz/wbsite/dbtool/javafx/po/Field.java

@@ -276,7 +276,7 @@ public class Field extends Table {
             value = "true";
         } else if (fieldType.get().matches("Dict")) {
             value = "\"code\"";
-        }else if (fieldType.get().matches("Select")) {
+        } else if (fieldType.get().matches("Select")) {
             value = "\"value\"";
         } else if (fieldType.get().matches("Byte")) {
             value = "(byte)1";
@@ -327,4 +327,13 @@ public class Field extends Table {
     public String getFieldTypeJdbc() {
         return FieldType.parse(getFieldType()).jdbcType();
     }
+
+    public String getLabel(String value, String defaults) {
+        for (SelectItem selectItem : selectItems) {
+            if (value.equals(selectItem.getValue())) {
+                return selectItem.getLabel();
+            }
+        }
+        return defaults;
+    }
 }

src/main/java/xyz/wbsite/dbtool/javafx/tool/Dialog.java

@@ -771,7 +771,7 @@ public class Dialog {
             Scene scene = new Scene(root);
 
             stage.setScene(scene);
-            stage.setTitle("编辑字典项");
+            stage.setTitle("编辑选项");
 
             OptionSelectController controller = dbdetailloader.getController();
             controller.setData(field.getSelectItems());

src/main/resources/modules/SpringBoot/resources/templates/screen/module/mgr.ftl

@@ -7,8 +7,8 @@
         <#if item.getFieldTypeJava() =="Boolean">
             <el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
                 <el-radio-group v-model="vm.${item.getFName()}" clearable size="mini">
-                    <el-radio :label="true">是</el-radio>
+                    <el-radio :label="true">${item.getLabel("true","是")}</el-radio>
-                    <el-radio :label="false">否</el-radio>
+                    <el-radio :label="false">${item.getLabel("false","否")}</el-radio>
                 </el-radio-group>
             </el-form-item>
         <#elseif item.getFieldTypeJava() =="Byte">
@@ -142,8 +142,8 @@
                     prop="${item.getFName()}"
                     label="${item.fieldComment?default("")}">
                 <template slot-scope="scope">
-                    <el-tag size="mini" effect="dark" type="success" v-if="scope.row.${item.getFName()}">是</el-tag>
+                    <el-tag size="mini" effect="dark" type="success" v-if="scope.row.${item.getFName()}">${item.getLabel("true","是")}</el-tag>
-                    <el-tag size="mini" effect="dark" type="danger" v-if="!scope.row.${item.getFName()}">否</el-tag>
+                    <el-tag size="mini" effect="dark" type="danger" v-if="!scope.row.${item.getFName()}">${item.getLabel("false","否")}</el-tag>
                 </template>
             </el-table-column>
 <#elseif  item.fieldType == 'Byte'>
@@ -334,8 +334,8 @@
         <#if item.getFieldTypeJava() =="Boolean">
             <el-form-item label="${item.fieldComment?default("")}" prop="${item.getFName()}">
                 <el-radio-group v-model="form.${item.getFName()}" clearable size="mini">
-                    <el-radio :label="true">是</el-radio>
+                    <el-radio :label="true">${item.getLabel("true","是")}</el-radio>
-                    <el-radio :label="false">否</el-radio>
+                    <el-radio :label="false">${item.getLabel("false","否")}</el-radio>
                 </el-radio-group>
             </el-form-item>
         <#elseif item.getFieldTypeJava() =="Byte">