提交 59acd63b 编写于 作者: fxy060608's avatar fxy060608

chore: build

上级 48e3a670
...@@ -18085,10 +18085,13 @@ const navigateBack = defineAsyncApi(API_NAVIGATE_BACK, (args, { resolve, reject ...@@ -18085,10 +18085,13 @@ const navigateBack = defineAsyncApi(API_NAVIGATE_BACK, (args, { resolve, reject
else if (isDirectPage(page)) { else if (isDirectPage(page)) {
reLaunchEntryPage(); reLaunchEntryPage();
} }
else { else if (args) {
const { delta, animationType, animationDuration } = args; const { delta, animationType, animationDuration } = args;
back(delta, animationType, animationDuration); back(delta, animationType, animationDuration);
} }
else {
back();
}
return resolve(); return resolve();
}, NavigateBackProtocol, NavigateBackOptions); }, NavigateBackProtocol, NavigateBackOptions);
let firstBackTime = 0; let firstBackTime = 0;
...@@ -18105,7 +18108,7 @@ function quit() { ...@@ -18105,7 +18108,7 @@ function quit() {
plus.runtime.quit(); plus.runtime.quit();
} }
} }
function back(delta, animationType, animationDuration) { function back(delta = 1, animationType, animationDuration) {
const pages = getCurrentPages(); const pages = getCurrentPages();
const len = pages.length; const len = pages.length;
const currentPage = pages[len - 1]; const currentPage = pages[len - 1];
......
...@@ -3220,7 +3220,8 @@ var Switch = defineComponent({ ...@@ -3220,7 +3220,8 @@ var Switch = defineComponent({
}, [type === SwitchType.switch ? createVNode("dc-switch", mergeProps({ }, [type === SwitchType.switch ? createVNode("dc-switch", mergeProps({
dataUncType: "uni-switch" dataUncType: "uni-switch"
}, listeners, { }, listeners, {
checked: switchChecked.value checked: switchChecked.value,
color
}, { }, {
"style": DCSwitchSize "style": DCSwitchSize
}), null) : null, type === SwitchType.checkbox ? createVNode(resolveComponent("checkbox"), mergeProps({ }), null) : null, type === SwitchType.checkbox ? createVNode(resolveComponent("checkbox"), mergeProps({
......
...@@ -8112,7 +8112,9 @@ var MapMarker = /* @__PURE__ */ defineSystemComponent({ ...@@ -8112,7 +8112,9 @@ var MapMarker = /* @__PURE__ */ defineSystemComponent({
} }
if (id) { if (id) {
trigger("markertap", {}, { trigger("markertap", {}, {
markerId: Number(id) markerId: Number(id),
latitude: props3.latitude,
longitude: props3.longitude
}); });
} }
}); });
......
...@@ -15756,7 +15756,9 @@ var MapMarker = /* @__PURE__ */ defineSystemComponent({ ...@@ -15756,7 +15756,9 @@ var MapMarker = /* @__PURE__ */ defineSystemComponent({
} }
if (id2) { if (id2) {
trigger("markertap", {}, { trigger("markertap", {}, {
markerId: Number(id2) markerId: Number(id2),
latitude: props3.latitude,
longitude: props3.longitude
}); });
} }
}); });
...@@ -18733,7 +18735,7 @@ const navigateBack = /* @__PURE__ */ defineAsyncApi(API_NAVIGATE_BACK, (args, { ...@@ -18733,7 +18735,7 @@ const navigateBack = /* @__PURE__ */ defineAsyncApi(API_NAVIGATE_BACK, (args, {
if (!canBack) { if (!canBack) {
return reject(ON_BACK_PRESS); return reject(ON_BACK_PRESS);
} }
getApp().$router.go(-args.delta); getApp().$router.go(args && args.delta ? -args.delta : -1);
return resolve(); return resolve();
}, NavigateBackProtocol, NavigateBackOptions); }, NavigateBackProtocol, NavigateBackOptions);
function navigate({ type, url, events }, __id__) { function navigate({ type, url, events }, __id__) {
...@@ -20766,6 +20768,7 @@ function useMap(props2, rootRef, emit2) { ...@@ -20766,6 +20768,7 @@ function useMap(props2, rootRef, emit2) {
emitBoundsReady(); emitBoundsReady();
}); });
maps2.event.addListener(map2, "click", () => { maps2.event.addListener(map2, "click", () => {
trigger("tap", {}, {});
trigger("click", {}, {}); trigger("click", {}, {});
}); });
maps2.event.addListener(map2, "dragstart", () => { maps2.event.addListener(map2, "dragstart", () => {
......
...@@ -387,7 +387,14 @@ function handleEvent(event) { ...@@ -387,7 +387,14 @@ function handleEvent(event) {
// 快手小程序的 __l 方法也会走此处逻辑,但没有 __ins__ // 快手小程序的 __l 方法也会走此处逻辑,但没有 __ins__
if (__ins__) { if (__ins__) {
// 自定义事件,通过 triggerEvent 传递 __ins__ // 自定义事件,通过 triggerEvent 传递 __ins__
methodName = resolveMethodName(type, __ins__.properties[EVENT_OPTS] || {}); let eventObj = {};
try {
// https://github.com/dcloudio/uni-app/issues/3647
// 通过字符串序列化解决百度小程序修改对象不触发组件properties变化的Bug
eventObj = JSON.parse(__ins__.properties[EVENT_OPTS]);
}
catch (e) { }
methodName = resolveMethodName(type, eventObj);
} }
else if (dataset && dataset[EVENT_OPTS]) { else if (dataset && dataset[EVENT_OPTS]) {
// 快手小程序 input 等内置组件的 input 事件也会走此逻辑,所以从 dataset 中读取 // 快手小程序 input 等内置组件的 input 事件也会走此逻辑,所以从 dataset 中读取
......
...@@ -387,7 +387,14 @@ function handleEvent(event) { ...@@ -387,7 +387,14 @@ function handleEvent(event) {
// 快手小程序的 __l 方法也会走此处逻辑,但没有 __ins__ // 快手小程序的 __l 方法也会走此处逻辑,但没有 __ins__
if (__ins__) { if (__ins__) {
// 自定义事件,通过 triggerEvent 传递 __ins__ // 自定义事件,通过 triggerEvent 传递 __ins__
methodName = resolveMethodName(type, __ins__.properties[EVENT_OPTS] || {}); let eventObj = {};
try {
// https://github.com/dcloudio/uni-app/issues/3647
// 通过字符串序列化解决百度小程序修改对象不触发组件properties变化的Bug
eventObj = JSON.parse(__ins__.properties[EVENT_OPTS]);
}
catch (e) { }
methodName = resolveMethodName(type, eventObj);
} }
else if (dataset && dataset[EVENT_OPTS]) { else if (dataset && dataset[EVENT_OPTS]) {
// 快手小程序 input 等内置组件的 input 事件也会走此逻辑,所以从 dataset 中读取 // 快手小程序 input 等内置组件的 input 事件也会走此逻辑,所以从 dataset 中读取
......
...@@ -5710,7 +5710,8 @@ const n = (value) => normalizeClass(value); ...@@ -5710,7 +5710,8 @@ const n = (value) => normalizeClass(value);
const t = (val) => toDisplayString(val); const t = (val) => toDisplayString(val);
const p = (props) => renderProps(props); const p = (props) => renderProps(props);
const sr = (ref, id, opts) => setRef(ref, id, opts); const sr = (ref, id, opts) => setRef(ref, id, opts);
const m = (fn, modifiers, isComponent = false) => withModelModifiers(fn, modifiers, isComponent); const m = (fn, modifiers, isComponent = false) => withModelModifiers(fn, modifiers, isComponent);
const j = (obj) => JSON.stringify(obj);
function createApp(rootComponent, rootProps = null) { function createApp(rootComponent, rootProps = null) {
rootComponent && (rootComponent.mpType = 'app'); rootComponent && (rootComponent.mpType = 'app');
...@@ -5718,4 +5719,4 @@ function createApp(rootComponent, rootProps = null) { ...@@ -5718,4 +5719,4 @@ function createApp(rootComponent, rootProps = null) {
} }
const createSSRApp = createApp; const createSSRApp = createApp;
export { EffectScope, Fragment, ReactiveEffect, Text, c, callWithAsyncErrorHandling, callWithErrorHandling, computed$1 as computed, createApp, createSSRApp, createVNode$1 as createVNode, createVueApp, customRef, d, defineAsyncComponent, defineComponent, defineEmits, defineExpose, defineProps, diff, e, effect, effectScope, f, findComponentPropsData, getCurrentInstance, getCurrentScope, getExposeProxy, guardReactiveProps, h, hasQueueJob, inject, injectHook, invalidateJob, isInSSRComponentSetup, isProxy, isReactive, isReadonly, isRef, logError, m, markRaw, mergeDefaults, mergeProps, n, nextTick, o, onActivated, onBeforeMount, onBeforeUnmount, onBeforeUpdate, onDeactivated, onErrorCaptured, onMounted, onRenderTracked, onRenderTriggered, onScopeDispose, onServerPrefetch, onUnmounted, onUpdated, p, patch, provide, proxyRefs, pruneComponentPropsCache, queuePostFlushCb, r, reactive, readonly, ref, resolveComponent, resolveDirective, resolveFilter, s, setCurrentRenderingInstance, setTemplateRef, setupDevtoolsPlugin, shallowReactive, shallowReadonly, shallowRef, sr, stop, t, toHandlers, toRaw, toRef, toRefs, triggerRef, unref, updateProps, useAttrs, useCssModule, useCssVars, useSSRContext, useSlots, version, w, warn$1 as warn, watch, watchEffect, watchPostEffect, watchSyncEffect, withAsyncContext, withCtx, withDefaults, withDirectives, withModifiers, withScopeId }; export { EffectScope, Fragment, ReactiveEffect, Text, c, callWithAsyncErrorHandling, callWithErrorHandling, computed$1 as computed, createApp, createSSRApp, createVNode$1 as createVNode, createVueApp, customRef, d, defineAsyncComponent, defineComponent, defineEmits, defineExpose, defineProps, diff, e, effect, effectScope, f, findComponentPropsData, getCurrentInstance, getCurrentScope, getExposeProxy, guardReactiveProps, h, hasQueueJob, inject, injectHook, invalidateJob, isInSSRComponentSetup, isProxy, isReactive, isReadonly, isRef, j, logError, m, markRaw, mergeDefaults, mergeProps, n, nextTick, o, onActivated, onBeforeMount, onBeforeUnmount, onBeforeUpdate, onDeactivated, onErrorCaptured, onMounted, onRenderTracked, onRenderTriggered, onScopeDispose, onServerPrefetch, onUnmounted, onUpdated, p, patch, provide, proxyRefs, pruneComponentPropsCache, queuePostFlushCb, r, reactive, readonly, ref, resolveComponent, resolveDirective, resolveFilter, s, setCurrentRenderingInstance, setTemplateRef, setupDevtoolsPlugin, shallowReactive, shallowReadonly, shallowRef, sr, stop, t, toHandlers, toRaw, toRef, toRefs, triggerRef, unref, updateProps, useAttrs, useCssModule, useCssVars, useSSRContext, useSlots, version, w, warn$1 as warn, watch, watchEffect, watchPostEffect, watchSyncEffect, withAsyncContext, withCtx, withDefaults, withDirectives, withModifiers, withScopeId };
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册