-
Notifications
You must be signed in to change notification settings - Fork 4.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1427 from agalwood/feature/dir_history_20230412
feat: choose dir from history directory
- Loading branch information
Showing
16 changed files
with
466 additions
and
77 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,25 @@ | ||
| !.gitkeep | ||
| .DS_Store | ||
| dist/electron/* | ||
| dist/web/* | ||
| *.provisionprofile | ||
| build/*.plist | ||
| .env | ||
| .idea/ | ||
| .vs/ | ||
| .vscode/ | ||
| *.log | ||
| node_modules/ | ||
| npm-debug.log | ||
| npm-debug.log.* | ||
| thumbs.db | ||
| !.gitkeep | ||
|
|
||
| # npm package | ||
| .npmrc | ||
| npm-debug.log.* | ||
|
|
||
| # Eslint Cache | ||
| .eslintcache* | ||
|
|
||
| # electron builder | ||
| *.provisionprofile | ||
| build/*.plist | ||
| dist/electron/* | ||
| dist/web/* | ||
|
|
||
| # release | ||
| release/* | ||
| .idea/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
229 changes: 229 additions & 0 deletions
229
src/renderer/components/Preference/HistoryDirectory.vue
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,229 @@ | ||
| <template> | ||
| <div class="mo-history-directory"> | ||
| <el-popover | ||
| popper-class="mo-directory-popper" | ||
| trigger="hover" | ||
| :placement="placement" | ||
| :width="width" | ||
| > | ||
| <el-empty class="mo-directory-empty" :image-size="48" v-if="empty" /> | ||
| <ul class="mo-directory-list" v-if="favoriteDirectories.length > 0"> | ||
| <li | ||
| v-for="directory in favoriteDirectories" | ||
| :key="directory" | ||
| @click.stop="() => handleSelectItem(directory)" | ||
| > | ||
| <span class="mo-directory-path" :title="directory">{{directory}}</span> | ||
| <span class="mo-directory-actions"> | ||
| <i | ||
| class="el-icon-star-off icon-history-favorited" | ||
| @click.stop="() => handleCancelFavoriteItem(directory)" | ||
| /> | ||
| <i | ||
| class="el-icon-delete icon-history-remove" | ||
| @click.stop="() => handleRemoveItem(directory)" | ||
| /> | ||
| </span> | ||
| </li> | ||
| </ul> | ||
| <div class="mo-directory-divider" v-if="showDivider" /> | ||
| <ul class="mo-directory-list" v-if="historyDirectories.length > 0"> | ||
| <li | ||
| v-for="directory in historyDirectories" | ||
| :key="directory" | ||
| @click.stop="() => handleSelectItem(directory)" | ||
| > | ||
| <span class="mo-directory-path" :title="directory">{{directory}}</span> | ||
| <span class="mo-directory-actions"> | ||
| <i | ||
| v-if="showFavoriteAction" | ||
| class="el-icon-star-off icon-history-favorite" | ||
| @click.stop="() => handleFavoriteItem(directory)" | ||
| /> | ||
| <i | ||
| class="el-icon-delete icon-history-remove" | ||
| @click.stop="() => handleRemoveItem(directory)" | ||
| /> | ||
| </span> | ||
| </li> | ||
| </ul> | ||
| <el-button | ||
| slot="reference" | ||
| :disabled="popoverDisabled" | ||
| > | ||
| <i class="el-icon-time" /> | ||
| </el-button> | ||
| </el-popover> | ||
| </div> | ||
| </template> | ||
|
|
||
| <script> | ||
| import { mapState } from 'vuex' | ||
| import { MAX_NUM_OF_DIRECTORIES } from '@shared/constants' | ||
| import { cloneArray } from '@shared/utils' | ||
| export default { | ||
| name: 'mo-history-directory', | ||
| components: { | ||
| }, | ||
| props: { | ||
| width: { | ||
| type: Number, | ||
| default: 360 | ||
| }, | ||
| placement: { | ||
| type: String, | ||
| default: 'bottom-start' | ||
| } | ||
| }, | ||
| data () { | ||
| return { | ||
| visible: false | ||
| } | ||
| }, | ||
| computed: { | ||
| ...mapState('preference', { | ||
| historyDirectories: state => { | ||
| return cloneArray(state.config.historyDirectories, true) | ||
| }, | ||
| favoriteDirectories: state => { | ||
| return cloneArray(state.config.favoriteDirectories, true) | ||
| } | ||
| }), | ||
| empty () { | ||
| const { favoriteDirectories, historyDirectories } = this | ||
| return favoriteDirectories.length + historyDirectories.length === 0 | ||
| }, | ||
| popoverDisabled () { | ||
| const { favoriteDirectories, historyDirectories } = this | ||
| return favoriteDirectories.length === 0 && | ||
| historyDirectories.length === 0 | ||
| }, | ||
| showDivider () { | ||
| const { favoriteDirectories, historyDirectories } = this | ||
| return favoriteDirectories.length > 0 && | ||
| historyDirectories.length > 0 | ||
| }, | ||
| showFavoriteAction () { | ||
| const { favoriteDirectories } = this | ||
| return favoriteDirectories.length < MAX_NUM_OF_DIRECTORIES | ||
| } | ||
| }, | ||
| methods: { | ||
| handleIconClick () { | ||
| if (this.popoverDisabled) { | ||
| return | ||
| } | ||
| const { visible } = this | ||
| this.visible = !visible | ||
| }, | ||
| handleSelectItem (directory) { | ||
| this.$emit('selected', directory.trim()) | ||
| this.visible = false | ||
| }, | ||
| handleFavoriteItem (directory) { | ||
| console.log('handleFavoriteItem==>', directory) | ||
| this.$store.dispatch('preference/favoriteDirectory', directory) | ||
| }, | ||
| handleCancelFavoriteItem (directory) { | ||
| console.log('handleCancelFavoriteItem==>', directory) | ||
| this.$store.dispatch('preference/cancelFavoriteDirectory', directory) | ||
| }, | ||
| handleRemoveItem (directory) { | ||
| console.log('handleRemoveItem==>', directory) | ||
| this.$store.dispatch('preference/removeDirectory', directory) | ||
| } | ||
| } | ||
| } | ||
| </script> | ||
|
|
||
| <style lang="scss"> | ||
| .el-popover.mo-directory-popper { | ||
| padding: $--popover-padding 0; | ||
| } | ||
| .el-empty.mo-directory-empty { | ||
| padding: 20px 0; | ||
| } | ||
| .mo-directory-divider { | ||
| padding: 0 $--popover-padding; | ||
| margin: 6px 0; | ||
| &::after { | ||
| content: ' '; | ||
| display: block; | ||
| height: 1px; | ||
| width: 100%; | ||
| background: $--border-color-base; | ||
| } | ||
| } | ||
| .mo-directory-list { | ||
| padding: 0; | ||
| margin: 0; | ||
| list-style: none; | ||
| &> li { | ||
| display: flex; | ||
| align-items: center; | ||
| list-style: none; | ||
| line-height: $--font-line-height-primary; | ||
| margin: 0; | ||
| font-size: $--font-size-small; | ||
| color: $--color-text-regular; | ||
| cursor: pointer; | ||
| outline: none; | ||
| padding: 6px 6px 6px $--popover-padding; | ||
| &:focus, &:hover { | ||
| background-color: $--background-color-base; | ||
| color: $--color-primary-light-2; | ||
| } | ||
| } | ||
| .mo-directory-path { | ||
| display: inline-block; | ||
| flex: 1; | ||
| overflow: hidden; | ||
| white-space: nowrap; | ||
| text-overflow: ellipsis; | ||
| } | ||
| .mo-directory-actions { | ||
| min-width: 40px; | ||
| text-align: right; | ||
| &> i { | ||
| padding: 3px; | ||
| margin-right: 3px; | ||
| display: inline-block; | ||
| } | ||
| } | ||
| .icon-history-favorite { | ||
| &:focus, &:hover { | ||
| color: $--color-warning; | ||
| } | ||
| } | ||
| .icon-history-favorited { | ||
| color: $--color-warning; | ||
| } | ||
| .icon-history-remove { | ||
| &:focus, &:hover { | ||
| color: $--color-danger; | ||
| } | ||
| } | ||
| } | ||
| .theme-dark { | ||
| .mo-directory-divider { | ||
| &::after { | ||
| background: $--dk-border-color-base; | ||
| } | ||
| } | ||
| .mo-directory-list { | ||
| &> li { | ||
| color: $--dk-font-color-base; | ||
| &:focus, &:hover { | ||
| background-color: $--color-primary; | ||
| color: $--color-white; | ||
| } | ||
| } | ||
| } | ||
| } | ||
| </style> |
Oops, something went wrong.