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

Merge pull request #2621 from dataease/pr@dev@fix_email_task_form_select

Browse Source 
fix(系统管理): 定时报告选择附件页面过滤掉非视图组件
This commit is contained in:
fit2cloud-chenyw 2022-07-12 11:39:44 +08:00 committed by GitHub
commit 167fbcffe6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/src/main/java/io/dataease/controller/IndexController.java
View File

@ -47,8 +47,7 @@ public class IndexController {
case valid:
return "doc.html";
default:
// return "nolic.html";
return "doc.html";
return "nolic.html";
}
}

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

@ -14,7 +14,7 @@
<div v-if="positionCheck('multiplexing')" style="margin-right: -1px;width: 18px;z-index: 5">
<el-checkbox v-model="multiplexingCheckModel" size="medium" @change="multiplexingCheck" />
</div>
<div v-if="positionCheck('email-task')" style="margin-right: -1px;width: 18px;z-index: 5">
<div v-if="positionCheck('email-task') && element.component === 'user-view'" style="margin-right: -1px;width: 18px;z-index: 5">
<el-checkbox v-model="isTaskChecked" size="medium" @change="emailTaskCheck" />
</div>
</div>