From f78b7f9054560101dceaa61f7fafc8ea64209c2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=92=83=E7=99=BD?= <18511759309@163.com>
Date: Mon, 13 Sep 2021 19:01:55 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0@=E5=BF=AB=E6=8D=B7?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   |  16 ++++++++--------
 src/assets/style/font/iconfont.ttf            | Bin 10240 -> 10580 bytes
 src/assets/style/iconfont.less                |   5 ++++-
 .../header/components/tool-button.vue         |   4 +++-
 src/components/header/md-header.vue           |  12 ++++++++++++
 5 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index c4525bf..9a9d89c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -5,7 +5,7 @@
   >
     <markdown-header
       :id="textareaId"
-      :ref="'md_header' + id"
+      :ref="'md_header_' + id"
       :text.sync="text"
       :selectionInfo.sync="selectionInfo"
       :showPreview.sync="showPreview"
@@ -63,9 +63,9 @@
       :show-help="showHelp"
       :formatType="formatType"
       :userList="userList"
-      :ref="'md_textarea' + id"
+      :ref="'md_textarea_' + id"
       :renderLinks="renderLinks"
-      @tab="$refs['md_header' + id].tab()"
+      @tab="$refs['md_header_' + id].tab()"
       @submit="submit"
       @enter="handleEnter"
       @getFilteredTags="filteredTags = $event"
