From 46e5c6dbb6d804099f103907c297bc2efe5a3f75 Mon Sep 17 00:00:00 2001
From: gaoyuanwei <2826352639@qq.com>
Date: Fri, 1 Jul 2022 17:58:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E4=B8=8A=E6=9E=B6=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/PutOnTheShelf.vue              | 22 +++++++++++++++----
 .../newHome/components/PopularAbility.vue     |  5 +++++
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
index 6efd0f0c..57c911cb 100644
--- a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
+++ b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
@@ -109,6 +109,12 @@
               v-model:value="item.note1"
               :options="item.options"
             />
+            <p v-else-if="item.type == 'text'">
+              {{ abilityToType }}
+            </p>
+            <p v-else-if="item.type == 'text2'">
+              {{ componentTypeValue }}
+            </p>
             <a-textarea
               v-else-if="item.type == 'textArea'"
               v-model:value="item.note1"
@@ -153,6 +159,9 @@
               :list="props.videoList"
               tip="支持视频类型，大小不超过100M"
             ></upload>
+            <a-button v-else-if="item.type == 'dialog'" @click="sourceClick">
+              请选择来源应用
+            </a-button>
             <a-select
               v-else-if="item.type == 'select'"
               style="width: 240px"
@@ -194,11 +203,15 @@
   </div>
 </template>
 <script setup>
-  import { ref, defineProps, watch } from 'vue'
+  import { ref, defineProps, watch, onMounted } from 'vue'
   import mybus from '@/myplugins/mybus'
   import upload from '@/views/components/upload'
   import { message } from 'ant-design-vue'
   import { getCategoryTreePage } from '@/api/personalCenter'
+  import { useRouter } from 'vue-router'
+  const router = useRouter()
+  const abilityToType = router.currentRoute.value.query.abilityToType
+  const componentTypeValue = router.currentRoute.value.query.componentTypeValue
   const props = defineProps({
     // 展示数据
     refData: { type: Object, default: null },
@@ -387,6 +400,7 @@
       delFlag: 0,
     })
   }
+  const sourceClick = () => {}
   watch(data.value.list, (newProps, oldProps) => {
     console.log(newProps, oldProps)
     newProps.forEach((val) => {
@@ -512,12 +526,12 @@
             width: 570px;
           }
           .ant-btn {
-            width: 100px;
+            width: 160px;
             height: 32px;
             text-align: center;
-            background: #d9ebff;
+            background: #edf4fc;
             color: #0087ff;
-            border: 1px solid #0087ff;
+            border: 1px solid #bbd3ef;
             border-radius: 6px;
           }
         }
diff --git a/front/src/views/newHome/components/PopularAbility.vue b/front/src/views/newHome/components/PopularAbility.vue
index 82206d55..5f86d6c7 100644
--- a/front/src/views/newHome/components/PopularAbility.vue
+++ b/front/src/views/newHome/components/PopularAbility.vue
@@ -293,6 +293,11 @@
                 color: #212121;
                 text-align: center;
                 margin-top: 0.05rem;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                display: -webkit-box;
+                -webkit-line-clamp: 1;
+                -webkit-box-orient: vertical;
               }
               .text {
                 width: 100%;