merge feat-transion-25.05.10

Author: wenwenhua

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

@@ -16,7 +16,7 @@
 RN 样式属性和 Web/小程序中 CSS 样式属性是相交关系：
 
 - **RN 独有属性**：`tintColor`、`writingDirection` 等，CSS 不支持
-- **CSS 独有属性**：`clip-path`、`animation`、`transition` 等，RN 不支持
+- **CSS 独有属性**：`clip-path`、`animation` 等，RN 不支持
 
 因此，在跨平台开发时：
 1. **优先使用交集属性**：尽量使用两边都支持的样式属性

packages/api-proxy/src/platform/api/route/index.ios.js

@@ -104,8 +104,10 @@ function navigateBack (options = {}) {
     }
     if (delta >= routeLength && global.__mpx?.config.rnConfig.onAppBack?.(delta - routeLength + 1)) {
       nextTick(() => {
-        navigationHelper.lastSuccessCallback()
-        navigationHelper.lastSuccessCallback = null
+        if (navigationHelper.lastSuccessCallback) {
+          navigationHelper.lastSuccessCallback()
+          navigationHelper.lastSuccessCallback = null
+        }
       })
     } else {
       navigation.pop(delta)

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/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)
         }
       }
     })
@@ -315,7 +315,7 @@ function createInstance ({ propsRef, type, rawOptions, currentInject, validProps
   if (type === 'page') {
     const props = propsRef.current
     const decodedQuery = {}
-    const rawQuery = props.route.params
+    const rawQuery = props.route.params || {}
     if (isObject(rawQuery)) {
       for (const key in rawQuery) {
         decodedQuery[key] = decodeURIComponent(rawQuery[key])

packages/utils/src/base.js

@@ -135,6 +135,24 @@ function hasChanged (value, oldValue) {
   return !Object.is(value, oldValue)
 }
 
+// 根据类型获取小程序默认值，与微信小程序原生行为保持一致
+function getDefaultValueByType (type, mode) {
+  switch (type) {
+    case String:
+      return ''
+    case Number:
+      return 0
+    case Boolean:
+      return false
+    case Object:
+      return null
+    case Array:
+      return mode === 'web' ? () => [] : []
+    default:
+      return undefined
+  }
+}
+
 export {
   hasProto,
   noop,
@@ -156,5 +174,6 @@ export {
   def,
   hasChanged,
   forEach,
-  cached
+  cached,
+  getDefaultValueByType
 }

packages/webpack-plugin/lib/platform/style/wx/index.js

@@ -39,7 +39,7 @@ module.exports = function getSpec ({ warn, error }) {
   }
   // React 属性支持的枚举值
   const SUPPORTED_PROP_VAL_ARR = {
-    'box-sizing': ['border-box'],
+    'box-sizing': ['border-box', 'content-box'],
     'backface-visibility': ['visible', 'hidden'],
     overflow: ['visible', 'hidden', 'scroll'],
     'border-style': ['solid', 'dotted', 'dashed'],
@@ -89,20 +89,48 @@ module.exports = function getSpec ({ warn, error }) {
       if (rule[1].test(prop)) return rule[0]
     }
   }
-  // const getDefaultValueFromVar = (str) => {
-  //   const totalVarExp = /^var\((.+)\)$/
-  //   if (!totalVarExp.test(str)) return str
-  //   const newVal = parseValues((str.match(totalVarExp)?.[1] || ''), ',')
-  //   if (newVal.length <= 1) return ''
-  //   if (!totalVarExp.test(newVal[1])) return newVal[1]
-  //   return getDefaultValueFromVar(newVal[1])
-  // }
-  // 属性值校验
+
+  // 从 CSS 变量中提取 fallback 值进行验证
+  // 返回值：fallback 值 | null（没有 fallback）| undefined（循环引用）
+  const getDefaultValueFromVar = (str, visited = new Set()) => {
+    const totalVarExp = /^var\((.+)\)$/
+    if (!totalVarExp.test(str)) return str
+
+    // 防止循环引用 - 返回 undefined 表示检测到循环
+    if (visited.has(str)) return undefined
+    visited.add(str)
+
+    const newVal = parseValues((str.match(totalVarExp)?.[1] || ''), ',')
+    if (newVal.length <= 1) return null // 没有 fallback
+    const fallback = newVal[1].trim()
+    // 如果 fallback 也是 var()，递归提取
+    if (totalVarExp.test(fallback)) return getDefaultValueFromVar(fallback, visited)
+    return fallback
+  }
+
   const verifyValues = ({ prop, value, selector }, isError = true) => {
     prop = prop.trim()
     value = value.trim()
     const tips = isError ? error : warn
-    if (cssVariableExp.test(value) || calcExp.test(value) || envExp.test(value)) return true
+
+    // 对于包含 CSS 变量的值，提取 fallback 值进行验证
+    if (cssVariableExp.test(value)) {
+      const fallback = getDefaultValueFromVar(value)
+      // undefined 表示检测到循环引用
+      if (fallback === undefined) {
+        tips(`CSS variable circular reference in fallback chain detected in ${selector} for property ${prop}, value: ${value}`)
+        return false
+      }
+      // null 表示没有 fallback，CSS 变量本身是合法的（运行时会解析）
+      if (fallback === null) {
+        return true
+      }
+      // 有 fallback 值，将 fallback 作为新的 value 继续后续验证流程
+      value = fallback
+    }
+
+    // calc() 和 env() 跳过验证
+    if (calcExp.test(value) || envExp.test(value)) return true
     const namedColor = ['transparent', 'aliceblue', 'antiquewhite', 'aqua', 'aquamarine', 'azure', 'beige', 'bisque', 'black', 'blanchedalmond', 'blue', 'blueviolet', 'brown', 'burlywood', 'cadetblue', 'chartreuse', 'chocolate', 'coral', 'cornflowerblue', 'cornsilk', 'crimson', 'cyan', 'darkblue', 'darkcyan', 'darkgoldenrod', 'darkgray', 'darkgreen', 'darkgrey', 'darkkhaki', 'darkmagenta', 'darkolivegreen', 'darkorange', 'darkorchid', 'darkred', 'darksalmon', 'darkseagreen', 'darkslateblue', 'darkslategrey', 'darkturquoise', 'darkviolet', 'deeppink', 'deepskyblue', 'dimgray', 'dimgrey', 'dodgerblue', 'firebrick', 'floralwhite', 'forestgreen', 'fuchsia', 'gainsboro', 'ghostwhite', 'gold', 'goldenrod', 'gray', 'green', 'greenyellow', 'grey', 'honeydew', 'hotpink', 'indianred', 'indigo', 'ivory', 'khaki', 'lavender', 'lavenderblush', 'lawngreen', 'lemonchiffon', 'lightblue', 'lightcoral', 'lightcyan', 'lightgoldenrodyellow', 'lightgray', 'lightgreen', 'lightgrey', 'lightpink', 'lightsalmon', 'lightseagreen', 'lightskyblue', 'lightslategrey', 'lightsteelblue', 'lightyellow', 'lime', 'limegreen', 'linen', 'magenta', 'maroon', 'mediumaquamarine', 'mediumblue', 'mediumorchid', 'mediumpurple', 'mediumseagreen', 'mediumslateblue', 'mediumspringgreen', 'mediumturquoise', 'mediumvioletred', 'midnightblue', 'mintcream', 'mistyrose', 'moccasin', 'navajowhite', 'navy', 'oldlace', 'olive', 'olivedrab', 'orange', 'orangered', 'orchid', 'palegoldenrod', 'palegreen', 'paleturquoise', 'palevioletred', 'papayawhip', 'peachpuff', 'peru', 'pink', 'plum', 'powderblue', 'purple', 'rebeccapurple', 'red', 'rosybrown', 'royalblue', 'saddlebrown', 'salmon', 'sandybrown', 'seagreen', 'seashell', 'sienna', 'silver', 'skyblue', 'slateblue', 'slategray', 'snow', 'springgreen', 'steelblue', 'tan', 'teal', 'thistle', 'tomato', 'turquoise', 'violet', 'wheat', 'white', 'whitesmoke', 'yellow', 'yellowgreen']
     const valueExp = {
       number: /^((-?(\d+(\.\d+)?|\.\d+))(rpx|px|%|vw|vh)?|hairlineWidth)$/,