@@ -213,7 +213,7 @@ export default {
       return "textarea_" + this.id;
     },
     headId() {
-      return "md_header" + this.id;
+      return "md_header_" + this.id;
     },
     textareaHeight() {
       const height = this.height;
@@ -235,12 +235,12 @@ export default {
           _this.text = newText;
           _this.$refs.mdUploadFile.value = "";
           _this.uploadImgPercent = 100;
-          _this.$refs["md_textarea" + _this.id].waiting = false;
+          _this.$refs["md_textarea_" + _this.id].waiting = false;
         } else {
-          _this.$refs["md_textarea" + _this.id].waiting = true;
+          _this.$refs["md_textarea_" + _this.id].waiting = true;
           _this.uploadImgPercent = parseInt(url);
         }
-        _this.$refs["md_header" + _this.id].loading(
+        _this.$refs["md_header_" + _this.id].loading(
           "img",
           _this.uploadImgPercent
         );
@@ -279,7 +279,7 @@ export default {
         } else {
           _this.uploadVideoPercent = parseInt(url);
         }
-        _this.$refs["md_header" + _this.id].loading(
+        _this.$refs["md_header_" + _this.id].loading(
           "video",
           _this.uploadVideoPercent
         );
diff --git a/src/assets/style/font/iconfont.ttf b/src/assets/style/font/iconfont.ttf
index 5d6d60fb7817490c90df06b1f1801f5d88f4c1fe..34b7b55facc2a708993b06f2a0d47bc32f2f0abd 100644
GIT binary patch
delta 1448
zcmaKqe`s4(6vw~!z2v=@pKaGPY3-V(Nt;;Lb+d^LtVuhn+e+!m7}~9^Of#D{scl+W
zH{0rn4i)SlWAh1C7%1*vb%lZ`6e%JIA}TWQAH{-l3Qkc5{^95r&+S$GN4%HMz4zR6
zf1LY0_k|NTPhL4#{_)0J9f0-{;COOsW@)na!`n-MnF5-&3i;ebctRrpTTFL>C#*3?
zgvT39YhiX_@y(jbT|oT8_Ug>sQ@PbouB-sYPizm*<`(Bg7HjOUXFF2L&E~7GXV`8F
z@SRihbLV^u&upCv1BvH((YIGOVtsK4Ud!Blaq8tKsxp7T<KPM4`-vaU{nJ<ORW3R%
z>aVbEL6fsw<i5Ba7PqQ+;3zY)N2OwWwV5+Kb}~A{50*ad_1!HHmw8rh?%>|NJMR!@
z+3v?--lLI&Omb5lMW~Gu)J`cnL|N*iemX)!RG>M!V2AaHy`$B*q%R|Vc0ixv7zCek
z^grqV{;h);`kx9!5koy%PzOI6a331ciZ(vE34z^+gK)uvDpaEed*DR`VUF7eD*%%p
z8bUK_S*5)&I3B~Uaon*_=&rJtp9t}VY`L@n#7au|LJ$ij;j2L`mV|=<nF<aE#9~P}
zFwoy{h@gmqg9XWR84eqiQ1Aml?JN$pv!j)J{%(@pAP(`Ekr|<kf?o>CD)`NyK84IC
z^($oN=!gPA?uQht4XB`Cl|Us0%KS}ePQlWF&MR0%&;<p{30hRJu%K5JEHUUc1&a-O
zLm|Hy-B54>Kp!jkmx4AGoD<ORKv_2OA8xNGI8oTXuHckm`+Wr`58J;g<Y)i+Hw7mY
zw^kK0wOj^-A>P)ewNJGj{ZaiL{f=YVIpDlxSjL30Vtj5^o2Sj2)_^POde_zbojdBD
zc7Na*^IZ0Ny~ExwefRq=`M&Y(_)q&ewDo%PPp4gMS+i?=*VY@NYhwL9-$rejBdBcZ
zoBClqjv}WiY8s{y2n9pIWLLUZJ0LoRoQXvf@kBh8?oM}iNoSp3n0~R3y;+g!<U!Og
znglON#G-yJEJDey?sSmbbgx_?H`fOIBHAfZy`n2DG;OJn@5yG%J(Gpyp`&#{%c&b7
zkG7}x;i<8aWGa;$8T)GVR5B%MYpUY4BHC`bET3r^iH4S#-aVeyl4ITafyef?4Qk1b
zSbMf7U+~5<$1<_qMnBx!lP}&b=6iY@Oi$2bcr2%8gdR$cjD9_;jvp-~jx{zMY!qjP
zKe8-MGu+M1zG{(~e6G+Z9^5xB9%wD~=}Yp6d$G>r`}ZFom(BWTu@z0k?UV6AO(g7V
u@kg4iXY-}$Vy=`l7K^#%T+w(sH_xVdHdmTjE}XZw;}y%1D=y?YrGEj>%Q{a0

delta 1026
zcmaKqTSyd97{~uJJ3F)PMc2~2WUHpzYFI=_fvuQe7Z!sMAH<-V%66?>g)Ux5)`t*_
z9?U6-2#M@bO4?TmAA0Dapobm|5_;(qx<C{{LACv7579%=IsE3F@0>a3`+xtLS6vf_
zr*~xDUH9w&^a;R7B+reWe*EagSHLO<suogx_Nhq6_Rj#`l3gh-_<D_M&KF62YT&}i
zt>WBIK>Nt}=DER>_SEs|dBA+mxO2cB8Peid;6Cp|P1+vl3(v(F*F9s-<j~;x(1qdN
zKqat+BD9w`7VFxg(D*KS{i*5bv7-1I0tOd=mF~5XKV$A!Zrm96OfvRCcURfmb5SRv
zeXugDhL<{f^;)M@KQN=4-MJihy~IPB2rt#I<<CI7!d3Tl6Gwl3-Ozd%?`7v1F~kzT
zluC_6B_@s1BCXOU?as2k$7+#yeqQBCW;DLv@lW56zx^N*|LH(AYEX&@)**lmC__1F
zsjL#kR927msAIiBgiweg6kroJQlB3dHnW}*AF2?h9TnNIQKV&-Sb^K>SphwA;r$Rg
z;KEF-Ou?KGOTp|Ay5K?`5O<GI5yU-1s0|WTP$eX$pk7F$B17qr7KLlC#1$+D(yCx#
zkT!+;X{23|7rl>j!m=Tq3K{@ODQE>Gt)MB8K?UuBT*Pko0XhY_q@ZUI{zEQw4{}vO
zA0aaeY;=yBWfgAyPZV?)vZTOfXPUbu!0McWmSgpy0%2##EIU#Ge7LQE$xLoLsF~V5
z{fz!p|KUj(<wlpW>}~e;dhdAOnhoXytK9nHyX>3yeJN-unDlS;AN9WpL;|ycZ^5qM
z{owOZLuewjT-cLsw!V9vmC)U6V|a1Bvn{lc9W7kYvZc`}U5h%iv4rzJ)?t|={q~sM
f?;L8#Rr-ee(r5bZ^iK1vJ;c#EVW*R0DO&RzkIUm6

diff --git a/src/assets/style/iconfont.less b/src/assets/style/iconfont.less
index 0b502de..af3a56a 100644
--- a/src/assets/style/iconfont.less
+++ b/src/assets/style/iconfont.less
@@ -83,6 +83,9 @@
   content: "\e63d";
 }
 
+.icon-aite:before {
+  content: "\e634";
+}
 .icon-fengexian:before {
   content: "\e60a";
 }
@@ -104,7 +107,7 @@
 }
 
 .icon-help:before {
-  content: "\e641";
+  content: "\e642";
 }
 
 .icon-file:before {
diff --git a/src/components/header/components/tool-button.vue b/src/components/header/components/tool-button.vue
index bb53026..7d7795a 100644
--- a/src/components/header/components/tool-button.vue
+++ b/src/components/header/components/tool-button.vue
@@ -235,6 +235,7 @@ export default {
         case "ul":
         case "task":
         case "table":
+        case "call":
           this.$emit("updateText", { startStr, endStr });
           break;
         case "format":
@@ -361,7 +362,8 @@ export default {
     &.icon-lianjie {
       font-size: 16px;
     }
-    &.icon-file {
+    &.icon-file,
+    &.icon-aite {
       font-size: 19px;
     }
   }
diff --git a/src/components/header/md-header.vue b/src/components/header/md-header.vue
index a558271..5b193cf 100644
--- a/src/components/header/md-header.vue
+++ b/src/components/header/md-header.vue
@@ -180,6 +180,13 @@ export default {
         tip: "全屏模式"
       },
       toolButtonList: [
+        {
+          name: "call",
+          icon: "aite",
+          tip: "@用户",
+          startStr: "@",
+          endStr: ""
+        },
         {
           name: "headline",
           icon: "biaoti",
@@ -399,6 +406,11 @@ export default {
         selectionInfo.selectionStart +
         startStr.length;
       this.updateText(newText, len);
+      if (startStr === "@") {
+        setTimeout(() => {
+          this.$parent.$refs["md_" + this.id].createSelectUserDialog('android');
+        }, 200);
+      }
     },
     updateText(val, len = 0) {
       const textEl = document.getElementById(this.id);
-- 
GitLab