fix: 修改类型错误,调整页面细节,新增拖拽上传图片

This commit is contained in:
mtruning 2022-02-12 12:16:00 +08:00
parent 7e4eb8eed2
commit d689698ddd
7 changed files with 29 additions and 18 deletions

View File

@ -1,5 +1,5 @@
<template>
<div>
<Skeleton repeat="3" :show="true"/>
<Skeleton :repeat="3" :show="true"/>
</div>
</template>

View File

@ -18,7 +18,6 @@ import config from './config'
const props = defineProps({
themeData: {
type: Object || String,
default: 'dark',
required: true
},
chartData: {

View File

@ -74,6 +74,9 @@ import {
NLoadingBarProvider,
NModal,
NUpload,
NUploadFileList,
NUploadTrigger,
NUploadDragger,
NTree,
NSpin,
NTimePicker,
@ -163,6 +166,9 @@ const naive = create({
NLoadingBarProvider,
NModal,
NUpload,
NUploadFileList,
NUploadTrigger,
NUploadDragger,
NTree,
NSpin,
NTimePicker,

View File

@ -58,7 +58,7 @@ export interface EditCanvasConfigType {
[EditCanvasConfigEnum.UN_OPACITY]: number
// 背景色
[EditCanvasConfigEnum.BACKGROUND]?: string
[EditCanvasConfigEnum.BACKGROUND_IAMGE]?: string | ArrayBuffer | null
[EditCanvasConfigEnum.BACKGROUND_IAMGE]?: string | null
// 图表主题颜色
[EditCanvasConfigEnum.CHART_THEME]: string
// 图表主题颜色

View File

@ -1,8 +1,8 @@
import { reactive, ref } from 'vue'
import { shallowReactive, ref } from 'vue'
import { icon } from '@/plugins'
import { renderLang, renderIcon } from '@/utils'
import { themeColor, setItem, getCharts } from './useLayout.hook'
import { PackagesCategoryEnum, PackagesCategoryName } from '@/packages/index.d'
import { PackagesCategoryEnum, PackagesCategoryName, PackagesType } from '@/packages/index.d'
// 图表
import { usePackagesStore } from '@/store/modules/packagesStore/packagesStore'
import { ChartLayoutStoreEnum } from '@/store/modules/chartLayoutStore/chartLayoutStore.d'
@ -17,9 +17,12 @@ const {
// 图表
const { getPackagesList } = usePackagesStore()
const menuOptions = reactive<{
[T: string]: any
}>([])
const menuOptions = shallowReactive<{
key: string
icon: ReturnType<typeof renderIcon>
label: ReturnType<typeof renderLang>
list: PackagesType
}[]>([])
const packagesListObj = {
[PackagesCategoryEnum.CHARTS]: {

View File

@ -29,8 +29,8 @@
>
<n-upload-dragger>
<img
class="upload-show"
v-if="canvasConfig.backgroundImage"
class="upload-show"
:src="canvasConfig.backgroundImage"
alt="背景"
/>
@ -95,7 +95,7 @@
<n-divider />
<!-- 主题选择和全局配置 -->
<n-tabs v-show="!selectTarget" class="tabs-box" size="small" type="segment">
<n-tabs class="tabs-box" size="small" type="segment">
<n-tab-pane
v-for="item in globalTabList"
:key="item.key"
@ -226,6 +226,8 @@ const customRequest = (options: UploadCustomRequestOptions) => {
</script>
<style lang="scss" scoped>
$updloadWidth: 326px;
$updloadHeight: 193px;
@include go(canvas-setting) {
padding-top: 20px;
.upload-box {
@ -233,22 +235,23 @@ const customRequest = (options: UploadCustomRequestOptions) => {
margin-bottom: 20px;
@include deep() {
.n-card__content {
padding: 0px;
padding: 0;
overflow: hidden;
}
.n-upload-dragger {
padding: 5px;
width: $updloadWidth;
}
}
.upload-show {
display: block;
width: 326px;
height: 193px;
margin-bottom: -7px;
width: -webkit-fill-available;
height: $updloadHeight;
border-radius: 5px;
}
.upload-img {
display: flex;
flex-direction: column;
align-items: center;
width: 326px;
img {
height: 150px;
}

View File

@ -12,9 +12,9 @@
:fallback-src="requireFallbackImg()"
/>
<n-ellipsis>
<b-text class="list-text">
<n-text class="list-text">
{{ title }}
</b-text>
</n-text>
</n-ellipsis>
</div>
<div :class="{ 'select-modal': select }" />