From 72998abf10eaa8b128c14195ddb80e60a5e79dd1 Mon Sep 17 00:00:00 2001
From: owen <owen@evolsun.com>
Date: Sat, 9 Dec 2023 21:33:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=90=A5=E9=94=80=EF=BC=9A=E9=80=82=E9=85=8D?=
 =?UTF-8?q?=E5=95=86=E5=9F=8E=E8=A3=85=E4=BF=AE=E7=BB=84=E4=BB=B6=E3=80=90?=
 =?UTF-8?q?=E6=82=AC=E6=B5=AE=E6=8C=89=E9=92=AE=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/user.vue                          |   1 -
 .../components/s-block-item/s-block-item.vue  |   2 +
 .../components/s-float-menu/s-float-menu.vue  | 116 ++++++++++--------
 sheep/components/s-layout/s-layout.vue        |   8 --
 4 files changed, 69 insertions(+), 58 deletions(-)

diff --git a/pages/index/user.vue b/pages/index/user.vue
index b51e5fd..37e6291 100644
--- a/pages/index/user.vue
+++ b/pages/index/user.vue
@@ -6,7 +6,6 @@
     :bgStyle="template.page"
     :navbarStyle="template.style?.navbar"
     onShareAppMessage
-    :showFloatButton="true"
   >
     <s-block v-for="(item, index) in template.components" :key="index" :styles="item.property.style">
       <s-block-item :type="item.id" :data="item.property" :styles="item.property.style" />
diff --git a/sheep/components/s-block-item/s-block-item.vue b/sheep/components/s-block-item/s-block-item.vue
index 67a8391..9821ce2 100644
--- a/sheep/components/s-block-item/s-block-item.vue
+++ b/sheep/components/s-block-item/s-block-item.vue
@@ -12,6 +12,8 @@
     <s-menu-grid v-if="type === 'MenuGrid'" :data="data" />
     <!-- 基础组件：弹窗广告 -->
     <s-popup-image v-if="type === 'Popover'" :data="data" />
+    <!-- 基础组件：悬浮按钮 -->
+    <s-float-menu v-if="type === 'FloatingActionButton'" :data="data" />
 
     <!-- 图文组件：图片展示 -->
     <s-image-block v-if="type === 'ImageBar'" :data="data" :styles="styles" />
diff --git a/sheep/components/s-float-menu/s-float-menu.vue b/sheep/components/s-float-menu/s-float-menu.vue
index b696c34..bed6513 100644
--- a/sheep/components/s-float-menu/s-float-menu.vue
+++ b/sheep/components/s-float-menu/s-float-menu.vue
@@ -1,75 +1,93 @@
 <template>
-  <!-- TODO-jj: 点击遮罩关闭 -->
-  <view>
-    <view v-if="data?.show === 1">
-      <uni-fab
-        ref="fabRef"
-        :pattern="state.pattern"
-        :content="state.content"
-        horizontal="right"
-        vertical="bottom"
-        :direction="state.direction"
-        @trigger="trigger"
-        @fabClick="fabClick"
-        :popMenu="true"
-      ></uni-fab>
-    </view>
-    <view :class="state.show ? 'float-bg' : ''" @click="onTap"></view>
-  </view>
+  <!-- 模态背景：展开时显示，点击后折叠 -->
+  <view class="modal-bg" v-if="fabRef?.isShow" @click="handleCollapseFab"></view>
+  <!-- 悬浮按钮 -->
+  <uni-fab
+    ref="fabRef"
+    horizontal="right"
+    vertical="bottom"
+    :direction="state.direction"
+    :pattern="state.pattern"
+    :content="state.content"
+    @trigger="handleOpenLink"
+  />
 </template>
 <script setup>
+  /**
+   * 悬浮按钮
+   */
+
   import sheep from '@/sheep';
-  import { computed, reactive, ref, unref, getCurrentInstance } from 'vue';
+  import { reactive, ref, unref } from 'vue';
   import { onBackPress } from '@dcloudio/uni-app';
