Merge branch 'dev' into next

2020-07-25 15:50:49 +08:00
parent 5879abbaf9 5c5761fc86
commit 73d538be05
109 changed files with 1699 additions and 744 deletions
@@ -1,6 +1,5 @@
 // Utils
 import { createNamespace } from '../utils';
-import { BORDER_SURROUND } from '../utils/constant';

 // Components
 import Icon from '../icon';
@@ -56,7 +55,7 @@ export default createComponent({
          <span
            key="content"
            style={style}
-            class={[bem([classes, type]), { [BORDER_SURROUND]: plain }]}
+            class={bem([classes, type])}
          >
            {slots.default?.()}
            {CloseIcon}