From 16a8d4d7cbda8b13117bdb34502e4bc7c378310d Mon Sep 17 00:00:00 2001
From: wangyaqi <wangyaqi988@163.com>
Date: Wed, 17 Apr 2024 20:16:26 +0800
Subject: [PATCH] =?UTF-8?q?fix(uni-app-x):=20=E4=BF=AE=E5=A4=8D=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E7=9B=B8=E5=85=B3api=E6=98=BE=E7=A4=BA=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../uni-h5/src/service/api/ui/popup/modal.tsx | 27 ++++----
 packages/uni-h5/style/framework/uvue.css      | 68 ++++++++++---------
 2 files changed, 50 insertions(+), 45 deletions(-)

diff --git a/packages/uni-h5/src/service/api/ui/popup/modal.tsx b/packages/uni-h5/src/service/api/ui/popup/modal.tsx
index 1a46380548..c6bf481161 100644
--- a/packages/uni-h5/src/service/api/ui/popup/modal.tsx
+++ b/packages/uni-h5/src/service/api/ui/popup/modal.tsx
@@ -1,17 +1,17 @@
 import { onEventPrevent, onEventStop } from '@dcloudio/uni-core'
 import {
+  type ExtractPropTypes,
+  type Ref,
   Transition,
   defineComponent,
-  ExtractPropTypes,
   ref,
-  Ref,
   watchEffect,
 } from 'vue'
-import { usePopup, VNODE_MASK } from './utils'
+import { VNODE_MASK, usePopup } from './utils'
 import {
-  onThemeChange,
-  offThemeChange,
   getTheme,
+  offThemeChange,
+  onThemeChange,
 } from '../../../../helpers/theme'
 
 type ModalTheme = Record<UniApp.ThemeMode, { cancelColor: string }>
@@ -57,7 +57,7 @@ const props = {
     default: '#576b95',
     //#endif
     //#if !_X_
-    // @ts-ignore
+    // @ts-expect-error
     default: '#007aff',
     //#endif
   },
@@ -108,11 +108,15 @@ export default /*#__PURE__*/ defineComponent({
           <uni-modal v-show={visible.value} onTouchmove={onEventPrevent}>
             {VNODE_MASK}
             <div class="uni-modal">
-              {title && (
-                <div class="uni-modal__hd">
-                  <strong class="uni-modal__title" v-text={title}></strong>
-                </div>
-              )}
+              {title ||
+                (__X__ && (
+                  <div class="uni-modal__hd">
+                    <strong
+                      class="uni-modal__title"
+                      v-text={title || ''}
+                    ></strong>
+                  </div>
+                ))}
               {editable ? (
                 <textarea
                   class="uni-modal__textarea"
@@ -126,7 +130,6 @@ export default /*#__PURE__*/ defineComponent({
               ) : (
                 <div
                   class="uni-modal__bd"
-                  // @ts-ignore
                   onTouchmovePassive={onEventStop}
                   v-text={content}
                 ></div>
diff --git a/packages/uni-h5/style/framework/uvue.css b/packages/uni-h5/style/framework/uvue.css
index 6544b4101c..eb17590d32 100644
--- a/packages/uni-h5/style/framework/uvue.css
+++ b/packages/uni-h5/style/framework/uvue.css
@@ -320,37 +320,39 @@ body .uni-modal__btn_primary {
   color: #576b95;
 }
 
-body .uni-actionsheet {
-  left: 0px;
-  right: 0px;
-  bottom: 0px;
-  border-top-left-radius: 12px;
-  border-top-right-radius: 12px;
-  background-color: #f7f7f7;
-  overflow: hidden;
-}
-
-body .uni-actionsheet__menu {
-  border-radius: 0px;
-  background-color: #ffffff;
-}
-
-body .uni-actionsheet__action {
-  border-radius: 0px;
-  margin-top: 8px;
-}
-
-body .uni-actionsheet__cell,
-body .uni-actionsheet__title {
-  padding: 16px;
-  line-height: 24px;
-}
-
-body .uni-actionsheet__cell {
-  font-size: 17px;
-}
-
-body .uni-actionsheet__title {
-  font-size: 14px;
-  color: #747474;
+@media screen and (max-width: 500px) {
+  body .uni-actionsheet {
+    left: 0px;
+    right: 0px;
+    bottom: 0px;
+    border-top-left-radius: 12px;
+    border-top-right-radius: 12px;
+    background-color: #f7f7f7;
+    overflow: hidden;
+  }
+
+  body .uni-actionsheet__menu {
+    border-radius: 0px;
+    background-color: #ffffff;
+  }
+
+  body .uni-actionsheet__action {
+    border-radius: 0px;
+    margin-top: 8px;
+  }
+
+  body .uni-actionsheet__cell,
+  body .uni-actionsheet__title {
+    padding: 16px;
+    line-height: 24px;
+  }
+
+  body .uni-actionsheet__cell {
+    font-size: 17px;
+  }
+
+  body .uni-actionsheet__title {
+    font-size: 14px;
+    color: #747474;
+  }
 }
\ No newline at end of file
-- 
GitLab