diff --git a/packages/core/client/src/antd-config-provider/index.tsx b/packages/core/client/src/antd-config-provider/index.tsx deleted file mode 100644 index 29d8e7139..000000000 --- a/packages/core/client/src/antd-config-provider/index.tsx +++ /dev/null @@ -1,68 +0,0 @@ -import { dayjs } from '@tachybase/utils/client'; -import { ConfigProvider, Spin } from 'antd'; -import React, { createContext, useContext } from 'react'; -import { useTranslation } from 'react-i18next'; -import { useAPIClient, useRequest } from '../api-client'; -import { Plugin } from '../application/Plugin'; -import { loadConstrueLocale } from './loadConstrueLocale'; - -export const AppLangContext = createContext({}); -AppLangContext.displayName = 'AppLangContext'; - -export const useAppLangContext = () => { - return useContext(AppLangContext); -}; - -export function AntdConfigProvider(props) { - const { remoteLocale, ...others } = props; - const api = useAPIClient(); - const { i18n } = useTranslation(); - const { data, loading } = useRequest<{ - data: { - lang: string; - resources: any; - moment: string; - antd: any; - cron: any; - }; - }>( - { - url: 'app:getLang', - params: { - locale: api.auth.locale, - }, - }, - { - onSuccess(data) { - const locale = api.auth.locale; - if (data?.data?.lang && !locale) { - api.auth.setLocale(data?.data?.lang); - i18n.changeLanguage(data?.data?.lang); - } - Object.keys(data?.data?.resources || {}).forEach((key) => { - i18n.addResources(data?.data?.lang, key, data?.data?.resources[key] || {}); - }); - loadConstrueLocale(data?.data); - dayjs.locale(data?.data?.moment); - window['cronLocale'] = data?.data?.cron; - }, - manual: !remoteLocale, - }, - ); - if (loading) { - return ; - } - return ( - - - {props.children} - - - ); -} - -export class AntdConfigPlugin extends Plugin { - async load() { - this.app.use(AntdConfigProvider, this.options?.config || {}); - } -} diff --git a/packages/core/client/src/api-client/APIClient.ts b/packages/core/client/src/api-client/APIClient.ts index 6a2a42168..442334b86 100644 --- a/packages/core/client/src/api-client/APIClient.ts +++ b/packages/core/client/src/api-client/APIClient.ts @@ -1,7 +1,9 @@ +import React from 'react'; import { APIClient as APIClientSDK, getSubAppName } from '@tachybase/sdk'; + import { Result } from 'ahooks/es/useRequest/src/types'; import { notification } from 'antd'; -import React from 'react'; + import { Application } from '../application'; function notify(type, messages, instance) { diff --git a/packages/core/client/src/api-client/APIClientProvider.tsx b/packages/core/client/src/api-client/APIClientProvider.tsx index 043b5236d..2ec688081 100644 --- a/packages/core/client/src/api-client/APIClientProvider.tsx +++ b/packages/core/client/src/api-client/APIClientProvider.tsx @@ -1,4 +1,5 @@ import React, { ReactNode } from 'react'; + import { APIClient } from './APIClient'; import { APIClientContext } from './context'; @@ -7,7 +8,7 @@ export interface APIClientProviderProps { children?: ReactNode; } -export const APIClientProvider: React.FC = (props) => { +export const APIClientProvider = (props: APIClientProviderProps) => { const { apiClient, children } = props; return {children}; }; diff --git a/packages/core/client/src/api-client/hooks/assign.ts b/packages/core/client/src/api-client/hooks/assign.ts index 591d9b958..758d4dcc6 100644 --- a/packages/core/client/src/api-client/hooks/assign.ts +++ b/packages/core/client/src/api-client/hooks/assign.ts @@ -1,6 +1,7 @@ import { isPlainObject } from '@tachybase/utils/client'; + import deepmerge from 'deepmerge'; -import uniq from 'lodash/uniq'; +import { uniq } from 'lodash'; type MergeStrategyType = 'merge' | 'deepMerge' | 'overwrite' | 'andMerge' | 'orMerge' | 'intersect' | 'union'; type MergeStrategyFunc = (x: any, y: any) => any; diff --git a/packages/core/client/src/appInfo/CurrentAppInfoProvider.tsx b/packages/core/client/src/appInfo/CurrentAppInfoProvider.tsx index 41393dc25..62ceebc46 100644 --- a/packages/core/client/src/appInfo/CurrentAppInfoProvider.tsx +++ b/packages/core/client/src/appInfo/CurrentAppInfoProvider.tsx @@ -1,4 +1,5 @@ import React, { createContext, useContext } from 'react'; + import { useRequest } from '../api-client'; import { useAppSpin } from '../application/hooks/useAppSpin'; diff --git a/packages/core/client/src/appInfo/index.md b/packages/core/client/src/appInfo/index.md deleted file mode 100644 index 4f297ea84..000000000 --- a/packages/core/client/src/appInfo/index.md +++ /dev/null @@ -1 +0,0 @@ -# AppInfo \ No newline at end of file diff --git a/packages/core/client/src/application/AppSchemaComponentProvider.tsx b/packages/core/client/src/application/AppSchemaComponentProvider.tsx index 843c7a432..86ecae41c 100644 --- a/packages/core/client/src/application/AppSchemaComponentProvider.tsx +++ b/packages/core/client/src/application/AppSchemaComponentProvider.tsx @@ -5,16 +5,14 @@ import { useLocalStorageState } from 'ahooks'; import { SchemaComponentProvider } from '../schema-component/core'; import { ISchemaComponentProvider } from '../schema-component/types'; -const getKeyByName = (name) => { +const getKeyByName = (name?: string) => { if (!name) { return 'tachybase_designable'.toUpperCase(); } return `tachybase_${name}_designable`.toUpperCase(); }; -const SchemaComponentProviderWithLocalStorageState: React.FC = ( - props, -) => { +const SchemaComponentProviderWithLocalStorageState = (props: ISchemaComponentProvider & { appName?: string }) => { const [designable, setDesignable] = useLocalStorageState(getKeyByName(props.appName), { defaultValue: props.designable ? true : false, }); @@ -29,7 +27,7 @@ const SchemaComponentProviderWithLocalStorageState: React.FC = (props) => { +export const AppSchemaComponentProvider = (props: ISchemaComponentProvider) => { if (typeof props.designable === 'boolean') { return ; } diff --git a/packages/core/client/src/application/Application.tsx b/packages/core/client/src/application/Application.tsx index 8902579a2..88372c375 100644 --- a/packages/core/client/src/application/Application.tsx +++ b/packages/core/client/src/application/Application.tsx @@ -9,13 +9,13 @@ import { I18nextProvider } from 'react-i18next'; import { Link, Navigate, NavLink } from 'react-router-dom'; import { APIClient, APIClientProvider } from '../api-client'; -import { CSSVariableProvider } from '../css-variable'; import { CollectionField } from '../data-source/collection-field/CollectionField'; import { DataSourceApplicationProvider } from '../data-source/components/DataSourceApplicationProvider'; import { DataBlockProvider } from '../data-source/data-block/DataBlockProvider'; import { DataSourceManager, type DataSourceManagerOptions } from '../data-source/data-source/DataSourceManager'; -import { AntdAppProvider, GlobalThemeProvider } from '../global-theme'; import { i18n } from '../i18n'; +import { CSSVariableProvider } from '../style/css-variable'; +import { AntdAppProvider, GlobalThemeProvider } from '../style/theme'; import { AppSchemaComponentProvider } from './AppSchemaComponentProvider'; import { AppComponent, BlankComponent, defaultAppComponents } from './components'; import type { Plugin } from './Plugin'; @@ -215,7 +215,6 @@ export class Application { let loadFailed = false; this.ws.on('message', (event) => { const data = JSON.parse(event.data); - console.log(data.payload); if (data?.payload?.refresh) { window.location.reload(); return; @@ -229,7 +228,6 @@ export class Application { this.maintaining = true; this.error = data.payload; } else { - // console.log('loadFailed', loadFailed); if (loadFailed) { window.location.reload(); return; diff --git a/packages/core/client/src/application/Plugin.ts b/packages/core/client/src/application/Plugin.ts index 45c18380d..23149cf0f 100644 --- a/packages/core/client/src/application/Plugin.ts +++ b/packages/core/client/src/application/Plugin.ts @@ -1,4 +1,5 @@ import { TFuncKey, TOptions } from 'i18next'; + import type { Application } from './Application'; export class Plugin { diff --git a/packages/core/client/src/application/PluginSettingsManager.ts b/packages/core/client/src/application/PluginSettingsManager.ts index 1b08efe79..22bf80fdb 100644 --- a/packages/core/client/src/application/PluginSettingsManager.ts +++ b/packages/core/client/src/application/PluginSettingsManager.ts @@ -1,5 +1,6 @@ -import { set } from 'lodash'; import React, { createElement } from 'react'; + +import { set } from 'lodash'; import { Outlet } from 'react-router-dom'; import { Icon } from '../icon'; diff --git a/packages/core/client/src/application/WebSocketClient.ts b/packages/core/client/src/application/WebSocketClient.ts index 8a92d73b8..a7cbe5126 100644 --- a/packages/core/client/src/application/WebSocketClient.ts +++ b/packages/core/client/src/application/WebSocketClient.ts @@ -116,7 +116,6 @@ export class WebSocketClient { this.connected = true; }; ws.onerror = async () => { - // setTimeout(() => this.connect(), this.reconnectInterval); console.log('onerror', this.readyState, this._reconnectTimes); }; ws.onclose = async (event) => { diff --git a/packages/core/client/src/application/hoc/withDynamicSchemaProps.tsx b/packages/core/client/src/application/hoc/withDynamicSchemaProps.tsx index d5f183ec1..bc8c73e62 100644 --- a/packages/core/client/src/application/hoc/withDynamicSchemaProps.tsx +++ b/packages/core/client/src/application/hoc/withDynamicSchemaProps.tsx @@ -1,8 +1,10 @@ -import { useExpressionScope } from '@tachybase/schema'; import React, { ComponentType, useMemo } from 'react'; -import { useDesignable } from '../../schema-component'; +import { useExpressionScope } from '@tachybase/schema'; + import _ from 'lodash'; +import { useDesignable } from '../../schema-component'; + const useDefaultSchemaProps = () => undefined; interface WithSchemaHookOptions { diff --git a/packages/core/client/src/application/index.md b/packages/core/client/src/application/index.md index 0671a8a7b..3aabe1e80 100644 --- a/packages/core/client/src/application/index.md +++ b/packages/core/client/src/application/index.md @@ -6,8 +6,6 @@ group: # Application V2 - - ## Usage ### 基础用法 diff --git a/packages/core/client/src/block-provider/DetailsBlockProvider.tsx b/packages/core/client/src/block-provider/DetailsBlockProvider.tsx index d53b83353..70ba7f556 100644 --- a/packages/core/client/src/block-provider/DetailsBlockProvider.tsx +++ b/packages/core/client/src/block-provider/DetailsBlockProvider.tsx @@ -1,14 +1,14 @@ -import { createForm } from '@tachybase/schema'; -import { useField } from '@tachybase/schema'; +import React, { createContext, useContext, useEffect, useMemo, useRef } from 'react'; +import { createForm, useField } from '@tachybase/schema'; + import { Spin } from 'antd'; import _ from 'lodash'; -import React, { createContext, useContext, useEffect, useMemo, useRef } from 'react'; + +import { withDynamicSchemaProps } from '../application/hoc/withDynamicSchemaProps'; import { useCollectionParentRecord } from '../data-source/collection-record/CollectionRecordProvider'; import { RecordProvider } from '../record-provider'; import { BlockProvider, useBlockRequestContext } from './BlockProvider'; import { useParsedFilter } from './hooks'; -import { withDynamicSchemaProps } from '../application/hoc/withDynamicSchemaProps'; -import { TemplateBlockProvider } from './TemplateBlockProvider'; export const DetailsBlockContext = createContext({}); DetailsBlockContext.displayName = 'DetailsBlockContext'; @@ -65,11 +65,9 @@ const InternalDetailsBlockProvider = (props) => { export const DetailsBlockProvider = withDynamicSchemaProps((props) => { return ( - - - - - + + + ); }); diff --git a/packages/core/client/src/block-provider/FilterFormBlockProvider.tsx b/packages/core/client/src/block-provider/FilterFormBlockProvider.tsx index ddd6e7138..ca5a9238a 100644 --- a/packages/core/client/src/block-provider/FilterFormBlockProvider.tsx +++ b/packages/core/client/src/block-provider/FilterFormBlockProvider.tsx @@ -1,8 +1,9 @@ import React from 'react'; + +import { withDynamicSchemaProps } from '../application/hoc/withDynamicSchemaProps'; import { DatePickerProvider } from '../schema-component'; import { DefaultValueProvider } from '../schema-settings'; import { FormBlockProvider } from './FormBlockProvider'; -import { withDynamicSchemaProps } from '../application/hoc/withDynamicSchemaProps'; export const FilterFormBlockProvider = withDynamicSchemaProps((props) => { return ( diff --git a/packages/core/client/src/block-provider/FormBlockProvider.tsx b/packages/core/client/src/block-provider/FormBlockProvider.tsx index ea9e0c7c2..66f9586de 100644 --- a/packages/core/client/src/block-provider/FormBlockProvider.tsx +++ b/packages/core/client/src/block-provider/FormBlockProvider.tsx @@ -11,7 +11,6 @@ import { useActionContext, useDesignable } from '../schema-component'; import { Templates as DataTemplateSelect } from '../schema-component/antd/form-v2/Templates'; import { BlockProvider, useBlockRequestContext } from './BlockProvider'; import { FormActiveFieldsProvider } from './hooks/useFormActiveFields'; -import { TemplateBlockProvider } from './TemplateBlockProvider'; export const FormBlockContext = createContext<{ form?: any; @@ -114,18 +113,16 @@ export const FormBlockProvider = withDynamicSchemaProps((props) => { } return ( - - - - - - - + + + + + ); }); diff --git a/packages/core/client/src/block-provider/FormFieldProvider.tsx b/packages/core/client/src/block-provider/FormFieldProvider.tsx index b7b789633..fed90f541 100644 --- a/packages/core/client/src/block-provider/FormFieldProvider.tsx +++ b/packages/core/client/src/block-provider/FormFieldProvider.tsx @@ -1,9 +1,9 @@ -import { createForm, onFormValuesChange } from '@tachybase/schema'; -import { useField } from '@tachybase/schema'; -import { autorun } from '@tachybase/schema'; -import { forEach } from '@tachybase/utils/client'; -import { Spin } from 'antd'; import React, { createContext, useContext, useEffect, useMemo } from 'react'; +import { autorun, createForm, onFormValuesChange, useField } from '@tachybase/schema'; +import { forEach } from '@tachybase/utils/client'; + +import { Spin } from 'antd'; + import { useCollectionParentRecordData } from '../data-source/collection-record/CollectionRecordProvider'; import { RecordProvider } from '../record-provider'; import { BlockProvider, useBlockRequestContext } from './BlockProvider'; diff --git a/packages/core/client/src/block-provider/TableBlockProvider.tsx b/packages/core/client/src/block-provider/TableBlockProvider.tsx index 3fd8eec6a..2f416c44e 100644 --- a/packages/core/client/src/block-provider/TableBlockProvider.tsx +++ b/packages/core/client/src/block-provider/TableBlockProvider.tsx @@ -1,12 +1,11 @@ -import { createForm } from '@tachybase/schema'; -import { FormContext, useField, useFieldSchema } from '@tachybase/schema'; import React, { createContext, useContext, useMemo, useState } from 'react'; +import { createForm, FormContext, useField, useFieldSchema } from '@tachybase/schema'; + +import { withDynamicSchemaProps } from '../application/hoc/withDynamicSchemaProps'; import { useCollectionManager_deprecated } from '../collection-manager'; +import { useTableBlockParams } from '../modules/blocks/data-blocks/table/hooks/useTableBlockDecoratorProps'; import { FixedBlockWrapper, SchemaComponentOptions } from '../schema-component'; import { BlockProvider, RenderChildrenWithAssociationFilter, useBlockRequestContext } from './BlockProvider'; -import { useParsedFilter } from './hooks'; -import { useTableBlockParams } from '../modules/blocks/data-blocks/table/hooks/useTableBlockDecoratorProps'; -import { withDynamicSchemaProps } from '../application/hoc/withDynamicSchemaProps'; export const TableBlockContext = createContext({}); TableBlockContext.displayName = 'TableBlockContext'; diff --git a/packages/core/client/src/block-provider/TableFieldProvider.tsx b/packages/core/client/src/block-provider/TableFieldProvider.tsx index b15669d33..2a943b370 100644 --- a/packages/core/client/src/block-provider/TableFieldProvider.tsx +++ b/packages/core/client/src/block-provider/TableFieldProvider.tsx @@ -1,6 +1,6 @@ -import { ArrayField, Field } from '@tachybase/schema'; -import { useField, useFieldSchema } from '@tachybase/schema'; import React, { createContext, useContext, useEffect } from 'react'; +import { ArrayField, Field, useField, useFieldSchema } from '@tachybase/schema'; + import { APIClient } from '../api-client'; import { BlockProvider, useBlockRequestContext } from './BlockProvider'; import { useFormBlockContext } from './FormBlockProvider'; @@ -23,9 +23,6 @@ const InternalTableFieldProvider = (props) => { if (!formBlockCtx?.updateAssociationValues?.includes(fullFieldName)) { formBlockCtx?.updateAssociationValues?.push(fullFieldName); } - // if (service.loading) { - // return ; - // } return ( { const { resource, service } = useBlockRequestContext(); const [expandFlag, setExpandFlag] = useState(false); const parentRecordData = useCollectionParentRecordData(); - // if (service.loading) { - // return ; - // } return ( { ); }; -const useAssociationNames2 = (collection) => { - const { getCollectionFields } = useCollectionManager_deprecated(); - const names = getCollectionFields(collection) - ?.filter((field) => field.target) - .map((field) => field.name); - return names; -}; - export const recursiveParent = (schema: Schema, component) => { return schema['x-component'] === component ? schema diff --git a/packages/core/client/src/block-provider/TemplateBlockProvider.tsx b/packages/core/client/src/block-provider/TemplateBlockProvider.tsx deleted file mode 100644 index 7da7e65e5..000000000 --- a/packages/core/client/src/block-provider/TemplateBlockProvider.tsx +++ /dev/null @@ -1,23 +0,0 @@ -import React, { createContext, useContext, useState } from 'react'; - -const TemplateBlockContext = createContext<{ - // 模板是否已经请求结束 - templateFinshed?: boolean; - onTemplateSuccess?: Function; -}>({}); -TemplateBlockContext.displayName = 'TemplateBlockContext'; - -export const useTemplateBlockContext = () => { - return useContext(TemplateBlockContext); -}; - -const TemplateBlockProvider = (props) => { - const [templateFinshed, setTemplateFinshed] = useState(false); - return ( - setTemplateFinshed(true) }}> - {props.children} - - ); -}; - -export { TemplateBlockProvider }; diff --git a/packages/core/client/src/block-provider/hooks/index.ts b/packages/core/client/src/block-provider/hooks/index.ts index 5a095319c..c9b6ff0fa 100644 --- a/packages/core/client/src/block-provider/hooks/index.ts +++ b/packages/core/client/src/block-provider/hooks/index.ts @@ -36,15 +36,6 @@ export * from './useFormActiveFields'; export * from './useParsedFilter'; export * from './useDataBlockSourceId'; -export const usePickActionProps = () => { - const form = useForm(); - return { - onClick() { - console.log('usePickActionProps', form.values); - }, - }; -}; - function renderTemplate(str: string, data: any) { const re = /\{\{\s*((\w+\.?)+)\s*\}\}/g; return str.replace(re, function (_, key) { diff --git a/packages/core/client/src/block-provider/hooks/useParsedFilter.ts b/packages/core/client/src/block-provider/hooks/useParsedFilter.ts index 586ef788a..50173eee8 100644 --- a/packages/core/client/src/block-provider/hooks/useParsedFilter.ts +++ b/packages/core/client/src/block-provider/hooks/useParsedFilter.ts @@ -1,7 +1,10 @@ +import { useState } from 'react'; import { reaction } from '@tachybase/schema'; import { flatten, getValuesByPath } from '@tachybase/utils/client'; + +import { useDeepCompareEffect } from 'ahooks'; import _ from 'lodash'; -import { useEffect, useState } from 'react'; + import { useParseDataScopeFilter } from '../../schema-settings'; import { DEBOUNCE_WAIT } from '../../variables'; import { getPath } from '../../variables/utils/getPath'; @@ -12,7 +15,7 @@ export function useParsedFilter({ filterOption }: { filterOption: any }) { const { parseFilter, findVariable } = useParseDataScopeFilter(); const [filter, setFilter] = useState({}); - useEffect(() => { + useDeepCompareEffect(() => { if (!filterOption) return; const _run = async () => { @@ -50,7 +53,7 @@ export function useParsedFilter({ filterOption }: { filterOption: any }) { }); return flat; }, run); - }, [JSON.stringify(filterOption)]); + }, [filterOption]); return { filter }; } diff --git a/packages/core/client/src/block-provider/index.md b/packages/core/client/src/block-provider/index.md deleted file mode 100644 index a277e3d54..000000000 --- a/packages/core/client/src/block-provider/index.md +++ /dev/null @@ -1 +0,0 @@ -# BlockProvider \ No newline at end of file diff --git a/packages/core/client/src/buildin-plugin/index.tsx b/packages/core/client/src/buildin-plugin/index.tsx index a96b5a1f2..2541496c7 100644 --- a/packages/core/client/src/buildin-plugin/index.tsx +++ b/packages/core/client/src/buildin-plugin/index.tsx @@ -12,7 +12,7 @@ import { Application } from '../application'; import { Plugin } from '../application/Plugin'; import { BlockSchemaComponentPlugin } from '../block-provider'; import { CollectionPlugin } from '../collection-manager'; -import { AdminLayoutPlugin, RouteSchemaComponent } from '../route-switch'; +import { RouteSchemaComponent } from '../route-switch'; import { AntdSchemaComponentPlugin, SchemaComponentPlugin } from '../schema-component'; import { ErrorFallback } from '../schema-component/antd/error-fallback'; import { AssociationFilterPlugin, SchemaInitializerPlugin } from '../schema-initializer'; @@ -20,12 +20,15 @@ import { SchemaSettingsPlugin } from '../schema-settings'; import { BlockTemplateDetails, BlockTemplatePage } from '../schema-templates'; import { CurrentUserProvider, CurrentUserSettingsMenuProvider } from '../user'; import { ACLPlugin } from './acl'; +import { AdminLayoutPlugin } from './admin-layout'; import { RemoteDocumentTitlePlugin } from './document-title'; import { LocalePlugin } from './locale/LocalePlugin'; import { PinnedListPlugin } from './pinned-list'; import { PMPlugin } from './pm'; import { SystemSettingsPlugin } from './system-settings'; +export { AdminProvider } from './admin-layout'; + interface AppStatusProps { error: Error; app: Application; @@ -224,11 +227,6 @@ const AppMaintaining = observer( status={status} title={app.i18n.t(title)} subTitle={app.i18n.t(subTitle)} - // extra={[ - // , - // ]} /> ); diff --git a/packages/core/client/src/buildin-plugin/locale/LocalePlugin.ts b/packages/core/client/src/buildin-plugin/locale/LocalePlugin.ts index 6c27ccd25..a0c3caea2 100644 --- a/packages/core/client/src/buildin-plugin/locale/LocalePlugin.ts +++ b/packages/core/client/src/buildin-plugin/locale/LocalePlugin.ts @@ -3,7 +3,7 @@ import { setValidateLanguage } from '@tachybase/schema'; import { App, ConfigProvider } from 'antd'; import dayjs from 'dayjs'; -import { loadConstrueLocale } from '../../antd-config-provider/loadConstrueLocale'; +import { loadConstrueLocale } from './loadConstrueLocale'; import { Plugin } from '../../application/Plugin'; import { dayjsLocale } from '../../locale'; diff --git a/packages/core/client/src/antd-config-provider/loadConstrueLocale.ts b/packages/core/client/src/buildin-plugin/locale/loadConstrueLocale.ts similarity index 95% rename from packages/core/client/src/antd-config-provider/loadConstrueLocale.ts rename to packages/core/client/src/buildin-plugin/locale/loadConstrueLocale.ts index 1080536d1..e25b66103 100644 --- a/packages/core/client/src/antd-config-provider/loadConstrueLocale.ts +++ b/packages/core/client/src/buildin-plugin/locale/loadConstrueLocale.ts @@ -164,9 +164,7 @@ class CronstrueLocale { } export const loadConstrueLocale = (data) => { - // vite bug: https://github.com/vitejs/vite/issues/2139 - const cronstrueVal = (cronstrue as any).default ? (cronstrue as any).default : cronstrue; - cronstrueVal.initialize({ + cronstrue.initialize({ load(availableLocales) { availableLocales[data?.lang] = new CronstrueLocale(data?.cronstrue); }, diff --git a/packages/core/client/src/buildin-plugin/pm/PluginDocument.tsx b/packages/core/client/src/buildin-plugin/pm/PluginDocument.tsx index d540a255e..ff593939a 100644 --- a/packages/core/client/src/buildin-plugin/pm/PluginDocument.tsx +++ b/packages/core/client/src/buildin-plugin/pm/PluginDocument.tsx @@ -3,9 +3,9 @@ import React, { memo, useCallback, useEffect, useMemo, useState } from 'react'; import { Spin } from 'antd'; import { useRequest } from '../../api-client'; -import { useGlobalTheme } from '../../global-theme'; import { useStyles as useMarkdownStyles } from '../../schema-component/antd/markdown/style'; import { useParseMarkdown } from '../../schema-component/antd/markdown/util'; +import { useGlobalTheme } from '../../style/theme'; import { useStyles } from './style'; const PLUGIN_STATICS_PATH = '/static/plugins/'; diff --git a/packages/core/client/src/collection-manager/CollectionHistoryProvider.tsx b/packages/core/client/src/collection-manager/CollectionHistoryProvider.tsx index 75567f931..f44b956c1 100644 --- a/packages/core/client/src/collection-manager/CollectionHistoryProvider.tsx +++ b/packages/core/client/src/collection-manager/CollectionHistoryProvider.tsx @@ -34,8 +34,6 @@ export const CollectionHistoryProvider = (props) => { const location = useLocation(); - // console.log('location', location); - const service = useRequest<{ data: any; }>(options, { diff --git a/packages/core/client/src/collection-manager/action-hooks.ts b/packages/core/client/src/collection-manager/action-hooks.ts index f98259016..639c02fec 100644 --- a/packages/core/client/src/collection-manager/action-hooks.ts +++ b/packages/core/client/src/collection-manager/action-hooks.ts @@ -478,7 +478,7 @@ export const useUpdateAction = (actionCallback?: (key: string, values: any) => v await form.reset(); refresh(); } catch (e) { - console.log(e); + console.error(e); } finally { field.data.loading = false; } diff --git a/packages/core/client/src/collection-manager/sub-table.tsx b/packages/core/client/src/collection-manager/sub-table.tsx index cf7b4a334..dad5aca1f 100644 --- a/packages/core/client/src/collection-manager/sub-table.tsx +++ b/packages/core/client/src/collection-manager/sub-table.tsx @@ -1,6 +1,8 @@ -import { observer, useForm } from '@tachybase/schema'; -import { cloneDeep } from 'lodash'; import React, { createContext, useContext, useState } from 'react'; +import { observer, useForm } from '@tachybase/schema'; + +import { cloneDeep } from 'lodash'; + import { CollectionOptions, CollectionProvider_deprecated, @@ -97,7 +99,6 @@ const useCreateAction = () => { const { setVisible } = useActionContext(); return { async run() { - console.log('form.values', form.values); const dataSource = ctx.dataSource || []; dataSource.push(cloneDeep(form.values)); ctx.setDataSource([...dataSource]); @@ -199,7 +200,6 @@ export const SubFieldDataSourceProvider_deprecated = observer( }, { onSuccess(data) { - console.log('dataSource1', data?.data); setDataSource(data?.data); }, }, diff --git a/packages/core/client/src/global-theme/compatOldTheme.ts b/packages/core/client/src/global-theme/compatOldTheme.ts deleted file mode 100644 index 1786ec763..000000000 --- a/packages/core/client/src/global-theme/compatOldTheme.ts +++ /dev/null @@ -1,13 +0,0 @@ -import defaultTheme from './defaultTheme'; -import { ThemeConfig } from './type'; - -// 兼容旧主题 -function compatOldTheme(theme: ThemeConfig) { - if (!theme.token?.colorSettings) { - theme.token = { ...theme.token, ...defaultTheme.token }; - } - - return theme; -} - -export default compatOldTheme; diff --git a/packages/core/client/src/hooks/useViewport.ts b/packages/core/client/src/hooks/useViewport.ts index 65070c7e7..5009c45ba 100644 --- a/packages/core/client/src/hooks/useViewport.ts +++ b/packages/core/client/src/hooks/useViewport.ts @@ -40,5 +40,6 @@ export function useViewport() { return () => { restore(); }; + // eslint-disable-next-line react-hooks/exhaustive-deps }, []); } diff --git a/packages/core/client/src/i18n/i18n.ts b/packages/core/client/src/i18n/i18n.ts index efc069c78..1e4053e69 100644 --- a/packages/core/client/src/i18n/i18n.ts +++ b/packages/core/client/src/i18n/i18n.ts @@ -18,27 +18,13 @@ Object.keys(locale).forEach((lang) => { resources[lang] = locale[lang].resources; }); -i18n - // .use(Backend) - .use(initReactI18next) - .init({ - lng: localStorage.getItem('TACHYBASE_LOCALE') || 'en-US', - // debug: true, - defaultNS: 'client', - // fallbackNS: 'client', - // backend: { - // // for all available options read the backend's repository readme file - // loadPath: '/api/locales/{{lng}}/{{ns}}.json', - // }, - // parseMissingKeyHandler: (key) => { - // console.log('parseMissingKeyHandler', `'${key}': '${key}',`); - // return key; - // }, - // ns: ['client'], - resources: {}, - keySeparator: false, - nsSeparator: false, - }); +i18n.use(initReactI18next).init({ + lng: localStorage.getItem('TACHYBASE_LOCALE') || 'en-US', + defaultNS: 'client', + resources: {}, + keySeparator: false, + nsSeparator: false, +}); i18n.on('languageChanged', (lng) => { localStorage.setItem('TACHYBASE_LOCALE', lng); diff --git a/packages/core/client/src/index.ts b/packages/core/client/src/index.ts index d31f01b74..8cf6186b8 100644 --- a/packages/core/client/src/index.ts +++ b/packages/core/client/src/index.ts @@ -4,7 +4,6 @@ import './global.less'; export * from '@emotion/css'; export * from './buildin-plugin/acl'; -export * from './antd-config-provider'; export * from './api-client'; export * from './appInfo'; export * from './application'; @@ -13,12 +12,12 @@ export * from './block-provider'; export * from './collection-manager'; export * from './common'; -export * from './css-variable'; +export * from './style/css-variable'; export * from './data-source'; export * from './buildin-plugin/document-title'; export * from './filter-provider'; export * from './flag-provider'; -export * from './global-theme'; +export * from './style/theme'; export * from './hooks'; export * from './i18n'; export * from './icon'; @@ -35,7 +34,7 @@ export * from './schema-items'; export * from './schema-settings'; export * from './schema-templates'; export * from './style'; -export type { CustomToken } from './global-theme'; +export type { CustomToken } from './style/theme'; export * from './buildin-plugin/system-settings'; export * from './testUtils'; export * from './user'; diff --git a/packages/core/client/src/modules/blocks/data-blocks/table/tableColumnSettings.tsx b/packages/core/client/src/modules/blocks/data-blocks/table/tableColumnSettings.tsx index d77884f31..a22ce9ea2 100644 --- a/packages/core/client/src/modules/blocks/data-blocks/table/tableColumnSettings.tsx +++ b/packages/core/client/src/modules/blocks/data-blocks/table/tableColumnSettings.tsx @@ -1,13 +1,14 @@ -import { ISchema } from '@tachybase/schema'; -import { useField, useFieldSchema } from '@tachybase/schema'; +import { ISchema, useField, useFieldSchema } from '@tachybase/schema'; + import { useTranslation } from 'react-i18next'; + import { useApp } from '../../../../application'; import { SchemaSettings } from '../../../../application/schema-settings/SchemaSettings'; import { useCollectionManager_deprecated } from '../../../../collection-manager'; import { useDesignable } from '../../../../schema-component'; import { useAssociationFieldContext } from '../../../../schema-component/antd/association-field/hooks'; import { useColumnSchema } from '../../../../schema-component/antd/table-v2/Table.Column.Decorator'; -import { SchemaSettingsDefaultValue, isPatternDisabled } from '../../../../schema-settings'; +import { isPatternDisabled, SchemaSettingsDefaultValue } from '../../../../schema-settings'; import { useFieldComponentName } from './utils'; export const tableColumnSettings = new SchemaSettings({ @@ -297,6 +298,7 @@ export const tableColumnSettings = new SchemaSettings({ useChildren() { const app = useApp(); const fieldComponentName = useFieldComponentName(); + console.log('🚀 ~ file: tableColumnSettings.tsx:300 ~ useChildren ~ fieldComponentName:', fieldComponentName); const map = { Select: 'Select', DatePicker: 'DatePicker', @@ -309,6 +311,12 @@ export const tableColumnSettings = new SchemaSettings({ const componentSettings = app.schemaSettingsManager.get( `fieldSettings:component:${map[fieldComponentName] || fieldComponentName}`, ); + console.log( + '🚀 ~ file: tableColumnSettings.tsx:313 ~ useChildren ~ componentSettings:', + componentSettings, + app.schemaSettingsManager.getAll(), + ); + console.log(`fieldSettings:component:${map[fieldComponentName] || fieldComponentName}`, 'fieldComponentName'); return componentSettings?.items || []; }, }, diff --git a/packages/core/client/src/modules/fields/component/DatePicker/datePickerComponentFieldSettings.tsx b/packages/core/client/src/modules/fields/component/DatePicker/datePickerComponentFieldSettings.tsx index 0723e2c5f..582e08420 100644 --- a/packages/core/client/src/modules/fields/component/DatePicker/datePickerComponentFieldSettings.tsx +++ b/packages/core/client/src/modules/fields/component/DatePicker/datePickerComponentFieldSettings.tsx @@ -1,7 +1,8 @@ import { useFieldSchema } from '@tachybase/schema'; + import { SchemaSettings } from '../../../../application/schema-settings/SchemaSettings'; -import { SchemaSettingsDateFormat } from '../../../../schema-settings/SchemaSettingsDateFormat'; import { useColumnSchema } from '../../../../schema-component/antd/table-v2/Table.Column.Decorator'; +import { SchemaSettingsDateFormat } from '../../../../schema-settings/SchemaSettingsDateFormat'; export const datePickerComponentFieldSettings = new SchemaSettings({ name: 'fieldSettings:component:DatePicker', diff --git a/packages/core/client/src/modules/menu/GroupItem.tsx b/packages/core/client/src/modules/menu/GroupItem.tsx index 010c9d989..7dbdf6844 100644 --- a/packages/core/client/src/modules/menu/GroupItem.tsx +++ b/packages/core/client/src/modules/menu/GroupItem.tsx @@ -1,11 +1,13 @@ +import React, { useCallback, useContext } from 'react'; import { FormLayout } from '@tachybase/components'; import { SchemaOptionsContext } from '@tachybase/schema'; -import React, { useCallback, useContext } from 'react'; + import { useTranslation } from 'react-i18next'; -import { FormDialog, SchemaComponent, SchemaComponentOptions } from '../../schema-component'; + import { SchemaInitializerItem, useSchemaInitializer } from '../../application'; -import { useGlobalTheme } from '../../global-theme'; +import { FormDialog, SchemaComponent, SchemaComponentOptions } from '../../schema-component'; import { useStyles } from '../../schema-component/antd/menu/MenuItemInitializers'; +import { useGlobalTheme } from '../../style/theme'; export const GroupItem = () => { const { insert } = useSchemaInitializer(); diff --git a/packages/core/client/src/modules/menu/LinkMenuItem.tsx b/packages/core/client/src/modules/menu/LinkMenuItem.tsx index 76ec396ad..49784b2e1 100644 --- a/packages/core/client/src/modules/menu/LinkMenuItem.tsx +++ b/packages/core/client/src/modules/menu/LinkMenuItem.tsx @@ -1,11 +1,13 @@ +import React, { useCallback, useContext } from 'react'; import { FormLayout } from '@tachybase/components'; import { SchemaOptionsContext } from '@tachybase/schema'; -import React, { useCallback, useContext } from 'react'; + import { useTranslation } from 'react-i18next'; -import { FormDialog, SchemaComponent, SchemaComponentOptions } from '../../schema-component'; + import { SchemaInitializerItem, useSchemaInitializer } from '../../application'; -import { useGlobalTheme } from '../../global-theme'; +import { FormDialog, SchemaComponent, SchemaComponentOptions } from '../../schema-component'; import { useStyles } from '../../schema-component/antd/menu/MenuItemInitializers'; +import { useGlobalTheme } from '../../style/theme'; export const LinkMenuItem = () => { const { insert } = useSchemaInitializer(); diff --git a/packages/core/client/src/modules/menu/PageMenuItem.tsx b/packages/core/client/src/modules/menu/PageMenuItem.tsx index 7ec7321cc..e6db3ff30 100644 --- a/packages/core/client/src/modules/menu/PageMenuItem.tsx +++ b/packages/core/client/src/modules/menu/PageMenuItem.tsx @@ -1,12 +1,13 @@ -import { FormLayout } from '@tachybase/components'; -import { SchemaOptionsContext } from '@tachybase/schema'; -import { uid } from '@tachybase/schema'; import React, { useCallback, useContext } from 'react'; +import { FormLayout } from '@tachybase/components'; +import { SchemaOptionsContext, uid } from '@tachybase/schema'; + import { useTranslation } from 'react-i18next'; + import { SchemaInitializerItem, useSchemaInitializer } from '../../application'; -import { useGlobalTheme } from '../../global-theme'; import { FormDialog, SchemaComponent, SchemaComponentOptions } from '../../schema-component'; import { useStyles } from '../../schema-component/antd/menu/MenuItemInitializers'; +import { useGlobalTheme } from '../../style/theme'; export const PageMenuItem = () => { const { insert } = useSchemaInitializer(); diff --git a/packages/core/client/src/route-switch/antd/route-schema-component/index.tsx b/packages/core/client/src/route-switch/RouteSchemaComponent.tsx similarity index 82% rename from packages/core/client/src/route-switch/antd/route-schema-component/index.tsx rename to packages/core/client/src/route-switch/RouteSchemaComponent.tsx index 0b576a7da..adb8edc3b 100644 --- a/packages/core/client/src/route-switch/antd/route-schema-component/index.tsx +++ b/packages/core/client/src/route-switch/RouteSchemaComponent.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { useParams } from 'react-router-dom'; -import { RemoteSchemaComponent } from '../../../'; +import { RemoteSchemaComponent } from '..'; export function RouteSchemaComponent(props: any) { const params = useParams(); diff --git a/packages/core/client/src/route-switch/antd/index.ts b/packages/core/client/src/route-switch/antd/index.ts deleted file mode 100644 index 6a8990912..000000000 --- a/packages/core/client/src/route-switch/antd/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from '../../buildin-plugin/admin-layout'; -export * from './route-schema-component'; diff --git a/packages/core/client/src/route-switch/index.tsx b/packages/core/client/src/route-switch/index.tsx index 37b189656..57920ed7c 100644 --- a/packages/core/client/src/route-switch/index.tsx +++ b/packages/core/client/src/route-switch/index.tsx @@ -1 +1 @@ -export * from './antd'; +export * from './RouteSchemaComponent'; diff --git a/packages/core/client/src/schema-component/antd/__builtins__/hooks/useToken.ts b/packages/core/client/src/schema-component/antd/__builtins__/hooks/useToken.ts index e148d3e10..c52718603 100644 --- a/packages/core/client/src/schema-component/antd/__builtins__/hooks/useToken.ts +++ b/packages/core/client/src/schema-component/antd/__builtins__/hooks/useToken.ts @@ -1,5 +1,6 @@ import { theme } from 'antd'; -import { CustomToken } from '../../../../global-theme'; + +import { CustomToken } from '../../../../style/theme'; interface Result extends ReturnType { token: CustomToken; diff --git a/packages/core/client/src/schema-component/antd/__builtins__/style.ts b/packages/core/client/src/schema-component/antd/__builtins__/style.ts index 94b397ec2..33fa9ac25 100644 --- a/packages/core/client/src/schema-component/antd/__builtins__/style.ts +++ b/packages/core/client/src/schema-component/antd/__builtins__/style.ts @@ -1,10 +1,11 @@ -import type { CSSInterpolation, CSSObject } from '@ant-design/cssinjs'; -import { useStyleRegister } from '@ant-design/cssinjs'; -import { merge } from '@tachybase/schema'; -import type { ComponentTokenMap, GlobalToken } from 'antd/es/theme/interface'; -import { CustomToken } from '../../../global-theme'; -import { useConfig, usePrefixCls, useToken } from './hooks'; import { useMemo } from 'react'; +import { merge } from '@tachybase/schema'; + +import { useStyleRegister, type CSSInterpolation, type CSSObject } from '@ant-design/cssinjs'; +import type { ComponentTokenMap, GlobalToken } from 'antd/es/theme/interface'; + +import { CustomToken } from '../../../style/theme'; +import { useConfig, usePrefixCls, useToken } from './hooks'; export type OverrideComponent = keyof ComponentTokenMap | string; diff --git a/packages/core/client/src/schema-component/antd/action/Action.tsx b/packages/core/client/src/schema-component/antd/action/Action.tsx index 2edfd6950..c05f6f2c4 100644 --- a/packages/core/client/src/schema-component/antd/action/Action.tsx +++ b/packages/core/client/src/schema-component/antd/action/Action.tsx @@ -68,7 +68,7 @@ export const Action: ComposedAction = withDynamicSchemaProps( const openSize = fieldSchema?.['x-component-props']?.['openSize']; const disabled = form.disabled || field.disabled || field.data?.disabled || propsDisabled; - const linkageRules = fieldSchema?.['x-linkage-rules'] || []; + const linkageRules = useMemo(() => fieldSchema?.['x-linkage-rules'] || [], [fieldSchema]); const { designable } = useDesignable(); const tarComponent = useComponent(component) || component; const { modal } = App.useApp(); diff --git a/packages/core/client/src/schema-component/antd/action/hooks.ts b/packages/core/client/src/schema-component/antd/action/hooks.ts index 475ab737a..2d239f174 100644 --- a/packages/core/client/src/schema-component/antd/action/hooks.ts +++ b/packages/core/client/src/schema-component/antd/action/hooks.ts @@ -50,7 +50,7 @@ export const useCloseAction = () => { async run() { setVisible(false); form.submit((values) => { - console.log(values); + console.warn(values); }); }, }; diff --git a/packages/core/client/src/schema-component/antd/form-dialog/index.tsx b/packages/core/client/src/schema-component/antd/form-dialog/index.tsx index 1b2f43c52..d82aa11ac 100644 --- a/packages/core/client/src/schema-component/antd/form-dialog/index.tsx +++ b/packages/core/client/src/schema-component/antd/form-dialog/index.tsx @@ -20,7 +20,7 @@ import { Modal, ModalProps, ThemeConfig } from 'antd'; import { createPortal } from 'react-dom'; import { createPortalProvider, createPortalRoot, loading, usePrefixCls, useToken } from '../__builtins__'; -import { GlobalThemeProvider } from '../../../global-theme'; +import { GlobalThemeProvider } from '../../../style/theme'; type FormDialogRenderer = React.ReactElement | ((form: Form) => React.ReactElement); diff --git a/packages/core/client/src/schema-component/antd/form-v2/Form.tsx b/packages/core/client/src/schema-component/antd/form-v2/Form.tsx index aadbe497c..6886e9714 100644 --- a/packages/core/client/src/schema-component/antd/form-v2/Form.tsx +++ b/packages/core/client/src/schema-component/antd/form-v2/Form.tsx @@ -23,7 +23,6 @@ import { createStyles } from 'antd-style'; import { useActionContext } from '..'; import { useAttach, useComponent } from '../..'; import { withDynamicSchemaProps } from '../../../application/hoc/withDynamicSchemaProps'; -import { useTemplateBlockContext } from '../../../block-provider/TemplateBlockProvider'; import { ActionType } from '../../../schema-settings/LinkageRules/type'; import { useLocalVariables, useVariables } from '../../../variables'; import { VariableOption, VariablesContextType } from '../../../variables/types'; @@ -83,7 +82,6 @@ const FormDecorator: React.FC = (props) => { - {/* {children} */} @@ -111,7 +109,6 @@ const WithForm = (props: WithFormProps) => { const { setFormValueChanged } = useActionContext(); const variables = useVariables(); const localVariables = useLocalVariables({ currentForm: form }); - const { templateFinshed } = useTemplateBlockContext(); const linkageRules: any[] = (getLinkageRules(fieldSchema) || fieldSchema.parent?.['x-linkage-rules'])?.filter((k) => !k.disabled) || []; @@ -191,7 +188,7 @@ const WithForm = (props: WithFormProps) => { dispose(); }); }; - }, [linkageRules, templateFinshed]); + }, [linkageRules]); return fieldSchema['x-decorator'] === 'FormV2' ? : ; }; @@ -332,7 +329,6 @@ function getFieldValuesInCondition({ linkageRules, formValues }) { return conditions .map((condition) => { - // fix if ('$and' in condition || '$or' in condition) { return run(condition); } diff --git a/packages/core/client/src/schema-component/antd/markdown/Markdown.Void.tsx b/packages/core/client/src/schema-component/antd/markdown/Markdown.Void.tsx index d2fa406d8..7682f6383 100644 --- a/packages/core/client/src/schema-component/antd/markdown/Markdown.Void.tsx +++ b/packages/core/client/src/schema-component/antd/markdown/Markdown.Void.tsx @@ -1,9 +1,11 @@ +import React, { useState } from 'react'; import { observer, useField, useFieldSchema } from '@tachybase/schema'; + import { Input as AntdInput, Button, Space, Spin } from 'antd'; import cls from 'classnames'; -import React, { useState } from 'react'; import { useTranslation } from 'react-i18next'; -import { useGlobalTheme } from '../../../global-theme'; + +import { useGlobalTheme } from '../../../style/theme'; import { useDesignable } from '../../hooks/useDesignable'; import { MarkdownVoidDesigner } from './Markdown.Void.Designer'; import { useStyles } from './style'; diff --git a/packages/core/client/src/schema-component/antd/markdown/Markdown.tsx b/packages/core/client/src/schema-component/antd/markdown/Markdown.tsx index e7266b444..0ae171fd9 100644 --- a/packages/core/client/src/schema-component/antd/markdown/Markdown.tsx +++ b/packages/core/client/src/schema-component/antd/markdown/Markdown.tsx @@ -1,8 +1,10 @@ -import { LoadingOutlined } from '@ant-design/icons'; -import { connect, mapProps, mapReadPretty } from '@tachybase/schema'; -import { Input as AntdInput, Spin } from 'antd'; import React from 'react'; -import { useGlobalTheme } from '../../../global-theme'; +import { connect, mapProps, mapReadPretty } from '@tachybase/schema'; + +import { LoadingOutlined } from '@ant-design/icons'; +import { Input as AntdInput, Spin } from 'antd'; + +import { useGlobalTheme } from '../../../style/theme'; import { ReadPretty as InputReadPretty } from '../input'; import { MarkdownVoid } from './Markdown.Void'; import { useStyles } from './style'; diff --git a/packages/core/client/src/schema-component/antd/menu/Menu.tsx b/packages/core/client/src/schema-component/antd/menu/Menu.tsx index 3faa37ebd..849cbdd88 100644 --- a/packages/core/client/src/schema-component/antd/menu/Menu.tsx +++ b/packages/core/client/src/schema-component/antd/menu/Menu.tsx @@ -89,7 +89,6 @@ const HeaderMenu = ({ if (!menuItemSchema) { return onSelect?.(info); } - // TODO setLoading(true); const keys = findKeysByUid(schema, menuItemSchema['x-uid']); setDefaultSelectedKeys(keys); @@ -262,7 +261,6 @@ export const Menu: ComposedMenu = observer( if (mode === 'mix' && key) { const s = schema.properties?.[key]; - // fix T-934 if (s?.['x-component'] === 'Menu.SubMenu') { return s; } diff --git a/packages/core/client/src/schema-component/antd/nanoIDInput/NanoIDInput.tsx b/packages/core/client/src/schema-component/antd/nanoIDInput/NanoIDInput.tsx index 84b0f9045..bd8651f6e 100644 --- a/packages/core/client/src/schema-component/antd/nanoIDInput/NanoIDInput.tsx +++ b/packages/core/client/src/schema-component/antd/nanoIDInput/NanoIDInput.tsx @@ -1,12 +1,14 @@ -import { customAlphabet as Alphabet } from 'nanoid'; import React, { useEffect } from 'react'; -import { LoadingOutlined } from '@ant-design/icons'; import { connect, mapProps, mapReadPretty, useForm } from '@tachybase/schema'; + +import { LoadingOutlined } from '@ant-design/icons'; import { Input as AntdInput } from 'antd'; -import { ReadPretty } from '../input'; -import { useCollectionField } from '../../../data-source/collection-field/CollectionFieldProvider'; +import { customAlphabet as Alphabet } from 'nanoid'; import { useTranslation } from 'react-i18next'; +import { useCollectionField } from '../../../data-source/collection-field/CollectionFieldProvider'; +import { ReadPretty } from '../input'; + export const NanoIDInput = Object.assign( connect( AntdInput, diff --git a/packages/core/client/src/schema-component/antd/page/Page.tsx b/packages/core/client/src/schema-component/antd/page/Page.tsx index 474834b44..6a1204f47 100644 --- a/packages/core/client/src/schema-component/antd/page/Page.tsx +++ b/packages/core/client/src/schema-component/antd/page/Page.tsx @@ -16,9 +16,9 @@ import { useAppSpin } from '../../../application/hooks/useAppSpin'; import { useStyles as useAClStyles } from '../../../buildin-plugin/acl/style'; import { useDocumentTitle } from '../../../buildin-plugin/document-title'; import { FilterBlockProvider } from '../../../filter-provider/FilterProvider'; -import { useGlobalTheme } from '../../../global-theme'; import { Icon } from '../../../icon'; import { useGetAriaLabelOfSchemaInitializer } from '../../../schema-initializer/hooks/useGetAriaLabelOfSchemaInitializer'; +import { useGlobalTheme } from '../../../style/theme'; import { DndContext } from '../../common'; import { SortableItem } from '../../common/sortable-item'; import { SchemaComponent, SchemaComponentOptions } from '../../core'; diff --git a/packages/core/client/src/schema-component/antd/upload/shared.ts b/packages/core/client/src/schema-component/antd/upload/shared.ts index 09f58f008..490c526ea 100644 --- a/packages/core/client/src/schema-component/antd/upload/shared.ts +++ b/packages/core/client/src/schema-component/antd/upload/shared.ts @@ -1,9 +1,8 @@ -import { Field } from '@tachybase/schema'; -import { useField } from '@tachybase/schema'; -import { reaction } from '@tachybase/schema'; -import { isArr, isValid, toArr as toArray } from '@tachybase/schema'; -import { UploadFile } from 'antd/es/upload/interface'; import { useEffect } from 'react'; +import { Field, isArr, isValid, reaction, toArr as toArray, useField } from '@tachybase/schema'; + +import { UploadFile } from 'antd/es/upload/interface'; + import { useAPIClient } from '../../../api-client'; import { UPLOAD_PLACEHOLDER } from './placeholder'; import type { IUploadProps, UploadProps } from './type'; @@ -202,7 +201,7 @@ export function useUploadProps({ serviceEr return { abort() { - console.log('upload progress is aborted.'); + console.warn('upload progress is aborted.'); }, }; }, diff --git a/packages/core/client/src/schema-component/antd/variable/TextArea.tsx b/packages/core/client/src/schema-component/antd/variable/TextArea.tsx index e94b66f71..a1bceacef 100644 --- a/packages/core/client/src/schema-component/antd/variable/TextArea.tsx +++ b/packages/core/client/src/schema-component/antd/variable/TextArea.tsx @@ -152,7 +152,6 @@ function getSingleEndRange(nodes: ChildNode[], index: number, offset: number): [ let realIndex = 0; let textOffset = 0; for (let i = 0; i < index + 1; i++) { - // console.log(i, realIndex, textOffset); if (nodes[i].nodeName === '#text') { if (i !== index && nodes[i + 1] && nodes[i + 1].nodeName !== '#text') { realIndex += 1; @@ -396,8 +395,6 @@ export function TextArea(props) { }, }, }).replace(/\n/g, ' '); - // ev.clipboardData.setData('text/html', sanitizedHTML); - // console.log(input, sanitizedHTML); setChanged(true); pasteHTML(ev.currentTarget, sanitizedHTML); setRange(getCurrentRange(ev.currentTarget)); diff --git a/packages/core/client/src/schema-component/hooks/useCompile.ts b/packages/core/client/src/schema-component/hooks/useCompile.ts index db1a62e37..e661f9778 100644 --- a/packages/core/client/src/schema-component/hooks/useCompile.ts +++ b/packages/core/client/src/schema-component/hooks/useCompile.ts @@ -1,5 +1,5 @@ -import { Schema, SchemaExpressionScopeContext, SchemaOptionsContext } from '@tachybase/schema'; import { isValidElement, useContext } from 'react'; +import { Schema, SchemaExpressionScopeContext, SchemaOptionsContext } from '@tachybase/schema'; interface Props { /** @@ -46,7 +46,6 @@ export const useCompile = ({ noCache }: Props = { noCache: false }) => { compileCache[cacheKey] = compileCache[cacheKey] || Schema.compile(source, mergedScope); return compileCache[cacheKey]; } catch (e) { - console.log('useCompile error', source, e); return Schema.compile(source, mergedScope); } } diff --git a/packages/core/client/src/schema-initializer/demos/basic.tsx b/packages/core/client/src/schema-initializer/demos/basic.tsx index 8443c71b6..ec817e2d6 100644 --- a/packages/core/client/src/schema-initializer/demos/basic.tsx +++ b/packages/core/client/src/schema-initializer/demos/basic.tsx @@ -1,11 +1,5 @@ -import { - Application, - CSSVariableProvider, - Plugin, - SchemaInitializer, - useSchemaInitializerRender, -} from '@tachybase/client'; import React from 'react'; +import { Application, Plugin, SchemaInitializer, useSchemaInitializerRender } from '@tachybase/client'; const myInitializer = new SchemaInitializer({ name: 'myInitializer', diff --git a/packages/core/client/src/schema-initializer/utils.ts b/packages/core/client/src/schema-initializer/utils.ts index 8b40578e2..13b40d428 100644 --- a/packages/core/client/src/schema-initializer/utils.ts +++ b/packages/core/client/src/schema-initializer/utils.ts @@ -1358,7 +1358,6 @@ export const createTableBlockSchema = (options) => { }, }, }; - // console.log(JSON.stringify(schema, null, 2)); return schema; }; diff --git a/packages/core/client/src/schema-settings/DataTemplates/FormDataTemplates.tsx b/packages/core/client/src/schema-settings/DataTemplates/FormDataTemplates.tsx index bf9e1572f..3601a06d8 100644 --- a/packages/core/client/src/schema-settings/DataTemplates/FormDataTemplates.tsx +++ b/packages/core/client/src/schema-settings/DataTemplates/FormDataTemplates.tsx @@ -1,13 +1,14 @@ -import { Field } from '@tachybase/schema'; -import { connect, mapProps, observer } from '@tachybase/schema'; -import { observable } from '@tachybase/schema'; +import React, { useMemo } from 'react'; +import { connect, Field, mapProps, observable, observer } from '@tachybase/schema'; + import { Tree as AntdTree } from 'antd'; import _ from 'lodash'; -import React, { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; + +import { withDynamicSchemaProps } from '../../application/hoc/withDynamicSchemaProps'; import { useCollectionManager_deprecated } from '../../collection-manager'; import { mergeFilter } from '../../filter-provider/utils'; -import { SchemaComponent, SchemaComponentContext, removeNullCondition, useProps } from '../../schema-component'; +import { removeNullCondition, SchemaComponent, SchemaComponentContext, useProps } from '../../schema-component'; import { ITemplate } from '../../schema-component/antd/form-v2/Templates'; import { VariableInput } from '../VariableInput'; import { AsDefaultTemplate } from './components/AsDefaultTemplate'; @@ -15,7 +16,6 @@ import { ArrayCollapse } from './components/DataTemplateTitle'; import { getSelectedIdFilter } from './components/Designer'; import { useCollectionState } from './hooks/useCollectionState'; import { useSyncFromForm } from './utils'; -import { withDynamicSchemaProps } from '../../application/hoc/withDynamicSchemaProps'; const Tree = connect( AntdTree, diff --git a/packages/core/client/src/schema-settings/DataTemplates/TreeLabel.tsx b/packages/core/client/src/schema-settings/DataTemplates/TreeLabel.tsx index cd375f545..941486841 100644 --- a/packages/core/client/src/schema-settings/DataTemplates/TreeLabel.tsx +++ b/packages/core/client/src/schema-settings/DataTemplates/TreeLabel.tsx @@ -1,6 +1,7 @@ -import { Tag } from 'antd'; import React from 'react'; +import { Tag } from 'antd'; + export const TreeNode = (props) => { const { tag, type } = props; const text = { diff --git a/packages/core/client/src/schema-settings/DataTemplates/components/AsDefaultTemplate.tsx b/packages/core/client/src/schema-settings/DataTemplates/components/AsDefaultTemplate.tsx index d97cd357b..4ab74d89b 100644 --- a/packages/core/client/src/schema-settings/DataTemplates/components/AsDefaultTemplate.tsx +++ b/packages/core/client/src/schema-settings/DataTemplates/components/AsDefaultTemplate.tsx @@ -1,6 +1,7 @@ -import { ArrayBase } from '@tachybase/components'; -import { Switch } from 'antd'; import React from 'react'; +import { ArrayBase } from '@tachybase/components'; + +import { Switch } from 'antd'; import { useTranslation } from 'react-i18next'; export const AsDefaultTemplate = React.forwardRef((props: any, ref) => { diff --git a/packages/core/client/src/schema-settings/DataTemplates/components/DataTemplateTitle.tsx b/packages/core/client/src/schema-settings/DataTemplates/components/DataTemplateTitle.tsx index fa3bc6d36..6a0eb18c6 100644 --- a/packages/core/client/src/schema-settings/DataTemplates/components/DataTemplateTitle.tsx +++ b/packages/core/client/src/schema-settings/DataTemplates/components/DataTemplateTitle.tsx @@ -1,13 +1,13 @@ -import { CopyOutlined } from '@ant-design/icons'; +import React, { Fragment, useEffect, useState } from 'react'; import { ArrayBase } from '@tachybase/components'; -import { ArrayField } from '@tachybase/schema'; -import { ISchema, RecursionField, observer, useField, useFieldSchema } from '@tachybase/schema'; -import { toArr, uid } from '@tachybase/schema'; +import { ArrayField, ISchema, observer, RecursionField, toArr, uid, useField, useFieldSchema } from '@tachybase/schema'; + +import { CopyOutlined } from '@ant-design/icons'; import { Badge, Card, Collapse, CollapsePanelProps, CollapseProps, Empty, Input } from 'antd'; import cls from 'classnames'; import { clone } from 'lodash'; -import React, { Fragment, useEffect, useState } from 'react'; import { useTranslation } from 'react-i18next'; + import { useStyles } from './DataTemplateTitle.style'; const DataTemplateTitle = observer<{ index: number; item: any }>((props) => { diff --git a/packages/core/client/src/schema-settings/DataTemplates/components/Designer.tsx b/packages/core/client/src/schema-settings/DataTemplates/components/Designer.tsx index 06fdcf782..7ce5e19f7 100644 --- a/packages/core/client/src/schema-settings/DataTemplates/components/Designer.tsx +++ b/packages/core/client/src/schema-settings/DataTemplates/components/Designer.tsx @@ -1,10 +1,11 @@ -import { Field } from '@tachybase/schema'; -import { ISchema, observer, useField, useFieldSchema } from '@tachybase/schema'; +import React from 'react'; +import { Field, ISchema, observer, useField, useFieldSchema } from '@tachybase/schema'; import { error } from '@tachybase/utils/client'; + import { Select } from 'antd'; import _ from 'lodash'; -import React from 'react'; import { useTranslation } from 'react-i18next'; + import { GeneralSchemaDesigner, SchemaSettingsItem } from '../..'; import { useFormBlockContext } from '../../../block-provider'; import { useCollectionManager_deprecated } from '../../../collection-manager'; diff --git a/packages/core/client/src/schema-settings/DataTemplates/hooks/useCollectionState.ts b/packages/core/client/src/schema-settings/DataTemplates/hooks/useCollectionState.ts index 257ecde68..589dde7ef 100644 --- a/packages/core/client/src/schema-settings/DataTemplates/hooks/useCollectionState.ts +++ b/packages/core/client/src/schema-settings/DataTemplates/hooks/useCollectionState.ts @@ -1,6 +1,6 @@ -import { ArrayField } from '@tachybase/schema'; -import { useField } from '@tachybase/schema'; import React, { useCallback, useState } from 'react'; +import { ArrayField, useField } from '@tachybase/schema'; + import { useCollectionManager_deprecated } from '../../../collection-manager'; import { useCompile } from '../../../schema-component'; import { TreeNode } from '../TreeLabel'; diff --git a/packages/core/client/src/schema-settings/EnableChildCollections/index.tsx b/packages/core/client/src/schema-settings/EnableChildCollections/index.tsx index 23d11cf84..be6d5c32b 100644 --- a/packages/core/client/src/schema-settings/EnableChildCollections/index.tsx +++ b/packages/core/client/src/schema-settings/EnableChildCollections/index.tsx @@ -1,9 +1,9 @@ -import { observer, useForm } from '@tachybase/schema'; -import { action } from '@tachybase/schema'; import React from 'react'; +import { action, observer, useForm } from '@tachybase/schema'; + +import { withDynamicSchemaProps } from '../../application/hoc/withDynamicSchemaProps'; import { useCollectionManager_deprecated } from '../../collection-manager'; import { SchemaComponent, useCompile, useProps } from '../../schema-component'; -import { withDynamicSchemaProps } from '../../application/hoc/withDynamicSchemaProps'; export const EnableChildCollections = withDynamicSchemaProps( observer((props: any) => { diff --git a/packages/core/client/src/schema-templates/BlockTemplate.tsx b/packages/core/client/src/schema-templates/BlockTemplate.tsx index eb18fc7b4..8ea74024c 100644 --- a/packages/core/client/src/schema-templates/BlockTemplate.tsx +++ b/packages/core/client/src/schema-templates/BlockTemplate.tsx @@ -2,7 +2,6 @@ import React, { createContext, useCallback, useContext, useMemo } from 'react'; import { useField, useFieldSchema } from '@tachybase/schema'; import { RemoteSchemaComponent, useDesignable, useSchemaComponentContext } from '..'; -import { useTemplateBlockContext } from '../block-provider/TemplateBlockProvider'; import { useSchemaTemplateManager } from './useSchemaTemplateManager'; const BlockTemplateContext = createContext({}); @@ -20,14 +19,12 @@ export const BlockTemplate = (props: any) => { const { dn } = useDesignable(); // eslint-disable-next-line react-hooks/exhaustive-deps const template = useMemo(() => getTemplateById(templateId), [templateId]); - const { onTemplateSuccess } = useTemplateBlockContext(); const { refresh } = useSchemaComponentContext(); const onSuccess = useCallback( (data) => { fieldSchema['x-linkage-rules'] = data?.data?.['x-linkage-rules'] || []; fieldSchema.setProperties(data?.data?.properties); - onTemplateSuccess?.(); refresh(); }, // eslint-disable-next-line react-hooks/exhaustive-deps diff --git a/packages/core/client/src/css-variable/CSSVariableProvider.tsx b/packages/core/client/src/style/css-variable/CSSVariableProvider.tsx similarity index 97% rename from packages/core/client/src/css-variable/CSSVariableProvider.tsx rename to packages/core/client/src/style/css-variable/CSSVariableProvider.tsx index 90056f766..3696c7146 100644 --- a/packages/core/client/src/css-variable/CSSVariableProvider.tsx +++ b/packages/core/client/src/style/css-variable/CSSVariableProvider.tsx @@ -2,8 +2,8 @@ import { useEffect, useMemo } from 'react'; import { TinyColor } from '@ctrl/tinycolor'; -import { defaultTheme } from '../global-theme'; -import { useToken } from '../style'; +import { useToken } from '..'; +import { defaultTheme } from '../theme'; export const CSSVariableProvider = ({ children }) => { const { token } = useToken(); diff --git a/packages/core/client/src/css-variable/index.ts b/packages/core/client/src/style/css-variable/index.ts similarity index 100% rename from packages/core/client/src/css-variable/index.ts rename to packages/core/client/src/style/css-variable/index.ts diff --git a/packages/core/client/src/global-theme/AntdAppProvider.tsx b/packages/core/client/src/style/theme/AntdAppProvider.tsx similarity index 82% rename from packages/core/client/src/global-theme/AntdAppProvider.tsx rename to packages/core/client/src/style/theme/AntdAppProvider.tsx index f516d4338..c6493887d 100644 --- a/packages/core/client/src/global-theme/AntdAppProvider.tsx +++ b/packages/core/client/src/style/theme/AntdAppProvider.tsx @@ -1,7 +1,9 @@ -import { App } from 'antd'; import React, { memo, useEffect } from 'react'; -import { useAPIClient } from '../api-client'; -import { useApp } from '../application'; + +import { App } from 'antd'; + +import { useAPIClient } from '../../api-client'; +import { useApp } from '../../application'; const AppInner = memo(({ children }: { children: React.ReactNode }) => { const app = useApp(); @@ -11,6 +13,7 @@ const AppInner = memo(({ children }: { children: React.ReactNode }) => { useEffect(() => { apiClient.notification = notification; app.notification = notification; + // eslint-disable-next-line react-hooks/exhaustive-deps }, [notification]); return <>{children}; diff --git a/packages/core/client/src/global-theme/defaultTheme.ts b/packages/core/client/src/style/theme/defaultTheme.ts similarity index 100% rename from packages/core/client/src/global-theme/defaultTheme.ts rename to packages/core/client/src/style/theme/defaultTheme.ts diff --git a/packages/core/client/src/global-theme/index.tsx b/packages/core/client/src/style/theme/index.tsx similarity index 91% rename from packages/core/client/src/global-theme/index.tsx rename to packages/core/client/src/style/theme/index.tsx index 000e38391..b7deec1a7 100644 --- a/packages/core/client/src/global-theme/index.tsx +++ b/packages/core/client/src/style/theme/index.tsx @@ -1,7 +1,8 @@ -import { ConfigProvider, theme as antdTheme } from 'antd'; -import _ from 'lodash'; import React, { createContext, useCallback, useMemo, useRef } from 'react'; -import compatOldTheme from './compatOldTheme'; + +import { theme as antdTheme, ConfigProvider } from 'antd'; +import _ from 'lodash'; + import defaultTheme from './defaultTheme'; import { ThemeConfig } from './type'; @@ -81,12 +82,11 @@ export const GlobalThemeProvider = ({ children, theme: themeFromProps }) => { return ( - {children} + {children} ); }; export { default as AntdAppProvider } from './AntdAppProvider'; -export { default as compatOldTheme } from './compatOldTheme'; export * from './type'; export { defaultTheme }; diff --git a/packages/core/client/src/global-theme/type.ts b/packages/core/client/src/style/theme/type.ts similarity index 100% rename from packages/core/client/src/global-theme/type.ts rename to packages/core/client/src/style/theme/type.ts diff --git a/packages/core/client/src/style/useToken.ts b/packages/core/client/src/style/useToken.ts index da5ed58d5..e370f1c54 100644 --- a/packages/core/client/src/style/useToken.ts +++ b/packages/core/client/src/style/useToken.ts @@ -1,6 +1,6 @@ import { theme } from 'antd'; -import { CustomToken } from '../global-theme'; +import { CustomToken } from './theme'; interface Result extends ReturnType { token: CustomToken; diff --git a/packages/core/client/src/user/ChangePassword.tsx b/packages/core/client/src/user/ChangePassword.tsx index 006e0b757..589642b01 100644 --- a/packages/core/client/src/user/ChangePassword.tsx +++ b/packages/core/client/src/user/ChangePassword.tsx @@ -14,7 +14,7 @@ const useCloseAction = () => { async run() { setVisible(false); form.submit((values) => { - console.log(values); + console.warn(values); }); }, }; diff --git a/packages/core/client/src/user/CurrentUserProvider.tsx b/packages/core/client/src/user/CurrentUserProvider.tsx index 96890a2f4..dbe0bde57 100644 --- a/packages/core/client/src/user/CurrentUserProvider.tsx +++ b/packages/core/client/src/user/CurrentUserProvider.tsx @@ -27,6 +27,7 @@ export const useCurrentRoles = () => { }); } return roles; + // eslint-disable-next-line react-hooks/exhaustive-deps }, [allowAnonymous, data?.data?.roles]); return options; }; diff --git a/packages/core/client/src/user/EditProfile.tsx b/packages/core/client/src/user/EditProfile.tsx index 07dbe6bd3..a97ca7d92 100644 --- a/packages/core/client/src/user/EditProfile.tsx +++ b/packages/core/client/src/user/EditProfile.tsx @@ -21,7 +21,7 @@ const useCloseAction = () => { async run() { setVisible(false); form.submit((values) => { - console.log(values); + console.warn(values); }); }, }; diff --git a/packages/core/client/src/variables/VariablesProvider.tsx b/packages/core/client/src/variables/VariablesProvider.tsx index 8a1a30a16..628c50e02 100644 --- a/packages/core/client/src/variables/VariablesProvider.tsx +++ b/packages/core/client/src/variables/VariablesProvider.tsx @@ -154,6 +154,7 @@ const VariablesProvider = ({ children }) => { return compile(_.isFunction(current) ? current() : current); }, + // eslint-disable-next-line react-hooks/exhaustive-deps [getCollectionJoinField], ); @@ -296,7 +297,6 @@ function shouldToRequest(value) { // value 有可能是一个响应式对象，使用 untracked 可以避免意外触发 autorun untracked(() => { - // fix // 兼容 `对多` 和 `对一` 子表单子表格字段的情况 if (JSON.stringify(value) === '[{}]' || JSON.stringify(value) === '{}') { result = true; diff --git a/packages/core/client/src/variables/__tests__/useVariables.test.tsx b/packages/core/client/src/variables/__tests__/useVariables.test.tsx index cc60ccc3b..ceee0ff31 100644 --- a/packages/core/client/src/variables/__tests__/useVariables.test.tsx +++ b/packages/core/client/src/variables/__tests__/useVariables.test.tsx @@ -1,11 +1,12 @@ +import React from 'react'; import { SchemaExpressionScopeContext, SchemaOptionsContext } from '@tachybase/schema'; import { act, renderHook, waitFor } from '@tachybase/test/client'; -import React from 'react'; + import { APIClientProvider } from '../../api-client'; import { mockAPIClient } from '../../testUtils'; import { CurrentUserProvider } from '../../user'; -import VariablesProvider from '../VariablesProvider'; import useVariables from '../hooks/useVariables'; +import VariablesProvider from '../VariablesProvider'; vi.mock('../../collection-manager', async () => { return { diff --git a/packages/core/client/src/variables/hooks/useBuiltinVariables.ts b/packages/core/client/src/variables/hooks/useBuiltinVariables.ts index 484929377..3f6aa9eb1 100644 --- a/packages/core/client/src/variables/hooks/useBuiltinVariables.ts +++ b/packages/core/client/src/variables/hooks/useBuiltinVariables.ts @@ -1,5 +1,6 @@ -import { dayjs } from '@tachybase/utils/client'; import { useMemo } from 'react'; +import { dayjs } from '@tachybase/utils/client'; + import { useCurrentUserVariable, useDatetimeVariable } from '../../schema-settings'; import { useCurrentRoleVariable } from '../../schema-settings/VariableInput/hooks/useRoleVariable'; import { VariableOption } from '../types'; diff --git a/packages/core/client/src/variables/hooks/useContextVariable.ts b/packages/core/client/src/variables/hooks/useContextVariable.ts index a268c0b99..bd12fdd40 100644 --- a/packages/core/client/src/variables/hooks/useContextVariable.ts +++ b/packages/core/client/src/variables/hooks/useContextVariable.ts @@ -1,4 +1,5 @@ import { useMemo } from 'react'; + import { useTableBlockContext } from '../../block-provider'; import { VariableOption } from '../types'; diff --git a/packages/core/client/src/variables/hooks/useLocalVariables.tsx b/packages/core/client/src/variables/hooks/useLocalVariables.tsx index fa678c09a..cb1d10f31 100644 --- a/packages/core/client/src/variables/hooks/useLocalVariables.tsx +++ b/packages/core/client/src/variables/hooks/useLocalVariables.tsx @@ -1,5 +1,6 @@ -import { Form } from '@tachybase/schema'; import { useMemo } from 'react'; +import { Form } from '@tachybase/schema'; + import { useCollection_deprecated } from '../../collection-manager'; import { useBlockCollection } from '../../schema-settings/VariableInput/hooks/useBlockCollection'; import { useDatetimeVariable } from '../../schema-settings/VariableInput/hooks/useDateVariable'; diff --git a/packages/core/client/src/variables/hooks/useVariables.ts b/packages/core/client/src/variables/hooks/useVariables.ts index a9b30c2fd..bbcf72175 100644 --- a/packages/core/client/src/variables/hooks/useVariables.ts +++ b/packages/core/client/src/variables/hooks/useVariables.ts @@ -1,4 +1,5 @@ import { useContext } from 'react'; + import { VariablesContext } from '../VariablesProvider'; const useVariables = () => { diff --git a/packages/core/client/src/variables/types.ts b/packages/core/client/src/variables/types.ts index 8760e6e59..52a8a09d2 100644 --- a/packages/core/client/src/variables/types.ts +++ b/packages/core/client/src/variables/types.ts @@ -1,4 +1,5 @@ import type { Dispatch, SetStateAction } from 'react'; + import { CollectionFieldOptions_deprecated } from '../collection-manager'; export interface VariablesContextType { diff --git a/packages/plugins/@hera/plugin-core/src/client/components/system/Notifications.tsx b/packages/plugins/@hera/plugin-core/src/client/components/system/Notifications.tsx index 2e8e1e2ff..afa908298 100644 --- a/packages/plugins/@hera/plugin-core/src/client/components/system/Notifications.tsx +++ b/packages/plugins/@hera/plugin-core/src/client/components/system/Notifications.tsx @@ -3,7 +3,7 @@ import { css, useRequest } from '@tachybase/client'; import { dayjs } from '@tachybase/utils/client'; import { BellOutlined } from '@ant-design/icons'; -import { Badge, Button, List, message, Popover } from 'antd'; +import { Badge, Button, List, Popover } from 'antd'; import { useNavigate } from 'react-router-dom'; import { useInitializationLinkKey, useLinkKey } from '../../hooks/useNotifications'; @@ -28,7 +28,6 @@ export const Notifications = () => { { onSuccess() { run(); - message.info('成功'); }, }, ); diff --git a/packages/plugins/@hera/plugin-core/src/client/features/custom-components/index.tsx b/packages/plugins/@hera/plugin-core/src/client/features/custom-components/index.tsx new file mode 100644 index 000000000..75fd0c906 --- /dev/null +++ b/packages/plugins/@hera/plugin-core/src/client/features/custom-components/index.tsx @@ -0,0 +1,69 @@ +import React from 'react'; +import { Plugin, SchemaSettings, SchemaSettingsModalItem, useCollection, useDesignable } from '@tachybase/client'; +import { ISchema, useField, useFieldSchema } from '@tachybase/schema'; + +import { get, set } from 'lodash'; + +const SchemaSettingsAppends = () => { + const fieldSchema = useFieldSchema(); + const field = useField(); + const c = useCollection(); + const { dn } = useDesignable(); + + return ( + item.name), + }, + }, + } as ISchema + } + onSubmit={({ appends }) => { + set(field.componentProps, 'service.params.appends', appends); + fieldSchema['x-component-props'] = field.componentProps; + const path = field.path?.splice(field.path?.length - 1, 1); + field.form.query(`${path.concat(`*.` + fieldSchema.name)}`).forEach((f) => { + f.componentProps.service = f.componentProps.service || { params: {} }; + f.componentProps.service.params.appends = appends; + }); + dn.emit('patch', { + schema: { + ['x-uid']: fieldSchema['x-uid'], + 'x-component-props': field.componentProps, + }, + }); + + dn.refresh(); + }} + /> + ); +}; + +export const customFieldComponentFieldSettings = new SchemaSettings({ + name: 'fieldSettings:component:CustomField', + items: [ + { + name: 'appends', + Component: SchemaSettingsAppends, + }, + ], +}); + +export class PluginCustomComponents extends Plugin { + async load() { + this.schemaSettingsManager.add(customFieldComponentFieldSettings); + } +} diff --git a/packages/plugins/@hera/plugin-core/src/client/index.tsx b/packages/plugins/@hera/plugin-core/src/client/index.tsx index 984eab4b5..a6ea247a4 100644 --- a/packages/plugins/@hera/plugin-core/src/client/index.tsx +++ b/packages/plugins/@hera/plugin-core/src/client/index.tsx @@ -16,6 +16,7 @@ import { import { PluginAssistant } from './features/assistant'; import { PluginGroupBlock } from './features/block-group'; import { PluginContextMenu } from './features/context-menu'; +import { PluginCustomComponents } from './features/custom-components'; import { DepartmentsPlugin } from './features/departments'; import { EmbedPlugin } from './features/embed'; import { PluginExtendedFilterForm } from './features/extended-filter-form'; @@ -88,6 +89,7 @@ export class PluginCoreClient extends Plugin { await this.app.pm.add(PluginOutbound); // await this.app.pm.add(PluginModeHighlight); await this.app.pm.add(PluginFieldAppends); + await this.app.pm.add(PluginCustomComponents); } async registerSettings() { diff --git a/packages/plugins/@hera/plugin-rental/package.json b/packages/plugins/@hera/plugin-rental/package.json index f924c1693..4d4dd6da7 100644 --- a/packages/plugins/@hera/plugin-rental/package.json +++ b/packages/plugins/@hera/plugin-rental/package.json @@ -10,6 +10,7 @@ "devDependencies": { "@ant-design/icons": "^5.3.6", "@tachybase/schema": "workspace:*", + "@types/lodash": "4.17.4", "ahooks": "^3.7.2", "antd": "5.16.1", "dayjs": "^1.11.8", diff --git a/packages/plugins/@hera/plugin-rental/src/client/custom-components/RecordDetails.tsx b/packages/plugins/@hera/plugin-rental/src/client/custom-components/RecordDetails.tsx index 2b661afdd..d89fed3db 100644 --- a/packages/plugins/@hera/plugin-rental/src/client/custom-components/RecordDetails.tsx +++ b/packages/plugins/@hera/plugin-rental/src/client/custom-components/RecordDetails.tsx @@ -81,7 +81,6 @@ export const RecordDetails: CustomFunctionComponent = () => { productItem[key].count += count; } else { productItem[key] = { - key: item.product.category_id, label: item.product.name, sort: item.product.category.sort, unit, diff --git a/packages/plugins/@tachybase/plugin-backup-restore/src/client/DuplicatorProvider.tsx b/packages/plugins/@tachybase/plugin-backup-restore/src/client/DuplicatorProvider.tsx index 22ad208cd..79d302f0e 100644 --- a/packages/plugins/@tachybase/plugin-backup-restore/src/client/DuplicatorProvider.tsx +++ b/packages/plugins/@tachybase/plugin-backup-restore/src/client/DuplicatorProvider.tsx @@ -1,7 +1,7 @@ -import React, { FC } from 'react'; +import React from 'react'; import { CurrentAppInfoProvider, SchemaComponentOptions } from '@tachybase/client'; -export const DuplicatorProvider: FC = function (props) { +export const DuplicatorProvider = function (props) { return ( {props.children} diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/index.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/index.tsx index a7adea368..531e1f54c 100644 --- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/index.tsx +++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/index.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { AppNotFound, createRouterManager, Plugin, RouterManager, RouteSchemaComponent } from '@tachybase/client'; +import { createRouterManager, Plugin, RouterManager } from '@tachybase/client'; import { Navigate, Outlet } from 'react-router-dom'; @@ -72,7 +72,7 @@ export class MobileClientPlugin extends Plugin { }); router.add('mobile.page', { path: '/mobile/:name', - element: , + Component: 'RouteSchemaComponent', }); this.mobileRouter = router; } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 09cb8b997..6bcd17485 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1726,6 +1726,9 @@ importers: '@tachybase/schema': specifier: workspace:* version: link:../../../core/schema + '@types/lodash': + specifier: 4.17.4 + version: 4.17.4 ahooks: specifier: ^3.7.2 version: 3.7.8(react@18.2.0) @@ -12262,6 +12265,10 @@ packages: /@types/lodash@4.17.0: resolution: {integrity: sha512-t7dhREVv6dbNj0q17X12j7yDG4bD/DHYX7o5/DbDxobP0HnGPgpRz2Ej77aL7TZT3DSw13fqUTj8J4mMnqa7WA==} + /@types/lodash@4.17.4: + resolution: {integrity: sha512-wYCP26ZLxaT3R39kiN2+HcJ4kTd3U1waI/cY7ivWYqFP6pW3ZNpvi6Wd6PHZx7T/t8z0vlkXMg3QYLa7DZ/IJQ==} + dev: true + /@types/luxon@3.3.7: resolution: {integrity: sha512-gKc9P2d4g5uYwmy4s/MO/yOVPmvHyvzka1YH6i5dM03UrFofHSmgc0D0ymbDRStFWHusk6cwwF6nhLm/ckBbbQ==}