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> <template>
<div> <div>
<Skeleton repeat="3" :show="true"/> <Skeleton :repeat="3" :show="true"/>
</div> </div>
</template> </template>

View File

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

View File

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

View File

@ -58,7 +58,7 @@ export interface EditCanvasConfigType {
[EditCanvasConfigEnum.UN_OPACITY]: number [EditCanvasConfigEnum.UN_OPACITY]: number
// 背景色 // 背景色
[EditCanvasConfigEnum.BACKGROUND]?: string [EditCanvasConfigEnum.BACKGROUND]?: string
[EditCanvasConfigEnum.BACKGROUND_IAMGE]?: string | ArrayBuffer | null [EditCanvasConfigEnum.BACKGROUND_IAMGE]?: string | null
// 图表主题颜色 // 图表主题颜色
[EditCanvasConfigEnum.CHART_THEME]: string [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 { icon } from '@/plugins'
import { renderLang, renderIcon } from '@/utils' import { renderLang, renderIcon } from '@/utils'
import { themeColor, setItem, getCharts } from './useLayout.hook' 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 { usePackagesStore } from '@/store/modules/packagesStore/packagesStore'
import { ChartLayoutStoreEnum } from '@/store/modules/chartLayoutStore/chartLayoutStore.d' import { ChartLayoutStoreEnum } from '@/store/modules/chartLayoutStore/chartLayoutStore.d'
@ -17,9 +17,12 @@ const {
// 图表 // 图表
const { getPackagesList } = usePackagesStore() const { getPackagesList } = usePackagesStore()
const menuOptions = reactive<{ const menuOptions = shallowReactive<{
[T: string]: any key: string
}>([]) icon: ReturnType<typeof renderIcon>
label: ReturnType<typeof renderLang>
list: PackagesType
}[]>([])
const packagesListObj = { const packagesListObj = {
[PackagesCategoryEnum.CHARTS]: { [PackagesCategoryEnum.CHARTS]: {

View File

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

View File

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