diff --git a/CHANGELOG.md b/CHANGELOG.md index 00b4e4fe8c86997e1edbbaeeb517f89ba1dd6303..5b3db17d2032c391808778325799292acf0d9bdd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,8 @@ ### Added - 新增编辑视图识别显示信息栏配置 +- 修改表单项readonly状态的取值(从控制器状态中获取) + ### Fixed - 修复分页搜索视图视图头是否显示计算异常 diff --git a/src/control/form/form-detail/form-item/form-item.tsx b/src/control/form/form-detail/form-item/form-item.tsx index 12277f6dc4df35280eac9cbd563cfedb146ed0f1..d96a2ace1ccf1ab08bf30e0729502f8adda98e2e 100644 --- a/src/control/form/form-detail/form-item/form-item.tsx +++ b/src/control/form/form-detail/form-item/form-item.tsx @@ -38,7 +38,7 @@ export const FormItem = defineComponent({ data: this.controller.data, controller: this.controller.editor, disabled: this.controller.state.disabled, - readonly: this.controller.model.editor!.readOnly, + readonly: this.controller.state.readonly, onChange: this.onValueChange, controlParams: this.controller.form.controlParams, onFocus: (event: MouseEvent) => this.c.onFocus(event), diff --git a/src/control/form/form-detail/form-mdctrl/form-mdctrl-repeater/repeater-grid/repeater-grid.tsx b/src/control/form/form-detail/form-mdctrl/form-mdctrl-repeater/repeater-grid/repeater-grid.tsx index 25d38ecab8c93bba725f9c3d5e125e24e6369882..64fcd56e5ff77497c3a4e8e1d389166f3d3a5cf9 100644 --- a/src/control/form/form-detail/form-mdctrl/form-mdctrl-repeater/repeater-grid/repeater-grid.tsx +++ b/src/control/form/form-detail/form-mdctrl/form-mdctrl-repeater/repeater-grid/repeater-grid.tsx @@ -223,7 +223,7 @@ export const RepeaterGrid = defineComponent({ data: formItemC.data, controller: formItemC.editor, disabled: formItemC.state.disabled, - readonly: formItemC.model.editor!.readOnly, + readonly: formItemC.state.readonly, onChange: (val: unknown, name?: string): void => { formItemC.setDataValue(val, name); },