imatrix-ui 0.2.4-up → 0.2.6-up

package/src/styles/theme/dark-blue/index.scss

@@ -190,7 +190,8 @@
   }
 
   .el-pagination {
-    text-align: right;
+    display: flex;
+    justify-content: flex-end;
   }
 
   .el-table td {
@@ -209,7 +210,7 @@
   /**表格内容纵向分隔线去掉**/
   .el-table--border td,
   .el-table--border th,
-  .el-table__body-wrapper .el-table--border.is-scrolling-left~.el-table__fixed {
+  .el-table__body-wrapper .el-table--border.is-scrolling-left ~ .el-table__fixed {
     border-right: 0px
   }
 
@@ -217,7 +218,7 @@
   .el-table--border td,
   .el-table--border th,
   .el-table--border th.is-leaf,
-  .el-table__body-wrapper .el-table--border.is-scrolling-left~.el-table__fixed {
+  .el-table__body-wrapper .el-table--border.is-scrolling-left ~ .el-table__fixed {
     border-right: 1px solid #fefefe;
   }
 
@@ -231,7 +232,7 @@
     text-align: left;
   }
 
-  .el-button+.el-button {
+  .el-button + .el-button {
     margin-left: 10px;
   }
 
@@ -269,4 +270,4 @@
     border-radius: 0;
     box-shadow: 0 0px 0px #ccc;
   }
-}
+}

package/src/utils/auth-api.js

@@ -1,4 +1,4 @@
-import * as Cookies from 'js-cookie'
+import Cookies from 'js-cookie'
 // const Cookies = require('js-cookie')
 
 const jwtKey = 'JWT'
@@ -71,7 +71,8 @@ function removeCurrentUser() {
 }
 
 function getCookieCache(key) {
-    console.log('%c描述-120304', 'color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px', Cookies);
+    console.log('%c描述-173122', 'color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px', Cookies);
+    console.dir(Cookies);
     return Cookies.get(key)
 }
 

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

@@ -1,228 +1,229 @@
 <template>
-  <div>
-    <el-scrollbar wrap-class="scrollbar-wrapper">
-      <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>
+	<div>
+		<el-scrollbar wrap-class="scrollbar-wrapper">
+			<keep-alive>
+				<el-menu
+						:collapse="isCollapse"
+						:default-active="getDefaultActive()"
+						:show-timeout="200"
+						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>
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
+import {mapGetters} from 'vuex'
 import SidebarItem from './SidebarItem'
-import * as Cookies from 'js-cookie'
+import Cookies from 'js-cookie'
 import tabJs from '../../../api/tab'
