diff --git a/CHANGELOG.md b/CHANGELOG.md index f2b766f2fed0f31b375da0bfd8dab8bb8973a321..ec92d3c09f3c43633286319e3b6bbea614b9558b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,11 @@ ## [Unreleased] +### Added + +- 图片控件上传按钮补充展示图标 +- 时间选择器类型为DATEPICKEREX_NOTIME时,不展示图标 + ### Changed - 面板成员接口调整,dataChangeNotify和panelStateNotify变成异步 diff --git a/src/editor/date-picker/ibiz-date-picker/ibiz-date-picker.scss b/src/editor/date-picker/ibiz-date-picker/ibiz-date-picker.scss index 0130114f423be7af21a28e0154929f84ddebdea4..d08446fa075885090c51370deddae2c09247c5de 100644 --- a/src/editor/date-picker/ibiz-date-picker/ibiz-date-picker.scss +++ b/src/editor/date-picker/ibiz-date-picker/ibiz-date-picker.scss @@ -22,4 +22,18 @@ @include m(readonly) { color: getCssVar('form-item', 'readonly-color'); } + + @include e(DATEPICKEREX_NOTIME) { + .el-input__wrapper { + padding-right: 2px; + .el-input__prefix { + display: none; + } + .el-input__suffix { + .el-icon.el-input__icon.clear-icon { + margin-left: 0px; + } + } + } + } } 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 a27b4f1a88a11b595959182f209fc63798f43177..03193807b62217e0a785df4e335bc4176f25b4a0 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 @@ -115,6 +115,7 @@ export const IBizDatePicker = defineComponent({ this.ns.b(), this.disabled ? this.ns.m('disabled') : '', this.readonly ? this.ns.m('readonly') : '', + this.ns.e(this.editorModel.editorType), ]} > {this.readonly ? ( diff --git a/src/editor/upload/ibiz-image-upload/ibiz-image-upload.scss b/src/editor/upload/ibiz-image-upload/ibiz-image-upload.scss index 0373050d0ec200c8f6f19d3be154b0f9ec43d76a..a45a757bedd96b82bd5b0e2ce1f4ba79b980d6cd 100644 --- a/src/editor/upload/ibiz-image-upload/ibiz-image-upload.scss +++ b/src/editor/upload/ibiz-image-upload/ibiz-image-upload.scss @@ -77,6 +77,11 @@ $image-upload: ( } } + @include e('image-upload-add') { + font-size: getCssVar('font-size', 'header-2'); + color: getCssVar(color, text, 3); + } + // 禁用态样式 @include m('disabled') { @include e('download-icon') { 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 6076542e603c5cce6e9ab39abf80b071fc382c1a..bb543e6e57fc51ea44f03efc61c5b59210b3dc8f 100644 --- a/src/editor/upload/ibiz-image-upload/ibiz-image-upload.tsx +++ b/src/editor/upload/ibiz-image-upload/ibiz-image-upload.tsx @@ -118,7 +118,10 @@ export const IBizImageUpload = defineComponent({ onRemove={this.onRemove} onPreview={this.onDownload} > - + {this.dialogVisible ? (