Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: popup 关联组件增加 z-index 属性 #2632

Merged
merged 1 commit into from
Nov 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/packages/__VUE/actionsheet/index.taro.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
:close-on-click-overlay="closeAbled"
:lock-scroll="lockScroll"
:catch-move="lockScroll"
:z-index="zIndex"
@click-overlay="close"
>
<view :class="classes">
Expand Down
1 change: 1 addition & 0 deletions src/packages/__VUE/actionsheet/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
round
:close-on-click-overlay="closeAbled"
:lock-scroll="lockScroll"
:z-index="zIndex"
@click-overlay="close"
>
<view :class="classes">
Expand Down
1 change: 1 addition & 0 deletions src/packages/__VUE/address/index.taro.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
:lock-scroll="lockScroll"
:catch-move="lockScroll"
:round="round"
:z-index="zIndex"
@close="close"
@click-overlay="clickOverlay"
@open="closeWay = 'self'"
Expand Down
1 change: 1 addition & 0 deletions src/packages/__VUE/address/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
:round="round"
:teleport-disable="teleportDisable"
:teleport="teleport"
:z-index="zIndex"
@close="close"
@click-overlay="clickOverlay"
@open="closeWay = 'self'"
Expand Down
1 change: 1 addition & 0 deletions src/packages/__VUE/cascader/index.taro.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
:close-icon-position="closeIconPosition"
:lock-scroll="lockScroll"
:catch-move="lockScroll"
:z-index="zIndex"
>
<template v-if="title">
<view class="nut-cascader__bar" v-html="title"></view>
Expand Down
1 change: 1 addition & 0 deletions src/packages/__VUE/cascader/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
:closeable="closeable"
:destroy-on-close="false"
:close-icon-position="closeIconPosition"
:z-index="zIndex"
>
<template v-if="title">
<view class="nut-cascader__bar" v-html="title"></view>
Expand Down
1 change: 1 addition & 0 deletions src/packages/__VUE/dialog/index.taro.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
:overlay-style="overlayStyle"
:style="popStyle"
round
:z-index="zIndex"
@click-overlay="onClickOverlay"
@click-close-icon="closed"
>
Expand Down
1 change: 1 addition & 0 deletions src/packages/__VUE/dialog/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
:overlay-style="overlayStyle"
:style="popStyle"
round
:z-index="zIndex"
@click-overlay="onClickOverlay"
@click-close-icon="closed"
>
Expand Down
24 changes: 13 additions & 11 deletions src/packages/__VUE/sku/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
round
style="height: 75%"
:lock-scroll="lockScroll"
:teleport-disable="teleportDisable"
:teleport="teleport"
:catch-move="lockScroll"
@click-close-icon="closePopup('icon')"
@click-overlay="closePopup('overlay')"
@close="closePopup('close')"
Expand Down Expand Up @@ -48,8 +47,8 @@
</view>

<sku-operate
:btn-options="btnOptions"
:btn-extra-text="btnExtraText"
:btn-options="btnOptions"
:buy-text="buyText || translate('buyNow')"
:add-cart-text="addCartText || translate('addToCart')"
:confirm-text="confirmText || translate('confirm')"
Expand All @@ -63,19 +62,21 @@
</nut-popup>
</template>
<script lang="ts">
import { ref, watch, onMounted, PropType } from 'vue';
import { ref, watch, PropType } from 'vue';
import SkuHeader from './components/SkuHeader.vue';
import SkuSelect from './components/SkuSelect.vue';
import SkuStepper from './components/SkuStepper.vue';
import SkuOperate from './components/SkuOperate.vue';
import { createComponent } from '@/packages/utils/create';
import { popupProps } from '../popup/props';
import Popup from '../popup/index.vue';
import { createComponent } from '@/packages/utils/create';
const { create, translate } = createComponent('sku');

export default create({
props: {
...popupProps,
visible: {
type: Boolean,
default: false
},

sku: {
type: Array,
Expand Down Expand Up @@ -138,6 +139,11 @@ export default create({
confirmText: {
type: String,
default: ''
},

lockScroll: {
type: Boolean,
default: true
}
},
emits: [
Expand Down Expand Up @@ -182,10 +188,6 @@ export default create({
}
);

onMounted(() => {
// console.log('更新参数');
});

const getSlots = (name: string) => slots[name];

// 商品规格 sku 选择
Expand Down