Merge remote-tracking branch 'origin/fix-drn-2.10.17' into fix-drn-2.10.17

Author: Blackgan3

analyze_git_stats.py

@@ -0,0 +1,177 @@
+import subprocess
+import sys
+import argparse
+from collections import defaultdict
+from datetime import datetime
+
+def analyze_git_stats():
+    # Parse command line arguments
+    parser = argparse.ArgumentParser(description='Analyze git contribution stats.')
+    parser.add_argument('--since', type=str, default="1 year ago", 
+                        help='Start time period to analyze (e.g. "1 year ago", "2023-01-01")')
+    parser.add_argument('--until', type=str, default=None,
+                        help='End time period to analyze (e.g. "now", "1 month ago", "2024-01-01"). Defaults to now.')
+    args = parser.parse_args()
+
+    # Configuration
+    since_date = args.since
+    until_date = args.until
+
+    # Author Alias Mapping
+    # Format: 'Alias Name': 'Canonical Name'
+    AUTHOR_MAPPINGS = {
+        'wangshunnn': 'Soon Wang',
+        'mackwang112': 'mackwang',
+        'wangxiaokou': 'wangcuijuan',
+        'dongxingxingdong': 'WX-DongXing',
+        'yandadaFreedom': 'lareinayanyu'
+        # Add more mappings here as needed
+    }
+    
+    # Using 'git log' to get the data
+    # --numstat: shows added/deleted lines
+    # --no-merges: optional, generally we want to count actual code contributions, not merge commits
+    # --pretty=format:"AUTHOR:%aN": helps us identify who made the commit
+    cmd = [
+        "git", "log",
+        f"--since={since_date}",
+        "--numstat",
+        "--pretty=format:AUTHOR:%aN",
+        "--no-merges" 
+    ]
+    
+    if until_date:
+        cmd.append(f"--until={until_date}")
+
+    try:
+        # Run the command with utf-8 encoding errors ignored to prevent crashing on binary filenames or weird author names
+        process = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True, errors='replace')
+        stdout, stderr = process.communicate()
+        
+        if process.returncode != 0:
+            print(f"Error executing git command: {stderr}")
+            return
+
+    except FileNotFoundError:
+        print("Error: 'git' command not found. Please ensure git is installed.")
+        return
+
+    # Data structure: 
+    # stats = {
+    #    author: {
+    #        'total': {'added': 0, 'deleted': 0, 'commits': 0},
+    #        'lt_1000': {'added': 0, 'deleted': 0, 'commits': 0},
+    #        'lt_5000': {'added': 0, 'deleted': 0, 'commits': 0}
+    #    }
+    # }
+    stats = defaultdict(lambda: {
+        'total': {'added': 0, 'deleted': 0, 'commits': 0},
+        'lt_1000': {'added': 0, 'deleted': 0, 'commits': 0},
+        'lt_5000': {'added': 0, 'deleted': 0, 'commits': 0}
+    })
+    
+    lines = stdout.split('\n')
+    
+    pending_author = None
+    pending_commit_stats = {'added': 0, 'deleted': 0}
+    
+    def finalize_commit(author, commit_stats):
+        if not author:
+            return
+            
+        added = commit_stats['added']
+        deleted = commit_stats['deleted']
+        total_change = added + deleted
+        
+        # Add to Total
+        stats[author]['total']['added'] += added
+        stats[author]['total']['deleted'] += deleted
+        stats[author]['total']['commits'] += 1
+        
+        # Add to < 5000
+        if total_change < 5000:
+            stats[author]['lt_5000']['added'] += added
+            stats[author]['lt_5000']['deleted'] += deleted
+            stats[author]['lt_5000']['commits'] += 1
+            
+        # Add to < 1000
+        if total_change < 1000:
+            stats[author]['lt_1000']['added'] += added
+            stats[author]['lt_1000']['deleted'] += deleted
+            stats[author]['lt_1000']['commits'] += 1
+
+    for line in lines:
+        line = line.strip()
+        if not line:
+            continue
+            
+        if line.startswith("AUTHOR:"):
+            # Finish previous commit
+            finalize_commit(pending_author, pending_commit_stats)
+            
+            # Start new commit
+            raw_author = line.split("AUTHOR:", 1)[1].strip()
+            pending_author = AUTHOR_MAPPINGS.get(raw_author, raw_author)
+            pending_commit_stats = {'added': 0, 'deleted': 0}
+        else:
+            # It's a numstat line: "added  deleted  filepath"
+            parts = line.split(maxsplit=2)
+            if len(parts) == 3:
+                added, deleted, _ = parts
+                
+                # Handle binary files or other non-numeric entries
+                if added == '-' or deleted == '-':
+                    continue
+                    
+                try:
+                    pending_commit_stats['added'] += int(added)
+                    pending_commit_stats['deleted'] += int(deleted)
+                except ValueError:
+                    continue
+
+    # Finalize the last commit
+    finalize_commit(pending_author, pending_commit_stats)
+
+    # Output formatting
+    def print_table(title, key_type):
+        print(f"\n{title}")
+        print(f"{'Author':<30} | {'Added':<10} | {'Deleted':<10} | {'Total Lines':<12} | {'Commits':<8}")
+        print("-" * 80)
+        
+        # Convert to list for sorting
+        results = []
+        for author, data in stats.items():
+            category_data = data[key_type]
+            total_changed = category_data['added'] + category_data['deleted']
+            # Only include if they have commits in this category
+            if category_data['commits'] > 0:
+                results.append({
+                    'author': author,
+                    'added': category_data['added'],
+                    'deleted': category_data['deleted'],
+                    'total': total_changed,
+                    'commits': category_data['commits']
+                })
+        
+        # Sort by total lines changed (descending)
+        results.sort(key=lambda x: x['total'], reverse=True)
+        
+        total_added_all = 0
+        total_deleted_all = 0
+        total_commits_all = 0
+        
+        for r in results:
+            print(f"{r['author']:<30} | {r['added']:<10} | {r['deleted']:<10} | {r['total']:<12} | {r['commits']:<8}")
+            total_added_all += r['added']
+            total_deleted_all += r['deleted']
+            total_commits_all += r['commits']
+
+        print("-" * 80)
+        print(f"{'TOTAL':<30} | {total_added_all:<10} | {total_deleted_all:<10} | {total_added_all+total_deleted_all:<12} | {total_commits_all:<8}")
+
+    print_table("=== ALL COMMITS ===", 'total')
+    print_table("=== COMMITS < 5000 LINES ===", 'lt_5000')
+    print_table("=== COMMITS < 1000 LINES ===", 'lt_1000')
+
+if __name__ == "__main__":
+    analyze_git_stats()

