Commit Graph
25 Commits
Author SHA1 Message Date
王怡栋 7399979c28 Merge branch 'sprint/scx_bug34275' into 'master'
* Fix bug #34275.

See merge request easycorp/zentaopms!7442
2023-04-18 00:24:26 +00:00
liugang 01e3f26c57 * Use export instead of exportChart. 2023-04-17 09:29:31 +00:00
宋辰轩 b1eea9afa7 * Fix bug #34275. 2023-04-17 17:15:07 +08:00
qixinzhi 0201ca4050 * Fix where condition sql with key words. 2023-04-17 05:18:46 +00:00
宋辰轩 5424de798c * Finish task #91131. 2023-04-14 16:55:50 +08:00
刘刚 dedce62d79 Merge branch 'fix_bug_qxz' into 'master'
* Fix bug #34124.

See merge request easycorp/zentaopms!7412
2023-04-14 03:03:23 +00:00
宋辰轩 5e1ecfe9bc * Fix bug for chart. 2023-04-14 10:07:04 +08:00
qixinzhi 5b93d9c057 * Fix bug #34124. 2023-04-14 01:50:07 +00:00
宋辰轩 2f7ed8959f * Add init picker. 2023-04-13 17:16:18 +08:00
daitingting 6cb02b9cea * Fix bug #34006. 2023-04-13 13:06:27 +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
宋辰轩 f8f4c3363e * Add inside and outside query button. 2023-04-12 16:21:52 +08:00
qixinzhi b5aabadf8b * Change chart ajax to async. 2023-04-12 15:41:47 +08:00
qixinzhi fd1bd5e58e * Finish bar chart datazoom. 2023-04-12 14:53:37 +08:00
刘刚 e09c353162 Merge branch 'chart_filter_format' into 'master'
* Add chart filter format.

See merge request easycorp/zentaopms!7357
2023-04-11 03:24:08 +00:00
liugang a81a24ff6a * Allways display the link to show more info of biz version. 2023-04-10 08:22:58 +00:00
liugang 6c3600ec2d + Display a link to show more function in biz. 2023-04-10 07:19:50 +00:00
宋辰轩 a9470cb411 * Modify for commit . 2023-04-10 11:17:44 +08:00
qixinzhi 7033d864a6 * Add chart filter format. 2023-04-07 17:33:01 +08:00
宋辰轩 a11e5a6bd8 * Finish chart result query select dropmenu. 2023-04-07 17:17:33 +08:00
xieqiyu fc528ed89a * Code for bug#33833. 2023-04-07 03:30:24 +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
liugang 492c01807f + Display chart in open source version. 2023-04-06 10:12:08 +00:00