haiwei-ui 1.0.3 → 1.0.4

package/packages/page/iframe/index.vue

@@ -4,12 +4,12 @@
   </nm-container>
 </template>
 <script>
-export default {
-  name: 'IframeMenu',
-  computed: {
-    url() {
-      return decodeURI(this.$route.params.url)
+  export default {
+    name: 'IframeMenu',
+    computed: {
+      url() {
+        return decodeURI(this.$route.params.url)
+      }
     }
   }
-}
 </script>

package/packages/page/login/index.vue

@@ -4,16 +4,16 @@
   </div>
 </template>
 <script>
-import { mapState } from 'vuex'
-export default {
-  computed: {
-    ...mapState('app/config', { loginOptions: s => s.component.login }),
-    type() {
-      if (!this.loginOptions.pageType || !this.loginOptions.pageTypeOptions.includes(this.loginOptions.pageType)) {
-        return 'neon'
+  import { mapState } from 'vuex'
+  export default {
+    computed: {
+      ...mapState('app/config', { loginOptions: s => s.component.login }),
+      type() {
+        if (!this.loginOptions.pageType || !this.loginOptions.pageTypeOptions.includes(this.loginOptions.pageType)) {
+          return 'neon'
+        }
+        return this.loginOptions.pageType
       }
-      return this.loginOptions.pageType
     }
   }
-}
 </script>

package/packages/page/userInfo/index.vue

@@ -38,10 +38,10 @@
   </nm-container>
 </template>
 <script>
-import { mapState } from 'vuex'
-export default {
-  computed: {
-    ...mapState('app/account', ['id', 'userName', 'name', 'phone', 'email'])
+  import { mapState } from 'vuex'
+  export default {
+    computed: {
+      ...mapState('app/account', ['id', 'userName', 'name', 'phone', 'email'])
+    }
   }
-}
 </script>

package/packages/router/index.js

@@ -69,15 +69,7 @@ export default (store, config) => {
               next()
               // 关闭进度条
               NProgress.done()
-            } else if (
-              !store.state.app.config.permission.validate ||
-              store.getters['app/account/routes'].includes(to.name) ||
-              to.path === homeUrl ||
-              to.path === '/' ||
-              to.path === '/default' ||
-              to.name === 'iframe' ||
-              to.name === 'userinfo'
-            ) {
+            } else if (!store.state.app.config.permission.validate || store.getters['app/account/routes'].includes(to.name) || to.path === homeUrl || to.path === '/' || to.path === '/default' || to.name === 'iframe' || to.name === 'userinfo') {
               // 打开页面
               store.dispatch('app/page/open', to, { root: true }).then(() => {
                 next()

package/packages/skins/pretty/components/header/components/breadcrumb/index.vue

@@ -6,40 +6,40 @@
   </el-breadcrumb>
 </template>
 <script>
-import { mapState } from 'vuex'
-export default {
-  computed: {
-    ...mapState('app/account', ['routeMenus']),
-    ...mapState('app/page', ['default']),
-    breadcrumb() {
-      let route = this.$route
-      let bc = [
-        {
-          title: '首页',
-          route: '/'
-        }
-      ]
+  import { mapState } from 'vuex'
+  export default {
+    computed: {
+      ...mapState('app/account', ['routeMenus']),
+      ...mapState('app/page', ['default']),
+      breadcrumb() {
+        let route = this.$route
+        let bc = [
+          {
+            title: '首页',
+            route: '/'
+          }
+        ]
 
-      if (!route.name || this.default === route.path) {
-        return bc
-      }
+        if (!route.name || this.default === route.path) {
+          return bc
+        }
 
-      if (this.routeMenus) {
-        const obj = this.routeMenus.get(route.name)
-        if (obj) {
-          bc = bc.concat(obj.breadcrumb)
+        if (this.routeMenus) {
+          const obj = this.routeMenus.get(route.name)
+          if (obj) {
+            bc = bc.concat(obj.breadcrumb)
+          }
         }
-      }
 
-      // 通过路由自定义的最后一个面包屑
-      if (route.params && route.params.bc_) {
-        bc.push({
-          title: route.params.bc_,
-          route: ''
-        })
+        // 通过路由自定义的最后一个面包屑
+        if (route.params && route.params.bc_) {
+          bc.push({
+            title: route.params.bc_,
+            route: ''
+          })
+        }
+        return bc
       }
-      return bc
     }
   }
-}
 </script>

package/packages/skins/pretty/components/header/components/theme/index.vue

@@ -1,7 +1,8 @@
 <template>
   <el-dropdown :hide-on-click="false">
     <span class="el-dropdown-link">
-      <nm-icon name="skin" />主题
+      <nm-icon name="skin" />
+      主题
       <i class="el-icon-arrow-down el-icon--right"></i>
     </span>
     <el-dropdown-menu v-slot:dropdown>
@@ -12,28 +13,28 @@
   </el-dropdown>
 </template>
 <script>
-import list from './list'
-import { mapState, mapMutations } from 'vuex'
-export default {
-  data() {
-    return {
-      list
+  import list from './list'
+  import { mapState, mapMutations } from 'vuex'
+  export default {
+    data() {
+      return {
+        list
+      }
+    },
+    computed: {
+      ...mapState('app/skins', ['current'])
+    },
+    methods: {
+      ...mapMutations('app/skins', ['themeChange'])
     }
-  },
-  computed: {
-    ...mapState('app/skins', ['current'])
-  },
-  methods: {
-    ...mapMutations('app/skins', ['themeChange'])
   }
-}
 </script>
 <style>
-.el-dropdown-link {
-  cursor: pointer;
-  color: #409eff;
-}
-.el-icon-arrow-down {
-  font-size: 12px;
-}
+  .el-dropdown-link {
+    cursor: pointer;
+    color: #409eff;
+  }
+  .el-icon-arrow-down {
+    font-size: 12px;
+  }
 </style>

package/packages/skins/pretty/components/header/index.vue

@@ -22,17 +22,17 @@
   </section>
 </template>
 <script>
-import { mapState, mapGetters, mapActions } from 'vuex'
-import Breadcrumb from './components/breadcrumb'
-export default {
-  components: { Breadcrumb },
-  computed: {
-    ...mapGetters('app/config', ['logoUrl']),
-    ...mapState('app/config', { title: s => s.system.title }),
-    ...mapState('app/skins/pretty/sidebar', { sidebarCollapse: 'collapse' })
-  },
-  methods: {
-    ...mapActions('app/skins/pretty/sidebar', { sidebarToggle: 'toggle' })
+  import { mapState, mapGetters, mapActions } from 'vuex'
+  import Breadcrumb from './components/breadcrumb'
+  export default {
+    components: { Breadcrumb },
+    computed: {
+      ...mapGetters('app/config', ['logoUrl']),
+      ...mapState('app/config', { title: s => s.system.title }),
+      ...mapState('app/skins/pretty/sidebar', { sidebarCollapse: 'collapse' })
+    },
+    methods: {
+      ...mapActions('app/skins/pretty/sidebar', { sidebarToggle: 'toggle' })
+    }
   }
-}
 </script>

package/packages/skins/pretty/components/main/index.vue

@@ -18,34 +18,34 @@
   </section>
 </template>
 <script>
-import NmSidebar from '../sidebar'
-import { mapState, mapMutations } from 'vuex'
-export default {
-  components: { NmSidebar },
-  data() {
-    return {
-      routerViewVisible: true
-    }
-  },
-  computed: {
-    ...mapState('app/page', ['keepAlive']),
-    ...mapState('app/config', { showTabnav: s => s.component.tabnav.enabled })
-  },
-  provide() {
-    return {
-      reload: this.reload
-    }
-  },
-  methods: {
-    ...mapMutations('app/page', ['keepAliveRemove']),
-    reload(name) {
-      this.routerViewVisible = false
-      this.keepAliveRemove(name)
+  import NmSidebar from '../sidebar'
+  import { mapState, mapMutations } from 'vuex'
+  export default {
+    components: { NmSidebar },
+    data() {
+      return {
+        routerViewVisible: true
+      }
+    },
+    computed: {
+      ...mapState('app/page', ['keepAlive']),
+      ...mapState('app/config', { showTabnav: s => s.component.tabnav.enabled })
+    },
+    provide() {
+      return {
+        reload: this.reload
+      }
+    },
+    methods: {
+      ...mapMutations('app/page', ['keepAliveRemove']),
+      reload(name) {
+        this.routerViewVisible = false
+        this.keepAliveRemove(name)
 
-      this.$nextTick(() => {
-        this.routerViewVisible = true
-      })
+        this.$nextTick(() => {
+          this.routerViewVisible = true
+        })
+      }
     }
   }
-}
 </script>

package/packages/skins/pretty/components/menus/index.vue

@@ -23,38 +23,38 @@
   </section>
 </template>
 <script>
-import { mapState } from 'vuex'
-import { open } from '../../../../utils/menu'
-import MenuItem from './item'
+  import { mapState } from 'vuex'
+  import { open } from '../../../../utils/menu'
+  import MenuItem from './item'
 
-export default {
-  components: { MenuItem },
-  computed: {
-    ...mapState('app/account', ['menus', 'routeMenus']),
-    ...mapState('app/config', { uniqueOpened: s => s.component.menu.uniqueOpened }),
-    ...mapState('app/page', ['current']),
-    ...mapState('app/skins/pretty/sidebar', ['collapse']),
-    active: {
-      get() {
-        const { current, routeMenus } = this
-        if (current.name && routeMenus) {
-          let routeMenu = routeMenus.get(current.code)
-          if (routeMenu) {
-            return routeMenu.menu.id
+  export default {
+    components: { MenuItem },
+    computed: {
+      ...mapState('app/account', ['menus', 'routeMenus']),
+      ...mapState('app/config', { uniqueOpened: s => s.component.menu.uniqueOpened }),
+      ...mapState('app/page', ['current']),
+      ...mapState('app/skins/pretty/sidebar', ['collapse']),
+      active: {
+        get() {
+          const { current, routeMenus } = this
+          if (current.name && routeMenus) {
+            let routeMenu = routeMenus.get(current.code)
+            if (routeMenu) {
+              return routeMenu.menu.id
+            }
           }
+          return '-1'
+        },
+        set() {}
+      }
+    },
+    methods: {
+      go(menu, e) {
+        if (e.$el.classList.contains('is-active')) {
+          return
         }
-        return '-1'
-      },
-      set() {}
-    }
-  },
-  methods: {
-    go(menu, e) {
-      if (e.$el.classList.contains('is-active')) {
-        return
+        open(this.$router, menu)
       }
-      open(this.$router, menu)
     }
   }
-}
 </script>

package/packages/skins/pretty/components/menus/item.vue

@@ -15,32 +15,32 @@
   </el-menu-item>
 </template>
 <script>
-import { mapActions } from 'vuex'
-import { open } from '../../../../utils/menu'
-export default {
-  name: 'MenuItem',
-  props: {
-    parentIndex: {
-      type: String,
-      default: ''
+  import { mapActions } from 'vuex'
+  import { open } from '../../../../utils/menu'
+  export default {
+    name: 'MenuItem',
+    props: {
+      parentIndex: {
+        type: String,
+        default: ''
+      },
+      menu: {}
     },
-    menu: {}
-  },
-  methods: {
-    ...mapActions('app/dialog-menu', { dialogMenuOpen: 'open' }),
-    go(menu, e) {
-      if (e.$el.classList.contains('is-active')) {
-        return
-      }
+    methods: {
+      ...mapActions('app/dialog-menu', { dialogMenuOpen: 'open' }),
+      go(menu, e) {
+        if (e.$el.classList.contains('is-active')) {
+          return
+        }
 
-      open(this.$router, menu)
-    },
-    getIndex(index) {
-      if (this.parentIndex === 0) {
-        return index + ''
+        open(this.$router, menu)
+      },
+      getIndex(index) {
+        if (this.parentIndex === 0) {
+          return index + ''
+        }
+        return this.parentIndex + '-' + index
       }
-      return this.parentIndex + '-' + index
     }
   }
-}
 </script>

package/packages/skins/pretty/components/sidebar/index.vue

@@ -6,12 +6,12 @@
   </section>
 </template>
 <script>
-import NmMenus from '../menus'
-import { mapState } from 'vuex'
-export default {
-  components: { NmMenus },
-  computed: {
-    ...mapState('app/skins/pretty/sidebar', ['collapse'])
+  import NmMenus from '../menus'
+  import { mapState } from 'vuex'
+  export default {
+    components: { NmMenus },
+    computed: {
+      ...mapState('app/skins/pretty/sidebar', ['collapse'])
+    }
   }
-}
 </script>

package/packages/skins/pretty/index.vue

@@ -5,12 +5,12 @@
   </div>
 </template>
 <script>
-import NmHeader from './components/header'
-import NmMain from './components/main'
-export default {
-  components: { NmHeader, NmMain }
-}
+  import NmHeader from './components/header'
+  import NmMain from './components/main'
+  export default {
+    components: { NmHeader, NmMain }
+  }
 </script>
 <style lang="scss">
-@import './styles/_index.scss';
+  @import './styles/_index.scss';
 </style>

package/packages/skins/pretty/styles/themes/blue-light/_index.scss

@@ -1,5 +1,5 @@
 @import './variables';
 
 &.theme-blue-light {
-    @import '../theme';
-}
+  @import '../theme';
+}

package/packages/skins/pretty/styles/themes/default/_index.scss

@@ -1,2 +1,2 @@
 @import './variables';
-@import '../theme';
+@import '../theme';

package/packages/skins/pretty/styles/themes/green/_index.scss

@@ -1,5 +1,5 @@
 @import './variables';
 
 &.theme-green {
-    @import '../theme';
-}
+  @import '../theme';
+}

package/packages/skins/pretty/styles/themes/green-light/_index.scss

@@ -1,5 +1,5 @@
 @import './variables';
 
 &.theme-green-light {
-    @import '../theme';
-}
+  @import '../theme';
+}

package/packages/styles/_mixins.scss

@@ -1,39 +1,38 @@
 /*垂直居中*/
 @mixin vertical-center($height) {
-    height: $height;
-    line-height: $height;
+  height: $height;
+  line-height: $height;
 }
 
 @mixin flex-row() {
-    display: flex;
-    flex-direction: row;
-    align-items: stretch;
+  display: flex;
+  flex-direction: row;
+  align-items: stretch;
 }
 
 @mixin flex-column() {
-    display: flex;
-    flex-direction: column;
-    align-items: stretch;
+  display: flex;
+  flex-direction: column;
+  align-items: stretch;
 }
 
 //顶部工具栏鼠标hover效果
 @mixin toolbar-hover-border() {
+  &:before {
+    content: '';
+    position: absolute;
+    top: 0;
+    left: 50%;
+    width: 0;
+    height: 2px;
+    background: #000;
+    transition: all 0.25s ease-in-out;
+  }
 
-    &:before {
-        content: '';
-        position: absolute;
-        top: 0;
-        left: 50%;
-        width: 0;
-        height: 2px;
-        background: #000;
-        transition: all .25s ease-in-out;
+  &:hover {
+    &::before {
+      left: 0;
+      width: 100%;
     }
-
-    &:hover {
-        &::before {
-            left: 0;
-            width: 100%;
-        }
-    }
-}
+  }
+}

package/packages/styles/animation/_index.scss

@@ -1,31 +1,30 @@
 @mixin motion-common() {
-    animation-duration: .3s;
-    animation-fill-mode: both;
+  animation-duration: 0.3s;
+  animation-fill-mode: both;
 }
 
 @mixin make-motion($className, $keyframeName) {
+  .#{$className}-enter-active,
+  .#{$className}-appear {
+    @include motion-common();
+    animation-play-state: paused;
+  }
 
-    .#{$className}-enter-active,
-    .#{$className}-appear {
-        @include motion-common();
-        animation-play-state: paused;
-    }
+  .#{$className}-leave-active {
+    @include motion-common();
+    animation-play-state: paused;
+  }
 
-    .#{$className}-leave-active {
-        @include motion-common();
-        animation-play-state: paused;
-    }
+  .#{$className}-enter-active,
+  .#{$className}-appear {
+    animation-name: $keyframeName + 'In';
+    animation-play-state: running;
+  }
 
-    .#{$className}-enter-active,
-    .#{$className}-appear {
-        animation-name: $keyframeName + "In";
-        animation-play-state: running;
-    }
-
-    .#{$className}-leave-active {
-        animation-name: $keyframeName + "Out";
-        animation-play-state: running;
-    }
+  .#{$className}-leave-active {
+    animation-name: $keyframeName + 'Out';
+    animation-play-state: running;
+  }
 }
 
 @import './move.scss';
@@ -33,5 +32,5 @@
 @import './breadcrumb.scss';
 
 .flip-list-move {
-    transition: transform 0.4s;
-}
+  transition: transform 0.4s;
+}

package/packages/styles/animation/breadcrumb.scss

@@ -1,18 +1,18 @@
 .breadcrumb-enter-active,
 .breadcrumb-leave-active {
-    transition: all .5s;
+  transition: all 0.5s;
 }
 
 .breadcrumb-enter,
 .breadcrumb-leave-active {
-    opacity: 0;
-    transform: translateX(20px);
+  opacity: 0;
+  transform: translateX(20px);
 }
 
 .breadcrumb-move {
-    transition: all .5s;
+  transition: all 0.5s;
 }
 
 .breadcrumb-leave-active {
-    position: absolute;
-}
+  position: absolute;
+}