From 08c26a461e497afbaf4ed87d4a3b09e731eb53e0 Mon Sep 17 00:00:00 2001 From: ibuler Date: Tue, 8 Apr 2025 14:03:36 +0800 Subject: [PATCH] perf: connect ad account --- src/assets/img/icons/general.png | Bin 2499 -> 2884 bytes src/assets/img/icons/other.png | Bin 2064 -> 2741 bytes src/assets/img/icons/windows_ad.png | Bin 0 -> 2376 bytes .../Apps/AccountListTable/AccountList.vue | 26 +++++++++++------- .../AccountConnectFormatter.vue | 2 +- .../TableFormatters/PlatformFormatter.vue | 7 ++++- .../assets/Asset/AssetDetail/Account.vue | 1 + src/views/assets/Asset/AssetList/index.vue | 2 +- 8 files changed, 25 insertions(+), 13 deletions(-) create mode 100644 src/assets/img/icons/windows_ad.png diff --git a/src/assets/img/icons/general.png b/src/assets/img/icons/general.png index 3760e8075374f99ede513573020dac492b40d945..58787c23280fda44de0f03151b5313c29168c243 100644 GIT binary patch literal 2884 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 literal 2064 zcmV+r2=DiaP)ND7Z5BG4QfnWJ}5EK$RZIH%Tf`m0fU+dC_9BGHOHLB$Kl-f z?wz~5yUZ_{)cSolSH&8Qx0|DNE zVu`Nx27uvQhRoB4pVnU^ya^o+iOTQ-@L!oS$2kC&066BdvDyH90AMbFdjMPm;6ear z0q6ywf>SU4AANT%|CaK6$THkqi^ihG0M14Rr~~j8fLxJA*$H4NfQbOk4Dk9SYZ8EE zF5b!aT&H0DCahQSQ4$i(v$U%Lj^Z-Ba|aPlmQq8V7)_`Pw*R6iGD?C zJC{|f15He8kr1v2@R!4+tPwzWB!?OROLJM9i7wpvux1atV^lKmgm7dQn{` zAf`-r7%$!f&=bk0JFD#4xbg^M#iux3 z3pQTqrf5JPg!FR-fIpS)YjP>Isbh-f(I45NKi63f^pR^{WD(t?m>9C~W@vAUGzsnH zxmaX&skMqBZZxvX4az{jKB^ggqcWJKQJV@vxgpbksEpu&EB~Tzhkelm@s2Xc(`sZW zkooxsal!3uUadEBO0DMB&bKcP(gl57qMi_4S+xW|INNUbsvnjiEv$0HSeVJjcB`9{R-^O zZZY{nvpfOx%2>s$;%lXGju1#r0M^6LJ=9jMq79$-BTV`((TbqO86P8EQ^MOzLt5!5V%ycT>}Gs9BRmh`tLDitqu@~5?!F-+-g$ZGDI!HTb~Rdvnj zqWE}S?M1+Bk(uTq7JtYg;BhaRzYv+p3*F+6DWXk3^P&|T6`6zF5|CB;h&DaqcF*Gg zk&!mKSc2gf(YCG}LdJGD4kZ9B$fA!@FH%Dkw^ zE~y-^8F*6tQXqf6$-w@m$aJ^I%B(6-5t%;qSgFc{%bzOpljc>FH6jyjo^;D150&Xm z3o;~ssL1=Jn@pQTCfd>Jw$IHe*5Mm@b&=9d0JbU%H|J+SK5>!A`#lUa0k`)1CZ#ep z4$GUZ2J7=p36~G{X3Wp`vzttEN9q|aFD5rk($nO`Xz|-k8ITWd%lv%gtX&kjLg>~V za=*w|$O)oG{C0l^|+0Z`II zaY>z*0r|#*dW)gjTd$~%t^73Aa2l;thSbLMG9cer?Op9-VkliG-K540$scMmF_fkg z3UTC?3N|OWt;{DLO%D|bmw&H`>138+|CnE?1rA$>^I!8uL*rjXg5}F`YNm;|9R>d~ zp`K^3o7iFE0Dqq6!PJm8`O^G;tD8(0i%fQbDmbJDOM`q-x+zPzw0I^ z=OVLpA@$E)rcMsTlYTwzET^#CWI*p^kjP9<*Va+apQGGwqD`;zBA`;SetMZ8T25xT zUsqCa#OHh=6wB6P#xl{C6tmbf4a!}$+Y!7|t@JiS4CL4iJ8|2v1CE8BFU)Rf^S`C- zIRw1vGtH6Wf@Yku>C<xgbwmSRsVd zB*#Vpa)y?9|1eqma7!O0jGdR2vaGR4wAG<7LjKKE7HKHrv*lziSJvhqMF>P%xU&Uy5X#L)w&j(Exr2V$MkAY?02n%EE-1T6zF@$)StdT}o}r#BFk& zQi%?Z_&h%5eqLp~o*|=CccwK-bgwOT^lD2Ck6!J<8r0WCj$Vyy1|F7^nA`@IpIX^7 zqq>A;tmXh?(wZ&z9ENTvjQaR)8CX-AURLrGS{~8cKrXYdD1KA<=}_8^@6M+$I~^C= zoz%fg#LfKX`1aBeW7`xigY>o4=26W7Uq80=<2b<5#i+v}(MFe#c}LS!_WYx0Y;^!m z=f$&1{#?i34dFd~^Et2FEaQ~g`K=*2nWHy5j_q{WSREmz9b6V0Uy}RtVeFK=FT$I! zk3-CuVSTw<7`G02&uI@Tm_CQJpiGHoEedFor!}mUD1}jcm@?!~K3c ue{SRNR`Z}dlXtuJPphV6u~;k?3-K?zs|S{h(q$6>00004vE>^v3NPEQSm`ace}ffdK-g8w(7|E0-D=m}&|B zn?lnom0dn{vAeA#W6iGUgoPC^E->~rSln|=5MxiASWwXvpBI{&A0T$*?zFau$!~nl zIfDh=zdGRfX}H;WB;iZkLG107$%@iNYdEdkbEO+zPIYA|d(gb3e#-OAImJH3Z!J;= z6v6*}!Wo_Ft8tppy^jy^<%Jz;zb2Ynrm(r&+(=bjJhv*7zSKwkd4y0BY@jkDX^9iG zm67xmbHeBnn4uFQ6=FCNpn0-GgD@t zkfE%^U|bU&eb6jkaMfpnlV%Uk0g|g38$?S4{itt=uhid|nR1|+TW8F>c0FOg>;5{1 zKwe%^s8Q{)dpLXJkZ=(HM83GXQ?PIBaeRP!w?VN-3$+7au@tC0wBOJM6Je@sp zd?&(nA(+&Am<$`8i+GadtIE#Y@|{av3T*V0I+LC9F-$J$6a%=v#`FANEknIPY1Q|> zBroD*DiN9P{AOnLD)3P2wMfx1=`Ye^=8kM`F(9Vnn_!%EJ(@e;sAnXox0wfBDuu8*Hx zkpe?;#CR$4sjR{_P?lL!EC!-PfG(EX@Ol8?T{k2J9`Bhd7fUxToV29WrSlF z5C(%uUxAp5cNf2c{5ZmCY2fT^We1EQh)>;g0ewh+E{a|dZ>xGMVa-nl$ky!=o=P`J{|>ng=2 z!(!c^sGCuB_O4*3%iXty`yos#bWlX-plF&&H$>cK73uY$BjUA=h`;i$+9zYJYp9-n z=VLrYzv|fB zmXn~%J>-&Lr=G2h|6z;#UV9NQ>LI=y*DCk8HFJ2Q0a7RPl8`O$MC=?EZ}fyfh%Qos24hwmVL>JXSP2mvP;qFeuEzbaBUD7 z9|zf!J{Q;fq1~A6lUeQXKTIKM7I=X+HITJ>bM70CF$=|fPZFL5@va{b@X9r2%yzw0 z|AzWM)dC%)_x2a9I*CzWP7A<8N--huxLp%`uS+PBBOWdzmuPc|9$@L$;>I+Yy}rh9 zQ51>01?TTN)OQh7INa3xunDx{=~wY@EFCh5q+36gnI^z?Bc8znWon1J4$q8A-RDEC z)?tWE)S;VY4s{a+@@ zt*cF(TXz1WZ}($-?=#wGkvNodbP><8R$kGe{#og=;BwT2b4! zwu!4O$7_C|*F7IEhX;<>szUMV-MDx6W;WyFl1{&e1$o zMFe{&*7(L7i&h@Jr=`w3v6-JCRg9dO=9_ILk;%nVU4>jg*h=+psSM`zK3WYJr_C_x z3cC#7Of%|8ld*<3(E|CgT7@}Z5zLnhY89h=c{E?{J338W@LnVM$B(OC?~JZpI@LfV Rjuz-P5CVeyulSL3{{( { + let title = row.name + if (row.ds_id && this.asset && this.asset.id !== row.asset.id) { + const dsID = row.ds_id.split('-')[0] + title = `${row.name}@${dsID}` + } + return title + }, getDrawerTitle({ row }) { return `${row.username}@${row.asset.name}` } @@ -213,12 +216,14 @@ export default { width: '80px', formatter: AccountConnectFormatter, formatterArgs: { - can: () => this.currentUserIsSuperAdmin, - connectUrlTemplate: (row) => { - + can: ({ row }) => { + return this.currentUserIsSuperAdmin } } }, + ds_domain: { + width: '100px' + }, platform: { label: this.$t('Platform'), width: '150px', @@ -228,6 +233,7 @@ export default { } }, asset: { + minWidth: '100px', formatter: function(row) { return row.asset.name } @@ -235,8 +241,8 @@ export default { username: { minWidth: '60px', formatter: function(row) { - if (row.ad_domain) { - return `${row.username}@${row.ad_domain}` + if (row.ds_domain) { + return `${row.username}@${row.ds_domain}` } else { return row.username } diff --git a/src/components/Table/TableFormatters/AccountConnectFormatter.vue b/src/components/Table/TableFormatters/AccountConnectFormatter.vue index 2fde206d3..411310780 100644 --- a/src/components/Table/TableFormatters/AccountConnectFormatter.vue +++ b/src/components/Table/TableFormatters/AccountConnectFormatter.vue @@ -80,7 +80,7 @@ export default { return this.formatterArgs.buttonIcon }, hasPerm() { - return this.formatterArgs.can(this.row, this.cellValue) + return this.formatterArgs.can({ row: this.row, cellValue: this.cellValue }) } }, methods: { diff --git a/src/components/Table/TableFormatters/PlatformFormatter.vue b/src/components/Table/TableFormatters/PlatformFormatter.vue index 26a5214b5..12f1c78f5 100644 --- a/src/components/Table/TableFormatters/PlatformFormatter.vue +++ b/src/components/Table/TableFormatters/PlatformFormatter.vue @@ -45,7 +45,7 @@ export default { } -