87 Commits

Include renames

Author	SHA1	Message	Date
tanghucheng	d667c4d029	Merge branch '18.x' into zentaoipd	2023-07-31 08:58:26 +08:00
songchenxuan	8dc213f9cc	* Fix bug #36839.	2023-07-26 12:38:45 +08:00
songchenxuan	22e24a7f0e	* Set session for back correct dimension and group.	2023-07-26 12:15:23 +08:00
songchenxuan	04b073350b	* Fix bug #36844.	2023-07-26 10:07:12 +08:00
songchenxuan	30e1b6e398	* If have not pivot-design/edit/delete permision, do not show after class.	2023-07-26 09:08:23 +08:00
songchenxuan	9feebc8346	* Add js confirm.	2023-07-25 11:00:43 +08:00
songchenxuan	7a5c8fbbda	* Add padding-top for query-origin and query-pivot.	2023-07-25 10:35:57 +08:00
songchenxuan	bad04f1acb	* Delete query-color.	2023-07-25 10:31:28 +08:00
宋辰轩	4cf861832e	revert 061aa26b5d ... revert * Add btn-link for button.	2023-07-25 10:24:13 +08:00
songchenxuan	061aa26b5d	* Add btn-link for button.	2023-07-25 10:15:04 +08:00
songchenxuan	2578e8c9d2	* Add padding for pivot preview.	2023-07-25 09:59:26 +08:00
songchenxuan	be3de59946	* Add button for preview.	2023-07-25 09:12:58 +08:00
songchenxuan	b087e806a9	* Try to fix bug 36782.	2023-07-24 15:09:31 +08:00
songchenxuan	9b32e98c33	* Modify after class color.	2023-07-19 01:27:02 +08:00
songchenxuan	6090f1cfda	* Add toggle buttom to check origin and pivot.	2023-07-18 21:35:19 +08:00
songchenxuan	f29d256d12	* Add button link color.	2023-07-18 21:11:15 +08:00
songchenxuan	da61f8d561	* Try to finish task 97835,97838.	2023-07-18 20:55:49 +08:00
songchenxuan	b23c2f6daf	* Fix bug for use result filter in preview.	2023-07-18 12:08:39 +08:00
songchenxuan	1af360729e	* Try to show pivot at preview.	2023-07-18 11:57:49 +08:00
songchenxuan	a95949abfe	* Finish design pivot when not use summary.	2023-07-18 10:19:59 +08:00
songchenxuan	ab4a8b6753	* Add lang for pivot.	2023-07-17 14:51:40 +08:00
tanghucheng	6b0db86d24	Merge branch '18.x' into zentaoipd	2023-07-13 17:26:49 +08:00
songchenxuan	d0e47791c2	* Fix bug #36385.	2023-07-11 09:46:37 +08:00
songchenxuan	07963e065b	* Try to fix bug #36385.	2023-07-11 09:37:42 +08:00
tanghucheng	3741c9b6fa	Merge branch '18.x' into zentaoipd	2023-07-03 13:36:29 +08:00
songchenxuan	4c1eadba72	* Try to exec sql, if error return, fix user upgrade zentao bug.	2023-06-25 15:20:27 +08:00
songchenxuan	0a893b3626	* Fix bug #35984.	2023-06-20 13:25:23 +08:00
songchenxuan	127ee40908	* Fix bug for pivot processFieldSetting func.	2023-06-12 13:04:53 +08:00
songchenxuan	e46a29fd32	* If pivot have not fieldSettings, try to init it. if pivot filters !is_array(), try to json_decode it. Compatibility screen/model use processPivot.	2023-06-06 16:39:09 +08:00
songchenxuan	7897fac83b	* ProcessFieldSettings if pivot stage is published.	2023-06-06 15:52:07 +08:00
songchenxuan	e806a0a1c1	* Add processFieldSettings to solve pivot design and view diff.	2023-06-06 14:12:42 +08:00
hufangzhou	1adb13d4cd	* Add 18.4 version.	2023-05-31 10:35:16 +08:00
Yagami	5935f603f4	* Change judgment condition.	2023-05-04 18:57:45 +08:00
liugang	da0d448216	* Increase side bar width to 240px.	2023-04-28 02:55:52 +00:00
wangyuting2	96b62c7a89	* Add css.	2023-04-28 10:49:02 +08:00
wangyuting2	85ce81c540	* Fix pivot table show bug for open version.	2023-04-28 10:32:16 +08:00
liugang	d5bddc6413	* Fix error of display the default pivot in open source version.	2023-04-28 02:04:55 +00:00
daitingting	7f91124fa0	* Optimize codes.	2023-04-27 10:14:33 +00:00
daitingting	7032ccdb45	* Set the default of date field is null.	2023-04-27 08:46:06 +00:00
daitingting	17804cf23d	* Insert pivot sql in pms.	2023-04-27 07:01:16 +00:00
wangyuting2	54542caadf	* Fix bug #34829.	2023-04-27 14:36:54 +08:00
daitingting	2697978732	* Fix bug.	2023-04-27 03:10:19 +00:00
wangyuting2	905d1ae26b	* Fix bug #34888.	2023-04-27 10:54:36 +08:00
liugang	76da16dd78	* Display project status in dropdown list, fix bug #34881.	2023-04-27 02:10:07 +00:00
qixinzhi	29031e1fd8	* Fix bug #34687.	2023-04-26 10:01:18 +00:00
宋辰轩	930291a95c	* Fix bug for pivot.	2023-04-25 17:46:44 +08:00
宋辰轩	675a5d3245	* Update pivot group.	2023-04-25 16:24:29 +08:00
daitingting	98bbf73ed6	* Fix bug #34678.	2023-04-25 16:00:23 +08:00
qixinzhi	0da8040c86	* Fix bug#34624.	2023-04-25 01:55:10 +00:00
qixinzhi	9030eeb96d	* Fix bug#34664.	2023-04-25 01:20:38 +00:00