From 9c67f0dba81292a359864ad2f53de4c0ac8705b2 Mon Sep 17 00:00:00 2001 From: fzh <1399952343@qq.com> Date: Thu, 21 Sep 2023 19:23:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E6=97=B6=E9=97=B4=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E5=99=A8=E7=B1=BB=E5=9E=8B=E4=B8=BADATEPICKEREX=5FNOT?= =?UTF-8?q?IME=E6=97=B6=EF=BC=8C=E4=B8=8D=E5=B1=95=E7=A4=BA=E5=9B=BE?= =?UTF-8?q?=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ibiz-date-picker/ibiz-date-picker.scss | 14 ++++++++++++++ .../ibiz-date-picker/ibiz-date-picker.tsx | 1 + 2 files changed, 15 insertions(+) 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 0130114f..d08446fa 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 a27b4f1a..03193807 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 ? ( -- Gitee From 22067d2fba8b09047e5423e6b6889ebbfb84185b Mon Sep 17 00:00:00 2001 From: fzh <1399952343@qq.com> Date: Thu, 21 Sep 2023 19:26:51 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E5=9B=BE=E7=89=87=E6=8E=A7?= =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E4=BC=A0=E6=8C=89=E9=92=AE=E8=A1=A5=E5=85=85?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 5 +++++ src/editor/upload/ibiz-image-upload/ibiz-image-upload.scss | 5 +++++ src/editor/upload/ibiz-image-upload/ibiz-image-upload.tsx | 5 ++++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f2b766f2..ec92d3c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,11 @@ ## [Unreleased] +### Added + +- 图片控件上传按钮补充展示图标 +- 时间选择器类型为DATEPICKEREX_NOTIME时,不展示图标 + ### Changed - 面板成员接口调整,dataChangeNotify和panelStateNotify变成异步 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 0373050d..a45a757b 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 6076542e..bb543e6e 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 ? (