From 25a192cd6aad63b54686e355c392f7b6be861c79 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Thu, 15 Aug 2024 19:59:47 +0800 Subject: [PATCH] update --- .../java/com/jeesite/modules/test/web/TestDataController.java | 1 + .../src/main/resources/views/modules/test/testDataForm2.html | 1 + 2 files changed, 2 insertions(+) diff --git a/modules/test/src/main/java/com/jeesite/modules/test/web/TestDataController.java b/modules/test/src/main/java/com/jeesite/modules/test/web/TestDataController.java index f51c2ffc..93a0294e 100644 --- a/modules/test/src/main/java/com/jeesite/modules/test/web/TestDataController.java +++ b/modules/test/src/main/java/com/jeesite/modules/test/web/TestDataController.java @@ -85,6 +85,7 @@ public class TestDataController extends BaseController { public String form(TestData testData, String flag, Model model) { testDataService.loadChildData(testData); model.addAttribute("testData", testData); +// model.addAttribute("testSelectItems", DictUtils.getDictList("sys_menu_type")); return "modules/test/testDataForm"+ StringUtils.defaultString(flag, ""); } diff --git a/modules/test/src/main/resources/views/modules/test/testDataForm2.html b/modules/test/src/main/resources/views/modules/test/testDataForm2.html index ff223ca7..d9e3ccd0 100644 --- a/modules/test/src/main/resources/views/modules/test/testDataForm2.html +++ b/modules/test/src/main/resources/views/modules/test/testDataForm2.html @@ -245,6 +245,7 @@ $('#testDataChildDataGrid').dataGrid({ }, editable:true, edittype:'select', editoptions:{'class':'form-control', items: $.merge([{dictLabel:' ',dictValue:''}], "#{@DictUtils.getDictListJson('sys_menu_type')}"), + // items: $.merge([{dictLabel:' ',dictValue:''}], "#{toJson(testSelectItems![])}"), itemLabel: 'dictLabel', itemValue: 'dictValue', dataInit: function(element){ js.select2(element).on("change",function(){$(this).resetValid()}); }