From aea9cb168c66185a9f8af853a222dbe43b95745e Mon Sep 17 00:00:00 2001 From: zhf <1204297681@qq.com> Date: Tue, 12 Mar 2024 19:09:54 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=BD=93=E4=B8=8A?= =?UTF-8?q?=E4=B8=8B=E6=96=87=E4=B8=AD=E9=85=8D=E7=BD=AEsrfreadonly=3Dtrue?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E7=BC=96=E8=BE=91=E8=A7=86=E5=9B=BE=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E5=91=88=E7=8E=B0=E4=B8=8D=E6=AD=A3=E7=A1=AE=E5=BC=82?= =?UTF-8?q?=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + src/editor/array/ibiz-array/ibiz-array.tsx | 7 ++++++- .../autocomplete/ibiz-autocomplete/ibiz-autocomplete.scss | 8 +++++++- .../autocomplete/ibiz-autocomplete/ibiz-autocomplete.tsx | 7 ++++++- src/editor/cascader/ibiz-cascader/ibiz-cascader.scss | 6 ++++++ src/editor/cascader/ibiz-cascader/ibiz-cascader.tsx | 7 ++++++- .../ibiz-checkbox-list/ibiz-checkbox-list.tsx | 7 ++++++- src/editor/check-box/ibiz-checkbox/ibiz-checkbox.tsx | 7 ++++++- .../color-picker/ibiz-color-picker/ibiz-color-picker.scss | 2 ++ .../color-picker/ibiz-color-picker/ibiz-color-picker.tsx | 7 ++++++- src/editor/data-picker/ibiz-mpicker/ibiz-mpicker.tsx | 7 ++++++- .../ibiz-picker-dropdown/ibiz-picker-dropdown.tsx | 7 ++++++- .../data-picker/ibiz-picker-link/ibiz-picker-link.tsx | 7 ++++++- .../ibiz-picker-select-view/ibiz-picker-select-view.scss | 6 ++++++ .../ibiz-picker-select-view/ibiz-picker-select-view.tsx | 7 ++++++- src/editor/data-picker/ibiz-picker/ibiz-picker.scss | 2 ++ src/editor/data-picker/ibiz-picker/ibiz-picker.tsx | 7 ++++++- .../date-picker/ibiz-date-picker/ibiz-date-picker.tsx | 7 ++++++- .../ibiz-date-range-picker/ibiz-date-range-picker.scss | 6 ++++++ .../ibiz-date-range-picker/ibiz-date-range-picker.tsx | 7 ++++++- src/editor/dropdown-list/ibiz-dropdown/ibiz-dropdown.tsx | 7 ++++++- src/editor/list-box/ibiz-list-box/ibiz-list-box.tsx | 7 ++++++- .../ibiz-number-range-picker/ibiz-number-range-picker.tsx | 7 ++++++- src/editor/radio-button-list/ibiz-radio/ibiz-radio.tsx | 7 ++++++- src/editor/rate/ibiz-rate/ibiz-rate.tsx | 7 ++++++- src/editor/raw/ibiz-raw/ibiz-raw.tsx | 7 ++++++- src/editor/slider/ibiz-slider/ibiz-slider.tsx | 7 ++++++- src/editor/span/span-link/span-link.tsx | 7 ++++++- src/editor/span/span/span.tsx | 7 ++++++- src/editor/stepper/ibiz-stepper/ibiz-stepper.scss | 7 +++++++ src/editor/stepper/ibiz-stepper/ibiz-stepper.tsx | 7 ++++++- src/editor/switch/ibiz-switch/ibiz-switch.tsx | 7 ++++++- src/editor/text-box/ibiz-input-ip/ibiz-input-ip.tsx | 7 ++++++- .../text-box/ibiz-input-number/ibiz-input-number.scss | 2 ++ .../text-box/ibiz-input-number/ibiz-input-number.tsx | 7 ++++++- src/editor/text-box/input/input.tsx | 7 ++++++- src/editor/upload/ibiz-file-upload/ibiz-file-upload.tsx | 7 ++++++- .../upload/ibiz-image-preview/ibiz-image-preview.tsx | 7 ++++++- src/editor/upload/ibiz-image-upload/ibiz-image-upload.tsx | 7 ++++++- .../user/ibiz-searchcond-edit/ibiz-searchcond-edit.tsx | 7 ++++++- 40 files changed, 225 insertions(+), 32 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aa9c60fe..dd252ba6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ - 修复跳转回首页下一级缓存的导航类视图时，浏览器后退会出现导航页本身的路由的问题 - 修复表格界面行为组列样式异常 +- 修复当上下文中配置srfreadonly=true时，编辑视图样式呈现不正确异常 ## [0.6.6] - 2024-03-10 diff --git a/src/editor/array/ibiz-array/ibiz-array.tsx b/src/editor/array/ibiz-array/ibiz-array.tsx index 9c8cf5ea..4e1fe477 100644 --- a/src/editor/array/ibiz-array/ibiz-array.tsx +++ b/src/editor/array/ibiz-array/ibiz-array.tsx @@ -75,7 +75,12 @@ export const IBizArray = defineComponent({ // 是否显示表单默认内容 const showFormDefaultContent = computed(() => { - if (props.controlParams && props.controlParams.editmode === 'hover') { + if ( + props.controlParams && + props.controlParams.editmode === 'hover' && + !props.readonly && + !props.disabled + ) { return true; } return false; diff --git a/src/editor/autocomplete/ibiz-autocomplete/ibiz-autocomplete.scss b/src/editor/autocomplete/ibiz-autocomplete/ibiz-autocomplete.scss index bb61d929..31aba048 100644 --- a/src/editor/autocomplete/ibiz-autocomplete/ibiz-autocomplete.scss +++ b/src/editor/autocomplete/ibiz-autocomplete/ibiz-autocomplete.scss @@ -3,7 +3,13 @@ @include b(autocomplete-input) { width: 100%; - } + } + + @include m(readonly) { + font-size: getCssVar(form-item, font-size); + line-height: getCssVar(editor, default, line-height); + color: getCssVar('form-item', 'readonly-color'); + } } // 表单下的时间选择器默认显示，悬浮上去显示编辑器 diff --git a/src/editor/autocomplete/ibiz-autocomplete/ibiz-autocomplete.tsx b/src/editor/autocomplete/ibiz-autocomplete/ibiz-autocomplete.tsx index e03d3000..be1df874 100644 --- a/src/editor/autocomplete/ibiz-autocomplete/ibiz-autocomplete.tsx +++ b/src/editor/autocomplete/ibiz-autocomplete/ibiz-autocomplete.tsx @@ -39,7 +39,12 @@ export const IBizAutoComplete = defineComponent({ // 是否显示表单默认内容 const showFormDefaultContent = computed(() => { - if (props.controlParams && props.controlParams.editmode === 'hover') { + if ( + props.controlParams && + props.controlParams.editmode === 'hover' && + !props.readonly && + !props.disabled + ) { return true; } return false; diff --git a/src/editor/cascader/ibiz-cascader/ibiz-cascader.scss b/src/editor/cascader/ibiz-cascader/ibiz-cascader.scss index fcba2873..7847f8fa 100644 --- a/src/editor/cascader/ibiz-cascader/ibiz-cascader.scss +++ b/src/editor/cascader/ibiz-cascader/ibiz-cascader.scss @@ -2,6 +2,12 @@ .el-cascader { width: 100%; } + + @include m(readonly) { + font-size: getCssVar(form-item, font-size); + line-height: getCssVar(editor, default, line-height); + color: getCssVar('form-item', 'readonly-color'); + } } // 表单下的时间选择器默认显示，悬浮上去显示编辑器 diff --git a/src/editor/cascader/ibiz-cascader/ibiz-cascader.tsx b/src/editor/cascader/ibiz-cascader/ibiz-cascader.tsx index 6dce3fd4..cfa9549c 100644 --- a/src/editor/cascader/ibiz-cascader/ibiz-cascader.tsx +++ b/src/editor/cascader/ibiz-cascader/ibiz-cascader.tsx @@ -113,7 +113,12 @@ export const IBizCascader = defineComponent({ // 是否显示表单默认内容 const showFormDefaultContent = computed(() => { - if (props.controlParams && props.controlParams.editmode === 'hover') { + if ( + props.controlParams && + props.controlParams.editmode === 'hover' && + !props.readonly && + !props.disabled + ) { return true; } return false; diff --git a/src/editor/check-box-list/ibiz-checkbox-list/ibiz-checkbox-list.tsx b/src/editor/check-box-list/ibiz-checkbox-list/ibiz-checkbox-list.tsx index 1fcae9d2..30980c7e 100644 --- a/src/editor/check-box-list/ibiz-checkbox-list/ibiz-checkbox-list.tsx +++ b/src/editor/check-box-list/ibiz-checkbox-list/ibiz-checkbox-list.tsx @@ -22,7 +22,12 @@ export const IBizCheckboxList = defineComponent({ // 是否显示表单默认内容 const showFormDefaultContent = computed(() => { - if (props.controlParams && props.controlParams.editmode === 'hover') { + if ( + props.controlParams && + props.controlParams.editmode === 'hover' && + !props.readonly && + !props.disabled + ) { return true; } return false; diff --git a/src/editor/check-box/ibiz-checkbox/ibiz-checkbox.tsx b/src/editor/check-box/ibiz-checkbox/ibiz-checkbox.tsx index e1d66b5c..93ee92a0 100644 --- a/src/editor/check-box/ibiz-checkbox/ibiz-checkbox.tsx +++ b/src/editor/check-box/ibiz-checkbox/ibiz-checkbox.tsx @@ -32,7 +32,12 @@ export const IBizCheckbox = defineComponent({ // 是否显示表单默认内容 const showFormDefaultContent = computed(() => { - if (props.controlParams && props.controlParams.editmode === 'hover') { + if ( + props.controlParams && + props.controlParams.editmode === 'hover' && + !props.readonly && + !props.disabled + ) { return true; } return false; diff --git a/src/editor/color-picker/ibiz-color-picker/ibiz-color-picker.scss b/src/editor/color-picker/ibiz-color-picker/ibiz-color-picker.scss index cf6aca87..15e8edc4 100644 --- a/src/editor/color-picker/ibiz-color-picker/ibiz-color-picker.scss +++ b/src/editor/color-picker/ibiz-color-picker/ibiz-color-picker.scss @@ -24,6 +24,8 @@ // 只读模式显示 @include m(readonly) { + font-size: getCssVar(form-item, font-size); + line-height: getCssVar(editor, default, line-height); color: getCssVar(form-item, readonly-color); @include overflow-wrap; diff --git a/src/editor/color-picker/ibiz-color-picker/ibiz-color-picker.tsx b/src/editor/color-picker/ibiz-color-picker/ibiz-color-picker.tsx index 15d46ab6..74dc5b32 100644 --- a/src/editor/color-picker/ibiz-color-picker/ibiz-color-picker.tsx +++ b/src/editor/color-picker/ibiz-color-picker/ibiz-color-picker.tsx @@ -45,7 +45,12 @@ export const IBizColorPicker = defineComponent({ // 是否显示表单默认内容 const showFormDefaultContent = computed(() => { - if (props.controlParams && props.controlParams.editmode === 'hover') { + if ( + props.controlParams && + props.controlParams.editmode === 'hover' && + !props.readonly && + !props.disabled + ) { return true; } return false; diff --git a/src/editor/data-picker/ibiz-mpicker/ibiz-mpicker.tsx b/src/editor/data-picker/ibiz-mpicker/ibiz-mpicker.tsx index 2a5908bb..5c70fe54 100644 --- a/src/editor/data-picker/ibiz-mpicker/ibiz-mpicker.tsx +++ b/src/editor/data-picker/ibiz-mpicker/ibiz-mpicker.tsx @@ -40,7 +40,12 @@ export const IBizMPicker = defineComponent({ // 是否显示表单默认内容 const showFormDefaultContent = computed(() => { - if (props.controlParams && props.controlParams.editmode === 'hover') { + if ( + props.controlParams && + props.controlParams.editmode === 'hover' && + !props.readonly && + !props.disabled + ) { return true; } return false; diff --git a/src/editor/data-picker/ibiz-picker-dropdown/ibiz-picker-dropdown.tsx b/src/editor/data-picker/ibiz-picker-dropdown/ibiz-picker-dropdown.tsx index 04afb426..1800098b 100644 --- a/src/editor/data-picker/ibiz-picker-dropdown/ibiz-picker-dropdown.tsx +++ b/src/editor/data-picker/ibiz-picker-dropdown/ibiz-picker-dropdown.tsx @@ -47,7 +47,12 @@ export const IBizPickerDropDown = defineComponent({ // 是否显示表单默认内容 const showFormDefaultContent = computed(() => { - if (props.controlParams && props.controlParams.editmode === 'hover') { + if ( + props.controlParams && + props.controlParams.editmode === 'hover' && + !props.readonly && + !props.disabled + ) { return true; } return false; diff --git a/src/editor/data-picker/ibiz-picker-link/ibiz-picker-link.tsx b/src/editor/data-picker/ibiz-picker-link/ibiz-picker-link.tsx index d695cd09..983e6b55 100644 --- a/src/editor/data-picker/ibiz-picker-link/ibiz-picker-link.tsx +++ b/src/editor/data-picker/ibiz-picker-link/ibiz-picker-link.tsx @@ -22,7 +22,12 @@ export const IBizPickerLink = defineComponent({ // 是否显示表单默认内容 const showFormDefaultContent = computed(() => { - if (props.controlParams && props.controlParams.editmode === 'hover') { + if ( + props.controlParams && + props.controlParams.editmode === 'hover' && + !props.readonly && + !props.disabled + ) { return true; } return false; diff --git a/src/editor/data-picker/ibiz-picker-select-view/ibiz-picker-select-view.scss b/src/editor/data-picker/ibiz-picker-select-view/ibiz-picker-select-view.scss index c790652c..2fa38b96 100644 --- a/src/editor/data-picker/ibiz-picker-select-view/ibiz-picker-select-view.scss +++ b/src/editor/data-picker/ibiz-picker-select-view/ibiz-picker-select-view.scss @@ -8,6 +8,12 @@ .el-select { width: 100%; } + + @include m(readonly) { + font-size: getCssVar(form-item, font-size); + line-height: getCssVar(editor, default, line-height); + color: getCssVar('form-item', 'readonly-color'); + } } @include b(picker-select-view-popper){ diff --git a/src/editor/data-picker/ibiz-picker-select-view/ibiz-picker-select-view.tsx b/src/editor/data-picker/ibiz-picker-select-view/ibiz-picker-select-view.tsx index ce1e8932..f580338b 100644 --- a/src/editor/data-picker/ibiz-picker-select-view/ibiz-picker-select-view.tsx +++ b/src/editor/data-picker/ibiz-picker-select-view/ibiz-picker-select-view.tsx @@ -90,7 +90,12 @@ export const IBizPickerSelectView = defineComponent({ // 是否显示表单默认内容 const showFormDefaultContent = computed(() => { - if (props.controlParams && props.controlParams.editmode === 'hover') { + if ( + props.controlParams && + props.controlParams.editmode === 'hover' && + !props.readonly && + !props.disabled + ) { return true; } return false; diff --git a/src/editor/data-picker/ibiz-picker/ibiz-picker.scss b/src/editor/data-picker/ibiz-picker/ibiz-picker.scss index 797b35d0..1e7bbaa2 100644 --- a/src/editor/data-picker/ibiz-picker/ibiz-picker.scss +++ b/src/editor/data-picker/ibiz-picker/ibiz-picker.scss @@ -81,6 +81,8 @@ $picker: ( } @include m(readonly) { + font-size: getCssVar(form-item, font-size); + line-height: getCssVar(editor, default, line-height); color: getCssVar('form-item', 'readonly-color'); } } diff --git a/src/editor/data-picker/ibiz-picker/ibiz-picker.tsx b/src/editor/data-picker/ibiz-picker/ibiz-picker.tsx index 4165d182..ef45cf02 100644 --- a/src/editor/data-picker/ibiz-picker/ibiz-picker.tsx +++ b/src/editor/data-picker/ibiz-picker/ibiz-picker.tsx @@ -38,7 +38,12 @@ export const IBizPicker = defineComponent({ // 是否显示表单默认内容 const showFormDefaultContent = computed(() => { - if (props.controlParams && props.controlParams.editmode === 'hover') { + if ( + props.controlParams && + props.controlParams.editmode === 'hover' && + !props.readonly && + !props.disabled + ) { return true; } return false; diff --git a/src/editor/date-picker/ibiz-date-picker/ibiz-date-picker.tsx b/src/editor/date-picker/ibiz-date-picker/ibiz-date-picker.tsx index 80294eed..acb08f46 100644 --- a/src/editor/date-picker/ibiz-date-picker/ibiz-date-picker.tsx +++ b/src/editor/date-picker/ibiz-date-picker/ibiz-date-picker.tsx @@ -33,7 +33,12 @@ export const IBizDatePicker = defineComponent({ // 是否显示表单默认内容 const showFormDefaultContent = computed(() => { - if (props.controlParams && props.controlParams.editmode === 'hover') { + if ( + props.controlParams && + props.controlParams.editmode === 'hover' && + !props.readonly && + !props.disabled + ) { return true; } return false; diff --git a/src/editor/date-range/ibiz-date-range-picker/ibiz-date-range-picker.scss b/src/editor/date-range/ibiz-date-range-picker/ibiz-date-range-picker.scss index e38897d7..254e433e 100644 --- a/src/editor/date-range/ibiz-date-range-picker/ibiz-date-range-picker.scss +++ b/src/editor/date-range/ibiz-date-range-picker/ibiz-date-range-picker.scss @@ -9,6 +9,12 @@ color: getCssVar(form-item, text-color); } } + + @include m(readonly) { + font-size: getCssVar(form-item, font-size); + line-height: getCssVar(editor, default, line-height); + color: getCssVar('form-item', 'readonly-color'); + } } // 表单下的时间选择器默认显示，悬浮上去显示编辑器 diff --git a/src/editor/date-range/ibiz-date-range-picker/ibiz-date-range-picker.tsx b/src/editor/date-range/ibiz-date-range-picker/ibiz-date-range-picker.tsx index 22c31b33..83ed3ae5 100644 --- a/src/editor/date-range/ibiz-date-range-picker/ibiz-date-range-picker.tsx +++ b/src/editor/date-range/ibiz-date-range-picker/ibiz-date-range-picker.tsx @@ -83,7 +83,12 @@ export const IBizDateRangePicker = defineComponent({ // 是否显示表单默认内容 const showFormDefaultContent = computed(() => { - if (props.controlParams && props.controlParams.editmode === 'hover') { + if ( + props.controlParams && + props.controlParams.editmode === 'hover' && + !props.readonly && + !props.disabled + ) { return true; } return false; diff --git a/src/editor/dropdown-list/ibiz-dropdown/ibiz-dropdown.tsx b/src/editor/dropdown-list/ibiz-dropdown/ibiz-dropdown.tsx index 1991acd6..f00af95d 100644 --- a/src/editor/dropdown-list/ibiz-dropdown/ibiz-dropdown.tsx +++ b/src/editor/dropdown-list/ibiz-dropdown/ibiz-dropdown.tsx @@ -60,7 +60,12 @@ export const IBizDropdown = defineComponent({ // 是否显示表单默认内容 const showFormDefaultContent = computed(() => { - if (props.controlParams && props.controlParams.editmode === 'hover') { + if ( + props.controlParams && + props.controlParams.editmode === 'hover' && + !props.readonly && + !props.disabled + ) { return true; } return false; diff --git a/src/editor/list-box/ibiz-list-box/ibiz-list-box.tsx b/src/editor/list-box/ibiz-list-box/ibiz-list-box.tsx index d592e6ff..479de19d 100644 --- a/src/editor/list-box/ibiz-list-box/ibiz-list-box.tsx +++ b/src/editor/list-box/ibiz-list-box/ibiz-list-box.tsx @@ -32,7 +32,12 @@ export const IBizListBox = defineComponent({ // 是否显示表单默认内容 const showFormDefaultContent = computed(() => { - if (props.controlParams && props.controlParams.editmode === 'hover') { + if ( + props.controlParams && + props.controlParams.editmode === 'hover' && + !props.readonly && + !props.disabled + ) { return true; } return false; diff --git a/src/editor/number-range/ibiz-number-range-picker/ibiz-number-range-picker.tsx b/src/editor/number-range/ibiz-number-range-picker/ibiz-number-range-picker.tsx index aa8d8d3d..d780ee01 100644 --- a/src/editor/number-range/ibiz-number-range-picker/ibiz-number-range-picker.tsx +++ b/src/editor/number-range/ibiz-number-range-picker/ibiz-number-range-picker.tsx @@ -80,7 +80,12 @@ export const IBizNumberRangePicker = defineComponent({ // 是否显示表单默认内容 const showFormDefaultContent = computed(() => { - if (props.controlParams && props.controlParams.editmode === 'hover') { + if ( + props.controlParams && + props.controlParams.editmode === 'hover' && + !props.readonly && + !props.disabled + ) { return true; } return false; diff --git a/src/editor/radio-button-list/ibiz-radio/ibiz-radio.tsx b/src/editor/radio-button-list/ibiz-radio/ibiz-radio.tsx index 331f6996..eb7df6ae 100644 --- a/src/editor/radio-button-list/ibiz-radio/ibiz-radio.tsx +++ b/src/editor/radio-button-list/ibiz-radio/ibiz-radio.tsx @@ -61,7 +61,12 @@ export const IBizRadio = defineComponent({ // 是否显示表单默认内容 const showFormDefaultContent = computed(() => { - if (props.controlParams && props.controlParams.editmode === 'hover') { + if ( + props.controlParams && + props.controlParams.editmode === 'hover' && + !props.readonly && + !props.disabled + ) { return true; } return false; diff --git a/src/editor/rate/ibiz-rate/ibiz-rate.tsx b/src/editor/rate/ibiz-rate/ibiz-rate.tsx index ae615061..5f4faa5c 100644 --- a/src/editor/rate/ibiz-rate/ibiz-rate.tsx +++ b/src/editor/rate/ibiz-rate/ibiz-rate.tsx @@ -47,7 +47,12 @@ export const IBizRate = defineComponent({ // 是否显示表单默认内容 const showFormDefaultContent = computed(() => { - if (props.controlParams && props.controlParams.editmode === 'hover') { + if ( + props.controlParams && + props.controlParams.editmode === 'hover' && + !props.readonly && + !props.disabled + ) { return true; } return false; diff --git a/src/editor/raw/ibiz-raw/ibiz-raw.tsx b/src/editor/raw/ibiz-raw/ibiz-raw.tsx index b9837b63..e306c3bc 100644 --- a/src/editor/raw/ibiz-raw/ibiz-raw.tsx +++ b/src/editor/raw/ibiz-raw/ibiz-raw.tsx @@ -42,7 +42,12 @@ export const IBizRaw = defineComponent({ // 是否显示表单默认内容 const showFormDefaultContent = computed(() => { - if (props.controlParams && props.controlParams.editmode === 'hover') { + if ( + props.controlParams && + props.controlParams.editmode === 'hover' && + !props.readonly && + !props.disabled + ) { return true; } return false; diff --git a/src/editor/slider/ibiz-slider/ibiz-slider.tsx b/src/editor/slider/ibiz-slider/ibiz-slider.tsx index 462469a5..12f80886 100644 --- a/src/editor/slider/ibiz-slider/ibiz-slider.tsx +++ b/src/editor/slider/ibiz-slider/ibiz-slider.tsx @@ -63,7 +63,12 @@ export const IBizSlider = defineComponent({ // 是否显示表单默认内容 const showFormDefaultContent = computed(() => { - if (props.controlParams && props.controlParams.editmode === 'hover') { + if ( + props.controlParams && + props.controlParams.editmode === 'hover' && + !props.readonly && + !props.disabled + ) { return true; } return false; diff --git a/src/editor/span/span-link/span-link.tsx b/src/editor/span/span-link/span-link.tsx index 9e8e655c..a3704455 100644 --- a/src/editor/span/span-link/span-link.tsx +++ b/src/editor/span/span-link/span-link.tsx @@ -42,7 +42,12 @@ export const IBizSpanLink = defineComponent({ // 是否显示表单默认内容 const showFormDefaultContent = computed(() => { - if (props.controlParams && props.controlParams.editmode === 'hover') { + if ( + props.controlParams && + props.controlParams.editmode === 'hover' && + !props.readonly && + !props.disabled + ) { return true; } return false; diff --git a/src/editor/span/span/span.tsx b/src/editor/span/span/span.tsx index 6ae7555a..29cd1d39 100644 --- a/src/editor/span/span/span.tsx +++ b/src/editor/span/span/span.tsx @@ -137,7 +137,12 @@ export const IBizSpan = defineComponent({ // 是否显示表单默认内容 const showFormDefaultContent = computed(() => { - if (props.controlParams && props.controlParams.editmode === 'hover') { + if ( + props.controlParams && + props.controlParams.editmode === 'hover' && + !props.readonly && + !props.disabled + ) { return true; } return false; diff --git a/src/editor/stepper/ibiz-stepper/ibiz-stepper.scss b/src/editor/stepper/ibiz-stepper/ibiz-stepper.scss index 03b12901..e25c79a7 100644 --- a/src/editor/stepper/ibiz-stepper/ibiz-stepper.scss +++ b/src/editor/stepper/ibiz-stepper/ibiz-stepper.scss @@ -1,3 +1,10 @@ +@include b(stepper) { + @include m(readonly) { + font-size: getCssVar(form-item, font-size); + line-height: getCssVar(editor, default, line-height); + color: getCssVar('form-item', 'readonly-color'); + } +} @include b(form-item){ @include b(stepper) { diff --git a/src/editor/stepper/ibiz-stepper/ibiz-stepper.tsx b/src/editor/stepper/ibiz-stepper/ibiz-stepper.tsx index e9c6b38b..569dcd09 100644 --- a/src/editor/stepper/ibiz-stepper/ibiz-stepper.tsx +++ b/src/editor/stepper/ibiz-stepper/ibiz-stepper.tsx @@ -46,7 +46,12 @@ export const IBizStepper = defineComponent({ // 是否显示表单默认内容 const showFormDefaultContent = computed(() => { - if (props.controlParams && props.controlParams.editmode === 'hover') { + if ( + props.controlParams && + props.controlParams.editmode === 'hover' && + !props.readonly && + !props.disabled + ) { return true; } return false; diff --git a/src/editor/switch/ibiz-switch/ibiz-switch.tsx b/src/editor/switch/ibiz-switch/ibiz-switch.tsx index 8af5bfa3..20da0204 100644 --- a/src/editor/switch/ibiz-switch/ibiz-switch.tsx +++ b/src/editor/switch/ibiz-switch/ibiz-switch.tsx @@ -52,7 +52,12 @@ export const IBizSwitch = defineComponent({ // 是否显示表单默认内容 const showFormDefaultContent = computed(() => { - if (props.controlParams && props.controlParams.editmode === 'hover') { + if ( + props.controlParams && + props.controlParams.editmode === 'hover' && + !props.readonly && + !props.disabled + ) { return true; } return false; diff --git a/src/editor/text-box/ibiz-input-ip/ibiz-input-ip.tsx b/src/editor/text-box/ibiz-input-ip/ibiz-input-ip.tsx index d184c047..795ec84c 100644 --- a/src/editor/text-box/ibiz-input-ip/ibiz-input-ip.tsx +++ b/src/editor/text-box/ibiz-input-ip/ibiz-input-ip.tsx @@ -19,7 +19,12 @@ export const IBizInputIP = defineComponent({ // 是否显示表单默认内容 const showFormDefaultContent = computed(() => { - if (props.controlParams && props.controlParams.editmode === 'hover') { + if ( + props.controlParams && + props.controlParams.editmode === 'hover' && + !props.readonly && + !props.disabled + ) { return true; } return false; diff --git a/src/editor/text-box/ibiz-input-number/ibiz-input-number.scss b/src/editor/text-box/ibiz-input-number/ibiz-input-number.scss index 9704aa76..cdc2b0c0 100644 --- a/src/editor/text-box/ibiz-input-number/ibiz-input-number.scss +++ b/src/editor/text-box/ibiz-input-number/ibiz-input-number.scss @@ -32,6 +32,8 @@ // 只读模式显示 @include m(readonly) { + font-size: getCssVar(form-item, font-size); + line-height: getCssVar(editor, default, line-height); color: getCssVar(form-item, readonly-color); @include overflow-wrap; diff --git a/src/editor/text-box/ibiz-input-number/ibiz-input-number.tsx b/src/editor/text-box/ibiz-input-number/ibiz-input-number.tsx index af5f9651..b16f04f7 100644 --- a/src/editor/text-box/ibiz-input-number/ibiz-input-number.tsx +++ b/src/editor/text-box/ibiz-input-number/ibiz-input-number.tsx @@ -43,7 +43,12 @@ export const IBizInputNumber = defineComponent({ // 是否显示表单默认内容 const showFormDefaultContent = computed(() => { - if (props.controlParams && props.controlParams.editmode === 'hover') { + if ( + props.controlParams && + props.controlParams.editmode === 'hover' && + !props.readonly && + !props.disabled + ) { return true; } return false; diff --git a/src/editor/text-box/input/input.tsx b/src/editor/text-box/input/input.tsx index 791442eb..e839336c 100644 --- a/src/editor/text-box/input/input.tsx +++ b/src/editor/text-box/input/input.tsx @@ -64,7 +64,12 @@ export const IBizInput = defineComponent({ // 是否显示表单默认内容 const showFormDefaultContent = computed(() => { - if (props.controlParams && props.controlParams.editmode === 'hover') { + if ( + props.controlParams && + props.controlParams.editmode === 'hover' && + !props.readonly && + !props.disabled + ) { return true; } return false; diff --git a/src/editor/upload/ibiz-file-upload/ibiz-file-upload.tsx b/src/editor/upload/ibiz-file-upload/ibiz-file-upload.tsx index 65ee1388..1cb6ebbb 100644 --- a/src/editor/upload/ibiz-file-upload/ibiz-file-upload.tsx +++ b/src/editor/upload/ibiz-file-upload/ibiz-file-upload.tsx @@ -47,7 +47,12 @@ export const IBizFileUpload = defineComponent({ // 是否显示表单默认内容 const showFormDefaultContent = computed(() => { - if (props.controlParams && props.controlParams.editmode === 'hover') { + if ( + props.controlParams && + props.controlParams.editmode === 'hover' && + !props.readonly && + !props.disabled + ) { return true; } return false; diff --git a/src/editor/upload/ibiz-image-preview/ibiz-image-preview.tsx b/src/editor/upload/ibiz-image-preview/ibiz-image-preview.tsx index 36d15173..8ce9f862 100644 --- a/src/editor/upload/ibiz-image-preview/ibiz-image-preview.tsx +++ b/src/editor/upload/ibiz-image-preview/ibiz-image-preview.tsx @@ -19,7 +19,12 @@ export const IBizImagePreview = defineComponent({ // 是否显示表单默认内容 const showFormDefaultContent = computed(() => { - if (props.controlParams && props.controlParams.editmode === 'hover') { + if ( + props.controlParams && + props.controlParams.editmode === 'hover' && + !props.readonly && + !props.disabled + ) { return true; } return false; diff --git a/src/editor/upload/ibiz-image-upload/ibiz-image-upload.tsx b/src/editor/upload/ibiz-image-upload/ibiz-image-upload.tsx index 6c7cbdcb..eb59cd79 100644 --- a/src/editor/upload/ibiz-image-upload/ibiz-image-upload.tsx +++ b/src/editor/upload/ibiz-image-upload/ibiz-image-upload.tsx @@ -57,7 +57,12 @@ export const IBizImageUpload = defineComponent({ // 是否显示表单默认内容 const showFormDefaultContent = computed(() => { - if (props.controlParams && props.controlParams.editmode === 'hover') { + if ( + props.controlParams && + props.controlParams.editmode === 'hover' && + !props.readonly && + !props.disabled + ) { return true; } return false; diff --git a/src/editor/user/ibiz-searchcond-edit/ibiz-searchcond-edit.tsx b/src/editor/user/ibiz-searchcond-edit/ibiz-searchcond-edit.tsx index ab1e3265..9da5eca9 100644 --- a/src/editor/user/ibiz-searchcond-edit/ibiz-searchcond-edit.tsx +++ b/src/editor/user/ibiz-searchcond-edit/ibiz-searchcond-edit.tsx @@ -44,7 +44,12 @@ export const IBizSearchCondEdit = defineComponent({ // 是否显示表单默认内容 const showFormDefaultContent = computed(() => { - if (props.controlParams && props.controlParams.editmode === 'hover') { + if ( + props.controlParams && + props.controlParams.editmode === 'hover' && + !props.readonly && + !props.disabled + ) { return true; } return false; -- Gitee