Merge pull request #9803 from allenve/master

feat: 优化签名面板图标

packages/amis-ui/src/components/Signature.tsx

@@ -136,22 +136,30 @@ const Signature: React.FC<ISignatureProps> = props => {
               onClick={clear}
               tooltip={clearBtnLabel || __('Signature.clear')}
             >
-              {clearBtnLabel ? clearBtnLabel : <Icon icon="fas fa-close" />}
+              {clearBtnLabel ? (
+                clearBtnLabel
+              ) : (
+                <Icon icon="close" className="icon" />
+              )}
             </Button>
             <Button
               onClick={undo}
               tooltip={undoBtnLabel || __('Signature.undo')}
             >
-              {undoBtnLabel ? undoBtnLabel : <Icon icon="fas fa-undo" />}
+              {undoBtnLabel ? (
+                undoBtnLabel
+              ) : (
+                <Icon icon="undo-normal" className="icon" />
+              )}
             </Button>
 
             {fullScreen ? (
               <Button onClick={handleUnFullScreen}>
-                <Icon icon="fas fa-compress" />
+                <Icon icon="un-fullscreen" className="icon" />
               </Button>
             ) : (
               <Button onClick={handleFullScreen}>
-                <Icon icon="fas fa-expand" />
+                <Icon icon="full-screen" className="icon" />
               </Button>
             )}
           </div>

packages/amis-ui/src/components/icons.tsx

@@ -9,6 +9,7 @@ import CloseIcon from '../icons/close.svg';
 import CloseSmallIcon from '../icons/close-small.svg';
 import StatusCloseIcon from '../icons/status-close.svg';
 import UnDoIcon from '../icons/undo.svg';
+import UnDoNormalIcon from '../icons/undo-normal.svg';
 import ReDoIcon from '../icons/redo.svg';
 import EnterIcon from '../icons/enter.svg';
 import VolumeIcon from '../icons/volume.svg';
@@ -49,6 +50,8 @@ import RefreshIcon from '../icons/refresh.svg';
 import DragIcon from '../icons/drag.svg';
 import EditIcon from '../icons/edit.svg';
 import DeskEmptyIcon from '../icons/desk-empty.svg';
+import FullScreen from '../icons/fullscreen.svg';
+import UnFullscreen from '../icons/unfullscreen.svg';
 
 import CopyIcon from '../icons/copy.svg';
 import FilterIcon from '../icons/filter.svg';
@@ -143,6 +146,9 @@ registerIcon('close', CloseIcon);
 registerIcon('close-small', CloseSmallIcon);
 registerIcon('status-close', StatusCloseIcon);
 registerIcon('undo', UnDoIcon);
+registerIcon('undo-normal', UnDoNormalIcon);
+registerIcon('full-screen', FullScreen);
+registerIcon('un-fullscreen', UnFullscreen);
 registerIcon('redo', ReDoIcon);
 registerIcon('enter', EnterIcon);
 registerIcon('volume', VolumeIcon);

packages/amis-ui/src/icons/fullscreen.svg

@@ -0,0 +1,4 @@
+<svg viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg">
+  <path d="M1011.2 384h-96V115.2H640V12.8h320c25.6 0 51.2 19.2 51.2 51.2v320zM384 1011.2H64c-25.6 0-51.2-19.2-51.2-51.2v-320h96v268.8H384v102.4zM115.2 384H12.8V64C12.8 38.4 32 12.8 64 12.8h320v96H115.2V384zM960 1011.2h-320v-96h268.8V640h96v320c6.4 25.6-19.2 51.2-44.8 51.2z" fill="currentColor">
+  </path>
+</svg>

packages/amis-ui/src/icons/undo-normal.svg

@@ -0,0 +1,4 @@
+<svg viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg">
+  <path d="M0 0.000512h1023.999488v1023.999488H0z" fill="currentColor" opacity=".01" p-id="15532"></path>
+  <path d="M5.631997 356.198734l0.768 1.382399a51.199974 51.199974 0 0 0 10.803194 13.516793l0.4608 0.3584c1.023999 0.9728 2.150399 1.843199 3.327999 2.662399l-3.788799-3.071999a51.609574 51.609574 0 0 0 10.444795 7.219197l1.024 0.512a50.943975 50.943975 0 0 0 4.659197 2.047999l0.6144 0.204799a50.790375 50.790375 0 0 0 14.233593 2.867199L51.199974 384.00032h230.399885a51.199974 51.199974 0 0 0 5.990397-102.041549L281.599859 281.600371H166.399917l0.4096-0.4096c23.449588-25.599987 42.598379-45.875177 55.551972-58.82877a409.599795 409.599795 0 1 1 0 579.27651A51.199974 51.199974 0 1 0 150.015925 873.984075 510.463745 510.463745 0 0 0 511.999744 1024c282.777459 0 511.999744-229.222285 511.999744-511.999744S794.777203 0.000512 511.999744 0.000512a510.463745 510.463745 0 0 0-362.035019 149.964725l-11.775994 11.929594c-6.348797 6.655997-13.465593 14.131193-21.299189 22.527989L102.399949 199.987612V102.400461a51.199974 51.199974 0 0 0-45.209578-50.841575L51.199974 51.200486a51.199974 51.199974 0 0 0-50.841574 45.209578L0 102.400461v230.399885c0 8.089596 1.894399 15.718392 5.222397 22.527988l0.4096 0.8704z" fill="currentColor"></path>
+</svg>

packages/amis-ui/src/icons/unfullscreen.svg

@@ -0,0 +1,3 @@
+<svg viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg">
+  <path d="M940.8 732.8h-176a32 32 0 0 0-32 32v196.8a62.4 62.4 0 0 1-124.8 0V736a128 128 0 0 1 128-128h225.6a62.4 62.4 0 0 1 0 124.8H940.8zM291.2 940.8v-176a32 32 0 0 0-32-32H62.4a62.4 62.4 0 0 1 0-124.8H288a128 128 0 0 1 128 128v225.6a62.4 62.4 0 0 1-124.8 0V940.8z m441.6-857.6v176a32 32 0 0 0 32 32h196.8a62.4 62.4 0 0 1 0 124.8H736a128 128 0 0 1-128-128V62.4a62.4 62.4 0 0 1 124.8 0V83.2zM83.2 291.2h176a32 32 0 0 0 32-32V62.4a62.4 62.4 0 0 1 124.8 0V288a128 128 0 0 1-128 128H62.4a62.4 62.4 0 0 1 0-124.8H83.2z" fill="currentColor"></path>
+</svg>