ruiling/tachybase_todo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 修复图表筛选区块字段支持排序 (#1252)

Browse Source 
Reviewed-on: daoyoucloud/tachybase#1252
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
This commit is contained in:
wjh 2024-07-01 20:48:05 +08:00 committed by sealday
parent e4166d7dec
commit c484545c39
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/core/client/src/schema-settings/SchemaSettingsSortingRule.tsx
View File

@ -117,6 +117,7 @@ export const SchemaSettingsSortingRule = function SortRuleConfigure(props) {
}); });
_.set(fieldSchema, 'x-component-props.service.params.sort', sortArr); _.set(fieldSchema, 'x-component-props.service.params.sort', sortArr);
props?.onSubmitCallBack?.(sortArr); props?.onSubmitCallBack?.(sortArr);
field.componentProps = fieldSchema['x-component-props'];
dn.emit('patch', { dn.emit('patch', {
schema: { schema: {
['x-uid']: fieldSchema['x-uid'], ['x-uid']: fieldSchema['x-uid'],

2
packages/plugins/@tachybase/plugin-data-visualization/src/client/filter/FilterItemDesigner.tsx
View File

@ -11,6 +11,7 @@ import {
SchemaSettingsModalItem, SchemaSettingsModalItem,
SchemaSettingsRemove, SchemaSettingsRemove,
SchemaSettingsSelectItem, SchemaSettingsSelectItem,
SchemaSettingsSortingRule,
useCollection_deprecated, useCollection_deprecated,
useCollectionManager_deprecated, useCollectionManager_deprecated,
useCompile, useCompile,
@ -366,6 +367,7 @@ export const ChartFilterItemDesigner: React.FC = () => {
{!isCustom && <EditOperator />} {!isCustom && <EditOperator />}
<EditTitleField /> <EditTitleField />
<EditDefaultValue /> <EditDefaultValue />
<SchemaSettingsSortingRule />
{collectionField ? <SchemaSettingsDivider /> : null} {collectionField ? <SchemaSettingsDivider /> : null}
<SchemaSettingsRemove <SchemaSettingsRemove
key="remove" key="remove"