Merge branch 'dev' into next

2020-09-07 20:41:50 +08:00
parent b9dbb1bc8a 601277fbe8
commit 7f87c57d12
8 changed files with 20 additions and 22 deletions
@@ -1,5 +1,5 @@
 // Utils
-import { createNamespace, isDef, pick } from '../utils';
+import { createNamespace, pick } from '../utils';

 // Components
 import Popup, { popupSharedProps } from '../popup';
@@ -102,7 +102,7 @@ export default createComponent({
    };

    const renderCancelText = () => {
-      const text = isDef(props.cancelText) ? props.cancelText : t('cancel');
+      const text = props.cancelText ?? t('cancel');
      if (text) {
        return (
          <button type="button" class={bem('cancel')} onClick={onCancel}>