diff --git a/build/rollup.config.stat.js b/build/rollup.config.stat.js index d86468c821377a182edd782ab7baaa630f62c76c..f574b7cdf2f4003d9d4cc5488dbc24e11e41445a 100644 --- a/build/rollup.config.stat.js +++ b/build/rollup.config.stat.js @@ -4,6 +4,6 @@ module.exports = { file: 'packages/uni-stat/dist/index.js', format: 'es' }, - external: ['vue', '@dcloudio/uni-stat/package.json'], + external: ['vue', '../package.json'], plugins: [] } diff --git a/packages/uni-cli-shared/lib/index.js b/packages/uni-cli-shared/lib/index.js index 09a392e1f5b2c3277aa9cdff1b595e6ba7f2269e..f343c3531dacd38357e99c35e16403807b70f3aa 100644 --- a/packages/uni-cli-shared/lib/index.js +++ b/packages/uni-cli-shared/lib/index.js @@ -35,7 +35,8 @@ const { const { getFlexDirection, - getPlatformProject, + getPlatformProject, + isSupportFilters, isSupportSubPackages, getPlatforms, getPlatformGlobal, @@ -82,7 +83,8 @@ module.exports = { getNetworkTimeout, runByHBuilderX, isInHBuilderX, - isInHBuilderXAlpha, + isInHBuilderXAlpha, + isSupportFilters, isSupportSubPackages, getPlatforms, getFlexDirection, diff --git a/packages/uni-cli-shared/lib/platform.js b/packages/uni-cli-shared/lib/platform.js index 378da59023566e1e54822a672ae4db4197734f13..039797f407c9ed53b255fef5dc7b9761393c0327 100644 --- a/packages/uni-cli-shared/lib/platform.js +++ b/packages/uni-cli-shared/lib/platform.js @@ -80,6 +80,7 @@ const PLATFORMS = { vue: '@dcloudio/vue-cli-plugin-uni/packages/h5-vue', compiler: false, megalo: false, + filters: true, subPackages: false, cssVars: { '--status-bar-height': '0px' @@ -107,11 +108,13 @@ const PLATFORMS = { global: 'wx', exts: { style: '.wxss', - template: '.wxml' + template: '.wxml', + filter: '.wxs' }, vue: mpvueRuntime, compiler: mpvueCompiler, megalo: false, + filters: true, subPackages: false, cssVars: { '--window-top': '0px', @@ -134,11 +137,13 @@ const PLATFORMS = { global: 'wx', exts: { style: '.qss', - template: '.qml' + template: '.qml', + filter: '.wxs' }, vue: mpvueRuntime, compiler: mpvueCompiler, megalo: false, + filters: true, subPackages: true, cssVars: { '--status-bar-height': '25px', @@ -159,11 +164,13 @@ const PLATFORMS = { global: 'wx', exts: { style: '.wxss', - template: '.wxml' + template: '.wxml', + filter: '.wxs' }, vue: mpvueRuntime, compiler: mpvueCompiler, megalo: false, + filters: true, subPackages: true, cssVars: { '--status-bar-height': '25px', @@ -194,11 +201,13 @@ const PLATFORMS = { global: 'swan', exts: { style: '.css', - template: '.swan' + template: '.swan', + filter: '.filter.js' }, vue: megaloRuntime, compiler: megaloCompiler, megalo: 'swan', + filters: true, subPackages: true, cssVars: { '--status-bar-height': '25px', @@ -219,11 +228,13 @@ const PLATFORMS = { global: 'my', exts: { style: '.acss', - template: '.axml' + template: '.axml', + filter: '.sjs' }, vue: megaloRuntime, compiler: megaloCompiler, megalo: 'alipay', + filters: true, subPackages: false, cssVars: { '--status-bar-height': '25px', @@ -429,6 +440,9 @@ module.exports = { type: 'html', context: nvuePreprocessContext }, + isSupportFilters () { + return platform.filters + }, isSupportSubPackages () { return platform.subPackages }, diff --git a/packages/uni-stat/dist/index.js b/packages/uni-stat/dist/index.js index 43d42304681f5a96fec6ff68150932d3baa818ed..9294a2e96ad8415aa31644062a32d05f2491c042 100644 --- a/packages/uni-stat/dist/index.js +++ b/packages/uni-stat/dist/index.js @@ -1,4 +1,4 @@ -import { version } from '@dcloudio/uni-stat/package.json'; +import { version } from '../package.json'; const STAT_VERSION = version; const STAT_URL = 'https://tongji.dcloud.net.cn/uni/stat'; @@ -18,7 +18,6 @@ function getUuid() { } catch (e) { uuid = ''; } - uni.setStorageSync(UUID_KEY, uuid); return uuid } @@ -505,7 +504,7 @@ class Util { key = '', value = "" } = {}) { - const route = getPageRoute(this); + const route = this._lastPageRoute; let options = { ak: this.statData.ak, uuid: this.statData.uuid, diff --git a/packages/uni-stat/package.json b/packages/uni-stat/package.json index 8033b635f3173e7aeb921ca36da0afc628e81aaa..ca9d0fef45ff5931cd3b74cd5a30d8058eef5dff 100644 --- a/packages/uni-stat/package.json +++ b/packages/uni-stat/package.json @@ -1,6 +1,6 @@ { "name": "@dcloudio/uni-stat", - "version": "0.0.105", + "version": "0.0.108", "description": "", "main": "dist/index.js", "scripts": { diff --git a/packages/uni-stat/src/config.js b/packages/uni-stat/src/config.js index 7c41028b56c497dd8b8aa4bcac49d288445bddac..b3204423c07b150bbea363689b4d704a824c1ebc 100644 --- a/packages/uni-stat/src/config.js +++ b/packages/uni-stat/src/config.js @@ -1,6 +1,6 @@ import { version -} from '@dcloudio/uni-stat/package.json' +} from '../package.json' export const STAT_VERSION = version export const STAT_URL = 'https://tongji.dcloud.net.cn/uni/stat' export const STAT_H5_URL = 'https://tongji.dcloud.net.cn/uni/stat.gif' diff --git a/packages/uni-stat/src/parameter.js b/packages/uni-stat/src/parameter.js index c443d2440174dae85936656e93ff9a6d020c23bd..10ffb082be284b18faff589fcda86a3ef37ce20c 100644 --- a/packages/uni-stat/src/parameter.js +++ b/packages/uni-stat/src/parameter.js @@ -14,7 +14,6 @@ export function getUuid() { } catch (e) { uuid = ''; } - uni.setStorageSync(UUID_KEY, uuid); return uuid } diff --git a/packages/uni-stat/src/stat.js b/packages/uni-stat/src/stat.js index 26e7724d8fd6be4ae8f0d010b0b40f81501547bf..08e4ba9d952a8112b2e5043ec2af30f1d8456685 100644 --- a/packages/uni-stat/src/stat.js +++ b/packages/uni-stat/src/stat.js @@ -239,7 +239,7 @@ class Util { key = '', value = "" } = {}) { - const route = getPageRoute(this); + const route = this._lastPageRoute; let options = { ak: this.statData.ak, uuid: this.statData.uuid,