uview-ultra 4.5.71 → 4.5.75

package/components/up-form-item/up-form-item.uvue

@@ -67,7 +67,7 @@
 			>{{ message }}</text>
 		</slot>
 		<up-line
-			v-if="borderBottom"
+			v-if="resolvedBorderBottom"
 			:color="message != '' && parentData['errorType'] == 'border-bottom' ? color['error'] : propsLine['color']"
 			:customStyle="`margin-top: ${message != '' && parentData['errorType'] == 'message' ? '5px' : 0}`"
 		></up-line>
@@ -93,6 +93,8 @@
 		labelWidth: 45,
 		// 错误提示方式
 		errorType: 'message',
+		// 是否显示下划线边框，未在up-form-item上显式设置时跟随up-form的同名属性
+		borderBottom: true,
 		originalModel: {}
 	})
 	const instance = getCurrentInstance()!.proxy!
@@ -178,6 +180,17 @@
 	const message = ref('')
 	const itemRules = ref<UTSJSONObject[]|UTSJSONObject>({})
 
+	// 是否显示下划线边框：未在up-form-item上显式设置（默认空串）时，跟随up-form的同名属性。
+	// 此前 form-item 只读自己的 borderBottom，导致 up-form 上配的 borderBottom 完全不生效
+	const resolvedBorderBottom = computed((): boolean => {
+		const own: any = props.borderBottom
+		if (own == null || (typeof own == 'string' && (own as string) == '')) {
+			const fromParent: any = parentData.value['borderBottom']
+			return fromParent == null ? true : fromParent as boolean
+		}
+		return own as boolean
+	})
+
 	// 获取父组件的参数
 	const updateParentData = () => {
 		getParentData('up-form', instance, false);

package/components/up-form-item/up-form-item.vue

@@ -67,7 +67,7 @@
 			>{{ message }}</text>
 		</slot>
 		<u-line
-			v-if="borderBottom"
+			v-if="resolvedBorderBottom"
 			:color="message && parentData['errorType'] === 'border-bottom' ? color['error'] : propsLine['color']"
 			:customStyle="`margin-top: ${message && parentData['errorType'] === 'message' ? '5px' : 0}`"
 		></u-line>
@@ -121,7 +121,9 @@
 		// 提示文本的宽度
 		labelWidth: 45,
 		// 错误提示方式
-		errorType: 'message'
+		errorType: 'message',
+		// 是否显示下划线边框，未在up-form-item上显式设置时跟随up-form的同名属性
+		borderBottom: true
 	})
 	const { parent, getParentData } = useUltraUI(props, parentData)
 	// 错误提示语
@@ -134,6 +136,16 @@
 		return defProps.line
 	})
 
