diff --git a/mayfly_go_web/src/common/config.ts b/mayfly_go_web/src/common/config.ts index 92770733..e73f0aca 100644 --- a/mayfly_go_web/src/common/config.ts +++ b/mayfly_go_web/src/common/config.ts @@ -15,7 +15,7 @@ const config = { baseWsUrl: `${(window as any).globalConfig.BaseWsUrl || `${location.protocol == 'https:' ? 'wss:' : 'ws:'}//${getBaseApiUrl()}`}/api`, // 系统版本 - version: 'v1.7.1', + version: 'v1.7.2', }; export default config; diff --git a/mayfly_go_web/src/views/ops/db/component/table/DbTableData.vue b/mayfly_go_web/src/views/ops/db/component/table/DbTableData.vue index 00d876c4..02750199 100644 --- a/mayfly_go_web/src/views/ops/db/component/table/DbTableData.vue +++ b/mayfly_go_web/src/views/ops/db/component/table/DbTableData.vue @@ -46,14 +46,6 @@ {{ column.title }} - - - - @@ -71,6 +63,13 @@ {{ column.title }} + + +
+ + + +
@@ -874,7 +873,13 @@ defineExpose({ position: absolute; top: -5px; padding: 2px; - height: 12px; + } + + .column-right { + position: absolute; + top: 2px; + right: 0; + padding: 2px; } } diff --git a/mayfly_go_web/src/views/ops/db/component/table/DbTableDataOp.vue b/mayfly_go_web/src/views/ops/db/component/table/DbTableDataOp.vue index 727bde8a..dbf56235 100644 --- a/mayfly_go_web/src/views/ops/db/component/table/DbTableDataOp.vue +++ b/mayfly_go_web/src/views/ops/db/component/table/DbTableDataOp.vue @@ -197,13 +197,10 @@ /> - - - - - - - 总 {{ state.total }} 条 + + + {{ state.showTotal ? `${state.total} 条` : 'count' }} + diff --git a/server/pkg/config/app.go b/server/pkg/config/app.go index 509aec5f..bcb099a9 100644 --- a/server/pkg/config/app.go +++ b/server/pkg/config/app.go @@ -4,7 +4,7 @@ import "fmt" const ( AppName = "mayfly-go" - Version = "v1.7.1" + Version = "v1.7.2" ) func GetAppInfo() string { diff --git a/server/resources/data/mayfly-go.sqlite b/server/resources/data/mayfly-go.sqlite index 7bb96966..7ed16d6e 100644 Binary files a/server/resources/data/mayfly-go.sqlite and b/server/resources/data/mayfly-go.sqlite differ diff --git a/server/resources/script/sql/mayfly-go-sqlite.sql b/server/resources/script/sql/mayfly-go-sqlite.sql index 6a9b68d8..13c36ece 100644 --- a/server/resources/script/sql/mayfly-go-sqlite.sql +++ b/server/resources/script/sql/mayfly-go-sqlite.sql @@ -52,6 +52,7 @@ CREATE TABLE IF NOT EXISTS "t_db_backup" ( "interval" integer(20), "start_time" datetime, "enabled" integer(1), + "enabled_desc" text(64), "last_status" integer(4), "last_result" text(256), "last_time" datetime, @@ -80,6 +81,8 @@ CREATE TABLE IF NOT EXISTS "t_db_backup_history" ( "create_time" datetime, "is_deleted" integer(1) NOT NULL, "delete_time" datetime, + "restoring" integer(1), + "deleting" integer(1), PRIMARY KEY ("id") ); @@ -196,6 +199,7 @@ CREATE TABLE IF NOT EXISTS "t_db_restore" ( "interval" integer(20), "start_time" datetime, "enabled" integer(1), + "enabled_desc" text(64), "last_status" integer(4), "last_result" text(256), "last_time" datetime, @@ -826,6 +830,8 @@ INSERT INTO t_sys_resource (id, pid, ui_path, type, status, name, code, weight, INSERT INTO t_sys_resource (id, pid, ui_path, type, status, name, code, weight, meta, creator_id, creator, modifier_id, modifier, create_time, update_time, is_deleted, delete_time) VALUES (153, 150, 'Jra0n7De/pLOA2UYz/', 2, 1, '删除', 'db:sync:del', 1703641342, 'null', 12, 'liuzongyang', 12, 'liuzongyang', '2023-12-27 09:42:22', '2023-12-27 09:42:22', 0, NULL); INSERT INTO t_sys_resource (id, pid, ui_path, type, status, name, code, weight, meta, creator_id, creator, modifier_id, modifier, create_time, update_time, is_deleted, delete_time) VALUES (154, 150, 'Jra0n7De/VBt68CDx/', 2, 1, '启停', 'db:sync:status', 1703641364, 'null', 12, 'liuzongyang', 12, 'liuzongyang', '2023-12-27 09:42:45', '2023-12-27 09:42:45', 0, NULL); INSERT INTO t_sys_resource (id, pid, ui_path, type, status, name, code, weight, meta, creator_id, creator, modifier_id, modifier, create_time, update_time, is_deleted, delete_time) VALUES (155, 150, 'Jra0n7De/PigmSGVg/', 2, 1, '日志', 'db:sync:log', 1704266866, 'null', 12, 'liuzongyang', 12, 'liuzongyang', '2024-01-03 15:27:47', '2024-01-03 15:27:47', 0, NULL); +INSERT INTO t_sys_resource (id, pid, ui_path, type, status, name, code, weight, meta, creator_id, creator, modifier_id, modifier, create_time, update_time, is_deleted, delete_time) VALUES (161, 49, 'dbms23ax/xleaiec2/3NUXQFIO/', 2, 1, '数据库备份', 'db:backup', 1705973876, 'null', 1, 'admin', 1, 'admin', '2024-01-23 09:37:56', '2024-01-23 09:37:56', 0, NULL); +INSERT INTO t_sys_resource (id, pid, ui_path, type, status, name, code, weight, meta, creator_id, creator, modifier_id, modifier, create_time, update_time, is_deleted, delete_time) VALUES (160, 49, 'dbms23ax/xleaiec2/ghErkTdb/', 2, 1, '数据库恢复', 'db:restore', 1705973909, 'null', 1, 'admin', 1, 'admin', '2024-01-23 09:38:29', '2024-01-23 09:38:29', 0, NULL); -- Table: t_sys_role CREATE TABLE IF NOT EXISTS "t_sys_role" ( diff --git a/server/resources/script/sql/mayfly-go.sql b/server/resources/script/sql/mayfly-go.sql index 3e3f55be..b6522bde 100644 --- a/server/resources/script/sql/mayfly-go.sql +++ b/server/resources/script/sql/mayfly-go.sql @@ -110,6 +110,7 @@ CREATE TABLE `t_db_backup` ( `interval` bigint(20) DEFAULT NULL COMMENT '备份周期', `start_time` datetime DEFAULT NULL COMMENT '首次备份时间', `enabled` tinyint(1) DEFAULT NULL COMMENT '是否启用', + `enabled_desc` varchar(64) NULL COMMENT '任务启用描述', `last_status` tinyint(4) DEFAULT NULL COMMENT '上次备份状态', `last_result` varchar(256) DEFAULT NULL COMMENT '上次备份结果', `last_time` datetime DEFAULT NULL COMMENT '上次备份时间', @@ -143,6 +144,8 @@ CREATE TABLE `t_db_backup_history` ( `create_time` datetime DEFAULT NULL COMMENT '历史备份创建时间', `is_deleted` tinyint(1) NOT NULL DEFAULT 0, `delete_time` datetime DEFAULT NULL, + `restoring` int(1) NOT NULL DEFAULT '0' COMMENT '备份历史恢复标识', + `deleting` int(1) NOT NULL DEFAULT '0' COMMENT '备份历史删除标识', PRIMARY KEY (`id`), KEY `idx_db_backup_id` (`db_backup_id`) USING BTREE, KEY `idx_db_instance_id` (`db_instance_id`) USING BTREE, @@ -161,6 +164,7 @@ CREATE TABLE `t_db_restore` ( `interval` bigint(20) DEFAULT NULL COMMENT '恢复周期', `start_time` datetime DEFAULT NULL COMMENT '首次恢复时间', `enabled` tinyint(1) DEFAULT NULL COMMENT '是否启用', + `enabled_desc` varchar(64) NULL COMMENT '任务启用描述', `last_status` tinyint(4) DEFAULT NULL COMMENT '上次恢复状态', `last_result` varchar(256) DEFAULT NULL COMMENT '上次恢复结果', `last_time` datetime DEFAULT NULL COMMENT '上次恢复时间', @@ -570,7 +574,7 @@ CREATE TABLE `t_sys_account` ( -- Records of t_sys_account -- ---------------------------- BEGIN; -INSERT INTO `t_sys_account` VALUES (1, "管理员", 'admin', '$2a$10$w3Wky2U.tinvR7c/s0aKPuwZsIu6pM1/DMJalwBDMbE6niHIxVrrm', 1, '', '2022-10-26 20:03:48', '::1', '2020-01-01 19:00:00', 1, 'admin', '2020-01-01 19:00:00', 1, 'admin', 0, NULL); +INSERT INTO `t_sys_account` VALUES (1, '管理员', 'admin', '$2a$10$w3Wky2U.tinvR7c/s0aKPuwZsIu6pM1/DMJalwBDMbE6niHIxVrrm', 1, '', '2022-10-26 20:03:48', '::1', '2020-01-01 19:00:00', 1, 'admin', '2020-01-01 19:00:00', 1, 'admin', 0, NULL); COMMIT; -- ---------------------------- @@ -788,6 +792,8 @@ INSERT INTO t_sys_resource (id, pid, ui_path, `type`, status, name, code, weight INSERT INTO t_sys_resource (id, pid, ui_path, `type`, status, name, code, weight, meta, creator_id, creator, modifier_id, modifier, create_time, update_time, is_deleted, delete_time) VALUES(152, 150, 'Jra0n7De/zvAMo2vk/', 2, 1, '编辑', 'db:sync:save', 1703641320, 'null', 12, 'liuzongyang', 12, 'liuzongyang', '2023-12-27 09:42:00', '2023-12-27 09:42:12', 0, NULL); INSERT INTO t_sys_resource (id, pid, ui_path, `type`, status, name, code, weight, meta, creator_id, creator, modifier_id, modifier, create_time, update_time, is_deleted, delete_time) VALUES(151, 150, 'Jra0n7De/uAnHZxEV/', 2, 1, '基本权限', 'db:sync', 1703641202, 'null', 12, 'liuzongyang', 12, 'liuzongyang', '2023-12-27 09:40:02', '2023-12-27 09:40:02', 0, NULL); INSERT INTO t_sys_resource (id, pid, ui_path, `type`, status, name, code, weight, meta, creator_id, creator, modifier_id, modifier, create_time, update_time, is_deleted, delete_time) VALUES(150, 36, 'Jra0n7De/', 1, 1, '数据同步', 'sync', 1693040707, '{"component":"ops/db/SyncTaskList","icon":"Coin","isKeepAlive":true,"routeName":"SyncTaskList"}', 12, 'liuzongyang', 12, 'liuzongyang', '2023-12-22 09:51:34', '2023-12-27 10:16:57', 0, NULL); +INSERT INTO t_sys_resource (id, pid, ui_path, `type`, status, name, code, weight, meta, creator_id, creator, modifier_id, modifier, create_time, update_time, is_deleted, delete_time) VALUES(161, 49, 'dbms23ax/xleaiec2/3NUXQFIO/', 2, 1, '数据库备份', 'db:backup', 1705973876, 'null', 1, 'admin', 1, 'admin', '2024-01-23 09:37:56', '2024-01-23 09:37:56', 0, NULL); +INSERT INTO t_sys_resource (id, pid, ui_path, `type`, status, name, code, weight, meta, creator_id, creator, modifier_id, modifier, create_time, update_time, is_deleted, delete_time) VALUES(160, 49, 'dbms23ax/xleaiec2/ghErkTdb/', 2, 1, '数据库恢复', 'db:restore', 1705973909, 'null', 1, 'admin', 1, 'admin', '2024-01-23 09:38:29', '2024-01-23 09:38:29', 0, NULL); COMMIT; -- ---------------------------- diff --git a/server/resources/script/sql/v1.7/v1.7.2.sql b/server/resources/script/sql/v1.7/v1.7.2.sql index 4773d597..0af8c9ba 100644 --- a/server/resources/script/sql/v1.7/v1.7.2.sql +++ b/server/resources/script/sql/v1.7/v1.7.2.sql @@ -9,5 +9,5 @@ ALTER TABLE `t_db_restore` ADD COLUMN `enabled_desc` varchar(64) NULL COMMENT '任务启用描述' AFTER `enabled`; ALTER TABLE `t_db_backup_history` - ADD COLUMN `restoring` int(1) NOT NULL DEFAULT(0) COMMENT '备份历史恢复标识', - ADD COLUMN `deleting` int(1) NOT NULL DEFAULT(0) COMMENT '备份历史删除标识'; + ADD COLUMN `restoring` int(1) NOT NULL DEFAULT '0' COMMENT '备份历史恢复标识', + ADD COLUMN `deleting` int(1) NOT NULL DEFAULT '0' COMMENT '备份历史删除标识';