docs-vitepress/guide/rn/style.md

@@ -1429,3 +1429,110 @@ object-fit: contain;    /* 完整显示，保持比例 */
 object-fit: cover;      /* 覆盖填充，保持比例，可能裁剪 */
 object-fit: scale-down; /* 缩小显示 */
 ```
+
+
+## 跨端动画
+基础组件 view 支持两种动画形式 createAnimation API 和 transition，
+可以通过设置 animation 属于来使用 createAnimation API 动画，通过 class 或者 style 设置 css transition 来使用 transition 动画，
+可以用过 prop enableAnimation = api/transition 来指定使用 createAnimation API/transition 的动画形式，，enableAnimation 设置 true 默认为 createAnimation API 形式，需要注意的是指定动画类型后，对应的动画参数也需要匹配设置，详细使用文档如下：
+
+### createAnimation 动画API
+创建一个动画实例 animation，调用实例的方法来描述动画，最后通过动画实例的 export 方法导出动画数据传递给组件的 animation 属性。
+详情参考以下动画部分微信小程序文档，以下仅描述支持能力有差异部分：
+#### [wx.createAnimation](https://developers.weixin.qq.com/miniprogram/dev/api/ui/animation/wx.createAnimation.html)
+- 参数 timingFunction 不支持 step-start 和 step-end
+#### [动画实例 animation](https://developers.weixin.qq.com/miniprogram/dev/api/ui/animation/Animation.html)
+- translateZ() 不支持
+- translate3d() 不支持
+- rotate3d() 不支持
+- rotateZ() 不支持
+- scaleZ() 不支持
+- scale3d() 不支持
+- animation.matrix() 不支持
+- animation.matrix3d() 不支持
+
+### CSS transition
+CSS transition 动画至少需要设置动画时长和动画属性，可通过单独属性 transition-property 和 transition-property 设置，也可以通过 transition 缩写设置
+>重要提示：transition 支持设置百分比，如 ```marginTop: 1%;marginTop: 100%;```；要注意的是起始值和结束值需设置为同一类型，同为px或者同为百分比， 支持 ```marginTop: 10px;marginTop: 100px; ```，**不支持 ```marginTop: 10px; marginTop: 100%;```**
+
+#### [transition](https://developer.mozilla.org/en-US/docs/Web/CSS/transition)
+```css
+/**** 支持 */
+/* property name | duration */
+transition: margin-right 4s;
+/* property name | duration | delay */
+transition: margin-right 4s 1s;
+/* property name | duration | easing function */
+transition: margin-right 4s ease-in-out;
+/* property name | duration | easing function | delay */
+transition: margin-right 4s ease-in-out 1s;
+
+/* Apply to 2 properties */
+transition: margin-right 4s, color 1s;
+```
+```css
+/**** 需配合 transition-property 使用*/
+/* transition 未定义 property 时需配合 transition-property 使用，否则仅设置duration、timingFunciton等参数实际动画不生效 */
+transition: 200ms linear 50ms;
+transition: 2s, 1s;
+```
+```css
+/**** 不支持：property 不支持设置为 all  */
+transition: all 0.5s ease-out
+```
+#### [transition-property](https://developer.mozilla.org/en-US/docs/Web/CSS/transition-property)
+不支持设置为 all，不支持自定义
+> 支持的 property 合集有：
+> rotateX rotateY rotateZ scaleX scaleY skewX skewY translateX translateY opacity backgroundColor width height top right bottom left color borderColor borderBottomColor borderLeftColor borderRightColor borderTopColor borderTopLeftRadius borderTopRightRadius borderBottomLeftRadius borderBottomRightRadius borderRadius borderBottomWidth borderLeftWidth borderRightWidth borderTopWidth borderWidth margin marginBottom marginLeft marginRight marginTop maxHeight maxWidth minHeight minWidth padding paddingBottom paddingLeft paddingRight paddingTop
+```css
+/**** 支持 */
+transition-property: height;
+transition-property: height, color;
+```
+```css
+/**** 不支持 */
+transition-property: all;
+/* <custom-ident> values */
+transition-property: test_05;
+transition-property: -specific;
+transition-property: sliding-vertically;
+transition-property: test1, animation4;
+transition-property: all, -moz-specific, sliding;
+transition-property: inherit;
+transition-property: initial;
+transition-property: revert;
+transition-property: revert-layer;
+transition-property: unset;
+```
+#### [transition-duration](https://developer.mozilla.org/zh-CN/docs/Web/CSS/transition-duration)
+```css
+/**** 支持 */
+transition-duration: 6s;
+transition-duration: 120ms;
+transition-duration: 1s, 15s;
+transition-duration: 10s, 30s, 230ms;
+```
+#### [transition-delay](https://developer.mozilla.org/zh-CN/docs/Web/CSS/transition-delay)
+```css
+/**** 支持 */
+transition-delay: 3s;
+transition-delay: 2s, 4ms;
+```
+#### [transition-behavior](https://developer.mozilla.org/en-US/docs/Web/CSS/transition-behavior)
+不支持
+#### [transition-timing-function](https://developer.mozilla.org/en-US/docs/Web/CSS/transition-timing-function)
+仅支持 ease、ease-in、ease-out、ease-in-out、linear、cubic-bezier()，不支持 step-start、step-end、steps()
+
+### CSS animation
+暂不支持
+
+### 动画监听事件
+#### transitionend
+- CSS transition 结束或 wx.createAnimation 结束一个阶段时触发
+- 不属于冒泡事件，需要绑定在真正发生了动画的节点上才会生效
+#### animationstart
+暂不支持
+#### animationiteration
+暂不支持
+#### animationend
+暂不支持

packages/core/src/convertor/wxToWeb.js

@@ -6,7 +6,8 @@ import {
   diffAndCloneA,
   error,
   hasOwn,
-  isDev
+  isDev,
+  getDefaultValueByType
 } from '@mpxjs/utils'
 import { implemented } from '../core/implement'
 
@@ -56,6 +57,12 @@ export default {
                   return diffAndCloneA(prop.value).clone
                 }
                 : prop.value
+            } else {
+              // 没有显式设置value时，根据type自动添加默认值，与微信小程序原生行为保持一致
+              const defaultValue = getDefaultValueByType(prop.type, 'web')
+              if (defaultValue !== undefined) {
+                newProp.default = defaultValue
+              }
             }
             props[key] = newProp
           } else {

packages/core/src/helper/MpxScroll/index.js

@@ -57,8 +57,8 @@ export default class MpxScroll {
       const isIntersecting = change.isIntersecting
       this.isIntersecting = isIntersecting
       if (!isIntersecting) {
-        // 非 inter section 状态下及时清除 transtorm，以免影响正常滚动时元素的 fixed 定位
-        this.el.style.cssText = ''
+        // 非 inter section 状态下及时清除 transform，以免影响正常滚动时元素的 fixed 定位
+        this.el.style.transform = ''
         this.pullDownEventRegister && this.pullDownEventRegister.destroy()
       } else {
         this.pullDownEventRegister = new EventRegister(this.el, [
@@ -103,7 +103,12 @@ export default class MpxScroll {
 
   transformPage (distance) {
     this.translateY = distance
-    this.el.style.cssText = `transform: translateY(${distance}px)`
+    if (distance === 0) {
+      // 距离为 0 时移除 transform，避免影响页面 fixed 定位
+      this.el.style.transform = ''
+    } else {
+      this.el.style.transform = `translateY(${distance}px)`
+    }
   }
 
   onTouchEnd (e) {
@@ -219,8 +224,15 @@ export default class MpxScroll {
   }
 
   onReachBottom (onReachBottomDistance, callback) {
-    const { bottom } = this.el.getBoundingClientRect()
-    const mark = bottom - window.innerHeight <= onReachBottomDistance
+    const scrollTop = getScrollTop()
+    const scrollHeight = document.documentElement.scrollHeight
+    const clientHeight = window.innerHeight
+
+    // 使用 scrollHeight 判断实际内容高度是否超过视口，只有可滚动时才计算触底
+    const scrollable = scrollHeight > clientHeight
+    // 距离底部的距离 = 内容总高度 - (当前滚动位置 + 视口高度)
+    const distanceToBottom = scrollHeight - (scrollTop + clientHeight)
+    const mark = scrollable && (distanceToBottom <= onReachBottomDistance)
 
     if (!this.bottomReached && mark) {
       this.bottomReached = true

packages/core/src/platform/builtInMixins/styleHelperMixin.ios.js

@@ -267,7 +267,7 @@ export default function styleHelperMixin () {
           classString.split(/\s+/).forEach((className) => {
             let localStyle, appStyle
             const getAppClassStyle = global.__getAppClassStyle || noop
-            if (localStyle = this.__getClassStyle(className)) {
+            if (localStyle = this.__getClassStyle?.(className)) {
               if (localStyle._media?.length) {
                 mergeResult(localStyle._default, getMediaStyle(localStyle._media))
               } else {

packages/core/src/platform/patch/getDefaultOptions.ios.js

@@ -3,7 +3,7 @@ import * as ReactNative from 'react-native'
 import { ReactiveEffect } from '../../observer/effect'
 import { watch } from '../../observer/watch'
 import { del, reactive, set } from '../../observer/reactive'
-import { hasOwn, isFunction, noop, isObject, isArray, getByPath, collectDataset, hump2dash, dash2hump, callWithErrorHandling, wrapMethodsWithErrorHandling, error, setFocusedNavigation } from '@mpxjs/utils'
+import { hasOwn, isFunction, noop, isObject, isArray, getByPath, collectDataset, hump2dash, dash2hump, callWithErrorHandling, wrapMethodsWithErrorHandling, error, setFocusedNavigation, getDefaultValueByType } from '@mpxjs/utils'
 import MpxProxy from '../../core/proxy'
 import { BEFOREUPDATE, ONLOAD, UPDATED, ONSHOW, ONHIDE, ONRESIZE, REACTHOOKSEXEC } from '../../core/innerLifecycle'
 import mergeOptions from '../../core/mergeOptions'
@@ -172,8 +172,8 @@ const instanceProto = {
               type: field
             }
           }
-          // 处理props默认值
-          propsData[key] = field.value
+          // 处理props默认值，没有显式设置value时根据type获取默认值，与微信小程序原生行为保持一致
+          propsData[key] = hasOwn(field, 'value') ? field.value : getDefaultValueByType(field.type)
         }
       }
     })