fanruan
/
design
6
1
Fork 2
Code Issues 2 Pull Requests Releases Wiki Activity
Browse Source

Pull request #6284: 无JIRA任务 换一下svg图片，原来的svg图片有点变形 

Merge in DESIGN/design from ~TOMMY/design:release/11.0 to release/11.0

* commit '0c76b726ba247cb250d3633de174b90c465a84e9':
  REPORT-61275 部分任务默认工具栏展开
  无JIRA任务 换一下svg图片，原来的svg图片有点变形
bugfix/11.0
Tommy 3 years ago
parent
0614f13d15 0c76b726ba
commit
edc79325be
6 changed files with 23 additions and 42 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      designer-base/src/main/resources/com/fr/design/mainframe/guide/complete_all.svg
  2. 21
      designer-base/src/main/resources/com/fr/design/mainframe/guide/complete_none.svg
  3. 25
      designer-base/src/main/resources/com/fr/design/mainframe/guide/complete_some.svg
  4. 2
      designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/layout/UseLayoutAndComponentGuide.java
  5. 1
      designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/theme/DownloadComponentPackageGuide.java
  6. 1
      designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/theme/ThemeToggleGuide.java

15
designer-base/src/main/resources/com/fr/design/mainframe/guide/complete_all.svg
Unescape View File

@ -1,17 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>编组 7备份 4</title>
<defs>
<filter id="filter-1">
<feColorMatrix in="SourceGraphic" type="matrix" values="0 0 0 0 0.254902 0 0 0 0 0.607843 0 0 0 0 0.976471 0 0 0 1.000000 0"></feColorMatrix>
</filter>
</defs>
<title>全部完成</title>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="编组-7备份-4" transform="translate(-452.000000, -294.000000)" filter="url(#filter-1)">
<g transform="translate(452.000000, 294.000000)" id="icon_QuestionIcon_normal备份-9">
<g id="规范" transform="translate(-82.000000, -660.000000)">
<g id="icon_QuestionIcon_normal备份-9" transform="translate(82.000000, 660.000000)">
<rect id="矩形" x="0" y="0" width="16" height="16"></rect>
<path d="M8,0.25 C10.1399118,0.25 12.0774083,1.11754994 13.4799292,2.52007081 C14.8824501,3.92259169 15.75,5.86008824 15.75,8 C15.75,10.1399118 14.8824501,12.0774083 13.4799292,13.4799292 C12.0774083,14.8824501 10.1399118,15.75 8,15.75 C5.86008824,15.75 3.92259169,14.8824501 2.52007081,13.4799292 C1.11754994,12.0774083 0.25,10.1399118 0.25,8 C0.25,5.86008824 1.11754994,3.92259169 2.52007081,2.52007081 C3.92259169,1.11754994 5.86008824,0.25 8,0.25 Z" id="Fill-3" stroke-opacity="0.496167163" stroke="#419BF9" stroke-width="0.5"></path>
<path d="M14.5,8 C14.5,9.79476471 13.7723707,11.4197578 12.5960643,12.5960643 C11.4197578,13.7723707 9.79476471,14.5 8,14.5 C6.20523529,14.5 4.58024219,13.7723707 3.40393574,12.5960643 C2.22762929,11.4197578 1.5,9.79476471 1.5,8 C1.5,7.70052513 1.5202589,7.4057771 1.55948076,7.11705169 L7.49405002,11.7381593 L12.7897165,3.60605749 C13.8517066,4.7630672 14.5,6.30590319 14.5,8 Z M8,1.5 C9.67636009,1.5 11.2046101,2.13478954 12.3574752,3.17706357 L6.80926645,9.1207825 L1.6022332,6.8455736 C1.84106679,5.51344393 2.4858429,4.32202858 3.40393574,3.40393574 C4.58024219,2.22762929 6.20523529,1.5 8,1.5 Z" id="形状结合" stroke="#419BF9" fill="#419BF9"></path>
<path d="M8,0 C12.4178824,0 16,3.58211765 16,8 C16,12.4178824 12.4178824,16 8,16 C3.58211765,16 0,12.4178824 0,8 C0,3.58211765 3.58211765,0 8,0 Z M8,0.5 C3.85826002,0.5 0.5,3.85826002 0.5,8 C0.5,12.14174 3.85826002,15.5 8,15.5 C12.14174,15.5 15.5,12.14174 15.5,8 C15.5,3.85826002 12.14174,0.5 8,0.5 Z" id="Fill-3" fill="#9FCCFB" fill-rule="nonzero"></path>
<path d="M8,1 C11.8656471,1 15,4.13435294 15,8 C15,11.8656471 11.8656471,15 8,15 C4.13435294,15 1,11.8656471 1,8 C1,4.13435294 4.13435294,1 8,1 Z M11.1613691,5.19061128 L6.93333556,9.72064718 L5.03863539,7.69061128 C4.81253501,7.44836087 4.43286168,7.43526869 4.19061128,7.66136907 C3.94836087,7.88746945 3.93526869,8.26714277 4.16136907,8.50939318 L6.4947024,11.0093932 C6.73190478,11.2635386 7.13476635,11.2635386 7.37196872,11.0093932 L12.0386354,6.00939318 C12.2647358,5.76714277 12.2516436,5.38746945 12.0093932,5.16136907 C11.7671428,4.93526869 11.3874694,4.94836087 11.1613691,5.19061128 Z" id="形状结合" fill="#419BF9"></path>
</g>
</g>
</g>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

