From 0515749e94eec446d7542451817822a906dc6e69 Mon Sep 17 00:00:00 2001 From: lijianxiong <1518062161@qq.com> Date: Fri, 25 Oct 2024 20:08:51 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E4=BC=A0=E7=BC=96=E8=BE=91=E5=99=A8=E6=9C=AA?= =?UTF-8?q?=E8=AF=86=E5=88=AB=E6=9C=80=E6=96=B0=E7=9A=84=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=B7=AF=E5=BE=84=E8=AE=A1=E7=AE=97=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 4 ++ src/editor/upload/upload-editor.controller.ts | 40 +------------------ src/editor/upload/use/use-ibiz-upload.ts | 7 +++- src/editor/upload/use/use-van-upload.ts | 7 +++- 4 files changed, 17 insertions(+), 41 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 49db0549863..f65cf378199 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,10 @@ - 修复门户视图背景色无效 - 时间范围对齐样式调整 +### Fixed + +- 修复文件上传编辑器未识别最新的文件上传路径计算方法 + ## [0.0.30] - 2024-10-25 ### Added diff --git a/src/editor/upload/upload-editor.controller.ts b/src/editor/upload/upload-editor.controller.ts index 06647d72ca1..93e1ae45a20 100644 --- a/src/editor/upload/upload-editor.controller.ts +++ b/src/editor/upload/upload-editor.controller.ts @@ -1,7 +1,6 @@ import { RuntimeModelError } from '@ibiz-template/core'; -import { convertNavData, EditorController } from '@ibiz-template/runtime'; +import { EditorController } from '@ibiz-template/runtime'; import { IFileUploader } from '@ibiz/model-core'; -import qs from 'qs'; /** * 文件上传编辑器控制器 @@ -136,43 +135,6 @@ export class UploadEditorController extends EditorController { } } - /** - * 计算文件的上传路径和下载路径 - * 下载路径文件id用%fileId%占位，替换即可 - * 配置编辑器参数uploadParams和exportParams时，会像导航参数一样动态添加对应的参数到url上 - * - * @author lxm - * @date 2022-11-17 13:11:43 - * @param {IData} data - * @returns {*} {{ uploadUrl: string; downloadUrl: string }} - */ - calcBaseUrl(data: IData): { uploadUrl: string; downloadUrl: string } { - let uploadUrl = `${ibiz.env.baseUrl}/${ibiz.env.appId}${ibiz.env.uploadFileUrl}`; - let downloadUrl = `${ibiz.env.baseUrl}/${ibiz.env.appId}${ibiz.env.downloadFileUrl}/%fileId%`; - let uploadParams: IParams = {}; - let exportParams: IParams = {}; - if (this.uploadParams) { - uploadParams = convertNavData( - this.uploadParams, - this.context, - this.params, - data, - ); - } - if (this.exportParams) { - exportParams = convertNavData( - this.exportParams, - this.context, - this.params, - data, - ); - } - uploadUrl += qs.stringify(uploadParams, { addQueryPrefix: true }); - downloadUrl += qs.stringify(exportParams, { addQueryPrefix: true }); - - return { uploadUrl, downloadUrl }; - } - /** * 请求url获取文件流，并用JS触发文件下载 * diff --git a/src/editor/upload/use/use-ibiz-upload.ts b/src/editor/upload/use/use-ibiz-upload.ts index fb9268d7e44..66abbfdff4c 100644 --- a/src/editor/upload/use/use-ibiz-upload.ts +++ b/src/editor/upload/use/use-ibiz-upload.ts @@ -86,7 +86,12 @@ export function useIBizUploadInit(props: { props.data, newVal => { if (newVal) { - const urls = props.controller.value.calcBaseUrl(newVal); + const urls = ibiz.util.file.calcFileUpDownUrl( + props.controller.value.context, + props.controller.value.params, + newVal, + props.controller.value.editorParams, + ); uploadUrl.value = urls.uploadUrl; downloadUrl.value = urls.downloadUrl; } diff --git a/src/editor/upload/use/use-van-upload.ts b/src/editor/upload/use/use-van-upload.ts index 31347b747c9..2a54a5123d6 100644 --- a/src/editor/upload/use/use-van-upload.ts +++ b/src/editor/upload/use/use-van-upload.ts @@ -73,7 +73,12 @@ export function useVanUpload( () => props.data, newVal => { if (newVal) { - const urls = c.calcBaseUrl(newVal); + const urls = ibiz.util.file.calcFileUpDownUrl( + c.context, + c.params, + newVal, + c.editorParams, + ); uploadUrl.value = urls.uploadUrl; downloadUrl.value = urls.downloadUrl; } -- Gitee From 15595dc6d1029bffbdcdaf2c4b979e393b6286aa Mon Sep 17 00:00:00 2001 From: lijianxiong <1518062161@qq.com> Date: Fri, 25 Oct 2024 20:17:57 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat=EF=BC=9A=E6=A8=A1=E6=80=81=E6=89=93?= =?UTF-8?q?=E5=BC=80=E8=A7=86=E5=9B=BE=E5=B7=A5=E5=85=B7=E7=B1=BB=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E8=AF=86=E5=88=AB=E5=B9=B3=E5=8F=B0=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 4 ++++ src/util/open-view-util/open-view-util.ts | 3 +++ 2 files changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f65cf378199..0f64468f1ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ ## [Unreleased] +### Added + +- 模态打开视图工具类方法识别平台配置参数 + ### Change - 修复门户视图背景色无效 diff --git a/src/util/open-view-util/open-view-util.ts b/src/util/open-view-util/open-view-util.ts index 1a18cd638a0..a3c73e80310 100644 --- a/src/util/open-view-util/open-view-util.ts +++ b/src/util/open-view-util/open-view-util.ts @@ -70,7 +70,10 @@ export class OpenViewUtil implements IOpenViewUtil { const appView = await ibiz.hub.config.view.get(appViewId!); // 设置默认的modal参数 const opts = { + width: appView.width, + height: appView.height, footerHide: true, + ...appView.modalOption, }; return openViewModal( -- Gitee From cbfe084a042ed59ee6a78a0b351d3972424931e3 Mon Sep 17 00:00:00 2001 From: lijianxiong <1518062161@qq.com> Date: Fri, 25 Oct 2024 20:22:06 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat=EF=BC=9A=E6=9B=B4=E6=96=B0=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E8=8C=83=E5=9B=B4=E9=80=89=E6=8B=A9=E5=99=A8=E9=80=82?= =?UTF-8?q?=E9=85=8D=E5=86=85=E5=AE=B9=E5=AE=BD=E5=BA=A6=E8=B6=85=E5=87=BA?= =?UTF-8?q?=E5=90=8E=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4=E5=87=BA=E7=9C=81?= =?UTF-8?q?=E7=95=A5=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + .../ibiz-date-range-picker.scss | 40 +++++++++- .../ibiz-date-range-picker.tsx | 76 +++++++++++-------- 3 files changed, 84 insertions(+), 33 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f64468f1ce..7bc3f697cb2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ ### Added - 模态打开视图工具类方法识别平台配置参数 +- 更新时间范围选择器适配内容宽度超出后结束时间出省略号 ### Change 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 d64aea5387d..02d432318ab 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 @@ -1,4 +1,37 @@ @include b(date-range-picker) { + display: flex; + align-items: center; + width: 100%; + overflow: hidden; + @include e(content) { + position: relative; + display: flex; + align-items: center; + min-height: calc(var(--van-cell-line-height) + 2px); /* 计算输入框高度，2px为边框 */ + white-space: nowrap; + @include when(end) { + min-width: 0; + overflow: hidden; + text-overflow: ellipsis; + + input { + overflow: hidden; + text-overflow: ellipsis; + } + } + } + + // 主要用于占位 + @include e(expand-hidden) { + opacity: 0; + } + + @include e(input) { + position: absolute; + top: 0; + left: 0; + } + .van-field { line-height: getCssVar(form-item, line-height); &::after { @@ -48,4 +81,9 @@ color: getCssVar('form-item', 'readonly-color'); } } -} \ No newline at end of file +} + +@include b(date-range-picker-separator) { +flex: 1; +text-align: center; +} 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 233689a508b..291e1820941 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 @@ -182,6 +182,11 @@ export const IBizDateRangePicker = defineComponent({ }); } }); + + // 绘制隐藏元素，用于撑开父元素高度，使输入框根据父元素自适应宽度 + const expandHidden = (text: string) => { + return {text}; + }; return { ns, c, @@ -197,6 +202,7 @@ export const IBizDateRangePicker = defineComponent({ startFormatValue, onFocus, onBlur, + expandHidden, }; }, render() { @@ -208,39 +214,45 @@ export const IBizDateRangePicker = defineComponent({ this.readonly ? this.ns.m('readonly') : '', ]} > - - {{ - input: ( - - ), - }} - +
+ {this.expandHidden(this.startFormatValue || this.startPlaceHolder)} + + {{ + input: ( + + ), + }} + +
{this.rangeSeparator}
- - {{ - input: ( - - ), - }} - +
+ {this.expandHidden(this.endFormatValue || this.endPlaceHolder)} + + {{ + input: ( + + ), + }} + +
); }, -- Gitee