From ecdbf8765ff81d58bacb88ffec13e47c1ae868e4 Mon Sep 17 00:00:00 2001 From: weifashi <605403358@qq.com> Date: Mon, 20 Nov 2023 17:16:10 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=9D=83=E9=99=90=E5=8A=9F=E8=83=BD=20-=2030%?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...14409_create_project_permissions_table.php | 36 +++++ language/original-web.txt | 1 + .../pages/manage/components/ProjectPanel.vue | 26 ++++ .../manage/components/ProjectPermission.vue | 128 ++++++++++++++++++ resources/assets/sass/pages/components/_.scss | 1 + .../pages/components/project-permission.scss | 52 +++++++ 6 files changed, 244 insertions(+) create mode 100644 database/migrations/2023_11_20_214409_create_project_permissions_table.php create mode 100644 resources/assets/js/pages/manage/components/ProjectPermission.vue create mode 100644 resources/assets/sass/pages/components/project-permission.scss diff --git a/database/migrations/2023_11_20_214409_create_project_permissions_table.php b/database/migrations/2023_11_20_214409_create_project_permissions_table.php new file mode 100644 index 000000000..14514d8de --- /dev/null +++ b/database/migrations/2023_11_20_214409_create_project_permissions_table.php @@ -0,0 +1,36 @@ +bigIncrements('id'); + $table->bigInteger('project_id')->nullable()->default(0)->comment('项目ID'); + $table->text('permissions')->nullable()->comment('权限'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('project_permissions'); + } +} diff --git a/language/original-web.txt b/language/original-web.txt index 2b838b5b3..85a534d50 100644 --- a/language/original-web.txt +++ b/language/original-web.txt @@ -1400,3 +1400,4 @@ APP推送 请输入时长 必须大于0 忍心拒绝 +请等待打包完成 diff --git a/resources/assets/js/pages/manage/components/ProjectPanel.vue b/resources/assets/js/pages/manage/components/ProjectPanel.vue index 455681523..883906802 100644 --- a/resources/assets/js/pages/manage/components/ProjectPanel.vue +++ b/resources/assets/js/pages/manage/components/ProjectPanel.vue @@ -52,6 +52,7 @@ {{$L('项目设置')}} + {{$L('权限设置')}} {{$L('工作流设置')}} {{$L('成员管理')}} {{$L('邀请链接')}} @@ -342,6 +343,15 @@ + + + + + { + // this.$refs.projectName.focus() + // setTimeout(this.$refs.projectDesc.resizeTextarea, 0) + // }); + break; + case "user": if (this.projectData.owner_userid !== this.userId) { return; diff --git a/resources/assets/js/pages/manage/components/ProjectPermission.vue b/resources/assets/js/pages/manage/components/ProjectPermission.vue new file mode 100644 index 000000000..fc4beb71d --- /dev/null +++ b/resources/assets/js/pages/manage/components/ProjectPermission.vue @@ -0,0 +1,128 @@ + + + + {{$L('权限设置')}} + + + + + + + + + + {{$L('任务权限')}}: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{$L('面板显示')}}: + + + + + + {{ $L('项目面板默认显示已完成的任务') }} + + + + + + + + + diff --git a/resources/assets/sass/pages/components/_.scss b/resources/assets/sass/pages/components/_.scss index 7d6f53d66..c6d3b333d 100755 --- a/resources/assets/sass/pages/components/_.scss +++ b/resources/assets/sass/pages/components/_.scss @@ -13,6 +13,7 @@ @import "project-management"; @import "project-panel"; @import "project-workflow"; +@import "project-permission"; @import "task-add"; @import "task-add-simple"; @import "task-archived"; diff --git a/resources/assets/sass/pages/components/project-permission.scss b/resources/assets/sass/pages/components/project-permission.scss new file mode 100644 index 000000000..5c1c4fbf4 --- /dev/null +++ b/resources/assets/sass/pages/components/project-permission.scss @@ -0,0 +1,52 @@ +.project-permission { + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + display: flex; + flex-direction: column; + .permission-title { + color: $primary-title-color; + font-size: 20px; + font-weight: 500; + line-height: 1; + // style="font-weight: bold;line-height: 40px;" + padding: 20px 20px 24px; + display: flex; + align-items: center; + .title-icon { + display: flex; + align-items: center; + width: 14px; + height: 14px; + margin-left: 4px; + margin-top: 2px; + > i { + cursor: pointer; + } + } + } + .permission-content { + flex: 1; + padding: 0 25px; + overflow: auto; + margin-bottom: 20px; + height: 100%; + + .project-permission-title{ + font-weight: 500; + padding:20px 0 10px 0; + } + + .ivu-form-item { + margin-bottom: 5px; + } + + .form-placeholder { + font-size: 12px; + color: #999; + } + } + +}