From 195695949f9e89744994a8030e83c1291b6f8607 Mon Sep 17 00:00:00 2001
From: lijianxiong <1518062161@qq.com>
Date: Mon, 11 Nov 2024 11:47:36 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=A4=9A=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=83=A8=E4=BB=B6=E6=8E=92=E5=BA=8F=E9=85=8D=E7=BD=AE=E9=80=82?=
 =?UTF-8?q?=E9=85=8D=E5=9B=BE=E6=A0=87=E6=8C=89=E9=92=AE=E7=A7=BB=E5=85=A5?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BAtitle?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                   |  1 +
 .../md-ctrl-setting/md-ctrl-setting.scss       |  9 ++++++++-
 src/common/md-ctrl-setting/md-ctrl-setting.tsx | 18 ++++++++++++++++--
 src/locale/en/index.ts                         |  1 +
 src/locale/zh-CN/index.ts                      |  1 +
 5 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4560bd1307f..f67b53ff541 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@
 - 返回顶部按钮、气泡工具栏按钮添加底部安全距离
 - 添加搜索栏过滤器组件
 - 过滤组件添加默认新建过滤功能
+- 多数据部件排序配置适配图标按钮移入显示title
 
 ### Fixed
 
diff --git a/src/common/md-ctrl-setting/md-ctrl-setting.scss b/src/common/md-ctrl-setting/md-ctrl-setting.scss
index 7774d374603..a9433583641 100644
--- a/src/common/md-ctrl-setting/md-ctrl-setting.scss
+++ b/src/common/md-ctrl-setting/md-ctrl-setting.scss
@@ -9,6 +9,7 @@ $md-ctrl-setting: (
 
   @include e('setting') {
     font-size: getCssVar('font-size', 'header-4');
+    cursor: pointer;
     svg {
       fill: var(--van-gray-6);
     }
@@ -85,6 +86,12 @@ $md-ctrl-setting: (
     @include m('bottom') {
       padding: 0 getCssVar('spacing', 'tight') getCssVar('spacing', 'loose') getCssVar('spacing', 'tight');
     }
+
+    @include m('icon') {
+      font-size: var(--van-popup-close-icon-size);
+      color: var(--van-popup-close-icon-color);
+      cursor: pointer;
+    }
   }
 
   @include e('list-item') {
@@ -116,4 +123,4 @@ $md-ctrl-setting: (
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/common/md-ctrl-setting/md-ctrl-setting.tsx b/src/common/md-ctrl-setting/md-ctrl-setting.tsx
index 363df1bdcc9..bf3c7432ea4 100644
--- a/src/common/md-ctrl-setting/md-ctrl-setting.tsx
+++ b/src/common/md-ctrl-setting/md-ctrl-setting.tsx
@@ -83,6 +83,11 @@ export const IBizMdCtrlSetting = defineComponent({
       });
     };
 
+    // 关闭弹框
+    const onClose = () => {
+      visible.value = false;
+    };
+
     onUnmounted(() => {
       selectedKey.value = '';
       currentPage.value = '';
@@ -146,6 +151,12 @@ export const IBizMdCtrlSetting = defineComponent({
             <div class={ns.em('content', 'title')}>
               {ibiz.i18n.t('component.mdCtrlSetting.sort')}
             </div>
+            <van-icon
+              name='cross'
+              class={ns.em('content', 'icon')}
+              onClick={onClose}
+              title={ibiz.i18n.t('app.close')}
+            />
           </div>
           <van-tabs
             class={ns.em('content', 'tabs')}
@@ -186,7 +197,6 @@ export const IBizMdCtrlSetting = defineComponent({
       return (
         <van-popup
           close-on-popstate={true}
-          closeable
           v-model:show={visible.value}
           round
           class={ns.e('popup')}
@@ -201,7 +211,11 @@ export const IBizMdCtrlSetting = defineComponent({
     // 绘制设置
     const renderSetting = () => {
       return (
-        <div class={ns.e('setting')} onClick={onOpenSortSetting}>
+        <div
+          class={ns.e('setting')}
+          title={ibiz.i18n.t('component.mdCtrlSetting.sort')}
+          onClick={onOpenSortSetting}
+        >
           <svg
             class={ns.em('setting', 'icon')}
             viewBox='0 0 1024 1024'
diff --git a/src/locale/en/index.ts b/src/locale/en/index.ts
index da4ea0cdeaf..03beb631ad7 100644
--- a/src/locale/en/index.ts
+++ b/src/locale/en/index.ts
@@ -10,6 +10,7 @@ export default {
     add: 'Add',
     delete: 'Delete',
     retract: 'Retract',
+    close: 'Close',
   },
   // 组件
   component: {
diff --git a/src/locale/zh-CN/index.ts b/src/locale/zh-CN/index.ts
index f3c535357ab..43bb3191e31 100644
--- a/src/locale/zh-CN/index.ts
+++ b/src/locale/zh-CN/index.ts
@@ -10,6 +10,7 @@ export default {
     add: '添加',
     delete: '删除',
     retract: '收起',
+    close: '关闭',
   },
   // 组件
   component: {
-- 
Gitee