Merge branch 'dev' into next

2020-09-05 07:17:49 +08:00
parent 71bae3fcb4 d0eb103cba
commit f19386fe1f
82 changed files with 264 additions and 228 deletions
@@ -308,6 +308,7 @@ export default createComponent({
    genColumnItems() {
      return this.formattedColumns.map((item, columnIndex) => (
        <PickerColumn
+          readonly={this.readonly}
          valueKey={this.valueKey}
          allowHtml={this.allowHtml}
          className={item.className}