21
designer-base/src/main/resources/com/fr/design/mainframe/guide/complete_none.svg
Unescape View File

@ -1,23 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>编组 7备份 5</title>
<defs>
<filter id="filter-1">
<feColorMatrix in="SourceGraphic" type="matrix" values="0 0 0 0 0.254902 0 0 0 0 0.607843 0 0 0 0 0.976471 0 0 0 1.000000 0"></feColorMatrix>
</filter>
<path d="M14,7 C14,10.8656471 10.8656471,14 7,14 C3.13435294,14 0,10.8656471 0,7 C0,3.13435294 3.13435294,0 7,0 C10.8656471,0 14,3.13435294 14,7 Z" id="path-2"></path>
</defs>
<title>未完成@2x</title>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="编组-7备份-5" transform="translate(-452.000000, -550.000000)" filter="url(#filter-1)">
<g transform="translate(452.000000, 550.000000)" id="icon_QuestionIcon_normal备份-9">
<g id="规范" transform="translate(-223.000000, -660.000000)">
<g id="icon_QuestionIcon_normal备份-9" transform="translate(223.000000, 660.000000)">
<rect id="矩形" x="0" y="0" width="16" height="16"></rect>
<path d="M8,0.25 C10.1399118,0.25 12.0774083,1.11754994 13.4799292,2.52007081 C14.8824501,3.92259169 15.75,5.86008824 15.75,8 C15.75,10.1399118 14.8824501,12.0774083 13.4799292,13.4799292 C12.0774083,14.8824501 10.1399118,15.75 8,15.75 C5.86008824,15.75 3.92259169,14.8824501 2.52007081,13.4799292 C1.11754994,12.0774083 0.25,10.1399118 0.25,8 C0.25,5.86008824 1.11754994,3.92259169 2.52007081,2.52007081 C3.92259169,1.11754994 5.86008824,0.25 8,0.25 Z" id="Fill-3" stroke-opacity="0.495982777" stroke="#419BF9" stroke-width="0.5"></path>
<g id="路径-3" transform="translate(1.000000, 1.000000)">
<mask id="mask-3" fill="white">
<use xlink:href="#path-2"></use>
</mask>
<path stroke="#419BF9" d="M7,0.5 C8.79476471,0.5 10.4197578,1.22762929 11.5960643,2.40393574 C12.7723707,3.58024219 13.5,5.20523529 13.5,7 C13.5,8.79476471 12.7723707,10.4197578 11.5960643,11.5960643 C10.4197578,12.7723707 8.79476471,13.5 7,13.5 C5.20523529,13.5 3.58024219,12.7723707 2.40393574,11.5960643 C1.22762929,10.4197578 0.5,8.79476471 0.5,7 C0.5,5.20523529 1.22762929,3.58024219 2.40393574,2.40393574 C3.58024219,1.22762929 5.20523529,0.5 7,0.5 Z"></path>
</g>
<path d="M8,0 C12.4178824,0 16,3.58211765 16,8 C16,12.4178824 12.4178824,16 8,16 C3.58211765,16 0,12.4178824 0,8 C0,3.58211765 3.58211765,0 8,0 Z M8,0.5 C3.85826002,0.5 0.5,3.85826002 0.5,8 C0.5,12.14174 3.85826002,15.5 8,15.5 C12.14174,15.5 15.5,12.14174 15.5,8 C15.5,3.85826002 12.14174,0.5 8,0.5 Z" id="Fill-3" fill-opacity="0.338693045" fill="#419BF9" fill-rule="nonzero"></path>
<path d="M8,1 C11.8656471,1 15,4.13435294 15,8 C15,11.8656471 11.8656471,15 8,15 C4.13435294,15 1,11.8656471 1,8 C1,4.13435294 4.13435294,1 8,1 Z M8,2 C4.68663769,2 2,4.68663769 2,8 C2,11.3133623 4.68663769,14 8,14 C11.3133623,14 14,11.3133623 14,8 C14,4.68663769 11.3133623,2 8,2 Z" id="Fill-3" fill="#419BF9" fill-rule="nonzero"></path>
</g>
</g>
</g>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

