diff --git a/packages/plugins/@hera/plugin-core/src/client/index.tsx b/packages/plugins/@hera/plugin-core/src/client/index.tsx index 3ee36f733..4af59f689 100644 --- a/packages/plugins/@hera/plugin-core/src/client/index.tsx +++ b/packages/plugins/@hera/plugin-core/src/client/index.tsx @@ -1,5 +1,4 @@ -import React from 'react'; -import { Plugin, EditTitleField, CollectionProvider, CollectionRecordProvider } from '@tachybase/client'; +import { Plugin, EditTitleField } from '@tachybase/client'; import { useFieldSchema } from '@tachybase/schema'; import { isValid } from '@tachybase/schema'; import { autorun } from '@tachybase/schema'; @@ -15,7 +14,7 @@ import { import { useCreateActionProps } from './schema-initializer/actions/hooks/useCreateActionProps'; import { useGetCustomAssociatedComponents } from './hooks/useGetCustomAssociatedComponents'; import { useGetCustomComponents } from './hooks/useGetCustomComponents'; -import { AdminLayout, DetailsPage, HomePage, PageLayout } from './pages'; +import { AdminLayout, DetailsPage, PageLayout } from './pages'; import { PluginSettingsHelper } from './settings-manager-components'; import { AssociatedFieldInterface, @@ -66,7 +65,6 @@ import { PluginWorkflowInterceptor } from './features/workflow-interceptor'; import { PluginPDF } from './features/pdf'; import { PluginExtendedFilterForm } from './features/extended-filter-form'; import { PluginOutbound } from './features/outbound'; -import { PluginModeHighlight } from './features/mode-highlight'; export { usePDFViewerRef } from './features/pdf/PDFVIewerBlockInitializer'; export * from './components/custom-components/custom-components'; @@ -164,11 +162,6 @@ export class PluginCoreClient extends Plugin { } async registerRouters() { - this.app.router.remove('root'); - this.app.router.add('home', { - path: '/', - element: , - }); this.app.router.add('admin.details_page', { path: '/admin/:name/page/:pageId/records/*', Component: DetailsPage, diff --git a/packages/plugins/@hera/plugin-core/src/client/pages/index.ts b/packages/plugins/@hera/plugin-core/src/client/pages/index.ts index 88c6a2d55..78f33ce89 100644 --- a/packages/plugins/@hera/plugin-core/src/client/pages/index.ts +++ b/packages/plugins/@hera/plugin-core/src/client/pages/index.ts @@ -1,5 +1,4 @@ export * from './AdminLayout'; export * from './DetailsPage'; -export * from './Home'; export * from '../features/outbound/OutboundPage'; export * from './PageLayout'; diff --git a/packages/plugins/@hera/plugin-core/src/client/settings-manager-components/index.ts b/packages/plugins/@hera/plugin-core/src/client/settings-manager-components/index.ts index 8f8352bf8..4d1c99167 100644 --- a/packages/plugins/@hera/plugin-core/src/client/settings-manager-components/index.ts +++ b/packages/plugins/@hera/plugin-core/src/client/settings-manager-components/index.ts @@ -1,11 +1,9 @@ import { Application } from '@tachybase/client'; import { tval } from '../locale'; import { Configuration } from './TokenConfiguration'; -import { HomePageConfiguration } from './HomePageConfiguration'; import { LinkManager } from './LinkManager'; import { Features } from './Features'; -export * from './HomePageConfiguration'; export * from './LinkManager'; export * from './TokenConfiguration'; @@ -21,11 +19,6 @@ export class PluginSettingsHelper { icon: 'ApiOutlined', Component: Features, }); - this.app.pluginSettingsManager.add('hera.home_page', { - title: tval('HomePage Config'), - icon: 'HomeOutlined', - Component: HomePageConfiguration, - }); this.app.pluginSettingsManager.add('hera.token', { title: tval('Third-party integration configuration'), icon: 'ShareAltOutlined', diff --git a/packages/plugins/@hera/plugin-core/src/server/plugin.ts b/packages/plugins/@hera/plugin-core/src/server/plugin.ts index 4362ab039..8ee599896 100644 --- a/packages/plugins/@hera/plugin-core/src/server/plugin.ts +++ b/packages/plugins/@hera/plugin-core/src/server/plugin.ts @@ -4,7 +4,7 @@ import CalcField from './fields/calc'; import { SqlLoader } from './services/sql-loader'; import { ConnectionManager } from './services/connection-manager'; import { FontManager } from './services/font-manager'; -import { HomePageService } from './services/home-page-service'; +import { HomePageService } from '../../../plugin-homepage/src/server/home-page-service'; import { WebControllerService as WebService } from './services/web-service'; import './actions'; import { Container } from '@tachybase/utils'; diff --git a/packages/plugins/@hera/plugin-homepage/.npmignore b/packages/plugins/@hera/plugin-homepage/.npmignore new file mode 100644 index 000000000..65f5e8779 --- /dev/null +++ b/packages/plugins/@hera/plugin-homepage/.npmignore @@ -0,0 +1,2 @@ +/node_modules +/src diff --git a/packages/plugins/@hera/plugin-homepage/README.md b/packages/plugins/@hera/plugin-homepage/README.md new file mode 100644 index 000000000..0fb864dd0 --- /dev/null +++ b/packages/plugins/@hera/plugin-homepage/README.md @@ -0,0 +1 @@ +# @hera/plugin-home-page diff --git a/packages/plugins/@hera/plugin-homepage/client.d.ts b/packages/plugins/@hera/plugin-homepage/client.d.ts new file mode 100644 index 000000000..6c459cbac --- /dev/null +++ b/packages/plugins/@hera/plugin-homepage/client.d.ts @@ -0,0 +1,2 @@ +export * from './dist/client'; +export { default } from './dist/client'; diff --git a/packages/plugins/@hera/plugin-homepage/client.js b/packages/plugins/@hera/plugin-homepage/client.js new file mode 100644 index 000000000..b6e3be70e --- /dev/null +++ b/packages/plugins/@hera/plugin-homepage/client.js @@ -0,0 +1 @@ +module.exports = require('./dist/client/index.js'); diff --git a/packages/plugins/@hera/plugin-homepage/package.json b/packages/plugins/@hera/plugin-homepage/package.json new file mode 100644 index 000000000..449d2b5da --- /dev/null +++ b/packages/plugins/@hera/plugin-homepage/package.json @@ -0,0 +1,14 @@ +{ + "name": "@hera/plugin-homepage", + "version": "0.0.1", + "main": "dist/server/index.js", + "dependencies": {}, + "devDependencies": { + "antd": "^5.16.1" + }, + "peerDependencies": { + "@tachybase/client": "0.x", + "@tachybase/server": "0.x", + "@tachybase/test": "0.x" + } +} diff --git a/packages/plugins/@hera/plugin-homepage/server.d.ts b/packages/plugins/@hera/plugin-homepage/server.d.ts new file mode 100644 index 000000000..c41081ddc --- /dev/null +++ b/packages/plugins/@hera/plugin-homepage/server.d.ts @@ -0,0 +1,2 @@ +export * from './dist/server'; +export { default } from './dist/server'; diff --git a/packages/plugins/@hera/plugin-homepage/server.js b/packages/plugins/@hera/plugin-homepage/server.js new file mode 100644 index 000000000..972842039 --- /dev/null +++ b/packages/plugins/@hera/plugin-homepage/server.js @@ -0,0 +1 @@ +module.exports = require('./dist/server/index.js'); diff --git a/packages/plugins/@hera/plugin-core/src/client/pages/Home.tsx b/packages/plugins/@hera/plugin-homepage/src/client/Home.tsx similarity index 100% rename from packages/plugins/@hera/plugin-core/src/client/pages/Home.tsx rename to packages/plugins/@hera/plugin-homepage/src/client/Home.tsx index 9538fb009..305664b08 100644 --- a/packages/plugins/@hera/plugin-core/src/client/pages/Home.tsx +++ b/packages/plugins/@hera/plugin-homepage/src/client/Home.tsx @@ -1,7 +1,7 @@ import React from 'react'; -import { useStyles } from './style'; import { Carousel, Image } from 'antd'; import { useAppSpin, useRequest } from '@tachybase/client'; +import { useStyles } from './style'; export const HomePage: React.FC<{}> = () => { const { styles } = useStyles(); diff --git a/packages/plugins/@hera/plugin-core/src/client/settings-manager-components/HomePageConfiguration.tsx b/packages/plugins/@hera/plugin-homepage/src/client/HomePageConfiguration.tsx similarity index 100% rename from packages/plugins/@hera/plugin-core/src/client/settings-manager-components/HomePageConfiguration.tsx rename to packages/plugins/@hera/plugin-homepage/src/client/HomePageConfiguration.tsx diff --git a/packages/plugins/@hera/plugin-homepage/src/client/index.tsx b/packages/plugins/@hera/plugin-homepage/src/client/index.tsx new file mode 100644 index 000000000..fa4ccc8f2 --- /dev/null +++ b/packages/plugins/@hera/plugin-homepage/src/client/index.tsx @@ -0,0 +1,23 @@ +import { Plugin, tval } from '@tachybase/client'; +import { HomePageConfiguration } from './HomePageConfiguration'; +import { HomePage } from './Home'; + +export class PluginHomePageClient extends Plugin { + async load() { + this.app.addComponents({ + HomePage, + }); + this.app.router.remove('root'); + this.app.router.add('home', { + path: '/', + Component: 'HomePage', + }); + this.app.pluginSettingsManager.add('hera', { + title: tval('Homepage config'), + icon: 'HomeOutlined', + Component: HomePageConfiguration, + }); + } +} + +export default PluginHomePageClient; diff --git a/packages/plugins/@hera/plugin-homepage/src/client/style.ts b/packages/plugins/@hera/plugin-homepage/src/client/style.ts new file mode 100644 index 000000000..2088ea293 --- /dev/null +++ b/packages/plugins/@hera/plugin-homepage/src/client/style.ts @@ -0,0 +1,137 @@ +import { createStyles } from '@tachybase/client'; + +export const useStyles = createStyles(({ css }) => ({ + home: css` + width: 100%; + height: 100%; + padding: 0; + margin: 0; + header { + .headerStyle { + width: 100%; + height: 60px; + background-color: #f7f7f7; + display: flex; + align-items: center; + border-radius: 8px; + box-shadow: 0 0 1px 1px #e3e3e3; + padding: 0px 10px 0px 15px; + .headerTitle { + height: 60px; + color: #6c6c6c; + font-size: 20px; + font-weight: 400; + line-height: 60px; + } + ul { + color: #6c6c6c; + display: flex; + align-items: center; + height: 100%; + margin-top: 0; + margin-bottom: 0; + padding: 0 0 0 25px; + li { + list-style: none; + padding-left: 5px; + padding-right: 5px; + text-align: center; + height: 100%; + line-height: 60px; + &:hover { + background-color: #e3e3e3; + } + } + .active { + background-color: #e3e3e3; + } + } + } + } + main { + padding: 20px 10px; + height: 500px; + div { + height: 500px; + img { + width: 100%; + height: auto; + } + } + .ant-carousel .slick-dots-bottom { + bottom: 50px; + } + .ant-carousel .slick-dots li { + width: 10px; + height: 10px; + border-radius: 50px; + border: 1px solid #ffffff; + } + + .ant-carousel .slick-dots li button { + width: 10px; + height: 10px; + border-radius: 50px; + opacity: 0; + } + .ant-carousel .slick-dots li.slick-active button { + opacity: 1; + } + } + footer { + width: 100%; + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + margin-top: 22px; + a { + color: #3372af; + } + ul { + display: flex; + margin: 0; + bottom: 0; + li { + list-style: none; + a { + border-right: 1.5px solid black; + padding: 0 5px; + } + &:nth-last-child(1) a { + border-right: 0; + } + } + } + div { + a { + margin-left: 5px; + } + } + } + `, +})); + +export const useHeadStyles = createStyles(({ token }) => { + return { + '.pageHeaderCss': { + backgroundColor: token.colorBgContainer, + paddingInline: token.paddingXS, + '&.ant-page-header-has-footer': { + paddingTop: token.paddingSM, + paddingBottom: '0', + '.ant-page-header-heading-left': {}, + '.ant-page-header-footer': { marginBlockStart: '0' }, + }, + '.ant-tabs-nav': { marginBottom: '0' }, + '.ant-page-header-heading-title': { + color: token.colorText, + }, + }, + + '.height0': { + fontSize: 0, + height: 0, + }, + }; +}); diff --git a/packages/plugins/@hera/plugin-homepage/src/index.ts b/packages/plugins/@hera/plugin-homepage/src/index.ts new file mode 100644 index 000000000..7e74612df --- /dev/null +++ b/packages/plugins/@hera/plugin-homepage/src/index.ts @@ -0,0 +1,2 @@ +export * from './server'; +export { default } from './server'; diff --git a/packages/plugins/@hera/plugin-homepage/src/server/collections/.gitkeep b/packages/plugins/@hera/plugin-homepage/src/server/collections/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/packages/plugins/@hera/plugin-core/src/server/collections/home-page-presentations-attachments.ts b/packages/plugins/@hera/plugin-homepage/src/server/collections/home-page-presentations-attachments.ts similarity index 100% rename from packages/plugins/@hera/plugin-core/src/server/collections/home-page-presentations-attachments.ts rename to packages/plugins/@hera/plugin-homepage/src/server/collections/home-page-presentations-attachments.ts diff --git a/packages/plugins/@hera/plugin-core/src/server/collections/home-page-presentations.ts b/packages/plugins/@hera/plugin-homepage/src/server/collections/home-page-presentations.ts similarity index 100% rename from packages/plugins/@hera/plugin-core/src/server/collections/home-page-presentations.ts rename to packages/plugins/@hera/plugin-homepage/src/server/collections/home-page-presentations.ts diff --git a/packages/plugins/@hera/plugin-core/src/server/services/home-page-service.ts b/packages/plugins/@hera/plugin-homepage/src/server/home-page-service.ts similarity index 100% rename from packages/plugins/@hera/plugin-core/src/server/services/home-page-service.ts rename to packages/plugins/@hera/plugin-homepage/src/server/home-page-service.ts diff --git a/packages/plugins/@hera/plugin-homepage/src/server/index.ts b/packages/plugins/@hera/plugin-homepage/src/server/index.ts new file mode 100644 index 000000000..b68aea57f --- /dev/null +++ b/packages/plugins/@hera/plugin-homepage/src/server/index.ts @@ -0,0 +1 @@ +export { default } from './plugin'; diff --git a/packages/plugins/@hera/plugin-homepage/src/server/plugin.ts b/packages/plugins/@hera/plugin-homepage/src/server/plugin.ts new file mode 100644 index 000000000..34b1d6a76 --- /dev/null +++ b/packages/plugins/@hera/plugin-homepage/src/server/plugin.ts @@ -0,0 +1,23 @@ +import { Plugin } from '@tachybase/server'; +import { Container } from '@tachybase/utils'; +import { HomePageService } from './home-page-service'; + +export class PluginHomePageServer extends Plugin { + async afterAdd() {} + + async beforeLoad() {} + + async load() {} + + async install() { + await Container.get(HomePageService).install(); + } + + async afterEnable() {} + + async afterDisable() {} + + async remove() {} +} + +export default PluginHomePageServer; diff --git a/packages/presets/rental/package.json b/packages/presets/rental/package.json index ca4f28d7d..87eb2511a 100644 --- a/packages/presets/rental/package.json +++ b/packages/presets/rental/package.json @@ -7,6 +7,7 @@ "@hera/plugin-approval": "workspace:*", "@hera/plugin-audit-logs": "workspace:*", "@hera/plugin-core": "workspace:*", + "@hera/plugin-homepage": "workspace:*", "@hera/plugin-rental": "workspace:*", "@nocobase/plugin-acl": "workspace:*", "@nocobase/plugin-action-bulk-edit": "workspace:*", diff --git a/packages/presets/rental/src/server/index.ts b/packages/presets/rental/src/server/index.ts index 1b7043bac..c637bd9cf 100644 --- a/packages/presets/rental/src/server/index.ts +++ b/packages/presets/rental/src/server/index.ts @@ -2,7 +2,7 @@ import PresetTachyBase from '@tachybase/preset-tachybase'; import _ from 'lodash'; export class PluginRental extends PresetTachyBase { - #builtInPlugins = ['approval-mobile', 'core']; + #builtInPlugins = ['approval-mobile', 'core', 'homepage']; get builtInPlugins() { return super.builtInPlugins.concat(this.#builtInPlugins); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 250778e09..989719235 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1663,6 +1663,22 @@ importers: specifier: ^4.17.0 version: 4.17.0 + packages/plugins/@hera/plugin-homepage: + dependencies: + '@tachybase/client': + specifier: 0.x + version: link:../../../core/client + '@tachybase/server': + specifier: 0.x + version: link:../../../core/server + '@tachybase/test': + specifier: 0.x + version: link:../../../core/test + devDependencies: + antd: + specifier: ^5.16.1 + version: 5.16.1(react-dom@18.2.0)(react@18.2.0) + packages/plugins/@hera/plugin-rental: dependencies: '@hera/plugin-core': @@ -4191,6 +4207,9 @@ importers: '@hera/plugin-core': specifier: workspace:* version: link:../../plugins/@hera/plugin-core + '@hera/plugin-homepage': + specifier: workspace:* + version: link:../../plugins/@hera/plugin-homepage '@hera/plugin-rental': specifier: workspace:* version: link:../../plugins/@hera/plugin-rental @@ -4726,22 +4745,6 @@ packages: react-dom: 18.2.0(react@18.2.0) stylis: 4.3.0 - /@ant-design/cssinjs@1.19.1(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-hgQ3wiys3X0sqDKWkqCJ6EYdF79i9JCvtavmIGwuuPUKmoJXV8Ff0sY+yQQSxk2dRmMyam/bYKo/Bwor45hnZw==} - peerDependencies: - react: '>=16.0.0' - react-dom: '>=16.0.0' - dependencies: - '@babel/runtime': 7.24.4 - '@emotion/hash': 0.8.0 - '@emotion/unitless': 0.7.5 - classnames: 2.5.1 - csstype: 3.1.3 - rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) - stylis: 4.3.1 - /@ant-design/cssinjs@1.20.0(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-uG3iWzJxgNkADdZmc6W0Ci3iQAUOvLMcM8SnnmWq3r6JeocACft4ChnY/YWvI2Y+rG/68QBla/O+udke1yH3vg==} peerDependencies: @@ -9694,7 +9697,7 @@ packages: peerDependencies: react: '>=16.3.0' dependencies: - '@babel/runtime': 7.23.6 + '@babel/runtime': 7.24.5 hoist-non-react-statics: 3.3.2 react: 18.1.0 react-is: 16.13.1 @@ -9705,7 +9708,7 @@ packages: peerDependencies: react: '>=16.3.0' dependencies: - '@babel/runtime': 7.23.6 + '@babel/runtime': 7.24.5 hoist-non-react-statics: 3.3.2 react: 18.2.0 react-is: 16.13.1 @@ -10452,7 +10455,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.5 '@ctrl/tinycolor': 3.6.1 classnames: 2.5.1 rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) @@ -10465,7 +10468,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.5 rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) @@ -10483,7 +10486,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.5 classnames: 2.5.1 rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 @@ -10496,7 +10499,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.5 classnames: 2.5.1 rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 @@ -10524,7 +10527,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.5 '@rc-component/portal': 1.1.2(react-dom@18.2.0)(react@18.2.0) classnames: 2.5.1 rc-motion: 2.9.0(react-dom@18.2.0)(react@18.2.0) @@ -10553,13 +10556,13 @@ packages: /@react-pdf/fns@2.2.1: resolution: {integrity: sha512-s78aDg0vDYaijU5lLOCsUD+qinQbfOvcNeaoX9AiE7+kZzzCo6B/nX+l48cmt9OosJmvZvE9DWR9cLhrhOi2pA==} dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.5 dev: true /@react-pdf/font@2.4.4: resolution: {integrity: sha512-yjK5eSY+LcbxS0m+sOYln8GdgIbUgti4xjwf14kx8OSsOMJQJyHFALHMh2cLcKJR9yZeqVDo1FwCsY6gw1yCkg==} dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.5 '@react-pdf/types': 2.4.1 cross-fetch: 3.1.8 fontkit: 2.0.2 @@ -10571,7 +10574,7 @@ packages: /@react-pdf/image@2.3.4: resolution: {integrity: sha512-IE34l7gfTdaxXe3XR9240xMZsFdxF1myIwmEWK28XoeTaucUPAUyOiNcFSGRT59vNuZVBuakYz3BlGGrkvAPVQ==} dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.5 '@react-pdf/png-js': 2.3.1 cross-fetch: 3.1.8 jay-peg: 1.0.1 @@ -10582,7 +10585,7 @@ packages: /@react-pdf/layout@3.11.2: resolution: {integrity: sha512-5EiHJ+Eb0odqnkWll9pWbTp+dwH1QRm7mOXDMiklqIWK98eI7e3cEae5Dgr0TtdnB7KgPW9Tvul2CwRJTwq54A==} dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.5 '@react-pdf/fns': 2.2.1 '@react-pdf/image': 2.3.4 '@react-pdf/pdfkit': 3.1.6 @@ -10601,7 +10604,7 @@ packages: /@react-pdf/pdfkit@3.1.6: resolution: {integrity: sha512-U96VVhphniDBsLbmeJHgEml15nng8cr90mmEfPATh98gsqg6wev0avBr4k9XPjLdaN1f2xTXD4VdlaMYJZ+n7Q==} dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.5 '@react-pdf/png-js': 2.3.1 browserify-zlib: 0.2.0 crypto-js: 4.2.0 @@ -10623,7 +10626,7 @@ packages: /@react-pdf/render@3.4.3: resolution: {integrity: sha512-9LL059vfwrK1gA0uIA4utpQ/pUH9EW/yia4bb7pCoARs8IlupY5UP265jgax15ua0p+MdUwShZzQ9rilu7kGsw==} dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.5 '@react-pdf/fns': 2.2.1 '@react-pdf/primitives': 3.1.1 '@react-pdf/textkit': 4.4.1 @@ -10660,7 +10663,7 @@ packages: /@react-pdf/stylesheet@4.2.4: resolution: {integrity: sha512-CgRfDzeMtnV0GL7zSn381NubmgwqKhFKcK1YrWX3azl/KWVh52jjFd3HWi6dvcETNT862mjWz5MnExe4WOBJXA==} dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.5 '@react-pdf/fns': 2.2.1 '@react-pdf/types': 2.4.1 color-string: 1.9.1 @@ -10672,7 +10675,7 @@ packages: /@react-pdf/textkit@4.4.1: resolution: {integrity: sha512-Jl9wdTqIvJ5pX+vAGz0EOhP7ut5Two9H6CzTKo/YYPeD79cM2yTXF3JzTERBC28y7LR0Waq9D2LHQjI+b/EYUQ==} dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.5 '@react-pdf/fns': 2.2.1 bidi-js: 1.0.3 hyphen: 1.10.4 @@ -13182,7 +13185,7 @@ packages: /@umijs/history@5.3.1: resolution: {integrity: sha512-/e0cEGrR2bIWQD7pRl3dl9dcyRGeC9hoW0OCvUTT/hjY0EfUrkd6G8ZanVghPMpDuY5usxq9GVcvrT8KNXLWvA==} dependencies: - '@babel/runtime': 7.23.6 + '@babel/runtime': 7.24.5 query-string: 6.14.1 /@umijs/lint@4.1.10(eslint@8.57.0)(stylelint@14.16.1)(typescript@5.4.5): @@ -14241,10 +14244,10 @@ packages: react-dom: '>=16.9.0' dependencies: '@ant-design/colors': 7.0.2 - '@ant-design/cssinjs': 1.19.1(react-dom@18.2.0)(react@18.2.0) + '@ant-design/cssinjs': 1.20.0(react-dom@18.2.0)(react@18.2.0) '@ant-design/icons': 5.3.6(react-dom@18.2.0)(react@18.2.0) '@ant-design/react-slick': 1.1.2(react@18.2.0) - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.5 '@ctrl/tinycolor': 3.6.1 '@rc-component/color-picker': 1.5.3(react-dom@18.2.0)(react@18.2.0) '@rc-component/mutate-observer': 1.1.0(react-dom@18.2.0)(react@18.2.0) @@ -14870,7 +14873,7 @@ packages: resolution: {integrity: sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==} engines: {node: '>=10', npm: '>=6'} dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.5 cosmiconfig: 7.1.0 resolve: 1.22.8 @@ -17116,7 +17119,7 @@ packages: resolution: {integrity: sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==} engines: {node: '>=0.11'} dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.5 dev: false /dateformat@2.2.0: @@ -17570,7 +17573,7 @@ packages: /dom-helpers@5.2.1: resolution: {integrity: sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==} dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.5 csstype: 3.1.3 dev: true @@ -20280,7 +20283,7 @@ packages: /history@5.3.0: resolution: {integrity: sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ==} dependencies: - '@babel/runtime': 7.23.6 + '@babel/runtime': 7.24.5 /hmac-drbg@1.0.1: resolution: {integrity: sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==} @@ -25600,7 +25603,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.5 classnames: 2.5.1 dom-align: 1.12.4 rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) @@ -25630,7 +25633,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.5 classnames: 2.5.1 rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 @@ -25642,7 +25645,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.5 classnames: 2.5.1 rc-motion: 2.9.0(react-dom@18.2.0)(react@18.2.0) rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) @@ -25683,7 +25686,7 @@ packages: react: '>=16.11.0' react-dom: '>=16.11.0' dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.5 '@rc-component/trigger': 2.1.0(react-dom@18.2.0)(react@18.2.0) classnames: 2.5.1 rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) @@ -25697,7 +25700,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.5 async-validator: 4.2.5 rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 @@ -25751,7 +25754,7 @@ packages: react: '>=16.0.0' react-dom: '>=16.0.0' dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.5 classnames: 2.5.1 rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 @@ -25763,7 +25766,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.5 '@rc-component/trigger': 2.1.0(react-dom@18.2.0)(react@18.2.0) classnames: 2.5.1 rc-input: 1.4.5(react-dom@18.2.0)(react@18.2.0) @@ -25794,7 +25797,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.5 classnames: 2.5.1 rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 @@ -25807,7 +25810,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.5 classnames: 2.5.1 rc-motion: 2.9.0(react-dom@18.2.0)(react@18.2.0) rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) @@ -25820,7 +25823,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.5 classnames: 2.5.1 rc-resize-observer: 1.4.0(react-dom@18.2.0)(react@18.2.0) rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) @@ -25833,7 +25836,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.5 classnames: 2.5.1 rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 @@ -25875,7 +25878,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.5 classnames: 2.5.1 rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 @@ -25888,7 +25891,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.5 classnames: 2.5.1 rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 @@ -25900,7 +25903,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.5 classnames: 2.5.1 rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 @@ -25913,7 +25916,7 @@ packages: react: '>=16.0.0' react-dom: '>=16.0.0' dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.5 classnames: 2.5.1 rc-motion: 2.9.0(react-dom@18.2.0)(react@18.2.0) rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) @@ -25927,7 +25930,7 @@ packages: react: '*' react-dom: '*' dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.5 classnames: 2.5.1 rc-motion: 2.9.0(react-dom@18.2.0)(react@18.2.0) rc-overflow: 1.3.2(react-dom@18.2.0)(react@18.2.0) @@ -25980,7 +25983,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.5 classnames: 2.5.1 rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 @@ -25993,7 +25996,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.5 classnames: 2.5.1 rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 @@ -26005,7 +26008,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.5 classnames: 2.5.1 rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 @@ -26034,7 +26037,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.5 classnames: 2.5.1 rc-dropdown: 4.2.0(react-dom@18.2.0)(react@18.2.0) rc-menu: 9.13.0(react-dom@18.2.0)(react@18.2.0) @@ -26050,7 +26053,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.5 classnames: 2.5.1 rc-input: 1.4.5(react-dom@18.2.0)(react@18.2.0) rc-resize-observer: 1.4.0(react-dom@18.2.0)(react@18.2.0) @@ -26064,7 +26067,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.5 '@rc-component/trigger': 2.1.0(react-dom@18.2.0)(react@18.2.0) classnames: 2.5.1 react: 18.2.0 @@ -26121,7 +26124,7 @@ packages: react: '*' react-dom: '*' dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.5 classnames: 2.5.1 rc-motion: 2.9.0(react-dom@18.2.0)(react@18.2.0) rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) @@ -26168,7 +26171,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.5 classnames: 2.5.1 rc-align: 4.0.15(react-dom@18.2.0)(react@18.2.0) rc-motion: 2.9.0(react-dom@18.2.0)(react@18.2.0) @@ -26183,7 +26186,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.5 classnames: 2.5.1 rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 @@ -26218,7 +26221,7 @@ packages: react: '*' react-dom: '*' dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.5 classnames: 2.5.1 rc-resize-observer: 1.4.0(react-dom@18.2.0)(react@18.2.0) rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) @@ -26233,7 +26236,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.5 classnames: 2.5.1 rc-resize-observer: 1.4.0(react-dom@18.2.0)(react@18.2.0) rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) @@ -26335,7 +26338,7 @@ packages: peerDependencies: react: '>=16.13.1' dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.5 react: 18.2.0 dev: false @@ -26359,7 +26362,7 @@ packages: react: ^16.6.0 || ^17.0.0 || ^18.0.0 react-dom: ^16.6.0 || ^17.0.0 || ^18.0.0 dependencies: - '@babel/runtime': 7.23.6 + '@babel/runtime': 7.24.5 invariant: 2.2.4 prop-types: 15.8.1 react: 18.1.0 @@ -26373,7 +26376,7 @@ packages: react: ^16.6.0 || ^17.0.0 || ^18.0.0 react-dom: ^16.6.0 || ^17.0.0 || ^18.0.0 dependencies: - '@babel/runtime': 7.23.6 + '@babel/runtime': 7.24.5 invariant: 2.2.4 prop-types: 15.8.1 react: 18.2.0 @@ -26495,7 +26498,7 @@ packages: react: '>=16.3.0' react-dom: '>=16.3.0' dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.5 '@popperjs/core': 2.11.8 '@restart/hooks': 0.4.15(react@18.2.0) '@types/warning': 3.0.3 @@ -29919,7 +29922,7 @@ packages: peerDependencies: react: '>=15.0.0' dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.5 '@types/react': 18.2.79 invariant: 2.2.4 react: 18.2.0