fix: 图层重复问题以及fabricGradientToCss val空值导致报错问题

ikuaitu · Jan 31, 2024 · 87eaf33 · 87eaf33
1 parent b00ea43
commit 87eaf33
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/src/components/colorSelector.vue b/src/components/colorSelector.vue
@@ -1,8 +1,8 @@
 <!--
  * @Author: 秦少卫
  * @Date: 2023-02-16 22:52:00
- * @LastEditors: 秦少卫
- * @LastEditTime: 2023-07-24 23:15:36
+ * @LastEditors: June
+ * @LastEditTime: 2024-01-31 12:46:50
  * @Description: 颜色选择器
 -->
 <template>
@@ -184,6 +184,7 @@ const fabricGradientToBar = (val) => {
 // Fabric渐变转css
 const fabricGradientToCss = (val, activeObject) => {
   // 渐变类型
+  if (!val) return;
   currentGradient.type = val.type;
   currentGradient.degree = activeObject.get(props.angleKey, val.degree);
   currentGradient.points = val.colorStops.map((item) => {

diff --git a/src/components/history.vue b/src/components/history.vue
@@ -1,8 +1,8 @@
 <!--
  * @Author: 秦少卫
  * @Date: 2022-09-03 19:16:55
- * @LastEditors: 秦少卫
- * @LastEditTime: 2023-07-16 12:31:25
+ * @LastEditors: June
+ * @LastEditTime: 2024-01-31 12:29:07
  * @Description: 回退重做
 -->
 

diff --git a/src/components/layer.vue b/src/components/layer.vue
@@ -1,8 +1,8 @@
 <!--
  * @Author: 秦少卫
  * @Date: 2022-09-03 19:16:55
- * @LastEditors: 秦少卫
- * @LastEditTime: 2023-07-24 23:13:51
+ * @LastEditors: June
+ * @LastEditTime: 2024-01-31 12:43:22
  * @Description: 图层面板
 -->
 
@@ -42,6 +42,7 @@
 </template>
 
 <script setup name="Layer">
+import { uniqBy } from 'lodash-es';
 import useSelect from '@/hooks/select';
 const { canvasEditor, fabric, mixinState } = useSelect();
 
@@ -142,6 +143,7 @@ const getList = () => {
         text,
       };
     });
+  list.value = uniqBy(unref(list), 'id');
 };
 
 onMounted(() => {