Oak-Team
/
oak-frontend-base
13
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases 37 Wiki Activity

Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-frontend-base into dev

This commit is contained in:
Xu Chang 2024-03-02 09:09:56 +08:00
parent 514c0ca0f6 e3c3f2417a
commit 85066643f6
48 changed files with 1071 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
es/components/errorPage/assets/svg/assets-result-403.svg Normal file
View File

@ -0,0 +1,32 @@
<svg width="200" height="140" viewBox="0 0 200 140" fill="none" xmlns="http://www.w3.org/2000/svg">
<g mask="url(#mask0_17_619)">
<path d="M30 62H118V122H30V62Z" fill="#97A3B7" />
<g filter="url(#filter0_f_17_619)">
<rect x="12" y="84" width="80" height="60" fill="#E3E6EB" />
</g>
<g filter="url(#filter1_f_17_619)">
<rect x="80" y="54" width="80" height="60" fill="#E3E6EB" />
</g>
<rect x="46" y="105" width="32" height="2" fill="white" />
<rect x="46" y="98" width="32" height="2" fill="white" />
<rect x="46" y="88" width="16" height="2" fill="white" />
</g>
<path opacity="0.9" d="M63 20H151V30H63V20Z" fill="currentcolor" />
<mask id="mask1_17_619" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="63" y="30" width="88" height="50">
<path d="M63 30H151V80H63V30Z" fill="currentcolor" />
</mask>
<g mask="url(#mask1_17_619)">
<path d="M63 30H151V80H63V30Z" fill="currentcolor" />
<g opacity="0.3" filter="url(#filter2_f_17_619)">
<path d="M30 62H118V122H30V62Z" fill="#97A3B7" />
</g>
</g>
<path fill-rule="evenodd" clip-rule="evenodd"
d="M95.6863 40.8577L105.964 51.1345C106.295 51.0466 106.642 50.9998 107 50.9998C109.213 50.9998 111 52.7865 111 54.9998C111 55.3574 110.953 55.7038 110.866 56.0333L121.142 66.3135L118.314 69.1419L113.716 64.5448C111.653 65.423 109.384 65.9089 107 65.9089C99.7273 65.9089 93.5164 61.3853 91 54.9998C92.1785 52.0093 94.1673 49.4271 96.6961 47.5268L92.8579 43.6861L95.6863 40.8577ZM99 54.9998C99 59.4158 102.584 62.9998 107 62.9998C108.483 62.9998 109.872 62.5957 111.063 61.8917L108.034 58.8657C107.704 58.9532 107.358 58.9998 107 58.9998C104.787 58.9998 103 57.2131 103 54.9998C103 54.6423 103.047 54.2958 103.134 53.9663L100.107 50.9389C99.4037 52.1295 99 53.5178 99 54.9998ZM107 44.0907C114.273 44.0907 120.484 48.6143 123 54.9998C122.071 57.3574 120.638 59.4612 118.834 61.1773L114.729 57.0717C114.906 56.4108 115 55.7162 115 54.9998C115 50.5838 111.416 46.9998 107 46.9998C106.284 46.9998 105.589 47.0941 104.928 47.2711L102.378 44.7205C103.848 44.3101 105.398 44.0907 107 44.0907Z"
fill="white" />
<rect x="68" y="24" width="2" height="2" fill="white" />
<rect x="74" y="24" width="2" height="2" fill="white" />
<rect x="80" y="24" width="66" height="2" fill="white" />
<path d="M157 53.9998L181.249 95.9998H132.751L157 53.9998Z" fill="white" stroke="black" />
<path d="M157 88.9998L157 70.9998" stroke="black" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

36
es/components/errorPage/assets/svg/assets-result-404.svg Normal file
View File

@ -0,0 +1,36 @@
<svg width="200" height="140" viewBox="0 0 200 140" fill="none" xmlns="http://www.w3.org/2000/svg">
<g mask="url(#mask0_16559_24301)">
<path d="M30 62H118V122H30V62Z" fill="#97A3B7" />
<g filter="url(#filter0_f_16559_24301)">
<rect x="12" y="84" width="80" height="60" fill="#E3E6EB" />
</g>
<g filter="url(#filter1_f_16559_24301)">
<rect x="80" y="54" width="80" height="60" fill="#E3E6EB" />
</g>
<path d="M49 93L42 100L49 107" stroke="white" stroke-width="2" />
<path d="M69 107L76 100L69 93" stroke="white" stroke-width="2" />
<path d="M62.3647 87.4431L55.6355 112.557" stroke="white" stroke-width="2" />
</g>
<path opacity="0.9" d="M63 20H151V30H63V20Z" fill="currentcolor" />
<mask id="mask1_16559_24301" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="63" y="30" width="88" height="50">
<path d="M63 30H151V80H63V30Z" fill="currentcolor" />
</mask>
<g mask="url(#mask1_16559_24301)">
<path d="M63 30H151V80H63V30Z" fill="currentcolor" />
<g opacity="0.3" filter="url(#filter2_f_16559_24301)">
<path d="M30 62H118V122H30V62Z" fill="#97A3B7" />
</g>
</g>
<path fill-rule="evenodd" clip-rule="evenodd"
d="M105.25 41C112.015 41 117.5 46.4845 117.5 53.25C117.5 55.6827 116.791 57.9498 115.568 59.8558L121 65.2877L117.288 69L111.856 63.5681C109.95 64.7909 107.683 65.5 105.25 65.5C98.4845 65.5 93 60.0155 93 53.25C93 46.4845 98.4845 41 105.25 41ZM105.25 44.5C100.418 44.5 96.5 48.4175 96.5 53.25C96.5 58.0825 100.418 62 105.25 62C110.082 62 114 58.0825 114 53.25C114 48.4175 110.082 44.5 105.25 44.5Z"
fill="white" />
<rect x="68" y="24" width="2" height="2" fill="white" />
<rect x="74" y="24" width="2" height="2" fill="white" />
<rect x="80" y="24" width="66" height="2" fill="white" />
<path fill-rule="evenodd" clip-rule="evenodd"
d="M153 56C140.85 56 131 65.8497 131 78C131 82.6039 132.414 86.8776 134.832 90.4102L127 98.5L139.495 95.3681C143.222 98.2709 147.909 100 153 100C165.15 100 175 90.1503 175 78C175 65.8497 165.15 56 153 56Z"
fill="white" />
<path
d="M131 78L131.5 78V78L131 78ZM134.832 90.4102L135.191 90.758L135.475 90.4647L135.245 90.1278L134.832 90.4102ZM127 98.5L126.641 98.1522L125.422 99.411L127.122 98.985L127 98.5ZM139.495 95.3681L139.802 94.9736L139.61 94.8238L139.373 94.8831L139.495 95.3681ZM153 100L153 100.5L153 100.5L153 100ZM175 78L174.5 78L174.5 78L175 78ZM131.5 78C131.5 66.1259 141.126 56.5 153 56.5V55.5C140.574 55.5 130.5 65.5736 130.5 78L131.5 78ZM135.245 90.1278C132.882 86.6757 131.5 82.5 131.5 78H130.5C130.5 82.7079 131.946 87.0794 134.419 90.6926L135.245 90.1278ZM134.473 90.0624L126.641 98.1522L127.359 98.8478L135.191 90.758L134.473 90.0624ZM127.122 98.985L139.616 95.8531L139.373 94.8831L126.878 98.015L127.122 98.985ZM153 99.5C148.024 99.5 143.445 97.8105 139.802 94.9736L139.187 95.7626C143 98.7314 147.794 100.5 153 100.5V99.5ZM174.5 78C174.5 89.8741 164.874 99.5 153 99.5L153 100.5C165.426 100.5 175.5 90.4264 175.5 78L174.5 78ZM153 56.5C164.874 56.5 174.5 66.1259 174.5 78H175.5C175.5 65.5736 165.426 55.5 153 55.5V56.5Z"
fill="black" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

32
es/components/errorPage/assets/svg/assets-result-500.svg Normal file
View File

@ -0,0 +1,32 @@
<svg width="200" height="140" viewBox="0 0 200 140" fill="none" xmlns="http://www.w3.org/2000/svg">
<g mask="url(#mask0_16559_24251)">
<path d="M68 48L106.105 70V114L68 136L29.8949 114V70L68 48Z" fill="#97A3B7" />
<g filter="url(#filter0_f_16559_24251)">
<rect x="46.3911" y="92" width="80" height="60" fill="#E3E6EB" />
</g>
<g filter="url(#filter1_f_16559_24251)">
<rect y="23" width="80" height="60" fill="#E3E6EB" />
</g>
</g>
<mask id="mask1_16559_24251" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="80" y="9" width="78" height="88">
<path d="M119 9L157.105 31V75L119 97L80.8949 75V31L119 9Z" fill="currentcolor" />
</mask>
<g mask="url(#mask1_16559_24251)">
<path fill-rule="evenodd" clip-rule="evenodd" d="M80.895 31V75L119 97L157.105 75V31L119 53L80.895 31Z"
fill="currentcolor" />
<path opacity="0.9" d="M119 -35L157.105 -13L157.105 31.5L119 53.5L80.8952 31.5L80.895 -13L119 -35Z"
fill="currentcolor" />
<g opacity="0.3" filter="url(#filter2_f_16559_24251)">
<path d="M68 48L106.105 70V114L68 136L29.8949 114V70L68 48Z" fill="#97A3B7" />
</g>
</g>
<path
d="M143 68.822L147.867 85.875L148 86.3405L148.469 86.2228L165.671 81.911L153.336 94.6522L152.999 95L153.336 95.3478L165.671 108.089L148.469 103.777L148 103.659L147.867 104.125L143 121.178L138.133 104.125L138 103.659L137.531 103.777L120.329 108.089L132.664 95.3478L133.001 95L132.664 94.6522L120.329 81.911L137.531 86.2228L138 86.3405L138.133 85.875L143 68.822Z"
fill="white" stroke="black" />
<path fill-rule="evenodd" clip-rule="evenodd"
d="M123.243 35.0821L126.071 33.4493L123.243 31.8164L120.414 33.4493L123.243 35.0821ZM119 32.6329L121.828 31L114.757 26.9179L111.929 28.5507L119 32.6329ZM127.485 35.8986C122.806 38.6001 115.194 38.6001 110.515 35.8986C105.835 33.197 105.835 28.803 110.515 26.1014C115.194 23.3999 122.806 23.3999 127.485 26.1014C132.165 28.803 132.165 33.197 127.485 35.8986ZM107.686 24.4686C101.438 28.0756 101.438 33.9244 107.686 37.5314C113.934 41.1384 124.066 41.1384 130.314 37.5314C136.562 33.9244 136.562 28.0756 130.314 24.4686C124.066 20.8616 113.934 20.8616 107.686 24.4686Z"
fill="white" />
<path fill-rule="evenodd" clip-rule="evenodd"
d="M41.8989 86.2863L44.7272 87.9193L44.7275 94.4512L41.8992 92.8181L41.8989 86.2863ZM53.9194 93.2269L56.7477 94.86L56.7479 101.392L53.9196 99.7587L53.9194 93.2269ZM44.7281 107.515L41.8999 105.882L41.9 109.148L44.7283 110.781L44.7282 107.515L53.92 112.822L53.9201 116.088L56.7484 117.721L56.7483 114.455L53.9201 112.822L53.92 109.556L44.728 104.249L44.7281 107.515Z"
fill="white" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

