Compare commits

...

40 Commits

Author SHA1 Message Date
wangjiahao
950735cd16 refactor(仪表板): 超长仪表板导出PDF、图片优化 2022-12-19 17:06:32 +08:00
wangjiahao
2063f42c04 refactor: 调整flyway 2022-12-13 12:13:27 +08:00
wangjiahao
1868523075 refactor: 更新默认模板数据 2022-12-13 12:05:20 +08:00
wangjiahao
e1795ea32e refactor: 调整flyway 2022-12-13 11:43:40 +08:00
taojinlong
cda06f8d1b fix: 参数设置按钮消失 2022-12-12 17:40:19 +08:00
Junjun
8a9e87c0e8
Merge pull request #4073 from dataease/pr@v1.17@fix_copy
fix(视图): 修复复制仪表板后视图计算字段表达式为空的问题 #4062
2022-12-12 17:19:29 +08:00
junjun
f32b8b53b9 fix(视图): 修复复制仪表板后视图计算字段表达式为空的问题 #4062 2022-12-12 17:17:43 +08:00
wangjiahao
43fc5a1e3c fix(仪表板): 修复第一次打开仪表板,过滤组件无法过滤 Tab 组件内的视图 #4011 2022-12-12 13:34:33 +08:00
Junjun
13c11acc96
Merge pull request #4061 from dataease/pr@v1.17@fix_table_page
fix(视图): 修复明细表总数
2022-12-12 10:55:18 +08:00
junjun
24fef55902 fix(视图): 修复明细表总数 2022-12-12 10:43:53 +08:00
fit2cloudrd
20a2e76cd1
Merge pull request #3978 from dataease/dev
merge dev
2022-11-30 19:44:24 +08:00
taojinlong
acf36f0d23 Merge branch 'dev' into v1.17 2022-11-30 19:07:43 +08:00
fit2cloudrd
a97315bdea
Merge pull request #3975 from dataease/dev
merge
2022-11-30 19:05:27 +08:00
fit2cloud-chenyw
9164c4c3f0 style(tabs): 选项卡头部水平位置设置失效 2022-11-30 18:54:25 +08:00
fit2cloud-chenyw
75b826ca8f fix(查询按钮): 绑定过滤器未能及时生效 2022-11-30 18:54:14 +08:00
taojinlong
58b68ce700 Merge branch 'dev' into v1.17 2022-11-30 18:41:52 +08:00
taojinlong
5373651856 Merge branch 'dev' into v1.17 2022-11-30 18:22:41 +08:00
taojinlong
57dd9bc27a Merge branch 'v1.17' of github.com:dataease/dataease into v1.17 2022-11-30 18:22:35 +08:00
taojinlong
df692fc00a fix: 上传excel限制文件大小 2022-11-30 15:17:37 +08:00
dataeaseShu
c21d976471 fix: 数据源选择列表样式调整 2022-11-30 13:45:41 +08:00
dataeaseShu
dbccefad2f fix: 视图复制后修改名称bug修复 错误信息看不到按钮样式调整 数据源描述字符限制保存异常 2022-11-30 13:45:02 +08:00
taojinlong
ffde3a0bdc Merge branch 'dev' into v1.17 2022-11-30 11:43:34 +08:00
taojinlong
7897fdeec3 Merge branch 'dev' into v1.17 2022-11-30 00:13:12 +08:00
taojinlong
b98dea0642 Merge branch 'dev' into v1.17 2022-11-30 00:05:48 +08:00
dataeaseShu
336394639c fix: 页面抖动 2022-11-29 15:11:49 +08:00
dataeaseShu
fe49b18383 fix: 编辑用户 组织不能删除,默认仪表板取消默认把”删除“字样改成”取消默认“ #3901, 选项卡-tab内部样式设置-轮播-时间调试-时间被上下调节按钮遮挡,明细表的页码在深色模式下看不清 2022-11-29 13:17:56 +08:00
taojinlong
9234c9d02d Merge branch 'dev' into v1.17 2022-11-28 23:10:49 +08:00
dataeaseShu
07eb822c1e fix: 日期组件包含当日 2022-11-28 17:47:30 +08:00
dataeaseShu
cd1cf5d4c1 fix: 图片上传提示修复 2022-11-28 17:47:18 +08:00
dataeaseShu
c511608b54 fix: 关联数据集保存bug修复 2022-11-28 17:46:12 +08:00
王嘉豪
d798f37f52
Merge pull request #3908 from dataease/dev
merge
2022-11-28 16:38:48 +08:00
dataeaseShu
6ec2c8b6e6 fix: 数据集导出 去重 样式调整 2022-11-28 14:45:53 +08:00
fit2cloud-chenyw
fe349fa906 style(地图): 跳转后切换指标窗口样式优化 2022-11-28 14:41:06 +08:00
fit2cloud-chenyw
c1c67de2da fix(过滤器): 日期范围过滤器参数设置单个结束时间有效 2022-11-28 14:40:52 +08:00
fit2cloud-chenyw
c2e9db264a perf(用户管理): 用户验证规则 2022-11-28 14:40:38 +08:00
taojinlong
78a9d491e8 refactor: merge dev 2022-11-28 12:26:48 +08:00
taojinlong
065b981ccc fix(数据集): 自定义时间格式 2022-11-28 12:24:01 +08:00
taojinlong
8fdcb9e916 fix(数据集): 自定义脱敏规则 2022-11-28 12:23:57 +08:00
dataeaseShu
6827be7562 fix: 渐变色 堆叠折线图 2022-11-26 09:29:50 +08:00
taojinlong
9ab6c1f95f fix: flyway placeholderReplacement false 2022-11-24 22:32:34 +08:00
10 changed files with 2269 additions and 560 deletions

