1862 Commits

Author SHA1 Message Date
YANG QIA
eb80f9635b
fix: increase the upload file size limit of field-markdown-vditor (#5063) 2024-08-15 14:46:09 +08:00
GitHub Actions Bot
e4e706c0a6 Merge branch 'main' into next 2024-08-15 04:22:13 +00:00
YANG QIA
6416e64287
fix(data-vi): dependency typo (#5060) 2024-08-15 11:59:06 +08:00
YANG QIA
161407c803
fix(m2m-array): check naming collision (#5059) 2024-08-15 11:55:36 +08:00
Zeke Zhang
3c82ca5bf4 Merge branch 'next' into develop 2024-08-14 18:09:16 +08:00
Katherine
ecaf0b7e79
style: table column congirure fields bar style improve (#5055) 2024-08-14 16:56:33 +08:00
chenos
88e47afe39
feat: pub/sub manager (#4933)
* feat: pub/sub manager

* fix: test case

* fix: test error

* fix: test error

* feat: skip self

* feat: debounce

* feat: improve code

* fix: test error

* feat: test cases

* feat: test cases

* fix: improve code

* fix: improve code

* feat: improve code

* fix: improve code

* fix: test case

* fix: typo

* fix: createPubSubManager

* fix: delete messageHandlers

* fix: test case

* feat: improve code

* fix: test error

* fix: test error

* refactor(server): adapt to new api and fix test

* fix(plugin-data-source-main): fix changed api

* fix: test error

* fix: remove sync-manager test case

* chore(server): remove legacy code

* fix(plugin-workflow): fix send sync message with transaction

* chore(server): remove legacy code

* chore(server): remove legacy code

* fix(plugin-workflow): fix test case

* fix(plugin-workflow): fix test case

* test(server): test skip-install parameter in cluster

* test(server): avoid multiple installation in cluster

* test(server): installation in cluster

* feat: sync collection using sync manager (#4920)

* chore: sync collection message

* chore: sync acl

* fix: typo

* chore: sync data source

* chore: remove collection

* fix: typo

* fix: test

* chore: sync sub app event

* chore: sync collection test

* chore: collection test

* chore: test

* chore: data source sync message

* chore: sync multi app

* chore: test

* chore: test

* chore: test

* chore: test

* chore: test

* chore: error message

* fix(server): add type and remove log

* fix(server): not to publish when adpater is not connected

* refactor(server): refine types

* chore: timeout

* fix(server): fix pubSubManager options

* test(ci): test ci checkout

---------

Co-authored-by: mytharcher <mytharcher@gmail.com>
Co-authored-by: ChengLei Shao <chareice@live.com>
2024-08-14 12:09:36 +08:00
jimmy201602
6108e0818f
feat(database): allows to filter child nodes in tree collections (#4770)
* feat(collection-tree): add collection tree plugin

* feat(collection-tree): add collection tree path handle function

* feat(collection-tree): add collection tree path root and depth column handle function

* feat(collection-tree): add exist tree collection data migrate function

* feat(collection-tree): improve exist tree collection data migrate function

* feat(collection-tree): improve exist tree collection data migrate function

* feat(collection-tree): add collection tree to build in plugin

* feat(collection-tree): modify collection tree plugin version

* feat(collection-tree): fix collection tree build bug

* feat(collection-tree): fix tree collection path create bug and add tree table search function

* feat(collection-tree): add tree table pagination function

* feat(collection-tree): fix tree table pagination function

* feat(collection-tree): fix tree table pagination function

* feat(collection-tree): fix tree table search function

* feat(collection-tree): fix tree table search function

* feat(collection-tree): improve tree table search filter function

* feat(collection-tree): update collection tree plugin version and preset package dependancy

* feat(collection-tree): improve tree collection function

* feat(collection-tree): remove the duplicate function

* feat(collection-tree): fix tree collection db exist bug

* feat(collection-tree): improve tree collection db  variable name

* feat(collection-tree): remove migration file

* feat(collection-tree): add collection tree sync create function

* feat(collection-tree): add collection tree sync create function

* feat(collection-tree): disable collection tree search function

* feat(collection-tree): enable collection tree search function

* feat(collection-tree): modify collection tree signal to adapt test case

* feat(collection-tree): modify code to fix test case

* feat(collection-tree): improve code and abstract define collection tree path

* feat(collection-tree): modify rootPK to rootPk to avoid underscored behavior

* feat(collection-tree): update collection tree version and add collection tree plugin for test

* feat(collection-tree): fix filter collection tree root null bug

* feat(collection-tree): migrate tree test case to collection tree plugin directory

* feat(collection-tree): add transaction for collection tree table delete

* feat(collection-tree): fix collection tree switch bug

* feat(collection-tree): remove tree filter switch

* feat(collection-tree): fix test case

* feat(collection-tree): fix test case

* feat(collection-tree): fix DB UNDERSCORED bug

* feat(collection-tree): fix relate collections not exist bug

* feat(collection-tree): add common parent function

* feat(collection-tree): add compatible function for sqlite

* feat(collection-tree): modify collection tree path create method

* feat(collection-tree): migrate tree test case to no acl

* feat(collection-tree): migrate tree test case to no acl and fix collections undefined bug

* feat(collection-tree): migrate tree test case

* feat(collection-tree): fix test case bug

* feat(collection-tree): fix test case bug

* feat(collection-tree): fix test case bug

* feat(collection-tree): improve tree search function

* feat(collection-tree): merge the next branch code to fix confilct

* feat(collection-tree): merge the next branch code to fix confilct

* feat(collection-tree): merge the next branch code to fix confilct

* feat(collection-tree): split the collection tree test to new file and fix filterbytk bug

* feat(collection-tree): fix filter tree collection primary key bug

* feat(collection-tree): remove recursive test case and fix collection tree filter bug

* feat(collection-tree): fix collection tree filter bug

* feat(collection-tree): fix collection tree filter bug and modify test case

* feat(collection-tree): add parentid column for tree collection and modify test case

* feat(collection-tree): disable sync exist tree collection path table create logic

* feat(collection-tree): add sync exist tree collection path table create logic on plugin afterLoad

* feat(collection-tree): remove debug code

* feat(collection-tree): fix collection tree delete bug

* feat(collection-tree): improve collection tree filter find and count implement

* feat(collection-tree): improve path table name variable implement

* feat(collection-tree): remove unnecessary plugin for test case code

* feat(collection-tree): add await for delete synchronous path function

* feat(collection-tree): improve tree path create function

* feat(collection-tree): remove unnecessary code

* feat(collection-tree): remove unnecessary code

* feat(collection-tree): improve tree path create function

* feat(collection-tree): improve tree filter function

* feat(collection-tree): improve tree filter datasource to dynamic

* feat(collection-tree): improve find common parent code

* feat(collection-tree): add collection tree path table not found warning log

* feat(collection-tree): improve get collection primary key implementation

* feat(collection-tree): fix tree root path not delete bug and tree path definition bug

* feat(collection-tree): fix findAndCount function variable definition bug

* feat(collection-tree): modify migrate exist collection tree migration function

* feat(collection-tree): correct variable name

* feat(collection-tree): remove duplicate code

* feat(collection-tree): fix sync exist collection tree path function variable bug

* feat(collection-tree): improve collection tree path update logic

* feat(collection-tree): remove await for get collection

* test: add test cases

* feat(collection-tree): modify filter parameter for collection tree

* feat(collection-tree): remove await for get collection

* feat(collection-tree): remove necessary code

* feat(collection-tree): add exist tree collection path migration function

* feat(collection-tree): remove unused sync exist tree collection table function

* feat(collection-tree): use get method to replace use dataValues function

* feat(collection-tree): use get method to replace use dataValues function

* feat(collection-tree): fix migration rootPk variable bug

* feat(collection-tree): use get method to replace use dataValues function

* feat(collection-tree): improve get tree path logic

* feat(collection-tree): remove unused test case code

* feat(collection-tree): add sync collection tree test case

* feat(collection-tree): add tree path test case and fix migration bug

* feat(collection-tree): add migration db variable

* feat(collection-tree): change logger function

* feat(collection-tree): remove unused library

* feat(collection-tree): add plugin information

* feat(collection-tree): remove await for get collection and use this.db instead of this.app.db

* feat(collection-tree): improve the performance of exist data migration to  path table

* feat(collection-tree): modify get tree path implement to avoid infinite loop bug

* feat(collection-tree): fix path create bug

* feat(collection-tree): add index for path table

* feat(collection-tree): fix related node path bug when some node parent changed

* feat(collection-tree): add transaction for get tree path function

* feat(collection-tree): add tree path test case

* feat(collection-tree): change parent field id name to dynamic

* feat(collection-tree): migrate some test case to path.test.ts file

* feat(collection-tree): add some test case for path table

* feat(collection-tree): fix sqlite and mysql json type search path data bug

* feat(collection-tree): fix sqlite query related data sql bug

* feat(collection-tree): fix list action test case query data with related data bug

* feat(collection-tree): try to fix mysql test case bug to remove index

* feat(collection-tree): remove unnecessary code

* chore: string field with length option

* feat(collection-tree): change path type to string and set max length to 1024

* fix: merge conflicts

* feat(collection-tree): modify query path filter to adapt the path change to string

* feat(collection-tree): remove append parent condition

* feat(collection-tree): split the path test case

* feat(collection-tree): remove unused code and fix test case plugin bug

* feat(collection-tree): improve get tree path implementation

* feat(collection-tree): disable one failed test case for full test

* feat(collection-tree): add transaction for collection tree migration

* feat(collection-tree): fix collection tree migration bug

* feat(collection-tree): remove sqlite handle condition code

* feat(collection-tree): add tree test case

* feat(collection-tree): add tree test case

* feat(collection-tree): modify test case to match the expection

* feat(collection-tree): modify tree implementation to root parent

* feat(collection-tree): remove unused function

* feat(collection-tree): add count function to solve tree data pagination implementation

* feat(collection-tree): split tree failed test case to legacy file

* feat(collection-tree): correct legacy tree test case to expection

* feat(collection-tree): add new tree test for legacy test case to meet expection

* feat(collection-tree): fix legacy test case to meet expection

* feat(collection-tree): modify legacy test case to meet expection and add new test case

* feat(collection-tree): improve tree test case

* feat(collection-tree): improve tree test case

* feat(collection-tree): improve tree test case

* feat(collection-tree): add tree test case

* feat(collection-tree): add tree count test case

* feat(collection-tree): add tree find and count test case

* feat(collection-tree): add tree find one test case

* feat(collection-tree): improve migration get path performance

* feat(collection-tree): improve get tree path function to avoid undefined parent data situation

* feat(collection-tree): add tree and raw parameter variable

* fix: test

* feat(collection-tree): modify index length

* feat(collection-tree): fix index snake case bug

* feat(collection-tree): improve tree filter search

* feat(collection-tree): fix tree search pagination parameter omit bug

* chore: optimize

* chore: optimize

* fix: build

* fix: type

* fix: bug

* chore: move tree repo to plugin

* fix: build

* fix: test

* chore: remove ts-ignore

* fix: issue of getting filter target key

---------

Co-authored-by: xilesun <2013xile@gmail.com>
Co-authored-by: Chareice <chareice@live.com>
2024-08-13 09:42:31 +08:00
GitHub Actions Bot
6dac406f7e Merge branch 'main' into next 2024-08-12 07:10:02 +00:00
Katherine
b75fdc7f62
fix: disable edit and delete button for all records and own record in data scope configuration (#5041) 2024-08-12 15:09:40 +08:00
Zeke Zhang
cfd5007110
fix(iframe): fix the popup contained Iframe block does not work (#5039) 2024-08-11 17:55:45 +08:00
Junyi
65ec69cc62
fix(plugin-workflow-aggregate): limit aggregate instruction to only work on db data source (#5033) 2024-08-10 11:32:58 +08:00
GitHub Actions Bot
c90ab059c0 Merge branch 'main' into next 2024-08-09 10:13:07 +00:00
Zeke Zhang
20f0e90fe6
fix(variable): the chinaRegions field should not be a submenu (#5030)
* fix(variable): the chinaRegions field should not be a submenu

* chore: skip unstable test
2024-08-09 18:12:49 +08:00
jack zhang
aa76b78da4
fix: mobile auth (#5015)
* fix(T-5026): mobile auth

* fix: bug

* fix: plugin settings only have link type

* fix: bug
2024-08-09 15:21:34 +08:00
Zeke Zhang
4590c754ce
feat: support to add Settings block in mobile (#5025)
* feat: support to add Settings block in mobile

* style(Popup): clear the margin-bottom of the last block

* refactor: extract hideDivider

* fix: fix form values
2024-08-09 11:45:22 +08:00
Katherine
9c44e0b229
fix: bug (#5009) 2024-08-08 13:14:06 +08:00
chenos
f696c67b5e fix: remove schema 2024-08-08 10:55:09 +08:00
GitHub Actions Bot
0fd0f9406b chore(versions): 😊 publish v1.2.34-alpha 2024-08-08 01:55:34 +00:00
GitHub Actions Bot
ea1a6210db Merge branch 'main' into next 2024-08-08 01:52:54 +00:00
Junyi
72ce761fd1
fix(plugin-workflow): fix event key in date field schedule mode (#5010) 2024-08-08 09:40:47 +08:00
GitHub Actions Bot
fb40563e52 Merge branch 'main' into next 2024-08-07 10:29:40 +00:00
ChengLei Shao
5f09674b9c
fix: backup file dir of sub apps (#4985) 2024-08-07 18:07:58 +08:00
GitHub Actions Bot
cfccf93f9c chore(versions): 😊 publish v1.2.33-alpha 2024-08-07 08:53:01 +00:00
jack zhang
238b3fb08a Merge remote-tracking branch 'origin/main' into next 2024-08-07 16:50:13 +08:00
jack zhang
cbf65394d2
feat: support dynamic field component (#5006)
* feat: field component

* fix: menu e2e bug
2024-08-07 15:37:00 +08:00
Zeke Zhang
a429b7a4b3
feat: adapt desktop blocks to mobile (#4945)
* feat: register workflow blocks to mobile page

* fix: should hide Divider in subpage

* refactor: rename 'Data blocks' to 'Desktop data blocks'

* feat: adapt blocks within subpages for mobile

* feat: adapt Filter action

* feat: isolate block templates between desktop and mobile

* refactor: export storePopupContext

* feat: support popup URL for 'Workflow todos'

* chore: update e2e tests

* chore: make e2e tests pass

* chore: add comment

* fix: make popup style of duplicate and bulk edit right

* fix(GridCard): ensure single column display in mobile

* fix: fix goBack

* refactor: make more stable

* refactor: change name for add blocks menu

* fix: fix block template for mobile

* feat: adapt Apply action of approval block to mobile

* fix(Map): use window.open to redirect to configuration page

* Revert "fix(Map): use window.open to redirect to configuration page"

This reverts commit 248ae8b68cfd78415184dfab2442081363872fb0.

* fix: redirect to the main app page when URL is starts with 'admin'

* fix(Link): make path right

* fix: refactor Popup to fix draging bug

* fix: should auto refresh when submiting in Manual popup

* fix(Action.Container): should return null when visible is false (T-4949)

* fix: increase z-index of subpage to cover Amap elements

* fix: fix tab switching not work (T-4985)

* fix(Link): should be change Link's URL of all table rows after editing URL (T-4981)

* fix: fix URL not changed after closing popup (T-4987)

* fix: make unit tests pass

* fix: make unit tests pass

* chore: get e2e tests to pass

* fix: use Popup to display data picker (T-4965)

* fix: use mobile Popup in some bloks

* refactor: use local isMobile

* fix: increase Popup's z-index to cover subpage

* fix: optimize Popup for mobile

* style: createRecordAction style improve

* refactor(AssociationField): get Component from AssociationFieldModeProvider

* refactor(InternalPopoverNester): support custom Container component

* feat: adapt PopoverNester to mobile

* chore: update unit tests

* fix: get e2e tests to pass

* chore: make e2e more stable

* refactor: move mobile-action-page in adaptor-of-desktop folder

* fix: get the z-index of popups and subpages correct

* feat: unify the styles of popups

* chore: make e2e more stable

---------

Co-authored-by: chenos <chenlinxh@gmail.com>
Co-authored-by: katherinehhh <katherine_15995@163.com>
2024-08-07 14:25:40 +08:00
GitHub Actions Bot
64e53558df Merge branch 'main' into next 2024-08-07 02:10:15 +00:00
Katherine
9df48ef0a1
fix: acl permission check issue for 'Delete Event' action (#5002)
* fix: delete Event action acl check

* chore: delete vent action
2024-08-07 10:09:58 +08:00
GitHub Actions Bot
e3d3de0386 chore(versions): 😊 publish v1.2.32-alpha 2024-08-06 22:55:38 +00:00
GitHub Actions Bot
1a00e031e4 chore(versions): 😊 publish v1.2.31-alpha 2024-08-06 14:58:34 +00:00
GitHub Actions Bot
e0b36fbeeb chore(versions): 😊 publish v1.2.30-alpha 2024-08-06 09:58:37 +00:00
chenos
5417f4444a fix: v1.3.0-alpha 2024-08-06 17:56:42 +08:00
chenos
4d2e379f74 Merge branch 'main' into next
# Conflicts:
#	packages/presets/nocobase/package.json
2024-08-06 17:55:45 +08:00
chenos
f8bc36066e fix: manual release 2024-08-06 17:52:23 +08:00
GitHub Actions Bot
ca87866959 chore(versions): 😊 publish v1.3.0-alpha 2024-08-06 03:52:38 +00:00
GitHub Actions Bot
7cb923f7bd Merge branch 'main' into next 2024-08-06 03:05:45 +00:00
Junyi
765ad45224
fix(plugin-workflow-manual): fix assign field value for all action buttons of manual node (#4983) 2024-08-06 11:03:04 +08:00
jack zhang
a7c2f90260
refactor: support dynamic field component (#4932)
* refactor: support dynamic field component

* fix: bug

* fix: bug

* fix: bug

* fix: bug

* fix: bug

* fix: add addFieldInterfaceComponentOption() doc

* fix: bug

* fix: bug

* fix: add unit test

* fix: bug

* fix: bug
2024-08-06 09:21:01 +08:00
GitHub Actions Bot
7276a404e4 Merge branch 'main' into next 2024-08-06 00:48:24 +00:00
Junyi
c4acdebcaa
fix(plugin-workflow): fix collection trigger in async mode after transaction committed (#4994) 2024-08-06 08:29:37 +08:00
GitHub Actions Bot
769d2b9365 chore(versions): 😊 publish v1.2.29-alpha 2024-08-05 05:58:26 +00:00
jack zhang
a2da825b31
feat: mobile modal bug (#4976)
* fix(T-4958): after closing the model, to reset the Form data

* fix: bug
2024-08-04 15:52:56 +08:00
GitHub Actions Bot
3a9b546f4f Merge branch 'main' into next 2024-08-03 13:55:02 +00:00
ChengLei Shao
c902875f3c
chore(action-export): error message when field not found (#4890) 2024-08-03 21:54:37 +08:00
GitHub Actions Bot
d17bbaca95 Merge branch 'main' into next 2024-08-02 13:28:03 +00:00
Katherine
c8b0ebb03e
refactor: filter FilterTargetKeys options based on titleUsable (#4981) 2024-08-02 21:26:45 +08:00
GitHub Actions Bot
6b9317d0ea Merge branch 'main' into next 2024-08-02 11:52:58 +00:00
Junyi
44e74a46f0
fix(plugin-workflow-manual): fix disabled status in clicked button of manual todo (#4982) 2024-08-02 19:52:40 +08:00
Katherine
c74b234dde
refactor: pc block & action compatible with mobile devices (#4935)
* style: import modal style improve

* style: grid card style improve

* style: action bar style improve

* style: action bar style improve

* style: action bar style improve

* fix: improt modal

* fix: modal style

* fix: bug

* fix: bug

* fix: modal style

* refactor: pagination style

* refactor: table configure fields  style

* refactor: grid card style

* style: table block  margin

* style: table block  margin

* fix: bug
2024-08-02 13:49:40 +08:00