Skip to content

Commit 61a9c65

Browse files
committed
fix(baseinfo): 修复基础资料上传头像不显示bug
1 parent 37fcdd1 commit 61a9c65

File tree

7 files changed

+30
-6
lines changed

7 files changed

+30
-6
lines changed

src/components.d.ts

+2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ declare module '@vue/runtime-core' {
2727
ElButton: typeof import('element-plus/es')['ElButton'];
2828
ElCarousel: typeof import('element-plus/es')['ElCarousel'];
2929
ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem'];
30+
ElCollapse: typeof import('element-plus/es')['ElCollapse'];
31+
ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem'];
3032
ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider'];
3133
ElDatePicker: typeof import('element-plus/es')['ElDatePicker'];
3234
ElDialog: typeof import('element-plus/es')['ElDialog'];

src/material/BaseInfo/BaseInfo4/BaseInfo.vue

+4-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,10 @@
2525
</template>
2626
<template v-else>
2727
<div v-show="isShow.avatar" class="avatar-shape-box">
28-
<component :is="avatarComponents[modelData.avatarShape]"></component>
28+
<component
29+
:is="avatarComponents[modelData.avatarShape]"
30+
:model-data="modelData"
31+
></component>
2932
</div>
3033
</template>
3134
</div>

src/material/BaseInfo/BaseInfo5/BaseInfo.vue

+4-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@
2323
</template>
2424
<template v-else>
2525
<div v-show="isShow.avatar" class="avatar-shape-box">
26-
<component :is="avatarComponents[modelData.avatarShape]"></component>
26+
<component
27+
:is="avatarComponents[modelData.avatarShape]"
28+
:model-data="modelData"
29+
></component>
2730
</div>
2831
</template>
2932
</div>

src/material/BaseInfo/BaseInfo6/BaseInfo.vue

+4-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@
1111
</template>
1212
<template v-else>
1313
<div v-show="isShow.avatar" class="avatar-shape-box">
14-
<component :is="avatarComponents[modelData.avatarShape]"></component>
14+
<component
15+
:is="avatarComponents[modelData.avatarShape]"
16+
:model-data="modelData"
17+
></component>
1518
</div>
1619
</template>
1720
<div class="right">

src/material/BaseInfo/BaseInfo7/BaseInfo.vue

+4-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@
1111
</template>
1212
<template v-else>
1313
<div v-show="isShow.avatar" class="avatar-shape-box">
14-
<component :is="avatarComponents[modelData.avatarShape]"></component>
14+
<component
15+
:is="avatarComponents[modelData.avatarShape]"
16+
:model-data="modelData"
17+
></component>
1518
</div>
1619
</template>
1720
<div class="right">

src/material/Common/BaseInfo/components/avatar/avatar1.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</template>
77
<template v-else>
88
<div v-show="isShow.avatar" class="avatar-shape-box">
9-
<component :is="avatarComponents[modelData.avatarShape]"></component>
9+
<component :is="avatarComponents[modelData.avatarShape]" :model-data="modelData"></component>
1010
</div>
1111
</template>
1212
</template>

src/options/BaseInfoOptions_1.vue

+11-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
<el-form label-width="100px" label-position="left">
66
<!-- 头像形状选择 -->
77
<el-form-item label="头像形状选择:">
8-
<el-input v-model="modelItem.data.name" type="text" maxlength="15" show-word-limit />
8+
<avatar-popover-shape-vue
9+
:model-item="modelItem"
10+
@change-shape="handleChangeShape"
11+
></avatar-popover-shape-vue>
912
</el-form-item>
1013
<!-- 公共样式属性 -->
1114
<common-options></common-options>
@@ -68,6 +71,7 @@
6871
import useDesignSelectModelItem from '@/hooks/material/useDesignSelectModelItem';
6972
import CONFIG from '@/config';
7073
import appStore from '@/store';
74+
import AvatarPopoverShapeVue from '@/components/AvatarPopoverShape/AvatarPopoverShape.vue';
7175
defineOptions({ name: 'BASE_INFO_OPTIONS' });
7276
// 选中的模块
7377
const { modelItem } = useDesignSelectModelItem();
@@ -97,6 +101,12 @@
97101
}
98102
return true;
99103
};
104+
105+
// 改变头像形状
106+
const handleChangeShape = (value: string | number) => {
107+
modelItem.data.avatarShape = value;
108+
console.log('切换头像后的数据', modelItem.data);
109+
};
100110
</script>
101111
<style lang="scss">
102112
.avatar-uploader .el-upload {

0 commit comments

Comments
 (0)