+
{{$L('归档的项目')}}
+
-
@@ -17,7 +18,7 @@
-
+ placement="right"
+ :size="768">
-
+
-
+ placement="right"
+ :size="768">
-
+
@@ -390,9 +390,12 @@ import TaskAddSimple from "./TaskAddSimple";
import TaskRow from "./TaskRow";
import TaskArchived from "./TaskArchived";
import ProjectLog from "./ProjectLog";
+import DrawerOverlay from "../../../components/DrawerOverlay";
export default {
name: "ProjectList",
- components: {ProjectLog, TaskArchived, TaskRow, Draggable, TaskAddSimple, UserInput, TaskAdd, TaskPriority},
+ components: {
+ DrawerOverlay,
+ ProjectLog, TaskArchived, TaskRow, Draggable, TaskAddSimple, UserInput, TaskAdd, TaskPriority},
data() {
return {
nowTime: Math.round(new Date().getTime() / 1000),
diff --git a/resources/assets/js/pages/manage/components/ProjectLog.vue b/resources/assets/js/pages/manage/components/ProjectLog.vue
index 080b0ac1..8e5add3f 100644
--- a/resources/assets/js/pages/manage/components/ProjectLog.vue
+++ b/resources/assets/js/pages/manage/components/ProjectLog.vue
@@ -1,5 +1,6 @@
+
{{$L('项目动态')}}
-
{{logDate(items)}}
diff --git a/resources/assets/js/pages/manage/components/ProjectManagement.vue b/resources/assets/js/pages/manage/components/ProjectManagement.vue
index 1db023a8..5fef38b6 100644
--- a/resources/assets/js/pages/manage/components/ProjectManagement.vue
+++ b/resources/assets/js/pages/manage/components/ProjectManagement.vue
@@ -1,6 +1,7 @@
-
+
{{$L('所有项目')}}
+
-
@@ -29,7 +30,7 @@
+
{{$L('归档的任务')}}
-
+
{{$L('团队管理')}}
+
-
+
-
-
-
-
-
+
- -->
+
+
@@ -225,12 +206,13 @@
import {mapState} from "vuex";
import {sortBy} from "lodash";
import UserInput from "../../components/UserInput";
+import DrawerOverlay from "../../components/DrawerOverlay";
const FileContent = () => import('./components/FileContent');
export default {
- components: {UserInput, FileContent},
+ components: {DrawerOverlay, UserInput, FileContent},
data() {
return {
loadIng: 0,
@@ -306,7 +288,6 @@ export default {
editShow: false,
editShowNum: 0,
- editHeight: 0,
editInfo: {},
uploadDir: false,
@@ -326,7 +307,6 @@ export default {
mounted() {
this.tableHeight = window.innerHeight - 160;
- this.editHeight = window.innerHeight - 40;
},
activated() {
@@ -650,7 +630,6 @@ export default {
this.searchKey = '';
this.pid = item.id;
} else {
- this.editHeight = window.innerHeight - 40;
this.editInfo = item;
this.editShow = true;
}
diff --git a/resources/assets/sass/components/_.scss b/resources/assets/sass/components/_.scss
index b455fbd7..f80d19ad 100644
--- a/resources/assets/sass/components/_.scss
+++ b/resources/assets/sass/components/_.scss
@@ -1,5 +1,6 @@
@import "auto-tip";
@import "circle";
+@import "drawer-overlay";
@import "img-update";
@import "loading";
@import "scroller-y";
diff --git a/resources/assets/sass/components/drawer-overlay.scss b/resources/assets/sass/components/drawer-overlay.scss
new file mode 100644
index 00000000..5c24c60d
--- /dev/null
+++ b/resources/assets/sass/components/drawer-overlay.scss
@@ -0,0 +1,111 @@
+.drawer-overlay {
+ position: fixed;
+ top: 0;
+ left: 0;
+ width: 0;
+ height: 0;
+ z-index: 1000;
+ box-sizing: border-box;
+ pointer-events: none;
+ background: rgba(0, 0, 0, 0.76);
+ outline: none;
+ opacity: 0;
+ display: flex;
+ flex-direction: column;
+ justify-content: flex-end;
+
+ .overlay-body {
+ display: flex;
+ flex-direction: column;
+ width: 100%;
+ height: 100%;
+ max-width: 100%;
+ max-height: 100%;
+
+ .overlay-close {
+ flex-shrink: 0;
+ display: flex;
+ align-items: flex-end;
+ justify-content: flex-end;
+ > a {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ width: 40px;
+ height: 40px;
+ color: #dbdbde;
+ &:hover {
+ color: #fff
+ }
+ .icon {
+ width: 24px;
+ height: 24px
+ }
+ }
+ }
+
+ .overlay-content {
+ flex: 1;
+ position: relative;
+ background: #fff;
+ border-radius: 18px 18px 0 0;
+ transform: translate(0, 15%) scale(0.98);
+ cursor: default;
+ opacity: 0;
+ }
+ }
+
+ &.overlay-visible {
+ pointer-events: auto;
+ opacity: 1;
+ width: 100%;
+ height: 100%;
+ transition: opacity 0.2s ease;
+ .overlay-body {
+ .overlay-content {
+ opacity: 1;
+ transform: translate(0, 0) scale(1);
+ transition: opacity 0.2s ease, transform 0.3s ease;
+ }
+ }
+ }
+
+ &.overlay-hide {
+ transition: opacity 0.2s ease;
+ .overlay-body {
+ .overlay-content {
+ transform: translate(0, 15%) scale(0.98);
+ transition: opacity 0.2s ease, transform 0.2s ease
+ }
+ }
+ }
+
+ &.right {
+ flex-direction: row;
+ justify-content: flex-end;
+ .overlay-body {
+ flex-direction: row;
+ .overlay-close {
+ align-items: flex-start;
+ }
+ .overlay-content {
+ transform: translate(15%, 0) scale(0.98);
+ border-radius: 18px 0 0 18px;
+ }
+ }
+ &.overlay-visible {
+ .overlay-body {
+ .overlay-content {
+ transform: translate(0, 0) scale(1);
+ }
+ }
+ }
+ &.overlay-hide {
+ .overlay-body {
+ .overlay-content {
+ transform: translate(15%, 0) scale(0.98);
+ }
+ }
+ }
+ }
+}
diff --git a/resources/assets/sass/pages/common.scss b/resources/assets/sass/pages/common.scss
index ca69b3b3..cea945ba 100755
--- a/resources/assets/sass/pages/common.scss
+++ b/resources/assets/sass/pages/common.scss
@@ -297,12 +297,12 @@ body {
}
-.page-box {
+.page-container {
text-align: center;
padding: 20px 0;
}
-.search-box {
+.search-container {
margin-bottom: 24px;
> ul {
display: flex;
diff --git a/resources/assets/sass/pages/components/_.scss b/resources/assets/sass/pages/components/_.scss
index a6cac89b..1950e62b 100755
--- a/resources/assets/sass/pages/components/_.scss
+++ b/resources/assets/sass/pages/components/_.scss
@@ -1,11 +1,13 @@
@import "dialog-wrapper";
@import "file-content";
+@import "project-archived";
@import "project-dialog";
@import "project-list";
@import "project-log";
@import "project-management";
@import "task-add";
@import "task-add-simple";
+@import "task-archived";
@import "task-detail";
@import "task-priority";
@import "team-management";
diff --git a/resources/assets/sass/pages/components/project-archived.scss b/resources/assets/sass/pages/components/project-archived.scss
new file mode 100644
index 00000000..3c467f9c
--- /dev/null
+++ b/resources/assets/sass/pages/components/project-archived.scss
@@ -0,0 +1,16 @@
+.project-archived {
+ position: absolute;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ padding: 20px;
+ overflow: auto;
+ .archived-title {
+ color: #333333;
+ font-size: 20px;
+ font-weight: 500;
+ line-height: 1;
+ margin-bottom: 24px;
+ }
+}
diff --git a/resources/assets/sass/pages/components/project-log.scss b/resources/assets/sass/pages/components/project-log.scss
index 14e127e6..38cc5c95 100644
--- a/resources/assets/sass/pages/components/project-log.scss
+++ b/resources/assets/sass/pages/components/project-log.scss
@@ -1,4 +1,18 @@
.project-log {
+ position: absolute;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ padding: 20px;
+ overflow: auto;
+ .log-title {
+ color: #333333;
+ font-size: 20px;
+ font-weight: 500;
+ line-height: 1;
+ margin-bottom: 24px;
+ }
.logs-activity {
position: relative;
word-break: break-all;
diff --git a/resources/assets/sass/pages/components/project-management.scss b/resources/assets/sass/pages/components/project-management.scss
index 83592595..cc692d5c 100644
--- a/resources/assets/sass/pages/components/project-management.scss
+++ b/resources/assets/sass/pages/components/project-management.scss
@@ -1,4 +1,18 @@
.project-management {
+ position: absolute;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ padding: 20px;
+ overflow: auto;
+ .management-title {
+ color: #333333;
+ font-size: 20px;
+ font-weight: 500;
+ line-height: 1;
+ margin-bottom: 24px;
+ }
.project-name {
line-height: 1;
.ivu-tag {
diff --git a/resources/assets/sass/pages/components/task-archived.scss b/resources/assets/sass/pages/components/task-archived.scss
new file mode 100644
index 00000000..658a1f52
--- /dev/null
+++ b/resources/assets/sass/pages/components/task-archived.scss
@@ -0,0 +1,16 @@
+.task-archived {
+ position: absolute;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ padding: 20px;
+ overflow: auto;
+ .archived-title {
+ color: #333333;
+ font-size: 20px;
+ font-weight: 500;
+ line-height: 1;
+ margin-bottom: 24px;
+ }
+}
diff --git a/resources/assets/sass/pages/components/team-management.scss b/resources/assets/sass/pages/components/team-management.scss
index 532f9fc2..7b5d7429 100644
--- a/resources/assets/sass/pages/components/team-management.scss
+++ b/resources/assets/sass/pages/components/team-management.scss
@@ -1,4 +1,18 @@
.team-management {
+ position: absolute;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ padding: 20px;
+ overflow: auto;
+ .management-title {
+ color: #333333;
+ font-size: 20px;
+ font-weight: 500;
+ line-height: 1;
+ margin-bottom: 24px;
+ }
.team-email {
line-height: 1;
.ivu-tag {
diff --git a/resources/assets/sass/pages/page-file.scss b/resources/assets/sass/pages/page-file.scss
index 476d3522..c7acb70c 100644
--- a/resources/assets/sass/pages/page-file.scss
+++ b/resources/assets/sass/pages/page-file.scss
@@ -526,77 +526,7 @@
}
.page-file-drawer {
- .ivu-drawer-content {
+ .overlay-content {
border-radius: 20px 20px 0 0 !important;
}
}
-
-.shot-overlay {
- top: 0;
- left: 0;
- z-index: 1000;
- width: 0;
- height: 0;
- position: fixed;
- -webkit-box-sizing: border-box;
- box-sizing: border-box;
- opacity: 0;
- pointer-events: none;
- background: rgba(0, 0, 0, 0.8);
- overflow-y: hidden;
- -webkit-overflow-scrolling: auto;
- cursor: pointer;
- &.overlay-visible {
- pointer-events: auto;
- opacity: 1;
- width: 100%;
- height: 100%;
- transition: opacity 0.2s ease;
- .overlay-content {
- opacity: 1;
- transform: translateY(0) scale(1);
- transition: opacity 0.2s ease, transform 0.3s ease;
- }
- }
- &.overlay-hide {
- transition: opacity 0.2s ease;
- .overlay-content {
- transform: translateY(15%) scale(0.98);
- transition: opacity 0.2s ease, transform 0.2s ease
- }
- }
- &:focus {
- outline: none
- }
- .overlay-content {
- position: relative;
- background: #fff;
- margin-top: 40px;
- border-radius: 12px 12px 0 0;
- height: calc(100vh - 40px);
- overflow-y: scroll;
- -webkit-overflow-scrolling: touch;
- opacity: 0;
- transform: translateY(15%) scale(0.98);
- cursor: default
- }
- .close-overlay {
- display: flex;
- align-items: center;
- justify-content: center;
- position: absolute;
- top: 0;
- right: 0;
- width: 40px;
- height: 40px;
- color: #dbdbde;
- z-index: 1;
- &:hover {
- color: #fff
- }
- .icon {
- width: 24px;
- height: 24px
- }
- }
-}