Commit Graph
44020 Commits
Author SHA1 Message Date
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
tianshujie 4514d136ca * Restore code. 2023-04-12 17:12:55 +08:00
wangyidong bf4c487742 * fix bug. 2023-04-12 17:00:48 +08:00
tianshujie 171cbf6150 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_task 2023-04-12 16:47:46 +08: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
宋辰轩 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
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
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
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
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
tianshujie b22fb42a7a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-04-12 14:36:01 +08:00
tianshujie c7c7e55d0c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_task 2023-04-12 14:32:47 +08: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
tianshujie ea8ee0faf5 * Fix bug #34076. 2023-04-12 13:42:08 +08:00
guofeilong e8d43fe0b0 * Code for task #90776 . 2023-04-12 13:37:48 +08:00
朱金勇 ef7d112212 * Fix create user. 2023-04-12 13:37:48 +08:00
朱金勇 5efdffbaf5 * Fix bug: no project in zt_usergroup. 2023-04-12 13:37:48 +08:00
朱金勇 b837d7f7cc * Fix setItem value. 2023-04-12 13:37:48 +08:00
朱金勇 43aee910e2 * Fix setItem to zt_config. 2023-04-12 13:37:48 +08:00
tianshujie f489571e37 * Fix bug #34077. 2023-04-12 13:28:47 +08:00
tianshujie 1d0b30eee4 * Fix bug #34073. 2023-04-12 13:17:46 +08:00
tianshujie 9a4c5d2ac8 * Code for task #90782. 2023-04-12 13:15:55 +08:00
tianshujie 545f39d9f6 Merge branch 'cyy_90779' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_task 2023-04-12 11:29:18 +08:00
caoyanyi 1b9bbe097d * Code for bug #34060. 2023-04-12 11:23:05 +08:00
tianshujie 6ef8f58a4f * Fix bug #34066. 2023-04-12 11:13:11 +08:00
caoyanyi 493e4a8589 * Modify no data tips. 2023-04-12 11:10:01 +08:00
tianshujie b9fce15bfd * Fixed tree highlighting on the left side of my space. 2023-04-12 10:59:09 +08:00
朱金勇 77b6e791d2 * Fix setItem value. 2023-04-12 02:57:43 +00:00