Commit Graph
54261 Commits
Author SHA1 Message Date
guofeilong 938821853c * Adjust code for task#91379 . 2023-04-19 16:47:13 +08:00
孙广明 04f579f103 Merge branch 'sprint/scx_scx_updategroup' into 'master'
*Modify chart group.

See merge request easycorp/zentaopms!7485
2023-04-19 08:44:01 +00:00
宋辰轩 53597c136a * Add en lang. 2023-04-19 16:43:00 +08:00
宋辰轩 4a17fc7e7a *Modify chart group. 2023-04-19 16:41:28 +08:00
王怡栋 db18de0660 Merge branch 'dev/gfl_fixbug' into 'master'
Dev/gfl fixbug

See merge request easycorp/zentaopms!7484
2023-04-19 08:35:56 +00:00
guofeilong 418a6a5ff9 * Code for task #91379 . 2023-04-19 16:29:06 +08:00
guofeilong a9db84f2c6 * Code for adjust padding-x in drop . 2023-04-19 16:28:29 +08:00
刘刚 8254f5e6e3 Merge branch 'zentaobiz39_bi_wangyuting' into 'master'
* Show builtin chart.

See merge request easycorp/zentaopms!7483
2023-04-19 08:27:29 +00:00
wangyuting2 0261dbccee * Show builtin chart. 2023-04-19 16:26:06 +08:00
朱金勇 027c3260c4 * Fix bug#34386. 2023-04-19 08:18:26 +00:00
朱金勇 0e619ba796 * Fix bug#34401. 2023-04-19 08:08:11 +00:00
朱金勇 97d9e06807 * Fix bug#34391. 2023-04-19 08:05:12 +00:00
王怡栋 86c1dc4280 Merge branch 'fix_bug_qxz' into 'master'
* Fix bug#33386.

See merge request easycorp/zentaopms!7480
2023-04-19 07:51:27 +00:00
王怡栋 78b5c4e16f Merge branch 'goview' into 'master'
* Update go-view dist.

See merge request easycorp/zentaopms!7479
2023-04-19 07:51:06 +00:00
王怡栋 01c8d5d893 Merge branch 'tsj_fixbug' into 'master'
Tsj fixbug

See merge request easycorp/zentaopms!7474
2023-04-19 07:49:35 +00:00
qixinzhi e90cf399c7 * Fix bug#33386. 2023-04-19 07:42:36 +00:00
tianshujie 18cba3006d * Modified create Project library page style. 2023-04-19 15:34:59 +08:00
qixinzhi 4f6b66774b * Update go-view dist. 2023-04-19 07:33:29 +00:00
王怡栋 cd2c399484 Merge branch 'dev/gfl_fixbug' into 'master'
Dev/gfl fixbug

See merge request easycorp/zentaopms!7477
2023-04-19 07:28:52 +00:00
guofeilong 4bd8a0b917 * Code for adjust style in drop. 2023-04-19 15:27:30 +08:00
guofeilong 70fd734b93 * Adjust code for add active to dropdown . 2023-04-19 15:27:07 +08:00
朱金勇 71b74c0a60 * Refactor insert privs. 2023-04-19 07:24:01 +00:00
wangyidong 4e05f5d566 * fix bug. 2023-04-19 15:15:25 +08:00
刘刚 39c0230212 Merge branch 'zentaobiz39_bi_wangyuting' into 'master'
* Add bi screen sql.

See merge request easycorp/zentaopms!7475
2023-04-19 06:55:26 +00:00
wangyidong d9e21d706a * fix bug #34362,34365,34361. 2023-04-19 14:50:43 +08:00
wangyuting2 5d2755b0e8 * Add bi screen sql. 2023-04-19 14:46:41 +08:00
tianshujie eb31e77d09 * Change the width of the create page control. 2023-04-19 14:32:44 +08:00
tianshujie 08b771ac3a * Fixed my spatial directory tree highlighting problem. 2023-04-19 14:18:27 +08:00
tianshujie 07ed9034a8 * Fixed a problem with the left module tree style. 2023-04-19 14:18:08 +08:00
王怡栋 200a0c6635 Merge branch 'fixbug/liumengyi_20185' into 'master'
* Fix bug #20185.

See merge request easycorp/zentaopms!7473
2023-04-19 05:59:52 +00:00
wangyidong 7659babe92 * fix bug #34364. 2023-04-19 13:55:17 +08:00
liumengyi b3b0073dd9 * Fix bug #20185. 2023-04-19 13:37:32 +08:00
王怡栋 5d56042091 Merge branch 'cyy_fixbug' into 'master'
* Modify book doc type.

See merge request easycorp/zentaopms!7468
2023-04-19 05:34:00 +00:00
王怡栋 1af597ef22 Merge branch 'tsj_fixbug' into 'master'
Tsj fixbug

See merge request easycorp/zentaopms!7465
2023-04-19 05:33:42 +00:00
tianshujie 43fa259a14 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-04-19 13:13:35 +08:00
朱金勇 51a43d37d6 * Fix date display in task module. 2023-04-19 04:34:10 +00:00
朱金勇 2fcff8c54a * Fix bug#34335. 2023-04-19 03:43:01 +00:00
朱金勇 31d42cf359 * Fix db for dm. 2023-04-19 03:24:41 +00:00
tianshujie 4146e5551a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-04-19 11:21:38 +08:00
wangyidong 506b786a33 * fix bug #34367. 2023-04-19 11:20:44 +08:00
tianshujie da8f3ade7f * Fix bug #34350. 2023-04-19 10:39:19 +08:00
刘刚 03f2d486a6 Merge branch 'fix_bug_qxz' into 'master'
* Update echarts dist for radar chart bug.

See merge request easycorp/zentaopms!7467
2023-04-19 02:38:19 +00:00
刘刚 b3457becaa Merge branch 'goview' into 'master'
* Update go-view dist.

See merge request easycorp/zentaopms!7466
2023-04-19 02:38:10 +00:00
tianshujie c17bf269f6 * Fix bug #34338. 2023-04-19 10:31:22 +08:00
朱金勇 ed55bb7980 * Fix type error. 2023-04-19 02:28:58 +00:00
qixinzhi d4f3aa0010 * Update echarts dist for radar chart bug. 2023-04-19 02:26:11 +00:00
tianshujie 32cf3c4d20 * Fix bug #34337. 2023-04-19 10:19:42 +08:00
qixinzhi c601c0e0b9 * Update go-view dist. 2023-04-19 02:18:29 +00:00
朱金勇 ac9801937e * Fix bug#34368 2023-04-19 02:17:23 +00:00
朱金勇 e7cc2b2e5e * Fix sync repo. 2023-04-19 02:10:10 +00:00