haojianlong 4 лет назад
Родитель
Сommit
e6dc815ebe

+ 2 - 2
package.json

@@ -9,10 +9,10 @@
   },
   "dependencies": {
     "@saga-web/base": "2.1.22",
-    "@saga-web/big": "1.0.81",
+    "@saga-web/big": "1.0.82",
     "@saga-web/draw": "2.1.101",
     "@saga-web/feng-map": "1.0.24",
-    "@saga-web/graph": "2.1.109",
+    "@saga-web/graph": "2.1.110",
     "ant-design-vue": "^1.6.0",
     "core-js": "^3.6.4",
     "element-ui": "^2.13.2",

BIN
src/assets/images/order-after-d.png


BIN
src/assets/images/order-after.png


BIN
src/assets/images/order-before-d.png


BIN
src/assets/images/order-before.png


BIN
src/assets/images/order-bottom-d.png


BIN
src/assets/images/order-bottom.png


BIN
src/assets/images/order-top-d.png


BIN
src/assets/images/order-top.png


+ 4 - 0
src/components/baseEditer.vue

@@ -157,6 +157,7 @@ export default {
             this.fParser.parseData(res);
             this.scene.fidToItem = {};
             this.fParser.spaceList.forEach(t => {
+              t.nameColor = '#2a2a2a';
               t.zOrder = t.zOrder + t.data.Height;
               t.selectable = true;
               this.scene.fidToItem[t.data.SourceId] = t;
@@ -329,6 +330,9 @@ export default {
       bus.$on("changeAlignItem", val => {
         this.scene.changeAlignItem(val);
       });
+      bus.$on("changeOrderItem", val => {
+        this.scene.changeOrderItem(val);
+      });
       bus.$on("extractItem", () => {
         const map = {},type={};
         this.fParser.spaceList.forEach(t => {

+ 48 - 1
src/components/edit/top_toolbar.vue

@@ -32,6 +32,23 @@
             <div class="ant-dropdown-link dropdown-flex" @click="e => e.preventDefault()">
               <div>
                 <img class="lock" :src="require(`./../../assets/images/t-format.png`)" alt />
+                <div>图层</div>
+              </div>
+              <a-icon type="caret-down" class="down-icon" />
+            </div>
+            <a-menu slot="overlay">
+              <a-menu-item :disabled='item.disable' v-for="item in orderOptions" :key="item.value" @click="changeOrderItem(item.value)">
+                <img style="width: 16px;margin-right: 5px;" :src="require(`./../../assets/images/`+item.img+`.png`)" alt />
+                <span>{{item.label}}</span>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </li>
+        <li>
+          <a-dropdown :trigger="['click']">
+            <div class="ant-dropdown-link dropdown-flex" @click="e => e.preventDefault()">
+              <div>
+                <img class="lock" :src="require(`./../../assets/images/t-format.png`)" alt />
                 <div>对齐</div>
               </div>
               <a-icon type="caret-down" class="down-icon" />
@@ -76,7 +93,7 @@
 </template>
 <script>
 import bus from "@/bus";
-import { SGraphLayoutType } from "@saga-web/graph/lib";
+import { SGraphLayoutType, SOrderSetType } from "@saga-web/graph/lib";
 import systym from "./codeMapSystem.js";
 import { MessageBox } from 'element-ui';
 export default {
@@ -135,6 +152,32 @@ export default {
            disable:true,
         }
       ],
+      orderOptions:[//图层
+        {
+          value: SOrderSetType.Top,
+          label: "同类置顶",
+          img: "order-top",
+          disable:false,
+        },
+        {
+          value: SOrderSetType.Bottom,
+          label: "同类置底",
+          img: "order-bottom",
+          disable:false,
+        },
+        {
+          value: SOrderSetType.After,
+          label: "上移一层",
+          img: "order-after",
+          disable:false,
+        },
+        {
+          value: SOrderSetType.Before,
+          label: "下移一层",
+          img: "order-before",
+          disable:false,
+        },
+      ],
       scale: 0.5, //底图缩放比例
       initScale: 0.5,  //初始 底图缩放比例
       baseScale: 1.0,  //底图基础缩放比例,由底图加载完成后,传入进来
@@ -247,6 +290,10 @@ export default {
     changeAlignItem(val) {
       bus.$emit("changeAlignItem", val);
     },
+    // 图层顺序
+    changeOrderItem(val){
+      bus.$emit('changeOrderItem', val )
+    },
     // 撤销
     undo(){
        bus.$emit("changeUndo");

+ 14 - 6
src/components/mapClass/EditScence.ts

@@ -84,12 +84,12 @@ export class EditScence extends SGraphScene {
         super();
         // // 选择绑定选额item事件
         this.selectContainer.connect("listChange", this, this.listChange);
-        ItemColor.spaceColor = new SColor("#A4ABB22B")
-        ItemColor.wallColor = new SColor("#A7AEB3FF")
-        ItemColor.columnColor = new SColor("#A7AEB3FF")
-        ItemColor.virtualWallColor = new SColor("#A7AEB3FF")
-        ItemColor.selectColor = new SColor("#84A0BB2B")
-        ItemColor.spaceBorderColor = new SColor("#A7AEB3FF")
+        ItemColor.spaceColor = new SColor("#f0f0f0")
+        ItemColor.wallColor = new SColor("#d4d4d4")
+        ItemColor.columnColor = new SColor("#d4d4d4")
+        ItemColor.virtualWallColor = new SColor("#d4d4d4")
+        ItemColor.selectColor = new SColor("#f0f0f0")
+        ItemColor.spaceBorderColor = new SColor("#d4d4d4")
     }
     /** 绘制图例样式 */
     _legend: any | null = null;
@@ -850,6 +850,14 @@ export class EditScence extends SGraphScene {
     }
 
     /**
+     * 图层排序
+     * @param v
+     */
+    changeOrderItem(v: any): void {
+        this.selectContainer.setOrder(v);
+    }
+
+    /**
      * 提取item
      */
     extractItem(): void {