25
designer-base/src/main/resources/com/fr/design/mainframe/guide/complete_some.svg
Unescape View File

@ -1,28 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>编组 7备份 4</title>
<title>部分完成</title>
<defs>
<filter id="filter-1">
<feColorMatrix in="SourceGraphic" type="matrix" values="0 0 0 0 0.254902 0 0 0 0 0.607843 0 0 0 0 0.976471 0 0 0 1.000000 0"></feColorMatrix>
</filter>
<path d="M14,7 C14,10.8656471 10.8656471,14 7,14 C3.13435294,14 0,10.8656471 0,7 C0,3.13435294 3.13435294,0 7,0 C10.8656471,0 14,3.13435294 14,7 Z" id="path-2"></path>
<path d="M14,7 C14,10.8656471 10.8656471,14 7,14 C3.13435294,14 0,10.8656471 0,7 C0,3.13435294 3.13435294,0 7,0 C10.8656471,0 14,3.13435294 14,7 Z" id="path-4"></path>
<path d="M14,7 C14,10.8656471 10.8656471,14 7,14 C3.13435294,14 0,10.8656471 0,7 C0,3.13435294 3.13435294,0 7,0 C10.8656471,0 14,3.13435294 14,7 Z" id="path-1"></path>
</defs>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="编组-7备份-4" transform="translate(-452.000000, -422.000000)" filter="url(#filter-1)">
<g transform="translate(452.000000, 422.000000)" id="icon_QuestionIcon_normal备份-9">
<g id="规范" transform="translate(-155.000000, -660.000000)">
<g id="icon_QuestionIcon_normal备份-9" transform="translate(155.000000, 660.000000)">
<rect id="矩形" x="0" y="0" width="16" height="16"></rect>
<path d="M8,0.25 C10.1399118,0.25 12.0774083,1.11754994 13.4799292,2.52007081 C14.8824501,3.92259169 15.75,5.86008824 15.75,8 C15.75,10.1399118 14.8824501,12.0774083 13.4799292,13.4799292 C12.0774083,14.8824501 10.1399118,15.75 8,15.75 C5.86008824,15.75 3.92259169,14.8824501 2.52007081,13.4799292 C1.11754994,12.0774083 0.25,10.1399118 0.25,8 C0.25,5.86008824 1.11754994,3.92259169 2.52007081,2.52007081 C3.92259169,1.11754994 5.86008824,0.25 8,0.25 Z" id="Fill-3" stroke-opacity="0.495982777" stroke="#419BF9" stroke-width="0.5"></path>
<path d="M8,0 C12.4178824,0 16,3.58211765 16,8 C16,12.4178824 12.4178824,16 8,16 C3.58211765,16 0,12.4178824 0,8 C0,3.58211765 3.58211765,0 8,0 Z M8,0.5 C3.85826002,0.5 0.5,3.85826002 0.5,8 C0.5,12.14174 3.85826002,15.5 8,15.5 C12.14174,15.5 15.5,12.14174 15.5,8 C15.5,3.85826002 12.14174,0.5 8,0.5 Z" id="Fill-3" fill="#BFDDFD" fill-rule="nonzero"></path>
<g id="路径-3" transform="translate(1.000000, 1.000000)">
<mask id="mask-3" fill="white">
<use xlink:href="#path-2"></use>
<mask id="mask-2" fill="white">
<use xlink:href="#path-1"></use>
</mask>
<g id="蒙版"></g>
<path d="M1.65086071,7.57759105 C2.92986055,6.74807704 4.30432707,6.33332003 5.77426028,6.33332003 C7.97916009,6.33332003 9.68111352,9.69885717 13.7949191,7.57759105 C16.5374562,6.16341363 14.5988699,9.08198996 7.97916009,16.33332 L2.03321526,13.4433732 L0,8.39748929 L1.65086071,7.57759105 Z" fill="#419BF9" mask="url(#mask-3)"></path>
<mask id="mask-5" fill="white">
<use xlink:href="#path-4"></use>
</mask>
<path stroke="#419BF9" d="M7,0.5 C8.79476471,0.5 10.4197578,1.22762929 11.5960643,2.40393574 C12.7723707,3.58024219 13.5,5.20523529 13.5,7 C13.5,8.79476471 12.7723707,10.4197578 11.5960643,11.5960643 C10.4197578,12.7723707 8.79476471,13.5 7,13.5 C5.20523529,13.5 3.58024219,12.7723707 2.40393574,11.5960643 C1.22762929,10.4197578 0.5,8.79476471 0.5,7 C0.5,5.20523529 1.22762929,3.58024219 2.40393574,2.40393574 C3.58024219,1.22762929 5.20523529,0.5 7,0.5 Z"></path>
<path d="M0.652488577,7.36430983 C7.24039717,3.20105356 7.90994979,10.1117332 13.9699833,7.81918587 C18.0100056,6.29082097 18.0100056,7.06390999 13.9699833,10.1384529 L11.1005083,14 L2.36825002,13.4206497 L-0.640871294,7.81918587 C-4.17057044,10.2914394 -3.73945048,10.139814 0.652488577,7.36430983 Z" id="路径-4" fill="#419BF9" mask="url(#mask-2)"></path>
<path d="M7,0 C10.8656471,0 14,3.13435294 14,7 C14,10.8656471 10.8656471,14 7,14 C3.13435294,14 0,10.8656471 0,7 C0,3.13435294 3.13435294,0 7,0 Z M7,1 C3.68663769,1 1,3.68663769 1,7 C1,10.3133623 3.68663769,13 7,13 C10.3133623,13 13,10.3133623 13,7 C13,3.68663769 10.3133623,1 7,1 Z" id="蒙版" fill="#419BF9" fill-rule="nonzero" mask="url(#mask-2)"></path>
</g>
</g>
</g>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

