chore: build

dcloudio · Jan 11, 2025 · e00a3c7 · e00a3c7
1 parent dbc5bca
commit e00a3c7
Show file tree

Hide file tree

Showing 2 changed files with 68 additions and 8 deletions.
diff --git a/packages/uni-app-plus/dist/uni.x.runtime.esm.js b/packages/uni-app-plus/dist/uni.x.runtime.esm.js
@@ -6382,14 +6382,32 @@ const _style_0$1 = {
       "paddingRight": 16,
       "paddingBottom": 16,
       "paddingLeft": 16,
+      "borderTopWidth": 1,
+      "borderRightWidth": 1,
       "borderBottomWidth": 1,
+      "borderLeftWidth": 1,
+      "borderTopStyle": "solid",
+      "borderRightStyle": "solid",
       "borderBottomStyle": "solid",
-      "borderBottomColor": "#e5e5e5"
+      "borderLeftStyle": "solid",
+      "borderTopColor": "#e5e5e5",
+      "borderRightColor": "#e5e5e5",
+      "borderBottomColor": "#e5e5e5",
+      "borderLeftColor": "#e5e5e5"
     },
     ".uni-action-sheet_dark__mode": {
+      "borderTopWidth": 1,
+      "borderRightWidth": 1,
       "borderBottomWidth": 1,
+      "borderLeftWidth": 1,
+      "borderTopStyle": "solid",
+      "borderRightStyle": "solid",
       "borderBottomStyle": "solid",
-      "borderBottomColor": "#2F3131"
+      "borderLeftStyle": "solid",
+      "borderTopColor": "#2F3131",
+      "borderRightColor": "#2F3131",
+      "borderBottomColor": "#2F3131",
+      "borderLeftColor": "#2F3131"
     },
     ".uni-action-sheet_landscape__mode": {
       "paddingTop": 10,
@@ -6405,13 +6423,31 @@ const _style_0$1 = {
       "paddingBottom": 16,
       "paddingLeft": 16,
       "borderTopWidth": 1,
+      "borderRightWidth": 1,
+      "borderBottomWidth": 1,
+      "borderLeftWidth": 1,
       "borderTopStyle": "solid",
-      "borderTopColor": "#e5e5e5"
+      "borderRightStyle": "solid",
+      "borderBottomStyle": "solid",
+      "borderLeftStyle": "solid",
+      "borderTopColor": "#e5e5e5",
+      "borderRightColor": "#e5e5e5",
+      "borderBottomColor": "#e5e5e5",
+      "borderLeftColor": "#e5e5e5"
     },
     ".uni-action-sheet_dark__mode": {
       "borderTopWidth": 1,
+      "borderRightWidth": 1,
+      "borderBottomWidth": 1,
+      "borderLeftWidth": 1,
       "borderTopStyle": "solid",
-      "borderTopColor": "#2F3131"
+      "borderRightStyle": "solid",
+      "borderBottomStyle": "solid",
+      "borderLeftStyle": "solid",
+      "borderTopColor": "#2F3131",
+      "borderRightColor": "#2F3131",
+      "borderBottomColor": "#2F3131",
+      "borderLeftColor": "#2F3131"
     },
     ".uni-action-sheet_landscape__mode": {
       "paddingTop": 10,
@@ -7525,14 +7561,32 @@ const _style_0 = {
       "bottom": 0,
       "right": 10,
       "width": "auto",
+      "borderTopWidth": 1,
+      "borderRightWidth": 1,
       "borderBottomWidth": 1,
+      "borderLeftWidth": 1,
+      "borderTopStyle": "solid",
+      "borderRightStyle": "solid",
       "borderBottomStyle": "solid",
-      "borderBottomColor": "#f8f8f8"
+      "borderLeftStyle": "solid",
+      "borderTopColor": "#f8f8f8",
+      "borderRightColor": "#f8f8f8",
+      "borderBottomColor": "#f8f8f8",
+      "borderLeftColor": "#f8f8f8"
     },
     ".uni-choose-location-dark ": {
+      "borderTopWidth": 1,
+      "borderRightWidth": 1,
       "borderBottomWidth": 1,
+      "borderLeftWidth": 1,
+      "borderTopStyle": "solid",
+      "borderRightStyle": "solid",
       "borderBottomStyle": "solid",
-      "borderBottomColor": "#1e1e1e"
+      "borderLeftStyle": "solid",
+      "borderTopColor": "#1e1e1e",
+      "borderRightColor": "#1e1e1e",
+      "borderBottomColor": "#1e1e1e",
+      "borderLeftColor": "#1e1e1e"
     }
   },
   "uni-choose-location-search-icon": {

diff --git a/packages/uni-app-plus/dist/uni.x.vue.js b/packages/uni-app-plus/dist/uni.x.vue.js
@@ -1,5 +1,5 @@
 import { invokeArrayFns, isUniLifecycleHook, decodedQuery, ON_LOAD, ON_SHOW, LINEFEED, RENDERJS_MODULES, formatLog, WXS_PROTOCOL, WXS_MODULES, ON_ERROR, UniLifecycleHooks, invokeCreateErrorHandler, invokeCreateVueAppHook } from '@dcloudio/uni-shared';
-import { isString, isArray, isFunction } from '@vue/shared';
+import { isString, isArray, hasOwn, isFunction } from '@vue/shared';
 import { injectHook, logError } from 'vue';
 
 function get$pageByPage(page) {
@@ -84,7 +84,13 @@ function initHooks(options, instance, publicThis) {
             }
             if ('app' === 'app' && true) {
                 // TODO 统一处理 Web
-                publicThis.options = query || {};
+                // @ts-expect-error
+                const { setupState } = instance;
+                // 组合式 API 时，如果开发者定义了 options 变量，再次赋值会导致 warn & error issues:15107
+                // 现有规范开发者不需要再从 pageVm 上获取 options, 但为了控制修改影响范围，只在上述情况下不再赋值
+                if (!(setupState.__isScriptSetup && hasOwn(setupState, 'options'))) {
+                    publicThis.options = query || {};
+                }
             }
             invokeHook(publicThis, ON_LOAD, query);
             delete instance.attrs.__pageQuery;