diff --git a/build/rollup.config.service.js b/build/rollup.config.service.js new file mode 100644 index 0000000000000000000000000000000000000000..e3ffd2af65e59ce1d0f33d8a2277555203a5f060 --- /dev/null +++ b/build/rollup.config.service.js @@ -0,0 +1,21 @@ +const path = require('path') +const alias = require('rollup-plugin-alias') +const replace = require('rollup-plugin-replace') + +module.exports = { + input: 'src/platforms/app-plus-nvue/services/index.legacy.js', + output: { + file: `packages/uni-app-plus-nvue/dist/service.legacy.js`, + format: 'es' + }, + plugins: [ + alias({ + 'uni-core': path.resolve(__dirname, '../src/core'), + 'uni-shared': path.resolve(__dirname, '../src/shared/util.js') + }), + replace({ + __GLOBAL__: 'getGlobalUni()', + __PLATFORM_TITLE__: 'app-plus-nvue' + }) + ] +} diff --git a/package.json b/package.json index 52a142a1c40968a89eceb8ab46bb9bdd4049dfe9..c14cc43b5ec4579b21ae3b2c2a4f03bfabda9bb8 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,8 @@ "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:app-plus": "npm run lint && cross-env UNI_PLATFORM=app-plus rollup -c build/rollup.config.js", + "build:app-plus": "npm run lint && cross-env UNI_PLATFORM=app-plus rollup -c build/rollup.config.js", + "build:service:legacy": "npm run lint && rollup -c build/rollup.config.service.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-nvue/LICENSE b/packages/uni-app-plus-nvue/LICENSE new file mode 100755 index 0000000000000000000000000000000000000000..7a4a3ea2424c09fbe48d455aed1eaa94d9124835 --- /dev/null +++ b/packages/uni-app-plus-nvue/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-nvue/dist/index.js b/packages/uni-app-plus-nvue/dist/index.js new file mode 100644 index 0000000000000000000000000000000000000000..781f6f0bf0beded496247009aa8fb7c1045c81a2 --- /dev/null +++ b/packages/uni-app-plus-nvue/dist/index.js @@ -0,0 +1,5 @@ +var weexPlus = new WeexPlus(weex) +export default getUni(weex) +export { + weexPlus +} diff --git a/packages/uni-app-plus-nvue/dist/service.legacy.js b/packages/uni-app-plus-nvue/dist/service.legacy.js new file mode 100644 index 0000000000000000000000000000000000000000..404477fa9d2fdcff081ecca3816d4feaea8074ba --- /dev/null +++ b/packages/uni-app-plus-nvue/dist/service.legacy.js @@ -0,0 +1,370 @@ +const hasOwnProperty = Object.prototype.hasOwnProperty; + +function isFn (fn) { + return typeof fn === 'function' +} + +function hasOwn (obj, key) { + return hasOwnProperty.call(obj, key) +} + +const SYNC_API_RE = /^\$|getSubNVueById|requireNativePlugin|upx2px|hideKeyboard|canIUse|^create|Sync$|Manager$|base64ToArrayBuffer|arrayBufferToBase64/; + +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 ( + isContextApi(name) || + isSyncApi(name) || + 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 */ + if (!Promise.prototype.finally) { + 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 upx2px (number, newDeviceWidth) { + 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 +} + +function initUpx2px (nvue) { + const env = nvue.config.env; + + deviceDPR = env.scale; + deviceWidth = Math.ceil(env.deviceWidth / deviceDPR); + isIOS = env.platform === 'iOS'; +} + +let getEmitter; + +function apply (ctx, method, args) { + return ctx[method].apply(ctx, args) +} + +function $on () { + return apply(getEmitter(), '$on', [...arguments]) +} +function $off () { + return apply(getEmitter(), '$off', [...arguments]) +} +function $once () { + return apply(getEmitter(), '$once', [...arguments]) +} +function $emit () { + return apply(getEmitter(), '$emit', [...arguments]) +} + +function initEventBus (getGlobalEmitter) { + getEmitter = getGlobalEmitter; +} + +const SUCCESS = 'success'; +const FAIL = 'fail'; +const COMPLETE = 'complete'; +const CALLBACKS = [SUCCESS, FAIL, COMPLETE]; +/** + * 调用无参数，或仅一个参数且为 callback 的 API + * @param {Object} vm + * @param {Object} method + * @param {Object} args + * @param {Object} extras + */ +function invokeVmMethodWithoutArgs (vm, method, args, extras) { + if (!vm) { + return + } + if (typeof args === 'undefined') { + return vm[method]() + } + const [, callbacks] = normalizeArgs(args, extras); + if (!Object.keys(callbacks).length) { + return vm[method]() + } + return vm[method](normalizeCallback(method, callbacks)) +} +/** + * 调用两个参数（第一个入参为普通参数，第二个入参为 callback） API + * @param {Object} vm + * @param {Object} method + * @param {Object} args + * @param {Object} extras + */ +function invokeVmMethod (vm, method, args, extras) { + if (!vm) { + return + } + const [pureArgs, callbacks] = normalizeArgs(args, extras); + if (!Object.keys(callbacks).length) { + return vm[method](pureArgs) + } + return vm[method](pureArgs, normalizeCallback(method, callbacks)) +} + +function findRefById (id, vm) { + return findRefByVNode(id, vm._vnode) +} + +function findRefByVNode (id, vnode) { + if (!id || !vnode) { + return + } + if (vnode.data && + vnode.data.ref && + vnode.data.attrs && + vnode.data.attrs.id === id) { + return vnode.data.ref + } + const children = vnode.children; + if (!children) { + return + } + for (let i = 0, len = children.length; i < len; i++) { + const ref = findRefByVNode(id, children[i]); + if (ref) { + return ref + } + } +} + +function normalizeArgs (args = {}, extras) { + const callbacks = Object.create(null); + + const iterator = function iterator (name) { + const callback = args[name]; + if (isFn(callback)) { + callbacks[name] = callback; + delete args[name]; + } + }; + + CALLBACKS.forEach(iterator); + + extras && extras.forEach(iterator); + + return [args, callbacks] +} + +function normalizeCallback (method, callbacks) { + return function weexCallback (ret) { + const type = ret.type; + delete ret.type; + const callback = callbacks[type]; + + if (type === SUCCESS) { + ret.errMsg = `${method}:ok`; + } else if (type === FAIL) { + ret.errMsg = method + ':fail' + (ret.msg ? (' ' + ret.msg) : ''); + } + + delete ret.code; + delete ret.msg; + + isFn(callback) && callback(ret); + + if (type === SUCCESS || type === FAIL) { + const complete = callbacks['complete']; + isFn(complete) && complete(ret); + } + } +} + +class MapContext { + constructor (id, ctx) { + this.id = id; + this.ctx = ctx; + } + + getCenterLocation (cbs) { + return invokeVmMethodWithoutArgs(this.ctx, 'getCenterLocation', cbs) + } + + moveToLocation () { + return invokeVmMethodWithoutArgs(this.ctx, 'moveToLocation') + } + + translateMarker (args) { + return invokeVmMethod(this.ctx, 'translateMarker', args, ['animationEnd']) + } + + includePoints (args) { + return invokeVmMethod(this.ctx, 'includePoints', args) + } + + getRegion (cbs) { + return invokeVmMethodWithoutArgs(this.ctx, 'getRegion', cbs) + } + + getScale (cbs) { + return invokeVmMethodWithoutArgs(this.ctx, 'getScale', cbs) + } +} + +function createMapContext (id, vm) { + const ref = findRefById(id, vm); + if (!ref) { + global.nativeLog('Can not find `' + id + '`', '__WARN'); + } + return new MapContext(id, vm.$refs[ref]) +} + + + +var apis = /*#__PURE__*/Object.freeze({ + upx2px: upx2px, + $on: $on, + $once: $once, + $off: $off, + $emit: $emit, + createMapContext: createMapContext +}); + +function initUni (uni, nvue) { + if (typeof Proxy !== 'undefined') { + return new Proxy({}, { + get (target, name) { + if (apis[name]) { + return apis[name] + } + if (name === 'requireNativePlugin') { + return nvue.requireModule + } + if (!hasOwn(uni, name)) { + return + } + return promisify(name, uni[name]) + } + }) + } + const ret = { + requireNativePlugin: nvue.requireModule + }; + Object.keys(apis).forEach(name => { + ret[name] = apis[name]; + }); + Object.keys(uni).forEach(name => { + ret[name] = promisify(name, uni[name]); + }); + return ret +} + +let getGlobalUni; +let getGlobalApp; +let getGlobalUniEmitter; +let getGlobalCurrentPages; + +var index_legacy = { + create (id, env, config) { + return { + initUniApp ({ + nvue, + getUni, + getApp, + getUniEmitter, + getCurrentPages + }) { + getGlobalUni = getUni; + getGlobalApp = getApp; + getGlobalUniEmitter = getUniEmitter; + getGlobalCurrentPages = getCurrentPages; + + initUpx2px(nvue); + initEventBus(getUniEmitter); + }, + instance: { + getUni (nvue) { + return initUni(getGlobalUni(), nvue) + }, + getApp () { + return getGlobalApp() + }, + getUniEmitter () { + return getGlobalUniEmitter() + }, + getCurrentPages () { + return getGlobalCurrentPages() + } + } + } + }, + + refresh: function (id, env, config) { + + }, + + destroy: function (id, env) { + + } +}; + +export default index_legacy; diff --git a/packages/uni-app-plus-nvue/package.json b/packages/uni-app-plus-nvue/package.json new file mode 100644 index 0000000000000000000000000000000000000000..91f8ada8a3a0312dddbd9a5b258f1d0e562e7490 --- /dev/null +++ b/packages/uni-app-plus-nvue/package.json @@ -0,0 +1,11 @@ +{ + "name": "@dcloudio/uni-app-plus-nvue", + "version": "0.0.1", + "description": "uni-app app-plus-nvue", + "main": "dist/index.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "author": "fxy060608", + "license": "Apache-2.0" +} diff --git a/src/core/runtime/event-bus.js b/src/core/runtime/event-bus.js new file mode 100644 index 0000000000000000000000000000000000000000..74a49cb16c864d8db524c0ad92dfeff7c921dc2b --- /dev/null +++ b/src/core/runtime/event-bus.js @@ -0,0 +1 @@ +export * from '../service/api/event-bus' diff --git a/src/core/runtime/event.js b/src/core/runtime/event.js deleted file mode 100644 index e34bb752b54ecf7e32ebb22815cc325180f7745d..0000000000000000000000000000000000000000 --- a/src/core/runtime/event.js +++ /dev/null @@ -1 +0,0 @@ -export * from '../service/api/event' diff --git a/src/core/runtime/index.js b/src/core/runtime/index.js index 9fca81a42b09976e564c6ca43dfd231574755ee6..cb850ef6d25c9a1315be62e49e353bac38ae9146 100644 --- a/src/core/runtime/index.js +++ b/src/core/runtime/index.js @@ -16,7 +16,7 @@ import todoApi from './todo' import * as extraApi from './extra' -import * as eventApi from './event' +import * as eventApi from './event-bus' import * as api from 'uni-platform/service/api/index.js' diff --git a/src/core/service/api/event.js b/src/core/service/api/event-bus.js similarity index 100% rename from src/core/service/api/event.js rename to src/core/service/api/event-bus.js diff --git a/src/platforms/app-plus-nvue/services/api/context/map.js b/src/platforms/app-plus-nvue/services/api/context/map.js new file mode 100644 index 0000000000000000000000000000000000000000..2339114744b962f9cbef72b2157bd25b53da87f1 --- /dev/null +++ b/src/platforms/app-plus-nvue/services/api/context/map.js @@ -0,0 +1,44 @@ +import { + findRefById, + invokeVmMethod, + invokeVmMethodWithoutArgs +} from '../util' + +class MapContext { + constructor (id, ctx) { + this.id = id + this.ctx = ctx + } + + getCenterLocation (cbs) { + return invokeVmMethodWithoutArgs(this.ctx, 'getCenterLocation', cbs) + } + + moveToLocation () { + return invokeVmMethodWithoutArgs(this.ctx, 'moveToLocation') + } + + translateMarker (args) { + return invokeVmMethod(this.ctx, 'translateMarker', args, ['animationEnd']) + } + + includePoints (args) { + return invokeVmMethod(this.ctx, 'includePoints', args) + } + + getRegion (cbs) { + return invokeVmMethodWithoutArgs(this.ctx, 'getRegion', cbs) + } + + getScale (cbs) { + return invokeVmMethodWithoutArgs(this.ctx, 'getScale', cbs) + } +} + +export function createMapContext (id, vm) { + const ref = findRefById(id, vm) + if (!ref) { + global.nativeLog('Can not find `' + id + '`', '__WARN') + } + return new MapContext(id, vm.$refs[ref]) +} diff --git a/src/platforms/app-plus-nvue/services/api/event-bus.js b/src/platforms/app-plus-nvue/services/api/event-bus.js new file mode 100644 index 0000000000000000000000000000000000000000..17d9c4cfe6ed3e8b709699713667df8c104e73aa --- /dev/null +++ b/src/platforms/app-plus-nvue/services/api/event-bus.js @@ -0,0 +1,22 @@ +let getEmitter + +function apply (ctx, method, args) { + return ctx[method].apply(ctx, args) +} + +export function $on () { + return apply(getEmitter(), '$on', [...arguments]) +} +export function $off () { + return apply(getEmitter(), '$off', [...arguments]) +} +export function $once () { + return apply(getEmitter(), '$once', [...arguments]) +} +export function $emit () { + return apply(getEmitter(), '$emit', [...arguments]) +} + +export default function initEventBus (getGlobalEmitter) { + getEmitter = getGlobalEmitter +} diff --git a/src/platforms/app-plus-nvue/services/api/legacy/api.js b/src/platforms/app-plus-nvue/services/api/legacy/api.js new file mode 100644 index 0000000000000000000000000000000000000000..764f96b466bec950617eae1b7e1c465706333b81 --- /dev/null +++ b/src/platforms/app-plus-nvue/services/api/legacy/api.js @@ -0,0 +1,14 @@ +export { + upx2px +} + from '../upx2px' + +export { + $on, + $once, + $off, + $emit +} + from '../event-bus' + +export * from '../context/map' diff --git a/src/platforms/app-plus-nvue/services/api/legacy/index.js b/src/platforms/app-plus-nvue/services/api/legacy/index.js new file mode 100644 index 0000000000000000000000000000000000000000..62677459190110cae07e3c2d6b2cc66f2e2039b2 --- /dev/null +++ b/src/platforms/app-plus-nvue/services/api/legacy/index.js @@ -0,0 +1,38 @@ +import { + hasOwn +} from 'uni-shared' + +import { + promisify +} from 'uni-core/helpers/promise' + +import * as apis from './api' + +export default function initUni (uni, nvue) { + if (typeof Proxy !== 'undefined') { + return new Proxy({}, { + get (target, name) { + if (apis[name]) { + return apis[name] + } + if (name === 'requireNativePlugin') { + return nvue.requireModule + } + if (!hasOwn(uni, name)) { + return + } + return promisify(name, uni[name]) + } + }) + } + const ret = { + requireNativePlugin: nvue.requireModule + } + Object.keys(apis).forEach(name => { + ret[name] = apis[name] + }) + Object.keys(uni).forEach(name => { + ret[name] = promisify(name, uni[name]) + }) + return ret +} diff --git a/src/platforms/app-plus-nvue/services/api/upx2px.js b/src/platforms/app-plus-nvue/services/api/upx2px.js new file mode 100644 index 0000000000000000000000000000000000000000..f971d2a7cac28061f6e638d20ba915b032931d08 --- /dev/null +++ b/src/platforms/app-plus-nvue/services/api/upx2px.js @@ -0,0 +1,33 @@ +const EPS = 1e-4 +const BASE_DEVICE_WIDTH = 750 +let isIOS = false +let deviceWidth = 0 +let deviceDPR = 0 + +export function upx2px (number, newDeviceWidth) { + 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 +} + +export default function initUpx2px (nvue) { + const env = nvue.config.env + + deviceDPR = env.scale + deviceWidth = Math.ceil(env.deviceWidth / deviceDPR) + isIOS = env.platform === 'iOS' +} diff --git a/src/platforms/app-plus-nvue/services/api/util.js b/src/platforms/app-plus-nvue/services/api/util.js new file mode 100644 index 0000000000000000000000000000000000000000..99d275c8c52a0723421d11f98310d0e631b7a4fe --- /dev/null +++ b/src/platforms/app-plus-nvue/services/api/util.js @@ -0,0 +1,113 @@ +import { + isFn +} from 'uni-shared' + +const SUCCESS = 'success' +const FAIL = 'fail' +const COMPLETE = 'complete' +const CALLBACKS = [SUCCESS, FAIL, COMPLETE] +/** + * 调用无参数，或仅一个参数且为 callback 的 API + * @param {Object} vm + * @param {Object} method + * @param {Object} args + * @param {Object} extras + */ +export function invokeVmMethodWithoutArgs (vm, method, args, extras) { + if (!vm) { + return + } + if (typeof args === 'undefined') { + return vm[method]() + } + const [, callbacks] = normalizeArgs(args, extras) + if (!Object.keys(callbacks).length) { + return vm[method]() + } + return vm[method](normalizeCallback(method, callbacks)) +} +/** + * 调用两个参数（第一个入参为普通参数，第二个入参为 callback） API + * @param {Object} vm + * @param {Object} method + * @param {Object} args + * @param {Object} extras + */ +export function invokeVmMethod (vm, method, args, extras) { + if (!vm) { + return + } + const [pureArgs, callbacks] = normalizeArgs(args, extras) + if (!Object.keys(callbacks).length) { + return vm[method](pureArgs) + } + return vm[method](pureArgs, normalizeCallback(method, callbacks)) +} + +export function findRefById (id, vm) { + return findRefByVNode(id, vm._vnode) +} + +function findRefByVNode (id, vnode) { + if (!id || !vnode) { + return + } + if (vnode.data && + vnode.data.ref && + vnode.data.attrs && + vnode.data.attrs.id === id) { + return vnode.data.ref + } + const children = vnode.children + if (!children) { + return + } + for (let i = 0, len = children.length; i < len; i++) { + const ref = findRefByVNode(id, children[i]) + if (ref) { + return ref + } + } +} + +function normalizeArgs (args = {}, extras) { + const callbacks = Object.create(null) + + const iterator = function iterator (name) { + const callback = args[name] + if (isFn(callback)) { + callbacks[name] = callback + delete args[name] + } + } + + CALLBACKS.forEach(iterator) + + extras && extras.forEach(iterator) + + return [args, callbacks] +} + +function normalizeCallback (method, callbacks) { + return function weexCallback (ret) { + const type = ret.type + delete ret.type + const callback = callbacks[type] + + if (type === SUCCESS) { + ret.errMsg = `${method}:ok` + } else if (type === FAIL) { + ret.errMsg = method + ':fail' + (ret.msg ? (' ' + ret.msg) : '') + } + + delete ret.code + delete ret.msg + + isFn(callback) && callback(ret) + + if (type === SUCCESS || type === FAIL) { + const complete = callbacks['complete'] + isFn(complete) && complete(ret) + } + } +} diff --git a/src/platforms/app-plus-nvue/services/index.legacy.js b/src/platforms/app-plus-nvue/services/index.legacy.js new file mode 100644 index 0000000000000000000000000000000000000000..de45d157cfa482398d4d8b10af520607dd4733b9 --- /dev/null +++ b/src/platforms/app-plus-nvue/services/index.legacy.js @@ -0,0 +1,52 @@ +import initUni from './api/legacy/index' +import initUpx2px from './api/upx2px' +import initEventBus from './api/event-bus' + +let getGlobalUni +let getGlobalApp +let getGlobalUniEmitter +let getGlobalCurrentPages + +export default { + create (id, env, config) { + return { + initUniApp ({ + nvue, + getUni, + getApp, + getUniEmitter, + getCurrentPages + }) { + getGlobalUni = getUni + getGlobalApp = getApp + getGlobalUniEmitter = getUniEmitter + getGlobalCurrentPages = getCurrentPages + + initUpx2px(nvue) + initEventBus(getUniEmitter) + }, + instance: { + getUni (nvue) { + return initUni(getGlobalUni(), nvue) + }, + getApp () { + return getGlobalApp() + }, + getUniEmitter () { + return getGlobalUniEmitter() + }, + getCurrentPages () { + return getGlobalCurrentPages() + } + } + } + }, + + refresh: function (id, env, config) { + + }, + + destroy: function (id, env) { + + } +}