Commit Graph

1528 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
dream2023
615b19a7cb fix: inheritance bug 2024-01-13 21:36:48 +08:00
Dunqing
8ab69500c7
fix(custom-request): permission issues (#3306)
* fix(custom-request-plugin): cannot see custom request action in non-root role when acl doesn't set

* fix: list all roles

* feat: display all roles

* feat: support

* fix: remove unused code

* fix: options is null

* fix: translation

* fix: migration error

---------

Co-authored-by: chenos <chenlinxh@gmail.com>
2024-01-13 18:13:18 +08:00
chenos
1adaa53c2b
feat: supports the WS_PATH environment variable (#3384) 2024-01-13 18:05:22 +08:00
katherinehhh
850d2c6616 refactor: code improve 2024-01-12 21:27:09 +08:00
Zeke Zhang
f466e6ec95 test(e2e): increase the number of retries for error-prone tests 2024-01-12 17:14:18 +08:00
dream2023
6adb95588d fix: remove isLocal 2024-01-12 16:01:30 +08:00
dream2023
5f37f7a523 fix: bug 2024-01-12 15:20:23 +08:00
dream2023
4132659670 fix: unit test 2024-01-12 12:05:46 +08:00
dream2023
3aba0d051e fix: add CollectionExtendsProvider 2024-01-12 11:50:15 +08:00
dream2023
db81a8aab6 fix: bug 2024-01-12 11:25:20 +08:00
dream2023
83680e211c fix: remove collectionTemplate and fieldInterface V2 2024-01-12 10:21:39 +08:00
dream2023
3c79cf419c Merge remote-tracking branch 'origin/main' into T-2327-refactor2 2024-01-12 10:18:02 +08:00
dream2023
c4257f1e23 fix: build error 2024-01-12 10:17:38 +08:00
katherinehhh
bc3da07b82 Merge branch 'main' into T-2771 2024-01-12 09:54:55 +08:00
katherinehhh
dfb4421484
fix: table column sort params should support cancel sort (#3372)
* fix: sort params

* fix: sort params
2024-01-12 09:50:17 +08:00
dream2023
0b6adb7994 Merge remote-tracking branch 'origin/main' into T-2327-refactor2 2024-01-11 23:35:27 +08:00
dream2023
9ec6372af9 fix: field interfaces to class 2024-01-11 23:33:35 +08:00
dream2023
9542db19ff fix: template to class 2024-01-11 22:05:18 +08:00
dream2023
9a85755684 fix: add field groups 2024-01-11 18:16:08 +08:00
dream2023
f934cb9bbe fix: rename collectionFieldInterfaceInstance to fieldInterfaceInstance 2024-01-11 17:19:52 +08:00
Zeke Zhang
29a09b1ceb
fix(TableSelectorProvider): parse filter param (#3366)
* fix(TableSelectorProvider): parse filter param

* fix: avoid duplicate loading of data
2024-01-11 16:22:06 +08:00
dream2023
b492f4999c Merge remote-tracking branch 'origin/main' into T-2327-refactor2 2024-01-11 15:16:54 +08:00
dream2023
04a4949d9d fix: collection field groups remove from core 2024-01-11 15:16:05 +08:00
katherinehhh
53e870c0b2 Merge branch 'main' into T-2771 2024-01-11 11:22:29 +08:00
katherinehhh
4d44c6e24e
fix: useDesigner Designer should has default toolbar (#3365)
* fix: useDesigner Designer should has default toolbar

* test: e2e schemaSeting for linkage rule

* test: e2e schemaSeting for linkage rule

* test: e2e schemaSeting for linkage rule
2024-01-11 11:21:18 +08:00
katherinehhh
895e305a8e Merge branch 'main' into T-2771 2024-01-11 10:17:25 +08:00
chenos
2f8b0e75f8 feat: optimize translation 2024-01-11 10:06:44 +08:00
dream2023
0d53f1b93c fix: bug 2024-01-10 23:51:02 +08:00
dream2023
50c57591a6 Merge remote-tracking branch 'origin/main' into T-2327-refactor2 2024-01-10 21:52:07 +08:00
dream2023
4bd5003002 fix: e2e 2024-01-10 21:50:58 +08:00
katherinehhh
77ef27d524
fix: linkage rules support multi-level association value calculation and assignment (#3359) 2024-01-10 17:01:20 +08:00
katherinehhh
79735a372b
fix: linkage rule only support action with context record (#3355) 2024-01-10 17:00:44 +08:00
Zeke Zhang
7534e12029
fix(header): avoid affecting the colours of other menus (#3357)
* fix: avoid affecting the colours of other menus

* Revert "Revert "fix(theme): fix color of header menu (#3354)""

This reverts commit 3a06893463.
2024-01-10 16:52:02 +08:00
Zeke Zhang
3a06893463 Revert "fix(theme): fix color of header menu (#3354)"
This reverts commit 70633840da.
2024-01-10 11:33:23 +08:00
Zeke Zhang
70633840da
fix(theme): fix color of header menu (#3354) 2024-01-10 09:15:41 +08:00
chenos
38c19818d3 chore(versions): 😊 publish v0.19.0-alpha.3 2024-01-09 18:32:09 +08:00
chenos
f2de05bea0 fix(client): hide gmt property 2024-01-09 18:12:34 +08:00
dream2023
ecb8842444 fix: docs build 2024-01-09 17:48:03 +08:00
dream2023
1af2b7e87c fix: bug 2024-01-09 16:51:03 +08:00
dream2023
8a3e816c54 Merge remote-tracking branch 'origin/main' into T-2327-refactor2 2024-01-09 15:37:39 +08:00
dream2023
f0a2e03402 fix: bug 2024-01-09 15:31:59 +08:00
by
effff269dc
fix: filter form drop-down selection to add data range (#3321)
* fix: filter form drop-down selection to add data range

* refactor: use existing code directly

* test: add tests

---------

Co-authored-by: zhangboya3 <zhangboya3@xiaomi.com>
Co-authored-by: Zeke Zhang <958414905@qq.com>
2024-01-09 12:21:16 +08:00
dream2023
55d9da5800 fix: bug 2024-01-09 11:45:55 +08:00
dream2023
6ac6f050c2 fix: bug 2024-01-09 10:47:37 +08:00
katherinehhh
32778658e2 refactor: params assign support url request 2024-01-09 10:46:05 +08:00
chenos
2070f2046d chore(versions): 😊 publish v0.19.0-alpha.2 2024-01-09 09:13:16 +08:00
chenos
c39d3398ae chore(versions): 😊 publish v0.19.0-alpha.1 2024-01-08 19:32:54 +08:00
chenos
7779cd79ac
refactor: optimize the command line (#3339)
* fix: perform load action on boot main app

* feat: add dataType option in collection duplicator

* chore: reset optional dumpable config

* chore: dump command

* chore: dump & restore command

* chore: delay restore

* fix: dump test

* chore: restore command

* chore: dump command action

* chore: dumpable collection api

* chore: client collection option

* feat: backup& restore client

* chore: content disposition header in dump response

* chore: download backup field

* feat: collection origin option

* fix: test

* chore: collection manager collection origin

* chore: upload  backup field

* chore: upload restore file

* chore: upload restore file

* fix: test

* chore: backup and restore support learn more

* refactor: upload restore file

* refactor: upload restore file

* fix: test

* fix: test

* chore: dumpable collection with title

* chore: pg only test

* chore: test

* fix: test

* chore: test sleep

* style: locale improve

* refactor: download backup file

* refactor: start restore

* fix: restore key name

* refactor: start restore

* refactor: start restore

* refactor: start restore

* refactor: start restore

* refactor: start restore

* refactor: start restore

* chore: unify duplicator option

* fix: dump empty collection

* chore: test

* chore: test

* style: style improve

* refactor: locale improve

* chore: dumpalbe collection orders

* style: style improve

* style: style improve

* style: icon adjust

* chore: nginx body size

* chore: get file status

* feat: run dump task

* feat: download api

* chore: backup files resourcer

* feat: restore destroy api

* chore: backup files resoucer

* feat: list backup files action

* chore: get collection meta from dumped file

* fix: dump file name

* fix: test

* chore: backup and restore ui

* chore: swagger api for backup & restore

* chore: api doc

* chore: api doc

* chore: api doc

* chore: backup and restore ui

* chore: backup and restore ui

* chore: backup and restore ui

* chore: backup and restore ui

* chore: backup and restore ui

* fix: restore values

* style: style improve

* fix: download field respontype

* fix: restore form local file

* refactor: local improve

* refactor: delete backup file

* fix: in progress status

* refactor: locale improve

* refactor: locale improve

* refactor: style improve

* refactor: style improve

* refactor: style improve

* test: dump collection table attribute

* chore: dump collection with table attributes

* chore: test

* chore: create new table in restore

* fix: import error

* chore: restore table from backup file

* chore: sync collection after restore collections

* fix: restore json data

* style: style improve

* chore: restore with fields

* chore: test

* fix: test

* fix: test with underscored

* style: style improve

* fix: lock file state

* chore: add test file

* refactor: backup & restore plugin

* fix: mysql test

* chore: skip import view collection

* chore: restore collection with inherits topo order

* fix: import

* style: style improve

* fix: restore sequence fields

* fix: themeConfig collection duplicator option

* fix: restore with dialectOnly meta

* fix: throw error

* fix: restore

* fix: import backup file created in postgres into mysql

* fix: repeated items in inherits

* chore: upgrade after restore

* feat: check database env before restore

* feat: handle autoincr val in postgres

* chore: sqlite & mysql queryInterface

* chore: test

* fix: test

* chore: test

* fix: build

* fix: pg test

* fix: restore with date field

* chore: theme-config collection

* chore: chage import collections method to support collection origin

* chore: fallback get autoincr value in mysql

* fix: dataType normalize

* chore: delay restore

* chore: test

* fix: build

* feat: collectin onDump

* feat: collection onDump interface

* chore: dump with view collection

* chore: sync in restore

* refactor: locale improve

* refactor: code improve

* fix: test

* fix: data sync

* chore: rename backup & restore plugin

* chore: skip test

* style: style improve

* style: style improve

* style: style improve

* style: style improve

* chore: import version check

* chore: backup file dir

* chore: build

* fix: bugs

* fix: error

* fix: pageSize

* fix: import origin

* fix: improve code

* fix: remove namespace

* chore: dump rules config

* fix: dump custom collection

* chore: version

* fix: test

* fix: test

* fix: test

* fix: test

* chore: test

* fix: load custom collection

* fix: client

* fix: translation

* chore: code

* fix: bug

* fix:  support shared option

* fix: roles collection dumpRules

* chore: test

* fix: define collections

* chore: collection group

* fix: translation

* fix: translation

* fix: restore options

* chore: restore command

* refactor: optimize the command line

* chore: dump error

* fix: test error

* fix:  test error

* fix: test error

* fix: test error

* fix: test error

* fix: skip cli test cases

* fix: test error

* fix: too many open files

* fix: update migration version

* fix: migrations

* fix: upgrade

* fix: error

* fix: migration error

* fix: upgrade

* fix: test error

* fix: timeout

* fix: width

* feat: auto load collections

* fix: test error

* fix: test error

* fix: test error

* fix: test error

* fix: test error

* fix: test error

* fix: test error

* fix: ipc error

* fix: test error

---------

Co-authored-by: Chareice <chareice@live.com>
Co-authored-by: katherinehhh <katherine_15995@163.com>
2024-01-08 19:05:14 +08:00
ChengLei Shao
fa97d0a642
feat: application backup and restore (#3268)
* fix: perform load action on boot main app

* feat: add dataType option in collection duplicator

* chore: reset optional dumpable config

* chore: dump command

* chore: dump & restore command

* chore: delay restore

* fix: dump test

* chore: restore command

* chore: dump command action

* chore: dumpable collection api

* chore: client collection option

* feat: backup& restore client

* chore: content disposition header in dump response

* chore: download backup field

* feat: collection origin option

* fix: test

* chore: collection manager collection origin

* chore: upload  backup field

* chore: upload restore file

* chore: upload restore file

* fix: test

* chore: backup and restore support learn more

* refactor: upload restore file

* refactor: upload restore file

* fix: test

* fix: test

* chore: dumpable collection with title

* chore: pg only test

* chore: test

* fix: test

* chore: test sleep

* style: locale improve

* refactor: download backup file

* refactor: start restore

* fix: restore key name

* refactor: start restore

* refactor: start restore

* refactor: start restore

* refactor: start restore

* refactor: start restore

* refactor: start restore

* chore: unify duplicator option

* fix: dump empty collection

* chore: test

* chore: test

* style: style improve

* refactor: locale improve

* chore: dumpalbe collection orders

* style: style improve

* style: style improve

* style: icon adjust

* chore: nginx body size

* chore: get file status

* feat: run dump task

* feat: download api

* chore: backup files resourcer

* feat: restore destroy api

* chore: backup files resoucer

* feat: list backup files action

* chore: get collection meta from dumped file

* fix: dump file name

* fix: test

* chore: backup and restore ui

* chore: swagger api for backup & restore

* chore: api doc

* chore: api doc

* chore: api doc

* chore: backup and restore ui

* chore: backup and restore ui

* chore: backup and restore ui

* chore: backup and restore ui

* chore: backup and restore ui

* fix: restore values

* style: style improve

* fix: download field respontype

* fix: restore form local file

* refactor: local improve

* refactor: delete backup file

* fix: in progress status

* refactor: locale improve

* refactor: locale improve

* refactor: style improve

* refactor: style improve

* refactor: style improve

* test: dump collection table attribute

* chore: dump collection with table attributes

* chore: test

* chore: create new table in restore

* fix: import error

* chore: restore table from backup file

* chore: sync collection after restore collections

* fix: restore json data

* style: style improve

* chore: restore with fields

* chore: test

* fix: test

* fix: test with underscored

* style: style improve

* fix: lock file state

* chore: add test file

* refactor: backup & restore plugin

* fix: mysql test

* chore: skip import view collection

* chore: restore collection with inherits topo order

* fix: import

* style: style improve

* fix: restore sequence fields

* fix: themeConfig collection duplicator option

* fix: restore with dialectOnly meta

* fix: throw error

* fix: restore

* fix: import backup file created in postgres into mysql

* fix: repeated items in inherits

* chore: upgrade after restore

* feat: check database env before restore

* feat: handle autoincr val in postgres

* chore: sqlite & mysql queryInterface

* chore: test

* fix: test

* chore: test

* fix: build

* fix: pg test

* fix: restore with date field

* chore: theme-config collection

* chore: chage import collections method to support collection origin

* chore: fallback get autoincr value in mysql

* fix: dataType normalize

* chore: delay restore

* chore: test

* fix: build

* feat: collectin onDump

* feat: collection onDump interface

* chore: dump with view collection

* chore: sync in restore

* refactor: locale improve

* refactor: code improve

* fix: test

* fix: data sync

* chore: rename backup & restore plugin

* chore: skip test

* style: style improve

* style: style improve

* style: style improve

* style: style improve

* chore: import version check

* chore: backup file dir

* chore: build

* fix: bugs

* fix: error

* fix: pageSize

* fix: import origin

* fix: improve code

* fix: remove namespace

* chore: dump rules config

* fix: dump custom collection

* chore: version

* fix: test

* fix: test

* fix: test

* fix: test

* chore: test

* fix: load custom collection

* fix: client

* fix: translation

* chore: code

* fix: bug

* fix:  support shared option

* fix: roles collection dumpRules

* chore: test

* fix: define collections

* chore: collection group

* fix: translation

* fix: translation

* fix: restore options

* chore: restore command

* chore: dump error

* fix: too many open files

---------

Co-authored-by: katherinehhh <katherine_15995@163.com>
Co-authored-by: chenos <chenlinxh@gmail.com>
2024-01-08 18:59:56 +08:00
dream2023
08ccdb2964 Merge remote-tracking branch 'origin/main' into T-2327-refactor2 2024-01-08 18:08:00 +08:00
dream2023
0b16526297 fix: bug 2024-01-08 18:03:25 +08:00
katherinehhh
af3ef28656 fix: value undefined in CollectionCategory 2024-01-08 15:25:18 +08:00
Chareice
0157deaff8
Merge branch 'T-2844' into T-2771 2024-01-07 22:24:35 +08:00
Zeke Zhang
d85aaa36e3
fix(z-index): avoid obscuring the pop-up and upgrade antd to v5.12.8 (#3337)
* fix(z-index): avoid obscuring the pop-up

* test: optimize

* chore: fix build

* test: fix errors
2024-01-06 18:32:25 +08:00
dream2023
f0e4152f49 Merge remote-tracking branch 'origin/main' into T-2327-refactor2 2024-01-06 16:59:36 +08:00
dream2023
c19305d4f9 fix: test bug 2024-01-06 16:36:27 +08:00
Zeke Zhang
2ab9f8625e
chore(e2e): make parallelism mode more stable (#3294)
* chore: make parallelism mode more stable

* refactor: optimize e2e tests

* test: make test more stable

* chore: change concurrency to 4 from 2

* refactor: inline variable

* test: fix error

* test: avoid error

* test: avoid error

* test: avoid error

* chore(e2e): remove --stop-on-error on CI runs

* Revert "refactor: inline variable"

This reverts commit 454bb04613.

* test: make more stable

* chore: adjust timeout

* chore: update config

* test: make test more stable

* chore: update yarn.lock

* Revert "chore: update yarn.lock"

This reverts commit 1bb7a661d1.

* test(workflow): increase local timeout

* test: optimize

* test: more stable

* test: fix errors

* test: more stable

* chore: increase retries to 2 in CI
2024-01-06 06:37:23 +08:00
chenos
da99573545
feat: add onChange props to SchemaComponent (#3292)
* feat: add onChange props to SchemaComponent

* fix(client): avoid undefined method error

---------

Co-authored-by: mytharcher <mytharcher@gmail.com>
2024-01-05 21:36:00 +08:00
dream2023
513f03ac62 fix: bug 2024-01-05 18:45:02 +08:00