haojianlong 4 yıl önce
ebeveyn
işleme
a04dababf4

+ 7 - 7
package-lock.json

@@ -1064,11 +1064,11 @@
       "integrity": "sha512-bsOw0WsGSn98oYkuf9Uah6Po2Ds7IWknxHqUmYxu7h8qaqw7SidWmT/9iwNTCnjeqJEd5f6tP+Yg4tT/8C52YA=="
     },
     "@saga-web/big": {
-      "version": "1.0.37",
-      "resolved": "http://192.168.200.80:8081/repository/npm-saga/@saga-web/big/-/big-1.0.37.tgz",
-      "integrity": "sha512-Se0SqHIUr98Bj4j3CTGsIVixDlnUDYlytaIRVczsOr2Z6yxWqnnxlKNHv+RIGcoF6hirqnkJrEblyC0FQBW0ZQ==",
+      "version": "1.0.39",
+      "resolved": "http://192.168.200.80:8081/repository/npm-saga/@saga-web/big/-/big-1.0.39.tgz",
+      "integrity": "sha512-1tdfTUkXr3mFxuakkriuiNIYFfRlbAYyh8bRHuoIOkNuJ42mXrQU4t/loWrThOe62zbUlDJx1W0qxyZajIQZdA==",
       "requires": {
-        "@saga-web/graph": "2.1.80"
+        "@saga-web/graph": "2.1.81"
       }
     },
     "@saga-web/draw": {
@@ -1116,9 +1116,9 @@
       }
     },
     "@saga-web/graph": {
-      "version": "2.1.80",
-      "resolved": "http://192.168.200.80:8081/repository/npm-saga/@saga-web/graph/-/graph-2.1.80.tgz",
-      "integrity": "sha512-9zx4XC6qxMG+jfsdtdCD7dv+vg7lCbsV/ekOl/Vsdpa0VHpcSQBL9S69f2qunrR1YCTUSlMgh6TBvLjDUHko6g==",
+      "version": "2.1.81",
+      "resolved": "http://192.168.200.80:8081/repository/npm-saga/@saga-web/graph/-/graph-2.1.81.tgz",
+      "integrity": "sha512-qZx4RUXuR/Y02/EUGZHTe10rF+SWndgVx0vexRRaslmHNn6NbRxpqRKtrGFJXJBOKoCaxIN3ZpDC62/9yUDVTg==",
       "requires": {
         "@saga-web/draw": "2.1.94"
       }

+ 2 - 2
package.json

@@ -9,10 +9,10 @@
   },
   "dependencies": {
     "@saga-web/base": "2.1.19",
-    "@saga-web/big": "1.0.37",
+    "@saga-web/big": "1.0.39",
     "@saga-web/draw": "2.1.94",
     "@saga-web/feng-map": "1.0.8",
-    "@saga-web/graph": "2.1.80",
+    "@saga-web/graph": "2.1.81",
     "@saga-web/topology": "1.0.84",
     "ant-design-vue": "^1.6.0",
     "core-js": "^3.6.4",

+ 7 - 0
src/components/baseEditer.vue

@@ -146,6 +146,13 @@ export default {
         }
         bus.$emit('exportItem',data)
       })
