Skip to content

D
dataease
提交 f4691239 authored 作者: wangjiahao's avatar wangjiahao
浏览文件
操作

feat:仪表盘

上级 e64013b2
全部展开 显示空白字符变更
内嵌 并排
正在显示 包含 679 行增加 和 2 行删除
backend/src/main/java/io/dataease/base/domain/PanelGroup.java 0 → 100644
浏览文件 @ f4691239
package io.dataease.base.domain;
import java.io.Serializable;
import lombok.Data;
@Data
public class PanelGroup implements Serializable {
private String id;
private String name;
private String pid;
private Integer level;
private String nodeType;
private String createBy;
private Long createTime;
private String panelType;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
backend/src/main/java/io/dataease/base/mapper/PanelGroupMapper.java 0 → 100644
浏览文件 @ f4691239
package io.dataease.base.mapper;
import io.dataease.base.domain.PanelGroup;
import io.dataease.base.domain.PanelGroupExample;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface PanelGroupMapper {
long countByExample(PanelGroupExample example);
int deleteByExample(PanelGroupExample example);
int deleteByPrimaryKey(String id);
int insert(PanelGroup record);
int insertSelective(PanelGroup record);
List<PanelGroup> selectByExample(PanelGroupExample example);
PanelGroup selectByPrimaryKey(String id);
int updateByExampleSelective(@Param("record") PanelGroup record, @Param("example") PanelGroupExample example);
int updateByExample(@Param("record") PanelGroup record, @Param("example") PanelGroupExample example);
int updateByPrimaryKeySelective(PanelGroup record);
int updateByPrimaryKey(PanelGroup record);
}
\ No newline at end of file
backend/src/main/java/io/dataease/base/mapper/PanelGroupMapper.xml 0 → 100644
浏览文件 @ f4691239
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="io.dataease.base.mapper.PanelGroupMapper">
<resultMap id="BaseResultMap" type="io.dataease.base.domain.PanelGroup">
<id column="id" jdbcType="VARCHAR" property="id" />
<result column="name" jdbcType="VARCHAR" property="name" />
<result column="pid" jdbcType="VARCHAR" property="pid" />
<result column="level" jdbcType="INTEGER" property="level" />
<result column="node_type" jdbcType="VARCHAR" property="nodeType" />
<result column="create_by" jdbcType="VARCHAR" property="createBy" />
<result column="create_time" jdbcType="BIGINT" property="createTime" />
<result column="panel_type" jdbcType="VARCHAR" property="panelType" />
</resultMap>
<sql id="Example_Where_Clause">
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Update_By_Example_Where_Clause">
<where>
<foreach collection="example.oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Base_Column_List">
id, `name`, pid, `level`, node_type, create_by, create_time, panel_type
</sql>
<select id="selectByExample" parameterType="io.dataease.base.domain.PanelGroupExample" resultMap="BaseResultMap">
select
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from panel_group
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
</select>
<select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from panel_group
where id = #{id,jdbcType=VARCHAR}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.String">
delete from panel_group
where id = #{id,jdbcType=VARCHAR}
</delete>
<delete id="deleteByExample" parameterType="io.dataease.base.domain.PanelGroupExample">
delete from panel_group
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="io.dataease.base.domain.PanelGroup">
insert into panel_group (id, `name`, pid,
`level`, node_type, create_by,
create_time, panel_type)
values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{pid,jdbcType=VARCHAR},
#{level,jdbcType=INTEGER}, #{nodeType,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR},
#{createTime,jdbcType=BIGINT}, #{panelType,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" parameterType="io.dataease.base.domain.PanelGroup">
insert into panel_group
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
<if test="name != null">
`name`,
</if>
<if test="pid != null">
pid,
</if>
<if test="level != null">
`level`,
</if>
<if test="nodeType != null">
node_type,
</if>
<if test="createBy != null">
create_by,
</if>
<if test="createTime != null">
create_time,
</if>
<if test="panelType != null">
panel_type,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=VARCHAR},
</if>
<if test="name != null">
#{name,jdbcType=VARCHAR},
</if>
<if test="pid != null">
#{pid,jdbcType=VARCHAR},
</if>
<if test="level != null">
#{level,jdbcType=INTEGER},
</if>
<if test="nodeType != null">
#{nodeType,jdbcType=VARCHAR},
</if>
<if test="createBy != null">
#{createBy,jdbcType=VARCHAR},
</if>
<if test="createTime != null">
#{createTime,jdbcType=BIGINT},
</if>
<if test="panelType != null">
#{panelType,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="io.dataease.base.domain.PanelGroupExample" resultType="java.lang.Long">
select count(*) from panel_group
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</select>
<update id="updateByExampleSelective" parameterType="map">
update panel_group
<set>
<if test="record.id != null">
id = #{record.id,jdbcType=VARCHAR},
</if>
<if test="record.name != null">
`name` = #{record.name,jdbcType=VARCHAR},
</if>
<if test="record.pid != null">
pid = #{record.pid,jdbcType=VARCHAR},
</if>
<if test="record.level != null">
`level` = #{record.level,jdbcType=INTEGER},
</if>
<if test="record.nodeType != null">
node_type = #{record.nodeType,jdbcType=VARCHAR},
</if>
<if test="record.createBy != null">
create_by = #{record.createBy,jdbcType=VARCHAR},
</if>
<if test="record.createTime != null">
create_time = #{record.createTime,jdbcType=BIGINT},
</if>
<if test="record.panelType != null">
panel_type = #{record.panelType,jdbcType=VARCHAR},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByExample" parameterType="map">
update panel_group
set id = #{record.id,jdbcType=VARCHAR},
`name` = #{record.name,jdbcType=VARCHAR},
pid = #{record.pid,jdbcType=VARCHAR},
`level` = #{record.level,jdbcType=INTEGER},
node_type = #{record.nodeType,jdbcType=VARCHAR},
create_by = #{record.createBy,jdbcType=VARCHAR},
create_time = #{record.createTime,jdbcType=BIGINT},
panel_type = #{record.panelType,jdbcType=VARCHAR}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByPrimaryKeySelective" parameterType="io.dataease.base.domain.PanelGroup">
update panel_group
<set>
<if test="name != null">
`name` = #{name,jdbcType=VARCHAR},
</if>
<if test="pid != null">
pid = #{pid,jdbcType=VARCHAR},
</if>
<if test="level != null">
`level` = #{level,jdbcType=INTEGER},
</if>
<if test="nodeType != null">
node_type = #{nodeType,jdbcType=VARCHAR},
</if>
<if test="createBy != null">
create_by = #{createBy,jdbcType=VARCHAR},
</if>
<if test="createTime != null">
create_time = #{createTime,jdbcType=BIGINT},
</if>
<if test="panelType != null">
panel_type = #{panelType,jdbcType=VARCHAR},
</if>
</set>
where id = #{id,jdbcType=VARCHAR}
</update>
<update id="updateByPrimaryKey" parameterType="io.dataease.base.domain.PanelGroup">
update panel_group
set `name` = #{name,jdbcType=VARCHAR},
pid = #{pid,jdbcType=VARCHAR},
`level` = #{level,jdbcType=INTEGER},
node_type = #{nodeType,jdbcType=VARCHAR},
create_by = #{createBy,jdbcType=VARCHAR},
create_time = #{createTime,jdbcType=BIGINT},
panel_type = #{panelType,jdbcType=VARCHAR}
where id = #{id,jdbcType=VARCHAR}
</update>
</mapper>
\ No newline at end of file
backend/src/main/java/io/dataease/controller/panel/PanelGroupController.java 0 → 100644
浏览文件 @ f4691239
package io.dataease.controller.panel;
/**
* Author: wangjiahao
* Date: 2021-03-05
* Description:
*/
public class PanelGroupController {
}
backend/src/main/java/io/dataease/dto/panel/PanelGroupDTO.java 0 → 100644
浏览文件 @ f4691239
package io.dataease.dto.panel;
import io.dataease.base.domain.PanelGroup;
import io.dataease.dto.dataset.DataSetGroupDTO;
import java.util.List;
/**
* Author: wangjiahao
* Date: 2021-03-05
* Description:
*/
public class PanelGroupDTO extends PanelGroup {
private String label;
private List<PanelGroupDTO> children;
public String getLabel() {
return label;
}
public void setLabel(String label) {
this.label = label;
}
public List<PanelGroupDTO> getChildren() {
return children;
}
public void setChildren(List<PanelGroupDTO> children) {
this.children = children;
}
}
backend/src/main/java/io/dataease/service/panel/PanelGroupService.java 0 → 100644
浏览文件 @ f4691239
package io.dataease.service.panel;
import io.dataease.base.mapper.PanelGroupMapper;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
/**
* Author: wangjiahao
* Date: 2021-03-05
* Description:
*/
@Service
public class PanelGroupService {
@Resource
private PanelGroupMapper panelGroupMapper;
}
backend/src/main/resources/db/migration/V12__panel_table.sql 0 → 100644
浏览文件 @ f4691239
SET NAMES utf8mb4;
SET FOREIGN_KEY_CHECKS = 0;
-- ----------------------------
-- Table structure for panel_group
-- ----------------------------
DROP TABLE IF EXISTS `panel_group`;
CREATE TABLE `panel_group` (
`id` varchar(50) NOT NULL,
`name` varchar(255) DEFAULT NULL COMMENT '名称',
`pid` varchar(255) DEFAULT NULL COMMENT '父级id',
`level` int(10) DEFAULT NULL COMMENT '层级',
`node_type` varchar(255) DEFAULT NULL COMMENT '节点类型 folder or panel 目录或者文件夹',
`create_by` varchar(255) DEFAULT NULL COMMENT '创建人',
`create_time` bigint(13) DEFAULT NULL COMMENT '创建时间',
`panel_type` varchar(255) DEFAULT NULL COMMENT '仪表盘类型 system 系统内置 self 用户自建 ',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-- ----------------------------
-- Table structure for panel_view
-- ----------------------------
DROP TABLE IF EXISTS `panel_view`;
CREATE TABLE `panel_view` (
`id` varchar(50) NOT NULL,
`panel_group_id` varchar(50) DEFAULT NULL COMMENT 'panel_group_id',
`content` blob COMMENT '内容',
`create_by` varchar(255) DEFAULT NULL COMMENT '创建人',
`create_time` bigint(13) DEFAULT NULL COMMENT '创建时间',
`update_by` varchar(255) DEFAULT NULL COMMENT '更新人',
`update_time` bigint(13) DEFAULT NULL COMMENT '更新时间',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
SET FOREIGN_KEY_CHECKS = 1;
\ No newline at end of file
backend/src/main/resources/generatorConfig.xml
浏览文件 @ f4691239
...@@ -64,7 +64,8 @@ ...@@ -64,7 +64,8 @@
<!--要生成的数据库表 --> <!--要生成的数据库表 -->
<table tableName="datasource"/> <!-- <table tableName="datasource"/>-->
<table tableName="panel_group"/>
</context> </context>
......
frontend/src/api/panel/panel.js 0 → 100644
浏览文件 @ f4691239
import request from '@/utils/request'
export function loadTable(data) {
return request({
url: '/dataset/table/list',
method: 'post',
data
})
}
export function getScene(sceneId) {
return request({
url: '/dataset/group/getScene/' + sceneId,
method: 'post'
})
}
export function addGroup(data) {
return request({
url: '/dataset/group/save',
method: 'post',
data
})
}
export function delGroup(groupId) {
return request({
url: '/dataset/group/delete/' + groupId,
method: 'post'
})
}
export function addTable(data) {
return request({
url: '/dataset/table/update',
method: 'post',
data
})
}
export function delTable(tableId) {
return request({
url: '/dataset/table/delete/' + tableId,
method: 'post'
})
}
export function groupTree(data) {
return request({
url: '/dataset/group/tree',
method: 'post',
data
})
}
export function listDatasource() {
return request({
url: '/datasource/list',
method: 'get'
})
}
export function getTable(id) {
return request({
url: '/dataset/table/get/' + id,
method: 'post'
})
}
export function getPreviewData(data) {
return request({
url: '/dataset/table/getPreviewData',
method: 'post',
data
})
}
export function fieldList(id) {
return request({
url: '/dataset/field/list/' + id,
method: 'post'
})
}
export function batchEdit(data) {
return request({
url: '/dataset/field/batchEdit',
method: 'post',
data
})
}
export function post(url, data) {
return request({
url: url,
method: 'post',
data
})
}
export default { loadTable, getScene, addGroup, delGroup, addTable, delTable, groupTree }
frontend/src/lang/zh.js
浏览文件 @ f4691239
...@@ -680,5 +680,47 @@ export default { ...@@ -680,5 +680,47 @@ export default {
message_webhook: '接收方式为钉钉和企业机器人时，webhook为必填项', message_webhook: '接收方式为钉钉和企业机器人时，webhook为必填项',
template: '模版' template: '模版'
} }
},
panel: {
datalist: '视图列表',
add_group: '添加分组',
add_scene: '添加场景',
group: '分组',
scene: '场景',
delete: '删除',
move_to: '移动到',
rename: '重命名',
tips: '提示',
confirm_delete: '确认删除',
delete_success: '删除成功',
confirm: '确认',
cancel: '取消',
search: '搜索',
back: '返回',
add_table: '添加表',
process: '进度',
add_chart: '添加视图',
db_data: '数据库表',
sql_data: 'SQL数据集',
excel_data: 'Excel数据集',
custom_data: '自助数据集',
pls_slc_tbl_left: '请从左侧选视图',
add_db_table: '添加数据库表',
pls_slc_data_source: '请选择数据库连接',
table: '表',
edit: '编辑',
create_view: '创建试图',
data_preview: '数据预览',
dimension: '维度',
quota: '指标',
title: '标题',
show: '显示',
chart_type: '图表类型',
shape_attr: '图形属性',
module_style: '组件样式',
result_filter: '结果过滤器',
x_axis: '横轴',
y_axis: '纵轴',
chart: '视图'
} }
} }
frontend/src/store/index.js
浏览文件 @ f4691239
...@@ -8,6 +8,7 @@ import permission from './modules/permission' ...@@ -8,6 +8,7 @@ import permission from './modules/permission'
import dataset from './modules/dataset' import dataset from './modules/dataset'
import chart from './modules/chart' import chart from './modules/chart'
import request from './modules/request' import request from './modules/request'
import panel from './modules/panel'
Vue.use(Vuex) Vue.use(Vuex)
const store = new Vuex.Store({ const store = new Vuex.Store({
...@@ -18,7 +19,8 @@ const store = new Vuex.Store({ ...@@ -18,7 +19,8 @@ const store = new Vuex.Store({
permission, permission,
dataset, dataset,
chart, chart,
request request,
panel
}, },
getters getters
}) })
......
frontend/src/store/modules/panel.js 0 → 100644
浏览文件 @ f4691239
const getDefaultState = () => {
return {
panelName: ""
}
}
const state = getDefaultState()
const mutations = {
setPanelName: (state, panelName) => {
state.panelName = panelName
}
}
const actions = {
setPanelName({ commit }, panelName) {
commit('setPanelName', panelName)
}
}
export default {
namespaced: true,
state,
mutations,
actions
}
frontend/src/views/panel/group/Group.vue 0 → 100644
浏览文件 @ f4691239
差异被折叠。
frontend/src/views/panel/index.vue 0 → 100644
浏览文件 @ f4691239
<template>
<ms-container>
<ms-aside-container>
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane name="PanelList">
<span slot="label"><i class="el-icon-document"></i>列表</span>
<PanelList @switchComponent="switchComponent"/>
</el-tab-pane>
<el-tab-pane name="panels_star">
<span slot="label"><i class="el-icon-star-off"></i>收藏</span>
开发中...
</el-tab-pane>
<el-tab-pane name="panels_share">
<span slot="label"><i class="el-icon-share"></i>分享</span>
开发中...
</el-tab-pane>
<!-- <el-tab-pane name="example">-->
<!-- <span slot="label"><i class="el-icon-star-on"></i>示例</span>-->
<!-- <group @switchComponent="switchComponent"/>-->
<!-- </el-tab-pane>-->
</el-tabs>
</ms-aside-container>
<ms-main-container>
<!--<router-view/>-->
<component :is="component" :param="param" @switchComponent="switchComponent"/>
</ms-main-container>
</ms-container>
</template>
<script>
import MsMainContainer from '@/metersphere/common/components/MsMainContainer'
import MsContainer from '@/metersphere/common/components/MsContainer'
import MsAsideContainer from '@/metersphere/common/components/MsAsideContainer'
import Group from './group/Group'
import PanelList from './list/PanelList'
import PanelView from './list/PanelView'
export default {
name: 'Panel',
components: {MsMainContainer, MsContainer, MsAsideContainer, Group, PanelList,PanelView},
data() {
return {
component: PanelView,
param: {},
activeName: 'PanelList'
}
},
methods: {
handleClick(tab, event) {
console.log(tab, event)
},
switchComponent(c) {
console.log(c)
this.param = c.param
switch (c.name) {
case 'PanelView':
this.component = PanelView
break
}
}
}
}
</script>
<style scoped>
.ms-aside-container {
height: calc(100vh - 56px);
padding: 15px;
min-width: 260px;
max-width: 460px;
}
.ms-main-container {
height: calc(100vh - 56px);
}
</style>
frontend/src/views/panel/list/PanelList.vue 0 → 100644
浏览文件 @ f4691239
差异被折叠。
frontend/src/views/panel/list/PanelView.vue 0 → 100644
浏览文件 @ f4691239
差异被折叠。
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论