Browse Source

feat:conflict

ananzhusen 1 year ago
parent
commit
052dcb70b8
4 changed files with 10 additions and 1 deletions
  1. BIN
      public/down.cur
  2. BIN
      public/right.cur
  3. 7 1
      src/views/components/ContextMenu.vue
  4. 3 0
      src/views/components/View.vue

BIN
public/down.cur


BIN
public/right.cur


+ 7 - 1
src/views/components/ContextMenu.vue

@@ -30,7 +30,13 @@
         <t-menu-item value="group"> 组合 </t-menu-item>
         <t-menu-item value="states"> 组合为状态 </t-menu-item>
       </template>
-      <t-menu-item v-if="hasChildren" value="unGroup"> 取消组合 </t-menu-item>
+        <t-menu-item v-if="hasChildren" value="unGroup"> 
+          <t-popconfirm  content="确认取消组合?(将丢失组合图元的数据)" @cancel="onMenu('xxxx')" @confirm="onMenu('unGroup')">
+            <div @click.stop>
+                取消组合 
+            </div>
+          </t-popconfirm>
+        </t-menu-item>
       <t-menu-item :disabled="!selections.mode" value="lock">
         {{ locked ? '解锁' : '锁定' }}
       </t-menu-item>

+ 3 - 0
src/views/components/View.vue

@@ -975,6 +975,9 @@ const meta2dOptions: Options = {
   rule: true,
   ruleColor:'#222E47',
   // background: '#1e2430',
+  rotateCursor: cdn + '/v/rotate.cur', //'https://assets.le5lecdn.com/2d/rotate.cur',
+  rightCursor: cdn + '/v/right.cur', 
+  downCursor: cdn + '/v/down.cur', 
   ruleOptions:{
     background:'#121924',
     underline:true,