From 29a315713e9a2bffd4979da3c221c363742d0106 Mon Sep 17 00:00:00 2001
From: zhf <1204297681@qq.com>
Date: Thu, 31 Aug 2023 19:47:32 +0800
Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81placeholder?=
=?UTF-8?q?=E5=8D=A0=E4=BD=8D=E6=8E=A7=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/common/rawitem/rawitem.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/common/rawitem/rawitem.tsx b/src/common/rawitem/rawitem.tsx
index 8b6cd0712..227e5c59c 100644
--- a/src/common/rawitem/rawitem.tsx
+++ b/src/common/rawitem/rawitem.tsx
@@ -272,7 +272,7 @@ export const IBizRawItem = defineComponent({
);
}
if (['PLACEHOLDER'].includes(this.rawItemType)) {
- return {this.rawItemType}类型暂未支持
;
+ return null;
}
return null;
};
--
Gitee
From cf0e36eebeef85c8e8bcff3412718501fe22e5e7 Mon Sep 17 00:00:00 2001
From: zhf <1204297681@qq.com>
Date: Thu, 31 Aug 2023 19:48:02 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=B7=A5=E4=BD=9C?=
=?UTF-8?q?=E6=B5=81=E6=8C=89=E9=92=AE=E6=96=87=E6=9C=AC=E5=86=85=E5=AE=B9?=
=?UTF-8?q?=E6=9C=AA=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/view-engine/wf-dyna-edit-view.engine.ts | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/view-engine/wf-dyna-edit-view.engine.ts b/src/view-engine/wf-dyna-edit-view.engine.ts
index 7b756f5f3..96cdf9165 100644
--- a/src/view-engine/wf-dyna-edit-view.engine.ts
+++ b/src/view-engine/wf-dyna-edit-view.engine.ts
@@ -203,6 +203,7 @@ export class WFDynaEditViewEngine extends EditViewEngine {
caption: link.sequenceFlowName,
buttonType: 'extra',
tooltip: link.sequenceFlowName,
+ showCaption: true,
} as const;
});
this.toolbar.setExtraButtons('before', extraButtons);
--
Gitee
From 1532c9e27677e372645b364dd466de5475f22331 Mon Sep 17 00:00:00 2001
From: zhf <1204297681@qq.com>
Date: Thu, 31 Aug 2023 19:48:39 +0800
Subject: [PATCH 3/4] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E5=B7=A5?=
=?UTF-8?q?=E5=85=B7=E6=A0=8F=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../toolbar/export-excel/export-excel.scss | 21 +++++++++++++++++++
.../toolbar/export-excel/export-excel.tsx | 6 +++++-
src/control/toolbar/toolbar.tsx | 16 +++++++-------
3 files changed, 35 insertions(+), 8 deletions(-)
diff --git a/src/control/toolbar/export-excel/export-excel.scss b/src/control/toolbar/export-excel/export-excel.scss
index 75a267519..093a3a116 100644
--- a/src/control/toolbar/export-excel/export-excel.scss
+++ b/src/control/toolbar/export-excel/export-excel.scss
@@ -12,4 +12,25 @@
background-color: transparent;
}
}
+
+ @include e(button) {
+ @include flex(row, center, center);
+
+ padding: getCssVar(spacing, tight) getCssVar(spacing, base);
+
+ > span {
+ @include flex(row, center, center);
+
+ font-size: 14px;
+ pointer-events: none;
+ }
+
+ img,
+ i {
+ display: inline-block;
+ max-width: getCssVar(width-icon, medium);
+ max-height: getCssVar(width-icon, medium);
+ margin: 0 getCssVar(spacing, extra-tight) 0 0;
+ }
+ }
}
\ No newline at end of file
diff --git a/src/control/toolbar/export-excel/export-excel.tsx b/src/control/toolbar/export-excel/export-excel.tsx
index 00e0a3770..74aee00d9 100644
--- a/src/control/toolbar/export-excel/export-excel.tsx
+++ b/src/control/toolbar/export-excel/export-excel.tsx
@@ -51,7 +51,11 @@ export const IBizExportExcel = defineComponent({
{{
default: (): VNode => {
return (
-
+
{this.btnContent(this.item)}
);
diff --git a/src/control/toolbar/toolbar.tsx b/src/control/toolbar/toolbar.tsx
index 9ae24b539..135fccfde 100644
--- a/src/control/toolbar/toolbar.tsx
+++ b/src/control/toolbar/toolbar.tsx
@@ -57,13 +57,15 @@ export const ToolbarControl = defineComponent({
const renderExtraButtons = (extraButtons: IExtraButton[]): VNode[] => {
return extraButtons.map(button => {
return (
- => handleClick(button, e)}
- >
- {btnContent(button)}
-
+
+ => handleClick(button, e)}
+ >
+ {btnContent(button)}
+
+
);
});
};
--
Gitee
From 58fcc9c9dabb81f3f4748080297a0b0e55a1c6fd Mon Sep 17 00:00:00 2001
From: zhf <1204297681@qq.com>
Date: Thu, 31 Aug 2023 19:49:29 +0800
Subject: [PATCH 4/4] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E6=96=87?=
=?UTF-8?q?=E6=9C=AC=E6=8B=B7=E8=B4=9D=E6=93=8D=E4=BD=9C=E6=8F=90=E7=A4=BA?=
=?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
CHANGELOG.md | 4 ++++
src/devtool/devtool-action.tsx | 10 +++++-----
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1190115cb..094ae201a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@
- 导航类视图支持通过导航栏部件的高宽配置分割容器占比
- 支持表格的固定列配置，操作列默认固定
- 支持代码表文本样式
+- 支持placeholder占位控件
### Fixed
@@ -25,6 +26,7 @@
- 树节点只点击右键菜单按钮，导致节点被激活
- 修复选择树选中数据后抛值不正确导致picker编辑器无法回显问题
- 修复表单嵌入导航视图未自动加载问题
+- 工作流按钮文本内容未显示异常
### Changed
@@ -36,6 +38,8 @@
- 导航视图引擎继承多数据视图
- 表格悬浮和当前行颜色更改更深一号的颜色
- 导航栏头部标题样式调整
+- 工具栏按钮样式调整
+- 文本拷贝操作提示信息调整
## [0.1.13] - 2023-08-29
diff --git a/src/devtool/devtool-action.tsx b/src/devtool/devtool-action.tsx
index a39d45e5d..0a220cb3c 100644
--- a/src/devtool/devtool-action.tsx
+++ b/src/devtool/devtool-action.tsx
@@ -85,15 +85,15 @@ export const DevtoolAction = defineComponent({
}
};
- const copy = async (value: string) => {
+ const copy = (value: string) => {
if (!value) {
return;
}
- try {
- await ibiz.util.text.copy(value);
+ const result = ibiz.util.text.copy(value);
+ if (result) {
ibiz.message.success('拷贝成功!');
- } catch (error) {
- ibiz.message.error('拷贝失败!');
+ } else {
+ ibiz.message.error('拷贝失败，浏览器copy操作不被支持或未被启用!');
}
};
--
Gitee