build: compile 1.11.3-beta.0

dist/action-sheet/index.js

@@ -36,6 +36,10 @@ VantComponent({
             type: Boolean,
             value: true,
         },
+        rootPortal: {
+            type: Boolean,
+            value: false,
+        },
     },
     methods: {
         onSelect(event) {

dist/action-sheet/index.wxml

@@ -9,6 +9,7 @@
   custom-class="van-action-sheet custom-class"
   safe-area-inset-bottom="{{ safeAreaInsetBottom }}"
   close-on-click-overlay="{{ closeOnClickOverlay }}"
+  root-portal="{{ rootPortal }}"
   bind:close="onClickOverlay"
 >
   <view wx:if="{{ title }}" class="van-action-sheet__header">

dist/calendar/index.js

@@ -113,6 +113,10 @@ VantComponent({
             value: 0,
         },
         readonly: Boolean,
+        rootPortal: {
+            type: Boolean,
+            value: false,
+        },
     },
     data: {
         subtitle: '',

dist/calendar/index.wxml

@@ -13,6 +13,7 @@
   closeable="{{ showTitle || showSubtitle }}"
   close-on-click-overlay="{{ closeOnClickOverlay }}"
   safe-area-inset-bottom="{{ safeAreaInsetBottom }}"
+  root-portal="{{ rootPortal }}"
   bind:enter="onOpen"
   bind:close="onClose"
   bind:after-enter="onOpened"

dist/cascader/index.js

@@ -49,6 +49,7 @@ VantComponent({
             value: defaultFieldNames,
             observer: 'updateFieldNames',
         },
+        useTitleSlot: Boolean,
     },
     data: {
         tabs: [],

dist/cascader/index.wxml

@@ -1,7 +1,8 @@
 <wxs src="./index.wxs" module="utils" />
 
 <view wx:if="{{ showHeader }}" class="van-cascader__header">
-  <text class="van-cascader__title"><slot name="title"></slot>{{ title }}</text>
+  <slot name="title" wx:if="{{ useTitleSlot }}"></slot>
+  <text class="van-cascader__title" wx:else>{{ title }}</text>
   <van-icon
     wx:if="{{ closeable }}"
     name="{{ closeIcon }}"

dist/dialog/index.js

@@ -65,6 +65,10 @@ VantComponent({
             type: String,
             value: 'scale',
         },
+        rootPortal: {
+            type: Boolean,
+            value: false,
+        },
     },
     data: {
         loading: {

dist/dialog/index.wxml

@@ -9,6 +9,7 @@
   custom-style="width: {{ utils.addUnit(width) }};{{ customStyle }}"
   overlay-style="{{ overlayStyle }}"
   close-on-click-overlay="{{ closeOnClickOverlay }}"
+  root-portal="{{ rootPortal }}"
   bind:close="onClickOverlay"
 >
   <view

dist/goods-action-button/index.js

@@ -19,6 +19,10 @@ VantComponent({
             type: String,
             value: 'danger',
         },
+        customStyle: {
+            type: String,
+            value: '',
+        },
     },
     methods: {
         onClick(event) {

dist/goods-action-button/index.wxml

@@ -12,6 +12,7 @@
   open-type="{{ openType }}"
   class="{{ utils.bem('goods-action-button', [type, { first: isFirst, last: isLast, plain: plain }])}}"
   custom-class="van-goods-action-button__inner custom-class"
+  custom-style="{{customStyle}}"
   business-id="{{ businessId }}"
   session-from="{{ sessionFrom }}"
   app-parameter="{{ appParameter }}"

dist/mixins/transition.js

@@ -46,6 +46,7 @@ export function transition(showDefaultValue) {
                 value ? this.enter() : this.leave();
             },
             enter() {
+                this.waitEnterEndPromise = new Promise((resolve) => {
                     const { duration, name } = this.data;
                     const classNames = getClassNames(name);
                     const currentDuration = isObj(duration) ? duration.enter : duration;
@@ -71,10 +72,15 @@ export function transition(showDefaultValue) {
                             }
                             this.transitionEnded = false;
                             this.setData({ classes: classNames['enter-to'] });
+                            resolve();
+                        });
                     });
                 });
             },
             leave() {
+                if (!this.waitEnterEndPromise)
+                    return;
+                this.waitEnterEndPromise.then(() => {
                     if (!this.data.display) {
                         return;
                     }
@@ -101,6 +107,7 @@ export function transition(showDefaultValue) {
                             this.setData({ classes: classNames['leave-to'] });
                         });
                     });
+                });
             },
             onTransitionEnd() {
                 if (this.transitionEnded) {

dist/share-sheet/index.js

@@ -36,6 +36,10 @@ VantComponent({
             type: null,
             value: 300,
         },
+        rootPortal: {
+            type: Boolean,
+            value: false,
+        },
     },
     methods: {
         onClickOverlay() {

dist/share-sheet/index.wxml

@@ -11,6 +11,7 @@
   overlay-style="{{ overlayStyle }}"
   close-on-click-overlay="{{ closeOnClickOverlay }}"
   safe-area-inset-bottom="{{ safeAreaInsetBottom }}"
+  root-portal="{{ rootPortal }}"
   bind:close="onClose"
   bind:click-overlay="onClickOverlay"
 >

dist/uploader/shared.js

@@ -40,7 +40,7 @@ export const mediaProps = {
     },
     mediaType: {
         type: Array,
-        value: ['image', 'video'],
+        value: ['image', 'video', 'mix'],
     },
     maxDuration: {
         type: Number,

dist/uploader/utils.js

@@ -33,7 +33,7 @@ function formatVideo(res) {
     ];
 }
 function formatMedia(res) {
-    return res.tempFiles.map((item) => (Object.assign(Object.assign({}, pickExclude(item, ['fileType', 'thumbTempFilePath', 'tempFilePath'])), { type: res.type, url: item.tempFilePath, thumb: res.type === 'video' ? item.thumbTempFilePath : item.tempFilePath })));
+    return res.tempFiles.map((item) => (Object.assign(Object.assign({}, pickExclude(item, ['fileType', 'thumbTempFilePath', 'tempFilePath'])), { type: item.fileType, url: item.tempFilePath, thumb: item.fileType === 'video' ? item.thumbTempFilePath : item.tempFilePath })));
 }
 function formatFile(res) {
     return res.tempFiles.map((item) => (Object.assign(Object.assign({}, pickExclude(item, ['path'])), { url: item.path })));

lib/action-sheet/index.js

@@ -38,6 +38,10 @@ var button_1 = require("../mixins/button");
             type: Boolean,
             value: true,
         },
+        rootPortal: {
+            type: Boolean,
+            value: false,
+        },
     },
     methods: {
         onSelect: function (event) {

lib/action-sheet/index.wxml

@@ -9,6 +9,7 @@
   custom-class="van-action-sheet custom-class"
   safe-area-inset-bottom="{{ safeAreaInsetBottom }}"
   close-on-click-overlay="{{ closeOnClickOverlay }}"
+  root-portal="{{ rootPortal }}"
   bind:close="onClickOverlay"
 >
   <view wx:if="{{ title }}" class="van-action-sheet__header">

lib/calendar/index.js

@@ -129,6 +129,10 @@ var getTime = function (date) {
             value: 0,
         },
         readonly: Boolean,
+        rootPortal: {
+            type: Boolean,
+            value: false,
+        },
     },
     data: {
         subtitle: '',

lib/calendar/index.wxml

@@ -13,6 +13,7 @@
   closeable="{{ showTitle || showSubtitle }}"
   close-on-click-overlay="{{ closeOnClickOverlay }}"
   safe-area-inset-bottom="{{ safeAreaInsetBottom }}"
+  root-portal="{{ rootPortal }}"
   bind:enter="onOpen"
   bind:close="onClose"
   bind:after-enter="onOpened"

lib/cascader/index.js

@@ -60,6 +60,7 @@ var defaultFieldNames = {
             value: defaultFieldNames,
             observer: 'updateFieldNames',
         },
+        useTitleSlot: Boolean,
     },
     data: {
         tabs: [],

lib/cascader/index.wxml

@@ -1,7 +1,8 @@
 <wxs src="./index.wxs" module="utils" />
 
 <view wx:if="{{ showHeader }}" class="van-cascader__header">
-  <text class="van-cascader__title"><slot name="title"></slot>{{ title }}</text>
+  <slot name="title" wx:if="{{ useTitleSlot }}"></slot>
+  <text class="van-cascader__title" wx:else>{{ title }}</text>
   <van-icon
     wx:if="{{ closeable }}"
     name="{{ closeIcon }}"

lib/dialog/index.js

@@ -67,6 +67,10 @@ var utils_1 = require("../common/utils");
             type: String,
             value: 'scale',
         },
+        rootPortal: {
+            type: Boolean,
+            value: false,
+        },
     },
     data: {
         loading: {

lib/dialog/index.wxml

@@ -9,6 +9,7 @@
   custom-style="width: {{ utils.addUnit(width) }};{{ customStyle }}"
   overlay-style="{{ overlayStyle }}"
   close-on-click-overlay="{{ closeOnClickOverlay }}"
+  root-portal="{{ rootPortal }}"
   bind:close="onClickOverlay"
 >
   <view

lib/goods-action-button/index.js

@@ -21,6 +21,10 @@ var link_1 = require("../mixins/link");
             type: String,
             value: 'danger',
         },
+        customStyle: {
+            type: String,
+            value: '',
+        },
     },
     methods: {
         onClick: function (event) {

lib/goods-action-button/index.wxml

@@ -12,6 +12,7 @@
   open-type="{{ openType }}"
   class="{{ utils.bem('goods-action-button', [type, { first: isFirst, last: isLast, plain: plain }])}}"
   custom-class="van-goods-action-button__inner custom-class"
+  custom-style="{{customStyle}}"
   business-id="{{ businessId }}"
   session-from="{{ sessionFrom }}"
   app-parameter="{{ appParameter }}"

lib/mixins/transition.js

@@ -50,14 +50,15 @@ function transition(showDefaultValue) {
             },
             enter: function () {
                 var _this = this;
-                var _a = this.data, duration = _a.duration, name = _a.name;
+                this.waitEnterEndPromise = new Promise(function (resolve) {
+                    var _a = _this.data, duration = _a.duration, name = _a.name;
                     var classNames = getClassNames(name);
                     var currentDuration = (0, validator_1.isObj)(duration) ? duration.enter : duration;
-                if (this.status === 'enter') {
+                    if (_this.status === 'enter') {
                         return;
                     }
-                this.status = 'enter';
+                    _this.status = 'enter';
-                this.$emit('before-enter');
+                    _this.$emit('before-enter');
                     (0, utils_1.requestAnimationFrame)(function () {
                         if (_this.status !== 'enter') {
                             return;
@@ -75,19 +76,24 @@ function transition(showDefaultValue) {
                             }
                             _this.transitionEnded = false;
                             _this.setData({ classes: classNames['enter-to'] });
+                            resolve();
+                        });
                     });
                 });
             },
             leave: function () {
                 var _this = this;
-                if (!this.data.display) {
+                if (!this.waitEnterEndPromise)
+                    return;
+                this.waitEnterEndPromise.then(function () {
+                    if (!_this.data.display) {
                         return;
                     }
-                var _a = this.data, duration = _a.duration, name = _a.name;
+                    var _a = _this.data, duration = _a.duration, name = _a.name;
                     var classNames = getClassNames(name);
                     var currentDuration = (0, validator_1.isObj)(duration) ? duration.leave : duration;
-                this.status = 'leave';
+                    _this.status = 'leave';
-                this.$emit('before-leave');
+                    _this.$emit('before-leave');
                     (0, utils_1.requestAnimationFrame)(function () {
                         if (_this.status !== 'leave') {
                             return;
@@ -106,6 +112,7 @@ function transition(showDefaultValue) {
                             _this.setData({ classes: classNames['leave-to'] });
                         });
                     });
+                });
             },
             onTransitionEnd: function () {
                 if (this.transitionEnded) {

lib/share-sheet/index.js

@@ -38,6 +38,10 @@ var component_1 = require("../common/component");
             type: null,
             value: 300,
         },
+        rootPortal: {
+            type: Boolean,
+            value: false,
+        },
     },
     methods: {
         onClickOverlay: function () {

lib/share-sheet/index.wxml

@@ -11,6 +11,7 @@
   overlay-style="{{ overlayStyle }}"
   close-on-click-overlay="{{ closeOnClickOverlay }}"
   safe-area-inset-bottom="{{ safeAreaInsetBottom }}"
+  root-portal="{{ rootPortal }}"
   bind:close="onClose"
   bind:click-overlay="onClickOverlay"
 >

lib/uploader/shared.js

@@ -43,7 +43,7 @@ exports.mediaProps = {
     },
     mediaType: {
         type: Array,
-        value: ['image', 'video'],
+        value: ['image', 'video', 'mix'],
     },
     maxDuration: {
         type: Number,

lib/uploader/utils.js

@@ -49,7 +49,7 @@ function formatVideo(res) {
     ];
 }
 function formatMedia(res) {
-    return res.tempFiles.map(function (item) { return (__assign(__assign({}, (0, utils_1.pickExclude)(item, ['fileType', 'thumbTempFilePath', 'tempFilePath'])), { type: res.type, url: item.tempFilePath, thumb: res.type === 'video' ? item.thumbTempFilePath : item.tempFilePath })); });
+    return res.tempFiles.map(function (item) { return (__assign(__assign({}, (0, utils_1.pickExclude)(item, ['fileType', 'thumbTempFilePath', 'tempFilePath'])), { type: item.fileType, url: item.tempFilePath, thumb: item.fileType === 'video' ? item.thumbTempFilePath : item.tempFilePath })); });
 }
 function formatFile(res) {
     return res.tempFiles.map(function (item) { return (__assign(__assign({}, (0, utils_1.pickExclude)(item, ['path'])), { url: item.path })); });