From 4cb68bd4bd5c872a445e07a2ff26ee9b89e4cd35 Mon Sep 17 00:00:00 2001
From: wanggeng888 <450292408@qq.com>
Date: Mon, 15 Mar 2021 21:55:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../factory/factory/ChoiceBoxTableCellFactory.java   |  6 ++++--
 src/main/resources/template/normal/page/save.ftl     | 12 ++++++------
 src/main/resources/template/normal/page/update.ftl   | 12 ++++++------
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/main/java/ink/wgink/code/factory/factory/ChoiceBoxTableCellFactory.java b/src/main/java/ink/wgink/code/factory/factory/ChoiceBoxTableCellFactory.java
index 7074877..eade985 100644
--- a/src/main/java/ink/wgink/code/factory/factory/ChoiceBoxTableCellFactory.java
+++ b/src/main/java/ink/wgink/code/factory/factory/ChoiceBoxTableCellFactory.java
@@ -52,10 +52,12 @@ public class ChoiceBoxTableCellFactory implements Callback<TableColumn.CellDataF
         if (StringUtils.equalsIgnoreCase(FormFieldTypeEnum.ID_SELECT.getValue(), fieldVO.getFormFieldType())) {
             choiceBox.setItems(singleSelect);
         } else {
-            fieldVO.setFormFieldValue(fieldVO.getFormFieldType());
             choiceBox.setItems(normalSelect);
-            choiceBox.getSelectionModel().select(fieldVO.getFormFieldType());
+            if (StringUtils.isBlank(fieldVO.getFormFieldValue())) {
+                fieldVO.setFormFieldValue(fieldVO.getFormFieldType());
+            }
         }
+        choiceBox.getSelectionModel().select(fieldVO.getFormFieldValue());
         choiceBox.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
             String oldText = (String) oldValue;
             String newText = (String) newValue;
