Merge branch '2.x' into dev

2020-10-29 22:03:29 +08:00
parent 1bb46ab003 0cb55c33e0
commit 2293b652ab
7 changed files with 81 additions and 13 deletions
@@ -135,8 +135,10 @@ export default createComponent({
      >
        {renderHeader()}
        {renderDescription()}
-        {renderOptions()}
-        {slots.default && <div class={bem('content')}>{slots.default()}</div>}
+        <div class={bem('content')}>
+          {renderOptions()}
+          {slots.default?.()}
+        </div>
        {renderCancel()}
      </Popup>
    );