提交 16a8d4d7 编写于 作者: 雪洛's avatar 雪洛

fix(uni-app-x): 修复界面相关api显示错误

上级 8643630e
import { onEventPrevent, onEventStop } from '@dcloudio/uni-core' import { onEventPrevent, onEventStop } from '@dcloudio/uni-core'
import { import {
type ExtractPropTypes,
type Ref,
Transition, Transition,
defineComponent, defineComponent,
ExtractPropTypes,
ref, ref,
Ref,
watchEffect, watchEffect,
} from 'vue' } from 'vue'
import { usePopup, VNODE_MASK } from './utils' import { VNODE_MASK, usePopup } from './utils'
import { import {
onThemeChange,
offThemeChange,
getTheme, getTheme,
offThemeChange,
onThemeChange,
} from '../../../../helpers/theme' } from '../../../../helpers/theme'
type ModalTheme = Record<UniApp.ThemeMode, { cancelColor: string }> type ModalTheme = Record<UniApp.ThemeMode, { cancelColor: string }>
...@@ -57,7 +57,7 @@ const props = { ...@@ -57,7 +57,7 @@ const props = {
default: '#576b95', default: '#576b95',
//#endif //#endif
//#if !_X_ //#if !_X_
// @ts-ignore // @ts-expect-error
default: '#007aff', default: '#007aff',
//#endif //#endif
}, },
...@@ -108,11 +108,15 @@ export default /*#__PURE__*/ defineComponent({ ...@@ -108,11 +108,15 @@ export default /*#__PURE__*/ defineComponent({
<uni-modal v-show={visible.value} onTouchmove={onEventPrevent}> <uni-modal v-show={visible.value} onTouchmove={onEventPrevent}>
{VNODE_MASK} {VNODE_MASK}
<div class="uni-modal"> <div class="uni-modal">
{title && ( {title ||
<div class="uni-modal__hd"> (__X__ && (
<strong class="uni-modal__title" v-text={title}></strong> <div class="uni-modal__hd">
</div> <strong
)} class="uni-modal__title"
v-text={title || ''}
></strong>
</div>
))}
{editable ? ( {editable ? (
<textarea <textarea
class="uni-modal__textarea" class="uni-modal__textarea"
...@@ -126,7 +130,6 @@ export default /*#__PURE__*/ defineComponent({ ...@@ -126,7 +130,6 @@ export default /*#__PURE__*/ defineComponent({
) : ( ) : (
<div <div
class="uni-modal__bd" class="uni-modal__bd"
// @ts-ignore
onTouchmovePassive={onEventStop} onTouchmovePassive={onEventStop}
v-text={content} v-text={content}
></div> ></div>
......
...@@ -320,37 +320,39 @@ body .uni-modal__btn_primary { ...@@ -320,37 +320,39 @@ body .uni-modal__btn_primary {
color: #576b95; color: #576b95;
} }
body .uni-actionsheet { @media screen and (max-width: 500px) {
left: 0px; body .uni-actionsheet {
right: 0px; left: 0px;
bottom: 0px; right: 0px;
border-top-left-radius: 12px; bottom: 0px;
border-top-right-radius: 12px; border-top-left-radius: 12px;
background-color: #f7f7f7; border-top-right-radius: 12px;
overflow: hidden; background-color: #f7f7f7;
} overflow: hidden;
}
body .uni-actionsheet__menu {
border-radius: 0px; body .uni-actionsheet__menu {
background-color: #ffffff; border-radius: 0px;
} background-color: #ffffff;
}
body .uni-actionsheet__action {
border-radius: 0px; body .uni-actionsheet__action {
margin-top: 8px; border-radius: 0px;
} margin-top: 8px;
}
body .uni-actionsheet__cell,
body .uni-actionsheet__title { body .uni-actionsheet__cell,
padding: 16px; body .uni-actionsheet__title {
line-height: 24px; padding: 16px;
} line-height: 24px;
}
body .uni-actionsheet__cell {
font-size: 17px; body .uni-actionsheet__cell {
} font-size: 17px;
}
body .uni-actionsheet__title {
font-size: 14px; body .uni-actionsheet__title {
color: #747474; font-size: 14px;
color: #747474;
}
} }
\ No newline at end of file
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册