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

Merge pull request #3404 from dataease/pr@dev@kylin

Browse Source 
typo: 修复单词拼写错误
This commit is contained in:
Junjun 2022-10-20 17:59:41 +08:00 committed by GitHub
commit 8ba5fcc849
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/main/java/io/dataease/auth/service/impl/AuthUserServiceImpl.java
View File

@ -182,7 +182,7 @@ public class AuthUserServiceImpl implements AuthUserService {
if (beansOfType.keySet().size() == 0) return false;
OidcXpackService oidcXpackService = SpringContextUtil.getBean(OidcXpackService.class);
if (ObjectUtils.isEmpty(oidcXpackService)) return false;
return oidcXpackService.isSuuportOIDC();
return oidcXpackService.isSupportOIDC();
}
@Override
@ -191,7 +191,7 @@ public class AuthUserServiceImpl implements AuthUserService {
if (beansOfType.keySet().size() == 0) return false;
CasXpackService casXpackService = SpringContextUtil.getBean(CasXpackService.class);
if (ObjectUtils.isEmpty(casXpackService)) return false;
return casXpackService.suuportCas();
return casXpackService.supportCas();
}
@Override

2
backend/src/main/java/io/dataease/plugins/server/SSOServer.java
View File

@ -57,7 +57,7 @@ public class SSOServer {
DEException.throwException("缺少oidc插件");
}
oidcXpackService = SpringContextUtil.getBean(OidcXpackService.class);
Boolean suuportOIDC = oidcXpackService.isSuuportOIDC();
Boolean suuportOIDC = oidcXpackService.isSupportOIDC();
if (!suuportOIDC) {
DEException.throwException("未开启oidc");
}

2
backend/src/main/java/io/dataease/provider/datasource/EsProvider.java
View File

@ -98,7 +98,7 @@ public class EsProvider extends Provider {
}
@Override
public List<TableField> getTableFileds(DatasourceRequest datasourceRequest) throws Exception {
public List<TableField> getTableFields(DatasourceRequest datasourceRequest) throws Exception {
datasourceRequest.setQuery("desc " + String.format(EsSqlLConstants.KEYWORD_TABLE, datasourceRequest.getTable()));
List<TableField> tableFields = new ArrayList<>();
try {

2
backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java
View File

@ -73,7 +73,7 @@ public class JdbcProvider extends DefaultJdbcProvider {
@Override
public List<TableField> getTableFileds(DatasourceRequest datasourceRequest) throws Exception {
public List<TableField> getTableFields(DatasourceRequest datasourceRequest) throws Exception {
if (datasourceRequest.getDatasource().getType().equalsIgnoreCase("mongo")) {
datasourceRequest.setQuery("select * from " + datasourceRequest.getTable());
return fetchResultField(datasourceRequest);

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

@ -1193,7 +1193,7 @@ public class ChartViewService {
PluginViewParam pluginViewParam = new PluginViewParam();
PluginViewSetImpl pluginViewSet = BeanUtils.copyBean(new PluginViewSetImpl(), table);
pluginViewSet.setDsType(ds.getType());
pluginViewSet.setTabelId(table.getId());
pluginViewSet.setTableId(table.getId());
pluginViewSet.setDs(ds);
PluginViewLimit pluginViewLimit = BeanUtils.copyBean(new PluginViewLimit(), view);

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

@ -105,7 +105,7 @@ public class ViewPluginBaseServiceImpl implements ViewPluginBaseService {
String tableName = null;
DataTableInfoDTO dataTableInfoDTO = new Gson().fromJson(pluginViewSet.getInfo(), DataTableInfoDTO.class);
if (ObjectUtils.isNotEmpty(pluginViewSet.getMode()) && 1 == pluginViewSet.getMode()) {
tableName = TableUtils.tableName(pluginViewSet.getTabelId());
tableName = TableUtils.tableName(pluginViewSet.getTableId());
}else {
switch (DatasetType.getEnumObjByKey(pluginViewSet.getType())) {
case DB:

2
backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
View File

@ -510,7 +510,7 @@ public class DataSetTableService {
DatasourceRequest datasourceRequest = new DatasourceRequest();
datasourceRequest.setDatasource(ds);
datasourceRequest.setTable(new Gson().fromJson(datasetTable.getInfo(), DataTableInfoDTO.class).getTable());
return datasourceProvider.getTableFileds(datasourceRequest);
return datasourceProvider.getTableFields(datasourceRequest);
}
public Map<String, List<DatasetTableField>> getFieldsFromDE(DataSetTableRequest dataSetTableRequest)

2
frontend/src/views/system/plugin/PluginCom.vue
View File

@ -8,7 +8,7 @@
v-bind="$attrs"
v-on="$listeners"
@execute-axios="executeAxios"
@on-add-languanges="addLanguages"
@on-add-languages="addLanguages"
@plugin-call-back="pluginCallBack"
/>
<div v-else>

6
frontend/src/views/system/plugin/dynamic.vue
View File

@ -9,7 +9,7 @@
v-if="showAsync"
:url="url"
@execute-axios="executeAxios"
@on-add-languanges="addLanguages"
@on-add-languages="addLanguages"
@on-plugin-layout="setLayoutInfo"
@plugin-call-back="pluginCallBack"
/>
@ -22,7 +22,7 @@
v-if="showAsync"
:url="url"
@execute-axios="executeAxios"
@on-add-languanges="addLanguages"
@on-add-languages="addLanguages"
@on-plugin-layout="setLayoutInfo"
@plugin-call-back="pluginCallBack"
/>
@ -35,7 +35,7 @@
v-if="showAsync"
:url="url"
@execute-axios="executeAxios"
@on-add-languanges="addLanguages"
@on-add-languages="addLanguages"
@on-plugin-layout="setLayoutInfo"
@plugin-call-back="pluginCallBack"
/>