diff --git a/CHANGELOG.md b/CHANGELOG.md index 90ea2020092fc42e9a8091feef582a81d3f5a69f..7b0296d7c9846f03a9d26d1f5113ee2c1626cd42 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,8 @@ - 新增多数据部件滑动行为组识别模型配置的按钮类型 - 新增多数据部件参数showgroupanchor(显示分组锚点导航),并调整分组绘制逻辑 - 新增移动端编辑表单取消变更功能 +- 卡片部件支持项样式表配置 +- 向导面板支持步骤样式表 ### Change @@ -42,6 +44,7 @@ - 优化表单分组的呈现样式 - 优化重复器表单和多数据部件表单的操作行为样式 - 多数据部件自定义排序设置采用布局实现 +- 用户消息无数据提示样式与部件一致 ### Fixed diff --git a/src/control/data-view/data-view.tsx b/src/control/data-view/data-view.tsx index f80c1d01161833e60cf4ef2763626fbb005b8cf5..bec253ee77b93cd404e73c1045d7baf464bc4588 100644 --- a/src/control/data-view/data-view.tsx +++ b/src/control/data-view/data-view.tsx @@ -185,16 +185,21 @@ export const DataViewControl = defineComponent({ return data.srfkey === item.srfkey; }); const panel = props.modelData.itemLayoutPanel; - const cardClass = [ns.b('item'), ns.is('active', findIndex !== -1)]; + const itemSysCss = model.itemSysCss?.cssName || ''; + const cardClass = [ + ns.b('item'), + ns.is('active', findIndex !== -1), + itemSysCss, + ]; const cardStyle = {}; if (model.cardWidth) { Object.assign(cardStyle, { - width: `${80}px`, + width: `${model.cardWidth}px`, }); } if (model.cardHeight) { Object.assign(cardStyle, { - height: `${80}px`, + height: `${model.cardHeight}px`, }); } Object.assign( diff --git a/src/control/wizard-panel/wizard-panel.scss b/src/control/wizard-panel/wizard-panel.scss index 515bc2ecbb99eedd96436faf62b9715ffce99740..7c6b8b0059190a4001ea51cd63001a5f28989c0d 100644 --- a/src/control/wizard-panel/wizard-panel.scss +++ b/src/control/wizard-panel/wizard-panel.scss @@ -1,9 +1,12 @@ /* 向导 start */ -$control-wizard-panel: ('header-height': 60px, +$control-wizard-panel: ( + 'header-height': 60px, 'footer-height': 40px, margin: getCssVar('spacing', 'loose') getCssVar('spacing', 'tight'), - gap:getCssVar('spacing', 'tight'), ); + gap:getCssVar('spacing', 'tight'), + 'form-padding': getCssVar('spacing', 'loose'), +); /* 向导 end */ @@ -17,6 +20,7 @@ $control-wizard-panel: ('header-height': 60px, @include e(form) { flex-grow: 1; overflow: auto; + padding: getCssVar('control-wizard-panel', 'form-padding'); } @include when(header) { diff --git a/src/control/wizard-panel/wizard-panel.tsx b/src/control/wizard-panel/wizard-panel.tsx index 2dedd7ce84f48b556f05e689566b3b3c95a4ee45..613fbaca4590877843b76ce5a246115aacad6ee5 100644 --- a/src/control/wizard-panel/wizard-panel.tsx +++ b/src/control/wizard-panel/wizard-panel.tsx @@ -7,6 +7,7 @@ import { IControlProvider, WizardPanelController, } from '@ibiz-template/runtime'; +import { showTitle } from '@ibiz-template/core'; export const WizardPanelControl = defineComponent({ name: 'IBizWizardPanelControl', @@ -138,7 +139,19 @@ export const WizardPanelControl = defineComponent({ active-icon={'circle'} > {dewizardSteps.map(step => { - return {step.title}; + const _slot = { + default: () => ( + + {showTitle(step.title)} + + ), + }; + return {_slot}; })} ); diff --git a/src/panel-component/user-message/user-message.tsx b/src/panel-component/user-message/user-message.tsx index da8fe09ea16b74d7ad8169f7d4f12d9dd6f7c969..913e569f325499d4161189cb23e4b5d0c36008fa 100644 --- a/src/panel-component/user-message/user-message.tsx +++ b/src/panel-component/user-message/user-message.tsx @@ -7,6 +7,7 @@ import { onUnmounted, reactive, ref, + VNode, watch, } from 'vue'; import { @@ -147,15 +148,21 @@ export const MobUserMessage = defineComponent({ c.load(); }); + const renderNoData = (): VNode => { + // 未加载不显示无数据 + return ( + + ); + }; + const renderItems = () => { if (allItems.value.length === 0) { - return ( -
- {ibiz.i18n.t( - 'panelComponent.userMessage.internalMessageTab.notificationYet', - )} -
- ); + return renderNoData(); } return allItems.value.map(msg => { let provider: IInternalMessageProvider | undefined;