Merge pull request #62 from WeBankFinTech/branch_joy

feat: 12.2.3版本更新，高筛按钮文字调整

Author: mayinrain

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fesjs/traction-widget",
-  "version": "1.12.2",
+  "version": "1.12.3",
   "description": "集合大型中台项目使用到的通用组件和工具函数",
   "scripts": {
     "docs:dev": "npm run build && node docs/.vitepress/scripts/generate-doc.js && vitepress dev docs",

packages/traction-widget/components/Search/Search.vue

@@ -20,7 +20,7 @@
                 <template v-if="props.isAdvance">
                     <FButton v-if="isAdvanceCount" @click="handleAdvance"
                             :class="querySelectedCount > 0 ? 'selected-count' : ''">
-                            {{searchLocalObj?.advance}}{{querySelectedCount > 0 ? `(${searchLocalObj?.selected}${querySelectedCount}${searchLocalObj?.item})` : ''}}
+                            {{querySelectedCountText()}}
                     </FButton>
                     <FButton v-else @click="handleAdvance">
                         {{searchLocalObj?.advance}}
@@ -34,7 +34,7 @@
                 <template v-if="props.isAdvance">
                     <FButton v-if="isAdvanceCount" @click="handleAdvance"
                             :class="querySelectedCount > 0 ? 'selected-count' : ''">
-                            {{searchLocalObj?.advance}}{{querySelectedCount > 0 ? `(${searchLocalObj?.selected} ${querySelectedCount} ${searchLocalObj?.item})` : ''}}
+                            {{querySelectedCountText()}}
                     </FButton>
                     <FButton v-else @click="handleAdvance">
                         {{searchLocalObj?.advance}}
@@ -116,7 +116,6 @@ const emit = defineEmits(['search', 'reset', 'advance', 'update:form', 'update:a
 const { datasource } = useFormModel(props, emit, ['form', 'advanceForm']);
 
 const prefixCls = getPrefixCls('search');
-
 // 筛选条件数量的watch
 const querySelectedCount = computed(() => {
     if (!props.isCustomAdvanceCount) {
@@ -130,7 +129,12 @@ const querySelectedCount = computed(() => {
         return props.advanceCountFunc(props.advanceForm);
     }
 });
-
+const querySelectedCountText = () => {
+    const str = searchLocalObj?.advance;
+    if (querySelectedCount.value === 0) return str;
+    if (querySelectedCount.value === 1) return `${str}(${searchLocalObj?.selected}${querySelectedCount.value}${searchLocalObj?.item})`;
+    if (querySelectedCount.value > 1) return `${str}(${searchLocalObj?.selected}${querySelectedCount.value}${searchLocalObj?.items})`;
+};
 const handleSearch = () => {
     emit('search', datasource.form);
 };

packages/traction-widget/components/locales/lang/enUS.ts

@@ -11,8 +11,9 @@ export default {
         search: 'Search',
         advance: 'Advanced Filter',
         advanceCount: 'Advanced Filter (selected {count} items)',
-        selected: 'selected',
-        item: 'items',
+        selected: 'selected ',
+        item: ' item',
+        items: ' items',
         reset: 'Reset'
     },
     TableHeaderConfig: {

packages/traction-widget/components/locales/lang/zhCN.ts

@@ -10,8 +10,9 @@ export default {
     SearchData: {
         search: '查询',
         advance: '高级筛选',
-        selected: '已选：',
+        selected: '已选',
         item: '项',
+        items: '项',
         reset: '重置'
     },
     TableHeaderConfig: {

packages/traction-widget/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fesjs/traction-widget",
-  "version": "1.12.2",
+  "version": "1.12.3",
   "description": "集合大型中台项目使用到的通用组件和工具函数",
   "main": "dist/traction-widget.min.js",
   "module": "es/components/index.js",