-import { getMenus } from '../../../utils/permissionAuth'
-import { getI18nName } from '../../../utils/menu'
+import {getMenus} from '../../../utils/permissionAuth'
+import {getI18nName} from '../../../utils/menu'
+
 export default {
-  name: 'Sidebar',
-  components: {
-    SidebarItem,
-  },
-  props: {
-    systemCode: {
-      type: String,
-      default: null,
-    },
-    collapse: {
-      type: Boolean,
-      default: false,
-    },
-  },
-  data() {
-    const menus = getMenus()
-    return {
-      menus: Object.freeze(menus),
-    }
-  },
-  computed: {
-    ...mapGetters(['sidebar']),
-    isCollapse() {
-      if (this.collapse === false) {
-        return !this.sidebar.opened
-      }
-      return true
-    },
-  },
-  created() {
-    const a = new Date().getTime()
-    this.firstLeafMenu = this.getMyFirstMenu(this.menus)
-    if (this.firstLeafMenu && this.firstLeafMenu.fullPath) {
-      // 跳转到第一个页面
-      if (
-        this.firstLeafMenu.pageType &&
-        this.firstLeafMenu.pageType === 'iframe'
-      ) {
-        const iframeSrc = this.firstLeafMenu.fullPath
-        const path = this.firstLeafMenu.path
-        const query = {
-          src: iframeSrc,
-          customSystem: this.systemCode,
-          path: path,
-          _menuCode: this.firstLeafMenu.code,
-          _menuName: getI18nName(this.firstLeafMenu),
-        }
-        this.addTabs(
-          query,
-          this.$store.state.tabContent.openTab,
-          '/dsc/iframe-page',
-          '/dsc/iframe-page'
-        )
-        this.$router.push({ path: '/dsc-index/iframe-page', query: query })
-      } else {
-        const pageCode = this.firstLeafMenu.path
-        const query = {
-          customSystem: this.systemCode,
-          pageCode: pageCode,
-          _menuCode: this.firstLeafMenu.code,
-          _menuName: getI18nName(this.firstLeafMenu),
-        }
-        this.addTabs(
-          query,
-          this.$store.state.tabContent.openTab,
-          '/dsc/page',
-          '/dsc/page'
-        )
-        this.$router.push({ path: '/dsc-index/page', query: query })
-        // this.$router.push({ path: this.firstLeafMenu.fullPath })
-      }
-      const b = new Date().getTime()
-      console.log('菜单组件==>created==>b-a', b - a)
-    }
-  },
-  methods: {
-    ...tabJs,
-    getDefaultActive() {
-      if (this.firstLeafMenu && this.firstLeafMenu.pageType !== 'iframe') {
-        const pageCode = this.firstLeafMenu.path
-        return '/dsc/' + this.firstLeafMenu.code + '~~' + pageCode
-      } else if (
-        this.firstLeafMenu &&
-        this.firstLeafMenu.pageType === 'iframe'
-      ) {
-        return '/dsc/' + this.firstLeafMenu.code + '~~'
-      } else {
-        return ''
-      }
-    },
-    toggleSideBar() {
-      this.$store.dispatch('toggleSidebar')
-    },
-    selectMenu(index, indexPath) {
-      Cookies.set('selectMenu', index)
-    },
-    getMyFirstMenu(menus) {
-      const a = new Date().getTime()
-      if (menus && menus.length > 0) {
-        let shouldSelectMenu = this.getFirstMenu(menus)
-        if (!shouldSelectMenu) {
-          shouldSelectMenu = this.getFirstMenuWithCookie(menus)
-        }
-        const b = new Date().getTime()
-        console.log('菜单组件==>getMyFirstMenu==>b-a', b - a)
-        // 默认不展示第一个有权限的菜单了，可以去掉下面的代码
-        // if (!shouldSelectMenu) {
-        //   shouldSelectMenu = this.getSelectMenuWithFirstMenu(menus[0])
-        // }
-        return shouldSelectMenu
-      }
-    },
-    getFirstMenu(menus) {
-      if (menus && menus.length > 0) {
-        let shouldSelectMenu
-        for (let i = 0; i < menus.length; i++) {
-          const menu = menus[i]
-          shouldSelectMenu = this.getShouldSelectMenu(menu)
-          if (shouldSelectMenu) {
-            // 表示获得到了应该选中的菜单
-            break
-          }
-        }
-        return shouldSelectMenu
-      }
-    },
-    getShouldSelectMenu(menu) {
-      // console.log('dsc--getShouldSelectMenu--this.$route=', this.$route)
-      const currentMenuCode = this.$route.query
-        ? this.$route.query._menuCode
-        : null
-      if (menu && currentMenuCode) {
-        let shouldSelectMenu
-        const children = menu.children
-        if (children && children.length > 0) {
-          shouldSelectMenu = this.getFirstMenu(children)
-        } else if (menu.code && menu.code === currentMenuCode) {
-          shouldSelectMenu = menu
-        }
-        return shouldSelectMenu
-      }
-    },
-    getSelectMenuWithFirstMenu(menu) {
-      if (menu) {
-        let shouldSelectMenu
-        const children = menu.children
-        if (children && children.length > 0) {
-          shouldSelectMenu = this.getFirstMenu(children)
-        } else {
-          shouldSelectMenu = menu
-        }
-        return shouldSelectMenu
-      }
-    },
-    getFirstMenuWithCookie(menus) {
-      if (menus && menus.length > 0) {
-        const cookieMenu = Cookies.get('selectMenu')
-        if (cookieMenu) {
-          //   // 表示缓存中存储了menu，格式为：/dsc/菜单编码~~pageCode
-          const prefix = '/dsc/'
-          const menuCode = cookieMenu.substring(
-            cookieMenu.indexOf(prefix) + prefix.length,
-            cookieMenu.lastIndexOf('~~')
-          )
+	name: 'Sidebar',
+	components: {
+		SidebarItem,
+	},
+	props: {
+		systemCode: {
+			type: String,
+			default: null,
+		},
+		collapse: {
+			type: Boolean,
+			default: false,
+		},
+	},
+	data() {
+		const menus = getMenus()
+		return {
+			menus: Object.freeze(menus),
+		}
+	},
+	computed: {
+		...mapGetters(['sidebar']),
+		isCollapse() {
+			if (this.collapse === false) {
+				return !this.sidebar.opened
+			}
+			return true
+		},
+	},
+	created() {
+		const a = new Date().getTime()
+		this.firstLeafMenu = this.getMyFirstMenu(this.menus)
+		if (this.firstLeafMenu && this.firstLeafMenu.fullPath) {
+			// 跳转到第一个页面
+			if (
+					this.firstLeafMenu.pageType &&
+					this.firstLeafMenu.pageType === 'iframe'
+			) {
+				const iframeSrc = this.firstLeafMenu.fullPath
+				const path = this.firstLeafMenu.path
+				const query = {
+					src: iframeSrc,
+					customSystem: this.systemCode,
+					path: path,
+					_menuCode: this.firstLeafMenu.code,
+					_menuName: getI18nName(this.firstLeafMenu),
+				}
+				this.addTabs(
+						query,
+						this.$store.state.tabContent.openTab,
+						'/dsc/iframe-page',
+						'/dsc/iframe-page'
+				)
+				this.$router.push({path: '/dsc-index/iframe-page', query: query})
+			} else {
+				const pageCode = this.firstLeafMenu.path
+				const query = {
+					customSystem: this.systemCode,
+					pageCode: pageCode,
+					_menuCode: this.firstLeafMenu.code,
+					_menuName: getI18nName(this.firstLeafMenu),
+				}
+				this.addTabs(
+						query,
+						this.$store.state.tabContent.openTab,
+						'/dsc/page',
+						'/dsc/page'
+				)
+				this.$router.push({path: '/dsc-index/page', query: query})
+				// this.$router.push({ path: this.firstLeafMenu.fullPath })
+			}
+			const b = new Date().getTime()
+			console.log('菜单组件==>created==>b-a', b - a)
+		}
+	},
+	methods: {
+		...tabJs,
+		getDefaultActive() {
+			if (this.firstLeafMenu && this.firstLeafMenu.pageType !== 'iframe') {
+				const pageCode = this.firstLeafMenu.path
+				return '/dsc/' + this.firstLeafMenu.code + '~~' + pageCode
+			} else if (
+					this.firstLeafMenu &&
+					this.firstLeafMenu.pageType === 'iframe'
+			) {
+				return '/dsc/' + this.firstLeafMenu.code + '~~'
+			} else {
+				return ''
+			}
+		},
+		toggleSideBar() {
+			this.$store.dispatch('toggleSidebar')
+		},
+		selectMenu(index, indexPath) {
+			Cookies.set('selectMenu', index)
+		},
+		getMyFirstMenu(menus) {
+			const a = new Date().getTime()
+			if (menus && menus.length > 0) {
+				let shouldSelectMenu = this.getFirstMenu(menus)
+				if (!shouldSelectMenu) {
+					shouldSelectMenu = this.getFirstMenuWithCookie(menus)
+				}
+				const b = new Date().getTime()
+				console.log('菜单组件==>getMyFirstMenu==>b-a', b - a)
+				// 默认不展示第一个有权限的菜单了，可以去掉下面的代码
+				// if (!shouldSelectMenu) {
+				//   shouldSelectMenu = this.getSelectMenuWithFirstMenu(menus[0])
+				// }
+				return shouldSelectMenu
+			}
+		},
+		getFirstMenu(menus) {
+			if (menus && menus.length > 0) {
+				let shouldSelectMenu
+				for (let i = 0; i < menus.length; i++) {
+					const menu = menus[i]
+					shouldSelectMenu = this.getShouldSelectMenu(menu)
+					if (shouldSelectMenu) {
+						// 表示获得到了应该选中的菜单
+						break
+					}
+				}
+				return shouldSelectMenu
+			}
+		},
+		getShouldSelectMenu(menu) {
+			// console.log('dsc--getShouldSelectMenu--this.$route=', this.$route)
+			const currentMenuCode = this.$route.query
+					? this.$route.query._menuCode
+					: null
+			if (menu && currentMenuCode) {
+				let shouldSelectMenu
+				const children = menu.children
+				if (children && children.length > 0) {
+					shouldSelectMenu = this.getFirstMenu(children)
+				} else if (menu.code && menu.code === currentMenuCode) {
+					shouldSelectMenu = menu
+				}
+				return shouldSelectMenu
+			}
+		},
+		getSelectMenuWithFirstMenu(menu) {
+			if (menu) {
+				let shouldSelectMenu
+				const children = menu.children
+				if (children && children.length > 0) {
+					shouldSelectMenu = this.getFirstMenu(children)
+				} else {
+					shouldSelectMenu = menu
+				}
+				return shouldSelectMenu
+			}
+		},
+		getFirstMenuWithCookie(menus) {
+			if (menus && menus.length > 0) {
+				const cookieMenu = Cookies.get('selectMenu')
+				if (cookieMenu) {
+					//   // 表示缓存中存储了menu，格式为：/dsc/菜单编码~~pageCode
+					const prefix = '/dsc/'
+					const menuCode = cookieMenu.substring(
+							cookieMenu.indexOf(prefix) + prefix.length,
+							cookieMenu.lastIndexOf('~~')
+					)
 
-          let shouldSelectMenu
-          for (let i = 0; i < menus.length; i++) {
-            const menu = menus[i]
-            shouldSelectMenu = this.getShouldSelectMenuWithCookie(
-              menu,
-              menuCode
-            )
-            if (shouldSelectMenu) {
-              // 表示获得到了应该选中的菜单
-              break
-            }
-          }
-          return shouldSelectMenu
-        }
-      }
-    },
-    getShouldSelectMenuWithCookie(menu, menuCode) {
-      if (menu) {
-        // console.log('dsc--getShouldSelectMenuWithCookie--this.$route=', this.$route)
-        let shouldSelectMenu
-        const children = menu.children
-        if (children && children.length > 0) {
-          shouldSelectMenu = this.getFirstMenuWithCookie(children)
-        } else if (menu.code && menu.code === menuCode) {
-          shouldSelectMenu = menu
-        }
-        return shouldSelectMenu
-      }
-    },
-  },
+					let shouldSelectMenu
+					for (let i = 0; i < menus.length; i++) {
+						const menu = menus[i]
+						shouldSelectMenu = this.getShouldSelectMenuWithCookie(
+								menu,
+								menuCode
+						)
+						if (shouldSelectMenu) {
+							// 表示获得到了应该选中的菜单
+							break
+						}
+					}
+					return shouldSelectMenu
+				}
+			}
+		},
+		getShouldSelectMenuWithCookie(menu, menuCode) {
+			if (menu) {
+				// console.log('dsc--getShouldSelectMenuWithCookie--this.$route=', this.$route)
+				let shouldSelectMenu
+				const children = menu.children
+				if (children && children.length > 0) {
+					shouldSelectMenu = this.getFirstMenuWithCookie(children)
+				} else if (menu.code && menu.code === menuCode) {
+					shouldSelectMenu = menu
+				}
+				return shouldSelectMenu
+			}
+		},
+	},
 }
 </script>