9 Commits

Author SHA1 Message Date
gchust
62f10d9c97
chore: upgrade ant design to 5.24.2 (#6343)
* chore: upgrade ant design to 5.24.2

* chore: fix errors after upgrade ant design

* fix: ts errors

* fix: ts error

* fix: ts error

* chore: keep original code format

* chore: revert format changes

* chore: keep code format

* fix: unit tests error after upgrade ant design

* fix: style issues for variable inputs

* fix: inbox style issue

* fix: some buttons not showing in drawer

* chore: fix formily antd version

* fix: incorrect details block pagination style [skip ci]

* fix: incorrect cron style after upgrade ant design [skip ci]

* fix: unit tests errors after upgrading ant design

* fix: update unit tests for collection select and color picker components

* fix: e2e tests errors

* fix: e2e tests failing

* fix: tests error

* fix: e2e test cases

* fix: some e2e tests failing

* fix: e2e testing errors

* fix: e2e build failing

* fix: update yarn.lock to avoid comment ci timeout

* Revert "fix: update yarn.lock to avoid comment ci timeout"

This reverts commit 6f117f57a0fd1d605de7ef18022c5c3e658e24af.

* chore: comment ci timeout

* chore: e2e

* fix: workflow approval e2e testing

* fix: e2e stable for some tests
2025-03-12 08:46:38 +08:00
Zeke Zhang
2cf3486b56 Merge branch 'next' into develop 2025-03-06 11:58:38 +08:00
Zeke Zhang
0d0c81cc90
refactor: make the menu responsive to screen width (#6331)
* chore: convert routes

* chore: stash

* chore: stash

* feat: support to add menu item

* feat: add MenuSchemaToolbar

* refactor: extract EditMenuItem component

* feat: add hidden option

* refactor: extract HiddenMenuItem

* feat: add 'Move to' option

* feat: add insert options

* feat: remove route

* fix: children

* fix: route

* feat: enhance menu item rendering and group handling in admin layout

* feat: add container support to MenuSchemaToolbar and fix display issue in Group

* fix: add conditional check before moving routes in menu item settings

* feat(navigation): add default page navigation for admin layout

* chore(versions): 😊 publish v1.6.0-alpha.24

* feat: export AppNotFound component and integrate 404 handling in AdminDynamicPage

* fix: update admin layout route path to use item options URL

* chore(versions): 😊 publish v1.6.0-alpha.25

* refactor: rename route node retrieval functions for clarity and add legacy route compatibility

* refactor: clean up layout component by removing unused styles and improving header rendering

* refactor: simplify menu item components by removing unused schema insertion logic and optimizing imports

* refactor: add 'x-async' property to tab schema and clean up server imports

* refactor: tabs

* feat: support extending frontend filter operators (#6085)

* feat: operator extension

* fix: bug

* refactor: code improve

* fix: jsonLogic

---------

Co-authored-by: chenos <chenlinxh@gmail.com>

* feat: add fake schema for routing in SortableItem and remove unused fieldSchema import

* feat: adjust content padding in InternalAdminLayout for improved layout

* refactor: remove registerOperators (#6224)

* refactor(plugin-workflow): trigger workflow action settings (#6143)

* refactor(plugin-workflow): move bind workflow settings to plugin

* refactor(plugin-block-workbench): move component to core

* refactor(plugin-block-workbench): adjust component api

* fix(plugin-workflow-action-trigger): fix test cases

* fix(plugin-workflow): fix component scope

* fix(plugin-workflow-action-trigger): fix test cases

* chore(versions): 😊 publish v1.6.0-alpha.26

* feat: support the extension of preset fields in collections (#6183)

* feat: support the extension of preset fields in collections

* fix: bug

* fix: bug

* fix: bug

* refactor: create collection

* fix: config

* fix: test case

* refactor: code improve

* refactor: code improve

* fix: bug

* fix: bug

---------

Co-authored-by: chenos <chenlinxh@gmail.com>

* feat: replace SchemaComponent with RemoteSchemaComponent and add AppNotFound for empty tabs

* refactor: rename useCurrentRoute to useCurrentRouteData for clarity

* fix: redirect to first tab by default

* feat: support for the extension of optional fields for Kanban, Calendar, and Formula Field plugins (#6076)

* feat: kanban field extention

* fix: bug

* fix: bug

* fix: bug

* fix: bug

* feat: calender title fields

* feat: background color fields

* fix: bug

* fix: bug

* feat: formula field expression support field

* feat: preset fields

* fix: bug

* fix: bug

* fix: bug

* fix: bug

* fix: bug

* fix: bug

* fix: bug

* fix: bug

* refactor: code improve

* fix: bug

* fix: bug

* fix: bug

* fix: bug

* refactor: code improve

* revert: preset fields

* refactor: code improve

* refactor: code improve

* fix: bug

* fix: bug

* fix: bug

* refactor: code improve

* fix: bug

* refactor: code improve

* refactor: code improve

* fix: bug

* fix: locale

* refactor: code improve

* fix: bug

* refactor: code improve

* refactor: code improve

* refactor: code improve

* refactor: locale

* fix: test

* fix: bug

* fix: test

* fix: test

---------

Co-authored-by: chenos <chenlinxh@gmail.com>

* fix: enhance access permission check and clean up unused props in Page component

* fix: adjust Action.Page style to set top position to 0

* fix: update redirect logic to point to the first page route in admin layout

* chore(versions): 😊 publish v1.6.0-alpha.27

* fix: add link handling in MenuItem to open URLs in a new tab

* fix(data-source-main): update order

* fix: integrate drag-and-drop functionality in MenuItem and Page components

* fix: add drag-and-drop support in admin layout and improve loading behavior

* fix: header style

* fix: set sider width in admin layout

* fix: refactor InternalAdminLayout for improved readability and maintainability

* fix: optimize token management in InternalAdminLayout for better styling consistency

* fix: style

* fix: avoid error

* fix: update container reference in MenuSchemaToolbarWithContainer

* fix: add icon style to MenuSchemaToolbar

* fix: remove bottom border from header in admin layout

* fix: add collapsed button render function to InternalAdminLayout

* fix: update viewport meta tag for better responsiveness

* fix: add MenuItemIcon component for conditional icon rendering in admin layout

* fix: wrap SchemaToolbar in SiderContext.Provider to prevent style issues in collapsed state

* fix: update InternalAdminLayout styles for improved menu item appearance

* fix: adjust menu item spacing and height for compact mode in admin layout

* fix: add collapse handling and page change logic in InternalAdminLayout

* fix: add header context provider and update MenuItemIcon rendering logic in InternalAdminLayout

* fix: replace Modal with App.useApp().modal in HiddenMenuItem for improved modal handling

* fix: enhance click area for links in MenuItem and streamline group navigation logic

* fix: refresh routes after adding link menu

* fix: add mobile actions popover for improved user interaction in admin layout

* fix: adjust layout width and margin for improved alignment in admin layout

* style: fix the style of the top collapsed menu button dropdown

* fix: add active background color for selected menu items in collapsed menu

* fix: improve z-index management for modal, drawer, and page components to prevent overlap with collapsed menu button

* fix: adjust position of collapsed button to prevent overlap with subpages

* fix: update collapsed button rendering to handle mobile context and prevent overlap with subpages

* fix: prevent schema data request for group pages in admin layout

* fix: handle undefined menu titles by providing a default value

* fix: add refresh functionality for desktop routes in menu permissions

* fix: adjust page header padding based on route settings and token

* fix: center text

* fix: add tooltip support for menu items in collapsed state

* fix: tooltip

* fix: improve page tab routing and deletion handling

* fix: adjust admin layout height to account for header

* fix: improve route navigation and deletion handling in admin layout

* chore: update version

* fix(routing): Add Navigate import from react-router-dom

* fix(e2e): locator

* test: remove demo and useless test case for Page component

* fix: improve page creation and routing in e2e utils

* fix: improve z-index handling for embedded pages

* feat(admin-layout): Add aria-label to menu item links for improved accessibility

* fix(mobile-ui): Adjust toolbar and navigation bar styling

* test(acl): Simplify menu item visibility test setup

* test: update e2e test templates and route handling

* fix: fix compatibility issues

* fix(admin-layout): improve default page navigation handling

* fix(acl): add optional chaining to prevent potential null/undefined error in uiButtonSchemasBlacklist check

* fix: keep alive

* fix(desktop-routes): enhance route retrieval with automatic child route inclusion

* test: add test

* fix(page): update navigation logic to use location pathname for tab routing

* fix(route): export CurrentRouteProvider for better accessibility in routing context

* refactor(layout): remove unused styles for cleaner code

* fix(layout): integrate useGlobalTheme for consistent theming and clean up unused parameters

* fix(route): improve route redirection logic

---------

Co-authored-by: nocobase[bot] <179432756+nocobase[bot]@users.noreply.github.com>
Co-authored-by: Katherine <katherine_15995@163.com>
Co-authored-by: chenos <chenlinxh@gmail.com>
Co-authored-by: Junyi <mytharcher@users.noreply.github.com>
2025-03-05 22:52:24 +08:00
Zeke Zhang
4808b6e684 fix: add optional chaining for menu title in translateTitle function 2025-02-11 15:16:23 +08:00
Zeke Zhang
97333d0c06
refactor(Menu): optimize menu interface (#5955)
* feat: define desktopRoutes collection

* feat: convert routes to schema

* feat: support to add new route

* feat: support to delete routes

* feat: adaptor Hidden option

* feat: adaptor Edit option

* fix: fix incomplete menu display issue

* feat: support to insert

* feat: adjust permission configuration page interface

* feat: add listAccessible action

* feat: routes table

* feat: edit button

* style: optimize style

* chore: add confirm text

* fix: delete corresponding schema when removing routes to ensure data consistency

* chore: add field type

* feat: create a tab when creating a page

* fix: fix tabs issue

* fix: avoid undefined error

* fix: should hide menu when it's hideInMenu is true

* fix: should refresh menu when updating it

* chore: optimize params

* fix: fix tab when adding child

* chore: should display empty

* fix: fix subapp path

* fix: fix activeKey of tab

* chore: add translation

* chore: prevent menu collapse after adding new menu item

* refactor: rename useDesktopRoutes to useNocoBaseRoutes

* fix: fix tab path

* fix: fix draging issue

* feat: support to set Hidden for Tab

* feat: implement move

* fix: draging

* chore: add migration

* fix: fix migration

* chore: fix build

* chore: fix e2e test

* fix: fix menu creation position issue

* fix: migration

* chore: add translation

* fix: fix some bugs

* fix: fix 'Move to'

* fix: compile Route name in permission management page

* fix: fix table selection issue

* chore: add comment

* fix: hidden

* fix: fix mobile route path

* fix: do not select parent node when selecting child nodes

* fix(mobile): hide menu

* fix(mobile): path

* fix(mobile): fix schema

* fix(mobile): compile tab title

* fix: fix permission configuration page selection error

* fix: fix selection issues

* fix(migration): transform old permission configuration to new permission configuration

* chore: translate fields title

* feat: support localization

* fix: fix pagination

* chore: fix build

* fix: change aclSnippet

* chore: fix unit tests

* fix: fix error

* chore: fix unit tests of server

* chore(migration): update version of migration

* chore: fix e2e tests

* chore: fix build error

* chore: make e2e tests pass

* chore: fix migration error

* fix: show ellipsis when text overflows

* fix: show ellipsis when text overflows

* chore: change 'Access' to 'View'

* fix: should use sort field to sort

* fix: fix tab drag and drop issue

* refactor: rename unnamed tab label to 'Unnamed'

* fix: fix draging issue

* refactor: add 'enableTabs' field

* refactor: optimize route fields

* refactor: optimize migration

* fix: set enableTabs to false when creating page

* refactor: change empty tab name to 'Unnamed'

* fix: fix tab path

* fix: avoid undefined error

* chore(migration): update appVersion

* fix(migration): fix page issue

* chore: fix unit test

* fix(mobile): fix incorrect path

* fix(mobile): fix enableTabs issue

* fix: disable Add child route button when enableTabs is false

* fix: fix embed issue

* fix(migration): add migration for mobile

* chore: update migration

* fix: fix tab title not updating issue

* fix: fix untranslated text issue

* fix: fix routes table style

* fix: fix group issue

* fix(mobile): fix 404 issue

* fix: should hide tabs when creating page

* fix: should translate tabs title

* fix: fix translation issue

* fix(migration): fix appVersion

* fix: fix ACL

* fix: should set paginate to true and filter out hidden items

* fix(migration): fix bug

* refactor(desktopRoutes): add enableHeader and displayTitle

* fix: fix permission issue

* fix(mobile): fix error

* fix(mobile): fix migration error

* fix(migration): compatible with older versions

* fix: make unit tests pass

* chore: ignore some failing test cases

* chore: test

* fix: test
2025-01-24 13:02:38 +08:00
Zeke Zhang
44275b5cd7
refactor(plugin-acl): extensible support for role permissions configuration UI (#5216) 2024-09-06 16:20:07 +08:00
jack zhang
62b2b5c68b
chore: add copyright information to the file header (#4028)
* fix: add license code

* fix: bug

* fix: bug

* fix: upgrade

* fix: improve

* chore: add copyright information to the file header

* fix: d.ts bug

* fix: bug

* fix: e2e bug

* fix: merge main

---------

Co-authored-by: chenos <chenlinxh@gmail.com>
2024-04-30 15:51:31 +08:00
katherinehhh
d3bd0c71dd
chore: menu permissions & plugins setting permissions (#3822)
* chore: menu permissions

* chore: plugins setting  permissions

* chore: plugins setting  permissions

* chore: plugins setting  permissions
2024-03-27 12:03:24 +08:00
katherinehhh
af6113c8ef
feat: support for multiple data sources (#3418)
* refactor: collectionName display with tablePrefix

* fix: bug

* fix: schema toolbar no ddata source (T-3182)

* fix: unit test bug

* fix: useAssociationNames support data source

* chore(RecordProvider_deprecated): add collectionName

* fix: deprecated

* refactor: default value

* refactor: default value

* fix: fastRefresh=false

* style: fix action link style (T-3228)

* fix: should not diaplay Save mode for some Action (T-3217)

* chore: remove group title (T-3194)

* fix: extend collections bug

* chore: transaction

* fix: filter block only current data source (T-3226)

* fix: fix filter block in drawer (T-3224)

* fix: avoid error when editing field (T-3232)

* fix: primary key name in postgres

* chore: test

* chore: test

* refactor: forgin key support select and input

* fix: doc bug

* fix: change duplllicte divier name

* feat: throughScope

* fix: bug

* refactor: local improve

* fix: fix parent record of Add child in tree table (T-3235)

* fix: block template filter by dataSource(T-3234)

* chore: change table primary key

* refactor: index for primarykey & unique

* chore: test

* fix: should not display filter blocks option if no association field (T-3242)

* fix: dataSourceKey

* refactor: sourcekey & forginkey & targetkey limit type

* fix: bug

* chore: test

* fix: upload action

* fix: unit test

* fix: useSourceIdFromParentRecord

* fix: permissions

* fix: oho association field should has default fieldnames

* fix: useSourceIdFromParentRecord

* fix: tableSelectorProvider collection undefined

* fix: bug

* chore: validate association keys

* fix: apply mixin bug

* fix: getPrimaryKey

* fix: bug T-3253

* fix:  collection unit test

* chore: validate association keys

* fix: create collection

* fix: getCollection in TableBlockProvider

* refactor: association key in data source manager

* fix: improve doc

* fix(relationshipBlocks): fix sourceId (T-3257,T-3264)

* fix: plugin acl test

* chore: correct field options

* fix: dataScope resource

* fix: improve doc

* fix: appVersion = '<0.20.0-alpha.1'

* refactor: fieldNames

* refactor: primarykey & unique & autoIncrement shuld not support edit in third dataSource

* fix: bug

* fix: gantt block params tree

* fix: style

* fix: wording & icon

* fix: bug

* fix: roles cache

* refactor: calender & express & file collection support preset fields

* fix: decode uri

* refactor: migrate files [wip] (#3584)

* refactor: migrate blockSettings:table

* refactor: migrate fieldSettings:TableColumn

* refactor: migrate TableBlockInitializer

* fix: fix import path

* refactor: migrate TableActionInitailizers

* refactor: migrate TableColumnInitializers

* refactor: migrate TableActionColumnInitializers

* refactor: migrate TableColumnSchemaToolbar

* refactor: migrate TableSelectorInitializer

* refactor: migrate blockSettings:tableSelector

* refactor(tableSelector): migrate e2e

* refactor(form): migrate e2e

* refactor: migrate FormBlockInitializer

* refactor: migrate CreateFormBlockInitializer

* refactor: migrate RecordFormBlockInitializer

* refactor: migrate blockSettings:createForm

* refactor: rename file name

* refactor: migrate blockSettings:editForm

* refactor: migrate FormActionInitailizers

* refactor: move to a new file

* refactor: migrate formItemInitializers

* refactor: migrate FormItemSchemaToolbar

* refactor: migrate fieldSettings:FormItem

* chore: fix build

* fix: fix weird path error

* fix: rename formActionInitializers

* fix: create collection field

* refactor: throughCollection

* fix: datasources get permission

* fix: throughCollection

* fix: throughCollection

* fix: register initializer components

* refactor: targetkey & source key must be unique

* refactor: targetkey & source key must be unique index

* fix(customRequest): avoid error when clicking button

* chore: error message when add multiple primary keys

* fix: target key in hasMany

* fix: default value should not support edit in outside dataSource

* fix: test

* fix: update associations (#3586)

* fix: source key

* fix: addAccessor

* fix: updateAssociations

* fix: bugs

* fix: remove test.only

* refactor: migrate RecordReadPrettyFormBlockInitializer

* refactor: migrate singleDataDetailsBlockSettings

* fix(users): filter bug

* refactor: migrate readPrettyFormActionInitializers

* refactor: migrate readPrettyFormItemInitializers

* refactor: migrate DetailsBlockInitializer

* refactor: migrate multiDataDetailsBlockSettings

* feat: validate association key pairs

* chore: default title

* refactor: migrate detailsActionInitializers

* refactor: migrate e2e

* refactor: migrate ListBlockInitializer

* refactor: migrate listBlockSettings

* refactor: migrate listActionInitializers

* refactor: migrate listItemActionInitializers

* fix: create collection

* fix: remove fieldsHistoryRepository.createMany

* test(e2e): fix error message for roles.name

* fix: sync indexes in postgres

* chore: test

* test: acl test

* test(e2e): fix sort error

* refactor: remove useless code

* test: kanban e2e

* fix: load user

* fix: test

* test: fix unit tests

* fix: db.sync

* test: updateRole

* fix: test

* fix: settings and initializer performance improve

* fix: update role resources

* fix: add block

* fix: fix T-3308

* test: fix e2e

* test(e2e): skip fix block

* chore: skip test in sqlite

* fix: change initializer menu key

* test(collectionManager): fix e2e

* refactor: sort field availableTypes

* fix: client core performance optimization

* refactor(GridCard): migrate e2e

* refactor: migrate GridCard

* fix: bug

* refactor: migrate utils

* refactor: migrate filter-form

* fix: change Record to CollectionRecord

* chore: acl migration

* chore: acl migration

* chore: migration of acl

* refactor: migrate Collapse

* chore: error message

* fix: update associations

* chore: update collection search to be case-insensitive

* refactor: migrate Markdown

* fix(WorkflowTodos): x-toolbar typo

* feat: admin change password

* feat: check foreign key && target key value in update associations

* chore: dataSource permission

* refactor: dataSource permission

* fix: acl support data source permission

* fix: fix T-3307

* chore: test

* refactor: locale improve

* chore: locale

* chore: sqlite test config

* chore: create user with roles test

* chore: test

* test: fix mock data to avoid duplication

* chore: test

* fix: load table with tablePrefix

* chore: move action in datasource

* chore: number field to sort field type

* test: optimize dropdown

* chore: upgrade @playwright/test to v1.42.1

* fix: fix invalid path for Windows

* test: fix e2e

* chore: kanban Sort field

* fix: kanban

* fix: kanban

* refactor: create sort in kanban

* refactor: create sort field in kanban

* refactor: locale improve

* refactor: locale improve

* fix: sync with null default value

* refactor: collectionFieldInterfaceSelect

* fix: move action

* fix: update associations

* fix: test case

* chore: test

* test: optimize e2e

* feat: remvoe Duplicate for single details block (T-3195)

* fix(fieldNames): should use primaryKey as default value (T-3322, T-3319)

* fix: use filterTargetKey as fieldNNames.value

* test: fix e2e

* test: fix e2e

* test(kanban): fix e2e

* test(blockTemplate): should clear template at end of test

* refactor: migrate fields

* refactor: migrate actions

* refactor: migrate menu

* refactor: migrate page

* refactor(SchemaSettings): unify naming style

* fix: scopeKeyOptions undefined

* refactor(SchemaInitializers): unify naming stle

* fix(bi): chart filter fields

* chore: acl snippets

* refactor: replace CreateFormBlockInitializers to blockInitializers:createForm

* refactor: replace to blockInitializers:customizeCreateForm

* refactor: replace block intializers name

* refactor: replace action initializers name

* refactor: replace field initializers name

* style: fix hover style for column action (T-3297)

* refactor: revert some codes

* chore: update comment

* fix: revert record deprected

* fix: remove pro-plugins

* fix: bug

* chore: replace iframeBlockSchemaSettings to blockSettings:iframe

* Revert "refactor: revert some codes"

This reverts commit 991021ceaeecc5d27113a51e501a4abd439edcd2.

* Revert "refactor: replace field initializers name"

This reverts commit b47b808d06305741b56302e3dad1dd256658fad4.

* Revert "refactor: replace action initializers name"

This reverts commit eab1b6e3d986d1c3dc80d75fa6230fa948e3a33e.

* Revert "refactor: replace block intializers name"

This reverts commit 50ab9da177f344d037184a17746cb1d0e037a826.

* Revert "refactor: replace to blockInitializers:customizeCreateForm"

This reverts commit 77b9f59bb14d944fd8c42006e899861196589748.

* Revert "refactor: replace CreateFormBlockInitializers to blockInitializers:createForm"

This reverts commit e9a38b0b4d9fabc571b7d9cdc8929914f5e2a367.

* Revert "refactor(SchemaInitializers): unify naming stle"

This reverts commit 542390899fa84d212a8dbbe7f77e0f19befa6ae8.

* Revert "refactor(SchemaSettings): unify naming style"

This reverts commit 8566735922c4a157efccdb3830deaedeb08c6f6a.

* Revert "chore: replace iframeBlockSchemaSettings to blockSettings:iframe"

This reverts commit 884f6df92fdc860a50500025f132904e9528002f.

* refactor: create sorting field in kanban

* refactor: create sorting field in kanban

* fix: style

* fix: bug

* fix(SideMenu): fix the problem of invalid add menu (T-3331)

* fix: translation

* feat: client en-US docs

---------

Co-authored-by: xilesun <2013xile@gmail.com>
Co-authored-by: dream2023 <1098626505@qq.com>
Co-authored-by: Zeke Zhang <958414905@qq.com>
Co-authored-by: chenos <chenlinxh@gmail.com>
Co-authored-by: Chareice <chareice@live.com>
2024-03-03 23:06:24 +08:00