doway-coms 1.7.2 → 1.7.4

package/package.json

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

package/packages/AuditsList/src/index.vue

@@ -114,7 +114,15 @@ export default {
       });
     },
     historyData(val) {
-      this.$emit("historyData", val);
+      if (
+        val.logData.hasOwnProperty("code") &&
+        val.logData.hasOwnProperty("content")
+      ) {
+        val.logData = val.logData.content;
+        this.$emit("historyData", val);
+      } else {
+        this.$emit("historyData", val);
+      }
     },
     textColor(val) {
       switch (val) {

package/packages/LeaveAMessage/src/index.vue

@@ -17,15 +17,9 @@
     >
       <div class="liu-yan" style="background-color: #eaeef1">
         <div class="input-box">
-          <a-tabs default-active-key="msg">
+          <a-tabs default-active-key="msg" @change="tabChange">
             <a-tab-pane key="msg" tab="发送消息">
-              <div style="display:flex">
-                <!-- <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 style="display:flex">
                 <div
                   style="display:flex;justify-content: center;align-items: center;margin-bottom:5px;margin-left:5px;flex:1"
                 >
@@ -41,7 +35,20 @@
                   ></a-select>
                 </div>
               </div>
-              <a-textarea placeholder="写些什么..." v-model:value="remark" />
+              <a-textarea placeholder="写些什么..." v-model:value="remark" />-->
+
+              <a-mentions
+                placeholder="写些什么..."
+                split=";"
+                v-model:value="remark"
+                rows="3"
+              >
+                <a-mentions-option
+                  v-for="(item, index) in userList"
+                  :key="index"
+                  :value="item.value"
+                >{{ item.label }}</a-mentions-option>
+              </a-mentions>
               <!-- <a-upload
             list-type="picture"
             :headers="uploadHeaders"
@@ -55,7 +62,7 @@
             <a-icon style="font-size: 16px; cursor: pointer; margin: 5px 10px" type="paper-clip" />
               </a-upload>-->
               <div style="display: flex; justify-content: flex-end;margin-top:5px">
-                <a-button @click="sendMsg" :disabled="sendUser.length < 1 || remark ===''">发送</a-button>
+                <a-button @click="sendMsg" :disabled="remark ===''">发送</a-button>
               </div>
             </a-tab-pane>
             <a-tab-pane key="remark" tab="记录备注">
@@ -373,17 +380,34 @@ export default {
         this.userList = [];
         res.content.forEach(item => {
           this.userList.push({
-            value: item.id,
-            label: item.name
+            value: item.userName,
+            label: item.name,
+            code: item.id
           });
         });
       });
     },
     sendMsg() {
-      let tmp = [];
+      let reg = /@(.*?);/;
+      let result;
+      let arr = [];
+      while ((result = reg.exec(this.remark))) {
+        arr.push(result[1]);
+        this.remark = this.remark.replace(/@(.*?);/, "0");
+      }
+
+      let receiver = [];
+      arr.forEach(item => {
+        this.userList.forEach(uitem => {
+          if (uitem.value === item) {
+            receiver.push(uitem.code);
+          }
+        });
+      });
+
       let postData = {
         content: this.remark,
-        receiver: this.sendUser.join(","),
+        receiver: receiver,
         subject: this.topic,
         objectName: this.objectName,
         resId: this.resId
@@ -408,6 +432,9 @@ export default {
             .indexOf(input.toLowerCase()) >= 0
         );
       }
+    },
+    tabChange(activeKey) {
+      this.remark = "";
     }
   }
 };