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

Merge pull request #2766 from dataease/dev

Browse Source 
dev merge
This commit is contained in:
王嘉豪 2022-08-02 17:42:44 +08:00 committed by GitHub
commit 725a0f6051
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 35 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/dataease/service/chart/ChartViewService.java
View File

@ -517,6 +517,7 @@ public class ChartViewService {
// 仪表板有参数不使用缓存
if (!cache || CollectionUtils.isNotEmpty(requestList.getFilter())
|| CollectionUtils.isNotEmpty(requestList.getLinkageFilters())
|| CollectionUtils.isNotEmpty(requestList.getOuterParamsFilters())
|| CollectionUtils.isNotEmpty(requestList.getDrill()) || CollectionUtils.isNotEmpty(rowPermissionsTree) || fields.size() != columnPermissionFields.size()) {
data = datasourceProvider.getData(datasourceRequest);
} else {
@ -911,6 +912,7 @@ public class ChartViewService {
// 仪表板有参数不使用缓存
if (!cache || CollectionUtils.isNotEmpty(requestList.getFilter())
|| CollectionUtils.isNotEmpty(requestList.getLinkageFilters())
|| CollectionUtils.isNotEmpty(requestList.getOuterParamsFilters())
|| CollectionUtils.isNotEmpty(requestList.getDrill()) || CollectionUtils.isNotEmpty(rowPermissionsTree) || fields.size() != columnPermissionFields.size()) {
data = datasourceProvider.getData(datasourceRequest);
} else {

5
backend/src/main/resources/db/migration/V38__1.13.sql
View File

@ -92,11 +92,6 @@ SET
`permission` = 'datasource:read'
WHERE
`menu_id` = 39;
UPDATE `sys_menu`
SET
`permission` = 'user:editPwd'
WHERE
`menu_id` = 51;
INSERT INTO `system_parameter` (`param_key`, `param_value`, `type`, `sort`) VALUES ('ui.openMarketPage', 'true', 'boolean', 14);

6
frontend/src/components/DeDrag/index.vue
View File

@ -595,14 +595,14 @@ export default {
return (this.canvasStyleData.panel.gap === 'yes' && this.element.auxiliaryMatrix) ? this.componentGap : 0
},
miniWidth() {
return this.element.auxiliaryMatrix ? this.curCanvasScale.matrixStyleWidth * 4 : 0
return this.element.auxiliaryMatrix ? this.curCanvasScale.matrixStyleWidth * (this.mobileLayoutStatus ? 1 : 4) : 0
},
miniHeight() {
if (this.element.auxiliaryMatrix) {
if (this.element.component === 'de-number-range') {
return this.element.auxiliaryMatrix ? this.curCanvasScale.matrixStyleHeight * 4 : 0
return this.element.auxiliaryMatrix ? this.curCanvasScale.matrixStyleHeight * (this.mobileLayoutStatus ? 1 : 4) : 0
} else {
return this.element.auxiliaryMatrix ? this.curCanvasScale.matrixStyleHeight * 4 : 0
return this.element.auxiliaryMatrix ? this.curCanvasScale.matrixStyleHeight * (this.mobileLayoutStatus ? 1 : 4) : 0
}
} else {
return 0

2
frontend/src/components/canvas/components/Editor/CloseBar.vue
View File

@ -48,7 +48,7 @@ export default {
padding-left: 3px;
padding-right: 0px;
cursor:pointer!important;
background-color: #0a7be0;
background-color: #3370ff;
}
.bar-main i{
color: white;

27
frontend/src/components/canvas/components/Editor/EditBar.vue
View File

@ -12,11 +12,6 @@
<el-checkbox size="medium" @change="batchOptChange" />
</div>
<div v-if="normalAreaShow">
<setting-menu v-if="activeModel==='edit'" style="float: right;height: 24px!important;" @amRemoveItem="amRemoveItem" @linkJumpSet="linkJumpSet" @boardSet="boardSet">
<span slot="icon" :title="$t('panel.setting')">
<i class="icon iconfont icon-shezhi" style="margin-top:2px" />
</span>
</setting-menu>
<span :title="$t('panel.edit')">
<i v-if="activeModel==='edit'&&curComponent&&editFilter.includes(curComponent.type)" class="icon iconfont icon-edit" @click.stop="edit" />
</span>
@ -26,12 +21,17 @@
<span :title="$t('panel.suspension')">
<i v-if="activeModel==='edit'&&!curComponent.auxiliaryMatrix" class="icon iconfont icon-xuanfuanniu" @click.stop="auxiliaryMatrixChange" />
</span>
<span :title="$t('panel.details')">
<i v-if="curComponent.type==='view'" class="icon iconfont icon-chakan" @click.stop="showViewDetails('details')" />
</span>
<span :title="$t('panel.enlarge')">
<i v-if="curComponent.type==='view'" class="icon iconfont icon-fangda" @click.stop="showViewDetails('enlarge')" />
</span>
<span :title="$t('panel.details')">
<i v-if="curComponent.type==='view'" class="icon iconfont icon-chakan" @click.stop="showViewDetails('details')" />
</span>
<setting-menu v-if="activeModel==='edit'" style="float: right;height: 24px!important;" @amRemoveItem="amRemoveItem" @linkJumpSet="linkJumpSet" @boardSet="boardSet">
<span slot="icon" :title="$t('panel.setting')">
<i class="icon iconfont icon-shezhi" style="margin-top:2px" />
</span>
</setting-menu>
<span :title="$t('panel.cancel_linkage')">
<i v-if="curComponent.type==='view'&&existLinkage" class="icon iconfont icon-quxiaoliandong" @click.stop="clearLinkage" />
</span>
@ -151,14 +151,10 @@ export default {
return this.targetLinkageInfo[this.element.propValue.viewId]
},
miniHeight() {
let miniHeight = 4
if (this.element.component === 'de-number-range') {
miniHeight = 4
}
return miniHeight
return this.mobileLayoutStatus ? 1 : 4
},
miniWidth() {
return 4
return this.mobileLayoutStatus ? 1 : 4
},
...mapState([
'menuTop',
@ -172,6 +168,7 @@ export default {
'curLinkageView',
'curCanvasScale',
'batchOptStatus',
'mobileLayoutStatus',
'curBatchOptComponents'
])
},
@ -315,7 +312,7 @@ export default {
padding-left: 3px;
padding-right: 0px;
cursor:pointer!important;
background-color: rgba(10,123,224, 1);
background-color: #3370ff;
}
.bar-main i{
color: white;

2
frontend/src/components/canvas/components/Editor/EditBarView.vue
View File

@ -149,7 +149,7 @@ export default {
padding-left: 3px!important;
padding-right: 0px!important;
cursor:pointer!important;
background-color: #0a7be0;
background-color: #3370ff;
}
.bar-main i{
color: white;

2
frontend/src/components/canvas/components/Editor/MobileCheckBar.vue
View File

@ -76,7 +76,7 @@ export default {
padding-right: 1px;
cursor:pointer!important;
text-align: center;
background-color: #0a7be0;
background-color: #3370ff;
}
.bar-main i{
color: white;

12
frontend/src/components/canvas/components/Editor/Preview.vue
View File

@ -561,23 +561,23 @@ export default {
color: #9ea6b2;
}
.dialog-css > > > .el-dialog__title {
.dialog-css ::v-deep .el-dialog__title {
font-size: 14px;
}
.dialog-css > > > .el-dialog__header {
padding: 20px 20px 0;
.dialog-css ::v-deep .el-dialog__header {
padding: 40px 20px 0;
}
.dialog-css > > > .el-dialog__body {
.dialog-css ::v-deep .el-dialog__body {
padding: 10px 20px 20px;
}
.mobile-dialog-css > > > .el-dialog__headerbtn {
.mobile-dialog-css ::v-deep .el-dialog__headerbtn {
top: 7px
}
.mobile-dialog-css > > > .el-dialog__body {
.mobile-dialog-css ::v-deep .el-dialog__body {
padding: 0px;
}
::-webkit-scrollbar {

8
frontend/src/components/canvas/components/Editor/PreviewMobile.vue
View File

@ -285,15 +285,15 @@ export default {
padding: 5px;
}
.dialog-css > > > .el-dialog__title {
.dialog-css ::v-deep .el-dialog__title {
font-size: 14px;
}
.dialog-css > > > .el-dialog__header {
padding: 20px 20px 0;
.dialog-css ::v-deep .el-dialog__header {
padding: 40px 20px 0;
}
.dialog-css > > > .el-dialog__body {
.dialog-css ::v-deep .el-dialog__body {
padding: 10px 20px 20px;
}

8
frontend/src/components/canvas/components/Editor/index.vue
View File

@ -1843,15 +1843,15 @@ export default {
height: 1px;
}
.dialog-css > > > .el-dialog__title {
.dialog-css ::v-deep .el-dialog__title {
font-size: 14px;
}
.dialog-css > > > .el-dialog__header {
padding: 20px 20px 0;
.dialog-css ::v-deep .el-dialog__header {
padding: 40px 20px 0;
}
.dialog-css > > > .el-dialog__body {
.dialog-css ::v-deep .el-dialog__body {
padding: 10px 20px 20px;
}

2
frontend/src/views/system/user/userEditer.vue
View File

@ -361,7 +361,7 @@ export default {
this.create();
return;
}
const { deptId:id, deptName:label } = row.dept;
const { deptId:id, deptName:label } = (row.dept || {});
this.selectDepts = [{id, label}]
this.formType = "modify";
this.dialogVisible = true;