4283 Commits

Author SHA1 Message Date
Zeke Zhang
4aaab331ae
fix(mobile): fix 'Edit link' setting (#5068) 2024-08-16 12:02:11 +08:00
Katherine
de9607f602
fix: gridCard blocks cannot flip pages when using API data sources (#5066)
* fix: gridCard pagination

* fix: bug
2024-08-16 09:40:18 +08:00
GitHub Actions Bot
2243957d0d Merge branch 'main' into next 2024-08-15 12:18:35 +00:00
Katherine
809b561aee
fix: filter form action bar stye improve (#5054) 2024-08-15 20:18:17 +08:00
Zeke Zhang
07f5c95afe Merge branch 'next' into develop 2024-08-15 19:44:25 +08:00
Zeke Zhang
c5f345ff57
fix(template): refresh parent data on submit button click in referenced template block (#5057)
* fix(template): refresh parent data on submit button click in referenced template block

* refactor: migrate e2e fiels of add-new to out

* test: add e2e test

* chore: fix e2e test
2024-08-15 19:32:43 +08:00
GitHub Actions Bot
954daa0943 Merge branch 'main' into next 2024-08-15 09:10:20 +00:00
ChengLei Shao
453ba9cba8
fix: quote table name in mysql query interface (#5065)
* fix: quote table name when get mysql table define

* chore: test

---------

Co-authored-by: SuperGoo <gu.zhichao@nint.com>
2024-08-15 16:13:03 +08:00
chenos
75e107f558 Merge branch 'next' into develop 2024-08-15 15:49:10 +08:00
Katherine
b26d38be5f
fix: html rendering in markdown block (#5062) 2024-08-15 12:01:48 +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
Zeke Zhang
1338940c71 Merge branch 'main' into next 2024-08-14 10:23:07 +08:00
dependabot[bot]
d8c34c5bb3
chore(deps): bump @babel/plugin-transform-modules-amd from 7.22.5 to 7.24.7 (#5052)
* chore(deps): bump @babel/plugin-transform-modules-amd

Bumps [@babel/plugin-transform-modules-amd](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-modules-amd) from 7.22.5 to 7.24.7.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.24.7/packages/babel-plugin-transform-modules-amd)

---
updated-dependencies:
- dependency-name: "@babel/plugin-transform-modules-amd"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* chore(deps): bump @babel/core and @babel/preset-env from 7.22.10 to 7.25.3

* chore: update yarn.lock

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Zeke Zhang <958414905@qq.com>
2024-08-14 10:16:38 +08:00
Zeke Zhang
be4ae42376
fix(inherit): fix 'Add new' button for inherited collectons (#5049)
* fix(inherit): fix 'Add new' button for inherited collectons

* test: add e2e test
2024-08-14 09:33:32 +08:00
Zeke Zhang
b4c486afd8 Merge branch 'main' into next 2024-08-13 19:16:33 +08:00
dependabot[bot]
9b055b904c
chore(deps): bump tsup from 7.2.0 to 8.2.4 (#5046)
Bumps [tsup](https://github.com/egoist/tsup) from 7.2.0 to 8.2.4.
- [Release notes](https://github.com/egoist/tsup/releases)
- [Changelog](https://github.com/egoist/tsup/blob/dev/.releaserc.json)
- [Commits](https://github.com/egoist/tsup/compare/v7.2.0...v8.2.4)

---
updated-dependencies:
- dependency-name: tsup
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-08-13 19:13:14 +08:00
GitHub Actions Bot
207d571756 Merge branch 'main' into next 2024-08-13 10:19:11 +00:00
Zeke Zhang
8058d22bc5
fix(inherit): correct title for inherited sub-collection association block (#5048) 2024-08-13 18:18:54 +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
Junyi
ea92a8b9a0
feat(client): add parse options for variable input (#5043)
* feat(client): add parse options for variable input

* docs(client): add component type doc
2024-08-12 21:59:32 +08:00
Chareice
d6796ac758
chore: filterTargetKey getter in collection 2024-08-12 21:23:27 +08:00
GitHub Actions Bot
b3ad75be0a Merge branch 'main' into next 2024-08-12 10:31:38 +00:00
ChengLei Shao
fb57f12ba2
fix: load parent field in inherited collection (#5044)
* fix: load parent field in inherited collection

* chore: test
2024-08-12 18:30:18 +08:00
GitHub Actions Bot
7f258ac62b Merge branch 'main' into next 2024-08-12 02:16:33 +00:00
Zeke Zhang
5d825f85bc
fix(Collapse): fix issue with data scope settings being ineffective (#4914)
* fix(Collapse): fix issue with data scope settings being ineffective

* fix: fix 'Default collapse' and 'sort rules'
2024-08-12 10:16:15 +08:00
Zeke Zhang
3ecad296e7 Merge branch 'main' into next 2024-08-11 15:48:56 +08:00
Zeke Zhang
f6cb299678
fix(Table): should not error when open a popup by clicking a multi-level field (#5038) 2024-08-11 15:46:16 +08:00
GitHub Actions Bot
b860078857 Merge branch 'main' into next 2024-08-11 05:24:14 +00:00
Zeke Zhang
d6c2cfe602
fix(linkageRules): fix an exception when the condition contains a association field (#5037) 2024-08-11 13:23:56 +08:00
GitHub Actions Bot
70bb95bcaf Merge branch 'main' into next 2024-08-10 01:03:32 +00:00
chenos
c42a2040e2
fix(client): missing sort parameter (#5034) 2024-08-10 09:03:14 +08:00
GitHub Actions Bot
99070be46d Merge branch 'main' into next 2024-08-09 11:37:53 +00:00
chenos
688e9efd67
fix(database): skip table doesn't exist (#5023)
* fix(database): skip table doesn't exist

* fix: error

* fix: remove console log
2024-08-09 19:37:33 +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
00d3ffaf99
fix: extend collection cache bug (#5031) 2024-08-09 17:40:52 +08:00
jack zhang
4404f5fa13
feat: encryption field (#4975)
* feat: add @nocobase/plugin-field-encryption

* fix: bug

* fix: hook

* fix: add operators

* feat: add hidden

* fix: i18n

* fix: bug

* feat: env add ENCRYPTION_FIELD_KEY

* fix: exception handling

* fix: error message i18n

* fix: add `addFieldInterfaces()` alias

* fix: bug

* fix: bug

* fix: bug

* fix: bug

* fix: workflow env

* fix: bug

* fix: e2e

* fix: e2e bug

* fix: move `checkKey()` to field

* fix: move EncryptionField to database package

* fix: move encryption plugin to pro

* chore: encryption field in field type map

* fix: unit test

* fix: remove console

* fix: add more value check

* fix: bug

* fix: bug

* fix: bug

---------

Co-authored-by: chenos <chenlinxh@gmail.com>
Co-authored-by: Chareice <chareice@live.com>
2024-08-09 17:14:37 +08:00
Chareice
bd77ef2bd3
fix: collection options 2024-08-09 16:32:35 +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
GitHub Actions Bot
7f2703ede2 Merge branch 'main' into next 2024-08-09 07:21:03 +00:00
Katherine
750eeadb99
style: quick add button for association field in the form, compact theme style without adaptation (#5024) 2024-08-09 15:10:15 +08:00
GitHub Actions Bot
0bfe908a66 Merge branch 'main' into next 2024-08-09 07:07:26 +00:00
Zeke Zhang
789dc49867
fix: correct foreign key value errors (#5027) 2024-08-09 15:07:08 +08:00
Junyi
acae33a89d
fix(client): show original field input component after cleared variable (#5028) 2024-08-09 14:12:49 +08:00
GitHub Actions Bot
5f9f94d008 Merge branch 'main' into next 2024-08-08 07:52:23 +00:00
Katherine
cd5d48eb80
fix: source field type filtering association fields in sql collection & view collection (#5014)
* fix: source field type filtering relationship fields in sql collection and view collection

* fix: bug

* fix: bug
2024-08-08 15:52:06 +08:00
Katherine
84119e6a06
style: action style improve (#5018)
* style: action style improve

* style: style improve

* style: style improve
2024-08-08 15:31:01 +08:00
GitHub Actions Bot
35a36d28dd Merge branch 'main' into next 2024-08-08 07:25:34 +00:00