33
es/components/errorPage/assets/svg/assets-result-browser-incompatible.svg Normal file
View File

@ -0,0 +1,33 @@
<svg width="200" height="140" viewBox="0 0 200 140" fill="none" xmlns="http://www.w3.org/2000/svg">
<g mask="url(#mask0_22_990)">
<path fill-rule="evenodd" clip-rule="evenodd"
d="M144.569 105.61L96.5692 133.322L48.5693 105.61V83.7121L96.569 55.9995L144.569 83.7122V105.61Z"
fill="#97A3B7" />
<g filter="url(#filter0_f_22_990)">
<rect x="-3" y="33.9995" width="80" height="60" fill="#E3E6EB" />
</g>
<g filter="url(#filter1_f_22_990)">
<rect x="97" y="97.9995" width="80" height="60" fill="#E3E6EB" />
</g>
</g>
<mask id="mask1_22_990" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="53" y="16" width="86" height="69">
<path fill-rule="evenodd" clip-rule="evenodd"
d="M113.357 42.715L129.829 33.2059C128.859 32.4995 127.789 31.823 126.643 31.1615C121.268 28.0584 114.723 26.0153 107.758 25.023C103.549 19.4606 97.5775 16.1248 90.4344 16.1945C83.6788 16.2821 74.9482 21.9412 68.9271 30.5602C68.096 30.975 67.2847 31.4099 66.4949 31.8659C52.1168 40.1664 49.5542 52.6155 59.0218 61.9309C57.9871 56.1259 58.712 51.0657 62.1231 45.7161C62.0653 46.3482 61.9127 50.143 61.8906 50.7834C61.2209 69.6969 76.9107 84.8409 88.03 84.7113C96.4806 84.6119 103.595 79.6976 108.349 72.0797C114.563 70.8487 120.438 68.786 125.443 65.8968C138.919 58.1167 142.01 46.7146 134.547 37.629L117.948 47.2113C119.71 50.8655 117.997 55.034 112.87 57.9936C107.744 60.9532 100.523 61.9424 94.1928 60.9252C91.3499 60.4563 88.6706 59.5834 86.4524 58.3029L86.4042 58.275L113.357 42.715ZM78.6546 53.7727C72.5285 49.7965 72.9717 43.5469 79.8498 39.5762C86.7276 35.6056 97.5532 35.3496 104.441 38.8864L78.6546 53.7727ZM93.5561 18.1703C98.1657 18.1302 102.284 20.5752 105.496 24.7401C97.0486 23.8219 88.1122 24.4143 79.9732 26.5054C83.672 21.3809 88.444 18.2301 93.5561 18.1703ZM91.3238 81.6169C85.471 81.685 80.3525 77.691 76.9473 71.2848C85.7921 73.6267 95.8719 74.0599 105.374 72.6022C101.618 78.1222 96.6601 81.5531 91.3238 81.6169Z"
fill="currentcolor" />
</mask>
<g mask="url(#mask1_22_990)">
<path fill-rule="evenodd" clip-rule="evenodd"
d="M113.357 42.715L129.829 33.2059C128.859 32.4995 127.789 31.823 126.643 31.1615C121.268 28.0584 114.723 26.0153 107.758 25.023C103.549 19.4606 97.5775 16.1248 90.4344 16.1945C83.6788 16.2821 74.9482 21.9412 68.9271 30.5602C68.096 30.975 67.2847 31.4099 66.4949 31.8659C52.1168 40.1664 49.5542 52.6155 59.0218 61.9309C57.9871 56.1259 58.712 51.0657 62.1231 45.7161C62.0653 46.3482 61.9127 50.143 61.8906 50.7834C61.2209 69.6969 76.9107 84.8409 88.03 84.7113C96.4806 84.6119 103.595 79.6976 108.349 72.0797C114.563 70.8487 120.438 68.786 125.443 65.8968C138.919 58.1167 142.01 46.7146 134.547 37.629L117.948 47.2113C119.71 50.8655 117.997 55.034 112.87 57.9936C107.744 60.9532 100.523 61.9424 94.1928 60.9252C91.3499 60.4563 88.6706 59.5834 86.4524 58.3029L86.4042 58.275L113.357 42.715ZM78.6546 53.7727C72.5285 49.7965 72.9717 43.5469 79.8498 39.5762C86.7276 35.6056 97.5532 35.3496 104.441 38.8864L78.6546 53.7727ZM93.5561 18.1703C98.1657 18.1302 102.284 20.5752 105.496 24.7401C97.0486 23.8219 88.1122 24.4143 79.9732 26.5054C83.672 21.3809 88.444 18.2301 93.5561 18.1703ZM91.3238 81.6169C85.471 81.685 80.3525 77.691 76.9473 71.2848C85.7921 73.6267 95.8719 74.0599 105.374 72.6022C101.618 78.1222 96.6601 81.5531 91.3238 81.6169Z"
fill="currentcolor" />
<g opacity="0.3" filter="url(#filter2_f_22_990)">
<path d="M96.569 55.9995L144.569 83.7122V139.138L96.569 166.85L48.5692 139.138V83.7122L96.569 55.9995Z"
fill="#97A3B7" />
</g>
</g>
<ellipse cx="155" cy="78" rx="22" ry="22" transform="rotate(180 155 78)" fill="white" stroke="black" />
<path d="M155 83L155 65" stroke="black" />
<rect x="155" y="87" width="0.00390625" height="0.00390625" fill="#C4C4C4" stroke="black" stroke-width="2"
stroke-linejoin="round" />
<path d="M96.5693 112L96.5693 87.9995" stroke="white" stroke-width="2" />
<path d="M86.5693 97.9995L96.5693 87.9995L106.569 97.9995" stroke="white" stroke-width="2" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.9 KiB

49
es/components/errorPage/assets/svg/assets-result-maintenance.svg Normal file
View File

@ -0,0 +1,49 @@
<svg width="200" height="140" viewBox="0 0 200 140" fill="none" xmlns="http://www.w3.org/2000/svg">
<mask id="mask0_216_313" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="80" y="9" width="78" height="88">
<path d="M119 9L157.105 31V75L119 97L80.8949 75V31L119 9Z" fill="currentColor"/>
</mask>
<g mask="url(#mask0_216_313)">
<path d="M119 9L157.105 31V75L119 97L80.8949 75V31L119 9Z" fill="currentColor"/>
<path opacity="0.9" d="M119 -35L157.105 -13V31L119 53L80.8949 31V-13L119 -35Z" fill="currentColor" />
<g opacity="0.3" filter="url(#filter0_f_216_313)">
<path d="M68 48L106.105 70V114L68 136L29.8949 114V70L68 48Z" fill="#97A3B7"/>
</g>
</g>
<mask id="mask1_216_313" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="29" y="48" width="78" height="88">
<path d="M68 48L106.105 70V114L68 136L29.8949 114V70L68 48Z" fill="#97A3B7"/>
</mask>
<g mask="url(#mask1_216_313)">
<path d="M68 48L106.105 70V114L68 136L29.8949 114V70L68 48Z" fill="#97A3B7"/>
<g filter="url(#filter1_f_216_313)">
<rect x="46.3906" y="92" width="80" height="60" fill="#E3E6EB"/>
</g>
<g filter="url(#filter2_f_216_313)">
<rect y="23" width="80" height="60" fill="#E3E6EB"/>
</g>
</g>
<path d="M41.8984 86.2866L44.7267 87.9197L44.727 94.4515L41.8987 92.8185L41.8984 86.2866Z" fill="white"/>
<path d="M53.9189 93.2273L56.7472 94.8603L56.7474 101.392L53.9191 99.7591L53.9189 93.2273Z" fill="white"/>
<path d="M44.7276 107.515L41.8994 105.882L41.8995 109.148L44.7278 110.781L44.7276 107.515L53.9195 112.823L53.9196 116.088L56.7479 117.721L56.7478 114.455L53.9195 112.823L53.9195 109.557L44.7275 104.249L44.7276 107.515Z" fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M108.348 23.4792C106.188 25.9904 106.535 29.3829 109.395 31.5604C112.66 34.0461 117.963 34.007 121.24 31.4731C124.516 28.9392 124.526 24.8699 121.261 22.3841C118.401 20.2066 113.977 19.9666 110.721 21.6439L115.923 25.6047L113.55 27.4399L108.348 23.4792Z" fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M120.865 33.0087L129.83 39.8346L132.203 37.9994L123.238 31.1735C122.917 31.521 122.554 31.8531 122.149 32.1657C121.745 32.4784 121.315 32.7594 120.865 33.0087ZM119.662 32.0932C120.123 31.8557 120.561 31.5798 120.967 31.2655C121.373 30.9513 121.73 30.6134 122.035 30.2579L122.035 30.2579C121.73 30.6134 121.373 30.9513 120.967 31.2655C120.561 31.5798 120.123 31.8557 119.662 32.0931L119.662 32.0932Z" fill="white"/>
<path d="M144 70L168.249 112H119.751L144 70Z" fill="white" stroke="#181818"/>
<path d="M144 100L144 82" stroke="#181818"/>
<path d="M144 105H144.004V105.004H144V105Z" stroke="#181818" stroke-width="2" stroke-linejoin="round"/>
<defs>
<filter id="filter0_f_216_313" x="23.8949" y="42" width="88.2102" height="100" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
<feGaussianBlur stdDeviation="3" result="effect1_foregroundBlur_216_313"/>
</filter>
<filter id="filter1_f_216_313" x="-3.60938" y="42" width="180" height="160" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
<feGaussianBlur stdDeviation="25" result="effect1_foregroundBlur_216_313"/>
</filter>
<filter id="filter2_f_216_313" x="-50" y="-27" width="180" height="160" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
<feGaussianBlur stdDeviation="25" result="effect1_foregroundBlur_216_313"/>
</filter>
</defs>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.7 KiB

