Merge branch 'dev' into next

2020-09-06 07:59:45 +08:00
parent f19386fe1f aefec84e14
commit b01a587099
12 changed files with 109 additions and 28 deletions
@@ -21,6 +21,10 @@ export default createComponent({
      type: Boolean,
      default: true,
    },
+    closeable: {
+      type: Boolean,
+      default: true,
+    },
    closeIcon: {
      type: String,
      default: 'cross',
@@ -50,11 +54,13 @@ export default createComponent({
        return (
          <div class={bem('header')}>
            {props.title}
-            <Icon
-              name={props.closeIcon}
-              class={bem('close')}
-              onClick={onCancel}
-            />
+            {props.closeable && (
+              <Icon
+                name={props.closeIcon}
+                class={bem('close')}
+                onClick={onCancel}
+              />
+            )}
          </div>
        );
      }