 wangyidong
|
bb5ced8e4d
|
* fix bug #33745.
|
2023-04-12 17:42:49 +08:00 |
|
|
孙广明
|
f27939941b
|
Merge branch 'chart_async' into 'master'
Chart async
See merge request easycorp/zentaopms!7389
|
2023-04-12 09:32:31 +00:00 |
|
|
王怡栋
|
0c6c34b46f
|
Merge branch 'tsj_fixbug' into 'master'
* Restore code.
See merge request easycorp/zentaopms!7390
|
2023-04-12 09:16:37 +00:00 |
|
|
tianshujie
|
4514d136ca
|
* Restore code.
|
2023-04-12 17:12:55 +08:00 |
|
|
wangyidong
|
bf4c487742
|
* fix bug.
|
2023-04-12 17:00:48 +08:00 |
|
|
王怡栋
|
25c2d64d8c
|
Merge branch 'tsj_task' into 'master'
Tsj task
See merge request easycorp/zentaopms!7385
|
2023-04-12 08:52:27 +00:00 |
|
|
王怡栋
|
0e9151fe3c
|
Merge branch 'dev/gfl_addIcon' into 'master'
ZUI: update Icons files .
See merge request easycorp/zentaopms!7387
|
2023-04-12 08:49:31 +00:00 |
|
|
tianshujie
|
171cbf6150
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_task
|
2023-04-12 16:47:46 +08:00 |
|
|
刘刚
|
a42c624a73
|
Merge branch 'bar_scroll' into 'master'
* Update echarts dist.
See merge request easycorp/zentaopms!7386
|
2023-04-12 08:47:46 +00:00 |
|
|
tianshujie
|
aec7381fcf
|
* Code for task #90782.
|
2023-04-12 16:46:53 +08:00 |
|
|
tianshujie
|
f2a92c6d57
|
* Fixed logical determination of document permissions.
|
2023-04-12 16:35:28 +08:00 |
|
|
guofeilong
|
6dca9b89d4
|
ZUI: update Icons files .
|
2023-04-12 16:26:58 +08:00 |
|
|
宋辰轩
|
f8f4c3363e
|
* Add inside and outside query button.
|
2023-04-12 16:21:52 +08:00 |
|
|
wangyidong
|
a3715fa226
|
* fix bug.
|
2023-04-12 16:20:53 +08:00 |
|
|
qixinzhi
|
dafb2bfbb6
|
* Update echarts dist.
|
2023-04-12 16:15:17 +08:00 |
|
|
tianshujie
|
6fe26dbc28
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_task
|
2023-04-12 16:13:22 +08:00 |
|
|
tianshujie
|
542f843bd2
|
* Fix bug #34099.
|
2023-04-12 16:08:24 +08:00 |
|
|
刘刚
|
35d3cc2880
|
Merge branch 'bar_scroll' into 'master'
* Finish bar chart datazoom.
See merge request easycorp/zentaopms!7384
|
2023-04-12 08:05:43 +00:00 |
|
|
liugang
|
669b85b2ef
|
* Add default privileges of screen.
|
2023-04-12 07:45:39 +00:00 |
|
|
tianshujie
|
15e0011047
|
* Fix bug #33641.
|
2023-04-12 15:44:47 +08:00 |
|
|
qixinzhi
|
b5aabadf8b
|
* Change chart ajax to async.
|
2023-04-12 15:41:47 +08:00 |
|
|
liugang
|
e6a58cad9b
|
* Sort sqls to update the builtin field and the status field of the built-in screens.
|
2023-04-12 07:37:15 +00:00 |
|
|
wangyidong
|
49ce03d757
|
* fix bug #34074.
|
2023-04-12 15:36:01 +08:00 |
|
|
tianshujie
|
8a7d951639
|
Merge branch 'tsj_task' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_task
|
2023-04-12 15:35:01 +08:00 |
|
|
tianshujie
|
263b5d650a
|
* Code for task #90782.
|
2023-04-12 15:34:46 +08:00 |
|
|
liugang
|
478fed274a
|
* Add default privileges of pivot module.
|
2023-04-12 07:34:12 +00:00 |
|
|
wangyidong
|
e1295a89e4
|
* fix bug #34088.
|
2023-04-12 15:30:21 +08:00 |
|
|
wangyidong
|
4180510b79
|
* fix bug #33994.
|
2023-04-12 15:20:32 +08:00 |
|
|
wangyidong
|
bc58f409f7
|
* fix bug #34015.
|
2023-04-12 15:20:32 +08:00 |
|
|
tianshujie
|
8548a4bf10
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_task
|
2023-04-12 15:17:17 +08:00 |
|
|
caoyanyi
|
8e9d75cf47
|
Merge branch 'tsj_task' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_task
|
2023-04-12 15:14:01 +08:00 |
|
|
caoyanyi
|
f1ad325ba1
|
* Code for bug #90787.
|
2023-04-12 15:13:39 +08:00 |
|
|
tianshujie
|
4ba1446559
|
Merge branch 'tsj_task' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_task
|
2023-04-12 15:09:03 +08:00 |
|
|
tianshujie
|
5444be8677
|
* Code for task #90782.
|
2023-04-12 15:08:32 +08:00 |
|
|
caoyanyi
|
e627f1aadc
|
* Code for bug #34068.
|
2023-04-12 15:07:24 +08:00 |
|
|
qixinzhi
|
fd1bd5e58e
|
* Finish bar chart datazoom.
|
2023-04-12 14:53:37 +08:00 |
|
|
tianshujie
|
2a71bcf16b
|
* Code for task #90782.
|
2023-04-12 14:43:47 +08:00 |
|
|
王怡栋
|
54d50f0f02
|
Merge branch 'tsj_fixbug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!7382
|
2023-04-12 06:37:24 +00:00 |
|
|
tianshujie
|
b22fb42a7a
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug
|
2023-04-12 14:36:01 +08:00 |
|
|
刘刚
|
a69a90c0b3
|
Merge branch 'sprint/scx_apibug' into 'master'
* Fix testcase api bug and modify bug api data consistent.
See merge request easycorp/zentaopms!7383
|
2023-04-12 06:32:55 +00:00 |
|
|
tianshujie
|
c7c7e55d0c
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_task
|
2023-04-12 14:32:47 +08:00 |
|
|
王怡栋
|
5b8c3d09d9
|
Merge branch 'cyy_90779' into 'master'
Cyy 90779
See merge request easycorp/zentaopms!7381
|
2023-04-12 06:32:19 +00:00 |
|
|
caoyanyi
|
75ac945109
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_90779
|
2023-04-12 14:31:56 +08:00 |
|
|
caoyanyi
|
875aee00b1
|
* Modify doc priv style.
|
2023-04-12 14:31:37 +08:00 |
|
|
tianshujie
|
1f56b05cea
|
* Fix bug #34076.
|
2023-04-12 14:13:15 +08:00 |
|
|
tianshujie
|
754928d906
|
* Fix bug #34066.
|
2023-04-12 14:09:41 +08:00 |
|
|
tianshujie
|
f0d405aebf
|
* Fix bug #34076.
|
2023-04-12 14:04:15 +08:00 |
|
|
宋辰轩
|
fe9b40629a
|
* Fix testcase api bug and modify bug api data consistent.
|
2023-04-12 14:02:07 +08:00 |
|
|
王怡栋
|
bfe60c4926
|
Merge branch 'dev/gfl_task' into 'master'
* Adjust code for style in crumbs .
See merge request easycorp/zentaopms!7379
|
2023-04-12 05:52:16 +00:00 |
|
|
tianshujie
|
ea8ee0faf5
|
* Fix bug #34076.
|
2023-04-12 13:42:08 +08:00 |
|