From c484545c3935e365eae6f9b44701cfa969465d6a Mon Sep 17 00:00:00 2001 From: wjh Date: Mon, 1 Jul 2024 20:48:05 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=9B=BE=E8=A1=A8?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E5=8C=BA=E5=9D=97=E5=AD=97=E6=AE=B5=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E6=8E=92=E5=BA=8F=20(#1252)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-on: https://git.daoyoucloud.com/daoyoucloud/tachybase/pulls/1252 Co-authored-by: wjh Co-committed-by: wjh --- .../client/src/schema-settings/SchemaSettingsSortingRule.tsx | 1 + .../src/client/filter/FilterItemDesigner.tsx | 2 ++ 2 files changed, 3 insertions(+) diff --git a/packages/core/client/src/schema-settings/SchemaSettingsSortingRule.tsx b/packages/core/client/src/schema-settings/SchemaSettingsSortingRule.tsx index c34f3a409..08ad3e96e 100644 --- a/packages/core/client/src/schema-settings/SchemaSettingsSortingRule.tsx +++ b/packages/core/client/src/schema-settings/SchemaSettingsSortingRule.tsx @@ -117,6 +117,7 @@ export const SchemaSettingsSortingRule = function SortRuleConfigure(props) { }); _.set(fieldSchema, 'x-component-props.service.params.sort', sortArr); props?.onSubmitCallBack?.(sortArr); + field.componentProps = fieldSchema['x-component-props']; dn.emit('patch', { schema: { ['x-uid']: fieldSchema['x-uid'], diff --git a/packages/plugins/@tachybase/plugin-data-visualization/src/client/filter/FilterItemDesigner.tsx b/packages/plugins/@tachybase/plugin-data-visualization/src/client/filter/FilterItemDesigner.tsx index 9b6208a22..a7ddae052 100644 --- a/packages/plugins/@tachybase/plugin-data-visualization/src/client/filter/FilterItemDesigner.tsx +++ b/packages/plugins/@tachybase/plugin-data-visualization/src/client/filter/FilterItemDesigner.tsx @@ -11,6 +11,7 @@ import { SchemaSettingsModalItem, SchemaSettingsRemove, SchemaSettingsSelectItem, + SchemaSettingsSortingRule, useCollection_deprecated, useCollectionManager_deprecated, useCompile, @@ -366,6 +367,7 @@ export const ChartFilterItemDesigner: React.FC = () => { {!isCustom && } + {collectionField ? : null}