@dcloudio/uni-cli-shared 2.0.2-4080720251210002 → 2.0.2-5000420260318002

package/components/ad-interstitial.vue

@@ -2,11 +2,11 @@
   <view @click="_onclick">
     <slot :options="options" :loading="loading" :error="errorMessage" />
     <!-- #ifdef MP-WEIXIN -->
-    <uniad-plugin class="uniad-plugin" data-com-type="wx" :adpid="adpid" :unit-id="unitId" @load="_onmpload" @close="_onmpclose" @error="_onmperror" @nextChannel="_onnextchannel"></uniad-plugin>
+    <uniad-plugin class="uniad-plugin" data-com-type="wx" :isUni="true" :adpid="adpid" :unit-id="unitId" @load="_onmpload" @close="_onmpclose" @error="_onmperror" @nextChannel="_onnextchannel"></uniad-plugin>
     <uniad-plugin-wx v-if="wxchannel" class="uniad-plugin-wx" data-com-type="wx" @load="_onmpload" @close="_onmpclose" @error="_onwxchannelerror"></uniad-plugin-wx>
-    <!-- #endif -->
-    <!-- #ifdef MP-ALIPAY -->
-    <uniad-plugin class="uniad-plugin" :adpid="adpid" @create="_handleAdRef" @load="_onmpload" @close="_onmpclose" @error="_onmperror"></uniad-plugin>
+    <!-- #endif -->
+    <!-- #ifdef MP-ALIPAY -->
+    <uniad-plugin class="uniad-plugin" :adpid="adpid" @create="_handleAdRef" @load="_onmpload" @close="_onmpclose" @error="_onmperror"></uniad-plugin>
     <!-- #endif -->
     <!-- #ifdef H5 -->
     <div ref="container" />
@@ -24,8 +24,8 @@
   // #ifdef MP-WEIXIN
   import adMixin from "./ad.mixin.mp-weixin.js"
   // #endif
