diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js index 12c196d2..c0cfadca 100644 --- a/resources/assets/js/app.js +++ b/resources/assets/js/app.js @@ -29,8 +29,16 @@ Vue.component('TagInput', TagInput) Vue.component('TableAction', TableAction); Vue.component('UserAvatar', UserAvatar); -import { Tooltip } from 'element-ui'; +import { + Tooltip, + Dropdown, + DropdownMenu, + DropdownItem, +} from 'element-ui'; Vue.component('ETooltip', Tooltip); +Vue.component('EDropdown', Dropdown); +Vue.component('EDropdownMenu', DropdownMenu); +Vue.component('EDropdownItem', DropdownItem); const originalPush = VueRouter.prototype.push VueRouter.prototype.push = function push(location) { diff --git a/resources/assets/js/pages/manage/components/ProjectList.vue b/resources/assets/js/pages/manage/components/ProjectList.vue index 28716bf5..3efde5b5 100644 --- a/resources/assets/js/pages/manage/components/ProjectList.vue +++ b/resources/assets/js/pages/manage/components/ProjectList.vue @@ -72,21 +72,28 @@ ({{column.project_task.length}})
- + -
-
    -
  • {{$L('修改')}}
    • -
  • {{$L('删除')}}
    • -
  • -
  • {{$L('颜色')}}
    • -
  • + + +
    + {{$L('修改')}} +
    +     + +
    + {{$L('删除')}} +
    +     + {{$L('颜色')}} + +
    {{$L(c.name)}} -
    • -
-
- - +
+ + + +
@@ -111,8 +118,15 @@ @remove="sortUpdate">
+ 
{{item.name}}
- + + + + {{$L('完成')}} + {{$L('删除')}} + +
@@ -725,6 +739,18 @@ export default { }); }, + dropColumn(column, command) { + if (command === 'modify') { + this.modifyColumn(column); + } + else if (command === 'delete') { + this.removeColumn(column); + } + else if (command.name) { + this.saveColumn(column, column.name, command.color) + } + }, + modifyColumn(column) { $A.modalInput({ value: column.name, @@ -737,7 +763,6 @@ export default { return true; } }); - this.$refs['poptip_' + column.id][0].handleClose(); }, removeColumn(column) { @@ -768,7 +793,6 @@ export default { }); } }); - this.$refs['poptip_' + column.id][0].handleClose(); }, saveColumn(column, name, color) { @@ -796,7 +820,16 @@ export default { } } }); - this.$refs['poptip_' + column.id][0].handleClose(); + }, + + dropTask(task, command) { + switch (command) { + case 'complete': + break; + + case 'delete': + break; + } }, onSetting() { diff --git a/resources/assets/sass/element.scss b/resources/assets/sass/element.scss index e3476af0..9e1aaeff 100644 --- a/resources/assets/sass/element.scss +++ b/resources/assets/sass/element.scss @@ -2,4 +2,14 @@ $--tooltip-fill: #585E6A; $--tooltip-border-color: #585E6A; $--tooltip-font-size: 14px; +@import "~element-ui/packages/theme-chalk/src/common/transition"; @import "~element-ui/packages/theme-chalk/src/tooltip"; +@import "~element-ui/packages/theme-chalk/src/dropdown"; +@import "~element-ui/packages/theme-chalk/src/dropdown-menu"; +@import "~element-ui/packages/theme-chalk/src/dropdown-item"; + + +.el-dropdown-menu__item { + min-width: 100px; + line-height: 34px; +} diff --git a/resources/assets/sass/iconfont.scss b/resources/assets/sass/iconfont.scss index cd9ca14e..6819d3c0 100644 --- a/resources/assets/sass/iconfont.scss +++ b/resources/assets/sass/iconfont.scss @@ -1,8 +1,8 @@ @font-face { font-family: 'iconfont'; /* Project id 2583385 */ - src: url('//at.alicdn.com/t/font_2583385_9mlcjsehf5c.woff2?t=1622711688395') format('woff2'), - url('//at.alicdn.com/t/font_2583385_9mlcjsehf5c.woff?t=1622711688395') format('woff'), - url('//at.alicdn.com/t/font_2583385_9mlcjsehf5c.ttf?t=1622711688395') format('truetype'); + src: url('//at.alicdn.com/t/font_2583385_e77s2y4tokk.woff2?t=1623151884621') format('woff2'), + url('//at.alicdn.com/t/font_2583385_e77s2y4tokk.woff?t=1623151884621') format('woff'), + url('//at.alicdn.com/t/font_2583385_e77s2y4tokk.ttf?t=1623151884621') format('truetype'); } .iconfont { diff --git a/resources/assets/sass/project-list.scss b/resources/assets/sass/project-list.scss index 56806f4e..786a154a 100644 --- a/resources/assets/sass/project-list.scss +++ b/resources/assets/sass/project-list.scss @@ -228,9 +228,9 @@ .column-head-icon { display: flex; align-items: center; - margin-left: 12px; + margin-left: 16px; .ivu-icon { - padding-left: 8px; + padding-right: 8px; font-size: 16px; color: #aaaaaa; cursor: pointer; @@ -240,51 +240,8 @@ color: #888888; } } - .ivu-poptip-popper { - color: #515a6e; - min-width: 130px; - .ivu-poptip-body { - padding: 0; - } - .more-content { - ul { - margin: 10px 0; - > li { - display: flex; - align-items: center; - cursor: pointer; - list-style: none; - line-height: 30px; - padding: 0 20px; - > i { - font-size: 18px; - margin-right: 8px; - padding: 0; - color: #bbbbbb; - &.ivu-icon { - font-size: 16px; - } - } - &.title, - &.divided { - font-size: 13px; - color: #888888; - cursor: default; - &:hover { - background-color: transparent; - } - } - &.divided { - margin-top: 5px; - height: 6px; - border-top: 1px solid #F4F4F5; - } - &:hover { - background-color: #f1f1f1; - } - } - } - } + .last { + padding-right: 0; } } &.custom-color { @@ -339,6 +296,14 @@ .task-head { display: flex; align-items: flex-start; + .task-choose { + margin-right: 5px; + font-size: 22px; + color: #aaaaaa; + height: 22px; + line-height: 22px; + cursor: pointer; + } .task-title { flex: 1; padding-top: 1px; @@ -354,6 +319,10 @@ font-size: 22px; color: #666666; margin-left: 8px; + cursor: pointer; + &:hover { + color: #555555; + } } &.has-desc { .task-title { @@ -598,3 +567,21 @@ } } } +.project-list-column-more-content { + > li { + min-width: 130px; + .item { + display: flex; + align-items: center; + > i { + font-size: 18px; + margin-right: 8px; + padding: 0; + color: #bbbbbb; + &.ivu-icon { + font-size: 16px; + } + } + } + } +}