Explorar o código

换图标导致撤回/恢复失效

cxmo hai 1 ano
pai
achega
050e36de59

+ 1 - 1
src/views/chartFrame_manage/components/frameContainer.vue

@@ -202,7 +202,7 @@ export default {
     display: flex;
     overflow: hidden;
     position: relative;
-    padding-top: 24px;
+    padding-top: 26px;
     .minimap {
         position: absolute;
         right: 6px;

+ 9 - 10
src/views/chartFrame_manage/components/frameToolBar.vue

@@ -4,20 +4,18 @@
         <div class="cell-style">
             <!-- 撤销 -->
             <ToolItem tooltip="撤销" toolkey="undo">
-                <div class="tool-item">
+                <div class="tool-item" @click="handleGraphHistory('undo')">
                     <img :src="require(`@/assets/icons/chartFrame/undo.svg`)"
-                        :class="{'img-disabled':!canUndo,'actived':canUndo}"
-                        @click="handleGraphHistory('undo')">
+                        :class="{'img-disabled':!canUndo,'actived':canUndo}">
                     <span class="disabled" v-if="!canUndo"></span>
                 </div>
                 
             </ToolItem>
             <!-- 恢复 -->
             <ToolItem tooltip="恢复" toolkey="undo">
-                <div class="tool-item">
+                <div class="tool-item" @click="handleGraphHistory('redo')">
                     <img :src="require(`@/assets/icons/chartFrame/redo.svg`)"
-                        :class="{'img-disabled':!canRedo,'actived':canRedo}"
-                        @click="handleGraphHistory('redo')">
+                        :class="{'img-disabled':!canRedo,'actived':canRedo}">
                     <span class="disabled" v-if="!canRedo"></span>
                 </div>
             </ToolItem>
@@ -40,7 +38,7 @@
             <ToolItem tooltip="加粗" toolkey="fontWeight">
                 <span class="tool-item">
                     <span class="item-text" :class="{'text-disabled':!isSelectNode,'text-actived':isSelectNode}"
-                        style="{font-size: 16px;font-weight: bold;}"
+                        :style="'font-size: 16px;font-weight: bold;'"
                         @click="changeStyleToggle('label/fontWeight')">B</span>
                     <span class="disabled" v-if="!isSelectNode"></span>
                 </span>
@@ -146,7 +144,7 @@
                     <div class="el-dropdown-link">
                         <img :src="require(`@/assets/icons/chartFrame/arrow-left.svg`)"
                             :class="{'img-disabled':!isSelectEdge,'actived':isSelectEdge}">
-                        <i class="el-icon-arrow-down" style="font-size:12px;"></i>
+                            <i class="el-icon-caret-bottom"></i>
                     </div>
                     <el-dropdown-menu slot="dropdown">
                         <el-dropdown-item :command="{attr:'line/sourceMarker',value: 'classic'}">
@@ -166,7 +164,7 @@
                     <div class="el-dropdown-link">
                         <img :src="require(`@/assets/icons/chartFrame/arrow-right.svg`)"
                             :class="{'img-disabled':!isSelectEdge,'actived':isSelectEdge}">
-                        <i class="el-icon-arrow-down" style="font-size:12px;"></i>
+                            <i class="el-icon-caret-bottom"></i>
                     </div>
                     <el-dropdown-menu slot="dropdown">
                         <el-dropdown-item :command="{attr:'line/targetMarker',value: 'classic'}">
@@ -336,7 +334,7 @@ export default {
     background-color:#F6F7F8;
     padding: 5px;
     position: absolute;
-    height: 24px;
+    height: 26px;
     left: 0;
     right:0;
     top:0;
@@ -346,6 +344,7 @@ export default {
         display: flex;
         gap:0 20px;
         overflow:hidden;
+        align-items:center;
         .tool-item{
             cursor: pointer;
             position: relative;