diff --git a/package.json b/package.json index 53b53ce1ea1559400661f5bb98dff42c2ebaa2c0..bd27e94c7bf872fd6e54655ae90b23325c36e9bb 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ }, "devDependencies": { "@babel/preset-env": "^7.16.11", - "@dcloudio/types": "^2.6.3", + "@dcloudio/types": "^2.6.4", "@dcloudio/uni-api": "3.0.0-alpha-3040620220415003", "@dcloudio/uni-app": "3.0.0-alpha-3040620220415003", "@jest/types": "^27.0.2", diff --git a/packages/uni-api/src/protocols/device/scanCode.ts b/packages/uni-api/src/protocols/device/scanCode.ts index b69518a5fdf1e4fe890a8281c59b210838e46d2f..fd254a539e0098151bcbe84d2fc470beda176a3c 100644 --- a/packages/uni-api/src/protocols/device/scanCode.ts +++ b/packages/uni-api/src/protocols/device/scanCode.ts @@ -5,4 +5,14 @@ export const ScanCodeProtocol: ApiProtocol = { onlyFromCamera: Boolean, scanType: Array, autoDecodeCharSet: Boolean, + sound: String as any, +} + +const SOUND: Parameters[0]['sound'][] = ['default', 'none'] +export const ScanCodeOptions: ApiOptions = { + formatArgs: { + sound(value, params) { + if (!SOUND.includes(value)) params.sound = 'none' + }, + }, } diff --git a/packages/uni-app-plus/src/service/api/device/scanCode.ts b/packages/uni-app-plus/src/service/api/device/scanCode.ts index fb945c8bc48397a973332e52a3048b9980b6f675..9c57660b0b1dd29d313eec154141f6f7c94e2d6f 100644 --- a/packages/uni-app-plus/src/service/api/device/scanCode.ts +++ b/packages/uni-app-plus/src/service/api/device/scanCode.ts @@ -4,6 +4,7 @@ import { API_SCAN_CODE, API_TYPE_SCAN_CODE, ScanCodeProtocol, + ScanCodeOptions, } from '@dcloudio/uni-api' import { useI18n, initI18nScanCodeMsgsOnce } from '@dcloudio/uni-core' import { getStatusBarStyle } from '../../../helpers/statusBar' @@ -92,5 +93,6 @@ export const scanCode = defineAsyncApi( }) } }, - ScanCodeProtocol + ScanCodeProtocol, + ScanCodeOptions ) diff --git a/packages/uni-app-vite/lib/template/__uniappscan.js b/packages/uni-app-vite/lib/template/__uniappscan.js index 3fd3ba5299bb51f7e860c5d20244ee3e7fc31ec5..5b0bb89111aa236733b4455442f70cfe84c5e785 100644 --- a/packages/uni-app-vite/lib/template/__uniappscan.js +++ b/packages/uni-app-vite/lib/template/__uniappscan.js @@ -1,2 +1,2 @@ "use weex:vue"; -(()=>{var _=Object.create;var f=Object.defineProperty;var E=Object.getOwnPropertyDescriptor;var D=Object.getOwnPropertyNames;var w=Object.getPrototypeOf,v=Object.prototype.hasOwnProperty;var S=e=>f(e,"__esModule",{value:!0});var y=(e,a)=>()=>(a||e((a={exports:{}}).exports,a),a.exports);var B=(e,a,s,o)=>{if(a&&typeof a=="object"||typeof a=="function")for(let l of D(a))!v.call(e,l)&&(s||l!=="default")&&f(e,l,{get:()=>a[l],enumerable:!(o=E(a,l))||o.enumerable});return e},k=(e,a)=>B(S(f(e!=null?_(w(e)):{},"default",!a&&e&&e.__esModule?{get:()=>e.default,enumerable:!0}:{value:e,enumerable:!0})),e);var b=y((P,m)=>{m.exports=Vue});var d={data(){return{locale:"en",fallbackLocale:"en",localization:{en:{done:"OK",cancel:"Cancel"},zh:{done:"\u5B8C\u6210",cancel:"\u53D6\u6D88"},"zh-hans":{},"zh-hant":{},messages:{}}}},onLoad(){this.initLocale()},created(){this.initLocale()},methods:{initLocale(){if(this.__initLocale)return;this.__initLocale=!0;let e=(plus.webview.currentWebview().extras||{}).data||{};if(e.messages&&(this.localization.messages=e.messages),e.locale){this.locale=e.locale.toLowerCase();return}let a={chs:"hans",cn:"hans",sg:"hans",cht:"hant",tw:"hant",hk:"hant",mo:"hant"},s=plus.os.language.toLowerCase().split("/")[0].replace("_","-").split("-"),o=s[1];o&&(s[1]=a[o]||o),s.length=s.length>2?2:s.length,this.locale=s.join("-")},localize(e){let a=this.locale,s=a.split("-")[0],o=this.fallbackLocale,l=this.localization;function r(c){return l[c]||{}}return r("messages")[e]||r(a)[e]||r(s)[e]||r(o)[e]||e}}},p={onLoad(){this.initMessage()},methods:{initMessage(){let{from:e,callback:a,runtime:s,data:o={},useGlobalEvent:l}=plus.webview.currentWebview().extras||{};this.__from=e,this.__runtime=s,this.__page=plus.webview.currentWebview().id,this.__useGlobalEvent=l,this.data=JSON.parse(JSON.stringify(o)),plus.key.addEventListener("backbutton",()=>{typeof this.onClose=="function"?this.onClose():plus.webview.currentWebview().close("auto")});let r=this,c=function(i){let g=i.data&&i.data.__message;!g||r.__onMessageCallback&&r.__onMessageCallback(g.data)};if(this.__useGlobalEvent)weex.requireModule("globalEvent").addEventListener("plusMessage",c);else{let i=new BroadcastChannel(this.__page);i.onmessage=c}},postMessage(e={},a=!1){let s=JSON.parse(JSON.stringify({__message:{__page:this.__page,data:e,keep:a}})),o=this.__from;if(this.__runtime==="v8")this.__useGlobalEvent?plus.webview.postMessageToUniNView(s,o):new BroadcastChannel(o).postMessage(s);else{let l=plus.webview.getWebviewById(o);l&&l.evalJS(`__plusMessage&&__plusMessage(${JSON.stringify({data:s})})`)}},onMessage(e){this.__onMessageCallback=e}}};var n=k(b());var C=(e,a)=>{let s=e.__vccOpts||e;for(let[o,l]of a)s[o]=l;return s};var O={content:{"":{flex:1,alignItems:"center",justifyContent:"center",backgroundColor:"#000000"}},barcode:{"":{position:"absolute",left:0,top:0,right:0,bottom:0,zIndex:1}},"set-flash":{"":{alignItems:"center",justifyContent:"center",transform:"translateY(80px)",zIndex:2}},"image-flash":{"":{width:26,height:26,marginBottom:2}},"image-flash-text":{"":{fontSize:10,color:"#FFFFFF"}}},t=plus.barcode,A={qrCode:[t.QR,t.AZTEC,t.MAXICODE],barCode:[t.EAN13,t.EAN8,t.UPCA,t.UPCE,t.CODABAR,t.CODE128,t.CODE39,t.CODE93,t.ITF,t.RSS14,t.RSSEXPANDED],datamatrix:[t.DATAMATRIX],pdf417:[t.PDF417]},M={[t.QR]:"QR_CODE",[t.EAN13]:"EAN_13",[t.EAN8]:"EAN_8",[t.DATAMATRIX]:"DATA_MATRIX",[t.UPCA]:"UPC_A",[t.UPCE]:"UPC_E",[t.CODABAR]:"CODABAR",[t.CODE39]:"CODE_39",[t.CODE93]:"CODE_93",[t.CODE128]:"CODE_128",[t.ITF]:"CODE_25",[t.PDF417]:"PDF_417",[t.AZTEC]:"AZTEC",[t.RSS14]:"RSS_14",[t.RSSEXPANDED]:"RSSEXPANDED"},I={mixins:[p,d],data:{filters:[0,2,1],backgroud:"#000000",frameColor:"#118ce9",scanbarColor:"#118ce9",enabledFlash:!1,flashImage0:"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAABjklEQVRoQ+1ZbVHEQAx9TwE4ABTcOQAknANQAKcAUAAOAAXgAHAACsDCKQiTmbYDzJZtNt2bFrJ/m6+Xl2yyU2LmhzOPH/8PgIjcADirxNyapNoffMwMiMgzgMPBHmyCLySPLCoBwJKtAbJbYaBmD1yRvBwAtBMxl5DF+DZkiwCIyBLAzsgBbki+Wm2WAlCaL6zOMvKnJO+sNksB7ALQbO1ZHfbIv5FUVs2nCIB6EZETALdmj2mFY5I6X8ynGEADQllYmL1+VzBfnV/VvQB0aj45ARyQ/Ci14QLQsOBZLe5JaikWnzEA7AN4L4hgA2Dpyb76dANwsOCq/TZhASAYKGie0a7R1lDPI0ebtF0NUi+4yfdAtxr3PEMnD6BbD0QkNfACQO05EAwMuaBqDrIVycdmTpwDuP4R0OR7QFftVRP0g+49cwOQq4DJMxAAchmofY3m/EcJBQOZbTRKKJeBKKEoIePvpFRJ1VzmciUccyCa+C81cerBkuuB7sGTE/zt+yhN7AnAqxsAvBn06n8CkyPwMZKwm+UAAAAASUVORK5CYII=",flashImage1:"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAMFBMVEUAAAA3kvI3lfY2k/VAl+43k/U3k/Q4k/M3kvI3k/M4k/Q4lPU2lPU2k/Vdq843k/WWSpNKAAAAD3RSTlMAwD+QINCAcPBgUDDgoBAE044kAAAAdklEQVQ4y2OgOrD/DwffUSTkERIfyZXAtOMbca7iVoKDDSgSbAijJqBI8J2HiX9FM2s+TOITmgQrTEIATYIJJuEA5mJ68S+Gg/0hEi0YEoxQK2gs0WyPQyKBGYeEAhPtJRaw45AIccXpwVEJekuwQyQWMFAfAACeDBJY9aXa3QAAAABJRU5ErkJggg==",autoDecodeCharSet:!1,localization:{en:{fail:"Recognition failure","flash.on":"Tap to turn light on","flash.off":"Tap to turn light off"},zh:{fail:"\u8BC6\u522B\u5931\u8D25","flash.on":"\u8F7B\u89E6\u7167\u4EAE","flash.off":"\u8F7B\u89E6\u5173\u95ED"}}},onLoad(){let e=this.data,a=e.scanType;this.autoDecodeCharSet=e.autoDecodeCharSet;let s=[];Array.isArray(a)&&a.length&&a.forEach(o=>{let l=A[o];l&&(s=s.concat(l))}),s.length||(s=s.concat(A.qrCode).concat(A.barCode).concat(A.datamatrix).concat(A.pdf417)),this.filters=s,this.onMessage(o=>{this.gallery()})},onUnload(){this.cancel()},methods:{start(){this.$refs.barcode.start({conserve:!0,filename:"_doc/barcode/"})},scan(e){t.scan(e,(a,s,o,l)=>{this.scanSuccess(a,s,o,l)},()=>{plus.nativeUI.toast(this.localize("fail"))},this.filters,this.autoDecodeCharSet)},cancel(){this.$refs.barcode.cancel()},gallery(){plus.gallery.pick(e=>{this.scan(e)},e=>{e.code!==(weex.config.env.platform.toLowerCase()==="android"?12:-2)&&plus.nativeUI.toast(this.localize("fail"))},{multiple:!1,system:!1,filename:"_doc/uniapp_temp/gallery/",permissionAlert:!0})},onmarked(e){var a=e.detail;this.scanSuccess(a.code,a.message,a.file,a.charSet)},scanSuccess(e,a,s,o){this.postMessage({event:"marked",detail:{scanType:M[e],result:a,charSet:o||"utf8",path:s||""}})},onerror(e){this.postMessage({event:"fail",message:JSON.stringify(e)})},setFlash(){this.enabledFlash=!this.enabledFlash,this.$refs.barcode.setFlash(this.enabledFlash)}}};function N(e,a,s,o,l,r){let c=(0,n.resolveComponent)("barcode");return(0,n.openBlock)(),(0,n.createElementBlock)("scroll-view",{scrollY:!0,showScrollbar:!0,enableBackToTop:!0,bubble:!0,style:{flexDirection:"column"}},[(0,n.createElementVNode)("view",{class:"content"},[(0,n.createVNode)(c,{class:"barcode",ref:"barcode",autostart:"true",backgroud:e.backgroud,frameColor:e.frameColor,scanbarColor:e.scanbarColor,filters:e.filters,autoDecodeCharset:e.autoDecodeCharSet,onMarked:r.onmarked,onError:r.onerror},null,8,["backgroud","frameColor","scanbarColor","filters","autoDecodeCharset","onMarked","onError"]),(0,n.createElementVNode)("view",{class:"set-flash",onClick:a[0]||(a[0]=(...i)=>r.setFlash&&r.setFlash(...i))},[(0,n.createElementVNode)("u-image",{class:"image-flash",src:e.enabledFlash?e.flashImage1:e.flashImage0,resize:"stretch"},null,8,["src"]),(0,n.createElementVNode)("u-text",{class:"image-flash-text"},(0,n.toDisplayString)(e.enabledFlash?e.localize("flash.off"):e.localize("flash.on")),1)])])])}var h=C(I,[["render",N],["styles",[O]]]);var u=plus.webview.currentWebview();if(u){let e=parseInt(u.id),a="template/__uniappscan",s={};try{s=JSON.parse(u.__query__)}catch{}h.mpType="page";let o=Vue.createPageApp(h,{$store:getApp({allowDefault:!0}).$store,__pageId:e,__pagePath:a,__pageQuery:s});o.provide("__globalStyles",Vue.useCssStyles([...__uniConfig.styles,...h.styles||[]])),o.mount("#root")}})(); +(()=>{var _=Object.create;var g=Object.defineProperty;var E=Object.getOwnPropertyDescriptor;var D=Object.getOwnPropertyNames;var w=Object.getPrototypeOf,v=Object.prototype.hasOwnProperty;var y=(e,a)=>()=>(a||e((a={exports:{}}).exports,a),a.exports);var S=(e,a,s,o)=>{if(a&&typeof a=="object"||typeof a=="function")for(let l of D(a))!v.call(e,l)&&l!==s&&g(e,l,{get:()=>a[l],enumerable:!(o=E(a,l))||o.enumerable});return e};var B=(e,a,s)=>(s=e!=null?_(w(e)):{},S(a||!e||!e.__esModule?g(s,"default",{value:e,enumerable:!0}):s,e));var C=y((F,m)=>{m.exports=Vue});var d={data(){return{locale:"en",fallbackLocale:"en",localization:{en:{done:"OK",cancel:"Cancel"},zh:{done:"\u5B8C\u6210",cancel:"\u53D6\u6D88"},"zh-hans":{},"zh-hant":{},messages:{}}}},onLoad(){this.initLocale()},created(){this.initLocale()},methods:{initLocale(){if(this.__initLocale)return;this.__initLocale=!0;let e=(plus.webview.currentWebview().extras||{}).data||{};if(e.messages&&(this.localization.messages=e.messages),e.locale){this.locale=e.locale.toLowerCase();return}let a={chs:"hans",cn:"hans",sg:"hans",cht:"hant",tw:"hant",hk:"hant",mo:"hant"},s=plus.os.language.toLowerCase().split("/")[0].replace("_","-").split("-"),o=s[1];o&&(s[1]=a[o]||o),s.length=s.length>2?2:s.length,this.locale=s.join("-")},localize(e){let a=this.locale,s=a.split("-")[0],o=this.fallbackLocale,l=this.localization;function i(c){return l[c]||{}}return i("messages")[e]||i(a)[e]||i(s)[e]||i(o)[e]||e}}},p={onLoad(){this.initMessage()},methods:{initMessage(){let{from:e,callback:a,runtime:s,data:o={},useGlobalEvent:l}=plus.webview.currentWebview().extras||{};this.__from=e,this.__runtime=s,this.__page=plus.webview.currentWebview().id,this.__useGlobalEvent=l,this.data=JSON.parse(JSON.stringify(o)),plus.key.addEventListener("backbutton",()=>{typeof this.onClose=="function"?this.onClose():plus.webview.currentWebview().close("auto")});let i=this,c=function(r){let u=r.data&&r.data.__message;!u||i.__onMessageCallback&&i.__onMessageCallback(u.data)};if(this.__useGlobalEvent)weex.requireModule("globalEvent").addEventListener("plusMessage",c);else{let r=new BroadcastChannel(this.__page);r.onmessage=c}},postMessage(e={},a=!1){let s=JSON.parse(JSON.stringify({__message:{__page:this.__page,data:e,keep:a}})),o=this.__from;if(this.__runtime==="v8")this.__useGlobalEvent?plus.webview.postMessageToUniNView(s,o):new BroadcastChannel(o).postMessage(s);else{let l=plus.webview.getWebviewById(o);l&&l.evalJS(`__plusMessage&&__plusMessage(${JSON.stringify({data:s})})`)}},onMessage(e){this.__onMessageCallback=e}}};var n=B(C());var b=(e,a)=>{let s=e.__vccOpts||e;for(let[o,l]of a)s[o]=l;return s};var k={content:{"":{flex:1,alignItems:"center",justifyContent:"center",backgroundColor:"#000000"}},barcode:{"":{position:"absolute",left:0,top:0,right:0,bottom:0,zIndex:1}},"set-flash":{"":{alignItems:"center",justifyContent:"center",transform:"translateY(80px)",zIndex:2}},"image-flash":{"":{width:26,height:26,marginBottom:2}},"image-flash-text":{"":{fontSize:10,color:"#FFFFFF"}}},t=plus.barcode,A={qrCode:[t.QR,t.AZTEC,t.MAXICODE],barCode:[t.EAN13,t.EAN8,t.UPCA,t.UPCE,t.CODABAR,t.CODE128,t.CODE39,t.CODE93,t.ITF,t.RSS14,t.RSSEXPANDED],datamatrix:[t.DATAMATRIX],pdf417:[t.PDF417]},O={[t.QR]:"QR_CODE",[t.EAN13]:"EAN_13",[t.EAN8]:"EAN_8",[t.DATAMATRIX]:"DATA_MATRIX",[t.UPCA]:"UPC_A",[t.UPCE]:"UPC_E",[t.CODABAR]:"CODABAR",[t.CODE39]:"CODE_39",[t.CODE93]:"CODE_93",[t.CODE128]:"CODE_128",[t.ITF]:"CODE_25",[t.PDF417]:"PDF_417",[t.AZTEC]:"AZTEC",[t.RSS14]:"RSS_14",[t.RSSEXPANDED]:"RSSEXPANDED"},M={mixins:[p,d],data:{filters:[0,2,1],backgroud:"#000000",frameColor:"#118ce9",scanbarColor:"#118ce9",enabledFlash:!1,flashImage0:"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAABjklEQVRoQ+1ZbVHEQAx9TwE4ABTcOQAknANQAKcAUAAOAAXgAHAACsDCKQiTmbYDzJZtNt2bFrJ/m6+Xl2yyU2LmhzOPH/8PgIjcADirxNyapNoffMwMiMgzgMPBHmyCLySPLCoBwJKtAbJbYaBmD1yRvBwAtBMxl5DF+DZkiwCIyBLAzsgBbki+Wm2WAlCaL6zOMvKnJO+sNksB7ALQbO1ZHfbIv5FUVs2nCIB6EZETALdmj2mFY5I6X8ynGEADQllYmL1+VzBfnV/VvQB0aj45ARyQ/Ci14QLQsOBZLe5JaikWnzEA7AN4L4hgA2Dpyb76dANwsOCq/TZhASAYKGie0a7R1lDPI0ebtF0NUi+4yfdAtxr3PEMnD6BbD0QkNfACQO05EAwMuaBqDrIVycdmTpwDuP4R0OR7QFftVRP0g+49cwOQq4DJMxAAchmofY3m/EcJBQOZbTRKKJeBKKEoIePvpFRJ1VzmciUccyCa+C81cerBkuuB7sGTE/zt+yhN7AnAqxsAvBn06n8CkyPwMZKwm+UAAAAASUVORK5CYII=",flashImage1:"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAMFBMVEUAAAA3kvI3lfY2k/VAl+43k/U3k/Q4k/M3kvI3k/M4k/Q4lPU2lPU2k/Vdq843k/WWSpNKAAAAD3RSTlMAwD+QINCAcPBgUDDgoBAE044kAAAAdklEQVQ4y2OgOrD/DwffUSTkERIfyZXAtOMbca7iVoKDDSgSbAijJqBI8J2HiX9FM2s+TOITmgQrTEIATYIJJuEA5mJ68S+Gg/0hEi0YEoxQK2gs0WyPQyKBGYeEAhPtJRaw45AIccXpwVEJekuwQyQWMFAfAACeDBJY9aXa3QAAAABJRU5ErkJggg==",autoDecodeCharSet:!1,localization:{en:{fail:"Recognition failure","flash.on":"Tap to turn light on","flash.off":"Tap to turn light off"},zh:{fail:"\u8BC6\u522B\u5931\u8D25","flash.on":"\u8F7B\u89E6\u7167\u4EAE","flash.off":"\u8F7B\u89E6\u5173\u95ED"}}},onLoad(){let e=this.data,a=e.scanType;this.autoDecodeCharSet=e.autoDecodeCharSet;let s=[];Array.isArray(a)&&a.length&&a.forEach(o=>{let l=A[o];l&&(s=s.concat(l))}),s.length||(s=s.concat(A.qrCode).concat(A.barCode).concat(A.datamatrix).concat(A.pdf417)),this.filters=s,this.onMessage(o=>{this.gallery()})},onUnload(){this.cancel()},onReady(){setTimeout(()=>{this.cancel(),this.start()},50)},methods:{start(){this.$refs.barcode.start({sound:this.data.sound})},scan(e){t.scan(e,(a,s,o,l)=>{this.scanSuccess(a,s,o,l)},()=>{plus.nativeUI.toast(this.localize("fail"))},this.filters,this.autoDecodeCharSet)},cancel(){this.$refs.barcode.cancel()},gallery(){plus.gallery.pick(e=>{this.scan(e)},e=>{e.code!==(weex.config.env.platform.toLowerCase()==="android"?12:-2)&&plus.nativeUI.toast(this.localize("fail"))},{multiple:!1,system:!1,filename:"_doc/uniapp_temp/gallery/",permissionAlert:!0})},onmarked(e){var a=e.detail;this.scanSuccess(a.code,a.message,a.file,a.charSet)},scanSuccess(e,a,s,o){this.postMessage({event:"marked",detail:{scanType:O[e],result:a,charSet:o||"utf8",path:s||""}})},onerror(e){this.postMessage({event:"fail",message:JSON.stringify(e)})},setFlash(){this.enabledFlash=!this.enabledFlash,this.$refs.barcode.setFlash(this.enabledFlash)}}};function I(e,a,s,o,l,i){let c=(0,n.resolveComponent)("barcode");return(0,n.openBlock)(),(0,n.createElementBlock)("scroll-view",{scrollY:!0,showScrollbar:!0,enableBackToTop:!0,bubble:!0,style:{flexDirection:"column"}},[(0,n.createElementVNode)("view",{class:"content"},[(0,n.createVNode)(c,{class:"barcode",ref:"barcode",autostart:"false",backgroud:e.backgroud,frameColor:e.frameColor,scanbarColor:e.scanbarColor,filters:e.filters,autoDecodeCharset:e.autoDecodeCharSet,onMarked:i.onmarked,onError:i.onerror},null,8,["backgroud","frameColor","scanbarColor","filters","autoDecodeCharset","onMarked","onError"]),(0,n.createElementVNode)("view",{class:"set-flash",onClick:a[0]||(a[0]=(...r)=>i.setFlash&&i.setFlash(...r))},[(0,n.createElementVNode)("u-image",{class:"image-flash",src:e.enabledFlash?e.flashImage1:e.flashImage0,resize:"stretch"},null,8,["src"]),(0,n.createElementVNode)("u-text",{class:"image-flash-text"},(0,n.toDisplayString)(e.enabledFlash?e.localize("flash.off"):e.localize("flash.on")),1)])])])}var h=b(M,[["render",I],["styles",[k]]]);var f=plus.webview.currentWebview();if(f){let e=parseInt(f.id),a="template/__uniappscan",s={};try{s=JSON.parse(f.__query__)}catch(l){}h.mpType="page";let o=Vue.createPageApp(h,{$store:getApp({allowDefault:!0}).$store,__pageId:e,__pagePath:a,__pageQuery:s});o.provide("__globalStyles",Vue.useCssStyles([...__uniConfig.styles,...h.styles||[]])),o.mount("#root")}})(); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1c9876dc8f7ada914155d1dfc0945b1d7f1f12c5..fbbedc8d931a5505da2a27cf197f70f5dda1dac3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5,7 +5,7 @@ importers: .: specifiers: '@babel/preset-env': ^7.16.11 - '@dcloudio/types': ^2.6.3 + '@dcloudio/types': ^2.6.4 '@dcloudio/uni-api': 3.0.0-alpha-3040620220415003 '@dcloudio/uni-app': 3.0.0-alpha-3040620220415003 '@jest/types': ^27.0.2 @@ -53,7 +53,7 @@ importers: yorkie: ^2.0.0 devDependencies: '@babel/preset-env': 7.16.11 - '@dcloudio/types': 2.6.3 + '@dcloudio/types': 2.6.4 '@dcloudio/uni-api': link:packages/uni-api '@dcloudio/uni-app': link:packages/uni-app '@jest/types': 27.4.2 @@ -2338,8 +2338,8 @@ packages: lodash.once: 4.1.1 dev: true - /@dcloudio/types/2.6.3: - resolution: {integrity: sha512-IanHe26b9P+m3I+GF4nPzgUr3tf/T+fAmFcgqfrA0vrAfgZOM5im1Nsdgg2sPFoYpLikf6TG57OW1Z3S98lTAg==} + /@dcloudio/types/2.6.4: + resolution: {integrity: sha512-Tr3+46YJ/sL4nnAmNSeela5/0g6O2WP6ZFVjkVoBkhHcOwJsRUXm3RblD+B2fjBtZs0IW0Ulxogi/jGoOk0WIA==} dev: true /@dcloudio/uni-cli-i18n/2.0.0-alpha-33020211130001: