uview-ultra 4.5.48 → 4.5.71

package/components/up-button/up-button.uvue

@@ -72,6 +72,7 @@ import { computed } from 'vue'
 import { addStyle, addUnit, getPx, bem } from '../../libs/function/index'
 import { throttle } from '../../libs/function/throttle'
 import config from '../../libs/config/config'
+	import { upThemeVar } from '../../libs/theme/theme.uts'
 const props = defineProps({
     // 自定义样式
     customStyle: {
@@ -255,7 +256,7 @@ const loadingColor = computed(() => {
         // 如果有设置color值，则用color值，否则使用type主题颜色
         return props.color != ''
             ? props.color
-            : config.getString(`color.up-${props.type}`) as string;
+            : upThemeVar(`--up-${props.type}`, config.getString(`color.up-${props.type}`) as string);
     }
     if (props.type == "info") {
         return "#c9c9c9";
@@ -270,7 +271,7 @@ const textColor = computed((): string => {
     if (props.color != '') return props.color
     if (props.type == 'info') return '#000000'
     if (props.type == 'warning') return config.getString('color.up-error') ?? '#fa3534'
-    const color = config.getString(`color.up-${props.type}`) ?? ''
+    const color = upThemeVar(`--up-${props.type}`, config.getString(`color.up-${props.type}`) ?? '')
     return color == '' ? '#ffffff' : color
 })
 
@@ -402,10 +403,10 @@ $up-button-circle-border-top-right-radius: 100px !default;
 $up-button-circle-border-top-left-radius: 100px !default;
 $up-button-circle-border-bottom-left-radius: 100px !default;
 $up-button-circle-border-bottom-right-radius: 100px !default;
-$up-button-square-border-top-right-radius: 3px !default;
-$up-button-square-border-top-left-radius: 3px !default;
-$up-button-square-border-bottom-left-radius: 3px !default;
-$up-button-square-border-bottom-right-radius: 3px !default;
+$up-button-square-border-top-right-radius: 10px !default;
+$up-button-square-border-top-left-radius: 10px !default;
+$up-button-square-border-bottom-left-radius: 10px !default;
+$up-button-square-border-bottom-right-radius: 10px !default;
 $up-button-icon-min-width: 4px !default;
 $up-button-plain-background-color: transparent !default;
 $up-button-hairline-border-width: 0.5px !default;
@@ -500,8 +501,8 @@ $up-button-plain-up-button-warning-color:$up-error !default;;
 		/* #ifndef APP */
 		color: $up-button-primary-color;
 		/* #endif */
-		background-color: $up-button-primary-background-color !important;
-		border-color: $up-button-primary-border-color !important;
+		background-color: var(--up-primary, $up-button-primary-background-color) !important;
+		border-color: var(--up-primary, $up-button-primary-border-color) !important;
 		border-width: $up-button-primary-border-width !important;
 		border-style: $up-button-primary-border-style !important;
 	}

package/components/up-button/up-button.vue

@@ -315,10 +315,10 @@ $up-button-circle-border-top-right-radius: 100px !default;
 $up-button-circle-border-top-left-radius: 100px !default;
 $up-button-circle-border-bottom-left-radius: 100px !default;
 $up-button-circle-border-bottom-right-radius: 100px !default;
-$up-button-square-border-top-right-radius: 3px !default;
-$up-button-square-border-top-left-radius: 3px !default;
-$up-button-square-border-bottom-left-radius: 3px !default;
-$up-button-square-border-bottom-right-radius: 3px !default;
+$up-button-square-border-top-right-radius: 10px !default;
+$up-button-square-border-top-left-radius: 10px !default;
+$up-button-square-border-bottom-left-radius: 10px !default;
+$up-button-square-border-bottom-right-radius: 10px !default;
 $up-button-icon-min-width: 1em !default;
 $up-button-plain-background-color: transparent !default;
 $up-button-hairline-border-width: 0.5px !default;

package/components/up-cell/props.js

@@ -33,6 +33,12 @@ export const propsCell = defineMixin({
             type: Boolean,
             default: () => defProps.cell.border
         },
+        // 分隔线左侧偏移（px 或带单位字符串）。iOS 标准是线条不顶到图标，
+        // 而是从图标右侧的内容起始处开始；传 0 或不传保持通栏。
+        borderInsetLeft: {
+            type: [String, Number],
+            default: 0
+        },
         // 内容是否垂直居中(主要是针对右侧的value部分)
         center: {
             type: Boolean,

package/components/up-cell/up-cell.uvue

@@ -51,14 +51,21 @@
 				</slot>
 			</view>
 		</view>
-		<up-line v-if="border"></up-line>
+		<!--
+			iOS 标准分隔线：默认通栏；borderInsetLeft 传值后线条从该偏移处开始，
+			对齐「图标右侧内容」的起始位置（= 左 padding + 图标宽 + 图标右距）。
+		-->
+		<view v-if="border" class="up-cell__line-wrap"
+			:style="{ paddingLeft: addUnit(borderInsetLeft) }">
+			<up-line></up-line>
+		</view>
 	</view>
 </template>
 
 <script setup lang="ts">
 	import { computed } from 'vue'
 	import defProps from './cell'
-	import { addStyle } from '../../libs/function/index'
+	import { addStyle, addUnit } from '../../libs/function/index'
 	import { empty as _testEmpty } from '../../libs/function/test'
 	// props
 	const props = defineProps({
@@ -139,6 +146,12 @@
 			type: Boolean,
 			default: defProps.getBoolean('cell.border')
 		},
+		// 分隔线左侧偏移（px 或带单位字符串）。iOS 标准是线条不顶到图标，
+		// 而是从图标右侧的内容起始处开始；传 0 或不传保持通栏。
+		borderInsetLeft: {
+			type: [String, Number],
+			default: 0
+		},
 		disabled: {
 			type: Boolean,
 			default: defProps.getBoolean('cell.disabled')
@@ -200,15 +213,15 @@
 <style lang="scss" scoped>
 	@import "../../libs/css/components.scss";
 
-	$up-cell-padding: 10px 15px !important;
+	$up-cell-padding: 14px !important;
 	$up-cell-font-size: 15px !important;
 	$up-cell-line-height: 24px !important;
 	$up-cell-color: $up-main-color !important;
 	$up-cell-icon-size: 16px !important;
 	$up-cell-title-font-size: 15px !important;
 	$up-cell-title-line-height: 22px !important;
-	$up-cell-title-color: $up-main-color !important;
-	$up-cell-required-font-size: 14px !important;
+	$up-cell-title-color: $up-main-color !important;
+	$up-cell-required-font-size: 14px !important;
 	$up-cell-required-color: #f56c6c !important;
 	$up-cell-label-font-size: 12px !important;
 	$up-cell-label-color: $up-tips-color !important;
@@ -217,12 +230,12 @@
 	$up-cell-value-color: $up-content-color !important;
 	$up-cell-clickable-color: $up-bg-color !important;
 	$up-cell-disabled-color: #c8c9cc !important;
-	$up-cell-padding-top-large: 13px !important;
-	$up-cell-padding-bottom-large: 13px !important;
+	$up-cell-padding-top-large: 16px !important;
+	$up-cell-padding-bottom-large: 16px !important;
 	$up-cell-value-font-size-large: 15px !important;
 	$up-cell-label-font-size-large: 14px !important;
 	$up-cell-title-font-size-large: 16px !important;
-	$up-cell-left-icon-wrap-margin-right: 4px !important;
+	$up-cell-left-icon-wrap-margin-right: 10px !important;
 	$up-cell-right-icon-wrap-margin-left: 4px !important;
 	$up-cell-title-flex:1 !important;
 	$up-cell-label-margin-top:5px !important;

package/components/up-cell/up-cell.vue

@@ -44,7 +44,14 @@
 				</slot>
 			</view>
 		</view>
-		<up-line v-if="border"></up-line>
+		<!--
+			iOS 标准分隔线：默认通栏；borderInsetLeft 传值后线条从该偏移处开始，
+			对齐「图标右侧内容」的起始位置（= 左 padding + 图标宽 + 图标右距）。
+		-->
+		<view v-if="border" class="up-cell__line-wrap"
+			:style="{ paddingLeft: addUnit(borderInsetLeft) }">
+			<up-line></up-line>
+		</view>
 	</view>
 </template>
 
@@ -52,7 +59,7 @@
 	import { computed, inject } from 'vue'
 	import { propsCell } from './props.js'
 	import { commonProps, useUltraUI } from '../../libs/composable/useUltraUI.js'
-	import { addStyle } from '../../libs/function/index.js'
+	import { addStyle, addUnit } from '../../libs/function/index.js'
 	import test from '../../libs/function/test.js'
 	/**
 	 * cell  单元格

package/components/up-cell-group/up-cell-group.uvue

@@ -51,7 +51,14 @@
 	$up-cell-group-title-line-height: 16px !default;
 	$up-cell-group-title-color: $up-main-color !default;
 
+    /*
+     * 默认 iOS grouped-inset 卡片形制：大圆角 + 裁剪。
+     * 分隔线/子 cell 的直角背景被裁进圆角里；不需要圆角的场合用 customStyle
+     * 传 borderRadius: 0 覆盖（内联样式优先级高于此处类规则）。
+     */
     .up-cell-group {
+        border-radius: 12px;
+        overflow: hidden;
 		
         &__title {
             padding: $up-cell-group-title-padding;

package/components/up-checkbox/up-checkbox.uvue

@@ -38,6 +38,7 @@
 	import { array as testArray } from '../../libs/function/test'
 	import { addStyle, addUnit, deepMerge, formValidate, error } from '../../libs/function/index'
 	import defProps from './checkbox.uts'
+	import { upThemeVar } from '../../libs/theme/theme.uts'
 	import { useUltraUI } from '../../libs/composable/useUltraUI'
 	const { parent, parentData, getParentData } = useUltraUI()
 	const instance = getCurrentInstance()!.proxy!
@@ -193,7 +194,7 @@
 			? props.activeColor
 			: (parentData.value['activeColor'] != null
 				? parentData.value['activeColor'].toString() 
-				: '#2979ff');
+				: upThemeVar('--up-primary', '#2979ff'));
 	})
 	
 	// 组件选未中激活时的颜色
@@ -503,8 +504,8 @@
 
 			&--checked {
 				color: $up-checkbox-icon-wrap-checked-color;
-				background-color: $up-checkbox-icon-wrap-checked-background-color;
-				border-color: $up-checkbox-icon-wrap-checked-border-color;
+				background-color: var(--up-primary, $up-checkbox-icon-wrap-checked-background-color);
+				border-color: var(--up-primary, $up-checkbox-icon-wrap-checked-border-color);
 			}
 
 			&--disabled {

package/components/up-empty/up-empty.uvue

@@ -27,6 +27,10 @@
 		<view class="up-empty__wrap" v-if="$slots['default'] != null || $slots['$default'] != null">
 			<slot />
 		</view>
+		<!-- 兼容 uview-plus 3.x 的 bottom 具名插槽（按钮等操作区） -->
+		<view class="up-empty__wrap" v-if="$slots['bottom'] != null || $slots['$bottom'] != null">
+			<slot name="bottom" />
+		</view>
 	</view>
 </template>
 

package/components/up-empty/up-empty.vue

@@ -27,6 +27,9 @@
 		<view class="up-empty__wrap" v-if="$slots.default || $slots.$default">
 			<slot />
 		</view>
+		<view class="up-empty__wrap" v-if="$slots.bottom || $slots.$bottom">
+			<slot name="bottom" />
+		</view>
 	</view>
 </template>
 

package/components/up-goods-sku/up-goods-sku.uvue

@@ -8,6 +8,7 @@
             mode="bottom"
             :closeable="pageInline ? false : closeable"
             :pageInline="pageInline"
+            :safeAreaInsetBottom="safeAreaInsetBottom"
             :border-radius="20"
             @close="close"
             @closed="closedHandler"
@@ -78,7 +79,7 @@
 
 <script setup lang="uts">
 	import type { PropType } from 'vue'
-	import { computed, ref } from 'vue'
+	import { computed, ref, watch } from 'vue'
 	function emptySkuList(): Array<UTSJSONObject> {
 		return [] as Array<UTSJSONObject>
 	}
@@ -88,6 +89,17 @@
 	function emptyObject(): UTSJSONObject {
 		return {} as UTSJSONObject
 	}
+	function cloneSkuObject(value: UTSJSONObject | null): UTSJSONObject {
+		if (value == null) {
+			return emptyObject()
+		}
+		const result = emptyObject()
+		const keys = UTSJSONObject.keys(value)
+		for (let i = 0; i < keys.length; i++) {
+			result[keys[i]] = value[keys[i]]
+		}
+		return result
+	}
 	function normalizeNumber(value: any | null, defaultValue: number = 0): number {
 		if (typeof value === 'number') {
 			return value
@@ -148,6 +160,13 @@ const props = defineProps({
 				return [] as Array<UTSJSONObject>
 			}
 		},
+		// 默认选中的SKU
+		defaultSku: {
+			type: Object as PropType<UTSJSONObject>,
+			default(): UTSJSONObject {
+				return {} as UTSJSONObject
+			}
+		},
 		// 最大购买数量
 		maxBuy: {
 			type: Number,
@@ -167,12 +186,17 @@ const props = defineProps({
 		pageInline: {
 			type: Boolean,
 			default: false
+		},
+		// 是否留出底部安全距离
+		safeAreaInsetBottom: {
+			type: Boolean,
+			default: true
 		}
 })
 
 const emit = defineEmits(['open', 'confirm', 'close', 'closed'])
 const show = ref(props.pageInline)
-const selectedSku = ref(emptyObject())
+const selectedSku = ref(cloneSkuObject(props.defaultSku))
 const buyNum = ref(1)
 
 const skuTreeList = computed((): Array<UTSJSONObject> => {
@@ -380,10 +404,15 @@ const onNumChange = (e: UTSJSONObject): void => {
 }
 
 const reset = (): void => {
-	selectedSku.value = emptyObject()
+	selectedSku.value = cloneSkuObject(props.defaultSku)
 	buyNum.value = 1
 }
 
+// 外部更新 defaultSku 时，同步替换内部选中状态
+watch(() : UTSJSONObject | null => props.defaultSku, (newVal: UTSJSONObject | null) => {
+	selectedSku.value = cloneSkuObject(newVal)
+})
+
 const open = (): void => {
 	show.value = true
 	emit('open')

package/components/up-goods-sku/up-goods-sku.vue

@@ -8,6 +8,7 @@
             mode="bottom"
             :closeable="pageInline ? false : closeable"
             :pageInline="pageInline"
+            :safeAreaInsetBottom="safeAreaInsetBottom"
             :border-radius="20"
             @close="close"
             @closed="closedHandler"
@@ -77,7 +78,7 @@
 </template>
 
 <script setup>
-import { computed, ref } from 'vue'
+import { computed, ref, watch } from 'vue'
 import { commonProps } from '../../libs/composable/useUltraUI.js'
 import { t } from '../../libs/i18n/index.js'
 
@@ -107,6 +108,11 @@ const props = defineProps({
 		type: Array,
 		default: () => []
 	},
+	// 默认选中的SKU
+	defaultSku: {
+		type: Object,
+		default: () => ({})
+	},
 	// 最大购买数量
 	maxBuy: {
 		type: Number,
@@ -126,12 +132,17 @@ const props = defineProps({
 	pageInline: {
 		type: Boolean,
 		default: false
+	},
+	// 是否留出底部安全距离
+	safeAreaInsetBottom: {
+		type: Boolean,
+		default: true
 	}
 })
 const emit = defineEmits(['open', 'confirm', 'close', 'closed'])
 
 const show = ref(false)
-const selectedSku = ref({})
+const selectedSku = ref({ ...props.defaultSku })
 const buyNum = ref(1)
 
 if (props.pageInline) {
@@ -270,10 +281,15 @@ function onNumChange(e) {
 }
 
 function reset() {
-	selectedSku.value = {}
+	selectedSku.value = { ...props.defaultSku }
 	buyNum.value = 1
 }
 
+// 外部更新 defaultSku 时，同步替换内部选中状态
+watch(() => props.defaultSku, (sku) => {
+	selectedSku.value = { ...(sku || {}) }
+})
+
 function open() {
 	show.value = true
 	emit('open')

package/components/up-icon/icons.uts

@@ -10,7 +10,7 @@
     'upicon-level': '\ue693',
     'upicon-column-line': '\ue68e',
     'upicon-checkbox-mark': '\ue807',
-    'uiupiconcon-folder': '\ue7f5',
+    'upicon-folder': '\ue7f5',
     'upicon-movie': '\ue7f6',
     'upicon-star-fill': '\ue669',
     'upicon-star': '\ue65f',

package/components/up-navbar/navbar.uts

@@ -30,6 +30,8 @@ export default {
 		titleStyle: {},
 		mode: 'default',
 		scrollTop: 0,
+		frosted: false,
+		statusBarInsetTop: -1,
 		avoidCapsule: true
     }
 } as UTSJSONObject