From a730afb67c81ad275f2f51a9a456a810d88cfdd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E5=B0=8F=E6=B0=91?= Date: Wed, 20 Sep 2023 15:14:17 +0800 Subject: [PATCH 1/4] Update index.less MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 处理 移动滚动条的时候，ant-select-dropdown 没有随form-item移动 --- src/design/index.less | 1 + 1 file changed, 1 insertion(+) diff --git a/src/design/index.less b/src/design/index.less index b2c024af..956c9d85 100644 --- a/src/design/index.less +++ b/src/design/index.less @@ -25,6 +25,7 @@ body { height: 100%; overflow: visible; overflow-x: hidden; + position: relative; &.color-weak { filter: invert(80%); From a6b65b58a1b389e3d354e8edc61abfed1e612423 Mon Sep 17 00:00:00 2001 From: zmcode <48686959+zmcode@users.noreply.github.com> Date: Thu, 21 Sep 2023 10:39:44 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:=20=E8=A7=A3=E5=86=B3Form=E7=BB=84?= =?UTF-8?q?=E4=BB=B6slot=E5=BF=85=E9=A1=BB=E4=BC=A0=E9=80=92component?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=89=8D=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=20(#3049)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit feat: 解决Form组件slot必须传递component字段才显示的问题 --- src/components/Form/src/components/FormItem.vue | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/components/Form/src/components/FormItem.vue b/src/components/Form/src/components/FormItem.vue index 7652941f..04803713 100644 --- a/src/components/Form/src/components/FormItem.vue +++ b/src/components/Form/src/components/FormItem.vue @@ -159,7 +159,10 @@ const joinLabel = Reflect.has(props.schema, 'rulesMessageJoinLabel') ? rulesMessageJoinLabel : globalRulesMessageJoinLabel; - const defaultMsg = createPlaceholderMessage(component) + `${joinLabel ? label : ''}`; + const assertLabel = joinLabel ? label : ''; + const defaultMsg = component + ? createPlaceholderMessage(component) + assertLabel + : assertLabel; function validator(rule: any, value: any) { const msg = rule.message || defaultMsg; @@ -382,8 +385,8 @@ } return () => { - const { colProps = {}, colSlot, renderColContent, component } = props.schema; - if (!componentMap.has(component)) { + const { colProps = {}, colSlot, renderColContent, component, slot } = props.schema; + if (!componentMap.has(component) && !slot) { return null; } From dbdd811705b76cd9814afb65e640392e36c9dcce Mon Sep 17 00:00:00 2001 From: invalid w Date: Thu, 21 Sep 2023 10:40:09 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat(style):=20=E4=BD=BF=E7=94=A8Antd?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=8F=90=E4=BE=9B=E7=9A=84=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E4=B8=BB=E9=A2=98=E5=8A=9F=E8=83=BD=20(#3051)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * perf(style): 使用antd4的暗黑主题 * refactor: 抽离切换暗黑主题模式 --- src/App.vue | 6 +- src/components/Modal/src/index.less | 2 +- src/design/dark.less | 8265 +------------------------ src/hooks/setting/useDarkModeTheme.ts | 18 + 4 files changed, 25 insertions(+), 8266 deletions(-) create mode 100644 src/hooks/setting/useDarkModeTheme.ts diff --git a/src/App.vue b/src/App.vue index a4d2e80d..303d31a3 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,5 +1,5 @@