From 70f423a6fcd9c74bddf0d9ea210722f1359b4e3f Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 20 Sep 2022 15:11:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?perf(=E4=BB=AA=E8=A1=A8=E6=9D=BF-=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E5=99=A8):=20=E8=BF=87=E6=BB=A4=E5=99=A8=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E6=96=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/widget/DeWidget/DeSelect.vue | 7 ++++++- frontend/src/lang/en.js | 10 +++++----- frontend/src/lang/tw.js | 10 +++++----- frontend/src/lang/zh.js | 10 +++++----- 4 files changed, 21 insertions(+), 16 deletions(-) diff --git a/frontend/src/components/widget/DeWidget/DeSelect.vue b/frontend/src/components/widget/DeWidget/DeSelect.vue index 8fb364e606..5afd67e53a 100644 --- a/frontend/src/components/widget/DeWidget/DeSelect.vue +++ b/frontend/src/components/widget/DeWidget/DeSelect.vue @@ -8,7 +8,7 @@ :collapse-tags="showNumber" :clearable="!element.options.attrs.multiple" :multiple="element.options.attrs.multiple" - :placeholder="$t(element.options.attrs.placeholder)" + :placeholder="$t(element.options.attrs.placeholder) + placeholderSuffix" :popper-append-to-body="inScreen" :size="size" :filterable="true" @@ -110,6 +110,11 @@ export default { customStyle() { const { brColor, wordColor, innerBgColor } = this.element.style return { brColor, wordColor, innerBgColor } + }, + placeholderSuffix() { + const i18nKey = this.element.options.attrs.multiple ? 'panel.multiple_choice' : 'panel.single_choice' + const i18nValue = this.$t(i18nKey) + return '(' + i18nValue + ')' } }, diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index cd9db96d02..2d09f5e12b 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -131,7 +131,7 @@ export default { default_login: 'Normal' }, commons: { - uninstall:'Uninstall', + uninstall: 'Uninstall', no_result: 'No Result', manage_member: 'Managing members', confirm_remove_cancel: 'Are you sure to delete the role?', @@ -2339,7 +2339,7 @@ export default { }, denumberselect: { label: 'Number selector', - placeholder: 'Please select' + placeholder: 'Please select number' }, deinputsearch: { label: 'Text search', @@ -2347,7 +2347,7 @@ export default { }, detextselect: { label: 'Text selector', - placeholder: 'Please select' + placeholder: 'Please select text' }, detextselectTree: { label: 'Tree selector', @@ -2564,8 +2564,8 @@ export default { no_apps: 'No apps', app_group_icon: 'Cover icon', app_name: 'Application name', - search_by_keyword:'Search by keyword', - apply_logs:'Apply logs', + search_by_keyword: 'Search by keyword', + apply_logs: 'Apply logs', app_group_delete_tips: 'Are you sure to delete this application category?', app_group_delete_content: 'After deletion, all application templates in this category will also be deleted.' } diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 078c88b4b6..dc2d0e315e 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -131,7 +131,7 @@ export default { default_login: '普通登錄' }, commons: { - uninstall:'卸载', + uninstall: '卸载', no_result: '没有找到相关内容', manage_member: '管理成員', user_confirm_remove_cancel: '確定將該用戶從角色中移除嗎?', @@ -2340,7 +2340,7 @@ export default { }, denumberselect: { label: '數字下拉', - placeholder: '請選擇' + placeholder: '請選擇數字' }, deinputsearch: { label: '文本搜索', @@ -2348,7 +2348,7 @@ export default { }, detextselect: { label: '文本下拉', - placeholder: '請選擇' + placeholder: '請選擇文本' }, detextselectTree: { label: '下拉樹', @@ -2565,8 +2565,8 @@ export default { no_apps: '暫無應用', app_group_icon: '封面圖標', app_name: '應用名稱', - search_by_keyword:'通過關鍵字搜索', - apply_logs:'應用記錄', + search_by_keyword: '通過關鍵字搜索', + apply_logs: '應用記錄', app_group_delete_tips: '確定刪除該應用分類嗎?', app_group_delete_content: '刪除後，該分類中所有的應用模闆也將被刪除。' } diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index cfe0b029cf..2bdc366141 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -131,7 +131,7 @@ export default { default_login: '普通登录' }, commons: { - uninstall:'卸载', + uninstall: '卸载', no_result: '没有找到相关内容', manage_member: '管理成员', confirm_remove_cancel: '确定删除该角色吗?', @@ -2341,7 +2341,7 @@ export default { }, denumberselect: { label: '数字下拉', - placeholder: '请选择' + placeholder: '请选择数字' }, deinputsearch: { label: '文本搜索', @@ -2349,7 +2349,7 @@ export default { }, detextselect: { label: '文本下拉', - placeholder: '请选择' + placeholder: '请选择文本' }, detextselectTree: { label: '下拉树', @@ -2566,8 +2566,8 @@ export default { no_apps: '暂无应用', app_group_icon: '封面图标', app_name: '应用名称', - search_by_keyword:'通过关键字搜索', - apply_logs:'应用记录', + search_by_keyword: '通过关键字搜索', + apply_logs: '应用记录', app_group_delete_tips: '确定删除该应用分类吗?', app_group_delete_content: '删除后，该分类中所有的应用模板也将被删除。' } From 558d328c527ef5c9c13f738ad86473f09fdac20b Mon Sep 17 00:00:00 2001 From: junjun Date: Tue, 20 Sep 2022 15:59:15 +0800 Subject: [PATCH 2/2] =?UTF-8?q?style(=E8=A7=86=E5=9B=BE):=20=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/styles/index.scss | 8 -------- frontend/src/views/chart/view/ChartEdit.vue | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/frontend/src/styles/index.scss b/frontend/src/styles/index.scss index a550ba3ac6..730a435bd9 100644 --- a/frontend/src/styles/index.scss +++ b/frontend/src/styles/index.scss @@ -607,14 +607,6 @@ div:focus { padding-bottom: 0 !important; } -// .el-collapse-item__header { -// height: 34px !important; -// line-height: 34px !important; -// padding: 0 0 0 6px !important; -// font-size: 12px !important; -// font-weight: 400 !important; -// } - .blackTheme .el-submenu__title { color: var(--TextPrimary); } diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue index e876b24dc4..e9abaf3bac 100644 --- a/frontend/src/views/chart/view/ChartEdit.vue +++ b/frontend/src/views/chart/view/ChartEdit.vue @@ -3247,4 +3247,12 @@ span { padding-left: 0!important; } +.view-panel-row ::v-deep .el-collapse-item__header{ + height: 34px !important; + line-height: 34px !important; + padding: 0 0 0 6px !important; + font-size: 12px !important; + font-weight: 400 !important; +} +