center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #2369 from dataease/dev

Browse Source 
Dev
This commit is contained in:
王嘉豪 2022-06-01 12:17:54 +08:00 committed by GitHub
commit 09af5f8180
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
backend/src/main/java/io/dataease/ext/ExtPanelViewMapper.xml
View File

@ -33,6 +33,7 @@
chart_view.create_time, chart_view.create_time,
chart_view.update_time, chart_view.update_time,
chart_view.style_priority, chart_view.style_priority,
ifnull(chart_view.is_plugin,0) as 'is_plugin',
panel_view.panel_id, panel_view.panel_id,
dataset_table_field.id as 'field_id', dataset_table_field.id as 'field_id',
dataset_table_field.origin_name, dataset_table_field.origin_name,

7
frontend/src/views/panel/LinkJumpSet/index.vue
View File

@ -95,10 +95,13 @@
:label="item.name" :label="item.name"
:value="item.id" :value="item.id"
> >
<span style="float: left"> <span v-if="item.isPlugin" style="float: left">
<svg-icon :icon-class="item.type !== 'buddle-map' ? ('/api/pluginCommon/staticInfo/' + item.type + '/svg') : item.type" style="width: 14px;height: 14px" />
</span>
<span v-else style="float: left">
<svg-icon :icon-class="item.type" style="width: 14px;height: 14px" /> <svg-icon :icon-class="item.type" style="width: 14px;height: 14px" />
</span> </span>
<span style="float: left; font-size: 12px"> {{ item.name }}</span> <span style="float: left; font-size: 12px">{{ item.name }}</span>
</el-option> </el-option>
</el-select> </el-select>
</div> </div>

5
frontend/src/views/panel/OuterParamsSet/index.vue
View File

@ -81,7 +81,10 @@
:label="item.name" :label="item.name"
:value="item.id" :value="item.id"
> >
<span style="float: left"> <span v-if="item.isPlugin" style="float: left">
<svg-icon :icon-class="item.type !== 'buddle-map' ? ('/api/pluginCommon/staticInfo/' + item.type + '/svg') : item.type" style="width: 14px;height: 14px" />
</span>
<span v-else style="float: left">
<svg-icon :icon-class="item.type" style="width: 14px;height: 14px" /> <svg-icon :icon-class="item.type" style="width: 14px;height: 14px" />
</span> </span>
<span style="float: left; font-size: 12px"> {{ item.name }}</span> <span style="float: left; font-size: 12px"> {{ item.name }}</span>