dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into pr@dev@pages

Browse Source
This commit is contained in:
taojinlong 2023-01-12 12:03:22 +08:00
commit df53532649
11 changed files with 89 additions and 213 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
backend/src/main/java/io/dataease/dto/chart/ChartSeniorAssistDTO.java
View File

@ -17,4 +17,5 @@ public class ChartSeniorAssistDTO {
private String lineType;
private String color;
private DatasetTableField curField;
private String fontSize;
}

182
backend/src/main/resources/db/migration/V49__1.18.2.sql
View File

@ -2,185 +2,3 @@ UPDATE `my_plugin`
SET `version` = '1.18.2'
where `plugin_id` > 0
and `version` = '1.18.1';
UPDATE `sys_menu`
SET `pid` = 8
WHERE `menu_id` = 800;
INSERT INTO `sys_menu` (`menu_id`,
`pid`,
`sub_count`,
`type`,
`title`,
`name`,
`component`,
`menu_sort`,
`icon`,
`path`,
`i_frame`,
`cache`,
`hidden`,
`permission`,
`create_by`,
`update_by`,
`create_time`,
`update_time`)
VALUES (802,
0,
0,
2,
'视图导出',
NULL,
NULL,
999,
NULL,
NULL,
0,
0,
0,
'view:export',
NULL,
NULL,
NULL,
NULL);
INSERT INTO `sys_auth` (`id`,
`auth_source`,
`auth_source_type`,
`auth_target`,
`auth_target_type`,
`auth_time`,
`auth_details`,
`auth_user`,
`update_time`,
`copy_from`,
`copy_id`)
VALUES ('dc3536c2-5193-4fcd-a875-926e3e712344',
'802',
'menu',
'2',
'role',
1673405964319,
NULL,
'admin',
NULL,
NULL,
NULL);
INSERT INTO `sys_auth` (`id`,
`auth_source`,
`auth_source_type`,
`auth_target`,
`auth_target_type`,
`auth_time`,
`auth_details`,
`auth_user`,
`update_time`,
`copy_from`,
`copy_id`)
VALUES ('dc7fa546-9ac4-49a7-8af2-152be9fdde68',
'802',
'menu',
'1',
'role',
1673405986872,
NULL,
'admin',
NULL,
NULL,
NULL);
INSERT INTO `sys_auth_detail` (`id`,
`auth_id`,
`privilege_name`,
`privilege_type`,
`privilege_value`,
`privilege_extend`,
`remark`,
`create_user`,
`create_time`,
`update_time`,
`copy_from`,
`copy_id`)
VALUES ('01c6367b-915c-11ed-bd88-0242ac130004',
'dc7fa546-9ac4-49a7-8af2-152be9fdde68',
'i18n_auth_grant',
15,
0,
'grant',
'基础权限-授权',
'admin',
1673405987000,
NULL,
NULL,
NULL);
INSERT INTO `sys_auth_detail` (`id`,
`auth_id`,
`privilege_name`,
`privilege_type`,
`privilege_value`,
`privilege_extend`,
`remark`,
`create_user`,
`create_time`,
`update_time`,
`copy_from`,
`copy_id`)
VALUES ('01c63c6c-915c-11ed-bd88-0242ac130004',
'dc7fa546-9ac4-49a7-8af2-152be9fdde68',
'i18n_auth_use',
1,
1,
'use',
'基础权限-使用',
'admin',
1673405987000,
NULL,
NULL,
NULL);
INSERT INTO `sys_auth_detail` (`id`,
`auth_id`,
`privilege_name`,
`privilege_type`,
`privilege_value`,
`privilege_extend`,
`remark`,
`create_user`,
`create_time`,
`update_time`,
`copy_from`,
`copy_id`)
VALUES ('f4559db9-915b-11ed-bd88-0242ac130004',
'dc3536c2-5193-4fcd-a875-926e3e712344',
'i18n_auth_grant',
15,
0,
'grant',
'基础权限-授权',
'admin',
1673405964000,
NULL,
NULL,
NULL);
INSERT INTO `sys_auth_detail` (`id`,
`auth_id`,
`privilege_name`,
`privilege_type`,
`privilege_value`,
`privilege_extend`,
`remark`,
`create_user`,
`create_time`,
`update_time`,
`copy_from`,
`copy_id`)
VALUES ('f455a074-915b-11ed-bd88-0242ac130004',
'dc3536c2-5193-4fcd-a875-926e3e712344',
'i18n_auth_use',
1,
1,
'use',
'基础权限-使用',
'admin',
1673405964000,
NULL,
NULL,
NULL);

3
frontend/src/components/canvas/components/editor/Preview.vue
View File

@ -120,8 +120,7 @@
{{ $t('chart.export_img') }}
</el-button>
<el-button
v-if="showChartInfoType==='details'"
v-permission="['view:export']"
v-if="showChartInfoType==='details'&& hasDataPermission('export',panelInfo.privileges)"
size="mini"
@click="exportExcel"
>

3
frontend/src/components/canvas/customComponent/UserView.vue
View File

@ -149,8 +149,7 @@
{{ $t('chart.export_img') }}
</el-button>
<el-button
v-if="showChartInfoType==='details'"
v-permission="['view:export']"
v-if="showChartInfoType==='details' && hasDataPermission('export',panelInfo.privileges)"
size="mini"
@click="exportExcel"
>

31
frontend/src/styles/index.scss
View File

