doway-coms 1.6.55 → 1.6.56

package/package.json

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

package/packages/LeaveAMessage/src/index.vue

@@ -21,12 +21,12 @@
           <a-tabs default-active-key="msg">
             <a-tab-pane key="msg" tab="发送消息">
               <div style="display:flex">
-                <div
+                <!-- <div
                   style="display:flex;justify-content: center;align-items: center;margin-bottom:5px;flex:1"
                 >
                   <div style="flex:1">主题：</div>
                   <a-input v-model:value="subject" style="flex:3" size="small"></a-input>
-                </div>
+                </div> -->
                 <div
                   style="display:flex;justify-content: center;align-items: center;margin-bottom:5px;margin-left:5px;flex:1"
                 >
@@ -80,7 +80,7 @@
             </a-tab-pane>
           </a-tabs>
         </div>
-        <div class="list" :style="{ height: listHeight - 215 + 'px',maxHeight:listHeight - 215 + 'px' }">
+        <div class="list" :style="{ height: listHeight - 215 + 'px' }">
           <a-list
             v-if="remarkData.length > 0"
             item-layout="horizontal"
@@ -112,6 +112,11 @@
               <span v-for="(action,index) in item.actions" :key="index">{{ action }}</span>
                   </template>-->
                   <template slot="content">
+                    <template v-if="item.receiver!==null">
+                      <div style="display:flex;flex-wrap: wrap;">
+                        <div v-for="(item,index) in item.atUser" :key="index" style="background-color:#eee;margin-right:3px">@{{item}}</div>
+                      </div>
+                    </template>
                     <div style="margin-bottom: 5px">{{ item.body }}</div>
                     <div
                       v-if="item.objectCommentAttachDtos.length > 0"
@@ -218,8 +223,8 @@ export default {
     this.uploadData.resId = this.resId;
     this.internalServiceUrl = attachGetAttachUrlApi();
     this.uploadData.picAction = this.internalServiceUrl + "/UploadAttach";
-    this.getMsgRemarkData();
     this.getUserInfo();
+    this.getMsgRemarkData();
   },
   data() {
     return {
@@ -291,6 +296,17 @@ export default {
       searchObjectCommentApi(postData).then(res => {
         let tmp = [];
         res.content.forEach(item => {
+
+          if (item.receiver !== null) {
+            item["atUser"] = [];
+            let atUser = item.receiver.split(",");
+            this.userList.forEach(uitem => {
+              if (atUser.indexOf(uitem.value) > -1) {
+                item.atUser.push(uitem.label);
+              }
+            });
+          }
+
           let flag = tmp.findIndex(titem => {
             return (
               titem.createTime ===
@@ -357,7 +373,7 @@ export default {
       let postData = {
         content: this.remark,
         receiver: this.sendUser.join(","),
-        subject: this.subject,
+        subject: this.uploadData.resId,
         objectName: this.objectName,
         resId: this.resId
       };
@@ -382,8 +398,41 @@ export default {
 }
 ::v-deep(.ant-upload-list) {
   display: flex;
-  flex-wrap: wrap;
+  overflow-x: auto;
+  margin-bottom: 10px;
+  // flex-wrap: wrap;
+}
+::v-deep(.ant-upload-list::-webkit-scrollbar) {
+  width: 5px;
+  height: 5px;
+  z-index: 10;
+}
+::v-deep(.ant-upload-list::-webkit-scrollbar-track) {
+  background-color: #ffffff;
+  z-index: 10;
+}
+/*滚动条里面的小方块，能向上向下移动*/
+::v-deep(.ant-upload-list::-webkit-scrollbar-thumb) {
+  background-color: #bfbfbf;
+  border-radius: 5px;
+  border: 1px solid #f1f1f1;
+  box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
+  z-index: 10;
+}
+::v-deep(.ant-upload-list::-webkit-scrollbar-thumb:hover) {
+  background-color: #a8a8a8;
+  z-index: 10;
 }
+::v-deep(.ant-upload-list::-webkit-scrollbar-thumb:active) {
+  background-color: #787878;
+  z-index: 10;
+}
+/*边角，即两个滚动条的交汇处*/
+::v-deep(.ant-upload-list::-webkit-scrollbar-corner) {
+  background-color: #ffffff;
+  z-index: 10;
+}
+
 ::v-deep(.ant-list-item) {
   padding: 12px 10px;
   position: relative;
@@ -436,7 +485,7 @@ export default {
 .input-box {
   background-color: #fff;
   padding: 10px 10px 0;
-  min-height: 210px;
+  min-height: 180px;
   // max-height: 210px;
 }
 .msg-content {