+      bus.$on("exportByKey", val => {
+        this.fParser.spaceList.forEach(t => {
+          if(t.data.Type == val.key){
+            t.selected = true;
+          }
+        })
+      })
     }
   },
   watch: {

+ 18 - 45
src/components/edit/left_toolbar.vue

@@ -1,37 +1,17 @@
 <template>
   <div id="left_toolbar">
     <ul class="list-1">
-      <li
-        v-on:mouseout="mouseoutActive(item)"
-        v-on:mouseover="mouseoverActive(item)"
-        v-for="(item,i) in baseChoice"
-        :key="i"
-        @click="toolActionClick(item)"
-        v-bind:class="{ actives:item.isChoice}"
-      >
+      <li v-on:mouseout="mouseoutActive(item)" v-on:mouseover="mouseoverActive(item)" v-for="(item,i) in baseChoice" :key="i"
+        @click="toolActionClick(item)" v-bind:class="{ actives:item.isChoice}">
         <div class="item">
-          <img
-            v-show="!item.isHover && !item.isChoice"
-            :src="require(`./../../assets/images/${item.img}`)"
-            alt
-          />
-          <img
-            v-show="item.isHover || item.isChoice "
-            :src="require(`./../../assets/images/${item.hoverImg}`)"
-            alt
-          />
+          <img v-show="!item.isHover && !item.isChoice" :src="require(`./../../assets/images/${item.img}`)" alt />
+          <img v-show="item.isHover || item.isChoice " :src="require(`./../../assets/images/${item.hoverImg}`)" alt />
         </div>
       </li>
     </ul>
     <ul class="list-2">
-      <li
-        v-on:mouseout="mouseoutActive(item)"
-        v-on:mouseover="mouseoverActive(item)"
-        v-for="(item,i) in systemChoice"
-        @click="showDrawer(item)"
-        :key="i"
-        v-bind:class="{ actives:item.isChoice}"
-      >
+      <li v-on:mouseout="mouseoutActive(item)" v-on:mouseover="mouseoverActive(item)" v-for="(item,i) in systemChoice" @click="showDrawer(item)"
+        :key="i" v-bind:class="{ actives:item.isChoice}">
         <div class="item">
           <img v-show="!item.isHover" :src="require(`./../../assets/images/${item.img}`)" alt />
           <img v-show="item.isHover" :src="require(`./../../assets/images/${item.hoverImg}`)" alt />
@@ -41,13 +21,7 @@
     </ul>
     <!--    提取-->
     <ul class="list-2 border-top">
-      <li
-        v-on:mouseout="mouseoutActive(item)"
-        v-on:mouseover="mouseoverActive(item)"
-        v-for="(item,i) in extractChoice"
-        :key="i"
-        @click="extractItem"
-      >
+      <li v-on:mouseout="mouseoutActive(item)" v-on:mouseover="mouseoverActive(item)" v-for="(item,i) in extractChoice" :key="i" @click="extractItem">
         <div class="item">
           <img v-show="!item.isHover" :src="require(`./../../assets/images/${item.img}`)" alt />
           <img v-show="item.isHover" :src="require(`./../../assets/images/${item.hoverImg}`)" alt />
@@ -69,14 +43,7 @@
     <!-- 打开弹窗 -->
     <transition name="fade">
       <div class="drawer-model" id="drawer-model" v-show="visible">
-        <a-drawer
-          placement="left"
-          :closable="false"
-          :visible="visible"
-          :wrap-style="{ position: 'absolute',}"
-          @close="onClose"
-          :getContainer="false"
-        >
+        <a-drawer placement="left" :closable="false" :visible="visible" :wrap-style="{ position: 'absolute',}" @close="onClose" :getContainer="false">
           <div class="drawer-model-body" v-show="activeItem ==1 || activeItem ==2">
             <div class="btn-list">
               <a-button-group>
@@ -104,7 +71,9 @@
             </div>
           </div>
           <div class="drawer-model-body drawer-model-body-extract" v-show="activeItem ==3">
-            <a-table :columns="columns" :data-source="data" size="small" :pagination="false" />
+            <a-table :columns="columns" :data-source="data" size="small" :pagination="false">
+              <a-tag slot="address" slot-scope="text, record, index" :color="'geekblue'" @click="pickUp(text, record, index)">{{ text }}</a-tag>
+            </a-table>
           </div>
         </a-drawer>
       </div>
@@ -113,7 +82,7 @@
 </template>
 <script>
 import itemTree from "./leftbar_components/itemTree";
-import {queryByGroup} from "@/api/editer.js"
+import { queryByGroup } from "@/api/editer.js"
 import bus from "@/bus";
 const columns = [
   {
@@ -130,7 +99,8 @@ const columns = [
   },
   {
     title: "操作",
-    dataIndex: "address"
+    dataIndex: "address",
+    scopedSlots: { customRender: 'address' }
   }
 ];
 const data = [
@@ -307,10 +277,13 @@ export default {
       this.activeItem = 3;
       bus.$emit("extractItem")
     },
-    getBus(){
+    getBus() {
       bus.$on("exportItem", data => {
         this.data = data;
       })
+    },
+    pickUp(text, record, index) {
+      bus.$emit('exportByKey', record);
     }
   },
   watch: {