@ -1721,3 +1721,34 @@ div:focus {
display: inline-block;
}
}
.operator-bar {
width: 100%;
height: 70px;
display: flex;
align-items: center;
justify-content: space-between;
position: sticky;
background: #fff;
top: 0;
z-index: 15;
.title {
font-family: PingFang SC;
font-size: 16px;
font-weight: 500;
line-height: 24px;
color: #1f2329;
}
}
.el-table-column--selection {
.cell {
padding: 0 14px !important;
}
}
.dept-popper {
.el-tree-node__label {
color: var(--deTextPrimary, #1F2329) !important;
}
}

1
frontend/src/views/chart/chart/chart.js
View File

@ -1021,6 +1021,7 @@ export const BASE_TREEMAP = {
{
// name: '',
type: 'treemap',
roam: true,
itemStyle: {
gapWidth: 2
},

13
frontend/src/views/chart/components/ChartComponent.vue
View File

@ -128,6 +128,7 @@ export default {
showSuspension: true,
currentSeriesId: null,
haveScrollType: [
'treemap',
'map',
'chart-mix',
'bar',
@ -198,7 +199,13 @@ export default {
if (this.haveScrollType.includes(this.chart.type)) {
const opt = this.myChart.getOption()
this.adaptorOpt(opt)
this.myChart.setOption(opt)
if (this.chart.type === 'treemap') {
this.myChart.dispose()
this.myChart = null
this.preDraw()
} else {
this.myChart.setOption(opt)
}
}
},
adaptorOpt(opt) {
@ -218,6 +225,10 @@ export default {
opt.geo.roam = this.active
}
}
//矩形树图
if (this.chart.type === 'treemap' && opt.series) {
opt.series[0].roam = this.active
}
},
changeSeriesId(param) {
const { id, seriesId } = param

19
frontend/src/views/dataset/add/AddSQL.vue
View File

@ -698,17 +698,17 @@ export default {
},
keywords(val) {
if (!val) {
this.tableDataCopy = [...this.tableData]
this.fieldDataCopy = [...this.fieldData]
this.tableDataCopy = this.arrSort([...this.tableData], 'name')
this.fieldDataCopy = this.arrSort([...this.fieldData])
return
}
if (this.dataSource && !this.dataTable) {
this.tableDataCopy = this.tableData.filter(ele => ele.name.includes(val))
this.tableDataCopy = this.arrSort(this.tableData.filter(ele => ele.name.includes(val)), 'name')
}
if (this.dataSource && this.dataTable) {
this.fieldDataCopy = this.fieldData.filter(ele => ele.fieldName.includes(val))
this.fieldDataCopy = this.arrSort(this.fieldData.filter(ele => ele.fieldName.includes(val)))
}
}
},
@ -760,7 +760,7 @@ export default {
info: JSON.stringify({ table: name })
}).then((res) => {
this.fieldData = res.data
this.fieldDataCopy = [...this.fieldData]
this.fieldDataCopy = this.arrSort([...this.fieldData])
})
.finally(() => {
this.tableLoading = false
@ -818,12 +818,19 @@ export default {
post('/datasource/getTables/' + this.dataSource, {})
.then((response) => {
this.tableData = response.data
this.tableDataCopy = [...this.tableData]
this.tableDataCopy = this.arrSort([...this.tableData], 'name')
})
.finally(() => {
this.tableLoading = false
})
},
arrSort(arr = [], field = 'fieldName') {
arr.sort((a, b) => {
return a[field][0].toLowerCase().charCodeAt() - b[field][0].toLowerCase().charCodeAt()
})
return arr
},
calHeight: _.debounce(function() {
const sqlHeight = Math.max(this.sqlHeight, 248)
const currentHeight = document.documentElement.clientHeight

4
frontend/src/views/dataset/data/components/filterFiled.vue
View File

@ -128,7 +128,7 @@
/>
<ul
class="infinite-list autochecker-list"
style="overflow: auto"
style="overflow: auto;height: 231px"
>
<li
v-for="i in checkListWithFilter"
@ -218,7 +218,7 @@
</ul>
<div class="right-menu-foot">
<div class="footer-left">
{{ $t("auth.added") }} {{ checklist.length }}
&nbsp;
</div>
<div
class="confirm-btn"

28
frontend/src/views/system/datasource/DsFormContent.vue
View File

@ -118,7 +118,33 @@
:key="item.id"
:label="item.name"
:value="item.id"
/>
>
<span
v-if="
item.status !== 'Error' &&
item.status !== 'Warning'
"
>
<svg-icon
icon-class="db-de"
/>
</span>
<span v-if="item.status === 'Error'">
<svg-icon
icon-class="de-ds-error"
class="ds-icon-scene"
/>
</span>
<span v-if="item.status === 'Warning'">
<svg-icon
icon-class="de-ds-warning"
class="ds-icon-scene"
/>
</span>
<span>
{{ item.name }}
</span>
</el-option>
</el-select>
</el-form-item>
</el-form>

17
frontend/src/views/system/sysParam/Operator.vue
View File

@ -17,20 +17,3 @@ export default {
}
}
</script>
<style lang="scss" scoped>
.operator-bar {
width: 100%;
height: 70px;
display: flex;
align-items: center;
justify-content: space-between;
.title {
font-family: PingFang SC;
font-size: 16px;
font-weight: 500;
line-height: 24px;
color: #1f2329;
}
}
</style>