diff --git a/packages/uni-components/src/components/label/index.tsx b/packages/uni-components/src/components/label/index.tsx index 98adc03495d365d69d3d87ce56e84efd383f8d7f..ab2365fe4266331db2b79a446c1e08e8b99ffd6d 100644 --- a/packages/uni-components/src/components/label/index.tsx +++ b/packages/uni-components/src/components/label/index.tsx @@ -13,7 +13,7 @@ const props = { export default /*#__PURE__*/ defineBuiltInComponent({ name: 'Label', props, - setup(props, { emit, slots }) { + setup(props, { slots }) { const pageId = useCurrentPageId() const handlers = useProvideLabel() @@ -44,9 +44,7 @@ export default /*#__PURE__*/ defineBuiltInComponent({ true ) } else { - handlers.forEach((handler) => { - handler($event, true) - }) + handlers[0]($event, true) } }) diff --git a/packages/uni-h5/dist/uni-h5.cjs.js b/packages/uni-h5/dist/uni-h5.cjs.js index 72dbf0d420287a200dda5d768c4100a8193aeb67..d29c5781a4b41154f2513af7851405d8d548ab50 100644 --- a/packages/uni-h5/dist/uni-h5.cjs.js +++ b/packages/uni-h5/dist/uni-h5.cjs.js @@ -1905,7 +1905,6 @@ var index$o = /* @__PURE__ */ defineBuiltInComponent({ name: "Label", props: props$o, setup(props2, { - emit: emit2, slots }) { const pageId = useCurrentPageId(); @@ -1923,9 +1922,7 @@ var index$o = /* @__PURE__ */ defineBuiltInComponent({ if (props2.for) { UniViewJSBridge.emit("uni-label-click-" + pageId + "-" + props2.for, $event, true); } else { - handlers.forEach((handler) => { - handler($event, true); - }); + handlers[0]($event, true); } }); return () => vue.createVNode("uni-label", { diff --git a/packages/uni-h5/dist/uni-h5.es.js b/packages/uni-h5/dist/uni-h5.es.js index 0ab5270fac68906e80ed1d2a0f22b515f4cb0cd8..176d41b383c797a290a201d0db674b3aa39c65c7 100644 --- a/packages/uni-h5/dist/uni-h5.es.js +++ b/packages/uni-h5/dist/uni-h5.es.js @@ -594,7 +594,7 @@ var safeAreaInsets = { onChange, offChange }; -var out = safeAreaInsets; +var D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out = safeAreaInsets; const onEventPrevent = /* @__PURE__ */ withModifiers(() => { }, ["prevent"]); const onEventStop = /* @__PURE__ */ withModifiers(() => { @@ -606,10 +606,10 @@ function getWindowOffset() { const left = parseInt(style.getPropertyValue("--window-left")); const right = parseInt(style.getPropertyValue("--window-right")); return { - top: top ? top + out.top : 0, - bottom: bottom ? bottom + out.bottom : 0, - left: left ? left + out.left : 0, - right: right ? right + out.right : 0 + top: top ? top + D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.top : 0, + bottom: bottom ? bottom + D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.bottom : 0, + left: left ? left + D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.left : 0, + right: right ? right + D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.right : 0 }; } function updateCssVar(cssVars) { @@ -1291,7 +1291,7 @@ function normalizePageMeta(pageMeta) { let offset = rpx2px(refreshOptions.offset); const {type} = navigationBar; if (type !== "transparent" && type !== "none") { - offset += NAVBAR_HEIGHT + out.top; + offset += NAVBAR_HEIGHT + D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.top; } refreshOptions.offset = offset; refreshOptions.height = rpx2px(refreshOptions.height); @@ -3156,7 +3156,6 @@ var index$l = /* @__PURE__ */ defineBuiltInComponent({ name: "Label", props: props$v, setup(props2, { - emit: emit2, slots }) { const pageId = useCurrentPageId(); @@ -3174,9 +3173,7 @@ var index$l = /* @__PURE__ */ defineBuiltInComponent({ if (props2.for) { UniViewJSBridge.emit("uni-label-click-" + pageId + "-" + props2.for, $event, true); } else { - handlers.forEach((handler) => { - handler($event, true); - }); + handlers[0]($event, true); } }); return () => createVNode("uni-label", { @@ -14885,7 +14882,7 @@ const getSystemInfoSync = /* @__PURE__ */ defineSyncApi("getSystemInfoSync", () const windowWidth = getWindowWidth(screenWidth); let windowHeight = window.innerHeight; const language = navigator.language; - const statusBarHeight = out.top; + const statusBarHeight = D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.top; let osname; let osversion; let model; @@ -14998,12 +14995,12 @@ const getSystemInfoSync = /* @__PURE__ */ defineSyncApi("getSystemInfoSync", () const system = `${osname} ${osversion}`; const platform = osname.toLocaleLowerCase(); const safeArea = { - left: out.left, - right: windowWidth - out.right, - top: out.top, - bottom: windowHeight - out.bottom, - width: windowWidth - out.left - out.right, - height: windowHeight - out.top - out.bottom + left: D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.left, + right: windowWidth - D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.right, + top: D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.top, + bottom: windowHeight - D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.bottom, + width: windowWidth - D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.left - D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.right, + height: windowHeight - D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.top - D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.bottom }; const {top: windowTop, bottom: windowBottom} = getWindowOffset(); windowHeight -= windowTop; @@ -15023,10 +15020,10 @@ const getSystemInfoSync = /* @__PURE__ */ defineSyncApi("getSystemInfoSync", () model, safeArea, safeAreaInsets: { - top: out.top, - right: out.right, - bottom: out.bottom, - left: out.left + top: D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.top, + right: D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.right, + bottom: D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.bottom, + left: D__DCloud_local_git_uniAppNext_node_modules_safeAreaInsets_out.left } }; });