diff --git a/backend/src/main/resources/db/migration/V44__1.17.sql b/backend/src/main/resources/db/migration/V44__1.17.sql
index d8c2c0778b..a94905a739 100644
--- a/backend/src/main/resources/db/migration/V44__1.17.sql
+++ b/backend/src/main/resources/db/migration/V44__1.17.sql
@@ -41,9 +41,14 @@ ALTER TABLE `panel_group`
ADD COLUMN `panel_sort` bigint(13) NULL COMMENT '排序' AFTER `watermark_open`;
ALTER TABLE `sys_task_email`
- CHANGE COLUMN `content` `content` MEDIUMBLOB NULL DEFAULT NULL COMMENT '内容' ;
+ CHANGE COLUMN `content` `content` MEDIUMBLOB NULL DEFAULT NULL COMMENT '内容';
ALTER TABLE `dataset_table_field`
ADD COLUMN `date_format_type` VARCHAR(255) NULL COMMENT '时间格式类型' AFTER `date_format`;
+update panel_app_template
+set name ='JumpServer 运维安全审计大屏'
+where id = '3986ba4c-5a8e-11ed-bc5b-cf4a43b3b40c';
+
+
update `my_plugin` set `name` = '气泡地图插件' where `plugin_id` = 2;
diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index d020e604cf..eba9278892 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -807,6 +807,7 @@ export default {
edite_organization: 'Edit organization'
},
system_parameter_setting: {
+ edit_success: 'Edit success',
mailbox_service_settings: 'Mail Setting',
test_connection: 'Test connection',
SMTP_host: 'SMTP Host',
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index 3142da7f5f..044f558847 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -807,6 +807,7 @@ export default {
edite_organization: '編輯組織'
},
system_parameter_setting: {
+ edit_success: '編輯成功',
mailbox_service_settings: '郵件設置',
test_connection: '測試連接',
SMTP_host: 'SMTP主機',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index 25d540156e..e6aa2f1550 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -806,6 +806,7 @@ export default {
edite_organization: '编辑组织'
},
system_parameter_setting: {
+ edit_success: '编辑成功',
mailbox_service_settings: '邮件设置',
test_connection: '测试连接',
SMTP_host: 'SMTP主机',
diff --git a/frontend/src/views/panel/appTemplate/AppTemplateContent.vue b/frontend/src/views/panel/appTemplate/AppTemplateContent.vue
index 879fb8747a..11dd2311cb 100644
--- a/frontend/src/views/panel/appTemplate/AppTemplateContent.vue
+++ b/frontend/src/views/panel/appTemplate/AppTemplateContent.vue
@@ -77,7 +77,7 @@
:label="dialogTitleLabel"
prop="name"
>
-
+
-
+
-
+
@@ -186,13 +186,15 @@ export default {
const erd = elementResizeDetectorMaker()
const templateMainDom = document.getElementById('template-main')
// 监听div变动事件
- erd.listenTo(templateMainDom, element => {
- _this.$nextTick(() => {
- const curSeparator = Math.trunc(templateMainDom.offsetWidth / _this.templateMiniWidth)
- _this.templateSpan = (100 / Math.trunc(templateMainDom.offsetWidth / _this.templateMiniWidth)) + '%'
- _this.templateCurWidth = Math.trunc(templateMainDom.offsetWidth / curSeparator) - 33
+ if (templateMainDom) {
+ erd.listenTo(templateMainDom, element => {
+ _this.$nextTick(() => {
+ const curSeparator = Math.trunc(templateMainDom.offsetWidth / _this.templateMiniWidth)
+ _this.templateSpan = (100 / Math.trunc(templateMainDom.offsetWidth / _this.templateMiniWidth)) + '%'
+ _this.templateCurWidth = Math.trunc(templateMainDom.offsetWidth / curSeparator) - 33
+ })
})
- })
+ }
},
methods: {
applyNew(item) {
diff --git a/frontend/src/views/panel/templateMarket/index.vue b/frontend/src/views/panel/templateMarket/index.vue
index e90946f5af..142ca95e2c 100644
--- a/frontend/src/views/panel/templateMarket/index.vue
+++ b/frontend/src/views/panel/templateMarket/index.vue
@@ -130,20 +130,22 @@
{{ $t('commons.cancel') }}
+ >{{ $t('commons.cancel') }}
+
{{ $t('commons.confirm') }}
+ >{{ $t('commons.confirm') }}
+