system-clients 3.2.86 → 3.2.87-fix

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "system-clients",
-  "version": "3.2.86",
+  "version": "3.2.87-fix",
   "description": "系统基础框架",
   "main": "src/index.js",
   "directories": {

package/src/components/server/LeftTree.vue

@@ -1,61 +1,67 @@
 <template>
   <div class='over'>
-    <tree :model='functions' :flagres="false" :is-click="false" v-ref:tree @toggle="toggled" >
+    <tree :model='functions' :flagres="false" :is-click="false" v-ref:tree @toggle="toggled">
       <span partial class="row" :class="{ 'tree-img': isFolder(row), 'tree-span': !isFolder(row) }">
-        <div class="col-sm-2" >
+        <div class="col-sm-2">
           <img v-if="isFolder(row)" :src="row.data.icon" alt="">
         </div>
-        <div class="col-sm-8" style="padding-left:6%;text-align: left" title="{{row.data.name}}">{{row.data.name}}</div>
+        <div class="col-sm-8" style="padding-left:6%;text-align: left"
+             title="{{row.data.name}}">{{ row.data.name }}</div>
       </span>
     </tree>
   </div>
 </template>
 <script>
-  import Vue from 'vue'
+import Vue from 'vue'
 
 export default {
-  props: ['functions', 'userid','tabs'],
+  props: ['functions', 'userid', 'tabs'],
   title: '左侧树菜单',
-  data () {
+  data() {
     return {
       index: -1,
       name: null,
-      tbcg:[]
+      tbcg: []
     }
   },
   methods: {
-    open (row) {
+    open(row) {
       if (row.data.name === '资源管理') {
         this.$parent.changeMain(row.data.id)
-          return
+        return
       }
-        console.log(row.data.navigate)
-        if (row.data.navigate) {
+      console.log(row.data.navigate)
+      if (row.data.navigate) {
 
-            let isExist = false
+        let isExist = false
         this.tbcg.forEach((tab) => {
-            if(tab.comp.name == row.data.link) {
+          if (tab.comp.props.compName === row.data.link) {
             isExist = true
           }
         })
-        if (!isExist){
-          this.$goto('embbed-page', {domainName: row.data.navigate, title: row.data.name, compName: row.data.link, login: Vue.$login, param: Vue.$appdata}, 'main')
-        }else {
-            console.log(isExist,'aa')
-          this.$emit('isnodo',row.data.link)
+        if (!isExist) {
+          this.$goto('embbed-page', {
+            domainName: row.data.navigate,
+            title: row.data.name,
+            compName: row.data.link,
+            login: Vue.$login,
+            param: Vue.$appdata
+          }, 'main')
+        } else {
+          this.$emit('isnodo', row.data.link)
         }
       } else if (row.data.link) {
         let isExist = false
         this.tbcg.forEach((tab) => {
-          if(tab.comp.name == row.data.link) {
+          if (tab.comp.name == row.data.link) {
             isExist = true
           }
         })
-        if (!isExist){
+        if (!isExist) {
           this.$goto(row.data.link, {f: this.functions}, 'main')
-        }else {
-            console.log(isExist,'saaa')
-          this.$emit('isnodo',row.data.link)
+        } else {
+          console.log(isExist, 'saaa')
+          this.$emit('isnodo', row.data.link)
         }
       }
     },
@@ -70,22 +76,22 @@ export default {
       // 当前激活页签有，index为-1，说明菜单收缩
       this.changeSelected(index)
     },
-    selfFindIndex (name) {
+    selfFindIndex(name) {
 
       return this.$refs.tree.toNode.findIndex((item) => {
         return item.data.link === name
       })
     },
-    changeSelected (index) {
+    changeSelected(index) {
 
       if (index === -1) {
         this.$refs.tree.selectStore.select(null)
-      }else {
+      } else {
         this.$refs.tree.selectStore.select(this.$refs.tree.toNode[index])
       }
 
     },
-    toggled () {
+    toggled() {
 
       if (this.name && this.index === -1) {
         let index = this.selfFindIndex(this.name)
@@ -102,8 +108,8 @@ export default {
       this.open(data.val)
     }
   },
-  watch:{
-    'tabs'(val){
+  watch: {
+    'tabs'(val) {
       this.tbcg = val
     }
   }

package/src/components/server/ResSelectGroup.vue

@@ -135,6 +135,13 @@ export default {
           userid: this.$login.f.id
         }, {resolveMsg: null, rejectMsg: '获取片区出错！！！'})
         let arr = getAllArea.data.filter((res) => {
+          if(Array.isArray(val)){
+            for (let i = 0; i <val.length ; i++) {
+              if(res.parentid == val[i]){
+                return true
+              }
+            }
+          }
           return res.parentid == val
         })
         this.sliceArea = []