Commit Graph
1061 Commits
Author SHA1 Message Date
liumengyi 01ffcbef5d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-20 15:22:32 +08:00
daitingting c4484f1ff9 * Match the group of dimension 1. 2023-04-20 13:19:40 +08:00
hufangzhou e18b37128f Merge branch 'master' into zentaopms_304 2023-04-20 13:03:30 +08:00
daitingting d4ae238ed9 * Remove note. 2023-04-19 17:49:23 +08:00
daitingting 5c746f6757 * Fix bug for upgrading. 2023-04-19 17:46:43 +08:00
liumengyi 19870de8a0 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-19 17:23:44 +08:00
宋辰轩 4a17fc7e7a *Modify chart group. 2023-04-19 16:41:28 +08:00
liumengyi 7fe3662ea7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-19 14:09:20 +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
caoyanyi e8a3ca0fc7 * Modify book doc type. 2023-04-19 09:28:15 +08:00
tianshujie 3062276963 * Check whether the field already exists. 2023-04-19 09:05:13 +08:00
liumengyi d971d4b4b7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-18 08:38:14 +08:00
宋辰轩 7374a11495 Add func for update18_3. 2023-04-17 15:23:30 +08:00
hufangzhou 0e8f7d807c Merge branch 'master' into zentaopms_304 2023-04-17 08:30:02 +08:00
tianshujie 8fbab2b84f * Modify upgrade program. 2023-04-14 17:31:02 +08:00
tianshujie 23171d926d * Fix field problems. 2023-04-14 17:09:27 +08:00
wangyidong e5ff2093cb * code for change collector field to collects. 2023-04-14 16:14:42 +08:00
wangyidong 6f2d0db971 * fix for convert collector in upgrade. 2023-04-14 15:57:23 +08:00
liumengyi 648dc288ca Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-14 15:15:03 +08:00
daitingting a47cb05c8e * Add parameters. 2023-04-14 13:15:54 +08:00
liumengyi e3c6375224 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-12 08:58:39 +08:00
宋辰轩 5ad72bdcf9 * Modify task #90919. 2023-04-11 16:18:26 +08:00
hufangzhou 4e05ed02ed * Finish task #91015. 2023-04-11 15:31:58 +08:00
daitingting ee8f7b50f9 * Process filter of chart.
* Process group of report.
2023-04-11 14:59:11 +08:00
wangyuting2 2285fefd83 * Finish task #90968. 2023-04-11 09:38:51 +08:00
宋辰轩 bf5fd1ff25 * Add default module when dimension create. 2023-04-10 14:45:45 +08:00
朱金勇 6e27c59147 * Fix importing demo data. 2023-04-08 15:01:22 +00:00
wangyidong 38898d1a13 * code for task #89914. 2023-04-07 10:53:53 +08:00
liugang 93e71f8861 * Call getDatabaseVersion instead of getMysqlVersion. 2023-04-06 02:05:02 +00:00
宋辰轩 3502de4b7b * Move createDimension to pms. 2023-04-04 09:42:52 +08:00
tianshujie 57d515bd07 * Handle upgrade SQL and upgrade programs. 2023-04-03 09:57:45 +08:00
caoyanyi d477203aa7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-03 08:30:03 +08:00
daitingting 790df501b0 * Process upgrade. 2023-03-31 13:40:17 +08:00
daitingting d75d5e9b5a * Adjust current version. 2023-03-30 17:29:44 +08:00
liumengyi f7ae01003c * Fix bug of task #89527. 2023-03-30 16:05:54 +08:00
daitingting ae8ade1cef * Process columns settings. 2023-03-30 15:34:17 +08:00
daitingting 9010cb15ff * Process privilege.
* Adjust codes for program.
2023-03-30 13:41:04 +08:00
liumengyi ec89805736 * Change book lib to custom lib. 2023-03-30 11:17:44 +08:00
liumengyi a8ab7fa2d5 + Add book upgrade function. 2023-03-30 11:09:58 +08:00
daitingting 4a28d27be0 * Process stat type. 2023-03-29 17:13:08 +08:00
daitingting d65eda5362 * Check sql is not empty when getFields by sql. 2023-03-29 15:33:40 +08:00
xieqiyu 2a6f0647ed * Fix bug of dataset upgrade. 2023-03-29 07:12:28 +00:00
daitingting 8edc327784 * Optimize codes. 2023-03-29 11:13:19 +08:00
daitingting e18e7525b8 * Callback upgrade program when upgrade from biz8.4. 2023-03-29 10:50:33 +08:00
宋辰轩 91b14148a7 * Remove comment. 2023-03-29 10:26:09 +08:00
daitingting 63869d9bc5 * Adjust upgrade codes. 2023-03-28 16:47:50 +08:00
宋辰轩 daa71b9170 * Add default dimension when install and upgrade. 2023-03-28 14:32:02 +08:00
xieqiyu 3db6009275 * Modify processDataset when upgrade. 2023-03-28 05:32:12 +00:00
daitingting 9cf1b954a3 * Upgrade vars of report to filters of pivot. 2023-03-24 13:52:15 +08:00
xieqiyu c53a2ff5e5 * Code for task#86981. 2023-03-24 05:40:41 +00:00