From 8734af6dbf3424e7495db620f8bc936f50115b05 Mon Sep 17 00:00:00 2001 From: Jiaxin Peng Date: Sun, 12 Nov 2023 20:59:39 +0000 Subject: [PATCH] add switch button --- README-zh.md | 8 +++ README.md | 10 ++++ img.png | Bin 0 -> 14616 bytes src/commands/NotionCommands.ts | 95 ++++++++++++++++++++++----------- src/lang/I18n.ts | 8 +-- src/ui/settingTabs.ts | 52 +++++++++--------- 6 files changed, 114 insertions(+), 59 deletions(-) create mode 100644 img.png diff --git a/README-zh.md b/README-zh.md index 5ac9b7f..cc7c7e4 100644 --- a/README-zh.md +++ b/README-zh.md @@ -3,6 +3,14 @@ 所以我在[原作者](https://github.com/EasyChris/obsidian-to-notion)的基础之上，增加了匹配[NotionNext](https://github.com/tangly1024/NotionNext)模板的功能。这样可以直接在Obsidian编辑，整理好之后一键发布。 ## 更新说明 +### 0.2.6 +- 增加一个按钮用来控制是否在名列列表中显示如下数据库。 + +![](https://minioapi.pjx.ac.cn/img1/2023/11/147c6a4eaa34da41a6f102558ed77106.png) +如果你关闭普通数据库的按钮，你在上传命令列表中就不会出现普通数据库的选项。如果你关闭NotionNext数据库的按钮，你在上传命令列表中就不会出现NotionNext数据库的选项。 + +![](https://minioapi.pjx.ac.cn/img1/2023/11/70b8e4fc2148688ccbd6cfc53ce339a2.png) + ### 0.2.3 - 修复了一个bug，现在可以正常更新了。 ### 0.2.2 diff --git a/README.md b/README.md index aaf0e89..81747c0 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,16 @@ Thanks to the [original author](https://github.com/EasyChris/obsidian-to-notion) Thus, based on the [original author's work](https://github.com/EasyChris/obsidian-to-notion), I've added a feature to match the [NotionNext](https://github.com/tangly1024/NotionNext) template. This way, you can edit directly in Obsidian and publish with a single click after organizing. ## Update +### 0.2.6 +- Add a switch button to control whether to show the upload command in the command palette. + +![](https://minioapi.pjx.ac.cn/img1/2023/11/147c6a4eaa34da41a6f102558ed77106.png) +If you turn off the button for the General database, you won't see the option for the General database in the upload command list. + +If you turn off the button for the NotionNext database, you won't see the option for the NotionNext database in the upload command list. + +![](https://minioapi.pjx.ac.cn/img1/2023/11/70b8e4fc2148688ccbd6cfc53ce339a2.png) + ### 0.2.3 - Fix the bug, now you can update normally. ### 0.2.2 diff --git a/img.png b/img.png new file mode 100644 index 0000000000000000000000000000000000000000..28ebe7a26c9311f80524a0488fbc849697701aa7 GIT binary patch literal 14616 zcmb`uRZtw?7d46w6I>EBz~B(v6D$l67~Dy4mkI6zgy0rzaJMi(NN@y4vdW>3z;wd#$}Fev8aZdBxj(T}z1rUlG+9pYO zaw5^pjuVa5vjU(#`fx3occ8cG1qvT03|VwsN%LA=x|!u&*!@}cRri5|;lJ$-;DPG? zNAKgdxgWvdOhQ7E$c&@8_`gfQ{03<$DXCASQqTYx4EB@>hWd4OcE%}phB#hdU)K&_ zQ(k&}uo&2r(ijyLr9>9`|9*iW%W<3U>2U5VPn&=Dw-;+YVQbJ9-_!ijd}-r!USmor zeUM3qzdo&)6X*H)`JbbAn~%2$z5mJi%J0JFEH(79SSc}GHG>aV(@%=6Fd>fdwHY}D zMOYa=eG0pJGXAp{$f;tburdZZI&qiOa^14wzjrrbWm5U_eQ^!drfuv&cT1~V1m?d( zd5ju3VMZ>ioxDN+E(=Q3vV?kc6Z_VCqe|YyQYI%SlmFx6=2rc9{mooChMa9{w$gZf zrncv?G25Gr56ybzI&V&vTPUO|!~d3R2C7U`Iy%kQfET|za%AwE6X##R2yN`_hBG>^ z*l5I@-ks?c75iQ8Tzsz%RBv=%DlMos@8YAE^hurh_7<<|gUG?pa+cSBrV_WpNMwMI z4-=CKqe^xDod!MVqW(=6{9_$VppSh?0)03%e@Jdx{V2I{cW<%M>U|NT`9ZGHX@UIw z@BVZd!Pqpt%!g(%7%@-+DAmmW@jTXJ3z@W5&H`y z>%Y%8El;VdA4bgo)mW|BG6x>l+={(UO(I>-d|*Nr83^H;pu!cs01!B z^P>h-2ZT>&D|5U~(WdD}0xCG^G%URRTk#?c7dY!9c6ugEEA z%w6UAqLcppy&I`AZDSsvhM%`<Y@=L#mzc;o!qgjiU|7M#y zOZY0cK-s1pMSaiQNLH-3@S*fMrOoNa2#|r^S|^x$=$*8 z6Lnq`VFM9dP!tcC4}VrlWbhyBkEOc455*-A;Rg`WrgB$f+^S@4MCkCjxPB7Km-MZw zF#4`y3m8rbNK*RQ1VRR&Yjw*s{w)9esdszg+jR#)l`8dmB2UpB0ZK3NPCIV$r9yKBJhmXW%eyjV@vF?V(CK&0 z3?y5O55J@SYc4V{JXgrbN#6M_B0w{nWG>i@KU2gWeD zjCcJYZ}#E*jVS2;wG9$pGl*UL;c-yBwYtBZ2&(G9Zm&HJJPlAGrX&TfES0Ec3|9yJ zb@bbe7vCC)r(3_Ag3#4%$dKX!;_m)!^9Mbl_^7BDd4E;*dM3cos^l(Cd=;TgA?k5` zIG165zd^OwJw$;%9Zut3w{He%E;T@lyEyof=KrcqT0Ht(2NLMHS8vCCx9nfvW$h5$ zuxmECtk8A>!jPWke%sG(dl~(H$jb+X3GxgoZg$yR*=J zb0Ay1L?sR7v2JEE5qP#EozLHw+rUJFEc4n&eeGrA;5fW>K+scBl@XC@0@R1F!W(fm?#7W2a0XRU=bz`&4B%%To+clVA0@MLDJD*0$w;!6moBStkqi zN>AXvKe)#T5K&&*O~2`Hs}Lo(?b>i)f85N@0V9`6^U6aE<3b~6^)`QLog5|)`?Un=O2nDA#{`QbFK6CVAaL+ zpU1DL^k7~#iVv85SkO(dF^)2wbdqBztynP59u_tvO7WA+9#$gW5QZk;9jcL*JN`5= z=)Rbi0txu+rc7su?ZIPMhoEJaGX5v`5-}3U(5HdDdjqQiPyXF81FtOLZUtA69^dfo z-QM4HJ&cuj$^(%vXIWfVTEF|3RvEqvdobZMe!g`M5W3c+BO-)Lz{ETey;>`?N3fl{MKQ zzZoWE@Y5R3-+}aBaEITaRQV$&rZF7mN%crYe8vr{MPDPvqzu}>t_3p{da&eSs4iB` z5l@;kDlTHU#+_2{eP;4xR9z%&|13FMWoq0Z5HPuR#<$|NE?DGj1Z9c7hl}OYCCiSa z^M;i%2e)_M;g!WQy@3xRiMx{X`!Iu0c25rXgXJ3O~tacW~XCj}W?IEU5K!#>jRE-DYIt>0>x(Dbp3cMZKdD z0k3|?j`Hf=rxp703@4jCKbF4MKA1HA)bb)aO&T3|vvMXH9H|!3l$LXdud;~oBU0;p z`PNZ+iMX{znEL|Db9`U9ut;9UXKgIh-t#nShy{te#f6|W@d^PqC=k@jGV}xp)vK%`BzKi+vH6Cq$MHHiFXV}9KL_JGWzHRvN!z5YEQ}a`QIM|$RVlvD>8cq}~ z8KELaA>zgV3`p2CVM-15l9Q0?ki$&cC@IqV{qj0|$x=+u9-+#GM3)~0-_NM_r;;lt`Hsj#bsnUDF zLZ!_TrYY(@ANhBLv-9{Q<+aIzU!cNPn#FZnDlC7uI9}6u_isMpx$kXpf`zdJ4#A_5 zMV7+CxGgy3TeQ)+RbuhEn2=82T|wccFqfw5ms5r`TR#ZGYA%dul#Tq9;z+S!)B?zh zN9fx|P6sN0$@IywM2SGKZ{wOAL#os|TM%QZQjiIH6Wg_;+mNI2{MnK|+KA1EjsdN6A#w zzUyX4{Ww*4!QKIBljQHA_V?%*kJ`mo(9iz@kE|I-N>q!zJsFpJ*G-Yu!}!PfT%UqN zTmY}im$tC+0AW5hBlJV@t)#5Z7cpX+=O38t5bDJ?vYgcbtR4Y*rsl~ImH4?Bz3z~x zjf7-l*`I2DKXmPXVGu>`774dn1Oth(LS(D@i#_QWb!R~Cw6O&3v{$x==Ns4S&vw4Q zAft)gZQg}u!mi+ei6{jo#c%OK-$_wkM1Zakw|6ER{!2OHt_J*h07oKa5sS%8W(Y|X zV1hZJ@ad1stoQFKjYQdG(cGLvZuuTHx)hjZq6(YDXH%EKlTK13ag+s>=U7(;0;m%w z;$e*5tzY;c-vb=Kh^bP-%yZ0z6uV*SO_~Z}YN`Bvbis#kU{+R`wd{)Qx1E0{?;s); zZUXFEL<8yPNfuIcz?3WD-BnQ#gmo)PG?|iT`EzIMmpYRQPJtJF{ zNela6y~a*fIUY$F@|S7ArPPDvdSCf;oy)YrZFfwLPG+Ho zJ0dn?YyLd<>Utg&pEc-ldI-BgORI0* zX&MG_eR>&in|@W0!PnnXOXmfXzRHdA$R=cBPP_f>SB9BLJIL}Vh0upv zLz=doTtZVHMG1}9e9r)g;n>JY^Y|rxX*-1SY)kG+qE$?0vKUdi26jT zK07Z-?(fCKuq;n1)vRG}+aMi{vlnphi&Vd|bPrZh4x{y6IP5H1F!MC#`_dMPZBlYN znV%)5K;XDs$J-ip6RWUQi7}grPAyOs2j;cI#J^nLjeL&hGv$-+EA~lT4l^PeZ;HP^RIQ=jmz?Xtx@jb}PxJoR>s%VU@vJ{*zzZr%W+% z@|HE42D;i2ph*r$5Qy)LDHmzm{={@vky3Wu*7Q|$5&*T7hhKI(turhqj?&Lz zHzuuJVBJ)&wuh-@3US|$mVBF4E;h&$v0Cg1xM5)~3;Fi8dgS)9sHU9K#CMlz-wQ0G z5Wpcm*+u6~s6ar2`pgt-U zJ%R1JgyrU>&F#s{Zw|T9y}#mhTXN`Ivid{! z!eh?Huip3b!Ah;dDCBOhPb5bg=Cuu zlNo=V4zTLJs6{6E`tWx;g!ZAY&B+g2RHJ9Ri1XZ=4%a0hWG=kC{wfG1<2vO5U8rpn zahlR**DPRZx;&eNg5Vm~o~Hm_$@jF!opB;av%gV8i}9z*CifWSa}|$#iS!iQhSNvX zMz_e$y4*>s^4CtF-veTc1?7A8rKY`4Ix;RBbUo%eq}h5%8Ssl^IJn5#W~y%HkH*+y zfB9fGqgz4UfTTAY*|62jV!XO^c`^woD%K~W4y2*4=u^&*R>l>D|K$oyx61D zX4sQyFx5V#K(^Z$`%M zd*E!FlAc}qwl`p5Rl8Gan(g>|sS~GTZXDTW*`BDy`Nd4BT4dzmfaP>pAsUg>C~7+( z#pQY;KfyKr64QQsn|}7j@JD=(Z^=5+Mt(l(GyJ=1U)Jr*1Uts81KWw!^WTVoiL;3> zY4&N&--y&wJu|F10{Y_`?D^j@6B+w_`r5-MW~0+&C@J0an#<6P+gSg-==(|{*ue4| zolZr0wpVT|BGHYJqdDIX-_uUgZeEWGD}ChpWkAGM^UP7~y?iNn36K_s z_g?nBm=o{H9ihP~BZ=+xpRo)7miMR@`=HCaYa!TA7?)vDIxBmWm?X8dd$!jBTIs>u zuH6IqbfeS~mB}>Vka>0T+?hv21=;4YVkZRKf?a>q$d@SAA?qMT#^22d#HV|$kFn8( z&Hc$^c>jFX75z2dJ&)=43-26maC^{Ysj{wl`ReDee?C`zz9khy6bQ!d)eP0Q$;74s z-==!rrG0&8e0s-Oh?&yZjK-ePYCdnk3@=QUx2pTN69`Ji?3HWlArzT-@y|z{M$9gm z{Mo5i8Pqrs4;XVQs7OlXr@M$4N&g;OK~ctPISCQ1p^nqFAOE^M`&nLGKF?rOuh2^$^4Hoq^BW1kuE z7?(TvrFZk;R1zF2t1bI2{z|xSMj>>rCB;nX4)foAyTnY|Um?j*=sIuv-%@D)aMydX%N_D=02 zv2-s{%QZu0eFzSMs8*hpF1~5xJ84e;%arlO_$3Ebn@uRc%}CtC$VHQ z?iUT6bX(D8u9!u9W}WQsad!ePBzG_0vvG(|2$HKWdL_I7gBL3$eoa0w!3evzx!>w9 z1~()k>>N&`{)jrFlh00dP$+$Sbc>`y=JH^r^_J$d&6W-7H7|?4#@B~O+VhBcwPNrVX`2%7bS1LfW=}aM@>P`3R#TSzRMC;je?7_ z1-wiDohJY4k>^?*LnKX0qw50S{=5lG1#$RJ!m|LPaT$rJ!HNk}p90hi}?G->>4)b z;Z!sedE7T)-JlkZK9#?v;}$$ToO5K>9ET5&KtvzK-j#Hi-IS;swbkwpbijs~&Jl)m zK@TW|=#DXH$Xr{)_opV)F}gTh&0ZL4A2ty9WA)Y-+(=pciA=dLy4k9+%afmP>DU9k zib|+3Q92JV7P2>X!K(yO*B?~eS9>NCn)~y>zREr#E?2R9;S~j`3J}N$NPQ%n56rI( zFpY$+!R*!gi*@FpiyARN^~A7&i7W7LA5;!$!W+&ToFzsoj=d^G`n1q|Ob7@r3l+{`H-+&?pywib)t%+U;9eF*iC+XfPX?B_c z200~Q*xx(29DYUEJevl+U_NGn(x{k_9--0>f9yW4{a^P#B|l|TK=*1iHTb0_rnMDRh&7P|9m&_Z_q){iioWUJMT`CcFmz&blVK0nJs(w{q>|1{r7{3RO zu#_g0l`_tVw1jQO3F?U>G#{x5|K}*c-gW=ToK}2}8QlQQlju7mEg6FJ3Lpu!b#$gi zo6R=urOS1%wGgQDL93E+0(;!NgI6CwpPc*zOd`n{(5!IGz>&vtWm^7muwE8i+M_<6P5Y`f0#lp*Va7~^pHlS-D%QSYx0jPZ;<{&JcaMv0Ro)1{$g-oEZ@=y8*wB)Y336C$rAB& zKS9VbxT;2VQJpX*G4JVnP#kKS4OfaWOxWg1Vc#`6CZx!(G~^Ao5S|(R{;{M@LupKp zq1!ObSH%B3So+$fRsHFR` zQu10a44xbnqPXz`)P_)h)wI8?`-t(_j!cCUvqXe`e`4BxIM*-~2v(=>huJeoS20LR zbmn!0@Wpee{XNbWfE;Gz&HRvMzV6E#AJiM~Vd2<&*en|rxh~YlfnL78{bM!sNrDo~ z%_XxGLOZB|fBiI*xBvIBjAw$F^8C2=1Jau&QD{zvRnc+^T1iRqvboDuXA9o z6%HNpq4OG+jy+%q%spYoplTaI9az22*sdekhqN6$_a z<8msVF(iJNs?#Tn2ZULc5YSen;WkHNGNK^Gy=|X%Dvi!G;Ia=z#rh+S-AkoY&Y~;E zQvOmtfEAM#Y-XEZxD#Lr34bZoYuhEFGJ-^oVc8=AYXu%ItOmVOfsGg}RJ8kI+v}~Y z%YSN~abop&liT@Xjv*?V)Dhd?W}{AR!T(U$%<+6kiYD>U*|?h%6}~Op$jkt|LwVBF z>&JYnH&$~mP*4?XBI!?fSq>GvoO8s2Mo=E0yqlZCUd2|u&o#;I!AAFSVvT>`T1zFH z_|v5ZqCbC7OYRe5#*|dva6)Wu1N2USCHmQq;9Z@Bo>#kZxRcz4yADZC!_?OO6|{?~ zqBxKwpB-RuCP$~F@gOTk$CCr9uv#Q|Lg>sS_C_jm)An_0jVFcI$!2P*2x7(B#U-n$ zu+ZguRw~!S;Ro4YrLQ9pe>r6rVKIB969f)OLL|6~5qEMpDv|4V_fy@|y;*D6rvq}| zM0*O@V##@f{s{39v-T57*-;Wn6&jSwYf;~q;h`IUmu?W}^Im@2(CY?9+$}PZE)r|M zU(;Bu*mlpiO4_K{&j#MnXJkHaX^`xa%?EpYv1oUaobK=4gkom<%=AQgZ(F(W-%W-8 z-C09!@_MG86tH2>0lEXw2Mchojr30mJ zTRcwL{9c_DictG)?Pp7GJQjSMYg-Hq=wA3wu#h3>O=*XijzQW{3Df@V&?;UuhwjF1 zy59l@t8v;oa2`>#~wTs!z#lIx8$YsnwGfxhXTwHw<%h~Y*S%~Ejn zVgMMu_fbpbS}j?A&~pO)0{Fjjlc#>90XVLbU5}l=p~%d&z#)GS2T2jmAYgZ7XYAs8 z_9sG2V^8wIp~_GlH-h7Muy1?htv9i=0AhEuTZ3jPw}Uph+{nl7iEfwNWsE14fbJZ= zCt&zCmWu6sjY*x6z}s%rlv>o{VG~0=*RQ`vKPiH!ltHM2&qz+v!^cM zwbhbMbS<(mP}zoZ@cQ)hG>^gd7X*!+WQj%c{Ezg=LO_Y~bS*U5k3Fb}nuplNEag46 ze7I?#TU~D3#Z$%G0JH9cS9V<{!)6ZJq?40|oK|lu1s^ish|0?M`0P=7pTR-0JbW*B z1n}B?if2{4IO;aNEll!pMtRx0G7oMoLtl+681(@Gg055eflZ-2Qpyru@7|g%zCu-S zf&Ofuo;hN__5UyrdF9tjx<$s74^LWJ8W&ZP6nEd1_#NLu(l(<<>-LWF^kv!f4MU`( z_~~$ky8YHz_@pA?_8sd;{#9;-L9Ohla?Wtv+qAhOQY*z~%md8)y!g3M^Eqs*B&9Qd zy4-yG7D3M63AiFX5d;|IHVN)-Au)kf>b?zpgdy98eZA7}?t5|%LC{M{yQt;~yV+<^PUwufDRkt_XNaoRHhh zxnp5}k*sFc*0Z7ZNh7-h*N(XZpA39xi?i4vh&}4JB zJ|blICjBQvHcz#WbYZxupKRTcMl7#o*dsNnIutVoR(Of^ymF;GUA+kK;c`dabfsU% zrSYQ`w3*G?AjJDtOhMB6M6+6q62Q`!_oX*rqVFDA2LZTmze8_tby^8y{=6Wh0a zRvev?bcM0ca->HC{ix7EsD_1Bk=L|PYuG|XhzDc@`SaopA5)~Hcg7j+)UOnq5+2n9 z!*tD;=KiLs!enHIfz+$6nFAV3n!0(FLlC-iB~A)vl7mu4zY2|Om`84#hcSRxhOdMo z;qi|OBfMU>pK!39@R+(Aw!i(dbE&(8YnrL??@cj#JFWUKG(H>uP2_~lQLML!@7DTo3rn&6h=rLyu}H(1n+8cR$J#DL#+m|AI~8H5)D&OBZ!Y-q?ao)h_RG= zDwSTYo6tuQ@?3E1KHby`c%hJq%}S5VvAvn1bYJ*=OzkZ4K`y^;2**a_H;zo3B(~vN z9toqQ@@YrljaiGs1$=kY0e*@z!0fE9mbXs7Z@Av?8?8Fopwsomev7IIR|=m>d9Z4v z`;DPaAmnT6ehzzo+|6JAYA;V4YRz1hOF?4Kzz?nMv%>mj$4Si9Uay_n_ig-I9FtEj z%$OM_{=l!YQ@GmVsTe8;8Mq%y0hvf?+YgIKSy-hvGx^3r!SQX+XyOaL*um=hSlG2l ziRc8r$oI1k=in~skD0fdJVgBj4%>v_0gK+P4aqjxJSR#4Lhloml;CVwl4Q%D6mg+# zMT+O3Lt0m0C{u^)oC7tQ6oV8~V>^ixp`NKPCD=M2uG&x6+ZJlUZ_@spEdQBDRI2Pp z=b&&w$0N4Vd_2A;7GjeK1w890`avz1plS zM{_v{UJTV8-&>}nMtmw|0Bt*ovyT5&W`XV&Qgw^j_xxp%#>ac>x;z!q^Bs?G2(>~r z>OS@S-W=Y0?=$ztuiHne$| zEIF)nq<%x5K7QyL@;NgOuS73)<|>Tp0Nr1LUEy`Q4lHI^B208L}c0hbwKtASM_UcYM^R zQhM;>LL?;(pgQlS7jlHA!rxOcoEmW-!AJE|3#~?JzIZR%3JUdC8 zBY8z`G>bLS+}bj6;GJ_Vg`)`5^{0c~?6qwX3}hoi75H!v5o1A5%s<^Y`(A{=%DLOQ zClE@JQKPfQk8F4S70xoI%8zQDGKOuaG0LY{0TobdOVPKn{Y~zg#WBDj*w)sg= zikiIIou&TSq>Ks?8VMT1^}LULvq_lc&IqA_`%2lve1Zc3Vvacz1{cATXTO}6ovC1* zS1+CBje&_FFGY2Tp%gx;S$v2YK)c-G;H51g<_fLO4+~*#>)++{a`YwcMcfK>(4~riMrch{?b0Fp zR|;Irnv7S&7VS!AugA#Ac3kV$!g|A5IT>y@ii; zQm@21kPs*{#BqVM3I6Ama9VvTVQUB3jL1xq0tEq%;clS!sHl(X0zvK01aZ=e-Q!lZ zg;6+UpF?!fTiA>BGxG~y7aiwD89f}~ShWL{7-5z0;+)Hvk186-@F7G>qzqnBMg z+NclQMQhQ&pOmBIA$CS#?mamh=P|&dwu*Z<7ak&USEdkQ^kUr)_7vxFum;cde7VDU z#C7U8G4W8pN10^K;`D^QX_U)ua%$kcBEJn~a2tzcK7LztuybjxfbI`0O%$;eRy&;( zL^XRTO4r)}3p?QoN6dMpJU;ajCzS*J9aje{Kxff!XK#V}x&M=Iv#ux_iaqp{!6N2K z%)omh(r#|V+?ooRSH=*D>>sB;G&P@nH_RN}_aNB^B|Oh9sa)(p&24VjJFc5VLT|`5 z=T~H30i`yz{Kk^6bDE%uQHDaWucSQKL+PWOEFGt*h6hB(LVYRW$aK%-_ zK1V@w)3r@G1yW#>ed4E3$3%!Hi7J3pCNe`xzT^IzH8-3XtCy zeUn2q_EZ-gFOtk4#^tu#zRA^=qlVKH%rQ+u!uaI+#lCH_7y;q48(&c$8+M=eED6Va zl{X9wxNp>ymo{&)5o5!>Ya3ai!MNOnw3|#+J05`~iJu7{{Rx^lBDQwb0EnLr#Y8-FNr~$<^wu z@pC23=O0}SEI`f0#277sLiQH9dKs>0`JNB(ukd-u#ZI_-@lPe6j=qKQ4r8QJq#44tWNNsrgQ?!X(n z5>Tw3i9k;18^seVI+WU3(MS2g$6DQzdXe0;a2_U-&dtXp_-bXj`|W?u4hlgw=g_BQ zqzpPNvah*UowS}?iC)nPsAb4`3UJIN3u6|)%a`(4)-z=o^Vs%_&2Y@!eiW{UmS*UN z*OFdYf(=zxf{+f-)$dIM{FXE#HpBKC2BhF|zVWqNg~M+vi1_?4>X^8}1hxu)*8Hn4 z=epke!r&-~l9B)T58`x9ikr`&Onr9Fn>Le3_afM$HZY5tz0cOpP=d)&nXdM=6NAMh zuzI-8HC^t~g{KS;j2gfoyUP)&^}{Z*Ur;5l!O7i&ZLy4u_`S8Ntoe}pI6SP{lcl~1 zb4+A@8#%enC&j85zk0Nzv_6Ug^>I|pp$_lz$2_dX!1FBu1>``?qyy1Y3z^e7w`?Bd znq*^JT@I)r_OMcW@}1B>|CX<`Wg+uSss>f@Ko=Zvhkj)Uz(dYlu?jQ*P_4U_cIS3d zkWNpLf2VM3{X|kV=E?rhg)1`k_jB6Z_k%9+wd!XDE**ILu7(L}_o?7s z_G$6L9lVE>bY`f}(A0cB+tB6KdZyE))+74Fypp-C9xUs^qq+}2LNDk?kb*Kea-Ru- zGzaVJ+9HokFgq5#!iG;zjG=lkJrPj9)<`t`WV0!z3ul@FW?-rrvU-@$4EW zIJ=4SX@5K?tnXXn-jr_*z^e{ale&U~nV7w%gkxdF;l1HcYLL2Xtp@Z`Kx)QrJBo28 zc}ma8p{jDRZ+D+*=D@hAQ;>&L<*6aNYH)T0(TVz1*PBuf?N%LUqTe_)@{4^dis&yk z=%7c=k@hldl@y&0GM-%;D2x~Ea{-T%#SP^L7Hw}q6qXZT()*K4PZ!~Zgv%u&A6-Na zk1JN?`DeVHzF41-D7Cj}qM#@HwNZ@PTc2G+CttAVfC}{~I6tkjbdcr|Rm*r#gy&Y4 zEUS}7k4Ktp3`pBKRt@{X#aLBwn4YxA^NT#^rsUI)?EfK4F4g8xiVe z>(Uev#QeFOAD`oBTgBXT9&K+Ny;XM5A@K5mxiaXowg<7*YA<)q=c`?@x>a> zk7zxQvD2uVsm{L^Cy8O_@@G^bf-vXcC*dJQ@u4x-qoA+2Oxm#-)imqSV(4m@ulZ$y zG~=;M=++y?%ls`i*-g78zP2#@dTVMo!V*ytpmLl`BS*bLqTNKgo7BYrX(3U|+HH|~ zag)&6>@fTrn>c{+oMHbn3yCa>RN6v!2KDR^qT*BYQN$TQwW3aXAb$EqFb;F^RlN|; z#vM`0OZ!s=A6I+86AKJtqHKF1c^tV&&dRbep2WxRXjFN&Swz0fNa{{3%^=@1N^OG= zku}k%e zB*Vo3BgQz{ti`UlGvj4P5Pzw|@Pj4Q_(A%s_ar5V{SE`V)BNLRY73i5QtTfXOxUTEqrUdm zm=`IBK=b$DR$x@C$MJw$=el-%4CXYTl9;6EvZ5t6{hOIf6VByhSZ7CbL0_M~tMMus zf9g*4m$!^u#QeU6g&9Y>u@LO|KBOB$5X(qCjf)L>`RY}O9bx!Zyv!15=w1) WbNii$x<|(&hVmN?g(^9V(EkS-GE+?e literal 0 HcmV?d00001 diff --git a/src/commands/NotionCommands.ts b/src/commands/NotionCommands.ts index 337e00e..dcfb90b 100644 --- a/src/commands/NotionCommands.ts +++ b/src/commands/NotionCommands.ts @@ -16,27 +16,10 @@ interface Command { export default class RibbonCommands { plugin: ObsidianSyncNotionPlugin; - Ncommand: Command[] = []; - async ribbonDisplay() { - const NcommandList: DatabaseList[] = []; - this.Ncommand.map(command => NcommandList.push( - { - name:command.name, - match: command.editorCallback - } - ) - ); - - const fusg = new FuzzySuggester(this.plugin); - - fusg.setSuggesterData(NcommandList); - await fusg.display(async (results) => {await results.match()}) - }; - - constructor(plugin: ObsidianSyncNotionPlugin) { - this.plugin = plugin; + constructor(plugin: ObsidianSyncNotionPlugin) { + this.plugin = plugin; // Check if NextButton is true, then include the corresponding command if (this.plugin.settings.NextButton) { @@ -60,16 +43,68 @@ export default class RibbonCommands { }); } - // Register all the commands - this.Ncommand.forEach(command => { - this.plugin.addCommand( - { - id: command.id, - name: command.name, - editorCallback: command.editorCallback, - } - ); - }); - } + // Register all the commands + this.Ncommand.forEach(command => { + this.plugin.addCommand( + { + id: command.id, + name: command.name, + editorCallback: command.editorCallback, + } + ); + }); + } + async ribbonDisplay() { + const NcommandList: DatabaseList[] = []; + + this.Ncommand.map(command => NcommandList.push( + { + name:command.name, + match: command.editorCallback + } + ) + ); + + const fusg = new FuzzySuggester(this.plugin); + + fusg.setSuggesterData(NcommandList); + await fusg.display(async (results) => {await results.match()}) + }; + + // if the setting has been changed, try to rebuild the command list + async updateCommand() { + + this.Ncommand = []; + + if (this.plugin.settings.NextButton) { + this.Ncommand.push({ + id: "share-to-notionnext", + name: i18nConfig.CommandName, // Use the translated text from i18nConfig + editorCallback: async (editor: Editor, view: MarkdownView) => { + await uploadCommandNext(this.plugin, this.plugin.settings, this.plugin.app); + } + }); + } + + if (this.plugin.settings.GeneralButton) { + this.Ncommand.push({ + id: "share-to-notion", + name: i18nConfig.CommandNameGeneral, // Use the translated text from i18nConfig + editorCallback: async (editor: Editor, view: MarkdownView) => { + await uploadCommandGeneral(this.plugin, this.plugin.settings, this.plugin.app); + } + }); + } + + this.Ncommand.forEach(command => { + this.plugin.addCommand( + { + id: command.id, + name: command.name, + editorCallback: command.editorCallback, + } + ); + }); + } } diff --git a/src/lang/I18n.ts b/src/lang/I18n.ts index d270f32..e50e0c3 100644 --- a/src/lang/I18n.ts +++ b/src/lang/I18n.ts @@ -16,12 +16,12 @@ export const I18n: { [key: string]: any } = { DatabaseIDText: "Enter your Database ID", BannerUrl: "Banner url(optional)", BannerUrlDesc: - "page banner url(optional), default is empty, if you want to show a banner, please enter the url(like: https://minioapi.pjx.ac.cn/img1/2023/11/b7b40a0724e93b7d7ab494bb3b8a2da8.png)", + "Default is empty, if you want to show a banner, please enter the url(like: https://minioapi.pjx.ac.cn/img1/2023/11/b7b40a0724e93b7d7ab494bb3b8a2da8.png)", BannerUrlText: "Enter your banner url", NotionUser: "Notion ID(username, optional)", NotionUserDesc: "Your notion ID (optional),share link likes:https://username.notion.site/,your notion id is [username]", - NotionUserText: "Enter your notion ID (options)", + NotionUserText: "Enter your notion ID", NotionGeneralSettingHeader: "General Notion Database Settings", NotionGeneralButton: "Notion General command switch", NotionGeneralButtonDesc: "Open this option, Sync to Notion General Database command will be displayed in the command palette", @@ -63,12 +63,12 @@ export const I18n: { [key: string]: any } = { DatabaseIDText: "输入你的数据库 ID", BannerUrl: "封面图片地址（可选）", BannerUrlDesc: - "页面封面图片地址（可选），默认为空，如果你想显示封面图片，请输入图片地址（例如：https://minioapi.pjx.ac.cn/img1/2023/11/b7b40a0724e93b7d7ab494bb3b8a2da8.png）", + "默认为空，如果你想显示封面图片，请输入图片地址（例如：https://minioapi.pjx.ac.cn/img1/2023/11/b7b40a0724e93b7d7ab494bb3b8a2da8.png）", BannerUrlText: "输入你的封面图片地址", NotionUser: "Notion ID（用户名，可选）", NotionUserDesc: "你的 Notion ID（可选），分享链接类似：https://username.notion.site/，你的 Notion ID 是 [username]", - NotionUserText: "输入你的 Notion ID（可选）", + NotionUserText: "输入你的 Notion ID", NotionGeneralSettingHeader: "普通 Notion 数据库设置", NotionGeneralButton: "普通数据库同步命令开关", NotionGeneralButtonDesc: "打开此选项，同步到普通数据库命令将显示在命令面板中", diff --git a/src/ui/settingTabs.ts b/src/ui/settingTabs.ts index 3addb38..6fb5c3c 100644 --- a/src/ui/settingTabs.ts +++ b/src/ui/settingTabs.ts @@ -48,18 +48,6 @@ export class ObsidianSettingTab extends PluginSettingTab { containerEl.createEl('h2', {text: i18nConfig.GeneralSetting}) - new Setting(containerEl) - .setName(i18nConfig.NotionNextButton) - .setDesc(i18nConfig.NotionNextButtonDesc) - .addToggle((toggle) => - toggle - .setValue(this.plugin.settings.NextButton) - .onChange(async (value) => { - this.plugin.settings.NextButton = value; - await this.plugin.saveSettings(); - }) - ); - new Setting(containerEl) .setName(i18nConfig.BannerUrl) .setDesc(i18nConfig.BannerUrlDesc) @@ -89,6 +77,19 @@ export class ObsidianSettingTab extends PluginSettingTab { containerEl.createEl('h2', {text: i18nConfig.NotionNextSettingHeader}) + new Setting(containerEl) + .setName(i18nConfig.NotionNextButton) + .setDesc(i18nConfig.NotionNextButtonDesc) + .addToggle((toggle) => + toggle + .setValue(this.plugin.settings.NextButton) + .onChange(async (value) => { + this.plugin.settings.NextButton = value; + await this.plugin.saveSettings(); + await this.plugin.commands.updateCommand(); + }) + ); + new Setting(containerEl) .setName(i18nConfig.NotionAPI) .setDesc(i18nConfig.NotionAPIDesc) @@ -136,6 +137,7 @@ export class ObsidianSettingTab extends PluginSettingTab { .onChange(async (value) => { this.plugin.settings.GeneralButton = value; await this.plugin.saveSettings(); + await this.plugin.commands.updateCommand(); }) ); @@ -182,18 +184,18 @@ export class ObsidianSettingTab extends PluginSettingTab { // Custom Database Settings - containerEl.createEl('h2', {text: i18nConfig.NotionCustomSettingHeader}); - - new Setting(containerEl) - .setName(i18nConfig.NotionCustomButton) - .setDesc(i18nConfig.NotionCustomButtonDesc) - .addToggle((toggle) => - toggle - .setValue(this.plugin.settings.CustomButton) - .onChange(async (value) => { - this.plugin.settings.CustomButton = value; - await this.plugin.saveSettings(); - }) - ); + // containerEl.createEl('h2', {text: i18nConfig.NotionCustomSettingHeader}); + // + // new Setting(containerEl) + // .setName(i18nConfig.NotionCustomButton) + // .setDesc(i18nConfig.NotionCustomButtonDesc) + // .addToggle((toggle) => + // toggle + // .setValue(this.plugin.settings.CustomButton) + // .onChange(async (value) => { + // this.plugin.settings.CustomButton = value; + // await this.plugin.saveSettings(); + // }) + // ); } }