Merge branch 'master' of https://hel.hand-china.com/easyUI/hls-easy-ui

packages/components/ListItem/Item.vue

@@ -97,7 +97,7 @@ export default {
     },
     focusin () {
       let vm = this
-      let showFocus = vm.$parent.showFocusBorder ? vm.$parent.showFocusBorder : vm.showFocusBorder
+      let showFocus = vm.showFocusBorder ？vm.showFocusBorder : vm.$parent.showFocusBorder
       vm.focus = 'focus'
       if (showFocus) {
         vm.focusBorder = 'focus-border'

packages/components/ShowPicture/showpicture.vue

@@ -173,10 +173,14 @@ export default {
 
   mounted () {
     this.$el.setAttribute('vum-show-picture', '')
+     if (window.history && window.history.pushState) {
+      window.addEventListener('popstate', this.hide, false);//false阻止默认事件
+    }
   },
 
   destroyed () {
     document.body.removeChild(this.$el)
+    window.removeEventListener('popstate', this.hide, false);//false阻止默认事件
   },
 
   methods: {