From e0039c515927f509d77445356cdf0654df594af6 Mon Sep 17 00:00:00 2001 From: fxy060608 Date: Sat, 27 Jul 2019 13:56:42 +0800 Subject: [PATCH] refactor api protocol --- build/rollup.config.app.js | 2 +- .../rollup-plugin-require-context/README.md | 0 .../package.json | 0 .../src/helper/extract-args.js | 0 .../helper/generate-require-context-code.js | 0 .../src/helper/has-require-context.js | 0 .../src/helper/resolve-reqquire-modules.js | 0 .../src/helper/resolve-require-code.js | 0 .../src/index.js | 0 packages/uni-app-plus-nvue/dist/index.js | 806 ++++++++++-------- .../helpers/protocol/{ => base}/base64.js | 0 .../protocol/{base.js => base/can-i-use.js} | 0 src/core/helpers/protocol/base/event-bus.js | 25 + src/core/helpers/protocol/base/interceptor.js | 6 + src/core/helpers/protocol/base/upx2px.js | 5 + .../helpers/protocol/{ => context}/canvas.js | 0 .../helpers/protocol/{ => context}/context.js | 0 .../protocol/location/choose-location.js | 5 + .../helpers/protocol/location/get-location.js | 18 + .../open-location.js} | 18 - .../{plugins.js => plugin/get-provider.js} | 0 .../helpers/protocol/{ => route}/route.js | 2 +- src/core/helpers/protocol/storage.js | 18 - src/core/helpers/protocol/storage/storage.js | 34 + .../protocol/{ => ui}/navigation-bar.js | 0 .../protocol/{ => ui}/page-scroll-to.js | 0 src/core/helpers/protocol/{ => ui}/popup.js | 0 src/core/helpers/protocol/{ => ui}/tab-bar.js | 0 .../service/api/{plugin => base}/event-bus.js | 0 src/platforms/app-plus/service/api/index.js | 2 +- .../service/api/{plugin => base}/event-bus.js | 0 31 files changed, 546 insertions(+), 395 deletions(-) rename {build => lib}/rollup-plugin-require-context/README.md (100%) rename {build => lib}/rollup-plugin-require-context/package.json (100%) rename {build => lib}/rollup-plugin-require-context/src/helper/extract-args.js (100%) rename {build => lib}/rollup-plugin-require-context/src/helper/generate-require-context-code.js (100%) rename {build => lib}/rollup-plugin-require-context/src/helper/has-require-context.js (100%) rename {build => lib}/rollup-plugin-require-context/src/helper/resolve-reqquire-modules.js (100%) rename {build => lib}/rollup-plugin-require-context/src/helper/resolve-require-code.js (100%) rename {build => lib}/rollup-plugin-require-context/src/index.js (100%) rename src/core/helpers/protocol/{ => base}/base64.js (100%) rename src/core/helpers/protocol/{base.js => base/can-i-use.js} (100%) create mode 100644 src/core/helpers/protocol/base/event-bus.js create mode 100644 src/core/helpers/protocol/base/interceptor.js create mode 100644 src/core/helpers/protocol/base/upx2px.js rename src/core/helpers/protocol/{ => context}/canvas.js (100%) rename src/core/helpers/protocol/{ => context}/context.js (100%) create mode 100644 src/core/helpers/protocol/location/choose-location.js create mode 100644 src/core/helpers/protocol/location/get-location.js rename src/core/helpers/protocol/{location.js => location/open-location.js} (52%) rename src/core/helpers/protocol/{plugins.js => plugin/get-provider.js} (100%) rename src/core/helpers/protocol/{ => route}/route.js (94%) delete mode 100644 src/core/helpers/protocol/storage.js create mode 100644 src/core/helpers/protocol/storage/storage.js rename src/core/helpers/protocol/{ => ui}/navigation-bar.js (100%) rename src/core/helpers/protocol/{ => ui}/page-scroll-to.js (100%) rename src/core/helpers/protocol/{ => ui}/popup.js (100%) rename src/core/helpers/protocol/{ => ui}/tab-bar.js (100%) rename src/platforms/app-plus/service/api/{plugin => base}/event-bus.js (100%) rename src/platforms/h5/service/api/{plugin => base}/event-bus.js (100%) diff --git a/build/rollup.config.app.js b/build/rollup.config.app.js index b2e5c4987..688680055 100644 --- a/build/rollup.config.app.js +++ b/build/rollup.config.app.js @@ -3,7 +3,7 @@ const alias = require('rollup-plugin-alias') const replace = require('rollup-plugin-replace') const resolve = require('rollup-plugin-node-resolve') const commonjs = require('rollup-plugin-commonjs') -const requireContext = require('./rollup-plugin-require-context') +const requireContext = require('../lib/rollup-plugin-require-context') let input = 'src/platforms/app-plus/service/framework/create-instance-context.js' diff --git a/build/rollup-plugin-require-context/README.md b/lib/rollup-plugin-require-context/README.md similarity index 100% rename from build/rollup-plugin-require-context/README.md rename to lib/rollup-plugin-require-context/README.md diff --git a/build/rollup-plugin-require-context/package.json b/lib/rollup-plugin-require-context/package.json similarity index 100% rename from build/rollup-plugin-require-context/package.json rename to lib/rollup-plugin-require-context/package.json diff --git a/build/rollup-plugin-require-context/src/helper/extract-args.js b/lib/rollup-plugin-require-context/src/helper/extract-args.js similarity index 100% rename from build/rollup-plugin-require-context/src/helper/extract-args.js rename to lib/rollup-plugin-require-context/src/helper/extract-args.js diff --git a/build/rollup-plugin-require-context/src/helper/generate-require-context-code.js b/lib/rollup-plugin-require-context/src/helper/generate-require-context-code.js similarity index 100% rename from build/rollup-plugin-require-context/src/helper/generate-require-context-code.js rename to lib/rollup-plugin-require-context/src/helper/generate-require-context-code.js diff --git a/build/rollup-plugin-require-context/src/helper/has-require-context.js b/lib/rollup-plugin-require-context/src/helper/has-require-context.js similarity index 100% rename from build/rollup-plugin-require-context/src/helper/has-require-context.js rename to lib/rollup-plugin-require-context/src/helper/has-require-context.js diff --git a/build/rollup-plugin-require-context/src/helper/resolve-reqquire-modules.js b/lib/rollup-plugin-require-context/src/helper/resolve-reqquire-modules.js similarity index 100% rename from build/rollup-plugin-require-context/src/helper/resolve-reqquire-modules.js rename to lib/rollup-plugin-require-context/src/helper/resolve-reqquire-modules.js diff --git a/build/rollup-plugin-require-context/src/helper/resolve-require-code.js b/lib/rollup-plugin-require-context/src/helper/resolve-require-code.js similarity index 100% rename from build/rollup-plugin-require-context/src/helper/resolve-require-code.js rename to lib/rollup-plugin-require-context/src/helper/resolve-require-code.js diff --git a/build/rollup-plugin-require-context/src/index.js b/lib/rollup-plugin-require-context/src/index.js similarity index 100% rename from build/rollup-plugin-require-context/src/index.js rename to lib/rollup-plugin-require-context/src/index.js diff --git a/packages/uni-app-plus-nvue/dist/index.js b/packages/uni-app-plus-nvue/dist/index.js index 2b5288d37..af414546c 100644 --- a/packages/uni-app-plus-nvue/dist/index.js +++ b/packages/uni-app-plus-nvue/dist/index.js @@ -1864,16 +1864,6 @@ var serviceContext = (function () { } } - const canIUse = [{ - name: 'schema', - type: String, - required: true - }]; - - var require_context_module_0_0 = /*#__PURE__*/Object.freeze({ - canIUse: canIUse - }); - const base64ToArrayBuffer = [{ name: 'base64', type: String, @@ -1886,11 +1876,76 @@ var serviceContext = (function () { required: true }]; - var require_context_module_0_1 = /*#__PURE__*/Object.freeze({ + var require_context_module_0_0 = /*#__PURE__*/Object.freeze({ base64ToArrayBuffer: base64ToArrayBuffer, arrayBufferToBase64: arrayBufferToBase64 }); + const canIUse = [{ + name: 'schema', + type: String, + required: true + }]; + + var require_context_module_0_1 = /*#__PURE__*/Object.freeze({ + canIUse: canIUse + }); + + const $on = [{ + name: 'event', + type: [String, Array], + required: true + }, { + name: 'callback', + type: Function, + required: true + }]; + + const $once = $on; + + const $off = [{ + name: 'event', + type: [String, Array] + }, { + name: 'callback', + type: Function + }]; + + const $emit = [{ + name: 'event', + type: String, + required: true + }]; + + var require_context_module_0_2 = /*#__PURE__*/Object.freeze({ + $on: $on, + $once: $once, + $off: $off, + $emit: $emit + }); + + const addInterceptor$1 = [{ + name: 'method', + type: [String, Object], + required: true + }]; + const removeInterceptor$1 = addInterceptor$1; + + var require_context_module_0_3 = /*#__PURE__*/Object.freeze({ + addInterceptor: addInterceptor$1, + removeInterceptor: removeInterceptor$1 + }); + + const upx2px = [{ + name: 'upx', + type: Number, + required: true + }]; + + var require_context_module_0_4 = /*#__PURE__*/Object.freeze({ + upx2px: upx2px + }); + function getInt (method) { return function (value, params) { if (value) { @@ -2023,7 +2078,7 @@ var serviceContext = (function () { } }; - var require_context_module_0_2 = /*#__PURE__*/Object.freeze({ + var require_context_module_0_5 = /*#__PURE__*/Object.freeze({ canvasGetImageData: canvasGetImageData, canvasPutImageData: canvasPutImageData, canvasToTempFilePath: canvasToTempFilePath, @@ -2048,7 +2103,7 @@ var serviceContext = (function () { type: Object }]; - var require_context_module_0_3 = /*#__PURE__*/Object.freeze({ + var require_context_module_0_6 = /*#__PURE__*/Object.freeze({ createAudioContext: createAudioContext, createVideoContext: createVideoContext, createMapContext: createMapContext, @@ -2067,7 +2122,7 @@ var serviceContext = (function () { } }; - var require_context_module_0_4 = /*#__PURE__*/Object.freeze({ + var require_context_module_0_7 = /*#__PURE__*/Object.freeze({ makePhoneCall: makePhoneCall }); @@ -2081,28 +2136,43 @@ var serviceContext = (function () { } }; - var require_context_module_0_5 = /*#__PURE__*/Object.freeze({ + var require_context_module_0_8 = /*#__PURE__*/Object.freeze({ openDocument: openDocument }); - const type = { - WGS84: 'WGS84', - GCJ02: 'GCJ02' + const chooseLocation = { + keyword: { + type: String + } }; - const getLocation = { - type: { - type: String, - validator (value, params) { - value = (value || '').toUpperCase(); - params.type = Object.values(type).indexOf(value) < 0 ? type.WGS84 : value; - }, - default: type.WGS84 - }, - altitude: { - altitude: Boolean, - default: false - } + + var require_context_module_0_9 = /*#__PURE__*/Object.freeze({ + chooseLocation: chooseLocation + }); + + const type = { + WGS84: 'WGS84', + GCJ02: 'GCJ02' + }; + const getLocation = { + type: { + type: String, + validator (value, params) { + value = (value || '').toUpperCase(); + params.type = Object.values(type).indexOf(value) < 0 ? type.WGS84 : value; + }, + default: type.WGS84 + }, + altitude: { + altitude: Boolean, + default: false + } }; + + var require_context_module_0_10 = /*#__PURE__*/Object.freeze({ + getLocation: getLocation + }); + const openLocation = { latitude: { type: Number, @@ -2128,8 +2198,7 @@ var serviceContext = (function () { } }; - var require_context_module_0_6 = /*#__PURE__*/Object.freeze({ - getLocation: getLocation, + var require_context_module_0_11 = /*#__PURE__*/Object.freeze({ openLocation: openLocation }); @@ -2186,7 +2255,7 @@ var serviceContext = (function () { } }; - var require_context_module_0_7 = /*#__PURE__*/Object.freeze({ + var require_context_module_0_12 = /*#__PURE__*/Object.freeze({ chooseImage: chooseImage }); @@ -2213,7 +2282,7 @@ var serviceContext = (function () { } }; - var require_context_module_0_8 = /*#__PURE__*/Object.freeze({ + var require_context_module_0_13 = /*#__PURE__*/Object.freeze({ chooseVideo: chooseVideo }); @@ -2288,7 +2357,7 @@ var serviceContext = (function () { } }; - var require_context_module_0_9 = /*#__PURE__*/Object.freeze({ + var require_context_module_0_14 = /*#__PURE__*/Object.freeze({ getImageInfo: getImageInfo }); @@ -2323,53 +2392,10 @@ var serviceContext = (function () { } }; - var require_context_module_0_10 = /*#__PURE__*/Object.freeze({ + var require_context_module_0_15 = /*#__PURE__*/Object.freeze({ previewImage: previewImage }); - const FRONT_COLORS = ['#ffffff', '#000000']; - const setNavigationBarColor = { - 'frontColor': { - type: String, - required: true, - validator (frontColor, params) { - if (FRONT_COLORS.indexOf(frontColor) === -1) { - return `invalid frontColor "${frontColor}"` - } - } - }, - 'backgroundColor': { - type: String, - required: true - }, - 'animation': { - type: Object, - default () { - return { - duration: 0, - timingFunc: 'linear' - } - }, - validator (animation = {}, params) { - params.animation = { - duration: animation.duration || 0, - timingFunc: animation.timingFunc || 'linear' - }; - } - } - }; - const setNavigationBarTitle = { - 'title': { - type: String, - required: true - } - }; - - var require_context_module_0_11 = /*#__PURE__*/Object.freeze({ - setNavigationBarColor: setNavigationBarColor, - setNavigationBarTitle: setNavigationBarTitle - }); - const downloadFile = { url: { type: String, @@ -2383,7 +2409,7 @@ var serviceContext = (function () { } }; - var require_context_module_0_12 = /*#__PURE__*/Object.freeze({ + var require_context_module_0_16 = /*#__PURE__*/Object.freeze({ downloadFile: downloadFile }); @@ -2480,7 +2506,7 @@ var serviceContext = (function () { } }; - var require_context_module_0_13 = /*#__PURE__*/Object.freeze({ + var require_context_module_0_17 = /*#__PURE__*/Object.freeze({ request: request }); @@ -2533,7 +2559,7 @@ var serviceContext = (function () { } }; - var require_context_module_0_14 = /*#__PURE__*/Object.freeze({ + var require_context_module_0_18 = /*#__PURE__*/Object.freeze({ connectSocket: connectSocket, sendSocketMessage: sendSocketMessage, closeSocket: closeSocket @@ -2569,28 +2595,10 @@ var serviceContext = (function () { } }; - var require_context_module_0_15 = /*#__PURE__*/Object.freeze({ + var require_context_module_0_19 = /*#__PURE__*/Object.freeze({ uploadFile: uploadFile }); - const pageScrollTo = { - scrollTop: { - type: Number, - required: true - }, - duration: { - type: Number, - default: 300, - validator (duration, params) { - params.duration = Math.max(0, duration); - } - } - }; - - var require_context_module_0_16 = /*#__PURE__*/Object.freeze({ - pageScrollTo: pageScrollTo - }); - const service = { OAUTH: 'OAUTH', SHARE: 'SHARE', @@ -2611,8 +2619,265 @@ var serviceContext = (function () { } }; - var require_context_module_0_17 = /*#__PURE__*/Object.freeze({ - getProvider: getProvider + var require_context_module_0_20 = /*#__PURE__*/Object.freeze({ + getProvider: getProvider + }); + + function encodeQueryString (url) { + if (typeof url !== 'string') { + return url + } + const index = url.indexOf('?'); + + if (index === -1) { + return url + } + + const query = url.substr(index + 1).trim().replace(/^(\?|#|&)/, ''); + + if (!query) { + return url + } + + url = url.substr(0, index); + + const params = []; + + query.split('&').forEach(param => { + const parts = param.replace(/\+/g, ' ').split('='); + const key = parts.shift(); + const val = parts.length > 0 + ? parts.join('=') + : ''; + + params.push(key + '=' + encodeURIComponent(val)); + }); + + return params.length ? url + '?' + params.join('&') : url + } + + function createValidator (type) { + return function validator (url, params) { + // 格式化为绝对路径路由 + url = getRealRoute$1(url); + + const pagePath = url.split('?')[0]; + // 匹配路由是否存在 + const routeOptions = __uniRoutes.find(({ + path, + alias + }) => path === pagePath || alias === pagePath); + + if (!routeOptions) { + return 'page `' + url + '` is not found' + } + + // 检测不同类型跳转 + if (type === 'navigateTo' || type === 'redirectTo') { + if (routeOptions.meta.isTabBar) { + return `can not ${type} a tabbar page` + } + } else if (type === 'switchTab') { + if (!routeOptions.meta.isTabBar) { + return 'can not switch to no-tabBar page' + } + } + + // tabBar不允许传递参数 + if (routeOptions.meta.isTabBar) { + url = pagePath; + } + + // 首页自动格式化为`/` + if (routeOptions.meta.isEntry) { + url = url.replace(routeOptions.alias, '/'); + } + + // 参数格式化 + params.url = encodeQueryString(url); + } + } + + function createProtocol (type, extras = {}) { + return Object.assign({ + url: { + type: String, + required: true, + validator: createValidator(type) + } + }, extras) + } + + function createAnimationProtocol (animationTypes) { + return { + animationType: { + type: String, + validator (type) { + if (type && animationTypes.indexOf(type) === -1) { + return '`' + type + '` is not supported for `animationType` (supported values are: `' + animationTypes.join( + '`|`') + '`)' + } + } + }, + animationDuration: { + type: Number + } + } + } + + const redirectTo = createProtocol('redirectTo'); + + const reLaunch = createProtocol('reLaunch'); + + const navigateTo = createProtocol('navigateTo', createAnimationProtocol( + [ + 'slide-in-right', + 'slide-in-left', + 'slide-in-top', + 'slide-in-bottom', + 'fade-in', + 'zoom-out', + 'zoom-fade-out', + 'pop-in', + 'none' + ] + )); + + const switchTab = createProtocol('switchTab'); + + const navigateBack = Object.assign({ + delta: { + type: Number, + validator (delta, params) { + delta = parseInt(delta) || 1; + params.delta = Math.min(getCurrentPages().length - 1, delta); + } + } + }, createAnimationProtocol( + [ + 'slide-out-right', + 'slide-out-left', + 'slide-out-top', + 'slide-out-bottom', + 'fade-out', + 'zoom-in', + 'zoom-fade-in', + 'pop-out', + 'none' + ] + )); + + var require_context_module_0_21 = /*#__PURE__*/Object.freeze({ + redirectTo: redirectTo, + reLaunch: reLaunch, + navigateTo: navigateTo, + switchTab: switchTab, + navigateBack: navigateBack + }); + + const getStorage = { + 'key': { + type: String, + required: true + } + }; + + const getStorageSync = [{ + name: 'key', + type: String, + required: true + }]; + + const setStorage = { + 'key': { + type: String, + required: true + }, + 'data': { + required: true + } + }; + + const setStorageSync = [{ + name: 'key', + type: String, + required: true + }, { + name: 'data', + required: true + }]; + + const removeStorage = getStorage; + const removeStorageSync = getStorageSync; + + var require_context_module_0_22 = /*#__PURE__*/Object.freeze({ + getStorage: getStorage, + getStorageSync: getStorageSync, + setStorage: setStorage, + setStorageSync: setStorageSync, + removeStorage: removeStorage, + removeStorageSync: removeStorageSync + }); + + const FRONT_COLORS = ['#ffffff', '#000000']; + const setNavigationBarColor = { + 'frontColor': { + type: String, + required: true, + validator (frontColor, params) { + if (FRONT_COLORS.indexOf(frontColor) === -1) { + return `invalid frontColor "${frontColor}"` + } + } + }, + 'backgroundColor': { + type: String, + required: true + }, + 'animation': { + type: Object, + default () { + return { + duration: 0, + timingFunc: 'linear' + } + }, + validator (animation = {}, params) { + params.animation = { + duration: animation.duration || 0, + timingFunc: animation.timingFunc || 'linear' + }; + } + } + }; + const setNavigationBarTitle = { + 'title': { + type: String, + required: true + } + }; + + var require_context_module_0_23 = /*#__PURE__*/Object.freeze({ + setNavigationBarColor: setNavigationBarColor, + setNavigationBarTitle: setNavigationBarTitle + }); + + const pageScrollTo = { + scrollTop: { + type: Number, + required: true + }, + duration: { + type: Number, + default: 300, + validator (duration, params) { + params.duration = Math.max(0, duration); + } + } + }; + + var require_context_module_0_24 = /*#__PURE__*/Object.freeze({ + pageScrollTo: pageScrollTo }); const showModal = { @@ -2728,189 +2993,13 @@ var serviceContext = (function () { } }; - var require_context_module_0_18 = /*#__PURE__*/Object.freeze({ + var require_context_module_0_25 = /*#__PURE__*/Object.freeze({ showModal: showModal, showToast: showToast, showLoading: showLoading, showActionSheet: showActionSheet }); - function encodeQueryString (url) { - if (typeof url !== 'string') { - return url - } - const index = url.indexOf('?'); - - if (index === -1) { - return url - } - - const query = url.substr(index + 1).trim().replace(/^(\?|#|&)/, ''); - - if (!query) { - return url - } - - url = url.substr(0, index); - - const params = []; - - query.split('&').forEach(param => { - const parts = param.replace(/\+/g, ' ').split('='); - const key = parts.shift(); - const val = parts.length > 0 - ? parts.join('=') - : ''; - - params.push(key + '=' + encodeURIComponent(val)); - }); - - return params.length ? url + '?' + params.join('&') : url - } - - function createValidator (type) { - return function validator (url, params) { - // 格式化为绝对路径路由 - url = getRealRoute$1(url); - - const pagePath = url.split('?')[0]; - // 匹配路由是否存在 - const routeOptions = __uniRoutes.find(({ - path, - alias - }) => path === pagePath || alias === pagePath); - - if (!routeOptions) { - return 'page `' + url + '` is not found' - } - - // 检测不同类型跳转 - if (type === 'navigateTo' || type === 'redirectTo') { - if (routeOptions.meta.isTabBar) { - return `can not ${type} a tabbar page` - } - } else if (type === 'switchTab') { - if (!routeOptions.meta.isTabBar) { - return 'can not switch to no-tabBar page' - } - } - - // tabBar不允许传递参数 - if (routeOptions.meta.isTabBar) { - url = pagePath; - } - - // 首页自动格式化为`/` - if (routeOptions.meta.isEntry) { - url = url.replace(routeOptions.alias, '/'); - } - - // 参数格式化 - params.url = encodeQueryString(url); - } - } - - function createProtocol (type, extras = {}) { - return Object.assign({ - url: { - type: String, - required: true, - validator: createValidator(type) - } - }, extras) - } - - function createAnimationProtocol (animationTypes) { - return { - animationType: { - type: String, - validator (type) { - if (type && animationTypes.indexOf(type) === -1) { - return '`' + type + '` is not supported for `animationType` (supported values are: `' + animationTypes.join( - '`|`') + '`)' - } - } - }, - animationDuration: { - type: Number - } - } - } - - const redirectTo = createProtocol('redirectTo'); - - const reLaunch = createProtocol('reLaunch'); - - const navigateTo = createProtocol('navigateTo', createAnimationProtocol( - [ - 'slide-in-right', - 'slide-in-left', - 'slide-in-top', - 'slide-in-bottom', - 'fade-in', - 'zoom-out', - 'zoom-fade-out', - 'pop-in', - 'none' - ] - )); - - const switchTab = createProtocol('switchTab'); - - const navigateBack = Object.assign({ - delta: { - type: Number, - validator (delta, params) { - delta = parseInt(delta) || 1; - params.delta = Math.min(getCurrentPages().length - 1, delta); - } - } - }, createAnimationProtocol( - [ - 'slide-out-right', - 'slide-out-left', - 'slide-out-top', - 'slide-out-bottom', - 'fade-out', - 'zoom-in', - 'zoom-fade-in', - 'pop-out', - 'none' - ] - )); - - var require_context_module_0_19 = /*#__PURE__*/Object.freeze({ - redirectTo: redirectTo, - reLaunch: reLaunch, - navigateTo: navigateTo, - switchTab: switchTab, - navigateBack: navigateBack - }); - - const setStorage = { - 'key': { - type: String, - required: true - }, - 'data': { - required: true - } - }; - - const setStorageSync = [{ - name: 'key', - type: String, - required: true - }, { - name: 'data', - required: true - }]; - - var require_context_module_0_20 = /*#__PURE__*/Object.freeze({ - setStorage: setStorage, - setStorageSync: setStorageSync - }); - const indexValidator = { type: Number, required: true @@ -2988,7 +3077,7 @@ var serviceContext = (function () { } }; - var require_context_module_0_21 = /*#__PURE__*/Object.freeze({ + var require_context_module_0_26 = /*#__PURE__*/Object.freeze({ setTabBarItem: setTabBarItem$1, setTabBarStyle: setTabBarStyle$1, hideTabBar: hideTabBar$1, @@ -3003,28 +3092,33 @@ var serviceContext = (function () { const modules = (function() { var map = { - './base.js': require_context_module_0_0, - './base64.js': require_context_module_0_1, - './canvas.js': require_context_module_0_2, - './context.js': require_context_module_0_3, - './device/make-phone-call.js': require_context_module_0_4, - './file/open-document.js': require_context_module_0_5, - './location.js': require_context_module_0_6, - './media/choose-image.js': require_context_module_0_7, - './media/choose-video.js': require_context_module_0_8, - './media/get-image-info.js': require_context_module_0_9, - './media/preview-image.js': require_context_module_0_10, - './navigation-bar.js': require_context_module_0_11, - './network/download-file.js': require_context_module_0_12, - './network/request.js': require_context_module_0_13, - './network/socket.js': require_context_module_0_14, - './network/upload-file.js': require_context_module_0_15, - './page-scroll-to.js': require_context_module_0_16, - './plugins.js': require_context_module_0_17, - './popup.js': require_context_module_0_18, - './route.js': require_context_module_0_19, - './storage.js': require_context_module_0_20, - './tab-bar.js': require_context_module_0_21, + './base/base64.js': require_context_module_0_0, + './base/can-i-use.js': require_context_module_0_1, + './base/event-bus.js': require_context_module_0_2, + './base/interceptor.js': require_context_module_0_3, + './base/upx2px.js': require_context_module_0_4, + './context/canvas.js': require_context_module_0_5, + './context/context.js': require_context_module_0_6, + './device/make-phone-call.js': require_context_module_0_7, + './file/open-document.js': require_context_module_0_8, + './location/choose-location.js': require_context_module_0_9, + './location/get-location.js': require_context_module_0_10, + './location/open-location.js': require_context_module_0_11, + './media/choose-image.js': require_context_module_0_12, + './media/choose-video.js': require_context_module_0_13, + './media/get-image-info.js': require_context_module_0_14, + './media/preview-image.js': require_context_module_0_15, + './network/download-file.js': require_context_module_0_16, + './network/request.js': require_context_module_0_17, + './network/socket.js': require_context_module_0_18, + './network/upload-file.js': require_context_module_0_19, + './plugin/get-provider.js': require_context_module_0_20, + './route/route.js': require_context_module_0_21, + './storage/storage.js': require_context_module_0_22, + './ui/navigation-bar.js': require_context_module_0_23, + './ui/page-scroll-to.js': require_context_module_0_24, + './ui/popup.js': require_context_module_0_25, + './ui/tab-bar.js': require_context_module_0_26, }; var req = function req(key) { @@ -3576,7 +3670,7 @@ var serviceContext = (function () { isIOS = platform === 'ios'; } - function upx2px (number, newDeviceWidth) { + function upx2px$1 (number, newDeviceWidth) { if (deviceWidth === 0) { checkDeviceWidth(); } @@ -3601,9 +3695,31 @@ var serviceContext = (function () { } var require_context_module_1_3 = /*#__PURE__*/Object.freeze({ - upx2px: upx2px + upx2px: upx2px$1 }); + const Emitter = new Vue(); + + function apply (ctx, method, args) { + return ctx[method].apply(ctx, args) + } + + function $on$1 () { + return apply(Emitter, '$on', [...arguments]) + } + + function $off$1 () { + return apply(Emitter, '$off', [...arguments]) + } + + function $once$1 () { + return apply(Emitter, '$once', [...arguments]) + } + + function $emit$1 () { + return apply(Emitter, '$emit', [...arguments]) + } + let audios = {}; const evts = ['play', 'canplay', 'ended', 'stop', 'waiting', 'seeking', 'seeked', 'pause']; @@ -4934,7 +5050,7 @@ var serviceContext = (function () { const CHOOSE_LOCATION_PATH = '_www/__uniappchooselocation.html'; - function chooseLocation (params, callbackId) { + function chooseLocation$1 (params, callbackId) { const statusBarStyle = plus.navigator.getStatusBarStyle(); const webview = plus.webview.create( CHOOSE_LOCATION_PATH, @@ -6545,28 +6661,6 @@ var serviceContext = (function () { ); } - const Emitter = new Vue(); - - function apply (ctx, method, args) { - return ctx[method].apply(ctx, args) - } - - function $on () { - return apply(Emitter, '$on', [...arguments]) - } - - function $off () { - return apply(Emitter, '$off', [...arguments]) - } - - function $once () { - return apply(Emitter, '$once', [...arguments]) - } - - function $emit () { - return apply(Emitter, '$emit', [...arguments]) - } - function showKeyboard () { plus.key.showSoftKeybord(); return { @@ -6908,12 +7002,16 @@ var serviceContext = (function () { var appApi = /*#__PURE__*/Object.freeze({ startPullDownRefresh: startPullDownRefresh, stopPullDownRefresh: stopPullDownRefresh, - chooseVideo: chooseVideo$1, - createAudioInstance: createAudioInstance, - destroyAudioInstance: destroyAudioInstance, - setAudioState: setAudioState, - getAudioState: getAudioState, - operateAudio: operateAudio, + chooseImage: chooseImage$1, + $on: $on$1, + $off: $off$1, + $once: $once$1, + $emit: $emit$1, + getMusicPlayerState: getMusicPlayerState, + operateMusicPlayer: operateMusicPlayer, + setBackgroundAudioState: setBackgroundAudioState, + operateBackgroundAudio: operateBackgroundAudio, + getBackgroundAudioState: getBackgroundAudioState, enableAccelerometer: enableAccelerometer, addPhoneContact: addPhoneContact, openBluetoothAdapter: openBluetoothAdapter, @@ -6957,7 +7055,7 @@ var serviceContext = (function () { getSavedFileInfo: getSavedFileInfo, removeSavedFile: removeSavedFile, openDocument: openDocument$1, - chooseLocation: chooseLocation, + chooseLocation: chooseLocation$1, getLocation: getLocation$1, openLocation: openLocation$1, startRecord: startRecord, @@ -6965,12 +7063,12 @@ var serviceContext = (function () { playVoice: playVoice, pauseVoice: pauseVoice, stopVoice: stopVoice, - chooseImage: chooseImage$1, - getMusicPlayerState: getMusicPlayerState, - operateMusicPlayer: operateMusicPlayer, - setBackgroundAudioState: setBackgroundAudioState, - operateBackgroundAudio: operateBackgroundAudio, - getBackgroundAudioState: getBackgroundAudioState, + createAudioInstance: createAudioInstance, + destroyAudioInstance: destroyAudioInstance, + setAudioState: setAudioState, + getAudioState: getAudioState, + operateAudio: operateAudio, + chooseVideo: chooseVideo$1, compressImage: compressImage, getImageInfo: getImageInfo$1, previewImage: previewImage$1, @@ -6996,10 +7094,6 @@ var serviceContext = (function () { offPush: offPush, shareAppMessageDirectly: shareAppMessageDirectly, share: share, - $on: $on, - $off: $off, - $once: $once, - $emit: $emit, showKeyboard: showKeyboard, hideKeyboard: hideKeyboard, setNavigationBarTitle: setNavigationBarTitle$1, @@ -7727,7 +7821,7 @@ var serviceContext = (function () { }); } - function getStorage ({ + function getStorage$1 ({ key } = {}) { const data = localStorage.getItem(key); @@ -7740,14 +7834,14 @@ var serviceContext = (function () { } } - function getStorageSync (key) { - const res = getStorage({ + function getStorageSync$1 (key) { + const res = getStorage$1({ key }); return res.data } - function removeStorage ({ + function removeStorage$1 ({ key } = {}) { const keyList = localStorage.getItem('uni-storage-keys'); @@ -7763,8 +7857,8 @@ var serviceContext = (function () { } } - function removeStorageSync (key) { - removeStorage({ + function removeStorageSync$1 (key) { + removeStorage$1({ key }); } @@ -7804,10 +7898,10 @@ var serviceContext = (function () { var require_context_module_1_5 = /*#__PURE__*/Object.freeze({ setStorage: setStorage$1, setStorageSync: setStorageSync$1, - getStorage: getStorage, - getStorageSync: getStorageSync, - removeStorage: removeStorage, - removeStorageSync: removeStorageSync, + getStorage: getStorage$1, + getStorageSync: getStorageSync$1, + removeStorage: removeStorage$1, + removeStorageSync: removeStorageSync$1, clearStorage: clearStorage, clearStorageSync: clearStorageSync, getStorageInfo: getStorageInfo, diff --git a/src/core/helpers/protocol/base64.js b/src/core/helpers/protocol/base/base64.js similarity index 100% rename from src/core/helpers/protocol/base64.js rename to src/core/helpers/protocol/base/base64.js diff --git a/src/core/helpers/protocol/base.js b/src/core/helpers/protocol/base/can-i-use.js similarity index 100% rename from src/core/helpers/protocol/base.js rename to src/core/helpers/protocol/base/can-i-use.js diff --git a/src/core/helpers/protocol/base/event-bus.js b/src/core/helpers/protocol/base/event-bus.js new file mode 100644 index 000000000..2de4874c8 --- /dev/null +++ b/src/core/helpers/protocol/base/event-bus.js @@ -0,0 +1,25 @@ +export const $on = [{ + name: 'event', + type: [String, Array], + required: true +}, { + name: 'callback', + type: Function, + required: true +}] + +export const $once = $on + +export const $off = [{ + name: 'event', + type: [String, Array] +}, { + name: 'callback', + type: Function +}] + +export const $emit = [{ + name: 'event', + type: String, + required: true +}] diff --git a/src/core/helpers/protocol/base/interceptor.js b/src/core/helpers/protocol/base/interceptor.js new file mode 100644 index 000000000..58b704a45 --- /dev/null +++ b/src/core/helpers/protocol/base/interceptor.js @@ -0,0 +1,6 @@ +export const addInterceptor = [{ + name: 'method', + type: [String, Object], + required: true +}] +export const removeInterceptor = addInterceptor diff --git a/src/core/helpers/protocol/base/upx2px.js b/src/core/helpers/protocol/base/upx2px.js new file mode 100644 index 000000000..e149319e0 --- /dev/null +++ b/src/core/helpers/protocol/base/upx2px.js @@ -0,0 +1,5 @@ +export const upx2px = [{ + name: 'upx', + type: Number, + required: true +}] diff --git a/src/core/helpers/protocol/canvas.js b/src/core/helpers/protocol/context/canvas.js similarity index 100% rename from src/core/helpers/protocol/canvas.js rename to src/core/helpers/protocol/context/canvas.js diff --git a/src/core/helpers/protocol/context.js b/src/core/helpers/protocol/context/context.js similarity index 100% rename from src/core/helpers/protocol/context.js rename to src/core/helpers/protocol/context/context.js diff --git a/src/core/helpers/protocol/location/choose-location.js b/src/core/helpers/protocol/location/choose-location.js new file mode 100644 index 000000000..a02143ed5 --- /dev/null +++ b/src/core/helpers/protocol/location/choose-location.js @@ -0,0 +1,5 @@ +export const chooseLocation = { + keyword: { + type: String + } +} diff --git a/src/core/helpers/protocol/location/get-location.js b/src/core/helpers/protocol/location/get-location.js new file mode 100644 index 000000000..6293dbc68 --- /dev/null +++ b/src/core/helpers/protocol/location/get-location.js @@ -0,0 +1,18 @@ +const type = { + WGS84: 'WGS84', + GCJ02: 'GCJ02' +} +export const getLocation = { + type: { + type: String, + validator (value, params) { + value = (value || '').toUpperCase() + params.type = Object.values(type).indexOf(value) < 0 ? type.WGS84 : value + }, + default: type.WGS84 + }, + altitude: { + altitude: Boolean, + default: false + } +} diff --git a/src/core/helpers/protocol/location.js b/src/core/helpers/protocol/location/open-location.js similarity index 52% rename from src/core/helpers/protocol/location.js rename to src/core/helpers/protocol/location/open-location.js index f2768e237..9a1912eb8 100644 --- a/src/core/helpers/protocol/location.js +++ b/src/core/helpers/protocol/location/open-location.js @@ -1,21 +1,3 @@ -const type = { - WGS84: 'WGS84', - GCJ02: 'GCJ02' -} -export const getLocation = { - type: { - type: String, - validator (value, params) { - value = (value || '').toUpperCase() - params.type = Object.values(type).indexOf(value) < 0 ? type.WGS84 : value - }, - default: type.WGS84 - }, - altitude: { - altitude: Boolean, - default: false - } -} export const openLocation = { latitude: { type: Number, diff --git a/src/core/helpers/protocol/plugins.js b/src/core/helpers/protocol/plugin/get-provider.js similarity index 100% rename from src/core/helpers/protocol/plugins.js rename to src/core/helpers/protocol/plugin/get-provider.js diff --git a/src/core/helpers/protocol/route.js b/src/core/helpers/protocol/route/route.js similarity index 94% rename from src/core/helpers/protocol/route.js rename to src/core/helpers/protocol/route/route.js index 26b54a1de..786d1ee54 100644 --- a/src/core/helpers/protocol/route.js +++ b/src/core/helpers/protocol/route/route.js @@ -1,4 +1,4 @@ -import getRealRoute from '../get-real-route' +import getRealRoute from '../../get-real-route' function encodeQueryString (url) { if (typeof url !== 'string') { diff --git a/src/core/helpers/protocol/storage.js b/src/core/helpers/protocol/storage.js deleted file mode 100644 index bbb361561..000000000 --- a/src/core/helpers/protocol/storage.js +++ /dev/null @@ -1,18 +0,0 @@ -export const setStorage = { - 'key': { - type: String, - required: true - }, - 'data': { - required: true - } -} - -export const setStorageSync = [{ - name: 'key', - type: String, - required: true -}, { - name: 'data', - required: true -}] diff --git a/src/core/helpers/protocol/storage/storage.js b/src/core/helpers/protocol/storage/storage.js new file mode 100644 index 000000000..f1762cb5a --- /dev/null +++ b/src/core/helpers/protocol/storage/storage.js @@ -0,0 +1,34 @@ +export const getStorage = { + 'key': { + type: String, + required: true + } +} + +export const getStorageSync = [{ + name: 'key', + type: String, + required: true +}] + +export const setStorage = { + 'key': { + type: String, + required: true + }, + 'data': { + required: true + } +} + +export const setStorageSync = [{ + name: 'key', + type: String, + required: true +}, { + name: 'data', + required: true +}] + +export const removeStorage = getStorage +export const removeStorageSync = getStorageSync diff --git a/src/core/helpers/protocol/navigation-bar.js b/src/core/helpers/protocol/ui/navigation-bar.js similarity index 100% rename from src/core/helpers/protocol/navigation-bar.js rename to src/core/helpers/protocol/ui/navigation-bar.js diff --git a/src/core/helpers/protocol/page-scroll-to.js b/src/core/helpers/protocol/ui/page-scroll-to.js similarity index 100% rename from src/core/helpers/protocol/page-scroll-to.js rename to src/core/helpers/protocol/ui/page-scroll-to.js diff --git a/src/core/helpers/protocol/popup.js b/src/core/helpers/protocol/ui/popup.js similarity index 100% rename from src/core/helpers/protocol/popup.js rename to src/core/helpers/protocol/ui/popup.js diff --git a/src/core/helpers/protocol/tab-bar.js b/src/core/helpers/protocol/ui/tab-bar.js similarity index 100% rename from src/core/helpers/protocol/tab-bar.js rename to src/core/helpers/protocol/ui/tab-bar.js diff --git a/src/platforms/app-plus/service/api/plugin/event-bus.js b/src/platforms/app-plus/service/api/base/event-bus.js similarity index 100% rename from src/platforms/app-plus/service/api/plugin/event-bus.js rename to src/platforms/app-plus/service/api/base/event-bus.js diff --git a/src/platforms/app-plus/service/api/index.js b/src/platforms/app-plus/service/api/index.js index 9759d198e..ffcd2a4db 100644 --- a/src/platforms/app-plus/service/api/index.js +++ b/src/platforms/app-plus/service/api/index.js @@ -1,3 +1,4 @@ +export * from './base/event-bus' export * from './context/audio' export * from './context/background-audio' @@ -41,7 +42,6 @@ export * from './plugin/oauth' export * from './plugin/payment' export * from './plugin/push' export * from './plugin/share' -export * from './plugin/event-bus' export * from './ui/keyboard' export * from './ui/navigation-bar' diff --git a/src/platforms/h5/service/api/plugin/event-bus.js b/src/platforms/h5/service/api/base/event-bus.js similarity index 100% rename from src/platforms/h5/service/api/plugin/event-bus.js rename to src/platforms/h5/service/api/base/event-bus.js -- GitLab