From 46a1aec34c64b657f13ef76b33d0d84e7a1e3ed5 Mon Sep 17 00:00:00 2001 From: zhangkang <1752553776@qq.com> Date: Fri, 14 Jul 2023 19:12:32 +0800 Subject: [PATCH 1/6] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E6=97=A0?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/index.ts | 2 ++ src/common/no-data/no-data.scss | 4 ++++ src/common/no-data/no-data.tsx | 20 ++++++++++++++++++++ 3 files changed, 26 insertions(+) create mode 100644 src/common/no-data/no-data.scss create mode 100644 src/common/no-data/no-data.tsx diff --git a/src/common/index.ts b/src/common/index.ts index 22a2cbe5a..b007ba81d 100644 --- a/src/common/index.ts +++ b/src/common/index.ts @@ -10,6 +10,7 @@ import { IBizControlShell } from './control-shell/control-shell'; import { IBizViewShell } from './view-shell/view-shell'; import { IBizRawItem } from './rawitem/rawitem'; import { IBizCodeList } from './code-list/code-list'; +import { IBizNoData } from './no-data/no-data'; export * from './icon/icon'; export * from './keep-alive/keep-alive'; @@ -36,6 +37,7 @@ export const IBizCommonComponents = { v.component(IBizControlShell.name, IBizControlShell); v.component(IBizRawItem.name, IBizRawItem); v.component(IBizCodeList.name, IBizCodeList); + v.component(IBizNoData.name, IBizNoData); }, }; diff --git a/src/common/no-data/no-data.scss b/src/common/no-data/no-data.scss new file mode 100644 index 000000000..eb7948dfb --- /dev/null +++ b/src/common/no-data/no-data.scss @@ -0,0 +1,4 @@ +@include b(no-data) { + width: 100%; + height: 100%; +} \ No newline at end of file diff --git a/src/common/no-data/no-data.tsx b/src/common/no-data/no-data.tsx new file mode 100644 index 000000000..4f098c69f --- /dev/null +++ b/src/common/no-data/no-data.tsx @@ -0,0 +1,20 @@ +import { useNamespace } from '@ibiz-template/vue3-util'; +import { defineComponent } from 'vue'; +import './no-data.scss'; + +export const IBizNoData = defineComponent({ + name: 'IBizNoData', + props: { + text: { + type: String, + default: '暂无数据', + }, + }, + setup() { + const ns = useNamespace('no-data'); + return { ns }; + }, + render() { + return ; + }, +}); -- Gitee From fe26e63c6ebe5dba514cdaa531240cf9544bdecd Mon Sep 17 00:00:00 2001 From: zhangkang <1752553776@qq.com> Date: Fri, 14 Jul 2023 19:13:12 +0800 Subject: [PATCH 2/6] =?UTF-8?q?feat:=20=E5=A4=9A=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=97=A0=E6=95=B0=E6=8D=AE=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/control/data-view/data-view.tsx | 16 +++++++++--- src/control/grid/grid/grid.tsx | 38 ++++++++++++++++++++--------- src/control/list/list.tsx | 15 +++++++++--- 3 files changed, 50 insertions(+), 19 deletions(-) diff --git a/src/control/data-view/data-view.tsx b/src/control/data-view/data-view.tsx index 083c652a9..f89dde999 100644 --- a/src/control/data-view/data-view.tsx +++ b/src/control/data-view/data-view.tsx @@ -131,6 +131,12 @@ export const DataViewControl = defineComponent({ }); }; + const renderNoData = () => { + // 未加载不显示无数据 + const { isLoaded } = c.state; + return isLoaded && ; + }; + // 绘制加载更多 const renderLoadMore = () => { return c.state.total > c.state.items.length ? ( @@ -145,15 +151,17 @@ export const DataViewControl = defineComponent({ ns, renderDataViewContent, renderLoadMore, + renderNoData, }; }, render() { + const { items, isCreated } = this.c.state; return ( - {this.c.state.isCreated && [ - this.renderDataViewContent(), - this.renderLoadMore(), - ]} + {isCreated && + (items.length > 0 + ? [this.renderDataViewContent(), this.renderLoadMore()] + : this.renderNoData())} ); }, diff --git a/src/control/grid/grid/grid.tsx b/src/control/grid/grid/grid.tsx index 50add6c8b..2f287508e 100644 --- a/src/control/grid/grid/grid.tsx +++ b/src/control/grid/grid/grid.tsx @@ -48,6 +48,12 @@ export const GridControl = defineComponent({ () => c.model.degridColumns?.filter(item => !item.hideDefault) || [], ); + const renderNoData = () => { + // 未加载不显示无数据 + const { isLoaded } = c.state; + return isLoaded && ; + }; + return { c, ns, @@ -62,6 +68,7 @@ export const GridControl = defineComponent({ onPageSizeChange, onPageReset, handleRowClassName, + renderNoData, }; }, render() { @@ -160,17 +167,26 @@ export const GridControl = defineComponent({ onSelectionChange={this.onSelectionChange} onSortChange={this.onSortChange} > - {!state.singleSelect && ( - - )} - {state.isCreated && - this.renderColumns.map((model, index) => { - return renderChildColumn(model, index); - })} + {{ + empty: () => { + return this.renderNoData(); + }, + default: () => { + return [ + !state.singleSelect && ( + + ), + state.isCreated && + this.renderColumns.map((model, index) => { + return renderChildColumn(model, index); + }), + ]; + }, + }} {enablePagingBar && ( { + // 未加载不显示无数据 + const { isLoaded } = c.state; + return isLoaded && ; + }; + return { c, ns, renderListContent, renderLoadMore, + renderNoData, }; }, render() { return ( - {this.c.state.isCreated && [ - this.renderListContent(), - this.renderLoadMore(), - ]} + {this.c.state.isCreated && + (this.c.state.items.length > 0 + ? [this.renderListContent(), this.renderLoadMore()] + : this.renderNoData())} ); }, -- Gitee From 603745f6f24490b555505871a462e49979ea6125 Mon Sep 17 00:00:00 2001 From: zhangkang <1752553776@qq.com> Date: Fri, 14 Jul 2023 19:14:12 +0800 Subject: [PATCH 3/6] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=99=A8=E5=80=BC=E4=B8=8D=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/editor/code/monaco-editor/monaco-editor.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/editor/code/monaco-editor/monaco-editor.tsx b/src/editor/code/monaco-editor/monaco-editor.tsx index 4c4d6f386..791ea0a26 100644 --- a/src/editor/code/monaco-editor/monaco-editor.tsx +++ b/src/editor/code/monaco-editor/monaco-editor.tsx @@ -25,6 +25,8 @@ export const IBizCode = defineComponent({ const currentVal = ref(''); + let editor: monaco.editor.IStandaloneCodeEditor; + watch( () => props.value, (newVal, oldVal) => { @@ -34,6 +36,7 @@ export const IBizCode = defineComponent({ } else { currentVal.value = newVal; } + editor?.setValue(currentVal.value); } }, { immediate: true }, @@ -41,8 +44,6 @@ export const IBizCode = defineComponent({ const codeEditBox = ref(); - let editor: monaco.editor.IStandaloneCodeEditor; - const editorInit = () => { nextTick(() => { loader.config({ -- Gitee From d3368eefb18bc1f06e0c39df02f4d5b3deeea39e Mon Sep 17 00:00:00 2001 From: zhangkang <1752553776@qq.com> Date: Fri, 14 Jul 2023 19:15:01 +0800 Subject: [PATCH 4/6] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E9=AB=98=E5=BA=A6=E4=B8=A2=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pickup-view-panel/pickup-view-panel.scss | 3 ++ .../pickup-view-panel/pickup-view-panel.tsx | 33 +++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/control/pickup-view-panel/pickup-view-panel.scss b/src/control/pickup-view-panel/pickup-view-panel.scss index e69de29bb..4cb8ef5d5 100644 --- a/src/control/pickup-view-panel/pickup-view-panel.scss +++ b/src/control/pickup-view-panel/pickup-view-panel.scss @@ -0,0 +1,3 @@ +@include b(control-pickupviewpanel) { + height: 100%; +} \ No newline at end of file diff --git a/src/control/pickup-view-panel/pickup-view-panel.tsx b/src/control/pickup-view-panel/pickup-view-panel.tsx index 2fd5c83f1..48f238f24 100644 --- a/src/control/pickup-view-panel/pickup-view-panel.tsx +++ b/src/control/pickup-view-panel/pickup-view-panel.tsx @@ -41,24 +41,21 @@ export const PickupViewPanelControl = defineComponent({ render() { return ( - {this.c.state.isCreated && ( -
- {this.$slots.default - ? this.$slots.default({ - context: this.c.state.context, - params: this.c.state.params, - state: { singleSelect: this.c.state.singleSelect }, - onCreated: this.onCreated, - }) - : h(resolveComponent('IBizViewShell'), { - context: this.c.state.context, - params: this.c.state.params, - viewId: this.c.model.embeddedAppDEViewId, - state: { singleSelect: this.c.state.singleSelect }, - onCreated: this.onCreated, - })} -
- )} + {this.c.state.isCreated && + (this.$slots.default + ? this.$slots.default({ + context: this.c.state.context, + params: this.c.state.params, + state: { singleSelect: this.c.state.singleSelect }, + onCreated: this.onCreated, + }) + : h(resolveComponent('IBizViewShell'), { + context: this.c.state.context, + params: this.c.state.params, + viewId: this.c.model.embeddedAppDEViewId, + state: { singleSelect: this.c.state.singleSelect }, + onCreated: this.onCreated, + }))} ); }, -- Gitee From a0d617209d1301656ca922b040c0ec460d5c3a1f Mon Sep 17 00:00:00 2001 From: zhangkang <1752553776@qq.com> Date: Fri, 14 Jul 2023 19:15:42 +0800 Subject: [PATCH 5/6] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=8D=A1=E7=89=87?= =?UTF-8?q?=E8=A7=86=E5=9B=BE=E9=AB=98=E5=BA=A6=E4=B8=A2=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/control/data-view/data-view.scss | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/control/data-view/data-view.scss b/src/control/data-view/data-view.scss index d74474570..bada63707 100644 --- a/src/control/data-view/data-view.scss +++ b/src/control/data-view/data-view.scss @@ -9,8 +9,8 @@ $control-dataview: ( @include b(control-dataview-item) { @include set-component-css-var('control-dataview', $control-dataview); - margin: getCssVar('control-dataview', 'margin'); padding: getCssVar('control-dataview', 'padding'); + margin: getCssVar('control-dataview', 'margin'); cursor: pointer; &:hover { @@ -26,6 +26,8 @@ $control-dataview: ( @include b(control-dataview) { display: flex; flex-wrap: wrap; + width: 100%; + height: 100%; // 加载更多样式 @include e(load-more) { @@ -60,8 +62,8 @@ $control-dataview: ( } @include b(control-dataview-group-content) { - overflow: auto; width: 100%; + overflow: auto; @include e(item) { .el-collapse-item__content { @@ -70,8 +72,8 @@ $control-dataview: ( } @include m(empty) { - text-align: center; width: 100%; + text-align: center; } } } \ No newline at end of file -- Gitee From 305b3eed2c3b3ec571b71069cd4eaa4aea2cf1ce Mon Sep 17 00:00:00 2001 From: zhangkang <1752553776@qq.com> Date: Fri, 14 Jul 2023 19:17:12 +0800 Subject: [PATCH 6/6] =?UTF-8?q?chore:=20=E5=88=A0=E9=99=A4box-sizing=20?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=20=E7=94=B1runtime=20=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E5=85=A8=E5=B1=80=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form-item/form-item-container/form-item-container.scss | 3 --- src/control/grid/grid/grid.scss | 1 - src/panel-component/nav-tabs/nav-tabs.scss | 1 - 3 files changed, 5 deletions(-) diff --git a/src/control/form/form-detail/form-item/form-item-container/form-item-container.scss b/src/control/form/form-detail/form-item/form-item-container/form-item-container.scss index f0fc04e7b..38aad47ca 100644 --- a/src/control/form/form-detail/form-item/form-item-container/form-item-container.scss +++ b/src/control/form/form-detail/form-item/form-item-container/form-item-container.scss @@ -8,7 +8,6 @@ $form-item-container: ( } @include b(form-item-container) { - box-sizing: border-box; width: 100%; height: 100%; padding-right: getCssVar('padding-right'); @@ -48,7 +47,6 @@ $form-item-container: ( @include m(left) { @include e(label) { - box-sizing: border-box; padding-right: 10px; text-align: right; } @@ -56,7 +54,6 @@ $form-item-container: ( @include m(right) { @include e(label) { - box-sizing: border-box; padding-left: 10px; text-align: left; } diff --git a/src/control/grid/grid/grid.scss b/src/control/grid/grid/grid.scss index a4244ba76..324aa4837 100644 --- a/src/control/grid/grid/grid.scss +++ b/src/control/grid/grid/grid.scss @@ -104,7 +104,6 @@ $control-grid-page: ( } @include b(grid-page) { - box-sizing: border-box; height: getCssVar('control-grid-page', 'height'); padding: getCssVar('control-grid-page', 'padding'); @include flex(row, flex-end); diff --git a/src/panel-component/nav-tabs/nav-tabs.scss b/src/panel-component/nav-tabs/nav-tabs.scss index 731f5f586..e4c261935 100644 --- a/src/panel-component/nav-tabs/nav-tabs.scss +++ b/src/panel-component/nav-tabs/nav-tabs.scss @@ -42,7 +42,6 @@ $nav-tabs-item: ( border-bottom: none; .el-tabs__item { - box-sizing: border-box; display: flex; align-items: center; height: getCssVar('nav-tabs-item', 'height'); -- Gitee