@dcloudio/uni-cli-shared 3.0.0-alpha-5020520260824002 → 3.0.0-alpha-5020520260829001

package/dist/json/uni-x/index.d.ts

@@ -3,6 +3,11 @@ export interface UniXPageOptions {
     disableScroll?: boolean;
     enablePullDownRefresh?: boolean;
     scrollIndicator?: 'none';
+    enableBackToTop?: boolean;
+    bounces?: boolean;
+    androidOverscroll?: boolean;
+    androidRefresherColor?: string;
+    backgroundColor?: string;
 }
 export declare function normalizeUniAppXAppPagesJson(jsonStr: string): UniApp.PagesJson;
 export declare function parseUniXPageOptions(filename: string): UniXPageOptions | undefined;

package/dist/json/uni-x/index.js

@@ -90,18 +90,27 @@ function updateUniXPageOptions(pagesJson) {
     }
     const pageOptions = new Map();
     pagesJson.pages.forEach((page) => {
-        pageOptions.set(page.path, normalizeRootPageOptions(page.style));
+        pageOptions.set(page.path, normalizeRootPageOptions(page.style, pagesJson.globalStyle));
     });
     uniXPageOptionsCache.set(inputDir, pageOptions);
 }
-function normalizeRootPageOptions(pageStyle) {
-    if (!pageStyle) {
-        return {};
-    }
+function normalizeRootPageOptions(pageStyle, globalStyle) {
+    const androidRefresherColor = pageStyle?.androidRefresherColor ?? globalStyle.androidRefresherColor;
+    const backgroundColor = pageStyle?.backgroundColor ?? globalStyle.backgroundColor;
     return {
-        disableScroll: pageStyle.disableScroll === true || undefined,
-        enablePullDownRefresh: isEnablePullDownRefresh(pageStyle) || undefined,
-        scrollIndicator: pageStyle.scrollIndicator,
+        disableScroll: pageStyle?.disableScroll === true || undefined,
+        enablePullDownRefresh: (pageStyle && isEnablePullDownRefresh(pageStyle)) || undefined,
+        scrollIndicator: pageStyle?.scrollIndicator,
+        // 新增的根滚动配置遵循 pages.json 页面样式覆盖全局样式的规则。
+        enableBackToTop: pageStyle?.enableBackToTop ?? globalStyle.enableBackToTop,
+        bounces: pageStyle?.bounces ?? globalStyle.bounces,
+        androidOverscroll: pageStyle?.androidOverscroll ?? globalStyle.androidOverscroll,
+        androidRefresherColor: androidRefresherColor?.startsWith('@')
+            ? undefined
+            : androidRefresherColor,
+        backgroundColor: backgroundColor?.startsWith('@')
+            ? undefined
+            : backgroundColor,
     };
 }
 function initUniXPageOptions() {