95452630b3
chore(version): upgrade rental
2024-03-12 21:59:56 +08:00
2c1aec83d6
Merge pull request 'fix: 小结理论重量更正,报价总金额工单修改,购销单pdf工单修改,订单导入hook停用,出库入筛选基地仓库' ( #353 ) from fix_amount_calc_and_buypdf into @hera/dev
...
Reviewed-on: daoyoucloud/tachycode#353
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-12 21:37:35 +08:00
lyx
2245cd84e7
fix: 小结理论重量更正,报价总金额工单修改,购销单pdf工单修改,订单导入hook停用,出库入筛选基地仓库
2024-03-12 21:33:51 +08:00
1f6b802b61
chore(version): upgrade core & rental
2024-03-12 21:21:29 +08:00
fbfde9f41e
Merge pull request 'fix: linkage should set undefined' ( #351 ) from fix_linkage into @hera/dev
...
Reviewed-on: daoyoucloud/tachycode#351
2024-03-12 20:14:20 +08:00
02fbf868a5
Merge pull request 'feat: 小结完成,recordhook小调整' ( #350 ) from feat_record_summary into @hera/dev
...
Reviewed-on: daoyoucloud/tachycode#350
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-12 20:13:00 +08:00
c0de2384df
fix: linkage should set undefined
2024-03-12 20:09:35 +08:00
lyx
52a17ca60c
feat: 小结完成
2024-03-12 20:07:27 +08:00
ae8d1a47b0
fix: undefined promises throw error
2024-03-12 20:03:34 +08:00
1737a0f83b
Merge pull request 'main' ( #349 ) from main into @hera/dev
...
Reviewed-on: daoyoucloud/tachycode#349
2024-03-12 20:00:15 +08:00
katherinehhh
559cbca396
refactor: add child in inheritance of tree collection ( #3676 )
...
* refactor: add child in inheritance of tree collection
* refactor: add child in inheritance of tree collection
* style: style improve
2024-03-12 17:27:35 +08:00
71ccf55d77
Merge pull request 'feat: 修改录单跳转问题' ( #348 ) from fix_recordNavigate into @hera/dev
...
Reviewed-on: daoyoucloud/tachycode#348
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-12 16:41:50 +08:00
847a1fae9a
feat: 修改录单跳转问题
2024-03-12 16:08:27 +08:00
0e8d02cc1e
Merge pull request 'feat: 添加汇总的提供请求链接地址' ( #347 ) from fix_groupBlock4 into @hera/dev
...
Reviewed-on: daoyoucloud/tachycode#347
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-12 16:02:49 +08:00
Chareice
023096b1a9
fix: pagination error in roles collections resourcer
2024-03-12 15:15:24 +08:00
jack zhang
de6e8469d3
fix: data source add field refresh(T-3253) ( #3645 )
2024-03-12 15:13:56 +08:00
ChengLei Shao
37b97c6e52
chore: escape underscore char in include query ( #3681 )
2024-03-12 14:53:12 +08:00
07068febbd
feat: 添加汇总的提供请求链接地址
2024-03-12 14:29:15 +08:00
ChengLei Shao
94cbbf93b8
fix: upgrade app after restore ( #3680 )
2024-03-12 11:34:22 +08:00
katherinehhh
4a346a4119
fix: view collection association field foreignkey should be select ( #3671 )
2024-03-12 09:30:38 +08:00
ChengLei Shao
cdf9f4818f
fix: acl should return true when resource allowed ( #3675 )
...
* fix: acl should return true when resource allowed
* chore: test
2024-03-12 09:08:15 +08:00
f98a4305f3
feat: add tab search block
2024-03-12 04:32:16 +08:00
f7872aa16e
feat: add notice bar and swiper block
2024-03-12 03:45:44 +08:00
92bec8c5f5
fix: after refactor path error
2024-03-11 21:17:34 +08:00
ChengLei Shao
3da2a8af92
fix: init scope value when all data is null value ( #3674 )
2024-03-11 19:37:48 +08:00
0eea4f4b96
Merge pull request 'feat: update standard interface name' ( #342 ) from feat_interface_name_standard into @hera/dev
...
Reviewed-on: daoyoucloud/tachycode#342
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
2024-03-11 19:29:38 +08:00
lyx
54d0942dae
fix: eslint --fix
2024-03-11 19:25:50 +08:00
lyx
d2ad2920d1
feat: update standard interface name
2024-03-11 19:25:05 +08:00
0b6025cd65
fix: type change from any to human-made
2024-03-11 19:20:15 +08:00
cca6c649c1
chore: mock records:group api
2024-03-11 19:08:01 +08:00
649a07d581
chore: upgrade hera-core
2024-03-11 17:08:53 +08:00
jack zhang
f9567d711b
fix: inheritance cache bug ( #3669 )
2024-03-11 16:57:37 +08:00
katherinehhh
ba2467c9bf
fix: assign field values modal shuold support maskClosable
2024-03-11 16:52:14 +08:00
Chareice
ef097bd450
fix: acl snippet value
2024-03-11 13:05:37 +08:00
e69e9b9940
fix: resource conflict with nocobase settings
2024-03-11 12:32:06 +08:00
16342247be
refactor: remove koa router deps
2024-03-11 10:38:12 +08:00
3ed284f94a
Merge pull request 'refactor_server' ( #340 ) from refactor_server into @hera/dev
...
Reviewed-on: daoyoucloud/tachycode#340
2024-03-11 10:35:14 +08:00
dbf6828741
fix: add oidc server plugin
2024-03-11 10:34:17 +08:00
c0f46dcf87
Merge pull request 'main' ( #339 ) from main into @hera/dev
...
Reviewed-on: daoyoucloud/tachycode#339
2024-03-11 10:31:45 +08:00
xilesun
56fd24ef4b
chore: update changelog
2024-03-11 09:59:12 +08:00
xilesun
6fd06a28c8
chore(versions): 😊 publish v0.20.0-alpha.8
2024-03-11 09:59:08 +08:00
ChengLei Shao
a477facdbf
chore: move collection manager snippets into data source ( #3666 )
2024-03-10 09:57:14 +08:00
7d35af679f
chore: update i18n
2024-03-10 05:54:34 +08:00
a0f9d54046
refactor: replace deprecated method
2024-03-10 05:48:38 +08:00
d06cce2cfa
feat: custom filter form add input component
2024-03-10 05:19:27 +08:00
c56ce13a0d
chore(version): upgrade rental
2024-03-10 04:36:36 +08:00
44c6d89e54
fix: template block linkage and association data load failed
2024-03-10 04:20:59 +08:00
afc79d633f
Merge branch '@hera/main' into @hera/dev
2024-03-10 04:13:18 +08:00
2d991ba7cf
合并对main的所有修改
...
<!-- Note -->
<!-- This is a template for submitting a new feature.
Use the bug fix template if you're submitting a bug fix pull request by adding `template=bug_fix.md` to your pull request URL. -->
<!-- Describe the new feature or modification to an existing feature clearly and consciously. -->
<!-- Explain the reason for adding or modifying this feature. -->
<!-- Provide a technically detailed description of the key changes made. -->
- Frontend
- Backend
<!-- Provide any suggestions or recommendations for improvements in the testing plan. -->
<!-- Identify any potential risks or issues that may arise from the new feature or modification. -->
<!-- Including any screenshots of the new feature or modification. -->
Co-authored-by: sealday <sealday@gmail.com>
Co-authored-by: wjh <wwwjh0710@163.com>
Co-authored-by: 吕延祥 <2256334253@qq.com>
Reviewed-on: daoyoucloud/nocobase#317
2024-03-10 04:06:04 +08:00
350c0ac1f4
Revert "Revert "fix: add displayName ( #3628 )""
...
This reverts commit 58e2fd6ea6
.
2024-03-10 03:06:57 +08:00