@dcloudio/uni-app-plus 3.0.0-alpha-4010720240511002 → 3.0.0-alpha-4010820240516001

package/dist/uni.runtime.esm.js

@@ -13262,15 +13262,15 @@ function parseTheme(pageStyle) {
 function useTabBarThemeChange(tabBar, options) {
     if (__uniConfig.darkmode) {
         const fn = () => {
-            const { list = [], color, selectedColor, backgroundColor, borderStyle, } = parseTheme(options);
-            tabBar &&
+            const { list = [], color, selectedColor, backgroundColor, borderStyle, midButton, } = parseTheme(options);
+            if (tabBar) {
                 tabBar.setTabBarStyle({
                     color,
                     selectedColor,
                     backgroundColor,
                     borderStyle,
+                    midButton,
                 });
-            tabBar &&
                 tabBar.setTabBarItems({
                     list: list.map((item) => ({
                         iconPath: item.iconPath,
@@ -13278,6 +13278,7 @@ function useTabBarThemeChange(tabBar, options) {
                         visible: item.visible,
                     })),
                 });
+            }
         };
         // 由于应用首次启动获取不到手机 theme 应用首次启动设置下 tabBar
         fn();
@@ -17351,7 +17352,7 @@ function normalizeArg(arg) {
     return arg;
 }
 function initUTSInstanceMethod(async, opts, instanceId, proxy) {
-    return initProxyFunction(async, opts, instanceId, proxy);
+    return initProxyFunction('method', async, opts, instanceId, proxy);
 }
 function getProxy() {
     if (!proxy) {
@@ -17410,7 +17411,7 @@ function invokePropGetter(args) {
     }
     return resolveSyncResult(args, getProxy().invokeSync(args, () => { }));
 }
-function initProxyFunction(async, { moduleName, moduleType, package: pkg, class: cls, name: propOrMethod, method, companion, params: methodParams, return: returnOptions, errMsg, }, instanceId, proxy) {
+function initProxyFunction(type, async, { moduleName, moduleType, package: pkg, class: cls, name: methodName, method, companion, params: methodParams, return: returnOptions, errMsg, }, instanceId, proxy) {
     const invokeCallback = ({ id, name, params, keepAlive, }) => {
         const callback = callbacks[id];
         if (callback) {
@@ -17420,7 +17421,7 @@ function initProxyFunction(async, { moduleName, moduleType, package: pkg, class:
             }
         }
         else {
-            console.error(`${pkg}${cls}.${propOrMethod} ${name} is not found`);
+            console.error(`${pkg}${cls}.${methodName} ${name} is not found`);
         }
     };
     const baseArgs = instanceId
@@ -17428,7 +17429,8 @@ function initProxyFunction(async, { moduleName, moduleType, package: pkg, class:
             moduleName,
             moduleType,
             id: instanceId,
-            name: propOrMethod,
+            type,
+            name: methodName,
             method: methodParams,
         }
         : {
@@ -17436,7 +17438,8 @@ function initProxyFunction(async, { moduleName, moduleType, package: pkg, class:
             moduleType,
             package: pkg,
             class: cls,
-            name: method || propOrMethod,
+            name: method || methodName,
+            type,
             companion,
             method: methodParams,
         };
@@ -17482,7 +17485,7 @@ function initUTSStaticMethod(async, opts) {
             opts.method = 's_' + opts.name;
         }
     }
-    return initProxyFunction(async, opts, 0);
+    return initProxyFunction('method', async, opts, 0);
 }
 const initUTSProxyFunction = initUTSStaticMethod;
 function parseClassMethodName(name, methods) {
@@ -17497,8 +17500,11 @@ function isUndefined(value) {
 function isProxyInterfaceOptions(options) {
     return !isUndefined(options.instanceId);
 }
+function parseClassPropertySetter(name) {
+    return '__$set' + capitalize(name);
+}
 function initUTSProxyClass(options) {
-    const { moduleName, moduleType, package: pkg, class: cls, methods, props, errMsg, } = options;
+    const { moduleName, moduleType, package: pkg, class: cls, methods, props, setters, errMsg, } = options;
     const baseOptions = {
         moduleName,
         moduleType,
@@ -17510,6 +17516,7 @@ function initUTSProxyClass(options) {
     let constructorParams = [];
     let staticMethods = {};
     let staticProps = [];
+    let staticSetters = {};
     let isProxyInterface = false;
     if (isProxyInterfaceOptions(options)) {
         isProxyInterface = true;
@@ -17519,6 +17526,7 @@ function initUTSProxyClass(options) {
         constructorParams = options.constructor.params;
         staticMethods = options.staticMethods;
         staticProps = options.staticProps;
+        staticSetters = options.staticSetters;
     }
     // iOS 需要为 ByJs 的 class 构造函数（如果包含JSONObject或UTSCallback类型）补充最后一个参数
     if (isUTSiOS()) {
@@ -17536,7 +17544,7 @@ function initUTSProxyClass(options) {
             // 初始化实例 ID
             if (!isProxyInterface) {
                 // 初始化未指定时，每次都要创建instanceId
-                this.__instanceId = initProxyFunction(false, extend({ name: 'constructor', params: constructorParams }, baseOptions), 0).apply(null, params);
+                this.__instanceId = initProxyFunction('method', false, extend({ name: 'constructor', params: constructorParams }, baseOptions), 0).apply(null, params);
             }
             else if (typeof instanceId === 'number') {
                 this.__instanceId = instanceId;
@@ -17568,6 +17576,7 @@ function initUTSProxyClass(options) {
                                 moduleName,
                                 moduleType,
                                 id: instance.__instanceId,
+                                type: 'property',
                                 name: name,
                                 errMsg,
                             });
@@ -17575,10 +17584,28 @@ function initUTSProxyClass(options) {
                     }
                     return target[name];
                 },
+                set(_, name, newValue) {
+                    if (props.includes(name)) {
+                        const setter = parseClassPropertySetter(name);
+                        if (!target[setter]) {
+                            const param = setters[name];
+                            if (param) {
+                                target[setter] = initProxyFunction('property', false, extend({
+                                    name: name,
+                                    params: [param],
+                                }, baseOptions), instance.__instanceId, proxy);
+                            }
+                        }
+                        target[parseClassPropertySetter(name)](newValue);
+                        return true;
+                    }
+                    return false;
+                },
             });
             return proxy;
         }
     };
+    const staticPropSetterCache = {};
     const staticMethodCache = {};
     return new Proxy(ProxyClass, {
         get(target, name, receiver) {
@@ -17587,16 +17614,42 @@ function initUTSProxyClass(options) {
                 if (!staticMethodCache[name]) {
                     const { async, params, return: returnOptions } = staticMethods[name];
                     // 静态方法
-                    staticMethodCache[name] = initUTSStaticMethod(!!async, extend({ name, companion: true, params, return: returnOptions }, baseOptions));
+                    staticMethodCache[name] = initUTSStaticMethod(!!async, extend({
+                        name,
+                        companion: true,
+                        params,
+                        return: returnOptions,
+                    }, baseOptions));
                 }
                 return staticMethodCache[name];
             }
             if (staticProps.includes(name)) {
-                // 静态属性
-                return invokePropGetter(extend({ name: name, companion: true }, baseOptions));
+                return invokePropGetter(extend({
+                    name: name,
+                    companion: true,
+                    type: 'property',
+                }, baseOptions));
             }
             return Reflect.get(target, name, receiver);
         },
+        set(_, name, newValue) {
+            if (staticProps.includes(name)) {
+                // 静态属性
+                const setter = parseClassPropertySetter(name);
+                if (!staticPropSetterCache[setter]) {
+                    const param = staticSetters[name];
+                    if (param) {
+                        staticPropSetterCache[setter] = initProxyFunction('property', false, extend({
+                            name: name,
+                            params: [param],
+                        }, baseOptions), 0);
+                    }
+                }
+                staticPropSetterCache[parseClassPropertySetter(name)](newValue);
+                return true;
+            }
+            return false;
+        },
     });
 }
 function isUTSAndroid() {

package/dist/uni.x.runtime.esm.js

@@ -1078,7 +1078,23 @@ var ON_POP_GESTURE = "onPopGesture";
 function parsePageStyle(route) {
   var style = /* @__PURE__ */ new Map();
   var routeMeta = route.meta;
-  var routeKeys = ["id", "route", "i18n", "isQuit", "isEntry", "isTabBar", "tabBarIndex", "tabBarText", "windowTop", "topWindow", "leftWindow", "rightWindow", "eventChannel"];
+  var routeKeys = [
+    "id",
+    "route",
+    "i18n",
+    "isQuit",
+    "isEntry",
+    "isTabBar",
+    "tabBarIndex",
+    "tabBarText",
+    "windowTop",
+    "topWindow",
+    "leftWindow",
+    "rightWindow",
+    "eventChannel",
+    // 忽略 initRouteMeta产生的 navigationBar 对象
+    "navigationBar"
+  ];
   var navKeys = ["navigationBarTitleText", "navigationBarBackgroundColor", "navigationBarTextStyle", "navigationStyle"];
   Object.keys(routeMeta).forEach((key) => {
     if (!routeKeys.includes(key) && !navKeys.includes(key)) {
@@ -1091,11 +1107,13 @@ function parsePageStyle(route) {
       navigationBar[key] = routeMeta[key];
     }
   });
-  if (Object.keys(navigationBar).length) {
-    style.set("navigationBar", navigationBar);
+  if (Object.keys(navigationBar).length > 0) {
     if (navigationBar.navigationBarTextStyle !== "custom" && !routeMeta.isQuit && routeMeta.route !== __uniConfig.realEntryPagePath) {
-      navigationBar["navigationBarAutoBackButton"] = true;
+      style.set("navigationBarAutoBackButton", true);
     }
+    Object.keys(navigationBar).forEach((key) => {
+      style.set(key, navigationBar[key]);
+    });
   }
   return style;
 }
@@ -1837,7 +1855,7 @@ var setNavigationBarColor = /* @__PURE__ */ defineAsyncApi(API_SET_NAVIGATION_BA
     return reject("getCurrentPages is empty");
   }
   var appPage = page.$nativePage;
-  appPage.updateStyle(/* @__PURE__ */ new Map([["navigationBar", /* @__PURE__ */ new Map([["navigationBarTextStyle", frontColor == "#000000" ? "black" : "white"], ["navigationBarBackgroundColor", backgroundColor]])]]));
+  appPage.updateStyle(/* @__PURE__ */ new Map([["navigationBarTextStyle", frontColor == "#000000" ? "black" : "white"], ["navigationBarBackgroundColor", backgroundColor]]));
   resolve();
 }, SetNavigationBarColorProtocol, SetNavigationBarColorOptions);
 var setNavigationBarTitle = /* @__PURE__ */ defineAsyncApi(API_SET_NAVIGATION_BAR_TITLE, (options, _ref) => {
@@ -1851,7 +1869,7 @@ var setNavigationBarTitle = /* @__PURE__ */ defineAsyncApi(API_SET_NAVIGATION_BA
     return;
   }
   var appPage = page.$nativePage;
-  appPage.updateStyle(/* @__PURE__ */ new Map([["navigationBar", /* @__PURE__ */ new Map([["navigationBarTitleText", options.title]])]]));
+  appPage.updateStyle(/* @__PURE__ */ new Map([["navigationBarTitleText", options.title]]));
   resolve();
 });
 var getElementById = /* @__PURE__ */ defineSyncApi("getElementById", (id2) => {
@@ -2193,7 +2211,7 @@ function normalizeArg(arg) {
   return arg;
 }
 function initUTSInstanceMethod(async, opts, instanceId, proxy2) {
-  return initProxyFunction(async, opts, instanceId, proxy2);
+  return initProxyFunction("method", async, opts, instanceId, proxy2);
 }
 function getProxy() {
   if (!proxy) {
@@ -2250,13 +2268,13 @@ function invokePropGetter(args) {
   return resolveSyncResult(args, getProxy().invokeSync(args, () => {
   }));
 }
-function initProxyFunction(async, _ref, instanceId, proxy2) {
+function initProxyFunction(type, async, _ref, instanceId, proxy2) {
   var {
     moduleName,
     moduleType,
     package: pkg,
     class: cls,
-    name: propOrMethod,
+    name: methodName,
     method,
     companion,
     params: methodParams,
@@ -2277,21 +2295,23 @@ function initProxyFunction(async, _ref, instanceId, proxy2) {
         delete callbacks[id2];
       }
     } else {
-      console.error("".concat(pkg).concat(cls, ".").concat(propOrMethod, " ").concat(name, " is not found"));
+      console.error("".concat(pkg).concat(cls, ".").concat(methodName, " ").concat(name, " is not found"));
     }
   };
   var baseArgs = instanceId ? {
     moduleName,
     moduleType,
     id: instanceId,
-    name: propOrMethod,
+    type,
+    name: methodName,
     method: methodParams
   } : {
     moduleName,
     moduleType,
     package: pkg,
     class: cls,
-    name: method || propOrMethod,
+    name: method || methodName,
+    type,
     companion,
     method: methodParams
   };
@@ -2329,7 +2349,7 @@ function initUTSStaticMethod(async, opts) {
       opts.method = "s_" + opts.name;
     }
   }
-  return initProxyFunction(async, opts, 0);
+  return initProxyFunction("method", async, opts, 0);
 }
 var initUTSProxyFunction = initUTSStaticMethod;
 function parseClassMethodName(name, methods) {
@@ -2344,6 +2364,9 @@ function isUndefined(value) {
 function isProxyInterfaceOptions(options) {
   return !isUndefined(options.instanceId);
 }
+function parseClassPropertySetter(name) {
+  return "__$set" + capitalize(name);
+}
 function initUTSProxyClass(options) {
   var {
     moduleName,
@@ -2352,6 +2375,7 @@ function initUTSProxyClass(options) {
     class: cls,
     methods,
     props,
+    setters,
     errMsg
   } = options;
   var baseOptions = {
@@ -2365,6 +2389,7 @@ function initUTSProxyClass(options) {
   var constructorParams = [];
   var staticMethods = {};
   var staticProps = [];
+  var staticSetters = {};
   var isProxyInterface = false;
   if (isProxyInterfaceOptions(options)) {
     isProxyInterface = true;
@@ -2373,6 +2398,7 @@ function initUTSProxyClass(options) {
     constructorParams = options.constructor.params;
     staticMethods = options.staticMethods;
     staticProps = options.staticProps;
+    staticSetters = options.staticSetters;
   }
   if (isUTSiOS()) {
     if (constructorParams.find((p) => p.type === "UTSCallback" || p.type.indexOf("JSONObject") > 0)) {
@@ -2393,7 +2419,7 @@ function initUTSProxyClass(options) {
         for (var _len2 = arguments.length, params = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
           params[_key2] = arguments[_key2];
         }
-        this.__instanceId = initProxyFunction(false, extend({
+        this.__instanceId = initProxyFunction("method", false, extend({
           name: "constructor",
           params: constructorParams
         }, baseOptions), 0).apply(null, params);
@@ -2427,17 +2453,36 @@ function initUTSProxyClass(options) {
                 moduleName,
                 moduleType,
                 id: instance.__instanceId,
+                type: "property",
                 name,
                 errMsg
               });
             }
           }
           return target[name];
+        },
+        set(_, name, newValue) {
+          if (props.includes(name)) {
+            var setter = parseClassPropertySetter(name);
+            if (!target[setter]) {
+              var param = setters[name];
+              if (param) {
+                target[setter] = initProxyFunction("property", false, extend({
+                  name,
+                  params: [param]
+                }, baseOptions), instance.__instanceId, proxy2);
+              }
+            }
+            target[parseClassPropertySetter(name)](newValue);
+            return true;
+          }
+          return false;
         }
       });
       return proxy2;
     }
   };
+  var staticPropSetterCache = {};
   var staticMethodCache = {};
   return new Proxy(ProxyClass, {
     get(target, name, receiver) {
@@ -2461,10 +2506,28 @@ function initUTSProxyClass(options) {
       if (staticProps.includes(name)) {
         return invokePropGetter(extend({
           name,
-          companion: true
+          companion: true,
+          type: "property"
         }, baseOptions));
       }
       return Reflect.get(target, name, receiver);
+    },
+    set(_, name, newValue) {
+      if (staticProps.includes(name)) {
+        var setter = parseClassPropertySetter(name);
+        if (!staticPropSetterCache[setter]) {
+          var param = staticSetters[name];
+          if (param) {
+            staticPropSetterCache[setter] = initProxyFunction("property", false, extend({
+              name,
+              params: [param]
+            }, baseOptions), 0);
+          }
+        }
+        staticPropSetterCache[parseClassPropertySetter(name)](newValue);
+        return true;
+      }
+      return false;
     }
   });
 }
@@ -2939,6 +3002,11 @@ function $dispatchParent(context, componentName, eventName) {
     }
   }
 }
+function initUniCustomEvent(element, e) {
+  e.target = element;
+  e.currentTarget = element;
+  return e;
+}
 var CHECKBOX_NAME = "Checkbox";
 var CHECKBOX_ROOT_ELEMENT = "uni-checkbox-element";
 class UniCheckboxElement extends UniElementImpl {
@@ -3211,7 +3279,7 @@ class UniCheckboxGroupChangeEventDetail {
     this.value = value;
   }
 }
-class UniCheckboxGroupChangeEvent extends CustomEvent {
+class UniCheckboxGroupChangeEvent extends UniCustomEvent {
   constructor(value) {
     super("change", {
       detail: new UniCheckboxGroupChangeEventDetail(value)
@@ -3252,7 +3320,7 @@ const checkboxGroup = /* @__PURE__ */ defineBuiltInComponent({
           i.checked = info.checked;
         }
       });
-      emit("change", new UniCheckboxGroupChangeEvent(_getValue()));
+      emit("change", initUniCustomEvent(uniCheckboxGroupElementRef.value, new UniCheckboxGroupChangeEvent(_getValue())));
     };
     var _getValue = () => {
       var valueArray = [];
@@ -3572,7 +3640,7 @@ class UniRadioGroupChangeEventDetail {
     this.value = value;
   }
 }
-class UniRadioGroupChangeEvent extends CustomEvent {
+class UniRadioGroupChangeEvent extends UniCustomEvent {
   constructor(value) {
     super("change", {
       detail: new UniRadioGroupChangeEventDetail(value)
@@ -3609,7 +3677,7 @@ const radioGroup = /* @__PURE__ */ defineBuiltInComponent({
     };
     var _changeHandler = (data) => {
       _setValue(data.name);
-      emit("change", new UniRadioGroupChangeEvent(data.name));
+      emit("change", initUniCustomEvent(uniRadioGroupElementRef.value, new UniRadioGroupChangeEvent(data.name)));
     };
     var _getValue = () => {
       var value = "";
@@ -4122,7 +4190,7 @@ class UniPickerViewChangeEventDetail {
     this.value = value;
   }
 }
-class UniPickerViewChangeEvent extends CustomEvent {
+class UniPickerViewChangeEvent extends UniCustomEvent {
   constructor(value) {
     super("change", {
       detail: new UniPickerViewChangeEventDetail(value)
@@ -4224,7 +4292,7 @@ const pickerView = /* @__PURE__ */ defineBuiltInComponent({
         if (data.valueSync.length > index2) {
           data.valueSync[index2] = val;
         }
-        emit("change", new UniPickerViewChangeEvent([...data.valueSync]));
+        emit("change", initUniCustomEvent(pickerViewElementRef.value, new UniPickerViewChangeEvent([...data.valueSync])));
       }
     };
     expose({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-app-plus",
-  "version": "3.0.0-alpha-4010720240511002",
+  "version": "3.0.0-alpha-4010820240516001",
   "description": "@dcloudio/uni-app-plus",
   "files": [
     "dist",
@@ -29,20 +29,20 @@
     "main": "dist/uni.compiler.js"
   },
   "dependencies": {
-    "@dcloudio/uni-app-uts": "3.0.0-alpha-4010720240511002",
-    "@dcloudio/uni-app-vite": "3.0.0-alpha-4010720240511002",
-    "@dcloudio/uni-app-vue": "3.0.0-alpha-4010720240511002",
+    "@dcloudio/uni-app-uts": "3.0.0-alpha-4010820240516001",
+    "@dcloudio/uni-app-vite": "3.0.0-alpha-4010820240516001",
+    "@dcloudio/uni-app-vue": "3.0.0-alpha-4010820240516001",
     "debug": "^4.3.3",
     "fs-extra": "^10.0.0",
     "licia": "^1.29.0",
     "postcss-selector-parser": "^6.0.6"
   },
   "devDependencies": {
-    "@dcloudio/uni-cli-shared": "3.0.0-alpha-4010720240511002",
-    "@dcloudio/uni-components": "3.0.0-alpha-4010720240511002",
-    "@dcloudio/uni-h5": "3.0.0-alpha-4010720240511002",
-    "@dcloudio/uni-i18n": "3.0.0-alpha-4010720240511002",
-    "@dcloudio/uni-shared": "3.0.0-alpha-4010720240511002",
+    "@dcloudio/uni-cli-shared": "3.0.0-alpha-4010820240516001",
+    "@dcloudio/uni-components": "3.0.0-alpha-4010820240516001",
+    "@dcloudio/uni-h5": "3.0.0-alpha-4010820240516001",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-4010820240516001",
+    "@dcloudio/uni-shared": "3.0.0-alpha-4010820240516001",
     "@types/pako": "1.0.2",
     "@vue/compiler-sfc": "3.4.21",
     "autoprefixer": "^10.4.19",

package/style/framework/base.css

@@ -60,8 +60,8 @@ uni-button[loading]:before {
 
 @media (prefers-color-scheme: dark) {
   html {
-    --UI-BG-CLOLOR-ACTIVE: #373737;
-    --UI-BORDER-CLOLOR-1: #373737;
+    --UI-BG-COLOR-ACTIVE: #373737;
+    --UI-BORDER-COLOR-1: #373737;
     /* UI */
     --UI-BG: #000;
     --UI-BG-0: #191919;