diff --git a/agri-common/src/main/java/com/agri/common/constant/GenConstants.java b/agri-common/src/main/java/com/agri/common/constant/GenConstants.java index 91f877f..6693c59 100644 --- a/agri-common/src/main/java/com/agri/common/constant/GenConstants.java +++ b/agri-common/src/main/java/com/agri/common/constant/GenConstants.java @@ -66,6 +66,7 @@ public class GenConstants /** 文本域 */ public static final String HTML_TEXTAREA = "textarea"; + public static final String HTML_NUMBER = "number"; /** 下拉框 */ public static final String HTML_SELECT = "select"; diff --git a/agri-generator/src/main/resources/vm/sql/sql.vm b/agri-generator/src/main/resources/vm/sql/sql.vm index 0575583..1da1f1b 100644 --- a/agri-generator/src/main/resources/vm/sql/sql.vm +++ b/agri-generator/src/main/resources/vm/sql/sql.vm @@ -7,16 +7,16 @@ SELECT @parentId := LAST_INSERT_ID(); -- 按钮 SQL insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}查询', @parentId, '1', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:query', '#', 'admin', sysdate(), '', null, ''); +values('查询', @parentId, '1', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:query', '#', 'admin', sysdate(), '', null, ''); insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}新增', @parentId, '2', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:add', '#', 'admin', sysdate(), '', null, ''); +values('新增', @parentId, '2', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:add', '#', 'admin', sysdate(), '', null, ''); insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}修改', @parentId, '3', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:edit', '#', 'admin', sysdate(), '', null, ''); +values('修改', @parentId, '3', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:edit', '#', 'admin', sysdate(), '', null, ''); insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}删除', @parentId, '4', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:remove', '#', 'admin', sysdate(), '', null, ''); +values('删除', @parentId, '4', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:remove', '#', 'admin', sysdate(), '', null, ''); insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}导出', @parentId, '5', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:export', '#', 'admin', sysdate(), '', null, ''); \ No newline at end of file +values('导出', @parentId, '5', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:export', '#', 'admin', sysdate(), '', null, ''); \ No newline at end of file diff --git a/agri-generator/src/main/resources/vm/vue/index-tree.vue.vm b/agri-generator/src/main/resources/vm/vue/index-tree.vue.vm index 6f15882..f7447bc 100644 --- a/agri-generator/src/main/resources/vm/vue/index-tree.vue.vm +++ b/agri-generator/src/main/resources/vm/vue/index-tree.vue.vm @@ -20,6 +20,12 @@ @keyup.enter.native="handleQuery" /> +#elseif($column.htmlType == "number") + + + #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType) @@ -187,6 +193,10 @@ +#elseif($column.htmlType == "number") + + + #elseif($column.htmlType == "imageUpload") diff --git a/agri-generator/src/main/resources/vm/vue/index.vue.vm b/agri-generator/src/main/resources/vm/vue/index.vue.vm index 0019995..4155400 100644 --- a/agri-generator/src/main/resources/vm/vue/index.vue.vm +++ b/agri-generator/src/main/resources/vm/vue/index.vue.vm @@ -20,6 +20,12 @@ @keyup.enter.native="handleQuery" /> +#elseif($column.htmlType == "number") + + + #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType) @@ -197,6 +203,10 @@ +#elseif($column.htmlType == "number") + + + #elseif($column.htmlType == "imageUpload") @@ -312,6 +322,12 @@ +#elseif($column.list && $column.htmlType == "number") + + + #elseif($column.list && $column.htmlType == "datetime") +#elseif($column.list && $column.htmlType == "number") + + + #elseif($column.list && $column.htmlType == "datetime")