Commit Graph
53499 Commits
Author SHA1 Message Date
tianshujie adb4e70bda Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-07 11:30:05 +08:00
tianshujie 3a30a4e65a * Code for task #89910,89911. 2023-04-07 11:29:34 +08:00
caoyanyi 13a7efb50c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-07 11:22:34 +08:00
caoyanyi 4ee58be39e * Add priv check. 2023-04-07 11:15:01 +08:00
guofeilong 09339199c1 * Adjust code for module view . 2023-04-07 11:12:19 +08:00
王怡栋 e6737c04f1 Merge branch 'zentaobiz37_bi_wangyuting' into 'master'
* Finish task #90147.

See merge request easycorp/zentaopms!7327
2023-04-07 03:05:43 +00:00
王怡栋 3d5bbbadcc Merge branch 'tsj_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!7324
2023-04-07 03:05:19 +00:00
wangyidong 882235b462 * fix bug for edit release. 2023-04-07 11:03:15 +08:00
wangyidong 38898d1a13 * code for task #89914. 2023-04-07 10:53:53 +08:00
wangyuting2 2971203444 * Finish task #90147. 2023-04-07 10:50:35 +08:00
朱金勇 c5ad00e960 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2023-04-07 02:39:22 +00:00
朱金勇 13374f3230 * Fix default value of field. 2023-04-07 02:37:07 +00:00
刘刚 d273c4cb6b Merge branch 'zentaobiz37_bi_wangyuting' into 'master'
* Renew goview css.

See merge request easycorp/zentaopms!7325
2023-04-07 02:34:49 +00:00
刘刚 aa9212c821 Merge branch 'sprint/biz37_task90074' into 'master'
Add chart module.

See merge request easycorp/zentaopms!7326
2023-04-07 02:34:33 +00:00
liugang d3dbbfe3e7 * Refactor: only process a chart object. 2023-04-07 02:31:28 +00:00
liugang ffd815ff16 * Sort lang items. 2023-04-07 02:31:12 +00:00
liugang 2939620b18 - Remove unused variable. 2023-04-07 02:30:46 +00:00
wangyuting2 f55e5bea6e * Renew goview css. 2023-04-07 10:28:10 +08:00
guofeilong 3cf6f46f62 * Code for task #89913 . 2023-04-07 10:21:57 +08:00
tianshujie 2e5404f1bd * Add update SQL for api module. 2023-04-07 10:08:30 +08:00
wangyidong 4a9fe5dceb * fix bug #33864. 2023-04-07 10:00:33 +08:00
tianshujie 81ff9b726a Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-07 10:00:11 +08:00
tianshujie 90caff0be0 * Remove Kanban when creating the execution document library. 2023-04-07 09:55:44 +08:00
tianshujie 7b1a0fb936 * Fix bug #33788. 2023-04-07 09:43:54 +08:00
caoyanyi ea55ca8c33 * Add api priv and switch api doc release locate. 2023-04-07 09:30:02 +08:00
朱金勇 2b9e5f4d95 Fix bug#33806. 2023-04-07 01:21:31 +00:00
tianshujie 22f8b70387 * Fix bug #33796. 2023-04-07 09:19:18 +08:00
朱金勇 4b399ad8f7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2023-04-07 01:13:42 +00:00
朱金勇 3516d6c670 - Remove registerDate in assetlib table. 2023-04-07 01:11:28 +00:00
王怡栋 692b526a2f Merge branch 'release/zentaopms_18.3' into 'master'
* Merge master.

See merge request easycorp/zentaopms!7322
2023-04-07 00:45:31 +00:00
王怡栋 2240876de1 Merge branch 'zentaobiz37_bi_wangyuting' into 'master'
* Add new goview css and js.

See merge request easycorp/zentaopms!7319
2023-04-07 00:43:11 +00:00
tianshujie 4bc2e44942 * Code for task #89911. 2023-04-07 08:22:33 +08:00
caoyanyi 4260e92cdd Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-07 08:18:46 +08:00
朱金勇 3f7a2e39e1 Fix: no dao->get() in control. 2023-04-07 00:16:15 +00:00
liugang 492c01807f + Display chart in open source version. 2023-04-06 10:12:08 +00:00
liugang adc8d2d267 + Move the config of bi from biz version to open source version. 2023-04-06 10:11:42 +00:00
liugang 0a096cf93a + Drop unused field. 2023-04-06 10:11:17 +00:00
liugang 8908ac2250 + Move the getGroupPairs from biz version to open source version. 2023-04-06 10:10:21 +00:00
tianshujie 639e36d34c Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-06 17:03:16 +08:00
tianshujie bb84c7a731 * Change the name of my spatial function. 2023-04-06 16:57:14 +08:00
guofeilong 828cc038ec * Adjust code . 2023-04-06 16:46:47 +08:00
guofeilong c846da6bf3 * Adjust code for hover in tree . 2023-04-06 16:15:58 +08:00
wangyidong 812f4db7b1 * fix bug for can not select integrated build in create bug. 2023-04-06 16:11:49 +08:00
guofeilong d840e25da5 * Adjust code for show-icon in left-tree . 2023-04-06 16:09:22 +08:00
tianshujie fc3accb1b0 Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-06 16:02:02 +08:00
tianshujie 8dcb58fdc3 * Add a jump and highlight to the left tree. 2023-04-06 16:01:39 +08:00
guofeilong 7b0cb461fe * ZUI: class menu-hover-primary refactors . 2023-04-06 15:47:34 +08:00
王怡栋 e15384c51a Merge branch 'dev/gfl_zui_files_refactors' into 'master'
* ZUI: class menu-hover-primary refactors .

See merge request easycorp/zentaopms!7321
2023-04-06 07:47:04 +00:00
liugang 69029b4154 + Add chart and dimension to openModules to prevent them from being moved to the extension/custom directory when upgrading. 2023-04-06 15:44:57 +08:00
liugang 7c88ea6cdb * Fix error the global $dao variable is replaced with a new instance when call function loadModel. 2023-04-06 15:44:57 +08:00