sileya-ai
/
vr-uniapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev-yxl' into dev-sws

v1.0.0
sws 2024-10-16 18:20:00 +08:00
parent e59c8962fd 9b72e9c4de
commit 98cb6aaacf
11 changed files with 61 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/model-carousel/index.vue
View File

@ -139,7 +139,7 @@ const seat_list = computed(() => {
} }
}) })
// 轮播图自适应高度 // 轮播图自适应高度
const newHeight = computed(() => new_style.value.height + 'px'); const newHeight = computed(() => form.value.height + 'px');
// 轮播图样式 // 轮播图样式
const interval_type = ref(''); const interval_type = ref('');
// 轮播图key值 // 轮播图key值

5
src/components/model-carousel/model-carousel-content.vue
View File

@ -14,7 +14,7 @@
<el-form-item label="图片设置"> <el-form-item label="图片设置">
<el-radio-group v-model="form.img_fit"> <el-radio-group v-model="form.img_fit">
<el-radio value="contain">等比缩放</el-radio> <el-radio value="contain">等比缩放</el-radio>
<el-radio value="none">铺满</el-radio> <el-radio value="fill">铺满</el-radio>
<el-radio value="cover">等比剪切</el-radio> <el-radio value="cover">等比剪切</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
@ -24,6 +24,9 @@
<el-form-item v-if="form.is_roll == '1'" label="间隔时间"> <el-form-item v-if="form.is_roll == '1'" label="间隔时间">
<slider v-model="form.interval_time" :min="1" :max="100"></slider> <slider v-model="form.interval_time" :min="1" :max="100"></slider>
</el-form-item> </el-form-item>
<el-form-item label="高度设置">
<slider v-model="form.height" :max="1000"></slider>
</el-form-item>
</card-container> </card-container>
<div class="divider-line"></div> <div class="divider-line"></div>
<card-container> <card-container>

19
src/components/model-carousel/model-carousel-styles.vue
View File

@ -7,16 +7,15 @@
<radius :value="form" @update:value="radius_change"></radius> <radius :value="form" @update:value="radius_change"></radius>
</el-form-item> </el-form-item>
</card-container> </card-container>
<div class="divider-line"></div> <template v-if="['oneDragOne', 'twoDragOne'].includes(new_content.carousel_type)">
<card-container> <div class="divider-line"></div>
<div class="mb-12">轮播设置</div> <card-container>
<el-form-item label="高度设置"> <div class="mb-12">轮播设置</div>
<slider v-model="form.height" :max="1000"></slider> <el-form-item label="图片间距">
</el-form-item> <slider v-model="form.image_spacing" :max="100"></slider>
<el-form-item v-if="['oneDragOne', 'twoDragOne'].includes(new_content.carousel_type)" label="图片间距"> </el-form-item>
<slider v-model="form.image_spacing" :max="100"></slider> </card-container>
</el-form-item> </template>
</card-container>
<div class="divider-line"></div> <div class="divider-line"></div>
<card-container> <card-container>
<carousel-indicator :value="form"></carousel-indicator> <carousel-indicator :value="form"></carousel-indicator>

2
src/components/model-data-magic/components/tabs-content.vue
View File

@ -18,7 +18,7 @@
<el-form-item label="图片设置"> <el-form-item label="图片设置">
<el-radio-group v-model="form.img_fit"> <el-radio-group v-model="form.img_fit">
<el-radio value="contain">等比缩放</el-radio> <el-radio value="contain">等比缩放</el-radio>
<el-radio value="none">铺满</el-radio> <el-radio value="fill">铺满</el-radio>
<el-radio value="cover">等比剪切</el-radio> <el-radio value="cover">等比剪切</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>

13
src/components/model-img-magic/index.vue
View File