23
es/components/errorPage/assets/svg/assets-result-network-error.svg Normal file
View File

@ -0,0 +1,23 @@
<svg width="200" height="140" viewBox="0 0 200 140" fill="none" xmlns="http://www.w3.org/2000/svg">
<g mask="url(#mask0_21_716)">
<path fill-rule="evenodd" clip-rule="evenodd"
d="M33 46.843L96.3214 119L159.643 46.843C142.742 31.9998 120.583 23 96.3214 23C72.0601 23 49.9009 31.9998 33 46.843Z"
fill="#97A3B7" />
<g filter="url(#filter0_f_21_716)">
<rect x="95" y="21" width="80" height="60" fill="#E3E6EB" />
</g>
<g filter="url(#filter1_f_21_716)">
<rect x="-7" y="43" width="80" height="60" fill="#E3E6EB" />
</g>
</g>
<path
d="M72.8122 63.6882L69.6548 66.8455L75.9009 73.0916C71.2469 75.1648 66.9663 77.925 63.188 81.2433L96.3213 119L108.234 105.425L114.647 111.837L117.804 108.68L80.4504 71.3261C80.4505 71.3261 80.4503 71.3261 80.4504 71.3261L72.8122 63.6882Z"
fill="currentcolor" />
<path
d="M129.455 81.2433L114.137 98.6982L85.3974 69.9585C88.9142 69.1786 92.5697 68.7674 96.3213 68.7674C109.016 68.7674 120.611 73.4766 129.455 81.2433Z"
fill="currentcolor" />
<path
d="M152 21.822L156.867 38.875L157 39.3405L157.469 39.2228L174.671 34.911L162.336 47.6522L161.999 48L162.336 48.3478L174.671 61.089L157.469 56.7772L157 56.6595L156.867 57.125L152 74.178L147.133 57.125L147 56.6595L146.531 56.7772L129.329 61.089L141.664 48.3478L142.001 48L141.664 47.6522L129.329 34.911L146.531 39.2228L147 39.3405L147.133 38.875L152 21.822Z"
fill="white" stroke="black" />
<path d="M101 31L90 42L101 53L93 61" stroke="white" stroke-width="2" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

11
es/components/errorPage/index.d.ts vendored Normal file
View File

@ -0,0 +1,11 @@
import { ED } from '../../types/AbstractComponent';
import { ReactComponentProps } from '../../types/Page';
import { ECode } from '../../types/ErrorPage';
declare const _default: <ED2 extends ED, T2 extends keyof ED2>(props: ReactComponentProps<ED2, T2, false, {
code: ECode;
title?: string | undefined;
desc?: string | undefined;
children?: React.ReactNode;
icon?: React.ReactNode;
}>) => React.ReactElement;
export default _default;

69
es/components/errorPage/index.js Normal file
View File

@ -0,0 +1,69 @@
import { ECode } from '../../types/ErrorPage';
const DefaultErrorInfo = {
[ECode.forbidden]: {
title: '403 Forbidden',
desc: '抱歉，您无权限访问此页面。',
imagePath: './assets/svg/assets-result-403.svg',
},
[ECode.notFound]: {
title: '404 Not Found',
desc: '抱歉，您访问的页面不存在。',
imagePath: './assets/svg/assets-result-404.svg',
},
[ECode.error]: {
title: '500 Internal Server Error',
desc: '抱歉，服务器出错啦！',
imagePath: './assets/svg/assets-result-500.svg',
},
[ECode.networkError]: {
title: '网络异常',
desc: '网络异常，请稍后再试。',
imagePath: './assets/svg/assets-result-network-error.svg',
},
[ECode.maintenance]: {
title: '系统维护中',
desc: '系统维护中，请稍后再试。',
imagePath: './assets/svg/assets-result-maintenance.svg',
},
[ECode.browserIncompatible]: {
title: '浏览器版本低',
desc: '抱歉，您正在使用的浏览器版本过低，无法打开当前网页。',
imagePath: './assets/svg/assets-result-browser-incompatible.svg',
},
};
export default OakComponent({
isList: false,
properties: {
code: '',
title: '',
desc: '',
icon: '',
imagePath: '', //小程序独有
},
lifetimes: {
ready() {
if (process.env.OAK_PLATFORM === 'wechatMp') {
const { title, desc, code, imagePath } = this.props;
let title2 = title;
if (code) {
this.setState({
desc: desc || DefaultErrorInfo[code].desc,
imagePath: imagePath ||
DefaultErrorInfo[code].imagePath,
});
if (!title2) {
title2 = DefaultErrorInfo[code].title;
}
wx.setNavigationBarTitle({
title: title2,
});
}
}
},
},
methods: {
goBack(delta) {
this.navigateBack(delta);
},
},
});

6
es/components/errorPage/index.json Normal file
View File

@ -0,0 +1,6 @@
{
"component": true,
"usingComponents": {
"l-status-show": "../../miniprogram_npm/lin-ui/status-show/index"
}
}

16
es/components/errorPage/index.less Normal file
View File

@ -0,0 +1,16 @@
.content {
display: flex;
flex-direction: column;
align-items: center;
width: 60%;
.desc {
color: red;
font-size: large;
font-weight: bold;
}
image {
max-width: 65%;
}
}

10
es/components/errorPage/index.xml Normal file
View File

@ -0,0 +1,10 @@
<l-status-show
show="{{true}}"
type="error"
custom="{{true}}"
>
<view class="content">
<view class="desc">{{desc}}</view>
<image src="{{imagePath}}" mode="aspectFit" />
</view>
</l-status-show>

13
es/components/errorPage/locales/zh_CN.json Normal file
View File

@ -0,0 +1,13 @@
{
"back": "返回",
"403 Forbidden": "抱歉，您无权限访问此页面",
"404 Not Found": "抱歉，您访问的页面不存在。",
"500 Internal Server Error": "抱歉，服务器出错啦！",
"networkError": "网络异常",
"Network error, please try again later": "网络异常，请稍后再试。",
"browserIncompatible": "浏览器版本低",
"Sorry, the browser version you are using is too low to open the current webpage": "抱歉，您正在使用的浏览器版本过低，无法打开当前网页。",
"maintenance": "系统维护中",
"System maintenance in progress, please try again later": "系统维护中，请稍后再试。"
}

16
es/components/errorPage/web.d.ts vendored Normal file
View File

@ -0,0 +1,16 @@
import React from 'react';
import { WebComponentProps } from '../../types/Page';
import { ED } from '../../types/AbstractComponent';
import { ECode } from '../../types/ErrorPage';
import './web.less';
interface IErrorPageProps {
code: ECode;
title?: string;
desc?: string;
children?: React.ReactNode;
icon?: React.ReactNode;
}
export default function Render(props: WebComponentProps<ED, keyof ED, false, IErrorPageProps, {
goBack: (delta?: number) => void;
}>): React.JSX.Element;
export {};

62
es/components/errorPage/web.js Normal file
View File

@ -0,0 +1,62 @@
import React from 'react';
import { Button } from 'antd';
import { ECode } from '../../types/ErrorPage';
import { ReactComponent as Light403Icon } from './assets/svg/assets-result-403.svg';
import { ReactComponent as Light404Icon } from './assets/svg/assets-result-404.svg';
import { ReactComponent as Light500Icon } from './assets/svg/assets-result-500.svg';
import { ReactComponent as LightMaintenanceIcon } from './assets/svg/assets-result-maintenance.svg';
import { ReactComponent as LightBrowserIncompatibleIcon } from './assets/svg/assets-result-browser-incompatible.svg';
import { ReactComponent as LightNetworkErrorIcon } from './assets/svg/assets-result-network-error.svg';
import './web.less';
const errorInfo = {
[ECode.forbidden]: {
title: '403 Forbidden',
desc: '抱歉，您无权限访问此页面。',
icon: <Light403Icon />,
},
[ECode.notFound]: {
title: '404 Not Found',
desc: '抱歉，您访问的页面不存在。',
icon: <Light404Icon />,
},
[ECode.error]: {
title: '500 Internal Server Error',
desc: '抱歉，服务器出错啦！',
icon: <Light500Icon />,
},
[ECode.networkError]: {
title: '网络异常',
desc: '网络异常，请稍后再试。',
icon: <LightNetworkErrorIcon />,
},
[ECode.browserIncompatible]: {
title: '浏览器版本低',
desc: '抱歉，您正在使用的浏览器版本过低，无法打开当前网页。',
icon: <LightBrowserIncompatibleIcon />,
},
[ECode.maintenance]: {
title: '系统维护中',
desc: '系统维护中，请稍后再试。',
icon: <LightMaintenanceIcon />,
},
};
export default function Render(props) {
const { code, icon, title, desc, children } = props.data;
const { t, goBack } = props.methods;
const info = errorInfo[code];
const prefixCls = 'oak';
return (<div className={`${prefixCls}-errorPage`}>
{icon || info?.icon}
<div className={`${prefixCls}-errorPage__title`}>
{title || info?.title}
</div>
<div className={`${prefixCls}-errorPage__description`}>
{desc || info?.desc}
</div>
{children || (<Button type="primary" onClick={() => {
goBack();
}}>
返回
</Button>)}
</div>);
}

34
es/components/errorPage/web.less Normal file
View File

