center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge branch 'dev' into pr@dev_st_fix

Browse Source
This commit is contained in:
dataeaseShu 2023-07-20 10:11:03 +08:00
commit 6491e9bdc0
20 changed files with 54 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.typos.toml
View File

@ -6,6 +6,7 @@ testng = "testng"
ba = "ba"
referer = "referer"
keynode = "keynode"
SCHEM = "SCHEM"
[files]
extend-exclude = ["public/", "amap-wx/", "m-icon/", "uni-card/", "uni-col/", "uni-link/", "uni-list/", "uni-list-item/", "uni-row/", "migration/", "mapFiles/", "frontend/src/views/chart/components/table/TableNormal.vue"]

2
Dockerfile
View File

@ -1,4 +1,4 @@
FROM registry.cn-qingdao.aliyuncs.com/dataease/fabric8-java-alpine-openjdk8-jre:edge-chromium
FROM registry.cn-qingdao.aliyuncs.com/dataease/fabric8-java-alpine-openjdk8-jre:edge-chromium-11
ARG IMAGE_TAG

8
backend/pom.xml
View File

@ -14,7 +14,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<shiro.version>1.9.1</shiro.version>
<java.version>1.8</java.version>
<java.version>11</java.version>
<graalvm.version>20.1.0</graalvm.version>
<jwt.version>3.12.1</jwt.version>
<buji.version>4.0.0</buji.version>
@ -30,7 +30,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>31.0.1-jre</version>
<version>32.0.0-jre</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
@ -429,8 +429,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
<source>11</source>
<target>11</target>
</configuration>
</plugin>
<!-- Overlay guacamole-common-js (zip) -->

2
backend/src/main/java/io/dataease/commons/utils/ExcelXlsxReader.java
View File

@ -286,7 +286,7 @@ public class ExcelXlsxReader extends DefaultHandler {
preRef = "A" + curRow;
if (!preRef.equalsIgnoreCase(ref)) {
cellList.add(curCol, "");
curCol++;
// curCol++;
}
}

16
backend/src/main/java/io/dataease/controller/sys/SysUserController.java
View File

@ -4,10 +4,13 @@ import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import io.dataease.auth.annotation.DeLog;
import io.dataease.auth.annotation.DePermission;
import io.dataease.auth.annotation.SqlInjectValidator;
import io.dataease.auth.api.dto.CurrentUserDto;
import io.dataease.auth.entity.AccountLockStatus;
import io.dataease.auth.service.AuthUserService;
import io.dataease.commons.constants.DePermissionType;
import io.dataease.commons.constants.ResourceAuthLevel;
import io.dataease.commons.constants.SysLogConstants;
import io.dataease.commons.exception.DEException;
import io.dataease.commons.utils.AuthUtils;
@ -102,6 +105,19 @@ public class SysUserController {
return users;
}
@DePermission(type = DePermissionType.DATASET, level = ResourceAuthLevel.DATASET_LEVEL_MANAGE)
@PostMapping("/userGrid/{datasetId}")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "path", name = "goPage", value = "页码", required = true, dataType = "Integer"),
@ApiImplicitParam(paramType = "path", name = "pageSize", value = "页容量", required = true, dataType = "Integer"),
@ApiImplicitParam(name = "request", value = "查询条件", required = true)
})
@SqlInjectValidator(value = {"create_time", "u.enabled", "nick_name", "u.dept_id"})
public Pager<List<SysUserGridResponse>> userGrids(@PathVariable String datasetId, @RequestBody KeyGridRequest request) {
return userGrid(0, 0, request);
}
@ApiOperation("创建用户")
@RequiresPermissions("user:add")
@PostMapping("/create")

9
frontend/src/components/asyncComponent/index.vue
View File