@ -19,9 +19,16 @@
</div> </div>
</template> </template>
<template v-else-if="form.style_actived == 10"> <template v-else-if="form.style_actived == 10">
<div v-for="(item, index) in form.img_magic_list" :key="index" :class="['img-spacing-border', { 'h': item.img.length > 0, 'style_actived_10': item.img.length == 0 }]" :style="selected_style(item)"> <template v-if="form.limit_size == '0'">
<image-empty v-model="item.img[0]" :style="content_img_radius"></image-empty> <div v-for="(item, index) in form.img_magic_list" :key="index" :class="['img-spacing-border', { 'h': item.img.length > 0, 'style_actived_10': item.img.length == 0 }]" :style="selected_style(item)">
</div> <image-empty v-model="item.img[0]" :style="content_img_radius" fit="contain"></image-empty>
</div>
</template>
<template v-else>
<div v-for="(item, index) in form.img_magic_list" :key="index" class="img-spacing-border" :style="`${ selected_style(item) };height: ${ form.image_height }px;`">
<image-empty v-model="item.img[0]" :style="content_img_radius" :fit="form.img_fit"></image-empty>
</div>
</template>
</template> </template>
<template v-else> <template v-else>
<div v-for="(item, index) in form.img_magic_list" :key="index" class="cube-selected img-spacing-border" :style="selected_style(item)"> <div v-for="(item, index) in form.img_magic_list" :key="index" class="cube-selected img-spacing-border" :style="selected_style(item)">

21
src/components/model-img-magic/model-img-magic-content.vue
View File