-  const data = computed(() => sheep.$store('app').template.basic?.floatMenu);
+
+  // 定义属性
+  const props = defineProps({
+    data: {
+      type: Object,
+      default() {
+        return {
+          // horizontal vertical
+          direction: 'vertical',
+          showText: true,
+          list: [{
+            imgUrl: 'http://localhost/logo.gif',
+            url: '',
+            text: '客服',
+            textColor: '',
+          }],
+        }
+      },
+    }
+  })
+
+  // 悬浮按钮配置： https://uniapp.dcloud.net.cn/component/uniui/uni-fab.html#fab-props
   const state = reactive({
+    // 可选样式配置项
     pattern: [],
+    // 展开菜单内容配置项
     content: [],
+    // 展开菜单显示方式：horizontal-水平显示，vertical-垂直显示
     direction: '',
-    show: false,
   });
 
+  // 悬浮按钮引用
   const fabRef = ref(null);
-  const vm = getCurrentInstance();
-  if (data.value?.mode === 1) {
-    state.direction = 'vertical';
-  } else {
-    state.direction = 'horizontal';
-  }
-  data.value?.list.forEach((i) => {
-    if (data.value?.isText === 0) {
-      state.content.push({ iconPath: sheep.$url.cdn(i.src), url: i.url });
-    } else {
-      state.content.push({ iconPath: sheep.$url.cdn(i.src), text: i.title.text + '', url: i.url });
-    }
-    state.pattern.push({ color: i.title.color });
+  // 按钮方向
+  state.direction = props.data.direction;
+  props.data?.list.forEach((item) => {
+    // 按钮文字
+    const text = props.data?.showText ? item.text : ''
+    // 生成内容配置项
+    state.content.push({ iconPath: sheep.$url.cdn(item.imgUrl), url: item.url, text });
+    // 生成样式配置项
+    state.pattern.push({ color: item.textColor });
   });
-  function trigger(e) {
+
+  // 处理链接跳转
+  function handleOpenLink(e) {
     sheep.$router.go(e.item.url);
   }
-  function onTap() {
-    if (state.show) {
-      state.show = false;
-      vm.refs.fabRef.close();
-    } else {
-      state.show = true;
-      vm.refs.fabRef.open();
+
+  // 折叠
+  function handleCollapseFab() {
+    if (unref(fabRef)?.isShow) {
+      unref(fabRef)?.close();
     }
   }
-  function fabClick() {
-    state.show = !state.show;
-  }
+
+  // 按返回值后，折叠悬浮按钮
   onBackPress(() => {
-    if (unref(fabRef).isShow) {
-      unref(fabRef).close();
+    if (unref(fabRef)?.isShow) {
+      unref(fabRef)?.close();
       return true;
-    } else {
-      return false;
     }
+    return false;
   });
 </script>
 <style lang="scss" scoped>
-  .float-bg {
+  /* 模态背景 */
+  .modal-bg {
     position: fixed;
     left: 0;
     top: 0;
diff --git a/sheep/components/s-layout/s-layout.vue b/sheep/components/s-layout/s-layout.vue
index f3bcb68..914e7a3 100644
--- a/sheep/components/s-layout/s-layout.vue
+++ b/sheep/components/s-layout/s-layout.vue
@@ -36,9 +36,6 @@
         <!-- 页面内容插槽 -->
         <slot />
 
-        <!-- 悬浮按钮 -->
-        <s-float-menu v-if="showFloatButton"></s-float-menu>
-
         <!-- 底部导航 -->
         <s-tabbar v-if="tabbar !== ''" :path="tabbar" />
       </view>
@@ -130,11 +127,6 @@
       type: String,
       default: '',
     },
-    //展示悬浮按钮
-    showFloatButton: {
-      type: Boolean,
-      default: false,
-    },
     //展示返回按钮
     showLeftButton: {
       type: Boolean,