Commit Graph
168 Commits
Author SHA1 Message Date
wangxuepeng 77c6e32fc5 * Refactor screen::genNewChartData. 2023-11-24 17:05:00 +08:00
qixinzhi 7067fc66d8 * Fix the bug assign name of pivot,bug#40551. 2023-11-21 22:13:24 +08:00
qixinzhi adcbc6c8cc * Fix user name with pre letter,bug#35720. 2023-11-21 22:13:24 +08:00
qixinzhi 8eff9450c7 * Fix show origin not work after slice,bug#40748. 2023-11-20 16:04:20 +08:00
qixinzhi f18e0f5371 * Fix display header error with show origin item,bug#40175. 2023-11-15 15:27:39 +08:00
qixinzhi 769604ebd8 * Fix display with summary when only one row in pivot. 2023-11-15 15:20:39 +08:00
qixinzhi 33c714339e * Add pivot lang 2023-11-15 15:02:58 +08:00
qixinzhi 1caa8eb059 * Finish display show origin item,task#105328,story#50220. 2023-11-15 14:47:21 +08:00
qixinzhi aea63e24c4 * Add pivot lang. 2023-11-15 14:42:37 +08:00
liumengyi b4238dc8bc * Remove , at the end of row in the lastest children in pivot. 2023-11-14 13:56:04 +08:00
songchenxuan cd285f7042 * Merge commit ab4a8b6753. 2023-11-10 14:47:58 +08:00
songchenxuan 482ada0934 * Merge commit 07963e065b, use lastest code. 2023-11-10 14:00:56 +08:00
songchenxuan 2f73920936 * Merge commit e46a29fd32. 2023-11-09 13:25:32 +08:00
songchenxuan 78bda936d8 * Merge commit 7897fac83b. 2023-11-09 13:20:54 +08:00
songchenxuan 3fed0535cd * Merge commit e806a0a1c1. 2023-11-09 13:14:17 +08:00
tanghucheng b0515caf4a * Merge #5935f603f4,Change judgment condition. 2023-11-09 00:31:19 -05:00
liugang 5f89e37ea8 * pivot: replace the input widget with datePicker widget. 2023-11-07 08:57:18 +08:00
liugang a51ee4691a * pivotJS: refactor the loadCustomPivot function - use the formData object to post data. 2023-11-06 17:44:09 +08:00
liugang 5fd9fabef4 * pivotJS: remove the module parameter in url. 2023-11-06 17:43:27 +08:00
liugang 70c4081588 * pivot: refactor the preview page. 2023-11-06 17:41:41 +08:00
liugang 8aedb6ee43 + pivot: assign js variable. 2023-11-06 17:40:48 +08:00
liugang 984947e982 - pivotZen: remove unused methods. 2023-11-06 17:40:00 +08:00
liugang 36c30437cc * pivot: implement functions in the preview method instead of in the pivotZen::prepare4Preview method. 2023-11-06 17:39:15 +08:00
liugang 098b53b134 * pivotZen: set the $currentMenu variable in each pivot. 2023-11-06 17:35:03 +08:00
liugang ee49451269 * pivotZen: refactor the show method to display custom pivots. 2023-11-06 17:34:23 +08:00
liugang e359d6d794 * pivotZen: simplify the getBuiltinMenus method - remove code of the $title and the $currentMenu variables. 2023-11-06 17:32:27 +08:00
liugang ad0db9c0f4 * pivotZen: refactor the getSidebarMenus method. 2023-11-06 17:29:41 +08:00
liugang 5c907f36e2 * pivotZen: rename the getDefaultPivotParams method to getDefaultModuleAndParams and refactor it. 2023-11-06 17:27:29 +08:00
liugang 7fe8672336 * pivotZen: refactor the getFirstGroup method to return a group id. 2023-11-06 17:25:50 +08:00
liugang 514a370afe * pivot: remove unused code. 2023-11-06 17:18:12 +08:00
hufangzhou 9b6d154040 * Merge: Add 18.4.beta1 version. 2023-11-02 16:52:45 +08:00
liugang d6d29980b2 * pivot: fix error the filter value maybe not a array. 2023-11-02 10:53:32 +08:00
liugang 5527932b86 * pivot: replace bg-white with bg-canvas. 2023-11-02 09:49:37 +08:00
liugang a42e200990 * pivot: optimize padding. 2023-11-02 09:48:08 +08:00
liugang 7b6810b2e3 - pivot: remove unused method. 2023-11-02 09:40:06 +08:00
liugang 1d563a84b7 * pivot: reload custom pivot table when query conditions changed. 2023-11-02 09:25:56 +08:00
liugang c999f7f9b7 * pivot: display filters in custom pivot page. 2023-11-01 13:50:38 +08:00
liugang 768ed94498 * pivot: move the ajaxGetSysOptions method from control to zen and refactor it. 2023-11-01 13:49:51 +08:00
liugang 9b52c6b6ba * pivotZen: fix error the builtin pivots don't display. 2023-10-31 14:58:28 +08:00
liugang d536fb09f2 * pivot: refactor the getCellSpan function. 2023-10-31 10:10:07 +08:00
liugang 1b3928da67 * pivot: enable the header-group plugin of data table. 2023-10-31 10:09:33 +08:00
liugang 8fb965ddad + pivot: the data table can call custom function to re-render cell. 2023-10-31 10:09:12 +08:00
liugang e07a3e67d4 * pivotZen: refactor the convertDataForDtable method. 2023-10-31 10:06:44 +08:00
liugang b62abc1171 + pivot: if column contains slice field, re-render cell. 2023-10-31 10:04:52 +08:00
liugang 85f5a92bfa * pivotModel: display the total lang item. 2023-10-31 10:01:07 +08:00
liugang 4eeb46ef71 + pivot: rewrite the show page with zin. 2023-10-27 17:27:37 +08:00
liugang 8e17b180bb + pivotZen: add method to convert the data of custom pivot to the format that can be used by data table. 2023-10-27 17:26:53 +08:00
liugang 7068b0c6d2 * pivot: replace $lang->error->noData with $lang->pivot->noPivot. 2023-10-27 14:59:26 +08:00
liugang cba0dd9601 * pivot: move the show method from control to zen. 2023-10-27 14:45:51 +08:00
liugang 0c2492c75a + pivot: add default function to generate pivot data. 2023-10-27 14:44:31 +08:00