diff --git a/CHANGELOG.md b/CHANGELOG.md index aa9c60fe1b074f7a47eabf5ef57b81d0aceee388..dd252ba67b10f7f0aa7e7532ca213c0048d348b2 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 9c8cf5eafc4dce966a131e94fe107b926455b3b0..4e1fe477abdf6fda20a300292a7c3db2e7039e47 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 bb61d9293d496ff14bdb6605c61869bbef8e2bcb..31aba048b0815a3a710f8e0fcf6f0c4bd5f6800d 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 e03d3000e8ffc2d167ef1ddaed8e42ae3b197c36..be1df8746e981db0bfed25df4486bb47892c5aea 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 fcba287333d2775ad6cdf53e2b76c83bc660a23b..7847f8fa8826141127bc26eb3e352f48155ffcfc 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 6dce3fd477ebec0de15164980f6c1b8db997564d..cfa9549c5390daa19b2ea7e991a2ddbfc359627f 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 1fcae9d2387fde44f1642800e485f9a8b2ba2477..30980c7e2de9bd3285a9865a844a2eea659d2013 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 e1d66b5c8ac5b5a7cfda798124c19741a915da63..93ee92a0deb4463175e97546de4dba86467bc84e 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 cf6aca874d5ee16c7b4a3ff06af8fbcdb6f23982..15e8edc4cc37da5bd14fa3dcb3eafbcd80a71e4c 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 15d46ab6679036f4d65f59597e34dd74e1e91314..74dc5b32cc2b9ad8bcb3d3f3e4d380195479d4db 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 2a5908bb2e83d4c0e424e8f486e157bd34b7113b..5c70fe546059592c4fdc91a860d2b58c5bdec467 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 04afb426a1c9dcc3336aca1e6ad92958fe1ed3be..1800098b99930f104410e98e54926f7d0e091a01 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 d695cd09c724cf0648b5cb97b9ed298427f58da5..983e6b55b35575dbca5564837731bc7152f7fcdd 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 c790652c2ae5a67d0db381040571a956b9d600e1..2fa38b960a230685b36c4a1cd62575e71b3e7618 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 ce1e89325188e193e8332437bb7b85106243433d..f580338b87288f975c73d8138d5914c9a72eeb3b 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 797b35d0b749382becf5524a0f933129756d5ba9..1e7bbaa2f8f6b219d2849f21652d6144045ea0c1 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 4165d1829383526523f1d6050d2d1a2e06f50868..ef45cf023a33af1a4ba56fc38996a7dcd774c2b8 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 80294eed127d2069cc9819f631623f3a6226eccf..acb08f465e1fb43bd9f1a3c752aaebd441eca3db 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 e38897d7c4a923535f5d4642621fa47313d29c57..254e433e5dc37109d12a077bb267ad23047f80e7 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 22c31b33ee986e0d0b7cc83d225f748f6bf8a553..83ed3ae5e53537bec1ff279282d773026dcced16 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 1991acd6f92c0839ed556841c5df69261c291c21..f00af95db76838dbadb66c92d43945ef7c3ae3d9 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 d592e6ffdb1add6a11ff9546c7a61369d9360515..479de19d519bb7d2789a337d53701c2b9ab6a2f6 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 aa8d8d3dfe8878240064c2603a007d76668911ca..d780ee01c8516a45d9b9f9b5e69a9aeb19f19902 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 331f69960aa2c0054414b02a94e8fd9c8301b9b8..eb7df6ae36676aa3f648ee1352723a3eecbb7855 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 ae61506124903c68d663d6c93dfea67ed195274b..5f4faa5c3440c6f6a940a3926ced87bcd5f59761 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 b9837b63ef83eeaadded8d07c566082d006c0e28..e306c3bcc524f1a0c89840df0f978ebe0b23c552 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 462469a511c2b569fa508a0f92bdbc3ef261bd9f..12f80886de5475d6fa32f9438b6488f7db1810a6 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 9e8e655c74d3060f6612b1665c88f29158376837..a37044555c97bd03d0c5cabace18b8bb3b303d3b 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 6ae7555a6799af2e517c9e12c7a7a9a29df916c3..29cd1d396c69f11e3375cfdb0762983e19014aff 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 03b12901408f2cfa54e44ae40f9977672efbf439..e25c79a7d02975d3ee967bd8f57cf9f3250bc219 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 e9c6b38b385a7138d940aa921a80d0a9ff60e08a..569dcd09ddd520a4e44b2c0f64db76318a966ed2 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 8af5bfa38019e51463c5c8812dd3091daf89a80e..20da0204d1e79c7310a28064beb291d57c798a03 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 d184c047d387070095a04dd1a390dcf4ecda6856..795ec84c8747238107e7aee3f22563e2c76d8ece 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 9704aa76c571c32cb7c62b2cceb407936858d22d..cdc2b0c06b9019ec5639844ff329ef6e5c4d6e37 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 af5f9651e0c5cf6b60f0a5a9bd3f5ad4f66c1373..b16f04f7d1ec74753d6bd84b7ffabcf1c44dddb2 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 791442eb4793c0a3fa79bcb7e7f12f560d33a084..e839336ce97834300278cb48e52c1835f91faeda 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 65ee13882bef234d244df2c874eee9f36b208580..1cb6ebbbcd941149921921ad1b9790dc564b683e 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 36d15173c0f967fc4bbc7666ddb2b9410752d94d..8ce9f86251d5ad57681da593c9a6d41207d48caf 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 6c7cbdcbd5e6587b9d47094c2e18143ef8d55977..eb59cd79ff8001d3a5bdcb483e76349cd84b89bc 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 ab1e326511fc80c2afb889f617bfdf0d8dc36891..9da5eca9d6976981c253b3997e1e00fea72d1943 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;