From 8fee79faaf7202ca64417423d1f59afdf5338213 Mon Sep 17 00:00:00 2001
From: Nevermore <15972699417@163.com>
Date: Mon, 4 Dec 2023 20:37:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=B8=8A=E4=BC=A0=E6=96=87?=
=?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/FileUpload/index.vue | 61 ++++++++++++
src/plugins/component.ts | 6 +-
src/plugins/icon.ts | 10 +-
src/store/modules/main.ts | 6 ++
.../CanvasLeft/components/HomePopover.vue | 96 +++++++++++++++++++
src/views/Editor/CanvasLeft/index.vue | 9 +-
.../Editor/CanvasMenu/components/CodePool.vue | 1 -
src/views/Editor/CanvasMenu/index.vue | 34 ++++---
8 files changed, 201 insertions(+), 22 deletions(-)
create mode 100644 src/components/FileUpload/index.vue
create mode 100644 src/views/Editor/CanvasLeft/components/HomePopover.vue
diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
new file mode 100644
index 00000000..380d3695
--- /dev/null
+++ b/src/components/FileUpload/index.vue
@@ -0,0 +1,61 @@
+
+
+
+
+
+
+
+ 拖拽文件到这里 或者 选择文件上传
+
+
+
+ 支持 PSD / PDF / SVG / CDR 以及 图片 等格式
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/plugins/component.ts b/src/plugins/component.ts
index 817f977d..9990836c 100644
--- a/src/plugins/component.ts
+++ b/src/plugins/component.ts
@@ -1,23 +1,21 @@
import { App } from 'vue'
import FileInput from '@/components/FileInput.vue'
-// import CheckboxButton from '@/components/CheckboxButton.vue'
-// import CheckboxButtonGroup from '@/components/CheckboxButtonGroup.vue'
import ColorPicker from '@/components/ColorPicker/index.vue'
import ColorButton from '@/components/ColorButton.vue'
import TextColorButton from '@/components/TextColorButton.vue'
import FullscreenSpin from '@/components/FullscreenSpin.vue'
import SwipeInput from '@/components/SwipeInput.vue'
+import FileUpload from '@/components/FileUpload/index.vue'
const components = {
FileInput,
ColorButton,
TextColorButton,
- // CheckboxButton,
- // CheckboxButtonGroup,
ColorPicker,
FullscreenSpin,
SwipeInput,
+ FileUpload,
}
export default {
diff --git a/src/plugins/icon.ts b/src/plugins/icon.ts
index 692b8b91..faef3a29 100644
--- a/src/plugins/icon.ts
+++ b/src/plugins/icon.ts
@@ -155,7 +155,10 @@ import {
ExcludeSelection,
SubtractSelection,
SubtractSelectionOne,
- AllApplication
+ AllApplication,
+ Home,
+ Newlybuild,
+ DividingLine
} from '@icon-park/vue-next'
export const icons = {
@@ -312,7 +315,10 @@ export const icons = {
IconExcludeSelection: ExcludeSelection,
IconSubtractSelection: SubtractSelection,
IconSubtractSelectionOne: SubtractSelectionOne,
- IconAllApplication: AllApplication
+ IconAllApplication: AllApplication,
+ IconHome: Home,
+ IconNewlybuild: Newlybuild,
+ IconDividingLine: DividingLine
}
export default {
diff --git a/src/store/modules/main.ts b/src/store/modules/main.ts
index c5027b32..6fa4b2d2 100644
--- a/src/store/modules/main.ts
+++ b/src/store/modules/main.ts
@@ -32,6 +32,8 @@ export interface MainState {
systemFonts: SystemFont[]
disableHotkeys: boolean
exportType: ExportTypes
+ lastHelp: PoolType
+ lastEdit: PoolType
poolType: PoolType
poolShow: boolean
rulerShow: boolean
@@ -64,6 +66,8 @@ export const useMainStore = defineStore('main', {
systemFonts: SYS_FONTS, // 系统字体
disableHotkeys: false, // 禁用快捷键
exportType: 'image', // 导出面板
+ lastEdit: 'editor', // 左边栏
+ lastHelp: 'editor', // 左边栏
poolType: 'editor', // 左边栏
poolShow: false, // 显示左边栏
rulerShow: true,
@@ -126,6 +130,8 @@ export const useMainStore = defineStore('main', {
// this.canvasDragged = isDragged
// },
setPoolType(poolType: PoolType) {
+ if (poolType === 'help') this.lastHelp = this.poolType
+ if (poolType === 'editor') this.lastEdit = this.poolType
this.poolType = poolType
},
diff --git a/src/views/Editor/CanvasLeft/components/HomePopover.vue b/src/views/Editor/CanvasLeft/components/HomePopover.vue
new file mode 100644
index 00000000..e32fdfd7
--- /dev/null
+++ b/src/views/Editor/CanvasLeft/components/HomePopover.vue
@@ -0,0 +1,96 @@
+
+
+
+
+
+
+ 创建设计
+
+
+
+ 导入文件
+
+
+
+ 参考线
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/Editor/CanvasLeft/index.vue b/src/views/Editor/CanvasLeft/index.vue
index e38058f7..4871b0af 100644
--- a/src/views/Editor/CanvasLeft/index.vue
+++ b/src/views/Editor/CanvasLeft/index.vue
@@ -2,7 +2,8 @@
@@ -50,13 +51,16 @@ import { storeToRefs } from 'pinia'
import { ref } from 'vue'
import HotkeyDrawer from './components/HotkeyDrawer.vue'
import HelpPopover from './components/HelpPopover.vue'
+import HomePopover from './components/HomePopover.vue'
const mainStore = useMainStore()
const { poolType, poolShow } = storeToRefs(mainStore)
const helpRef = ref()
+const menuRef = ref()
const helpPopoverRef = ref()
+const menuPopoverRef = ref()
const hasHotkey = ref(false)
interface TabItem {
@@ -164,7 +168,8 @@ const setPoolType = (tab: PoolType) => {
.left-close {
cursor: default;
left: -320px;
- position: relative;;
+ position: relative;
+ top: 50%;
// z-index: 1;
}
.layout-toggle {
diff --git a/src/views/Editor/CanvasMenu/components/CodePool.vue b/src/views/Editor/CanvasMenu/components/CodePool.vue
index 80a9ffc1..705cc477 100644
--- a/src/views/Editor/CanvasMenu/components/CodePool.vue
+++ b/src/views/Editor/CanvasMenu/components/CodePool.vue
@@ -51,7 +51,6 @@ import {
rendererDSJ,
rendererRandRect,
rendererImage,
- rendererResImage,
rendererCircle,
rendererLine,
rendererLine2,
diff --git a/src/views/Editor/CanvasMenu/index.vue b/src/views/Editor/CanvasMenu/index.vue
index 63b5f82f..8567476a 100644
--- a/src/views/Editor/CanvasMenu/index.vue
+++ b/src/views/Editor/CanvasMenu/index.vue
@@ -2,7 +2,7 @@