Merge pull request #2369 from dataease/dev

backend/src/main/java/io/dataease/ext/ExtPanelViewMapper.xml

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

frontend/src/views/panel/LinkJumpSet/index.vue

@@ -95,10 +95,13 @@
                           :label="item.name"
                           :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" />
                           </span>
-                          <span style="float: left; font-size: 12px"> {{ item.name }}</span>
+                          <span style="float: left; font-size: 12px">{{ item.name }}</span>
                         </el-option>
                       </el-select>
                     </div>

frontend/src/views/panel/OuterParamsSet/index.vue

@@ -81,7 +81,10 @@
                           :label="item.name"
                           :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" />
                           </span>
                           <span style="float: left; font-size: 12px"> {{ item.name }}</span>