Merge branch 'dev' into pr@dev_dataset_source

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 + ')'
     }
   },
 

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?',
@@ -2342,7 +2342,7 @@ export default {
   },
   denumberselect: {
     label: 'Number selector',
-    placeholder: 'Please select'
+    placeholder: 'Please select number'
   },
   deinputsearch: {
     label: 'Text search',
@@ -2350,7 +2350,7 @@ export default {
   },
   detextselect: {
     label: 'Text selector',
-    placeholder: 'Please select'
+    placeholder: 'Please select text'
   },
   detextselectTree: {
     label: 'Tree selector',
@@ -2567,8 +2567,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.'
   }

frontend/src/lang/tw.js

@@ -131,7 +131,7 @@ export default {
     default_login: '普通登錄'
   },
   commons: {
-    uninstall:'卸载',
+    uninstall: '卸载',
     no_result: '没有找到相关内容',
     manage_member: '管理成員',
     user_confirm_remove_cancel: '確定將該用戶從角色中移除嗎?',
@@ -2343,7 +2343,7 @@ export default {
   },
   denumberselect: {
     label: '數字下拉',
-    placeholder: '請選擇'
+    placeholder: '請選擇數字'
   },
   deinputsearch: {
     label: '文本搜索',
@@ -2351,7 +2351,7 @@ export default {
   },
   detextselect: {
     label: '文本下拉',
-    placeholder: '請選擇'
+    placeholder: '請選擇文本'
   },
   detextselectTree: {
     label: '下拉樹',
@@ -2568,8 +2568,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: '刪除後，該分類中所有的應用模闆也將被刪除。'
   }

frontend/src/lang/zh.js

@@ -131,7 +131,7 @@ export default {
     default_login: '普通登录'
   },
   commons: {
-    uninstall:'卸载',
+    uninstall: '卸载',
     no_result: '没有找到相关内容',
     manage_member: '管理成员',
     confirm_remove_cancel: '确定删除该角色吗?',
@@ -2344,7 +2344,7 @@ export default {
   },
   denumberselect: {
     label: '数字下拉',
-    placeholder: '请选择'
+    placeholder: '请选择数字'
   },
   deinputsearch: {
     label: '文本搜索',
@@ -2352,7 +2352,7 @@ export default {
   },
   detextselect: {
     label: '文本下拉',
-    placeholder: '请选择'
+    placeholder: '请选择文本'
   },
   detextselectTree: {
     label: '下拉树',
@@ -2569,8 +2569,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: '删除后，该分类中所有的应用模板也将被删除。'
   }

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);
 }

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;
+}
+
 </style>