 zhaoke
|
186d901af7
|
* getXmindImport,showXmindImport,saveXmindImport use importXmind permission.
|
2023-04-18 15:41:38 +08:00 |
|
|
zhaoke
|
4bcd11acd3
|
* Update commits.
|
2023-04-13 16:38:59 +08:00 |
|
|
zhaoke
|
e6faec7ba6
|
* Update commits.
|
2023-04-13 16:34:05 +08:00 |
|
|
zhaoke
|
3f3e644e70
|
* Add commit to testcase model.
|
2023-04-13 16:18:42 +08:00 |
|
|
zhaoke
|
d94b0041d7
|
* Format css file.
|
2023-04-13 15:34:13 +08:00 |
|
|
zhaoke
|
9a7ade5b64
|
* Fix formatting issues.
|
2023-04-13 15:22:20 +08:00 |
|
|
zhaoke
|
a64bc7d5ab
|
* Move xmind functions to lib.
|
2023-04-13 13:51:34 +08:00 |
|
|
zhaoke
|
eb833be4e5
|
Merge branch 'zenops_66' into zenops_69
|
2023-04-13 09:31:12 +08:00 |
|
|
zhaoke
|
7c86b0d243
|
* Remove repeat code.
|
2023-04-13 09:26:01 +08:00 |
|
|
zhaoke
|
70013fa98e
|
Merge remote-tracking branch 'origin/master' into zenops_66
|
2023-04-13 09:24:52 +08:00 |
|
|
zhaoke
|
d401a87812
|
Merge branch 'master' into zenops_69
|
2023-04-13 09:09:49 +08:00 |
|
|
zhaoke
|
2b1ee45b2b
|
Merge branch 'master' into zenops_66
|
2023-04-13 09:06:59 +08:00 |
|
|
zhaoke
|
c596d736e7
|
- Remove syncToZentao checkbox.
|
2023-04-13 09:06:48 +08:00 |
|
|
王怡栋
|
b2bf0e58ac
|
Merge branch 'tsj_task' into 'master'
* Code for task #90781.
See merge request easycorp/zentaopms!7391
|
2023-04-13 00:42:54 +00:00 |
|
|
wangyidong
|
c6512b3b8d
|
* fix bug #33722.
|
2023-04-13 08:41:27 +08:00 |
|
|
tianshujie
|
e452930e02
|
* Code for task #90781.
|
2023-04-13 08:38:31 +08:00 |
|
|
朱金勇
|
cecf04b069
|
Fix bug: show tables and desc table.
|
2023-04-12 16:40:08 +00:00 |
|
|
wangyidong
|
7cbeeb33c3
|
* fix bug #33745.
|
2023-04-12 17:46:35 +08:00 |
|
|
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 |
|
|
zhaoke
|
5d0cc84425
|
* Fix case drag sort error.
|
2023-04-12 17:28:31 +08: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 |
|