diff --git a/build/rollup.config.js b/build/rollup.config.js index c0eb819f8a640eebf20990dc6c39a022c4343070..f25112de4a842a3174d7e752a893b708a590fb2f 100644 --- a/build/rollup.config.js +++ b/build/rollup.config.js @@ -18,6 +18,10 @@ const PLATFORMS = { 'mp-toutiao': { prefix: 'tt', title: '头条小程序' + }, + 'app-plus': { + prefix: 'wx', + title: 'app-plus' } } diff --git a/package.json b/package.json index a739bea9a0e1fca5c04a2bc534b3d3582665f937..ece581cc334f88a9a5adced0f559c5f9b16cfa3f 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,8 @@ "scripts": { "lint": "eslint --fix --config package.json --ext .js --ext .vue --ignore-path .eslintignore build src", "dev:h5": "npm run lint && cross-env NODE_ENV=production UNI_WATCH=true UNI_PLATFORM=h5 node build/build.js", - "build:h5": "npm run lint && cross-env NODE_ENV=production UNI_WATCH=false UNI_PLATFORM=h5 node build/build.js", + "build:h5": "npm run lint && cross-env NODE_ENV=production UNI_WATCH=false UNI_PLATFORM=h5 node build/build.js", + "build:app-plus": "npm run lint && cross-env UNI_PLATFORM=app-plus rollup -c build/rollup.config.js", "build:mp-weixin": "npm run lint && cross-env UNI_PLATFORM=mp-weixin rollup -c build/rollup.config.js", "build:mp-baidu": "npm run lint && cross-env UNI_PLATFORM=mp-baidu rollup -c build/rollup.config.js", "build:mp-alipay": "npm run lint && cross-env UNI_PLATFORM=mp-alipay rollup -c build/rollup.config.js", diff --git a/packages/uni-app-plus/LICENSE b/packages/uni-app-plus/LICENSE new file mode 100755 index 0000000000000000000000000000000000000000..7a4a3ea2424c09fbe48d455aed1eaa94d9124835 --- /dev/null +++ b/packages/uni-app-plus/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. \ No newline at end of file diff --git a/packages/uni-app-plus/dist/index.js b/packages/uni-app-plus/dist/index.js new file mode 100644 index 0000000000000000000000000000000000000000..ea568d891608cec37091e4d8c6cccb48101b29bb --- /dev/null +++ b/packages/uni-app-plus/dist/index.js @@ -0,0 +1,626 @@ +import Vue from 'vue'; + +const _toString = Object.prototype.toString; +const hasOwnProperty = Object.prototype.hasOwnProperty; + +function isFn (fn) { + return typeof fn === 'function' +} + +function isStr (str) { + return typeof str === 'string' +} + +function isPlainObject (obj) { + return _toString.call(obj) === '[object Object]' +} + +function hasOwn (obj, key) { + return hasOwnProperty.call(obj, key) +} + +function noop () {} + +const SYNC_API_RE = /hideKeyboard|upx2px|canIUse|^create|Sync$|Manager$/; + +const CONTEXT_API_RE = /^create|Manager$/; + +const CALLBACK_API_RE = /^on/; + +function isContextApi (name) { + return CONTEXT_API_RE.test(name) +} +function isSyncApi (name) { + return SYNC_API_RE.test(name) +} + +function isCallbackApi (name) { + return CALLBACK_API_RE.test(name) +} + +function handlePromise (promise) { + return promise.then(data => { + return [null, data] + }) + .catch(err => [err]) +} + +function shouldPromise (name) { + if (isSyncApi(name)) { + return false + } + if (isCallbackApi(name)) { + return false + } + return true +} + +function promisify (name, api) { + if (!shouldPromise(name)) { + return api + } + return function promiseApi (options = {}, ...params) { + if (isFn(options.success) || isFn(options.fail) || isFn(options.complete)) { + return api(options, ...params) + } + return handlePromise(new Promise((resolve, reject) => { + api(Object.assign({}, options, { + success: resolve, + fail: reject + }), ...params); + /* eslint-disable no-extend-native */ + Promise.prototype.finally = function (callback) { + const promise = this.constructor; + return this.then( + value => promise.resolve(callback()).then(() => value), + reason => promise.resolve(callback()).then(() => { + throw reason + }) + ) + }; + })) + } +} + +const EPS = 1e-4; +const BASE_DEVICE_WIDTH = 750; +let isIOS = false; +let deviceWidth = 0; +let deviceDPR = 0; + +function checkDeviceWidth () { + const { + platform, + pixelRatio, + windowWidth + } = wx.getSystemInfoSync(); // uni=>wx runtime 编译目标是 uni 对象，内部不允许直接使用 uni + + deviceWidth = windowWidth; + deviceDPR = pixelRatio; + isIOS = platform === 'ios'; +} + +function upx2px (number, newDeviceWidth) { + if (deviceWidth === 0) { + checkDeviceWidth(); + } + + number = Number(number); + if (number === 0) { + return 0 + } + let result = (number / BASE_DEVICE_WIDTH) * (newDeviceWidth || deviceWidth); + if (result < 0) { + result = -result; + } + result = Math.floor(result + EPS); + if (result === 0) { + if (deviceDPR === 1 || !isIOS) { + return 1 + } else { + return 0.5 + } + } + return number < 0 ? -result : result +} + +var protocols = {}; + +const CALLBACKS = ['success', 'fail', 'cancel', 'complete']; + +function processCallback (methodName, method, returnValue) { + return function (res) { + return method(processReturnValue(methodName, res, returnValue)) + } +} + +function processArgs (methodName, fromArgs, argsOption = {}, returnValue = {}, keepFromArgs = false) { + if (isPlainObject(fromArgs)) { // 一般 api 的参数解析 + const toArgs = keepFromArgs === true ? fromArgs : {}; // returnValue 为 false 时，说明是格式化返回值，直接在返回值对象上修改赋值 + if (isFn(argsOption)) { + argsOption = argsOption(fromArgs, toArgs) || {}; + } + for (let key in fromArgs) { + if (hasOwn(argsOption, key)) { + let keyOption = argsOption[key]; + if (isFn(keyOption)) { + keyOption = keyOption(fromArgs[key], fromArgs, toArgs); + } + if (!keyOption) { // 不支持的参数 + console.warn(`app-plus ${methodName}暂不支持${key}`); + } else if (isStr(keyOption)) { // 重写参数 key + toArgs[keyOption] = fromArgs[key]; + } else if (isPlainObject(keyOption)) { // {name:newName,value:value}可重新指定参数 key:value + toArgs[keyOption.name ? keyOption.name : key] = keyOption.value; + } + } else if (CALLBACKS.includes(key)) { + toArgs[key] = processCallback(methodName, fromArgs[key], returnValue); + } else { + if (!keepFromArgs) { + toArgs[key] = fromArgs[key]; + } + } + } + return toArgs + } else if (isFn(fromArgs)) { + fromArgs = processCallback(methodName, fromArgs, returnValue); + } + return fromArgs +} + +function processReturnValue (methodName, res, returnValue, keepReturnValue = false) { + if (isFn(protocols.returnValue)) { // 处理通用 returnValue + res = protocols.returnValue(methodName, res); + } + return processArgs(methodName, res, returnValue, {}, keepReturnValue) +} + +function wrapper (methodName, method) { + if (hasOwn(protocols, methodName)) { + const protocol = protocols[methodName]; + if (!protocol) { // 暂不支持的 api + return function () { + console.error(`app-plus 暂不支持${methodName}`); + } + } + return function (arg1, arg2) { // 目前 api 最多两个参数 + let options = protocol; + if (isFn(protocol)) { + options = protocol(arg1); + } + + arg1 = processArgs(methodName, arg1, options.args, options.returnValue); + + const returnValue = wx[options.name || methodName](arg1, arg2); + if (isSyncApi(methodName)) { // 同步 api + return processReturnValue(methodName, returnValue, options.returnValue, isContextApi(methodName)) + } + return returnValue + } + } + return method +} + +const todoApis = Object.create(null); + +const TODOS = [ + 'subscribePush', + 'unsubscribePush', + 'onPush', + 'offPush', + 'share' +]; + +function createTodoApi (name) { + return function todoApi ({ + fail, + complete + }) { + const res = { + errMsg: `${name}:fail:暂不支持 ${name} 方法` + }; + isFn(fail) && fail(res); + isFn(complete) && complete(res); + } +} + +TODOS.forEach(function (name) { + todoApis[name] = createTodoApi(name); +}); + +var providers = {}; + +function getProvider ({ + service, + success, + fail, + complete +}) { + let res = false; + if (providers[service]) { + res = { + errMsg: 'getProvider:ok', + service, + provider: providers[service] + }; + isFn(success) && success(res); + } else { + res = { + errMsg: 'getProvider:fail:服务[' + service + ']不存在' + }; + isFn(fail) && fail(res); + } + isFn(complete) && complete(res); +} + +var extraApi = /*#__PURE__*/Object.freeze({ + getProvider: getProvider +}); + +function requireNativePlugin (pluginName) { + /* eslint-disable no-undef */ + return __requireNativePlugin__(pluginName) +} + +var api = /*#__PURE__*/Object.freeze({ + requireNativePlugin: requireNativePlugin +}); + +const MOCKS = ['__route__', '__wxExparserNodeId__', '__wxWebviewId__']; + +function initMocks (vm) { + const mpInstance = vm.$mp[vm.mpType]; + MOCKS.forEach(mock => { + if (hasOwn(mpInstance, mock)) { + vm[mock] = mpInstance[mock]; + } + }); +} + +function initHooks (mpOptions, hooks) { + hooks.forEach(hook => { + mpOptions[hook] = function (args) { + this.$vm.__call_hook(hook, args); + }; + }); +} + +function getData (data) { + if (typeof data === 'function') { + try { + return data() + } catch (e) { + console.warn('根据 Vue 的 data 函数初始化小程序 data 失败，请尽量确保 data 函数中不访问 vm 对象，否则可能影响首次数据渲染速度。'); + } + return {} + } + return data || {} +} + +const PROP_TYPES = [String, Number, Boolean, Object, Array, null]; + +function getProperties (props) { + const properties = {}; + if (Array.isArray(props)) { // ['title'] + props.forEach(key => { + properties[key] = null; + }); + } else if (isPlainObject(props)) { // {title:{type:String,default:''},content:String} + Object.keys(props).forEach(key => { + const opts = props[key]; + if (isPlainObject(opts)) { // title:{type:String,default:''} + let value = opts['default']; + if (isFn(value)) { + value = value(); + } + properties[key] = { + type: PROP_TYPES.includes(opts.type) ? opts.type : null, + value + }; + } else { // content:String + properties[key] = PROP_TYPES.includes(opts) ? opts : null; + } + }); + } + return properties +} + +function wrapper$1 (event) { + event.stopPropagation = noop; + event.preventDefault = noop; + + event.target = event.target || {}; + event.detail = event.detail || {}; + // TODO 又得兼容 mpvue 的 mp 对象 + event.mp = event; + event.target = Object.assign({}, event.target, event.detail); + return event +} + +function processEventArgs (event, args = [], isCustom) { + if (isCustom && !args.length) { // 无参数，直接传入 detail 数组 + return event.detail + } + const ret = []; + args.forEach(arg => { + if (arg === '$event') { + ret.push(isCustom ? event.detail[0] : event); + } else { + ret.push(arg); + } + }); + + return ret +} + +const ONCE = '~'; +const CUSTOM = '^'; + +function handleEvent (event) { + event = wrapper$1(event); + + // [['tap',[['handle',[1,2,a]],['handle1',[1,2,a]]]]] + const eventOpts = (event.currentTarget || event.target).dataset.eventOpts; + if (!eventOpts) { + return console.warn(`事件信息不存在`) + } + + // [['handle',[1,2,a]],['handle1',[1,2,a]]] + const eventType = event.type; + eventOpts.forEach(eventOpt => { + let type = eventOpt[0]; + const eventsArray = eventOpt[1]; + + const isCustom = type.charAt(0) === CUSTOM; + type = isCustom ? type.slice(1) : type; + const isOnce = type.charAt(0) === ONCE; + type = isOnce ? type.slice(1) : type; + + if (eventsArray && eventType === type) { + eventsArray.forEach(eventArray => { + const handler = this.$vm[eventArray[0]]; + if (isOnce) { + if (handler.once) { + return + } + handler.once = true; + } + handler.apply(this.$vm, processEventArgs(event, eventArray[1], isCustom)); + }); + } + }); +} + +function handleLink (event) { + event.detail.$parent = this.$vm; +} + +function initRefs (vm) { + const mpInstance = vm.$mp[vm.mpType]; + Object.defineProperty(vm, '$refs', { + get () { + const $refs = Object.create(null); + const components = mpInstance.selectAllComponents('.__ref__'); + components.forEach(component => { + const id = component.id; + $refs[id] = component.$vm; + }); + const forComponents = mpInstance.selectAllComponents('.__ref-in-for__'); + forComponents.forEach(component => { + const id = component.id; + if (!$refs[id]) { + $refs[id] = []; + } + $refs[id].push(component.$vm); + }); + return $refs + } + }); +} + +const hooks = [ + 'onShow', + 'onHide', + 'onError', + 'onPageNotFound' +]; + +function createApp (vueOptions) { + vueOptions = vueOptions.default || vueOptions; + + const appOptions = { + onLaunch (args) { + this.$vm = new Vue(vueOptions); + this.$vm.mpType = 'app'; + this.$vm.$mp = { + app: this + }; + this.$vm.$mount(); + this.$vm.__call_hook('onLaunch', args); + } + }; + + initHooks(appOptions, hooks); + + App(appOptions); + + return vueOptions +} + +const hooks$1 = [ + 'onShow', + 'onHide', + 'onPullDownRefresh', + 'onReachBottom', + 'onShareAppMessage', + 'onPageScroll', + 'onResize', + 'onTabItemTap', + 'onBackPress', + 'onNavigationBarButtonTap', + 'onNavigationBarSearchInputChanged', + 'onNavigationBarSearchInputConfirmed', + 'onNavigationBarSearchInputClicked' +]; + +function createPage (vueOptions) { + vueOptions = vueOptions.default || vueOptions; + const pageOptions = { + data: getData(vueOptions.data), + onLoad (args) { + this.$vm = new Vue(vueOptions); + this.$vm.mpType = 'page'; + this.$vm.$mp = { + data: {}, + page: this + }; + + initRefs(this.$vm); + initMocks(this.$vm); + + this.$vm.$mount(); + this.$vm.__call_hook('onLoad', args); + }, + onReady () { + this.$vm._isMounted = true; + this.$vm.__call_hook('onReady'); + }, + onUnload () { + this.$vm.__call_hook('onUnload'); + this.$vm.$destroy(); + }, + __e: handleEvent, + __l: handleLink + }; + + initHooks(pageOptions, hooks$1); + + return Page(pageOptions) +} + +function createComponent (vueOptions) { + vueOptions = vueOptions.default || vueOptions; + + const properties = getProperties(vueOptions.props); + + const VueComponent = Vue.extend(vueOptions); + + const componentOptions = { + options: { + multipleSlots: true, + addGlobalClass: true + }, + data: getData(vueOptions.data), + properties, + attached () { + // props的处理，一个是直接 与 mp 的 properties 对接，另一个是要做成 reactive，且排除掉 render watch + const options = { + propsData: this.properties, + $component: this + }; + // 初始化 vue 实例 + this.$vm = new VueComponent(options); + this.$vm.mpType = 'component'; + this.$vm.$mp = { + data: {}, + component: this + }; + + initRefs(this.$vm); + initMocks(this.$vm); + + // 初始化渲染数据 + this.$vm.$mount(); + }, + ready () { + this.triggerEvent('__l', this.$vm); + + const eventId = this.dataset.eventId; + if (eventId) { + const listeners = this.$vm.$parent.$mp.listeners; + if (listeners) { + const listenerOpts = listeners[eventId]; + Object.keys(listenerOpts).forEach(eventType => { + listenerOpts[eventType].forEach(handler => { + this.$vm[handler.once ? '$once' : '$on'](eventType, handler); + }); + }); + } + } + + this.$vm._isMounted = true; + this.$vm.__call_hook('mounted'); + this.$vm.__call_hook('onReady'); + }, + detached () { + this.$vm.$destroy(); + }, + pageLifetimes: { + show (args) { + this.$vm.__call_hook('onPageShow', args); + }, + hide () { + this.$vm.__call_hook('onPageHide'); + }, + resize (size) { + this.$vm.__call_hook('onPageResize', size); + } + }, + methods: { + __e: handleEvent, + __l: handleLink + } + }; + + return Component(componentOptions) +} + +let uni = {}; + +if (typeof Proxy !== 'undefined') { + uni = new Proxy({}, { + get (target, name) { + if (name === 'upx2px') { + return upx2px + } + if (api[name]) { + return promisify(name, api[name]) + } + if (extraApi[name]) { + return promisify(name, extraApi[name]) + } + if (todoApis[name]) { + return promisify(name, todoApis[name]) + } + if (!hasOwn(wx, name) && !hasOwn(protocols, name)) { + return + } + return promisify(name, wrapper(name, wx[name])) + } + }); +} else { + uni.upx2px = upx2px; + + Object.keys(todoApis).forEach(name => { + uni[name] = promisify(name, todoApis[name]); + }); + + Object.keys(extraApi).forEach(name => { + uni[name] = promisify(name, todoApis[name]); + }); + + Object.keys(api).forEach(name => { + uni[name] = promisify(name, api[name]); + }); + + Object.keys(wx).forEach(name => { + if (hasOwn(wx, name) || hasOwn(protocols, name)) { + uni[name] = promisify(name, wrapper(name, wx[name])); + } + }); +} + +var uni$1 = uni; + +export default uni$1; +export { createApp, createPage, createComponent }; diff --git a/packages/uni-app-plus/package.json b/packages/uni-app-plus/package.json new file mode 100644 index 0000000000000000000000000000000000000000..4f254be11d67ae2b566f327aea0016c27ed6fb1c --- /dev/null +++ b/packages/uni-app-plus/package.json @@ -0,0 +1,11 @@ +{ + "name": "@dcloudio/uni-app-plus", + "version": "0.0.1", + "description": "uni-app app-plus", + "main": "dist/index.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "author": "fxy060608", + "license": "Apache-2.0" +} diff --git a/packages/uni-mp-weixin/dist/index.js b/packages/uni-mp-weixin/dist/index.js index 6534299723a01fe90a2c156ea60f1ca4b0e62034..f24f0682eff72ba7ba87b8f95100df5571506fd6 100644 --- a/packages/uni-mp-weixin/dist/index.js +++ b/packages/uni-mp-weixin/dist/index.js @@ -268,6 +268,17 @@ var api = /*#__PURE__*/Object.freeze({ }); +const MOCKS = ['__route__', '__wxExparserNodeId__', '__wxWebviewId__']; + +function initMocks (vm) { + const mpInstance = vm.$mp[vm.mpType]; + MOCKS.forEach(mock => { + if (hasOwn(mpInstance, mock)) { + vm[mock] = mpInstance[mock]; + } + }); +} + function initHooks (mpOptions, hooks) { hooks.forEach(hook => { mpOptions[hook] = function (args) { @@ -467,6 +478,7 @@ function createPage (vueOptions) { }; initRefs(this.$vm); + initMocks(this.$vm); this.$vm.$mount(); this.$vm.__call_hook('onLoad', args); @@ -502,46 +514,48 @@ function createComponent (vueOptions) { }, data: getData(vueOptions.data), properties, - lifetimes: { - attached () { - // props的处理，一个是直接 与 mp 的 properties 对接，另一个是要做成 reactive，且排除掉 render watch - const options = { - propsData: this.properties, - $component: this - }; - // 初始化 vue 实例 - this.$vm = new VueComponent(options); - this.$vm.mpType = 'component'; - this.$vm.$mp = { - data: {}, - component: this - }; - initRefs(this.$vm); - // 初始化渲染数据 - this.$vm.$mount(); - }, - ready () { - this.triggerEvent('__l', this.$vm); - - const eventId = this.dataset.eventId; - if (eventId) { - const listeners = this.$vm.$parent.$mp.listeners; - if (listeners) { - const listenerOpts = listeners[eventId]; - Object.keys(listenerOpts).forEach(eventType => { - listenerOpts[eventType].forEach(handler => { - this.$vm[handler.once ? '$once' : '$on'](eventType, handler); - }); + attached () { + // props的处理，一个是直接 与 mp 的 properties 对接，另一个是要做成 reactive，且排除掉 render watch + const options = { + propsData: this.properties, + $component: this + }; + // 初始化 vue 实例 + this.$vm = new VueComponent(options); + this.$vm.mpType = 'component'; + this.$vm.$mp = { + data: {}, + component: this + }; + + initRefs(this.$vm); + initMocks(this.$vm); + + // 初始化渲染数据 + this.$vm.$mount(); + }, + ready () { + this.triggerEvent('__l', this.$vm); + + const eventId = this.dataset.eventId; + if (eventId) { + const listeners = this.$vm.$parent.$mp.listeners; + if (listeners) { + const listenerOpts = listeners[eventId]; + Object.keys(listenerOpts).forEach(eventType => { + listenerOpts[eventType].forEach(handler => { + this.$vm[handler.once ? '$once' : '$on'](eventType, handler); }); - } + }); } - - this.$vm._isMounted = true; - this.$vm.__call_hook('mounted'); - }, - detached () { - this.$vm.$destroy(); } + + this.$vm._isMounted = true; + this.$vm.__call_hook('mounted'); + this.$vm.__call_hook('onReady'); + }, + detached () { + this.$vm.$destroy(); }, pageLifetimes: { show (args) { diff --git a/packages/uni-mp-weixin/package.json b/packages/uni-mp-weixin/package.json index 0240b2bd3db9d2358bb64c9c208d1497da35ee91..db7f37ee6de733fd2adff74edfabbcf3b5c943c0 100644 --- a/packages/uni-mp-weixin/package.json +++ b/packages/uni-mp-weixin/package.json @@ -1,6 +1,6 @@ { "name": "@dcloudio/uni-mp-weixin", - "version": "0.0.5", + "version": "0.0.7", "description": "uni-app mp-weixin", "main": "dist/index.js", "scripts": { diff --git a/src/core/runtime/wrapper/create-component.js b/src/core/runtime/wrapper/create-component.js index 9a2631b782190f8ca97d6b165199be048f70c34d..7ec91d55be071fdbc219947792578e8aa235d32f 100644 --- a/src/core/runtime/wrapper/create-component.js +++ b/src/core/runtime/wrapper/create-component.js @@ -3,6 +3,7 @@ import Vue from 'vue' import { getData, initRefs, + initMocks, initMethods, handleLink, handleEvent, @@ -23,46 +24,48 @@ export function createComponent (vueOptions) { }, data: getData(vueOptions.data), properties, - lifetimes: { - attached () { - // props的处理，一个是直接 与 mp 的 properties 对接，另一个是要做成 reactive，且排除掉 render watch - const options = { - propsData: this.properties, - $component: this - } - // 初始化 vue 实例 - this.$vm = new VueComponent(options) - this.$vm.mpType = 'component' - this.$vm.$mp = { - data: {}, - component: this - } - initRefs(this.$vm) - // 初始化渲染数据 - this.$vm.$mount() - }, - ready () { - this.triggerEvent('__l', this.$vm) + attached () { + // props的处理，一个是直接 与 mp 的 properties 对接，另一个是要做成 reactive，且排除掉 render watch + const options = { + propsData: this.properties, + $component: this + } + // 初始化 vue 实例 + this.$vm = new VueComponent(options) + this.$vm.mpType = 'component' + this.$vm.$mp = { + data: {}, + component: this + } + + initRefs(this.$vm) + initMocks(this.$vm) - const eventId = this.dataset.eventId - if (eventId) { - const listeners = this.$vm.$parent.$mp.listeners - if (listeners) { - const listenerOpts = listeners[eventId] - Object.keys(listenerOpts).forEach(eventType => { - listenerOpts[eventType].forEach(handler => { - this.$vm[handler.once ? '$once' : '$on'](eventType, handler) - }) + // 初始化渲染数据 + this.$vm.$mount() + }, + ready () { + this.triggerEvent('__l', this.$vm) + + const eventId = this.dataset.eventId + if (eventId) { + const listeners = this.$vm.$parent.$mp.listeners + if (listeners) { + const listenerOpts = listeners[eventId] + Object.keys(listenerOpts).forEach(eventType => { + listenerOpts[eventType].forEach(handler => { + this.$vm[handler.once ? '$once' : '$on'](eventType, handler) }) - } + }) } - - this.$vm._isMounted = true - this.$vm.__call_hook('mounted') - }, - detached () { - this.$vm.$destroy() } + + this.$vm._isMounted = true + this.$vm.__call_hook('mounted') + this.$vm.__call_hook('onReady') + }, + detached () { + this.$vm.$destroy() }, pageLifetimes: { show (args) { diff --git a/src/core/runtime/wrapper/create-page.js b/src/core/runtime/wrapper/create-page.js index dd82f38c70649799388581cb87dff9b0542a3976..053e1956e12fd0d28805b1deea70317c6bca1813 100644 --- a/src/core/runtime/wrapper/create-page.js +++ b/src/core/runtime/wrapper/create-page.js @@ -4,6 +4,7 @@ import { getData, initRefs, initHooks, + initMocks, initMethods, handleLink, handleEvent @@ -38,6 +39,7 @@ export function createPage (vueOptions) { } initRefs(this.$vm) + initMocks(this.$vm) this.$vm.$mount() this.$vm.__call_hook('onLoad', args) diff --git a/src/core/runtime/wrapper/util.js b/src/core/runtime/wrapper/util.js index 9451ee87a792acb0c7975e03be220f823d6aa6d5..f22efef69a112b879386a18142313b4ac90c0d0c 100644 --- a/src/core/runtime/wrapper/util.js +++ b/src/core/runtime/wrapper/util.js @@ -1,9 +1,21 @@ import { isFn, noop, + hasOwn, isPlainObject } from 'uni-shared' +const MOCKS = ['__route__', '__wxExparserNodeId__', '__wxWebviewId__'] + +export function initMocks (vm) { + const mpInstance = vm.$mp[vm.mpType] + MOCKS.forEach(mock => { + if (hasOwn(mpInstance, mock)) { + vm[mock] = mpInstance[mock] + } + }) +} + export function initHooks (mpOptions, hooks) { hooks.forEach(hook => { mpOptions[hook] = function (args) { @@ -13,9 +25,9 @@ export function initHooks (mpOptions, hooks) { } export function initMethods (mpOptions, vueOptions) { -// if (vueOptions.methods) { -// Object.assign(mpOptions, vueOptions.methods) -// } + // if (vueOptions.methods) { + // Object.assign(mpOptions, vueOptions.methods) + // } } export function getData (data) { diff --git a/src/platforms/app-plus/service/api/index.js b/src/platforms/app-plus/service/api/index.js new file mode 100644 index 0000000000000000000000000000000000000000..7758d0cc113847c9874b9c6accc5e4e64436600a --- /dev/null +++ b/src/platforms/app-plus/service/api/index.js @@ -0,0 +1,4 @@ +export function requireNativePlugin (pluginName) { + /* eslint-disable no-undef */ + return __requireNativePlugin__(pluginName) +} diff --git a/src/platforms/app-plus/service/api/protocols.js b/src/platforms/app-plus/service/api/protocols.js new file mode 100644 index 0000000000000000000000000000000000000000..b1c6ea436a540020ff61f01dea449d5b39367b27 --- /dev/null +++ b/src/platforms/app-plus/service/api/protocols.js @@ -0,0 +1 @@ +export default {} diff --git a/src/platforms/app-plus/service/api/providers.js b/src/platforms/app-plus/service/api/providers.js new file mode 100644 index 0000000000000000000000000000000000000000..b1c6ea436a540020ff61f01dea449d5b39367b27 --- /dev/null +++ b/src/platforms/app-plus/service/api/providers.js @@ -0,0 +1 @@ +export default {}