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

refactor: fix warning of antd 4.x (#1998)

Browse Source 
* refactor: fix warning by codemod

* refactor: fix warning of Dropdown

* perf: use memo

* refactor: resolve SchemaInitializer

* refactor: fix lint

* refactor: remove SettingsForm

* refactor: resolve SchemaInitializer

* refactor: fix lint

* refactor: move useMenuItem to root dir

* chore: fix conflicts

* refactor: resolve SchemaSetting

* refactor: fix lint

* test: fix failed

* chore: upgrade Vite

* fix: fix style

* refactor: fix lint

* refactor: extract component

* refactor: resovle Menu

* refactor: resolve Tabs

* refactor(getPopupContainer): should return the unique div

* refactor(Drawer): change style to rootStyle and className to rootClassName

* chore: update yarn.lock

* fix: fix T-432

* fix: fix T-338

* fix: fix T-490

* fix: collection fields

* fix: fix style

* fix: fix T-500

* fix: fix SettingMenu error (close T-516)

* fix: fix tanslation of Map (T-506)

* style: fix style (T-508)

* fix: fix schemaSetting switch of mobile (T-517)

* fix: fix T-518

* fix: fix T-524

* fix: fix T-507

* perf: optimize SchemaInitializer.Button

* perf: optimize SchemaSettings

* fix: fix serch of SchemaInitializer (T-547)

* chore: change delay

* fix: fix button style (T-548)

* fix: fix scroll bar

* fix: update yarn.lock

* fix: fix build error

* fix: should update sideMenu when change it

* fix: fix build error

* chore: mouseEnterDelay

* fix: fix group menu can not selected
This commit is contained in:
被雨水过滤的空气-Rairn 2023-06-22 19:51:16 +08:00 committed by GitHub
parent 5fc5428d03
commit 6eed9ac2bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
71 changed files with 2331 additions and 2146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -63,7 +63,7 @@
"prettier": "^2.2.1",
"pretty-format": "^24.0.0",
"pretty-quick": "^3.1.0",
"vite": "^4.3.8",
"vite": "^4.3.9",
"vitest": "^0.32.0"
},
"volta": {

1
packages/core/client/package.json
View File

@ -7,6 +7,7 @@
"typings": "es/index.d.ts",
"dependencies": {
"@antv/g2plot": "^2.4.18",
"@ant-design/pro-layout": "^7.14.3",
"@dnd-kit/core": "^5.0.1",
"@dnd-kit/sortable": "^6.0.0",
"@emotion/css": "^11.7.1",

8
packages/core/client/src/application/Application.tsx
View File

@ -7,6 +7,8 @@ import { Link, NavLink } from 'react-router-dom';
import { ACLProvider } from '../acl';
import { AntdConfigProvider } from '../antd-config-provider';
import { APIClient, APIClientProvider } from '../api-client';
import { SigninPage, SignupPage } from '../auth';
import { SigninPageExtensionProvider } from '../auth/SigninPageExtension';
import { BlockSchemaComponentProvider } from '../block-provider';
import { RemoteDocumentTitleProvider } from '../document-title';
import { i18n } from '../i18n';
@ -30,8 +32,6 @@ import { ErrorFallback } from '../schema-component/antd/error-fallback';
import { SchemaInitializerProvider } from '../schema-initializer';
import { BlockTemplateDetails, BlockTemplatePage } from '../schema-templates';
import { SystemSettingsProvider } from '../system-settings';
import { SigninPage, SignupPage } from '../auth';
import { SigninPageExtensionProvider } from '../auth/SigninPageExtension';
import { compose } from './compose';
export interface ApplicationOptions {
@ -52,9 +52,7 @@ export type PluginCallback = () => Promise<any>;
const App = React.memo((props: any) => {
const C = compose(...props.providers)(() => {
const routes = useRoutes();
return (
<RouteSwitch routes={routes} />
);
return <RouteSwitch routes={routes} />;
});
return <C />;
});

20
packages/core/client/src/auth/SigninPage.tsx
View File

@ -1,19 +1,19 @@
import { css } from '@emotion/css';
import { useForm } from '@formily/react';
import { Space, Tabs } from 'antd';
import React, {
FunctionComponent,
FunctionComponentElement,
createContext,
createElement,
useCallback,
useContext,
createContext,
FunctionComponent,
createElement,
useState,
FunctionComponentElement,
} from 'react';
import { css } from '@emotion/css';
import { useTranslation } from 'react-i18next';
import { useNavigate, useSearchParams } from 'react-router-dom';
import { useAPIClient, useCurrentDocumentTitle, useRequest, useViewport } from '..';
import { useSigninPageExtension } from './SigninPageExtension';
import { useForm } from '@formily/react';
const SigninPageContext = createContext<{
[authType: string]: {
@ -132,13 +132,7 @@ export const SigninPage = () => {
`}
>
{tabs.length > 1 ? (
<Tabs>
{tabs.map((tab) => (
<Tabs.TabPane tab={tab.tabTitle} key={tab.name}>
{tab.component}
</Tabs.TabPane>
))}
</Tabs>
<Tabs items={tabs.map((tab) => ({ label: tab.tabTitle, key: tab.name, children: tab.component }))} />
) : tabs.length ? (
<div>{tabs[0].component}</div>
) : (

46
packages/core/client/src/collection-manager/Configuration/AddCollectionAction.tsx
View File

@ -2,9 +2,9 @@ import { DownOutlined, PlusOutlined } from '@ant-design/icons';
import { ArrayTable } from '@formily/antd';
import { ISchema, useField, useForm } from '@formily/react';
import { uid } from '@formily/shared';
import { Button, Dropdown, Menu } from 'antd';
import { Button, Dropdown, MenuProps } from 'antd';
import { cloneDeep } from 'lodash';
import React, { useState } from 'react';
import React, { useMemo, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { useRequest } from '../../api-client';
import { RecordProvider, useRecord } from '../../record-provider';
@ -246,41 +246,41 @@ export const AddCollectionAction = (props) => {
const [schema, setSchema] = useState({});
const compile = useCompile();
const { t } = useTranslation();
const collectionTemplates = templateOptions();
const items = [];
const collectionTemplates = useMemo(templateOptions, []);
const items = useMemo(() => {
const result = [];
collectionTemplates.forEach((item) => {
if (item.divider) {
items.push({
result.push({
type: 'divider',
});
}
items.push({ label: compile(item.title), key: item.name });
result.push({ label: compile(item.title), key: item.name });
});
return result;
}, [collectionTemplates]);
const {
state: { category },
} = useResourceActionContext();
return (
<RecordProvider record={record}>
<ActionContextProvider value={{ visible, setVisible }}>
<Dropdown
getPopupContainer={getContainer}
trigger={trigger}
align={align}
overlay={
<Menu
style={{
const menu = useMemo<MenuProps>(() => {
return {
style: {
maxHeight: '60vh',
overflow: 'auto',
}}
onClick={(info) => {
},
onClick: (info) => {
const schema = getSchema(getTemplate(info.key), category, compile);
setSchema(schema);
setVisible(true);
}}
items={items}
/>
}
>
},
items,
};
}, [category, items]);
return (
<RecordProvider record={record}>
<ActionContextProvider value={{ visible, setVisible }}>
<Dropdown getPopupContainer={getContainer} trigger={trigger} align={align} menu={menu}>
{children || (
<Button icon={<PlusOutlined />} type={'primary'}>
{t('Create collection')} <DownOutlined />

81
packages/core/client/src/collection-manager/Configuration/AddFieldAction.tsx
View File

@ -2,9 +2,9 @@ import { PlusOutlined } from '@ant-design/icons';
import { ArrayTable } from '@formily/antd';
import { useField, useForm } from '@formily/react';
import { uid } from '@formily/shared';
import { Button, Dropdown, Menu } from 'antd';
import { Button, Dropdown, MenuProps } from 'antd';
import { cloneDeep } from 'lodash';
import React, { useState } from 'react';
import React, { useCallback, useMemo, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { useRequest } from '../../api-client';
import { RecordProvider, useRecord } from '../../record-provider';
@ -12,7 +12,6 @@ import { ActionContextProvider, SchemaComponent, useActionContext, useCompile }
import { useResourceActionContext, useResourceContext } from '../ResourceActionProvider';
import { useCancelAction } from '../action-hooks';
import { useCollectionManager } from '../hooks';
import { useOptions } from '../hooks/useOptions';
import { IField } from '../interfaces/types';
import * as components from './components';
import { getOptions } from './interfaces';
@ -175,8 +174,7 @@ export const AddFieldAction = (props) => {
const [schema, setSchema] = useState({});
const compile = useCompile();
const { t } = useTranslation();
const options = useOptions();
const getFieldOptions = () => {
const getFieldOptions = useCallback(() => {
const { availableFieldInterfaces } = getTemplate(record.template) || {};
const { exclude, include } = availableFieldInterfaces || {};
const optionArr = [];
@ -218,22 +216,39 @@ export const AddFieldAction = (props) => {
}
});
return optionArr;
}, [getTemplate, record]);
const items = useMemo<MenuProps['items']>(() => {
return getFieldOptions().map((option) => {
if (option.children.length === 0) {
return null;
}
return {
type: 'group',
label: compile(option.label),
title: compile(option.label),
key: option.label,
children: option.children
.filter((child) => !['o2o', 'subTable', 'linkTo'].includes(child.name))
.map((child) => {
return {
label: compile(child.title),
title: compile(child.title),
key: child.name,
dataTargetScope: child.targetScope,
};
return (
record.template !== 'view' && (
<RecordProvider record={record}>
<ActionContextProvider value={{ visible, setVisible }}>
<Dropdown
getPopupContainer={getContainer}
trigger={trigger}
align={align}
overlay={
<Menu
style={{
}),
};
});
}, [getFieldOptions]);
const menu = useMemo<MenuProps>(() => {
return {
style: {
maxHeight: '60vh',
overflow: 'auto',
}}
onClick={(e) => {
},
onClick: (e) => {
//@ts-ignore
const targetScope = e.item.props['data-targetScope'];
targetScope && setTargetScope(targetScope);
@ -242,28 +257,16 @@ export const AddFieldAction = (props) => {
setSchema(schema);
setVisible(true);
}
}}
>
{getFieldOptions().map((option) => {
},
items,
};
}, [getInterface, items, record]);
return (
option.children.length > 0 && (
<Menu.ItemGroup key={option.label} title={compile(option.label)}>
{option.children
.filter((child) => !['o2o', 'subTable', 'linkTo'].includes(child.name))
.map((child) => {
return (
<Menu.Item key={child.name} data-targetScope={child.targetScope}>
{compile(child.title)}
</Menu.Item>
);
})}
</Menu.ItemGroup>
)
);
})}
</Menu>
}
>
record.template !== 'view' && (
<RecordProvider record={record}>
<ActionContextProvider value={{ visible, setVisible }}>
<Dropdown getPopupContainer={getContainer} trigger={trigger} align={align} menu={menu}>
{children || (
<Button icon={<PlusOutlined />} type={'primary'}>
{t('Add field')}

34
packages/core/client/src/collection-manager/Configuration/AddSubFieldAction.tsx
View File

@ -2,9 +2,9 @@ import { PlusOutlined } from '@ant-design/icons';
import { ArrayTable } from '@formily/antd';
import { ISchema } from '@formily/react';
import { uid } from '@formily/shared';
import { Button, Dropdown, Menu } from 'antd';
import { Button, Dropdown, MenuProps } from 'antd';
import { cloneDeep } from 'lodash';
import React, { useState } from 'react';
import React, { useMemo, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { useRequest } from '../../api-client';
import { RecordProvider } from '../../record-provider';
@ -101,7 +101,8 @@ export const AddSubFieldAction = () => {
const compile = useCompile();
const options = useOptions();
const { t } = useTranslation();
const items = options.map((option) => {
const items = useMemo(() => {
return options.map((option) => {
const children = option.children.map((child) => {
return { label: compile(child.title), key: child.name };
});
@ -111,24 +112,25 @@ export const AddSubFieldAction = () => {
children,
};
});
return (
<ActionContextProvider value={{ visible, setVisible }}>
<Dropdown
overlay={
<Menu
style={{
}, [options]);
const menu = useMemo<MenuProps>(() => {
return {
style: {
maxHeight: '60vh',
overflow: 'auto',
}}
onClick={(info) => {
},
onClick: (info) => {
const schema = getSchema(getInterface(info.key));
setSchema(schema);
setVisible(true);
}}
items={items}
/>
}
>
},
items,
};
}, [items]);
return (
<ActionContextProvider value={{ visible, setVisible }}>
<Dropdown menu={menu}>
<Button icon={<PlusOutlined />} type={'primary'}>
{t('Add field')}
</Button>

59
packages/core/client/src/collection-manager/Configuration/ConfigurationTabs.tsx
View File

@ -11,7 +11,8 @@ import {
} from '@dnd-kit/core';
import { RecursionField, observer } from '@formily/react';
import { uid } from '@formily/shared';
import { Badge, Card, Dropdown, Menu, Modal, Tabs } from 'antd';
import { Badge, Card, Dropdown, Modal, Tabs } from 'antd';
import _ from 'lodash';
import React, { useContext, useState } from 'react';
import { useAPIClient } from '../../api-client';
import { SchemaComponent, SchemaComponentOptions, useCompile } from '../../schema-component';
@ -181,9 +182,13 @@ export const ConfigurationTabs = () => {
value: item.id,
}));
};
const menu = (item) => (
<Menu>
<Menu.Item key={'edit'}>
const menu = _.memoize((item) => {
return {
items: [
{
key: 'edit',
label: (
<SchemaComponent
schema={{
type: 'void',
@ -197,12 +202,17 @@ export const ConfigurationTabs = () => {
},
}}
/>
</Menu.Item>
<Menu.Item key="delete" onClick={() => remove(item.id)}>
{compile("{{t('Delete category')}}")}
</Menu.Item>
</Menu>
);
),
},
{
key: 'delete',
label: compile("{{t('Delete category')}}"),
onClick: () => remove(item.id),
},
],
};
});
return (
<DndProvider>
<Tabs
@ -228,27 +238,24 @@ export const ConfigurationTabs = () => {
type="editable-card"
destroyInactiveTabPane={true}
tabBarStyle={{ marginBottom: '0px' }}
>
{tabsItems.map((item) => {
return (
<Tabs.TabPane
tab={
items={tabsItems.map((item) => {
return {
label:
item.id !== 'all' ? (
<div data-no-dnd="true">
<TabTitle item={item} />
</div>
) : (
compile(item.name)
)
}
key={item.id}
closable={item.closable}
closeIcon={
<Dropdown overlay={menu(item)}>
),
key: item.id,
closable: item.closable,
closeIcon: (
<Dropdown menu={menu(item)}>
<MenuOutlined />
</Dropdown>
}
>
),
children: (
<Card bordered={false}>
<SchemaComponentOptions
components={{ CollectionFields }}
@ -258,10 +265,10 @@ export const ConfigurationTabs = () => {
<RecursionField name={key} schema={item.schema} onlyRenderProperties />
</SchemaComponentOptions>
</Card>
</Tabs.TabPane>
);
),
};
})}
</Tabs>
/>
</DndProvider>
);
};

2
packages/core/client/src/collection-manager/demos/demo5.tsx
View File

@ -82,7 +82,7 @@ const FormItemInitializer = (props) => {
collection.fields.push(options);
form.setValuesIn(name, uid());
const { values } = await FormDrawer('Add field', () => {
await FormDrawer('Add field', () => {
return (
<CollectionManagerContext.Provider value={cm}>
<AntdSchemaComponentProvider>

3
packages/core/client/src/collection-manager/hooks/useOptions.ts
View File

@ -1,9 +1,11 @@
import set from 'lodash/set';
import { useMemo } from 'react';
import { useCollectionManager } from './useCollectionManager';
export const useOptions = () => {
const { interfaces } = useCollectionManager();
return useMemo(() => {
const fields = {};
Object.keys(interfaces).forEach((type) => {
@ -42,4 +44,5 @@ export const useOptions = () => {
})
.sort((a, b) => a.order - b.order),
}));
}, [interfaces]);
};

59
packages/core/client/src/formula/Expression.tsx
View File

@ -1,8 +1,8 @@
import { css } from '@emotion/css';
import { Field, onFormSubmitValidateStart } from '@formily/core';
import { useField, useFormEffects } from '@formily/react';
import { Dropdown, Menu } from 'antd';
import React, { useEffect, useRef, useState } from 'react';
import { Dropdown, MenuProps } from 'antd';
import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
import { useTranslation } from 'react-i18next';
function pasteHtml(html, selectPastedContent = false) {
@ -71,11 +71,15 @@ export const Expression = (props) => {
const inputRef = useRef<any>();
const [changed, setChanged] = useState(false);
const onChange = (value) => {
const onChange = useCallback(
(value) => {
setChanged(true);
props.onChange(value);
};
},
[props.onChange],
);
const { numColumns, scope } = useMemo(() => {
const numColumns = new Map<string, string>();
const scope = {};
fields
@ -84,6 +88,10 @@ export const Expression = (props) => {
numColumns.set(field.name, field.uiSchema.title);
scope[field.name] = 1;
});
return { numColumns, scope };
}, [fields, supports]);
const keys = Array.from(numColumns.keys());
const [html, setHtml] = useState(() => {
const scope = {};
@ -95,6 +103,7 @@ export const Expression = (props) => {
}
return renderExp(value || '', scope);
});
useEffect(() => {
if (changed) {
return;
@ -109,11 +118,13 @@ export const Expression = (props) => {
const val = renderExp(value || '', scope);
setHtml(val);
}, [value]);
const menu = (
<Menu>
{keys.length > 0 ? (
keys.map((key) => (
<Menu.Item disabled key={key}>
const menuItems = useMemo<MenuProps['items']>(() => {
if (keys.length > 0) {
return keys.map((key) => ({
key,
disabled: true,
label: (
<button
onClick={async (args) => {
(inputRef.current as any).focus();
@ -123,20 +134,28 @@ export const Expression = (props) => {
);
const text = getValue(inputRef.current);
onChange(text);
console.log('onChange', text);
}}
>
{numColumns.get(key)}
</button>
</Menu.Item>
))
) : (
<Menu.Item disabled key={0}>
{t('No available fields')}
</Menu.Item>
)}
</Menu>
);
),
}));
} else {
return [
{
key: 0,
disabled: true,
label: t('No available fields'),
},
];
}
}, [keys, numColumns, onChange]);
const menu = useMemo<MenuProps>(() => {
return {
items: menuItems,
};
}, [menuItems]);
useFormEffects(() => {
onFormSubmitValidateStart(() => {
@ -157,7 +176,7 @@ export const Expression = (props) => {
return (
<Dropdown
trigger={['click']}
overlay={menu}
menu={menu}
overlayClassName={css`
.ant-dropdown-menu-item {
padding: 0;

102
packages/core/client/src/hooks/useMenuItem.tsx Normal file
View File

@ -0,0 +1,102 @@
import { MenuProps } from 'antd';
import React, { ReactNode, createContext, useCallback, useContext, useRef } from 'react';
type Item = MenuProps['items'][0] & {
/** 在清空数组时，如果该字段为 true 则保留该选项 */
notdelete?: boolean;
/** 用于给列表排序 */
order?: number;
};
export const GetMenuItemContext = createContext<{ collectMenuItem?(item: Item): void; onChange?: () => void }>(null);
export const GetMenuItemsContext = createContext<{ pushMenuItem?(item: Item): void }>(null);
/**
* 用于为 SchemaInitializer.Item 组件提供一些方法，比如收集菜单项数据
* @returns
*/
export const useCollectMenuItem = () => {
return useContext(GetMenuItemContext) || {};
};
export const useCollectMenuItems = () => {
return useContext(GetMenuItemsContext) || {};
};
/**
* 用于在 antd 从 4.x 升级到 5.x 中，用于把 SchemaInitializer.Item 组件这种写法转换成 Menu 组件的 items 写法
* @returns
*/
export const useMenuItem = () => {
const list = useRef<any[]>([]);
const renderItems = useRef<() => JSX.Element>(null);
const shouldRerender = useRef(false);
const Component = useCallback(() => {
if (!shouldRerender.current) {
return null;
}
shouldRerender.current = false;
if (renderItems.current) {
return renderItems.current();
}
return (
<>
{list.current.map((Com, index) => (
<Com key={index} />
))}
</>
);
}, []);
const getMenuItems = useCallback((Com: () => ReactNode): Item[] => {
const items: Item[] = [];
const pushMenuItem = (item: Item) => {
items.push(item);
items.sort((a, b) => (a.order || 0) - (b.order || 0));
};
shouldRerender.current = true;
renderItems.current = () => {
const notDeleteItems = items.filter((item) => item.notdelete);
items.length = 0;
items.push(...notDeleteItems);
return (
<GetMenuItemsContext.Provider
value={{
pushMenuItem,
}}
>
{Com()}
</GetMenuItemsContext.Provider>
);
};
return items;
}, []);
const getMenuItem = useCallback((Com: () => JSX.Element): Item => {
const item = {} as Item;
const collectMenuItem = (menuItem: Item) => {
Object.assign(item, menuItem);
};
shouldRerender.current = true;
list.current.push(() => {
return <GetMenuItemContext.Provider value={{ collectMenuItem }}>{Com()}</GetMenuItemContext.Provider>;
});
return item;
}, []);
// 防止 list 有重复元素
const clean = useCallback(() => {
list.current = [];
}, []);
return { Component, getMenuItems, getMenuItem, clean };
};

6
packages/core/client/src/index.ts
View File

@ -14,6 +14,7 @@ export * from './collection-manager';
export * from './document-title';
export * from './filter-provider';
export * from './formula';
export * from './hooks';
export * from './i18n';
export * from './icon';
export * from './plugin-manager';
@ -23,10 +24,9 @@ export * from './record-provider';
export * from './route-switch';
export * from './schema-component';
export * from './schema-initializer';
export * from './schema-items';
export * from './schema-settings';
export * from './schema-templates';
export * from './schema-items';
export * from './settings-form';
export * from './system-settings';
export * from './user';
export * from './hooks';

16
packages/core/client/src/pm/Card.tsx
View File

@ -1,9 +1,8 @@
import React, { useEffect, useMemo, useState, useCallback, MouseEventHandler } from 'react';
import { useAPIClient, useRequest } from '../api-client';
import { DeleteOutlined, SettingOutlined } from '@ant-design/icons';
import { css } from '@emotion/css';
import {
Avatar,
Card,
message,
Modal,
Popconfirm,
Spin,
@ -13,14 +12,15 @@ import {
Tag,
Tooltip,
Typography,
message,
} from 'antd';
import { css } from '@emotion/css';
import cls from 'classnames';
import { useNavigate } from 'react-router-dom';
import React, { useCallback, useEffect, useMemo, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { DeleteOutlined, SettingOutlined } from '@ant-design/icons';
import { useParseMarkdown } from '../schema-component/antd/markdown/util';
import { useNavigate } from 'react-router-dom';
import type { IPluginData } from '.';
import { useAPIClient, useRequest } from '../api-client';
import { useParseMarkdown } from '../schema-component/antd/markdown/util';
interface PluginDocumentProps {
path: string;
@ -163,7 +163,7 @@ function PluginDetail(props: IPluginDetail) {
destroyOnClose
>
{plugin?.description && <div className={'plugin-desc'}>{plugin?.description}</div>}
<Tabs items={items}></Tabs>
<Tabs items={items} />
</Modal>
);
}

26
packages/core/client/src/pm/PluginManagerLink.tsx
View File

@ -1,11 +1,12 @@
import { ApiOutlined, SettingOutlined } from '@ant-design/icons';
import { Button, Dropdown, Menu, Tooltip } from 'antd';
import React, { useContext, useState } from 'react';
import { Button, Dropdown, MenuProps, Tooltip } from 'antd';
import _ from 'lodash';
import React, { useContext, useMemo, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { useNavigate } from 'react-router-dom';
import { useACLRoleContext } from '../acl/ACLProvider';
import { ActionContextProvider, useCompile } from '../schema-component';
import { getPluginsTabs, SettingsCenterContext } from './index';
import { SettingsCenterContext, getPluginsTabs } from './index';
export const PluginManagerLink = () => {
const { t } = useTranslation();
@ -23,7 +24,7 @@ export const PluginManagerLink = () => {
);
};
const getBookmarkTabs = (data) => {
const getBookmarkTabs = _.memoize((data) => {
const bookmarkTabs = [];
data.forEach((plugin) => {
const tabs = plugin.tabs;
@ -32,7 +33,7 @@ const getBookmarkTabs = (data) => {
});
});
return bookmarkTabs;
};
});
export const SettingsCenterDropdown = () => {
const { snippets = [] } = useACLRoleContext();
const [visible, setVisible] = useState(false);
@ -42,11 +43,8 @@ export const SettingsCenterDropdown = () => {
const itemData = useContext(SettingsCenterContext);
const pluginsTabs = getPluginsTabs(itemData, snippets);
const bookmarkTabs = getBookmarkTabs(pluginsTabs);
return (
<ActionContextProvider value={{ visible, setVisible }}>
<Dropdown
placement="bottom"
menu={{
const menu = useMemo<MenuProps>(() => {
return {
items: [
...bookmarkTabs.map((tab) => ({
key: `/admin/settings/${tab.path}`,
@ -61,8 +59,12 @@ export const SettingsCenterDropdown = () => {
onClick({ key }) {
navigate(key);
},
}}
>
};
}, [bookmarkTabs]);
return (
<ActionContextProvider value={{ visible, setVisible }}>
<Dropdown placement="bottom" menu={menu}>
<Button
icon={<SettingOutlined />}
// title={t('All plugin settings')}

47
packages/core/client/src/pm/index.tsx
View File

@ -1,6 +1,7 @@
import { PageHeader } from '@ant-design/pro-layout';
import { css } from '@emotion/css';
import { Layout, Menu, PageHeader, Result, Spin, Tabs } from 'antd';
import { sortBy } from 'lodash';
import { Layout, Menu, Result, Spin, Tabs } from 'antd';
import _, { sortBy } from 'lodash';
import React, { createContext, useContext, useEffect, useMemo } from 'react';
import { useTranslation } from 'react-i18next';
import { Navigate, useNavigate, useParams } from 'react-router-dom';
@ -126,6 +127,10 @@ const PluginList = (props) => {
return snippets.includes('pm') ? (
<div>
<PageHeader
style={{
backgroundColor: 'white',
paddingBottom: 0,
}}
ghost={false}
title={t('Plugin manager')}
footer={
@ -134,11 +139,21 @@ const PluginList = (props) => {
onChange={(activeKey) => {
navigate(`/admin/pm/list/${activeKey}`);
}}
>
<Tabs.TabPane tab={t('Local')} key={'local'} />
<Tabs.TabPane tab={t('Built-in')} key={'built-in'} />
<Tabs.TabPane tab={t('Marketplace')} key={'marketplace'} />
</Tabs>
items={[
{
key: 'local',
label: t('Local'),
},
{
key: 'built-in',
label: t('Built-in'),
},
{
key: 'marketplace',
label: t('Marketplace'),
},
]}
/>
}
/>
<div className={'m24'} style={{ margin: 24, display: 'flex', flexFlow: 'row wrap' }}>
@ -202,7 +217,7 @@ const settings = {
},
};
export const getPluginsTabs = (items, snippets) => {
export const getPluginsTabs = _.memoize((items, snippets) => {
const pluginsTabs = Object.keys(items).map((plugin) => {
const tabsObj = items[plugin].tabs;
const tabs = sortBy(
@ -223,7 +238,7 @@ export const getPluginsTabs = (items, snippets) => {
};
});
return sortBy(pluginsTabs, (o) => !o.isAllow);
};
});
const SettingsCenter = (props) => {
const { snippets = [] } = useACLRoleContext();
@ -296,6 +311,7 @@ const SettingsCenter = (props) => {
<Layout.Content>
{aclPluginTabCheck && (
<PageHeader
style={{ backgroundColor: 'white', paddingBottom: 0 }}
ghost={false}
title={compile(items[pluginName]?.title)}
footer={
@ -304,11 +320,16 @@ const SettingsCenter = (props) => {
onChange={(activeKey) => {
navigate(`/admin/settings/${pluginName}/${activeKey}`);
}}
>
{plugin.tabs?.map((tab) => {
return tab.isAllow && <Tabs.TabPane tab={compile(tab?.title)} key={tab.key} />;
items={plugin.tabs?.map((tab) => {
if (!tab.isAllow) {
return null;
}
return {
label: compile(tab?.title),
key: tab.key,
};
})}
</Tabs>
/>
}
/>
)}

10
packages/core/client/src/schema-component/antd/action/Action.Designer.tsx
View File

@ -1,6 +1,6 @@
import { connect, ISchema, mapProps, useField, useFieldSchema } from '@formily/react';
import { isValid, uid } from '@formily/shared';
import { Tree as AntdTree, Menu } from 'antd';
import { Tree as AntdTree } from 'antd';
import { cloneDeep } from 'lodash';
import React, { useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next';
@ -46,7 +46,11 @@ const MenuGroup = (props) => {
) {
return <>{props.children}</>;
}
return <Menu.ItemGroup title={`${t('Customize')} > ${actionTitles[actionType]}`}>{props.children}</Menu.ItemGroup>;
return (
<SchemaSettings.ItemGroup title={`${t('Customize')} > ${actionTitles[actionType]}`}>
{props.children}
</SchemaSettings.ItemGroup>
);
};
export const ActionDesigner = (props) => {
@ -54,7 +58,7 @@ export const ActionDesigner = (props) => {
const field = useField();
const fieldSchema = useFieldSchema();
const { name } = useCollection();
const { getChildrenCollections, getCollection, getCollectionField } = useCollectionManager();
const { getChildrenCollections } = useCollectionManager();
const { dn } = useDesignable();
const { t } = useTranslation();
const isAction = useLinkageAction();

2
packages/core/client/src/schema-component/antd/action/Action.Drawer.tsx
View File

@ -36,7 +36,7 @@ export const ActionDrawer: ComposedActionDrawer = observer(
{...others}
{...drawerProps}
{...modalProps}
style={{
rootStyle={{
...drawerProps?.style,
...others?.style,
}}

2
packages/core/client/src/schema-component/antd/action/ActionBar.tsx
View File

@ -1,5 +1,5 @@
import { cx } from '@emotion/css';
import { observer, RecursionField, useFieldSchema } from '@formily/react';
import { RecursionField, observer, useFieldSchema } from '@formily/react';
import { Space } from 'antd';
import React, { CSSProperties, useContext } from 'react';
import { createPortal } from 'react-dom';

2
packages/core/client/src/schema-component/antd/calendar/DeleteEvent.tsx
View File

@ -46,7 +46,7 @@ export const DeleteEvent = observer(
return createPortal(
<Modal
title={cron ? t('Delete events') : null}
visible={visible}
open={visible}
onCancel={() => setVisible(false)}
onOk={() => onOk()}
confirmLoading={loading}

7
packages/core/client/src/schema-component/antd/grid-card/GridCard.Designer.tsx
View File

@ -1,18 +1,17 @@
import { useFieldSchema, useField, ISchema } from '@formily/react';
import React, { useMemo } from 'react';
import { ArrayItems } from '@formily/antd';
import { ISchema, useField, useFieldSchema } from '@formily/react';
import { Slider } from 'antd';
import _ from 'lodash';
import React, { useMemo } from 'react';
import { useTranslation } from 'react-i18next';
import { useCollection, useCollectionFilterOptions, useSortFields } from '../../../collection-manager';
import { GeneralSchemaDesigner, SchemaSettings } from '../../../schema-settings';
import { useSchemaTemplate } from '../../../schema-templates';
import { SchemaComponentOptions } from '../../core';
import { useDesignable } from '../../hooks';
import { removeNullCondition } from '../filter';
import { FilterDynamicComponent } from '../table-v2/FilterDynamicComponent';
import { SchemaComponentOptions } from '../../core';
import { defaultColumnCount, gridSizes, pageSizeOptions, screenSizeMaps, screenSizeTitleMaps } from './options';
Slider;
const columnCountMarks = [1, 2, 3, 4, 6, 8, 12, 24].reduce((obj, cur) => {
obj[cur] = cur;

626
packages/core/client/src/schema-component/antd/menu/Menu.tsx
View File

@ -1,18 +1,21 @@
import { css } from '@emotion/css';
import {
FieldContext,
observer,
RecursionField,
Schema,
SchemaContext,
SchemaExpressionScopeContext,
useField,
useFieldSchema,
} from '@formily/react';
import { Menu as AntdMenu } from 'antd';
import React, { createContext, useContext, useEffect, useState } from 'react';
import { error } from '@nocobase/utils/client';
import { Menu as AntdMenu, MenuProps } from 'antd';
import React, { createContext, useContext, useEffect, useMemo, useState } from 'react';
import { createPortal } from 'react-dom';
import { useTranslation } from 'react-i18next';
import { createDesignable, DndContext, SortableItem, useDesignable, useDesigner } from '../..';
import { Icon, useAPIClient, useSchemaInitializer } from '../../../';
import { useCollectMenuItems, useMenuItem } from '../../../hooks/useMenuItem';
import { useProps } from '../../hooks/useProps';
import { MenuDesigner } from './Menu.Designer';
import { findKeysByUid, findMenuItem } from './util';
@ -115,7 +118,7 @@ const designerCss = css`
}
`;
const antdMenuClass = css`
const headerMenuClass = css`
.ant-menu-item:hover {
> .ant-menu-title-content > div {
.general-schema-designer {
@ -125,171 +128,7 @@ const antdMenuClass = css`
}
`;
type ComposedMenu = React.FC<any> & {
Item?: React.FC<any>;
URL?: React.FC<any>;
SubMenu?: React.FC<any>;
Designer?: React.FC<any>;
};
const MenuModeContext = createContext(null);
MenuModeContext.displayName = 'MenuModeContext';
const useSideMenuRef = () => {
const schema = useFieldSchema();
const scope = useContext(SchemaExpressionScopeContext);
const scopeKey = schema?.['x-component-props']?.['sideMenuRefScopeKey'];
if (!scopeKey) {
return;
}
return scope[scopeKey];
};
const MenuItemDesignerContext = createContext(null);
MenuItemDesignerContext.displayName = 'MenuItemDesignerContext';
export const Menu: ComposedMenu = observer(
(props) => {
const {
onSelect,
mode,
selectedUid,
defaultSelectedUid,
sideMenuRefScopeKey,
defaultSelectedKeys: dSelectedKeys,
defaultOpenKeys: dOpenKeys,
...others
} = useProps(props);
const { t } = useTranslation();
const Designer = useDesigner();
const schema = useFieldSchema();
const { refresh } = useDesignable();
const api = useAPIClient();
const { render } = useSchemaInitializer(schema['x-initializer']);
const sideMenuRef = useSideMenuRef();
const [selectedKeys, setSelectedKeys] = useState<string[]>();
const [defaultSelectedKeys, setDefaultSelectedKeys] = useState(() => {
if (dSelectedKeys) {
return dSelectedKeys;
}
if (defaultSelectedUid) {
return findKeysByUid(schema, defaultSelectedUid);
}
return [];
});
const [loading, setLoading] = useState(false);
const [defaultOpenKeys, setDefaultOpenKeys] = useState(() => {
if (['inline', 'mix'].includes(mode)) {
return dOpenKeys || defaultSelectedKeys;
}
return dOpenKeys;
});
const [sideMenuSchema, setSideMenuSchema] = useState<Schema>(() => {
const key = defaultSelectedKeys?.[0] || null;
if (mode === 'mix' && key) {
const s = schema.properties?.[key];
if (s['x-component'] === 'Menu.SubMenu') {
return s;
}
}
return null;
});
useEffect(() => {
if (!selectedUid) {
setSelectedKeys(undefined);
return;
}
const keys = findKeysByUid(schema, selectedUid);
setSelectedKeys(keys);
if (['inline', 'mix'].includes(mode)) {
setDefaultOpenKeys(dOpenKeys || keys);
}
const key = keys?.[0] || null;
if (mode === 'mix') {
if (key) {
const s = schema.properties?.[key];
if (s['x-component'] === 'Menu.SubMenu') {
setSideMenuSchema(s);
}
} else {
setSideMenuSchema(null);
}
}
}, [selectedUid]);
useEffect(() => {
if (['inline', 'mix'].includes(mode)) {
setDefaultOpenKeys(defaultSelectedKeys);
}
}, [defaultSelectedKeys]);
const { designable } = useDesignable();
return (
<DndContext>
<MenuItemDesignerContext.Provider value={Designer}>
<MenuModeContext.Provider value={mode}>
<AntdMenu
{...others}
className={antdMenuClass}
onSelect={(info: any) => {
const s = schema.properties[info.key];
if (mode === 'mix') {
setSideMenuSchema(s);
if (s['x-component'] !== 'Menu.SubMenu') {
onSelect && onSelect(info);
} else {
const menuItemSchema = findMenuItem(s);
if (!menuItemSchema) {
return;
}
// TODO
setLoading(true);
const keys = findKeysByUid(schema, menuItemSchema['x-uid']);
setDefaultSelectedKeys(keys);
setTimeout(() => {
setLoading(false);
}, 100);
onSelect &&
onSelect({
key: menuItemSchema.name,
item: {
props: {
schema: menuItemSchema,
},
},
});
}
} else {
onSelect && onSelect(info);
}
}}
mode={mode === 'mix' ? 'horizontal' : mode}
defaultOpenKeys={defaultOpenKeys}
defaultSelectedKeys={defaultSelectedKeys}
selectedKeys={selectedKeys}
>
{designable && (
<AntdMenu.Item disabled key="x-designer-button" style={{ padding: '0 8px', order: 9999 }}>
{render({ style: { background: 'none' } })}
</AntdMenu.Item>
)}
{props.children}
</AntdMenu>
{loading
? null
: mode === 'mix' &&
sideMenuSchema?.['x-component'] === 'Menu.SubMenu' &&
sideMenuRef?.current?.firstChild &&
createPortal(
<MenuModeContext.Provider value={'inline'}>
<AntdMenu
mode={'inline'}
defaultOpenKeys={defaultOpenKeys}
defaultSelectedKeys={defaultSelectedKeys}
onSelect={(info) => {
onSelect && onSelect(info);
}}
className={css`
const sideMenuClass = css`
height: 100%;
overflow-y: auto;
overflow-x: hidden;
@ -320,11 +159,127 @@ export const Menu: ComposedMenu = observer(
}
}
}
`}
>
<RecursionField schema={sideMenuSchema} onlyRenderProperties />
{render({
style: { margin: 8 },
`;
const menuItemClass = css`
:active {
background: inherit;
}
`;
type ComposedMenu = React.FC<any> & {
Item?: React.FC<any>;
URL?: React.FC<any>;
SubMenu?: React.FC<any>;
Designer?: React.FC<any>;
};
const HeaderMenu = ({
others,
schema,
mode,
onSelect,
setLoading,
setDefaultSelectedKeys,
defaultSelectedKeys,
defaultOpenKeys,
selectedKeys,
designable,
render,
children,
}) => {
const { Component, getMenuItems } = useMenuItem();
const items = useMemo(() => {
const designerBtn = {
key: 'x-designer-button',
disabled: true,
style: { padding: '0 8px', order: 9999 },
label: render({ style: { background: 'none' } }),
notdelete: true,
};
const result = getMenuItems(() => {
return children;
});
if (designable) {
result.push(designerBtn);
}
return result;
}, [children, designable]);
return (
<>
<Component />
<AntdMenu
{...others}
className={headerMenuClass}
onSelect={(info: any) => {
const s = schema.properties[info.key];
if (mode === 'mix') {
if (s['x-component'] !== 'Menu.SubMenu') {
onSelect && onSelect(info);
} else {
const menuItemSchema = findMenuItem(s);
if (!menuItemSchema) {
return onSelect && onSelect(info);
}
// TODO
setLoading(true);
const keys = findKeysByUid(schema, menuItemSchema['x-uid']);
setDefaultSelectedKeys(keys);
setTimeout(() => {
setLoading(false);
}, 100);
onSelect &&
onSelect({
key: menuItemSchema.name,
item: {
props: {
schema: menuItemSchema,
},
},
});
}
} else {
onSelect && onSelect(info);
}
}}
mode={mode === 'mix' ? 'horizontal' : mode}
defaultOpenKeys={defaultOpenKeys}
defaultSelectedKeys={defaultSelectedKeys}
selectedKeys={selectedKeys}
items={items}
/>
</>
);
};
const SideMenu = ({
loading,
mode,
sideMenuSchema,
sideMenuRef,
defaultOpenKeys,
defaultSelectedKeys,
onSelect,
render,
t,
api,
refresh,
designable,
}) => {
const { Component, getMenuItems } = useMenuItem();
const items = useMemo(() => {
const result = getMenuItems(() => {
return <RecursionField schema={sideMenuSchema} onlyRenderProperties />;
});
if (designable) {
result.push({
key: 'x-designer-button',
disabled: true,
label: render({
insert: (s) => {
const dn = createDesignable({
t,
@ -335,11 +290,167 @@ export const Menu: ComposedMenu = observer(
dn.loadAPIClientEvents();
dn.insertAdjacent('beforeEnd', s);
},
})}
</AntdMenu>
}),
order: 1,
notdelete: true,
});
}
return result;
}, [render, sideMenuSchema, designable, loading]);
if (loading) {
return null;
}
return (
mode === 'mix' &&
sideMenuSchema?.['x-component'] === 'Menu.SubMenu' &&
sideMenuRef?.current?.firstChild &&
createPortal(
<MenuModeContext.Provider value={'inline'}>
<Component />
<AntdMenu
mode={'inline'}
defaultOpenKeys={defaultOpenKeys}
defaultSelectedKeys={defaultSelectedKeys}
onSelect={(info) => {
onSelect && onSelect(info);
}}
className={sideMenuClass}
items={items as MenuProps['items']}
/>
</MenuModeContext.Provider>,
sideMenuRef.current.firstChild,
)}
)
);
};
const MenuModeContext = createContext(null);
MenuModeContext.displayName = 'MenuModeContext';
const useSideMenuRef = () => {
const schema = useFieldSchema();
const scope = useContext(SchemaExpressionScopeContext);
const scopeKey = schema?.['x-component-props']?.['sideMenuRefScopeKey'];
if (!scopeKey) {
return;
}
return scope[scopeKey];
};
const MenuItemDesignerContext = createContext(null);
MenuItemDesignerContext.displayName = 'MenuItemDesignerContext';
export const Menu: ComposedMenu = observer(
(props) => {
const {
onSelect,
mode,
selectedUid,
defaultSelectedUid,
sideMenuRefScopeKey,
defaultSelectedKeys: dSelectedKeys,
defaultOpenKeys: dOpenKeys,
children,
...others
} = useProps(props);
const { t } = useTranslation();
const Designer = useDesigner();
const schema = useFieldSchema();
const { refresh } = useDesignable();
const api = useAPIClient();
const { render } = useSchemaInitializer(schema['x-initializer']);
const sideMenuRef = useSideMenuRef();
const [selectedKeys, setSelectedKeys] = useState<string[]>();
const [defaultSelectedKeys, setDefaultSelectedKeys] = useState(() => {
if (dSelectedKeys) {
return dSelectedKeys;
}
if (defaultSelectedUid) {
return findKeysByUid(schema, defaultSelectedUid);
}
return [];
});
const [loading, setLoading] = useState(false);
const [defaultOpenKeys, setDefaultOpenKeys] = useState(() => {
if (['inline', 'mix'].includes(mode)) {
return dOpenKeys || defaultSelectedKeys;
}
return dOpenKeys;
});
const sideMenuSchema = useMemo(() => {
let key;
if (selectedUid) {
const keys = findKeysByUid(schema, selectedUid);
key = keys?.[0] || null;
} else {
key = defaultSelectedKeys?.[0] || null;
}
if (mode === 'mix' && key) {
const s = schema.properties?.[key];
if (s['x-component'] === 'Menu.SubMenu') {
return s;
}
}
return null;
}, [defaultSelectedKeys, mode, schema, selectedUid]);
useEffect(() => {
if (!selectedUid) {
setSelectedKeys(undefined);
return;
}
const keys = findKeysByUid(schema, selectedUid);
setSelectedKeys(keys);
if (['inline', 'mix'].includes(mode)) {
setDefaultOpenKeys(dOpenKeys || keys);
}
}, [selectedUid]);
useEffect(() => {
if (['inline', 'mix'].includes(mode)) {
setDefaultOpenKeys(defaultSelectedKeys);
}
}, [defaultSelectedKeys]);
const { designable } = useDesignable();
return (
<DndContext>
<MenuItemDesignerContext.Provider value={Designer}>
<MenuModeContext.Provider value={mode}>
<HeaderMenu
others={others}
schema={schema}
mode={mode}
onSelect={onSelect}
setLoading={setLoading}
setDefaultSelectedKeys={setDefaultSelectedKeys}
defaultSelectedKeys={defaultSelectedKeys}
defaultOpenKeys={defaultOpenKeys}
selectedKeys={selectedKeys}
designable={designable}
render={render}
>
{children}
</HeaderMenu>
<SideMenu
loading={loading}
mode={mode}
sideMenuSchema={sideMenuSchema}
sideMenuRef={sideMenuRef}
defaultOpenKeys={defaultOpenKeys}
defaultSelectedKeys={defaultSelectedKeys}
onSelect={onSelect}
render={render}
t={t}
api={api}
refresh={refresh}
designable={designable}
/>
</MenuModeContext.Provider>
</MenuItemDesignerContext.Provider>
</DndContext>
@ -350,116 +461,149 @@ export const Menu: ComposedMenu = observer(
Menu.Item = observer(
(props) => {
const { icon, ...others } = props;
const { pushMenuItem } = useCollectMenuItems();
const { icon, children, ...others } = props;
const schema = useFieldSchema();
const field = useField();
const Designer = useContext(MenuItemDesignerContext);
return (
<AntdMenu.Item
{...others}
className={css`
:active {
background: inherit;
}
`}
key={schema.name}
eventKey={schema.name}
schema={schema}
>
const item = useMemo(() => {
return {
...others,
className: menuItemClass,
key: schema.name,
eventKey: schema.name,
schema,
label: (
<SchemaContext.Provider value={schema}>
<FieldContext.Provider value={field}>
<SortableItem className={designerCss} removeParentsIfNoChildren={false}>
<Icon type={icon} />
<span
className={css`
overflow: hidden;
text-overflow: ellipsis;
display: inline-block;
width: 100%;
vertical-align: middle;
`}
style={{
overflow: 'hidden',
textOverflow: 'ellipsis',
display: 'inline-block',
width: '100%',
verticalAlign: 'middle',
}}
>
{field.title}
</span>
{Designer && <Designer />}
</SortableItem>
</AntdMenu.Item>
);
</FieldContext.Provider>
</SchemaContext.Provider>
),
};
}, [field.title, icon, schema]);
if (!pushMenuItem) {
error('Menu.Item must be wrapped by GetMenuItemsContext.Provider');
return null;
}
pushMenuItem(item);
return null;
},
{ displayName: 'Menu.Item' },
);
Menu.URL = observer(
(props) => {
const { icon, ...others } = props;
const { pushMenuItem } = useCollectMenuItems();
const { icon, children, ...others } = props;
const schema = useFieldSchema();
const field = useField();
const Designer = useContext(MenuItemDesignerContext);
return (
<AntdMenu.Item
{...others}
className={css`
:active {
background: inherit;
if (!pushMenuItem) {
error('Menu.URL must be wrapped by GetMenuItemsContext.Provider');
return null;
}
`}
key={schema.name}
eventKey={schema.name}
schema={schema}
onClick={() => {
const item = useMemo(() => {
return {
...others,
className: menuItemClass,
key: schema.name,
eventKey: schema.name,
schema,
onClick: () => {
window.open(props.href, '_blank');
}}
>
},
label: (
<SchemaContext.Provider value={schema}>
<FieldContext.Provider value={field}>
<SortableItem className={designerCss} removeParentsIfNoChildren={false}>
<Icon type={icon} />
<span
className={css`
overflow: hidden;
text-overflow: ellipsis;
display: inline-block;
width: 100%;
vertical-align: middle;
`}
style={{
overflow: 'hidden',
textOverflow: 'ellipsis',
display: 'inline-block',
width: '100%',
verticalAlign: 'middle',
}}
>
{field.title}
</span>
{Designer && <Designer />}
</SortableItem>
</AntdMenu.Item>
);
</FieldContext.Provider>
</SchemaContext.Provider>
),
};
}, [field.title, icon, props.href, schema]);
pushMenuItem(item);
return null;
},
{ displayName: 'MenuURL' },
);
Menu.SubMenu = observer(
(props) => {
const { icon, ...others } = props;
const { Component, getMenuItems } = useMenuItem();
const { pushMenuItem } = useCollectMenuItems();
const { icon, children, ...others } = props;
const schema = useFieldSchema();
const field = useField();
const mode = useContext(MenuModeContext);
const Designer = useContext(MenuItemDesignerContext);
if (mode === 'mix') {
return <Menu.Item {...props} />;
}
return (
<AntdMenu.SubMenu
{...others}
className={css`
:active {
background: inherit;
}
`}
key={schema.name}
eventKey={schema.name}
title={
const submenu = useMemo(() => {
return {
...others,
className: menuItemClass,
key: schema.name,
eventKey: schema.name,
label: (
<SchemaContext.Provider value={schema}>
<FieldContext.Provider value={field}>
<SortableItem className={subMenuDesignerCss} removeParentsIfNoChildren={false}>
<Icon type={icon} />
{field.title}
{Designer && <Designer />}
</SortableItem>
</FieldContext.Provider>
</SchemaContext.Provider>
),
children: getMenuItems(() => {
return <RecursionField schema={schema} onlyRenderProperties />;
}),
};
}, [field.title, icon, schema, children]);
if (!pushMenuItem) {
error('Menu.SubMenu must be wrapped by GetMenuItemsContext.Provider');
return null;
}
>
<RecursionField schema={schema} onlyRenderProperties />
</AntdMenu.SubMenu>
);
if (mode === 'mix') {
return <Menu.Item {...props} />;
}
pushMenuItem(submenu);
return <Component />;
},
{ displayName: 'Menu.SubMenu' },
);

56
packages/core/client/src/schema-component/antd/page/Page.tsx
View File

@ -1,8 +1,9 @@
import { PlusOutlined } from '@ant-design/icons';
import { PageHeader as AntdPageHeader } from '@ant-design/pro-layout';
import { css } from '@emotion/css';
import { FormDialog, FormLayout } from '@formily/antd';
import { Schema, SchemaOptionsContext, useFieldSchema } from '@formily/react';
import { Button, PageHeader as AntdPageHeader, Spin, Tabs } from 'antd';
import { Button, Spin, Tabs } from 'antd';
import classNames from 'classnames';
import React, { useContext, useEffect, useMemo, useState } from 'react';
import { ErrorBoundary } from 'react-error-boundary';
@ -119,6 +120,25 @@ const pageWithFixedBlockCss = classNames([
`,
]);
const pageHeaderCss = css`
background-color: white;
&.ant-page-header-has-footer {
padding-top: 12px;
padding-bottom: 0;
.ant-page-header-heading-left {
/* margin: 0; */
}
.ant-page-header-footer {
margin-top: 0;
}
}
`;
const height0 = css`
font-size: 0;
height: 0;
`;
export const Page = (props) => {
const { children, ...others } = props;
const compile = useCompile();
@ -156,6 +176,8 @@ export const Page = (props) => {
const handleErrors = (error) => {
console.error(error);
};
const pageHeaderTitle = hidePageTitle ? undefined : fieldSchema.title || compile(title);
return (
<FilterBlockProvider>
<div className={pageDesignerCss}>
@ -167,19 +189,10 @@ export const Page = (props) => {
>
{!disablePageHeader && (
<AntdPageHeader
className={css`
&.has-footer {
padding-top: 12px;
.ant-page-header-heading-left {
/* margin: 0; */
}
.ant-page-header-footer {
margin-top: 0;
}
}
`}
className={classNames(pageHeaderCss, pageHeaderTitle ? '' : height0)}
ghost={false}
title={hidePageTitle ? undefined : fieldSchema.title || compile(title)}
// 如果标题为空的时候会导致 PageHeader 不渲染，所以这里设置一个空白字符，然后再设置高度为 0
title={pageHeaderTitle || ' '}
{...others}
footer={
enablePageTabs && (
@ -247,11 +260,9 @@ export const Page = (props) => {
</Button>
)
}
>
{fieldSchema.mapProperties((schema) => {
return (
<Tabs.TabPane
tab={
items={fieldSchema.mapProperties((schema) => {
return {
label: (
<SortableItem
id={schema.name as string}
schema={schema}
@ -261,12 +272,11 @@ export const Page = (props) => {
<span>{schema.title || t('Unnamed')}</span>
<PageTabDesigner schema={schema} />
</SortableItem>
}
key={schema.name}
/>
);
),
key: schema.name as string,
};
})}
</Tabs>
/>
</DndContext>
)
}

9
packages/core/client/src/schema-component/antd/table-v2/Table.tsx
View File

@ -193,7 +193,8 @@ const useValidator = (validator: (value: any) => string) => {
}, []);
};
export const Table: any = observer((props: any) => {
export const Table: any = observer(
(props: any) => {
const { pagination: pagination1, useProps, onChange, ...others1 } = props;
const { pagination: pagination2, onClickRow, ...others2 } = useProps?.() || {};
const {
@ -453,7 +454,7 @@ export const Table: any = observer((props: any) => {
return dragSort
? React.createElement(SortableContext, {
items: field.value?.map?.(getRowKey) || [],
children: children,
children,
})
: React.createElement(React.Fragment, {
children,
@ -533,4 +534,6 @@ export const Table: any = observer((props: any) => {
)}
</div>
);
});
},
{ displayName: 'Table' },
);

41
packages/core/client/src/schema-component/antd/tabs/Tabs.tsx
View File

@ -1,15 +1,15 @@
import { css } from '@emotion/css';
import { observer, RecursionField, useField, useFieldSchema } from '@formily/react';
import { TabPaneProps, Tabs as AntdTabs, TabsProps } from 'antd';
import { Tabs as AntdTabs, TabPaneProps, TabsProps } from 'antd';
import classNames from 'classnames';
import React from 'react';
import React, { useMemo } from 'react';
import { Icon } from '../../../icon';
import { useSchemaInitializer } from '../../../schema-initializer';
import { DndContext, SortableItem } from '../../common';
import { useDesignable } from '../../hooks';
import { useDesigner } from '../../hooks/useDesigner';
import { useTabsContext } from './context';
import { TabsDesigner } from './Tabs.Designer';
import { useDesignable } from '../../hooks';
export const Tabs: any = observer(
(props: TabsProps) => {
@ -19,20 +19,33 @@ export const Tabs: any = observer(
const contextProps = useTabsContext();
const { PaneRoot = React.Fragment as React.FC<any> } = contextProps;
return (
<DndContext>
<AntdTabs {...contextProps} style={props.style}>
{fieldSchema.mapProperties((schema, key) => {
return (
<AntdTabs.TabPane tab={<RecursionField name={key} schema={schema} onlyRenderSelf />} key={key}>
const items = useMemo(() => {
const result = fieldSchema.mapProperties((schema, key: string) => {
return {
key,
label: <RecursionField name={key} schema={schema} onlyRenderSelf />,
children: (
<PaneRoot active={key === contextProps.activeKey}>
<RecursionField name={key} schema={schema} onlyRenderProperties />
</PaneRoot>
</AntdTabs.TabPane>
);
})}
{designable && <AntdTabs.TabPane tab={render()} />}
</AntdTabs>
),
};
});
if (designable) {
result.push({
key: 'designer',
label: render(),
children: null,
});
}
return result;
}, [fieldSchema.mapProperties((s, key) => key).join()]);
return (
<DndContext>
<AntdTabs {...contextProps} style={props.style} items={items} />
</DndContext>
);
},

9
packages/core/client/src/schema-component/antd/upload/ReadPretty.tsx
View File

@ -18,7 +18,7 @@ type Composed = React.FC<UploadProps> & {
export const ReadPretty: Composed = () => null;
ReadPretty.File = (props: UploadProps) => {
ReadPretty.File = function File(props: UploadProps) {
const record = useRecord();
const field = useField<Field>();
const value = isString(field.value) ? record : field.value;
@ -44,7 +44,7 @@ ReadPretty.File = (props: UploadProps) => {
// }
};
return (
<div className={'ant-upload-list-picture-card-container'}>
<div key={file.name} className={'ant-upload-list-picture-card-container'}>
<div className="ant-upload-list-item ant-upload-list-item-done ant-upload-list-item-list-type-picture-card">
<div className={'ant-upload-list-item-info'}>
<span className="ant-upload-span">
@ -114,6 +114,7 @@ ReadPretty.File = (props: UploadProps) => {
imageTitle={images[photoIndex]?.title}
toolbarButtons={[
<button
key={'download'}
style={{ fontSize: 22, background: 'none', lineHeight: 1 }}
type="button"
aria-label="Zoom in"
@ -135,10 +136,10 @@ ReadPretty.File = (props: UploadProps) => {
);
};
ReadPretty.Upload = (props) => {
ReadPretty.Upload = function Upload(props) {
const field = useField<Field>();
return (field.value || []).map((item) => (
<div>
<div key={item.name}>
{item.url ? (
<a target={'_blank'} href={item.url} rel="noreferrer">
{item.name}

2
packages/core/client/src/schema-component/antd/variable/VariableSelect.tsx
View File

@ -65,7 +65,7 @@ export function VariableSelect(props) {
}
}
}}
dropdownClassName={css`
popupClassName={css`
.ant-cascader-menu {
margin-bottom: 0;
}

283
packages/core/client/src/schema-initializer/SchemaInitializer.tsx
View File

@ -1,8 +1,10 @@
import { css } from '@emotion/css';
import { ISchema, observer, useForm } from '@formily/react';
import { Button, Dropdown, Menu, Switch } from 'antd';
import { error, isString } from '@nocobase/utils/client';
import { Button, Dropdown, MenuProps, Switch } from 'antd';
import classNames from 'classnames';
import React, { createContext, useCallback, useContext, useMemo, useState } from 'react';
import { useCollectMenuItem, useMenuItem } from '../hooks/useMenuItem';
import { Icon } from '../icon';
import { SchemaComponent, useActionContext } from '../schema-component';
import { useCompile, useDesignable } from '../schema-component/hooks';
@ -14,10 +16,22 @@ import {
SchemaInitializerItemProps,
} from './types';
const overlayClassName = css`
.ant-dropdown-menu-item-group-list {
max-height: 40vh;
overflow: auto;
}
`;
const defaultWrap = (s: ISchema) => s;
export const SchemaInitializerItemContext = createContext(null);
export const SchemaInitializerButtonContext = createContext<any>({});
export const SchemaInitializerButtonContext = createContext<{
visible?: boolean;
setVisible?: (v: boolean) => void;
searchValue?: string;
setSearchValue?: (v: string) => void;
}>({});
export const SchemaInitializer = () => null;
@ -41,27 +55,72 @@ SchemaInitializer.Button = observer(
const compile = useCompile();
const { insertAdjacent, findComponent, designable } = useDesignable();
const [visible, setVisible] = useState(false);
const { Component: CollectionComponent, getMenuItem, clean } = useMenuItem();
const [shouldRender, setShouldRender] = useState(false);
const [searchValue, setSearchValue] = useState('');
if (!designable && props.designable !== true) {
return null;
}
const buttonDom = (
<div
style={{ display: 'inline-block' }}
onMouseEnter={() => {
setShouldRender(true);
setVisible(true);
}}
>
{component ? (
component
) : (
<Button
type={'dashed'}
style={{
borderColor: '#f18b62',
color: '#f18b62',
...style,
}}
{...others}
icon={typeof icon === 'string' ? <Icon type={icon as string} /> : icon}
>
{compile(props.children || props.title)}
</Button>
)}
</div>
);
if (!shouldRender || !items.length) {
return buttonDom;
}
const insertSchema = (schema) => {
if (props.insert) {
props.insert(wrap(schema));
if (insert) {
insert(wrap(schema));
} else {
insertAdjacent(insertPosition, wrap(schema), { onSuccess });
}
};
const renderItems = (items: any) => {
return items
.filter((v) => {
.filter((v: any) => {
return v && (v?.visible ? v.visible() : true);
})
?.map((item, indexA) => {
?.map((item: any, indexA: number) => {
if (item.type === 'divider') {
return <Menu.Divider key={item.key || `item-${indexA}`} />;
return { type: 'divider', key: item.key || `item-${indexA}` };
}
if (item.type === 'item' && item.component) {
const Component = findComponent(item.component);
item.key = `${item.key || item.title}-${indexA}`;
if (!Component) {
error(`SchemaInitializer: component "${item.component}" not found`);
return null;
}
if (!item.key) {
item.key = `${item.title}-${indexA}`;
}
return getMenuItem(() => {
return (
Component && (
<SchemaInitializerItemContext.Provider
key={item.key}
value={{
@ -80,75 +139,61 @@ SchemaInitializer.Button = observer(
insert={insertSchema}
/>
</SchemaInitializerItemContext.Provider>
)
);
});
}
if (item.type === 'itemGroup') {
const label = compile(item.title);
return (
!!item.children?.length && (
<Menu.ItemGroup key={item.key || `item-group-${indexA}`} title={compile(item.title)}>
{renderItems(item.children)}
</Menu.ItemGroup>
)
!!item.children?.length && {
type: 'group',
key: item.key || `item-group-${indexA}`,
label,
title: label,
children: renderItems(item.children),
}
);
}
if (item.type === 'subMenu') {
const label = compile(item.title);
return (
!!item.children?.length && (
<Menu.SubMenu
key={item.key || `item-group-${indexA}`}
title={compile(item.title)}
popupClassName={menuItemGroupCss}
>
{renderItems(item.children)}
</Menu.SubMenu>
)
!!item.children?.length && {
key: item.key || `item-group-${indexA}`,
label,
title: label,
popupClassName: menuItemGroupCss,
children: renderItems(item.children),
}
);
}
});
};
const buttonDom = (
<Button
type={'dashed'}
style={{
borderColor: '#f18b62',
color: '#f18b62',
...style,
}}
{...others}
icon={typeof icon === 'string' ? <Icon type={icon as string} /> : icon}
>
{compile(props.children || props.title)}
</Button>
);
if (!items.length) {
return buttonDom;
}
const menu = <Menu style={{ maxHeight: '60vh', overflowY: 'auto' }}>{renderItems(items)}</Menu>;
if (!designable && props.designable !== true) {
return null;
}
clean();
const menuItems = renderItems(items);
return (
<SchemaInitializerButtonContext.Provider value={{ visible, setVisible }}>
<SchemaInitializerButtonContext.Provider value={{ visible, setVisible, searchValue, setSearchValue }}>
<CollectionComponent />
<Dropdown
className={classNames('nb-schema-initializer-button')}
openClassName={`nb-schema-initializer-button-open`}
overlayClassName={classNames(
'nb-schema-initializer-button-overlay',
css`
.ant-dropdown-menu-item-group-list {
max-height: 40vh;
overflow: auto;
}
`,
)}
overlayClassName={classNames('nb-schema-initializer-button-overlay', overlayClassName)}
open={visible}
onOpenChange={(visible) => {
setVisible(visible);
onOpenChange={() => {
// 如果不清空输入框的值，那么下次打开的时候会出现上次输入的值
setSearchValue('');
setShouldRender(false);
setVisible(false);
}}
menu={{
style: {
maxHeight: '60vh',
overflowY: 'auto',
},
items: menuItems,
}}
{...dropdown}
overlay={menu}
>
{component ? component : buttonDom}
</Dropdown>
@ -158,10 +203,17 @@ SchemaInitializer.Button = observer(
{ displayName: 'SchemaInitializer.Button' },
);
SchemaInitializer.Item = (props: SchemaInitializerItemProps) => {
const { index, info } = useContext(SchemaInitializerItemContext);
SchemaInitializer.Item = function Item(props: SchemaInitializerItemProps) {
const { info } = useContext(SchemaInitializerItemContext);
const compile = useCompile();
const { eventKey, items = [], children = info?.title, icon, onClick, ...others } = props;
const { items = [], children = info?.title, icon, onClick } = props;
const { collectMenuItem } = useCollectMenuItem();
if (!collectMenuItem) {
error('SchemaInitializer.Item: collectMenuItem is undefined, please check the context');
return null;
}
if (items?.length > 0) {
const renderMenuItem = (items: SchemaInitializerItemOptions[]) => {
if (!items?.length) {
@ -169,77 +221,70 @@ SchemaInitializer.Item = (props: SchemaInitializerItemProps) => {
}
return items.map((item, indexA) => {
if (item.type === 'divider') {
return <Menu.Divider key={`divider-${indexA}`} />;
return { type: 'divider', key: `divider-${indexA}` };
}
if (item.type === 'itemGroup') {
return (
<Menu.ItemGroup
// @ts-ignore
eventKey={item.key || `item-group-${indexA}`}
key={item.key || `item-group-${indexA}`}
title={compile(item.title)}
className={menuItemGroupCss}
>
{renderMenuItem(item.children)}
</Menu.ItemGroup>
);
const label = compile(item.title);
return {
type: 'group',
key: item.key || `item-group-${indexA}`,
label,
title: label,
className: menuItemGroupCss,
children: renderMenuItem(item.children),
} as MenuProps['items'][0];
}
if (item.type === 'subMenu') {
return (
<Menu.SubMenu
// @ts-ignore
eventKey={item.key || `sub-menu-${indexA}`}
key={item.key || `sub-menu-${indexA}`}
title={compile(item.title)}
>
{renderMenuItem(item.children)}
</Menu.SubMenu>
);
const label = compile(item.title);
return {
key: item.key || `sub-menu-${indexA}`,
label,
title: label,
children: renderMenuItem(item.children),
};
}
return (
<Menu.Item
eventKey={item.key}
key={item.key}
onClick={(info) => {
const label = compile(item.title);
return {
key: item.key || `${info.key}-${item.title}-${indexA}`,
label,
title: label,
onClick: (info) => {
item?.clearKeywords?.();
if (item.onClick) {
item.onClick({ ...info, item });
} else {
onClick({ ...info, item });
}
}}
>
{compile(item.title)}
</Menu.Item>
);
},
};
});
};
return (
<Menu.SubMenu
// @ts-ignore
eventKey={eventKey ? `${eventKey}-${index}` : info.key}
key={info.key}
title={compile(children)}
icon={typeof icon === 'string' ? <Icon type={icon as string} /> : icon}
>
{renderMenuItem(items)}
</Menu.SubMenu>
);
const item = {
key: info.key,
label: isString(children) ? compile(children) : children,
icon: typeof icon === 'string' ? <Icon type={icon as string} /> : icon,
children: renderMenuItem(items),
};
collectMenuItem(item);
return null;
}
return (
<Menu.Item
// {...others}
key={info.key}
eventKey={eventKey ? `${eventKey}-${index}` : info.key}
icon={typeof icon === 'string' ? <Icon type={icon as string} /> : icon}
onClick={(opts) => {
const label = isString(children) ? compile(children) : children;
const item = {
key: info.key,
label,
title: label,
icon: typeof icon === 'string' ? <Icon type={icon as string} /> : icon,
onClick: (opts) => {
info?.clearKeywords?.();
onClick({ ...opts, item: info });
}}
>
{compile(children)}
</Menu.Item>
);
},
};
collectMenuItem(item);
return null;
};
SchemaInitializer.itemWrap = (component?: SchemaInitializerItemComponent) => {
@ -253,11 +298,13 @@ interface SchemaInitializerActionModalProps {
onSubmit?: (values: any) => void;
buttonText?: any;
}
SchemaInitializer.ActionModal = (props: SchemaInitializerActionModalProps) => {
SchemaInitializer.ActionModal = function ActionModal(props: SchemaInitializerActionModalProps) {
const { title, schema, buttonText, onCancel, onSubmit } = props;
const useCancelAction = useCallback(() => {
// eslint-disable-next-line react-hooks/rules-of-hooks
const form = useForm();
// eslint-disable-next-line react-hooks/rules-of-hooks
const ctx = useActionContext();
return {
async run() {
@ -269,7 +316,9 @@ SchemaInitializer.ActionModal = (props: SchemaInitializerActionModalProps) => {
}, [onCancel]);
const useSubmitAction = useCallback(() => {
// eslint-disable-next-line react-hooks/rules-of-hooks
const form = useForm();
// eslint-disable-next-line react-hooks/rules-of-hooks
const ctx = useActionContext();
return {
async run() {

23
packages/core/client/src/schema-initializer/SelectCollection.tsx
View File

@ -1,31 +1,28 @@
import { Divider, Input } from 'antd';
import React from 'react';
import React, { useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { useCollectionManager } from '../collection-manager';
export const SelectCollection = ({ value, onChange, setSelected }) => {
export const SelectCollection = ({ value: outValue, onChange }) => {
const { t } = useTranslation();
const { collections } = useCollectionManager();
const [value, setValue] = useState<string>(outValue);
// 之所以要增加个内部的 value 是为了防止用户输入过快时造成卡顿的问题
useEffect(() => {
setValue(outValue);
}, [outValue]);
return (
<div style={{ width: 210 }}>
<Input
autoFocus
allowClear
style={{ padding: '0 4px 6px' }}
bordered={false}
placeholder={t('Search and select collection')}
value={value}
onChange={(e) => {
const names = collections
.filter((collection) => {
if (!collection.title) {
return;
}
return collection.title.toUpperCase().includes(e.target.value.toUpperCase());
})
.map((item) => item.name);
setSelected(names);
onChange(e.target.value);
setValue(e.target.value);
}}
/>
<Divider style={{ margin: 0 }} />

2
packages/core/client/src/schema-initializer/buttons/TableActionColumnInitializers.tsx
View File

@ -1,12 +1,12 @@
import { MenuOutlined } from '@ant-design/icons';
import { ISchema, useFieldSchema } from '@formily/react';
import _ from 'lodash';
import React from 'react';
import { useTranslation } from 'react-i18next';
import { SchemaInitializer, SchemaSettings } from '../..';
import { useAPIClient } from '../../api-client';
import { useCollection } from '../../collection-manager';
import { createDesignable, useDesignable } from '../../schema-component';
import _ from 'lodash';
export const Resizable = (props) => {
const { t } = useTranslation();

10
packages/core/client/src/schema-initializer/buttons/TableActionInitializers.tsx
View File

@ -32,7 +32,7 @@ export const TableActionInitializers = {
skipScopeCheck: true,
},
},
visible: () => {
visible: function useVisible() {
const collection = useCollection();
return collection.template !== 'view' && collection.template !== 'file';
},
@ -45,7 +45,7 @@ export const TableActionInitializers = {
'x-align': 'right',
'x-decorator': 'ACLActionProvider',
},
visible: () => {
visible: function useVisible() {
const collection = useCollection();
return (collection as any).template !== 'view';
},
@ -65,7 +65,7 @@ export const TableActionInitializers = {
schema: {
'x-align': 'right',
},
visible: () => {
visible: function useVisible() {
const schema = useFieldSchema();
const collection = useCollection();
const { treeTable } = schema?.parent?.['x-decorator-props'] || {};
@ -76,7 +76,7 @@ export const TableActionInitializers = {
},
{
type: 'divider',
visible: () => {
visible: function useVisible() {
const collection = useCollection();
return (collection as any).template !== 'view';
},
@ -157,7 +157,7 @@ export const TableActionInitializers = {
},
},
],
visible: () => {
visible: function useVisible() {
const collection = useCollection();
return (collection as any).template !== 'view';
},

42
packages/core/client/src/schema-initializer/components/CreateRecordAction.tsx
View File

@ -1,8 +1,8 @@
import { DownOutlined, PlusOutlined } from '@ant-design/icons';
import { css } from '@emotion/css';
import { RecursionField, observer, useField, useFieldSchema } from '@formily/react';
import { Button, Dropdown, Menu } from 'antd';
import React, { useEffect, useState } from 'react';
import { Button, Dropdown, MenuProps } from 'antd';
import React, { useEffect, useMemo, useState } from 'react';
import { useDesignable } from '../../';
import { useACLRolesCheck, useRecordPkValue } from '../../acl/ACLProvider';
import { CollectionProvider, useCollection, useCollectionManager } from '../../collection-manager';
@ -131,7 +131,8 @@ export const CreateAction = observer(
const componentType = field.componentProps.type || 'primary';
const { getChildrenCollections } = useCollectionManager();
const totalChildCollections = getChildrenCollections(collection.name);
const inheritsCollections = enableChildren
const inheritsCollections = useMemo(() => {
return enableChildren
.map((k) => {
if (!k) {
return;
@ -148,27 +149,26 @@ export const CreateAction = observer(
.filter((v) => {
return v && actionAclCheck(`${v.name}:create`);
});
}, [enableChildren, totalChildCollections]);
const linkageRules = fieldSchema?.['x-linkage-rules'] || [];
const values = useRecord();
const compile = useCompile();
const { designable } = useDesignable();
const icon = props.icon || <PlusOutlined />;
const menu = (
<Menu>
{inheritsCollections.map((option) => {
return (
<Menu.Item
key={option.name}
onClick={(info) => {
onClick?.(option.name);
}}
>
{compile(option.title)}
</Menu.Item>
);
})}
</Menu>
);
const menuItems = useMemo<MenuProps['items']>(() => {
return inheritsCollections.map((option) => ({
key: option.name,
label: compile(option.title),
onClick: () => onClick?.(option.name),
}));
}, [inheritsCollections, onClick]);
const menu = useMemo<MenuProps>(() => {
return {
items: menuItems,
};
}, [menuItems]);
useEffect(() => {
field.linkageProperty = {};
linkageRules
@ -190,7 +190,7 @@ export const CreateAction = observer(
leftButton,
React.cloneElement(rightButton as React.ReactElement<any, string>, { loading: false }),
]}
overlay={menu}
menu={menu}
onClick={(info) => {
onClick?.(collection.name);
}}
@ -199,7 +199,7 @@ export const CreateAction = observer(
{props.children}
</Dropdown.Button>
) : (
<Dropdown overlay={menu}>
<Dropdown menu={menu}>
{
<Button icon={icon} type={componentType}>
{props.children} <DownOutlined />

9
packages/core/client/src/schema-initializer/items/CalendarBlockInitializer.tsx
View File

@ -1,14 +1,13 @@
import React, { useContext } from 'react';
import { FormDialog, FormLayout } from '@formily/antd';
import { FormOutlined } from '@ant-design/icons';
import { FormDialog, FormLayout } from '@formily/antd';
import { SchemaOptionsContext } from '@formily/react';
import React, { useContext } from 'react';
import { useTranslation } from 'react-i18next';
import { useCollection, useCollectionManager } from '../../collection-manager';
import { SchemaComponent, SchemaComponentOptions, useCompile } from '../../schema-component';
import { useCollectionManager } from '../../collection-manager';
import { SchemaComponent, SchemaComponentOptions } from '../../schema-component';
import { createCalendarBlockSchema } from '../utils';
import { DataBlockInitializer } from './DataBlockInitializer';
import { CascaderProps } from 'antd';
export const CalendarBlockInitializer = (props) => {
const { insert } = props;

3
packages/core/client/src/schema-initializer/items/InitializerWithSwitch.tsx
View File

@ -3,8 +3,6 @@ import React from 'react';
import { SchemaInitializer } from '..';
import { useCurrentSchema } from '../utils';
import { useBlockRequestContext } from '../../block-provider';
import { useCollection } from '../../collection-manager';
export const InitializerWithSwitch = (props) => {
const { type, schema, item, insert, remove: passInRemove } = props;
@ -14,6 +12,7 @@ export const InitializerWithSwitch = (props) => {
item.find,
passInRemove ?? item.remove,
);
return (
<SchemaInitializer.SwitchItem
checked={exists}

31
packages/core/client/src/schema-initializer/utils.ts
View File

@ -1,8 +1,10 @@
import { ISchema, Schema, useFieldSchema, useForm } from '@formily/react';
import { uid } from '@formily/shared';
import React, { useContext, useMemo, useState } from 'react';
import { error } from '@nocobase/utils/client';
import _ from 'lodash';
import React, { useCallback, useContext, useMemo } from 'react';
import { useTranslation } from 'react-i18next';
import { BlockRequestContext, SchemaInitializerItemOptions } from '../';
import { BlockRequestContext, SchemaInitializerButtonContext, SchemaInitializerItemOptions } from '../';
import { FieldOptions, useCollection, useCollectionManager } from '../collection-manager';
import { isAssocField } from '../filter-provider/utils';
import { useActionContext, useDesignable } from '../schema-component';
@ -807,24 +809,28 @@ export const useCollectionDataSourceItems = (componentName) => {
const { t } = useTranslation();
const { collections, getCollectionFields } = useCollectionManager();
const { getTemplatesByCollection } = useSchemaTemplateManager();
const [selected, setSelected] = useState([]);
const [value, onChange] = useState(null);
const { searchValue, setSearchValue } = useContext(SchemaInitializerButtonContext);
// eslint-disable-next-line react-hooks/exhaustive-deps
const onChange = useCallback(_.debounce(setSearchValue, 300), [setSearchValue]);
if (!setSearchValue) {
error('useCollectionDataSourceItems: please use in SchemaInitializerButtonContext and provide setSearchValue');
return [];
}
const clearKeywords = () => {
setSelected([]);
onChange(null);
setSearchValue('');
};
return [
{
key: 'tableBlock',
type: 'itemGroup',
title: React.createElement(SelectCollection, {
value,
value: searchValue,
onChange,
setSelected,
}),
children: collections
?.filter((item) => {
const b = !value || selected.includes(item.name);
if (item.inherit) {
return false;
}
@ -836,7 +842,12 @@ export const useCollectionDataSourceItems = (componentName) => {
} else if (item.template === 'file' && ['Kanban', 'FormItem', 'Calendar'].includes(componentName)) {
return false;
} else {
return b && !(item?.isThrough && item?.autoCreate);
if (!item.title) {
return false;
}
return (
item.title.toUpperCase().includes(searchValue.toUpperCase()) && !(item?.isThrough && item?.autoCreate)
);
}
})
?.map((item, index) => {

131
packages/core/client/src/schema-settings/SchemaSettings.tsx
View File

@ -11,8 +11,8 @@ import {
CascaderProps,
Dropdown,
Empty,
Menu,
MenuItemProps,
MenuProps,
Modal,
Select,
Space,
@ -46,6 +46,7 @@ import {
} from '..';
import { findFilterTargets, updateFilterTargets } from '../block-provider/hooks';
import { FilterBlockType, isSameCollection, useSupportedBlocks } from '../filter-provider/utils';
import { useCollectMenuItem, useCollectMenuItems, useMenuItem } from '../hooks/useMenuItem';
import { getTargetKey } from '../schema-component/antd/association-filter/utilts';
import { useSchemaTemplateManager } from '../schema-templates';
import { useBlockTemplateContext } from '../schema-templates/BlockTemplate';
@ -53,7 +54,6 @@ import { FormDataTemplates } from './DataTemplates';
import { EnableChildCollections } from './EnableChildCollections';
import { FormLinkageRules } from './LinkageRules';
import { useLinkageCollectionFieldOptions } from './LinkageRules/action-hooks';
import { MenuDividerProps } from 'antd/lib/menu';
interface SchemaSettingsProps {
title?: any;
@ -117,17 +117,7 @@ export const SchemaSettingsProvider: React.FC<SchemaSettingsProviderProps> = (pr
);
};
export const SchemaSettings: React.FC<SchemaSettingsProps> & SchemaSettingsNested = (props) => {
const { title, dn, ...others } = props;
const [visible, setVisible] = useState(false);
const DropdownMenu = (
<Dropdown
open={visible}
onOpenChange={(visible) => {
setVisible(visible);
}}
overlay={<Menu>{props.children as any}</Menu>}
overlayClassName={classNames(
const overlayClassName = classNames(
'nb-schema-initializer-button-overlay',
css`
.ant-dropdown-menu-item-group-list {
@ -135,19 +125,52 @@ export const SchemaSettings: React.FC<SchemaSettingsProps> & SchemaSettingsNeste
overflow: auto;
}
`,
)}
);
export const SchemaSettings: React.FC<SchemaSettingsProps> & SchemaSettingsNested = (props) => {
const { title, dn, ...others } = props;
const [visible, setVisible] = useState(false);
const { Component, getMenuItems } = useMenuItem();
const [shouldRender, setShouldRender] = useState(false);
if (!shouldRender) {
return (
<div
onMouseEnter={() => {
setShouldRender(true);
setVisible(true);
}}
>
{typeof title === 'string' ? <span>{title}</span> : title}
</div>
);
}
const dropdownMenu = () => (
<>
<Component />
<Dropdown
open={visible}
onOpenChange={() => {
setShouldRender(false);
setVisible(false);
}}
menu={{ items: getMenuItems(() => props.children) }}
overlayClassName={overlayClassName}
>
{typeof title === 'string' ? <span>{title}</span> : title}
</Dropdown>
</>
);
if (dn) {
return (
<SchemaSettingsProvider visible={visible} setVisible={setVisible} dn={dn} {...others}>
{DropdownMenu}
{dropdownMenu()}
</SchemaSettingsProvider>
);
}
return DropdownMenu;
return dropdownMenu();
};
SchemaSettings.Template = function Template(props) {
@ -388,35 +411,70 @@ SchemaSettings.FormItemTemplate = function FormItemTemplate(props) {
};
SchemaSettings.Item = function Item(props) {
const { pushMenuItem } = useCollectMenuItems();
const { collectMenuItem } = useCollectMenuItem();
const { eventKey } = props;
const key = useMemo(() => uid(), []);
return (
<Menu.Item
key={key}
eventKey={(eventKey as any) || key}
{...props}
onClick={(info) => {
const item = {
..._.omit(props, ['children']),
key,
eventKey: (eventKey as any) || key,
onClick: (info) => {
info.domEvent.preventDefault();
info.domEvent.stopPropagation();
props?.onClick?.(info);
}}
style={{ minWidth: 120 }}
>
{props.children || props.title}
</Menu.Item>
);
},
style: { minWidth: 120 },
label: props.children || props.title,
title: props.title,
} as MenuProps['items'][0];
pushMenuItem?.(item);
collectMenuItem?.(item);
return null;
};
SchemaSettings.ItemGroup = (props) => {
return <Menu.ItemGroup {...props} />;
SchemaSettings.ItemGroup = function ItemGroup(props) {
const { Component, getMenuItems } = useMenuItem();
const { pushMenuItem } = useCollectMenuItems();
const key = useMemo(() => uid(), []);
const item = {
key,
type: 'group',
title: props.title,
label: props.title,
children: getMenuItems(() => props.children),
} as MenuProps['items'][0];
pushMenuItem(item);
return <Component />;
};
SchemaSettings.SubMenu = (props) => {
return <Menu.SubMenu {...props} />;
SchemaSettings.SubMenu = function SubMenu(props) {
const { Component, getMenuItems } = useMenuItem();
const { pushMenuItem } = useCollectMenuItems();
const key = useMemo(() => uid(), []);
const item = {
key,
label: props.title,
title: props.title,
children: getMenuItems(() => props.children),
} as MenuProps['items'][0];
pushMenuItem(item);
return <Component />;
};
SchemaSettings.Divider = (props: MenuDividerProps) => {
return <Menu.Divider {...props} />;
SchemaSettings.Divider = function Divider() {
const { pushMenuItem } = useCollectMenuItems();
const key = useMemo(() => uid(), []);
const item = {
key,
type: 'divider',
} as MenuProps['items'][0];
pushMenuItem(item);
return null;
};
SchemaSettings.Remove = function Remove(props: any) {
@ -470,6 +528,7 @@ SchemaSettings.ConnectDataBlocks = function ConnectDataBlocks(props: {
const collection = useCollection();
const { inProvider } = useFilterBlock();
const dataBlocks = useSupportedBlocks(type);
// eslint-disable-next-line prefer-const
let { targets = [], uid } = findFilterTargets(fieldSchema);
const compile = useCompile();
@ -578,11 +637,13 @@ SchemaSettings.ConnectDataBlocks = function ConnectDataBlocks(props: {
{Content.length ? (
Content
) : (
<SchemaSettings.Item>
<Empty
style={{ width: 160, padding: '0 1em' }}
description={emptyDescription}
image={Empty.PRESENTED_IMAGE_SIMPLE}
/>
</SchemaSettings.Item>
)}
</SchemaSettings.SubMenu>
);
@ -755,7 +816,7 @@ SchemaSettings.ActionModalItem = React.memo((props: any) => {
title={compile(title)}
{...others}
destroyOnClose
visible={visible}
open={visible}
onCancel={cancelHandler}
footer={
<Space>

4
packages/core/client/src/schema-templates/BlockTemplateDetails.tsx
View File

@ -1,4 +1,5 @@
import { PageHeader as AntdPageHeader, Input, Spin } from 'antd';
import { PageHeader as AntdPageHeader } from '@ant-design/pro-layout';
import { Input, Spin } from 'antd';
import React, { useContext, useState } from 'react';
import { useNavigate, useParams } from 'react-router-dom';
import { useAPIClient, useRequest, useSchemaTemplateManager } from '..';
@ -75,6 +76,7 @@ export const BlockTemplateDetails = () => {
return (
<div>
<AntdPageHeader
style={{ backgroundColor: 'white' }}
onBack={() => {
navigate('/admin/plugins/block-templates');
}}

4
packages/core/client/src/schema-templates/BlockTemplatePage.tsx
View File

@ -1,4 +1,4 @@
import { PageHeader as AntdPageHeader } from 'antd';
import { PageHeader as AntdPageHeader } from '@ant-design/pro-layout';
import React from 'react';
import { useTranslation } from 'react-i18next';
import { CollectionManagerProvider } from '../collection-manager';
@ -10,7 +10,7 @@ export const BlockTemplatePage = () => {
const { t } = useTranslation();
return (
<div>
<AntdPageHeader ghost={false} title={t('Block templates')} />
<AntdPageHeader style={{ backgroundColor: 'white' }} ghost={false} title={t('Block templates')} />
<div style={{ margin: 'var(--nb-spacing)' }}>
<CollectionManagerProvider collections={[uiSchemaTemplatesCollection]}>
<SchemaComponent schema={uiSchemaTemplatesSchema} />

278
packages/core/client/src/settings-form/SettingsForm.tsx
View File

@ -1,278 +0,0 @@
import { FormButtonGroup, FormDialog, FormDrawer, FormItem, FormLayout, Reset, Submit } from '@formily/antd';
import { createForm, Field, ObjectField, onFormValuesChange } from '@formily/core';
import {
FieldContext,
FormContext,
observer,
RecursionField,
Schema,
SchemaOptionsContext,
useField,
useFieldSchema,
useForm,
} from '@formily/react';
import { Dropdown, Menu, Modal, Select, Switch } from 'antd';
import React, { createContext, useContext, useMemo, useState } from 'react';
import { SchemaComponentOptions, useAttach, useDesignable } from '..';
export interface SettingsFormContextProps {
field?: Field;
fieldSchema?: Schema;
dropdownVisible?: boolean;
setDropdownVisible?: (v: boolean) => void;
dn?: any;
}
export const SettingsFormContext = createContext<SettingsFormContextProps>(null);
export const useSettingsFormContext = () => {
return useContext(SettingsFormContext);
};
export const SettingsForm: any = observer(
(props: any) => {
const dn = useDesignable();
const field = useField<Field>();
const fieldSchema = useFieldSchema();
const [dropdownVisible, setDropdownVisible] = useState(false);
const settingsFormSchema = useMemo(() => new Schema(props.schema), []);
const form = useMemo(
() =>
createForm({
initialValues: fieldSchema.toJSON(),
effects(form) {
onFormValuesChange((form) => {
dn.patch(form.values);
console.log('form.values', form.values);
});
},
}),
[],
);
const f = useAttach(form.createVoidField({ ...field.props, basePath: '' }));
return (
<SettingsFormContext.Provider value={{ dn, field, fieldSchema, dropdownVisible, setDropdownVisible }}>
<SchemaComponentOptions components={{ SettingsForm }}>
<FieldContext.Provider value={null}>
<FormContext.Provider value={form}>
<FieldContext.Provider value={f}>
<Dropdown
open={dropdownVisible}
onOpenChange={(visible) => setDropdownVisible(visible)}
overlayStyle={{ width: 200 }}
overlay={
<Menu>
{settingsFormSchema.mapProperties((s, key) => {
return <RecursionField name={key} schema={s} />;
})}
</Menu>
}
>
<a>配置</a>
</Dropdown>
</FieldContext.Provider>
</FormContext.Provider>
</FieldContext.Provider>
</SchemaComponentOptions>
</SettingsFormContext.Provider>
);
},
{ displayName: 'SettingsForm' },
);
SettingsForm.Divider = () => {
return <Menu.Divider />;
};
SettingsForm.Remove = (props) => {
const field = useField();
const { dn, setDropdownVisible } = useSettingsFormContext();
return (
<Menu.Item
onClick={() => {
setDropdownVisible(false);
Modal.confirm({
title: 'Are you sure delete this task?',
content: 'Some descriptions',
okText: 'Yes',
okType: 'danger',
cancelText: 'No',
...props.confirm,
onOk() {
dn.remove();
console.log('OK');
},
onCancel() {
console.log('Cancel');
},
});
}}
>
{field.title}
</Menu.Item>
);
};
SettingsForm.Switch = observer(
() => {
const field = useField<Field>();
return (
<Menu.Item
onClick={() => {
field.value = !field.value;
}}
>
<div style={{ display: 'flex', justifyContent: 'space-between' }}>
{field.title} <Switch checked={!!field.value} />
</div>
</Menu.Item>
);
},
{ displayName: 'SettingsForm' },
);
SettingsForm.Select = observer(
(props) => {
const field = useField<Field>();
const [open, setOpen] = useState(false);
return (
<Menu.Item onClick={() => !open && setOpen(true)}>
<div style={{ display: 'flex', justifyContent: 'space-between' }}>
{field.title}
<Select
open={open}
onDropdownVisibleChange={(open) => setOpen(open)}
onSelect={() => {
setOpen(false);
}}
onChange={(value) => {
field.value = value;
}}
value={field.value}
options={field.dataSource}
style={{ width: '60%' }}
size={'small'}
bordered={false}
/>
</div>
</Menu.Item>
);
},
{ displayName: 'SettingsForm' },
);
SettingsForm.Modal = () => {
const form = useForm();
const field = useField<Field>();
const fieldSchema = useFieldSchema();
const options = useContext(SchemaOptionsContext);
const { setDropdownVisible } = useSettingsFormContext();
return (
<Menu.Item
style={{ width: 200 }}
onClick={async () => {
setDropdownVisible(false);
const values = await FormDialog('Title', () => {
return (
<SchemaComponentOptions scope={options.scope} components={{ ...options.components, FormItem }}>
<FormLayout layout={'vertical'}>
<RecursionField schema={fieldSchema} onlyRenderProperties />
</FormLayout>
</SchemaComponentOptions>
);
}).open({
initialValues: fieldSchema.type !== 'void' ? field.value : form.values,
});
if (fieldSchema.type !== 'void') {
form.setValues(
{
[fieldSchema.name]: values,
},
'deepMerge',
);
} else {
form.setValues(values);
}
}}
>
{field.title}
</Menu.Item>
);
};
SettingsForm.Drawer = () => {
const form = useForm();
const field = useField<ObjectField>();
const fieldSchema = useFieldSchema();
const options = useContext(SchemaOptionsContext);
const { setDropdownVisible } = useSettingsFormContext();
return (
<Menu.Item
style={{ width: 200 }}
onClick={async () => {
setDropdownVisible(false);
const values = await FormDrawer('Popup form', () => {
return (
<SchemaComponentOptions scope={options.scope} components={{ ...options.components, FormItem }}>
<FormLayout layout={'vertical'}>
<RecursionField schema={fieldSchema} onlyRenderProperties />
<FormDrawer.Footer>
<FormButtonGroup align="right">
<Reset>Reset</Reset>
<Submit
onSubmit={() => {
return new Promise((resolve) => {
setTimeout(resolve, 1000);
});
}}
>
Submit
</Submit>
</FormButtonGroup>
</FormDrawer.Footer>
</FormLayout>
</SchemaComponentOptions>
);
}).open({
initialValues: fieldSchema.type !== 'void' ? field.value : form.values,
});
if (fieldSchema.type !== 'void') {
form.setValues(
{
[fieldSchema.name]: values,
},
'deepMerge',
);
} else {
form.setValues(values);
}
}}
>
{field.title}
</Menu.Item>
);
};
SettingsForm.SubMenu = () => {
const field = useField();
const fieldSchema = useFieldSchema();
return (
<Menu.SubMenu title={field.title}>
{fieldSchema.mapProperties((schema, key) => {
return <RecursionField name={key} schema={schema} />;
})}
</Menu.SubMenu>
);
};
SettingsForm.ItemGroup = () => {
const field = useField();
const fieldSchema = useFieldSchema();
return (
<Menu.ItemGroup title={field.title}>
{fieldSchema.mapProperties((schema, key) => {
return <RecursionField name={key} schema={schema} />;
})}
</Menu.ItemGroup>
);
};

136
packages/core/client/src/settings-form/demos/demo1.tsx
View File

@ -1,136 +0,0 @@
import { ISchema, observer, useFieldSchema } from '@formily/react';
import { AntdSchemaComponentProvider, SchemaComponent, SchemaComponentProvider, SettingsForm } from '@nocobase/client';
import React from 'react';
const schema: ISchema = {
type: 'object',
properties: {
'x-component-props.switch': {
title: 'Switch',
'x-component': 'SettingsForm.Switch',
},
'x-component-props.select': {
title: 'Select',
'x-component': 'SettingsForm.Select',
enum: [
{ label: 'Option1', value: 'option1' },
{ label: 'Option2', value: 'option2' },
{ label: 'Option3', value: 'option3' },
],
},
modal: {
type: 'void',
title: 'Open Modal',
'x-component': 'SettingsForm.Modal',
'x-component-props': {},
properties: {
'x-component-props.title': {
title: '标题',
'x-component': 'Input',
'x-decorator': 'FormItem',
},
},
},
drawer: {
type: 'void',
title: 'Open Drawer',
'x-component': 'SettingsForm.Drawer',
properties: {
'x-component-props.title': {
title: '标题',
'x-component': 'Input',
'x-decorator': 'FormItem',
},
},
},
group: {
type: 'void',
title: 'ItemGroup',
'x-component': 'SettingsForm.ItemGroup',
properties: {
'x-component-props': {
type: 'object',
title: 'Open Modal',
'x-component': 'SettingsForm.Modal',
properties: {
title: {
title: '标题',
'x-component': 'Input',
'x-decorator': 'FormItem',
},
},
},
},
},
submenu: {
type: 'void',
title: 'SubMenu',
'x-component': 'SettingsForm.SubMenu',
properties: {
'x-component-props': {
type: 'object',
title: 'Open Modal',
'x-component': 'SettingsForm.Modal',
properties: {
title: {
title: '标题',
'x-component': 'Input',
'x-decorator': 'FormItem',
},
},
},
},
},
divider: {
'x-component': 'SettingsForm.Divider',
},
remove: {
title: 'Delete',
'x-component': 'SettingsForm.Remove',
'x-component-props': {
confirm: {
title: 'Are you sure delete this task?',
content: 'Some descriptions',
},
},
},
},
};
const Hello = observer(
(props: any) => {
const fieldSchema = useFieldSchema();
return (
<div>
<pre>{JSON.stringify(props, null, 2)}</pre>
<pre>{JSON.stringify(fieldSchema.toJSON(), null, 2)}</pre>
<SettingsForm schema={schema} />
</div>
);
},
{ displayName: 'Hello' },
);
export default () => {
return (
<SchemaComponentProvider components={{ Hello }}>
<AntdSchemaComponentProvider>
<SchemaComponent
schema={{
type: 'object',
properties: {
hello: {
'x-component': 'Hello',
'x-component-props': {
title: 'abc',
switch: true,
select: 'option1',
},
},
},
}}
/>
</AntdSchemaComponentProvider>
</SchemaComponentProvider>
);
};

9
packages/core/client/src/settings-form/index.md
View File

@ -1,9 +0,0 @@
---
group:
title: Client
order: 1
---
# SettingsForm
<code src="./demos/demo1.tsx"></code>

1
packages/core/client/src/settings-form/index.ts
View File

@ -1 +0,0 @@
export * from './SettingsForm';

39
packages/core/client/src/user/ChangePassword.tsx
View File

@ -1,11 +1,10 @@
import { ISchema, useForm } from '@formily/react';
import { uid } from '@formily/shared';
import { Menu } from 'antd';
import React, { useContext, useState } from 'react';
import { MenuProps } from 'antd';
import React, { useContext, useMemo, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { ActionContextProvider, SchemaComponent, useActionContext } from '../';
import { ActionContextProvider, DropdownVisibleContext, SchemaComponent, useActionContext } from '../';
import { useAPIClient } from '../api-client';
import { DropdownVisibleContext } from './CurrentUser';
const useCloseAction = () => {
const { setVisible } = useActionContext();
@ -114,23 +113,29 @@ const schema: ISchema = {
},
};
export const ChangePassword = () => {
export const useChangePassword = () => {
const ctx = useContext(DropdownVisibleContext);
const [visible, setVisible] = useState(false);
const { t } = useTranslation();
const ctx = useContext(DropdownVisibleContext);
return (
<ActionContextProvider value={{ visible, setVisible }}>
<Menu.Item
key="password"
eventKey={'ChangePassword'}
onClick={() => {
ctx?.setVisible?.(false);
return useMemo<MenuProps['items'][0]>(() => {
return {
key: 'password',
eventKey: 'ChangePassword',
onClick: () => {
setVisible(true);
}}
>
ctx?.setVisible(false);
},
label: (
<>
{t('Change password')}
</Menu.Item>
<ActionContextProvider value={{ visible, setVisible }}>
<div onClick={(e) => e.stopPropagation()}>
<SchemaComponent scope={{ useCloseAction, useSaveCurrentUserValues }} schema={schema} />
</div>
</ActionContextProvider>
);
</>
),
};
}, [visible]);
};

148
packages/core/client/src/user/CurrentUser.tsx
View File

@ -1,22 +1,25 @@
import { css } from '@emotion/css';
import { Dropdown, Menu, Modal } from 'antd';
import React, { createContext, useState } from 'react';
import { error } from '@nocobase/utils/client';
import { Dropdown, Menu, MenuProps, Modal } from 'antd';
import React, { createContext, useCallback, useMemo, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { useNavigate } from 'react-router-dom';
import { useACLRoleContext, useAPIClient, useCurrentUserContext } from '..';
import { useCurrentAppInfo } from '../appInfo/CurrentAppInfoProvider';
import { ChangePassword } from './ChangePassword';
import { EditProfile } from './EditProfile';
import { LanguageSettings } from './LanguageSettings';
import { SwitchRole } from './SwitchRole';
import { ThemeSettings } from './ThemeSettings';
const ApplicationVersion = () => {
import { useChangePassword } from './ChangePassword';
import { useEditProfile } from './EditProfile';
import { useLanguageSettings } from './LanguageSettings';
import { useSwitchRole } from './SwitchRole';
import { useThemeSettings } from './ThemeSettings';
const useApplicationVersion = () => {
const data = useCurrentAppInfo();
return (
<Menu.Item key="version" disabled>
Version {data?.data?.version}
</Menu.Item>
);
return useMemo(() => {
return {
key: 'version',
disabled: true,
label: `Version ${data?.data?.version}`,
};
}, [data?.data?.version]);
};
/**
@ -32,7 +35,7 @@ export const SettingsMenu: React.FC<{
const api = useAPIClient();
const { t } = useTranslation();
const silenceApi = useAPIClient();
const check = async () => {
const check = useCallback(async () => {
return await new Promise((resolve) => {
const heartbeat = setInterval(() => {
silenceApi
@ -47,42 +50,44 @@ export const SettingsMenu: React.FC<{
}
return res;
})
.catch(() => {
// ignore
.catch((err) => {
error(err);
});
}, 3000);
});
}, [silenceApi]);
const divider = useMemo<MenuProps['items'][0]>(() => {
return {
type: 'divider',
};
return (
<Menu>
<ApplicationVersion />
<Menu.Divider />
<EditProfile />
<ChangePassword />
<Menu.Divider />
<SwitchRole />
<LanguageSettings />
<ThemeSettings />
<Menu.Divider />
{appAllowed && (
<>
<Menu.Item
key="cache"
onClick={async () => {
}, []);
const appVersion = useApplicationVersion();
const editProfile = useEditProfile();
const changePassword = useChangePassword();
const switchRole = useSwitchRole();
const languageSettings = useLanguageSettings();
const themeSettings = useThemeSettings();
const controlApp = useMemo<MenuProps['items']>(() => {
if (!appAllowed) {
return [];
}
return [
{
key: 'cache',
label: t('Clear cache'),
onClick: async () => {
await api.resource('app').clearCache();
window.location.reload();
}}
>
{t('Clear cache')}
</Menu.Item>
<Menu.Item
key="reboot"
onClick={async () => {
},
},
{
key: 'reboot',
label: t('Reboot application'),
onClick: async () => {
Modal.confirm({
title: t('Reboot application'),
content: t(
'The will interrupt service, it may take a few seconds to restart. Are you sure to continue?',
),
content: t('The will interrupt service, it may take a few seconds to restart. Are you sure to continue?'),
okText: t('Reboot'),
okButtonProps: {
danger: true,
@ -93,29 +98,52 @@ export const SettingsMenu: React.FC<{
window.location.reload();
},
});
}}
>
{t('Reboot application')}
</Menu.Item>
<Menu.Divider />
</>
)}
<Menu.Item
key="signout"
onClick={async () => {
},
},
divider,
];
}, [appAllowed, check]);
const items = useMemo<MenuProps['items']>(() => {
return [
appVersion,
divider,
editProfile,
changePassword,
divider,
switchRole,
languageSettings,
themeSettings,
divider,
...controlApp,
{
key: 'signout',
label: t('Sign out'),
onClick: async () => {
await api.auth.signOut();
navigate(`/signin?redirect=${encodeURIComponent(redirectUrl)}`);
}}
>
{t('Sign out')}
</Menu.Item>
</Menu>
);
},
},
];
}, [
appVersion,
changePassword,
controlApp,
divider,
editProfile,
history,
languageSettings,
switchRole,
themeSettings,
]);
return <Menu items={items} />;
};
export const DropdownVisibleContext = createContext(null);
export const CurrentUser = () => {
const [visible, setVisible] = useState(false);
const { data } = useCurrentUserContext();
return (
<div style={{ display: 'inline-flex', verticalAlign: 'top' }}>
<DropdownVisibleContext.Provider value={{ visible, setVisible }}>
@ -124,7 +152,9 @@ export const CurrentUser = () => {
onOpenChange={(visible) => {
setVisible(visible);
}}
overlay={<SettingsMenu />}
dropdownRender={() => {
return <SettingsMenu />;
}}
>
<span
className={css`

39
packages/core/client/src/user/EditProfile.tsx
View File

@ -1,7 +1,7 @@
import { ISchema, useForm } from '@formily/react';
import { uid } from '@formily/shared';
import { Menu } from 'antd';
import React, { useContext, useState } from 'react';
import { MenuProps } from 'antd';
import React, { useContext, useMemo, useState } from 'react';
import { useTranslation } from 'react-i18next';
import {
ActionContextProvider,
@ -114,23 +114,32 @@ const schema: ISchema = {
},
};
export const EditProfile = () => {
export const useEditProfile = () => {
const ctx = useContext(DropdownVisibleContext);
const [visible, setVisible] = useState(false);
const { t } = useTranslation();
const ctx = useContext(DropdownVisibleContext);
return (
<ActionContextProvider value={{ visible, setVisible }}>
<Menu.Item
key="profile"
eventKey={'EditProfile'}
onClick={() => {
return useMemo<MenuProps['items'][0]>(() => {
return {
key: 'profile',
eventKey: 'EditProfile',
onClick: () => {
setVisible(true);
ctx?.setVisible(false);
}}
>
},
label: (
<>
{t('Edit profile')}
</Menu.Item>
<SchemaComponent scope={{ useCurrentUserValues, useCloseAction, useSaveCurrentUserValues }} schema={schema} />
<ActionContextProvider value={{ visible, setVisible }}>
<div onClick={(e) => e.stopPropagation()}>
<SchemaComponent
scope={{ useCurrentUserValues, useCloseAction, useSaveCurrentUserValues }}
schema={schema}
/>
</div>
</ActionContextProvider>
);
</>
),
};
}, [visible]);
};

49
packages/core/client/src/user/LanguageSettings.tsx
View File

@ -1,35 +1,29 @@
import { css } from '@emotion/css';
import { Menu, Select } from 'antd';
import React, { useState } from 'react';
import { MenuProps, Select } from 'antd';
import React, { useMemo, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { useAPIClient, useCurrentUserContext, useSystemSettings } from '..';
import { useAPIClient, useSystemSettings } from '..';
import locale from '../locale';
export const LanguageSettings = () => {
export const useLanguageSettings = () => {
const { t, i18n } = useTranslation();
const [open, setOpen] = useState(false);
const api = useAPIClient();
const ctx = useCurrentUserContext();
const { data } = useSystemSettings();
const enabledLanguages: string[] = data?.data?.enabledLanguages || [];
if (enabledLanguages.length < 2) {
return null;
}
// console.log('data', data?.data?.enabledLanguages);
return (
<Menu.Item
key="language"
eventKey={'LanguageSettings'}
onClick={() => {
const result = useMemo<MenuProps['items'][0]>(() => {
return {
key: 'language',
eventKey: 'LanguageSettings',
onClick: () => {
setOpen(true);
}}
>
},
label: (
<div
className={css`
display: flex;
align-items: center;
justify-content: space-between;
`}
style={{
display: 'flex',
alignItems: 'center',
justifyContent: 'space-between',
}}
>
{t('Language')}{' '}
<Select
@ -60,6 +54,13 @@ export const LanguageSettings = () => {
}}
/>
</div>
</Menu.Item>
);
),
};
}, [enabledLanguages, i18n, open]);
if (enabledLanguages.length < 2) {
return null;
}
return result;
};

27
packages/core/client/src/user/SigninPage.tsx
View File

@ -1,7 +1,7 @@
import { css } from '@emotion/css';
import { ISchema, useForm } from '@formily/react';
import { Space, Tabs } from 'antd';
import React, { useCallback, useContext } from 'react';
import { css } from '@emotion/css';
import React, { useCallback } from 'react';
import { useTranslation } from 'react-i18next';
import { Link, useNavigate, useSearchParams } from 'react-router-dom';
import { SchemaComponent, useAPIClient, useCurrentDocumentTitle, useSystemSettings } from '..';
@ -142,11 +142,18 @@ export const SigninPage = (props: SigninPageProps) => {
`}
>
{smsAuthEnabled ? (
<Tabs defaultActiveKey="password">
<Tabs.TabPane tab={t('Sign in via account')} key="password">
<SchemaComponent scope={{ usePasswordSignIn }} schema={schema || passwordForm} />
</Tabs.TabPane>
<Tabs.TabPane tab={t('Sign in via phone')} key="phone">
<Tabs
defaultActiveKey="password"
items={[
{
label: t('Sign in via account'),
key: 'password',
children: <SchemaComponent scope={{ usePasswordSignIn }} schema={schema || passwordForm} />,
},
{
label: t('Sign in via phone'),
key: 'phone',
children: (
<SchemaComponent
schema={phoneForm}
scope={{ usePhoneSignIn, ...scope }}
@ -155,8 +162,10 @@ export const SigninPage = (props: SigninPageProps) => {
...components,
}}
/>
</Tabs.TabPane>
</Tabs>
),
},
]}
/>
) : (
<SchemaComponent
components={{ ...components }}

38
packages/core/client/src/user/SwitchRole.tsx
View File

@ -1,6 +1,5 @@
import { css } from '@emotion/css';
import { Menu, Select } from 'antd';
import React from 'react';
import { MenuProps, Select } from 'antd';
import React, { useMemo } from 'react';
import { useTranslation } from 'react-i18next';
import { useACLRoleContext } from '../acl';
import { useAPIClient } from '../api-client';
@ -26,21 +25,21 @@ const useCurrentRoles = () => {
return compile(options);
};
export const SwitchRole = () => {
export const useSwitchRole = () => {
const api = useAPIClient();
const roles = useCurrentRoles();
const { t } = useTranslation();
if (roles.length <= 1) {
return null;
}
return (
<Menu.Item key="role" eventKey={'SwitchRole'}>
const result = useMemo<MenuProps['items'][0]>(() => {
return {
key: 'role',
eventKey: 'SwitchRole',
label: (
<div
className={css`
display: flex;
align-items: center;
justify-content: space-between;
`}
style={{
display: 'flex',
alignItems: 'center',
justifyContent: 'space-between',
}}
>
{t('Switch role')}{' '}
<Select
@ -60,6 +59,13 @@ export const SwitchRole = () => {
}}
/>
</div>
</Menu.Item>
);
),
};
}, [api, history, roles]);
if (roles.length <= 1) {
return null;
}
return result;
};

30
packages/core/client/src/user/ThemeSettings.tsx
View File

@ -1,22 +1,25 @@
import { css } from '@emotion/css';
import { Menu, Select } from 'antd';
import React from 'react';
import { MenuProps, Select } from 'antd';
import React, { useMemo } from 'react';
import { useTranslation } from 'react-i18next';
import { useAPIClient } from '../api-client';
import { useCurrentUserContext } from './CurrentUserProvider';
export const ThemeSettings = () => {
export const useThemeSettings = () => {
const { t } = useTranslation();
const ctx = useCurrentUserContext();
const api = useAPIClient();
return (
<Menu.Item key="theme" eventKey={'theme'}>
return useMemo<MenuProps['items'][0]>(() => {
return {
key: 'theme',
eventKey: 'theme',
label: (
<div
className={css`
display: flex;
align-items: center;
justify-content: space-between;
`}
style={{
display: 'flex',
alignItems: 'center',
justifyContent: 'space-between',
}}
>
{t('Theme')}{' '}
<Select
@ -42,6 +45,7 @@ export const ThemeSettings = () => {
}}
/>
</div>
</Menu.Item>
);
),
};
}, [ctx.data.data.id, ctx.data.data.systemSettings]);
};

61
packages/plugins/charts/src/client/ChartQueryBlockInitializer.tsx
View File

@ -8,7 +8,8 @@ import {
SchemaInitializerButtonContext,
useAPIClient,
} from '@nocobase/client';
import React, { useContext, useEffect, useState } from 'react';
import { error } from '@nocobase/utils/client';
import React, { useCallback, useContext, useMemo } from 'react';
import { useChartQueryMetadataContext } from './ChartQueryMetadataProvider';
import { lang } from './locale';
import { getQueryTypeSchema } from './settings/queryTypes';
@ -21,20 +22,13 @@ export interface ChartQueryMetadata {
}
export const ChartQueryBlockInitializer = (props) => {
const defaultItems: any = [
{
type: 'itemGroup',
title: lang('Select query data'),
children: [],
},
];
const { templateWrap, onCreateBlockSchema, componentType, createBlockSchema, insert, ...others } = props;
const { setVisible } = useContext(SchemaInitializerButtonContext);
const [items, setItems] = useState(defaultItems);
const apiClient = useAPIClient();
const ctx = useChartQueryMetadataContext();
const options = useContext(SchemaOptionsContext);
const onAddQuery = (info) => {
const onAddQuery = useCallback(
(info) => {
FormDialog(
{
sql: lang('Add SQL query'),
@ -72,33 +66,52 @@ export const ChartQueryBlockInitializer = (props) => {
})
.then(async (values) => {
try {
const { data } = await apiClient.resource('chartsQueries')?.create?.({ values });
if (apiClient.resource('chartsQueries')?.create) {
const { data } = await apiClient.resource('chartsQueries').create({ values });
const items = (await ctx.refresh()) as any;
const item = items.find((item) => item.id === data?.data?.id);
onCreateBlockSchema({ item });
}
setVisible(false);
} catch (error) {}
} catch (err) {
error(err);
}
})
.catch(() => {});
};
useEffect(() => {
.catch((err) => {
error(err);
});
},
[apiClient, ctx, onCreateBlockSchema, options.components, options.scope, setVisible],
);
const items = useMemo(() => {
const defaultItems: any = [
{
type: 'itemGroup',
title: lang('Select query data'),
children: [],
},
];
const chartQueryMetadata = ctx.data;
if (chartQueryMetadata && Array.isArray(chartQueryMetadata)) {
setItems(
[
const item1 =
chartQueryMetadata.length > 0
? {
type: 'itemGroup',
title: '{{t("Select chart query", {ns: "charts"})}}',
children: chartQueryMetadata,
}
: null,
: null;
const item2 =
chartQueryMetadata.length > 0
? {
type: 'divider',
}
: null,
,
: null;
return [
item1,
item2,
{
type: 'subMenu',
title: lang('Add chart query'),
@ -118,10 +131,12 @@ export const ChartQueryBlockInitializer = (props) => {
},
],
},
].filter(Boolean),
);
].filter(Boolean);
}
}, []);
return defaultItems;
}, [ctx.data, onAddQuery]);
return (
<SchemaInitializer.Item
icon={<TableOutlined />}

47
packages/plugins/charts/src/client/settings/AddNewQuery.tsx
View File

@ -10,11 +10,11 @@ import {
useResourceActionContext,
useResourceContext,
} from '@nocobase/client';
import { Button, Dropdown, Menu } from 'antd';
import { Button, Dropdown, MenuProps } from 'antd';
import React, { useMemo, useState } from 'react';
import { useChartQueryMetadataContext } from '../ChartQueryMetadataProvider';
import { getQueryTypeSchema } from './queryTypes';
import { lang } from '../locale';
import { getQueryTypeSchema } from './queryTypes';
const useCreateAction = () => {
const { setVisible } = useActionContext();
@ -112,25 +112,40 @@ export const AddNewQuery = () => {
const [visible, setVisible] = useState(false);
const [schema, setSchema] = useState({});
const form = useMemo(() => createForm(), []);
const menu = (
<Menu
onClick={(info) => {
const menu = useMemo<MenuProps>(() => {
return {
onClick: (info) => {
setVisible(true);
form.setValues({ type: info.key });
setSchema(getSchema({ type: info.key }, { form, isNewRecord: true }));
}}
>
<Menu.Item key={'json'}>JSON</Menu.Item>
<Menu.Item key={'sql'}>SQL</Menu.Item>
<Menu.Item disabled key={'api'}>
API
</Menu.Item>
<Menu.Item disabled>Collection</Menu.Item>
</Menu>
);
},
items: [
{
key: 'json',
label: 'JSON',
},
{
key: 'sql',
label: 'SQL',
},
{
key: 'api',
label: 'API',
disabled: true,
},
{
key: 'collection',
label: 'Collection',
disabled: true,
},
],
};
}, [form]);
return (
<ActionContextProvider value={{ visible, setVisible }}>
<Dropdown overlay={menu}>
<Dropdown menu={menu}>
<Button icon={<PlusOutlined />} type={'primary'}>
{lang('Add query')} <DownOutlined />
</Button>

100
packages/plugins/graph-collection-manager/src/client/GraphDrawPage.tsx
View File

@ -12,19 +12,19 @@ import { css, cx } from '@emotion/css';
import { SchemaOptionsContext } from '@formily/react';
import {
APIClientProvider,
collection,
CollectionCategroriesContext,
CollectionCategroriesProvider,
CollectionManagerContext,
CollectionManagerProvider,
CurrentAppInfoContext,
SchemaComponent,
SchemaComponentOptions,
Select,
collection,
useAPIClient,
useCollectionManager,
useCompile,
useCurrentAppInfo,
CollectionCategroriesProvider,
CollectionCategroriesContext,
} from '@nocobase/client';
import { useFullscreen } from 'ahooks';
import { Button, Input, Layout, Menu, Popover, Switch, Tooltip } from 'antd';
@ -42,6 +42,7 @@ import {
getDiffEdge,
getDiffNode,
getInheritCollections,
getPopupContainer,
useGCMTranslation,
} from './utils';
@ -232,10 +233,6 @@ function getEdges(edges) {
});
}
const getPopupContainer = () => {
return document.getElementById('graph_container');
};
const CollapsedContext = createContext<any>({});
const formatNodeData = () => {
const layoutNodes = [];
@ -1021,14 +1018,7 @@ export const GraphDrawPage = React.memo(() => {
<div className={cx(collectionListClass)}>
<SchemaComponent
components={{
Select: (props) => (
<Select
{...props}
getPopupContainer={() => {
return document.getElementById('graph_container');
}}
/>
),
Select: (props) => <Select {...props} getPopupContainer={getPopupContainer} />,
AddCollectionAction,
}}
schema={{
@ -1100,7 +1090,7 @@ export const GraphDrawPage = React.memo(() => {
},
collectionList: {
type: 'void',
'x-component': () => {
'x-component': function Com() {
const { handleSearchCollection, collectionList } = useContext(CollapsedContext);
const [selectedKeys, setSelectKey] = useState([]);
const content = (
@ -1121,13 +1111,13 @@ export const GraphDrawPage = React.memo(() => {
}
`}
style={{ maxHeight: '70vh', overflowY: 'auto', border: 'none' }}
>
<Menu.Divider />
{collectionList.map((v) => {
return (
<Menu.Item
key={v.name}
onClick={(e: any) => {
items={[
{ type: 'divider' },
...collectionList.map((v) => {
return {
key: v.name,
label: compile(v.title),
onClick: (e: any) => {
if (e.key !== selectedKeys[0]) {
setSelectKey([e.key]);
handleFiterCollections(e.key);
@ -1136,13 +1126,11 @@ export const GraphDrawPage = React.memo(() => {
handleFiterCollections(false);
setSelectKey([]);
}
}}
>
<span>{compile(v.title)}</span>
</Menu.Item>
);
})}
</Menu>
},
};
}),
]}
/>
</div>
);
return (
@ -1226,24 +1214,22 @@ export const GraphDrawPage = React.memo(() => {
}
`}
style={{ maxHeight: '70vh', overflowY: 'auto', border: 'none' }}
>
<Menu.Divider />
{menuItems.map((v) => {
return (
<Menu.Item
key={v.key}
onClick={(e: any) => {
items={[
{ type: 'divider' },
...menuItems.map((v) => {
return {
key: v.key,
label: t(v.label),
onClick: (e: any) => {
targetGraph.connectionType = v.key;
const { filterConfig } = targetGraph;
filterConfig && handleFiterCollections(filterConfig.key);
handleSetRelationshipType(v.key);
}}
>
<span>{t(v.label)}</span>
</Menu.Item>
);
})}
</Menu>
},
};
}),
]}
/>
</div>
);
return (
@ -1303,25 +1289,23 @@ export const GraphDrawPage = React.memo(() => {
}
`}
style={{ maxHeight: '70vh', overflowY: 'auto', border: 'none' }}
>
<Menu.Divider />
{menuItems.map((v) => {
return (
<Menu.Item
key={v.key}
onClick={(e: any) => {
items={[
{ type: 'divider' },
...menuItems.map((v) => {
return {
key: v.key,
label: t(v.label),
onClick: (e: any) => {
targetGraph.direction = v.key;
const { filterConfig } = targetGraph;
if (filterConfig) {
handleFiterCollections(filterConfig.key);
}
}}
>
<span>{t(v.label)}</span>
</Menu.Item>
);
})}
</Menu>
},
};
}),
]}
/>
</div>
);
return (

5
packages/plugins/graph-collection-manager/src/client/components/AddCollectionAction.tsx
View File

@ -1,8 +1,9 @@
import { PlusOutlined } from '@ant-design/icons';
import { AddCollection } from '@nocobase/client';
import React from 'react';
import { Button } from 'antd';
import React from 'react';
import { useCancelAction } from '../action-hooks';
import { getPopupContainer } from '../utils';
export const AddCollectionAction = ({ item: record }) => {
return (
@ -17,7 +18,7 @@ export const AddCollectionAction = ({ item: record }) => {
scope={{
useCancelAction,
}}
getContainer={() => document.getElementById('graph_container')}
getContainer={getPopupContainer}
>
<Button type="primary">
<PlusOutlined />

3
packages/plugins/graph-collection-manager/src/client/components/AddFieldAction.tsx
View File

@ -2,6 +2,7 @@ import { PlusOutlined } from '@ant-design/icons';
import { AddFieldAction as AddCollectionFieldAction } from '@nocobase/client';
import React from 'react';
import { useCancelAction, useCreateAction } from '../action-hooks';
import { getPopupContainer } from '../utils';
const useCreateCollectionField = (record) => {
const title = record.collectionName;
@ -27,7 +28,7 @@ export const AddFieldAction = ({ item: record }) => {
useCancelAction,
useCreateCollectionField: () => useCreateCollectionField(record),
}}
getContainer={() => document.getElementById('graph_container')}
getContainer={getPopupContainer}
>
<PlusOutlined className="btn-add" id="graph_btn_add_field" />
</AddCollectionFieldAction>

5
packages/plugins/graph-collection-manager/src/client/components/EditCollectionAction.tsx
View File

@ -1,8 +1,9 @@
import { EditOutlined } from '@ant-design/icons';
import { css } from '@emotion/css';
import { EditCollection } from '@nocobase/client';
import React from 'react';
import { css } from '@emotion/css';
import { useCancelAction, useUpdateCollectionActionAndRefreshCM } from '../action-hooks';
import { getPopupContainer } from '../utils';
export const EditCollectionAction = ({ item: record }) => {
return (
@ -13,7 +14,7 @@ export const EditCollectionAction = ({ item: record }) => {
useUpdateCollectionActionAndRefreshCM,
createOnly: false,
}}
getContainer={() => document.getElementById('graph_container')}
getContainer={getPopupContainer}
>
<EditOutlined
className={css`

3
packages/plugins/graph-collection-manager/src/client/components/EditFieldAction.tsx
View File

@ -2,6 +2,7 @@ import { EditOutlined } from '@ant-design/icons';
import { EditFieldAction as EditCollectionFieldAction } from '@nocobase/client';
import React from 'react';
import { useCancelAction, useUpdateFieldAction } from '../action-hooks';
import { getPopupContainer } from '../utils';
const useUpdateCollectionField = (record) => {
const collectionName = record.collectionName;
@ -21,7 +22,7 @@ export const EditFieldAction = ({ item: record }) => {
useCancelAction,
useUpdateCollectionField: () => useUpdateCollectionField(record),
}}
getContainer={() => document.getElementById('graph_container')}
getContainer={getPopupContainer}
>
<EditOutlined className="btn-edit" />
</EditCollectionFieldAction>

34
packages/plugins/graph-collection-manager/src/client/components/Entity.tsx
View File

@ -5,7 +5,7 @@ import { uid } from '@formily/shared';
import {
Action,
Checkbox,
collection,
CollectionCategroriesContext,
CollectionField,
CollectionProvider,
Form,
@ -19,15 +19,15 @@ import {
SchemaComponent,
SchemaComponentProvider,
Select,
collection,
useCollectionManager,
useCompile,
useCurrentAppInfo,
useRecord,
CollectionCategroriesContext,
} from '@nocobase/client';
import { Badge, Dropdown, Popover, Tag } from 'antd';
import { groupBy } from 'lodash';
import React, { useRef, useState, useContext } from 'react';
import React, { useContext, useRef, useState } from 'react';
import {
useAsyncDataSource,
useCancelAction,
@ -37,7 +37,7 @@ import {
useValuesFromRecord,
} from '../action-hooks';
import { collectiionPopoverClass, entityContainer, headClass, tableBtnClass, tableNameClass } from '../style';
import { useGCMTranslation } from '../utils';
import { getPopupContainer, useGCMTranslation } from '../utils';
import { AddFieldAction } from './AddFieldAction';
import { CollectionNodeProvder } from './CollectionNodeProvder';
import { EditCollectionAction } from './EditCollectionAction';
@ -161,9 +161,7 @@ const Entity: React.FC<{
confirm: {
title: "{{t('Delete record')}}",
getContainer: () => {
return document.getElementById('graph_container');
},
getContainer: getPopupContainer,
collectionConten: "{{t('Are you sure you want to delete it?')}}",
},
useAction: () => useDestroyActionAndRefreshCM({ name, id }),
@ -233,6 +231,7 @@ const PortsCom = React.memo<any>(({ targetGraph, collectionData, setTargetNode,
return 'orange';
}
};
const OperationButton = ({ property }) => {
const isInheritField = !(property.collectionName !== name);
return (
@ -244,14 +243,7 @@ const PortsCom = React.memo<any>(({ targetGraph, collectionData, setTargetNode,
Input,
Form,
ResourceActionProvider,
Select: (props) => (
<Select
{...props}
getPopupContainer={() => {
return document.getElementById('graph_container');
}}
/>
),
Select: (props) => <Select {...props} getPopupContainer={getPopupContainer} />,
Checkbox,
Radio,
InputNumber,
@ -334,9 +326,7 @@ const PortsCom = React.memo<any>(({ targetGraph, collectionData, setTargetNode,
`,
confirm: {
title: "{{t('Delete record')}}",
getContainer: () => {
return document.getElementById('graph_container');
},
getContainer: getPopupContainer,
collectionConten: "{{t('Are you sure you want to delete it?')}}",
},
useAction: () =>
@ -409,9 +399,7 @@ const PortsCom = React.memo<any>(({ targetGraph, collectionData, setTargetNode,
property.uiSchema && (
<Popover
content={CollectionConten(property)}
getPopupContainer={() => {
return document.getElementById('graph_container');
}}
getPopupContainer={getPopupContainer}
mouseLeaveDelay={0}
zIndex={100}
title={
@ -452,9 +440,7 @@ const PortsCom = React.memo<any>(({ targetGraph, collectionData, setTargetNode,
property.uiSchema && (
<Popover
content={CollectionConten(property)}
getPopupContainer={() => {
return document.getElementById('graph_container');
}}
getPopupContainer={getPopupContainer}
mouseLeaveDelay={0}
zIndex={100}
title={

3
packages/plugins/graph-collection-manager/src/client/components/OverrideFieldAction.tsx
View File

@ -2,6 +2,7 @@ import { CopyOutlined } from '@ant-design/icons';
import { OverridingFieldAction as OverridingCollectionFieldAction } from '@nocobase/client';
import React from 'react';
import { useCancelAction, useCreateAction } from '../action-hooks';
import { getPopupContainer } from '../utils';
const useOverridingCollectionField = (record) => {
const collectionName = record.targetCollection;
@ -21,7 +22,7 @@ export const OverrideFieldAction = ({ item: record }) => {
useCancelAction,
useOverridingCollectionField: () => useOverridingCollectionField(record),
}}
getContainer={() => document.getElementById('graph_container')}
getContainer={getPopupContainer}
>
<CopyOutlined className="btn-override" />
</OverridingCollectionFieldAction>

3
packages/plugins/graph-collection-manager/src/client/components/ViewFieldAction.tsx
View File

@ -1,10 +1,11 @@
import { EyeOutlined } from '@ant-design/icons';
import { ViewFieldAction as ViewCollectionFieldAction } from '@nocobase/client';
import React from 'react';
import { getPopupContainer } from '../utils';
export const ViewFieldAction = ({ item: record }) => {
return (
<ViewCollectionFieldAction item={{ ...record }} getContainer={() => document.getElementById('graph_container')}>
<ViewCollectionFieldAction item={{ ...record }} getContainer={getPopupContainer}>
<EyeOutlined className="btn-view" />
</ViewCollectionFieldAction>
);

12
packages/plugins/graph-collection-manager/src/client/utils.tsx
View File

@ -532,3 +532,15 @@ export const getDiffEdge = (newEdges, oldEdges) => {
}
return edges;
};
let graphContainer;
/**
* 所有的 getPopupContainer 都需要保证返回的是唯一的 div。React 18 concurrent 下会反复调用该方法
* 参考：https://ant.design/docs/react/migration-v5-cn#%E5%8D%87%E7%BA%A7%E5%87%86%E5%A4%87
*/
export const getPopupContainer = () => {
if (graphContainer) {
return graphContainer;
}
return (graphContainer = document.getElementById('graph_container'));
};

2
packages/plugins/iframe-block/src/client/IframeBlockInitializer.tsx
View File

@ -1,11 +1,9 @@
import { FormOutlined } from '@ant-design/icons';
import { SchemaInitializer } from '@nocobase/client';
import React from 'react';
import { useTranslation } from 'react-i18next';
export const IframeBlockInitializer = (props) => {
const { insert } = props;
const { t } = useTranslation();
return (
<SchemaInitializer.Item
{...props}

2
packages/plugins/import/src/client/ImportInitializerProvider.tsx
View File

@ -18,7 +18,7 @@ export const ImportInitializerProvider = (props: any) => {
skipScopeCheck: true,
},
},
visible: () => {
visible: function useVisible() {
const collection = useCollection();
return collection.template !== 'view' && collection.template !== 'file';
},

19
packages/plugins/map/src/client/components/Configuration.tsx
View File

@ -1,6 +1,6 @@
import { useAPIClient, useCompile } from '@nocobase/client';
import { useBoolean } from 'ahooks';
import { Button, Card, Form, Input, message, Tabs } from 'antd';
import { Button, Card, Form, Input, Tabs, message } from 'antd';
import React, { useEffect, useMemo } from 'react';
import { MapTypes } from '../constants';
import { MapConfigurationResourceKey, getSSKey, useMapConfiguration } from '../hooks';
@ -76,15 +76,16 @@ const Configuration = () => {
const compile = useCompile();
return (
<Card bordered>
<Tabs type="card">
{tabList.map((tab) => {
return (
<Tabs.TabPane key={tab.value} tab={compile(tab.label)}>
<tab.component type={tab.value} />
</Tabs.TabPane>
);
<Tabs
type="card"
items={tabList.map((tab) => {
return {
key: tab.value,
label: compile(tab.label),
children: <tab.component type={tab.value} />,
};
})}
</Tabs>
/>
</Card>
);
};

13
packages/plugins/mobile-client/src/client/core/schema/components/container/Container.Designer.tsx
View File

@ -1,13 +1,13 @@
import { SchemaSettings, useDesignable } from '@nocobase/client';
import React from 'react';
import { generateNTemplate, useTranslation } from '../../../../locale';
import { MenuOutlined } from '@ant-design/icons';
import { Schema, useField, useFieldSchema } from '@formily/react';
import { uid } from '@formily/shared';
import { useNavigate } from 'react-router-dom';
import { findSchema } from '../../helpers';
import { SchemaSettings, useDesignable } from '@nocobase/client';
import { Button } from 'antd';
import { MenuOutlined } from '@ant-design/icons';
import React from 'react';
import { useNavigate } from 'react-router-dom';
import { generateNTemplate, useTranslation } from '../../../../locale';
import { PageSchema } from '../../common';
import { findSchema } from '../../helpers';
export const ContainerDesigner = () => {
const { t } = useTranslation();
@ -32,6 +32,7 @@ export const ContainerDesigner = () => {
style={{
borderColor: 'rgb(241, 139, 98)',
color: 'rgb(241, 139, 98)',
width: '100%',
}}
icon={<MenuOutlined />}
type="dashed"

11
packages/plugins/mobile-client/src/client/core/schema/components/page/Page.Designer.tsx
View File

@ -1,11 +1,11 @@
import { GeneralSchemaDesigner, SchemaSettings, useDesignable } from '@nocobase/client';
import { MenuOutlined } from '@ant-design/icons';
import { useField, useFieldSchema } from '@formily/react';
import { uid } from '@formily/shared';
import { SchemaSettings, useDesignable } from '@nocobase/client';
import { Button } from 'antd';
import React from 'react';
import { generateNTemplate, useTranslation } from '../../../../locale';
import { useField, useFieldSchema } from '@formily/react';
import { findGridSchema } from '../../helpers';
import { uid } from '@formily/shared';
import { Button } from 'antd';
import { MenuOutlined } from '@ant-design/icons';
export const PageDesigner = (props) => {
const { showBack } = props;
@ -28,6 +28,7 @@ export const PageDesigner = (props) => {
style={{
borderColor: 'rgb(241, 139, 98)',
color: 'rgb(241, 139, 98)',
width: '100%',
}}
icon={<MenuOutlined />}
type="dashed"

6
packages/plugins/mobile-client/src/client/core/schema/components/settings/Settings.tsx
View File

@ -1,7 +1,7 @@
import React from 'react';
import { SettingsMenu, SortableItem, useDesigner } from '@nocobase/client';
import { SettingsDesigner } from './Settings.Designer';
import { css, cx } from '@emotion/css';
import { SettingsMenu, SortableItem, useDesigner } from '@nocobase/client';
import React from 'react';
import { SettingsDesigner } from './Settings.Designer';
export const InternalSettings = () => {
const Designer = useDesigner();
return (

2
packages/plugins/multi-app-manager/src/client/index.tsx
View File

@ -5,7 +5,7 @@ import {
SettingsCenterProvider,
useRequest,
} from '@nocobase/client';
import { Button, Dropdown, Menu } from 'antd';
import { Button, Dropdown } from 'antd';
import React from 'react';
import { Link } from 'react-router-dom';
import { AppManager } from './AppManager';

92
packages/plugins/workflow/src/client/AddButton.tsx
View File

@ -1,12 +1,12 @@
import React from 'react';
import { cx } from '@emotion/css';
import { Dropdown, Menu, Button } from 'antd';
import { PlusOutlined } from '@ant-design/icons';
import { cx } from '@emotion/css';
import { useAPIClient, useCompile } from '@nocobase/client';
import { Button, Dropdown, MenuProps } from 'antd';
import React, { useCallback, useMemo } from 'react';
import { useFlowContext } from './FlowContext';
import { NAMESPACE } from './locale';
import { Instruction, instructions } from './nodes';
import { addButtonClass } from './style';
import { NAMESPACE } from './locale';
interface AddButtonProps {
upstream;
@ -17,39 +17,9 @@ export function AddButton({ upstream, branchIndex = null }: AddButtonProps) {
const compile = useCompile();
const api = useAPIClient();
const { workflow, refresh } = useFlowContext() ?? {};
if (!workflow) {
return null;
}
const resource = api.resource('workflows.nodes', workflow.id);
async function onCreate({ keyPath }) {
const type = keyPath.pop();
const config = {};
const [optionKey] = keyPath;
const instruction = instructions.get(type);
if (optionKey) {
const { value } = instruction.options?.find((item) => item.key === optionKey) ?? {};
Object.assign(config, value);
}
const {
data: { data: node },
} = await resource.create!({
values: {
type,
upstreamId: upstream?.id ?? null,
branchIndex,
title: compile(instruction.title),
config,
},
});
refresh();
}
const instructionList = Array.from(instructions.getValues()) as Instruction[];
const groups = [
const groups = useMemo(() => {
return [
{ key: 'control', label: `{{t("Control", { ns: "${NAMESPACE}" })}}` },
{ key: 'collection', label: `{{t("Collection operations", { ns: "${NAMESPACE}" })}}` },
{ key: 'manual', label: `{{t("Manual", { ns: "${NAMESPACE}" })}}` },
@ -75,14 +45,54 @@ export function AddButton({ upstream, branchIndex = null }: AddButtonProps) {
})),
};
});
}, [instructionList]);
const resource = useMemo(() => {
if (!workflow) {
return null;
}
return api.resource('workflows.nodes', workflow.id);
}, [workflow?.id]);
const onCreate = useCallback(
async ({ keyPath }) => {
const type = keyPath.pop();
const config = {};
const [optionKey] = keyPath;
const instruction = instructions.get(type);
if (optionKey) {
const { value } = instruction.options?.find((item) => item.key === optionKey) ?? {};
Object.assign(config, value);
}
if (resource) {
await resource.create({
values: {
type,
upstreamId: upstream?.id ?? null,
branchIndex,
title: compile(instruction.title),
config,
},
});
refresh();
}
},
[branchIndex, resource?.create, upstream?.id],
);
const menu = useMemo<MenuProps>(() => {
return {
onClick: (ev) => onCreate(ev),
items: compile(groups),
};
}, [groups, onCreate]);
if (!workflow) {
return null;
}
return (
<div className={cx(addButtonClass)}>
<Dropdown
trigger={['click']}
overlay={<Menu onClick={(ev) => onCreate(ev)} items={compile(groups)} />}
disabled={workflow.executed}
>
<Dropdown trigger={['click']} menu={menu} disabled={workflow.executed}>
<Button shape="circle" icon={<PlusOutlined />} />
</Dropdown>
</div>

2
packages/plugins/workflow/src/client/WorkflowProvider.tsx
View File

@ -5,7 +5,7 @@ import {
SchemaComponent,
SchemaComponentOptions,
SettingsCenterProvider,
useCollectionDataSource
useCollectionDataSource,
} from '@nocobase/client';
import { Card } from 'antd';
import React, { useContext } from 'react';

43
packages/plugins/workflow/src/client/components/CollectionFieldset.tsx
View File

@ -1,9 +1,9 @@
import React, { useCallback } from 'react';
import { observer, useForm, useField } from '@formily/react';
import { Input, Button, Dropdown, Menu, Form } from 'antd';
import { PlusOutlined, CloseCircleOutlined } from '@ant-design/icons';
import { useTranslation } from 'react-i18next';
import { CloseCircleOutlined, PlusOutlined } from '@ant-design/icons';
import { css } from '@emotion/css';
import { observer, useField, useForm } from '@formily/react';
import { Button, Dropdown, Form, Input, MenuProps } from 'antd';
import React, { useMemo } from 'react';
import { useTranslation } from 'react-i18next';
import {
CollectionField,
@ -53,8 +53,23 @@ const CollectionFieldSet = observer(
const collectionFields = useCollectionUIFields(collectionName);
const fields = filter ? collectionFields.filter(filter.bind(config)) : collectionFields;
const unassignedFields = fields.filter((field) => !value || !(field.name in value));
const unassignedFields = useMemo(() => fields.filter((field) => !value || !(field.name in value)), [fields, value]);
const mergedDisabled = disabled || form.disabled;
const menu = useMemo<MenuProps>(() => {
return {
onClick: ({ key }) => {
onChange({ ...value, [key]: null });
},
style: {
maxHeight: 300,
overflowY: 'auto',
},
items: unassignedFields.map((field) => ({
key: field.name,
label: compile(field.uiSchema?.title ?? field.name),
})),
};
}, [onChange, unassignedFields, value]);
return (
<fieldset
@ -127,21 +142,7 @@ const CollectionFieldSet = observer(
);
})}
{unassignedFields.length ? (
<Dropdown
overlay={
<Menu
items={unassignedFields.map((field) => ({
key: field.name,
label: compile(field.uiSchema?.title ?? field.name),
}))}
onClick={({ key }) => onChange({ ...value, [key]: null })}
className={css`
max-height: 300px;
overflow-y: auto;
`}
/>
}
>
<Dropdown menu={menu}>
<Button icon={<PlusOutlined />}>{t('Add field')}</Button>
</Dropdown>
) : null}

151
yarn.lock
View File

@ -163,10 +163,10 @@
classnames "^2.2.6"
rc-util "^5.9.4"
"@ant-design/icons@^5.1.0":
version "5.1.2"
resolved "https://registry.yarnpkg.com/@ant-design/icons/-/icons-5.1.2.tgz#6dc30c5caff0670f11b6391f0839ed41847c72e6"
integrity sha512-sSorFv+4e5nkSq9vD7UHG2IQYUmR8jCO49+z4vn3MUeiM1G1qxCqh7JiR5pexVY0hZywHes/uxiNflAQZCWZ8Q==
"@ant-design/icons@^5.0.0", "@ant-design/icons@^5.1.0":
version "5.1.4"
resolved "https://registry.npmmirror.com/@ant-design/icons/-/icons-5.1.4.tgz#614e29e26d092c2c1c1a2acbc0d84434d8d1474e"
integrity sha512-YHKL7Jx3bM12OxvtiYDon04BsBT/6LGitYEqar3GljzWaAyMOAD8i/uF1Rsi5Us/YNdWWXBGSvZV2OZWMpJlcA==
dependencies:
"@ant-design/colors" "^7.0.0"
"@ant-design/icons-svg" "^4.2.1"
@ -185,6 +185,52 @@
classnames "^2.2.6"
rc-util "^5.31.1"
"@ant-design/pro-layout@^7.14.3":
version "7.14.3"
resolved "https://registry.npmmirror.com/@ant-design/pro-layout/-/pro-layout-7.14.3.tgz#01063883a334060c41b72ec084c3e83200673952"
integrity sha512-FcKj23f/laod2hfSSYfBbkjb9r74lZLgan8dylI+tngQnZKQc1o1a1f9If7CggkrhEdgDyIkIyFl9Ii/tfDa+A==
dependencies:
"@ant-design/icons" "^5.0.0"
"@ant-design/pro-provider" "^2.10.2"
"@ant-design/pro-utils" "^2.11.3"
"@babel/runtime" "^7.18.0"
"@umijs/route-utils" "^4.0.0"
"@umijs/use-params" "^1.0.9"
classnames "^2.3.2"
lodash.merge "^4.6.2"
omit.js "^2.0.2"
path-to-regexp "2.4.0"
rc-resize-observer "^1.1.0"
rc-util "^5.0.6"
swr "^2.0.0"
use-json-comparison "^1.0.3"
use-media-antd-query "^1.1.0"
warning "^4.0.3"
"@ant-design/pro-provider@^2.10.2":
version "2.10.2"
resolved "https://registry.npmmirror.com/@ant-design/pro-provider/-/pro-provider-2.10.2.tgz#3338afa88f35fe06da8f3573e7cf31c323cad456"
integrity sha512-I0wfnP/fJUgGrl/9P5haMtITg8oHe2NOm83QKFVjqQWGYnA2V4O5rVqD+vdWveuaJ6rtCW8mEoeelfHF6nOnxw==
dependencies:
"@ant-design/cssinjs" "^1.9.1"
"@babel/runtime" "^7.18.0"
"@ctrl/tinycolor" "^3.4.0"
rc-util "^5.0.1"
swr "^2.0.0"
"@ant-design/pro-utils@^2.11.3":
version "2.11.3"
resolved "https://registry.npmmirror.com/@ant-design/pro-utils/-/pro-utils-2.11.3.tgz#847da90763f4157bc5e273bf0aa018af13ec28ae"
integrity sha512-Sd2oHzhQlSJ0svaD3Ih3v2VeXPnYWwJ05ul+ek8i9GWAGnFWD0yDTawGj7pDZwCQwJYaLpAzPHhfNvq3Led0/w==
dependencies:
"@ant-design/icons" "^5.0.0"
"@ant-design/pro-provider" "^2.10.2"
"@babel/runtime" "^7.18.0"
classnames "^2.3.2"
dayjs "^1.11.4"
rc-util "^5.0.6"
swr "^2.0.0"
"@ant-design/react-slick@~0.29.1":
version "0.29.2"
resolved "https://registry.yarnpkg.com/@ant-design/react-slick/-/react-slick-0.29.2.tgz#53e6a7920ea3562eebb304c15a7fc2d7e619d29c"
@ -3394,7 +3440,7 @@
"@emotion/hash@^0.8.0":
version "0.8.0"
resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.8.0.tgz#bbbff68978fefdbe68ccb533bc8cbe1d1afb5413"
resolved "https://registry.npmmirror.com/@emotion/hash/-/hash-0.8.0.tgz#bbbff68978fefdbe68ccb533bc8cbe1d1afb5413"
integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==
"@emotion/hash@^0.9.1":
@ -3442,16 +3488,15 @@
"@emotion/sheet@^1.2.2":
version "1.2.2"
resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.2.2.tgz#d58e788ee27267a14342303e1abb3d508b6d0fec"
integrity sha512-0QBtGvaqtWi+nx6doRwDdBIzhNdZrXUppvTM4dtZZWEGTXL/XE/yJxLMGlDT1Gt+UHH5IX1n+jkXyytE/av7OA==
"@emotion/stylis@^0.8.4":
version "0.8.5"
resolved "https://registry.yarnpkg.com/@emotion/stylis/-/stylis-0.8.5.tgz#deacb389bd6ee77d1e7fcaccce9e16c5c7e78e04"
resolved "https://registry.npmmirror.com/@emotion/stylis/-/stylis-0.8.5.tgz#deacb389bd6ee77d1e7fcaccce9e16c5c7e78e04"
integrity sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ==
"@emotion/unitless@^0.7.4", "@emotion/unitless@^0.7.5":
version "0.7.5"
resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.5.tgz#77211291c1900a700b8a78cfafda3160d76949ed"
resolved "https://registry.npmmirror.com/@emotion/unitless/-/unitless-0.7.5.tgz#77211291c1900a700b8a78cfafda3160d76949ed"
integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==
"@emotion/unitless@^0.8.1":
@ -7376,6 +7421,11 @@
react-helmet-async "1.3.0"
react-router-dom "6.3.0"
"@umijs/route-utils@^4.0.0":
version "4.0.1"
resolved "https://registry.npmmirror.com/@umijs/route-utils/-/route-utils-4.0.1.tgz#156df5b3f2328059722d3ee7dd8f65e18c3cde8b"
integrity sha512-+1ixf1BTOLuH+ORb4x8vYMPeIt38n9q0fJDwhv9nSxrV46mxbLF0nmELIo9CKQB2gHfuC4+hww6xejJ6VYnBHQ==
"@umijs/server@4.0.69":
version "4.0.69"
resolved "https://registry.yarnpkg.com/@umijs/server/-/server-4.0.69.tgz#6819612ee294ae432a37b7c673ea39e39a6aa7ef"
@ -7406,6 +7456,11 @@
resolved "https://registry.yarnpkg.com/@umijs/ui/-/ui-3.0.1.tgz#64ae7ef36bf9374823f7361a7a844876d96c9e06"
integrity sha512-zcz37AJH0xt/6XVVbyO/hmsK9Hq4vH23HZ4KYVi5A8rbM9KeJkJigTS7ELOdArawZhVNGe+h3a5Oixs4a2QsWw==
"@umijs/use-params@^1.0.9":
version "1.0.9"
resolved "https://registry.npmmirror.com/@umijs/use-params/-/use-params-1.0.9.tgz#0ae4a87f4922d8e8e3fb4495b0f8f4de9ca38c52"
integrity sha512-QlN0RJSBVQBwLRNxbxjQ5qzqYIGn+K7USppMoIOVlf7fxXHsnQZ2bEsa6Pm74bt6DVQxpUE8HqvdStn6Y9FV1w==
"@umijs/utils@3.5.39", "@umijs/utils@^3.5.20":
version "3.5.39"
resolved "https://registry.yarnpkg.com/@umijs/utils/-/utils-3.5.39.tgz#86a57e262bfbdbc356cdcacaf415b11b1a450e12"
@ -11113,13 +11168,15 @@ dateformat@^3.0.0:
version "3.0.3"
resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
dayjs@1.x, dayjs@^1.11.1, dayjs@^1.11.7, dayjs@^1.9.1, dayjs@~1.11.5:
version "1.11.7"
resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.7.tgz#4b296922642f70999544d1144a2c25730fce63e2"
dayjs@1.x, dayjs@^1.11.1, dayjs@^1.11.4, dayjs@^1.11.7, dayjs@^1.9.1, dayjs@~1.11.5:
version "1.11.8"
resolved "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.8.tgz#4282f139c8c19dd6d0c7bd571e30c2d0ba7698ea"
integrity sha512-LcgxzFoWMEPO7ggRv1Y2N31hUf2R0Vj7fuy/m+Bg1K8rr+KAs1AEy4y9jd5DXe8pbHgX+srkHNS7TH6Q6ZhYeQ==
dayjs@~1.8.24:
version "1.8.36"
resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.8.36.tgz#be36e248467afabf8f5a86bae0de0cdceecced50"
resolved "https://registry.npmmirror.com/dayjs/-/dayjs-1.8.36.tgz#be36e248467afabf8f5a86bae0de0cdceecced50"
integrity sha512-3VmRXEtw7RZKAf+4Tv1Ym9AGeo8r8+CjDi26x+7SYQil1UqtqdaokhzoEJohqlzt0m5kacJSDhJQkG/LWhpRBw==
debounce-fn@^4.0.0:
version "4.0.0"
@ -19239,6 +19296,11 @@ omit-deep@0.3.0:
is-plain-object "^2.0.1"
unset-value "^0.1.1"
omit.js@^2.0.2:
version "2.0.2"
resolved "https://registry.npmmirror.com/omit.js/-/omit.js-2.0.2.tgz#dd9b8436fab947a5f3ff214cb2538631e313ec2f"
integrity sha512-hJmu9D+bNB40YpL9jYebQl4lsTW6yEHRTroJzNLqQJYHm7c+NQnJGfZmIWh8S3q3KoaxV1aLhV6B3+0N0/kyJg==
on-exit-leak-free@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/on-exit-leak-free/-/on-exit-leak-free-0.2.0.tgz#b39c9e3bf7690d890f4861558b0d7b90a442d209"
@ -19874,6 +19936,11 @@ path-to-regexp@2.2.1:
version "2.2.1"
resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-2.2.1.tgz#90b617025a16381a879bc82a38d4e8bdeb2bcf45"
path-to-regexp@2.4.0:
version "2.4.0"
resolved "https://registry.npmmirror.com/path-to-regexp/-/path-to-regexp-2.4.0.tgz#35ce7f333d5616f1c1e1bfe266c3aba2e5b2e704"
integrity sha512-G6zHoVqC6GGTQkZwF4lkuEyMbVOjoBKAEybQUypI1WTkqinCOrq2x6U2+phkJ1XsEMTy4LjtwPI7HW+NVrRR2w==
path-to-regexp@^6.1.0:
version "6.2.1"
resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-6.2.1.tgz#d54934d6798eb9e5ef14e7af7962c945906918e5"
@ -21883,17 +21950,17 @@ rc-upload@~4.3.0:
classnames "^2.2.5"
rc-util "^5.2.0"
rc-util@^5.0.1, rc-util@^5.0.6, rc-util@^5.15.0, rc-util@^5.16.0, rc-util@^5.16.1, rc-util@^5.17.0, rc-util@^5.18.1, rc-util@^5.19.2, rc-util@^5.2.0, rc-util@^5.2.1, rc-util@^5.20.1, rc-util@^5.21.0, rc-util@^5.21.2, rc-util@^5.22.5, rc-util@^5.23.0, rc-util@^5.24.4, rc-util@^5.26.0, rc-util@^5.27.0, rc-util@^5.4.0, rc-util@^5.6.1, rc-util@^5.8.0, rc-util@^5.9.4:
version "5.29.3"
resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-5.29.3.tgz#dc02b7b2103468e9fdf14e0daa58584f47898e37"
rc-util@^5.0.1, rc-util@^5.0.6, rc-util@^5.15.0, rc-util@^5.16.0, rc-util@^5.16.1, rc-util@^5.17.0, rc-util@^5.18.1, rc-util@^5.19.2, rc-util@^5.2.0, rc-util@^5.2.1, rc-util@^5.20.1, rc-util@^5.21.0, rc-util@^5.21.2, rc-util@^5.22.5, rc-util@^5.23.0, rc-util@^5.24.4, rc-util@^5.25.2, rc-util@^5.26.0, rc-util@^5.27.0, rc-util@^5.31.1, rc-util@^5.4.0, rc-util@^5.6.1, rc-util@^5.8.0, rc-util@^5.9.4:
version "5.33.0"
resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-5.33.0.tgz#8e673700e467b24c722014f2fe2f2f77aa6c2c07"
dependencies:
"@babel/runtime" "^7.18.3"
react-is "^16.12.0"
rc-util@^5.21.5, rc-util@^5.25.2, rc-util@^5.27.1, rc-util@^5.28.0, rc-util@^5.31.1, rc-util@^5.33.0:
version "5.33.0"
resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-5.33.0.tgz#8e673700e467b24c722014f2fe2f2f77aa6c2c07"
integrity sha512-mq2NkEAnHklq4fgU/JqjiE0PS8+8u33gEWw2bDUNDPck3OroPpSgw/8oEyuFrvPgaZEmt9BgQdh59JfQt2cU+w==
rc-util@^5.21.5, rc-util@^5.27.1, rc-util@^5.28.0, rc-util@^5.33.0:
version "5.33.1"
resolved "https://registry.npmmirror.com/rc-util/-/rc-util-5.33.1.tgz#96e5814400e04b819bace502b6ca40a67f3be37f"
integrity sha512-oMs2OIV/2lUCF8nllevzLccneyxAzdSOaHSs5y91qOLdqaLbIMsuL49C6/DhF/WKMqiAKEKGdVk2F1sB5HQe9A==
dependencies:
"@babel/runtime" "^7.18.3"
react-is "^16.12.0"
@ -21906,16 +21973,7 @@ rc-util@^5.30.0:
"@babel/runtime" "^7.18.3"
react-is "^16.12.0"
rc-virtual-list@^3.2.0:
version "3.4.13"
resolved "https://registry.yarnpkg.com/rc-virtual-list/-/rc-virtual-list-3.4.13.tgz#20acc934b263abcf7b7c161f50ef82281b2f7e8d"
dependencies:
"@babel/runtime" "^7.20.0"
classnames "^2.2.6"
rc-resize-observer "^1.0.0"
rc-util "^5.15.0"
rc-virtual-list@^3.4.8, rc-virtual-list@^3.5.2:
rc-virtual-list@^3.2.0, rc-virtual-list@^3.4.8, rc-virtual-list@^3.5.2:
version "3.5.2"
resolved "https://registry.npmmirror.com/rc-virtual-list/-/rc-virtual-list-3.5.2.tgz#5e1028869bae900eacbae6788d4eca7210736006"
integrity sha512-sE2G9hTPjVmatQni8OP2Kx33+Oth6DMKm67OblBBmgMBJDJQOOFpSGH7KZ6Pm85rrI2IGxDRXZCr0QhYOH2pfQ==
@ -24256,25 +24314,21 @@ stylehacks@^4.0.0:
stylelint-config-recommended@^7.0.0:
version "7.0.0"
resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-7.0.0.tgz#7497372ae83ab7a6fffc18d7d7b424c6480ae15e"
resolved "https://registry.npmmirror.com/stylelint-config-recommended/-/stylelint-config-recommended-7.0.0.tgz#7497372ae83ab7a6fffc18d7d7b424c6480ae15e"
integrity sha512-yGn84Bf/q41J4luis1AZ95gj0EQwRX8lWmGmBwkwBNSkpGSpl66XcPTulxGa/Z91aPoNGuIGBmFkcM1MejMo9Q==
stylelint-config-standard@25.0.0:
version "25.0.0"
resolved "https://registry.yarnpkg.com/stylelint-config-standard/-/stylelint-config-standard-25.0.0.tgz#2c916984e6655d40d6e8748b19baa8603b680bff"
resolved "https://registry.npmmirror.com/stylelint-config-standard/-/stylelint-config-standard-25.0.0.tgz#2c916984e6655d40d6e8748b19baa8603b680bff"
integrity sha512-21HnP3VSpaT1wFjFvv9VjvOGDtAviv47uTp3uFmzcN+3Lt+RYRv6oAplLaV51Kf792JSxJ6svCJh/G18E9VnCA==
dependencies:
stylelint-config-recommended "^7.0.0"
stylis@4.2.0, stylis@^4.0.13:
stylis@4.2.0, stylis@^4.0.13, stylis@^4.1.2:
version "4.2.0"
resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.2.0.tgz#79daee0208964c8fe695a42fcffcac633a211a51"
resolved "https://registry.npmmirror.com/stylis/-/stylis-4.2.0.tgz#79daee0208964c8fe695a42fcffcac633a211a51"
integrity sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw==
stylis@^4.1.2:
version "4.1.3"
resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.1.3.tgz#fd2fbe79f5fed17c55269e16ed8da14c84d069f7"
superagent@^8.0.5:
version "8.0.9"
resolved "https://registry.yarnpkg.com/superagent/-/superagent-8.0.9.tgz#2c6fda6fadb40516515f93e9098c0eb1602e0535"
@ -24409,6 +24463,13 @@ svgson@^4.1.0:
omit-deep "0.3.0"
xml-reader "2.4.3"
swr@^2.0.0:
version "2.1.5"
resolved "https://registry.npmmirror.com/swr/-/swr-2.1.5.tgz#688effa719c03f6d35c66decbb0f8e79c7190399"
integrity sha512-/OhfZMcEpuz77KavXST5q6XE9nrOBOVcBLWjMT+oAE/kQHyE3PASrevXCtQDZ8aamntOfFkbVJp7Il9tNBQWrw==
dependencies:
use-sync-external-store "^1.2.0"
symbol-tree@^3.2.2, symbol-tree@^3.2.4:
version "3.2.4"
resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
@ -25641,6 +25702,16 @@ use-isomorphic-layout-effect@^1.1.1:
resolved "https://registry.yarnpkg.com/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.2.tgz#497cefb13d863d687b08477d9e5a164ad8c1a6fb"
integrity sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA==
use-json-comparison@^1.0.3:
version "1.0.6"
resolved "https://registry.npmmirror.com/use-json-comparison/-/use-json-comparison-1.0.6.tgz#a012bbc258ce745db1f56745dc653f575226cb21"
integrity sha512-xPadt5yMRbEmVfOSGFSMqjjICrq7nLbfSH3rYIXsrtcuFX7PmbYDN/ku8ObBn3v8o/yZelO1OxUS5+5TI3+fUw==
use-media-antd-query@^1.1.0:
version "1.1.0"
resolved "https://registry.npmmirror.com/use-media-antd-query/-/use-media-antd-query-1.1.0.tgz#f083ad7e292c1c0261b6bbfaac0edc3e0920d85d"
integrity sha512-B6kKZwNV4R+l4Rl11sWO7HqOay9alzs1Vp1b4YJqjz33YxbltBCZtt/yxXxkXN9rc1S7OeEL/GbwC30Wmqhw6Q==
use-memo-one@^1.1.1:
version "1.1.3"
resolved "https://registry.yarnpkg.com/use-memo-one/-/use-memo-one-1.1.3.tgz#2fd2e43a2169eabc7496960ace8c79efef975e99"
@ -25889,7 +25960,7 @@ vite-node@0.32.0:
vite@4.3.1:
version "4.3.1"
resolved "https://registry.yarnpkg.com/vite/-/vite-4.3.1.tgz#9badb1377f995632cdcf05f32103414db6fbb95a"
resolved "https://registry.npmmirror.com/vite/-/vite-4.3.1.tgz#9badb1377f995632cdcf05f32103414db6fbb95a"
integrity sha512-EPmfPLAI79Z/RofuMvkIS0Yr091T2ReUoXQqc5ppBX/sjFRhHKiPPF/R46cTdoci/XgeQpB23diiJxq5w30vdg==
dependencies:
esbuild "^0.17.5"
@ -25898,9 +25969,9 @@ vite@4.3.1:
optionalDependencies:
fsevents "~2.3.2"
"vite@^3.0.0 || ^4.0.0", vite@^4.3.8:
"vite@^3.0.0 || ^4.0.0", vite@^4.3.9:
version "4.3.9"
resolved "https://registry.yarnpkg.com/vite/-/vite-4.3.9.tgz#db896200c0b1aa13b37cdc35c9e99ee2fdd5f96d"
resolved "https://registry.npmmirror.com/vite/-/vite-4.3.9.tgz#db896200c0b1aa13b37cdc35c9e99ee2fdd5f96d"
integrity sha512-qsTNZjO9NoJNW7KnOrgYwczm0WctJ8m/yqYAMAK9Lxt4SoySUfS5S8ia9K7JHpa3KEeMfyF8LoJ3c5NeBJy6pg==
dependencies:
esbuild "^0.17.5"