diff --git a/src/main/resources/template/normal/page/save.ftl b/src/main/resources/template/normal/page/save.ftl
index a5177a1..8e9a775 100644
--- a/src/main/resources/template/normal/page/save.ftl
+++ b/src/main/resources/template/normal/page/save.ftl
@@ -77,7 +77,7 @@
                         <select id="${field.propertyName}" name="${field.propertyName}">
                             <option value="">请选择${field.columnComment}</option>
                             {{# for(var i = 0, item; item = d[i++];) { }}
-                            <option value="{{item.dictionaryId}}">{{item.dictionaryName}}</option>
+                            <option value="{{item.selectId}}">{{item.selectName}}</option>
                             {{# } }}
                         </select>
                     </script>
@@ -88,7 +88,7 @@
                     <div class="layui-input-block layui-form" id="${field.propertyName}CheckboxTemplateBox" lay-filter="${field.propertyName}CheckboxTemplateBox"></div>
                     <script id="${field.propertyName}CheckboxTemplate" type="text/html">
                         {{# for(var i = 0, item; item = d[i++];) { }}
-                        <input type="checkbox" name="${field.propertyName}[{{item.dictionaryId}}]" value="{{item.dictionaryId}}" title="{{item.dictionaryName}}">
+                        <input type="checkbox" name="${field.propertyName}[{{item.selectId}}]" value="{{item.selectId}}" title="{{item.selectName}}">
                         {{# } }}
                     </script>
                 </div>
@@ -98,7 +98,7 @@
                     <div class="layui-input-block layui-form" id="${field.propertyName}RadioTemplateBox" lay-filter="${field.propertyName}RadioTemplateBox"></div>
                     <script id="${field.propertyName}RadioTemplate" type="text/html">
                         {{# for(var i = 0, item; item = d[i++];) { }}
-                        <input type="radio" name="${field.propertyName}" value="{{item.dictionaryId}}" title="{{item.dictionaryName}}">
+                        <input type="radio" name="${field.propertyName}" value="{{item.selectId}}" title="{{item.selectName}}">
                         {{# } }}
                     </script>
                 </div>
@@ -404,7 +404,7 @@
                 <#elseif field.formFieldValue == "select">
         // 初始化${field.columnComment}下拉选择
         function init${field.firstUpperPropertyName}Select() {
-            top.restAjax.get(top.restAjax.path('api/url/${field.dictionaryId}', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/url/selectUrl', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('${field.propertyName}SelectTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('${field.propertyName}SelectTemplateBox').innerHTML = html;
                 });
@@ -417,7 +417,7 @@
                 <#elseif field.formFieldValue == "checkbox">
         // 初始化${field.columnComment}复选
         function init${field.firstUpperPropertyName}Checkbox() {
-            top.restAjax.get(top.restAjax.path('api/url/${field.dictionaryId}', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/url/selectUrl', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('${field.propertyName}CheckboxTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('${field.propertyName}CheckboxTemplateBox').innerHTML = html;
                 });
@@ -430,7 +430,7 @@
                 <#elseif field.formFieldValue == "radio">
         // 初始化${field.columnComment}单选
         function init${field.firstUpperPropertyName}Radio() {
-            top.restAjax.get(top.restAjax.path('api/url/${field.dictionaryId}', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/url/selectUrl', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('${field.propertyName}RadioTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('${field.propertyName}RadioTemplateBox').innerHTML = html;
                 });
diff --git a/src/main/resources/template/normal/page/update.ftl b/src/main/resources/template/normal/page/update.ftl
index 3e17d0c..bc8b05a 100644
--- a/src/main/resources/template/normal/page/update.ftl
+++ b/src/main/resources/template/normal/page/update.ftl
@@ -77,7 +77,7 @@
                         <select id="${field.propertyName}" name="${field.propertyName}">
                             <option value="">请选择${field.columnComment}</option>
                             {{# for(var i = 0, item; item = d[i++];) { }}
-                            <option value="{{item.dictionaryId}}">{{item.dictionaryName}}</option>
+                            <option value="{{item.selectId}}">{{item.selectName}}</option>
                             {{# } }}
                         </select>
                     </script>
@@ -88,7 +88,7 @@
                     <div class="layui-input-block layui-form" id="${field.propertyName}CheckboxTemplateBox" lay-filter="${field.propertyName}CheckboxTemplateBox"></div>
                     <script id="${field.propertyName}CheckboxTemplate" type="text/html">
                         {{# for(var i = 0, item; item = d[i++];) { }}
-                        <input type="checkbox" name="${field.propertyName}[{{item.dictionaryId}}]" value="{{item.dictionaryId}}" title="{{item.dictionaryName}}">
+                        <input type="checkbox" name="${field.propertyName}[{{item.selectId}}]" value="{{item.selectId}}" title="{{item.selectName}}">
                         {{# } }}
                     </script>
                 </div>
@@ -98,7 +98,7 @@
                     <div class="layui-input-block" id="${field.propertyName}RadioTemplateBox" lay-filter="${field.propertyName}RadioTemplateBox"></div>
                     <script id="${field.propertyName}RadioTemplate" type="text/html">
                         {{# for(var i = 0, item; item = d[i++];) { }}
-                        <input type="radio" name="${field.propertyName}" value="{{item.dictionaryId}}" title="{{item.dictionaryName}}">
+                        <input type="radio" name="${field.propertyName}" value="{{item.selectId}}" title="{{item.selectName}}">
                         {{# } }}
                     </script>
                 </div>
@@ -407,7 +407,7 @@
                 <#elseif field.formFieldValue == "select">
         // 初始化${field.columnComment}下拉选择
         function init${field.firstUpperPropertyName}Select(selectValue) {
-            top.restAjax.get(top.restAjax.path('api/url/${field.dictionaryId}', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/url/selectUrl', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('${field.propertyName}SelectTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('${field.propertyName}SelectTemplateBox').innerHTML = html;
                 });
@@ -424,7 +424,7 @@
                 <#elseif field.formFieldValue == "checkbox">
         // 初始化${field.columnComment}复选
         function init${field.firstUpperPropertyName}Checkbox(selectValues) {
-            top.restAjax.get(top.restAjax.path('api/url/${field.dictionaryId}', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/url/selectUrl', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('${field.propertyName}CheckboxTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('${field.propertyName}CheckboxTemplateBox').innerHTML = html;
                 });
@@ -444,7 +444,7 @@
                 <#elseif field.formFieldValue == "radio">
         // 初始化${field.columnComment}单选
         function init${field.firstUpperPropertyName}Radio(selectValue) {
-            top.restAjax.get(top.restAjax.path('api/url/${field.dictionaryId}', []), {}, null, function(code, data, args) {
+            top.restAjax.get(top.restAjax.path('api/url/selectUrl', []), {}, null, function(code, data, args) {
                 laytpl(document.getElementById('${field.propertyName}RadioTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('${field.propertyName}RadioTemplateBox').innerHTML = html;
                 });