dist/action-sheet/index.js

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

dist/action-sheet/index.wxml

@@ -9,7 +9,6 @@
   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,10 +113,6 @@ VantComponent({
             value: 0,
         },
         readonly: Boolean,
-        rootPortal: {
-            type: Boolean,
-            value: false,
-        },
     },
     data: {
         subtitle: '',

dist/calendar/index.wxml

@@ -13,7 +13,6 @@
   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,7 +49,6 @@ VantComponent({
             value: defaultFieldNames,
             observer: 'updateFieldNames',
         },
-        useTitleSlot: Boolean,
     },
     data: {
         tabs: [],

dist/cascader/index.wxml

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

dist/dialog/index.js

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

dist/dialog/index.wxml

@@ -9,7 +9,6 @@
   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,10 +19,6 @@ VantComponent({
             type: String,
             value: 'danger',
         },
-        customStyle: {
-            type: String,
-            value: '',
-        },
     },
     methods: {
         onClick(event) {

dist/goods-action-button/index.wxml

@@ -12,7 +12,6 @@
   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,66 +46,59 @@ 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;
-                    if (this.status === 'enter') {
+                const { duration, name } = this.data;
+                const classNames = getClassNames(name);
+                const currentDuration = isObj(duration) ? duration.enter : duration;
+                if (this.status === 'enter') {
+                    return;
+                }
+                this.status = 'enter';
+                this.$emit('before-enter');
+                requestAnimationFrame(() => {
+                    if (this.status !== 'enter') {
                         return;
                     }
-                    this.status = 'enter';
-                    this.$emit('before-enter');
+                    this.$emit('enter');
+                    this.setData({
+                        inited: true,
+                        display: true,
+                        classes: classNames.enter,
+                        currentDuration,
+                    });
                     requestAnimationFrame(() => {
                         if (this.status !== 'enter') {
                             return;
                         }
-                        this.$emit('enter');
-                        this.setData({
-                            inited: true,
-                            display: true,
-                            classes: classNames.enter,
-                            currentDuration,
-                        });
-                        requestAnimationFrame(() => {
-                            if (this.status !== 'enter') {
-                                return;
-                            }
-                            this.transitionEnded = false;
-                            this.setData({ classes: classNames['enter-to'] });
-                            resolve();
-                        });
+                        this.transitionEnded = false;
+                        this.setData({ classes: classNames['enter-to'] });
                     });
                 });
             },
             leave() {
-                if (!this.waitEnterEndPromise)
+                if (!this.data.display) {
                     return;
-                this.waitEnterEndPromise.then(() => {
-                    if (!this.data.display) {
+                }
+                const { duration, name } = this.data;
+                const classNames = getClassNames(name);
+                const currentDuration = isObj(duration) ? duration.leave : duration;
+                this.status = 'leave';
+                this.$emit('before-leave');
+                requestAnimationFrame(() => {
+                    if (this.status !== 'leave') {
                         return;
                     }
-                    const { duration, name } = this.data;
-                    const classNames = getClassNames(name);
-                    const currentDuration = isObj(duration) ? duration.leave : duration;
-                    this.status = 'leave';
-                    this.$emit('before-leave');
+                    this.$emit('leave');
+                    this.setData({
+                        classes: classNames.leave,
+                        currentDuration,
+                    });
                     requestAnimationFrame(() => {
                         if (this.status !== 'leave') {
                             return;
                         }
-                        this.$emit('leave');
-                        this.setData({
-                            classes: classNames.leave,
-                            currentDuration,
-                        });
-                        requestAnimationFrame(() => {
-                            if (this.status !== 'leave') {
-                                return;
-                            }
-                            this.transitionEnded = false;
-                            setTimeout(() => this.onTransitionEnd(), currentDuration);
-                            this.setData({ classes: classNames['leave-to'] });
-                        });
+                        this.transitionEnded = false;
+                        setTimeout(() => this.onTransitionEnd(), currentDuration);
+                        this.setData({ classes: classNames['leave-to'] });
                     });
                 });
             },

dist/share-sheet/index.js

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

dist/share-sheet/index.wxml

@@ -11,7 +11,6 @@
   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', 'mix'],
+        value: ['image', 'video'],
     },
     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: item.fileType, url: item.tempFilePath, thumb: item.fileType === 'video' ? item.thumbTempFilePath : item.tempFilePath })));
+    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 })));
 }
 function formatFile(res) {
     return res.tempFiles.map((item) => (Object.assign(Object.assign({}, pickExclude(item, ['path'])), { url: item.path })));

docs/markdown/changelog.md

@@ -1,22 +1,5 @@
 # 更新日志
 
-### [v1.11.3](https://github.com/youzan/vant-weapp/compare/v1.11.2...v1.11.3)
-
-`2024-01-16`
-
-**Bug Fixes**
-
-- Cascader: fix title slot inoperative [#5676](https://github.com/youzan/vant-weapp/issues/5676)
-- Transition: fix transition event sequence [#5699](https://github.com/youzan/vant-weapp/issues/5699)
-
-
-**Feature**
-
-- Calendar、ActionSheet、Dialog、ShareSheet: add root portal prop [#5680](https://github.com/youzan/vant-weapp/issues/5680)
-- goods-action-button: add custom-style prop support [#5659](https://github.com/youzan/vant-weapp/issues/5659)
-- Upload: support mix mediaType #5690 [#5690](https://github.com/youzan/vant-weapp/issues/5690)
-
-
 ### [v1.11.2](https://github.com/youzan/vant-weapp/compare/v1.11.1...v1.11.2)
 
 `2023-12-05`

lib/action-sheet/index.js

@@ -38,10 +38,6 @@ 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,7 +9,6 @@
   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,10 +129,6 @@ var getTime = function (date) {
             value: 0,
         },
         readonly: Boolean,
-        rootPortal: {
-            type: Boolean,
-            value: false,
-        },
     },
     data: {
         subtitle: '',

lib/calendar/index.wxml

@@ -13,7 +13,6 @@
   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,7 +60,6 @@ var defaultFieldNames = {
             value: defaultFieldNames,
             observer: 'updateFieldNames',
         },
-        useTitleSlot: Boolean,
     },
     data: {
         tabs: [],

lib/cascader/index.wxml

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

lib/dialog/index.js

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

lib/dialog/index.wxml

@@ -9,7 +9,6 @@
   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,10 +21,6 @@ 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,7 +12,6 @@
   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,67 +50,60 @@ function transition(showDefaultValue) {
             },
             enter: function () {
                 var _this = this;
-                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') {
+                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') {
+                    return;
+                }
+                this.status = 'enter';
+                this.$emit('before-enter');
+                (0, utils_1.requestAnimationFrame)(function () {
+                    if (_this.status !== 'enter') {
                         return;
                     }
-                    _this.status = 'enter';
-                    _this.$emit('before-enter');
+                    _this.$emit('enter');
+                    _this.setData({
+                        inited: true,
+                        display: true,
+                        classes: classNames.enter,
+                        currentDuration: currentDuration,
+                    });
                     (0, utils_1.requestAnimationFrame)(function () {
                         if (_this.status !== 'enter') {
                             return;
                         }
-                        _this.$emit('enter');
-                        _this.setData({
-                            inited: true,
-                            display: true,
-                            classes: classNames.enter,
-                            currentDuration: currentDuration,
-                        });
-                        (0, utils_1.requestAnimationFrame)(function () {
-                            if (_this.status !== 'enter') {
-                                return;
-                            }
-                            _this.transitionEnded = false;
-                            _this.setData({ classes: classNames['enter-to'] });
-                            resolve();
-                        });
+                        _this.transitionEnded = false;
+                        _this.setData({ classes: classNames['enter-to'] });
                     });
                 });
             },
             leave: function () {
                 var _this = this;
-                if (!this.waitEnterEndPromise)
+                if (!this.data.display) {
                     return;
-                this.waitEnterEndPromise.then(function () {
-                    if (!_this.data.display) {
+                }
+                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.$emit('before-leave');
+                (0, utils_1.requestAnimationFrame)(function () {
+                    if (_this.status !== 'leave') {
                         return;
                     }
-                    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.$emit('before-leave');
+                    _this.$emit('leave');
+                    _this.setData({
+                        classes: classNames.leave,
+                        currentDuration: currentDuration,
+                    });
                     (0, utils_1.requestAnimationFrame)(function () {
                         if (_this.status !== 'leave') {
                             return;
                         }
-                        _this.$emit('leave');
-                        _this.setData({
-                            classes: classNames.leave,
-                            currentDuration: currentDuration,
-                        });
-                        (0, utils_1.requestAnimationFrame)(function () {
-                            if (_this.status !== 'leave') {
-                                return;
-                            }
-                            _this.transitionEnded = false;
-                            setTimeout(function () { return _this.onTransitionEnd(); }, currentDuration);
-                            _this.setData({ classes: classNames['leave-to'] });
-                        });
+                        _this.transitionEnded = false;
+                        setTimeout(function () { return _this.onTransitionEnd(); }, currentDuration);
+                        _this.setData({ classes: classNames['leave-to'] });
                     });
                 });
             },

lib/share-sheet/index.js

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

lib/share-sheet/index.wxml

@@ -11,7 +11,6 @@
   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', 'mix'],
+        value: ['image', 'video'],
     },
     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: item.fileType, url: item.tempFilePath, thumb: item.fileType === 'video' ? item.thumbTempFilePath : item.tempFilePath })); });
+    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 })); });
 }
 function formatFile(res) {
     return res.tempFiles.map(function (item) { return (__assign(__assign({}, (0, utils_1.pickExclude)(item, ['path'])), { url: item.path })); });

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vant/weapp",
-  "version": "1.11.3",
+  "version": "1.11.2",
   "author": "vant-ui",
   "license": "MIT",
   "miniprogram": "lib",

packages/goods-action-button/index.ts

@@ -22,10 +22,6 @@ VantComponent({
       type: String,
       value: 'danger',
     },
-    customStyle: {
-      type: String,
-      value: '',
-    },
   },
 
   methods: {

packages/goods-action-button/index.wxml

@@ -12,7 +12,6 @@
   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 }}"

packages/goods-action/README.md

@@ -144,7 +144,6 @@ Page({
 | send-message-path | 会话内消息卡片点击跳转小程序路径 | _string_ | 当前分享路径 |
 | send-message-img | sendMessageImg | _string_ | 截图 |
 | show-message-card | 显示会话内消息卡片 | _string_ | `false` |
-| custom-style `v1.11.3` | 自定义样式 | _string_ | '' |
 
 ### Events