Commit Graph

3854 Commits

Author SHA1 Message Date
dream2023
591b9d6dc5 Merge remote-tracking branch 'origin/main' into T-2327-and-2771 2024-01-25 11:00:01 +08:00
dream2023
2ad4e25e66 Merge branch 'T-2327-and-2771' of https://github.com/nocobase/nocobase into T-2327-and-2771 2024-01-25 10:59:53 +08:00
dream2023
b5f77c938b fix: e2e bug 2024-01-25 10:51:47 +08:00
Chareice
1ed633f366
chore: collection field list 2024-01-25 10:41:46 +08:00
Chareice
06fe160167
chore: field type 2024-01-25 09:59:26 +08:00
Chareice
fc175a7730
chore: update collection option 2024-01-25 09:31:30 +08:00
Chareice
5bcc44a768
chore: get collections from datasource 2024-01-24 22:14:03 +08:00
Junyi
fb11c82b79
feat(plugin-workflow): add cancel action for execution (#3425)
* feat(plugin-workflow): add cancel action for execution

* feat(plugin-workflow): add cancel button in execution canvas

* fix(plugin-workflow-manual): fix canceled execution actions
2024-01-24 21:09:48 +08:00
Chareice
d0a63bfa45
chore: create data source test 2024-01-24 20:17:22 +08:00
Chareice
5d070fea64
chore: test 2024-01-24 20:07:55 +08:00
Chareice
476d0b869c
chore: restore file 2024-01-24 18:20:02 +08:00
Zeke Zhang
4e7c95f22b Merge branch 'main' into T-2327-and-2771 2024-01-24 18:04:43 +08:00
katherinehhh
88de3b6b82 fix: refresh bug 2024-01-24 17:18:43 +08:00
Chareice
dd6509cb5a
chore: test 2024-01-24 17:13:47 +08:00
jack zhang
dc61f10f78
fix: change exit description (#3430) 2024-01-24 17:12:00 +08:00
katherinehhh
f08d6cb6db Merge branch 'T-2327-and-2771' into feat/dataSource-manager 2024-01-24 17:01:09 +08:00
dream2023
e0ffb32a90 Merge remote-tracking branch 'origin/main' into T-2327-and-2771 2024-01-24 16:14:38 +08:00
jack zhang
b7948d5409
fix: remove tree-kill package to core/cli (#3429)
* fix: remove tree-kill package to core/cli

* fix: remove unuse code
2024-01-24 16:05:29 +08:00
chenos
2792cb1b0a
fix: e2e test did not exit successfully (#3427)
* fix: e2e test did not exit successfully

* fix: tree kill

---------

Co-authored-by: dream2023 <1098626505@qq.com>
2024-01-24 14:55:41 +08:00
chenos
1b2c67fea7 fix: symlink dir 2024-01-24 13:06:06 +08:00
Chareice
0994875b0d
Merge branch 'feat/data-source-manager' into feat/dataSource-manager 2024-01-24 09:51:05 +08:00
Chareice
66d5a1aee6
chore: rename 2024-01-24 09:39:25 +08:00
dream2023
3090174df2 fix: bug 2024-01-23 17:36:12 +08:00
dream2023
15c1f16eeb Merge remote-tracking branch 'origin/T-2327-refactor2' into T-2327-and-2771 2024-01-23 16:28:18 +08:00
dream2023
5340ac1811 fix: local collection 2024-01-23 16:17:51 +08:00
katherinehhh
10e0f6ec1f
refactor: configuration mode, buttons without permission should be displayed, but cannot be clicked (#3421) 2024-01-23 15:33:48 +08:00
dream2023
b3ced4c7e1 fix: block resource 2024-01-23 11:09:29 +08:00
dream2023
819b38fe28 fix: data-block dataSource 2024-01-23 10:13:56 +08:00
chenos
61d6bea14d fix: data source 2024-01-23 09:01:12 +08:00
chenos
b008dbc862 feat: improve code 2024-01-23 00:15:46 +08:00
katherinehhh
b174d2c1f7 refactor: code improve 2024-01-22 22:25:26 +08:00
katherinehhh
a71f46dc4f refactor: code improve 2024-01-22 22:20:26 +08:00
katherinehhh
2f35bb23d4 refactor: local improve 2024-01-22 22:15:13 +08:00
katherinehhh
c0807c17f3 refactor: local improve 2024-01-22 22:06:41 +08:00
katherinehhh
302970dea5 refactor: local improve 2024-01-22 22:03:43 +08:00
katherinehhh
8ae68c0886 refactor: local improve 2024-01-22 21:58:47 +08:00
katherinehhh
22fcf877ad refactor: local improve 2024-01-22 21:55:38 +08:00
katherinehhh
dcda4b3ae6 refactor: local improve 2024-01-22 21:49:06 +08:00
katherinehhh
4bd4033445 refactor: local improve 2024-01-22 21:46:14 +08:00
katherinehhh
cdd0a570f4 refactor: edit data soource 2024-01-22 21:40:25 +08:00
katherinehhh
101b60129e fix: merge bug 2024-01-22 21:25:41 +08:00
dream2023
3da6bdc659 fix: withDynamicSchemaProps 2024-01-22 21:22:33 +08:00
katherinehhh
51dbe7e20a Merge branch 'feat/dataSource-manager' of github.com:nocobase/nocobase into feat/dataSource-manager 2024-01-22 21:09:22 +08:00
katherinehhh
171b84dbbc Merge branch 'T-2327-and-2771' into feat/dataSource-manager 2024-01-22 21:08:40 +08:00
katherinehhh
c281950b5d refactor: createDatabaseConnection 2024-01-22 20:55:55 +08:00
katherinehhh
840ef5acd4 refactor: dataSource manager 2024-01-22 17:36:36 +08:00
dream2023
a9eaeea639 docs: namespace to dataSource 2024-01-22 17:27:33 +08:00
dream2023
2a8cf7a5b8 refactor: namespace to dataSource 2024-01-22 17:06:27 +08:00
katherinehhh
d12140a2e0 feat: datasource manager 2024-01-22 15:02:27 +08:00
katherinehhh
5a09774cf6
refactor: permission sholud passed without setting x-acl action (#3410) 2024-01-22 14:40:04 +08:00
Zeke Zhang
9c25e10668 chore: optimize CI variable 2024-01-22 11:01:14 +08:00
Zeke Zhang
13e289909c chore(e2e): reduce timeout 2024-01-22 10:56:34 +08:00
chenos
d58d899c62 feat: data source manager 2024-01-22 09:53:27 +08:00
Zeke Zhang
89828d099c feat: add collectionName for Record 2024-01-21 15:27:22 +08:00
Zeke Zhang
c0e5dd2453 refactor: extract 2024-01-21 15:08:53 +08:00
Zeke Zhang
9a33216640 refactor: extract condition 2024-01-21 14:54:22 +08:00
Zeke Zhang
8e7cb845d4 Merge branch 'main' into T-2327-and-2771 2024-01-21 12:25:20 +08:00
Chareice
0cfa308ce4
chore: allowed action middleware 2024-01-21 10:37:33 +08:00
Chareice
9b515c6687
chore: with acl meta middleware 2024-01-21 09:57:28 +08:00
Junyi
3b60ba2cf8
test: mysql version bug (#3412)
* test(plugin-workflow): limit mysql version to pass test

* fix(plugin-workflow-delay): fix test case

* fix(plugin-workflow-delay): fix test case
2024-01-20 20:59:49 +08:00
chenos
1260934d2b fix(client): cannot read properties of null (reading 'removeEventListener')
at http://localhost:13000/p. index.f739617tasyncis:118:3551
2024-01-20 14:48:17 +08:00
dream2023
4c2f3592db fix: change role bug 2024-01-19 17:48:03 +08:00
dream2023
1d6a828f43 fix: bug 2024-01-19 16:40:16 +08:00
dream2023
0895bccde2 fix: e2e bug 2024-01-19 15:36:40 +08:00
dream2023
59abd5b41d fix: e2e bug 2024-01-19 15:29:48 +08:00
katherinehhh
cf8c30d435 fix: foreignKey 2024-01-19 15:21:51 +08:00
katherinehhh
1d983ccadf Merge branch 'T-2327-and-2771' of github.com:nocobase/nocobase into T-2327-and-2771 2024-01-19 15:10:31 +08:00
katherinehhh
96bf8398de refactor: availableTypes 2024-01-19 15:08:44 +08:00
dream2023
ddc71c60aa Merge branch 'T-2327-and-2771' of https://github.com/nocobase/nocobase into T-2327-and-2771 2024-01-19 14:30:18 +08:00
dream2023
1e79eb5484 fix: e2e bug 2024-01-19 14:29:29 +08:00
Chareice
cbbe21cd7b
chore: mysql unsigned number field 2024-01-19 14:09:12 +08:00
Chareice
817177c196
chore: mysql field type 2024-01-19 11:52:54 +08:00
Chareice
3b0feef046
chore: mysql field type 2024-01-19 11:42:00 +08:00
Chareice
fd817d7fb5
chore: postgres type map 2024-01-19 11:36:16 +08:00
dream2023
137d912802 fix: bug 2024-01-19 10:18:33 +08:00
dream2023
598f8234ff Merge branch 'T-2327-and-2771' of https://github.com/nocobase/nocobase into T-2327-and-2771 2024-01-19 09:16:57 +08:00
dream2023
0f108158d5 fix: bug 2024-01-19 09:16:37 +08:00
Chareice
31f55e3a1a
chore: error handler 2024-01-19 00:36:30 +08:00
Chareice
b6f46a16e4
chore: test 2024-01-18 22:58:15 +08:00
dream2023
9782e53f42 fix: reload database 2024-01-18 22:41:22 +08:00
Chareice
b2e4b6a7cd
chore: test 2024-01-18 22:17:52 +08:00
katherinehhh
69dcc2bf4d refactor: menu side bar 2024-01-18 21:01:17 +08:00
katherinehhh
1fa4d48869
fix: attachment deletion and re upload do not display (#3405) 2024-01-18 19:10:44 +08:00
dream2023
b4d950566c fix: bug 2024-01-18 18:41:15 +08:00
dream2023
4560619ef3 fix: bug 2024-01-18 18:40:23 +08:00
katherinehhh
ae62b83397 refactor: namespace in useresource 2024-01-18 17:12:16 +08:00
dream2023
b1ba7722c1 fix: unit test 2024-01-18 16:31:40 +08:00
dream2023
48e4b2118d fix: single and multi data source 2024-01-18 16:30:38 +08:00
katherinehhh
a15a72a113 Merge branch 'T-2327-and-2771' of github.com:nocobase/nocobase into T-2327-and-2771 2024-01-18 15:20:04 +08:00
katherinehhh
2f9f42dca8 refactor: acl support namespace 2024-01-18 15:19:06 +08:00
dream2023
31ed99810c Merge branch 'T-2327-and-2771' of https://github.com/nocobase/nocobase into T-2327-and-2771 2024-01-18 15:02:29 +08:00
dream2023
da34bf051b fix: e2e bug 2024-01-18 15:02:02 +08:00
katherinehhh
ccee2df920 refactor: acl support namespace 2024-01-18 14:44:58 +08:00
katherinehhh
3535a8d559 refactor: acl support namespace 2024-01-18 14:44:02 +08:00
dream2023
681b551697 Merge remote-tracking branch 'origin/main' into T-2327-refactor2 2024-01-18 14:42:01 +08:00
dream2023
554b1f45bb fix: delete placedholder tip 2024-01-18 14:24:26 +08:00
dream2023
1e0136e402 Merge remote-tracking branch 'origin/main' into T-2327-and-2771 2024-01-18 14:23:27 +08:00
Chareice
edad85b92d
chore: acl selectore 2024-01-18 13:52:24 +08:00
Chareice
d98a42e34f
chore: acl 2024-01-18 13:48:28 +08:00
katherinehhh
738f9c568e Merge branch 'T-2327-and-2771' of github.com:nocobase/nocobase into T-2327-and-2771 2024-01-18 12:59:45 +08:00
katherinehhh
3b63cebbf1 Merge branch 'T-2771' into T-2327-and-2771 2024-01-18 12:59:00 +08:00
katherinehhh
85cdf8ace0 refactor: availableTypes 2024-01-18 12:57:28 +08:00
dream2023
e95d5e7270 Merge remote-tracking branch 'origin/T-2327-refactor2' into T-2327-and-2771 2024-01-18 11:52:20 +08:00
dream2023
87d8f767fa fix: workflow menual 2024-01-18 11:51:01 +08:00
chenos
acabb9cbf0 fix: run postinstall after pm add 2024-01-18 11:23:57 +08:00
dream2023
f185b11616 fix: cache bug 2024-01-18 11:02:54 +08:00
katherinehhh
a60a0a6989 Merge branch 'T-2771' into T-2327-and-2771 2024-01-18 10:40:50 +08:00
katherinehhh
c80b67380b Merge branch 'T-2771' into T-2327-and-2771 2024-01-18 10:07:12 +08:00
katherinehhh
fe260d0371
refactor: parent inherited collection support enable child collection in add new action (#3398)
* refactor: parent inherited collectionsholud enable child collection in add new

* fix: useisDetailBlock

* fix: useIsDetailBlock

* fix: useIsDetailBlock

* fix: useIsDetailBlock
2024-01-18 09:46:27 +08:00
chenos
8217ebfb1b
feat: improve plugin manager process (#3386)
* feat: improve plugin manager process

* fix: skip help error

* fix: ipc check

* fix: improve remove

* fix: refresh

* fix: remove dir

* fix: improve code

* fix: update yarn.lock

* fix: e2e error

* fix: migration

* fix: pm create

* Revert "fix: migration"

This reverts commit 8f8fe04436.

* fix: remove sample-hello
2024-01-18 00:33:15 +08:00
katherinehhh
9c4eb9cd1f refactor: availableTypes 2024-01-17 22:27:55 +08:00
katherinehhh
1ea0995f71 refactor: availableTypes 2024-01-17 22:14:37 +08:00
dream2023
d2d5532127 fix: improve code 2024-01-17 21:54:18 +08:00
katherinehhh
343f057748 refactor: availableTypes 2024-01-17 21:49:20 +08:00
Junyi
a4b9544944
Fix/plugin workflow migration (#3404)
* fix(plugin-workflow): fix migration

* fix(plugin-workflow): add job.nodeKey when saving
2024-01-17 20:09:24 +08:00
dream2023
2724521000 fix: bug 2024-01-17 17:34:59 +08:00
dream2023
855db5a830 fix: build bug 2024-01-17 15:29:13 +08:00
dream2023
3216634b6a Merge remote-tracking branch 'origin/T-2771' into T-2327-and-2771 2024-01-17 14:44:42 +08:00
dream2023
40755d3ec6 Merge remote-tracking branch 'origin/T-2327-refactor2' into T-2327-and-2771 2024-01-17 14:44:22 +08:00
dream2023
de16828d73 feat: muti source 2024-01-17 14:43:39 +08:00
katherinehhh
8d06b73c48
fix: varibales as & &Iteration is not correct in record picker (#3399) 2024-01-17 11:16:19 +08:00
dream2023
c9aae391bd fix: get children collection bug 2024-01-17 10:38:48 +08:00
Junyi
6f72451d27
fix(plugin-workflow-manual): fix value block in todo block (#3400) 2024-01-17 00:06:40 +08:00
katherinehhh
5c1cce9781 refactor: sourceKey should be string 2024-01-16 16:06:41 +08:00
katherinehhh
d3704f6807
fix: assciation field in sub-table should support enable link when readOnly or readPrety (#3390) 2024-01-16 15:58:18 +08:00
katherinehhh
c2c65f15a1 refactor: o2o sourceKey should be string 2024-01-16 15:57:43 +08:00
katherinehhh
bc927af640
refactor: local translate (#3396) 2024-01-16 11:31:03 +08:00
dream2023
98206cf90e Merge remote-tracking branch 'origin/T-2771' into T-2327-and-2771 2024-01-16 10:05:08 +08:00
YANG QIA
8530da7c23
fix: fix T-2916 (#3393) 2024-01-15 23:46:29 +08:00
katherinehhh
9ccec69068 refactor: target key should be string 2024-01-15 22:29:54 +08:00
katherinehhh
82ed96400f refactor: target key should be string 2024-01-15 22:20:05 +08:00
katherinehhh
222d3f0b7b refactor: target key shuold required 2024-01-15 22:04:12 +08:00
katherinehhh
6fb5af993e
refactor(sub-table): sub-table support selection of existing records (#3311)
* refactor: sub-table support selection of existing records

* refactor: local improve

* refactor: sub-table support select existing records

* refactor: create action support updateAssociationValues

* refactor:  sub-table

* fix: omit foreignKey

* refactor: record picker omit foreignKey

* test: manyToMany

* test: subform: basic fields

* test: table column & sub-table in edit form
2024-01-15 17:46:55 +08:00
dream2023
7538d7b110 Merge remote-tracking branch 'origin/T-2327-refactor2' into T-2327-and-2771 2024-01-15 16:30:09 +08:00
dream2023
087e2dcfe4 fix: rename CollectionTemplate to CollectionTemplateBase 2024-01-15 16:18:08 +08:00
dream2023
4f6ed79221 fix: rename CollectionFieldInterface to CollectionFieldInterfaceBase 2024-01-15 16:13:57 +08:00
katherinehhh
8b893b7fdb refactor: plugin manager link 2024-01-15 16:05:25 +08:00
dream2023
4bd0198ffc Merge remote-tracking branch 'origin/T-2771' into T-2327-and-2771 2024-01-15 14:33:11 +08:00
dream2023
14ce98cee5 fix: docs bug 2024-01-15 10:34:38 +08:00
dream2023
c4f43cab54 docs: new docs 2024-01-14 23:11:15 +08:00
YANG QIA
dc71a77d8c
fix(auth): redirect URL after signing in by SSO sucessfully (#3387)
* fix: fix T-2900

* fix: saml
2024-01-14 22:26:13 +08:00
katherinehhh
dea66152b3 refactor: foreign key 2024-01-14 21:12:21 +08:00
katherinehhh
18a25682ed refactor: foreign key 2024-01-14 21:11:34 +08:00
Chareice
1b3bcb2c3c
chore: acl export 2024-01-14 19:52:19 +08:00
Chareice
157e3d2ef9
chore: test 2024-01-14 17:34:35 +08:00
Chareice
1214717f82
chore: database to connection name 2024-01-14 17:27:59 +08:00
Chareice
b8a6199f60
chore: acl selector 2024-01-14 16:02:16 +08:00
Chareice
2d1da285a9
chore: acl test 2024-01-14 10:37:13 +08:00
Chareice
f570aa5c88
chore: namespace test 2024-01-14 10:16:34 +08:00
Chareice
a58f736416
chore: acl instances 2024-01-14 10:15:39 +08:00