Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	backend/src/main/resources/db/migration/V44__1.17.sql

backend/src/main/resources/db/migration/V44__1.17.sql

@@ -46,4 +46,9 @@ ALTER TABLE `sys_task_email`
 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;

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',

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主機',

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主机',

frontend/src/views/panel/appTemplate/AppTemplateContent.vue

@@ -154,7 +154,7 @@
 import TemplateList from './component/TemplateList'
 import TemplateItem from './component/TemplateItem'
 import TemplateImport from './component/TemplateImport'
-import { save, update, templateDelete, find } from '@/api/system/appTemplate'
+import { find, save, templateDelete, update } from '@/api/system/appTemplate'
 import elementResizeDetectorMaker from 'element-resize-detector'
 import msgCfm from '@/components/msgCfm/index'
 import { uploadFileResult } from '@/api/staticResource/staticResource'
@@ -364,7 +364,7 @@ export default {
               : 'edit_template'
           }`
         )
-        this.originName = this.templateEditForm.label
+        this.originName = this.templateEditForm.name
       } else {
         this.fileList = []
         this.dialogTitle = this.$t('panel.add_app_category')
@@ -398,7 +398,7 @@ export default {
             this.openMessageSuccess(
               `system_parameter_setting.${
                 this.templateEditForm.id
-                  ? 'rename_succeeded'
+                  ? 'edit_success'
                   : 'added_successfully'
               }`
             )

frontend/src/views/panel/appTemplateMarket/index.vue

@@ -186,6 +186,7 @@ export default {
     const erd = elementResizeDetectorMaker()
     const templateMainDom = document.getElementById('template-main')
     // 监听div变动事件
+    if (templateMainDom) {
       erd.listenTo(templateMainDom, element => {
         _this.$nextTick(() => {
           const curSeparator = Math.trunc(templateMainDom.offsetWidth / _this.templateMiniWidth)
@@ -193,6 +194,7 @@ export default {
           _this.templateCurWidth = Math.trunc(templateMainDom.offsetWidth / curSeparator) - 33
         })
       })
+    }
   },
   methods: {
     applyNew(item) {

frontend/src/views/panel/templateMarket/index.vue

@@ -130,20 +130,22 @@
         <el-button
           size="mini"
           @click="folderSelectShow=false"
-        >{{ $t('commons.cancel') }}</el-button>
+        >{{ $t('commons.cancel') }}
+        </el-button>
         <el-button
           size="mini"
           type="primary"
           :disabled="!panelForm.name || !panelForm.pid"
           @click="apply"
-        >{{ $t('commons.confirm') }}</el-button>
+        >{{ $t('commons.confirm') }}
+        </el-button>
       </div>
     </el-dialog>
   </el-row>
 </template>
 
 <script>
-import { searchMarket, getCategories } from '@/api/templateMarket'
+import { getCategories, searchMarket } from '@/api/templateMarket'
 import TemplateMarketItem from '@/views/panel/templateMarket/component/TemplateMarketItem'
 import { groupTree, panelSave } from '@/api/panel/panel'
 import { DEFAULT_COMMON_CANVAS_STYLE_STRING } from '@/views/panel/panel'
@@ -199,9 +201,7 @@ export default {
       }
     }
   },
-  computed: {
-
-  },
+  computed: {},
   watch: {
     marketActiveTab() {
       this.initTemplateShow()
@@ -217,6 +217,7 @@ export default {
     const erd = elementResizeDetectorMaker()
     const templateMainDom = document.getElementById('template-main')
     // 监听div变动事件
+    if (templateMainDom) {
       erd.listenTo(templateMainDom, element => {
         _this.$nextTick(() => {
           const curSeparator = Math.trunc(templateMainDom.offsetWidth / _this.templateMiniWidth)
@@ -224,6 +225,7 @@ export default {
           _this.templateCurWidth = Math.trunc(templateMainDom.offsetWidth / curSeparator) - 33
         })
       })
+    }
   },
   methods: {
     initMarketTemplate() {
@@ -331,9 +333,11 @@ export default {
   overflow-y: auto;
   background-color: var(--ContentBG, #ffffff);
 }
+
 .market-main {
   padding: 24px
 }
+
 .title-left {
   float: left;
   font-size: 20px;
@@ -341,13 +345,16 @@ export default {
   line-height: 28px;
   color: var(--TextPrimary, #1F2329);
 }
+
 .title-right {
   float: right;
   width: 320px;
 }
+
 .dialog-footer-self {
   text-align: right;
 }
+
 .search-button-self {
   text-align: left;
   padding-left: 10px;
@@ -372,6 +379,7 @@ export default {
     color: #3a8ee6;
   }
 }
+
 .custom-position {
   height: 80vh;
   flex: 1;
@@ -383,6 +391,7 @@ export default {
   color: #646A73;
   font-weight: 400;
 }
+
 .outer-body {
   width: 100%;
   height: calc(100vh - 56px);