diff --git a/examples/docs/en-US/form.md b/examples/docs/en-US/form.md index 57eff57b6..1d62ae939 100644 --- a/examples/docs/en-US/form.md +++ b/examples/docs/en-US/form.md @@ -841,7 +841,9 @@ All components in a Form inherit their `size` attribute from that Form. Similarl | show-message | whether to show the error message | boolean | — | true | | inline-message | whether to display the error message inline with the form item | boolean | — | false | | status-icon | whether to display an icon indicating the validation result | boolean | — | false | -| size | control the size of components in this form | string | medium / small / mini | - | +| validate-on-rule-change | whether to trigger validation when the `rules` prop is changed | boolean | — | true | +| size | control the size of components in this form | string | medium / small / mini | — | +| disabled | whether to disabled all components in this form. If set to true, it cannot be overridden by its inner components' `disabled` prop | boolean | — | false | ### Form Methods diff --git a/examples/docs/es/form.md b/examples/docs/es/form.md index ee8d9d261..265128b4f 100644 --- a/examples/docs/es/form.md +++ b/examples/docs/es/form.md @@ -846,7 +846,9 @@ Todos los componentes de un formulario heredan su atributo `size`. De manera sim | show-message | si mostrar o no el mensaje de error | boolean | — | true | | inline-message | si desea visualizar el mensaje de error inline con la posición del form item | boolean | — | false | | status-icon | si desea visualizar un icono que indique el resultado de la validación | boolean | — | false | -| size | el tamaño de los componentes en este form | string | medium / small / mini | - | +| validate-on-rule-change | whether to trigger validation when the `rules` prop is changed | boolean | — | true | +| size | el tamaño de los componentes en este form | string | medium / small / mini | — | +| disabled | whether to disabled all components in this form. If set to true, it cannot be overridden by its inner components' `disabled` prop | boolean | — | false | ### Form Metodos diff --git a/examples/docs/zh-CN/form.md b/examples/docs/zh-CN/form.md index 82d1e1fe8..a3077ac78 100644 --- a/examples/docs/zh-CN/form.md +++ b/examples/docs/zh-CN/form.md @@ -829,7 +829,9 @@ W3C 标准中有如下[规定](https://www.w3.org/MarkUp/html-spec/html-spec_8.h | show-message | 是否显示校验错误信息 | boolean | — | true | | inline-message | 是否以行内形式展示校验信息 | boolean | — | false | | status-icon | 是否在输入框中显示校验结果反馈图标 | boolean | — | false | -| size | 用于控制该表单内组件的尺寸 | string | medium / small / mini | - | +| validate-on-rule-change | 是否在 `rules` 属性改变后立即触发一次验证 | boolean | — | true | +| size | 用于控制该表单内组件的尺寸 | string | medium / small / mini | — | +| disabled | 是否禁用该表单内的所有组件。若设置为 true,则表单内组件上的 disabled 属性不再生效 | boolean | — | false | ### Form Methods diff --git a/packages/cascader/src/main.vue b/packages/cascader/src/main.vue index 14d977053..b861cd2ae 100644 --- a/packages/cascader/src/main.vue +++ b/packages/cascader/src/main.vue @@ -4,7 +4,7 @@ :class="[ { 'is-opened': menuVisible, - 'is-disabled': disabled + 'is-disabled': cascaderDisabled }, cascaderSize ? 'el-cascader--' + cascaderSize : '' ]" @@ -27,7 +27,7 @@ @blur="handleBlur" :validate-event="false" :size="size" - :disabled="disabled" + :disabled="cascaderDisabled" >