2
designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/layout/UseLayoutAndComponentGuide.java
Unescape View File

@ -89,7 +89,9 @@ public class UseLayoutAndComponentGuide {
Component component = ComponentUtils.findComponentByName(NorthRegionContainerPane.getInstance(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_File"));
fileHeadMenu = ((UIHeadMenu) component);
asyncThemeFetcher.shutdown();
EastRegionContainerPane.getInstance().showContainer();
GuideManager.getInstance().getCurrentGuide().start();
}
});
} else {

1
designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/theme/DownloadComponentPackageGuide.java
Unescape View File

@ -99,6 +99,7 @@ public class DownloadComponentPackageGuide {
GuideManager.getInstance().getCurrentGuide().terminate();
return false;
}
EastRegionContainerPane.getInstance().showContainer();
EastRegionContainerPane.getInstance().switchTabTo(EastRegionContainerPane.KEY_WIDGET_SETTINGS);
OnlineWidgetRepoPane onlineWidgetRepoPane = OnlineWidgetRepoPane.getInstance();
OnlineWidgetTabPane tabPane = (OnlineWidgetTabPane) ComponentUtils.findComponentByClass(onlineWidgetRepoPane, OnlineWidgetTabPane.class);

1
designer-realize/src/main/java/com/fr/design/mainframe/guide/creator/theme/ThemeToggleGuide.java
Unescape View File

@ -82,6 +82,7 @@ public class ThemeToggleGuide {
GuideCreateUtils.showNoFileAuthAlert();
GuideManager.getInstance().getCurrentGuide().terminate();
} else {
EastRegionContainerPane.getInstance().showContainer();
EastRegionContainerPane.getInstance().switchTabTo(EastRegionContainerPane.KEY_WIDGET_SETTINGS);
asyncThemeFetcher.shutdown();
GuideManager.getInstance().getCurrentGuide().start();

Write Preview
Loading…
Cancel
Save