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 6d353947..82884dc7 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 @@ -11,6 +11,8 @@ import com.jeesite.common.web.BaseController; import com.jeesite.modules.test.entity.TestData; import com.jeesite.modules.test.entity.TestDataChild; import com.jeesite.modules.test.service.TestDataService; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -21,8 +23,6 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import java.util.List; /** @@ -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()}); }