소스 검색

Merge branch 'develop' of http://39.106.8.246:3003/web/wanda-editer into develop

haojianlong 4 년 전
부모
커밋
535a70c8c2
4개의 변경된 파일38개의 추가작업 그리고 16개의 파일을 삭제
  1. 13 1
      src/components/baseEditer.vue
  2. 12 8
      src/components/edit/attr_select.vue
  3. 3 3
      src/components/edit/edit-dialog.vue
  4. 10 4
      src/components/mapClass/EditScence.ts

+ 13 - 1
src/components/baseEditer.vue

@@ -30,6 +30,7 @@ import { Message } from "element-ui";
 import { SCircleItem } from "@/lib/items/SCircleItem";
 import menuList from "@/components/edit/menu_list.vue";
 window.FENGMAP = null;
+const isMac = /macintosh|mac os x/i.test(navigator.userAgent);
 //// 底图空间增加字段 isExtracted:boolean true 已被提取过
 export default {
   props: {
@@ -85,11 +86,17 @@ export default {
     window.vm = this;
     const that = this;
     document.onkeydown = function(event) {
+      console.log('ctrl',event,isMac)
       const e = event || window.event || arguments.callee.caller.arguments[0];
       if (e && e.key == "Control") {
         // 按 ctrl
         that.scene.isDownCtrl = true;
       }
+      if(e && e.key == "Meta" && isMac){
+           console.log('meta',event,isMac)
+        // 如果为苹果键
+        that.scene.isDownCtrl = true;
+      }
     };
     document.onkeyup = function(event) {
       const e = event || window.event || arguments.callee.caller.arguments[0];
@@ -98,6 +105,11 @@ export default {
         that.scene.isDownCtrl = false;
         this.scene.setCmd = "choice";
       }
+      if(e && e.key == "Meta" && isMac){
+        // 如果为苹果键
+        that.scene.isDownCtrl = false;
+        this.scene.setCmd = "choice";
+      }
     };
     // 监听粘贴事件
     // document.onpaste = e =>{
@@ -107,7 +119,7 @@ export default {
     // 自动保存(时间差为一分钟)
     this.autoSave = setInterval(() => {
       this.saveMsgNoMessage();
-    }, 60000);
+    }, 300000);
   },
   methods: {
     init() {

+ 12 - 8
src/components/edit/attr_select.vue

@@ -123,7 +123,7 @@
                   v-model="lengedName"
                   allow-clear
                   @change="changeLengedName"
-                  :auto-size="{ minRows: 2}"
+                  :rows="2"
           />
 <!--          <a-input v-model="lengedName" @change="changeLengedName" />-->
         </div>
@@ -183,7 +183,7 @@
                     v-model="lengedName"
                     allow-clear
                     @change="changeLengedName"
-                    :auto-size="{ minRows: 2}"
+                    :rows="2"
             />
 <!--            <a-input v-model="lengedName" @change="changeLengedName" />-->
           </div>
@@ -212,7 +212,7 @@
             <a-textarea
               @change="changeitemExplain"
               v-model="itemExplain"
-              :auto-size="{ minRows: 4, maxRows: 6 }"
+              :rows="4"
             />
           </div>
           <div class="row">
@@ -252,7 +252,7 @@
             <a-button type="link" class="edit-option-btn" @click="OpenEditStatus">{{isEdit? "取消编辑" : editStatus[type]}}</a-button>
           </div>
           <div class="row">
-            <a-textarea placeholder="" v-model="lengedName" allow-clear @change="changeLengedName" :auto-size="{ minRows: 2}"/>
+            <a-textarea placeholder="" v-model="lengedName" allow-clear @change="changeLengedName" :rows="2"/>
           </div>
           <div class="row">
             <div class="row-tit">字号</div>
@@ -280,7 +280,7 @@
                     v-model="lengedName"
                     allow-clear
                     @change="changeLengedName"
-                    :auto-size="{ minRows: 2}"
+                    :rows="2"
             />
 <!--            <a-input v-model="lengedName" @change="changeLengedName" />-->
           </div>
@@ -349,7 +349,7 @@
         </a-collapse-panel>
       </a-collapse>
     </div>
-    <editDialog ref="dialog" :attrCards="attrCards" :GraphElementId="GraphElementId" :InfoLocal="InfoLocal" :sysNum="imageNum" :key="new Date().getTime()" />
+    <editDialog ref="dialog" :attrCards="attrCards" :GraphElementId="GraphElementId" :InfoLocal="InfoLocal" :sysNum="imageNum" :key="keys" />
 <!--    <editDialog ref="dialog" :attrCards="attrCards" :getmajorId="getmajorId" :InfoLocal="InfoLocal" :sysNum="imageNum" :key="new Date().getTime()" />-->
     <!--    <editDialog ref="dialog" :typeEdit="2" :getmajorId="'1001'" :sysNum="5" />-->
   </div>
@@ -475,6 +475,7 @@ export default {
       GraphElementId:'',//图例Id
       CUSTOMbgColor: 'rgba(0,0,0,0.15)', // 自定义多边形背景色
       CUSTOMbdColor: 'rgba(0,0,0,1)', // 自定义多边形线条色
+      keys:new Date().getTime()
     };
   },
   methods: {
@@ -558,7 +559,10 @@ export default {
       }
     },
     handleEdit() {
-      this.$refs.dialog.showModal();
+      this.keys = new Date().getTime()
+      setTimeout(()=>{
+          this.$refs.dialog.showModal();
+      })
     },
     // 修改设备数量
     changeImageNum() {
@@ -695,7 +699,7 @@ export default {
               if (newval.itemList[0] instanceof SCustomLegendItem) {
                 const fColor = newval.itemList[0].fillColor;
                 this.CUSTOMbgColor = `rgba(${fColor.red}, ${fColor.green}, ${fColor.blue}, ${fColor.alpha/100})`
-                
+
                 const bColor = newval.itemList[0].strokeColor;
                 this.CUSTOMbdColor = `rgba(${bColor.red}, ${bColor.green}, ${bColor.blue}, ${bColor.alpha/100})`
               }

+ 3 - 3
src/components/edit/edit-dialog.vue

@@ -281,7 +281,7 @@
                     graphElementId:this.GraphElementId,
                 }).then(res=>{
                     this.spinning = false;
-                    let data = res.Data;
+                    const data = res.Data;
                     (function recursion(newObj) {
                         newObj.map(item => {
                             item.label = item.name;
@@ -293,7 +293,7 @@
                     })(data)
                     this.treeData = data;
                     this.treeData.length && this.treeData.map(item=>{
-                        let index = item.name.indexOf('/');
+                        const index = item.name.indexOf('/');
                         item.name = item.name.slice(index+1);
                     })
                 }).catch(()=>{
@@ -330,7 +330,7 @@
             //获取treeId --classstructureid
             onSearchTree(val){
                 console.log(this.majorId);
-                let arr = [];
+                const arr = [];
                 const reg = new RegExp(val, 'g');
                 let flag= false;
                 if(this.majorId=='#'){

+ 10 - 4
src/components/mapClass/EditScence.ts

@@ -31,10 +31,11 @@ import { SCustomLegendItem } from '@/lib/items/SCustomLegendItem';
  *
  * @author 韩耀龙
  */
-
 export class EditScence extends SGraphScene {
 
     undoStack = new SUndoStack();
+    /** 判断是否为苹果电脑 */
+    public isMac = /macintosh|mac os x/i.test(navigator.userAgent);
     /** 命令 1 绘制直线 */
     private cmd = 'choice';
     /** 获取当前状态 */
@@ -102,7 +103,8 @@ export class EditScence extends SGraphScene {
         ItemColor.columnColor = new SColor("#d4d4d4")
         ItemColor.virtualWallColor = new SColor("#d4d4d4")
         ItemColor.selectColor = new SColor("#f0f0f0")
-        ItemColor.spaceBorderColor = new SColor("#d4d4d4")
+        ItemColor.spaceBorderColor = new SColor("#d4d4d4");
+        console.log('isMac',this.isMac)
     }
     /** 绘制图例样式 */
     _legend: any | null = null;
@@ -1139,8 +1141,12 @@ export class EditScence extends SGraphScene {
         if (event.code == 'Delete') {
             this.deleiteItem()
         }
+        // 删除键功能--兼容苹果mac
+        if (event.code == 'Backspace' && this.isMac){
+            this.deleiteItem()
+        }
         // 复制粘贴
-        if (event.ctrlKey && !event.repeat) { 
+        if (event.ctrlKey && !event.repeat) {
             if (event.code == 'KeyC') {
                 console.log('ctrl c')
                 this.copy()
@@ -1189,7 +1195,7 @@ export class EditScence extends SGraphScene {
             document.body.removeChild(input)
         }
     }
-    
+
     /**
      * 粘贴
      *