From b58a50a601adcec534bd415189a1d5fcef37b85f Mon Sep 17 00:00:00 2001 From: "X1627315083@163.com" <1627315083@qq.com> Date: Wed, 25 Mar 2026 17:08:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E8=89=B2=E8=B0=83=E5=92=8C=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?text=E7=9A=84icon=E5=A2=9E=E5=A4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/css/style.css | 17 +++++++++++++++++ src/assets/css/style.less | 11 ++++++++++- .../FlowCanvas/components/header-tools.vue | 2 +- .../Canvas/FlowCanvas/components/nodes/text.vue | 2 +- .../components/tools/my-textTools.vue | 2 +- 5 files changed, 30 insertions(+), 4 deletions(-) diff --git a/src/assets/css/style.css b/src/assets/css/style.css index f479d8b..ac0dcd0 100644 --- a/src/assets/css/style.css +++ b/src/assets/css/style.css @@ -79,3 +79,20 @@ body, --el-color-primary-light-9: #fff2ec; --el-color-primary-dark-2: #cc6241; } +.el-select, +.el-popper { + --el-color-primary: #6c6c6c; + /* 主灰色 */ + --el-color-primary-light-3: #8a8a8a; + /* 较浅的灰色（混合20%白） */ + --el-color-primary-light-5: #a8a8a8; + /* 更浅的灰色（混合33%白） */ + --el-color-primary-light-7: #c6c6c6; + /* 浅灰色（混合47%白） */ + --el-color-primary-light-8: #d4d4d4; + /* 很浅的灰色（混合53%白） */ + --el-color-primary-light-9: #e3e3e3; + /* 极浅的灰色（混合60%白） */ + --el-color-primary-dark-2: #565656; + /* 深灰色（加深20%） */ +} diff --git a/src/assets/css/style.less b/src/assets/css/style.less index 22d4fcd..fd26490 100644 --- a/src/assets/css/style.less +++ b/src/assets/css/style.less @@ -95,4 +95,13 @@ body, --el-color-primary-light-8: #ffe8df; // 很浅的橙红（混合53%白） --el-color-primary-light-9: #fff2ec; // 极浅的橙红（混合60%白） --el-color-primary-dark-2: #cc6241; // 深橙红（加深20%） -} \ No newline at end of file +} +.el-select, .el-popper{ + --el-color-primary: #6c6c6c; /* 主灰色 */ + --el-color-primary-light-3: #8a8a8a; /* 较浅的灰色（混合20%白） */ + --el-color-primary-light-5: #a8a8a8; /* 更浅的灰色（混合33%白） */ + --el-color-primary-light-7: #c6c6c6; /* 浅灰色（混合47%白） */ + --el-color-primary-light-8: #d4d4d4; /* 很浅的灰色（混合53%白） */ + --el-color-primary-light-9: #e3e3e3; /* 极浅的灰色（混合60%白） */ + --el-color-primary-dark-2: #565656; /* 深灰色（加深20%） */ +} diff --git a/src/components/Canvas/FlowCanvas/components/header-tools.vue b/src/components/Canvas/FlowCanvas/components/header-tools.vue index 2f840b0..ecfe5fd 100644 --- a/src/components/Canvas/FlowCanvas/components/header-tools.vue +++ b/src/components/Canvas/FlowCanvas/components/header-tools.vue @@ -44,7 +44,7 @@ const tools = ref([ { name: TOOLS.SELECT, icon: 'c-select', iconSize: 16, disabled: ref(false) }, { name: TOOLS.MOVE, icon: 'c-move', iconSize: 18, disabled: ref(false) }, - { name: TOOLS.TEXT, icon: 'c-text', iconSize: 18, disabled: ref(false) }, + { name: TOOLS.TEXT, icon: 'c-text', iconSize: 22, disabled: ref(false) }, { type: 'line' }, { name: TOOLS.UNDO, diff --git a/src/components/Canvas/FlowCanvas/components/nodes/text.vue b/src/components/Canvas/FlowCanvas/components/nodes/text.vue index 551b659..c4b5892 100644 --- a/src/components/Canvas/FlowCanvas/components/nodes/text.vue +++ b/src/components/Canvas/FlowCanvas/components/nodes/text.vue @@ -12,7 +12,7 @@ @paste.prevent @keydown.stop > -
+
diff --git a/src/components/Canvas/FlowCanvas/components/tools/my-textTools.vue b/src/components/Canvas/FlowCanvas/components/tools/my-textTools.vue index 480fb48..f95ee47 100644 --- a/src/components/Canvas/FlowCanvas/components/tools/my-textTools.vue +++ b/src/components/Canvas/FlowCanvas/components/tools/my-textTools.vue @@ -121,7 +121,7 @@ } .fontFamily{ width: 103px; - + --el-text-color-regular: #000 } .color{ width: 55px; From 5faeded50bd3be78645509acddaa1727328902bf Mon Sep 17 00:00:00 2001 From: lzp Date: Wed, 25 Mar 2026 17:27:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=B1=E5=BA=A6=E7=94=BB=E5=B8=83?= =?UTF-8?q?=E5=BD=A2=E7=8A=B6=E5=B1=9E=E6=80=A7=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/icons/dc/angle.svg | 9 + .../components/details-panel/fill-repeat.vue | 2 + .../components/details-panel/index.vue | 12 +- .../details-panel/shape-setting.vue | 188 +++++++++++-- .../components/tools/depth-input.vue | 249 ++++++++++++++++-- 5 files changed, 415 insertions(+), 45 deletions(-) create mode 100644 src/assets/icons/dc/angle.svg diff --git a/src/assets/icons/dc/angle.svg b/src/assets/icons/dc/angle.svg new file mode 100644 index 0000000..5b38489 --- /dev/null +++ b/src/assets/icons/dc/angle.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/components/Canvas/DepthCanvas/components/details-panel/fill-repeat.vue b/src/components/Canvas/DepthCanvas/components/details-panel/fill-repeat.vue index 85fe2ae..24b73ad 100644 --- a/src/components/Canvas/DepthCanvas/components/details-panel/fill-repeat.vue +++ b/src/components/Canvas/DepthCanvas/components/details-panel/fill-repeat.vue @@ -13,6 +13,8 @@
Rotation
- +
@@ -27,10 +27,10 @@ const layers = computed(() => layerManager.layers.value) const activeObject = ref(null) - // const shapes = ['rect', 'line', 'path', 'triangle', 'polygon', 'ellipse'] - // const isShape = computed(() => shapes.includes(activeObject.value?.type)) + const shapes = ['rect', 'line', 'path', 'triangle', 'polygon', 'ellipse'] + const isShape = computed(() => shapes.includes(activeObject.value?.type)) const isRepeat = computed(() => activeObject.value?.fill?.repeat === 'repeat') - const isShow = computed(() => isRepeat.value) + const isShow = computed(() => isRepeat.value || isShape.value) const updateActiveObject = () => { const layer = layerManager.getActiveLayer() @@ -104,6 +104,10 @@ width: 100%; height: auto; padding: 0 1.4rem; + margin-bottom: 1.6rem; + &:last-child { + margin-bottom: 0; + } } } &.v > div { diff --git a/src/components/Canvas/DepthCanvas/components/details-panel/shape-setting.vue b/src/components/Canvas/DepthCanvas/components/details-panel/shape-setting.vue index 5da2277..2e3768c 100644 --- a/src/components/Canvas/DepthCanvas/components/details-panel/shape-setting.vue +++ b/src/components/Canvas/DepthCanvas/components/details-panel/shape-setting.vue @@ -1,21 +1,121 @@