diff --git a/CHANGELOG.md b/CHANGELOG.md index 1190115cbbd47c6345ac3221996806cb070ef760..094ae201a36d437cd2e49ac0aba802926177c9c1 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/common/rawitem/rawitem.tsx b/src/common/rawitem/rawitem.tsx index 8b6cd07125b8cd56532e912dc19da48cb7a27cf9..227e5c59c316874e0edc65cbf7c3071171d55723 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; }; diff --git a/src/control/toolbar/export-excel/export-excel.scss b/src/control/toolbar/export-excel/export-excel.scss index 75a267519a083b5e05141f9bf4ce5393913ef76b..093a3a116a19fe279e7a9b3fc9027c0be52fd797 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 00e0a3770643099c2cf89bcf84dac683eefde8ca..74aee00d9e8da5c60e0a36ebcd3019defad01742 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 9ae24b539839c997904d75e41e191d1ea31ba301..135fccfde325581b39c30285e2ae348f413bb0ae 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)} + +
); }); }; diff --git a/src/devtool/devtool-action.tsx b/src/devtool/devtool-action.tsx index a39d45e5d8a0043e78f2483909eb8ef3e1d00f73..0a220cb3c3bba4c590eb3fafdf8ad444f8ac992d 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操作不被支持或未被启用!'); } }; diff --git a/src/view-engine/wf-dyna-edit-view.engine.ts b/src/view-engine/wf-dyna-edit-view.engine.ts index 7b756f5f39d5f588577815995f6fc13d3e36bc7c..96cdf9165d93acaa4d8c41dbc66b2274a30ab304 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);