From a8677b7b6fe1cd088a2086eff8de24b3947ed739 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E6=94=BF=E6=9D=83?= <1978141412@qq.com> Date: Fri, 2 Aug 2024 19:34:31 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feat:=20=E5=BA=94=E7=94=A8=E6=A0=87?= =?UTF-8?q?=E9=A2=98=E6=94=AF=E6=8C=81=E6=98=BE=E7=A4=BA=E5=B1=95=E5=BC=80?= =?UTF-8?q?=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../panel-app-title.controller.ts | 35 +++++++++++++++++-- .../panel-app-title/panel-app-title.scss | 10 +++++- .../panel-app-title/panel-app-title.tsx | 22 +++++++++++- 3 files changed, 62 insertions(+), 5 deletions(-) diff --git a/src/panel-component/panel-app-title/panel-app-title.controller.ts b/src/panel-component/panel-app-title/panel-app-title.controller.ts index ff46a870..5be36f0a 100644 --- a/src/panel-component/panel-app-title/panel-app-title.controller.ts +++ b/src/panel-component/panel-app-title/panel-app-title.controller.ts @@ -2,7 +2,7 @@ import { PanelItemController, ViewLayoutPanelController, } from '@ibiz-template/runtime'; -import { IPanelField, IAppIndexView } from '@ibiz/model-core'; +import { IPanelRawItem, IAppIndexView } from '@ibiz/model-core'; import { PanelAppTitleState } from './panel-app-title.state'; /** @@ -10,9 +10,9 @@ import { PanelAppTitleState } from './panel-app-title.state'; * * @export * @class PanelAppTitleController - * @extends {PanelItemController} + * @extends {PanelItemController} */ -export class PanelAppTitleController extends PanelItemController { +export class PanelAppTitleController extends PanelItemController { declare state: PanelAppTitleState; protected createState(): PanelAppTitleState { @@ -35,6 +35,13 @@ export class PanelAppTitleController extends PanelItemController { */ private captionSplit = '|'; + /** + * @description 自定义补充参数 + * @type {IData} + * @memberof PanelAppTitleController + */ + rawItemParams: IData = {}; + /** * 初始化 * @@ -43,6 +50,7 @@ export class PanelAppTitleController extends PanelItemController { */ async onInit(): Promise { await super.onInit(); + this.handleRawItemParams(); const indexViewModel: IAppIndexView = this.panel.view.model; // 抬头 if (indexViewModel.title) { @@ -83,4 +91,25 @@ export class PanelAppTitleController extends PanelItemController { this.state.isSvg = true; } } + + /** + * 处理自定义补充参数 [{key:'name',value:'data'}] => {name:'data'} + * + * @author zk + * @date 2023-09-27 03:09:55 + * @protected + * @memberof NavPosController + */ + protected handleRawItemParams(): void { + const rawItemParams = this.model.rawItem?.rawItemParams; + if (Array.isArray(rawItemParams)) { + rawItemParams.forEach(item => { + const key = item.key; + const value = item.value; + if (key && value) { + this.rawItemParams[key.toLowerCase()] = value; + } + }); + } + } } diff --git a/src/panel-component/panel-app-title/panel-app-title.scss b/src/panel-component/panel-app-title/panel-app-title.scss index c2d2dfea..1872872e 100644 --- a/src/panel-component/panel-app-title/panel-app-title.scss +++ b/src/panel-component/panel-app-title/panel-app-title.scss @@ -2,7 +2,7 @@ $panel-app-title: ( 'color': getCssVar(color, text, 0), 'font-size': getCssVar(font-size, header-3), 'font-weight': getCssVar(font-weight, bold), - 'padding': 0 getCssVar(spacing, loose), + 'padding': 0 getCssVar(spacing, base, tight), 'collapse-padding': 0 getCssVar(spacing, tight), ); @@ -40,6 +40,14 @@ $panel-app-title: ( svg { fill: getCssVar('panel-app-title', 'color'); } + @include m('expand') { + width: 56px; + height: 56px; + + &+svg { + width: calc(100% - 56px); + } + } } diff --git a/src/panel-component/panel-app-title/panel-app-title.tsx b/src/panel-component/panel-app-title/panel-app-title.tsx index f1a1b02d..db048350 100644 --- a/src/panel-component/panel-app-title/panel-app-title.tsx +++ b/src/panel-component/panel-app-title/panel-app-title.tsx @@ -104,9 +104,29 @@ export const PanelAppTitle = defineComponent({ ); } } else { + let tempIcon = null; + if (this.c.rawItemParams.showexpandicon === 'true') { + if (isSvg) { + tempIcon = ( + + ); + } else { + tempIcon = ( + + + + ); + } + } iconVNode = ( - + {tempIcon} + Date: Fri, 2 Aug 2024 19:35:14 +0800 Subject: [PATCH 2/5] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=BF=AB?= =?UTF-8?q?=E9=80=9F=E6=90=9C=E7=B4=A2=E8=BF=87=E6=BB=A4=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../search-bar/quick-search-select/quick-search-select.tsx | 7 ++++++- src/locale/en/index.ts | 3 +++ src/locale/zh-CN/index.ts | 3 +++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/control/search-bar/quick-search-select/quick-search-select.tsx b/src/control/search-bar/quick-search-select/quick-search-select.tsx index 80ee3773..b6fc080a 100644 --- a/src/control/search-bar/quick-search-select/quick-search-select.tsx +++ b/src/control/search-bar/quick-search-select/quick-search-select.tsx @@ -36,7 +36,12 @@ export const QuickSearchSelect = defineComponent({ > {{ default: () => ( -
+
), diff --git a/src/locale/en/index.ts b/src/locale/en/index.ts index 07ce0aaf..2982d597 100644 --- a/src/locale/en/index.ts +++ b/src/locale/en/index.ts @@ -422,6 +422,9 @@ export default { dialogCancel: 'Cancel', dialogDetermine: 'Determine', }, + quickSearchSelect: { + searchField: 'Search attribute', + }, }, toolbar: { exportExcel: { diff --git a/src/locale/zh-CN/index.ts b/src/locale/zh-CN/index.ts index c6a78d13..b4b6fd56 100644 --- a/src/locale/zh-CN/index.ts +++ b/src/locale/zh-CN/index.ts @@ -391,6 +391,9 @@ export default { dialogCancel: '取 消', dialogDetermine: '确 定', }, + quickSearchSelect: { + searchField: '搜索属性', + }, }, toolbar: { exportExcel: { -- Gitee From fdea362860bad3d6673bd6a0c3bb522c2952e065 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E6=94=BF=E6=9D=83?= <1978141412@qq.com> Date: Fri, 2 Aug 2024 20:00:03 +0800 Subject: [PATCH 3/5] =?UTF-8?q?feat:=20=E6=90=9C=E7=B4=A2=E6=A0=8F?= =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/locale/en/index.ts | 2 +- src/locale/zh-CN/index.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/locale/en/index.ts b/src/locale/en/index.ts index 2982d597..6866549e 100644 --- a/src/locale/en/index.ts +++ b/src/locale/en/index.ts @@ -423,7 +423,7 @@ export default { dialogDetermine: 'Determine', }, quickSearchSelect: { - searchField: 'Search attribute', + searchField: 'Quick search item selection', }, }, toolbar: { diff --git a/src/locale/zh-CN/index.ts b/src/locale/zh-CN/index.ts index b4b6fd56..ae543282 100644 --- a/src/locale/zh-CN/index.ts +++ b/src/locale/zh-CN/index.ts @@ -392,7 +392,7 @@ export default { dialogDetermine: '确 定', }, quickSearchSelect: { - searchField: '搜索属性', + searchField: '快速搜索项选择', }, }, toolbar: { -- Gitee From 51f1ffba3187d59446b10c4d202554672112e484 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E6=94=BF=E6=9D=83?= <1978141412@qq.com> Date: Tue, 6 Aug 2024 11:02:00 +0800 Subject: [PATCH 4/5] =?UTF-8?q?style:=20=E5=BA=94=E7=94=A8=E6=A0=87?= =?UTF-8?q?=E9=A2=98=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../panel-app-title/panel-app-title.scss | 6 +- .../panel-app-title/panel-app-title.tsx | 67 ++++++++++++++----- 2 files changed, 55 insertions(+), 18 deletions(-) diff --git a/src/panel-component/panel-app-title/panel-app-title.scss b/src/panel-component/panel-app-title/panel-app-title.scss index 1872872e..6d7e17d1 100644 --- a/src/panel-component/panel-app-title/panel-app-title.scss +++ b/src/panel-component/panel-app-title/panel-app-title.scss @@ -41,11 +41,11 @@ $panel-app-title: ( fill: getCssVar('panel-app-title', 'color'); } @include m('expand') { - width: 56px; - height: 56px; + width: 66px; + height: 66px; &+svg { - width: calc(100% - 56px); + width: calc(100% - 66px); } } } diff --git a/src/panel-component/panel-app-title/panel-app-title.tsx b/src/panel-component/panel-app-title/panel-app-title.tsx index db048350..2455343f 100644 --- a/src/panel-component/panel-app-title/panel-app-title.tsx +++ b/src/panel-component/panel-app-title/panel-app-title.tsx @@ -103,28 +103,65 @@ export const PanelAppTitle = defineComponent({
); } - } else { + } else if (this.c.rawItemParams.showexpandicon === 'true' && icon) { let tempIcon = null; - if (this.c.rawItemParams.showexpandicon === 'true') { - if (isSvg) { - tempIcon = ( - - ); - } else { - tempIcon = ( - - - - ); - } + if (isSvg) { + tempIcon = ( + + ); + } else { + tempIcon = ( + + + + ); } iconVNode = ( {tempIcon} + + + + {caption} + + + + + {subCaption} + + + + + + ); + } else { + iconVNode = ( + + Date: Tue, 6 Aug 2024 11:08:40 +0800 Subject: [PATCH 5/5] =?UTF-8?q?feat:=20=E6=90=9C=E7=B4=A2=E6=A0=8F?= =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/locale/en/index.ts | 2 +- src/locale/zh-CN/index.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/locale/en/index.ts b/src/locale/en/index.ts index 6866549e..0c2c0b34 100644 --- a/src/locale/en/index.ts +++ b/src/locale/en/index.ts @@ -423,7 +423,7 @@ export default { dialogDetermine: 'Determine', }, quickSearchSelect: { - searchField: 'Quick search item selection', + searchField: 'Selective search field', }, }, toolbar: { diff --git a/src/locale/zh-CN/index.ts b/src/locale/zh-CN/index.ts index ae543282..8d51fece 100644 --- a/src/locale/zh-CN/index.ts +++ b/src/locale/zh-CN/index.ts @@ -392,7 +392,7 @@ export default { dialogDetermine: '确 定', }, quickSearchSelect: { - searchField: '快速搜索项选择', + searchField: '选择搜索属性', }, }, toolbar: { -- Gitee