mirror of
https://github.com/ialley-workshop-open/uni-halo.git
synced 2026-11-13 22:11:42 +08:00
refactor: 批量优化页面组件与弹窗组件
1. 重构多个页面的插件检测逻辑,统一提示文案为维护中样式,新增页面跳转自动滚动到顶部并初始化搜索/数据加载 2. 优化uh-glass-popup组件,新增lazyRender和hideWhenClose属性并设置默认值 3. 重构友链、瞬间等页面的加载逻辑,移除多余的setTimeout,统一使用sleep延迟 4. 重写偏好设置页面的枚举选择弹窗,替换为自定义弹窗组件 5. 优化瞬间页面的UI布局,改为时间轴样式 6. 修复多个组件的样式细节与代码规范问题
This commit is contained in:
@@ -0,0 +1,118 @@
|
||||
<script setup lang="ts">
|
||||
import { computed } from 'vue'
|
||||
|
||||
/** 单列选项(wd-picker PickerOption 的宽松形态,label/value 与 wot 一致) */
|
||||
interface IPickerOption {
|
||||
label?: string | number
|
||||
value?: string | number
|
||||
disabled?: boolean
|
||||
children?: IPickerOption[]
|
||||
[key: string]: unknown
|
||||
}
|
||||
|
||||
interface IProps {
|
||||
/** v-model:visible 是否显示 */
|
||||
visible: boolean
|
||||
/** 弹层标题 */
|
||||
title?: string
|
||||
/** 选择器数据(单列/多列;与 wd-picker columns 一致) */
|
||||
columns?: Array<IPickerOption | IPickerOption[]>
|
||||
/** 选中项(单列如 ['value']) */
|
||||
modelValue?: (string | number)[]
|
||||
/** 确认/取消按钮文案 */
|
||||
confirmButtonText?: string
|
||||
cancelButtonText?: string
|
||||
/** 自定义层级 */
|
||||
zIndex?: number
|
||||
/** 点击遮罩是否关闭 */
|
||||
closeOnClickModal?: boolean
|
||||
/** 底部安全距离适配 */
|
||||
safeAreaInsetBottom?: boolean
|
||||
/** 追加到选择器根元素的自定义类 */
|
||||
customClass?: string
|
||||
}
|
||||
|
||||
interface IEmits {
|
||||
(e: 'update:visible', value: boolean): void
|
||||
(e: 'update:modelValue', value: (string | number)[]): void
|
||||
(e: 'confirm', payload: { value: (string | number)[] }): void
|
||||
(e: 'open'): void
|
||||
(e: 'cancel'): void
|
||||
}
|
||||
|
||||
const props = withDefaults(defineProps<IProps>(), {
|
||||
title: '',
|
||||
columns: () => [],
|
||||
modelValue: () => [],
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
zIndex: 15,
|
||||
closeOnClickModal: true,
|
||||
safeAreaInsetBottom: true,
|
||||
customClass: '',
|
||||
})
|
||||
|
||||
const emit = defineEmits<IEmits>()
|
||||
|
||||
const pickerClass = computed(() => `uh-picker ${props.customClass}`.trim())
|
||||
|
||||
/* ---------------- wd-picker 事件转发(在 script 处理,模板只做绑定) ---------------- */
|
||||
function handleUpdateVisible(value: boolean) {
|
||||
emit('update:visible', value)
|
||||
}
|
||||
|
||||
function handleUpdateModelValue(value: (string | number)[]) {
|
||||
emit('update:modelValue', value)
|
||||
}
|
||||
|
||||
function handleConfirm(payload: { value: (string | number)[] }) {
|
||||
emit('confirm', payload)
|
||||
}
|
||||
|
||||
function handleOpen() {
|
||||
emit('open')
|
||||
}
|
||||
|
||||
function handleCancel() {
|
||||
emit('cancel')
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<wd-picker
|
||||
:visible="visible" :title="title" :columns="columns" :model-value="modelValue"
|
||||
:confirm-button-text="confirmButtonText" :cancel-button-text="cancelButtonText" :z-index="zIndex"
|
||||
:close-on-click-modal="closeOnClickModal" :safe-area-inset-bottom="safeAreaInsetBottom"
|
||||
:custom-class="pickerClass" @update:visible="handleUpdateVisible" @update:model-value="handleUpdateModelValue"
|
||||
@confirm="handleConfirm" @open="handleOpen" @cancel="handleCancel"
|
||||
>
|
||||
<slot />
|
||||
</wd-picker>
|
||||
</template>
|
||||
|
||||
<style scoped lang="scss">
|
||||
/* 弹层面板玻璃质感(与 uh-glass-popup 同款;wd-picker 内层 popup 挂 .wd-picker__popup) */
|
||||
:deep(.wd-picker__popup .wd-popup) {
|
||||
box-sizing: border-box;
|
||||
background-color: rgb(255 255 255 / 85%);
|
||||
border: 4rpx solid rgb(255 255 255 / 90%);
|
||||
box-shadow:
|
||||
inset 0 1rpx 0 rgb(255 255 255 / 75%),
|
||||
0 8rpx 32rpx rgb(90 105 200 / 14%);
|
||||
backdrop-filter: blur(24rpx) saturate(160%);
|
||||
-webkit-backdrop-filter: blur(24rpx) saturate(160%);
|
||||
}
|
||||
|
||||
/* 低端 WebView 不支持 backdrop-filter 的兜底:提高不透明度保证可读性 */
|
||||
@supports not ((backdrop-filter: blur(1px)) or (-webkit-backdrop-filter: blur(1px))) {
|
||||
:deep(.wd-picker__popup .wd-popup) {
|
||||
background-color: rgb(255 255 255 / 88%);
|
||||
}
|
||||
}
|
||||
|
||||
:deep(.wd-popup--bottom) {
|
||||
left: 24rpx;
|
||||
bottom: 24rpx;
|
||||
right: 24rpx;
|
||||
}
|
||||
</style>
|
||||
@@ -23,6 +23,8 @@
|
||||
radius ?: string
|
||||
/** 是否开启 wot 位置自适应圆角(bottom→上圆角 / center→四圆角等),与 radius 二选一 */
|
||||
round ?: boolean
|
||||
lazyRender ?: boolean
|
||||
hideWhenClose?: boolean
|
||||
/** 追加到面板的内联样式,如宽度:width:640rpx; */
|
||||
customStyle ?: string
|
||||
customClass? :string
|
||||
@@ -43,6 +45,8 @@
|
||||
safeAreaInsetBottom: false,
|
||||
radius: '',
|
||||
round: false,
|
||||
lazyRender: true,
|
||||
hideWhenClose: true,
|
||||
customStyle: '',
|
||||
customClass:''
|
||||
})
|
||||
@@ -66,10 +70,12 @@
|
||||
:closable="closable"
|
||||
:modal="modal"
|
||||
:close-on-click-modal="closeOnClickModal"
|
||||
:hide-when-close="hideWhenClose"
|
||||
:safe-area-inset-bottom="safeAreaInsetBottom"
|
||||
:round="round"
|
||||
:custom-style="panelStyle"
|
||||
:custom-class="panelClass"
|
||||
:lazy-render="lazyRender"
|
||||
@update:model-value="(value: boolean) => emit('update:modelValue', value)"
|
||||
@close="emit('close')"
|
||||
@click-modal="emit('click-modal')"
|
||||
|
||||
@@ -201,7 +201,7 @@
|
||||
|
||||
<template>
|
||||
<uh-glass-popup v-model="isShow" :z-index="100" position="bottom"
|
||||
custom-class="!border rounded-lt-2xl rounded-rt-2xl" @close="handleClose(false)">
|
||||
custom-class="!border rounded-xl" @close="handleClose(false)">
|
||||
<view class="mb-4 relative w-full flex items-center justify-around box-border px-4 pt-4">
|
||||
<view class="w-full flex flex-col gap-y-1">
|
||||
<text class="text-md font-bold">申请收录小程序</text>
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
pluginId : string
|
||||
errorText ?: string
|
||||
checking : boolean
|
||||
customClass ?: string
|
||||
}>(), {
|
||||
errorText: '',
|
||||
})
|
||||
@@ -16,7 +17,7 @@
|
||||
|
||||
/** 插件信息(未在清单中时兜底) */
|
||||
const pluginInfo = computed(() => {
|
||||
return NeedPlugins.get(props.pluginId) ?? {pluginId:props.pluginId, name: '未找到插件' }
|
||||
return NeedPlugins.get(props.pluginId) ?? { pluginId: props.pluginId, name: '未找到插件' }
|
||||
})
|
||||
|
||||
function handleRefresh() {
|
||||
@@ -26,7 +27,9 @@
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<view v-if="pluginInfo" class="max-w-3/5 mx-auto my-auto box-border flex flex-col items-center justify-center gap-6 text-sm">
|
||||
<view v-if="pluginInfo"
|
||||
class="max-w-3/5 mx-auto my-auto box-border flex flex-col items-center justify-center gap-6 text-sm"
|
||||
:class="props.customClass">
|
||||
|
||||
<wd-icon class-prefix="uhemoji-icon" name="-cry" size="160rpx"></wd-icon>
|
||||
|
||||
@@ -46,8 +49,7 @@
|
||||
<!-- 微信端客服会话只能由原生 button 的 open-type="contact" 唤起,故此处不用 uh-button(view 实现) -->
|
||||
<button
|
||||
class="uh-contact-btn bg-white py-2 px-4 !rounded-full text-black text-sm leading-none flex items-center justify-center"
|
||||
open-type="contact"
|
||||
hover-class="none">提交反馈</button>
|
||||
open-type="contact" hover-class="none">提交反馈</button>
|
||||
<!-- #endif -->
|
||||
</view>
|
||||
</view>
|
||||
@@ -59,5 +61,6 @@
|
||||
.uh-contact-btn::after {
|
||||
border: none;
|
||||
}
|
||||
|
||||
/* #endif */
|
||||
</style>
|
||||
@@ -1,135 +0,0 @@
|
||||
<script lang="ts" setup>
|
||||
/**
|
||||
* 插件不可用提示(源自旧项目 components/plugin-unavailable,新建复刻)
|
||||
* 当依赖的 Halo 插件未安装/未启用时展示:插件 logo、名称、错误标签、描述、插件地址、复制/反馈按钮
|
||||
*/
|
||||
import { computed } from 'vue'
|
||||
import { NeedPlugins } from '@/utils/plugin'
|
||||
|
||||
const props = withDefaults(defineProps<{
|
||||
/** 插件名称(与 NeedPlugins 中的 id 对应) */
|
||||
pluginId: string
|
||||
errorText?: string
|
||||
useDecoration?: boolean
|
||||
useBorder?: boolean
|
||||
customStyle?: Record<string, string>
|
||||
}>(), {
|
||||
errorText: '',
|
||||
useDecoration: true,
|
||||
useBorder: true,
|
||||
customStyle: () => ({}),
|
||||
})
|
||||
|
||||
const emit = defineEmits<{
|
||||
(e: 'on-refresh'): void
|
||||
}>()
|
||||
|
||||
/** 插件信息(未在清单中时兜底) */
|
||||
const pluginInfo = computed(() => {
|
||||
const info = NeedPlugins.get(props.pluginId)
|
||||
return info || {
|
||||
id: props.pluginId,
|
||||
name: props.pluginId,
|
||||
desc: '',
|
||||
logo: '',
|
||||
url: '',
|
||||
}
|
||||
})
|
||||
|
||||
const defaultStyle = {
|
||||
width: '80vw',
|
||||
borderRadius: '24rpx',
|
||||
}
|
||||
|
||||
const calcCustomStyle = computed(() => ({
|
||||
...defaultStyle,
|
||||
...props.customStyle,
|
||||
}))
|
||||
|
||||
function copy() {
|
||||
if (!pluginInfo.value.url)
|
||||
return
|
||||
uni.setClipboardData({
|
||||
data: pluginInfo.value.url,
|
||||
showToast: false,
|
||||
success: () => {
|
||||
uni.showToast({ icon: 'none', title: '插件地址已复制' })
|
||||
},
|
||||
})
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<view
|
||||
v-if="pluginInfo"
|
||||
class="uh-plugin-unavailable mx-auto my-auto box-border flex flex-col gap-6 p-10 text-[28rpx]"
|
||||
:class="{ border: useBorder, decoration: useDecoration }"
|
||||
:style="[calcCustomStyle]"
|
||||
>
|
||||
<!-- 图标 -->
|
||||
<image class="plugin-logo box-border h-[120rpx] w-[120rpx] rounded-3xl" :src="pluginInfo.logo" mode="scaleToFill" />
|
||||
<!-- 名称 -->
|
||||
<view class="plugin-name box-border text-[32rpx] text-[#333] font-bold">
|
||||
{{ pluginInfo.name }}
|
||||
</view>
|
||||
<!-- 错误标签 -->
|
||||
<view class="plugin-error box-border rounded-[36rpx] px-4 py-1.5 text-[24rpx] font-bold" style="background-color: rgb(255 61 49 / 7.5%); color: rgb(255 61 49);">
|
||||
未安装/启用插件
|
||||
</view>
|
||||
<!-- 描述 -->
|
||||
<view class="plugin-desc box-border w-[60vw] text-center text-[24rpx] text-[#64748b]">
|
||||
{{ pluginInfo.desc }}
|
||||
</view>
|
||||
<!-- 自定义错误提示 -->
|
||||
<view v-if="errorText" class="plugin-tip box-border border-2 rounded-xl border-dashed px-5 py-2.5 text-[24rpx]" style="border-color: #f2c97d; color: #f0a020;">
|
||||
{{ errorText }}
|
||||
</view>
|
||||
<!-- 插件地址 -->
|
||||
<view class="plugin-url box-border w-full overflow-hidden text-ellipsis whitespace-nowrap rounded-xl bg-[#f1f5f9] px-6 py-4 text-[24rpx] text-[#666]">
|
||||
插件地址:{{ pluginInfo.url }}
|
||||
</view>
|
||||
<!-- 反馈按钮/复制地址 -->
|
||||
<view class="plugin-btns box-border w-full">
|
||||
<!-- #ifndef MP-WEIXIN -->
|
||||
<wd-button type="primary" block size="medium" @click="copy">
|
||||
复制地址
|
||||
</wd-button>
|
||||
<!-- #endif -->
|
||||
<!-- #ifdef MP-WEIXIN -->
|
||||
<view class="flex gap-3">
|
||||
<wd-button type="primary" plain block size="medium" @click="copy">
|
||||
复制地址
|
||||
</wd-button>
|
||||
<wd-button type="warning" plain block size="medium" open-type="contact">
|
||||
提交反馈
|
||||
</wd-button>
|
||||
</view>
|
||||
<!-- #endif -->
|
||||
</view>
|
||||
<!-- 刷新按钮 -->
|
||||
<view class="flex justify-center">
|
||||
<wd-button size="small" plain type="info" @click="emit('on-refresh')">
|
||||
刷新试试
|
||||
</wd-button>
|
||||
</view>
|
||||
|
||||
<view class="plugin-copyright text-[20rpx] text-[#999]" style="transform: scale(0.9) translateY(20px);">
|
||||
提示:请确保 Halo 博客已安装相关插件
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.uh-plugin-unavailable {
|
||||
&.border {
|
||||
border: 2rpx solid #eee;
|
||||
}
|
||||
|
||||
&.decoration {
|
||||
background-color: rgb(255 255 255 / 95%);
|
||||
box-shadow: 0 0 12rpx rgb(226 232 240 / 35%);
|
||||
backdrop-filter: blur(6rpx);
|
||||
border-top: 12rpx solid rgb(3 169 244);
|
||||
}
|
||||
}
|
||||
</style>
|
||||
Reference in New Issue
Block a user