@ -3,6 +3,8 @@
:is="mode"
:ref="refId"
:obj="obj"
:bus="bus"
:axios-request="request"
v-bind="$attrs"
v-on="$listeners"
/>
@ -11,6 +13,9 @@
<script>
import { uuid } from 'vue-uuid'
import { get } from '@/api/system/dynamic'
import bus from '@/utils/bus'
import request from '@/utils/request'
export default {
name: 'AsyncComponent',
inheritAttrs: true,
@ -29,7 +34,9 @@ export default {
return {
resData: '',
mode: '',
refId: null
refId: null,
bus: bus,
request: request
}
},
watch: {

8
frontend/src/components/canvas/components/editor/EditBar.vue
View File

@ -82,10 +82,10 @@
/>
</span>
<span :title="$t('route.exportExcel')">
<svg-icon
<i
v-if="exportExcelShow"
style="color: white"
icon-class="file-excel"
style="line-height: 24px"
class="el-icon-document-delete"
@click.stop="exportExcelDownload()"
/>
</span>
@ -469,7 +469,7 @@ export default {
this.$emit('showViewDetails', { openType: openType })
},
exportExcelDownload() {
exportExcelDownload(this.chart, null, null, null, null, null)
exportExcelDownload(this.chart)
},
auxiliaryMatrixChange() {
if (this.curComponent.auxiliaryMatrix) {

2
frontend/src/views/chart/components/dragItem/QuotaExtItem.vue
View File

@ -449,7 +449,7 @@ export default {
valueFormatter() {
this.item.index = this.index
this.item.formatterType = 'quota'
this.item.formatterType = 'quotaExt'
this.$emit('valueFormatter', this.item)
}
}

9
frontend/src/views/chart/view/ChartEdit.vue
View File

@ -473,7 +473,8 @@
<plugin-com
v-if="view.isPlugin"
:component-name="view.type + '-data'"
:obj="{view, param, chart, dimensionData, quotaData}"
:obj="{view, param, chart, dimension, dimensionData, quota, quotaData}"
:bus="bus"
/>
<div v-else>
@ -819,6 +820,7 @@
@editItemFilter="showQuotaEditFilter"
@onNameEdit="showRename"
@editItemCompare="showQuotaEditCompare"
@valueFormatter="valueFormatter"
/>
</transition-group>
</draggable>
@ -1795,7 +1797,7 @@ export default {
DrillPath,
PluginCom,
MapMapping,
MarkMapDataEditor,
MarkMapDataEditor
},
props: {
param: {
@ -1815,6 +1817,7 @@ export default {
},
data() {
return {
bus: bus,
positionActiveNames: 'positionAdjust',
loading: false,
table: {},
@ -2954,7 +2957,7 @@ export default {
// 更换数据集
changeChart() {
const optType = this.view.tableId === this.changeTable.id && this.view.dataFrom!=='template' ? 'same' : 'change'
const optType = this.view.tableId === this.changeTable.id && this.view.dataFrom !== 'template' ? 'same' : 'change'
// 更换数据集后清空视图字段，并重新请求数据；否则没有操作
if (optType === 'change') {
this.view.dataFrom = 'dataset'

2
frontend/src/views/chart/view/TitleRemark.vue
View File

@ -10,7 +10,7 @@
<div
class="remark-style"
:style="{backgroundColor:remarkCfg.bgFill}"
v-html="remarkCfg.content"
v-html="$xss(remarkCfg.content)"
/>
<i
slot="reference"

4
frontend/src/views/dataset/common/DatasetChartDetail.vue
View File

@ -21,8 +21,8 @@
<el-col class="info-item">
<p class="info-title">{{ $t('chart.chart_type') }}</p>
<svg-icon
v-if="detail.chart.type"
:icon-class="detail.chart.type"
:icon-class="detail.chart.isPlugin && detail.chart.type && detail.chart.type !== 'buddle-map' ? ('/api/pluginCommon/staticInfo/' + detail.chart.type + '/svg') : detail.chart.type"
class="chart-icon"
/>
</el-col>
<el-col class="info-item">

2
frontend/src/views/dataset/data/components/LazyTree.vue
View File

@ -34,7 +34,7 @@
<span>
<span
style="margin-left: 6px"
v-html="data.name"
v-html="$xss(data.name)"
/>
</span>
<span

2
frontend/src/views/dataset/group/GroupMoveSelector.vue
View File

@ -34,7 +34,7 @@
text-overflow: ellipsis;
"
:title="data.name"
v-html="highlights(data.name)"
v-html="$xss(highlights(data.name))"
/>
</span>
</span>

2
frontend/src/views/login/index.vue
View File

@ -202,7 +202,7 @@
<div
v-if="showFoot"
class="dynamic-login-foot"
v-html="footContent"
v-html="$xss(footContent)"
/>
</div>
</template>

2
frontend/src/views/panel/export/PDFPreExport.vue
View File

@ -15,7 +15,7 @@
<div
class="export_body_inner_class"
:style="templateHtmlStyle"
v-html="templateContentChange"
v-html="$xss(templateContentChange)"
/>
</div>
</el-row>

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

@ -202,7 +202,7 @@
<!-- // {{}}会将数据解释为普通文本，而非 HTML 代码。 -->
<div
slot="content"
v-html="filterRoles(scope.row.roles)"
v-html="$xss(filterRoles(scope.row.roles))"
/>
<div class="de-one-line">{{ filterRoles(scope.row.roles) }}</div>
</el-tooltip>

2
frontend/src/views/wizard/WizardCard.vue
View File

@ -9,7 +9,7 @@
{{ details.head }}
</el-row>
<el-row class="card_content">
<span v-html="details.content" />
<span v-html="$xss(details.content)" />
</el-row>
<el-row class="card_bottom">
{{ $t('wizard.click_show') }}

2
frontend/src/views/wizard/WizardCardEnterprise.vue
View File

@ -9,7 +9,7 @@
{{ details.head }}
</el-row>
<el-row class="card_content">
<span v-html="details.content" />
<span v-html="$xss(details.content)" />
</el-row>
<el-row class="card_bottom">
{{ $t('wizard.apply') }}

2
frontend/src/views/wizard/details/CardDetail.vue
View File

@ -18,7 +18,7 @@
<span>{{ details.head }}</span>
</el-row>
<el-row class="content">
<span v-html="details.content" />
<span v-html="$xss(details.content)" />
</el-row>
<el-row class="bottom">
<span class="span-box">{{ details.bottom }}</span>

2
frontend/src/views/wizard/details/LatestDevelopments.vue
View File

@ -18,7 +18,7 @@
<span>{{ details.head }}</span>
</el-row>
<el-row class="content">
<span v-html="details.content" />
<span v-html="$xss(details.content)" />
</el-row>
<el-row class="bottom">
<span class="span-box">{{ details.bottom }}</span>