diff --git a/core/core-frontend/src/views/template/component/DeTemplateImport.vue b/core/core-frontend/src/views/template/component/DeTemplateImport.vue index e5360331a5..ae1df09219 100644 --- a/core/core-frontend/src/views/template/component/DeTemplateImport.vue +++ b/core/core-frontend/src/views/template/component/DeTemplateImport.vue @@ -9,10 +9,10 @@ >
- - {{ - t('visualization.upload_template') - }} + + 导入模版 - + +
+ 暂无可选分类 +
{ } categoryTemplateNameCheck(nameCheckRequest).then(response => { if (response.data.indexOf('exist') > -1) { - ElMessageBox.confirm('提示?', { + ElMessageBox.confirm('提示', { tip: '当前分类存在相同模版名称,是否覆盖?', confirmButtonType: 'danger', type: 'warning', @@ -301,4 +310,25 @@ if (props.templateId) { height: 1px; background-color: rgba(31, 35, 41, 0.15); } + +.custom-category-empty { + .ed-scrollbar { + display: inherit !important; + } + + .custom-dropdown__empty { + display: inherit !important; + } + + .ed-select-dropdown__empty { + display: none !important; + } +} + +.custom-dropdown__empty { + display: none; + margin-left: 12px; + font-size: 14px; + color: rgba(143, 149, 158, 1); +} diff --git a/core/core-frontend/src/views/template/component/DeTemplateList.vue b/core/core-frontend/src/views/template/component/DeTemplateList.vue index 8525ccd909..78365e8563 100644 --- a/core/core-frontend/src/views/template/component/DeTemplateList.vue +++ b/core/core-frontend/src/views/template/component/DeTemplateList.vue @@ -105,8 +105,9 @@ const add = () => { } const categoryDelete = template => { ElMessageBox.confirm('确定删除该分类吗?', { - tip: '', + tip: '删除后不可恢复,是否继续?', confirmButtonType: 'danger', + confirmButtonText: t('common.delete'), type: 'warning', autofocus: false, showClose: false diff --git a/core/core-frontend/src/views/template/index.vue b/core/core-frontend/src/views/template/index.vue index 83065973a2..39512a406c 100644 --- a/core/core-frontend/src/views/template/index.vue +++ b/core/core-frontend/src/views/template/index.vue @@ -392,8 +392,8 @@ const categoryDelete = id => { }) getTree() } else { - ElMessageBox.confirm('无法删除分类?', { - tip: '请移除该分类下所有模版再进行删除分类操作', + ElMessageBox.confirm('无法删除分类', { + tip: '请先移除该分类下所有模版再进行删除分类操作', confirmButtonText: '知道了', confirmButtonType: 'default', showCancelButton: false, @@ -411,6 +411,7 @@ const templateDeleteInfo = id => { tip: '', confirmButtonType: 'danger', type: 'warning', + confirmButtonText: t('common.delete'), autofocus: false, showClose: false }).then(() => { @@ -466,6 +467,11 @@ const saveTemplateEdit = templateEditForm => { if (valid) { save({ ...templateEditForm }).then(response => { state.currentTemplateLabel = templateEditForm.name + ElMessage({ + message: '添加成功', + type: 'success', + showClose: true + }) getTree() close() }) @@ -521,6 +527,7 @@ const closeEditTemplateDialog = () => { const templateImport = pid => { state.templateDialog.visible = true + state.templateDialog.title = '导入模版' state.templateDialog.templateId = null state.templateDialog.optType = 'insert' state.templateDialog.pid = pid