From b013c400c8616b0d9656c408b94bde82532d1489 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E8=BE=B0=E8=BD=A9?= Date: Mon, 24 Apr 2023 13:34:18 +0800 Subject: [PATCH 1/2] * Fix bug #34583. --- module/chart/css/preview.css | 1 + module/chart/view/preview.html.php | 2 +- module/pivot/css/preview.css | 1 + module/pivot/view/preview.html.php | 10 +++++----- module/pivot/zen.php | 19 ++++++++++--------- 5 files changed, 18 insertions(+), 15 deletions(-) diff --git a/module/chart/css/preview.css b/module/chart/css/preview.css index 6d0a146010..d8cdc2b860 100644 --- a/module/chart/css/preview.css +++ b/module/chart/css/preview.css @@ -5,6 +5,7 @@ .parent-position{padding-right: 180px;} .biz-version {padding-top: 10px;} .biz-version a {color: #81511C;} +.overflow-hidden {overflow: hidden;} #chartGroups li {overflow: hidden; white-space: nowrap;} #chartGroups .checkbox-primary {margin-left: 8px; display: inline-block;} diff --git a/module/chart/view/preview.html.php b/module/chart/view/preview.html.php index e007da1ad6..876e5906e7 100644 --- a/module/chart/view/preview.html.php +++ b/module/chart/view/preview.html.php @@ -45,7 +45,7 @@
-
+
name) ? $group->name : '';?>
diff --git a/module/pivot/css/preview.css b/module/pivot/css/preview.css index 6ffa30f3ee..1725a33b66 100644 --- a/module/pivot/css/preview.css +++ b/module/pivot/css/preview.css @@ -5,3 +5,4 @@ #pivotGroups li>a, #pivotGroups ul>li>a {overflow: hidden; white-space: nowrap;} .biz-version {padding-top: 10px;} .biz-version a {color: #81511C;} +.overflow-hidden {overflow: hidden;} diff --git a/module/pivot/view/preview.html.php b/module/pivot/view/preview.html.php index cb4733fd1a..220c64c3a1 100644 --- a/module/pivot/view/preview.html.php +++ b/module/pivot/view/preview.html.php @@ -1,18 +1,18 @@ config->edition != 'open'):?> - +
-
-
pivot->list;?>
+
+
name) ? $group->name : '';?>
diff --git a/module/pivot/zen.php b/module/pivot/zen.php index 2134c4c5a0..0b7dd2a328 100644 --- a/module/pivot/zen.php +++ b/module/pivot/zen.php @@ -5,27 +5,28 @@ class pivotZen extends pivot * Prepare for preview a pivot. * * @param int $dimension - * @param string $group + * @param string $groupID * @param string $module * @param string $method * @param string $params * @access public * @return void */ - public function prepare4Preview($dimension, $group, $module, $method, $params) + public function prepare4Preview($dimension, $groupID, $module, $method, $params) { $params = helper::safe64Decode($params); - if(!$group) $group = $this->getDefaultGroup($dimension); - if(!$module || !$method) list($module, $method, $params) = $this->getDefaultPivotParams($dimension, $group); + if(!$groupID) $groupID = $this->getDefaultGroup($dimension); + if(!$module || !$method) list($module, $method, $params) = $this->getDefaultPivotParams($dimension, $groupID); if(!empty($module) && !empty($method) && $method != 'show' && !common::hasPriv($module, $method)) $this->loadModel('common')->deny('pivot', $method); $this->setFeatureBar($dimension); - $this->view->sidebar = $this->getSidebar($dimension, $group, $module, $method, $params); + $this->view->sidebar = $this->getSidebar($dimension, $groupID, $module, $method, $params); $this->view->dimension = $dimension; - $this->view->group = $group; + $this->view->groupID = $groupID; + $this->view->group = $this->loadModel('tree')->getByID($groupID); $this->view->module = $module; $this->view->method = $method; $this->view->params = $params; @@ -199,19 +200,19 @@ class pivotZen extends pivot foreach($pivots as $pivot) { - $class = ''; + $class = "pivot-{$pivot->id}"; $pivotName = $pivot->name; $params = helper::safe64Encode("dimensionID=$pivot->dimension&groupID=$pivot->group&pivotID=$pivot->id"); if($module == 'pivot' && $method == 'show' && $pivotID == $pivot->id) { - $class = "class='active'"; + $class .= ' active'; $this->view->title = $pivotName; } $pivotLink = helper::createLink('pivot', 'preview', "dimension=$dimension&group=$currentGroup->id&module=pivot&method=show¶ms=$params"); - $sidebar .= "
  • " . html::a($pivotLink, $pivotName, '', "title='$pivotName'") . '
    • '; + $sidebar .= "
  • " . html::a($pivotLink, $pivotName, '', "title='$pivotName'") . '
    • '; } if($group->grade == 2) $sidebar .= ''; From 3a0195009c7b8395e1f35146e98c24ea16dec9dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E8=BE=B0=E8=BD=A9?= Date: Mon, 24 Apr 2023 13:39:22 +0800 Subject: [PATCH 2/2] * Modify dom. --- module/chart/css/preview.css | 1 - module/chart/view/preview.html.php | 46 ++++++++++++++++-------------- module/pivot/css/preview.css | 1 - module/pivot/view/preview.html.php | 2 +- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/module/chart/css/preview.css b/module/chart/css/preview.css index d8cdc2b860..6d0a146010 100644 --- a/module/chart/css/preview.css +++ b/module/chart/css/preview.css @@ -5,7 +5,6 @@ .parent-position{padding-right: 180px;} .biz-version {padding-top: 10px;} .biz-version a {color: #81511C;} -.overflow-hidden {overflow: hidden;} #chartGroups li {overflow: hidden; white-space: nowrap;} #chartGroups .checkbox-primary {margin-left: 8px; display: inline-block;} diff --git a/module/chart/view/preview.html.php b/module/chart/view/preview.html.php index 876e5906e7..1d68f0867f 100644 --- a/module/chart/view/preview.html.php +++ b/module/chart/view/preview.html.php @@ -44,31 +44,33 @@
    -
    -
    -
    name) ? $group->name : '';?>
    -
    -
    - -
    -
    - chart->noChart;?> +
    +
    +
    +
    name) ? $group->name : '';?>
    -
    - -
    - -
    - - chart->preview, '', 'btn btn-primary');?> +
    + +
    +
    + chart->noChart;?>
    - - - config->edition == 'open'):?> -
    - isINT)) ? $lang->bizVersionINT : $lang->bizVersion;?> +
    + +
    + +
    + + chart->preview, '', 'btn btn-primary');?> +
    +
    + + config->edition == 'open'):?> +
    + isINT)) ? $lang->bizVersionINT : $lang->bizVersion;?> +
    +
    -
    diff --git a/module/pivot/css/preview.css b/module/pivot/css/preview.css index 1725a33b66..6ffa30f3ee 100644 --- a/module/pivot/css/preview.css +++ b/module/pivot/css/preview.css @@ -5,4 +5,3 @@ #pivotGroups li>a, #pivotGroups ul>li>a {overflow: hidden; white-space: nowrap;} .biz-version {padding-top: 10px;} .biz-version a {color: #81511C;} -.overflow-hidden {overflow: hidden;} diff --git a/module/pivot/view/preview.html.php b/module/pivot/view/preview.html.php index 220c64c3a1..a86fac7ec3 100644 --- a/module/pivot/view/preview.html.php +++ b/module/pivot/view/preview.html.php @@ -37,7 +37,7 @@ $('#subNavbar li').not('[data-id=]').removeClass('active')
    -
    +
    name) ? $group->name : '';?>