From eabac82e457ba2dce15147cf4af82cf96f4af007 Mon Sep 17 00:00:00 2001
From: Yjhon <hbzgyjh@126.com>
Date: Thu, 24 Feb 2022 16:34:30 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project/ProjectList.vue             | 13 ++++++++-----
 src/views/project/form/ProjectCourseList.vue  |  2 +-
 .../project/form/ProjectCourseSelect.vue      | 19 ++++++++++++++++++-
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/views/project/ProjectList.vue b/src/views/project/ProjectList.vue
index 73658cd..976c2a6 100644
--- a/src/views/project/ProjectList.vue
+++ b/src/views/project/ProjectList.vue
@@ -38,14 +38,17 @@
         </span>
         <span slot="action" slot-scope="text, record">
           <template>
-            <a v-if="hasPerm(power.release) && record.status == '1'" href="javascript:;" @click="handledRelease(record)">发布</a>
-            <a-divider type="vertical" v-if="hasPerm(power.edit) && hasPerm('project:list')" />
+            <a-popconfirm title="是否发布?" @confirm="() => handledRelease(record)">
+              <a v-if="hasPerm(power.release) && record.status == '1'" href="javascript:;">发布</a>
+            </a-popconfirm>
+            <!-- <a v-if="hasPerm(power.release) && record.status == '1'" href="javascript:;" @click="handledRelease(record)">发布</a> -->
+            <a-divider type="vertical" v-if="hasPerm(power.edit) && hasPerm('project:list') && hasPerm(power.release) && record.status == '1'" />
             <a v-if="hasPerm('project:list')" href="javascript:;" @click="getDetail(record)">详情</a>
-            <a-divider type="vertical" v-if="hasPerm(power.edit) && hasPerm('project:list')" />
+            <a-divider type="vertical" v-if="hasPerm(power.edit) && hasPerm('project:list') && ['1','2'].includes(record.status)" />
             <a v-if="hasPerm(power.edit) && ['1','2'].includes(record.status)" href="javascript:;" @click="handledCreate(record)">修改</a>
-            <a-divider type="vertical" v-if="hasPerm(power.del) && hasPerm('project:list')" />
+            <a-divider type="vertical" v-if="hasPerm(power.del) && hasPerm('project:list') && ['1'].includes(record.status)" />
             <a-popconfirm title="是否删除?" @confirm="() => handleDelete(record)">
-              <a v-if="hasPerm(power.del)" href="javascript:;">删除</a>
+              <a v-if="hasPerm(power.del) && ['1'].includes(record.status)" href="javascript:;">删除</a>
             </a-popconfirm>
           </template>
         </span>
diff --git a/src/views/project/form/ProjectCourseList.vue b/src/views/project/form/ProjectCourseList.vue
index 9fca9a8..2633ad0 100644
--- a/src/views/project/form/ProjectCourseList.vue
+++ b/src/views/project/form/ProjectCourseList.vue
@@ -41,7 +41,7 @@
       </s-table>
     </a-space>
     <project-course-select ref="CourseSelect" @selectKeyDataSubmit="selectKeyDataChange" :selectRows="selData"></project-course-select>
-    <a-col :span="24" style="text-align: center;">
+    <a-col :span="24" style="text-align: center;margin-top: 10px;">
       <a-button type="primary" size="default" @click="toPrep" style="margin-right: 8px;">上一步</a-button>
       <a-button type="primary" size="default" @click="toNext">下一步</a-button>
     </a-col>
diff --git a/src/views/project/form/ProjectCourseSelect.vue b/src/views/project/form/ProjectCourseSelect.vue
index c04491c..41aa0ff 100644
--- a/src/views/project/form/ProjectCourseSelect.vue
+++ b/src/views/project/form/ProjectCourseSelect.vue
@@ -23,8 +23,9 @@
                 <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
               </a-row>
             </a-form>
+            <!-- onChange: onSelectChange, -->
             <s-table ref="table" :columns="columns" :data="loadData" :rowKey="(record) => record.id" 
-              :rowSelection="{ selectedRowKeys: selectedRowKeys, selectedRows: selectedRows, onChange: onSelectChange }">
+              :rowSelection="{ selectedRowKeys: selectedRowKeys, selectedRows: selectedRows,onChange: onSelectChange,  onSelect: tableOnSelect }">
               <span slot="serial" slot-scope="text, record, index">
                 {{ index + 1 }}
               </span>
@@ -144,6 +145,22 @@ export default {
       this.selectedRows = this.unique([...this.selectedRows, ...selectedRows])
     },
 
+    /** 用户手动选择/取消选择某列的回调 */
+    tableOnSelect(record, selected, selectedRows, nativeEvent){
+      if(!selected) { //取消勾选操作
+        console.log('tableOnSelect - record:{}', record)
+        console.log('tableOnSelect - selected:{}', selected)
+        console.log('tableOnSelect - selectedRows:{}', selectedRows)
+        console.log('tableOnSelect - nativeEvent:{}', nativeEvent)
+        
+        let keys = this.selectedRowKeys.filter(item => item != record.id);
+        let rows = this.selectedRows.filter(item => item.id != record.id);
+
+        this.selectedRows = rows;
+        this.selectedRowKeys = keys;
+      } 
+    },
+
     //对象去重
     unique(arr) {
       const res = new Map()