Pull request #14408: REPORT-127436【NewUI】设计器样式翻新-服务器数据集数据库查询警告icon

Merge in DESIGN/design from ~RICHARD.FANG/design:newui to newui

* commit 'fc349fcbb72ad0575da1671127dff5b3aa05e330':
  REPORT-127436【NewUI】设计器样式翻新-服务器数据集icon

designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/ServerTableDataWrapper.java

@@ -26,7 +26,7 @@ public final class ServerTableDataWrapper extends AbstractTableDataWrapper {
 	public Icon getIcon() {
 		if (tabledata instanceof DBTableData) {
 			if (StringUtils.isBlank(((DBTableData) tabledata).getQuery())) {
-				return new WarningIcon(SVGLoader.load("/com/fr/design/standard/server_database.svg"));
+				return new LazyIcon("server_database_warning");
 			}
 			else {
 				return new LazyIcon("server_database");

designer-base/src/main/resources/com/fine/theme/icon/dataset/server_database_warning.svg

@@ -0,0 +1,20 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3 4.1C3 3.21634 3.71634 2.5 4.6 2.5H27.4C28.2837 2.5 29 3.21634 29 4.1V8.9C29 9.78366 28.2837 10.5 27.4 10.5H4.6C3.71634 10.5 3 9.78366 3 8.9V4.1Z" fill="#5493F2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M27.4 3.7H4.6C4.37909 3.7 4.2 3.87909 4.2 4.1V8.9C4.2 9.12091 4.37909 9.3 4.6 9.3H27.4C27.6209 9.3 27.8 9.12091 27.8 8.9V4.1C27.8 3.87909 27.6209 3.7 27.4 3.7ZM4.6 2.5C3.71634 2.5 3 3.21634 3 4.1V8.9C3 9.78366 3.71634 10.5 4.6 10.5H27.4C28.2837 10.5 29 9.78366 29 8.9V4.1C29 3.21634 28.2837 2.5 27.4 2.5H4.6Z" fill="#1E65CD"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3 13.6C3 12.7163 3.71634 12 4.6 12H27.4C28.2837 12 29 12.7163 29 13.6V18.4C29 19.1461 28.4893 19.773 27.7984 19.95C26.498 18.1646 24.3673 17 21.9565 17C19.5234 17 17.3754 18.1863 16.0786 20H4.6C3.71634 20 3 19.2837 3 18.4V13.6ZM12.874 21.5H4.6C3.71634 21.5 3 22.2163 3 23.1V27.9C3 28.7837 3.71634 29.5 4.6 29.5H10.9664C10.356 28.6062 10 27.5313 10 26.375C10 24.2912 11.1561 22.472 12.874 21.5ZM27.9272 29.4111C27.7621 29.4687 27.5847 29.5 27.4 29.5H23.3779L18 28.5C16.8369 28.5 16.492 28.8245 16.4169 28.7709C16.3555 28.7271 16.4743 28.4311 16.4743 27.5C16.4743 26.6611 16.0498 25.7635 15.6851 24.9924C15.1494 23.8597 14.7428 23 16 23C16.1308 23 16.1965 23.1231 16.2629 23.2476C16.3241 23.3623 16.3859 23.4782 16.5 23.5C16.5352 23.5067 16.7146 23.6402 16.9213 23.794C17.4639 24.1977 18.1947 24.7415 17 23.5C17.022 23.4132 17.267 23.327 17.5093 23.2418C17.7413 23.1603 17.9708 23.0796 18 23C18.4893 21.6664 19.076 21.8003 20.0969 22.0332C20.5986 22.1477 21.2051 22.2861 21.9565 22.2861C22.651 22.2861 23.1889 22.2057 23.6169 22.1417C24.6907 21.9812 25.0726 21.9241 25.5 23.5C27.2389 23.8532 28 24.566 28 26.375C28 26.7806 28.0282 27.1712 28.0546 27.5371C28.1095 28.2974 28.1566 28.951 27.9272 29.4111Z" fill="#5493F2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M27.4 13.2H4.6C4.37909 13.2 4.2 13.3791 4.2 13.6V18.4C4.2 18.6209 4.37909 18.8 4.6 18.8H17.1632C16.757 19.1579 16.3928 19.5605 16.0786 20H4.6C3.71634 20 3 19.2837 3 18.4V13.6C3 12.7163 3.71634 12 4.6 12H27.4C28.2837 12 29 12.7163 29 13.6V18.4C29 19.1461 28.4893 19.773 27.7984 19.95C27.4924 19.53 27.1405 19.1443 26.7498 18.8H27.4C27.6209 18.8 27.8 18.6209 27.8 18.4V13.6C27.8 13.3791 27.6209 13.2 27.4 13.2ZM27.9272 29.4111C27.7621 29.4687 27.5847 29.5 27.4 29.5H23.3779L18 28.5C16.8369 28.5 16.492 28.8245 16.4169 28.7709C16.3785 28.7435 16.4105 28.6177 16.4399 28.3H27.4C27.6209 28.3 27.8 28.1209 27.8 27.9V25.0526C27.9351 25.4122 28 25.8469 28 26.375C28 26.7806 28.0282 27.1712 28.0546 27.5371C28.1095 28.2974 28.1566 28.951 27.9272 29.4111ZM12.874 21.5H4.6C3.71634 21.5 3 22.2163 3 23.1V27.9C3 28.7837 3.71634 29.5 4.6 29.5H10.9664C10.7129 29.1288 10.5033 28.7265 10.3449 28.3H4.6C4.37909 28.3 4.2 28.1209 4.2 27.9V23.1C4.2 22.8791 4.37909 22.7 4.6 22.7H11.3941C11.814 22.2235 12.3142 21.8167 12.874 21.5ZM18.1229 22.7H25.2257C24.8783 21.9531 24.4618 22.0154 23.6169 22.1417C23.1889 22.2057 22.651 22.2861 21.9565 22.2861C21.2051 22.2861 20.5986 22.1477 20.0969 22.0332C19.1599 21.8194 18.5887 21.6891 18.1229 22.7Z" fill="#1E65CD"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M26.2105 30H15.7895C13.6966 30 12 28.3584 12 26.3333C12 24.3083 13.6966 22.6667 15.7895 22.6667C16.1722 22.6667 16.5417 22.7216 16.8899 22.8237C17.453 20.6277 19.5037 19 21.9474 19C24.361 19 26.3913 20.5879 26.9834 22.743C28.7056 23.0883 30 24.5646 30 26.3333C30 28.2032 28.5535 29.7461 26.6842 29.9716V30H26.2105Z" fill="#57C4FB"/>
+<path d="M8.5 6.5C8.5 6.91421 8.16421 7.25 7.75 7.25C7.33579 7.25 7 6.91421 7 6.5C7 6.08579 7.33579 5.75 7.75 5.75C8.16421 5.75 8.5 6.08579 8.5 6.5Z" fill="white"/>
+<path d="M8.5 16C8.5 16.4142 8.16421 16.75 7.75 16.75C7.33579 16.75 7 16.4142 7 16C7 15.5858 7.33579 15.25 7.75 15.25C8.16421 15.25 8.5 15.5858 8.5 16Z" fill="white"/>
+<path d="M8.5 25.5C8.5 25.9142 8.16421 26.25 7.75 26.25C7.33579 26.25 7 25.9142 7 25.5C7 25.0858 7.33579 24.75 7.75 24.75C8.16421 24.75 8.5 25.0858 8.5 25.5Z" fill="white"/>
+<path d="M12 6.5C12 6.91421 11.6642 7.25 11.25 7.25C10.8358 7.25 10.5 6.91421 10.5 6.5C10.5 6.08579 10.8358 5.75 11.25 5.75C11.6642 5.75 12 6.08579 12 6.5Z" fill="white"/>
+<path d="M12 16C12 16.4142 11.6642 16.75 11.25 16.75C10.8358 16.75 10.5 16.4142 10.5 16C10.5 15.5858 10.8358 15.25 11.25 15.25C11.6642 15.25 12 15.5858 12 16Z" fill="white"/>
+<path d="M8.5 6.5C8.5 6.91421 8.16421 7.25 7.75 7.25C7.33579 7.25 7 6.91421 7 6.5C7 6.08579 7.33579 5.75 7.75 5.75C8.16421 5.75 8.5 6.08579 8.5 6.5Z" stroke="white" stroke-width="0.5"/>
+<path d="M8.5 16C8.5 16.4142 8.16421 16.75 7.75 16.75C7.33579 16.75 7 16.4142 7 16C7 15.5858 7.33579 15.25 7.75 15.25C8.16421 15.25 8.5 15.5858 8.5 16Z" stroke="white" stroke-width="0.5"/>
+<path d="M8.5 25.5C8.5 25.9142 8.16421 26.25 7.75 26.25C7.33579 26.25 7 25.9142 7 25.5C7 25.0858 7.33579 24.75 7.75 24.75C8.16421 24.75 8.5 25.0858 8.5 25.5Z" stroke="white" stroke-width="0.5"/>
+<path d="M12 6.5C12 6.91421 11.6642 7.25 11.25 7.25C10.8358 7.25 10.5 6.91421 10.5 6.5C10.5 6.08579 10.8358 5.75 11.25 5.75C11.6642 5.75 12 6.08579 12 6.5Z" stroke="white" stroke-width="0.5"/>
+<path d="M12 16C12 16.4142 11.6642 16.75 11.25 16.75C10.8358 16.75 10.5 16.4142 10.5 16C10.5 15.5858 10.8358 15.25 11.25 15.25C11.6642 15.25 12 15.5858 12 16Z" stroke="white" stroke-width="0.5"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M29.875 22C29.875 26.3489 26.3489 29.875 22 29.875C17.6511 29.875 14.125 26.3489 14.125 22C14.125 17.6511 17.6511 14.125 22 14.125C26.3489 14.125 29.875 17.6511 29.875 22Z" fill="#F9AE31"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M21.3626 24.5785C21.1876 24.7535 21.1001 24.966 21.1001 25.216C21.1001 25.466 21.1876 25.6785 21.3626 25.8535C21.5376 26.0285 21.7501 26.116 22.0001 26.116C22.2501 26.116 22.4626 26.0285 22.6376 25.8535C22.8126 25.6785 22.9001 25.466 22.9001 25.216C22.9001 24.966 22.8126 24.7535 22.6376 24.5785C22.4626 24.4035 22.2501 24.316 22.0001 24.316C21.7501 24.316 21.5376 24.4035 21.3626 24.5785Z" fill="white"/>
+<rect x="21.2124" y="17.749" width="1.575" height="5.625" rx="0.7" fill="white"/>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/widget/apply_components.svg

@@ -0,0 +1,13 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_5185_49403)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24 11H8V8H24V11ZM6 13V7C6 6.44772 6.44772 6 7 6H25C25.5523 6 26 6.44772 26 7V13H6Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11 17H8V24H11V17ZM6 15V25C6 25.5523 6.44772 26 7 26H13V15H6Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17 17H24V24H17V17ZM26 15V25C26 25.5523 25.5523 26 25 26H15V15H26Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.5 2C2.67157 2 2 2.67157 2 3.5V28.5C2 29.3284 2.67157 30 3.5 30H28.5C29.3284 30 30 29.3284 30 28.5V3.5C30 2.67157 29.3284 2 28.5 2H3.5ZM4 28V4H28V28H4Z" fill="#0A1C38" fill-opacity="0.9"/>
+</g>
+<defs>
+<clipPath id="clip0_5185_49403">
+<rect width="32" height="32" fill="white"/>
+</clipPath>
+</defs>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/widget/apply_components_disable.svg

@@ -0,0 +1,13 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_5830_164273)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24 11H8V8H24V11ZM6 13V7C6 6.44772 6.44772 6 7 6H25C25.5523 6 26 6.44772 26 7V13H6Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11 17H8V24H11V17ZM6 15V25C6 25.5523 6.44772 26 7 26H13V15H6Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17 17H24V24H17V17ZM26 15V25C26 25.5523 25.5523 26 25 26H15V15H26Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.5 2C2.67157 2 2 2.67157 2 3.5V28.5C2 29.3284 2.67157 30 3.5 30H28.5C29.3284 30 30 29.3284 30 28.5V3.5C30 2.67157 29.3284 2 28.5 2H3.5ZM4 28V4H28V28H4Z" fill="#0A1C38" fill-opacity="0.29"/>
+</g>
+<defs>
+<clipPath id="clip0_5830_164273">
+<rect width="32" height="32" fill="white"/>
+</clipPath>
+</defs>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/widget/prewidget.svg

@@ -1,13 +1,8 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_5185_49403)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M24 11H8V8H24V11ZM6 13V7C6 6.44772 6.44772 6 7 6H25C25.5523 6 26 6.44772 26 7V13H6Z" fill="#0A1C38" fill-opacity="0.9"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M11 17H8V24H11V17ZM6 15V25C6 25.5523 6.44772 26 7 26H13V15H6Z" fill="#0A1C38" fill-opacity="0.9"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M17 17H24V24H17V17ZM26 15V25C26 25.5523 25.5523 26 25 26H15V15H26Z" fill="#0A1C38" fill-opacity="0.9"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M3.5 2C2.67157 2 2 2.67157 2 3.5V28.5C2 29.3284 2.67157 30 3.5 30H28.5C29.3284 30 30 29.3284 30 28.5V3.5C30 2.67157 29.3284 2 28.5 2H3.5ZM4 28V4H28V28H4Z" fill="#0A1C38" fill-opacity="0.9"/>
-</g>
-<defs>
-<clipPath id="clip0_5185_49403">
-<rect width="32" height="32" fill="white"/>
-</clipPath>
-</defs>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14.5 30.8492C14.2239 30.8492 14 30.6254 14 30.3492V28.0208L25.5836 16.4372L28.412 19.2657L16.8284 30.8492H14.5ZM29.8262 17.8514L30.2635 17.4142C31.0445 16.6332 31.0445 15.3668 30.2635 14.5858C29.4824 13.8047 28.2161 13.8047 27.435 14.5858L26.9978 15.023L29.8262 17.8514Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4 5H26V13.1165C26.5752 12.5843 27.2705 12.2423 28 12.0907V5C28 3.89543 27.1046 3 26 3H4C2.89543 3 2 3.89543 2 5V26C2 27.1046 2.89543 28 4 28H11.449C11.391 27.7925 11.3601 27.5743 11.3601 27.3492V26H4L4 5ZM24.08 26L22 28H26C27.1046 28 28 27.1046 28 26V22.5061L26 24.4292V26H24.08Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path d="M6 10.6255C6 9.7968 6.6718 9.125 7.5005 9.125C8.32921 9.125 9.00101 9.7968 9.00101 10.6255V10.7245C9.00101 11.5532 8.32921 12.225 7.5005 12.225C6.6718 12.225 6 11.5532 6 10.7245V10.6255Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.6286 7C11.0763 7 10.6286 7.44772 10.6286 8V13.4375C10.6286 13.9898 11.0763 14.4375 11.6286 14.4375H23C23.5523 14.4375 24 13.9898 24 13.4375V8C24 7.44772 23.5523 7 23 7H11.6286ZM21.943 9.125H12.6859V12.3125H21.943V9.125Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path d="M6 20.188C6 19.3593 6.6718 18.6875 7.5005 18.6875C8.32921 18.6875 9.00101 19.3593 9.00101 20.188V20.287C9.00101 21.1157 8.32921 21.7875 7.5005 21.7875C6.6718 21.7875 6 21.1157 6 20.287V20.188Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path d="M23.3744 16.635C23.2588 16.5882 23.1324 16.5625 23 16.5625H11.6286C11.0763 16.5625 10.6286 17.0102 10.6286 17.5625V23C10.6286 23.5523 11.0763 24 11.6286 24H16.2446L18.3017 21.875H12.6859V18.6875H21.3874L23.3744 16.635Z" fill="#0A1C38" fill-opacity="0.9"/>
 </svg>

designer-base/src/main/resources/com/fine/theme/icon/widget/prewidget_disable.svg

@@ -1,13 +1,8 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_5830_164273)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M24 11H8V8H24V11ZM6 13V7C6 6.44772 6.44772 6 7 6H25C25.5523 6 26 6.44772 26 7V13H6Z" fill="#0A1C38" fill-opacity="0.29"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M11 17H8V24H11V17ZM6 15V25C6 25.5523 6.44772 26 7 26H13V15H6Z" fill="#0A1C38" fill-opacity="0.29"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M17 17H24V24H17V17ZM26 15V25C26 25.5523 25.5523 26 25 26H15V15H26Z" fill="#0A1C38" fill-opacity="0.29"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M3.5 2C2.67157 2 2 2.67157 2 3.5V28.5C2 29.3284 2.67157 30 3.5 30H28.5C29.3284 30 30 29.3284 30 28.5V3.5C30 2.67157 29.3284 2 28.5 2H3.5ZM4 28V4H28V28H4Z" fill="#0A1C38" fill-opacity="0.29"/>
-</g>
-<defs>
-<clipPath id="clip0_5830_164273">
-<rect width="32" height="32" fill="white"/>
-</clipPath>
-</defs>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14.5 30.8492C14.2239 30.8492 14 30.6254 14 30.3492V28.0208L25.5836 16.4372L28.412 19.2657L16.8284 30.8492H14.5ZM29.8262 17.8514L30.2635 17.4142C31.0445 16.6332 31.0445 15.3668 30.2635 14.5858C29.4824 13.8047 28.2161 13.8047 27.435 14.5858L26.9978 15.023L29.8262 17.8514Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4 5H26V13.1165C26.5752 12.5843 27.2705 12.2423 28 12.0907V5C28 3.89543 27.1046 3 26 3H4C2.89543 3 2 3.89543 2 5V26C2 27.1046 2.89543 28 4 28H11.449C11.391 27.7925 11.3601 27.5743 11.3601 27.3492V26H4L4 5ZM24.08 26L22 28H26C27.1046 28 28 27.1046 28 26V22.5061L26 24.4292V26H24.08Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path d="M6 10.6255C6 9.7968 6.6718 9.125 7.5005 9.125C8.32921 9.125 9.00101 9.7968 9.00101 10.6255V10.7245C9.00101 11.5532 8.32921 12.225 7.5005 12.225C6.6718 12.225 6 11.5532 6 10.7245V10.6255Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.6286 7C11.0763 7 10.6286 7.44772 10.6286 8V13.4375C10.6286 13.9898 11.0763 14.4375 11.6286 14.4375H23C23.5523 14.4375 24 13.9898 24 13.4375V8C24 7.44772 23.5523 7 23 7H11.6286ZM21.943 9.125H12.6859V12.3125H21.943V9.125Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path d="M6 20.188C6 19.3593 6.6718 18.6875 7.5005 18.6875C8.32921 18.6875 9.00101 19.3593 9.00101 20.188V20.287C9.00101 21.1157 8.32921 21.7875 7.5005 21.7875C6.6718 21.7875 6 21.1157 6 20.287V20.188Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path d="M23.3744 16.635C23.2588 16.5882 23.1324 16.5625 23 16.5625H11.6286C11.0763 16.5625 10.6286 17.0102 10.6286 17.5625V23C10.6286 23.5523 11.0763 24 11.6286 24H16.2446L18.3017 21.875H12.6859V18.6875H21.3874L23.3744 16.635Z" fill="#0A1C38" fill-opacity="0.29"/>
 </svg>

designer-base/src/main/resources/com/fine/theme/light/ui/fine_light.icon.json

@@ -49,6 +49,7 @@
     "batch_esd_off": "dataset/batch_esd_off.svg",
     "edit": "dataset/edit.svg",
     "server_database": "dataset/server_database.svg",
+    "server_database_warning": "dataset/server_database_warning.svg",
     "field": "dataset/field.svg",
     "folder": "filetree/folder.svg",
     "folder_open": "filetree/folder_open.svg",
@@ -310,6 +311,7 @@
     "password_field": "widget/password_field.svg",
     "picture": "widget/picture.svg",
     "widget_preview": "widget/preview.svg",
+    "apply_components": "widget/apply_components.svg",
     "prewidget": "widget/prewidget.svg",
     "tab": "widget/tab.svg",
     "text_area": "widget/text_area.svg",