diff --git a/twelvet-server/twelvet-server-gen/src/main/java/com/twelvet/server/gen/controller/GenController.java b/twelvet-server/twelvet-server-gen/src/main/java/com/twelvet/server/gen/controller/GenController.java index 4ed95ebeaf9da61f4ff34077a699b9d4b3cf8b54..57bdf67ddc41b56573d9cc947258df6c0e138242 100644 --- a/twelvet-server/twelvet-server-gen/src/main/java/com/twelvet/server/gen/controller/GenController.java +++ b/twelvet-server/twelvet-server-gen/src/main/java/com/twelvet/server/gen/controller/GenController.java @@ -230,7 +230,7 @@ public class GenController extends TWTController { private void genCode(HttpServletResponse response, byte[] data) throws IOException { response.reset(); response.setHeader("Content-Disposition", "attachment; filename=\"twelvet.zip\""); - response.addHeader("Content-Length", String.valueOf(data.length)); + response.setHeader("Content-Length", String.valueOf(data.length)); response.setContentType("application/octet-stream; charset=UTF-8"); IOUtils.write(data, response.getOutputStream()); } diff --git a/twelvet-server/twelvet-server-gen/src/main/resources/vm/react/index-tree.tsx.vm b/twelvet-server/twelvet-server-gen/src/main/resources/vm/react/index-tree.tsx.vm index 3c2362750196cc83ebe44f542d6bb60e34fc1e59..49d662699877568c0fdc6e50214e9f0b13c17b58 100644 --- a/twelvet-server/twelvet-server-gen/src/main/resources/vm/react/index-tree.tsx.vm +++ b/twelvet-server/twelvet-server-gen/src/main/resources/vm/react/index-tree.tsx.vm @@ -96,7 +96,7 @@ const ${BusinessName}: React.FC = () => { }, } - const [${businessName}Options, set${BusinessName}Options] = useState<[]>() + const [${businessName}Options, set${BusinessName}Options] = useState() #if($table.sub) @@ -125,6 +125,37 @@ const ${BusinessName}: React.FC = () => { ] #end + /** 查询下拉树结构 */ + const getTreeselect = async () => { + + try { + const {code, msg, data} = await list${BusinessName}({}) + if (code !== 200) { + return message.error(msg) + } + + const tree = [{ + key: 0, + title: '顶级节点', + value: 0, + children: makeTree({ + dataSource: data.records, + id: `${treeCode}`, + parentId: '${treeParentCode}', + rootId: false, + enhance: { + key: `${treeCode}`, + title: `${treeCode}`, + value: `${treeCode}` + } + }) + }] + set${BusinessName}Options(tree) + } catch (e) { + system.error(e) + } + } + /** * 新增${functionName}数据 * @param row row @@ -141,7 +172,7 @@ const ${BusinessName}: React.FC = () => { const refPut = async (row: { [key: string]: any }) => { try { const {code, msg, data} = await get${BusinessName}(row.${pkColumn.javaField}) - if (code != 200) { + if (code !== 200) { return message.error(msg) } @@ -162,37 +193,6 @@ const ${BusinessName}: React.FC = () => { } } - /** 查询下拉树结构 */ - const getTreeselect = async () => { - - try { - const {code, msg, data} = await list${BusinessName}({}) - if (code !== 200) { - return message.error(msg) - } - - const tree = [{ - key: 0, - title: '顶级节点', - value: 0, - children: makeTree({ - dataSource: data.records, - id: `${treeCode}`, - parentId: '${treeParentCode}', - rootId: false, - enhance: { - key: `${treeCode}`, - title: `${treeCode}`, - value: `${treeCode}` - } - }) - }] - set${BusinessName}Options(tree) - } catch (e) { - system.error(e) - } - } - /** * 移除${functionName}数据 * @param row ${pkColumn.javaField}