8037 Commits

Author SHA1 Message Date
Zeke Zhang
ecaee603bd
fix(useCompile): avoid error (#6141) 2025-01-26 13:04:03 +08:00
nocobase[bot]
4c3b4c8497 Merge branch 'main' into next 2025-01-25 14:20:56 +00:00
ChengLei Shao
49cad7ed3f
chore: append acl strategy resource (#6137) 2025-01-25 22:20:32 +08:00
nocobase[bot]
de782020d2 Merge branch 'main' into next 2025-01-25 14:20:19 +00:00
ChengLei Shao
b6d83503c3
fix: query uuid field (#6138)
* fix: query uuid field

* fix: test
2025-01-25 22:19:54 +08:00
ChengLei Shao
72f515a321
chore: import placeholder (#6134) 2025-01-25 21:29:22 +08:00
katherinehhh
cae5d68211 Merge branch 'main' into next 2025-01-24 23:05:50 +08:00
Katherine
a00dcb78cb
refactor: optimize filter component in filter form to match filterable settings (#6110)
* fix: display checkbox field as select in filter form

* fix: bug

* chore: filterCollectionffield

* refactor: code improve

* fix: bug

* fix: bug

* fix: isTruly and isFalsy

* fix: bug

* fix: bug

* fix: bug

* fix: bug

---------

Co-authored-by: chenos <chenlinxh@gmail.com>
2025-01-24 23:00:35 +08:00
YANG QIA
7c0d424173
fix(m2m-array): updating many to many (array) fields in a subform is not working (#6136)
* fix(m2m-array): updating many to many (array) fields in a subform is not working

* test: add tests

* fix: build

* fix: test
2025-01-24 22:41:42 +08:00
Katherine
3f68c5b836
fix: incorrect variable display in association field quick-add form (#6119)
* fix: incorrect variable display in association field quick-add form

* fix: current popup record

* fix: bug
2025-01-24 21:30:45 +08:00
katherinehhh
daefd83114 fix: merge bug 2025-01-24 16:01:52 +08:00
katherinehhh
955c167f5e Merge branch 'main' into next 2025-01-24 15:51:52 +08:00
chenos
225278602c
Update server.ts 2025-01-24 15:22:21 +08:00
Katherine
7c45197058
fix: select in read-only mode clickable and text overflow issue on mobile (#6130) 2025-01-24 11:41:27 +08:00
Katherine
11a3e5b2b5
fix: linkage rules in subtable/subform affecting blocks in association field popups (#5543)
* fix: linkage rules in subtable/subform affecting blocks in association field popups

* Revert "fix: linkage rules in subtable/subform affecting blocks in association field popups"

This reverts commit 9417ccc2952d6a64cfabf97ec3afc5dd65225abc.

* fix: fix linkage rules issue in subtable

* test: add e2e test

* chore: make e2e pass

* chore: update e2e test

* fix: e2e error

---------

Co-authored-by: Zeke Zhang <958414905@qq.com>
2025-01-24 08:35:14 +08:00
Junyi
55a7d9a828
refactor(plugin-file-manager): move destroy to collection event (#6127) 2025-01-23 22:27:11 +08:00
Junyi
19ffa45ee9
fix(plugin-workflow): fix tsfn for generating SQL (#6128) 2025-01-23 20:33:04 +08:00
kennnnn
6c922ba7e1
feat(plugin-field-sequence): add random character pattern (#5959)
* chore(plugin-field-sequence): add random number and random string patterns

- Add random number pattern with configurable length (padded with zeros)
- Add random string pattern with configurable length (alphanumeric)
- Update Chinese translations for new patterns

* fix(plugin-workflow): fix date range variables (#5954)

* feat: hidden date range variables from nodes which is not filter components

* feat: remove system daterange variables from plugin

* refactor(plugin-workflow): move date range variables to component

* fix(plugin-workflow): remove useless code

---------

Co-authored-by: Linda <huanghui9850@gmail.com>

* Update sequence-field.ts

合并了随机字符

* Update sequence.tsx

合并成了随机字符

* Update zh-CN.json

* Update zh-CN.json

更新中文翻译

* Update zh-CN.json

修改了重复的文本

* Update sequence.tsx

删掉了旧的随机数字和随机字符,保留合并后的随机字符,可以配置字符集选择数字、大小写字母、符号,配置字符长度,配置要不要根据长度补零、不补充,

* Update sequence-field.ts

* Update sequence.tsx

除了数字以外的字符集隐藏掉是否补0的选项,因为用不上

* Update sequence.tsx

重新提交下防止之前发错了

* Update sequence.tsx

重新提交下,不小心把服务端内容贴进去了

* Update sequence.tsx

隐藏补充类型改成禁用补充类型

* Update sequence.tsx

补零改成了前补零和后补零两个选项

* Update sequence-field.ts

补零改成了前补零和后补零

* Update zh-CN.json

修改了文本

* Update sequence-field.ts

去掉了多余还影响观感的后补零

* Update sequence.tsx

去掉了多余的后补零

* Update zh-CN.json

* Update zh-CN.json

删了多余的padding

* Update sequence.tsx

去掉了多余的padding

* Update sequence-field.ts

去掉了多余的padding

---------

Co-authored-by: Junyi <mytharcher@users.noreply.github.com>
Co-authored-by: Linda <huanghui9850@gmail.com>
2025-01-23 17:33:15 +08:00
Zeke Zhang
76c826150b
fix: fix the issue where oho field block does not request data (#6125) 2025-01-23 12:23:15 +08:00
Katherine
0b6ed37fa4
fix: filter button nonfilterable field settings affecting other table block with the same collection (#6121) 2025-01-23 11:48:46 +08:00
Zeke Zhang
049b2a542f
fix: the content is not displayed in the quick add popup (#6123) 2025-01-23 11:01:32 +08:00
Zeke Zhang
c14530b9f5
fix: refresh entire block after adding field (#6117) 2025-01-23 10:52:53 +08:00
nocobase[bot]
4ca070a7e6 Merge branch 'main' into next 2025-01-23 02:46:16 +00:00
ChengLei Shao
f66a48abd0
fix: update table value without primary keys (#6124)
* fix: update table value without primary keys

* fix: test

* fix: test
2025-01-23 10:45:54 +08:00
nocobase[bot]
07f26f5531 Merge branch 'main' into next 2025-01-23 01:06:32 +00:00
nocobase[bot]
b4eda8d04a docs: update changelogs 2025-01-23 01:06:03 +00:00
nocobase[bot]
2c4e01416a Merge branch 'main' into next 2025-01-23 00:13:26 +00:00
nocobase[bot]
1250300fb2 chore(versions): 😊 publish v1.4.30 v1.4.30 2025-01-23 00:13:10 +00:00
nocobase[bot]
654a0b0ce2 Merge branch 'main' into next 2025-01-22 15:56:39 +00:00
xilesun
986fb5d5bc fix(tree): test 2025-01-22 23:55:54 +08:00
Zeke Zhang
1bf9a66a13 Merge branch 'main' into next 2025-01-22 22:24:07 +08:00
YANG QIA
aa62053c14
fix(tree): should not set a tree collection node as its own parent (#6122) 2025-01-22 17:57:50 +08:00
Zeke Zhang
21095d0127
fix(Table): fix incorrect rowKey (#6109)
* fix(Table): fix incorrect rowKey

* fix: add key for table row
2025-01-22 17:40:13 +08:00
Zeke Zhang
86b813850e
fix: loading mode (#6115) 2025-01-22 17:29:20 +08:00
Zeke Zhang
03db13f241
fix: refresh association field data after page switching (#6114) 2025-01-22 17:17:29 +08:00
nocobase[bot]
a55e8a8cca Merge branch 'main' into next 2025-01-22 09:15:57 +00:00
Junyi
b89f255d4c
fix(plugin-workflow-request): fix flow bug (#6120) 2025-01-22 17:15:30 +08:00
Katherine
778d98e038
fix: merge bug (#6118)
* fix: merge bug

* fix: merge bug
2025-01-22 14:32:41 +08:00
katherinehhh
8243db5e3d fix: merge bug 2025-01-22 14:21:42 +08:00
katherinehhh
982936963b Merge branch 'main' into next 2025-01-22 10:13:55 +08:00
Junyi
29f547bc26
fix(plugin-workflow-test): fix acl for mock data source (#6116) 2025-01-22 09:45:44 +08:00
Katherine
dddd4616ca
fix: drag issue in quick popup add action for association field (#6112) 2025-01-21 20:01:37 +08:00
nocobase[bot]
7601386e18 chore(versions): 😊 publish v1.5.0-beta.33 v1.5.0-beta.33 2025-01-21 09:51:26 +00:00
nocobase[bot]
4fbf0ba3f3 Merge branch 'main' into next 2025-01-21 07:30:59 +00:00
nocobase[bot]
d311821943 docs: update changelogs 2025-01-21 07:30:32 +00:00
nocobase[bot]
302e53ac24 Merge branch 'main' into next 2025-01-21 07:13:58 +00:00
nocobase[bot]
a326f7efae chore(versions): 😊 publish v1.4.29 v1.4.29 2025-01-21 07:13:43 +00:00
chenos
d6c624d17a Merge branch 'main' into next
# Conflicts:
#	.gitignore
2025-01-21 15:09:46 +08:00
Sheldon Guo
20ae334f4c
feat(template-print-support): provide auxiliary support for template printing functionality (#5713) (#6111)
* chore: update .gitignore to exclude print-templates and modify APIClient type definition
2025-01-21 15:05:29 +08:00
katherinehhh
5b81a072f7 Merge branch 'main' into next 2025-01-21 13:52:46 +08:00