diff --git a/packages/core/client/src/collection-manager/action-hooks.ts b/packages/core/client/src/collection-manager/action-hooks.ts index e497cb4cc..e76b9a9f5 100644 --- a/packages/core/client/src/collection-manager/action-hooks.ts +++ b/packages/core/client/src/collection-manager/action-hooks.ts @@ -285,8 +285,8 @@ export const useCreateActionAndRefreshCM = () => { const { refreshCM } = useCollectionManager(); return { async run() { - await run(); await refreshCM(); + await run(); }, }; }; @@ -296,8 +296,8 @@ export const useUpdateActionAndRefreshCM = () => { const { refreshCM } = useCollectionManager(); return { async run() { - await run(); await refreshCM(); + await run(); }, }; }; @@ -307,8 +307,8 @@ export const useDestroyActionAndRefreshCM = () => { const { refreshCM } = useCollectionManager(); return { async run() { - await run(); await refreshCM(); + await run(); }, }; }; @@ -318,8 +318,8 @@ export const useBulkDestroyActionAndRefreshCM = () => { const { refreshCM } = useCollectionManager(); return { async run() { - await run(); await refreshCM(); + await run(); }, }; }; diff --git a/packages/core/client/src/schema-component/antd/table/Table.Array.tsx b/packages/core/client/src/schema-component/antd/table/Table.Array.tsx index 6e73ec4ad..8dc86ceca 100644 --- a/packages/core/client/src/schema-component/antd/table/Table.Array.tsx +++ b/packages/core/client/src/schema-component/antd/table/Table.Array.tsx @@ -31,7 +31,7 @@ const useTableColumns = () => { key: s.name, render: (v, record) => { const index = field.value?.indexOf(record); - console.log((Date.now() - start) / 1000); + // console.log((Date.now() - start) / 1000); return ( diff --git a/packages/core/client/src/schema-component/antd/time-picker/ReadPretty.tsx b/packages/core/client/src/schema-component/antd/time-picker/ReadPretty.tsx index 7e04ec41a..37e313faf 100644 --- a/packages/core/client/src/schema-component/antd/time-picker/ReadPretty.tsx +++ b/packages/core/client/src/schema-component/antd/time-picker/ReadPretty.tsx @@ -1,15 +1,17 @@ -import { formatMomentValue, usePrefixCls } from '@formily/antd/lib/__builtins__'; -import { isArr } from '@formily/shared'; +import { usePrefixCls } from '@formily/antd/lib/__builtins__'; +import { toArr } from '@formily/shared'; import { TimeRangePickerProps } from 'antd/lib/time-picker'; import cls from 'classnames'; +import moment from 'moment'; import React from 'react'; export const ReadPretty: React.FC = (props: any) => { - const { placeholder } = props; + const { value, format = 'HH:mm:ss' } = props; const prefixCls = usePrefixCls('description-text', props); + const values = toArr(value); const getLabels = () => { - const labels = formatMomentValue(props.value, props.format, placeholder); - return isArr(labels) ? labels.join('~') : labels; + const labels = values.map((v) => moment(v, 'HH:mm:ss').format(format)); + return labels.join('~'); }; return (