Merge branch '2.x' into dev

2020-11-15 11:16:02 +08:00
parent d47353e8ba d78438a899
commit 6c6ea01599
7 changed files with 46 additions and 48 deletions
@@ -10,6 +10,8 @@ export default createComponent({
    title: Boolean,
    round: Boolean,
    avatar: Boolean,
+    avatarSize: [Number, String],
+    titleWidth: [Number, String],
    row: {
      type: [Number, String],
      default: 0,
@@ -22,18 +24,10 @@ export default createComponent({
      type: Boolean,
      default: true,
    },
-    avatarSize: {
-      type: String,
-      default: '32px',
-    },
    avatarShape: {
      type: String as PropType<'square' | 'round'>,
      default: 'round',
    },
-    titleWidth: {
-      type: [Number, String],
-      default: '40%',
-    },
    rowWidth: {
      type: [Number, String, Array] as PropType<
        number | string | (number | string)[]