From f28125fe38c0f3d9965e4a5ca307c66dba5274f3 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Tue, 13 May 2025 16:12:24 +0800 Subject: [PATCH] * [bug#62486,done,2h] Render the selected values and add button tip. --- lib/zin/wg/filter/v1.php | 2 +- module/chart/lang/de.php | 18 ++++++++++-------- module/chart/lang/en.php | 18 ++++++++++-------- module/chart/lang/fr.php | 18 ++++++++++-------- module/chart/lang/zh-cn.php | 18 ++++++++++-------- module/chart/ui/charts.html.php | 1 + module/chart/ui/preview.html.php | 2 +- 7 files changed, 43 insertions(+), 34 deletions(-) diff --git a/lib/zin/wg/filter/v1.php b/lib/zin/wg/filter/v1.php index 1baeddd66d..23ca9ba7e6 100644 --- a/lib/zin/wg/filter/v1.php +++ b/lib/zin/wg/filter/v1.php @@ -32,7 +32,7 @@ class filter extends wg return picker ( - setClass('flex-auto'), + setClass('flex-auto no-morph'), set::name($name), set::value($value), set::items($items), diff --git a/module/chart/lang/de.php b/module/chart/lang/de.php index 8efe093957..5a7c8b39e5 100644 --- a/module/chart/lang/de.php +++ b/module/chart/lang/de.php @@ -8,14 +8,16 @@ $lang->chart->acl = 'Access Control'; $lang->chart->aclList['open'] = 'Public (with chart view permissions and dimension permissions can access it)'; $lang->chart->aclList['private'] = 'Private (Only creators and whitelisted users with dimension permissions can access it)'; -$lang->chart->group = 'Group'; -$lang->chart->field = 'Related Field'; -$lang->chart->agg = 'Aggregate'; -$lang->chart->chooseField = 'Choose field'; -$lang->chart->aggType = 'Aggregate type'; -$lang->chart->other = 'Other'; -$lang->chart->unlimited = 'Unlimited'; -$lang->chart->colon = 'To'; +$lang->chart->group = 'Group'; +$lang->chart->field = 'Related Field'; +$lang->chart->agg = 'Aggregate'; +$lang->chart->chooseField = 'Choose field'; +$lang->chart->aggType = 'Aggregate type'; +$lang->chart->other = 'Other'; +$lang->chart->unlimited = 'Unlimited'; +$lang->chart->colon = 'To'; +$lang->chart->updateCharts = 'Update the chart'; +$lang->chart->updateCurrentChart = 'Update data in charts'; $lang->chart->fieldTypeList = array(); $lang->chart->fieldTypeList['input'] = 'Text'; diff --git a/module/chart/lang/en.php b/module/chart/lang/en.php index 8efe093957..5a7c8b39e5 100644 --- a/module/chart/lang/en.php +++ b/module/chart/lang/en.php @@ -8,14 +8,16 @@ $lang->chart->acl = 'Access Control'; $lang->chart->aclList['open'] = 'Public (with chart view permissions and dimension permissions can access it)'; $lang->chart->aclList['private'] = 'Private (Only creators and whitelisted users with dimension permissions can access it)'; -$lang->chart->group = 'Group'; -$lang->chart->field = 'Related Field'; -$lang->chart->agg = 'Aggregate'; -$lang->chart->chooseField = 'Choose field'; -$lang->chart->aggType = 'Aggregate type'; -$lang->chart->other = 'Other'; -$lang->chart->unlimited = 'Unlimited'; -$lang->chart->colon = 'To'; +$lang->chart->group = 'Group'; +$lang->chart->field = 'Related Field'; +$lang->chart->agg = 'Aggregate'; +$lang->chart->chooseField = 'Choose field'; +$lang->chart->aggType = 'Aggregate type'; +$lang->chart->other = 'Other'; +$lang->chart->unlimited = 'Unlimited'; +$lang->chart->colon = 'To'; +$lang->chart->updateCharts = 'Update the chart'; +$lang->chart->updateCurrentChart = 'Update data in charts'; $lang->chart->fieldTypeList = array(); $lang->chart->fieldTypeList['input'] = 'Text'; diff --git a/module/chart/lang/fr.php b/module/chart/lang/fr.php index 8efe093957..5a7c8b39e5 100644 --- a/module/chart/lang/fr.php +++ b/module/chart/lang/fr.php @@ -8,14 +8,16 @@ $lang->chart->acl = 'Access Control'; $lang->chart->aclList['open'] = 'Public (with chart view permissions and dimension permissions can access it)'; $lang->chart->aclList['private'] = 'Private (Only creators and whitelisted users with dimension permissions can access it)'; -$lang->chart->group = 'Group'; -$lang->chart->field = 'Related Field'; -$lang->chart->agg = 'Aggregate'; -$lang->chart->chooseField = 'Choose field'; -$lang->chart->aggType = 'Aggregate type'; -$lang->chart->other = 'Other'; -$lang->chart->unlimited = 'Unlimited'; -$lang->chart->colon = 'To'; +$lang->chart->group = 'Group'; +$lang->chart->field = 'Related Field'; +$lang->chart->agg = 'Aggregate'; +$lang->chart->chooseField = 'Choose field'; +$lang->chart->aggType = 'Aggregate type'; +$lang->chart->other = 'Other'; +$lang->chart->unlimited = 'Unlimited'; +$lang->chart->colon = 'To'; +$lang->chart->updateCharts = 'Update the chart'; +$lang->chart->updateCurrentChart = 'Update data in charts'; $lang->chart->fieldTypeList = array(); $lang->chart->fieldTypeList['input'] = 'Text'; diff --git a/module/chart/lang/zh-cn.php b/module/chart/lang/zh-cn.php index dfbfd209db..f40a3d10f1 100644 --- a/module/chart/lang/zh-cn.php +++ b/module/chart/lang/zh-cn.php @@ -8,14 +8,16 @@ $lang->chart->acl = '访问控制'; $lang->chart->aclList['open'] = '公开（有图表视图权限与所在维度的访问权限即可访问）'; $lang->chart->aclList['private'] = '私有（仅创建者和白名单用户可访问）'; -$lang->chart->group = '所属分组'; -$lang->chart->field = '关联字段'; -$lang->chart->agg = '汇总'; -$lang->chart->chooseField = '选择字段'; -$lang->chart->aggType = '统计方式'; -$lang->chart->other = '其他'; -$lang->chart->unlimited = '不限'; -$lang->chart->colon = '至'; +$lang->chart->group = '所属分组'; +$lang->chart->field = '关联字段'; +$lang->chart->agg = '汇总'; +$lang->chart->chooseField = '选择字段'; +$lang->chart->aggType = '统计方式'; +$lang->chart->other = '其他'; +$lang->chart->unlimited = '不限'; +$lang->chart->colon = '至'; +$lang->chart->updateCharts = '更新展示图表'; +$lang->chart->updateCurrentChart = '更新当前图表数据'; $lang->chart->fieldTypeList = array(); $lang->chart->fieldTypeList['input'] = '文本框'; diff --git a/module/chart/ui/charts.html.php b/module/chart/ui/charts.html.php index 1aff2249c9..22a4ca93a8 100644 --- a/module/chart/ui/charts.html.php +++ b/module/chart/ui/charts.html.php @@ -57,6 +57,7 @@ $generateCharts = function() use($charts, $lang) ( setClass('btn primary'), setData(array('on' => 'click', 'call' => "loadChart('{$chartID}')")), + set::title($lang->chart->updateCurrentChart), $lang->chart->query ) ) : null, diff --git a/module/chart/ui/preview.html.php b/module/chart/ui/preview.html.php index 6403a3d793..bdac23bc75 100644 --- a/module/chart/ui/preview.html.php +++ b/module/chart/ui/preview.html.php @@ -77,7 +77,7 @@ sidebar $treeMenu ? div ( setClass('bg-canvas px-4 py-2 module-menu'), - btn($lang->chart->preview, setClass('primary'), on::click('previewCharts')) + btn($lang->chart->preview, setClass('primary'), set::hint($lang->chart->updateCharts), on::click('previewCharts')) ) : null, $config->edition == 'open' ? div (