From 30474f03e2afce1b558a742b781f9a677d30c3ed Mon Sep 17 00:00:00 2001 From: aeizzz <1129603149@qq.com> Date: Mon, 19 Dec 2022 17:41:15 +0800 Subject: [PATCH] =?UTF-8?q?=20:bug:=20Fixing=20a=20bug.=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E9=97=AE=E9=A2=98=EF=BC=9B=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/2pigxx.sql | 1 - db/update/update.sql | 1 - .../main/resources/template/avue/crud.js.vm | 27 ++++++++++--------- .../main/resources/template/avue/index.vue.vm | 2 +- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/db/2pigxx.sql b/db/2pigxx.sql index 8e5979eb7..544307319 100644 --- a/db/2pigxx.sql +++ b/db/2pigxx.sql @@ -506,7 +506,6 @@ INSERT INTO `sys_menu` VALUES (1601051690644447233, '秘钥管理', NULL, '/app/ INSERT INTO `sys_menu` VALUES (1601051800774287362, '删除秘钥', 'app_social_details_del', NULL, 1601051690644447233, NULL, '1', 999, '0', '1', 'admin', '2022-12-09 11:11:10', ' ', NULL, '0', 1); INSERT INTO `sys_menu` VALUES (1601051844994834433, '修改秘钥', 'app_social_details_edit', NULL, 1601051690644447233, NULL, '1', 999, '0', '1', 'admin', '2022-12-09 11:11:21', ' ', NULL, '0', 1); INSERT INTO `sys_menu` VALUES (1601051895175487489, '保存秘钥', 'app_social_details_add', NULL, 1601051690644447233, NULL, '1', 999, '0', '1', 'admin', '2022-12-09 11:11:33', ' ', NULL, '0', 1); -INSERT INTO `sys_menu` VALUES (1601095373834067969, '租户菜单', NULL, '/admin/tenantmenu/index', 1000, 'icon-caidanguanli', '0', 7, '0', '0', 'admin', '2022-12-09 14:04:19', 'admin', '2022-12-12 09:00:04', '1', 1); INSERT INTO `sys_menu` VALUES (1601095530717814785, '租户菜单新增', 'admin_systenantmenu_add', NULL, 1602106377770541057, NULL, '1', 1, '0', '1', 'admin', '2022-12-09 14:04:19', 'admin', '2022-12-12 09:02:00', '0', 1); INSERT INTO `sys_menu` VALUES (1601095569972305921, '租户菜单编辑', 'admin_systenantmenu_edit', NULL, 1602106377770541057, NULL, '1', 999, '0', '1', 'admin', '2022-12-09 14:04:19', 'admin', '2022-12-12 09:02:11', '0', 1); INSERT INTO `sys_menu` VALUES (1601095611131011073, '租户菜单删除', 'admin_systenantmenu_del', NULL, 1602106377770541057, NULL, '1', 999, '0', '1', 'admin', '2022-12-09 14:04:19', 'admin', '2022-12-12 09:02:06', '0', 1); diff --git a/db/update/update.sql b/db/update/update.sql index 6eb0fa0ac..f8913f922 100644 --- a/db/update/update.sql +++ b/db/update/update.sql @@ -52,7 +52,6 @@ INSERT INTO `sys_menu` VALUES (1601051690644447233, '秘钥管理', NULL, '/app/ INSERT INTO `sys_menu` VALUES (1601051800774287362, '删除秘钥', 'app_social_details_del', NULL, 1601051690644447233, NULL, '1', 999, '0', '1', 'admin', '2022-12-09 11:11:10', ' ', NULL, '0', 1); INSERT INTO `sys_menu` VALUES (1601051844994834433, '修改秘钥', 'app_social_details_edit', NULL, 1601051690644447233, NULL, '1', 999, '0', '1', 'admin', '2022-12-09 11:11:21', ' ', NULL, '0', 1); INSERT INTO `sys_menu` VALUES (1601051895175487489, '保存秘钥', 'app_social_details_add', NULL, 1601051690644447233, NULL, '1', 999, '0', '1', 'admin', '2022-12-09 11:11:33', ' ', NULL, '0', 1); -INSERT INTO `sys_menu` VALUES (1601095373834067969, '租户菜单', NULL, '/admin/tenantmenu/index', 1000, 'icon-caidanguanli', '0', 7, '0', '0', 'admin', '2022-12-09 14:04:19', 'admin', '2022-12-12 09:00:04', '1', 1); INSERT INTO `sys_menu` VALUES (1601095530717814785, '租户菜单新增', 'admin_systenantmenu_add', NULL, 1602106377770541057, NULL, '1', 1, '0', '1', 'admin', '2022-12-09 14:04:19', 'admin', '2022-12-12 09:02:00', '0', 1); INSERT INTO `sys_menu` VALUES (1601095569972305921, '租户菜单编辑', 'admin_systenantmenu_edit', NULL, 1602106377770541057, NULL, '1', 999, '0', '1', 'admin', '2022-12-09 14:04:19', 'admin', '2022-12-12 09:02:11', '0', 1); INSERT INTO `sys_menu` VALUES (1601095611131011073, '租户菜单删除', 'admin_systenantmenu_del', NULL, 1602106377770541057, NULL, '1', 999, '0', '1', 'admin', '2022-12-09 14:04:19', 'admin', '2022-12-12 09:02:06', '0', 1); diff --git a/pigx-visual/pigx-codegen/src/main/resources/template/avue/crud.js.vm b/pigx-visual/pigx-codegen/src/main/resources/template/avue/crud.js.vm index 0abf8c0e7..88de19521 100644 --- a/pigx-visual/pigx-codegen/src/main/resources/template/avue/crud.js.vm +++ b/pigx-visual/pigx-codegen/src/main/resources/template/avue/crud.js.vm @@ -1,19 +1,20 @@ export const tableOption = { - "border": true, - "index": true, - "indexLabel": "序号", - "stripe": true, - "menuAlign": "center", - "align": "center", - "searchMenuSpan": 6, - "column": [ + 'border': true, + 'index': true, + 'indexLabel': '序号', + 'stripe': true, + 'menuAlign': 'center', + 'align': 'center', + 'searchMenuSpan': 6, + 'column': [ #foreach ($column in $columns) - { - "type": "input", - "label": "$column.comments", - "prop": "$column.lowerAttrName", - "span": 12 + { + 'type': 'input', + 'label': '$column.comments', + 'prop': '$column.lowerAttrName', + 'span': 12 }#if($foreach.hasNext),#end #end ] } + diff --git a/pigx-visual/pigx-codegen/src/main/resources/template/avue/index.vue.vm b/pigx-visual/pigx-codegen/src/main/resources/template/avue/index.vue.vm index 8a9b7715d..4bc5518cd 100755 --- a/pigx-visual/pigx-codegen/src/main/resources/template/avue/index.vue.vm +++ b/pigx-visual/pigx-codegen/src/main/resources/template/avue/index.vue.vm @@ -48,7 +48,7 @@