@ -13,10 +13,27 @@
<el-form-item v-if="form.style_actived !== 10" label="图片设置"> <el-form-item v-if="form.style_actived !== 10" label="图片设置">
<el-radio-group v-model="form.img_fit"> <el-radio-group v-model="form.img_fit">
<el-radio value="contain">等比缩放</el-radio> <el-radio value="contain">等比缩放</el-radio>
<el-radio value="none">铺满</el-radio> <el-radio value="fill">铺满</el-radio>
<el-radio value="cover">等比剪切</el-radio> <el-radio value="cover">等比剪切</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<template v-else>
<el-form-item label="限制尺寸">
<el-switch v-model="form.limit_size" active-value="1" inactive-value="0" />
</el-form-item>
<template v-if="form.limit_size == '1'">
<el-form-item label="图片高度">
<slider v-model="form.image_height" :max="500"></slider>
</el-form-item>
<el-form-item label="图片设置">
<el-radio-group v-model="form.img_fit">
<el-radio value="contain">等比缩放</el-radio>
<el-radio value="fill">铺满</el-radio>
<el-radio value="cover">等比剪切</el-radio>
</el-radio-group>
</el-form-item>
</template>
</template>
</card-container> </card-container>
<div class="bg-f5 divider-line" /> <div class="bg-f5 divider-line" />
<card-container> <card-container>
@ -80,7 +97,7 @@ const props = defineProps({
}, },
}); });
const style_list = ['heng2', 'shu2', 'shu3', 'shang2xia1', 'shang1xia2', 'zuo1you2', 'zuo2you1', 'tianzige', 'shang2xia3', 'zuo1youshang1youxia2', 'a-1ge', 'a-4x4']; const style_list = ['heng2', 'shu2', 'shu3', 'shang2xia1', 'shang1xia2', 'zuo1you2', 'zuo2you1', 'tianzige', 'shang2xia3', 'zuo1youshang1youxia2', 'a-1ge', 'a-4x4'];
const img_fit_10 = 'contain';
// 风格 // 风格
const style_show_list = [ const style_show_list = [
[{ start: {x: 1, y: 1}, end: {x: 4, y: 2}, img: [], img_link: {} }, { start: {x: 1, y: 3},end: {x: 4, y: 4},img: [], img_link: {}}], // 风格1 [{ start: {x: 1, y: 1}, end: {x: 4, y: 2}, img: [], img_link: {} }, { start: {x: 1, y: 3},end: {x: 4, y: 4},img: [], img_link: {}}], // 风格1

8
src/components/model-title/index.vue
View File

@ -10,7 +10,7 @@
<template v-else-if="!isEmpty(form.icon_class)"> <template v-else-if="!isEmpty(form.icon_class)">
<icon :name="form.icon_class" :size="new_style.icon_size + ''" :color="new_style.icon_color"></icon> <icon :name="form.icon_class" :size="new_style.icon_size + ''" :color="new_style.icon_color"></icon>
</template> </template>
<div class="pr-15 nowrap" :style="title_style">{{ form.title || '标题' }}</div> <div class="pr-15 nowrap" :style="title_style">{{ form.title }}</div>
</div> </div>
<div class="flex-row gap-10 align-c right-0 abs"> <div class="flex-row gap-10 align-c right-0 abs">
<template v-if="form.keyword_show == '1'"> <template v-if="form.keyword_show == '1'">
@ -84,6 +84,7 @@ const keyword_style = computed(() => {
const right_style = computed(() => { const right_style = computed(() => {
return `color:${new_style.value.right_color}; font-size: ${new_style.value.right_size}px;`; return `color:${new_style.value.right_color}; font-size: ${new_style.value.right_size}px;`;
}); });
const title_img_height = computed(() => new_style.value.img_height + 'px');
// 通用样式区 // 通用样式区
const style_container = computed(() => common_styles_computer(new_style.value.common_style)); const style_container = computed(() => common_styles_computer(new_style.value.common_style));
const style_img_container = computed(() => common_img_computer(new_style.value.common_style)); const style_img_container = computed(() => common_img_computer(new_style.value.common_style));
@ -99,7 +100,8 @@ const style_img_container = computed(() => common_img_computer(new_style.value.c
word-wrap: break-word; word-wrap: break-word;
} }
.title-img { .title-img {
max-width: 6rem; // max-width: 6rem;
max-height: 3rem; // max-height: 3rem;
height: v-bind(title_img_height);
} }
</style> </style>

3
src/components/model-title/model-title-styles.vue
View File

@ -28,6 +28,9 @@
<slider v-model="form.title_size" :max="100"></slider> <slider v-model="form.title_size" :max="100"></slider>
</el-form-item> </el-form-item>
</el-form-item> </el-form-item>
<el-form-item label="图片高度">
<slider v-model="form.img_height" :max="500"></slider>
</el-form-item>
</card-container> </card-container>
<template v-if="!isEmpty(content.subtitle)"> <template v-if="!isEmpty(content.subtitle)">
<div class="bg-f5 divider-line" /> <div class="bg-f5 divider-line" />

4
src/config/const/carousel.ts
View File

@ -14,6 +14,7 @@ interface defaultSearch {
img_fit: string, img_fit: string,
is_roll: string; is_roll: string;
interval_time: number; interval_time: number;
height: number,
}; };
style: { style: {
radius: number; radius: number;
@ -22,7 +23,6 @@ interface defaultSearch {
radius_bottom_left: number; radius_bottom_left: number;
radius_bottom_right: number; radius_bottom_right: number;
is_show: string; is_show: string;
height: number,
image_spacing: number, image_spacing: number,
indicator_style: string; indicator_style: string;
indicator_location: string; indicator_location: string;
@ -53,6 +53,7 @@ const defaultSearch: defaultSearch = {
img_fit: 'contain', img_fit: 'contain',
is_roll: '1', is_roll: '1',
interval_time: 3, interval_time: 3,
height: 300,
carousel_list: [ carousel_list: [
{ {
carousel_img: [], carousel_img: [],
@ -81,7 +82,6 @@ const defaultSearch: defaultSearch = {
radius_bottom_left: 0, radius_bottom_left: 0,
radius_bottom_right: 0, radius_bottom_right: 0,
is_show: '1', is_show: '1',
height: 300,
image_spacing: 10, image_spacing: 10,
indicator_style: 'dot', indicator_style: 'dot',
indicator_location: 'center', indicator_location: 'center',

4
src/config/const/img-magic.ts
View File

@ -11,6 +11,8 @@ interface defaultSearch {
style_actived: number; style_actived: number;
img_magic_list: img_magic[]; img_magic_list: img_magic[];
img_fit: string; img_fit: string;
limit_size: string,
image_height: number;
}; };
style: { style: {
radius: number; radius: number;
@ -41,6 +43,8 @@ const defaultSearch: defaultSearch = {
} }
], ],
img_fit: 'cover', img_fit: 'cover',
limit_size: '0',
image_height: 100,
}, },
style: { style: {
radius: 0, radius: 0,

4
src/config/const/title.ts
View File

@ -25,6 +25,7 @@ interface defaultSearch {
title_color: string; title_color: string;
title_size: number; title_size: number;
title_weight: string; title_weight: string;
img_height: number;
icon_size: number; icon_size: number;
icon_color: string; icon_color: string;
subtitle_color: string; subtitle_color: string;
@ -39,7 +40,7 @@ interface defaultSearch {
} }
const defaultSearch: defaultSearch = { const defaultSearch: defaultSearch = {
content: { content: {
title: '', title: '标题',
title_link: {}, title_link: {},
img_src: [], img_src: [],
icon_class: '', icon_class: '',
@ -62,6 +63,7 @@ const defaultSearch: defaultSearch = {
title_color: '#000', title_color: '#000',
title_size: 12, title_size: 12,
title_weight: 'normal', title_weight: 'normal',
img_height: 30,
icon_size: 12, icon_size: 12,
icon_color: '#999', icon_color: '#999',
subtitle_color: '#999', subtitle_color: '#999',