From b55a9156002b083fa429aeebee84a3afc1fbe11f Mon Sep 17 00:00:00 2001
From: xuesinan <1404152492@qq.com>
Date: Mon, 25 Oct 2021 11:18:54 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=A1=B9=E7=9B=AE=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E5=BC=B9=E6=A1=86=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |  3 ++-
 .../PrettyExchange/PrettyExchange.vue         | 20 ++++++++++++++--
 src/components/Projects/ProjectItem.vue       | 24 ++++++++++---------
 3 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 23706f9..897941b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# 0.1.0 (2021-10-20)
+# 0.1.0 (2021-10-25)
 
 ### 🌟 新功能
 范围|描述|commitId
@@ -185,6 +185,7 @@
  - | 修改utils/upload 兼容小程序选择客户端文件上传WBS | 8f49129
  - | 重构store分层 | 5f6fff8
  calendar | 日历细节调整 | 1a8d6bf
+ - | H5自定义导航 | 04ae8f2
  - | project 代码健壮性完善 | a3202c5
  store/home | 删除store/home | db8a3b4
  task beginTime | 格式化任务开始时间 | fbc0301
diff --git a/src/components/PrettyExchange/PrettyExchange.vue b/src/components/PrettyExchange/PrettyExchange.vue
index 3975f80..ac1ffa1 100644
--- a/src/components/PrettyExchange/PrettyExchange.vue
+++ b/src/components/PrettyExchange/PrettyExchange.vue
@@ -8,7 +8,7 @@
             :index="index"
             :item="item"
             :menuList="menuList"
-            @chooseAction="chooseAction"
+            @setData="setData"
             @openSubProject="openSubProject"
           />
         </view>
@@ -119,6 +119,9 @@
       </view>
     </view>
     <!-- 移动悬浮 end -->
+
+    <!-- 项目操作面板 -->
+    <u-action-sheet :list="menuList" :tips="tips" @click="chooseAction" v-model="showMenu"></u-action-sheet>
   </view>
 </template>
 
@@ -156,6 +159,7 @@ export default {
         color: '#909399',
         fontSize: 28,
       },
+      projectId: 0,
       menuList: [{ text: '复制' }, { text: '编辑' }, { text: '删除' }, { text: '置顶' }, { text: '排序' }],
       // show: false,
       border: 'border border-blue-500 shadow rounded-md',
@@ -223,8 +227,20 @@ export default {
         .exec();
     },
 
+    setData(flag, projectId, tips) {
+      this.showMenu = flag;
+      this.projectId = projectId;
+      this.tips = tips;
+    },
+
+    chooseAction(e) {
+      let data = { index: e, projectId: this.projectId };
+      // this.$emit('chooseAction', data);
+      this.actionFun(data);
+    },
+
     // 操作
-    chooseAction(obj) {
+    actionFun(obj) {
       let action = this.menuList[obj.index].text;
       if (action === '排序') {
         this.changeEvent = true;
diff --git a/src/components/Projects/ProjectItem.vue b/src/components/Projects/ProjectItem.vue
index e3e01f2..c0840d1 100644
--- a/src/components/Projects/ProjectItem.vue
+++ b/src/components/Projects/ProjectItem.vue
@@ -77,7 +77,7 @@
     </view>
     <!-- 项目操作面板 -->
     <!-- <u-action-sheet :list="menuList" :tips="tips" @click="$emit('chooseAction', $event)" v-model="showMenu"></u-action-sheet> -->
-    <u-action-sheet :list="menuList" :tips="tips" @click="chooseAction" v-model="showMenu"></u-action-sheet>
+    <!-- <u-action-sheet :list="menuList" :tips="tips" @click="chooseAction" v-model="showMenu"></u-action-sheet> -->
   </view>
 </template>
 
@@ -101,12 +101,12 @@ export default {
   },
   data() {
     return {
-      showMenu: false,
-      tips: {
-        text: '',
-        color: '#909399',
-        fontSize: 28,
-      },
+      // showMenu: false,
+      // tips: {
+      //   text: '',
+      //   color: '#909399',
+      //   fontSize: 28,
+      // },
       show: false,
       border: 'border border-blue-500 shadow rounded-md',
       showBorder: false,
@@ -136,12 +136,14 @@ export default {
       this.showMenu = true;
       this.projectId = project.id;
       this.tips.text = project.name;
-    },
 
-    chooseAction(e) {
-      let data = { index: e, projectId: this.projectId };
-      this.$emit('chooseAction', data);
+      this.$emit('setData', this.showMenu, this.projectId, this.tips);
     },
+
+    // chooseAction(e) {
+    //   let data = { index: e, projectId: this.projectId };
+    //   this.$emit('chooseAction', data);
+    // },
   },
 };
 </script>