From c04b8956868e2bc436852589ae5d1a3278cba187 Mon Sep 17 00:00:00 2001 From: lbw Date: Tue, 11 Apr 2023 08:38:57 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20Introducing=20new=20features.=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=20v-loading?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/8pigxx_codegen.sql | 9 +++++---- .../resources/templates/jmreport/desreport/list.ftl | 10 +++------- pigx-visual/pigx-report-platform/pom.xml | 4 ++-- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/db/8pigxx_codegen.sql b/db/8pigxx_codegen.sql index 631495df5..2a8bdc9bf 100644 --- a/db/8pigxx_codegen.sql +++ b/db/8pigxx_codegen.sql @@ -244,15 +244,16 @@ INSERT INTO `gen_template` VALUES (8, 'template/Mapper.xml.vm', '${backendPath}/ INSERT INTO `gen_template` VALUES (9, 'template/menu.sql.vm', '${backendPath}/menu/${functionName}_menu.sql', 'menu.sql', '-- 该脚本不要直接执行， 注意维护菜单的父节点ID 默认 父节点-1 , 默认租户 1\n#set($menuId=${dateTool.getSystemTime()})\n\n -- 菜单SQL\n insert into `sys_menu` ( `menu_id`,`parent_id`, `path`, `permission`, `menu_type`, `icon`, `del_flag`, `create_time`, `sort_order`, `update_time`, `name`, `tenant_id`)\n values (${menuId}, \'-1\', \'/${moduleName}/${functionName}/index\', \'\', \'0\', \'icon-bangzhushouji\', \'0\', null , \'8\', null , \'${tableComment}管理\', 1);\n\n-- 按钮父菜单ID\n set @parentId = @@identity;\n\n-- 菜单对应按钮SQL\n insert into `sys_menu` ( `menu_id`,`parent_id`, `permission`, `menu_type`, `path`, `icon`, `del_flag`, `create_time`, `sort_order`, `update_time`, `name`, `tenant_id`)\n values (${math.add($menuId,1)},${menuId}, \'${moduleName}_${functionName}_view\', \'1\', null, \'1\', \'0\', null, \'0\', null, \'${tableComment}查看\', 1);\n\n insert into `sys_menu` ( `menu_id`,`parent_id`, `permission`, `menu_type`, `path`, `icon`, `del_flag`, `create_time`, `sort_order`, `update_time`, `name`, `tenant_id`)\n values (${math.add($menuId,2)},${menuId}, \'${moduleName}_${functionName}_add\', \'1\', null, \'1\', \'0\', null, \'1\', null, \'${tableComment}新增\', 1);\n\n insert into `sys_menu` (`menu_id`, `parent_id`, `permission`, `menu_type`, `path`, `icon`, `del_flag`, `create_time`, `sort_order`, `update_time`, `name`, `tenant_id`)\n values (${math.add($menuId,3)},${menuId}, \'${moduleName}_${functionName}_edit\', \'1\', null, \'1\', \'0\', null, \'2\', null, \'${tableComment}修改\', 1);\n\n insert into `sys_menu` (`menu_id`, `parent_id`, `permission`, `menu_type`, `path`, `icon`, `del_flag`, `create_time`, `sort_order`, `update_time`, `name`, `tenant_id`)\n values (${math.add($menuId,4)},${menuId}, \'${moduleName}_${functionName}_del\', \'1\', null, \'1\', \'0\', null, \'3\', null, \'${tableComment}删除\', 1);\n\n insert into `sys_menu` ( `menu_id`,`parent_id`, `permission`, `menu_type`, `path`, `icon`, `del_flag`, `create_time`, `sort_order`, `update_time`, `name`, `tenant_id`)\n values (${math.add($menuId,5)},${menuId}, \'${moduleName}_${functionName}_export\', \'1\', null, \'1\', \'0\', null, \'3\', null, \'导入导出\', 1);', '2023-02-23 01:19:08', '2023-02-23 12:13:47', '0', 1, ' ', ' '); INSERT INTO `gen_template` VALUES (10, 'template/plus/api.ts.vm', '${frontendPath}/src/api/${moduleName}/${functionName}.ts', 'vue3 版本api.ts', 'import request from \"/@/utils/request\"\n\nexport function fetchList(query?: Object) {\n return request({\n url: \'/${moduleName}/${functionName}/page\',\n method: \'get\',\n params: query\n })\n}\n\nexport function addObj(obj?: Object) {\n return request({\n url: \'/${moduleName}/${functionName}\',\n method: \'post\',\n data: obj\n })\n}\n\nexport function getObj(id?: string) {\n return request({\n url: \'/${moduleName}/${functionName}/\' + id,\n method: \'get\'\n })\n}\n\nexport function delObjs(ids?: Object) {\n return request({\n url: \'/${moduleName}/${functionName}\',\n method: \'delete\',\n data: ids\n })\n}\n\nexport function putObj(obj?: Object) {\n return request({\n url: \'/${moduleName}/${functionName}\',\n method: \'put\',\n data: obj\n })\n}', '2023-02-23 01:19:23', '2023-02-23 12:13:49', '0', 1, ' ', ' '); INSERT INTO `gen_template` VALUES (11, 'template/plus/index.vue.vm', '${frontendPath}/src/views/${moduleName}/${functionName}/index.vue', 'vue3版本页面不含i18n', '\n\n', '2023-02-23 01:19:35', '2023-04-03 18:21:24', '0', 1, '', 'admin'); -INSERT INTO `gen_template` VALUES (12, 'template/plus/form.vue.vm', '${frontendPath}/src/views/${moduleName}/${functionName}/form.vue', 'vue3版本表单弹窗不含i18n', '\n\n', '2023-02-23 01:19:48', '2023-04-02 17:49:01', '0', 1, '', 'admin'); +INSERT INTO `gen_template` VALUES (12, 'template/plus/form.vue.vm', '${frontendPath}/src/views/${moduleName}/${functionName}/form.vue', 'vue3版本表单弹窗不含i18n', '\n\n', '2023-02-23 01:19:48', '2023-04-10 22:57:27', '0', 1, '', 'admin'); INSERT INTO `gen_template` VALUES (13, 'template/plus/i18n/index.vue.vm', '${frontendPath}/src/views/${moduleName}/${functionName}/index.vue', 'vue3列表页面含i18n', '\n\n', '2023-02-23 01:20:01', '2023-04-03 18:21:02', '0', 1, '', 'admin'); -INSERT INTO `gen_template` VALUES (14, 'template/plus/i18n/form.vue.vm', '${frontendPath}/src/views/${moduleName}/${functionName}/form.vue', 'vue3表单弹窗页面含i18n', '\n\n', '2023-02-23 01:20:13', '2023-04-02 17:48:34', '0', 1, '', 'admin'); +INSERT INTO `gen_template` VALUES (14, 'template/plus/i18n/form.vue.vm', '${frontendPath}/src/views/${moduleName}/${functionName}/form.vue', 'vue3表单弹窗页面含i18n', '\n\n', '2023-02-23 01:20:13', '2023-04-10 22:56:03', '0', 1, '', 'admin'); INSERT INTO `gen_template` VALUES (15, 'template/plus/i18n/en.ts.vm', '${frontendPath}/src/views/${moduleName}/${functionName}/i18n/en.ts', 'i18n英文模板', 'export default {\n ${functionName}: {\n index: \'#\',\n import${className}Tip: \'import ${ClassName}\',\n#foreach($field in $fieldList)\n ${field.attrName}: \'${field.attrName}\',\n#end\n#foreach($field in $fieldList)\n input$str.pascalCase(${field.attrName})Tip: \'input ${field.attrName}\',\n#end\n }\n}', '2023-02-23 01:20:25', '2023-04-03 18:21:30', '0', 1, '', 'admin'); INSERT INTO `gen_template` VALUES (16, 'template/plus/i18n/zh-cn.ts.vm', '${frontendPath}/src/views/${moduleName}/${functionName}/i18n/zh-cn.ts', 'i18n中文模板', 'export default {\n ${functionName}: {\n index: \'#\',\n import${className}Tip: \'导入${tableComment}\',\n#foreach($field in $fieldList)\n ${field.attrName}: \'#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\',\n#end\n#foreach($field in $fieldList)\n input$str.pascalCase(${field.attrName})Tip: \'请输入#if(${field.fieldComment})${field.fieldComment}#else ${field.attrName}#end\',\n#end\n }\n}', '2023-02-23 01:20:40', '2023-04-03 18:21:42', '0', 1, '', 'admin'); -INSERT INTO `gen_template` VALUES (17, 'template/plus/i18n/form-drawer.vue.vm', '${frontendPath}/src/views/${moduleName}/${functionName}/form.vue', 'vue3表单抽屉页面含i18n', '\n\n', '2023-02-23 12:15:08', '2023-04-02 17:26:43', '0', 1, '', 'admin'); -INSERT INTO `gen_template` VALUES (18, 'template/plus/form-drawer.vue.vm', '${frontendPath}/src/views/${moduleName}/${functionName}/form.vue', 'vue3表单抽屉页面不含i18n', '\n\n', '2023-02-23 12:17:00', '2023-04-02 17:26:08', '0', 1, '', 'admin'); +INSERT INTO `gen_template` VALUES (17, 'template/plus/i18n/form-drawer.vue.vm', '${frontendPath}/src/views/${moduleName}/${functionName}/form.vue', 'vue3表单抽屉页面含i18n', '\n\n', '2023-02-23 12:15:08', '2023-04-10 23:00:16', '0', 1, '', 'admin'); +INSERT INTO `gen_template` VALUES (18, 'template/plus/form-drawer.vue.vm', '${frontendPath}/src/views/${moduleName}/${functionName}/form.vue', 'vue3表单抽屉页面不含i18n', '\n\n', '2023-02-23 12:17:00', '2023-04-10 23:03:31', '0', 1, '', 'admin'); COMMIT; + -- ---------------------------- -- Table structure for gen_template_group -- ---------------------------- diff --git a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/list.ftl b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/list.ftl index b6516ff9c..e4d359dbb 100644 --- a/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/list.ftl +++ b/pigx-visual/pigx-jimu-platform/src/main/resources/templates/jmreport/desreport/list.ftl @@ -140,10 +140,6 @@ 数据报表 - - - 图形报表 - 打印设计 @@ -475,7 +471,7 @@ slot: 'action', className: 'table-background', fixed:'right' - } + } ],//列表的列 }, computed: { @@ -600,7 +596,7 @@ /** * 为路径拼接token * @param url 需要拼接的路径 - * @return 拼接后的token + * @return 拼接后的token */ splicingToken(url){ if(this.token && "null" != this.token){ @@ -677,7 +673,7 @@ //报表设计和模板案例点击事件 tabsClick(name){ this.name="" - this.loadData(name) + this.loadData(name) }, //回车搜索事件 enterSearchClick(){ diff --git a/pigx-visual/pigx-report-platform/pom.xml b/pigx-visual/pigx-report-platform/pom.xml index 9b5d09121..31b84c751 100644 --- a/pigx-visual/pigx-report-platform/pom.xml +++ b/pigx-visual/pigx-report-platform/pom.xml @@ -13,9 +13,9 @@ jar - 基于 aj-report 的大屏设计系统 + 基于 GoView 的大屏设计系统 - 0.0.3 + 0.0.4