View File

@ -608,6 +608,7 @@
id,
table_id,
chart_id,
origin_name,
`name`,
dataease_name,
group_type,
@ -624,6 +625,7 @@
uuid() AS id,
chart_view_field.table_id,
chart_view_field.pv_copy.chart_view_id AS chart_id,
chart_view_field.origin_name,
chart_view_field.`name`,
chart_view_field.dataease_name,
chart_view_field.group_type,

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,4 @@
INSERT INTO `my_plugin` (`name`, `store`, `free`, `cost`, `category`, `descript`, `version`, `creator`, `load_mybatis`,
`install_time`, `module_name`, `ds_type`)
VALUES ('人大金仓数据源插件', 'default', '0', '0', 'datasource', '人大金仓数据源插件', '1.0-SNAPSHOT', 'DATAEASE', '0',
'1650765903630', 'kingbase-backend', 'kingbase');

View File

@ -443,6 +443,9 @@ export default {
bus.$off('trigger-reset-button', this.triggerResetButton)
},
methods: {
getCanvasHeight() {
return this.mainHeightCount
},
openChartDetailsDialog(paramInfo) {
if (this.canvasId === 'canvas-main') {
this.showChartInfo = paramInfo.showChartInfo

View File

@ -1,6 +1,6 @@
import { Condition } from '@/components/widget/bean/Condition'
import { ApplicationContext } from '@/utils/ApplicationContext'
import store from '@/store'
/**
* 判断两个conditions数组是否相同
@ -70,7 +70,11 @@ export const buildViewKeyMap = panelItems => {
}
export const buildViewKeyFilters = (panelItems, result) => {
panelItems.forEach((element, index) => {
if (!(panelItems && panelItems.length > 0)) {
return result
}
const buildItems = panelItems[0].canvasId === 'canvas-main' ? panelItems : store.state.componentData
buildItems.forEach((element, index) => {
if (element.type !== 'custom') {
return true
}

View File

@ -67,7 +67,7 @@
>
{{ $t('chart.total') }}
<span>{{
chart.datasetMode === 0 ? chart.totalItems : ((chart.data && chart.data.tableRow) ? chart.data.tableRow.length : 0)
(chart.datasetMode === 0 && !not_support_page_dataset.includes(chart.datasourceType)) ? chart.totalItems : ((chart.data && chart.data.tableRow) ? chart.data.tableRow.length : 0)
}}</span>
{{ $t('chart.items') }}
</span>
@ -173,7 +173,8 @@ export default {
},
totalStyle: {
color: '#606266'
}
},
not_support_page_dataset: NOT_SUPPORT_PAGE_DATASET
}
},

View File

@ -55,7 +55,7 @@
>
{{ $t('chart.total') }}
<span>{{
chart.datasetMode === 0 ? chart.totalItems : ((chart.data && chart.data.tableRow) ? chart.data.tableRow.length : 0)
(chart.datasetMode === 0 && !not_support_page_dataset.includes(chart.datasourceType)) ? chart.totalItems : ((chart.data && chart.data.tableRow) ? chart.data.tableRow.length : 0)
}}</span>
{{ $t('chart.items') }}
</span>
@ -166,7 +166,8 @@ export default {
scrollBarHoverColor: DEFAULT_COLOR_CASE.tableScrollBarHoverColor,
totalStyle: {
color: '#606266'
}
},
not_support_page_dataset: NOT_SUPPORT_PAGE_DATASET
}
},
computed: {

View File

@ -82,7 +82,7 @@ export default {
mainCanvasStyle() {
if (this.toExport) {
return {
width: '4096px'
width: '1280px'
}
} else {
return {
@ -93,7 +93,7 @@ export default {
templateHtmlStyle() {
if (this.toExport) {
return {
fontSize: '48px!important'
fontSize: '14px!important'
}
} else {
return {}
@ -134,16 +134,15 @@ export default {
setTimeout(() => {
html2canvas(document.getElementById('exportPdf')).then(function(canvas) {
_this.exportLoading = false
const contentWidth = canvas.width / 4
const contentHeight = canvas.height / 4
const contentWidth = canvas.width / 2
const contentHeight = canvas.height / 2
const pageData = canvas.toDataURL('image/jpeg', 1.0)
const lp = contentWidth > contentHeight ? 'l' : 'p'
const PDF = new JsPDF(lp, 'pt', [contentWidth, contentHeight])
PDF.addImage(pageData, 'JPEG', 0, 0, contentWidth, contentHeight)
PDF.save(_this.panelName + '.pdf')
_this.$emit('closePreExport')
}
)
})
}, 1500)
}, 500)
}

View File

@ -328,10 +328,13 @@ export default {
created() {
this.attrs = this.controlAttrs
if (this.widget.isTimeWidget && this.widget.isTimeWidget()) {
if (this.widget.isTimeWidget) {
this.showParams = true
this.isRangeParamWidget = this.widget.isRangeParamWidget && this.widget.isRangeParamWidget()
}
if ('timeYearWidget,timeMonthWidget,timeDateWidget,textSelectWidget,numberSelectWidget'.indexOf(this.widget.name) !== -1) {
this.showParams = true
}
},
methods: {
changeDynamicParams(val, name) {

View File

@ -17,7 +17,7 @@
style="border-bottom: 1px solid;border-bottom-color:#E6E6E6;"
>
<div style="height: 100%;">
<share-head />
<share-head/>
</div>
</el-row>
<el-row
@ -45,7 +45,7 @@
width="400"
trigger="click"
>
<panel-detail-info />
<panel-detail-info/>
<i
slot="reference"
class="el-icon-warning icon-class"
@ -209,6 +209,7 @@
>
<Preview
v-if="showMainFlag"
ref="paneViewPreviewRef"
:component-data="mainCanvasComponentData"
:canvas-style-data="canvasStyleData"
:active-tab="activeTab"
@ -378,8 +379,8 @@ export default {
imageWrapperStyle() {
if (this.exporting) {
return {
width: '2560px',
height: '1440px'
width: '1280px',
height: '720px'
}
} else {
return {
@ -429,6 +430,16 @@ export default {
bus.$off('set-panel-share-user', this.setPanelShareUser)
},
methods: {
// 6000px 使
changeExportingState() {
const canvasHeight = this.$refs.paneViewPreviewRef.getCanvasHeight()
if (canvasHeight && canvasHeight > 6000) {
return false
} else {
return true
}
},
downLoadApp(appAttachInfo) {
this.downLoadToApp(appAttachInfo)
},
@ -597,7 +608,7 @@ export default {
downloadAsImage() {
this.dataLoading = true
setTimeout(() => {
this.exporting = true
this.exporting = this.changeExportingState()
setTimeout(() => {
const canvasID = document.getElementById(this.canvasInfoTemp)
const a = document.createElement('a')
@ -628,7 +639,7 @@ export default {
this.dataLoading = true
setTimeout(() => {
this.exporting = true
this.exporting = this.changeExportingState()
setTimeout(() => {
html2canvas(document.getElementById(this.canvasInfoTemp)).then(canvas => {
const snapshot = canvas.toDataURL('image/jpeg', 1) //