diff --git a/components/config-provider/__tests__/__snapshots__/components.test.tsx.snap b/components/config-provider/__tests__/__snapshots__/components.test.tsx.snap
index 2d042380ba..db9202396c 100644
--- a/components/config-provider/__tests__/__snapshots__/components.test.tsx.snap
+++ b/components/config-provider/__tests__/__snapshots__/components.test.tsx.snap
@@ -12548,13 +12548,8 @@ exports[`ConfigProvider components ColorPicker configProvider 1`] = `
   class="config-color-picker-trigger"
 >
   <div
-    class="config-color-picker-color-block"
-  >
-    <div
-      class="config-color-picker-color-block-inner"
-      style="background: rgb(22, 119, 255);"
-    />
-  </div>
+    class="config-color-picker-clear"
+  />
 </div>
 `;
 
@@ -12563,13 +12558,8 @@ exports[`ConfigProvider components ColorPicker configProvider componentDisabled
   class="config-color-picker-trigger config-color-picker-trigger-disabled"
 >
   <div
-    class="config-color-picker-color-block"
-  >
-    <div
-      class="config-color-picker-color-block-inner"
-      style="background: rgb(22, 119, 255);"
-    />
-  </div>
+    class="config-color-picker-clear"
+  />
 </div>
 `;
 
@@ -12578,13 +12568,8 @@ exports[`ConfigProvider components ColorPicker configProvider componentSize larg
   class="config-color-picker-trigger config-color-picker-lg"
 >
   <div
-    class="config-color-picker-color-block"
-  >
-    <div
-      class="config-color-picker-color-block-inner"
-      style="background: rgb(22, 119, 255);"
-    />
-  </div>
+    class="config-color-picker-clear"
+  />
 </div>
 `;
 
@@ -12593,13 +12578,8 @@ exports[`ConfigProvider components ColorPicker configProvider componentSize midd
   class="config-color-picker-trigger"
 >
   <div
-    class="config-color-picker-color-block"
-  >
-    <div
-      class="config-color-picker-color-block-inner"
-      style="background: rgb(22, 119, 255);"
-    />
-  </div>
+    class="config-color-picker-clear"
+  />
 </div>
 `;
 
@@ -12608,13 +12588,8 @@ exports[`ConfigProvider components ColorPicker configProvider componentSize smal
   class="config-color-picker-trigger config-color-picker-sm"
 >
   <div
-    class="config-color-picker-color-block"
-  >
-    <div
-      class="config-color-picker-color-block-inner"
-      style="background: rgb(22, 119, 255);"
-    />
-  </div>
+    class="config-color-picker-clear"
+  />
 </div>
 `;
 
@@ -12623,13 +12598,8 @@ exports[`ConfigProvider components ColorPicker normal 1`] = `
   class="ant-color-picker-trigger"
 >
   <div
-    class="ant-color-picker-color-block"
-  >
-    <div
-      class="ant-color-picker-color-block-inner"
-      style="background: rgb(22, 119, 255);"
-    />
-  </div>
+    class="ant-color-picker-clear"
+  />
 </div>
 `;
 
@@ -12638,13 +12608,8 @@ exports[`ConfigProvider components ColorPicker prefixCls 1`] = `
   class="prefix-ColorPicker-trigger"
 >
   <div
-    class="prefix-ColorPicker-color-block"
-  >
-    <div
-      class="prefix-ColorPicker-color-block-inner"
-      style="background: rgb(22, 119, 255);"
-    />
-  </div>
+    class="prefix-ColorPicker-clear"
+  />
 </div>
 `;
 
@@ -15601,7 +15566,7 @@ exports[`ConfigProvider components Form configProvider 1`] = `
             class="config-form-item-control-input-content"
           >
             <input
-              class="config-input config-input-outlined config-input-status-error"
+              class="config-input"
               type="text"
               value=""
             />
@@ -15655,7 +15620,7 @@ exports[`ConfigProvider components Form configProvider componentDisabled 1`] = `
             class="config-form-item-control-input-content"
           >
             <input
-              class="config-input config-input-disabled config-input-outlined config-input-status-error"
+              class="config-input config-input-disabled"
               disabled=""
               type="text"
               value=""
@@ -15710,7 +15675,7 @@ exports[`ConfigProvider components Form configProvider componentSize large 1`] =
             class="config-form-item-control-input-content"
           >
             <input
-              class="config-input config-input-lg config-input-outlined config-input-status-error"
+              class="config-input config-input-lg"
               type="text"
               value=""
             />
@@ -15764,7 +15729,7 @@ exports[`ConfigProvider components Form configProvider componentSize middle 1`]
             class="config-form-item-control-input-content"
           >
             <input
-              class="config-input config-input-outlined config-input-status-error"
+              class="config-input"
               type="text"
               value=""
             />
@@ -15818,7 +15783,7 @@ exports[`ConfigProvider components Form configProvider componentSize small 1`] =
             class="config-form-item-control-input-content"
           >
             <input
-              class="config-input config-input-sm config-input-outlined config-input-status-error"
+              class="config-input config-input-sm"
               type="text"
               value=""
             />
@@ -15872,7 +15837,7 @@ exports[`ConfigProvider components Form normal 1`] = `
             class="ant-form-item-control-input-content"
           >
             <input
-              class="ant-input ant-input-outlined ant-input-status-error"
+              class="ant-input"
               type="text"
               value=""
             />
@@ -15926,7 +15891,7 @@ exports[`ConfigProvider components Form prefixCls 1`] = `
             class="prefix-Form-item-control-input-content"
           >
             <input
-              class="prefix-Form prefix-Form-outlined prefix-Form-status-error"
+              class="prefix-Form"
               type="text"
               value=""
             />
@@ -16036,18 +16001,18 @@ exports[`ConfigProvider components Input configProvider 1`] = `
     class="config-input-group"
   >
     <input
-      class="config-input config-input-outlined"
+      class="config-input"
       type="text"
       value=""
     />
     <span
-      class="config-input-group-wrapper config-input-group-wrapper-outlined config-input-search"
+      class="config-input-group-wrapper config-input-search"
     >
       <span
         class="config-input-wrapper config-input-group"
       >
         <input
-          class="config-input config-input-outlined"
+          class="config-input"
           type="text"
           value=""
         />
@@ -16087,7 +16052,7 @@ exports[`ConfigProvider components Input configProvider 1`] = `
     </span>
   </span>
   <span
-    class="config-input-affix-wrapper config-input-outlined config-input-password"
+    class="config-input-affix-wrapper config-input-password"
   >
     <input
       class="config-input"
@@ -16123,7 +16088,7 @@ exports[`ConfigProvider components Input configProvider 1`] = `
     </span>
   </span>
   <textarea
-    class="config-input config-input-outlined"
+    class="config-input"
   />
 </div>
 `;
@@ -16134,19 +16099,19 @@ exports[`ConfigProvider components Input configProvider componentDisabled 1`] =
     class="config-input-group"
   >
     <input
-      class="config-input config-input-disabled config-input-outlined"
+      class="config-input config-input-disabled"
       disabled=""
       type="text"
       value=""
     />
     <span
-      class="config-input-group-wrapper config-input-group-wrapper-disabled config-input-group-wrapper-outlined config-input-search"
+      class="config-input-group-wrapper config-input-search"
     >
       <span
         class="config-input-wrapper config-input-group"
       >
         <input
-          class="config-input config-input-disabled config-input-outlined"
+          class="config-input config-input-disabled"
           disabled=""
           type="text"
           value=""
@@ -16188,7 +16153,7 @@ exports[`ConfigProvider components Input configProvider componentDisabled 1`] =
     </span>
   </span>
   <span
-    class="config-input-affix-wrapper config-input-disabled config-input-affix-wrapper-disabled config-input-outlined config-input-password"
+    class="config-input-affix-wrapper config-input-affix-wrapper-disabled config-input-password"
   >
     <input
       class="config-input config-input-disabled"
@@ -16225,7 +16190,7 @@ exports[`ConfigProvider components Input configProvider componentDisabled 1`] =
     </span>
   </span>
   <textarea
-    class="config-input config-input-outlined config-input-disabled"
+    class="config-input config-input-disabled"
     disabled=""
   />
 </div>
@@ -16237,18 +16202,18 @@ exports[`ConfigProvider components Input configProvider componentSize large 1`]
     class="config-input-group"
   >
     <input
-      class="config-input config-input-lg config-input-outlined"
+      class="config-input config-input-lg"
       type="text"
       value=""
     />
     <span
-      class="config-input-group-wrapper config-input-group-wrapper-lg config-input-group-wrapper-outlined config-input-search config-input-search-large"
+      class="config-input-group-wrapper config-input-search config-input-search-large"
     >
       <span
         class="config-input-wrapper config-input-group"
       >
         <input
-          class="config-input config-input-lg config-input-outlined"
+          class="config-input config-input-lg"
           type="text"
           value=""
         />
@@ -16288,7 +16253,7 @@ exports[`ConfigProvider components Input configProvider componentSize large 1`]
     </span>
   </span>
   <span
-    class="config-input-affix-wrapper config-input-affix-wrapper-lg config-input-outlined config-input-password"
+    class="config-input-affix-wrapper config-input-password config-input-affix-wrapper-lg"
   >
     <input
       class="config-input config-input-lg"
@@ -16324,7 +16289,7 @@ exports[`ConfigProvider components Input configProvider componentSize large 1`]
     </span>
   </span>
   <textarea
-    class="config-input config-input-lg config-input-outlined"
+    class="config-input config-input-lg"
   />
 </div>
 `;
@@ -16335,18 +16300,18 @@ exports[`ConfigProvider components Input configProvider componentSize middle 1`]
     class="config-input-group"
   >
     <input
-      class="config-input config-input-outlined"
+      class="config-input"
       type="text"
       value=""
     />
     <span
-      class="config-input-group-wrapper config-input-group-wrapper-outlined config-input-search config-input-search-middle"
+      class="config-input-group-wrapper config-input-search config-input-search-middle"
     >
       <span
         class="config-input-wrapper config-input-group"
       >
         <input
-          class="config-input config-input-outlined"
+          class="config-input"
           type="text"
           value=""
         />
@@ -16386,7 +16351,7 @@ exports[`ConfigProvider components Input configProvider componentSize middle 1`]
     </span>
   </span>
   <span
-    class="config-input-affix-wrapper config-input-outlined config-input-password"
+    class="config-input-affix-wrapper config-input-password"
   >
     <input
       class="config-input"
@@ -16422,7 +16387,7 @@ exports[`ConfigProvider components Input configProvider componentSize middle 1`]
     </span>
   </span>
   <textarea
-    class="config-input config-input-outlined"
+    class="config-input"
   />
 </div>
 `;
@@ -16433,18 +16398,18 @@ exports[`ConfigProvider components Input configProvider componentSize small 1`]
     class="config-input-group"
   >
     <input
-      class="config-input config-input-sm config-input-outlined"
+      class="config-input config-input-sm"
       type="text"
       value=""
     />
     <span
-      class="config-input-group-wrapper config-input-group-wrapper-sm config-input-group-wrapper-outlined config-input-search config-input-search-small"
+      class="config-input-group-wrapper config-input-search config-input-search-small"
     >
       <span
         class="config-input-wrapper config-input-group"
       >
         <input
-          class="config-input config-input-sm config-input-outlined"
+          class="config-input config-input-sm"
           type="text"
           value=""
         />
@@ -16484,7 +16449,7 @@ exports[`ConfigProvider components Input configProvider componentSize small 1`]
     </span>
   </span>
   <span
-    class="config-input-affix-wrapper config-input-affix-wrapper-sm config-input-outlined config-input-password"
+    class="config-input-affix-wrapper config-input-password config-input-affix-wrapper-sm"
   >
     <input
       class="config-input config-input-sm"
@@ -16520,7 +16485,7 @@ exports[`ConfigProvider components Input configProvider componentSize small 1`]
     </span>
   </span>
   <textarea
-    class="config-input config-input-sm config-input-outlined"
+    class="config-input config-input-sm"
   />
 </div>
 `;
@@ -16531,18 +16496,18 @@ exports[`ConfigProvider components Input normal 1`] = `
     class="ant-input-group"
   >
     <input
-      class="ant-input ant-input-outlined"
+      class="ant-input"
       type="text"
       value=""
     />
     <span
-      class="ant-input-group-wrapper ant-input-group-wrapper-outlined ant-input-search"
+      class="ant-input-group-wrapper ant-input-search"
     >
       <span
         class="ant-input-wrapper ant-input-group"
       >
         <input
-          class="ant-input ant-input-outlined"
+          class="ant-input"
           type="text"
           value=""
         />
@@ -16582,7 +16547,7 @@ exports[`ConfigProvider components Input normal 1`] = `
     </span>
   </span>
   <span
-    class="ant-input-affix-wrapper ant-input-outlined ant-input-password"
+    class="ant-input-affix-wrapper ant-input-password"
   >
     <input
       class="ant-input"
@@ -16618,7 +16583,7 @@ exports[`ConfigProvider components Input normal 1`] = `
     </span>
   </span>
   <textarea
-    class="ant-input ant-input-outlined"
+    class="ant-input"
   />
 </div>
 `;
@@ -16629,18 +16594,18 @@ exports[`ConfigProvider components Input prefixCls 1`] = `
     class="prefix-Input"
   >
     <input
-      class="prefix-Input prefix-Input-outlined"
+      class="prefix-Input"
       type="text"
       value=""
     />
     <span
-      class="ant-input-group-wrapper ant-input-group-wrapper-outlined prefix-Input"
+      class="ant-input-group-wrapper prefix-Input"
     >
       <span
         class="ant-input-wrapper ant-input-group"
       >
         <input
-          class="ant-input ant-input-outlined"
+          class="ant-input"
           type="text"
           value=""
         />
@@ -16680,7 +16645,7 @@ exports[`ConfigProvider components Input prefixCls 1`] = `
     </span>
   </span>
   <span
-    class="ant-input-affix-wrapper ant-input-outlined prefix-Input"
+    class="ant-input-affix-wrapper prefix-Input"
   >
     <input
       class="ant-input"
@@ -16716,14 +16681,14 @@ exports[`ConfigProvider components Input prefixCls 1`] = `
     </span>
   </span>
   <textarea
-    class="prefix-Input prefix-Input-outlined"
+    class="prefix-Input"
   />
 </div>
 `;
 
 exports[`ConfigProvider components InputNumber configProvider 1`] = `
 <div
-  class="config-input-number config-input-number-outlined"
+  class="config-input-number"
 >
   <div
     class="config-input-number-handler-wrap"
@@ -16799,7 +16764,7 @@ exports[`ConfigProvider components InputNumber configProvider 1`] = `
 
 exports[`ConfigProvider components InputNumber configProvider componentDisabled 1`] = `
 <div
-  class="config-input-number config-input-number-outlined config-input-number-disabled"
+  class="config-input-number config-input-number-disabled"
 >
   <div
     class="config-input-number-handler-wrap"
@@ -16876,7 +16841,7 @@ exports[`ConfigProvider components InputNumber configProvider componentDisabled
 
 exports[`ConfigProvider components InputNumber configProvider componentSize large 1`] = `
 <div
-  class="config-input-number config-input-number-lg config-input-number-outlined"
+  class="config-input-number config-input-number-lg"
 >
   <div
     class="config-input-number-handler-wrap"
@@ -16952,7 +16917,7 @@ exports[`ConfigProvider components InputNumber configProvider componentSize larg
 
 exports[`ConfigProvider components InputNumber configProvider componentSize middle 1`] = `
 <div
-  class="config-input-number config-input-number-outlined"
+  class="config-input-number"
 >
   <div
     class="config-input-number-handler-wrap"
@@ -17028,7 +16993,7 @@ exports[`ConfigProvider components InputNumber configProvider componentSize midd
 
 exports[`ConfigProvider components InputNumber configProvider componentSize small 1`] = `
 <div
-  class="config-input-number config-input-number-sm config-input-number-outlined"
+  class="config-input-number config-input-number-sm"
 >
   <div
     class="config-input-number-handler-wrap"
@@ -17104,7 +17069,7 @@ exports[`ConfigProvider components InputNumber configProvider componentSize smal
 
 exports[`ConfigProvider components InputNumber normal 1`] = `
 <div
-  class="ant-input-number ant-input-number-outlined"
+  class="ant-input-number"
 >
   <div
     class="ant-input-number-handler-wrap"
@@ -17180,7 +17145,7 @@ exports[`ConfigProvider components InputNumber normal 1`] = `
 
 exports[`ConfigProvider components InputNumber prefixCls 1`] = `
 <div
-  class="prefix-InputNumber prefix-InputNumber-outlined"
+  class="prefix-InputNumber"
 >
   <div
     class="prefix-InputNumber-handler-wrap"