Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev

2025-04-28 13:19:57 +08:00
parent e662681ce2 ca94ca906f
commit 5f26f5662e
90 changed files with 380 additions and 260 deletions
--- a/packages/effects/plugins/src/vxe-table/use-vxe-grid.vue
+++ b/packages/effects/plugins/src/vxe-table/use-vxe-grid.vue
@@ -150,7 +150,9 @@ const toolbarOptions = computed(() => {
    icon: 'vxe-icon-search',
    circle: true,
    status: showSearchForm.value ? 'primary' : undefined,
-    title: $t('common.search'),
+    title: showSearchForm.value
+      ? $t('common.hideSearchPanel')
+      : $t('common.showSearchPanel'),
  };
  // 将搜索按钮合并到用户配置的toolbarConfig.tools中
  const toolbarConfig: VxeGridPropTypes.ToolbarConfig = {