From d64d092dbd973b1c996e54ab5d3cb9ce1a146c03 Mon Sep 17 00:00:00 2001 From: wjh Date: Mon, 6 May 2024 18:50:49 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=90=88=E5=B9=B6=20@hera/plugin-mobil?= =?UTF-8?q?e=20=E5=88=B0=20@tachybase/plugin-mobile-client=20close=20#906?= =?UTF-8?q?=20(#912)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-on: https://git.daoyoucloud.com/daoyoucloud/tachybase/pulls/912 Reviewed-by: sealday Co-authored-by: wjh Co-committed-by: wjh --- .../plugins/@hera/plugin-mobile/.npmignore | 2 - .../plugins/@hera/plugin-mobile/README.md | 1 - .../plugins/@hera/plugin-mobile/client.d.ts | 2 - .../plugins/@hera/plugin-mobile/client.js | 1 - .../plugins/@hera/plugin-mobile/package.json | 26 -- .../plugins/@hera/plugin-mobile/server.d.ts | 2 - .../plugins/@hera/plugin-mobile/server.js | 1 - .../plugin-mobile/src/client/common/plugin.ts | 17 - .../@hera/plugin-mobile/src/client/index.tsx | 24 - .../@hera/plugin-mobile/src/client/locale.tsx | 15 - .../src/client/schma-block/index.tsx | 19 - .../schma-component/image-search/plugin.ts | 40 -- .../client/schma-component/swiper/index.ts | 33 -- .../schma-component/tab-search/index.ts | 47 -- .../plugins/@hera/plugin-mobile/src/index.ts | 2 - .../@hera/plugin-mobile/src/locale/en-US.json | 17 - .../@hera/plugin-mobile/src/locale/zh-CN.json | 17 - .../src/server/collections/.gitkeep | 0 .../@hera/plugin-mobile/src/server/index.ts | 1 - .../@hera/plugin-mobile/src/server/plugin.ts | 19 - .../plugin-mobile-client/package.json | 1 + .../src/client/core}/assets/svg/index.tsx | 0 .../src/client/core}/assets/svg/notice.svg | 0 .../src/client/core}/assets/svg/swiper.svg | 0 .../client/core}/assets/svg/tab-search.svg | 0 .../src/client/core/index.tsx | 45 ++ .../image-search/ImageSearch.configure.ts | 5 +- .../image-search/ImageSearch.initializer.tsx | 0 .../image-search/ImageSearch.provider.tsx | 0 .../image-search/ImageSearch.schema.ts | 0 .../image-search/ImageSearch.view.tsx | 0 .../schema/components}/image-search/data.ts | 0 .../components/image-search/hooks/index.ts | 2 + .../hooks/useAction.ImageSearchItemView.ts | 2 +- .../image-search/hooks/useSelect.ts | 0 .../schema/components/image-search/index.ts | 8 + .../ImageSearchItem.intializer.tsx | 0 .../search-item/ImageSearchItem.schema.ts | 0 .../search-item/ImageSearchItem.setting.tsx | 2 +- .../search-item/ImageSearchItem.toolbar.tsx | 0 .../search-item/ImageSearchItem.view.tsx | 0 .../image-search/search-item/index.ts | 7 + .../search-item/useProps.Optional.ts | 0 .../search-item/useProps.Related.tsx | 0 .../client/core/schema/components/index.ts | 4 + .../core/schema/components/notice/index.ts | 1 + .../schema-create/createGridCardBlockSchma.ts | 0 .../NoticeBlockInitializer.tsx | 2 +- .../notice/schema-initializer/index.ts | 1 + .../schema/components}/swiper/SwiperBlock.tsx | 3 +- .../swiper/SwiperBlockInitializer.tsx | 1 - .../swiper/SwiperFieldSettings.tsx | 2 +- .../schema/components}/swiper/SwiperPage.tsx | 7 +- .../core/schema/components/swiper/index.ts | 5 + .../components}/swiper/useSwiperBlockProps.ts | 0 .../tab-search/components/TabSearch.tsx | 0 .../tab-search/components/TabSearchAction.ts | 0 .../TabSearchCollapsibleInputItem.tsx | 0 .../TabSearchCollapsibleInputItemAction.ts | 0 .../TabSearchCollapsibleInputItemChild.tsx | 2 +- .../TabSearchCollapsibleInputMItem.tsx | 2 +- .../TabSearchCollapsibleInputMItemChild.tsx | 2 +- .../field-item/TabSearchFieldItem.tsx | 0 .../field-item/TabSearchFieldItemAction.ts | 2 +- .../field-item/TabSearchFieldItemProps.ts | 0 .../field-item/TabSearchFieldMItem.tsx | 0 .../TabSerachFieldItemRelatedProps.tsx | 0 .../components/field-item/hooks.tsx | 0 .../tab-search/components/field-item/index.ts | 6 + .../components/tab-search/components/index.ts | 3 + .../create/createTabSearchBlockSchema.ts | 0 .../create/createTabSearchItemSchema.ts | 0 .../schema/components/tab-search/index.ts | 4 + .../initializer/TabSearchBlockInitializer.tsx | 0 .../TabSearchFieldSchemaInitializer.tsx | 2 +- .../TabSearchFieldSchemaInitializerGadget.tsx | 0 .../tab-search/initializer/index.ts | 3 + .../tab-search/provider/TabSearchProvider.tsx | 0 .../components/tab-search/provider/index.ts | 1 + .../settings/TabSearchItemFieldSettings.tsx | 2 +- .../components/tab-search/settings/index.ts | 1 + .../schema/components}/tab-search/utils.ts | 0 .../schema/initializers/BlockInitializers.ts | 54 ++- .../plugin-mobile-client/src/client/index.tsx | 15 +- .../src/client/locale/index.ts | 4 +- .../src/locale/en-US.json | 17 +- .../src/locale/zh-CN.json | 20 +- pnpm-lock.yaml | 413 ++++++++++++------ 88 files changed, 487 insertions(+), 450 deletions(-) delete mode 100644 packages/plugins/@hera/plugin-mobile/.npmignore delete mode 100644 packages/plugins/@hera/plugin-mobile/README.md delete mode 100644 packages/plugins/@hera/plugin-mobile/client.d.ts delete mode 100644 packages/plugins/@hera/plugin-mobile/client.js delete mode 100644 packages/plugins/@hera/plugin-mobile/package.json delete mode 100644 packages/plugins/@hera/plugin-mobile/server.d.ts delete mode 100644 packages/plugins/@hera/plugin-mobile/server.js delete mode 100644 packages/plugins/@hera/plugin-mobile/src/client/common/plugin.ts delete mode 100644 packages/plugins/@hera/plugin-mobile/src/client/index.tsx delete mode 100644 packages/plugins/@hera/plugin-mobile/src/client/locale.tsx delete mode 100644 packages/plugins/@hera/plugin-mobile/src/client/schma-block/index.tsx delete mode 100644 packages/plugins/@hera/plugin-mobile/src/client/schma-component/image-search/plugin.ts delete mode 100644 packages/plugins/@hera/plugin-mobile/src/client/schma-component/swiper/index.ts delete mode 100644 packages/plugins/@hera/plugin-mobile/src/client/schma-component/tab-search/index.ts delete mode 100644 packages/plugins/@hera/plugin-mobile/src/index.ts delete mode 100644 packages/plugins/@hera/plugin-mobile/src/locale/en-US.json delete mode 100644 packages/plugins/@hera/plugin-mobile/src/locale/zh-CN.json delete mode 100644 packages/plugins/@hera/plugin-mobile/src/server/collections/.gitkeep delete mode 100644 packages/plugins/@hera/plugin-mobile/src/server/index.ts delete mode 100644 packages/plugins/@hera/plugin-mobile/src/server/plugin.ts rename packages/plugins/{@hera/plugin-mobile/src/client => @tachybase/plugin-mobile-client/src/client/core}/assets/svg/index.tsx (100%) rename packages/plugins/{@hera/plugin-mobile/src/client => @tachybase/plugin-mobile-client/src/client/core}/assets/svg/notice.svg (100%) rename packages/plugins/{@hera/plugin-mobile/src/client => @tachybase/plugin-mobile-client/src/client/core}/assets/svg/swiper.svg (100%) rename packages/plugins/{@hera/plugin-mobile/src/client => @tachybase/plugin-mobile-client/src/client/core}/assets/svg/tab-search.svg (100%) rename packages/plugins/{@hera/plugin-mobile/src/client/schma-component => @tachybase/plugin-mobile-client/src/client/core/schema/components}/image-search/ImageSearch.configure.ts (93%) rename packages/plugins/{@hera/plugin-mobile/src/client/schma-component => @tachybase/plugin-mobile-client/src/client/core/schema/components}/image-search/ImageSearch.initializer.tsx (100%) rename packages/plugins/{@hera/plugin-mobile/src/client/schma-component => @tachybase/plugin-mobile-client/src/client/core/schema/components}/image-search/ImageSearch.provider.tsx (100%) rename packages/plugins/{@hera/plugin-mobile/src/client/schma-component => @tachybase/plugin-mobile-client/src/client/core/schema/components}/image-search/ImageSearch.schema.ts (100%) rename packages/plugins/{@hera/plugin-mobile/src/client/schma-component => @tachybase/plugin-mobile-client/src/client/core/schema/components}/image-search/ImageSearch.view.tsx (100%) rename packages/plugins/{@hera/plugin-mobile/src/client/schma-component => @tachybase/plugin-mobile-client/src/client/core/schema/components}/image-search/data.ts (100%) create mode 100644 packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/hooks/index.ts rename packages/plugins/{@hera/plugin-mobile/src/client/schma-component => @tachybase/plugin-mobile-client/src/client/core/schema/components}/image-search/hooks/useAction.ImageSearchItemView.ts (96%) rename packages/plugins/{@hera/plugin-mobile/src/client/schma-component => @tachybase/plugin-mobile-client/src/client/core/schema/components}/image-search/hooks/useSelect.ts (100%) create mode 100644 packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/index.ts rename packages/plugins/{@hera/plugin-mobile/src/client/schma-component => @tachybase/plugin-mobile-client/src/client/core/schema/components}/image-search/search-item/ImageSearchItem.intializer.tsx (100%) rename packages/plugins/{@hera/plugin-mobile/src/client/schma-component => @tachybase/plugin-mobile-client/src/client/core/schema/components}/image-search/search-item/ImageSearchItem.schema.ts (100%) rename packages/plugins/{@hera/plugin-mobile/src/client/schma-component => @tachybase/plugin-mobile-client/src/client/core/schema/components}/image-search/search-item/ImageSearchItem.setting.tsx (99%) rename packages/plugins/{@hera/plugin-mobile/src/client/schma-component => @tachybase/plugin-mobile-client/src/client/core/schema/components}/image-search/search-item/ImageSearchItem.toolbar.tsx (100%) rename packages/plugins/{@hera/plugin-mobile/src/client/schma-component => @tachybase/plugin-mobile-client/src/client/core/schema/components}/image-search/search-item/ImageSearchItem.view.tsx (100%) create mode 100644 packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/search-item/index.ts rename packages/plugins/{@hera/plugin-mobile/src/client/schma-component => @tachybase/plugin-mobile-client/src/client/core/schema/components}/image-search/search-item/useProps.Optional.ts (100%) rename packages/plugins/{@hera/plugin-mobile/src/client/schma-component => @tachybase/plugin-mobile-client/src/client/core/schema/components}/image-search/search-item/useProps.Related.tsx (100%) create mode 100644 packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/notice/index.ts rename packages/plugins/{@hera/plugin-mobile/src/client/schma-block => @tachybase/plugin-mobile-client/src/client/core/schema/components/notice}/schema-create/createGridCardBlockSchma.ts (100%) rename packages/plugins/{@hera/plugin-mobile/src/client/schma-block => @tachybase/plugin-mobile-client/src/client/core/schema/components/notice}/schema-initializer/NoticeBlockInitializer.tsx (95%) create mode 100644 packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/notice/schema-initializer/index.ts rename packages/plugins/{@hera/plugin-mobile/src/client/schma-component => @tachybase/plugin-mobile-client/src/client/core/schema/components}/swiper/SwiperBlock.tsx (94%) rename packages/plugins/{@hera/plugin-mobile/src/client/schma-component => @tachybase/plugin-mobile-client/src/client/core/schema/components}/swiper/SwiperBlockInitializer.tsx (93%) rename packages/plugins/{@hera/plugin-mobile/src/client/schma-component => @tachybase/plugin-mobile-client/src/client/core/schema/components}/swiper/SwiperFieldSettings.tsx (98%) rename packages/plugins/{@hera/plugin-mobile/src/client/schma-component => @tachybase/plugin-mobile-client/src/client/core/schema/components}/swiper/SwiperPage.tsx (79%) create mode 100644 packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/swiper/index.ts rename packages/plugins/{@hera/plugin-mobile/src/client/schma-component => @tachybase/plugin-mobile-client/src/client/core/schema/components}/swiper/useSwiperBlockProps.ts (100%) rename packages/plugins/{@hera/plugin-mobile/src/client/schma-component => @tachybase/plugin-mobile-client/src/client/core/schema/components}/tab-search/components/TabSearch.tsx (100%) rename packages/plugins/{@hera/plugin-mobile/src/client/schma-component => @tachybase/plugin-mobile-client/src/client/core/schema/components}/tab-search/components/TabSearchAction.ts (100%) rename packages/plugins/{@hera/plugin-mobile/src/client/schma-component => @tachybase/plugin-mobile-client/src/client/core/schema/components}/tab-search/components/field-item/TabSearchCollapsibleInputItem.tsx (100%) rename packages/plugins/{@hera/plugin-mobile/src/client/schma-component => @tachybase/plugin-mobile-client/src/client/core/schema/components}/tab-search/components/field-item/TabSearchCollapsibleInputItemAction.ts (100%) rename packages/plugins/{@hera/plugin-mobile/src/client/schma-component => @tachybase/plugin-mobile-client/src/client/core/schema/components}/tab-search/components/field-item/TabSearchCollapsibleInputItemChild.tsx (94%) rename packages/plugins/{@hera/plugin-mobile/src/client/schma-component => @tachybase/plugin-mobile-client/src/client/core/schema/components}/tab-search/components/field-item/TabSearchCollapsibleInputMItem.tsx (97%) rename packages/plugins/{@hera/plugin-mobile/src/client/schma-component => @tachybase/plugin-mobile-client/src/client/core/schema/components}/tab-search/components/field-item/TabSearchCollapsibleInputMItemChild.tsx (98%) rename packages/plugins/{@hera/plugin-mobile/src/client/schma-component => @tachybase/plugin-mobile-client/src/client/core/schema/components}/tab-search/components/field-item/TabSearchFieldItem.tsx (100%) rename packages/plugins/{@hera/plugin-mobile/src/client/schma-component => @tachybase/plugin-mobile-client/src/client/core/schema/components}/tab-search/components/field-item/TabSearchFieldItemAction.ts (95%) rename packages/plugins/{@hera/plugin-mobile/src/client/schma-component => @tachybase/plugin-mobile-client/src/client/core/schema/components}/tab-search/components/field-item/TabSearchFieldItemProps.ts (100%) rename packages/plugins/{@hera/plugin-mobile/src/client/schma-component => @tachybase/plugin-mobile-client/src/client/core/schema/components}/tab-search/components/field-item/TabSearchFieldMItem.tsx (100%) rename packages/plugins/{@hera/plugin-mobile/src/client/schma-component => @tachybase/plugin-mobile-client/src/client/core/schema/components}/tab-search/components/field-item/TabSerachFieldItemRelatedProps.tsx (100%) rename packages/plugins/{@hera/plugin-mobile/src/client/schma-component => @tachybase/plugin-mobile-client/src/client/core/schema/components}/tab-search/components/field-item/hooks.tsx (100%) create mode 100644 packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/index.ts create mode 100644 packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/index.ts rename packages/plugins/{@hera/plugin-mobile/src/client/schma-component => @tachybase/plugin-mobile-client/src/client/core/schema/components}/tab-search/create/createTabSearchBlockSchema.ts (100%) rename packages/plugins/{@hera/plugin-mobile/src/client/schma-component => @tachybase/plugin-mobile-client/src/client/core/schema/components}/tab-search/create/createTabSearchItemSchema.ts (100%) create mode 100644 packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/index.ts rename packages/plugins/{@hera/plugin-mobile/src/client/schma-component => @tachybase/plugin-mobile-client/src/client/core/schema/components}/tab-search/initializer/TabSearchBlockInitializer.tsx (100%) rename packages/plugins/{@hera/plugin-mobile/src/client/schma-component => @tachybase/plugin-mobile-client/src/client/core/schema/components}/tab-search/initializer/TabSearchFieldSchemaInitializer.tsx (98%) rename packages/plugins/{@hera/plugin-mobile/src/client/schma-component => @tachybase/plugin-mobile-client/src/client/core/schema/components}/tab-search/initializer/TabSearchFieldSchemaInitializerGadget.tsx (100%) create mode 100644 packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/initializer/index.ts rename packages/plugins/{@hera/plugin-mobile/src/client/schma-component => @tachybase/plugin-mobile-client/src/client/core/schema/components}/tab-search/provider/TabSearchProvider.tsx (100%) create mode 100644 packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/provider/index.ts rename packages/plugins/{@hera/plugin-mobile/src/client/schma-component => @tachybase/plugin-mobile-client/src/client/core/schema/components}/tab-search/settings/TabSearchItemFieldSettings.tsx (99%) create mode 100644 packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/settings/index.ts rename packages/plugins/{@hera/plugin-mobile/src/client/schma-component => @tachybase/plugin-mobile-client/src/client/core/schema/components}/tab-search/utils.ts (100%) diff --git a/packages/plugins/@hera/plugin-mobile/.npmignore b/packages/plugins/@hera/plugin-mobile/.npmignore deleted file mode 100644 index 65f5e8779..000000000 --- a/packages/plugins/@hera/plugin-mobile/.npmignore +++ /dev/null @@ -1,2 +0,0 @@ -/node_modules -/src diff --git a/packages/plugins/@hera/plugin-mobile/README.md b/packages/plugins/@hera/plugin-mobile/README.md deleted file mode 100644 index 4bb676b3d..000000000 --- a/packages/plugins/@hera/plugin-mobile/README.md +++ /dev/null @@ -1 +0,0 @@ -# @hera/plugin-mobile diff --git a/packages/plugins/@hera/plugin-mobile/client.d.ts b/packages/plugins/@hera/plugin-mobile/client.d.ts deleted file mode 100644 index 6c459cbac..000000000 --- a/packages/plugins/@hera/plugin-mobile/client.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from './dist/client'; -export { default } from './dist/client'; diff --git a/packages/plugins/@hera/plugin-mobile/client.js b/packages/plugins/@hera/plugin-mobile/client.js deleted file mode 100644 index b6e3be70e..000000000 --- a/packages/plugins/@hera/plugin-mobile/client.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('./dist/client/index.js'); diff --git a/packages/plugins/@hera/plugin-mobile/package.json b/packages/plugins/@hera/plugin-mobile/package.json deleted file mode 100644 index 77599bd9e..000000000 --- a/packages/plugins/@hera/plugin-mobile/package.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "name": "@hera/plugin-mobile", - "displayName": "Mobile client: Customization", - "version": "1.1.20", - "description": "Provides the ability to configure mobile pages,more professional.", - "main": "dist/server/index.js", - "devDependencies": { - "@ant-design/icons": "5.x", - "@tachybase/schema": "workspace:*", - "@types/lodash": "^4.17.0", - "antd": "5.16.1", - "antd-mobile": "^5.35.0", - "antd-mobile-icons": "^0.3.0", - "classnames": "^2.3.1", - "lodash": "4.17.21", - "react-i18next": "^11.15.1" - }, - "peerDependencies": { - "@nocobase/client": "workspace:*", - "@nocobase/server": "workspace:*", - "@nocobase/test": "workspace:*", - "@nocobase/utils": "workspace:*" - }, - "description.zh-CN": "提提供定制化的移动端页面配置的能力。", - "displayName.zh-CN": "移动端:定制化" -} diff --git a/packages/plugins/@hera/plugin-mobile/server.d.ts b/packages/plugins/@hera/plugin-mobile/server.d.ts deleted file mode 100644 index c41081ddc..000000000 --- a/packages/plugins/@hera/plugin-mobile/server.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from './dist/server'; -export { default } from './dist/server'; diff --git a/packages/plugins/@hera/plugin-mobile/server.js b/packages/plugins/@hera/plugin-mobile/server.js deleted file mode 100644 index 972842039..000000000 --- a/packages/plugins/@hera/plugin-mobile/server.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('./dist/server/index.js'); diff --git a/packages/plugins/@hera/plugin-mobile/src/client/common/plugin.ts b/packages/plugins/@hera/plugin-mobile/src/client/common/plugin.ts deleted file mode 100644 index 9f2b8e3ca..000000000 --- a/packages/plugins/@hera/plugin-mobile/src/client/common/plugin.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { Plugin, tval } from '@nocobase/client'; - -class PluginCommon extends Plugin { - async afterAdd() {} - async beforeLoad() {} - - async load() { - // 扩展原移动端插件的 block 类型 - this.app.schemaInitializerManager.addItem('mobilePage:addBlock', 'filterBlocks', { - title: tval('Filter blocks'), - type: 'itemGroup', - children: [], - }); - } -} - -export default PluginCommon; diff --git a/packages/plugins/@hera/plugin-mobile/src/client/index.tsx b/packages/plugins/@hera/plugin-mobile/src/client/index.tsx deleted file mode 100644 index c349f71ab..000000000 --- a/packages/plugins/@hera/plugin-mobile/src/client/index.tsx +++ /dev/null @@ -1,24 +0,0 @@ -import { Plugin } from '@nocobase/client'; -import PluginCommon from './common/plugin'; -import PluginBlock from './schma-block'; -import PluginImageSearch from './schma-component/image-search/plugin'; -import PluginSwiper from './schma-component/swiper'; -import PluginTabSearch from './schma-component/tab-search'; -import './assets/svg/index'; - -class PluginMobileClient extends Plugin { - async afterAdd() { - this.pm.add(PluginCommon); - this.pm.add(PluginBlock); - this.pm.add(PluginTabSearch); - this.pm.add(PluginSwiper); - this.pm.add(PluginImageSearch); - // this.app.router.add() - } - - async beforeLoad() {} - - async load() {} -} - -export default PluginMobileClient; diff --git a/packages/plugins/@hera/plugin-mobile/src/client/locale.tsx b/packages/plugins/@hera/plugin-mobile/src/client/locale.tsx deleted file mode 100644 index 6941f42af..000000000 --- a/packages/plugins/@hera/plugin-mobile/src/client/locale.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import { useApp, tval as nTval, i18n } from '@nocobase/client'; - -const NAMESPACE = '@hera/plugin-mobile'; - -export const useTranslation = (): any => { - const { i18n } = useApp(); - const t = (key: string, props = {}) => i18n.t(key, { ns: NAMESPACE, ...props }); - return { t }; -}; - -export const tval = (key: string) => nTval(key, { ns: NAMESPACE }); - -export function lang(key: string) { - return i18n.t(key, { ns: NAMESPACE }); -} diff --git a/packages/plugins/@hera/plugin-mobile/src/client/schma-block/index.tsx b/packages/plugins/@hera/plugin-mobile/src/client/schma-block/index.tsx deleted file mode 100644 index 0a96a9b4e..000000000 --- a/packages/plugins/@hera/plugin-mobile/src/client/schma-block/index.tsx +++ /dev/null @@ -1,19 +0,0 @@ -import { Plugin } from '@nocobase/client'; -import { NoticeBlock, NoticeBlockInitializer } from './schema-initializer/NoticeBlockInitializer'; - -class PluginBlock extends Plugin { - async load() { - this.app.addComponents({ - NoticeBlock, - NoticeBlockInitializer, - }); - this.app.schemaInitializerManager.addItem('MBlockInitializers', 'dataBlocks.notice', { - title: 'notice', - name: 'notice', - type: 'item', - Component: 'NoticeBlockInitializer', - }); - } -} - -export default PluginBlock; diff --git a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/image-search/plugin.ts b/packages/plugins/@hera/plugin-mobile/src/client/schma-component/image-search/plugin.ts deleted file mode 100644 index b7d3a8ec5..000000000 --- a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/image-search/plugin.ts +++ /dev/null @@ -1,40 +0,0 @@ -import { Plugin } from '@nocobase/client'; -import { ImageSearchView } from './ImageSearch.view'; -import { ImageSearchInitializer } from './ImageSearch.initializer'; -import { ImageSearchConfigureFields } from './ImageSearch.configure'; -import { ImageSearchProvider } from './ImageSearch.provider'; -import { ImageSearchItemIntializer } from './search-item/ImageSearchItem.intializer'; -import { ImageSearchItemToolbar } from './search-item/ImageSearchItem.toolbar'; -import { ImageSearchItemView } from './search-item/ImageSearchItem.view'; -import { ImageSearchItemFieldSettings } from './search-item/ImageSearchItem.setting'; -import { usePropsOptionalImageSearchItemField } from './search-item/useProps.Optional'; -import { usePropsRelatedImageSearchItemField } from './search-item/useProps.Related'; - -class PluginImageSearch extends Plugin { - async load() { - this.app.addScopes({ - usePropsOptionalImageSearchItemField: usePropsOptionalImageSearchItemField, - usePropsRelatedImageSearchItemField: usePropsRelatedImageSearchItemField, - }); - this.app.addComponents({ - ImageSearchView: ImageSearchView, - ImageSearchInitializer: ImageSearchInitializer, - ImageSearchProvider: ImageSearchProvider, - ImageSearchItemIntializer: ImageSearchItemIntializer, - ImageSearchItemToolbar: ImageSearchItemToolbar, - ImageSearchItemView: ImageSearchItemView, - }); - - this.app.schemaInitializerManager.add(ImageSearchConfigureFields); - this.schemaSettingsManager.add(ImageSearchItemFieldSettings); - - this.app.schemaInitializerManager.addItem('mobilePage:addBlock', 'filterBlocks.imageSearch', { - name: 'imageSearch', - title: 'imageSearch', - icon: 'tab-search', - Component: 'ImageSearchInitializer', - }); - } -} - -export default PluginImageSearch; diff --git a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/swiper/index.ts b/packages/plugins/@hera/plugin-mobile/src/client/schma-component/swiper/index.ts deleted file mode 100644 index 69b7a88f7..000000000 --- a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/swiper/index.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { Plugin } from '@nocobase/client'; -import { SwiperBlockInitializer } from './SwiperBlockInitializer'; -import { SwiperBlock } from './SwiperBlock'; -import { SwiperFieldSettings } from './SwiperFieldSettings'; -import { useSwiperBlockProps } from './useSwiperBlockProps'; -import { SwiperPage } from './SwiperPage'; - -class PluginSwiper extends Plugin { - async load() { - this.app.addScopes({ - useSwiperBlockProps, - }); - this.app.addComponents({ - SwiperBlockInitializer, - SwiperBlock, - SwiperPage, - }); - - this.app.schemaInitializerManager.addItem('mobilePage:addBlock', 'dataBlocks.swiper', { - title: 'swiper', - name: 'swiper', - type: 'item', - Component: 'SwiperBlockInitializer', - }); - this.app.schemaSettingsManager.add(SwiperFieldSettings); - this.app.router.add('mobile.swiper.page', { - path: '/mobile/:name/image/:collection/:field/:fieldParams', - Component: 'SwiperPage', - }); - } -} - -export default PluginSwiper; diff --git a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/tab-search/index.ts b/packages/plugins/@hera/plugin-mobile/src/client/schma-component/tab-search/index.ts deleted file mode 100644 index ab556eabd..000000000 --- a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/tab-search/index.ts +++ /dev/null @@ -1,47 +0,0 @@ -import { Plugin } from '@nocobase/client'; -import { TabSearch } from './components/TabSearch'; -import { TabSearchProvider } from './provider/TabSearchProvider'; -import { TabSearchBlockInitializer } from './initializer/TabSearchBlockInitializer'; -import { TabSearchFieldItem } from './components/field-item/TabSearchFieldItem'; -import { TabSearchCollapsibleInputItem } from './components/field-item/TabSearchCollapsibleInputItem'; -import { TabSearchFieldSchemaInitializerGadget } from './initializer/TabSearchFieldSchemaInitializerGadget'; -import { useTabSearchFieldItemRelatedProps } from './components/field-item/TabSerachFieldItemRelatedProps'; -import { useTabSearchFieldItemProps } from './components/field-item/TabSearchFieldItemProps'; -import { TabSearchFieldSchemaInitializer } from './initializer/TabSearchFieldSchemaInitializer'; -import { TabSearchItemFieldSettings } from './settings/TabSearchItemFieldSettings'; -import { TabSearchFieldMItem } from './components/field-item/TabSearchFieldMItem'; -import { TabSearchCollapsibleInputMItem } from './components/field-item/TabSearchCollapsibleInputMItem'; - -class PluginTabSearch extends Plugin { - async load() { - this.app.addScopes({ - useTabSearchFieldItemProps, - useTabSearchFieldItemRelatedProps, - }); - - this.app.addComponents({ - TabSearch, - TabSearchProvider, - TabSearchBlockInitializer, - TabSearchFieldItem, - TabSearchFieldMItem, - TabSearchCollapsibleInputItem, - TabSearchCollapsibleInputMItem, - TabSearchFieldSchemaInitializerGadget, - }); - this.app.schemaInitializerManager.add(TabSearchFieldSchemaInitializer); - this.schemaSettingsManager.add(TabSearchItemFieldSettings); - this.app.schemaInitializerManager.addItem('mobilePage:addBlock', 'filterBlocks.tabSearch', { - name: 'tabSearch', - title: 'tabSearch', - Component: 'TabSearchBlockInitializer', - }); - this.app.schemaInitializerManager.addItem('page:addBlock', 'filterBlocks.tabSearch', { - name: 'tabSearch', - title: 'tabSearch', - Component: 'TabSearchBlockInitializer', - }); - } -} - -export default PluginTabSearch; diff --git a/packages/plugins/@hera/plugin-mobile/src/index.ts b/packages/plugins/@hera/plugin-mobile/src/index.ts deleted file mode 100644 index 7e74612df..000000000 --- a/packages/plugins/@hera/plugin-mobile/src/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from './server'; -export { default } from './server'; diff --git a/packages/plugins/@hera/plugin-mobile/src/locale/en-US.json b/packages/plugins/@hera/plugin-mobile/src/locale/en-US.json deleted file mode 100644 index 556f51607..000000000 --- a/packages/plugins/@hera/plugin-mobile/src/locale/en-US.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "Choices fields":"Choices fields", - "Text fields":"Text fields", - "Generic properties":"Generic properties", - "Search":"Search", - "Please enter search content":"Please enter search content", - "Title field":"Title field", - "Set show field":"Set show field", - "Set field count":"Set field count", - "Configure field": "Configure field", - "Configure fields": "Configure fields", - "Configure columns": "Configure columns", - "Add block": "Add block", - "all": "all", - "AllProducts": "AllProducts", - "sort":"sort" -} diff --git a/packages/plugins/@hera/plugin-mobile/src/locale/zh-CN.json b/packages/plugins/@hera/plugin-mobile/src/locale/zh-CN.json deleted file mode 100644 index d055f6fd1..000000000 --- a/packages/plugins/@hera/plugin-mobile/src/locale/zh-CN.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "Choices fields":"选择字段", - "Text fields":"文本字段", - "Generic properties":"通用属性", - "Search":"搜索", - "Please enter search content":"请输入查询内容", - "Title field":"标题字段", - "Set show field":"设置展示字段", - "Set field count":"设置展示数量", - "Configure field": "配置字段", - "Configure fields": "配置字段", - "Configure columns": "配置字段", - "Add block": "创建区块", - "all": "全部", - "AllProducts": "全部商品", - "sort": "排序" -} diff --git a/packages/plugins/@hera/plugin-mobile/src/server/collections/.gitkeep b/packages/plugins/@hera/plugin-mobile/src/server/collections/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/packages/plugins/@hera/plugin-mobile/src/server/index.ts b/packages/plugins/@hera/plugin-mobile/src/server/index.ts deleted file mode 100644 index b68aea57f..000000000 --- a/packages/plugins/@hera/plugin-mobile/src/server/index.ts +++ /dev/null @@ -1 +0,0 @@ -export { default } from './plugin'; diff --git a/packages/plugins/@hera/plugin-mobile/src/server/plugin.ts b/packages/plugins/@hera/plugin-mobile/src/server/plugin.ts deleted file mode 100644 index b078ebcee..000000000 --- a/packages/plugins/@hera/plugin-mobile/src/server/plugin.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { Plugin } from '@nocobase/server'; - -export class PluginMobileServer extends Plugin { - async afterAdd() {} - - async beforeLoad() {} - - async load() {} - - async install() {} - - async afterEnable() {} - - async afterDisable() {} - - async remove() {} -} - -export default PluginMobileServer; diff --git a/packages/plugins/@tachybase/plugin-mobile-client/package.json b/packages/plugins/@tachybase/plugin-mobile-client/package.json index ab73fb9e5..1af3c8867 100644 --- a/packages/plugins/@tachybase/plugin-mobile-client/package.json +++ b/packages/plugins/@tachybase/plugin-mobile-client/package.json @@ -14,6 +14,7 @@ "ahooks": "3.x", "antd": "5.16.1", "antd-mobile": "^5.35.0", + "antd-mobile-icons": "^0.3.0", "antd-style": "3.x", "classnames": "2.x", "lodash": "4.17.21", diff --git a/packages/plugins/@hera/plugin-mobile/src/client/assets/svg/index.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/assets/svg/index.tsx similarity index 100% rename from packages/plugins/@hera/plugin-mobile/src/client/assets/svg/index.tsx rename to packages/plugins/@tachybase/plugin-mobile-client/src/client/core/assets/svg/index.tsx diff --git a/packages/plugins/@hera/plugin-mobile/src/client/assets/svg/notice.svg b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/assets/svg/notice.svg similarity index 100% rename from packages/plugins/@hera/plugin-mobile/src/client/assets/svg/notice.svg rename to packages/plugins/@tachybase/plugin-mobile-client/src/client/core/assets/svg/notice.svg diff --git a/packages/plugins/@hera/plugin-mobile/src/client/assets/svg/swiper.svg b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/assets/svg/swiper.svg similarity index 100% rename from packages/plugins/@hera/plugin-mobile/src/client/assets/svg/swiper.svg rename to packages/plugins/@tachybase/plugin-mobile-client/src/client/core/assets/svg/swiper.svg diff --git a/packages/plugins/@hera/plugin-mobile/src/client/assets/svg/tab-search.svg b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/assets/svg/tab-search.svg similarity index 100% rename from packages/plugins/@hera/plugin-mobile/src/client/assets/svg/tab-search.svg rename to packages/plugins/@tachybase/plugin-mobile-client/src/client/core/assets/svg/tab-search.svg diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/index.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/index.tsx index c8597ef2f..cd9671b4f 100644 --- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/index.tsx +++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/index.tsx @@ -11,8 +11,31 @@ import { MSettings, useGridCardBlockItemProps, useGridCardBlockProps, + TabSearch, + TabSearchProvider, + TabSearchBlockInitializer, + TabSearchFieldItem, + TabSearchFieldMItem, + TabSearchCollapsibleInputItem, + TabSearchCollapsibleInputMItem, + TabSearchFieldSchemaInitializerGadget, + SwiperBlockInitializer, + SwiperBlock, + SwiperPage, + ImageSearchView, + ImageSearchInitializer, + ImageSearchProvider, + ImageSearchItemIntializer, + ImageSearchItemToolbar, + ImageSearchItemView, + NoticeBlock, + NoticeBlockInitializer, + useSwiperBlockProps, + usePropsOptionalImageSearchItemField, + usePropsRelatedImageSearchItemField, } from './schema'; import './bridge'; +import './assets/svg'; export const MobileCore: React.FC = (props) => { return ( @@ -26,10 +49,32 @@ export const MobileCore: React.FC = (props) => { MPage, MHeader, MSettings, + TabSearch, + TabSearchProvider, + TabSearchBlockInitializer, + TabSearchFieldItem, + TabSearchFieldMItem, + TabSearchCollapsibleInputItem, + TabSearchCollapsibleInputMItem, + TabSearchFieldSchemaInitializerGadget, + SwiperBlockInitializer, + SwiperBlock, + SwiperPage, + ImageSearchView: ImageSearchView, + ImageSearchInitializer: ImageSearchInitializer, + ImageSearchProvider: ImageSearchProvider, + ImageSearchItemIntializer: ImageSearchItemIntializer, + ImageSearchItemToolbar: ImageSearchItemToolbar, + ImageSearchItemView: ImageSearchItemView, + // NoticeBlock, + // NoticeBlockInitializer, }} scope={{ useGridCardBlockItemProps, useGridCardBlockProps, + useSwiperBlockProps, + usePropsOptionalImageSearchItemField: usePropsOptionalImageSearchItemField, + usePropsRelatedImageSearchItemField: usePropsRelatedImageSearchItemField, }} > {props.children} diff --git a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/image-search/ImageSearch.configure.ts b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/ImageSearch.configure.ts similarity index 93% rename from packages/plugins/@hera/plugin-mobile/src/client/schma-component/image-search/ImageSearch.configure.ts rename to packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/ImageSearch.configure.ts index ed6ff233e..825f18d23 100644 --- a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/image-search/ImageSearch.configure.ts +++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/ImageSearch.configure.ts @@ -1,19 +1,18 @@ import { SchemaInitializer, useCollection, useCollectionManager } from '@nocobase/client'; -import { tval } from '../../locale'; import { useIsMobile } from '../tab-search/components/field-item/hooks'; import { canBeOptionalField, canBeRelatedField } from '../tab-search/utils'; import { createSchemaImageSearchItem } from './search-item/ImageSearchItem.schema'; export const ImageSearchConfigureFields = new SchemaInitializer({ name: 'ImageSearchView:configureFields', - title: tval('Configure fields'), + title: '{{t("Configure fields")}}', style: { marginTop: 16 }, icon: 'SettingOutlined', items: [ { name: 'choicesFields', type: 'itemGroup', - title: tval('Choices fields'), + title: '{{t("Choices fields")}}', useChildren: useChildrenChoicesFieldSchemas, }, ], diff --git a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/image-search/ImageSearch.initializer.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/ImageSearch.initializer.tsx similarity index 100% rename from packages/plugins/@hera/plugin-mobile/src/client/schma-component/image-search/ImageSearch.initializer.tsx rename to packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/ImageSearch.initializer.tsx diff --git a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/image-search/ImageSearch.provider.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/ImageSearch.provider.tsx similarity index 100% rename from packages/plugins/@hera/plugin-mobile/src/client/schma-component/image-search/ImageSearch.provider.tsx rename to packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/ImageSearch.provider.tsx diff --git a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/image-search/ImageSearch.schema.ts b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/ImageSearch.schema.ts similarity index 100% rename from packages/plugins/@hera/plugin-mobile/src/client/schma-component/image-search/ImageSearch.schema.ts rename to packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/ImageSearch.schema.ts diff --git a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/image-search/ImageSearch.view.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/ImageSearch.view.tsx similarity index 100% rename from packages/plugins/@hera/plugin-mobile/src/client/schma-component/image-search/ImageSearch.view.tsx rename to packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/ImageSearch.view.tsx diff --git a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/image-search/data.ts b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/data.ts similarity index 100% rename from packages/plugins/@hera/plugin-mobile/src/client/schma-component/image-search/data.ts rename to packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/data.ts diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/hooks/index.ts b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/hooks/index.ts new file mode 100644 index 000000000..e53fa9d3c --- /dev/null +++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/hooks/index.ts @@ -0,0 +1,2 @@ +export * from './useAction.ImageSearchItemView'; +export * from './useSelect'; diff --git a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/image-search/hooks/useAction.ImageSearchItemView.ts b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/hooks/useAction.ImageSearchItemView.ts similarity index 96% rename from packages/plugins/@hera/plugin-mobile/src/client/schma-component/image-search/hooks/useAction.ImageSearchItemView.ts rename to packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/hooks/useAction.ImageSearchItemView.ts index 9cb34a4e3..a851d4cc0 100644 --- a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/image-search/hooks/useAction.ImageSearchItemView.ts +++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/hooks/useAction.ImageSearchItemView.ts @@ -1,7 +1,7 @@ import { useCollection, useDesigner } from '@nocobase/client'; import { useFieldSchema } from '@tachybase/schema'; import React from 'react'; -import { useTranslation } from '../../../locale'; +import { useTranslation } from '../../../../../locale'; export function useActionImageSearchItemView(props) { const { list, onSelected, valueKey: _valueKey, labelKey: _labelKey, filterKey } = props; diff --git a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/image-search/hooks/useSelect.ts b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/hooks/useSelect.ts similarity index 100% rename from packages/plugins/@hera/plugin-mobile/src/client/schma-component/image-search/hooks/useSelect.ts rename to packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/hooks/useSelect.ts diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/index.ts b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/index.ts new file mode 100644 index 000000000..11d893461 --- /dev/null +++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/index.ts @@ -0,0 +1,8 @@ +export * from './ImageSearch.configure'; +export * from './ImageSearch.initializer'; +export * from './ImageSearch.provider'; +export * from './ImageSearch.schema'; +export * from './ImageSearch.view'; +export * from './data'; +export * from './hooks'; +export * from './search-item'; diff --git a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/image-search/search-item/ImageSearchItem.intializer.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/search-item/ImageSearchItem.intializer.tsx similarity index 100% rename from packages/plugins/@hera/plugin-mobile/src/client/schma-component/image-search/search-item/ImageSearchItem.intializer.tsx rename to packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/search-item/ImageSearchItem.intializer.tsx diff --git a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/image-search/search-item/ImageSearchItem.schema.ts b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/search-item/ImageSearchItem.schema.ts similarity index 100% rename from packages/plugins/@hera/plugin-mobile/src/client/schma-component/image-search/search-item/ImageSearchItem.schema.ts rename to packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/search-item/ImageSearchItem.schema.ts diff --git a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/image-search/search-item/ImageSearchItem.setting.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/search-item/ImageSearchItem.setting.tsx similarity index 99% rename from packages/plugins/@hera/plugin-mobile/src/client/schma-component/image-search/search-item/ImageSearchItem.setting.tsx rename to packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/search-item/ImageSearchItem.setting.tsx index cf6483147..e317371c2 100644 --- a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/image-search/search-item/ImageSearchItem.setting.tsx +++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/search-item/ImageSearchItem.setting.tsx @@ -9,7 +9,7 @@ import { } from '@nocobase/client'; import { useField, useFieldSchema } from '@tachybase/schema'; import _ from 'lodash'; -import { useTranslation } from '../../../locale'; +import { useTranslation } from '../../../../../locale'; import { isTabSearchCollapsibleInputItem } from '../../tab-search/utils'; export const ImageSearchItemFieldSettings = new SchemaSettings({ diff --git a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/image-search/search-item/ImageSearchItem.toolbar.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/search-item/ImageSearchItem.toolbar.tsx similarity index 100% rename from packages/plugins/@hera/plugin-mobile/src/client/schma-component/image-search/search-item/ImageSearchItem.toolbar.tsx rename to packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/search-item/ImageSearchItem.toolbar.tsx diff --git a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/image-search/search-item/ImageSearchItem.view.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/search-item/ImageSearchItem.view.tsx similarity index 100% rename from packages/plugins/@hera/plugin-mobile/src/client/schma-component/image-search/search-item/ImageSearchItem.view.tsx rename to packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/search-item/ImageSearchItem.view.tsx diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/search-item/index.ts b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/search-item/index.ts new file mode 100644 index 000000000..9272ebeba --- /dev/null +++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/search-item/index.ts @@ -0,0 +1,7 @@ +export * from './ImageSearchItem.intializer'; +export * from './ImageSearchItem.schema'; +export * from './ImageSearchItem.setting'; +export * from './ImageSearchItem.toolbar'; +export * from './ImageSearchItem.view'; +export * from './useProps.Optional'; +export * from './useProps.Related'; diff --git a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/image-search/search-item/useProps.Optional.ts b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/search-item/useProps.Optional.ts similarity index 100% rename from packages/plugins/@hera/plugin-mobile/src/client/schma-component/image-search/search-item/useProps.Optional.ts rename to packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/search-item/useProps.Optional.ts diff --git a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/image-search/search-item/useProps.Related.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/search-item/useProps.Related.tsx similarity index 100% rename from packages/plugins/@hera/plugin-mobile/src/client/schma-component/image-search/search-item/useProps.Related.tsx rename to packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/search-item/useProps.Related.tsx diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/index.ts b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/index.ts index 3289ab988..23f344029 100644 --- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/index.ts +++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/index.ts @@ -4,3 +4,7 @@ export * from './tab-bar'; export * from './page'; export * from './header'; export * from './settings'; +export * from './image-search'; +export * from './swiper'; +export * from './tab-search'; +export * from './notice'; diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/notice/index.ts b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/notice/index.ts new file mode 100644 index 000000000..6a3cff170 --- /dev/null +++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/notice/index.ts @@ -0,0 +1 @@ +export * from './schema-initializer'; diff --git a/packages/plugins/@hera/plugin-mobile/src/client/schma-block/schema-create/createGridCardBlockSchma.ts b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/notice/schema-create/createGridCardBlockSchma.ts similarity index 100% rename from packages/plugins/@hera/plugin-mobile/src/client/schma-block/schema-create/createGridCardBlockSchma.ts rename to packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/notice/schema-create/createGridCardBlockSchma.ts diff --git a/packages/plugins/@hera/plugin-mobile/src/client/schma-block/schema-initializer/NoticeBlockInitializer.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/notice/schema-initializer/NoticeBlockInitializer.tsx similarity index 95% rename from packages/plugins/@hera/plugin-mobile/src/client/schma-block/schema-initializer/NoticeBlockInitializer.tsx rename to packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/notice/schema-initializer/NoticeBlockInitializer.tsx index 0cbe3276a..74831abb4 100644 --- a/packages/plugins/@hera/plugin-mobile/src/client/schma-block/schema-initializer/NoticeBlockInitializer.tsx +++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/notice/schema-initializer/NoticeBlockInitializer.tsx @@ -8,7 +8,7 @@ import { } from '@nocobase/client'; import { NoticeBar } from 'antd-mobile'; import { createGridCardBlockSchema } from '../schema-create/createGridCardBlockSchma'; -import { NoticeIcon } from '../../assets/svg'; +import { NoticeIcon } from '../../../../assets/svg'; export const NoticeBlock = () => { return ; diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/notice/schema-initializer/index.ts b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/notice/schema-initializer/index.ts new file mode 100644 index 000000000..d2b75ddcc --- /dev/null +++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/notice/schema-initializer/index.ts @@ -0,0 +1 @@ +export * from './NoticeBlockInitializer'; diff --git a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/swiper/SwiperBlock.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/swiper/SwiperBlock.tsx similarity index 94% rename from packages/plugins/@hera/plugin-mobile/src/client/schma-component/swiper/SwiperBlock.tsx rename to packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/swiper/SwiperBlock.tsx index 40c03d950..5b48f938f 100644 --- a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/swiper/SwiperBlock.tsx +++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/swiper/SwiperBlock.tsx @@ -1,7 +1,6 @@ import { BlockItem, css, useDesignable, useRequest, withDynamicSchemaProps } from '@nocobase/client'; -import { useFieldSchema } from '@tachybase/schema'; import { Swiper } from 'antd-mobile'; -import React, { useEffect, useState } from 'react'; +import React from 'react'; export const SwiperBlock = withDynamicSchemaProps((props) => { const { fieldValue, data, changeNav } = props; diff --git a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/swiper/SwiperBlockInitializer.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/swiper/SwiperBlockInitializer.tsx similarity index 93% rename from packages/plugins/@hera/plugin-mobile/src/client/schma-component/swiper/SwiperBlockInitializer.tsx rename to packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/swiper/SwiperBlockInitializer.tsx index 433c4186e..47f08b4f8 100644 --- a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/swiper/SwiperBlockInitializer.tsx +++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/swiper/SwiperBlockInitializer.tsx @@ -6,7 +6,6 @@ import { useSchemaInitializerItem, } from '@nocobase/client'; import React from 'react'; -import { createGridCardBlockSchema } from '../../schma-block/schema-create/createGridCardBlockSchma'; import { ISchema } from '@tachybase/schema'; import { Toast } from 'antd-mobile'; diff --git a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/swiper/SwiperFieldSettings.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/swiper/SwiperFieldSettings.tsx similarity index 98% rename from packages/plugins/@hera/plugin-mobile/src/client/schma-component/swiper/SwiperFieldSettings.tsx rename to packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/swiper/SwiperFieldSettings.tsx index da814cf47..7f554f289 100644 --- a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/swiper/SwiperFieldSettings.tsx +++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/swiper/SwiperFieldSettings.tsx @@ -8,7 +8,7 @@ import { } from '@nocobase/client'; import { useField, useFieldSchema } from '@tachybase/schema'; import _ from 'lodash'; -import { useTranslation } from '../../locale'; +import { useTranslation } from '../../../../locale'; export const SwiperFieldSettings = new SchemaSettings({ name: 'SwiperFieldSettings', diff --git a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/swiper/SwiperPage.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/swiper/SwiperPage.tsx similarity index 79% rename from packages/plugins/@hera/plugin-mobile/src/client/schma-component/swiper/SwiperPage.tsx rename to packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/swiper/SwiperPage.tsx index 489114f74..98f444987 100644 --- a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/swiper/SwiperPage.tsx +++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/swiper/SwiperPage.tsx @@ -1,9 +1,4 @@ -import { - CollectionRecordProvider, - DataBlockProvider, - RemoteSchemaComponent, - useCollectionRecord, -} from '@nocobase/client'; +import { CollectionRecordProvider, DataBlockProvider, RemoteSchemaComponent } from '@nocobase/client'; import React from 'react'; import { useParams } from 'react-router-dom'; diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/swiper/index.ts b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/swiper/index.ts new file mode 100644 index 000000000..fcb7229e4 --- /dev/null +++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/swiper/index.ts @@ -0,0 +1,5 @@ +export * from './SwiperBlock'; +export * from './SwiperBlockInitializer'; +export * from './SwiperFieldSettings'; +export * from './SwiperPage'; +export * from './useSwiperBlockProps'; diff --git a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/swiper/useSwiperBlockProps.ts b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/swiper/useSwiperBlockProps.ts similarity index 100% rename from packages/plugins/@hera/plugin-mobile/src/client/schma-component/swiper/useSwiperBlockProps.ts rename to packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/swiper/useSwiperBlockProps.ts diff --git a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/tab-search/components/TabSearch.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/TabSearch.tsx similarity index 100% rename from packages/plugins/@hera/plugin-mobile/src/client/schma-component/tab-search/components/TabSearch.tsx rename to packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/TabSearch.tsx diff --git a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/tab-search/components/TabSearchAction.ts b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/TabSearchAction.ts similarity index 100% rename from packages/plugins/@hera/plugin-mobile/src/client/schma-component/tab-search/components/TabSearchAction.ts rename to packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/TabSearchAction.ts diff --git a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/tab-search/components/field-item/TabSearchCollapsibleInputItem.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSearchCollapsibleInputItem.tsx similarity index 100% rename from packages/plugins/@hera/plugin-mobile/src/client/schma-component/tab-search/components/field-item/TabSearchCollapsibleInputItem.tsx rename to packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSearchCollapsibleInputItem.tsx diff --git a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/tab-search/components/field-item/TabSearchCollapsibleInputItemAction.ts b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSearchCollapsibleInputItemAction.ts similarity index 100% rename from packages/plugins/@hera/plugin-mobile/src/client/schma-component/tab-search/components/field-item/TabSearchCollapsibleInputItemAction.ts rename to packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSearchCollapsibleInputItemAction.ts diff --git a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/tab-search/components/field-item/TabSearchCollapsibleInputItemChild.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSearchCollapsibleInputItemChild.tsx similarity index 94% rename from packages/plugins/@hera/plugin-mobile/src/client/schma-component/tab-search/components/field-item/TabSearchCollapsibleInputItemChild.tsx rename to packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSearchCollapsibleInputItemChild.tsx index cc085a8a6..cafea7c01 100644 --- a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/tab-search/components/field-item/TabSearchCollapsibleInputItemChild.tsx +++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSearchCollapsibleInputItemChild.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { Button, Col, Divider, Input, Select } from 'antd'; -import { useTranslation } from '../../../../locale'; +import { useTranslation } from '../../../../../../locale'; export const ISelect = (props) => { const { options, onChange } = props; diff --git a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/tab-search/components/field-item/TabSearchCollapsibleInputMItem.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSearchCollapsibleInputMItem.tsx similarity index 97% rename from packages/plugins/@hera/plugin-mobile/src/client/schma-component/tab-search/components/field-item/TabSearchCollapsibleInputMItem.tsx rename to packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSearchCollapsibleInputMItem.tsx index a4e442056..701677c83 100644 --- a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/tab-search/components/field-item/TabSearchCollapsibleInputMItem.tsx +++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSearchCollapsibleInputMItem.tsx @@ -4,7 +4,7 @@ import React from 'react'; import { useTabSearchCollapsibleInputItemAction } from './TabSearchCollapsibleInputItemAction'; import { IButton, IDatePicker, IInput, ISelect } from './TabSearchCollapsibleInputMItemChild'; import { canBeDataField } from '../../utils'; -import { useTranslation } from '../../../../locale'; +import { useTranslation } from '../../../../../../locale'; export const TabSearchCollapsibleInputMItem = withDynamicSchemaProps( (props) => { diff --git a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/tab-search/components/field-item/TabSearchCollapsibleInputMItemChild.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSearchCollapsibleInputMItemChild.tsx similarity index 98% rename from packages/plugins/@hera/plugin-mobile/src/client/schma-component/tab-search/components/field-item/TabSearchCollapsibleInputMItemChild.tsx rename to packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSearchCollapsibleInputMItemChild.tsx index 661c6f1e9..d22007359 100644 --- a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/tab-search/components/field-item/TabSearchCollapsibleInputMItemChild.tsx +++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSearchCollapsibleInputMItemChild.tsx @@ -1,5 +1,5 @@ import React, { useState } from 'react'; -import { useTranslation } from '../../../../locale'; +import { useTranslation } from '../../../../../../locale'; import { Grid, Divider, Picker, Input, Space, ActionSheet, DatePicker, CalendarPicker } from 'antd-mobile'; import { DownOutline } from 'antd-mobile-icons'; import type { Action } from 'antd-mobile/es/components/action-sheet'; diff --git a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/tab-search/components/field-item/TabSearchFieldItem.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSearchFieldItem.tsx similarity index 100% rename from packages/plugins/@hera/plugin-mobile/src/client/schma-component/tab-search/components/field-item/TabSearchFieldItem.tsx rename to packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSearchFieldItem.tsx diff --git a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/tab-search/components/field-item/TabSearchFieldItemAction.ts b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSearchFieldItemAction.ts similarity index 95% rename from packages/plugins/@hera/plugin-mobile/src/client/schma-component/tab-search/components/field-item/TabSearchFieldItemAction.ts rename to packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSearchFieldItemAction.ts index 56dc9ca0f..cb77fef8c 100644 --- a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/tab-search/components/field-item/TabSearchFieldItemAction.ts +++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSearchFieldItemAction.ts @@ -2,7 +2,7 @@ import React from 'react'; import { MenuProps } from 'antd'; import { useCollection, useDesigner } from '@nocobase/client'; import { useFieldSchema } from '@tachybase/schema'; -import { useTranslation } from '../../../../locale'; +import { useTranslation } from '../../../../../../locale'; export const useTabSearchFieldItemAction = (props) => { const { list, onSelected, valueKey: _valueKey, labelKey: _labelKey, filterKey } = props; diff --git a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/tab-search/components/field-item/TabSearchFieldItemProps.ts b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSearchFieldItemProps.ts similarity index 100% rename from packages/plugins/@hera/plugin-mobile/src/client/schma-component/tab-search/components/field-item/TabSearchFieldItemProps.ts rename to packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSearchFieldItemProps.ts diff --git a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/tab-search/components/field-item/TabSearchFieldMItem.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSearchFieldMItem.tsx similarity index 100% rename from packages/plugins/@hera/plugin-mobile/src/client/schma-component/tab-search/components/field-item/TabSearchFieldMItem.tsx rename to packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSearchFieldMItem.tsx diff --git a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/tab-search/components/field-item/TabSerachFieldItemRelatedProps.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSerachFieldItemRelatedProps.tsx similarity index 100% rename from packages/plugins/@hera/plugin-mobile/src/client/schma-component/tab-search/components/field-item/TabSerachFieldItemRelatedProps.tsx rename to packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSerachFieldItemRelatedProps.tsx diff --git a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/tab-search/components/field-item/hooks.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/hooks.tsx similarity index 100% rename from packages/plugins/@hera/plugin-mobile/src/client/schma-component/tab-search/components/field-item/hooks.tsx rename to packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/hooks.tsx diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/index.ts b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/index.ts new file mode 100644 index 000000000..8c0046401 --- /dev/null +++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/index.ts @@ -0,0 +1,6 @@ +export * from './TabSearchCollapsibleInputItem'; +export * from './TabSearchCollapsibleInputMItem'; +export * from './TabSearchFieldItem'; +export * from './TabSearchFieldItemProps'; +export * from './TabSearchFieldMItem'; +export * from './TabSerachFieldItemRelatedProps'; diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/index.ts b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/index.ts new file mode 100644 index 000000000..a739ba602 --- /dev/null +++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/index.ts @@ -0,0 +1,3 @@ +export * from './TabSearch'; +export * from './TabSearchAction'; +export * from './field-item'; diff --git a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/tab-search/create/createTabSearchBlockSchema.ts b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/create/createTabSearchBlockSchema.ts similarity index 100% rename from packages/plugins/@hera/plugin-mobile/src/client/schma-component/tab-search/create/createTabSearchBlockSchema.ts rename to packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/create/createTabSearchBlockSchema.ts diff --git a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/tab-search/create/createTabSearchItemSchema.ts b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/create/createTabSearchItemSchema.ts similarity index 100% rename from packages/plugins/@hera/plugin-mobile/src/client/schma-component/tab-search/create/createTabSearchItemSchema.ts rename to packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/create/createTabSearchItemSchema.ts diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/index.ts b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/index.ts new file mode 100644 index 000000000..432f47744 --- /dev/null +++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/index.ts @@ -0,0 +1,4 @@ +export * from './components'; +export * from './initializer'; +export * from './provider'; +export * from './settings'; diff --git a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/tab-search/initializer/TabSearchBlockInitializer.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/initializer/TabSearchBlockInitializer.tsx similarity index 100% rename from packages/plugins/@hera/plugin-mobile/src/client/schma-component/tab-search/initializer/TabSearchBlockInitializer.tsx rename to packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/initializer/TabSearchBlockInitializer.tsx diff --git a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/tab-search/initializer/TabSearchFieldSchemaInitializer.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/initializer/TabSearchFieldSchemaInitializer.tsx similarity index 98% rename from packages/plugins/@hera/plugin-mobile/src/client/schma-component/tab-search/initializer/TabSearchFieldSchemaInitializer.tsx rename to packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/initializer/TabSearchFieldSchemaInitializer.tsx index 6f5bd89ba..a26db300e 100644 --- a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/tab-search/initializer/TabSearchFieldSchemaInitializer.tsx +++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/initializer/TabSearchFieldSchemaInitializer.tsx @@ -1,9 +1,9 @@ import { SchemaInitializer, SchemaInitializerItemType, useCollection, useCollectionManager } from '@nocobase/client'; import _ from 'lodash'; -import { tval } from '../../../locale'; import { canBeDataField, canBeOptionalField, canBeRelatedField, canBeSearchField } from '../utils'; import { createTabSearchItemSchema } from '../create/createTabSearchItemSchema'; import { useIsMobile } from '../components/field-item/hooks'; +import { tval } from '../../../../../locale'; const textFieldsItem: SchemaInitializerItemType = { name: 'textFields', diff --git a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/tab-search/initializer/TabSearchFieldSchemaInitializerGadget.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/initializer/TabSearchFieldSchemaInitializerGadget.tsx similarity index 100% rename from packages/plugins/@hera/plugin-mobile/src/client/schma-component/tab-search/initializer/TabSearchFieldSchemaInitializerGadget.tsx rename to packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/initializer/TabSearchFieldSchemaInitializerGadget.tsx diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/initializer/index.ts b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/initializer/index.ts new file mode 100644 index 000000000..7db10447d --- /dev/null +++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/initializer/index.ts @@ -0,0 +1,3 @@ +export * from './TabSearchBlockInitializer'; +export * from './TabSearchFieldSchemaInitializer'; +export * from './TabSearchFieldSchemaInitializerGadget'; diff --git a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/tab-search/provider/TabSearchProvider.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/provider/TabSearchProvider.tsx similarity index 100% rename from packages/plugins/@hera/plugin-mobile/src/client/schma-component/tab-search/provider/TabSearchProvider.tsx rename to packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/provider/TabSearchProvider.tsx diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/provider/index.ts b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/provider/index.ts new file mode 100644 index 000000000..872bebd51 --- /dev/null +++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/provider/index.ts @@ -0,0 +1 @@ +export * from './TabSearchProvider'; diff --git a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/tab-search/settings/TabSearchItemFieldSettings.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/settings/TabSearchItemFieldSettings.tsx similarity index 99% rename from packages/plugins/@hera/plugin-mobile/src/client/schma-component/tab-search/settings/TabSearchItemFieldSettings.tsx rename to packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/settings/TabSearchItemFieldSettings.tsx index d37b56360..a1c2b7192 100644 --- a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/tab-search/settings/TabSearchItemFieldSettings.tsx +++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/settings/TabSearchItemFieldSettings.tsx @@ -7,7 +7,7 @@ import { useDesignable, useFormBlockContext, } from '@nocobase/client'; -import { useTranslation } from '../../../locale'; +import { useTranslation } from '../../../../../locale'; import { useField, useFieldSchema } from '@tachybase/schema'; import _ from 'lodash'; import { isTabSearchCollapsibleInputItem } from '../utils'; diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/settings/index.ts b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/settings/index.ts new file mode 100644 index 000000000..deacaf6a6 --- /dev/null +++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/settings/index.ts @@ -0,0 +1 @@ +export * from './TabSearchItemFieldSettings'; diff --git a/packages/plugins/@hera/plugin-mobile/src/client/schma-component/tab-search/utils.ts b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/utils.ts similarity index 100% rename from packages/plugins/@hera/plugin-mobile/src/client/schma-component/tab-search/utils.ts rename to packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/utils.ts diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/initializers/BlockInitializers.ts b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/initializers/BlockInitializers.ts index 36f8b3169..3b2ac2155 100644 --- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/initializers/BlockInitializers.ts +++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/initializers/BlockInitializers.ts @@ -1,5 +1,5 @@ import { CompatibleSchemaInitializer, gridRowColWrap } from '@nocobase/client'; -import { generateNTemplate } from '../../../locale'; +import { generateNTemplate, tval } from '../../../locale'; /** * @deprecated @@ -31,11 +31,11 @@ export const mBlockInitializers_deprecated = new CompatibleSchemaInitializer({ title: '{{t("Form")}}', Component: 'FormBlockInitializer', }, - { - name: 'details', - title: '{{t("Details")}}', - Component: 'DetailsBlockInitializer', - }, + // { + // name: 'details', + // title: '{{t("Details")}}', + // Component: 'DetailsBlockInitializer', + // }, { name: 'calendar', title: '{{t("Calendar")}}', @@ -96,11 +96,11 @@ export const mBlockInitializers = new CompatibleSchemaInitializer( title: '{{t("Table")}}', Component: 'TableBlockInitializer', }, - { - name: 'form', - title: '{{t("Form")}}', - Component: 'FormBlockInitializer', - }, + // { + // name: 'form', + // title: '{{t("Form")}}', + // Component: 'FormBlockInitializer', + // }, { name: 'details', title: '{{t("Details")}}', @@ -116,6 +116,18 @@ export const mBlockInitializers = new CompatibleSchemaInitializer( title: generateNTemplate('Map'), Component: 'MapBlockInitializer', }, + { + title: tval('Swiper'), + name: 'swiper', + type: 'item', + Component: 'SwiperBlockInitializer', + }, + { + title: 'notice', + name: 'notice', + type: 'item', + Component: 'NoticeBlockInitializer', + }, ], }, { @@ -130,7 +142,7 @@ export const mBlockInitializers = new CompatibleSchemaInitializer( }, { name: 'markdown', - title: '{{t("Markdown")}}', + title: tval('Markdown'), Component: 'MarkdownBlockInitializer', }, { @@ -140,6 +152,24 @@ export const mBlockInitializers = new CompatibleSchemaInitializer( }, ], }, + { + name: 'filterBlocks', + type: 'itemGroup', + title: '{{t("Filter blocks")}}', + children: [ + { + name: 'tabSearch', + title: tval('TabSearch'), + Component: 'TabSearchBlockInitializer', + }, + { + name: 'imageSearch', + title: tval('ImageSearch'), + icon: 'tab-search', + Component: 'ImageSearchInitializer', + }, + ], + }, ], }, mBlockInitializers_deprecated, diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/index.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/index.tsx index 0b54b8d78..6ad4c4b95 100644 --- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/index.tsx +++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/index.tsx @@ -3,7 +3,13 @@ import React from 'react'; import { Navigate, Outlet } from 'react-router-dom'; import { MobileClientProvider } from './MobileClientProvider'; import MApplication from './router/Application'; -import { mBlockInitializers, mBlockInitializers_deprecated } from './core/schema'; +import { + ImageSearchConfigureFields, + ImageSearchItemFieldSettings, + mBlockInitializers, + mBlockInitializers_deprecated, + TabSearchFieldSchemaInitializer, +} from './core/schema'; import { AppConfiguration, InterfaceConfiguration } from './configuration'; import { NAMESPACE } from './locale'; @@ -16,6 +22,9 @@ export class MobileClientPlugin extends Plugin { this.app.use(MobileClientProvider); this.app.schemaInitializerManager.add(mBlockInitializers_deprecated); this.app.schemaInitializerManager.add(mBlockInitializers); + this.app.schemaInitializerManager.add(ImageSearchConfigureFields); + this.app.schemaSettingsManager.add(ImageSearchItemFieldSettings); + this.app.schemaInitializerManager.add(TabSearchFieldSchemaInitializer); } addSettings() { @@ -66,6 +75,10 @@ export class MobileClientPlugin extends Plugin { path: '/mobile/:name', Component: 'RouteSchemaComponent', }); + this.app.router.add('mobile.swiper.page', { + path: '/mobile/:name/image/:collection/:field/:fieldParams', + Component: 'SwiperPage', + }); } } diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/locale/index.ts b/packages/plugins/@tachybase/plugin-mobile-client/src/client/locale/index.ts index ac6168939..83610b094 100644 --- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/locale/index.ts +++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/locale/index.ts @@ -1,4 +1,4 @@ -import { i18n } from '@nocobase/client'; +import {tval as nTval, i18n } from '@nocobase/client'; import { useTranslation as useT } from 'react-i18next'; export const NAMESPACE = 'mobile-client'; @@ -14,6 +14,8 @@ export function generateNTemplate(key: string) { return `{{t('${key}', { ns: '${NAMESPACE}', nsMode: 'fallback' })}}`; } +export const tval = (key: string) => nTval(key, { ns: NAMESPACE }); + export function useTranslation() { return useT([NAMESPACE, 'client'], { nsMode: 'fallback', diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/locale/en-US.json b/packages/plugins/@tachybase/plugin-mobile-client/src/locale/en-US.json index 117e24f99..4570e1f52 100644 --- a/packages/plugins/@tachybase/plugin-mobile-client/src/locale/en-US.json +++ b/packages/plugins/@tachybase/plugin-mobile-client/src/locale/en-US.json @@ -28,5 +28,20 @@ "Delete menu block": "Delete menu block", "Mobile client access address": "Mobile client access address", "The full address is": "The full address is", - "Preview": "Preview" + "Preview": "Preview", + "Choices fields":"Choices fields", + "Text fields":"Text fields", + "Generic properties":"Generic properties", + "Search":"Search", + "Please enter search content":"Please enter search content", + "Title field":"Title field", + "Set show field":"Set show field", + "Set field count":"Set field count", + "Configure field": "Configure field", + "Configure fields": "Configure fields", + "Configure columns": "Configure columns", + "Add block": "Add block", + "all": "all", + "AllProducts": "AllProducts", + "sort":"sort" } diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/locale/zh-CN.json b/packages/plugins/@tachybase/plugin-mobile-client/src/locale/zh-CN.json index becde917e..f1b9b76d5 100644 --- a/packages/plugins/@tachybase/plugin-mobile-client/src/locale/zh-CN.json +++ b/packages/plugins/@tachybase/plugin-mobile-client/src/locale/zh-CN.json @@ -28,5 +28,23 @@ "Delete menu block": "删除菜单区块", "Mobile client access address": "移动端访问地址", "The full address is": "完整的地址是", - "Preview": "预览" + "Preview": "预览", + "Choices fields":"选择字段", + "Text fields":"文本字段", + "Generic properties":"通用属性", + "Search":"搜索", + "Please enter search content":"请输入查询内容", + "Title field":"标题字段", + "Set show field":"设置展示字段", + "Set field count":"设置展示数量", + "Configure field": "配置字段", + "Configure fields": "配置字段", + "Configure columns": "配置字段", + "Add block": "创建区块", + "all": "全部", + "AllProducts": "全部商品", + "sort": "排序", + "Swiper":"轮播图", + "TabSearch":"表格搜索", + "ImageSearch":"图片搜索" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f649ced39..0e1cb6090 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -105,13 +105,13 @@ importers: version: 18.2.0(react@18.2.0) tsx: specifier: ^4.7.2 - version: 4.7.2 + version: 4.9.3 typescript: specifier: 5.4.5 version: 5.4.5 umi: specifier: ^4.1.10 - version: 4.1.10(@babel/core@7.22.10)(@types/node@20.12.7)(@types/react@18.2.79)(eslint@8.57.0)(prettier@3.2.5)(react-dom@18.2.0)(react@18.2.0)(stylelint@14.16.1)(typescript@5.4.5)(webpack@5.91.0) + version: 4.1.10(@babel/core@7.22.10)(@types/node@20.12.8)(@types/react@18.2.79)(eslint@8.57.0)(prettier@3.2.5)(react-dom@18.2.0)(react@18.2.0)(stylelint@14.16.1)(typescript@5.4.5)(webpack@5.91.0) packages/core/acl: dependencies: @@ -275,7 +275,7 @@ importers: version: 3.0.0 vite: specifier: ^5.0.0 - version: 5.1.5(@types/node@20.12.7)(sass@1.75.0) + version: 5.1.5(@types/node@20.12.8)(sass@1.75.0) vite-plugin-css-injected-by-js: specifier: ^3.2.1 version: 3.3.0(vite@5.1.5) @@ -1003,7 +1003,7 @@ importers: version: 1.22.0(axios@1.6.7) vitest: specifier: ^1.4.0 - version: 1.4.0(@types/node@20.12.7)(jsdom@16.7.0) + version: 1.4.0(@types/node@20.12.8)(jsdom@16.7.0) packages/core/server: dependencies: @@ -1292,10 +1292,10 @@ importers: version: 6.3.3 vite: specifier: ^5.0.0 - version: 5.1.5(@types/node@20.12.7)(sass@1.75.0) + version: 5.1.5(@types/node@20.12.8)(sass@1.75.0) vitest: specifier: ^1.4.0 - version: 1.4.0(@types/node@20.12.7)(jsdom@16.7.0) + version: 1.4.0(@types/node@20.12.8)(jsdom@16.7.0) ws: specifier: ^8.13.0 version: 8.15.1 @@ -1606,7 +1606,7 @@ importers: version: 5.0.0 vitest: specifier: ^1.4.0 - version: 1.4.0(@types/node@20.12.7)(jsdom@16.7.0) + version: 1.4.0(@types/node@20.12.8)(jsdom@16.7.0) ws: specifier: ^8.13.0 version: 8.15.1 @@ -1642,49 +1642,6 @@ importers: specifier: ^4.17.0 version: 4.17.0 - packages/plugins/@hera/plugin-mobile: - dependencies: - '@nocobase/client': - specifier: workspace:* - version: link:../../../core/client - '@nocobase/server': - specifier: workspace:* - version: link:../../../core/server - '@nocobase/test': - specifier: workspace:* - version: link:../../../core/test - '@nocobase/utils': - specifier: workspace:* - version: link:../../../core/utils - devDependencies: - '@ant-design/icons': - specifier: 5.x - version: 5.3.6(react-dom@18.2.0)(react@18.2.0) - '@tachybase/schema': - specifier: workspace:* - version: link:../../../core/schema - '@types/lodash': - specifier: ^4.17.0 - version: 4.17.0 - antd: - specifier: 5.16.1 - version: 5.16.1(react-dom@18.2.0)(react@18.2.0) - antd-mobile: - specifier: ^5.35.0 - version: 5.35.0(react-dom@18.2.0)(react@18.2.0) - antd-mobile-icons: - specifier: ^0.3.0 - version: 0.3.0 - classnames: - specifier: ^2.3.1 - version: 2.5.1 - lodash: - specifier: 4.17.21 - version: 4.17.21 - react-i18next: - specifier: ^11.15.1 - version: 11.18.6(i18next@22.5.1)(react-dom@18.2.0)(react@18.2.0) - packages/plugins/@hera/plugin-rental: dependencies: '@hera/plugin-core': @@ -3892,6 +3849,9 @@ importers: antd-mobile: specifier: ^5.35.0 version: 5.35.0(react-dom@18.2.0)(react@18.2.0) + antd-mobile-icons: + specifier: ^0.3.0 + version: 0.3.0 antd-style: specifier: 3.x version: 3.4.5(@types/react@18.2.79)(antd@5.16.1)(react-dom@18.2.0)(react@18.2.0) @@ -5703,6 +5663,28 @@ packages: transitivePeerDependencies: - supports-color + /@babel/core@7.24.5: + resolution: {integrity: sha512-tVQRucExLQ02Boi4vdPp49svNGcfL2GhdTCT9aldhXgCJVAI21EtRfBettiuLUwce/7r6bFdgs6JFkcdTiFttA==} + engines: {node: '>=6.9.0'} + dependencies: + '@ampproject/remapping': 2.3.0 + '@babel/code-frame': 7.24.2 + '@babel/generator': 7.24.5 + '@babel/helper-compilation-targets': 7.23.6 + '@babel/helper-module-transforms': 7.24.5(@babel/core@7.24.5) + '@babel/helpers': 7.24.5 + '@babel/parser': 7.24.5 + '@babel/template': 7.24.0 + '@babel/traverse': 7.24.5 + '@babel/types': 7.24.5 + convert-source-map: 2.0.0 + debug: 4.3.4(supports-color@5.5.0) + gensync: 1.0.0-beta.2 + json5: 2.2.3 + semver: 6.3.1 + transitivePeerDependencies: + - supports-color + /@babel/eslint-parser@7.23.3(@babel/core@7.23.6)(eslint@8.55.0): resolution: {integrity: sha512-9bTuNlyx7oSstodm1cR1bECj4fkiknsDa1YniISkJemMY3DGhJNYBECbe6QD/q54mp2J8VO66jW3/7uP//iFCw==} engines: {node: ^10.13.0 || ^12.13.0 || >=14.0.0} @@ -5749,6 +5731,15 @@ packages: '@jridgewell/trace-mapping': 0.3.25 jsesc: 2.5.2 + /@babel/generator@7.24.5: + resolution: {integrity: sha512-x32i4hEXvr+iI0NEoEfDKzlemF8AmtOP8CcrRaEcpzysWuoEb1KknpcvMsHKPONoKZiDuItklgWhB18xEhr9PA==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/types': 7.24.5 + '@jridgewell/gen-mapping': 0.3.5 + '@jridgewell/trace-mapping': 0.3.25 + jsesc: 2.5.2 + /@babel/helper-annotate-as-pure@7.22.5: resolution: {integrity: sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==} engines: {node: '>=6.9.0'} @@ -5847,6 +5838,12 @@ packages: dependencies: '@babel/types': 7.23.6 + /@babel/helper-module-imports@7.24.3: + resolution: {integrity: sha512-viKb0F9f2s0BCS22QSF308z/+1YWKV/76mwt61NBzS5izMzDPwdq1pTrzf+Li3npBWX9KdQbkeCt1jSAM7lZqg==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/types': 7.24.5 + /@babel/helper-module-transforms@7.23.3(@babel/core@7.22.10): resolution: {integrity: sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==} engines: {node: '>=6.9.0'} @@ -5886,6 +5883,19 @@ packages: '@babel/helper-split-export-declaration': 7.22.6 '@babel/helper-validator-identifier': 7.22.20 + /@babel/helper-module-transforms@7.24.5(@babel/core@7.24.5): + resolution: {integrity: sha512-9GxeY8c2d2mdQUP1Dye0ks3VDyIMS98kt/llQ2nUId8IsWqTF0l1LkSX0/uP7l7MCDrzXS009Hyhe2gzTiGW8A==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0 + dependencies: + '@babel/core': 7.24.5 + '@babel/helper-environment-visitor': 7.22.20 + '@babel/helper-module-imports': 7.24.3 + '@babel/helper-simple-access': 7.24.5 + '@babel/helper-split-export-declaration': 7.24.5 + '@babel/helper-validator-identifier': 7.24.5 + /@babel/helper-optimise-call-expression@7.22.5: resolution: {integrity: sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==} engines: {node: '>=6.9.0'} @@ -5931,6 +5941,12 @@ packages: dependencies: '@babel/types': 7.23.6 + /@babel/helper-simple-access@7.24.5: + resolution: {integrity: sha512-uH3Hmf5q5n7n8mz7arjUlDOCbttY/DW4DYhE6FUsjKJ/oYC1kQQUvwEQWxRwUpX9qQKRXeqLwWxrqilMrf32sQ==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/types': 7.24.5 + /@babel/helper-skip-transparent-expression-wrappers@7.22.5: resolution: {integrity: sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==} engines: {node: '>=6.9.0'} @@ -5944,6 +5960,12 @@ packages: dependencies: '@babel/types': 7.23.6 + /@babel/helper-split-export-declaration@7.24.5: + resolution: {integrity: sha512-5CHncttXohrHk8GWOFCcCl4oRD9fKosWlIRgWm4ql9VYioKm52Mk2xsmoohvm7f3JoiLSM5ZgJuRaf5QZZYd3Q==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/types': 7.24.5 + /@babel/helper-string-parser@7.23.4: resolution: {integrity: sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==} engines: {node: '>=6.9.0'} @@ -5956,6 +5978,10 @@ packages: resolution: {integrity: sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==} engines: {node: '>=6.9.0'} + /@babel/helper-validator-identifier@7.24.5: + resolution: {integrity: sha512-3q93SSKX2TWCG30M2G2kwaKeTYgEUp5Snjuj8qm729SObL6nbtUldAi37qbxkD5gg3xnBio+f9nqpSepGZMvxA==} + engines: {node: '>=6.9.0'} + /@babel/helper-validator-option@7.23.5: resolution: {integrity: sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==} engines: {node: '>=6.9.0'} @@ -5989,6 +6015,16 @@ packages: transitivePeerDependencies: - supports-color + /@babel/helpers@7.24.5: + resolution: {integrity: sha512-CiQmBMMpMQHwM5m01YnrM6imUG1ebgYJ+fAIW4FZe6m4qHTPaRHti+R8cggAwkdz4oXhtO4/K9JWlh+8hIfR2Q==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/template': 7.24.0 + '@babel/traverse': 7.24.5 + '@babel/types': 7.24.5 + transitivePeerDependencies: + - supports-color + /@babel/highlight@7.24.2: resolution: {integrity: sha512-Yac1ao4flkTxTteCDZLEvdxg2fZfz1v8M4QpaGypq/WPDqg3ijHYbDfs+LG5hvzSoqaSZ9/Z9lKSP3CjZjv+pA==} engines: {node: '>=6.9.0'} @@ -6012,6 +6048,13 @@ packages: dependencies: '@babel/types': 7.24.0 + /@babel/parser@7.24.5: + resolution: {integrity: sha512-EOv5IK8arwh3LI47dz1b0tKUb/1uhHAnHJOrjgtQMIpu1uXd9mlFrJg9IUgGUgZ41Ch0K8REPTYpO7B76b4vJg==} + engines: {node: '>=6.0.0'} + hasBin: true + dependencies: + '@babel/types': 7.24.5 + /@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.23.3(@babel/core@7.22.10): resolution: {integrity: sha512-iRkKcCqb7iGnq9+3G6rZ+Ciz5VywC4XNRHe57lKM+jOeYAoR0lVqdeeDRfh0tQcTfw/+vBhHn926FmQhLtlFLQ==} engines: {node: '>=6.9.0'} @@ -6940,6 +6983,12 @@ packages: dependencies: regenerator-runtime: 0.14.1 + /@babel/runtime@7.24.5: + resolution: {integrity: sha512-Nms86NXrsaeU9vbBJKni6gXiEXZ4CVpYVzEjDH9Sb8vmZ3UljyA1GSOJl/6LGPO8EHLuSF9H+IxNXHPX8QHJ4g==} + engines: {node: '>=6.9.0'} + dependencies: + regenerator-runtime: 0.14.1 + /@babel/template@7.22.15: resolution: {integrity: sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==} engines: {node: '>=6.9.0'} @@ -6990,6 +7039,23 @@ packages: transitivePeerDependencies: - supports-color + /@babel/traverse@7.24.5: + resolution: {integrity: sha512-7aaBLeDQ4zYcUFDUD41lJc1fG8+5IU9DaNSJAgal866FGvmD5EbWQgnEC6kO1gGLsX0esNkfnJSndbTXA3r7UA==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/code-frame': 7.24.2 + '@babel/generator': 7.24.5 + '@babel/helper-environment-visitor': 7.22.20 + '@babel/helper-function-name': 7.23.0 + '@babel/helper-hoist-variables': 7.22.5 + '@babel/helper-split-export-declaration': 7.24.5 + '@babel/parser': 7.24.5 + '@babel/types': 7.24.5 + debug: 4.3.4(supports-color@5.5.0) + globals: 11.12.0 + transitivePeerDependencies: + - supports-color + /@babel/types@7.23.6: resolution: {integrity: sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==} engines: {node: '>=6.9.0'} @@ -7006,6 +7072,14 @@ packages: '@babel/helper-validator-identifier': 7.22.20 to-fast-properties: 2.0.0 + /@babel/types@7.24.5: + resolution: {integrity: sha512-6mQNsaLeXTw0nxYUYu+NSa4Hx4BlF1x1x8/PMFbiR+GBSr+2DkECc69b8hgy2frEodNcvPffeH8YfWd3LI6jhQ==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/helper-string-parser': 7.24.1 + '@babel/helper-validator-identifier': 7.24.5 + to-fast-properties: 2.0.0 + /@bloomberg/record-tuple-polyfill@0.0.3: resolution: {integrity: sha512-sBnCqW0nqofE47mxFnw+lvx6kzsQstwaQMVkh66qm/A6IlsnH7WsyGuVXTou8RF2wL4W7ybOoHPvP2WgIo6rhQ==} dev: false @@ -7020,7 +7094,7 @@ packages: /@changesets/apply-release-plan@7.0.0: resolution: {integrity: sha512-vfi69JR416qC9hWmFGSxj7N6wA5J222XNBmezSVATPWDVPIF7gkd4d8CpbEbXmRWbVrkoli3oerGS6dcL/BGsQ==} dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.5 '@changesets/config': 3.0.0 '@changesets/get-version-range-type': 0.4.0 '@changesets/git': 3.0.0 @@ -7038,7 +7112,7 @@ packages: /@changesets/assemble-release-plan@6.0.0: resolution: {integrity: sha512-4QG7NuisAjisbW4hkLCmGW2lRYdPrKzro+fCtZaILX+3zdUELSvYjpL4GTv0E4aM9Mef3PuIQp89VmHJ4y2bfw==} dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.5 '@changesets/errors': 0.2.0 '@changesets/get-dependents-graph': 2.0.0 '@changesets/types': 6.0.0 @@ -7056,7 +7130,7 @@ packages: resolution: {integrity: sha512-iJ91xlvRnnrJnELTp4eJJEOPjgpF3NOh4qeQehM6Ugiz9gJPRZ2t+TsXun6E3AMN4hScZKjqVXl0TX+C7AB3ZQ==} hasBin: true dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.5 '@changesets/apply-release-plan': 7.0.0 '@changesets/assemble-release-plan': 6.0.0 '@changesets/changelog-git': 0.2.0 @@ -7121,7 +7195,7 @@ packages: /@changesets/get-release-plan@4.0.0: resolution: {integrity: sha512-9L9xCUeD/Tb6L/oKmpm8nyzsOzhdNBBbt/ZNcjynbHC07WW4E1eX8NMGC5g5SbM5z/V+MOrYsJ4lRW41GCbg3w==} dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.5 '@changesets/assemble-release-plan': 6.0.0 '@changesets/config': 3.0.0 '@changesets/pre': 2.0.0 @@ -7137,7 +7211,7 @@ packages: /@changesets/git@3.0.0: resolution: {integrity: sha512-vvhnZDHe2eiBNRFHEgMiGd2CT+164dfYyrJDhwwxTVD/OW0FUD6G7+4DIx1dNwkwjHyzisxGAU96q0sVNBns0w==} dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.5 '@changesets/errors': 0.2.0 '@changesets/types': 6.0.0 '@manypkg/get-packages': 1.1.3 @@ -7162,7 +7236,7 @@ packages: /@changesets/pre@2.0.0: resolution: {integrity: sha512-HLTNYX/A4jZxc+Sq8D1AMBsv+1qD6rmmJtjsCJa/9MSRybdxh0mjbTvE6JYZQ/ZiQ0mMlDOlGPXTm9KLTU3jyw==} dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.5 '@changesets/errors': 0.2.0 '@changesets/types': 6.0.0 '@manypkg/get-packages': 1.1.3 @@ -7172,7 +7246,7 @@ packages: /@changesets/read@0.6.0: resolution: {integrity: sha512-ZypqX8+/im1Fm98K4YcZtmLKgjs1kDQ5zHpc2U1qdtNBmZZfo/IBiG162RoP0CUF05tvp2y4IspH11PLnPxuuw==} dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.5 '@changesets/git': 3.0.0 '@changesets/logger': 0.1.0 '@changesets/parse': 0.4.0 @@ -7193,7 +7267,7 @@ packages: /@changesets/write@0.3.0: resolution: {integrity: sha512-slGLb21fxZVUYbyea+94uFiD6ntQW0M2hIKNznFizDhZPDgn2c/fv1UzzlW43RVzh1BEDuIqW6hzlJ1OflNmcw==} dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.5 '@changesets/types': 6.0.0 fs-extra: 7.0.1 human-id: 1.0.2 @@ -7286,10 +7360,10 @@ packages: '@commitlint/execute-rule': 16.2.1 '@commitlint/resolve-extends': 16.2.1 '@commitlint/types': 16.2.1 - '@types/node': 20.12.7 + '@types/node': 20.12.8 chalk: 4.1.2 cosmiconfig: 7.1.0 - cosmiconfig-typescript-loader: 2.0.2(@types/node@20.12.7)(cosmiconfig@7.1.0)(typescript@4.9.5) + cosmiconfig-typescript-loader: 2.0.2(@types/node@20.12.8)(cosmiconfig@7.1.0)(typescript@4.9.5) lodash: 4.17.21 resolve-from: 5.0.0 typescript: 4.9.5 @@ -7710,7 +7784,7 @@ packages: resolution: {integrity: sha512-NfsJX4PdzhwSkfJukczyUiZGc7zNNWZcEAyqeISpDnn0PTfzMJR1aR8xAIPskBejIxBJbIgCCMzbaYa9SXepIg==} dependencies: '@esbuild-kit/core-utils': 3.3.2 - get-tsconfig: 4.7.3 + get-tsconfig: 4.7.4 /@esbuild-kit/core-utils@3.3.2: resolution: {integrity: sha512-sPRAnw9CdSsRmEtnsl2WXWdyquogVpB3yZ3dgwJfe8zrOzTsV7cJvmwrKVa+0ma5BoiGJ+BoqkMvawbayKUsqQ==} @@ -7722,7 +7796,7 @@ packages: resolution: {integrity: sha512-FxEMIkJKnodyA1OaCUoEvbYRkoZlLZ4d/eXFu9Fh8CbBBgP5EmZxrfTRyN0qpXZ4vOvqnE5YdRdcrmUUXuU+dA==} dependencies: '@esbuild-kit/core-utils': 3.3.2 - get-tsconfig: 4.7.3 + get-tsconfig: 4.7.4 /@esbuild/aix-ppc64@0.19.12: resolution: {integrity: sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==} @@ -7730,6 +7804,7 @@ packages: cpu: [ppc64] os: [aix] requiresBuild: true + dev: false optional: true /@esbuild/aix-ppc64@0.20.2: @@ -7762,6 +7837,7 @@ packages: cpu: [arm64] os: [android] requiresBuild: true + dev: false optional: true /@esbuild/android-arm64@0.19.9: @@ -7803,6 +7879,7 @@ packages: cpu: [arm] os: [android] requiresBuild: true + dev: false optional: true /@esbuild/android-arm@0.19.9: @@ -7844,6 +7921,7 @@ packages: cpu: [x64] os: [android] requiresBuild: true + dev: false optional: true /@esbuild/android-x64@0.19.9: @@ -7885,6 +7963,7 @@ packages: cpu: [arm64] os: [darwin] requiresBuild: true + dev: false optional: true /@esbuild/darwin-arm64@0.19.9: @@ -7926,6 +8005,7 @@ packages: cpu: [x64] os: [darwin] requiresBuild: true + dev: false optional: true /@esbuild/darwin-x64@0.19.9: @@ -7967,6 +8047,7 @@ packages: cpu: [arm64] os: [freebsd] requiresBuild: true + dev: false optional: true /@esbuild/freebsd-arm64@0.19.9: @@ -8008,6 +8089,7 @@ packages: cpu: [x64] os: [freebsd] requiresBuild: true + dev: false optional: true /@esbuild/freebsd-x64@0.19.9: @@ -8049,6 +8131,7 @@ packages: cpu: [arm64] os: [linux] requiresBuild: true + dev: false optional: true /@esbuild/linux-arm64@0.19.9: @@ -8090,6 +8173,7 @@ packages: cpu: [arm] os: [linux] requiresBuild: true + dev: false optional: true /@esbuild/linux-arm@0.19.9: @@ -8131,6 +8215,7 @@ packages: cpu: [ia32] os: [linux] requiresBuild: true + dev: false optional: true /@esbuild/linux-ia32@0.19.9: @@ -8172,6 +8257,7 @@ packages: cpu: [loong64] os: [linux] requiresBuild: true + dev: false optional: true /@esbuild/linux-loong64@0.19.9: @@ -8213,6 +8299,7 @@ packages: cpu: [mips64el] os: [linux] requiresBuild: true + dev: false optional: true /@esbuild/linux-mips64el@0.19.9: @@ -8254,6 +8341,7 @@ packages: cpu: [ppc64] os: [linux] requiresBuild: true + dev: false optional: true /@esbuild/linux-ppc64@0.19.9: @@ -8295,6 +8383,7 @@ packages: cpu: [riscv64] os: [linux] requiresBuild: true + dev: false optional: true /@esbuild/linux-riscv64@0.19.9: @@ -8336,6 +8425,7 @@ packages: cpu: [s390x] os: [linux] requiresBuild: true + dev: false optional: true /@esbuild/linux-s390x@0.19.9: @@ -8377,6 +8467,7 @@ packages: cpu: [x64] os: [linux] requiresBuild: true + dev: false optional: true /@esbuild/linux-x64@0.19.9: @@ -8418,6 +8509,7 @@ packages: cpu: [x64] os: [netbsd] requiresBuild: true + dev: false optional: true /@esbuild/netbsd-x64@0.19.9: @@ -8459,6 +8551,7 @@ packages: cpu: [x64] os: [openbsd] requiresBuild: true + dev: false optional: true /@esbuild/openbsd-x64@0.19.9: @@ -8500,6 +8593,7 @@ packages: cpu: [x64] os: [sunos] requiresBuild: true + dev: false optional: true /@esbuild/sunos-x64@0.19.9: @@ -8541,6 +8635,7 @@ packages: cpu: [arm64] os: [win32] requiresBuild: true + dev: false optional: true /@esbuild/win32-arm64@0.19.9: @@ -8582,6 +8677,7 @@ packages: cpu: [ia32] os: [win32] requiresBuild: true + dev: false optional: true /@esbuild/win32-ia32@0.19.9: @@ -8623,6 +8719,7 @@ packages: cpu: [x64] os: [win32] requiresBuild: true + dev: false optional: true /@esbuild/win32-x64@0.19.9: @@ -9069,7 +9166,7 @@ packages: resolution: {integrity: sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@babel/core': 7.24.4 + '@babel/core': 7.24.5 '@jest/types': 29.6.3 '@jridgewell/trace-mapping': 0.3.25 babel-plugin-istanbul: 6.1.1 @@ -9229,7 +9326,7 @@ packages: peerDependencies: react: '>=16.3.0' dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.23.6 hoist-non-react-statics: 3.3.2 react: 18.1.0 react-is: 16.13.1 @@ -9240,7 +9337,7 @@ packages: peerDependencies: react: '>=16.3.0' dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.23.6 hoist-non-react-statics: 3.3.2 react: 18.2.0 react-is: 16.13.1 @@ -9248,8 +9345,8 @@ packages: /@manypkg/find-root@1.1.0: resolution: {integrity: sha512-mki5uBvhHzO8kYYix/WRy2WX8S3B5wdVSc9D6KcU5lQNglP2yt58/VfLuAK49glRXChosY8ap2oJ1qgma3GUVA==} dependencies: - '@babel/runtime': 7.24.4 - '@types/node': 20.12.7 + '@babel/runtime': 7.24.5 + '@types/node': 20.12.8 find-up: 4.1.0 fs-extra: 8.1.0 dev: true @@ -9257,7 +9354,7 @@ packages: /@manypkg/get-packages@1.1.3: resolution: {integrity: sha512-fo+QhuU3qE/2TQMQmbVMqaQ6EWbMhi4ABWP+O4AM1NqPBuy0OrApV5LO6BrrgnhtAHS2NH6RrVk9OL181tTi8A==} dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.5 '@changesets/types': 4.1.0 '@manypkg/find-root': 1.1.0 fs-extra: 8.1.0 @@ -11285,7 +11382,7 @@ packages: dom-accessibility-api: 0.6.3 lodash: 4.17.21 redent: 3.0.0 - vitest: 1.4.0(@types/node@20.12.7)(jsdom@16.7.0) + vitest: 1.4.0(@types/node@20.12.8)(jsdom@16.7.0) dev: false /@testing-library/react-hooks@8.0.1(@types/react@18.2.79)(react-dom@18.2.0)(react@18.2.0): @@ -11539,7 +11636,7 @@ packages: /@types/graceful-fs@4.1.9: resolution: {integrity: sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==} dependencies: - '@types/node': 20.12.7 + '@types/node': 20.12.2 /@types/gulp@4.0.17: resolution: {integrity: sha512-+pKQynu2C/HS16kgmDlAicjtFYP8kaa86eE9P0Ae7GB5W29we/E2TIdbOWtEZD5XkpY+jr8fyqfwO6SWZecLpQ==} @@ -11736,6 +11833,11 @@ packages: dependencies: undici-types: 5.26.5 + /@types/node@20.12.8: + resolution: {integrity: sha512-NU0rJLJnshZWdE/097cdCBbyW1h4hEg0xpovcoAQYHl8dnEyp/NAOiE45pvc+Bd1Dt+2r94v2eGFpQJ4R7g+2w==} + dependencies: + undici-types: 5.26.5 + /@types/nodemailer@6.4.4: resolution: {integrity: sha512-Ksw4t7iliXeYGvIQcSIgWQ5BLuC/mljIEbjf615svhZL10PE9t+ei8O9gDaD3FPCasUJn9KTLwz2JFJyiiyuqw==} dependencies: @@ -11788,7 +11890,7 @@ packages: /@types/react-dom@18.2.24: resolution: {integrity: sha512-cN6upcKd8zkGy4HU9F1+/s98Hrp6D4MOcippK4PoE8OZRngohHZpbJn1GsaDLz87MqvHNoT13nHvNqM9ocRHZg==} dependencies: - '@types/react': 18.2.75 + '@types/react': 18.2.79 /@types/react-dom@18.2.25: resolution: {integrity: sha512-o/V48vf4MQh7juIKZU2QGDfli6p1+OOi5oXx36Hffpc9adsHeXjVp8rHuPkjd8VT8sOJ2Zp05HR7CdpGTIUFUA==} @@ -11864,7 +11966,7 @@ packages: /@types/ssri@7.1.5: resolution: {integrity: sha512-odD/56S3B51liILSk5aXJlnYt99S6Rt9EFDDqGtJM26rKHApHcwyU/UoYHrzKkdkHMAIquGWCuHtQTbes+FRQw==} dependencies: - '@types/node': 20.12.7 + '@types/node': 20.12.8 dev: false /@types/streamx@2.9.5: @@ -12458,7 +12560,7 @@ packages: - supports-color dev: false - /@umijs/bundler-vite@4.1.10(@types/node@20.12.7)(postcss@8.4.38): + /@umijs/bundler-vite@4.1.10(@types/node@20.12.8)(postcss@8.4.38): resolution: {integrity: sha512-MzJqAlplcx07FqY66cyotDctFSexh4G4Xd+0zuHqwPQT1BdD6k6pA5FZrniJRG8BAZ07zas16I0B5hPxWtpctw==} hasBin: true dependencies: @@ -12470,8 +12572,8 @@ packages: less: 4.1.3 postcss-preset-env: 7.5.0(postcss@8.4.38) rollup-plugin-visualizer: 5.9.0 - systemjs: 6.14.3 - vite: 4.5.2(@types/node@20.12.7)(less@4.1.3) + systemjs: 6.15.1 + vite: 4.5.2(@types/node@20.12.8)(less@4.1.3) transitivePeerDependencies: - '@types/node' - lightningcss @@ -12712,7 +12814,7 @@ packages: /@umijs/history@5.3.1: resolution: {integrity: sha512-/e0cEGrR2bIWQD7pRl3dl9dcyRGeC9hoW0OCvUTT/hjY0EfUrkd6G8ZanVghPMpDuY5usxq9GVcvrT8KNXLWvA==} dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.23.6 query-string: 6.14.1 /@umijs/lint@4.1.10(eslint@8.57.0)(stylelint@14.16.1)(typescript@5.4.5): @@ -12807,7 +12909,7 @@ packages: tsx: 3.12.2 dev: false - /@umijs/preset-umi@4.1.10(@types/node@20.12.7)(@types/react@18.2.79)(typescript@5.4.5)(webpack@5.91.0): + /@umijs/preset-umi@4.1.10(@types/node@20.12.8)(@types/react@18.2.79)(typescript@5.4.5)(webpack@5.91.0): resolution: {integrity: sha512-fwsdv21gxEyCPd5Qz9uOCpxOPIS1+vLUURHBetB64zSy4tXXfW8jchJYXHZhaKHlnmKnWglsALK7HIk3h2nzCg==} dependencies: '@iconify/utils': 2.1.1 @@ -12816,7 +12918,7 @@ packages: '@umijs/babel-preset-umi': 4.1.10 '@umijs/bundler-esbuild': 4.1.10 '@umijs/bundler-utils': 4.1.10 - '@umijs/bundler-vite': 4.1.10(@types/node@20.12.7)(postcss@8.4.38) + '@umijs/bundler-vite': 4.1.10(@types/node@20.12.8)(postcss@8.4.38) '@umijs/bundler-webpack': 4.1.10(typescript@5.4.5)(webpack@5.91.0) '@umijs/core': 4.1.10 '@umijs/did-you-know': 1.0.3 @@ -13147,7 +13249,7 @@ packages: '@babel/plugin-transform-react-jsx-self': 7.24.1(@babel/core@7.24.4) '@babel/plugin-transform-react-jsx-source': 7.24.1(@babel/core@7.24.4) react-refresh: 0.14.0 - vite: 4.5.2(@types/node@20.12.2)(less@4.1.3) + vite: 4.5.2(@types/node@20.12.8)(less@4.1.3) transitivePeerDependencies: - supports-color @@ -13162,7 +13264,7 @@ packages: '@babel/plugin-transform-react-jsx-source': 7.23.3(@babel/core@7.23.6) '@types/babel__core': 7.20.5 react-refresh: 0.14.0 - vite: 5.1.5(@types/node@20.12.7)(sass@1.75.0) + vite: 5.1.5(@types/node@20.12.8)(sass@1.75.0) transitivePeerDependencies: - supports-color dev: false @@ -13514,8 +13616,8 @@ packages: uri-js: 4.4.1 dev: true - /ajv@8.12.0: - resolution: {integrity: sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==} + /ajv@8.13.0: + resolution: {integrity: sha512-PRA911Blj99jR5RMeTunVbNXMF6Lp4vZXnk5GQjcnUWUTsrXtekg/pnmFFI2u/I36Y/2bITGS30GZCXei6uNkA==} dependencies: fast-deep-equal: 3.1.3 json-schema-traverse: 1.0.0 @@ -15948,7 +16050,7 @@ packages: layout-base: 2.0.1 dev: false - /cosmiconfig-typescript-loader@2.0.2(@types/node@20.12.7)(cosmiconfig@7.1.0)(typescript@4.9.5): + /cosmiconfig-typescript-loader@2.0.2(@types/node@20.12.8)(cosmiconfig@7.1.0)(typescript@4.9.5): resolution: {integrity: sha512-KmE+bMjWMXJbkWCeY4FJX/npHuZPNr9XF9q9CIQ/bpFwi1qHfCmSiKarrCcRa0LO4fWjk93pVoeRtJAkTGcYNw==} engines: {node: '>=12', npm: '>=6'} peerDependencies: @@ -15956,9 +16058,9 @@ packages: cosmiconfig: '>=7' typescript: '>=3' dependencies: - '@types/node': 20.12.7 + '@types/node': 20.12.8 cosmiconfig: 7.1.0 - ts-node: 10.9.2(@types/node@20.12.7)(typescript@4.9.5) + ts-node: 10.9.2(@types/node@20.12.8)(typescript@4.9.5) typescript: 4.9.5 transitivePeerDependencies: - '@swc/core' @@ -17743,6 +17845,7 @@ packages: '@esbuild/win32-arm64': 0.19.12 '@esbuild/win32-ia32': 0.19.12 '@esbuild/win32-x64': 0.19.12 + dev: false /esbuild@0.19.9: resolution: {integrity: sha512-U9CHtKSy+EpPsEBa+/A2gMs/h3ylBC0H0KSqIg7tpztHerLi6nrrcoUJAkNCEPumx8yJ+Byic4BVwHgRbN0TBg==} @@ -17937,7 +18040,7 @@ packages: '@testing-library/dom': optional: true dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.5 eslint: 8.57.0 requireindex: 1.2.0 dev: true @@ -19282,6 +19385,11 @@ packages: dependencies: resolve-pkg-maps: 1.0.0 + /get-tsconfig@4.7.4: + resolution: {integrity: sha512-ofbkKj+0pjXjhejr007J/fLf+sW+8H7K5GCm+msC8q3IpvgjobpyPqSRFemNyIMxklC0zeJpi7VDFna19FacvQ==} + dependencies: + resolve-pkg-maps: 1.0.0 + /get-uri@6.0.3: resolution: {integrity: sha512-BzUrJBS9EcUb4cFol8r4W3v1cPsSyajLSthNkz5BxbpDcHN5tIrM10E2eNvfnvBn3DaT3DUgx0OpsBKkaOpanw==} engines: {node: '>= 14'} @@ -19804,7 +19912,7 @@ packages: /history@5.3.0: resolution: {integrity: sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ==} dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.23.6 /hmac-drbg@1.0.1: resolution: {integrity: sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==} @@ -21001,7 +21109,7 @@ packages: resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==} engines: {node: '>= 10.13.0'} dependencies: - '@types/node': 20.12.7 + '@types/node': 20.12.8 merge-stream: 2.0.0 supports-color: 8.1.1 @@ -21018,7 +21126,7 @@ packages: resolution: {integrity: sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@types/node': 20.12.7 + '@types/node': 20.12.2 jest-util: 29.7.0 merge-stream: 2.0.0 supports-color: 8.1.1 @@ -24078,7 +24186,7 @@ packages: async: 3.2.5 debug: 4.3.4(supports-color@5.5.0) pidusage: 2.0.21 - systeminformation: 5.22.7 + systeminformation: 5.22.8 tx2: 1.0.5 transitivePeerDependencies: - supports-color @@ -25124,7 +25232,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.0 classnames: 2.5.1 dom-align: 1.12.4 rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) @@ -25451,7 +25559,7 @@ packages: react: '*' react-dom: '*' dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.0 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) @@ -25645,7 +25753,7 @@ packages: react: '*' react-dom: '*' dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.0 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) @@ -25692,7 +25800,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.0 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) @@ -25719,7 +25827,7 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.0 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) react-is: 18.3.1 @@ -25844,7 +25952,7 @@ packages: dependencies: loose-envify: 1.4.0 react: 18.2.0 - scheduler: 0.23.0 + scheduler: 0.23.2 /react-drag-listview@0.1.9: resolution: {integrity: sha512-/OsYevKtCUlw4FhJIfZPH7INHEmyl89sSC5COzonHW5Z2c8rHg4DNYFnUxOyqH+65o7sHweL13oaf6wr7dFvPA==} @@ -25883,7 +25991,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.24.4 + '@babel/runtime': 7.23.6 invariant: 2.2.4 prop-types: 15.8.1 react: 18.1.0 @@ -25897,7 +26005,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.24.4 + '@babel/runtime': 7.23.6 invariant: 2.2.4 prop-types: 15.8.1 react: 18.2.0 @@ -26019,7 +26127,7 @@ packages: react: '>=16.3.0' react-dom: '>=16.3.0' dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.0 '@popperjs/core': 2.11.8 '@restart/hooks': 0.4.15(react@18.2.0) '@types/warning': 3.0.3 @@ -26447,7 +26555,7 @@ packages: /regenerator-transform@0.15.2: resolution: {integrity: sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==} dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.5 dev: false /regex-not@1.0.2: @@ -27065,8 +27173,8 @@ packages: dependencies: loose-envify: 1.4.0 - /scheduler@0.23.0: - resolution: {integrity: sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==} + /scheduler@0.23.2: + resolution: {integrity: sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==} dependencies: loose-envify: 1.4.0 @@ -28387,8 +28495,8 @@ packages: tslib: 2.6.2 dev: true - /systeminformation@5.22.7: - resolution: {integrity: sha512-AWxlP05KeHbpGdgvZkcudJpsmChc2Y5Eo/GvxG/iUA/Aws5LZKHAMSeAo+V+nD+nxWZaxrwpWcnx4SH3oxNL3A==} + /systeminformation@5.22.8: + resolution: {integrity: sha512-F1iWQ+PSfOzvLMGh2UXASaWLDq5o+1h1db13Kddl6ojcQ47rsJhpMtRrmBXfTA5QJgutC4KV67YRmXLuroIxrA==} engines: {node: '>=8.0.0'} os: [darwin, linux, win32, freebsd, openbsd, netbsd, sunos, android] hasBin: true @@ -28398,12 +28506,17 @@ packages: /systemjs@6.14.3: resolution: {integrity: sha512-hQv45irdhXudAOr8r6SVSpJSGtogdGZUbJBRKCE5nsIS7tsxxvnIHqT4IOPWj+P+HcSzeWzHlGCGpmhPDIKe+w==} + dev: false + + /systemjs@6.15.1: + resolution: {integrity: sha512-Nk8c4lXvMB98MtbmjX7JwJRgJOL8fluecYCfCeYBznwmpOs8Bf15hLM6z4z71EDAhQVrQrI+wt1aLWSXZq+hXA==} + dev: true /table@6.8.2: resolution: {integrity: sha512-w2sfv80nrAh2VCbqR5AK27wswXhqcck2AhfnNW76beQXskGZ1V12GwS//yYVa3d3fcvAip2OUnbDAjW2k3v9fA==} engines: {node: '>=10.0.0'} dependencies: - ajv: 8.12.0 + ajv: 8.13.0 lodash.truncate: 4.4.2 slice-ansi: 4.0.0 string-width: 4.2.3 @@ -28549,7 +28662,7 @@ packages: jest-worker: 27.5.1 schema-utils: 3.3.0 serialize-javascript: 6.0.2 - terser: 5.30.4 + terser: 5.31.0 webpack: 5.91.0 /terser@5.30.3: @@ -28562,8 +28675,8 @@ packages: commander: 2.20.3 source-map-support: 0.5.21 - /terser@5.30.4: - resolution: {integrity: sha512-xRdd0v64a8mFK9bnsKVdoNP9GQIKUAaJPTaqEQDL4w/J8WaW4sWXXoMZ+6SimPkfT5bElreXf8m9HnmPc3E1BQ==} + /terser@5.31.0: + resolution: {integrity: sha512-Q1JFAoUKE5IMfI4Z/lkE/E6+SwgzO+x4tq4v1AyBLRj8VSYvRO6A/rQrPg1yud4g0En9EKI1TvFRF2tQFcoUkg==} engines: {node: '>=10'} hasBin: true dependencies: @@ -28883,7 +28996,7 @@ packages: typescript: 5.4.4 dev: false - /ts-node@10.9.2(@types/node@20.12.7)(typescript@4.9.5): + /ts-node@10.9.2(@types/node@20.12.8)(typescript@4.9.5): resolution: {integrity: sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==} hasBin: true peerDependencies: @@ -28902,7 +29015,7 @@ packages: '@tsconfig/node12': 1.0.11 '@tsconfig/node14': 1.0.3 '@tsconfig/node16': 1.0.4 - '@types/node': 20.12.7 + '@types/node': 20.12.8 acorn: 8.11.3 acorn-walk: 8.3.2 arg: 4.1.3 @@ -29043,6 +29156,18 @@ packages: get-tsconfig: 4.7.3 optionalDependencies: fsevents: 2.3.3 + dev: false + + /tsx@4.9.3: + resolution: {integrity: sha512-czVbetlILiyJZI5zGlj2kw9vFiSeyra9liPD4nG+Thh4pKTi0AmMEQ8zdV/L2xbIVKrIqif4sUNrsMAOksx9Zg==} + engines: {node: '>=18.0.0'} + hasBin: true + dependencies: + esbuild: 0.20.2 + get-tsconfig: 4.7.4 + optionalDependencies: + fsevents: 2.3.3 + dev: true /tty-browserify@0.0.0: resolution: {integrity: sha512-JVa5ijo+j/sOoHGjw0sxw734b1LhBkQ3bvUGNdxnVXDCX81Yx7TFgnZygxrIIWn23hbfTaMYLwRmAxFyDuFmIw==} @@ -29278,7 +29403,7 @@ packages: requiresBuild: true optional: true - /umi@4.1.10(@babel/core@7.22.10)(@types/node@20.12.7)(@types/react@18.2.79)(eslint@8.57.0)(prettier@3.2.5)(react-dom@18.2.0)(react@18.2.0)(stylelint@14.16.1)(typescript@5.4.5)(webpack@5.91.0): + /umi@4.1.10(@babel/core@7.22.10)(@types/node@20.12.8)(@types/react@18.2.79)(eslint@8.57.0)(prettier@3.2.5)(react-dom@18.2.0)(react@18.2.0)(stylelint@14.16.1)(typescript@5.4.5)(webpack@5.91.0): resolution: {integrity: sha512-SyR6zPGOMCNcAefId8guibojzdkcimcOyYtM73qU59w2I5mpqcJFSMHKrprh/k/ilFJz0rYP0EChSqIgcRDW3A==} engines: {node: '>=14'} hasBin: true @@ -29288,7 +29413,7 @@ packages: '@umijs/bundler-webpack': 4.1.10(typescript@5.4.5)(webpack@5.91.0) '@umijs/core': 4.1.10 '@umijs/lint': 4.1.10(eslint@8.57.0)(stylelint@14.16.1)(typescript@5.4.5) - '@umijs/preset-umi': 4.1.10(@types/node@20.12.7)(@types/react@18.2.79)(typescript@5.4.5)(webpack@5.91.0) + '@umijs/preset-umi': 4.1.10(@types/node@20.12.8)(@types/react@18.2.79)(typescript@5.4.5)(webpack@5.91.0) '@umijs/renderer-react': 4.1.10(react-dom@18.2.0)(react@18.2.0) '@umijs/server': 4.1.10 '@umijs/test': 4.1.10(@babel/core@7.22.10) @@ -29415,7 +29540,7 @@ packages: peerDependencies: react: '>=15.0.0' dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.24.0 '@types/react': 18.2.79 invariant: 2.2.4 react: 18.2.0 @@ -29943,7 +30068,7 @@ packages: util-deprecate: 1.0.2 dev: true - /vite-node@1.4.0(@types/node@20.12.7): + /vite-node@1.4.0(@types/node@20.12.8): resolution: {integrity: sha512-VZDAseqjrHgNd4Kh8icYHWzTKSCZMhia7GyHfhtzLW33fZlG9SwsB6CEhgyVOWkJfJ2pFLrp/Gj1FSfAiqH9Lw==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -29952,7 +30077,7 @@ packages: debug: 4.3.4(supports-color@5.5.0) pathe: 1.1.2 picocolors: 1.0.0 - vite: 5.2.8(@types/node@20.12.7) + vite: 5.2.8(@types/node@20.12.8) transitivePeerDependencies: - '@types/node' - less @@ -29968,7 +30093,7 @@ packages: peerDependencies: vite: '>2.0.0-0' dependencies: - vite: 5.1.5(@types/node@20.12.7)(sass@1.75.0) + vite: 5.1.5(@types/node@20.12.8)(sass@1.75.0) dev: false /vite-plugin-lib-inject-css@1.2.0(vite@5.1.5): @@ -29978,7 +30103,7 @@ packages: dependencies: magic-string: 0.30.8 picocolors: 1.0.0 - vite: 5.1.5(@types/node@20.12.7)(sass@1.75.0) + vite: 5.1.5(@types/node@20.12.8)(sass@1.75.0) dev: false /vite@4.5.2(@types/node@20.12.2)(less@4.1.3): @@ -30016,8 +30141,9 @@ packages: rollup: 3.29.4 optionalDependencies: fsevents: 2.3.3 + dev: false - /vite@4.5.2(@types/node@20.12.7)(less@4.1.3): + /vite@4.5.2(@types/node@20.12.8)(less@4.1.3): resolution: {integrity: sha512-tBCZBNSBbHQkaGyhGCDUGqeo2ph8Fstyp6FMSvTtsXeZSPpSMGlviAOav2hxVTqFcx8Hj/twtWKsMJXNY0xI8w==} engines: {node: ^14.18.0 || >=16.0.0} hasBin: true @@ -30045,16 +30171,15 @@ packages: terser: optional: true dependencies: - '@types/node': 20.12.7 + '@types/node': 20.12.8 esbuild: 0.18.20 less: 4.1.3 postcss: 8.4.38 rollup: 3.29.4 optionalDependencies: fsevents: 2.3.3 - dev: true - /vite@5.1.5(@types/node@20.12.7)(sass@1.75.0): + /vite@5.1.5(@types/node@20.12.8)(sass@1.75.0): resolution: {integrity: sha512-BdN1xh0Of/oQafhU+FvopafUp6WaYenLU/NFoL5WyJL++GxkNfieKzBhM24H3HVsPQrlAqB7iJYTHabzaRed5Q==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -30082,7 +30207,7 @@ packages: terser: optional: true dependencies: - '@types/node': 20.12.7 + '@types/node': 20.12.8 esbuild: 0.19.9 postcss: 8.4.35 rollup: 4.9.0 @@ -30125,8 +30250,44 @@ packages: rollup: 4.14.1 optionalDependencies: fsevents: 2.3.3 + dev: true - /vitest@1.4.0(@types/node@20.12.7)(jsdom@16.7.0): + /vite@5.2.8(@types/node@20.12.8): + resolution: {integrity: sha512-OyZR+c1CE8yeHw5V5t59aXsUPPVTHMDjEZz8MgguLL/Q7NblxhZUlTu9xSPqlsUO/y+X7dlU05jdhvyycD55DA==} + engines: {node: ^18.0.0 || >=20.0.0} + hasBin: true + peerDependencies: + '@types/node': ^20.12.2 + less: '*' + lightningcss: ^1.21.0 + sass: '*' + stylus: '*' + sugarss: '*' + terser: ^5.4.0 + peerDependenciesMeta: + '@types/node': + optional: true + less: + optional: true + lightningcss: + optional: true + sass: + optional: true + stylus: + optional: true + sugarss: + optional: true + terser: + optional: true + dependencies: + '@types/node': 20.12.8 + esbuild: 0.20.2 + postcss: 8.4.38 + rollup: 4.14.1 + optionalDependencies: + fsevents: 2.3.3 + + /vitest@1.4.0(@types/node@20.12.8)(jsdom@16.7.0): resolution: {integrity: sha512-gujzn0g7fmwf83/WzrDTnncZt2UiXP41mHuFYFrdwaLRVQ6JYQEiME2IfEjU3vcFL3VKa75XhI3lFgn+hfVsQw==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -30151,7 +30312,7 @@ packages: jsdom: optional: true dependencies: - '@types/node': 20.12.7 + '@types/node': 20.12.8 '@vitest/expect': 1.4.0 '@vitest/runner': 1.4.0 '@vitest/snapshot': 1.4.0 @@ -30170,8 +30331,8 @@ packages: strip-literal: 2.0.0 tinybench: 2.6.0 tinypool: 0.8.3 - vite: 5.2.8(@types/node@20.12.7) - vite-node: 1.4.0(@types/node@20.12.7) + vite: 5.2.8(@types/node@20.12.8) + vite-node: 1.4.0(@types/node@20.12.8) why-is-node-running: 2.2.2 transitivePeerDependencies: - less