From bf07ff57442e3340edcb7fafff3732f63d460591 Mon Sep 17 00:00:00 2001 From: xie7654 <765462425@qq.com> Date: Mon, 7 Jul 2025 00:04:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=86=85=E9=93=BE=E3=80=81?= =?UTF-8?q?=E5=A4=96=E9=93=BE=E3=80=81=E5=85=B3=E4=BA=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/backend/settings.py | 2 +- backend/system/views/menu.py | 4 + sql/django_vue.sql | 26 ++++--- .../src/locales/langs/en-US/examples.json | 74 +++++++++++++++++++ .../src/locales/langs/zh-CN/examples.json | 74 +++++++++++++++++++ .../web-antd/src/views/system/menu/data.ts | 2 +- .../src/views/system/menu/modules/form.vue | 12 +-- .../@core/base/shared/src/constants/vben.ts | 6 +- .../effects/common-ui/src/ui/about/about.vue | 10 +-- 9 files changed, 184 insertions(+), 26 deletions(-) create mode 100644 web/apps/web-antd/src/locales/langs/en-US/examples.json create mode 100644 web/apps/web-antd/src/locales/langs/zh-CN/examples.json diff --git a/backend/backend/settings.py b/backend/backend/settings.py index f628620..7e8abfa 100644 --- a/backend/backend/settings.py +++ b/backend/backend/settings.py @@ -26,7 +26,7 @@ SECRET_KEY = 'django-insecure-m4@pv814c_m^pgpyhz^i96a@mcqh_@m9ccu(17*895t!79e!nb DEBUG = os.getenv('DEBUG', 'True') == 'True' # 演示环境配置 -DEMO_MODE = os.getenv('DEMO_MODE', 'False') == 'False' +DEMO_MODE = os.getenv('DEMO_MODE', 'False').lower() in ('true', '1') ALLOWED_HOSTS = [ '*', diff --git a/backend/system/views/menu.py b/backend/system/views/menu.py index dbc40da..3ada171 100644 --- a/backend/system/views/menu.py +++ b/backend/system/views/menu.py @@ -14,6 +14,7 @@ class MenuMetaSerializer(serializers.ModelSerializer): """菜单元数据序列化器""" hideChildrenInMenu = serializers.SerializerMethodField() hideInMenu = serializers.SerializerMethodField() + iframeSrc = serializers.SerializerMethodField() class Meta: model = MenuMeta @@ -25,6 +26,9 @@ class MenuMetaSerializer(serializers.ModelSerializer): def get_hideInMenu(self, obj): return getattr(obj, 'hide_in_menu', None) + def get_iframeSrc(self, obj): + return getattr(obj, 'iframe_src', None) + class MenuSerializer(CustomModelSerializer): """菜单序列化器""" diff --git a/sql/django_vue.sql b/sql/django_vue.sql index f520155..257a429 100644 --- a/sql/django_vue.sql +++ b/sql/django_vue.sql @@ -11,7 +11,7 @@ Target Server Version : 90300 (9.3.0) File Encoding : 65001 - Date: 04/07/2025 22:51:23 + Date: 07/07/2025 00:04:11 */ SET NAMES utf8mb4; @@ -400,7 +400,7 @@ CREATE TABLE `system_login_log` ( `user_ip` varchar(50) NOT NULL COMMENT '用户 IP', `user_agent` varchar(512) NOT NULL COMMENT '浏览器 UA', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=19 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +) ENGINE=InnoDB AUTO_INCREMENT=23 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; -- ---------------------------- -- Records of system_login_log @@ -424,6 +424,10 @@ INSERT INTO `system_login_log` (`id`, `remark`, `creator`, `modifier`, `update_t INSERT INTO `system_login_log` (`id`, `remark`, `creator`, `modifier`, `update_time`, `create_time`, `is_deleted`, `username`, `result`, `user_ip`, `user_agent`) VALUES (16, NULL, NULL, NULL, '2025-07-04 09:41:07.394602', '2025-07-04 09:41:07.394619', 0, 'chenze', 1, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/138.0.0.0 Safari/537.36'); INSERT INTO `system_login_log` (`id`, `remark`, `creator`, `modifier`, `update_time`, `create_time`, `is_deleted`, `username`, `result`, `user_ip`, `user_agent`) VALUES (17, NULL, NULL, NULL, '2025-07-04 14:46:34.812031', '2025-07-04 14:46:34.812041', 0, 'chenze', 1, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/138.0.0.0 Safari/537.36'); INSERT INTO `system_login_log` (`id`, `remark`, `creator`, `modifier`, `update_time`, `create_time`, `is_deleted`, `username`, `result`, `user_ip`, `user_agent`) VALUES (18, NULL, NULL, NULL, '2025-07-04 14:48:20.347506', '2025-07-04 14:48:20.347516', 0, 'admin', 1, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/138.0.0.0 Safari/537.36'); +INSERT INTO `system_login_log` (`id`, `remark`, `creator`, `modifier`, `update_time`, `create_time`, `is_deleted`, `username`, `result`, `user_ip`, `user_agent`) VALUES (19, NULL, NULL, NULL, '2025-07-05 01:54:03.993248', '2025-07-05 01:54:03.993260', 0, 'chenze', 1, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/138.0.0.0 Safari/537.36'); +INSERT INTO `system_login_log` (`id`, `remark`, `creator`, `modifier`, `update_time`, `create_time`, `is_deleted`, `username`, `result`, `user_ip`, `user_agent`) VALUES (20, NULL, NULL, NULL, '2025-07-05 02:02:58.915096', '2025-07-05 02:02:58.915110', 0, 'admin', 1, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/138.0.0.0 Safari/537.36'); +INSERT INTO `system_login_log` (`id`, `remark`, `creator`, `modifier`, `update_time`, `create_time`, `is_deleted`, `username`, `result`, `user_ip`, `user_agent`) VALUES (21, NULL, NULL, NULL, '2025-07-05 02:03:48.892432', '2025-07-05 02:03:48.892446', 0, 'chenze', 1, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/138.0.0.0 Safari/537.36'); +INSERT INTO `system_login_log` (`id`, `remark`, `creator`, `modifier`, `update_time`, `create_time`, `is_deleted`, `username`, `result`, `user_ip`, `user_agent`) VALUES (22, NULL, NULL, NULL, '2025-07-05 02:03:56.725873', '2025-07-05 02:03:56.725887', 0, 'admin', 1, '127.0.0.1', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/138.0.0.0 Safari/537.36'); COMMIT; -- ---------------------------- @@ -452,7 +456,7 @@ CREATE TABLE `system_menu` ( KEY `system_menu_pid_id_94c9bb14_fk_system_menu_id` (`pid_id`), CONSTRAINT `system_menu_meta_id_3c0f37de_fk_system_menu_meta_id` FOREIGN KEY (`meta_id`) REFERENCES `system_menu_meta` (`id`), CONSTRAINT `system_menu_pid_id_94c9bb14_fk_system_menu_id` FOREIGN KEY (`pid_id`) REFERENCES `system_menu` (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=54 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +) ENGINE=InnoDB AUTO_INCREMENT=55 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; -- ---------------------------- -- Records of system_menu @@ -469,8 +473,8 @@ INSERT INTO `system_menu` (`id`, `remark`, `creator`, `modifier`, `update_time`, INSERT INTO `system_menu` (`id`, `remark`, `creator`, `modifier`, `update_time`, `create_time`, `is_deleted`, `name`, `status`, `type`, `path`, `component`, `auth_code`, `pid_id`, `meta_id`, `sort`) VALUES (9, NULL, NULL, NULL, '2025-06-30 12:59:45.455554', '2025-06-30 12:59:45.455621', 0, 'SystemDeptEdit', 1, 'button', '', '', 'system:dept:edit', 7, 9, 0); INSERT INTO `system_menu` (`id`, `remark`, `creator`, `modifier`, `update_time`, `create_time`, `is_deleted`, `name`, `status`, `type`, `path`, `component`, `auth_code`, `pid_id`, `meta_id`, `sort`) VALUES (10, NULL, NULL, NULL, '2025-06-30 13:00:27.836789', '2025-06-30 13:00:27.836845', 0, 'SystemDeptDelete', 1, 'button', '', '', 'system:dept:delete', 7, 10, 0); INSERT INTO `system_menu` (`id`, `remark`, `creator`, `modifier`, `update_time`, `create_time`, `is_deleted`, `name`, `status`, `type`, `path`, `component`, `auth_code`, `pid_id`, `meta_id`, `sort`) VALUES (12, NULL, NULL, 'admin', '2025-07-03 03:12:19.599531', '2025-06-30 14:14:57.815188', 0, 'About', 1, 'menu', '/about', '_core/about/index', '', NULL, 12, 8); -INSERT INTO `system_menu` (`id`, `remark`, `creator`, `modifier`, `update_time`, `create_time`, `is_deleted`, `name`, `status`, `type`, `path`, `component`, `auth_code`, `pid_id`, `meta_id`, `sort`) VALUES (13, NULL, 'admin', 'admin', '2025-06-30 14:17:50.344871', '2025-06-30 14:17:50.344905', 0, 'Project', 1, 'catalog', '/vben-admin', '', '', NULL, 13, 0); -INSERT INTO `system_menu` (`id`, `remark`, `creator`, `modifier`, `update_time`, `create_time`, `is_deleted`, `name`, `status`, `type`, `path`, `component`, `auth_code`, `pid_id`, `meta_id`, `sort`) VALUES (14, NULL, 'admin', 'admin', '2025-06-30 14:23:46.754262', '2025-06-30 14:23:46.754306', 0, 'VbenDocument', 1, 'embedded', '/vben-admin/document', '', '', 13, 14, 0); +INSERT INTO `system_menu` (`id`, `remark`, `creator`, `modifier`, `update_time`, `create_time`, `is_deleted`, `name`, `status`, `type`, `path`, `component`, `auth_code`, `pid_id`, `meta_id`, `sort`) VALUES (13, NULL, 'admin', 'admin', '2025-07-06 16:01:51.348938', '2025-06-30 14:17:50.344905', 0, 'Project', 1, 'catalog', '/django-vue3-admin', '', '', NULL, 13, 0); +INSERT INTO `system_menu` (`id`, `remark`, `creator`, `modifier`, `update_time`, `create_time`, `is_deleted`, `name`, `status`, `type`, `path`, `component`, `auth_code`, `pid_id`, `meta_id`, `sort`) VALUES (14, NULL, 'admin', 'admin', '2025-07-06 16:01:45.924656', '2025-06-30 14:23:46.754306', 0, 'VbenDocument', 1, 'embedded', '/django-vue3-admin/document', 'IFrameView', '', 13, 14, 0); INSERT INTO `system_menu` (`id`, `remark`, `creator`, `modifier`, `update_time`, `create_time`, `is_deleted`, `name`, `status`, `type`, `path`, `component`, `auth_code`, `pid_id`, `meta_id`, `sort`) VALUES (15, NULL, 'admin', 'admin', '2025-07-01 08:10:19.878461', '2025-07-01 08:10:19.878496', 0, '查询', 1, 'button', '', '', 'system:menu:query', 3, 15, 1); INSERT INTO `system_menu` (`id`, `remark`, `creator`, `modifier`, `update_time`, `create_time`, `is_deleted`, `name`, `status`, `type`, `path`, `component`, `auth_code`, `pid_id`, `meta_id`, `sort`) VALUES (16, NULL, 'admin', 'admin', '2025-07-01 08:17:08.227740', '2025-07-01 08:17:08.227775', 0, '查询', 1, 'button', '', '', 'system:dept:query', 7, 16, 1); INSERT INTO `system_menu` (`id`, `remark`, `creator`, `modifier`, `update_time`, `create_time`, `is_deleted`, `name`, `status`, `type`, `path`, `component`, `auth_code`, `pid_id`, `meta_id`, `sort`) VALUES (17, NULL, 'admin', 'admin', '2025-07-01 09:43:54.210777', '2025-07-01 09:43:54.210831', 0, '分析页', 1, 'menu', '/analytics', '/dashboard/analytics/index', '', 1, 17, 1); @@ -505,6 +509,7 @@ INSERT INTO `system_menu` (`id`, `remark`, `creator`, `modifier`, `update_time`, INSERT INTO `system_menu` (`id`, `remark`, `creator`, `modifier`, `update_time`, `create_time`, `is_deleted`, `name`, `status`, `type`, `path`, `component`, `auth_code`, `pid_id`, `meta_id`, `sort`) VALUES (51, NULL, NULL, NULL, '2025-07-02 08:02:58.020560', '2025-07-02 08:02:58.020564', 0, 'loginlogCreate', 1, 'button', '', '', 'system:login_log:create', 49, 51, 1); INSERT INTO `system_menu` (`id`, `remark`, `creator`, `modifier`, `update_time`, `create_time`, `is_deleted`, `name`, `status`, `type`, `path`, `component`, `auth_code`, `pid_id`, `meta_id`, `sort`) VALUES (52, NULL, NULL, NULL, '2025-07-02 08:02:58.023348', '2025-07-02 08:02:58.023354', 0, 'loginlogEdit', 1, 'button', '', '', 'system:login_log:edit', 49, 52, 2); INSERT INTO `system_menu` (`id`, `remark`, `creator`, `modifier`, `update_time`, `create_time`, `is_deleted`, `name`, `status`, `type`, `path`, `component`, `auth_code`, `pid_id`, `meta_id`, `sort`) VALUES (53, NULL, NULL, NULL, '2025-07-02 08:02:58.024971', '2025-07-02 08:02:58.024976', 0, 'loginlogDelete', 1, 'button', '', '', 'system:login_log:delete', 49, 53, 3); +INSERT INTO `system_menu` (`id`, `remark`, `creator`, `modifier`, `update_time`, `create_time`, `is_deleted`, `name`, `status`, `type`, `path`, `component`, `auth_code`, `pid_id`, `meta_id`, `sort`) VALUES (54, NULL, 'admin', 'admin', '2025-07-06 16:02:20.555780', '2025-07-06 16:00:22.966211', 0, 'VbenGithub', 1, 'embedded', '/django-vue3-admin/github', '', '', 13, 54, 2); COMMIT; -- ---------------------------- @@ -531,7 +536,7 @@ CREATE TABLE `system_menu_meta` ( `hide_children_in_menu` tinyint(1) NOT NULL COMMENT '隐藏子菜单', `hide_in_menu` tinyint(1) NOT NULL COMMENT '隐藏菜单', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=54 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +) ENGINE=InnoDB AUTO_INCREMENT=55 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; -- ---------------------------- -- Records of system_menu_meta @@ -549,8 +554,8 @@ INSERT INTO `system_menu_meta` (`id`, `remark`, `creator`, `modifier`, `update_t INSERT INTO `system_menu_meta` (`id`, `remark`, `creator`, `modifier`, `update_time`, `create_time`, `is_deleted`, `title`, `icon`, `sort`, `affix_tab`, `badge`, `badge_type`, `badge_variants`, `iframe_src`, `link`, `hide_children_in_menu`, `hide_in_menu`) VALUES (10, NULL, NULL, NULL, '2025-06-30 13:00:27.814988', '2025-06-30 13:00:27.815021', 0, 'common.delete', '', 0, 0, '', '', '', '', '', 0, 0); INSERT INTO `system_menu_meta` (`id`, `remark`, `creator`, `modifier`, `update_time`, `create_time`, `is_deleted`, `title`, `icon`, `sort`, `affix_tab`, `badge`, `badge_type`, `badge_variants`, `iframe_src`, `link`, `hide_children_in_menu`, `hide_in_menu`) VALUES (11, NULL, NULL, NULL, '2025-06-30 13:00:28.085386', '2025-06-30 13:00:28.085434', 0, 'common.delete', '', 0, 0, '', '', '', '', '', 0, 0); INSERT INTO `system_menu_meta` (`id`, `remark`, `creator`, `modifier`, `update_time`, `create_time`, `is_deleted`, `title`, `icon`, `sort`, `affix_tab`, `badge`, `badge_type`, `badge_variants`, `iframe_src`, `link`, `hide_children_in_menu`, `hide_in_menu`) VALUES (12, NULL, NULL, NULL, '2025-07-03 03:12:19.592343', '2025-06-30 14:14:57.789248', 0, 'demos.vben.about', 'lucide:copyright', 0, 0, '', '', '', '', '', 0, 0); -INSERT INTO `system_menu_meta` (`id`, `remark`, `creator`, `modifier`, `update_time`, `create_time`, `is_deleted`, `title`, `icon`, `sort`, `affix_tab`, `badge`, `badge_type`, `badge_variants`, `iframe_src`, `link`, `hide_children_in_menu`, `hide_in_menu`) VALUES (13, NULL, NULL, NULL, '2025-06-30 14:17:50.320099', '2025-06-30 14:17:50.320137', 0, 'demos.vben.title', 'carbon:data-center', 0, 0, '', '', '', '', '', 0, 0); -INSERT INTO `system_menu_meta` (`id`, `remark`, `creator`, `modifier`, `update_time`, `create_time`, `is_deleted`, `title`, `icon`, `sort`, `affix_tab`, `badge`, `badge_type`, `badge_variants`, `iframe_src`, `link`, `hide_children_in_menu`, `hide_in_menu`) VALUES (14, NULL, NULL, NULL, '2025-06-30 14:23:46.727547', '2025-06-30 14:23:46.727573', 0, 'demos.vben.document', 'carbon:book', 0, 0, '', '', '', '', '', 0, 0); +INSERT INTO `system_menu_meta` (`id`, `remark`, `creator`, `modifier`, `update_time`, `create_time`, `is_deleted`, `title`, `icon`, `sort`, `affix_tab`, `badge`, `badge_type`, `badge_variants`, `iframe_src`, `link`, `hide_children_in_menu`, `hide_in_menu`) VALUES (13, NULL, NULL, NULL, '2025-07-06 16:01:51.343973', '2025-06-30 14:17:50.320137', 0, 'demos.vben.title', 'carbon:data-center', 0, 0, '', '', '', '', '', 0, 0); +INSERT INTO `system_menu_meta` (`id`, `remark`, `creator`, `modifier`, `update_time`, `create_time`, `is_deleted`, `title`, `icon`, `sort`, `affix_tab`, `badge`, `badge_type`, `badge_variants`, `iframe_src`, `link`, `hide_children_in_menu`, `hide_in_menu`) VALUES (14, NULL, NULL, NULL, '2025-07-06 16:01:45.915788', '2025-06-30 14:23:46.727573', 0, 'demos.vben.document', 'carbon:book', 0, 0, '', '', '', 'https://docs.ywwuzi.cn/', '', 0, 0); INSERT INTO `system_menu_meta` (`id`, `remark`, `creator`, `modifier`, `update_time`, `create_time`, `is_deleted`, `title`, `icon`, `sort`, `affix_tab`, `badge`, `badge_type`, `badge_variants`, `iframe_src`, `link`, `hide_children_in_menu`, `hide_in_menu`) VALUES (15, NULL, NULL, NULL, '2025-07-01 08:10:19.854182', '2025-07-01 08:10:19.854206', 0, '查询', '', 0, 0, '', '', '', '', '', 0, 0); INSERT INTO `system_menu_meta` (`id`, `remark`, `creator`, `modifier`, `update_time`, `create_time`, `is_deleted`, `title`, `icon`, `sort`, `affix_tab`, `badge`, `badge_type`, `badge_variants`, `iframe_src`, `link`, `hide_children_in_menu`, `hide_in_menu`) VALUES (16, NULL, NULL, NULL, '2025-07-01 08:17:08.205093', '2025-07-01 08:17:08.205154', 0, '查询', '', 0, 0, '', '', '', '', '', 0, 0); INSERT INTO `system_menu_meta` (`id`, `remark`, `creator`, `modifier`, `update_time`, `create_time`, `is_deleted`, `title`, `icon`, `sort`, `affix_tab`, `badge`, `badge_type`, `badge_variants`, `iframe_src`, `link`, `hide_children_in_menu`, `hide_in_menu`) VALUES (17, NULL, NULL, NULL, '2025-07-01 09:43:54.186595', '2025-07-01 09:43:54.186661', 0, '分析页', '', 0, 0, '', '', '', '', '', 0, 0); @@ -585,6 +590,7 @@ INSERT INTO `system_menu_meta` (`id`, `remark`, `creator`, `modifier`, `update_t INSERT INTO `system_menu_meta` (`id`, `remark`, `creator`, `modifier`, `update_time`, `create_time`, `is_deleted`, `title`, `icon`, `sort`, `affix_tab`, `badge`, `badge_type`, `badge_variants`, `iframe_src`, `link`, `hide_children_in_menu`, `hide_in_menu`) VALUES (51, NULL, NULL, NULL, '2025-07-02 08:02:58.018239', '2025-07-02 08:02:58.018243', 0, 'common.create', '', 0, 0, '', '', '', '', '', 0, 0); INSERT INTO `system_menu_meta` (`id`, `remark`, `creator`, `modifier`, `update_time`, `create_time`, `is_deleted`, `title`, `icon`, `sort`, `affix_tab`, `badge`, `badge_type`, `badge_variants`, `iframe_src`, `link`, `hide_children_in_menu`, `hide_in_menu`) VALUES (52, NULL, NULL, NULL, '2025-07-02 08:02:58.021897', '2025-07-02 08:02:58.021901', 0, 'common.edit', '', 0, 0, '', '', '', '', '', 0, 0); INSERT INTO `system_menu_meta` (`id`, `remark`, `creator`, `modifier`, `update_time`, `create_time`, `is_deleted`, `title`, `icon`, `sort`, `affix_tab`, `badge`, `badge_type`, `badge_variants`, `iframe_src`, `link`, `hide_children_in_menu`, `hide_in_menu`) VALUES (53, NULL, NULL, NULL, '2025-07-02 08:02:58.024225', '2025-07-02 08:02:58.024229', 0, 'common.delete', '', 0, 0, '', '', '', '', '', 0, 0); +INSERT INTO `system_menu_meta` (`id`, `remark`, `creator`, `modifier`, `update_time`, `create_time`, `is_deleted`, `title`, `icon`, `sort`, `affix_tab`, `badge`, `badge_type`, `badge_variants`, `iframe_src`, `link`, `hide_children_in_menu`, `hide_in_menu`) VALUES (54, NULL, NULL, NULL, '2025-07-06 16:02:20.548920', '2025-07-06 16:00:22.954337', 0, 'Github', 'mdi:github', 0, 0, '', '', '', '', 'https://github.com/XIE7654/django-vue3-admin', 0, 0); COMMIT; -- ---------------------------- @@ -776,8 +782,8 @@ CREATE TABLE `system_users` ( -- Records of system_users -- ---------------------------- BEGIN; -INSERT INTO `system_users` (`id`, `password`, `last_login`, `is_superuser`, `username`, `first_name`, `last_name`, `email`, `is_staff`, `is_active`, `date_joined`, `remark`, `creator`, `modifier`, `update_time`, `create_time`, `is_deleted`, `mobile`, `nickname`, `gender`, `language`, `city`, `province`, `country`, `avatar_url`, `status`, `login_ip`) VALUES (1, 'pbkdf2_sha256$1000000$b8gwLD046kZQIz1VMiUnmN$8/HRWXvV2MawPTME6SBo2bmA+pXYMN375l91lFdIIZE=', '2025-07-04 14:48:20.327087', 1, 'admin', '', '', '765462425@qq.com', 1, 1, '2025-06-29 13:09:47.780431', NULL, NULL, 'admin', '2025-07-04 14:48:13.446261', '2025-06-29 13:09:47.892332', 0, '18888888888', NULL, 0, NULL, NULL, NULL, NULL, NULL, 1, '127.0.0.1'); -INSERT INTO `system_users` (`id`, `password`, `last_login`, `is_superuser`, `username`, `first_name`, `last_name`, `email`, `is_staff`, `is_active`, `date_joined`, `remark`, `creator`, `modifier`, `update_time`, `create_time`, `is_deleted`, `mobile`, `nickname`, `gender`, `language`, `city`, `province`, `country`, `avatar_url`, `status`, `login_ip`) VALUES (2, 'pbkdf2_sha256$1000000$HTigORn4exnjjE2JJqJXy5$c3Ivb+1m+9a5aOnjDJvEEfCcUO1/JfZKYLbnkvJTbBE=', '2025-07-04 14:46:34.788246', 0, 'chenze', '', '', '765462425@qq.com', 0, 1, '2025-07-01 06:25:50.946515', NULL, 'admin', 'admin', '2025-07-03 09:03:50.080498', '2025-07-01 06:25:50.947136', 0, '18677777777', NULL, 0, NULL, NULL, NULL, NULL, NULL, 1, '127.0.0.1'); +INSERT INTO `system_users` (`id`, `password`, `last_login`, `is_superuser`, `username`, `first_name`, `last_name`, `email`, `is_staff`, `is_active`, `date_joined`, `remark`, `creator`, `modifier`, `update_time`, `create_time`, `is_deleted`, `mobile`, `nickname`, `gender`, `language`, `city`, `province`, `country`, `avatar_url`, `status`, `login_ip`) VALUES (1, 'pbkdf2_sha256$1000000$b8gwLD046kZQIz1VMiUnmN$8/HRWXvV2MawPTME6SBo2bmA+pXYMN375l91lFdIIZE=', '2025-07-05 02:03:56.705767', 1, 'admin', '', '', '765462425@qq.com', 1, 1, '2025-06-29 13:09:47.780431', NULL, NULL, 'admin', '2025-07-04 14:48:13.446261', '2025-06-29 13:09:47.892332', 0, '18888888888', NULL, 0, NULL, NULL, NULL, NULL, NULL, 1, '127.0.0.1'); +INSERT INTO `system_users` (`id`, `password`, `last_login`, `is_superuser`, `username`, `first_name`, `last_name`, `email`, `is_staff`, `is_active`, `date_joined`, `remark`, `creator`, `modifier`, `update_time`, `create_time`, `is_deleted`, `mobile`, `nickname`, `gender`, `language`, `city`, `province`, `country`, `avatar_url`, `status`, `login_ip`) VALUES (2, 'pbkdf2_sha256$1000000$MWNyUoBTr4K24ySzXNbQup$eB+xVm6dCqwSVBQV5hIrURgMe2NGFgaeXpsociexCcI=', '2025-07-05 02:03:48.872113', 0, 'chenze', '', '', '765462425@qq.com', 0, 1, '2025-07-01 06:25:50.946515', NULL, 'admin', 'admin', '2025-07-05 02:04:38.567613', '2025-07-01 06:25:50.947136', 0, '18677777776', NULL, 0, NULL, NULL, NULL, NULL, NULL, 1, '127.0.0.1'); COMMIT; -- ---------------------------- diff --git a/web/apps/web-antd/src/locales/langs/en-US/examples.json b/web/apps/web-antd/src/locales/langs/en-US/examples.json new file mode 100644 index 0000000..9335b28 --- /dev/null +++ b/web/apps/web-antd/src/locales/langs/en-US/examples.json @@ -0,0 +1,74 @@ +{ + "title": "Examples", + "modal": { + "title": "Modal" + }, + "drawer": { + "title": "Drawer" + }, + "ellipsis": { + "title": "EllipsisText" + }, + "form": { + "title": "Form", + "basic": "Basic Form", + "layout": "Custom Layout", + "query": "Query Form", + "rules": "Form Rules", + "dynamic": "Dynamic Form", + "custom": "Custom Component", + "api": "Api", + "merge": "Merge Form", + "upload-error": "Partial file upload failed", + "upload-urls": "Urls after file upload", + "file": "file", + "upload-image": "Click to upload image" + }, + "vxeTable": { + "title": "Vxe Table", + "basic": "Basic Table", + "remote": "Remote Load", + "tree": "Tree Table", + "fixed": "Fixed Header/Column", + "virtual": "Virtual Scroll", + "editCell": "Edit Cell", + "editRow": "Edit Row", + "custom-cell": "Custom Cell", + "form": "Form Table" + }, + "captcha": { + "title": "Captcha", + "pointSelection": "Point Selection Captcha", + "sliderCaptcha": "Slider Captcha", + "sliderRotateCaptcha": "Rotate Captcha", + "captchaCardTitle": "Please complete the security verification", + "pageDescription": "Verify user identity by clicking on specific locations in the image.", + "pageTitle": "Captcha Component Example", + "basic": "Basic Usage", + "titlePlaceholder": "Captcha Title Text", + "captchaImageUrlPlaceholder": "Captcha Image (supports img tag src attribute value)", + "hintImage": "Hint Image", + "hintText": "Hint Text", + "hintImagePlaceholder": "Hint Image (supports img tag src attribute value)", + "hintTextPlaceholder": "Hint Text", + "showConfirm": "Show Confirm", + "hideConfirm": "Hide Confirm", + "widthPlaceholder": "Captcha Image Width Default 300px", + "heightPlaceholder": "Captcha Image Height Default 220px", + "paddingXPlaceholder": "Horizontal Padding Default 12px", + "paddingYPlaceholder": "Vertical Padding Default 16px", + "index": "Index:", + "timestamp": "Timestamp:", + "x": "x:", + "y": "y:" + }, + "resize": { + "title": "Resize" + }, + "layout": { + "col-page": "ColPage Layout" + }, + "button-group": { + "title": "Button Group" + } +} diff --git a/web/apps/web-antd/src/locales/langs/zh-CN/examples.json b/web/apps/web-antd/src/locales/langs/zh-CN/examples.json new file mode 100644 index 0000000..ff11d7f --- /dev/null +++ b/web/apps/web-antd/src/locales/langs/zh-CN/examples.json @@ -0,0 +1,74 @@ +{ + "title": "示例", + "modal": { + "title": "弹窗" + }, + "drawer": { + "title": "抽屉" + }, + "ellipsis": { + "title": "文本省略" + }, + "resize": { + "title": "拖动调整" + }, + "form": { + "title": "表单", + "basic": "基础表单", + "layout": "自定义布局", + "query": "查询表单", + "rules": "表单校验", + "dynamic": "动态表单", + "custom": "自定义组件", + "api": "Api", + "merge": "合并表单", + "upload-error": "部分文件上传失败", + "upload-urls": "文件上传后的网址", + "file": "文件", + "upload-image": "点击上传图片" + }, + "vxeTable": { + "title": "Vxe 表格", + "basic": "基础表格", + "remote": "远程加载", + "tree": "树形表格", + "fixed": "固定表头/列", + "virtual": "虚拟滚动", + "editCell": "单元格编辑", + "editRow": "行编辑", + "custom-cell": "自定义单元格", + "form": "搜索表单" + }, + "captcha": { + "title": "验证码", + "pointSelection": "点选验证", + "sliderCaptcha": "滑块验证", + "sliderRotateCaptcha": "旋转验证", + "captchaCardTitle": "请完成安全验证", + "pageDescription": "通过点击图片中的特定位置来验证用户身份。", + "pageTitle": "验证码组件示例", + "basic": "基本使用", + "titlePlaceholder": "验证码标题文案", + "captchaImageUrlPlaceholder": "验证码图片（支持img标签src属性值）", + "hintImage": "提示图片", + "hintText": "提示文本", + "hintImagePlaceholder": "提示图片（支持img标签src属性值）", + "hintTextPlaceholder": "提示文本", + "showConfirm": "展示确认", + "hideConfirm": "隐藏确认", + "widthPlaceholder": "验证码图片宽度 默认300px", + "heightPlaceholder": "验证码图片高度 默认220px", + "paddingXPlaceholder": "水平内边距 默认12px", + "paddingYPlaceholder": "垂直内边距 默认16px", + "index": "索引：", + "timestamp": "时间戳：", + "x": "x：", + "y": "y：" + }, + "layout": { + "col-page": "双列布局" + }, + "button-group": { + "title": "按钮组" + } +} diff --git a/web/apps/web-antd/src/views/system/menu/data.ts b/web/apps/web-antd/src/views/system/menu/data.ts index 208d411..fe9aa05 100644 --- a/web/apps/web-antd/src/views/system/menu/data.ts +++ b/web/apps/web-antd/src/views/system/menu/data.ts @@ -2,7 +2,7 @@ import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { SystemMenuApi } from '#/api/system/menu'; import { $t } from '#/locales'; -import {op} from "#/utils/permission"; +import { op } from '#/utils/permission'; export function getMenuTypeOptions() { return [ diff --git a/web/apps/web-antd/src/views/system/menu/modules/form.vue b/web/apps/web-antd/src/views/system/menu/modules/form.vue index 6964958..2d04295 100644 --- a/web/apps/web-antd/src/views/system/menu/modules/form.vue +++ b/web/apps/web-antd/src/views/system/menu/modules/form.vue @@ -238,7 +238,7 @@ const schema: VbenFormSchema[] = [ }, triggerFields: ['type'], }, - fieldName: 'linkSrc', + fieldName: 'link', label: $t('system.menu.linkSrc'), rules: z.string().url($t('ui.formRules.invalidURL')), }, @@ -468,9 +468,9 @@ const [Drawer, drawerApi] = useVbenDrawer({ if (isOpen) { const data = drawerApi.getData(); if (data?.type === 'link') { - data.linkSrc = data.meta?.link; + data.link = data.meta?.link; } else if (data?.type === 'embedded') { - data.linkSrc = data.meta?.iframeSrc; + data.link = data.meta?.iframe_src; } if (data) { formData.value = data; @@ -495,11 +495,11 @@ async function onSubmit() { Omit >(); if (data.type === 'link') { - data.meta = { ...data.meta, link: data.linkSrc }; + data.meta = { ...data.meta, link: data.link }; } else if (data.type === 'embedded') { - data.meta = { ...data.meta, iframeSrc: data.linkSrc }; + data.meta = { ...data.meta, iframeSrc: data.link }; } - delete data.linkSrc; + delete data.link; try { await (formData.value?.id ? updateMenu(formData.value.id, data) diff --git a/web/packages/@core/base/shared/src/constants/vben.ts b/web/packages/@core/base/shared/src/constants/vben.ts index 0f6cbbe..afda469 100644 --- a/web/packages/@core/base/shared/src/constants/vben.ts +++ b/web/packages/@core/base/shared/src/constants/vben.ts @@ -1,12 +1,12 @@ /** * @zh_CN GITHUB 仓库地址 */ -export const VBEN_GITHUB_URL = 'https://github.com/vbenjs/vue-vben-admin'; +export const VBEN_GITHUB_URL = 'https://github.com/xie7654/django-vue3-admin'; /** * @zh_CN 文档地址 */ -export const VBEN_DOC_URL = 'https://doc.vben.pro'; +export const VBEN_DOC_URL = 'https://docs.ywwuzi.cn/'; /** * @zh_CN Vben Logo @@ -17,7 +17,7 @@ export const VBEN_LOGO_URL = /** * @zh_CN Vben Admin 首页地址 */ -export const VBEN_PREVIEW_URL = 'https://www.vben.pro'; +export const VBEN_PREVIEW_URL = 'https://demo.ywwuzi.cn/'; export const VBEN_ELE_PREVIEW_URL = 'https://ele.vben.pro'; diff --git a/web/packages/effects/common-ui/src/ui/about/about.vue b/web/packages/effects/common-ui/src/ui/about/about.vue index bee8b34..b19e1e7 100644 --- a/web/packages/effects/common-ui/src/ui/about/about.vue +++ b/web/packages/effects/common-ui/src/ui/about/about.vue @@ -21,8 +21,8 @@ defineOptions({ withDefaults(defineProps(), { description: - '是一个现代化开箱即用的中后台解决方案，采用最新的技术栈，包括 Vue 3.0、Vite、TailwindCSS 和 TypeScript 等前沿技术，代码规范严谨，提供丰富的配置选项，旨在为中大型项目的开发提供现成的开箱即用解决方案及丰富的示例，同时，它也是学习和深入前端技术的一个极佳示例。', - name: 'Vben Admin', + '本项目为基于 Django5 + Vue3（vben-admin）全栈开发的企业级中后台管理系统，支持动态菜单、按钮权限、自动化代码生成、前后端权限联动等功能，适用于多角色、多权限场景的管理后台。\n', + name: 'Django Vue3 Admin', title: '关于项目', }); @@ -76,7 +76,7 @@ const vbenDescriptionItems: DescriptionItem[] = [ title: '最后构建时间', }, { - content: renderLink(homepage, '点击查看'), + content: renderLink(VBEN_PREVIEW_URL, '点击查看'), title: '主页', }, { @@ -93,8 +93,8 @@ const vbenDescriptionItems: DescriptionItem[] = [ }, { content: h('div', [ - renderLink(authorUrl, `${authorName} `), - renderLink(`mailto:${authorEmail}`, authorEmail), + renderLink(authorUrl, `XIE7654 `), + renderLink(`mailto:${authorEmail}`, '765462425@qq.com'), ]), title: '作者', },