From 32e43b8260fad3d709af50339bcbb234a1952f0e Mon Sep 17 00:00:00 2001
From: Ken <66313154+HeHasGun@users.noreply.github.com>
Date: Wed, 10 Jul 2024 18:06:39 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8D=8F=E4=BD=9C=E8=80=85=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E4=BC=98=E5=8C=96=E5=92=8C=E7=9A=AE=E8=82=A4=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4=20(#333)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: 皮肤设置内主题分类标签样式调整

* feat: 协作者管理优化
---
 .../edit/components/CooperationPanel.vue      | 32 +++++++++++++++++++
 .../pages/edit/components/ModuleNavbar.vue    | 15 +++++++++
 .../settingModule/skin/CatalogPanel.vue       |  3 +-
 .../pages/list/components/CooperModify.vue    |  6 +---
 4 files changed, 50 insertions(+), 6 deletions(-)
 create mode 100644 web/src/management/pages/edit/components/CooperationPanel.vue

diff --git a/web/src/management/pages/edit/components/CooperationPanel.vue b/web/src/management/pages/edit/components/CooperationPanel.vue
new file mode 100644
index 00000000..13a8ddb9
--- /dev/null
+++ b/web/src/management/pages/edit/components/CooperationPanel.vue
@@ -0,0 +1,32 @@
+<template>
+  <slot name="content" :onCooper="onCooper"></slot>
+  <CooperModify :modifyId="cooperId" :visible="cooperModify" @on-close-codify="onCooperClose" />
+</template>
+<script setup lang="ts">
+import { ref } from 'vue'
+import 'element-plus/theme-chalk/src/message.scss'
+import CooperModify from '@/management/pages/list/components/CooperModify.vue';
+import { useRoute } from 'vue-router';
+
+defineSlots<{
+  content: (scope: { onCooper: () => void }) => any
+}>();
+
+const route = useRoute()
+const surveyId = route.params?.id as string;
+const cooperModify = ref<boolean>(false);
+const cooperId = ref<string>('');
+
+const onCooper = (): void => {
+  cooperId.value = surveyId;
+  cooperModify.value = true;
+};
+
+const onCooperClose = (): void => {
+  cooperModify.value = false;
+};
+
+</script>
+<style lang="scss" scoped>
+
+</style>
diff --git a/web/src/management/pages/edit/components/ModuleNavbar.vue b/web/src/management/pages/edit/components/ModuleNavbar.vue
index 0965cddf..59f8b303 100644
--- a/web/src/management/pages/edit/components/ModuleNavbar.vue
+++ b/web/src/management/pages/edit/components/ModuleNavbar.vue
@@ -8,6 +8,14 @@
       <NavPanel></NavPanel>
     </div>
     <div class="right-group">
+      <CooperationPanel>
+        <template #content="{ onCooper }">
+          <div class="btn" @click="onCooper">
+            <i-ep-connection class="view-icon" :size="20" />
+            <span class="btn-txt">协作</span>
+          </div>
+        </template>
+      </CooperationPanel>
       <PreviewPanel></PreviewPanel>
       <HistoryPanel></HistoryPanel>
       <SavePanel></SavePanel>
@@ -27,11 +35,18 @@ import HistoryPanel from '../modules/contentModule/HistoryPanel.vue'
 import PreviewPanel from '../modules/contentModule/PreviewPanel.vue'
 import SavePanel from '../modules/contentModule/SavePanel.vue'
 import PublishPanel from '../modules/contentModule/PublishPanel.vue'
+import CooperationPanel from './CooperationPanel.vue';
 
 const store = useStore()
 const title = computed(() => _get(store.state, 'edit.schema.metaData.title'))
 </script>
 <style lang="scss" scoped>
+@import url('@/management/styles/edit-btn.scss');
+.view-icon {
+  font-size: 20px;
+  height: 29px;
+  line-height: 29px;
+}
 .nav {
   width: 100%;
   height: 56px;
diff --git a/web/src/management/pages/edit/modules/settingModule/skin/CatalogPanel.vue b/web/src/management/pages/edit/modules/settingModule/skin/CatalogPanel.vue
index 7f663cd6..2459bed4 100644
--- a/web/src/management/pages/edit/modules/settingModule/skin/CatalogPanel.vue
+++ b/web/src/management/pages/edit/modules/settingModule/skin/CatalogPanel.vue
@@ -108,8 +108,9 @@ const changePreset = (banner: any) => {
     display: flex;
     flex-wrap: wrap;
     .tag {
-      margin: 5px 8px;
       cursor: pointer;
+      width: 51px;
+      margin: 5px 2px;
       &.current {
         color: $primary-color;
         background-color: $primary-bg-color;
diff --git a/web/src/management/pages/list/components/CooperModify.vue b/web/src/management/pages/list/components/CooperModify.vue
index 8d1ba16e..6893d20b 100644
--- a/web/src/management/pages/list/components/CooperModify.vue
+++ b/web/src/management/pages/list/components/CooperModify.vue
@@ -110,9 +110,6 @@ const rules = {
     {
       trigger: 'change',
       validator: (rule: any, value: IMember[], callback: Function) => {
-        if (value.length === 0) {
-          callback('请至少添加一名协作者')
-        }
         if (value.filter((item: IMember) => !item.role.length).length) {
           callback('请设置协作者对应权限')
         }
@@ -132,7 +129,6 @@ const rules = {
 const formDisabled = computed(() => {
   return false
 })
-
 const onClose = () => {
   emit('on-close-codify')
 }
@@ -140,7 +136,7 @@ const onConfirm = async () => {
   ruleForm.value?.validate(async (valid: boolean) => {
     if (valid) {
       try {
-        const collaborators = formModel.value.members.map((i: any) => {
+        const collaborators = formModel.value.members.map((i) => {
           const collaborator = {
             userId: i.userId,
             permissions: i.role