@ -0,0 +1,34 @@
.oak-errorPage {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
height: 75vh;
min-height: 400px;
color: var(--oak-color-primary);
img {
width: 200px;
height: 140px;
color: var(--oak-color-primary);
}
&__title {
font-weight: 500;
font-size: 20px;
line-height: 28px;
margin-top: 8px;
color: var(--oak-text-color-primary);
}
&__description {
margin: 8px 0 32px;
font-size: 14px;
line-height: 22px;
color: var(--oak-text-color-secondary);
}
&__rightButton {
margin-left: 8px;
}
}

4
es/features/runningTree.d.ts vendored
View File

@ -94,7 +94,7 @@ declare class ListNode<ED extends EntityDict & BaseEntityDict, T extends keyof E
addNamedSorter(sorter: NamedSorterItem<ED, T>, refresh?: boolean): void;
removeNamedSorter(sorter: NamedSorterItem<ED, T>, refresh?: boolean): void;
removeNamedSorterByName(name: string, refresh: boolean): void;
getFreshValue(): Array<Partial<ED[T]['Schema']>>;
getFreshValue(inModi?: boolean): Array<Partial<ED[T]['Schema']>>;
private addItemInner;
addItem(item: Omit<ED[T]['CreateSingle']['data'], 'id'> & {
id?: string;
@ -167,7 +167,7 @@ declare class SingleNode<ED extends EntityDict & BaseEntityDict, T extends keyof
};
addChild(path: string, node: SingleNode<ED, keyof ED, Cxt, FrontCxt, AD> | ListNode<ED, keyof ED, Cxt, FrontCxt, AD>): void;
removeChild(path: string): void;
getFreshValue(): Partial<ED[T]['Schema']> | undefined;
getFreshValue(inModi?: boolean): Partial<ED[T]['Schema']> | undefined;
create(data: Partial<Omit<ED[T]['CreateSingle']['data'], 'id'>>): void;
update(data: ED[T]['Update']['data'], action?: ED[T]['Action']): void;
remove(): void;

32
es/features/runningTree.js
View File

@ -468,21 +468,29 @@ class ListNode extends Node {
this.publish();
}
}
getFreshValue() {
getFreshValue(inModi) {
/**
* 现在简化情况，只取sr中有id的数据
* 但是对于modi查询，需要查询“热更新”部分的数据（逻辑可能不一定严密）
*/
const ids = Object.keys(this.sr);
const { data, sorter } = this.constructSelection(true, false, true);
const { data, sorter, filter } = this.constructSelection(true, false, true);
/**
* 这里在非modi状态下，原来的代码是不会去刷新缺失的数据，原因不明，可能是认为页面应当自己负责数据的获取
* 在modi状态下，有些外键指向的数据无法预先获取，因此需要加上这个逻辑
*
* 先放回来，不知道会有什么后果
* by Xc 20240229
*/
const result = this.cache.get(this.entity, {
data,
filter: {
filter: inModi ? filter : {
id: {
$in: ids,
}
},
sorter,
}, true, this.sr);
}, undefined, this.sr);
return result;
}
addItemInner(item) {
@ -933,16 +941,23 @@ class SingleNode extends Node {
removeChild(path) {
unset(this.children, path);
}
getFreshValue() {
getFreshValue(inModi) {
const projection = this.getProjection(false);
const id = this.getId();
if (projection && id) {
/**
* 这里在非modi状态下，原来的代码是不会去刷新缺失的数据，原因不明，可能是认为页面应当自己负责数据的获取
* 在modi状态下，有些外键指向的数据无法预先获取，因此需要加上这个逻辑
*
* 先放回来，不知道有什么问题
* by Xc 20240229
*/
const result = this.cache.get(this.entity, {
data: projection,
filter: {
id,
},
}, true, {
}, undefined, {
[id]: this.sr,
});
return result[0];
@ -1144,7 +1159,7 @@ class SingleNode extends Node {
filter: {
id: this.id,
},
});
}, true, this.sr);
const keys = k ? [k] : Object.keys(this.children || {});
for (const k of keys) {
if (this.sr[k]) {
@ -1646,7 +1661,8 @@ export class RunningTree extends Feature {
if (opers) {
this.cache.redoOperation(opers);
}
const value = node.getFreshValue();
// 如果是list结点，要将modi所产生的未提交行的数据也读出来
const value = includeModi && node instanceof ListNode ? node.getFreshValue(true) : node.getFreshValue();
this.cache.rollback();
return value;
}

1
es/index.d.ts vendored
View File

@ -9,5 +9,6 @@ export * from './types/AbstractComponent';
export * from './types/Exception';
export * from './types/Pagination';
export * from './types/NamedCondition';
export * from './types/ErrorPage';
export { FrontendRuntimeContext, SerializedData } from './context/FrontendRuntimeContext';
export { BackendRuntimeContext } from './context/BackendRuntimeContext';

2
es/index.js
View File

@ -10,7 +10,7 @@ export * from './types/AbstractComponent';
export * from './types/Exception';
export * from './types/Pagination';
export * from './types/NamedCondition';
// export * from './utils/upload';
export * from './types/ErrorPage';
// export { CacheStore } from './cacheStore/CacheStore';
// export { default as SyncTriggerExecutor } from './cacheStore/SyncTriggerExecutor';
// export { DebugStore } from './debugStore/DebugStore';

16
es/page.react.js
View File

@ -653,17 +653,17 @@ export function createComponent(option, features) {
console.warn('发生了结点先形成再配置oakPath的情况，请检查代码修正');
lifetimes?.ready && lifetimes.ready.call(this);
lifetimes?.show && lifetimes.show.call(this);
const { oakFullpath } = this.state;
if (oakFullpath && !features.runningTree.checkIsModiNode(oakFullpath) && !features.runningTree.isListDescandent(oakFullpath)) {
this.refresh();
}
else {
this.reRender();
}
}
const { oakFullpath } = this.state;
if (oakFullpath && !features.runningTree.checkIsModiNode(oakFullpath) && !features.runningTree.isListDescandent(oakFullpath)) {
this.refresh();
}
else {
this.reRender();
}
});
}
if (this.props.oakId !== prevProps.oakId) {
else if (this.props.oakId !== prevProps.oakId) {
assert(this.props.oakId); // 好像不可能把已有的id设空的界面需求吧
this.setId(this.props.oakId);
}

8
es/types/ErrorPage.d.ts vendored Normal file
View File

@ -0,0 +1,8 @@
export declare enum ECode {
forbidden = "403",
notFound = "404",
error = "500",
networkError = "network-error",
browserIncompatible = "browser-incompatible",
maintenance = "maintenance"
}

9
es/types/ErrorPage.js Normal file
View File

@ -0,0 +1,9 @@
export var ECode;
(function (ECode) {
ECode["forbidden"] = "403";
ECode["notFound"] = "404";
ECode["error"] = "500";
ECode["networkError"] = "network-error";
ECode["browserIncompatible"] = "browser-incompatible";
ECode["maintenance"] = "maintenance";
})(ECode || (ECode = {}));

4
lib/features/runningTree.d.ts vendored
View File

@ -94,7 +94,7 @@ declare class ListNode<ED extends EntityDict & BaseEntityDict, T extends keyof E
addNamedSorter(sorter: NamedSorterItem<ED, T>, refresh?: boolean): void;
removeNamedSorter(sorter: NamedSorterItem<ED, T>, refresh?: boolean): void;
removeNamedSorterByName(name: string, refresh: boolean): void;
getFreshValue(): Array<Partial<ED[T]['Schema']>>;
getFreshValue(inModi?: boolean): Array<Partial<ED[T]['Schema']>>;
private addItemInner;
addItem(item: Omit<ED[T]['CreateSingle']['data'], 'id'> & {
id?: string;
@ -167,7 +167,7 @@ declare class SingleNode<ED extends EntityDict & BaseEntityDict, T extends keyof
};
addChild(path: string, node: SingleNode<ED, keyof ED, Cxt, FrontCxt, AD> | ListNode<ED, keyof ED, Cxt, FrontCxt, AD>): void;
removeChild(path: string): void;
getFreshValue(): Partial<ED[T]['Schema']> | undefined;
getFreshValue(inModi?: boolean): Partial<ED[T]['Schema']> | undefined;
create(data: Partial<Omit<ED[T]['CreateSingle']['data'], 'id'>>): void;
update(data: ED[T]['Update']['data'], action?: ED[T]['Action']): void;
remove(): void;

32
lib/features/runningTree.js
View File

@ -471,21 +471,29 @@ class ListNode extends Node {
this.publish();
}
}
getFreshValue() {
getFreshValue(inModi) {
/**
* 现在简化情况，只取sr中有id的数据
* 但是对于modi查询，需要查询“热更新”部分的数据（逻辑可能不一定严密）
*/
const ids = Object.keys(this.sr);
const { data, sorter } = this.constructSelection(true, false, true);
const { data, sorter, filter } = this.constructSelection(true, false, true);
/**
* 这里在非modi状态下，原来的代码是不会去刷新缺失的数据，原因不明，可能是认为页面应当自己负责数据的获取
* 在modi状态下，有些外键指向的数据无法预先获取，因此需要加上这个逻辑
*
* 先放回来，不知道会有什么后果
* by Xc 20240229
*/
const result = this.cache.get(this.entity, {
data,
filter: {
filter: inModi ? filter : {
id: {
$in: ids,
}
},
sorter,
}, true, this.sr);
}, undefined, this.sr);
return result;
}
addItemInner(item) {
@ -936,16 +944,23 @@ class SingleNode extends Node {
removeChild(path) {
(0, lodash_1.unset)(this.children, path);
}
getFreshValue() {
getFreshValue(inModi) {
const projection = this.getProjection(false);
const id = this.getId();
if (projection && id) {
/**
* 这里在非modi状态下，原来的代码是不会去刷新缺失的数据，原因不明，可能是认为页面应当自己负责数据的获取
* 在modi状态下，有些外键指向的数据无法预先获取，因此需要加上这个逻辑
*
* 先放回来，不知道有什么问题
* by Xc 20240229
*/
const result = this.cache.get(this.entity, {
data: projection,
filter: {
id,
},
}, true, {
}, undefined, {
[id]: this.sr,
});
return result[0];
@ -1147,7 +1162,7 @@ class SingleNode extends Node {
filter: {
id: this.id,
},
});
}, true, this.sr);
const keys = k ? [k] : Object.keys(this.children || {});
for (const k of keys) {
if (this.sr[k]) {
@ -1649,7 +1664,8 @@ class RunningTree extends Feature_1.Feature {
if (opers) {
this.cache.redoOperation(opers);
}
const value = node.getFreshValue();
// 如果是list结点，要将modi所产生的未提交行的数据也读出来
const value = includeModi && node instanceof ListNode ? node.getFreshValue(true) : node.getFreshValue();
this.cache.rollback();
return value;
}

1
lib/index.d.ts vendored
View File

@ -9,5 +9,6 @@ export * from './types/AbstractComponent';
export * from './types/Exception';
export * from './types/Pagination';
export * from './types/NamedCondition';
export * from './types/ErrorPage';
export { FrontendRuntimeContext, SerializedData } from './context/FrontendRuntimeContext';
export { BackendRuntimeContext } from './context/BackendRuntimeContext';

2
lib/index.js
View File

@ -14,7 +14,7 @@ tslib_1.__exportStar(require("./types/AbstractComponent"), exports);
tslib_1.__exportStar(require("./types/Exception"), exports);
tslib_1.__exportStar(require("./types/Pagination"), exports);
tslib_1.__exportStar(require("./types/NamedCondition"), exports);
// export * from './utils/upload';
tslib_1.__exportStar(require("./types/ErrorPage"), exports);
// export { CacheStore } from './cacheStore/CacheStore';
// export { default as SyncTriggerExecutor } from './cacheStore/SyncTriggerExecutor';
// export { DebugStore } from './debugStore/DebugStore';

16
lib/page.react.js
View File

@ -658,17 +658,17 @@ function createComponent(option, features) {
console.warn('发生了结点先形成再配置oakPath的情况，请检查代码修正');
lifetimes?.ready && lifetimes.ready.call(this);
lifetimes?.show && lifetimes.show.call(this);
const { oakFullpath } = this.state;
if (oakFullpath && !features.runningTree.checkIsModiNode(oakFullpath) && !features.runningTree.isListDescandent(oakFullpath)) {
this.refresh();
}
else {
this.reRender();
}
}
const { oakFullpath } = this.state;
if (oakFullpath && !features.runningTree.checkIsModiNode(oakFullpath) && !features.runningTree.isListDescandent(oakFullpath)) {
this.refresh();
}
else {
this.reRender();
}
});
}
if (this.props.oakId !== prevProps.oakId) {
else if (this.props.oakId !== prevProps.oakId) {
(0, assert_1.assert)(this.props.oakId); // 好像不可能把已有的id设空的界面需求吧
this.setId(this.props.oakId);
}

8
lib/types/ErrorPage.d.ts vendored Normal file
View File

@ -0,0 +1,8 @@
export declare enum ECode {
forbidden = "403",
notFound = "404",
error = "500",
networkError = "network-error",
browserIncompatible = "browser-incompatible",
maintenance = "maintenance"
}

12
lib/types/ErrorPage.js Normal file
View File

@ -0,0 +1,12 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
exports.ECode = void 0;
var ECode;
(function (ECode) {
ECode["forbidden"] = "403";
ECode["notFound"] = "404";
ECode["error"] = "500";
ECode["networkError"] = "network-error";
ECode["browserIncompatible"] = "browser-incompatible";
ECode["maintenance"] = "maintenance";
})(ECode || (exports.ECode = ECode = {}));

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "oak-frontend-base",
"version": "4.2.4",
"version": "4.2.5",
"description": "oak框架中前端与业务逻辑无关的平台部分",
"author": {
"name": "XuChang"

32
src/components/errorPage/assets/svg/assets-result-403.svg Normal file
View File

@ -0,0 +1,32 @@
<svg width="200" height="140" viewBox="0 0 200 140" fill="none" xmlns="http://www.w3.org/2000/svg">
<g mask="url(#mask0_17_619)">
<path d="M30 62H118V122H30V62Z" fill="#97A3B7" />
<g filter="url(#filter0_f_17_619)">
<rect x="12" y="84" width="80" height="60" fill="#E3E6EB" />
</g>
<g filter="url(#filter1_f_17_619)">
<rect x="80" y="54" width="80" height="60" fill="#E3E6EB" />
</g>
<rect x="46" y="105" width="32" height="2" fill="white" />
<rect x="46" y="98" width="32" height="2" fill="white" />
<rect x="46" y="88" width="16" height="2" fill="white" />
</g>
<path opacity="0.9" d="M63 20H151V30H63V20Z" fill="currentcolor" />
<mask id="mask1_17_619" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="63" y="30" width="88" height="50">
<path d="M63 30H151V80H63V30Z" fill="currentcolor" />
</mask>
<g mask="url(#mask1_17_619)">
<path d="M63 30H151V80H63V30Z" fill="currentcolor" />
<g opacity="0.3" filter="url(#filter2_f_17_619)">
<path d="M30 62H118V122H30V62Z" fill="#97A3B7" />
</g>
</g>
<path fill-rule="evenodd" clip-rule="evenodd"
d="M95.6863 40.8577L105.964 51.1345C106.295 51.0466 106.642 50.9998 107 50.9998C109.213 50.9998 111 52.7865 111 54.9998C111 55.3574 110.953 55.7038 110.866 56.0333L121.142 66.3135L118.314 69.1419L113.716 64.5448C111.653 65.423 109.384 65.9089 107 65.9089C99.7273 65.9089 93.5164 61.3853 91 54.9998C92.1785 52.0093 94.1673 49.4271 96.6961 47.5268L92.8579 43.6861L95.6863 40.8577ZM99 54.9998C99 59.4158 102.584 62.9998 107 62.9998C108.483 62.9998 109.872 62.5957 111.063 61.8917L108.034 58.8657C107.704 58.9532 107.358 58.9998 107 58.9998C104.787 58.9998 103 57.2131 103 54.9998C103 54.6423 103.047 54.2958 103.134 53.9663L100.107 50.9389C99.4037 52.1295 99 53.5178 99 54.9998ZM107 44.0907C114.273 44.0907 120.484 48.6143 123 54.9998C122.071 57.3574 120.638 59.4612 118.834 61.1773L114.729 57.0717C114.906 56.4108 115 55.7162 115 54.9998C115 50.5838 111.416 46.9998 107 46.9998C106.284 46.9998 105.589 47.0941 104.928 47.2711L102.378 44.7205C103.848 44.3101 105.398 44.0907 107 44.0907Z"
fill="white" />
<rect x="68" y="24" width="2" height="2" fill="white" />
<rect x="74" y="24" width="2" height="2" fill="white" />
<rect x="80" y="24" width="66" height="2" fill="white" />
<path d="M157 53.9998L181.249 95.9998H132.751L157 53.9998Z" fill="white" stroke="black" />
<path d="M157 88.9998L157 70.9998" stroke="black" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

36
src/components/errorPage/assets/svg/assets-result-404.svg Normal file
View File

@ -0,0 +1,36 @@
<svg width="200" height="140" viewBox="0 0 200 140" fill="none" xmlns="http://www.w3.org/2000/svg">
<g mask="url(#mask0_16559_24301)">
<path d="M30 62H118V122H30V62Z" fill="#97A3B7" />
<g filter="url(#filter0_f_16559_24301)">
<rect x="12" y="84" width="80" height="60" fill="#E3E6EB" />
</g>
<g filter="url(#filter1_f_16559_24301)">
<rect x="80" y="54" width="80" height="60" fill="#E3E6EB" />
</g>
<path d="M49 93L42 100L49 107" stroke="white" stroke-width="2" />
<path d="M69 107L76 100L69 93" stroke="white" stroke-width="2" />
<path d="M62.3647 87.4431L55.6355 112.557" stroke="white" stroke-width="2" />
</g>
<path opacity="0.9" d="M63 20H151V30H63V20Z" fill="currentcolor" />
<mask id="mask1_16559_24301" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="63" y="30" width="88" height="50">
<path d="M63 30H151V80H63V30Z" fill="currentcolor" />
</mask>
<g mask="url(#mask1_16559_24301)">
<path d="M63 30H151V80H63V30Z" fill="currentcolor" />
<g opacity="0.3" filter="url(#filter2_f_16559_24301)">
<path d="M30 62H118V122H30V62Z" fill="#97A3B7" />
</g>
</g>
<path fill-rule="evenodd" clip-rule="evenodd"
d="M105.25 41C112.015 41 117.5 46.4845 117.5 53.25C117.5 55.6827 116.791 57.9498 115.568 59.8558L121 65.2877L117.288 69L111.856 63.5681C109.95 64.7909 107.683 65.5 105.25 65.5C98.4845 65.5 93 60.0155 93 53.25C93 46.4845 98.4845 41 105.25 41ZM105.25 44.5C100.418 44.5 96.5 48.4175 96.5 53.25C96.5 58.0825 100.418 62 105.25 62C110.082 62 114 58.0825 114 53.25C114 48.4175 110.082 44.5 105.25 44.5Z"
fill="white" />
<rect x="68" y="24" width="2" height="2" fill="white" />
<rect x="74" y="24" width="2" height="2" fill="white" />
<rect x="80" y="24" width="66" height="2" fill="white" />
<path fill-rule="evenodd" clip-rule="evenodd"
d="M153 56C140.85 56 131 65.8497 131 78C131 82.6039 132.414 86.8776 134.832 90.4102L127 98.5L139.495 95.3681C143.222 98.2709 147.909 100 153 100C165.15 100 175 90.1503 175 78C175 65.8497 165.15 56 153 56Z"
fill="white" />
<path
d="M131 78L131.5 78V78L131 78ZM134.832 90.4102L135.191 90.758L135.475 90.4647L135.245 90.1278L134.832 90.4102ZM127 98.5L126.641 98.1522L125.422 99.411L127.122 98.985L127 98.5ZM139.495 95.3681L139.802 94.9736L139.61 94.8238L139.373 94.8831L139.495 95.3681ZM153 100L153 100.5L153 100.5L153 100ZM175 78L174.5 78L174.5 78L175 78ZM131.5 78C131.5 66.1259 141.126 56.5 153 56.5V55.5C140.574 55.5 130.5 65.5736 130.5 78L131.5 78ZM135.245 90.1278C132.882 86.6757 131.5 82.5 131.5 78H130.5C130.5 82.7079 131.946 87.0794 134.419 90.6926L135.245 90.1278ZM134.473 90.0624L126.641 98.1522L127.359 98.8478L135.191 90.758L134.473 90.0624ZM127.122 98.985L139.616 95.8531L139.373 94.8831L126.878 98.015L127.122 98.985ZM153 99.5C148.024 99.5 143.445 97.8105 139.802 94.9736L139.187 95.7626C143 98.7314 147.794 100.5 153 100.5V99.5ZM174.5 78C174.5 89.8741 164.874 99.5 153 99.5L153 100.5C165.426 100.5 175.5 90.4264 175.5 78L174.5 78ZM153 56.5C164.874 56.5 174.5 66.1259 174.5 78H175.5C175.5 65.5736 165.426 55.5 153 55.5V56.5Z"
fill="black" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

32
src/components/errorPage/assets/svg/assets-result-500.svg Normal file
View File

@ -0,0 +1,32 @@
<svg width="200" height="140" viewBox="0 0 200 140" fill="none" xmlns="http://www.w3.org/2000/svg">
<g mask="url(#mask0_16559_24251)">
<path d="M68 48L106.105 70V114L68 136L29.8949 114V70L68 48Z" fill="#97A3B7" />
<g filter="url(#filter0_f_16559_24251)">
<rect x="46.3911" y="92" width="80" height="60" fill="#E3E6EB" />
</g>
<g filter="url(#filter1_f_16559_24251)">
<rect y="23" width="80" height="60" fill="#E3E6EB" />
</g>
</g>
<mask id="mask1_16559_24251" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="80" y="9" width="78" height="88">
<path d="M119 9L157.105 31V75L119 97L80.8949 75V31L119 9Z" fill="currentcolor" />
</mask>
<g mask="url(#mask1_16559_24251)">
<path fill-rule="evenodd" clip-rule="evenodd" d="M80.895 31V75L119 97L157.105 75V31L119 53L80.895 31Z"
fill="currentcolor" />
<path opacity="0.9" d="M119 -35L157.105 -13L157.105 31.5L119 53.5L80.8952 31.5L80.895 -13L119 -35Z"
fill="currentcolor" />
<g opacity="0.3" filter="url(#filter2_f_16559_24251)">
<path d="M68 48L106.105 70V114L68 136L29.8949 114V70L68 48Z" fill="#97A3B7" />
</g>
</g>
<path
d="M143 68.822L147.867 85.875L148 86.3405L148.469 86.2228L165.671 81.911L153.336 94.6522L152.999 95L153.336 95.3478L165.671 108.089L148.469 103.777L148 103.659L147.867 104.125L143 121.178L138.133 104.125L138 103.659L137.531 103.777L120.329 108.089L132.664 95.3478L133.001 95L132.664 94.6522L120.329 81.911L137.531 86.2228L138 86.3405L138.133 85.875L143 68.822Z"
fill="white" stroke="black" />
<path fill-rule="evenodd" clip-rule="evenodd"
d="M123.243 35.0821L126.071 33.4493L123.243 31.8164L120.414 33.4493L123.243 35.0821ZM119 32.6329L121.828 31L114.757 26.9179L111.929 28.5507L119 32.6329ZM127.485 35.8986C122.806 38.6001 115.194 38.6001 110.515 35.8986C105.835 33.197 105.835 28.803 110.515 26.1014C115.194 23.3999 122.806 23.3999 127.485 26.1014C132.165 28.803 132.165 33.197 127.485 35.8986ZM107.686 24.4686C101.438 28.0756 101.438 33.9244 107.686 37.5314C113.934 41.1384 124.066 41.1384 130.314 37.5314C136.562 33.9244 136.562 28.0756 130.314 24.4686C124.066 20.8616 113.934 20.8616 107.686 24.4686Z"
fill="white" />
<path fill-rule="evenodd" clip-rule="evenodd"
d="M41.8989 86.2863L44.7272 87.9193L44.7275 94.4512L41.8992 92.8181L41.8989 86.2863ZM53.9194 93.2269L56.7477 94.86L56.7479 101.392L53.9196 99.7587L53.9194 93.2269ZM44.7281 107.515L41.8999 105.882L41.9 109.148L44.7283 110.781L44.7282 107.515L53.92 112.822L53.9201 116.088L56.7484 117.721L56.7483 114.455L53.9201 112.822L53.92 109.556L44.728 104.249L44.7281 107.515Z"
fill="white" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

33
src/components/errorPage/assets/svg/assets-result-browser-incompatible.svg Normal file
View File

@ -0,0 +1,33 @@
<svg width="200" height="140" viewBox="0 0 200 140" fill="none" xmlns="http://www.w3.org/2000/svg">
<g mask="url(#mask0_22_990)">
<path fill-rule="evenodd" clip-rule="evenodd"
d="M144.569 105.61L96.5692 133.322L48.5693 105.61V83.7121L96.569 55.9995L144.569 83.7122V105.61Z"
fill="#97A3B7" />
<g filter="url(#filter0_f_22_990)">
<rect x="-3" y="33.9995" width="80" height="60" fill="#E3E6EB" />
</g>
<g filter="url(#filter1_f_22_990)">
<rect x="97" y="97.9995" width="80" height="60" fill="#E3E6EB" />
</g>
</g>
<mask id="mask1_22_990" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="53" y="16" width="86" height="69">
<path fill-rule="evenodd" clip-rule="evenodd"
d="M113.357 42.715L129.829 33.2059C128.859 32.4995 127.789 31.823 126.643 31.1615C121.268 28.0584 114.723 26.0153 107.758 25.023C103.549 19.4606 97.5775 16.1248 90.4344 16.1945C83.6788 16.2821 74.9482 21.9412 68.9271 30.5602C68.096 30.975 67.2847 31.4099 66.4949 31.8659C52.1168 40.1664 49.5542 52.6155 59.0218 61.9309C57.9871 56.1259 58.712 51.0657 62.1231 45.7161C62.0653 46.3482 61.9127 50.143 61.8906 50.7834C61.2209 69.6969 76.9107 84.8409 88.03 84.7113C96.4806 84.6119 103.595 79.6976 108.349 72.0797C114.563 70.8487 120.438 68.786 125.443 65.8968C138.919 58.1167 142.01 46.7146 134.547 37.629L117.948 47.2113C119.71 50.8655 117.997 55.034 112.87 57.9936C107.744 60.9532 100.523 61.9424 94.1928 60.9252C91.3499 60.4563 88.6706 59.5834 86.4524 58.3029L86.4042 58.275L113.357 42.715ZM78.6546 53.7727C72.5285 49.7965 72.9717 43.5469 79.8498 39.5762C86.7276 35.6056 97.5532 35.3496 104.441 38.8864L78.6546 53.7727ZM93.5561 18.1703C98.1657 18.1302 102.284 20.5752 105.496 24.7401C97.0486 23.8219 88.1122 24.4143 79.9732 26.5054C83.672 21.3809 88.444 18.2301 93.5561 18.1703ZM91.3238 81.6169C85.471 81.685 80.3525 77.691 76.9473 71.2848C85.7921 73.6267 95.8719 74.0599 105.374 72.6022C101.618 78.1222 96.6601 81.5531 91.3238 81.6169Z"
fill="currentcolor" />
</mask>
<g mask="url(#mask1_22_990)">
<path fill-rule="evenodd" clip-rule="evenodd"
d="M113.357 42.715L129.829 33.2059C128.859 32.4995 127.789 31.823 126.643 31.1615C121.268 28.0584 114.723 26.0153 107.758 25.023C103.549 19.4606 97.5775 16.1248 90.4344 16.1945C83.6788 16.2821 74.9482 21.9412 68.9271 30.5602C68.096 30.975 67.2847 31.4099 66.4949 31.8659C52.1168 40.1664 49.5542 52.6155 59.0218 61.9309C57.9871 56.1259 58.712 51.0657 62.1231 45.7161C62.0653 46.3482 61.9127 50.143 61.8906 50.7834C61.2209 69.6969 76.9107 84.8409 88.03 84.7113C96.4806 84.6119 103.595 79.6976 108.349 72.0797C114.563 70.8487 120.438 68.786 125.443 65.8968C138.919 58.1167 142.01 46.7146 134.547 37.629L117.948 47.2113C119.71 50.8655 117.997 55.034 112.87 57.9936C107.744 60.9532 100.523 61.9424 94.1928 60.9252C91.3499 60.4563 88.6706 59.5834 86.4524 58.3029L86.4042 58.275L113.357 42.715ZM78.6546 53.7727C72.5285 49.7965 72.9717 43.5469 79.8498 39.5762C86.7276 35.6056 97.5532 35.3496 104.441 38.8864L78.6546 53.7727ZM93.5561 18.1703C98.1657 18.1302 102.284 20.5752 105.496 24.7401C97.0486 23.8219 88.1122 24.4143 79.9732 26.5054C83.672 21.3809 88.444 18.2301 93.5561 18.1703ZM91.3238 81.6169C85.471 81.685 80.3525 77.691 76.9473 71.2848C85.7921 73.6267 95.8719 74.0599 105.374 72.6022C101.618 78.1222 96.6601 81.5531 91.3238 81.6169Z"
fill="currentcolor" />
<g opacity="0.3" filter="url(#filter2_f_22_990)">
<path d="M96.569 55.9995L144.569 83.7122V139.138L96.569 166.85L48.5692 139.138V83.7122L96.569 55.9995Z"
fill="#97A3B7" />
</g>
</g>
<ellipse cx="155" cy="78" rx="22" ry="22" transform="rotate(180 155 78)" fill="white" stroke="black" />
<path d="M155 83L155 65" stroke="black" />
<rect x="155" y="87" width="0.00390625" height="0.00390625" fill="#C4C4C4" stroke="black" stroke-width="2"
stroke-linejoin="round" />
<path d="M96.5693 112L96.5693 87.9995" stroke="white" stroke-width="2" />
<path d="M86.5693 97.9995L96.5693 87.9995L106.569 97.9995" stroke="white" stroke-width="2" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.9 KiB

49
src/components/errorPage/assets/svg/assets-result-maintenance.svg Normal file
View File

@ -0,0 +1,49 @@
<svg width="200" height="140" viewBox="0 0 200 140" fill="none" xmlns="http://www.w3.org/2000/svg">
<mask id="mask0_216_313" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="80" y="9" width="78" height="88">
<path d="M119 9L157.105 31V75L119 97L80.8949 75V31L119 9Z" fill="currentColor"/>
</mask>
<g mask="url(#mask0_216_313)">
<path d="M119 9L157.105 31V75L119 97L80.8949 75V31L119 9Z" fill="currentColor"/>
<path opacity="0.9" d="M119 -35L157.105 -13V31L119 53L80.8949 31V-13L119 -35Z" fill="currentColor" />
<g opacity="0.3" filter="url(#filter0_f_216_313)">
<path d="M68 48L106.105 70V114L68 136L29.8949 114V70L68 48Z" fill="#97A3B7"/>
</g>
</g>
<mask id="mask1_216_313" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="29" y="48" width="78" height="88">
<path d="M68 48L106.105 70V114L68 136L29.8949 114V70L68 48Z" fill="#97A3B7"/>
</mask>
<g mask="url(#mask1_216_313)">
<path d="M68 48L106.105 70V114L68 136L29.8949 114V70L68 48Z" fill="#97A3B7"/>
<g filter="url(#filter1_f_216_313)">
<rect x="46.3906" y="92" width="80" height="60" fill="#E3E6EB"/>
</g>
<g filter="url(#filter2_f_216_313)">
<rect y="23" width="80" height="60" fill="#E3E6EB"/>
</g>
</g>
<path d="M41.8984 86.2866L44.7267 87.9197L44.727 94.4515L41.8987 92.8185L41.8984 86.2866Z" fill="white"/>
<path d="M53.9189 93.2273L56.7472 94.8603L56.7474 101.392L53.9191 99.7591L53.9189 93.2273Z" fill="white"/>
<path d="M44.7276 107.515L41.8994 105.882L41.8995 109.148L44.7278 110.781L44.7276 107.515L53.9195 112.823L53.9196 116.088L56.7479 117.721L56.7478 114.455L53.9195 112.823L53.9195 109.557L44.7275 104.249L44.7276 107.515Z" fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M108.348 23.4792C106.188 25.9904 106.535 29.3829 109.395 31.5604C112.66 34.0461 117.963 34.007 121.24 31.4731C124.516 28.9392 124.526 24.8699 121.261 22.3841C118.401 20.2066 113.977 19.9666 110.721 21.6439L115.923 25.6047L113.55 27.4399L108.348 23.4792Z" fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M120.865 33.0087L129.83 39.8346L132.203 37.9994L123.238 31.1735C122.917 31.521 122.554 31.8531 122.149 32.1657C121.745 32.4784 121.315 32.7594 120.865 33.0087ZM119.662 32.0932C120.123 31.8557 120.561 31.5798 120.967 31.2655C121.373 30.9513 121.73 30.6134 122.035 30.2579L122.035 30.2579C121.73 30.6134 121.373 30.9513 120.967 31.2655C120.561 31.5798 120.123 31.8557 119.662 32.0931L119.662 32.0932Z" fill="white"/>
<path d="M144 70L168.249 112H119.751L144 70Z" fill="white" stroke="#181818"/>
<path d="M144 100L144 82" stroke="#181818"/>
<path d="M144 105H144.004V105.004H144V105Z" stroke="#181818" stroke-width="2" stroke-linejoin="round"/>
<defs>
<filter id="filter0_f_216_313" x="23.8949" y="42" width="88.2102" height="100" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
<feGaussianBlur stdDeviation="3" result="effect1_foregroundBlur_216_313"/>
</filter>
<filter id="filter1_f_216_313" x="-3.60938" y="42" width="180" height="160" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
<feGaussianBlur stdDeviation="25" result="effect1_foregroundBlur_216_313"/>
</filter>
<filter id="filter2_f_216_313" x="-50" y="-27" width="180" height="160" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
<feGaussianBlur stdDeviation="25" result="effect1_foregroundBlur_216_313"/>
</filter>
</defs>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.7 KiB

23
src/components/errorPage/assets/svg/assets-result-network-error.svg Normal file
View File

@ -0,0 +1,23 @@
<svg width="200" height="140" viewBox="0 0 200 140" fill="none" xmlns="http://www.w3.org/2000/svg">
<g mask="url(#mask0_21_716)">
<path fill-rule="evenodd" clip-rule="evenodd"
d="M33 46.843L96.3214 119L159.643 46.843C142.742 31.9998 120.583 23 96.3214 23C72.0601 23 49.9009 31.9998 33 46.843Z"
fill="#97A3B7" />
<g filter="url(#filter0_f_21_716)">
<rect x="95" y="21" width="80" height="60" fill="#E3E6EB" />
</g>
<g filter="url(#filter1_f_21_716)">
<rect x="-7" y="43" width="80" height="60" fill="#E3E6EB" />
</g>
</g>
<path
d="M72.8122 63.6882L69.6548 66.8455L75.9009 73.0916C71.2469 75.1648 66.9663 77.925 63.188 81.2433L96.3213 119L108.234 105.425L114.647 111.837L117.804 108.68L80.4504 71.3261C80.4505 71.3261 80.4503 71.3261 80.4504 71.3261L72.8122 63.6882Z"
fill="currentcolor" />
<path
d="M129.455 81.2433L114.137 98.6982L85.3974 69.9585C88.9142 69.1786 92.5697 68.7674 96.3213 68.7674C109.016 68.7674 120.611 73.4766 129.455 81.2433Z"
fill="currentcolor" />
<path
d="M152 21.822L156.867 38.875L157 39.3405L157.469 39.2228L174.671 34.911L162.336 47.6522L161.999 48L162.336 48.3478L174.671 61.089L157.469 56.7772L157 56.6595L156.867 57.125L152 74.178L147.133 57.125L147 56.6595L146.531 56.7772L129.329 61.089L141.664 48.3478L142.001 48L141.664 47.6522L129.329 34.911L146.531 39.2228L147 39.3405L147.133 38.875L152 21.822Z"
fill="white" stroke="black" />
<path d="M101 31L90 42L101 53L93 61" stroke="white" stroke-width="2" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

6
src/components/errorPage/index.json Normal file
View File

@ -0,0 +1,6 @@
{
"component": true,
"usingComponents": {
"l-status-show": "../../miniprogram_npm/lin-ui/status-show/index"
}
}

16
src/components/errorPage/index.less Normal file
View File

@ -0,0 +1,16 @@
.content {
display: flex;
flex-direction: column;
align-items: center;
width: 60%;
.desc {
color: red;
font-size: large;
font-weight: bold;
}
image {
max-width: 65%;
}
}

89
src/components/errorPage/index.ts Normal file
View File

@ -0,0 +1,89 @@
import {
ED,
} from '../../types/AbstractComponent';
import { ReactComponentProps } from '../../types/Page';
import { ECode } from '../../types/ErrorPage';
const DefaultErrorInfo = {
[ECode.forbidden]: {
title: '403 Forbidden',
desc: '抱歉，您无权限访问此页面。',
imagePath: './assets/svg/assets-result-403.svg',
},
[ECode.notFound]: {
title: '404 Not Found',
desc: '抱歉，您访问的页面不存在。',
imagePath: './assets/svg/assets-result-404.svg',
},
[ECode.error]: {
title: '500 Internal Server Error',
desc: '抱歉，服务器出错啦！',
imagePath: './assets/svg/assets-result-500.svg',
},
[ECode.networkError]: {
title: '网络异常',
desc: '网络异常，请稍后再试。',
imagePath: './assets/svg/assets-result-network-error.svg',
},
[ECode.maintenance]: {
title: '系统维护中',
desc: '系统维护中，请稍后再试。',
imagePath: './assets/svg/assets-result-maintenance.svg',
},
[ECode.browserIncompatible]: {
title: '浏览器版本低',
desc: '抱歉，您正在使用的浏览器版本过低，无法打开当前网页。',
imagePath: './assets/svg/assets-result-browser-incompatible.svg',
},
};
export default OakComponent({
isList: false,
properties: {
code: '',
title: '',
desc: '',
icon: '', //web独有
imagePath: '', //小程序独有
},
lifetimes: {
ready() {
if (process.env.OAK_PLATFORM === 'wechatMp') {
const { title, desc, code, imagePath } = this.props;
let title2 = title;
if (code) {
this.setState({
desc: desc || DefaultErrorInfo[code as ECode].desc,
imagePath:
imagePath ||
DefaultErrorInfo[code as ECode].imagePath,
});
if (!title2) {
title2 = DefaultErrorInfo[code as ECode].title;
}
wx.setNavigationBarTitle({
title: title2,
});
}
}
},
},
methods: {
goBack(delta?: number) {
this.navigateBack(delta);
},
},
}) as <ED2 extends ED, T2 extends keyof ED2>(
props: ReactComponentProps<
ED2,
T2,
false,
{
code: ECode;
title?: string;
desc?: string;
children?: React.ReactNode;
icon?: React.ReactNode;
}
>
) => React.ReactElement;

10
src/components/errorPage/index.xml Normal file
View File

@ -0,0 +1,10 @@
<l-status-show
show="{{true}}"
type="error"
custom="{{true}}"
>
<view class="content">
<view class="desc">{{desc}}</view>
<image src="{{imagePath}}" mode="aspectFit" />
</view>
</l-status-show>

13
src/components/errorPage/locales/zh_CN.json Normal file
View File

@ -0,0 +1,13 @@
{
"back": "返回",
"403 Forbidden": "抱歉，您无权限访问此页面",
"404 Not Found": "抱歉，您访问的页面不存在。",
"500 Internal Server Error": "抱歉，服务器出错啦！",
"networkError": "网络异常",
"Network error, please try again later": "网络异常，请稍后再试。",
"browserIncompatible": "浏览器版本低",
"Sorry, the browser version you are using is too low to open the current webpage": "抱歉，您正在使用的浏览器版本过低，无法打开当前网页。",
"maintenance": "系统维护中",
"System maintenance in progress, please try again later": "系统维护中，请稍后再试。"
}

34
src/components/errorPage/web.less Normal file
View File

@ -0,0 +1,34 @@
.oak-errorPage {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
height: 75vh;
min-height: 400px;
color: var(--oak-color-primary);
img {
width: 200px;
height: 140px;
color: var(--oak-color-primary);
}
&__title {
font-weight: 500;
font-size: 20px;
line-height: 28px;
margin-top: 8px;
color: var(--oak-text-color-primary);
}
&__description {
margin: 8px 0 32px;
font-size: 14px;
line-height: 22px;
color: var(--oak-text-color-secondary);
}
&__rightButton {
margin-left: 8px;
}
}

94
src/components/errorPage/web.tsx Normal file
View File

@ -0,0 +1,94 @@
import React from 'react';
import { Button } from 'antd';
import { WebComponentProps } from '../../types/Page';
import { ED } from '../../types/AbstractComponent';
import { ECode } from '../../types/ErrorPage';
import { ReactComponent as Light403Icon } from './assets/svg/assets-result-403.svg';
import { ReactComponent as Light404Icon } from './assets/svg/assets-result-404.svg';
import { ReactComponent as Light500Icon } from './assets/svg/assets-result-500.svg';
import { ReactComponent as LightMaintenanceIcon } from './assets/svg/assets-result-maintenance.svg';
import { ReactComponent as LightBrowserIncompatibleIcon } from './assets/svg/assets-result-browser-incompatible.svg';
import { ReactComponent as LightNetworkErrorIcon } from './assets/svg/assets-result-network-error.svg';
import './web.less';
interface IErrorPageProps {
code: ECode;
title?: string;
desc?: string;
children?: React.ReactNode;
icon?: React.ReactNode;
}
const errorInfo = {
[ECode.forbidden]: {
title: '403 Forbidden',
desc: '抱歉，您无权限访问此页面。',
icon: <Light403Icon />,
},
[ECode.notFound]: {
title: '404 Not Found',
desc: '抱歉，您访问的页面不存在。',
icon: <Light404Icon />,
},
[ECode.error]: {
title: '500 Internal Server Error',
desc: '抱歉，服务器出错啦！',
icon: <Light500Icon />,
},
[ECode.networkError]: {
title: '网络异常',
desc: '网络异常，请稍后再试。',
icon: <LightNetworkErrorIcon />,
},
[ECode.browserIncompatible]: {
title: '浏览器版本低',
desc: '抱歉，您正在使用的浏览器版本过低，无法打开当前网页。',
icon: <LightBrowserIncompatibleIcon />,
},
[ECode.maintenance]: {
title: '系统维护中',
desc: '系统维护中，请稍后再试。',
icon: <LightMaintenanceIcon />,
},
};
export default function Render(
props: WebComponentProps<
ED,
keyof ED,
false,
IErrorPageProps,
{
goBack: (delta?: number) => void;
}
>
) {
const { code, icon, title, desc, children } = props.data;
const { t, goBack } = props.methods;
const info = errorInfo[code];
const prefixCls = 'oak';
return (
<div className={`${prefixCls}-errorPage`}>
{icon || info?.icon}
<div className={`${prefixCls}-errorPage__title`}>
{title || info?.title}
</div>
<div className={`${prefixCls}-errorPage__description`}>
{desc || info?.desc}
</div>
{children || (
<Button
type="primary"
onClick={() => {
goBack();
}}
>
返回
</Button>
)}
</div>
);
}

46
src/features/runningTree.ts
View File

@ -183,7 +183,7 @@ class ListNode<
Cxt extends AsyncContext<ED>,
FrontCxt extends SyncContext<ED>,
AD extends CommonAspectDict<ED, Cxt>
> extends Node<ED, T, Cxt, FrontCxt, AD> {
> extends Node<ED, T, Cxt, FrontCxt, AD> {
private updates: Record<
string,
ED[T]['CreateSingle']
@ -353,11 +353,11 @@ class ListNode<
id: 1,
},
filter: combineFilters(this.entity, this.cache.getSchema(), [
{ id: { $in: ids }},
{ id: { $in: ids } },
...filters
])
});
ids.forEach(
(id) => {
if (!rows2.find(ele => ele.id === id)) {
@ -595,22 +595,30 @@ class ListNode<
}
}
getFreshValue(): Array<Partial<ED[T]['Schema']>> {
getFreshValue(inModi?: boolean): Array<Partial<ED[T]['Schema']>> {
/**
* 现在简化情况，只取sr中有id的数据
* 但是对于modi查询，需要查询“热更新”部分的数据（逻辑可能不一定严密）
*/
const ids = Object.keys(this.sr);
const { data, sorter } = this.constructSelection(true, false, true);
const { data, sorter, filter } = this.constructSelection(true, false, true);
/**
* 这里在非modi状态下，原来的代码是不会去刷新缺失的数据，原因不明，可能是认为页面应当自己负责数据的获取
* 在modi状态下，有些外键指向的数据无法预先获取，因此需要加上这个逻辑
*
* 先放回来，不知道会有什么后果
* by Xc 20240229
*/
const result = this.cache.get(this.entity, {
data,
filter: {
filter: inModi ? filter : {
id: {
$in: ids,
}
},
sorter,
}, true, this.sr);
}, undefined, this.sr);
return result;
}
@ -641,7 +649,7 @@ class ListNode<
return id;
}
addItems(items: Array< Omit<ED[T]['CreateSingle']['data'], 'id'> & { id?: string }>) {
addItems(items: Array<Omit<ED[T]['CreateSingle']['data'], 'id'> & { id?: string }>) {
const ids = items.map(
(item) => this.addItemInner(item)
);
@ -1156,16 +1164,23 @@ class SingleNode<ED extends EntityDict & BaseEntityDict,
unset(this.children, path);
}
getFreshValue(): Partial<ED[T]['Schema']> | undefined {
getFreshValue(inModi?: boolean): Partial<ED[T]['Schema']> | undefined {
const projection = this.getProjection(false);
const id = this.getId();
if (projection && id) {
/**
* 这里在非modi状态下，原来的代码是不会去刷新缺失的数据，原因不明，可能是认为页面应当自己负责数据的获取
* 在modi状态下，有些外键指向的数据无法预先获取，因此需要加上这个逻辑
*
* 先放回来，不知道有什么问题
* by Xc 20240229
*/
const result = this.cache.get(this.entity, {
data: projection,
filter: {
id,
},
}, true, {
}, undefined, {
[id]: this.sr,
});
return result[0];
@ -1382,7 +1397,7 @@ class SingleNode<ED extends EntityDict & BaseEntityDict,
filter: {
id: this.id,
},
});
}, true, this.sr);
const keys = k ? [k] : Object.keys(this.children || {});
for (const k of keys) {
if (this.sr[k]) {
@ -1587,7 +1602,7 @@ class VirtualNode<
Cxt extends AsyncContext<ED>,
FrontCxt extends SyncContext<ED>,
AD extends CommonAspectDict<ED, Cxt>
> extends Feature {
> extends Feature {
private dirty: boolean;
private executing: boolean;
private loading = false;
@ -1772,7 +1787,7 @@ export class RunningTree<
Cxt extends AsyncContext<ED>,
FrontCxt extends SyncContext<ED>,
AD extends CommonAspectDict<ED, Cxt>
> extends Feature {
> extends Feature {
private cache: Cache<ED, Cxt, FrontCxt, AD>;
private schema: StorageSchema<ED>;
private root: Record<
@ -2002,7 +2017,8 @@ export class RunningTree<
if (opers) {
this.cache.redoOperation(opers);
}
const value = node.getFreshValue();
// 如果是list结点，要将modi所产生的未提交行的数据也读出来
const value = includeModi && node instanceof ListNode ? node.getFreshValue(true) : node.getFreshValue();
this.cache.rollback();
return value;
}
@ -2104,7 +2120,7 @@ export class RunningTree<
isCreation(path: string) {
const value = this.getFreshValue(path);
assert(!(value instanceof Array));
return value?.$$createAt$$ === 1;
}

3
src/index.ts
View File

@ -12,8 +12,7 @@ export * from './types/AbstractComponent';
export * from './types/Exception';
export * from './types/Pagination';
export * from './types/NamedCondition';
// export * from './utils/upload';
export * from './types/ErrorPage';
// export { CacheStore } from './cacheStore/CacheStore';
// export { default as SyncTriggerExecutor } from './cacheStore/SyncTriggerExecutor';

17
src/page.react.tsx
View File

@ -992,18 +992,17 @@ export function createComponent<
console.warn('发生了结点先形成再配置oakPath的情况，请检查代码修正');
lifetimes?.ready && lifetimes.ready.call(this);
lifetimes?.show && lifetimes.show.call(this);
const { oakFullpath } = this.state;
if (oakFullpath && !features.runningTree.checkIsModiNode(oakFullpath) && !features.runningTree.isListDescandent(oakFullpath)) {
this.refresh();
}
else {
this.reRender();
}
}
const { oakFullpath } = this.state;
if (oakFullpath && !features.runningTree.checkIsModiNode(oakFullpath) && !features.runningTree.isListDescandent(oakFullpath)) {
this.refresh();
}
else {
this.reRender();
}
});
}
if (this.props.oakId !== prevProps.oakId) {
else if (this.props.oakId !== prevProps.oakId) {
assert(this.props.oakId); // 好像不可能把已有的id设空的界面需求吧
this.setId(this.props.oakId!);
}

1
src/types/AbstractComponent.ts
View File

@ -1,5 +1,6 @@
import { EntityDict } from 'oak-domain/lib/types/Entity';
import { EntityDict as BaseEntityDict } from 'oak-domain/lib/base-app-domain';
// @ts-ignore
import { ButtonProps } from 'antd';
export type RenderWidth = 1 | 2 | 3 | 4;

11
src/types/ErrorPage.ts Normal file
View File

@ -0,0 +1,11 @@
export enum ECode {
forbidden = '403',
notFound = '404',
error = '500',
networkError = 'network-error',
browserIncompatible = 'browser-incompatible',
maintenance = 'maintenance',
}