diff --git a/packages/uni-components/src/components/index.ts b/packages/uni-components/src/components/index.ts index 845579459776b2c6cb7bdc1bcf36e8e63eb42e2c..346e0e2d5881c717a0b4f475c7e09572dc4b8b71 100644 --- a/packages/uni-components/src/components/index.ts +++ b/packages/uni-components/src/components/index.ts @@ -11,7 +11,7 @@ import Input from './input/index' import Label from './label/index' import MovableArea from './movable-area/index' import MovableView from './movable-view/index' -import Navigator from './navigator/index.vue' +import Navigator from './navigator' import PickerView from './picker-view/index' import PickerViewColumn from './picker-view-column/index' import Progress from './progress/index' diff --git a/packages/uni-components/src/components/navigator/index.tsx b/packages/uni-components/src/components/navigator/index.tsx new file mode 100644 index 0000000000000000000000000000000000000000..fc28dfb2453ac9e3cd742043ef79298b086ebf81 --- /dev/null +++ b/packages/uni-components/src/components/navigator/index.tsx @@ -0,0 +1,114 @@ +import { useHover } from '../../helpers/useHover' +import { defineBuiltInComponent } from '@dcloudio/uni-components' + +const OPEN_TYPES = [ + 'navigate', + 'redirect', + 'switchTab', + 'reLaunch', + 'navigateBack', +] + +const props = { + hoverClass: { + type: String, + default: 'navigator-hover', + }, + url: { + type: String, + default: '', + }, + openType: { + type: String, + default: 'navigate', + validator(value: unknown) { + return Boolean(~OPEN_TYPES.indexOf(value as string)) + }, + }, + delta: { + type: Number, + default: 1, + }, + hoverStartTime: { + type: [Number, String], + default: 50, + }, + hoverStayTime: { + type: [Number, String], + default: 600, + }, + exists: { + type: String, + default: '', + }, + hoverStopPropagation: { + type: Boolean, + default: false, + }, +} + +export default /*#__PURE__*/ defineBuiltInComponent({ + name: 'Navigator', + compatConfig: { + MODE: 3, + }, + props, + setup(props, { slots }) { + const { hovering, binding } = useHover(props) + + function onClick($event: MouseEvent) { + if (props.openType !== 'navigateBack' && !props.url) { + console.error( + ' should have url attribute when using navigateTo, redirectTo, reLaunch or switchTab' + ) + return + } + + switch (props.openType) { + case 'navigate': + uni.navigateTo({ + url: props.url, + }) + break + case 'redirect': + uni.redirectTo({ + url: props.url, + // @ts-ignore + exists: props.exists, + }) + break + case 'switchTab': + uni.switchTab({ + url: props.url, + }) + break + case 'reLaunch': + uni.reLaunch({ + url: props.url, + }) + break + case 'navigateBack': + uni.navigateBack({ + delta: props.delta, + }) + break + default: + break + } + } + + return () => { + const { hoverClass } = props + const hasHoverClass = props.hoverClass && props.hoverClass !== 'none' + return ( + + {slots.default && slots.default()} + + ) + } + }, +}) diff --git a/packages/uni-components/src/components/navigator/index.vue b/packages/uni-components/src/components/navigator/index.vue deleted file mode 100644 index adff211d82e79d300741cdc9ff2ffd385b5e3ca6..0000000000000000000000000000000000000000 --- a/packages/uni-components/src/components/navigator/index.vue +++ /dev/null @@ -1,113 +0,0 @@ - - diff --git a/packages/uni-h5/dist/uni-h5.cjs.js b/packages/uni-h5/dist/uni-h5.cjs.js index 8f6dcac403a60eb9840c784a99be23ab298f2dde..225e2789b5aa079dc457a5837b21cb10f2d7dd0f 100644 --- a/packages/uni-h5/dist/uni-h5.cjs.js +++ b/packages/uni-h5/dist/uni-h5.cjs.js @@ -883,7 +883,7 @@ function throttle(fn, wait) { }; return newFn; } -const _sfc_main$8 = { +const _sfc_main$5 = { name: "Audio", mixins: [subscriber], props: { @@ -1002,13 +1002,13 @@ const _sfc_main$8 = { } } }; -const _hoisted_1$6 = {class: "uni-audio-default"}; +const _hoisted_1$4 = {class: "uni-audio-default"}; const _hoisted_2$3 = {class: "uni-audio-right"}; const _hoisted_3$2 = {class: "uni-audio-time"}; const _hoisted_4$2 = {class: "uni-audio-info"}; const _hoisted_5$1 = {class: "uni-audio-name"}; const _hoisted_6$1 = {class: "uni-audio-author"}; -function _sfc_render$8(_ctx, _cache, $props, $setup, $data, $options) { +function _sfc_render$5(_ctx, _cache, $props, $setup, $data, $options) { return vue.openBlock(), vue.createBlock("uni-audio", vue.mergeProps({ id: $props.id, controls: !!$props.controls @@ -1018,7 +1018,7 @@ function _sfc_render$8(_ctx, _cache, $props, $setup, $data, $options) { loop: $props.loop, style: {"display": "none"} }, null, 8, ["loop"]), - vue.createVNode("div", _hoisted_1$6, [ + vue.createVNode("div", _hoisted_1$4, [ vue.createVNode("div", { style: "background-image: url(" + _ctx.$getRealPath($props.poster) + ");", class: "uni-audio-left" @@ -1038,7 +1038,7 @@ function _sfc_render$8(_ctx, _cache, $props, $setup, $data, $options) { ]) ], 16, ["id", "controls"]); } -_sfc_main$8.render = _sfc_render$8; +_sfc_main$5.render = _sfc_render$5; function converPx(value) { if (/^-?\d+[ur]px$/i.test(value)) { return value.replace(/(^-?\d+)[ur]px$/i, (text, num) => { @@ -1270,7 +1270,7 @@ function normalizeCustomEvent(name, domEvt, el, detail) { }; } const uniFormKey = PolySymbol(process.env.NODE_ENV !== "production" ? "uniForm" : "uf"); -var index$r = /* @__PURE__ */ defineBuiltInComponent({ +var index$u = /* @__PURE__ */ defineBuiltInComponent({ name: "Form", setup(_props, { slots, @@ -1310,15 +1310,15 @@ function provideForm(emit2) { return fields2; } const uniLabelKey = PolySymbol(process.env.NODE_ENV !== "production" ? "uniLabel" : "ul"); -const props$p = { +const props$r = { for: { type: String, default: "" } }; -var index$q = /* @__PURE__ */ defineBuiltInComponent({ +var index$t = /* @__PURE__ */ defineBuiltInComponent({ name: "Label", - props: props$p, + props: props$r, setup(props2, { slots }) { @@ -1360,7 +1360,7 @@ function useProvideLabel() { }); return handlers; } -var index$p = /* @__PURE__ */ defineBuiltInComponent({ +var index$s = /* @__PURE__ */ defineBuiltInComponent({ name: "Button", props: { id: { @@ -1558,7 +1558,7 @@ function getTempCanvas(width = 0, height = 0) { tempCanvas.height = height; return tempCanvas; } -var _sfc_main$7 = { +var _sfc_main$4 = { name: "Canvas", inheritAttrs: false, compatConfig: { @@ -2020,20 +2020,20 @@ var _sfc_main$7 = { }; } }; -const _hoisted_1$5 = { +const _hoisted_1$3 = { class: "uni-canvas-canvas", ref: "canvas", width: "300", height: "150" }; const _hoisted_2$2 = {style: {"position": "absolute", "top": "0", "left": "0", "width": "100%", "height": "100%", "overflow": "hidden"}}; -function _sfc_render$7(_ctx, _cache, $props, $setup, $data, $options) { +function _sfc_render$4(_ctx, _cache, $props, $setup, $data, $options) { const _component_ResizeSensor = vue.resolveComponent("ResizeSensor"); return vue.openBlock(), vue.createBlock("uni-canvas", vue.mergeProps({ "canvas-id": $props.canvasId, "disable-scroll": $props.disableScroll }, __spreadValues(__spreadValues({}, $setup.Attrs), $setup.ExcludeAttrs), vue.toHandlers($options._listeners)), [ - vue.createVNode("canvas", _hoisted_1$5, null, 512), + vue.createVNode("canvas", _hoisted_1$3, null, 512), vue.createVNode("div", _hoisted_2$2, [ vue.renderSlot(_ctx.$slots, "default") ]), @@ -2043,17 +2043,17 @@ function _sfc_render$7(_ctx, _cache, $props, $setup, $data, $options) { }, null, 8, ["onResize"]) ], 16, ["canvas-id", "disable-scroll"]); } -_sfc_main$7.render = _sfc_render$7; +_sfc_main$4.render = _sfc_render$4; const uniCheckGroupKey = PolySymbol(process.env.NODE_ENV !== "production" ? "uniCheckGroup" : "ucg"); -const props$o = { +const props$q = { name: { type: String, default: "" } }; -var index$o = /* @__PURE__ */ defineBuiltInComponent({ +var index$r = /* @__PURE__ */ defineBuiltInComponent({ name: "CheckboxGroup", - props: props$o, + props: props$q, emits: ["change"], setup(props2, { emit: emit2, @@ -2105,7 +2105,7 @@ function useProvideCheckGroup(props2, trigger) { } return getFieldsValue; } -const props$n = { +const props$p = { checked: { type: [Boolean, String], default: false @@ -2127,9 +2127,9 @@ const props$n = { default: "" } }; -var index$n = /* @__PURE__ */ defineBuiltInComponent({ +var index$q = /* @__PURE__ */ defineBuiltInComponent({ name: "Checkbox", - props: props$n, + props: props$p, setup(props2, { slots }) { @@ -2198,7 +2198,7 @@ function useCheckboxInject(checkboxChecked, checkboxValue, reset) { let resetTimer; function iosHideKeyboard() { } -const props$m = { +const props$o = { cursorSpacing: { type: [Number, String], default: 0 @@ -2384,7 +2384,7 @@ function useQuill(props2, rootRef, trigger) { } }, id, true); } -const props$l = /* @__PURE__ */ Object.assign({}, props$m, { +const props$n = /* @__PURE__ */ Object.assign({}, props$o, { id: { type: String, default: "" @@ -2410,9 +2410,9 @@ const props$l = /* @__PURE__ */ Object.assign({}, props$m, { default: false } }); -var index$m = /* @__PURE__ */ defineBuiltInComponent({ +var index$p = /* @__PURE__ */ defineBuiltInComponent({ name: "Editor", - props: props$l, + props: props$n, emit: ["ready", "focus", "blur", "input", "statuschange", ...emit$1], setup(props2, { emit: emit2 @@ -2471,7 +2471,7 @@ const ICONS = { c: GREY_COLOR } }; -var index$l = /* @__PURE__ */ defineBuiltInComponent({ +var index$o = /* @__PURE__ */ defineBuiltInComponent({ name: "Icon", props: { type: { @@ -2498,7 +2498,7 @@ var index$l = /* @__PURE__ */ defineBuiltInComponent({ }; } }); -const props$k = { +const props$m = { src: { type: String, default: "" @@ -2535,9 +2535,9 @@ const IMAGE_MODES = { "bottom left": ["left bottom"], "bottom right": ["right bottom"] }; -var index$k = /* @__PURE__ */ defineBuiltInComponent({ +var index$n = /* @__PURE__ */ defineBuiltInComponent({ name: "Image", - props: props$k, + props: props$m, setup(props2, { emit: emit2 }) { @@ -2772,7 +2772,7 @@ const UniViewJSBridgeSubscribe = function() { function getValueString(value) { return value === null ? "" : String(value); } -const props$j = /* @__PURE__ */ Object.assign({}, { +const props$l = /* @__PURE__ */ Object.assign({}, { name: { type: String, default: "" @@ -2837,7 +2837,7 @@ const props$j = /* @__PURE__ */ Object.assign({}, { type: String, default: "done" } -}, props$m); +}, props$o); const emit = [ "input", "focus", @@ -3023,7 +3023,7 @@ function useField(props2, rootRef, emit2, beforeInput) { trigger }; } -const props$i = /* @__PURE__ */ Object.assign({}, props$j, { +const props$k = /* @__PURE__ */ Object.assign({}, props$l, { placeholderClass: { type: String, default: "input-placeholder" @@ -3031,7 +3031,7 @@ const props$i = /* @__PURE__ */ Object.assign({}, props$j, { }); var Input = /* @__PURE__ */ defineBuiltInComponent({ name: "Input", - props: props$i, + props: props$k, emit: ["confirm", ...emit], setup(props2, { emit: emit2 @@ -3187,16 +3187,16 @@ function flatVNode(nodes) { } return array; } -const props$h = { +const props$j = { scaleArea: { type: Boolean, default: false } }; -var index$j = /* @__PURE__ */ defineBuiltInComponent({ +var index$m = /* @__PURE__ */ defineBuiltInComponent({ inheritAttrs: false, name: "MovableArea", - props: props$h, + props: props$j, setup(props2, { slots }) { @@ -3782,7 +3782,7 @@ STD.prototype.reconfigure = function(e2, t2, n) { this._springY.reconfigure(e2, t2, n); this._springScale.reconfigure(e2, t2, n); }; -const props$g = { +const props$i = { direction: { type: String, default: "none" @@ -3836,9 +3836,9 @@ const props$g = { default: true } }; -var index$i = /* @__PURE__ */ defineBuiltInComponent({ +var index$l = /* @__PURE__ */ defineBuiltInComponent({ name: "MovableView", - props: props$g, + props: props$i, emits: ["change", "scale"], setup(props2, { slots, @@ -4210,109 +4210,104 @@ function useMovableViewState(props2, trigger, rootRef) { }; } const OPEN_TYPES = ["navigate", "redirect", "switchTab", "reLaunch", "navigateBack"]; -const _sfc_main$6 = { +const props$h = { + hoverClass: { + type: String, + default: "navigator-hover" + }, + url: { + type: String, + default: "" + }, + openType: { + type: String, + default: "navigate", + validator(value) { + return Boolean(~OPEN_TYPES.indexOf(value)); + } + }, + delta: { + type: Number, + default: 1 + }, + hoverStartTime: { + type: [Number, String], + default: 50 + }, + hoverStayTime: { + type: [Number, String], + default: 600 + }, + exists: { + type: String, + default: "" + }, + hoverStopPropagation: { + type: Boolean, + default: false + } +}; +var index$k = /* @__PURE__ */ defineBuiltInComponent({ name: "Navigator", compatConfig: { MODE: 3 }, - props: { - hoverClass: { - type: String, - default: "navigator-hover" - }, - url: { - type: String, - default: "" - }, - openType: { - type: String, - default: "navigate", - validator(value) { - return ~OPEN_TYPES.indexOf(value); - } - }, - delta: { - type: Number, - default: 1 - }, - hoverStartTime: { - type: [Number, String], - default: 50 - }, - hoverStayTime: { - type: [Number, String], - default: 600 - }, - exists: { - type: String, - default: "" - }, - hoverStopPropagation: { - type: Boolean, - default: false - } - }, - methods: { - _onClick($event) { - if (this.openType !== "navigateBack" && !this.url) { + props: props$h, + setup(props2, { + slots + }) { + const { + hovering, + binding + } = useHover(props2); + function onClick($event) { + if (props2.openType !== "navigateBack" && !props2.url) { console.error(" should have url attribute when using navigateTo, redirectTo, reLaunch or switchTab"); return; } - switch (this.openType) { + switch (props2.openType) { case "navigate": uni.navigateTo({ - url: this.url + url: props2.url }); break; case "redirect": uni.redirectTo({ - url: this.url, - exists: this.exists + url: props2.url, + exists: props2.exists }); break; case "switchTab": uni.switchTab({ - url: this.url + url: props2.url }); break; case "reLaunch": uni.reLaunch({ - url: this.url + url: props2.url }); break; case "navigateBack": uni.navigateBack({ - delta: this.delta + delta: props2.delta }); break; } } - }, - setup(props2) { - const {hovering, binding} = useHover(props2); - return { - hovering, - binding + return () => { + const { + hoverClass + } = props2; + const hasHoverClass = props2.hoverClass && props2.hoverClass !== "none"; + return vue.createVNode("uni-navigator", vue.mergeProps({ + "class": hasHoverClass && hovering.value ? hoverClass : "" + }, hasHoverClass && binding, { + "onClick": onClick + }), [slots.default && slots.default()], 16, ["onClick"]); }; } -}; -function _sfc_render$6(_ctx, _cache, $props, $setup, $data, $options) { - return $props.hoverClass && $props.hoverClass !== "none" ? (vue.openBlock(), vue.createBlock("uni-navigator", vue.mergeProps({ - key: 0, - class: [$setup.hovering ? $props.hoverClass : ""] - }, $setup.binding, { - onClick: _cache[1] || (_cache[1] = (...args) => $options._onClick && $options._onClick(...args)) - }), [ - vue.renderSlot(_ctx.$slots, "default") - ], 16)) : (vue.openBlock(), vue.createBlock("uni-navigator", { - key: 1, - onClick: _cache[2] || (_cache[2] = (...args) => $options._onClick && $options._onClick(...args)) - }, [ - vue.renderSlot(_ctx.$slots, "default") - ])); -} -_sfc_main$6.render = _sfc_render$6; -const props$f = { +}); +const props$g = { value: { type: Array, default() { @@ -4359,7 +4354,7 @@ function useState$1(props2) { } var PickerView = /* @__PURE__ */ defineBuiltInComponent({ name: "PickerView", - props: props$f, + props: props$g, emits: ["change", "pickstart", "pickend", "update:value"], setup(props2, { slots, @@ -5204,7 +5199,7 @@ const VALUES = { backgroundColor: "#EBEBEB", activeMode: "backwards" }; -const props$e = { +const props$f = { percent: { type: [Number, String], default: 0, @@ -5251,9 +5246,9 @@ const props$e = { } } }; -var index$h = /* @__PURE__ */ defineBuiltInComponent({ +var index$j = /* @__PURE__ */ defineBuiltInComponent({ name: "Progress", - props: props$e, + props: props$f, setup(props2) { const state = useProgressState(props2); _activeAnimation(state, props2); @@ -5324,15 +5319,15 @@ function _activeAnimation(state, props2) { } } const uniRadioGroupKey = PolySymbol(process.env.NODE_ENV !== "production" ? "uniCheckGroup" : "ucg"); -const props$d = { +const props$e = { name: { type: String, default: "" } }; -var index$g = /* @__PURE__ */ defineBuiltInComponent({ +var index$i = /* @__PURE__ */ defineBuiltInComponent({ name: "RadioGroup", - props: props$d, + props: props$e, setup(props2, { emit: emit2, slots @@ -5408,7 +5403,7 @@ function useProvideRadioGroup(props2, trigger) { } return fields2; } -const props$c = { +const props$d = { checked: { type: [Boolean, String], default: false @@ -5430,9 +5425,9 @@ const props$c = { default: "" } }; -var index$f = /* @__PURE__ */ defineBuiltInComponent({ +var index$h = /* @__PURE__ */ defineBuiltInComponent({ name: "Radio", - props: props$c, + props: props$d, setup(props2, { slots }) { @@ -5716,7 +5711,7 @@ function parseNodes(nodes, parentNode) { }); return parentNode; } -const _sfc_main$5 = { +const _sfc_main$3 = { name: "RichText", compatConfig: { MODE: 3 @@ -5748,15 +5743,15 @@ const _sfc_main$5 = { } } }; -const _hoisted_1$4 = /* @__PURE__ */ vue.createVNode("div", null, null, -1); -function _sfc_render$5(_ctx, _cache, $props, $setup, $data, $options) { +const _hoisted_1$2 = /* @__PURE__ */ vue.createVNode("div", null, null, -1); +function _sfc_render$3(_ctx, _cache, $props, $setup, $data, $options) { return vue.openBlock(), vue.createBlock("uni-rich-text", _ctx.$attrs, [ - _hoisted_1$4 + _hoisted_1$2 ], 16); } -_sfc_main$5.render = _sfc_render$5; +_sfc_main$3.render = _sfc_render$3; const passiveOptions = uniShared.passive(true); -const _sfc_main$4 = { +const _sfc_main$2 = { name: "ScrollView", compatConfig: { MODE: 3 @@ -6148,7 +6143,7 @@ const _sfc_main$4 = { }; } }; -const _hoisted_1$3 = {ref: "rootRef"}; +const _hoisted_1$1 = {ref: "rootRef"}; const _hoisted_2$1 = { ref: "wrap", class: "uni-scroll-view" @@ -6182,8 +6177,8 @@ const _hoisted_9 = /* @__PURE__ */ vue.createVNode("circle", { style: {"color": "#2bd009"}, "stroke-width": "3" }, null, -1); -function _sfc_render$4(_ctx, _cache, $props, $setup, $data, $options) { - return vue.openBlock(), vue.createBlock("uni-scroll-view", _hoisted_1$3, [ +function _sfc_render$2(_ctx, _cache, $props, $setup, $data, $options) { + return vue.openBlock(), vue.createBlock("uni-scroll-view", _hoisted_1$1, [ vue.createVNode("div", _hoisted_2$1, [ vue.createVNode("div", { ref: "main", @@ -6230,8 +6225,8 @@ function _sfc_render$4(_ctx, _cache, $props, $setup, $data, $options) { ], 512) ], 512); } -_sfc_main$4.render = _sfc_render$4; -const props$b = { +_sfc_main$2.render = _sfc_render$2; +const props$c = { name: { type: String, default: "" @@ -6285,9 +6280,9 @@ const props$b = { default: false } }; -var index$e = /* @__PURE__ */ defineBuiltInComponent({ +var index$g = /* @__PURE__ */ defineBuiltInComponent({ name: "Slider", - props: props$b, + props: props$c, emits: ["changing", "change"], setup(props2, { emit: emit2 @@ -6449,7 +6444,7 @@ var computeController = { return Number(s1.replace(".", "")) * Number(s2.replace(".", "")) / Math.pow(10, m); } }; -const props$a = { +const props$b = { indicatorDots: { type: [Boolean, String], default: false @@ -6830,9 +6825,9 @@ function useLayout(props2, state, swiperContexts, slideFrameRef, emit2, trigger) onSwiperDotClick }; } -var index$d = /* @__PURE__ */ defineBuiltInComponent({ +var index$f = /* @__PURE__ */ defineBuiltInComponent({ name: "Swiper", - props: props$a, + props: props$b, emits: ["change", "transition", "animationfinish", "update:current", "update:currentItemId"], setup(props2, { slots, @@ -6927,15 +6922,15 @@ var index$d = /* @__PURE__ */ defineBuiltInComponent({ }; } }); -const props$9 = { +const props$a = { itemId: { type: String, default: "" } }; -var index$c = /* @__PURE__ */ defineBuiltInComponent({ +var index$e = /* @__PURE__ */ defineBuiltInComponent({ name: "SwiperItem", - props: props$9, + props: props$a, setup(props2, { slots }) { @@ -6952,7 +6947,7 @@ var index$c = /* @__PURE__ */ defineBuiltInComponent({ }; } }); -const props$8 = { +const props$9 = { name: { type: String, default: "" @@ -6978,9 +6973,9 @@ const props$8 = { default: "#007aff" } }; -var index$b = /* @__PURE__ */ defineBuiltInComponent({ +var index$d = /* @__PURE__ */ defineBuiltInComponent({ name: "Switch", - props: props$8, + props: props$9, emits: ["change"], setup(props2, { emit: emit2 @@ -7068,7 +7063,7 @@ function normalizeText(text, { } return text.replace(/ /g, SPACE_UNICODE.nbsp).replace(/ /g, SPACE_UNICODE.ensp).replace(/ /g, SPACE_UNICODE.emsp).replace(/</g, "<").replace(/>/g, ">").replace(/&/g, "&").replace(/"/g, '"').replace(/'/g, "'"); } -var index$a = /* @__PURE__ */ defineBuiltInComponent({ +var index$c = /* @__PURE__ */ defineBuiltInComponent({ name: "Text", props: { selectable: { @@ -7121,7 +7116,7 @@ var index$a = /* @__PURE__ */ defineBuiltInComponent({ }; } }); -const props$7 = /* @__PURE__ */ shared.extend({}, props$j, { +const props$8 = /* @__PURE__ */ shared.extend({}, props$l, { placeholderClass: { type: String, default: "input-placeholder" @@ -7135,9 +7130,9 @@ const props$7 = /* @__PURE__ */ shared.extend({}, props$j, { default: "" } }); -var index$9 = /* @__PURE__ */ defineBuiltInComponent({ +var index$b = /* @__PURE__ */ defineBuiltInComponent({ name: "Textarea", - props: props$7, + props: props$8, emit: ["confirm", "linechange", ...emit], setup(props2, { emit: emit2 @@ -7255,7 +7250,7 @@ var index$9 = /* @__PURE__ */ defineBuiltInComponent({ }; } }); -var index$8 = /* @__PURE__ */ defineBuiltInComponent({ +var index$a = /* @__PURE__ */ defineBuiltInComponent({ name: "View", props: shared.extend({}, hoverProps), setup(props2, { @@ -7283,13 +7278,13 @@ function useSubscribe(callback, name, multiple) { } function useOn(name, callback) { } -let index$7 = 0; +let index$9 = 0; function useContextInfo() { const page = useCurrentPageId(); const instance = vue.getCurrentInstance(); const vm = instance.proxy; const type = vm.$options.name.toLowerCase(); - const id = vm.id || `context${index$7++}`; + const id = vm.id || `context${index$9++}`; return `${page}.${type}.${id}`; } function getContextInfo(el) { @@ -7658,7 +7653,7 @@ function initHistory() { return vueRouter.createMemoryHistory(base); } } -var index$6 = { +var index$8 = { install(app) { initApp$1(app); if (__UNI_FEATURE_PAGES__) { @@ -8216,7 +8211,7 @@ function useContext(play, pause, seek, sendDanmu, playbackRate, requestFullScree } }, id, true); } -const props$6 = { +const props$7 = { id: { type: String, default: "" @@ -8300,9 +8295,9 @@ const props$6 = { default: true } }; -var index$5 = /* @__PURE__ */ defineBuiltInComponent({ +var index$7 = /* @__PURE__ */ defineBuiltInComponent({ name: "Video", - props: props$6, + props: props$7, emits: ["fullscreenchange", "progress", "loadedmetadata", "waiting", "error", "play", "pause", "ended", "timeupdate"], setup(props2, { emit: emit2, @@ -8515,16 +8510,16 @@ var index$5 = /* @__PURE__ */ defineBuiltInComponent({ }; } }); -const props$5 = { +const props$6 = { src: { type: String, default: "" } }; -var index$4 = /* @__PURE__ */ defineBuiltInComponent({ +var index$6 = /* @__PURE__ */ defineBuiltInComponent({ inheritAttrs: false, name: "WebView", - props: props$5, + props: props$6, setup(props2, { attrs }) { @@ -8574,7 +8569,7 @@ function useWebViewSize(rootRef, iframeRef) { }; return _resize; } -const props$4 = { +const props$5 = { id: { type: [Number, String], default: "" @@ -8638,7 +8633,7 @@ const props$4 = { }; var MapMarker = /* @__PURE__ */ defineSystemComponent({ name: "MapMarker", - props: props$4, + props: props$5, setup(props2) { const id = String(Number(props2.id) !== NaN ? props2.id : ""); const onMapReady = vue.inject("onMapReady"); @@ -8836,7 +8831,7 @@ var MapMarker = /* @__PURE__ */ defineSystemComponent({ }; } }); -const props$3 = { +const props$4 = { points: { type: Array, require: true @@ -8882,7 +8877,7 @@ const props$3 = { }; var MapPolyline = /* @__PURE__ */ defineSystemComponent({ name: "MapPolyline", - props: props$3, + props: props$4, setup(props2) { const onMapReady = vue.inject("onMapReady"); let polyline; @@ -8934,7 +8929,7 @@ var MapPolyline = /* @__PURE__ */ defineSystemComponent({ }; } }); -const props$2 = { +const props$3 = { latitude: { type: [Number, String], require: true @@ -8966,7 +8961,7 @@ const props$2 = { }; var MapCircle = /* @__PURE__ */ defineSystemComponent({ name: "MapCircle", - props: props$2, + props: props$3, setup(props2) { const onMapReady = vue.inject("onMapReady"); let circle; @@ -9009,7 +9004,7 @@ var MapCircle = /* @__PURE__ */ defineSystemComponent({ }; } }); -const props$1 = { +const props$2 = { id: { type: [Number, String], default: "" @@ -9029,7 +9024,7 @@ const props$1 = { }; var MapControl = /* @__PURE__ */ defineSystemComponent({ name: "MapControl", - props: props$1, + props: props$2, setup(props2) { const onMapReady = vue.inject("onMapReady"); let control; @@ -9106,7 +9101,7 @@ var MapLocation = /* @__PURE__ */ defineSystemComponent({ }; } }); -const props = { +const props$1 = { id: { type: String, default: "" @@ -9316,9 +9311,9 @@ function useMap(props2, rootRef, emit2) { mapRef }; } -var index$3 = /* @__PURE__ */ defineBuiltInComponent({ +var index$5 = /* @__PURE__ */ defineBuiltInComponent({ name: "Map", - props, + props: props$1, emits: ["markertap", "labeltap", "callouttap", "controltap", "regionchange", "tap", "click", "updated", "update:scale", "update:latitude", "update:longitude"], setup(props2, { emit: emit2, @@ -9343,61 +9338,51 @@ var index$3 = /* @__PURE__ */ defineBuiltInComponent({ }; } }); -const _sfc_main$3 = { +const props = { + scrollTop: { + type: [String, Number], + default: 0 + } +}; +var index$4 = /* @__PURE__ */ defineBuiltInComponent({ name: "CoverView", compatConfig: { MODE: 3 }, - props: { - scrollTop: { - type: [String, Number], - default: 0 - } - }, - watch: { - scrollTop(val) { - this.setScrollTop(val); - } - }, - mounted() { - this.setScrollTop(this.scrollTop); - }, - methods: { - setScrollTop(val) { - var content = this.content; - if (getComputedStyle(content).overflowY === "scroll") { - content.scrollTop = this._upx2pxNum(val); + props, + setup(props2, { + slots + }) { + const content = vue.ref(null); + vue.watch(() => props2.scrollTop, (val) => { + setScrollTop(val); + }); + function setScrollTop(val) { + let _content = content.value; + if (getComputedStyle(_content).overflowY === "scroll") { + _content.scrollTop = _upx2pxNum(val); } - }, - _upx2pxNum(val) { - if (/\d+[ur]px$/i.test(val)) { - val.replace(/\d+[ur]px$/i, (text) => { - return uni.upx2px(parseFloat(text)); + } + function _upx2pxNum(val) { + let _val = String(val); + if (/\d+[ur]px$/i.test(_val)) { + _val.replace(/\d+[ur]px$/i, (text) => { + return String(uni.upx2px(parseFloat(text))); }); } - return parseFloat(val) || 0; + return parseFloat(_val) || 0; } - }, - setup() { - const content = vue.ref(null); - return { - content + return () => { + return vue.createVNode("uni-cover-view", { + "scroll-top": props2.scrollTop + }, [vue.createVNode("div", { + "ref": content, + "class": "uni-cover-view" + }, [slots.default && slots.default()], 512)], 8, ["scroll-top"]); }; } -}; -const _hoisted_1$2 = { - ref: "content", - class: "uni-cover-view" -}; -function _sfc_render$3(_ctx, _cache, $props, $setup, $data, $options) { - return vue.openBlock(), vue.createBlock("uni-cover-view", {"scroll-top": $props.scrollTop}, [ - vue.createVNode("div", _hoisted_1$2, [ - vue.renderSlot(_ctx.$slots, "default") - ], 512) - ], 8, ["scroll-top"]); -} -_sfc_main$3.render = _sfc_render$3; -const _sfc_main$2 = { +}); +var index$3 = /* @__PURE__ */ defineBuiltInComponent({ name: "CoverImage", compatConfig: { MODE: 3 @@ -9408,42 +9393,35 @@ const _sfc_main$2 = { default: "" } }, - methods: { - getRealPath, - _load($event) { - this.$trigger("load", $event); - }, - _error($event) { - this.$trigger("error", $event); - } - }, - mounted() { - this.$trigger = useCustomEvent({value: this.root}, this.$emit); - }, - setup() { + emits: ["load", "error"], + setup(props2, { + emit: emit2 + }) { const root = vue.ref(null); - return { - root + const trigger = useCustomEvent(root, emit2); + function load($event) { + trigger("load", $event); + } + function error($event) { + trigger("error", $event); + } + return () => { + const { + src + } = props2; + return vue.createVNode("uni-cover-image", { + "ref": root, + "src": src + }, [vue.createVNode("div", { + "class": "uni-cover-image" + }, [src ? vue.createVNode("img", { + "src": getRealPath(src), + "onLoad": load, + "onError": error + }, null, 40, ["src", "onLoad", "onError"]) : null])], 8, ["src"]); }; } -}; -const _hoisted_1$1 = {class: "uni-cover-image"}; -function _sfc_render$2(_ctx, _cache, $props, $setup, $data, $options) { - return vue.openBlock(), vue.createBlock("uni-cover-image", { - ref: "root", - src: $props.src - }, [ - vue.createVNode("div", _hoisted_1$1, [ - $props.src ? (vue.openBlock(), vue.createBlock("img", { - key: 0, - src: $options.getRealPath($props.src), - onLoad: _cache[1] || (_cache[1] = (...args) => $options._load && $options._load(...args)), - onError: _cache[2] || (_cache[2] = (...args) => $options._error && $options._error(...args)) - }, null, 40, ["src"])) : vue.createCommentVNode("", true) - ]) - ], 8, ["src"]); -} -_sfc_main$2.render = _sfc_render$2; +}); function useKeyboard() { const key = vue.ref(""); const disable = vue.ref(false); @@ -11356,48 +11334,48 @@ var index = /* @__PURE__ */ defineSystemComponent({ }); exports.AsyncErrorComponent = index$1; exports.AsyncLoadingComponent = index; -exports.Audio = _sfc_main$8; -exports.Button = index$p; -exports.Canvas = _sfc_main$7; -exports.Checkbox = index$n; -exports.CheckboxGroup = index$o; -exports.CoverImage = _sfc_main$2; -exports.CoverView = _sfc_main$3; -exports.Editor = index$m; -exports.Form = index$r; +exports.Audio = _sfc_main$5; +exports.Button = index$s; +exports.Canvas = _sfc_main$4; +exports.Checkbox = index$q; +exports.CheckboxGroup = index$r; +exports.CoverImage = index$3; +exports.CoverView = index$4; +exports.Editor = index$p; +exports.Form = index$u; exports.Friction = Friction; -exports.Icon = index$l; -exports.Image = index$k; +exports.Icon = index$o; +exports.Image = index$n; exports.Input = Input; -exports.Label = index$q; +exports.Label = index$t; exports.LayoutComponent = LayoutComponent; -exports.Map = index$3; -exports.MovableArea = index$j; -exports.MovableView = index$i; -exports.Navigator = _sfc_main$6; +exports.Map = index$5; +exports.MovableArea = index$m; +exports.MovableView = index$l; +exports.Navigator = index$k; exports.PageComponent = index$2; exports.Picker = _sfc_main$1; exports.PickerView = PickerView; exports.PickerViewColumn = PickerViewColumn; -exports.Progress = index$h; -exports.Radio = index$f; -exports.RadioGroup = index$g; +exports.Progress = index$j; +exports.Radio = index$h; +exports.RadioGroup = index$i; exports.ResizeSensor = ResizeSensor; -exports.RichText = _sfc_main$5; -exports.ScrollView = _sfc_main$4; +exports.RichText = _sfc_main$3; +exports.ScrollView = _sfc_main$2; exports.Scroller = Scroller; -exports.Slider = index$e; +exports.Slider = index$g; exports.Spring = Spring; -exports.Swiper = index$d; -exports.SwiperItem = index$c; -exports.Switch = index$b; -exports.Text = index$a; -exports.Textarea = index$9; +exports.Swiper = index$f; +exports.SwiperItem = index$e; +exports.Switch = index$d; +exports.Text = index$c; +exports.Textarea = index$b; exports.UniServiceJSBridge = UniServiceJSBridge$1; exports.UniViewJSBridge = UniViewJSBridge$1; -exports.Video = index$5; -exports.View = index$8; -exports.WebView = index$4; +exports.Video = index$7; +exports.View = index$a; +exports.WebView = index$6; exports.clearStorage = clearStorage; exports.clearStorageSync = clearStorageSync; exports.defineBuiltInComponent = defineBuiltInComponent; @@ -11412,7 +11390,7 @@ exports.getStorageInfoSync = getStorageInfoSync; exports.getStorageSync = getStorageSync; exports.getSystemInfoSync = getSystemInfoSync; exports.initScrollBounce = initScrollBounce; -exports.plugin = index$6; +exports.plugin = index$8; exports.removeStorage = removeStorage; exports.removeStorageSync = removeStorageSync; exports.request = request; diff --git a/packages/uni-h5/dist/uni-h5.es.js b/packages/uni-h5/dist/uni-h5.es.js index d9eb859fb709f69f5161d5165f25dc482b36aeaf..4d54835e3dd2ac52c4934ae997f531cd8516a170 100644 --- a/packages/uni-h5/dist/uni-h5.es.js +++ b/packages/uni-h5/dist/uni-h5.es.js @@ -485,7 +485,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(() => { @@ -497,10 +497,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) { @@ -1190,7 +1190,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); @@ -1824,7 +1824,7 @@ function throttle(fn, wait) { }; return newFn; } -const _sfc_main$8 = { +const _sfc_main$5 = { name: "Audio", mixins: [subscriber], props: { @@ -1943,13 +1943,13 @@ const _sfc_main$8 = { } } }; -const _hoisted_1$6 = {class: "uni-audio-default"}; +const _hoisted_1$4 = {class: "uni-audio-default"}; const _hoisted_2$3 = {class: "uni-audio-right"}; const _hoisted_3$2 = {class: "uni-audio-time"}; const _hoisted_4$2 = {class: "uni-audio-info"}; const _hoisted_5$1 = {class: "uni-audio-name"}; const _hoisted_6$1 = {class: "uni-audio-author"}; -function _sfc_render$8(_ctx, _cache, $props, $setup, $data, $options) { +function _sfc_render$5(_ctx, _cache, $props, $setup, $data, $options) { return openBlock(), createBlock("uni-audio", mergeProps({ id: $props.id, controls: !!$props.controls @@ -1959,7 +1959,7 @@ function _sfc_render$8(_ctx, _cache, $props, $setup, $data, $options) { loop: $props.loop, style: {"display": "none"} }, null, 8, ["loop"]), - createVNode("div", _hoisted_1$6, [ + createVNode("div", _hoisted_1$4, [ createVNode("div", { style: "background-image: url(" + _ctx.$getRealPath($props.poster) + ");", class: "uni-audio-left" @@ -1979,7 +1979,7 @@ function _sfc_render$8(_ctx, _cache, $props, $setup, $data, $options) { ]) ], 16, ["id", "controls"]); } -_sfc_main$8.render = _sfc_render$8; +_sfc_main$5.render = _sfc_render$5; function converPx(value) { if (/^-?\d+[ur]px$/i.test(value)) { return value.replace(/(^-?\d+)[ur]px$/i, (text2, num) => { @@ -2211,7 +2211,7 @@ function normalizeCustomEvent(name, domEvt, el, detail) { }; } const uniFormKey = PolySymbol(process.env.NODE_ENV !== "production" ? "uniForm" : "uf"); -var index$o = /* @__PURE__ */ defineBuiltInComponent({ +var index$r = /* @__PURE__ */ defineBuiltInComponent({ name: "Form", setup(_props, { slots, @@ -2251,15 +2251,15 @@ function provideForm(emit2) { return fields2; } const uniLabelKey = PolySymbol(process.env.NODE_ENV !== "production" ? "uniLabel" : "ul"); -const props$w = { +const props$y = { for: { type: String, default: "" } }; -var index$n = /* @__PURE__ */ defineBuiltInComponent({ +var index$q = /* @__PURE__ */ defineBuiltInComponent({ name: "Label", - props: props$w, + props: props$y, setup(props2, { slots }) { @@ -2355,7 +2355,7 @@ function _removeListeners(id2, listeners, watch2) { } }); } -var index$m = /* @__PURE__ */ defineBuiltInComponent({ +var index$p = /* @__PURE__ */ defineBuiltInComponent({ name: "Button", props: { id: { @@ -2680,7 +2680,7 @@ function getTempCanvas(width = 0, height = 0) { tempCanvas.height = height; return tempCanvas; } -var _sfc_main$7 = { +var _sfc_main$4 = { name: "Canvas", inheritAttrs: false, compatConfig: { @@ -3142,20 +3142,20 @@ var _sfc_main$7 = { }; } }; -const _hoisted_1$5 = { +const _hoisted_1$3 = { class: "uni-canvas-canvas", ref: "canvas", width: "300", height: "150" }; const _hoisted_2$2 = {style: {"position": "absolute", "top": "0", "left": "0", "width": "100%", "height": "100%", "overflow": "hidden"}}; -function _sfc_render$7(_ctx, _cache, $props, $setup, $data, $options) { +function _sfc_render$4(_ctx, _cache, $props, $setup, $data, $options) { const _component_ResizeSensor = resolveComponent("ResizeSensor"); return openBlock(), createBlock("uni-canvas", mergeProps({ "canvas-id": $props.canvasId, "disable-scroll": $props.disableScroll }, {...$setup.Attrs, ...$setup.ExcludeAttrs}, toHandlers($options._listeners)), [ - createVNode("canvas", _hoisted_1$5, null, 512), + createVNode("canvas", _hoisted_1$3, null, 512), createVNode("div", _hoisted_2$2, [ renderSlot(_ctx.$slots, "default") ]), @@ -3165,17 +3165,17 @@ function _sfc_render$7(_ctx, _cache, $props, $setup, $data, $options) { }, null, 8, ["onResize"]) ], 16, ["canvas-id", "disable-scroll"]); } -_sfc_main$7.render = _sfc_render$7; +_sfc_main$4.render = _sfc_render$4; const uniCheckGroupKey = PolySymbol(process.env.NODE_ENV !== "production" ? "uniCheckGroup" : "ucg"); -const props$v = { +const props$x = { name: { type: String, default: "" } }; -var index$l = /* @__PURE__ */ defineBuiltInComponent({ +var index$o = /* @__PURE__ */ defineBuiltInComponent({ name: "CheckboxGroup", - props: props$v, + props: props$x, emits: ["change"], setup(props2, { emit: emit2, @@ -3227,7 +3227,7 @@ function useProvideCheckGroup(props2, trigger) { } return getFieldsValue; } -const props$u = { +const props$w = { checked: { type: [Boolean, String], default: false @@ -3249,9 +3249,9 @@ const props$u = { default: "" } }; -var index$k = /* @__PURE__ */ defineBuiltInComponent({ +var index$n = /* @__PURE__ */ defineBuiltInComponent({ name: "Checkbox", - props: props$u, + props: props$w, setup(props2, { slots }) { @@ -3330,7 +3330,7 @@ function useCheckboxInject(checkboxChecked, checkboxValue, reset) { let resetTimer; function iosHideKeyboard() { } -const props$t = { +const props$v = { cursorSpacing: { type: [Number, String], default: 0 @@ -4080,7 +4080,7 @@ function useQuill(props2, rootRef, trigger) { } }, id2, true); } -const props$s = /* @__PURE__ */ Object.assign({}, props$t, { +const props$u = /* @__PURE__ */ Object.assign({}, props$v, { id: { type: String, default: "" @@ -4106,9 +4106,9 @@ const props$s = /* @__PURE__ */ Object.assign({}, props$t, { default: false } }); -var index$j = /* @__PURE__ */ defineBuiltInComponent({ +var index$m = /* @__PURE__ */ defineBuiltInComponent({ name: "Editor", - props: props$s, + props: props$u, emit: ["ready", "focus", "blur", "input", "statuschange", ...emit$1], setup(props2, { emit: emit2 @@ -4168,7 +4168,7 @@ const ICONS = { c: GREY_COLOR } }; -var index$i = /* @__PURE__ */ defineBuiltInComponent({ +var index$l = /* @__PURE__ */ defineBuiltInComponent({ name: "Icon", props: { type: { @@ -4195,7 +4195,7 @@ var index$i = /* @__PURE__ */ defineBuiltInComponent({ }; } }); -const props$r = { +const props$t = { src: { type: String, default: "" @@ -4232,9 +4232,9 @@ const IMAGE_MODES = { "bottom left": ["left bottom"], "bottom right": ["right bottom"] }; -var index$h = /* @__PURE__ */ defineBuiltInComponent({ +var index$k = /* @__PURE__ */ defineBuiltInComponent({ name: "Image", - props: props$r, + props: props$t, setup(props2, { emit: emit2 }) { @@ -4536,7 +4536,7 @@ const UniViewJSBridgeSubscribe = function() { function getValueString(value) { return value === null ? "" : String(value); } -const props$q = /* @__PURE__ */ Object.assign({}, { +const props$s = /* @__PURE__ */ Object.assign({}, { name: { type: String, default: "" @@ -4601,7 +4601,7 @@ const props$q = /* @__PURE__ */ Object.assign({}, { type: String, default: "done" } -}, props$t); +}, props$v); const emit = [ "input", "focus", @@ -4796,7 +4796,7 @@ function useField(props2, rootRef, emit2, beforeInput) { trigger }; } -const props$p = /* @__PURE__ */ Object.assign({}, props$q, { +const props$r = /* @__PURE__ */ Object.assign({}, props$s, { placeholderClass: { type: String, default: "input-placeholder" @@ -4804,7 +4804,7 @@ const props$p = /* @__PURE__ */ Object.assign({}, props$q, { }); var Input = /* @__PURE__ */ defineBuiltInComponent({ name: "Input", - props: props$p, + props: props$r, emit: ["confirm", ...emit], setup(props2, { emit: emit2 @@ -4960,7 +4960,7 @@ function flatVNode(nodes) { } return array; } -const props$o = { +const props$q = { scaleArea: { type: Boolean, default: false @@ -4969,7 +4969,7 @@ const props$o = { var MovableArea = /* @__PURE__ */ defineBuiltInComponent({ inheritAttrs: false, name: "MovableArea", - props: props$o, + props: props$q, setup(props2, { slots }) { @@ -5570,7 +5570,7 @@ STD.prototype.reconfigure = function(e2, t2, n) { this._springY.reconfigure(e2, t2, n); this._springScale.reconfigure(e2, t2, n); }; -const props$n = { +const props$p = { direction: { type: String, default: "none" @@ -5626,7 +5626,7 @@ const props$n = { }; var MovableView = /* @__PURE__ */ defineBuiltInComponent({ name: "MovableView", - props: props$n, + props: props$p, emits: ["change", "scale"], setup(props2, { slots, @@ -6209,109 +6209,104 @@ function useMovableViewState(props2, trigger, rootRef) { }; } const OPEN_TYPES = ["navigate", "redirect", "switchTab", "reLaunch", "navigateBack"]; -const _sfc_main$6 = { +const props$o = { + hoverClass: { + type: String, + default: "navigator-hover" + }, + url: { + type: String, + default: "" + }, + openType: { + type: String, + default: "navigate", + validator(value) { + return Boolean(~OPEN_TYPES.indexOf(value)); + } + }, + delta: { + type: Number, + default: 1 + }, + hoverStartTime: { + type: [Number, String], + default: 50 + }, + hoverStayTime: { + type: [Number, String], + default: 600 + }, + exists: { + type: String, + default: "" + }, + hoverStopPropagation: { + type: Boolean, + default: false + } +}; +var index$j = /* @__PURE__ */ defineBuiltInComponent({ name: "Navigator", compatConfig: { MODE: 3 }, - props: { - hoverClass: { - type: String, - default: "navigator-hover" - }, - url: { - type: String, - default: "" - }, - openType: { - type: String, - default: "navigate", - validator(value) { - return ~OPEN_TYPES.indexOf(value); - } - }, - delta: { - type: Number, - default: 1 - }, - hoverStartTime: { - type: [Number, String], - default: 50 - }, - hoverStayTime: { - type: [Number, String], - default: 600 - }, - exists: { - type: String, - default: "" - }, - hoverStopPropagation: { - type: Boolean, - default: false - } - }, - methods: { - _onClick($event) { - if (this.openType !== "navigateBack" && !this.url) { + props: props$o, + setup(props2, { + slots + }) { + const { + hovering, + binding + } = useHover(props2); + function onClick($event) { + if (props2.openType !== "navigateBack" && !props2.url) { console.error(" should have url attribute when using navigateTo, redirectTo, reLaunch or switchTab"); return; } - switch (this.openType) { + switch (props2.openType) { case "navigate": uni.navigateTo({ - url: this.url + url: props2.url }); break; case "redirect": uni.redirectTo({ - url: this.url, - exists: this.exists + url: props2.url, + exists: props2.exists }); break; case "switchTab": uni.switchTab({ - url: this.url + url: props2.url }); break; case "reLaunch": uni.reLaunch({ - url: this.url + url: props2.url }); break; case "navigateBack": uni.navigateBack({ - delta: this.delta + delta: props2.delta }); break; } } - }, - setup(props2) { - const {hovering, binding} = useHover(props2); - return { - hovering, - binding + return () => { + const { + hoverClass + } = props2; + const hasHoverClass = props2.hoverClass && props2.hoverClass !== "none"; + return createVNode("uni-navigator", mergeProps({ + "class": hasHoverClass && hovering.value ? hoverClass : "" + }, hasHoverClass && binding, { + "onClick": onClick + }), [slots.default && slots.default()], 16, ["onClick"]); }; } -}; -function _sfc_render$6(_ctx, _cache, $props, $setup, $data, $options) { - return $props.hoverClass && $props.hoverClass !== "none" ? (openBlock(), createBlock("uni-navigator", mergeProps({ - key: 0, - class: [$setup.hovering ? $props.hoverClass : ""] - }, $setup.binding, { - onClick: _cache[1] || (_cache[1] = (...args) => $options._onClick && $options._onClick(...args)) - }), [ - renderSlot(_ctx.$slots, "default") - ], 16)) : (openBlock(), createBlock("uni-navigator", { - key: 1, - onClick: _cache[2] || (_cache[2] = (...args) => $options._onClick && $options._onClick(...args)) - }, [ - renderSlot(_ctx.$slots, "default") - ])); -} -_sfc_main$6.render = _sfc_render$6; -const props$m = { +}); +const props$n = { value: { type: Array, default() { @@ -6358,7 +6353,7 @@ function useState$2(props2) { } var PickerView = /* @__PURE__ */ defineBuiltInComponent({ name: "PickerView", - props: props$m, + props: props$n, emits: ["change", "pickstart", "pickend", "update:value"], setup(props2, { slots, @@ -7284,7 +7279,7 @@ const VALUES = { backgroundColor: "#EBEBEB", activeMode: "backwards" }; -const props$l = { +const props$m = { percent: { type: [Number, String], default: 0, @@ -7331,9 +7326,9 @@ const props$l = { } } }; -var index$g = /* @__PURE__ */ defineBuiltInComponent({ +var index$i = /* @__PURE__ */ defineBuiltInComponent({ name: "Progress", - props: props$l, + props: props$m, setup(props2) { const state2 = useProgressState(props2); _activeAnimation(state2, props2); @@ -7404,15 +7399,15 @@ function _activeAnimation(state2, props2) { } } const uniRadioGroupKey = PolySymbol(process.env.NODE_ENV !== "production" ? "uniCheckGroup" : "ucg"); -const props$k = { +const props$l = { name: { type: String, default: "" } }; -var index$f = /* @__PURE__ */ defineBuiltInComponent({ +var index$h = /* @__PURE__ */ defineBuiltInComponent({ name: "RadioGroup", - props: props$k, + props: props$l, setup(props2, { emit: emit2, slots @@ -7488,7 +7483,7 @@ function useProvideRadioGroup(props2, trigger) { } return fields2; } -const props$j = { +const props$k = { checked: { type: [Boolean, String], default: false @@ -7510,9 +7505,9 @@ const props$j = { default: "" } }; -var index$e = /* @__PURE__ */ defineBuiltInComponent({ +var index$g = /* @__PURE__ */ defineBuiltInComponent({ name: "Radio", - props: props$j, + props: props$k, setup(props2, { slots }) { @@ -7806,7 +7801,7 @@ function parseNodes(nodes, parentNode) { }); return parentNode; } -const _sfc_main$5 = { +const _sfc_main$3 = { name: "RichText", compatConfig: { MODE: 3 @@ -7838,15 +7833,15 @@ const _sfc_main$5 = { } } }; -const _hoisted_1$4 = /* @__PURE__ */ createVNode("div", null, null, -1); -function _sfc_render$5(_ctx, _cache, $props, $setup, $data, $options) { +const _hoisted_1$2 = /* @__PURE__ */ createVNode("div", null, null, -1); +function _sfc_render$3(_ctx, _cache, $props, $setup, $data, $options) { return openBlock(), createBlock("uni-rich-text", _ctx.$attrs, [ - _hoisted_1$4 + _hoisted_1$2 ], 16); } -_sfc_main$5.render = _sfc_render$5; +_sfc_main$3.render = _sfc_render$3; const passiveOptions = passive(true); -const _sfc_main$4 = { +const _sfc_main$2 = { name: "ScrollView", compatConfig: { MODE: 3 @@ -8238,7 +8233,7 @@ const _sfc_main$4 = { }; } }; -const _hoisted_1$3 = {ref: "rootRef"}; +const _hoisted_1$1 = {ref: "rootRef"}; const _hoisted_2$1 = { ref: "wrap", class: "uni-scroll-view" @@ -8272,8 +8267,8 @@ const _hoisted_9 = /* @__PURE__ */ createVNode("circle", { style: {"color": "#2bd009"}, "stroke-width": "3" }, null, -1); -function _sfc_render$4(_ctx, _cache, $props, $setup, $data, $options) { - return openBlock(), createBlock("uni-scroll-view", _hoisted_1$3, [ +function _sfc_render$2(_ctx, _cache, $props, $setup, $data, $options) { + return openBlock(), createBlock("uni-scroll-view", _hoisted_1$1, [ createVNode("div", _hoisted_2$1, [ createVNode("div", { ref: "main", @@ -8320,8 +8315,8 @@ function _sfc_render$4(_ctx, _cache, $props, $setup, $data, $options) { ], 512) ], 512); } -_sfc_main$4.render = _sfc_render$4; -const props$i = { +_sfc_main$2.render = _sfc_render$2; +const props$j = { name: { type: String, default: "" @@ -8375,9 +8370,9 @@ const props$i = { default: false } }; -var index$d = /* @__PURE__ */ defineBuiltInComponent({ +var index$f = /* @__PURE__ */ defineBuiltInComponent({ name: "Slider", - props: props$i, + props: props$j, emits: ["changing", "change"], setup(props2, { emit: emit2 @@ -8545,7 +8540,7 @@ var computeController = { return Number(s1.replace(".", "")) * Number(s2.replace(".", "")) / Math.pow(10, m); } }; -const props$h = { +const props$i = { indicatorDots: { type: [Boolean, String], default: false @@ -9034,7 +9029,7 @@ function useLayout(props2, state2, swiperContexts, slideFrameRef, emit2, trigger } var Swiper = /* @__PURE__ */ defineBuiltInComponent({ name: "Swiper", - props: props$h, + props: props$i, emits: ["change", "transition", "animationfinish", "update:current", "update:currentItemId"], setup(props2, { slots, @@ -9129,7 +9124,7 @@ var Swiper = /* @__PURE__ */ defineBuiltInComponent({ }; } }); -const props$g = { +const props$h = { itemId: { type: String, default: "" @@ -9137,7 +9132,7 @@ const props$g = { }; var SwiperItem = /* @__PURE__ */ defineBuiltInComponent({ name: "SwiperItem", - props: props$g, + props: props$h, setup(props2, { slots }) { @@ -9186,7 +9181,7 @@ var SwiperItem = /* @__PURE__ */ defineBuiltInComponent({ }; } }); -const props$f = { +const props$g = { name: { type: String, default: "" @@ -9212,9 +9207,9 @@ const props$f = { default: "#007aff" } }; -var index$c = /* @__PURE__ */ defineBuiltInComponent({ +var index$e = /* @__PURE__ */ defineBuiltInComponent({ name: "Switch", - props: props$f, + props: props$g, emits: ["change"], setup(props2, { emit: emit2 @@ -9311,7 +9306,7 @@ function normalizeText(text2, { } return text2.replace(/ /g, SPACE_UNICODE.nbsp).replace(/ /g, SPACE_UNICODE.ensp).replace(/ /g, SPACE_UNICODE.emsp).replace(/</g, "<").replace(/>/g, ">").replace(/&/g, "&").replace(/"/g, '"').replace(/'/g, "'"); } -var index$b = /* @__PURE__ */ defineBuiltInComponent({ +var index$d = /* @__PURE__ */ defineBuiltInComponent({ name: "Text", props: { selectable: { @@ -9364,7 +9359,7 @@ var index$b = /* @__PURE__ */ defineBuiltInComponent({ }; } }); -const props$e = /* @__PURE__ */ extend({}, props$q, { +const props$f = /* @__PURE__ */ extend({}, props$s, { placeholderClass: { type: String, default: "input-placeholder" @@ -9378,9 +9373,9 @@ const props$e = /* @__PURE__ */ extend({}, props$q, { default: "" } }); -var index$a = /* @__PURE__ */ defineBuiltInComponent({ +var index$c = /* @__PURE__ */ defineBuiltInComponent({ name: "Textarea", - props: props$e, + props: props$f, emit: ["confirm", "linechange", ...emit], setup(props2, { emit: emit2 @@ -9498,7 +9493,7 @@ var index$a = /* @__PURE__ */ defineBuiltInComponent({ }; } }); -var index$9 = /* @__PURE__ */ defineBuiltInComponent({ +var index$b = /* @__PURE__ */ defineBuiltInComponent({ name: "View", props: extend({}, hoverProps), setup(props2, { @@ -9563,13 +9558,13 @@ function useOn(name, callback) { onMounted(() => UniViewJSBridge.on(name, callback)); onBeforeUnmount(() => UniViewJSBridge.off(name)); } -let index$8 = 0; +let index$a = 0; function useContextInfo() { const page = useCurrentPageId(); const instance2 = getCurrentInstance(); const vm = instance2.proxy; const type = vm.$options.name.toLowerCase(); - const id2 = vm.id || `context${index$8++}`; + const id2 = vm.id || `context${index$a++}`; onMounted(() => { const el = vm.$el; el.__uniContextInfo = { @@ -11074,12 +11069,12 @@ const createIntersectionObserver = /* @__PURE__ */ defineSyncApi("createIntersec return new ServiceIntersectionObserver(getCurrentPageVm(), options); }); let eventReady = false; -let index$7 = 0; +let index$9 = 0; let optionsCache = {}; function operateEditor(componentId, pageId, type, options) { const data = {}; if (options && ("success" in options || "fail" in options || "complete" in options)) { - const callbackId = String(index$7++); + const callbackId = String(index$9++); data.callbackId = callbackId; optionsCache[callbackId] = options; if (!eventReady) { @@ -13095,7 +13090,7 @@ function initHistory() { }); return history2; } -var index$6 = { +var index$8 = { install(app) { initApp$1(app); initView(app); @@ -13763,7 +13758,7 @@ function useContext(play, pause, seek, sendDanmu, playbackRate, requestFullScree } }, id2, true); } -const props$d = { +const props$e = { id: { type: String, default: "" @@ -13847,9 +13842,9 @@ const props$d = { default: true } }; -var index$5 = /* @__PURE__ */ defineBuiltInComponent({ +var index$7 = /* @__PURE__ */ defineBuiltInComponent({ name: "Video", - props: props$d, + props: props$e, emits: ["fullscreenchange", "progress", "loadedmetadata", "waiting", "error", "play", "pause", "ended", "timeupdate"], setup(props2, { emit: emit2, @@ -14062,16 +14057,16 @@ var index$5 = /* @__PURE__ */ defineBuiltInComponent({ }; } }); -const props$c = { +const props$d = { src: { type: String, default: "" } }; -var index$4 = /* @__PURE__ */ defineBuiltInComponent({ +var index$6 = /* @__PURE__ */ defineBuiltInComponent({ inheritAttrs: false, name: "WebView", - props: props$c, + props: props$d, setup(props2, { attrs: attrs2 }) { @@ -14257,7 +14252,7 @@ function loadMaps(callback) { document.body.appendChild(script); } } -const props$b = { +const props$c = { id: { type: [Number, String], default: "" @@ -14321,7 +14316,7 @@ const props$b = { }; var MapMarker = /* @__PURE__ */ defineSystemComponent({ name: "MapMarker", - props: props$b, + props: props$c, setup(props2) { const id2 = String(Number(props2.id) !== NaN ? props2.id : ""); const onMapReady = inject("onMapReady"); @@ -14532,7 +14527,7 @@ var MapMarker = /* @__PURE__ */ defineSystemComponent({ }; } }); -const props$a = { +const props$b = { points: { type: Array, require: true @@ -14578,7 +14573,7 @@ const props$a = { }; var MapPolyline = /* @__PURE__ */ defineSystemComponent({ name: "MapPolyline", - props: props$a, + props: props$b, setup(props2) { const onMapReady = inject("onMapReady"); let polyline; @@ -14631,7 +14626,7 @@ var MapPolyline = /* @__PURE__ */ defineSystemComponent({ }; } }); -const props$9 = { +const props$a = { latitude: { type: [Number, String], require: true @@ -14663,7 +14658,7 @@ const props$9 = { }; var MapCircle = /* @__PURE__ */ defineSystemComponent({ name: "MapCircle", - props: props$9, + props: props$a, setup(props2) { const onMapReady = inject("onMapReady"); let circle; @@ -14707,7 +14702,7 @@ var MapCircle = /* @__PURE__ */ defineSystemComponent({ }; } }); -const props$8 = { +const props$9 = { id: { type: [Number, String], default: "" @@ -14727,7 +14722,7 @@ const props$8 = { }; var MapControl = /* @__PURE__ */ defineSystemComponent({ name: "MapControl", - props: props$8, + props: props$9, setup(props2) { const onMapReady = inject("onMapReady"); let control; @@ -14939,7 +14934,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; @@ -15052,12 +15047,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; @@ -15077,10 +15072,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 } }; }); @@ -15668,13 +15663,13 @@ function usePopup(props2, { }); return visible; } -let index$3 = 0; +let index$5 = 0; let overflow = ""; function preventScroll(prevent) { - let before = index$3; - index$3 += prevent ? 1 : -1; - index$3 = Math.max(0, index$3); - if (index$3 > 0) { + let before = index$5; + index$5 += prevent ? 1 : -1; + index$5 = Math.max(0, index$5); + if (index$5 > 0) { if (before === 0) { overflow = document.body.style.overflow; document.body.style.overflow = "hidden"; @@ -15688,7 +15683,7 @@ function usePreventScroll() { onMounted(() => preventScroll(true)); onUnmounted(() => preventScroll(false)); } -const props$7 = { +const props$8 = { src: { type: String, default: "" @@ -15696,7 +15691,7 @@ const props$7 = { }; var ImageView = /* @__PURE__ */ defineSystemComponent({ name: "ImageView", - props: props$7, + props: props$8, setup(props2) { const state2 = reactive({ direction: "none" @@ -15786,7 +15781,7 @@ var ImageView = /* @__PURE__ */ defineSystemComponent({ function _isSlot$1(s) { return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !isVNode(s); } -const props$6 = { +const props$7 = { urls: { type: Array, default() { @@ -15805,7 +15800,7 @@ function getIndex(props2) { } var ImagePreview = /* @__PURE__ */ defineSystemComponent({ name: "ImagePreview", - props: props$6, + props: props$7, emits: ["close"], setup(props2, { emit: emit2 @@ -16516,7 +16511,7 @@ const getLocation = /* @__PURE__ */ defineAsyncApi(API_GET_LOCATION, ({type, alt reject(error.message); }); }, GetLocationProtocol, GetLocationOptions); -const props$5 = { +const props$6 = { latitude: { type: Number }, @@ -16538,7 +16533,7 @@ const props$5 = { }; var LocationView = /* @__PURE__ */ defineSystemComponent({ name: "LocationView", - props: props$5, + props: props$6, emits: ["close"], setup(props2, { emit: emit2 @@ -16630,7 +16625,7 @@ function _isSlot(s) { return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !isVNode(s); } const ICON_PATH_LOCTAION = "M13.3334375 16 q0.033125 1.1334375 0.783125 1.8834375 q0.75 0.75 1.8834375 0.75 q1.1334375 0 1.8834375 -0.75 q0.75 -0.75 0.75 -1.8834375 q0 -1.1334375 -0.75 -1.8834375 q-0.75 -0.75 -1.8834375 -0.75 q-1.1334375 0 -1.8834375 0.75 q-0.75 0.75 -0.783125 1.8834375 ZM30.9334375 14.9334375 l-1.1334375 0 q-0.5 -5.2 -4.0165625 -8.716875 q-3.516875 -3.5165625 -8.716875 -4.0165625 l0 -1.1334375 q0 -0.4665625 -0.3 -0.7665625 q-0.3 -0.3 -0.7665625 -0.3 q-0.4665625 0 -0.7665625 0.3 q-0.3 0.3 -0.3 0.7665625 l0 1.1334375 q-5.2 0.5 -8.716875 4.0165625 q-3.5165625 3.516875 -4.0165625 8.716875 l-1.1334375 0 q-0.4665625 0 -0.7665625 0.3 q-0.3 0.3 -0.3 0.7665625 q0 0.4665625 0.3 0.7665625 q0.3 0.3 0.7665625 0.3 l1.1334375 0 q0.5 5.2 4.0165625 8.716875 q3.516875 3.5165625 8.716875 4.0165625 l0 1.1334375 q0 0.4665625 0.3 0.7665625 q0.3 0.3 0.7665625 0.3 q0.4665625 0 0.7665625 -0.3 q0.3 -0.3 0.3 -0.7665625 l0 -1.1334375 q5.2 -0.5 8.716875 -4.0165625 q3.5165625 -3.516875 4.0165625 -8.716875 l1.1334375 0 q0.4665625 0 0.7665625 -0.3 q0.3 -0.3 0.3 -0.7665625 q0 -0.4665625 -0.3 -0.7665625 q-0.3 -0.3 -0.7665625 -0.3 ZM17.0665625 27.6665625 l0 -2.0665625 q0 -0.4665625 -0.3 -0.7665625 q-0.3 -0.3 -0.7665625 -0.3 q-0.4665625 0 -0.7665625 0.3 q-0.3 0.3 -0.3 0.7665625 l0 2.0665625 q-4.3 -0.4665625 -7.216875 -3.383125 q-2.916875 -2.916875 -3.3834375 -7.216875 l2.0665625 0 q0.4665625 0 0.7665625 -0.3 q0.3 -0.3 0.3 -0.7665625 q0 -0.4665625 -0.3 -0.7665625 q-0.3 -0.3 -0.7665625 -0.3 l-2.0665625 0 q0.4665625 -4.3 3.3834375 -7.216875 q2.9165625 -2.916875 7.216875 -3.3834375 l0 2.0665625 q0 0.4665625 0.3 0.7665625 q0.3 0.3 0.7665625 0.3 q0.4665625 0 0.7665625 -0.3 q0.3 -0.3 0.3 -0.7665625 l0 -2.0665625 q4.3 0.4665625 7.216875 3.3834375 q2.9165625 2.9165625 3.383125 7.216875 l-2.0665625 0 q-0.4665625 0 -0.7665625 0.3 q-0.3 0.3 -0.3 0.7665625 q0 0.4665625 0.3 0.7665625 q0.3 0.3 0.7665625 0.3 l2.0665625 0 q-0.4665625 4.3 -3.383125 7.216875 q-2.916875 2.9165625 -7.216875 3.383125 Z"; -const props$4 = { +const props$5 = { latitude: { type: Number }, @@ -16730,7 +16725,7 @@ function useList(state2) { } var LoctaionPicker = /* @__PURE__ */ defineSystemComponent({ name: "LoctaionPicker", - props: props$4, + props: props$5, emits: ["close"], setup(props2, { emit: emit2 @@ -16868,7 +16863,7 @@ var LoctaionPicker = /* @__PURE__ */ defineSystemComponent({ state2.searching = false; state2.keyword = ""; } - }, [createTextVNode("\u53D6\u6D88")], 8, ["onClick"])]), createVNode(_sfc_main$4, { + }, [createTextVNode("\u53D6\u6D88")], 8, ["onClick"])]), createVNode(_sfc_main$2, { "scroll-y": true, "class": "list", "onScrolltolower": loadMore @@ -16993,7 +16988,7 @@ const preloadPage = /* @__PURE__ */ defineAsyncApi(API_PRELOAD_PAGE, ({url}, {re reject(`${url} ${String(err)}`); }); }, PreloadPageProtocol); -const props$3 = { +const props$4 = { title: { type: String, default: "" @@ -17027,7 +17022,7 @@ const props$3 = { } }; var modal = /* @__PURE__ */ defineComponent({ - props: props$3, + props: props$4, setup(props2, { emit: emit2 }) { @@ -17099,7 +17094,7 @@ const showModal = /* @__PURE__ */ defineAsyncApi(API_SHOW_MODAL, (args, {resolve showModalState.visible = true; } }, ShowModalProtocol, ShowModalOptions); -const props$2 = { +const props$3 = { title: { type: String, default: "" @@ -17129,7 +17124,7 @@ const props$2 = { const ToastIconClassName = "uni-toast__icon"; var Toast = /* @__PURE__ */ defineComponent({ name: "Toast", - props: props$2, + props: props$3, setup(props2) { initI18nShowToastMsgsOnce(); initI18nShowLoadingMsgsOnce(); @@ -17331,7 +17326,7 @@ function usePopupStyle(props2) { popupStyle }; } -const props$1 = { +const props$2 = { title: { type: String, default: "" @@ -17357,7 +17352,7 @@ const props$1 = { }; var actionSheet = /* @__PURE__ */ defineComponent({ name: "ActionSheet", - props: props$1, + props: props$2, emits: ["close"], setup(props2, { emit: emit2 @@ -17908,7 +17903,7 @@ var MapLocation = /* @__PURE__ */ defineSystemComponent({ }; } }); -const props = { +const props$1 = { id: { type: String, default: "" @@ -18232,7 +18227,7 @@ function useMap(props2, rootRef, emit2) { } var Map$1 = /* @__PURE__ */ defineBuiltInComponent({ name: "Map", - props, + props: props$1, emits: ["markertap", "labeltap", "callouttap", "controltap", "regionchange", "tap", "click", "updated", "update:scale", "update:latitude", "update:longitude"], setup(props2, { emit: emit2, @@ -18257,61 +18252,54 @@ var Map$1 = /* @__PURE__ */ defineBuiltInComponent({ }; } }); -const _sfc_main$3 = { +const props = { + scrollTop: { + type: [String, Number], + default: 0 + } +}; +var index$4 = /* @__PURE__ */ defineBuiltInComponent({ name: "CoverView", compatConfig: { MODE: 3 }, - props: { - scrollTop: { - type: [String, Number], - default: 0 - } - }, - watch: { - scrollTop(val) { - this.setScrollTop(val); - } - }, - mounted() { - this.setScrollTop(this.scrollTop); - }, - methods: { - setScrollTop(val) { - var content = this.content; - if (getComputedStyle(content).overflowY === "scroll") { - content.scrollTop = this._upx2pxNum(val); + props, + setup(props2, { + slots + }) { + const content = ref(null); + watch(() => props2.scrollTop, (val) => { + setScrollTop(val); + }); + function setScrollTop(val) { + let _content = content.value; + if (getComputedStyle(_content).overflowY === "scroll") { + _content.scrollTop = _upx2pxNum(val); } - }, - _upx2pxNum(val) { - if (/\d+[ur]px$/i.test(val)) { - val.replace(/\d+[ur]px$/i, (text2) => { - return uni.upx2px(parseFloat(text2)); + } + function _upx2pxNum(val) { + let _val = String(val); + if (/\d+[ur]px$/i.test(_val)) { + _val.replace(/\d+[ur]px$/i, (text2) => { + return String(uni.upx2px(parseFloat(text2))); }); } - return parseFloat(val) || 0; + return parseFloat(_val) || 0; } - }, - setup() { - const content = ref(null); - return { - content + onMounted(() => { + setScrollTop(props2.scrollTop); + }); + return () => { + return createVNode("uni-cover-view", { + "scroll-top": props2.scrollTop + }, [createVNode("div", { + "ref": content, + "class": "uni-cover-view" + }, [slots.default && slots.default()], 512)], 8, ["scroll-top"]); }; } -}; -const _hoisted_1$2 = { - ref: "content", - class: "uni-cover-view" -}; -function _sfc_render$3(_ctx, _cache, $props, $setup, $data, $options) { - return openBlock(), createBlock("uni-cover-view", {"scroll-top": $props.scrollTop}, [ - createVNode("div", _hoisted_1$2, [ - renderSlot(_ctx.$slots, "default") - ], 512) - ], 8, ["scroll-top"]); -} -_sfc_main$3.render = _sfc_render$3; -const _sfc_main$2 = { +}); +var index$3 = /* @__PURE__ */ defineBuiltInComponent({ name: "CoverImage", compatConfig: { MODE: 3 @@ -18322,42 +18310,35 @@ const _sfc_main$2 = { default: "" } }, - methods: { - getRealPath, - _load($event) { - this.$trigger("load", $event); - }, - _error($event) { - this.$trigger("error", $event); - } - }, - mounted() { - this.$trigger = useCustomEvent({value: this.root}, this.$emit); - }, - setup() { + emits: ["load", "error"], + setup(props2, { + emit: emit2 + }) { const root = ref(null); - return { - root + const trigger = useCustomEvent(root, emit2); + function load($event) { + trigger("load", $event); + } + function error($event) { + trigger("error", $event); + } + return () => { + const { + src + } = props2; + return createVNode("uni-cover-image", { + "ref": root, + "src": src + }, [createVNode("div", { + "class": "uni-cover-image" + }, [src ? createVNode("img", { + "src": getRealPath(src), + "onLoad": load, + "onError": error + }, null, 40, ["src", "onLoad", "onError"]) : null])], 8, ["src"]); }; } -}; -const _hoisted_1$1 = {class: "uni-cover-image"}; -function _sfc_render$2(_ctx, _cache, $props, $setup, $data, $options) { - return openBlock(), createBlock("uni-cover-image", { - ref: "root", - src: $props.src - }, [ - createVNode("div", _hoisted_1$1, [ - $props.src ? (openBlock(), createBlock("img", { - key: 0, - src: $options.getRealPath($props.src), - onLoad: _cache[1] || (_cache[1] = (...args) => $options._load && $options._load(...args)), - onError: _cache[2] || (_cache[2] = (...args) => $options._error && $options._error(...args)) - }, null, 40, ["src"])) : createCommentVNode("", true) - ]) - ], 8, ["src"]); -} -_sfc_main$2.render = _sfc_render$2; +}); const {t, getLocale} = useI18n(); function getDefaultStartValue() { if (this.mode === mode.TIME) { @@ -20205,4 +20186,4 @@ var index = /* @__PURE__ */ defineSystemComponent({ return openBlock(), createBlock("div", clazz, [loadingVNode]); } }); -export {$emit, $off, $on, $once, index$1 as AsyncErrorComponent, index as AsyncLoadingComponent, _sfc_main$8 as Audio, index$m as Button, _sfc_main$7 as Canvas, index$k as Checkbox, index$l as CheckboxGroup, _sfc_main$2 as CoverImage, _sfc_main$3 as CoverView, index$j as Editor, index$o as Form, Friction, index$i as Icon, index$h as Image, Input, index$n as Label, LayoutComponent, Map$1 as Map, MovableArea, MovableView, _sfc_main$6 as Navigator, index$2 as PageComponent, _sfc_main$1 as Picker, PickerView, PickerViewColumn, index$g as Progress, index$e as Radio, index$f as RadioGroup, ResizeSensor, _sfc_main$5 as RichText, _sfc_main$4 as ScrollView, Scroller, index$d as Slider, Spring, Swiper, SwiperItem, index$c as Switch, index$b as Text, index$a as Textarea, UniServiceJSBridge$1 as UniServiceJSBridge, UniViewJSBridge$1 as UniViewJSBridge, index$5 as Video, index$9 as View, index$4 as WebView, addInterceptor, arrayBufferToBase64, base64ToArrayBuffer, canIUse, canvasGetImageData, canvasPutImageData, canvasToTempFilePath, chooseFile, chooseImage, chooseLocation, chooseVideo, clearStorage, clearStorageSync, closeSocket, connectSocket, createAnimation, createCanvasContext, createInnerAudioContext, createIntersectionObserver, createMapContext, createSelectorQuery, createVideoContext, cssBackdropFilter, cssConstant, cssEnv, cssVar, defineBuiltInComponent, defineSystemComponent, disableScrollBounce, downloadFile, getApp$1 as getApp, getContextInfo, getCurrentPages$1 as getCurrentPages, getFileInfo, getImageInfo, getLocation, getNetworkType, getSelectedTextRange, getStorage, getStorageInfo, getStorageInfoSync, getStorageSync, getSystemInfo, getSystemInfoSync, getVideoInfo, hideKeyboard, hideLoading, hideNavigationBarLoading, hideTabBar, hideTabBarRedDot, hideToast, initScrollBounce, loadFontFace, makePhoneCall, navigateBack, navigateTo, offAccelerometerChange, offCompassChange, offNetworkStatusChange, offWindowResize, onAccelerometerChange, onCompassChange, onNetworkStatusChange, onSocketClose, onSocketError, onSocketMessage, onSocketOpen, onTabBarMidButtonTap, onWindowResize, openDocument, openLocation, pageScrollTo, index$6 as plugin, preloadPage, previewImage, promiseInterceptor, reLaunch, redirectTo, removeInterceptor, removeStorage, removeStorageSync, removeTabBarBadge, request, sendSocketMessage, setNavigationBarColor, setNavigationBarTitle, setStorage, setStorageSync, setTabBarBadge, setTabBarItem, setTabBarStyle, setupApp, setupPage, showActionSheet, showLoading, showModal, showNavigationBarLoading, showTabBar, showTabBarRedDot, showToast, startAccelerometer, startCompass, startPullDownRefresh, stopAccelerometer, stopCompass, stopPullDownRefresh, switchTab, uni$1 as uni, uniFormKey, uploadFile, upx2px, useAttrs, useBooleanAttr, useContextInfo, useCustomEvent, useNativeEvent, useOn, useScroller, useSubscribe, useTouchtrack, useUserAction, vibrateLong, vibrateShort, withWebEvent}; +export {$emit, $off, $on, $once, index$1 as AsyncErrorComponent, index as AsyncLoadingComponent, _sfc_main$5 as Audio, index$p as Button, _sfc_main$4 as Canvas, index$n as Checkbox, index$o as CheckboxGroup, index$3 as CoverImage, index$4 as CoverView, index$m as Editor, index$r as Form, Friction, index$l as Icon, index$k as Image, Input, index$q as Label, LayoutComponent, Map$1 as Map, MovableArea, MovableView, index$j as Navigator, index$2 as PageComponent, _sfc_main$1 as Picker, PickerView, PickerViewColumn, index$i as Progress, index$g as Radio, index$h as RadioGroup, ResizeSensor, _sfc_main$3 as RichText, _sfc_main$2 as ScrollView, Scroller, index$f as Slider, Spring, Swiper, SwiperItem, index$e as Switch, index$d as Text, index$c as Textarea, UniServiceJSBridge$1 as UniServiceJSBridge, UniViewJSBridge$1 as UniViewJSBridge, index$7 as Video, index$b as View, index$6 as WebView, addInterceptor, arrayBufferToBase64, base64ToArrayBuffer, canIUse, canvasGetImageData, canvasPutImageData, canvasToTempFilePath, chooseFile, chooseImage, chooseLocation, chooseVideo, clearStorage, clearStorageSync, closeSocket, connectSocket, createAnimation, createCanvasContext, createInnerAudioContext, createIntersectionObserver, createMapContext, createSelectorQuery, createVideoContext, cssBackdropFilter, cssConstant, cssEnv, cssVar, defineBuiltInComponent, defineSystemComponent, disableScrollBounce, downloadFile, getApp$1 as getApp, getContextInfo, getCurrentPages$1 as getCurrentPages, getFileInfo, getImageInfo, getLocation, getNetworkType, getSelectedTextRange, getStorage, getStorageInfo, getStorageInfoSync, getStorageSync, getSystemInfo, getSystemInfoSync, getVideoInfo, hideKeyboard, hideLoading, hideNavigationBarLoading, hideTabBar, hideTabBarRedDot, hideToast, initScrollBounce, loadFontFace, makePhoneCall, navigateBack, navigateTo, offAccelerometerChange, offCompassChange, offNetworkStatusChange, offWindowResize, onAccelerometerChange, onCompassChange, onNetworkStatusChange, onSocketClose, onSocketError, onSocketMessage, onSocketOpen, onTabBarMidButtonTap, onWindowResize, openDocument, openLocation, pageScrollTo, index$8 as plugin, preloadPage, previewImage, promiseInterceptor, reLaunch, redirectTo, removeInterceptor, removeStorage, removeStorageSync, removeTabBarBadge, request, sendSocketMessage, setNavigationBarColor, setNavigationBarTitle, setStorage, setStorageSync, setTabBarBadge, setTabBarItem, setTabBarStyle, setupApp, setupPage, showActionSheet, showLoading, showModal, showNavigationBarLoading, showTabBar, showTabBarRedDot, showToast, startAccelerometer, startCompass, startPullDownRefresh, stopAccelerometer, stopCompass, stopPullDownRefresh, switchTab, uni$1 as uni, uniFormKey, uploadFile, upx2px, useAttrs, useBooleanAttr, useContextInfo, useCustomEvent, useNativeEvent, useOn, useScroller, useSubscribe, useTouchtrack, useUserAction, vibrateLong, vibrateShort, withWebEvent}; diff --git a/packages/uni-h5/src/service/api/route/redirectTo.ts b/packages/uni-h5/src/service/api/route/redirectTo.ts index a1315d95a36fadb30d1c8651f5caa1d6695da1ab..8102f2550a5d67ea9eb1349a817877857887a7c2 100644 --- a/packages/uni-h5/src/service/api/route/redirectTo.ts +++ b/packages/uni-h5/src/service/api/route/redirectTo.ts @@ -22,6 +22,7 @@ export const redirectTo = defineAsyncApi( API_REDIRECT_TO, ({ url }, { resolve, reject }) => { return ( + // TODO exists 属性未实现 removeLastPage(), navigate(API_REDIRECT_TO, url).then(resolve).catch(reject) ) diff --git a/packages/uni-h5/src/view/components/cover-image/index.tsx b/packages/uni-h5/src/view/components/cover-image/index.tsx new file mode 100644 index 0000000000000000000000000000000000000000..ae3110c6ca89cafb9b1a49094120980e005fee6a --- /dev/null +++ b/packages/uni-h5/src/view/components/cover-image/index.tsx @@ -0,0 +1,43 @@ +import { ref } from 'vue' +import { getRealPath } from '@dcloudio/uni-platform' +import { useCustomEvent, EmitEvent } from '@dcloudio/uni-components' +import { defineBuiltInComponent } from '@dcloudio/uni-components' + +export default /*#__PURE__*/ defineBuiltInComponent({ + name: 'CoverImage', + compatConfig: { + MODE: 3, + }, + props: { + src: { + type: String, + default: '', + }, + }, + emits: ['load', 'error'], + setup(props, { emit }) { + const root = ref(null) + const trigger = useCustomEvent>(root, emit) + + function load($event: Event) { + trigger('load', $event) + } + function error($event: Event) { + trigger('error', $event) + } + + return () => { + const { src } = props + + return ( + +
+ {src ? ( + + ) : null} +
+ + ) + } + }, +}) diff --git a/packages/uni-h5/src/view/components/cover-image/index.vue b/packages/uni-h5/src/view/components/cover-image/index.vue deleted file mode 100644 index b4a1bf6cdad7f6880f15a6898922340c45c6858c..0000000000000000000000000000000000000000 --- a/packages/uni-h5/src/view/components/cover-image/index.vue +++ /dev/null @@ -1,44 +0,0 @@ - - diff --git a/packages/uni-h5/src/view/components/cover-view/index.tsx b/packages/uni-h5/src/view/components/cover-view/index.tsx new file mode 100644 index 0000000000000000000000000000000000000000..bf718664e68f3e59bb3694156779eb5ef0df58ff --- /dev/null +++ b/packages/uni-h5/src/view/components/cover-view/index.tsx @@ -0,0 +1,60 @@ +import { ref, ExtractPropTypes, watch, onMounted } from 'vue' +import { defineBuiltInComponent } from '@dcloudio/uni-components' + +const props = { + scrollTop: { + type: [String, Number], + default: 0, + }, +} + +type Props = ExtractPropTypes + +export default /*#__PURE__*/ defineBuiltInComponent({ + name: 'CoverView', + compatConfig: { + MODE: 3, + }, + props, + setup(props, { slots }) { + const content = ref(null) + + watch( + () => props.scrollTop, + (val) => { + setScrollTop(val) + } + ) + + function setScrollTop(val: Props['scrollTop']) { + let _content = content.value! + if (getComputedStyle(_content).overflowY === 'scroll') { + _content.scrollTop = _upx2pxNum(val) + } + } + + function _upx2pxNum(val: Props['scrollTop']) { + let _val = String(val) + if (/\d+[ur]px$/i.test(_val)) { + _val.replace(/\d+[ur]px$/i, (text) => { + return String(uni.upx2px(parseFloat(text))) + }) + } + return parseFloat(_val) || 0 + } + + onMounted(() => { + setScrollTop(props.scrollTop) + }) + + return () => { + return ( + +
+ {slots.default && slots.default()} +
+ + ) + } + }, +}) diff --git a/packages/uni-h5/src/view/components/cover-view/index.vue b/packages/uni-h5/src/view/components/cover-view/index.vue deleted file mode 100644 index e5cc7cf85797811ea9eb5b19ef6687a306704525..0000000000000000000000000000000000000000 --- a/packages/uni-h5/src/view/components/cover-view/index.vue +++ /dev/null @@ -1,54 +0,0 @@ - - \ No newline at end of file diff --git a/packages/uni-h5/src/view/components/index.ts b/packages/uni-h5/src/view/components/index.ts index 8081e5acd9cd7079248e7d2565a493a30172cece..cf7499a899dd4a40176c721bf1ed5fea226e6566 100644 --- a/packages/uni-h5/src/view/components/index.ts +++ b/packages/uni-h5/src/view/components/index.ts @@ -1,8 +1,8 @@ import Video from './video/index' import WebView from './web-view/index' import Map from './map/index' -import CoverView from './cover-view/index.vue' -import CoverImage from './cover-image/index.vue' +import CoverView from './cover-view' +import CoverImage from './cover-image' import Picker from './picker/index.vue' export { Video, WebView, Map, CoverView, CoverImage, Picker }