浏览代码

fix:conflict

ananzhusen 6 月之前
父节点
当前提交
6a7989e712
共有 1 个文件被更改,包括 13 次插入1 次删除
  1. 13 1
      src/views/components/View.vue

+ 13 - 1
src/views/components/View.vue

@@ -906,9 +906,10 @@ const router = useRouter();
 const route = useRoute();
 const route = useRoute();
 const { user, getUser } = useUser();
 const { user, getUser } = useUser();
 const { dot, setDot } = useDot();
 const { dot, setDot } = useDot();
-const { select } = useSelection();
+const { select, selections } = useSelection();
 const { proxy } = getCurrentInstance();
 const { proxy } = getCurrentInstance();
 const $t = proxy.$t
 const $t = proxy.$t
+
 const meta2dOptions: Options = {
 const meta2dOptions: Options = {
   cdn,
   cdn,
   rule: true,
   rule: true,
@@ -2338,7 +2339,18 @@ const changeFit = () => {
   if(fitFlag.value){
   if(fitFlag.value){
     meta2d.canvas.showFit();
     meta2d.canvas.showFit();
   }else{
   }else{
+    meta2d.store.data.pens.forEach((pen) => {
+      if (!selections.fit.children?.includes(pen.id)) {
+        meta2d.setValue(
+          { id: pen.id, visible: true },
+          { render: false, doEvent: false, history: false }
+        );
+      }
+    });
     meta2d.canvas.hideFit();
     meta2d.canvas.hideFit();
+    meta2d.canvas.canvasImage.init();
+    meta2d.canvas.canvasImageBottom.init();
+    meta2d.render();
     select();
     select();
   }
   }
 }
 }