doway-coms 1.6.34 → 1.6.35

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doway-coms",
-  "version": "1.6.34",
+  "version": "1.6.35",
   "description": "doway组件库",
   "author": "dowaysoft",
   "main": "packages/index.js",

package/packages/LeaveAMessage/src/index.vue

@@ -3,6 +3,7 @@
     <!-- style="overflow: auto" -->
     <div class="list">
       <a-list
+        v-if="remark.length > 0"
         item-layout="horizontal"
         :data-source="remarkData"
         style="box-shadow: 3px 3px 6px #cad1d7"
@@ -16,6 +17,17 @@
           }"
         >
           <template v-if="item.type !== 'date'">
+            <a-popconfirm
+              placement="topRight"
+              title="确认删除当前备注吗？"
+              ok-text="确认"
+              cancel-text="取消"
+              @confirm="delMsgRemark(item)"
+            >
+              <div v-show="userId === item.createUserId" class="close-icon">
+                <a-icon type="close" />
+              </div>
+            </a-popconfirm>
             <a-comment :author="item.createUserName" :avatar="item.avatar">
               <!-- <template slot="actions">
               <span v-for="(action,index) in item.actions" :key="index">{{ action }}</span>
@@ -58,6 +70,7 @@
           </template>
         </a-list-item>
       </a-list>
+      <div v-else></div>
     </div>
     <div class="input-box">
       <!-- :auto-size="{ minRows: 2, maxRows: 2 }" -->
@@ -137,7 +150,7 @@ export default {
     let viewDatas =
       this.$store.getters.moduleViewInfo[this.$route.meta.moduleCode];
     this.objectName = viewDatas.objectName;
-    console.log(viewDatas);
+    this.userId = this.$store.getters.userId;
   },
   mounted() {
     this.uploadHeaders.Authorization = `Bearer ${this.$store.getters.token}`;
@@ -149,6 +162,7 @@ export default {
   },
   data() {
     return {
+      userId: null,
       fileList: [],
       remarkData: [],
       uploadData: {
@@ -254,6 +268,13 @@ export default {
         });
       }
     },
+    delMsgRemark(val) {
+      deleteObjectCommentApi({
+        keyIds: [val.id],
+      }).then((res) => {
+        this.getMsgRemarkData();
+      });
+    },
   },
 };
 </script>
@@ -278,6 +299,12 @@ export default {
   padding: 15px 15px;
   height: 540px;
   overflow: auto;
+  .close-icon {
+    position: absolute;
+    top: 30%;
+    right: 5%;
+    cursor: pointer;
+  }
 }
 /*滚动条整体部分*/
 .list::-webkit-scrollbar {