manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
thinkgem
2024-08-15 19:59:57 +08:00
parent cad2ff85ef
commit 8fd7fcb489
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/test/src/main/java/com/jeesite/modules/test/web/TestDataController.java
View File

@@ -11,6 +11,8 @@ import com.jeesite.common.web.BaseController;
import com.jeesite.modules.test.entity.TestData; import com.jeesite.modules.test.entity.TestData;
import com.jeesite.modules.test.entity.TestDataChild; import com.jeesite.modules.test.entity.TestDataChild;
import com.jeesite.modules.test.service.TestDataService; 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.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; 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.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.util.List; import java.util.List;
/** /**
@@ -85,6 +85,7 @@ public class TestDataController extends BaseController {
public String form(TestData testData, String flag, Model model) { public String form(TestData testData, String flag, Model model) {
testDataService.loadChildData(testData); testDataService.loadChildData(testData);
model.addAttribute("testData", testData); model.addAttribute("testData", testData);
// model.addAttribute("testSelectItems", DictUtils.getDictList("sys_menu_type"));
return "modules/test/testDataForm"+ StringUtils.defaultString(flag, ""); return "modules/test/testDataForm"+ StringUtils.defaultString(flag, "");
} }

1
modules/test/src/main/resources/views/modules/test/testDataForm2.html
View File

@@ -245,6 +245,7 @@ $('#testDataChildDataGrid').dataGrid({
}, },
editable:true, edittype:'select', editoptions:{'class':'form-control', editable:true, edittype:'select', editoptions:{'class':'form-control',
items: $.merge([{dictLabel:' ',dictValue:''}], "#{@DictUtils.getDictListJson('sys_menu_type')}"), items: $.merge([{dictLabel:' ',dictValue:''}], "#{@DictUtils.getDictListJson('sys_menu_type')}"),
// items: $.merge([{dictLabel:' ',dictValue:''}], "#{toJson(testSelectItems![])}"),
itemLabel: 'dictLabel', itemValue: 'dictValue', dataInit: function(element){ itemLabel: 'dictLabel', itemValue: 'dictValue', dataInit: function(element){
js.select2(element).on("change",function(){$(this).resetValid()}); js.select2(element).on("change",function(){$(this).resetValid()});
} }