 wangyidong
|
fd043f0b9b
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2023-03-31 08:59:38 +08:00 |
|
|
wangyidong
|
f2a164ffb8
|
Merge branch 'sprint/biz17'
|
2023-03-31 08:58:40 +08:00 |
|
|
daitingting
|
d75d5e9b5a
|
* Adjust current version.
|
2023-03-30 17:29:44 +08:00 |
|
|
daitingting
|
ae8ade1cef
|
* Process columns settings.
|
2023-03-30 15:34:17 +08:00 |
|
|
qixinzhi
|
284a4ccfae
|
* Finish task#88964.
|
2023-03-30 14:19:26 +08:00 |
|
|
王怡栋
|
abf82c9a0d
|
Merge branch 'fixfeedback/liumengyi_2649' into 'master'
* Fix feedback #2649.
See merge request easycorp/zentaopms!7277
|
2023-03-30 06:12:42 +00:00 |
|
|
liumengyi
|
0156a1eddc
|
* Fix bug of update sql.
|
2023-03-30 14:09:13 +08:00 |
|
|
daitingting
|
9010cb15ff
|
* Process privilege.
* Adjust codes for program.
|
2023-03-30 13:41:04 +08:00 |
|
|
liumengyi
|
78a4bb181f
|
* Fix feedback #2649.
|
2023-03-30 13:36:09 +08:00 |
|
|
宋辰轩
|
03ac074ea2
|
* Add filesaver js.
|
2023-03-30 11:25:24 +08:00 |
|
|
qixinzhi
|
343f01d304
|
* Update go view dist.
|
2023-03-30 10:29:11 +08:00 |
|
|
王怡栋
|
163088f2f4
|
Merge branch 'cyy_compatible' into 'master'
* Compatible with IE.
See merge request easycorp/zentaopms!7276
|
2023-03-30 00:42:02 +00:00 |
|
|
caoyanyi
|
b883f56dfc
|
* Compatible with IE.
|
2023-03-30 08:30:17 +08:00 |
|
|
宋辰轩
|
120584f692
|
* Do not judge pivot when preview pivot.
|
2023-03-29 17:31:32 +08:00 |
|
|
宋辰轩
|
d0ce8a9f7b
|
Merge branch 'sprint/biz17' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/biz17
|
2023-03-29 17:26:40 +08:00 |
|
|
宋辰轩
|
cc1c1c0838
|
* Move code to biz.
|
2023-03-29 17:26:35 +08:00 |
|
|
daitingting
|
000179d422
|
Merge branch 'sprint/biz17' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/biz17
|
2023-03-29 17:13:37 +08:00 |
|
|
daitingting
|
4a28d27be0
|
* Process stat type.
|
2023-03-29 17:13:08 +08:00 |
|
|
宋辰轩
|
051a55e68e
|
* Add biz and max export button and design button in pivot-preview.
|
2023-03-29 17:09:33 +08:00 |
|
|
宋辰轩
|
d959fa669f
|
* Check priv except pivot-show.
|
2023-03-29 16:04:24 +08:00 |
|
|
daitingting
|
d65eda5362
|
* Check sql is not empty when getFields by sql.
|
2023-03-29 15:33:40 +08:00 |
|
|
liugang
|
19fe082665
|
* Replace the subNavbar of pivot with mainMenu.
|
2023-03-29 07:31:15 +00:00 |
|
|
王怡栋
|
9f19893d26
|
Merge branch 'bugfix/screen' into 'master'
* Fix bug of screen and remove unused parameters.
See merge request easycorp/zentaopms!7275
|
2023-03-29 07:15:15 +00:00 |
|
|
xieqiyu
|
2a6f0647ed
|
* Fix bug of dataset upgrade.
|
2023-03-29 07:12:28 +00:00 |
|
|
liumengyi
|
d86aa233eb
|
* Remove unused parameters.
|
2023-03-29 15:05:17 +08:00 |
|
|
宋辰轩
|
23c0839060
|
* Fix static error.
|
2023-03-29 13:18:16 +08:00 |
|
|
宋辰轩
|
96d5217d55
|
* Remove bi sql file.
|
2023-03-29 13:05:18 +08:00 |
|
|
宋辰轩
|
c590e94f0c
|
* Modify bi sql.
|
2023-03-29 13:01:45 +08:00 |
|
|
daitingting
|
8edc327784
|
* Optimize codes.
|
2023-03-29 11:13:19 +08:00 |
|
|
宋辰轩
|
983d1e4f49
|
Merge branch 'sprint/biz17' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/biz17
|
2023-03-29 10:56:49 +08:00 |
|
|
宋辰轩
|
d3861768fc
|
* Upgrade 18beta2 will execute sql,but the installation does not, so add it to upgrade and install again.
|
2023-03-29 10:56:42 +08:00 |
|
|
daitingting
|
e18e7525b8
|
* Callback upgrade program when upgrade from biz8.4.
|
2023-03-29 10:50:33 +08:00 |
|
|
liugang
|
c3cae43d8c
|
* Display the subNavbar in left side.
|
2023-03-29 02:39:05 +00:00 |
|
|
liumengyi
|
9842006745
|
* Fix bug of screen.
|
2023-03-29 10:32:47 +08:00 |
|
|
liumengyi
|
fc9f1a510a
|
* Fix bug of screen.
|
2023-03-29 10:31:15 +08:00 |
|
|
宋辰轩
|
91b14148a7
|
* Remove comment.
|
2023-03-29 10:26:09 +08:00 |
|
|
wangyidong
|
2bcbd46898
|
* fix bug.
|
2023-03-29 10:18:29 +08:00 |
|
|
liumengyi
|
03ecfe5450
|
* Fix bug of screen.
|
2023-03-29 09:43:14 +08:00 |
|
|
liugang
|
f6430b6050
|
* Replace report with pivot.
|
2023-03-29 00:46:16 +00:00 |
|
|
王怡栋
|
6e5371e439
|
Merge branch 'sprint/hufangzhou_task_89288' into 'master'
* Finish task #89288.
See merge request easycorp/zentaopms!7273
|
2023-03-28 09:03:34 +00:00 |
|
|
hufangzhou
|
202a93daeb
|
* Finish task #89288.
|
2023-03-28 16:57:26 +08:00 |
|
|
daitingting
|
63869d9bc5
|
* Adjust upgrade codes.
|
2023-03-28 16:47:50 +08:00 |
|
|
liugang
|
8e9f4d9e2d
|
* User the pivot lang items instead of the report lang items.
|
2023-03-28 07:52:52 +00:00 |
|
|
liugang
|
7ae206cdec
|
- Remove PHP closing tag.
|
2023-03-28 07:51:02 +00:00 |
|
|
王怡栋
|
128d5aa6fc
|
Merge branch 'sprint/hufangzhou_task_89173' into 'master'
* Finish task #89173.
See merge request easycorp/zentaopms!7272
|
2023-03-28 07:41:48 +00:00 |
|
|
liugang
|
b634131c11
|
* Remove the unused "$storyID" local variable.
|
2023-03-28 07:41:13 +00:00 |
|
|
王怡栋
|
1b2341dac5
|
Merge branch 'sprint/hufangzhou_adjustcss' into 'master'
* Remove the blue font color when the link is unclickable.
See merge request easycorp/zentaopms!7270
|
2023-03-28 07:41:10 +00:00 |
|
|
liugang
|
742d9fddd3
|
* Replace the use of "join" with "implode".
|
2023-03-28 07:39:55 +00:00 |
|
|
liugang
|
6cf087fac5
|
* Remove the unused local variable.
|
2023-03-28 07:39:28 +00:00 |
|
|
liugang
|
abf4f90f90
|
* Remove the unused local variable.
|
2023-03-28 07:38:08 +00:00 |
|