-  // #ifdef MP-ALIPAY
-  import adMixin from "./ad.mixin.mp-alipay.js"
+  // #ifdef MP-ALIPAY
+  import adMixin from "./ad.mixin.mp-alipay.js"
   // #endif
 
   export default {

package/components/ad-rewarded-video.vue

@@ -1,12 +1,12 @@
 <template>
   <view @click="_onclick">
-    <slot :options="options" :loading="loading" :error="errorMessage" />
-    <!-- #ifdef MP-WEIXIN -->
-    <uniad-plugin class="uniad-plugin" data-com-type="wx" :adpid="adpid" :unit-id="unitId" @load="_onmpload" @close="_onmpclose" @error="_onmperror" @nextChannel="_onnextchannel"></uniad-plugin>
-    <uniad-plugin-wx v-if="wxchannel" class="uniad-plugin-wx" data-com-type="wx" @load="_onmpload" @close="_onmpclose" @error="_onwxchannelerror"></uniad-plugin-wx>
-    <!-- #endif -->
-    <!-- #ifdef MP-ALIPAY -->
-    <uniad-plugin class="uniad-plugin" :adpid="adpid" @create="_handleAdRef" @load="_onmpload" @close="_onmpclose" @error="_onmperror"></uniad-plugin>
+    <slot :options="options" :loading="loading" :error="errorMessage" />
+    <!-- #ifdef MP-WEIXIN -->
+    <uniad-plugin class="uniad-plugin" :isUni="true" data-com-type="wx" :adpid="adpid" :unit-id="unitId" @load="_onmpload" @close="_onmpclose" @error="_onmperror" @nextChannel="_onnextchannel"></uniad-plugin>
+    <uniad-plugin-wx v-if="wxchannel" class="uniad-plugin-wx" data-com-type="wx" @load="_onmpload" @close="_onmpclose" @error="_onwxchannelerror"></uniad-plugin-wx>
+    <!-- #endif -->
+    <!-- #ifdef MP-ALIPAY -->
+    <uniad-plugin class="uniad-plugin" :adpid="adpid" @create="_handleAdRef" @load="_onmpload" @close="_onmpclose" @error="_onmperror"></uniad-plugin>
     <!-- #endif -->
   </view>
 </template>
@@ -20,9 +20,9 @@
   // #endif
   // #ifdef MP-WEIXIN
   import adMixin from "./ad.mixin.mp-weixin.js"
-  // #endif
-  // #ifdef MP-ALIPAY
-  import adMixin from "./ad.mixin.mp-alipay.js"
+  // #endif
+  // #ifdef MP-ALIPAY
+  import adMixin from "./ad.mixin.mp-alipay.js"
   // #endif
 
   export default {

package/components/ad.mixin.mp-weixin.js

@@ -1,4 +1,4 @@
-/* eslint-disable no-undef */
+/* eslint-disable no-undef */
 const adPlugin = requirePlugin('uni-ad')
 
 const EventType = {
@@ -19,8 +19,22 @@ const ProviderType = {
   ShanHu: 10020
 }
 
+const ActionType = {
+  ServerRequest: '-3',
+  AdRequest: '-1',
+  Show: '40',
+  Click: '41'
+}
+
 export default {
+  options: {
+    virtualHost: true
+  },
   props: {
+    style: {
+      type: String,
+      default: ''
+    },
     options: {
       type: [Object, Array],
       default () {
@@ -43,6 +57,10 @@ export default {
       type: [Boolean, String],
       default: false
     },
+    adIntervals: {
+      type: [Number, String],
+      default: ''
+    },
     urlCallback: {
       type: Object,
       default () {
@@ -54,7 +72,7 @@ export default {
     return {
       loading: false,
       userwx: false,
-      userUnitId: '',
+      userUnitId: '',
       customFullscreen: '',
       wxchannel: false,
       errorMessage: null
@@ -64,7 +82,7 @@ export default {
     this._ad = null
     this._loading = false
     this._wxRewardedAd = null
-    this._wxInterstitialAd = null
+    this._wxInterstitialAd = null
     this._userInvokeShowFlag = false
     this._providerType = ProviderType.ShanHu
     if (this.preload && this._canCreateAd()) {
@@ -87,10 +105,10 @@ export default {
     },
 
     show (e) {
-      this.errorMessage = null
-      if (this.loading) {
-        this._userInvokeShowFlag = true
-        return
+      this.errorMessage = null
+      if (this.loading) {
+        this._userInvokeShowFlag = true
+        return
       }
       if (this._providerType === ProviderType.ShanHu) {
         this._showAdInPlugin(this.selectComponent('.uniad-plugin'))
@@ -126,16 +144,17 @@ export default {
 
     _onmpload (e) {
       this.loading = false
-      this._dispatchEvent(EventType.Load, {})
-      if (this._userInvokeShowFlag) {
-        this._userInvokeShowFlag = false
-        setTimeout(() => {
-          this.show()
-        }, 1)
+      this._dispatchEvent(EventType.Load, {})
+      this._report(ActionType.AdRequest)
+      if (this._userInvokeShowFlag) {
+        this._userInvokeShowFlag = false
+        setTimeout(() => {
+          this.show()
+        }, 1)
       }
     },
 
-    _onmpclose (e) {
+    _onmpclose (e) {
       const detail = e.detail || e
       this._dispatchEvent(EventType.Close, detail)
       if (detail.adsdata) {
@@ -169,6 +188,7 @@ export default {
       this.loading = false
       this.errorMessage = JSON.stringify(e.detail)
       this._dispatchEvent(EventType.Error, e.detail)
+      this._report(ActionType.AdRequest, e.detail)
     },
 
     _onnextchannel (e) {
@@ -181,9 +201,9 @@ export default {
             case 4:
               this.wxAdType = AdType.Banner
               this.userwx = true
-              this.userUnitId = adData.posid
-              if (adData.tmpl_type === 24) {
-                this.customFullscreen = 'uni-ad-custom-fullscreen'
+              this.userUnitId = adData.posid
+              if (adData.tmpl_type === 24) {
+                this.customFullscreen = 'uni-ad-custom-fullscreen'
               }
               break
             case 9:
@@ -196,20 +216,22 @@ export default {
               break
           }
         } else if (adData.provider === 10018) {
-          this._providerType = ProviderType.WeChat
-          if (adData.tmpl_type === 24) {
-            this.customFullscreen = 'uni-ad-custom-fullscreen'
-          }
-          this.loading = true
-          if (!adData.dcloudAdpid) {
-            adData.dcloudAdpid = this.adpid
+          this._providerType = ProviderType.WeChat
+          if (adData.tmpl_type === 24) {
+            this.customFullscreen = 'uni-ad-custom-fullscreen'
+          }
+          this.loading = true
+          if (!adData.dcloudAdpid) {
+            adData.dcloudAdpid = this.adpid
           }
           this.selectComponent('.uniad-plugin-wx').setConfig(adData)
         }
       })
     },
-
-    _onwxchannelerror (e) {
+    _customFullscreen () {
+      this.customFullscreen = 'uni-ad-custom-fullscreen'
+    },
+    _onwxchannelerror (e) {
       this._dispatchEvent(EventType.Error, e.detail || e)
     },
 
@@ -228,9 +250,9 @@ export default {
             iv,
             version,
             expireTime
-          }) => {
-            const uniOptions = {
-              adpid: this.adpid
+          }) => {
+            const uniOptions = {
+              adpid: this.adpid
             }
             adComponent.show({
               userId: this.urlCallback.userId || '',
@@ -238,7 +260,7 @@ export default {
               encryptKey,
               iv,
               version,
-              expireTime,
+              expireTime,
               uniOptions
             })
           },
@@ -284,19 +306,25 @@ export default {
         case AdType.RewardedVideo:
           if (!this._wxRewardedAd) {
             return
-          }
+          }
           // eslint-disable-next-line handle-callback-err
-          this._wxRewardedAd.show().catch((err) => {
+          this._wxRewardedAd.show().then(() => {
+            this._report(ActionType.Show)
+          }).catch((err) => {
             this._dispatchEvent(EventType.Error, err)
+            this._report(ActionType.Show, err)
           })
           break
         case AdType.Interstitial:
           if (!this._wxInterstitialAd) {
             return
-          }
+          }
           // eslint-disable-next-line handle-callback-err
-          this._wxInterstitialAd.show().catch((err) => {
+          this._wxInterstitialAd.show().then(() => {
+            this._report(ActionType.Show)
+          }).catch((err) => {
             this._dispatchEvent(EventType.Error, err)
+            this._report(ActionType.Show, err)
           })
           break
       }
@@ -313,6 +341,7 @@ export default {
       this._wxRewardedAd.onLoad(() => {
         this.loading = false
         this._dispatchEvent(EventType.Load, {})
+        this._report(ActionType.AdRequest)
         if (this._userInvokeShowFlag) {
           this._userInvokeShowFlag = false
           this._wxRewardedAd.show()
@@ -320,21 +349,21 @@ export default {
       })
 
       this._wxRewardedAd.onError(err => {
-        this.loading = false
+        this.loading = false
         this.errorMessage = JSON.stringify(err)
         this._dispatchEvent(EventType.Error, err)
       })
 
-      this._wxRewardedAd.onClose(res => {
+      this._wxRewardedAd.onClose(res => {
         this._dispatchEvent(EventType.Close, res)
         if (res.isEnded && this._hasCallback()) {
           this._callServer()
         }
-      })
-
-      this._wxRewardedAd.load().then(() => {
-      }).catch((_) => {
-      })
+      })
+
+      this._wxRewardedAd.load().then(() => {
+      }).catch((_) => {
+      })
 
       this.loading = true
     },
@@ -350,6 +379,7 @@ export default {
       this._wxInterstitialAd.onLoad(() => {
         this.loading = false
         this._dispatchEvent(EventType.Load, {})
+        this._report(ActionType.AdRequest)
         if (this._userInvokeShowFlag) {
           this._userInvokeShowFlag = false
           this._wxInterstitialAd.show().catch((err) => {
@@ -359,17 +389,19 @@ export default {
       })
 
       this._wxInterstitialAd.onError(err => {
-        this.loading = false
+        this.loading = false
         this.errorMessage = JSON.stringify(err)
         this._dispatchEvent(EventType.Error, err)
+        this._report(ActionType.AdRequest, err)
       })
 
       this._wxInterstitialAd.onClose(res => {
         this._dispatchEvent(EventType.Close, res)
-      })
-
+      })
+
       this._wxInterstitialAd.load().catch((err) => {
         this._dispatchEvent(EventType.Error, err)
+        this._report(ActionType.AdRequest, err)
       })
 
       this.loading = true
@@ -400,6 +432,18 @@ export default {
 
     toJSON () {
       return ''
+    },
+
+    _report (type, detail) {
+      const adComponent = this.selectComponent('.uniad-plugin')
+      if (adComponent && adComponent._unireport) {
+        adComponent._unireport({
+          isUni: true,
+          adpid: this.adpid,
+          type,
+          detail: detail || ''
+        })
+      }
     }
   }
 }

package/components/uniad.vue

@@ -1,40 +1,52 @@
-<template>
-  <view @click="onclick">
-    <uniad-plugin
-      class="uniad-plugin"
-      :adpid="adpid"
-      @load="_onmpload"
-      @close="_onmpclose"
+<template>
+  <view :class="[customFullscreen?'uni-ad-custom':'',customFullscreen]" :style="style" @click="onclick">
+    <uniad-plugin
+      class="uniad-plugin"
+      :adpid="adpid"
+      :isUni="true"
+      :adIntervals="adIntervals"
+      @load="_onmpload"
+      @close="_onmpclose"
       @error="_onmperror"
-      @nextChannel="_onnextchannel"
+      @nextChannel="_onnextchannel"
+      @customFullscreen="_customFullscreen"
     />
     <!-- #ifdef MP-WEIXIN -->
-    <ad-custom v-if="userwx" :unit-id="userUnitId" class="uni-ad-custom" data-com-type="wx" :class="[customFullscreen]" @load="_onmpload" @error="_onmperror"></ad-custom>
-    <uniad-plugin-wx v-if="wxchannel" class="uniad-plugin-wx" :class="[customFullscreen]" data-com-type="wx" @load="_onmpload" @error="_onwxchannelerror"></uniad-plugin-wx>
-    <!-- #endif -->
-  </view>
-</template>
-
+    <ad-custom v-if="userwx" :adIntervals="adIntervals" :unit-id="userUnitId" class="uni-ad-custom" data-com-type="wx" :class="[customFullscreen]" @load="_onmpload" @error="_onmperror"></ad-custom>
+    <!-- <uniad-plugin-wx v-if="wxchannel" class="uniad-plugin-wx" :class="[customFullscreen]" data-com-type="wx" @load="_onmpload" @error="_onwxchannelerror"></uniad-plugin-wx> -->
+    <!-- #endif -->
+  </view>
+</template>
+
 <script>
-// #ifdef MP-WEIXIN
-import adMixin from "./ad.mixin.mp-weixin.js"
+// #ifdef MP-WEIXIN
+import adMixin from "./ad.mixin.mp-weixin.js"
 // #endif
 // #ifdef MP-ALIPAY
 import adMixin from "./ad.mixin.mp-alipay.js"
-// #endif
-export default {
-  name: 'Uniad',
-  mixins: [adMixin],
-  props: {
-  },
-  methods: {
-  }
-}
-</script>
+// #endif
+export default {
+  name: 'Uniad',
+  mixins: [adMixin],
+  props: {
+  },
+  methods: {
+  }
+}
+</script>
 
 <style>
 .uni-ad-custom-fullscreen {
-  display: flex;
-  height: 100vh;
+  display: flex;
+  height: 100vh;
+}
+.uni-ad-custom {
+  display: flex;
+  flex: 1;
+  width: 100%;
+}
+.uniad-plugin {
+  display: flex;
+  flex: 1;
 }
 </style>

package/lib/cache.js

@@ -200,6 +200,18 @@ function updateUsingComponents (name, usingComponents, type, content = '') {
   }
   if (oldJsonStr) { // update
     jsonObj.usingComponents = usingComponents
+    // 嵌套组件获取 props 为 null，使用占组件修正父子组件生命周期执行顺序 https://developer.open-douyin.com/docs/resource/zh-CN/mini-app/develop/tutorial/custom-component/placeholder
+    if (process.env.UNI_PLATFORM === 'mp-toutiao') {
+      if (type === 'Component') {
+        const usingComponentnames = Object.keys(jsonObj.usingComponents)
+        if (usingComponentnames.length) {
+          jsonObj.componentPlaceholder = {}
+          usingComponentnames.forEach(componentName => {
+            jsonObj.componentPlaceholder[componentName] = 'view'
+          })
+        }
+      }
+    }
     const newJsonStr = JSON.stringify(jsonObj, null, 2)
     if (newJsonStr !== oldJsonStr) {
       updateJsonFile(name, newJsonStr)

package/lib/index.js

@@ -74,6 +74,14 @@ const {
   initTheme
 } = require('./theme')
 
+const {
+  createRpx2Unit,
+  defaultRpx2Unit,
+  unitRE,
+  setRpx2Unit,
+  getRpx2Unit
+} = require('./style')
+
 module.exports = {
   uts,
   md5,
@@ -130,5 +138,10 @@ module.exports = {
   getPlatformUniCloud,
   parseTheme,
   initTheme,
-  getDevUniConsoleCode
+  getDevUniConsoleCode,
+  createRpx2Unit,
+  defaultRpx2Unit,
+  unitRE,
+  setRpx2Unit,
+  getRpx2Unit
 }

package/lib/pages.js

@@ -329,6 +329,14 @@ function generateGlobalUsingComponentsCode (usingComponents) {
   return `${importCode.join(';')};${componentsCode.join(';')};`
 }
 
+function getSubpackageRoots () {
+  const pagesJson = getPagesJson()
+  if (Array.isArray(pagesJson.subPackages) && pagesJson.subPackages.length) {
+    return pagesJson.subPackages.map(({ root }) => root).filter(Boolean)
+  }
+  return []
+}
+
 function getGlobalUsingComponentsCode () {
   const pagesJson = getPagesJson()
   const usingComponents = pagesJson.globalStyle && pagesJson.globalStyle.usingComponents
@@ -575,6 +583,7 @@ module.exports = {
   parsePages,
   parseEntry,
   getPagesJson,
+  getSubpackageRoots,
   parsePagesJson,
   pagesJsonJsFileName,
   getAutoComponents,

package/lib/style.js

@@ -0,0 +1,60 @@
+const unitRE = new RegExp('"[^"]+"|\'[^\']+\'|url\\([^)]+\\)|(\\d*\\.?\\d+)[r|u]px', 'g')
+
+function toFixed (number, precision) {
+  const multiplier = Math.pow(10, precision + 1)
+  const wholeNumber = Math.floor(number * multiplier)
+  return (Math.round(wholeNumber / 10) * 10) / multiplier
+}
+
+const defaultRpx2Unit = {
+  unit: 'rem',
+  unitRatio: 10 / 320,
+  unitPrecision: 5
+}
+
+const Rpx2Unit = Object.assign({}, defaultRpx2Unit)
+
+function setRpx2Unit (config) {
+  return Object.assign(config, defaultRpx2Unit)
+}
+
+function getRpx2Unit () {
+  return Rpx2Unit
+}
+
+function _rpx2Unit (rpx, unit, unitRatio, unitPrecision) {
+  if (unitRatio === 1) {
+    return `${rpx}${unit}`
+  }
+  const value = toFixed(rpx * unitRatio, unitPrecision)
+  return value === 0 ? '0' : `${value}${unit}`
+}
+
+function createRpx2Unit (unit, unitRatio, unitPrecision) {
+  // ignore: rpxCalcIncludeWidth
+  /**
+   * @param {string | number} val
+   * @returns {string}
+   */
+  return (val) => {
+    if (unitRE.test(val)) {
+      return val.replace(unitRE, (m, $1) => {
+        if (!$1) {
+          return m
+        }
+
+        return _rpx2Unit(parseFloat($1), unit, unitRatio, unitPrecision)
+      })
+    } else {
+      return _rpx2Unit(parseFloat(val), unit, unitRatio, unitPrecision)
+    }
+  }
+}
+
+module.exports = {
+  unitRE,
+  defaultRpx2Unit,
+  setRpx2Unit,
+  getRpx2Unit,
+  createRpx2Unit
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "2.0.2-4080720251210002",
+  "version": "2.0.2-5000420260318002",
   "description": "uni-cli-shared",
   "main": "lib/index.js",
   "repository": {
@@ -27,5 +27,5 @@
     "postcss-urlrewrite": "^0.2.2",
     "strip-json-comments": "^2.0.1"
   },
-  "gitHead": "18c75eccfcdabb303c0675cafdc44bc3cf58d7be"
+  "gitHead": "5ee212292b880f06dde5d198e5ceb09f9d3769e1"
 }