Commit Graph
1456 Commits
Author SHA1 Message Date
zhujinyong b6dcbaa519 + Add libraries for bi. 2022-08-15 12:02:11 +08:00
liumengyi 7252dc6b7c * Finish task #63694. 2022-08-09 14:51:15 +08:00
朱金勇 6d82afe4fa Merge branch 'sprint/sunhao/table_overflow_type' into 'master'
* change text overflow style in table.

See merge request easycorp/zentaopms!4787
2022-08-08 09:08:11 +00:00
lanzongjun 8adc70569f fix 2022-08-05 14:21:04 +08:00
lanzongjun aca14bafc6 remove ext 2022-08-05 08:50:17 +08:00
Hao Sun bf68fdab37 * change text overflow style in table. 2022-08-04 05:18:31 +00:00
lanzongjun 245aaf0b14 add dhtmlx 2022-08-02 17:14:33 +08:00
lanzongjun 3351911caa delete gantt ext 2022-07-28 14:47:26 +08:00
lanzongjun f866342fd2 * upgrade 2022-07-28 13:26:09 +08:00
朱金勇 e938a86fb5 Merge branch 'sprint/sunhao/zui_table' into 'master'
* update zui table, optimize UI for nested mode.

See merge request easycorp/zentaopms!4626
2022-07-21 08:21:43 +00:00
Hao Sun be417874c2 * update zui table, optimize UI for nested mode. 2022-07-21 07:03:08 +00:00
wangyidong ab6ee566e7 * code for task #61191. 2022-07-20 16:14:55 +08:00
wangzemei 7e8e91659c * Fix bug #24273 2022-07-19 05:44:09 +00:00
wangzemei 6827ec748a * Fix bug #25316 2022-07-14 09:12:09 +00:00
tianshujie 711c0e9e8c * Fix bug #25088. 2022-07-14 14:46:46 +08:00
wangzemei 739758db0f * Code for bug #23827 2022-07-12 08:01:51 +00:00
wangzemei 24aab39145 * Code for bug #23827 2022-07-12 07:24:15 +00:00
wangzemei debc2e3365 * Fix bug #24836 2022-07-11 09:32:20 +00:00
王怡栋 e9809af13a Merge branch 'master' into 'sprint/212_hufangzhou_59535'
# Conflicts:
#   www/js/my.full.js
2022-07-11 07:10:23 +00:00
hufangzhou 3f2b98e71c * Move the functions to my.full.js file. 2022-07-11 15:03:40 +08:00
wangzemei 7bb8a64638 * Fix bug #25041 2022-07-11 06:04:07 +00:00
tianshujie 5ccd62ea84 * Merge insensitive refresh custom forms into one method. 2022-07-07 10:44:29 +08:00
tianshujie dc7e0ec546 * Put the functions that add and remove elements in my.full.js. 2022-07-06 16:37:10 +08:00
wangzemei 0085cbd22c * Code for task#59575 2022-07-06 06:25:37 +00:00
wangzemei e30bd32527 * Finish task #59519 2022-07-05 05:40:53 +00:00
wangzemei 580085c24c * Fix bug24134 2022-07-01 09:07:44 +00:00
wangzemei 85e14d173a * Fix bug24393 2022-07-01 04:23:39 +00:00
guofeilong aaccdf4460 Revert "* fix bug #24581 in ZUI"
This reverts commit 23a07709fd.
2022-06-30 09:49:32 +00:00
guofeilong 23a07709fd * fix bug #24581 in ZUI 2022-06-30 07:36:50 +00:00
Hao Sun 0507500556 * optimize apps loading state. 2022-06-30 03:46:27 +00:00
Hao Sun 83c7f37ed4 * change default option for picker. 2022-06-28 01:48:23 +00:00
朱金勇 4f017f5e1d Merge branch 'sprint/sunhao/picker' into 'master'
* hide picker dropmenu on page scrolling.

See merge request easycorp/zentaopms!4142
2022-06-27 06:11:14 +00:00
wangyuting2 ad87d0c7da * Fix bug #23595. 2022-06-27 09:33:28 +08:00
Hao Sun 65f280ae66 * hide picker dropmenu on page scrolling. 2022-06-24 08:13:00 +00:00
王怡栋 8ad9dea460 Merge branch 'sprint/xuan_106' into 'master'
Sprint/xuan 106

See merge request easycorp/zentaopms!4126
2022-06-24 01:35:58 +00:00
zhujinyong ac574675d8 Merge branch 'sprint/sunhao/picker' 2022-06-23 17:52:13 +08:00
朱金勇 251593ac46 Merge branch 'sprint/sunhao/bug24187' into 'master'
* bug #24187, update picker to support for using picker for form controls with same id.

See merge request easycorp/zentaopms!4107
2022-06-23 09:18:34 +00:00
Hao Sun 2246f3a7ed * fix js error when create picker from a select element without any options. 2022-06-23 08:24:54 +00:00
Hao Sun 099280bab5 * bug #24187, update picker to support for using picker for form controls with same id. 2022-06-23 06:51:02 +00:00
xieqiyu 6838010353 * Code for task#57850. 2022-06-23 14:33:28 +08:00
Hao Sun d4e1f8a835 * task #57850, fix selected options not show in picker. 2022-06-23 05:18:52 +00:00
Hao Sun 631e65c121 * update picker lib. 2022-06-22 12:24:05 +00:00
Hao Sun cdb889d707 * update picker with new option "checkable". 2022-06-22 09:18:22 +00:00
dingyongliang 7111fcced8 * electron/zentao: rm image width. 2022-06-22 07:06:51 +00:00
孙广明 11c5cd1999 Merge branch 'sprint/sunhao/apps_loading_state' 2022-06-18 00:10:31 +08:00
Hao Sun 584bf73577 * update zui lib. 2022-06-17 15:54:16 +00:00
Hao Sun a8d212e213 * fix table with nested option not work as expected. 2022-06-17 15:18:08 +00:00
Hao Sun 775746df0a * optimize program list, support to preserve nested state. 2022-06-17 07:31:51 +00:00
zhujinyong a0d1f7cd4b Merge branch 'sprint/sunhao/task56927' 2022-06-16 08:30:31 +08:00
Hao Sun 56c5f05071 * optimize mini burn chart, support empty data. 2022-06-15 10:05:36 +00:00