imatrix-ui 2.8.97-dw-tmp11 → 2.8.97-dw-tmp13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imatrix-ui",
-  "version": "2.8.97-dw-tmp11",
+  "version": "2.8.97-dw-tmp13",
   "description": "前端组件库：表格、表单、组织结构树等",
   "main": "lib/super-ui.umd.min.js",
   "private": false,

package/src/views/dsc-component/Sidebar/Item.vue

@@ -52,9 +52,9 @@ export default {
         </div>)
       } else {
         // 有子菜单时
-        vnodes.push(<div slot='title' style='display: inline-block'>
+        vnodes.push(<template v-slot:title>  <div style='display: inline-block'>
           <div title={title} style={'display: inline-block;width:' + width + ';overflow:hidden;text-overflow:ellipsis;white-space:nowrap;word-break:keep-all;'}>{(title)}</div>
-        </div>)
+        </div></template>)
       }
     }
     return vnodes

package/src/views/dsc-component/Sidebar/SidebarItem.vue

@@ -9,12 +9,11 @@
     </template>
 
     <el-submenu v-else :index="resolvePath(item.code,item.path,item.pageType)" :show-timeout="0" :hide-timeout="50" popper-class="sidebar-container-popper">
-      <template slot="title">
+      <template v-slot:title>
         <item :icon="item.iconName" :title="getI18nName(item)" :has-children="item.children.length > 0?true:false" />
       </template>
 
       <template v-for="child in item.children">
-        <!-- <sidebar-item-child :key="child.code" :child="child" /> -->
         <sidebar-item
           v-if="child.children&&child.children.length>0"
           :key="child.code"

package/src/views/dsc-component/Sidebar/index.vue

@@ -1,15 +1,17 @@
 <template>
   <div>
     <el-scrollbar wrap-class="scrollbar-wrapper">
-      <el-menu
-        :show-timeout="200"
-        :default-active="getDefaultActive()"
-        :collapse="isCollapse"
-        mode="vertical"
-        @select="selectMenu"
-      >
-        <sidebar-item v-for="menu in menus" :key="menu.code" :item="menu" />
-      </el-menu>
+      <keep-alive>
+        <el-menu
+          :show-timeout="200"
+          :default-active="getDefaultActive()"
+          :collapse="isCollapse"
+          mode="vertical"
+          @select="selectMenu"
+        >
+          <sidebar-item v-for="menu in menus" :key="menu.code" :item="menu" />
+        </el-menu>
+      </keep-alive>
     </el-scrollbar>
     <hamburger :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
   </div>

package/src/views/dsc-component/Sidebar/SidebarItemChild.vue

@@ -1,152 +0,0 @@
-<template>
-  <div>
-    <sidebar-item
-      v-if="child && child.children&&child.children.length>0"
-      :is-nest="true"
-      :item="child"
-      class="nest-menu"
-    />
-    <app-link v-else :key="child.code" :to="toPath(child)" @click.native="clickMenu(toPath(child))">
-      <el-menu-item :index="resolvePath(child.code,child.path,child.pageType)">
-        <item :icon="child.iconName" :title="getI18nName(child)" />
-      </el-menu-item>
-    </app-link>
-  </div>
-</template>
-
-<script>
-// import { isExternal } from 'imatrix-ui/src/utils'
-import Item from './Item'
-import AppLink from './Link'
-import Vue from 'vue'
-import tabJs from '../../../api/tab'
-import { getI18nName } from '../../../utils/menu'
-import SidebarItem from './SidebarItem.vue'
-export default {
-  name: 'SidebarItemChild',
-  components: { Item, AppLink, SidebarItem },
-  props: {
-    // route object
-    child: {
-      type: Object,
-      required: true
-    },
-    isNest: {
-      type: Boolean,
-      default: false
-    }
-    // basePath: {
-    //   type: String,
-    //   default: ''
-    // }
-  },
-  data() {
-    return {
-      onlyOneChild: null
-    }
-  },
-  methods: {
-    ...tabJs,
-    hasOneShowingChild(children, parent) {
-      if (children && children.length > 0) {
-        this.onlyOneChild = children[0]
-      }
-      // When there is only one child router, the child router is displayed by default
-      if (children.length === 1) {
-        return true
-      }
-
-      // Show parent if there are no child router to display
-      if (!children || children.length === 0) {
-        // children不存在
-        this.onlyOneChild = { ... parent, path: '', noShowingChildren: true }
-        return true
-      }
-
-      return false
-    },
-    resolvePath(menuCode, pageCode, pageType) {
-      if (this.isExternalLink(pageType)) {
-        return '/dsc/' + menuCode + '~~'
-      } else {
-        return '/dsc/' + menuCode + '~~' + pageCode
-      }
-    },
-    toPath(menu) {
-      const toPathObj = {}
-      const routePath = menu.path
-      toPathObj.openWay = menu.openWay
-      if (this.isExternalLink(menu.pageType)) {
-        toPathObj.path = '/dsc-index/iframe-page'
-        toPathObj.tabPath = '/dsc/iframe-page'
-        toPathObj.query = {}
-        toPathObj.query.src = routePath
-        toPathObj.isExternal = true
-        // 如果路径中没有拼系统编码，才需要把系统编码放到参数中
-        toPathObj.query.customSystem = Vue.prototype.customSystem
-        toPathObj.query._menuCode = menu.code
-        toPathObj.query._menuName = getI18nName(menu)
-      } else {
-        const pageCode = routePath
-        toPathObj.path = '/dsc-index/page'
-        toPathObj.tabPath = '/dsc/page'
-        toPathObj.query = {}
-        toPathObj.query.pageCode = pageCode
-        toPathObj.query.customSystem = Vue.prototype.customSystem
-        toPathObj.query._menuCode = menu.code
-        toPathObj.query._menuName = getI18nName(menu)
-      }
-      return toPathObj
-    },
-    // 是否已存在customSystem参数
-    isHasCustomSystem(routePath) {
-      if (routePath && routePath.indexOf('?') > 0) {
-        const params = routePath.substring(routePath.indexOf('?') + 1)
-        const paramArr = params.split('&')
-        for (let i = 0; i < paramArr.length; i++) {
-          const item = paramArr[i]
-          const key = item.split('=')[0]
-          if (key === 'customSystem') {
-            return true
-          }
-        }
-      }
-      return false
-    },
-    clickMenu(toPathObj) {
-      // console.log('clickMenu----toPathObj=', toPathObj)
-      if (toPathObj.openWay && toPathObj.openWay === 'NEW_PAGE_OPEN' && toPathObj.query) {
-        // 新页签打开菜单
-        let url = toPathObj.query.src
-        if (url && url.indexOf('?') > 0) {
-          url += '&'
-        } else {
-          url += '?'
-        }
-        if (toPathObj.query.customSystem) {
-          url += 'customSystem=' + toPathObj.query.customSystem
-        }
-        if (toPathObj.query._menuCode) {
-          url += '_menuCode=' + toPathObj.query._menuCode
-        }
-        if (toPathObj.query._menuCode) {
-          url += '_menuName=' + toPathObj.query._menuName
-        }
-        window.open(url, toPathObj.query._menuCode)
-      } else {
-        // 刷新页签打开菜单
-        this.addTabs(toPathObj.query, this.$store.state.tabContent.openTab, toPathObj.tabPath)
-      }
-    },
-    isExternalLink(pageType) {
-      if (pageType && pageType === 'iframe') {
-        return true
-      }
-      return false
-    },
-    getI18nName(menu) {
-      return getI18nName(menu)
-    }
-  }
-}
-</script>