diff --git a/packages/playground/uts/unpackage/dist/app-plus/uni_modules/test-uniplugin/app-android/index.kt.map b/packages/playground/uts/unpackage/dist/app-plus/uni_modules/test-uniplugin/app-android/index.kt.map index 364dfa605d573ad8c494166f0a29c53e0ca823c5..45b8019ed1326847c85c63d47ece45e3bc5d6c0b 100644 --- a/packages/playground/uts/unpackage/dist/app-plus/uni_modules/test-uniplugin/app-android/index.kt.map +++ b/packages/playground/uts/unpackage/dist/app-plus/uni_modules/test-uniplugin/app-android/index.kt.map @@ -1 +1 @@ -{"version":3,"sources":["/Users/guoshengqiang/Documents/uni-app-next/packages/playground/uts/uni_modules/test-uniplugin/app-android/index.uts","/Users/guoshengqiang/Documents/uni-app-next/packages/playground/uts/uni_modules/test-uniplugin/app-android/login.uts"],"sourcesContent":["import Log from 'android.util.Log'\nimport { login } from './login.uts'\nexport class User {\n async login(name: string, pwd: string) {\n login(name, pwd)\n Log.info('123')\n }\n}\n","export function login(name: string, pwd: string) {\n return { name, pwd }\n}\n"],"names":[],"mappings":";;;AAAA,OAAgB,gBAAkB,CAAA;ACA3B,IAAS,KAAK,CAAC,IAAY,EAAN,MAAM,EAAE,GAAW,EAAN,MAAM,iBAAE;IAC/C,OAAO;QAAE,IAAA,IAAI,GAAJ,IAAI;QAAE,IAAA,GAAG,GAAH,GAAG;KAAE,CAAA;;ADCf,WAAM,IAAI;IACf,iBAAM,KAAK,CAAC,IAAY,EAAN,MAAM,EAAE,GAAW,EAAN,MAAM,8CAAE;QACrC,MAAM,IAAI,EAAE,GAAG,CAAC;QAChB,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC;;CAElB"} \ No newline at end of file +{"version":3,"sources":["/Users/fxy/Projects/GitHub/uni-app/uni-app-next/packages/playground/uts/uni_modules/test-uniplugin/app-android/index.uts","/Users/fxy/Projects/GitHub/uni-app/uni-app-next/packages/playground/uts/uni_modules/test-uniplugin/app-android/login.uts"],"sourcesContent":["import Log from 'android.util.Log'\nimport { login } from './login.uts'\nexport class User {\n async login(name: string, pwd: string) {\n login(name, pwd)\n Log.info('123')\n }\n}\n","export function login(name: string, pwd: string) {\n return { name, pwd }\n}\n"],"names":[],"mappings":";;;AAAA,OAAgB,gBAAkB,CAAA;ACA3B,IAAS,KAAK,CAAC,IAAY,EAAN,MAAM,EAAE,GAAW,EAAN,MAAM,iBAAE;IAC/C,OAAO;QAAE,IAAA,IAAI,GAAJ,IAAI;QAAE,IAAA,GAAG,GAAH,GAAG;KAAE,CAAA;;ADCf,WAAM,IAAI;IACf,iBAAM,KAAK,CAAC,IAAY,EAAN,MAAM,EAAE,GAAW,EAAN,MAAM,8CAAE;QACrC,MAAM,IAAI,EAAE,GAAG,CAAC;QAChB,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC;;CAElB"} \ No newline at end of file diff --git a/packages/uni-app/dist/uni-app.cjs.js b/packages/uni-app/dist/uni-app.cjs.js index 4dcc2a740a0451d1594135ea2c6d1be45c05ae38..b19cae7118902c04f7869fdd7ff898726bacf59a 100644 --- a/packages/uni-app/dist/uni-app.cjs.js +++ b/packages/uni-app/dist/uni-app.cjs.js @@ -239,7 +239,7 @@ function initUtsProxyClass({ package: pkg, class: cls, methods, props, staticPro } else if (shared.hasOwn(staticMethods, name)) { // 静态方法 - target[name] = initUtsStaticMethod(!!staticMethods[name].async, shared.extend({ name }, baseOptions)); + target[name] = initUtsStaticMethod(!!staticMethods[name].async, shared.extend({ name, companion: true }, baseOptions)); } else if (props.includes(name)) { // 实例属性 @@ -247,7 +247,7 @@ function initUtsProxyClass({ package: pkg, class: cls, methods, props, staticPro } else if (staticProps.includes(name)) { // 静态属性 - return invokePropGetter(shared.extend({ name: name }, baseOptions)); + return invokePropGetter(shared.extend({ name: name, companion: true }, baseOptions)); } } return target[name]; diff --git a/packages/uni-app/dist/uni-app.d.ts b/packages/uni-app/dist/uni-app.d.ts index af9168517c15af725582ee0dd099bb1a637b6fca..42d1e518b198402df46ec36f941d89bc65c141ad 100644 --- a/packages/uni-app/dist/uni-app.d.ts +++ b/packages/uni-app/dist/uni-app.d.ts @@ -180,6 +180,10 @@ declare interface ProxyBaseOptions { * 属性名或方法名 */ name: string; + /** + * 是否是伴生对象 + */ + companion?: boolean; } declare interface ProxyClassOptions { diff --git a/packages/uni-app/dist/uni-app.es.js b/packages/uni-app/dist/uni-app.es.js index cbb5c3e28bf24b064b7e0e995f16a157c437ebe9..ccc9e600fb609e0b4d6e4809591846a226364d97 100644 --- a/packages/uni-app/dist/uni-app.es.js +++ b/packages/uni-app/dist/uni-app.es.js @@ -207,7 +207,7 @@ function initUtsProxyClass({ package: pkg, class: cls, methods, props, staticPro } else if (hasOwn(staticMethods, name)) { // 静态方法 - target[name] = initUtsStaticMethod(!!staticMethods[name].async, extend({ name }, baseOptions)); + target[name] = initUtsStaticMethod(!!staticMethods[name].async, extend({ name, companion: true }, baseOptions)); } else if (props.includes(name)) { // 实例属性 @@ -215,7 +215,7 @@ function initUtsProxyClass({ package: pkg, class: cls, methods, props, staticPro } else if (staticProps.includes(name)) { // 静态属性 - return invokePropGetter(extend({ name: name }, baseOptions)); + return invokePropGetter(extend({ name: name, companion: true }, baseOptions)); } } return target[name]; diff --git a/packages/uni-app/src/uts.ts b/packages/uni-app/src/uts.ts index 67f7cb533a60f7fb0dbe1f313106bb0b109325bf..b698885589565a4e929a70f57033a2128461ac1b 100644 --- a/packages/uni-app/src/uts.ts +++ b/packages/uni-app/src/uts.ts @@ -29,6 +29,10 @@ interface ProxyBaseOptions { * 属性名或方法名 */ name: string + /** + * 是否是伴生对象 + */ + companion?: boolean } interface ProxyInstanceOptions extends ProxyBaseOptions { @@ -234,7 +238,7 @@ export function initUtsProxyClass({ // 静态方法 target[name] = initUtsStaticMethod( !!staticMethods[name].async, - extend({ name }, baseOptions) + extend({ name, companion: true }, baseOptions) ) } else if (props.includes(name as string)) { // 实例属性 @@ -242,7 +246,7 @@ export function initUtsProxyClass({ } else if (staticProps.includes(name as string)) { // 静态属性 return invokePropGetter( - extend({ name: name as string }, baseOptions) + extend({ name: name as string, companion: true }, baseOptions) ) } } diff --git a/packages/uni-h5/dist/uni-h5.cjs.js b/packages/uni-h5/dist/uni-h5.cjs.js index 506312a857624de3b765c3fdc5a669be0926bd21..17dcb3fa37b9cf905c33bec6774a70b6e57b6102 100644 --- a/packages/uni-h5/dist/uni-h5.cjs.js +++ b/packages/uni-h5/dist/uni-h5.cjs.js @@ -7896,6 +7896,10 @@ const props$8 = { src: { type: String, default: "" + }, + fullscreen: { + type: Boolean, + default: true } }; var index$d = /* @__PURE__ */ defineBuiltInComponent({ @@ -7915,7 +7919,9 @@ var index$d = /* @__PURE__ */ defineBuiltInComponent({ }); let _resize; return () => { - return vue.createVNode(vue.Fragment, null, [vue.createVNode("uni-web-view", vue.mergeProps($listeners.value, $excludeAttrs.value, { + return vue.createVNode(vue.Fragment, null, [vue.createVNode("uni-web-view", vue.mergeProps({ + "class": props2.fullscreen ? "uni-webview--fullscreen" : "" + }, $listeners.value, $excludeAttrs.value, { "ref": rootRef }), [vue.createVNode(ResizeSensor, { "onResize": _resize @@ -10700,7 +10706,8 @@ function useState() { "--window-margin": value + "px" })); return { - layoutState: layoutState2 + layoutState: layoutState2, + windowState: vue.computed(() => ({})) }; } const topWindowMediaQuery = vue.ref(false); @@ -10749,14 +10756,14 @@ function useState() { vue.watch(() => layoutState.rightWindowWidth + layoutState.marginWidth, (value) => updateCssVar({ "--window-right": value + "px" })); - const windowState = vue.reactive({ + const windowState = vue.computed(() => ({ matchTopWindow: layoutState.topWindowMediaQuery, showTopWindow: layoutState.showTopWindow || layoutState.apiShowTopWindow, matchLeftWindow: layoutState.leftWindowMediaQuery, showLeftWindow: layoutState.showLeftWindow || layoutState.apiShowLeftWindow, matchRightWindow: layoutState.rightWindowMediaQuery, showRightWindow: layoutState.showRightWindow || layoutState.apiShowRightWindow - }); + })); return { layoutState, windowState @@ -10767,9 +10774,9 @@ function createLayoutTsx(keepAliveRoute, layoutState, windowState, topWindow, le if (!__UNI_FEATURE_RESPONSIVE__) { return routerVNode; } - const topWindowTsx = __UNI_FEATURE_TOPWINDOW__ ? createTopWindowTsx(topWindow, layoutState, windowState) : null; - const leftWindowTsx = __UNI_FEATURE_LEFTWINDOW__ ? createLeftWindowTsx(leftWindow, layoutState, windowState) : null; - const rightWindowTsx = __UNI_FEATURE_RIGHTWINDOW__ ? createRightWindowTsx(rightWindow, layoutState, windowState) : null; + const topWindowTsx = __UNI_FEATURE_TOPWINDOW__ ? createTopWindowTsx(topWindow, layoutState, windowState.value) : null; + const leftWindowTsx = __UNI_FEATURE_LEFTWINDOW__ ? createLeftWindowTsx(leftWindow, layoutState, windowState.value) : null; + const rightWindowTsx = __UNI_FEATURE_RIGHTWINDOW__ ? createRightWindowTsx(rightWindow, layoutState, windowState.value) : null; return vue.createVNode("uni-layout", { "class": { "uni-app--showtopwindow": __UNI_FEATURE_TOPWINDOW__ && layoutState.showTopWindow, diff --git a/packages/uni-h5/dist/uni-h5.es.js b/packages/uni-h5/dist/uni-h5.es.js index d69d41b2cdced69573e7a078da50a967d660ae72..08db484e9c7d90b8660cc75ad9a7e3dc140f9122 100644 --- a/packages/uni-h5/dist/uni-h5.es.js +++ b/packages/uni-h5/dist/uni-h5.es.js @@ -15304,6 +15304,10 @@ const props$f = { src: { type: String, default: "" + }, + fullscreen: { + type: Boolean, + default: true } }; var index$d = /* @__PURE__ */ defineBuiltInComponent({ @@ -15335,13 +15339,18 @@ var index$d = /* @__PURE__ */ defineBuiltInComponent({ watchEffect(() => { iframe.src = getRealPath(props2.src); }); - document.body.appendChild(iframe); - iframeRef.value = iframe; - _resize = useWebViewSize(rootRef, iframeRef); + _resize = useWebViewSize(rootRef, iframe, props2.fullscreen); + if (props2.fullscreen) { + document.body.appendChild(iframe); + } else { + iframeRef.value = iframe; + } }; renderIframe(); onMounted(() => { + var _a; _resize(); + !props2.fullscreen && ((_a = rootRef.value) == null ? void 0 : _a.appendChild(iframeRef.value)); }); onActivated(() => { iframeRef.value && (iframeRef.value.style.display = "block"); @@ -15350,10 +15359,12 @@ var index$d = /* @__PURE__ */ defineBuiltInComponent({ iframeRef.value && (iframeRef.value.style.display = "none"); }); onBeforeUnmount(() => { - document.body.removeChild(iframeRef.value); + iframeRef.value && document.body.removeChild(iframeRef.value); }); return () => { - return createVNode(Fragment, null, [createVNode("uni-web-view", mergeProps($listeners.value, $excludeAttrs.value, { + return createVNode(Fragment, null, [createVNode("uni-web-view", mergeProps({ + "class": props2.fullscreen ? "uni-webview--fullscreen" : "" + }, $listeners.value, $excludeAttrs.value, { "ref": rootRef }), [createVNode(ResizeSensor, { "onResize": _resize @@ -15361,23 +15372,31 @@ var index$d = /* @__PURE__ */ defineBuiltInComponent({ }; } }); -function useWebViewSize(rootRef, iframeRef) { +function useWebViewSize(rootRef, iframe, fullscreen) { const _resize = () => { - const { - top, - left, - width, - height - } = rootRef.value.getBoundingClientRect(); - iframeRef.value && updateElementStyle(iframeRef.value, { - position: "absolute", - display: "block", - border: "0", - top: top + "px", - left: left + "px", - width: width + "px", - height: height + "px" - }); + var _a, _b; + if (fullscreen) { + const { + top, + left, + width, + height + } = rootRef.value.getBoundingClientRect(); + updateElementStyle(iframe, { + position: "absolute", + display: "block", + border: "0", + top: top + "px", + left: left + "px", + width: width + "px", + height: height + "px" + }); + } else { + updateElementStyle(iframe, { + width: ((_a = rootRef.value) == null ? void 0 : _a.style.width) || "300px", + height: ((_b = rootRef.value) == null ? void 0 : _b.style.height) || "150px" + }); + } }; return _resize; } @@ -20140,7 +20159,8 @@ function useState() { "--window-margin": value + "px" })); return { - layoutState: layoutState2 + layoutState: layoutState2, + windowState: computed(() => ({})) }; } const topWindowMediaQuery = ref(false); @@ -20193,14 +20213,14 @@ function useState() { watch(() => layoutState.rightWindowWidth + layoutState.marginWidth, (value) => updateCssVar({ "--window-right": value + "px" })); - const windowState = reactive({ + const windowState = computed(() => ({ matchTopWindow: layoutState.topWindowMediaQuery, showTopWindow: layoutState.showTopWindow || layoutState.apiShowTopWindow, matchLeftWindow: layoutState.leftWindowMediaQuery, showLeftWindow: layoutState.showLeftWindow || layoutState.apiShowLeftWindow, matchRightWindow: layoutState.rightWindowMediaQuery, showRightWindow: layoutState.showRightWindow || layoutState.apiShowRightWindow - }); + })); return { layoutState, windowState @@ -20211,9 +20231,9 @@ function createLayoutTsx(keepAliveRoute, layoutState, windowState, topWindow, le if (!__UNI_FEATURE_RESPONSIVE__) { return routerVNode; } - const topWindowTsx = __UNI_FEATURE_TOPWINDOW__ ? createTopWindowTsx(topWindow, layoutState, windowState) : null; - const leftWindowTsx = __UNI_FEATURE_LEFTWINDOW__ ? createLeftWindowTsx(leftWindow, layoutState, windowState) : null; - const rightWindowTsx = __UNI_FEATURE_RIGHTWINDOW__ ? createRightWindowTsx(rightWindow, layoutState, windowState) : null; + const topWindowTsx = __UNI_FEATURE_TOPWINDOW__ ? createTopWindowTsx(topWindow, layoutState, windowState.value) : null; + const leftWindowTsx = __UNI_FEATURE_LEFTWINDOW__ ? createLeftWindowTsx(leftWindow, layoutState, windowState.value) : null; + const rightWindowTsx = __UNI_FEATURE_RIGHTWINDOW__ ? createRightWindowTsx(rightWindow, layoutState, windowState.value) : null; return createVNode("uni-layout", { "class": { "uni-app--showtopwindow": __UNI_FEATURE_TOPWINDOW__ && layoutState.showTopWindow, diff --git a/packages/uni-h5/src/view/components/web-view/index.tsx b/packages/uni-h5/src/view/components/web-view/index.tsx index 6d12f83c32570810f57335322b4dd08f1ff7bc27..4756398974a5c54f2d011e5e9dcebcde71f8cabd 100644 --- a/packages/uni-h5/src/view/components/web-view/index.tsx +++ b/packages/uni-h5/src/view/components/web-view/index.tsx @@ -65,9 +65,9 @@ export default /*#__PURE__*/ defineBuiltInComponent({ iframe.src = getRealPath(props.src) }) _resize = useWebViewSize(rootRef, iframe, props.fullscreen) - if(props.fullscreen){ + if (props.fullscreen) { document.body.appendChild(iframe) - }else{ + } else { iframeRef.value = iframe } } @@ -94,7 +94,7 @@ export default /*#__PURE__*/ defineBuiltInComponent({ return ( <> { - if(fullscreen){ - const { top, left, width, height } = rootRef.value!.getBoundingClientRect() + if (fullscreen) { + const { top, left, width, height } = + rootRef.value!.getBoundingClientRect() updateElementStyle(iframe, { position: 'absolute', display: 'block', @@ -130,7 +135,7 @@ function useWebViewSize(rootRef: RootRef, iframe: HTMLIFrameElement, fullscreen: width: width + 'px', height: height + 'px', }) - }else{ + } else { updateElementStyle(iframe, { width: rootRef.value?.style.width || '300px', height: rootRef.value?.style.height || '150px', diff --git a/packages/uni-mp-alipay/dist/uni.mp.esm.js b/packages/uni-mp-alipay/dist/uni.mp.esm.js index 2263f766e1b9ffee96caa685f14bcf28e41e0ad3..8ca9a21710c222f110bfc4ef4afc55de7fc43182 100644 --- a/packages/uni-mp-alipay/dist/uni.mp.esm.js +++ b/packages/uni-mp-alipay/dist/uni.mp.esm.js @@ -717,6 +717,7 @@ function createVueComponent(mpType, mpInstance, vueOptions, parent) { }, { mpType, mpInstance, + slots: mpInstance.props.uS || {}, parentComponent: parent && parent.$, onBeforeSetup(instance, options) { initMocks(instance, mpInstance, mocks); diff --git a/packages/uni-mp-alipay/package.json b/packages/uni-mp-alipay/package.json index 7bc0e99c1b66dce62e81d52f78ccc98ca0bed5d2..3348e51b33df975cb261b2a6161bea1a069814ff 100644 --- a/packages/uni-mp-alipay/package.json +++ b/packages/uni-mp-alipay/package.json @@ -3,6 +3,10 @@ "version": "3.0.0-alpha-3050420220803001", "description": "uni-app mp-alipay", "main": "dist/index.js", + "files": [ + "dist", + "lib" + ], "repository": { "type": "git", "url": "git+https://github.com/dcloudio/uni-app.git", diff --git a/packages/uni-mp-kuaishou/package.json b/packages/uni-mp-kuaishou/package.json index d5fe721148e56a33ff6340115c4c41701ff11a5a..498db920496c4fa724453e7cfe156b084cf6532a 100644 --- a/packages/uni-mp-kuaishou/package.json +++ b/packages/uni-mp-kuaishou/package.json @@ -3,6 +3,10 @@ "version": "3.0.0-alpha-3050420220803001", "description": "uni-app mp-kuaishou", "main": "dist/index.js", + "files": [ + "dist", + "lib" + ], "repository": { "type": "git", "url": "git+https://github.com/dcloudio/uni-app.git", diff --git a/packages/uni-mp-lark/package.json b/packages/uni-mp-lark/package.json index 2a50bfbf7343ee275cf7afbb575dacd0c653c813..9e6e3b466461b76a21d5b2a937780a478118d0c4 100644 --- a/packages/uni-mp-lark/package.json +++ b/packages/uni-mp-lark/package.json @@ -3,6 +3,10 @@ "version": "3.0.0-alpha-3050420220803001", "description": "uni-app mp-lark", "main": "dist/index.js", + "files": [ + "dist", + "lib" + ], "repository": { "type": "git", "url": "git+https://github.com/dcloudio/uni-app.git", diff --git a/packages/uni-mp-qq/package.json b/packages/uni-mp-qq/package.json index 43e545fcf9f2878898228b55167120e928b57e37..e66020558021e081846e7c217b4364604a2ef94f 100644 --- a/packages/uni-mp-qq/package.json +++ b/packages/uni-mp-qq/package.json @@ -3,6 +3,10 @@ "version": "3.0.0-alpha-3050420220803001", "description": "uni-app mp-qq", "main": "dist/index.js", + "files": [ + "dist", + "lib" + ], "repository": { "type": "git", "url": "git+https://github.com/dcloudio/uni-app.git", diff --git a/packages/uni-mp-toutiao/package.json b/packages/uni-mp-toutiao/package.json index 4f1114a4c697dd2d1ebfcaa53cbc47973010befa..3e1a41e0171f863a85dcba22f7f1e1048a4e435e 100644 --- a/packages/uni-mp-toutiao/package.json +++ b/packages/uni-mp-toutiao/package.json @@ -3,6 +3,10 @@ "version": "3.0.0-alpha-3050420220803001", "description": "uni-app mp-toutiao", "main": "dist/index.js", + "files": [ + "dist", + "lib" + ], "repository": { "type": "git", "url": "git+https://github.com/dcloudio/uni-app.git", diff --git a/packages/uni-quickapp-webview/package.json b/packages/uni-quickapp-webview/package.json index c20f4ddb97cd57653a5cf4582bff6b0962f90787..c551b012c5e027f720f8fae078b7ffafe51754fc 100644 --- a/packages/uni-quickapp-webview/package.json +++ b/packages/uni-quickapp-webview/package.json @@ -3,6 +3,10 @@ "version": "3.0.0-alpha-3050420220803001", "description": "uni-app quickapp-webview", "main": "dist/index.js", + "files": [ + "dist", + "lib" + ], "repository": { "type": "git", "url": "git+https://github.com/dcloudio/uni-app.git",