+	// 是否显示下划线边框：未在up-form-item上显式设置（默认空串）时，跟随up-form的同名属性。
+	// 此前 form-item 只读自己的 borderBottom，导致 up-form 上配的 borderBottom 完全不生效
+	const resolvedBorderBottom = computed(() => {
+		const own = props.borderBottom
+		if (own === '' || own === undefined || own === null) {
+			return parentData.borderBottom
+		}
+		return own
+	})
+
 	function init() {
 		// 父组件的实例
 		updateParentData()

package/components/up-input/up-input.uvue

@@ -340,6 +340,10 @@ watch((): any => props.modelValue, (newVal: any, oldVal: string|number) => {
     if ((changeFromInner.value && !isBlurFormattedValue) || innerValue.value == newVal) {
         changeFromInner.value = false // 重要否则会出现双向绑定失效问题https://github.com/ijry/uview-plus/issues/419
         blurValue.value = null
+        // immediate 首次执行也会走这里，必须把 firstChange 置为 false，
+        // 否则首次外部赋值（如弹窗选择回填）会因 firstChange 仍为 true
+        // 而跳过 valueChange 与表单验证
+        firstChange.value = false
         return
     }
     innerValue.value = newVal

package/components/up-input/up-input.vue

@@ -167,6 +167,10 @@ watch(() => props.modelValue, (newVal) => {
     if ((changeFromInner.value && !isBlurFormattedValue) || innerValue.value === newVal) {
         changeFromInner.value = false // 重要否则会出现双向绑定失效问题https://github.com/ijry/uview-plus/issues/419
         blurValue.value = null
+        // immediate 首次执行也会走这里，必须把 firstChange 置为 false，
+        // 否则首次外部赋值（如弹窗选择回填）会因 firstChange 仍为 true
+        // 而跳过 valueChange 与表单验证
+        firstChange.value = false
         return
     }
     innerValue.value = newVal
@@ -282,7 +286,8 @@ function doFocus() {
 
 function doBlur() {
     const inputNative = proxy?.$refs?.['input-native']
-    inputNative && inputNative.blur()
+    // 部分平台（如小程序端）取不到原生节点引用，做防御性调用避免直接抛错
+    inputNative && typeof inputNative.blur === 'function' && inputNative.blur()
 }
 
 // 点击完成按钮时触发

package/components/up-lottie/libs/LICENSE-lottie-miniprogram

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019 wechat-miniprogram
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/components/up-lottie/libs/LICENSE-lottie-web

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 Bodymovin
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/components/up-lottie/libs/gen-uvue-variant.py

@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+"""生成 uvue 专用的 lottie-miniprogram 副本。
+
+lottie-miniprogram 在**模块加载期**就会执行 `var b = wx.getSystemInfoSync()`，
+而 uni-app x 没有 wx 全局，直接 import 会在启动时抛 ReferenceError。
+这里在文件最前面补一个模块作用域的 wx 桩，后续压缩代码里的 `wx` 引用
+会解析到这个局部变量（比挂 globalThis 更可靠，不依赖运行时全局对象）。
+
+只补 getSystemInfoSync / request 两项：
+- getSystemInfoSync：lottie 只用来取 pixelRatio（dpr 我们显式传 1）
+- request：仅在按 path 加载远程 JSON 时使用，本组件只用 animationData
+
+原始文件保持不动，供 .vue 侧（微信小程序/鸿蒙，有真实 wx）使用。
+"""
+import io
+
+SRC = 'lottie-miniprogram.min.js'
+DST = 'lottie-miniprogram.uvue.js'
+
+SHIM = """/* ------------------------------------------------------------------
+ * uni-app x 适配层（本文件由 lottie-miniprogram.min.js 自动生成）
+ * lottie-miniprogram 在模块加载期即调用 wx.getSystemInfoSync()，
+ * 而 uni-app x 没有 wx 全局，故在此补一个模块作用域的 wx 桩。
+ * 下方代码与 lottie-miniprogram.min.js 完全一致，未做任何修改。
+ * ------------------------------------------------------------------ */
+var wx = {
+    getSystemInfoSync: function () {
+        try {
+            var info = (typeof uni !== 'undefined' && uni.getSystemInfoSync) ? (uni.getSystemInfoSync() || {}) : {}
+            return { pixelRatio: info.pixelRatio || 1, platform: info.platform || '' }
+        } catch (e) {
+            return { pixelRatio: 1, platform: '' }
+        }
+    },
+    request: function () {}
+};
+
+"""
+
+with io.open(SRC, 'rb') as f:
+    body = f.read()
+
+with io.open(DST, 'wb') as f:
+    f.write(SHIM.encode('utf-8'))
+    f.write(body)
+
+print('generated %s, size=%d' % (DST, len(SHIM.encode('utf-8')) + len(body)))

package/components/up-lottie/libs/harmony-canvas-adapter.js

@@ -0,0 +1,394 @@
+function parseFontSize(font) {
+    const matched = String(font || '').match(/(\d+(?:\.\d+)?)px/)
+    return matched ? Number(matched[1]) : 10
+}
+
+export function createHarmonyCanvasAdapter(options = {}) {
+    const legacy = options.context
+    if (!legacy) {
+        throw new Error('harmony canvas context is required')
+    }
+
+    const width = Number(options.width) > 0 ? Number(options.width) : 1
+    const height = Number(options.height) > 0 ? Number(options.height) : 1
+
+    const state = {
+        fillStyle: '#000000',
+        strokeStyle: '#000000',
+        lineWidth: 1,
+        lineCap: 'butt',
+        lineJoin: 'miter',
+        miterLimit: 10,
+        lineDashOffset: 0,
+        lineDash: [],
+        globalAlpha: 1,
+        globalCompositeOperation: 'source-over',
+        font: '10px sans-serif'
+    }
+    const stack = []
+    const rafIds = new Set()
+    let dirty = false
+    let flushing = false
+    let destroyed = false
+    let flushTimer = null
+
+    const flush = () => {
+        if (destroyed || !dirty || flushing) return
+        dirty = false
+        flushing = true
+        let released = false
+        const release = () => {
+            if (released) return
+            released = true
+            flushing = false
+            if (dirty) scheduleFlush()
+        }
+        try {
+            if (typeof legacy.draw === 'function') {
+                legacy.draw(false, release)
+                setTimeout(release, 80)
+            } else {
+                release()
+            }
+        } catch (error) {
+            release()
+        }
+    }
+
+    const scheduleFlush = () => {
+        if (destroyed || flushTimer !== null) return
+        const timer = setTimeout(() => {
+            rafIds.delete(timer)
+            if (flushTimer === timer) flushTimer = null
+            flush()
+        }, 0)
+        flushTimer = timer
+        rafIds.add(timer)
+    }
+
+    const markDirty = () => {
+        dirty = true
+        scheduleFlush()
+    }
+
+    const sync = () => {
+        if (typeof legacy.setFillStyle === 'function') {
+            legacy.setFillStyle(state.fillStyle)
+        }
+        if (typeof legacy.setStrokeStyle === 'function') {
+            legacy.setStrokeStyle(state.strokeStyle)
+        }
+        if (typeof legacy.setLineWidth === 'function') {
+            legacy.setLineWidth(state.lineWidth)
+        }
+        if (typeof legacy.setLineCap === 'function') {
+            legacy.setLineCap(state.lineCap)
+        }
+        if (typeof legacy.setLineJoin === 'function') {
+            legacy.setLineJoin(state.lineJoin)
+        }
+        if (typeof legacy.setMiterLimit === 'function') {
+            legacy.setMiterLimit(state.miterLimit)
+        }
+        if (typeof legacy.setGlobalAlpha === 'function') {
+            legacy.setGlobalAlpha(state.globalAlpha)
+        }
+        if (typeof legacy.setGlobalCompositeOperation === 'function') {
+            legacy.setGlobalCompositeOperation(state.globalCompositeOperation)
+        }
+        if (typeof legacy.setLineDash === 'function') {
+            legacy.setLineDash(state.lineDash, state.lineDashOffset)
+        }
+        if (typeof legacy.setFontSize === 'function') {
+            legacy.setFontSize(parseFontSize(state.font))
+        }
+    }
+
+    const canvas = {
+        width,
+        height,
+        getContext() {
+            return context
+        },
+        requestAnimationFrame(callback) {
+            const timer = setTimeout(() => {
+                rafIds.delete(timer)
+                if (destroyed) return
+                try {
+                    callback(Date.now())
+                } finally {
+                    flush()
+                }
+            }, 33)
+            rafIds.add(timer)
+            return timer
+        },
+        cancelAnimationFrame(timer) {
+            if (rafIds.has(timer)) {
+                clearTimeout(timer)
+                rafIds.delete(timer)
+            }
+        },
+        createImage() {
+            const image = {
+                width: 0,
+                height: 0,
+                _src: '',
+                _localPath: '',
+                onload: null,
+                onerror: null,
+                addEventListener(type, callback) {
+                    if (type === 'load') image.onload = callback
+                    if (type === 'error') image.onerror = callback
+                }
+            }
+            Object.defineProperty(image, 'src', {
+                get() {
+                    return image._src
+                },
+                set(value) {
+                    image._src = value
+                    uni.getImageInfo({
+                        src: value,
+                        success(result) {
+                            image.width = result.width || 0
+                            image.height = result.height || 0
+                            image._localPath = result.path || value
+                            if (typeof image.onload === 'function') image.onload()
+                        },
+                        fail() {
+                            if (typeof image.onerror === 'function') image.onerror()
+                        }
+                    })
+                }
+            })
+            return image
+        }
+    }
+
+    const context = {
+        canvas,
+        get fillStyle() {
+            return state.fillStyle
+        },
+        set fillStyle(value) {
+            state.fillStyle = value
+        },
+        get strokeStyle() {
+            return state.strokeStyle
+        },
+        set strokeStyle(value) {
+            state.strokeStyle = value
+        },
+        get lineWidth() {
+            return state.lineWidth
+        },
+        set lineWidth(value) {
+            state.lineWidth = value
+        },
+        get lineCap() {
+            return state.lineCap
+        },
+        set lineCap(value) {
+            state.lineCap = value
+        },
+        get lineJoin() {
+            return state.lineJoin
+        },
+        set lineJoin(value) {
+            state.lineJoin = value
+        },
+        get miterLimit() {
+            return state.miterLimit
+        },
+        set miterLimit(value) {
+            state.miterLimit = value
+        },
+        get lineDashOffset() {
+            return state.lineDashOffset
+        },
+        set lineDashOffset(value) {
+            state.lineDashOffset = value
+        },
+        get globalAlpha() {
+            return state.globalAlpha
+        },
+        set globalAlpha(value) {
+            state.globalAlpha = value
+        },
+        get globalCompositeOperation() {
+            return state.globalCompositeOperation
+        },
+        set globalCompositeOperation(value) {
+            state.globalCompositeOperation = value
+        },
+        get font() {
+            return state.font
+        },
+        set font(value) {
+            state.font = value
+        },
+        save() {
+            stack.push(Object.assign({}, state))
+            if (typeof legacy.save === 'function') legacy.save()
+        },
+        restore() {
+            if (stack.length) Object.assign(state, stack.pop())
+            if (typeof legacy.restore === 'function') legacy.restore()
+            sync()
+        },
+        translate(x, y) {
+            legacy.translate(x, y)
+        },
+        scale(x, y) {
+            legacy.scale(x, y)
+        },
+        rotate(angle) {
+            legacy.rotate(angle)
+        },
+        transform(a, b, c, d, e, f) {
+            if (typeof legacy.transform === 'function') {
+                legacy.transform(a, b, c, d, e, f)
+            }
+        },
+        setTransform(a, b, c, d, e, f) {
+            if (typeof legacy.setTransform === 'function') {
+                legacy.setTransform(a, b, c, d, e, f)
+            } else if (typeof legacy.transform === 'function') {
+                legacy.transform(a, b, c, d, e, f)
+            }
+        },
+        beginPath() {
+            legacy.beginPath()
+        },
+        closePath() {
+            legacy.closePath()
+        },
+        moveTo(x, y) {
+            legacy.moveTo(x, y)
+        },
+        lineTo(x, y) {
+            legacy.lineTo(x, y)
+        },
+        bezierCurveTo(a, b, c, d, e, f) {
+            legacy.bezierCurveTo(a, b, c, d, e, f)
+        },
+        quadraticCurveTo(a, b, c, d) {
+            if (typeof legacy.quadraticCurveTo === 'function') {
+                legacy.quadraticCurveTo(a, b, c, d)
+            }
+        },
+        rect(x, y, w, h) {
+            legacy.rect(x, y, w, h)
+        },
+        arc(x, y, radius, start, end, anticlockwise) {
+            if (typeof legacy.arc === 'function') {
+                legacy.arc(x, y, radius, start, end, anticlockwise)
+            }
+        },
+        fill() {
+            sync()
+            legacy.fill()
+            markDirty()
+        },
+        stroke() {
+            sync()
+            legacy.stroke()
+            markDirty()
+        },
+        clip() {
+            if (typeof legacy.clip === 'function') {
+                legacy.clip()
+            }
+        },
+        clearRect(x, y, w, h) {
+            if (typeof legacy.clearRect === 'function') {
+                legacy.clearRect(x, y, w, h)
+            }
+            markDirty()
+        },
+        fillRect(x, y, w, h) {
+            sync()
+            if (typeof legacy.fillRect === 'function') {
+                legacy.fillRect(x, y, w, h)
+            }
+            markDirty()
+        },
+        strokeRect(x, y, w, h) {
+            sync()
+            if (typeof legacy.strokeRect === 'function') {
+                legacy.strokeRect(x, y, w, h)
+            }
+            markDirty()
+        },
+        drawImage() {
+            const image = arguments[0]
+            const source = image && (image._localPath || image._src || image.src)
+            if (!source) return
+            sync()
+            const args = Array.prototype.slice.call(arguments, 1)
+            try {
+                if (args.length >= 8) {
+                    legacy.drawImage(source, args[4], args[5], args[6], args[7])
+                } else if (args.length >= 4) {
+                    legacy.drawImage(source, args[0], args[1], args[2], args[3])
+                } else {
+                    legacy.drawImage(
+                        source,
+                        args[0] || 0,
+                        args[1] || 0,
+                        image.width || 0,
+                        image.height || 0
+                    )
+                }
+                markDirty()
+            } catch (error) {
+                // 单张图片绘制失败时跳过，避免中断整个动画
+            }
+        },
+        createLinearGradient(x0, y0, x1, y1) {
+            return legacy.createLinearGradient(x0, y0, x1, y1)
+        },
+        createRadialGradient(x0, y0, r0, x1, y1, r1) {
+            return legacy.createRadialGradient(x0, y0, r0, x1, y1, r1)
+        },
+        setLineDash(segments, offset) {
+            state.lineDash = Array.isArray(segments) ? segments.slice() : []
+            if (typeof offset === 'number') {
+                state.lineDashOffset = offset
+            }
+        },
+        fillText(text, x, y) {
+            sync()
+            if (typeof legacy.fillText === 'function') {
+                legacy.fillText(text, x, y)
+            }
+            markDirty()
+        },
+        strokeText(text, x, y) {
+            sync()
+            if (typeof legacy.strokeText === 'function') {
+                legacy.strokeText(text, x, y)
+            }
+            markDirty()
+        },
+        measureText(text) {
+            const fontSize = parseFontSize(state.font)
+            return { width: String(text == null ? '' : text).length * fontSize * 0.6 }
+        }
+    }
+
+    return {
+        canvas,
+        context,
+        flush,
+        destroy() {
+            destroyed = true
+            rafIds.forEach((timer) => clearTimeout(timer))
+            rafIds.clear()
+            flushTimer = null
+            dirty = false
+            stack.length = 0
+        }
+    }
+}