build: compile 1.11.3-beta.0

youzan · Jan 16, 2024 · 7c0c9e4 · 7c0c9e4
1 parent ff8fe1c
commit 7c0c9e4
Show file tree

Hide file tree

Showing 30 changed files with 146 additions and 78 deletions.
diff --git a/dist/action-sheet/index.js b/dist/action-sheet/index.js
@@ -36,6 +36,10 @@ VantComponent({
             type: Boolean,
             value: true,
         },
+        rootPortal: {
+            type: Boolean,
+            value: false,
+        },
     },
     methods: {
         onSelect(event) {

diff --git a/dist/action-sheet/index.wxml b/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">

diff --git a/dist/calendar/index.js b/dist/calendar/index.js
@@ -113,6 +113,10 @@ VantComponent({
             value: 0,
         },
         readonly: Boolean,
+        rootPortal: {
+            type: Boolean,
+            value: false,
+        },
     },
     data: {
         subtitle: '',

diff --git a/dist/calendar/index.wxml b/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"

diff --git a/dist/cascader/index.js b/dist/cascader/index.js
@@ -49,6 +49,7 @@ VantComponent({
             value: defaultFieldNames,
             observer: 'updateFieldNames',
         },
+        useTitleSlot: Boolean,
     },
     data: {
         tabs: [],

diff --git a/dist/cascader/index.wxml b/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 }}"

diff --git a/dist/dialog/index.js b/dist/dialog/index.js
@@ -65,6 +65,10 @@ VantComponent({
             type: String,
             value: 'scale',
         },
+        rootPortal: {
+            type: Boolean,
+            value: false,
+        },
     },
     data: {
         loading: {

diff --git a/dist/dialog/index.wxml b/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

diff --git a/dist/goods-action-button/index.js b/dist/goods-action-button/index.js
@@ -19,6 +19,10 @@ VantComponent({
             type: String,
             value: 'danger',
         },
+        customStyle: {
+            type: String,
+            value: '',
+        },
     },
     methods: {
         onClick(event) {

diff --git a/dist/goods-action-button/index.wxml b/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 }}"

diff --git a/dist/mixins/transition.js b/dist/mixins/transition.js
@@ -46,59 +46,66 @@ export function transition(showDefaultValue) {
                 value ? this.enter() : this.leave();
             },
             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') {
+                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') {
                         return;
                     }
-                    this.$emit('enter');
-                    this.setData({
-                        inited: true,
-                        display: true,
-                        classes: classNames.enter,
-                        currentDuration,
-                    });
+                    this.status = 'enter';
+                    this.$emit('before-enter');
                     requestAnimationFrame(() => {
                         if (this.status !== 'enter') {
                             return;
                         }
-                        this.transitionEnded = false;
-                        this.setData({ classes: classNames['enter-to'] });
+                        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();
+                        });
                     });
                 });
             },
             leave() {
-                if (!this.data.display) {
+                if (!this.waitEnterEndPromise)
                     return;
-                }
-                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') {
+                this.waitEnterEndPromise.then(() => {
+                    if (!this.data.display) {
                         return;
                     }
-                    this.$emit('leave');
-                    this.setData({
-                        classes: classNames.leave,
-                        currentDuration,
-                    });
+                    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;
                         }
-                        this.transitionEnded = false;
-                        setTimeout(() => this.onTransitionEnd(), currentDuration);
-                        this.setData({ classes: classNames['leave-to'] });
+                        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'] });
+                        });
                     });
                 });
             },

diff --git a/dist/share-sheet/index.js b/dist/share-sheet/index.js
@@ -36,6 +36,10 @@ VantComponent({
             type: null,
             value: 300,
         },
+        rootPortal: {
+            type: Boolean,
+            value: false,
+        },
     },
     methods: {
         onClickOverlay() {

diff --git a/dist/share-sheet/index.wxml b/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"
 >

diff --git a/dist/uploader/shared.js b/dist/uploader/shared.js
@@ -40,7 +40,7 @@ export const mediaProps = {
     },
     mediaType: {
         type: Array,
-        value: ['image', 'video'],
+        value: ['image', 'video', 'mix'],
     },
     maxDuration: {
         type: Number,

diff --git a/dist/uploader/utils.js b/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 })));

diff --git a/lib/action-sheet/index.js b/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) {

diff --git a/lib/action-sheet/index.wxml b/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">

diff --git a/lib/calendar/index.js b/lib/calendar/index.js
@@ -129,6 +129,10 @@ var getTime = function (date) {
             value: 0,
         },
         readonly: Boolean,
+        rootPortal: {
+            type: Boolean,
+            value: false,
+        },
     },
     data: {
         subtitle: '',

diff --git a/lib/calendar/index.wxml b/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"

diff --git a/lib/cascader/index.js b/lib/cascader/index.js
@@ -60,6 +60,7 @@ var defaultFieldNames = {
             value: defaultFieldNames,
             observer: 'updateFieldNames',
         },
+        useTitleSlot: Boolean,
     },
     data: {
         tabs: [],

diff --git a/lib/cascader/index.wxml b/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 }}"

diff --git a/lib/dialog/index.js b/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: {

diff --git a/lib/dialog/index.wxml b/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

diff --git a/lib/goods-action-button/index.js b/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) {

diff --git a/lib/goods-action-button/index.wxml b/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 }}"