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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source 
# Conflicts:
#	backend/src/main/resources/db/migration/V40__1.15.sql
This commit is contained in:
wangjiahao 2022-09-08 18:30:14 +08:00
commit b0720c1c6f
34 changed files with 583 additions and 231 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/main/java/io/dataease/auth/api/AuthApi.java
View File

@ -72,8 +72,8 @@ public interface AuthApi {
boolean isOpenDingtalk();
@ApiOperation("是否开启飞书")
@PostMapping("/isOpenFark")
boolean isOpenFark();
@PostMapping("/isOpenLark")
boolean isOpenLark();
@ApiIgnore
@PostMapping("/isPluginLoaded")

4
backend/src/main/java/io/dataease/auth/server/AuthServer.java
View File

@ -305,12 +305,12 @@ public class AuthServer implements AuthApi {
}
@Override
public boolean isOpenFark() {
public boolean isOpenLark() {
Boolean licValid = PluginUtils.licValid();
if (!licValid)
return false;
return authUserService.supportFark();
return authUserService.supportLark();
}
@Override

2
backend/src/main/java/io/dataease/auth/service/AuthUserService.java
View File

@ -36,7 +36,7 @@ public interface AuthUserService {
Boolean supportDingtalk();
Boolean supportFark();
Boolean supportLark();
Boolean pluginLoaded();

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

@ -16,6 +16,7 @@ import io.dataease.plugins.config.SpringContextUtil;
import io.dataease.plugins.util.PluginUtils;
import io.dataease.plugins.xpack.cas.service.CasXpackService;
import io.dataease.plugins.xpack.dingtalk.service.DingtalkXpackService;
import io.dataease.plugins.xpack.lark.service.LarkXpackService;
import io.dataease.plugins.xpack.ldap.service.LdapXpackService;
import io.dataease.plugins.xpack.oidc.service.OidcXpackService;
@ -187,8 +188,12 @@ public class AuthUserServiceImpl implements AuthUserService {
}
@Override
public Boolean supportFark() {
return false;
public Boolean supportLark() {
Map<String, LarkXpackService> beansOfType = SpringContextUtil.getApplicationContext().getBeansOfType((LarkXpackService.class));
if (beansOfType.keySet().size() == 0) return false;
LarkXpackService larkXpackService = SpringContextUtil.getBean(LarkXpackService.class);
if (ObjectUtils.isEmpty(larkXpackService)) return false;
return larkXpackService.isOpen();
}
@Override

6
backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java
View File

@ -83,7 +83,7 @@ public class ShiroServiceImpl implements ShiroService {
filterChainDefinitionMap.put("/api/auth/isOpenOidc", ANON);
filterChainDefinitionMap.put("/api/auth/isOpenWecom", ANON);
filterChainDefinitionMap.put("/api/auth/isOpenDingtalk", ANON);
filterChainDefinitionMap.put("/api/auth/isOpenFark", ANON);
filterChainDefinitionMap.put("/api/auth/isOpenLark", ANON);
filterChainDefinitionMap.put("/api/auth/getPublicKey", ANON);
filterChainDefinitionMap.put("/api/pluginCommon/component/*", ANON);
filterChainDefinitionMap.put("/api/pluginCommon/staticInfo/**", ANON);
@ -94,8 +94,8 @@ public class ShiroServiceImpl implements ShiroService {
filterChainDefinitionMap.put("/plugin/wecom/getQrParam", ANON);
filterChainDefinitionMap.put("/plugin/dingtalk/callBack*", ANON);
filterChainDefinitionMap.put("/plugin/dingtalk/getQrParam", ANON);
filterChainDefinitionMap.put("/plugin/fark/callBack*", ANON);
filterChainDefinitionMap.put("/plugin/fark/getQrParam", ANON);
filterChainDefinitionMap.put("/plugin/lark/callBack*", ANON);
filterChainDefinitionMap.put("/plugin/lark/getQrParam", ANON);
filterChainDefinitionMap.put("/cas/reset/**", ANON);
filterChainDefinitionMap.put("/unauth", ANON);

8
backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java
View File

@ -11,10 +11,10 @@ import io.dataease.controller.request.dataset.DataSetTableRequest;
import io.dataease.controller.response.DataSetDetail;
import io.dataease.dto.dataset.DataSetTableDTO;
import io.dataease.dto.dataset.ExcelFileData;
import io.dataease.dto.dataset.SqlVariableDetails;
import io.dataease.plugins.common.base.domain.DatasetTable;
import io.dataease.plugins.common.base.domain.DatasetTableField;
import io.dataease.plugins.common.base.domain.DatasetTableIncrementalConfig;
import io.dataease.plugins.common.dto.dataset.SqlVariableDetails;
import io.dataease.plugins.common.dto.datasource.TableField;
import io.dataease.service.dataset.DataSetTableService;
import io.swagger.annotations.*;
@ -211,8 +211,8 @@ public class DataSetTableController {
}
@ApiOperation("根据仪表板视图ID查询数据集变量")
@PostMapping("/paramsWithIds")
List<SqlVariableDetails> paramsWithIds(@RequestBody List<String> viewIds){
return dataSetTableService.paramsWithIds(viewIds);
@PostMapping("/paramsWithIds/{type}")
List<SqlVariableDetails> paramsWithIds(@PathVariable String type, @RequestBody List<String> viewIds){
return dataSetTableService.paramsWithIds(type, viewIds);
};
}

20
backend/src/main/java/io/dataease/dto/chart/ChartSeniorAssistDTO.java Normal file
View File

@ -0,0 +1,20 @@
package io.dataease.dto.chart;
import io.dataease.plugins.common.base.domain.DatasetTableField;
import lombok.Data;
/**
* @Author Junjun
*/
@Data
public class ChartSeniorAssistDTO {
private String name;
private String field;
private String fieldId;
private String summary;
private String axis;
private String value;
private String lineType;
private String color;
private DatasetTableField curField;
}

15
backend/src/main/java/io/dataease/dto/dataset/SqlVariableDetails.java
View File

@ -1,15 +0,0 @@
package io.dataease.dto.dataset;
import lombok.Data;
import java.util.List;
@Data
public class SqlVariableDetails {
private String variableName;
private String alias;
private List<String> type;
private String details;
private String defaultValue;
}

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

@ -88,7 +88,7 @@ public class XDingtalkServer {
DEException.throwException("未开启钉钉");
}
DingUserEntity dingUserEntity = dingtalkXpackService.userInfo(code);
String username = dingUserEntity.getUserId();
String username = dingUserEntity.getUserid();
String unionid = dingUserEntity.getUnionid();
SysUserEntity sysUserEntity = authUserService.getUserBySub(unionid, 5);
if (null == sysUserEntity) {

134
backend/src/main/java/io/dataease/plugins/server/XLarkServer.java Normal file
View File

@ -0,0 +1,134 @@
package io.dataease.plugins.server;
import io.dataease.auth.entity.SysUserEntity;
import io.dataease.auth.entity.TokenInfo;
import io.dataease.auth.service.AuthUserService;
import io.dataease.auth.util.JWTUtils;
import io.dataease.commons.constants.SysLogConstants;
import io.dataease.commons.exception.DEException;
import io.dataease.commons.utils.DeLogUtils;
import io.dataease.commons.utils.LogUtil;
import io.dataease.commons.utils.ServletUtils;
import io.dataease.plugins.config.SpringContextUtil;
import io.dataease.plugins.xpack.display.dto.response.SysSettingDto;
import io.dataease.plugins.xpack.lark.dto.entity.LarkQrResult;
import io.dataease.plugins.xpack.lark.dto.entity.LarkUserInfo;
import io.dataease.plugins.xpack.lark.dto.response.LarkInfo;
import io.dataease.plugins.xpack.lark.service.LarkXpackService;
import io.dataease.service.sys.SysUserService;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import springfox.documentation.annotations.ApiIgnore;
import javax.annotation.Resource;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletResponse;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.util.List;
import java.util.Map;
@ApiIgnore
@RequestMapping("/plugin/lark")
@Controller
public class XLarkServer {
@Resource
private AuthUserService authUserService;
@Resource
private SysUserService sysUserService;
@ResponseBody
@GetMapping("/info")
public LarkInfo getLarkInfo() {
LarkXpackService larkXpackService = SpringContextUtil.getBean(LarkXpackService.class);
return larkXpackService.info();
}
@ResponseBody
@RequiresPermissions("sysparam:read")
@PostMapping("/save")
public void save(@RequestBody List<SysSettingDto> settings) {
LarkXpackService larkXpackService = SpringContextUtil.getBean(LarkXpackService.class);
larkXpackService.save(settings);
}
@ResponseBody
@PostMapping("/testConn")
public void testConn(@RequestBody LarkInfo larkInfo) {
LarkXpackService larkXpackService = SpringContextUtil.getBean(LarkXpackService.class);
try {
larkXpackService.testConn(larkInfo);
} catch (Exception e) {
throw new RuntimeException(e);
}
}
@ResponseBody
@PostMapping("/getQrParam")
public LarkQrResult getQrParam() {
LarkXpackService larkXpackService = SpringContextUtil.getBean(LarkXpackService.class);
return larkXpackService.getQrParam();
}
@GetMapping("/callBack")
public ModelAndView callBack(@RequestParam("code") String code, @RequestParam("state") String state) {
ModelAndView modelAndView = new ModelAndView("redirect:/");
HttpServletResponse response = ServletUtils.response();
LarkXpackService larkXpackService = null;
try {
Map<String, LarkXpackService> beansOfType = SpringContextUtil.getApplicationContext().getBeansOfType((LarkXpackService.class));
if (beansOfType.keySet().size() == 0) {
DEException.throwException("缺少飞书插件");
}
larkXpackService = SpringContextUtil.getBean(LarkXpackService.class);
Boolean isOpen = larkXpackService.isOpen();
if (!isOpen) {
DEException.throwException("未开启飞书");
}
LarkUserInfo larkUserInfo = larkXpackService.userInfo(code, state);
String username = larkUserInfo.getUser_id();
String sub = larkUserInfo.getSub();
SysUserEntity sysUserEntity = authUserService.getUserBySub(sub, 6);
if (null == sysUserEntity) {
String email = StringUtils.isNotBlank(larkUserInfo.getEmail()) ? larkUserInfo.getEmail() : "demo@lark.work";
sysUserService.validateExistUser(username, larkUserInfo.getName(), email);
sysUserService.saveLarkCUser(larkUserInfo, email);
sysUserEntity = authUserService.getUserBySub(sub, 6);
}
TokenInfo tokenInfo = TokenInfo.builder().userId(sysUserEntity.getUserId()).username(sysUserEntity.getUsername()).build();
String realPwd = sysUserEntity.getPassword();
String token = JWTUtils.sign(tokenInfo, realPwd);
ServletUtils.setToken(token);
DeLogUtils.save(SysLogConstants.OPERATE_TYPE.LOGIN, SysLogConstants.SOURCE_TYPE.USER, sysUserEntity.getUserId(), null, null, null);
Cookie cookie_token = new Cookie("Authorization", token);
cookie_token.setPath("/");
response.addCookie(cookie_token);
} catch (Exception e) {
String msg = e.getMessage();
if (null != e.getCause()) {
msg = e.getCause().getMessage();
}
try {
msg = URLEncoder.encode(msg, "UTF-8");
LogUtil.error(e);
Cookie cookie_error = new Cookie("LarkError", msg);
cookie_error.setPath("/");
return modelAndView;
} catch (UnsupportedEncodingException e1) {
e.printStackTrace();
}
}
return modelAndView;
}
}

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

@ -1,6 +1,7 @@
package io.dataease.service.chart;
import cn.hutool.core.lang.Assert;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
@ -16,14 +17,10 @@ import io.dataease.commons.utils.LogUtil;
import io.dataease.controller.request.chart.*;
import io.dataease.controller.response.ChartDetail;
import io.dataease.controller.response.DataSetDetail;
import io.dataease.dto.chart.ChartDimensionDTO;
import io.dataease.dto.chart.ChartGroupDTO;
import io.dataease.dto.chart.ChartViewDTO;
import io.dataease.dto.chart.ViewOption;
import io.dataease.dto.chart.*;
import io.dataease.dto.dataset.DataSetTableDTO;
import io.dataease.dto.dataset.DataSetTableUnionDTO;
import io.dataease.dto.dataset.DataTableInfoDTO;
import io.dataease.dto.dataset.SqlVariableDetails;
import io.dataease.exception.DataEaseException;
import io.dataease.ext.ExtChartGroupMapper;
import io.dataease.ext.ExtChartViewMapper;
@ -33,11 +30,13 @@ import io.dataease.listener.util.CacheUtils;
import io.dataease.plugins.common.base.domain.*;
import io.dataease.plugins.common.base.mapper.ChartViewCacheMapper;
import io.dataease.plugins.common.base.mapper.ChartViewMapper;
import io.dataease.plugins.common.base.mapper.DatasetTableFieldMapper;
import io.dataease.plugins.common.base.mapper.PanelViewMapper;
import io.dataease.plugins.common.constants.DatasetType;
import io.dataease.plugins.common.dto.chart.ChartFieldCompareDTO;
import io.dataease.plugins.common.dto.chart.ChartFieldCustomFilterDTO;
import io.dataease.plugins.common.dto.chart.ChartViewFieldDTO;
import io.dataease.plugins.common.dto.dataset.SqlVariableDetails;
import io.dataease.plugins.common.request.chart.ChartExtFilterRequest;
import io.dataease.plugins.common.request.datasource.DatasourceRequest;
import io.dataease.plugins.common.request.permission.DataSetRowPermissionsTreeDTO;
@ -112,6 +111,8 @@ public class ChartViewService {
private ChartViewFieldService chartViewFieldService;
@Resource
private PermissionsTreeService permissionsTreeService;
@Resource
private DatasetTableFieldMapper datasetTableFieldMapper;
//默认使用非公平
@ -459,7 +460,7 @@ public class ChartViewService {
}
} else if (StringUtils.equalsIgnoreCase(table.getType(), DatasetType.SQL.name())) {
String sql = dataTableInfoDTO.isBase64Encryption() ? new String(java.util.Base64.getDecoder().decode(dataTableInfoDTO.getSql())) : dataTableInfoDTO.getSql();
sql = handleVariable(sql, requestList, qp);
sql = handleVariable(sql, requestList, qp, table);
if (StringUtils.equalsIgnoreCase("text", view.getType()) || StringUtils.equalsIgnoreCase("gauge", view.getType()) || StringUtils.equalsIgnoreCase("liquid", view.getType())) {
datasourceRequest.setQuery(qp.getSQLSummaryAsTmp(sql, yAxis, fieldCustomFilter, rowPermissionsTree, extFilterList, view));
} else if (StringUtils.containsIgnoreCase(view.getType(), "stack")) {
@ -658,8 +659,7 @@ public class ChartViewService {
}
boolean hasParameters = false;
if (StringUtils.isNotEmpty(table.getSqlVariableDetails())) {
List<SqlVariableDetails> sqlVariables = new Gson().fromJson(table.getSqlVariableDetails(), new TypeToken<List<SqlVariableDetails>>() {
}.getType());
List<SqlVariableDetails> sqlVariables = new Gson().fromJson(table.getSqlVariableDetails(), new TypeToken<List<SqlVariableDetails>>() {}.getType());
for (String parameter : Optional.ofNullable(request.getParameters()).orElse(new ArrayList<>())) {
if (sqlVariables.stream().map(SqlVariableDetails::getVariableName).collect(Collectors.toList()).contains(parameter)) {
hasParameters = true;
@ -804,6 +804,20 @@ public class ChartViewService {
Provider datasourceProvider = ProviderFactory.getProvider(ds.getType());
List<String[]> data = new ArrayList<>();
// senior dynamic assist
DatasourceRequest datasourceAssistRequest = new DatasourceRequest();
datasourceAssistRequest.setDatasource(ds);
List<String[]> assistData = new ArrayList<>();
List<ChartSeniorAssistDTO> dynamicAssistFields = getDynamicAssistFields(view);
List<ChartViewFieldDTO> assistFields = null;
if (StringUtils.containsIgnoreCase(view.getType(), "bar")
|| StringUtils.containsIgnoreCase(view.getType(), "line")
|| StringUtils.containsIgnoreCase(view.getType(), "area")
|| StringUtils.containsIgnoreCase(view.getType(), "scatter")
|| StringUtils.containsIgnoreCase(view.getType(), "mix")
) {
assistFields = getAssistFields(dynamicAssistFields);
}
// 如果是插件视图 走插件内部的逻辑
if (ObjectUtils.isNotEmpty(view.getIsPlugin()) && view.getIsPlugin()) {
@ -824,7 +838,7 @@ public class ChartViewService {
Map<String, Object> mapChart = pluginViewResult(pluginViewParam, view, data, isDrill);
Map<String, Object> mapTableNormal = ChartDataBuild.transTableNormal(fieldMap, view, data, desensitizationList);
return uniteViewResult(datasourceRequest.getQuery(), mapChart, mapTableNormal, view, isDrill, drillFilters);
return uniteViewResult(datasourceRequest.getQuery(), mapChart, mapTableNormal, view, isDrill, drillFilters, dynamicAssistFields, assistData);
// 如果是插件到此结束
}
@ -852,9 +866,12 @@ public class ChartViewService {
} else {
datasourceRequest.setQuery(qp.getSQL(dataTableInfoDTO.getTable(), xAxis, yAxis, fieldCustomFilter, rowPermissionsTree, extFilterList, ds, view));
}
if (CollectionUtils.isNotEmpty(assistFields)) {
datasourceAssistRequest.setQuery(qp.getSQLSummary(dataTableInfoDTO.getTable(), assistFields, null, null, null, view, ds));
}
} else if (StringUtils.equalsIgnoreCase(table.getType(), DatasetType.SQL.name())) {
String sql = dataTableInfoDTO.isBase64Encryption() ? new String(java.util.Base64.getDecoder().decode(dataTableInfoDTO.getSql())) : dataTableInfoDTO.getSql();
sql = handleVariable(sql, requestList, qp);
sql = handleVariable(sql, requestList, qp, table);
if (StringUtils.equalsIgnoreCase("text", view.getType()) || StringUtils.equalsIgnoreCase("gauge", view.getType()) || StringUtils.equalsIgnoreCase("liquid", view.getType())) {
datasourceRequest.setQuery(qp.getSQLSummaryAsTmp(sql, yAxis, fieldCustomFilter, rowPermissionsTree, extFilterList, view));
} else if (StringUtils.containsIgnoreCase(view.getType(), "stack")) {
@ -866,6 +883,9 @@ public class ChartViewService {
} else {
datasourceRequest.setQuery(qp.getSQLAsTmp(sql, xAxis, yAxis, fieldCustomFilter, rowPermissionsTree, extFilterList, view));
}
if (CollectionUtils.isNotEmpty(assistFields)) {
datasourceAssistRequest.setQuery(qp.getSQLSummaryAsTmp(sql, assistFields, fieldCustomFilter, rowPermissionsTree, extFilterList, view));
}
} else if (StringUtils.equalsIgnoreCase(table.getType(), DatasetType.CUSTOM.name())) {
DataTableInfoDTO dt = gson.fromJson(table.getInfo(), DataTableInfoDTO.class);
List<DataSetTableUnionDTO> list = dataSetTableUnionService.listByTableId(dt.getList().get(0).getTableId());
@ -881,6 +901,9 @@ public class ChartViewService {
} else {
datasourceRequest.setQuery(qp.getSQLAsTmp(sql, xAxis, yAxis, fieldCustomFilter, rowPermissionsTree, extFilterList, view));
}
if (CollectionUtils.isNotEmpty(assistFields)) {
datasourceAssistRequest.setQuery(qp.getSQLSummaryAsTmp(sql, assistFields, fieldCustomFilter, rowPermissionsTree, extFilterList, view));
}
} else if (StringUtils.equalsIgnoreCase(table.getType(), DatasetType.UNION.name())) {
DataTableInfoDTO dt = gson.fromJson(table.getInfo(), DataTableInfoDTO.class);
Map<String, Object> sqlMap = dataSetTableService.getUnionSQLDatasource(dt, ds);
@ -897,8 +920,14 @@ public class ChartViewService {
} else {
datasourceRequest.setQuery(qp.getSQLAsTmp(sql, xAxis, yAxis, fieldCustomFilter, rowPermissionsTree, extFilterList, view));
}
if (CollectionUtils.isNotEmpty(assistFields)) {
datasourceAssistRequest.setQuery(qp.getSQLSummaryAsTmp(sql, assistFields, fieldCustomFilter, rowPermissionsTree, extFilterList, view));
}
}
data = datasourceProvider.getData(datasourceRequest);
if (CollectionUtils.isNotEmpty(assistFields)) {
assistData = datasourceProvider.getData(datasourceAssistRequest);
}
} else if (table.getMode() == 1) {// 抽取
// 连接doris，构建doris数据源查询
datasourceRequest.setDatasource(ds);
@ -916,6 +945,10 @@ public class ChartViewService {
} else {
datasourceRequest.setQuery(qp.getSQL(tableName, xAxis, yAxis, fieldCustomFilter, rowPermissionsTree, extFilterList, ds, view));
}
if (CollectionUtils.isNotEmpty(assistFields)) {
datasourceAssistRequest.setQuery(qp.getSQLSummary(tableName, assistFields, fieldCustomFilter, rowPermissionsTree, extFilterList, view, ds));
assistData = datasourceProvider.getData(datasourceAssistRequest);
}
// 仪表板有参数不使用缓存
if (!cache || CollectionUtils.isNotEmpty(requestList.getFilter())
|| CollectionUtils.isNotEmpty(requestList.getLinkageFilters())
@ -1065,7 +1098,7 @@ public class ChartViewService {
}
// table组件，明细表，也用于导出数据
Map<String, Object> mapTableNormal = ChartDataBuild.transTableNormal(xAxis, yAxis, view, data, extStack, desensitizationList);
return uniteViewResult(datasourceRequest.getQuery(), mapChart, mapTableNormal, view, isDrill, drillFilters);
return uniteViewResult(datasourceRequest.getQuery(), mapChart, mapTableNormal, view, isDrill, drillFilters, dynamicAssistFields, assistData);
}
// 对结果排序
@ -1110,7 +1143,7 @@ public class ChartViewService {
return res;
}
public ChartViewDTO uniteViewResult(String sql, Map<String, Object> chartData, Map<String, Object> tabelData, ChartViewDTO view, Boolean isDrill, List<ChartExtFilterRequest> drillFilters) {
public ChartViewDTO uniteViewResult(String sql, Map<String, Object> chartData, Map<String, Object> tabelData, ChartViewDTO view, Boolean isDrill, List<ChartExtFilterRequest> drillFilters, List<ChartSeniorAssistDTO> dynamicAssistFields, List<String[]> assistData) {
Map<String, Object> map = new HashMap<>();
map.putAll(chartData);
@ -1118,6 +1151,9 @@ public class ChartViewService {
List<DatasetTableField> sourceFields = dataSetTableFieldsService.getFieldsByTableId(view.getTableId());
map.put("sourceFields", sourceFields);
// merge assist result
mergeAssistField(dynamicAssistFields, assistData);
map.put("dynamicAssistLines", dynamicAssistFields);
ChartViewDTO dto = new ChartViewDTO();
BeanUtils.copyBean(dto, view);
@ -1525,7 +1561,10 @@ public class ChartViewService {
chartViewMapper.updateByPrimaryKeySelective(chartView);
}
private String handleVariable(String sql, ChartExtRequest requestList, QueryProvider qp) throws Exception {
private String handleVariable(String sql, ChartExtRequest requestList, QueryProvider qp, DataSetTableDTO table) throws Exception {
List<SqlVariableDetails> sqlVariables = new Gson().fromJson(table.getSqlVariableDetails(), new TypeToken<List<SqlVariableDetails>>() {}.getType());
if (requestList != null && CollectionUtils.isNotEmpty(requestList.getFilter())) {
for (ChartExtFilterRequest chartExtFilterRequest : requestList.getFilter()) {
if (CollectionUtils.isEmpty(chartExtFilterRequest.getValue())) {
@ -1535,9 +1574,13 @@ public class ChartViewService {
continue;
}
String filter = qp.transFilter(chartExtFilterRequest);
for (String parameter : chartExtFilterRequest.getParameters()) {
sql = sql.replace("${" + parameter + "}", filter);
List<SqlVariableDetails> parameters = sqlVariables.stream().filter(item -> item.getVariableName().equalsIgnoreCase(parameter)).collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(parameters)) {
String filter = qp.transFilter(chartExtFilterRequest,parameters.get(0));
sql = sql.replace("${" + parameter + "}", filter);
}
}
}
}
@ -1610,4 +1653,56 @@ public class ChartViewService {
}
return list;
}
private List<ChartSeniorAssistDTO> getDynamicAssistFields(ChartViewDTO view) {
String senior = view.getSenior();
JSONObject jsonObject = JSONObject.parseObject(senior);
JSONArray assistLine = jsonObject.getJSONArray("assistLine");
List<ChartSeniorAssistDTO> assistLines = gson.fromJson(assistLine.toJSONString(), new TypeToken<List<ChartSeniorAssistDTO>>() {
}.getType());
List<ChartSeniorAssistDTO> list = new ArrayList<>();
for (ChartSeniorAssistDTO dto : assistLines) {
if (StringUtils.equalsIgnoreCase(dto.getField(), "0")) {
continue;
}
String fieldId = dto.getFieldId();
String summary = dto.getSummary();
if (StringUtils.isEmpty(fieldId) || StringUtils.isEmpty(summary)) {
continue;
}
DatasetTableFieldExample datasetTableFieldExample = new DatasetTableFieldExample();
datasetTableFieldExample.createCriteria().andTableIdEqualTo(view.getTableId()).andIdEqualTo(fieldId);
List<DatasetTableField> fieldList = datasetTableFieldMapper.selectByExample(datasetTableFieldExample);
if (CollectionUtils.isEmpty(fieldList)) {
continue;
}
dto.setCurField(fieldList.get(0));
list.add(dto);
}
return list;
}
private List<ChartViewFieldDTO> getAssistFields(List<ChartSeniorAssistDTO> list) {
List<ChartViewFieldDTO> res = new ArrayList<>();
for (ChartSeniorAssistDTO dto : list) {
DatasetTableField curField = dto.getCurField();
ChartViewFieldDTO chartViewFieldDTO = new ChartViewFieldDTO();
BeanUtils.copyBean(chartViewFieldDTO, curField);
chartViewFieldDTO.setSummary(dto.getSummary());
res.add(chartViewFieldDTO);
}
return res;
}
private void mergeAssistField(List<ChartSeniorAssistDTO> dynamicAssistFields, List<String[]> assistData) {
if (CollectionUtils.isEmpty(assistData)) {
return;
}
String[] strings = assistData.get(0);
for (int i = 0; i < dynamicAssistFields.size(); i++) {
ChartSeniorAssistDTO chartSeniorAssistDTO = dynamicAssistFields.get(i);
chartSeniorAssistDTO.setValue(strings[i]);
}
}
}

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

@ -31,6 +31,7 @@ import io.dataease.plugins.common.base.domain.*;
import io.dataease.plugins.common.base.mapper.*;
import io.dataease.plugins.common.constants.DatasetType;
import io.dataease.plugins.common.constants.DatasourceTypes;
import io.dataease.plugins.common.dto.dataset.SqlVariableDetails;
import io.dataease.plugins.common.dto.datasource.DataSourceType;
import io.dataease.plugins.common.dto.datasource.TableField;
import io.dataease.plugins.common.request.datasource.DatasourceRequest;
@ -930,10 +931,14 @@ public class DataSetTableService {
return map;
}
public List<SqlVariableDetails> paramsWithIds(List<String> viewIds) {
public List<SqlVariableDetails> paramsWithIds(String type, List<String> viewIds) {
if (CollectionUtils.isEmpty(viewIds)) {
return new ArrayList<>();
}
if(!Arrays.asList("DATE", "TEXT", "NUM").contains(type)){
return new ArrayList<>();
}
ChartViewExample chartViewExample = new ChartViewExample();
chartViewExample.createCriteria().andIdIn(viewIds);
List<String> datasetIds = chartViewMapper.selectByExample(chartViewExample).stream().map(ChartView::getTableId).collect(Collectors.toList());
@ -946,11 +951,9 @@ public class DataSetTableService {
if (CollectionUtils.isEmpty(datasetTables)) {
return new ArrayList<>();
}
List<SqlVariableDetails> sqlVariableDetails = new ArrayList<>();
List<String> sqlVariableNames = new ArrayList<>();
datasetTables.forEach(datasetTable -> {
for (DatasetTable datasetTable : datasetTables) {
if (StringUtils.isNotEmpty(datasetTable.getSqlVariableDetails())) {
List<SqlVariableDetails> sqlVariables = new Gson().fromJson(datasetTable.getSqlVariableDetails(), new TypeToken<List<SqlVariableDetails>>() {
}.getType());
@ -961,7 +964,27 @@ public class DataSetTableService {
}
}
}
});
}
switch (type){
case "DATE":
sqlVariableDetails = sqlVariableDetails.stream().filter(item -> item.getType().get(0).contains("DATETIME")).collect(Collectors.toList());
sqlVariableDetails.forEach(item -> {
if(item.getType().size()> 1){
item.setAlias(item.getVariableName() + "[" + item.getType().get(1) + "]");
}else {
item.setAlias(item.getVariableName());
}
});
break;
case "TEXT":
sqlVariableDetails = sqlVariableDetails.stream().filter(item -> item.getType().get(0).contains("TEXT")).collect(Collectors.toList());
sqlVariableDetails.forEach(item -> {item.setAlias(item.getVariableName());});
break;
case "NUM":
sqlVariableDetails = sqlVariableDetails.stream().filter(item -> item.getType().get(0).contains("LONG") || item.getType().get(0).contains("DOUBLE")).collect(Collectors.toList());
sqlVariableDetails.forEach(item -> {item.setAlias(item.getVariableName());});
break;
}
return sqlVariableDetails;
}

40
backend/src/main/java/io/dataease/service/sys/SysUserService.java
View File

@ -20,6 +20,7 @@ import io.dataease.plugins.common.base.mapper.SysUserMapper;
import io.dataease.plugins.common.base.mapper.SysUsersRolesMapper;
import io.dataease.plugins.common.entity.XpackLdapUserEntity;
import io.dataease.plugins.xpack.dingtalk.dto.response.DingUserEntity;
import io.dataease.plugins.xpack.lark.dto.entity.LarkUserInfo;
import io.dataease.plugins.xpack.oidc.dto.SSOUserInfo;
import org.apache.commons.collections4.CollectionUtils;
@ -147,13 +148,7 @@ public class SysUserService {
sysUser.setIsAdmin(false);
sysUser.setSub(userId);
sysUserMapper.insert(sysUser);
SysUser dbUser = findOne(sysUser);
if (null != dbUser && null != dbUser.getUserId()) {
// 默认角色是普通员工
List<Long> roleIds = new ArrayList<Long>();
roleIds.add(2L);
saveUserRoles( dbUser.getUserId(), roleIds);
}
}
@Transactional
@ -161,7 +156,7 @@ public class SysUserService {
long now = System.currentTimeMillis();
SysUser sysUser = new SysUser();
sysUser.setUsername(dingUserEntity.getUserId());
sysUser.setUsername(dingUserEntity.getUserid());
sysUser.setNickName(dingUserEntity.getName());
sysUser.setEmail(email);
sysUser.setPassword(CodingUtil.md5(DEFAULT_PWD));
@ -175,12 +170,29 @@ public class SysUserService {
sysUser.setSub(dingUserEntity.getUnionid());
sysUser.setPhone(dingUserEntity.getMobile());
sysUserMapper.insert(sysUser);
SysUser dbUser = findOne(sysUser);
/*if (null != dbUser && null != dbUser.getUserId()) {
List<Long> roleIds = new ArrayList<Long>();
roleIds.add(2L);
saveUserRoles( dbUser.getUserId(), roleIds);
}*/
}
@Transactional
public void saveLarkCUser(LarkUserInfo larkUserInfo, String email) {
long now = System.currentTimeMillis();
SysUser sysUser = new SysUser();
sysUser.setUsername(larkUserInfo.getUser_id());
sysUser.setNickName(larkUserInfo.getName());
sysUser.setEmail(email);
sysUser.setPassword(CodingUtil.md5(DEFAULT_PWD));
sysUser.setCreateTime(now);
sysUser.setUpdateTime(now);
sysUser.setEnabled(1L);
sysUser.setLanguage("zh_CN");
sysUser.setFrom(6);
sysUser.setIsAdmin(false);
sysUser.setSub(larkUserInfo.getSub());
sysUser.setPhone(larkUserInfo.getMobile());
sysUserMapper.insert(sysUser);
}
@Transactional

2
backend/src/main/resources/db/migration/V40__1.15.sql
View File

@ -34,3 +34,5 @@ CREATE TABLE `panel_app_template` (
`create_user` varchar(255) DEFAULT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
INSERT INTO `sys_menu` VALUES (800, 0, 0, 1, '数据集表单', 'dataset-form', 'dataset/form', 999, NULL, '/dataset-form', b'0', b'0', b'1', NULL, NULL, NULL, NULL, NULL);

4
frontend/src/api/panel/view.js
View File

@ -17,9 +17,9 @@ export function viewsWithIds(data) {
})
}
export function paramsWithIds(data) {
export function paramsWithIds(type, data) {
return request({
url: '/dataset/table/paramsWithIds',
url: '/dataset/table/paramsWithIds/' + type,
method: 'post',
loading: true,
data

4
frontend/src/api/user.js
View File

@ -114,9 +114,9 @@ export function dingtalkStatus() {
})
}
export function farkStatus() {
export function larkStatus() {
return request({
url: '/api/auth/isOpenFark',
url: '/api/auth/isOpenLark',
method: 'post'
})
}

0
frontend/src/assets/fark.png → frontend/src/assets/lark.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

1
frontend/src/components/widget/serviceImpl/TimeDateServiceImpl.js
View File

@ -17,6 +17,7 @@ const dialogPanel = {
placeholder: 'dedate.placeholder',
viewIds: [],
fieldId: '',
parameters: [],
dragItems: [],
default: {
isDynamic: false,

1
frontend/src/components/widget/serviceImpl/TimeMonthServiceImpl.js
View File

@ -15,6 +15,7 @@ const dialogPanel = {
placeholder: 'deyearmonth.placeholder',
viewIds: [],
fieldId: '',
parameters: [],
dragItems: [],
default: {
isDynamic: false,

1
frontend/src/components/widget/serviceImpl/TimeQuarterServiceImpl.js
View File

@ -13,6 +13,7 @@ const dialogPanel = {
},
value: ''
},
parameters: [],
defaultClass: 'time-filter',
component: 'de-quarter'
}

1
frontend/src/components/widget/serviceImpl/TimeYearServiceImpl.js
View File

@ -15,6 +15,7 @@ const dialogPanel = {
placeholder: 'deyear.placeholder',
viewIds: [],
fieldId: '',
parameters: [],
dragItems: [],
default: {
isDynamic: false,

4
frontend/src/lang/en.js
View File

@ -1326,7 +1326,9 @@ export default {
dynamic: 'Dynamic',
gauge_size_field_delete: 'Dynamic field changed，please edit again',
chart_group: 'Sub Type',
chart_bar_group: 'Bar Group'
chart_bar_group: 'Bar Group',
field_dynamic: 'Dynamic',
aggregation: 'Aggregation'
},
dataset: {
parse_filed: 'Parse Field',

4
frontend/src/lang/tw.js
View File

@ -1326,7 +1326,9 @@ export default {
dynamic: '動態值',
gauge_size_field_delete: '動態值中字段發生變更，請重新編輯',
chart_group: '子類別',
chart_bar_group: '分組柱狀圖'
chart_bar_group: '分組柱狀圖',
field_dynamic: '動態值',
aggregation: '聚合方式'
},
dataset: {
parse_filed: '解析字段',

4
frontend/src/lang/zh.js
View File

@ -1326,7 +1326,9 @@ export default {
dynamic: '动态值',
gauge_size_field_delete: '动态值中字段发生变更，请重新编辑',
chart_group: '子类别',
chart_bar_group: '分组柱状图'
chart_bar_group: '分组柱状图',
field_dynamic: '动态值',
aggregation: '聚合方式'
},
dataset: {
parse_filed: '解析字段',

2
frontend/src/store/modules/permission.js
View File

@ -29,7 +29,7 @@ const actions = {
commit('SET_CURRENT_PATH', path)
}
}
export const fullScreenRouters = ['XpackThemeForm', 'system/datasource/DsForm']
export const fullScreenRouters = ['XpackThemeForm', 'system/datasource/DsForm', 'dataset/form']
export const filterAsyncRouter = (routers) => { // 遍历后台传来的路由字符串，转换为组件对象
return routers.map(router => {
if (!fullScreenRouters.includes(router.component) && router.type === 1 && router.pid === 0 && router.component && router.component !== 'Layout') {

2
frontend/src/views/chart/chart/table/table-info.js
View File

@ -145,7 +145,7 @@ export function baseTableInfo(s2, container, chart, action, tableData) {
export function baseTableNormal(s2, container, chart, action, tableData) {
const containerDom = document.getElementById(container)
if(!containerDom) return
if (!containerDom) return
// fields
const fields = chart.data.fields

32
frontend/src/views/chart/components/shape-attr/TotalCfg.vue
View File

@ -16,6 +16,11 @@
<el-form-item :label="$t('chart.total_label')" class="form-item">
<el-input v-model="totalForm.row.label" style="width: 160px;" :placeholder="$t('chart.total_label')" size="mini" clearable @change="changeTotalCfg('row')" />
</el-form-item>
<el-form-item :label="$t('chart.aggregation')" class="form-item">
<el-select v-model="totalForm.row.calcTotals.aggregation" class="form-item-select" :placeholder="$t('chart.aggregation')" size="mini" @change="changeTotalCfg('row')">
<el-option v-for="option in aggregations" :key="option.value" :label="option.name" :value="option.value" />
</el-select>
</el-form-item>
</div>
<el-form-item v-show="showProperty('row')" :label="$t('chart.sub_total_show')" class="form-item">
@ -31,6 +36,11 @@
<el-form-item :label="$t('chart.total_label')" class="form-item">
<el-input v-model="totalForm.row.subLabel" :disabled="rowNum < 2" style="width: 160px;" :placeholder="$t('chart.total_label')" size="mini" clearable @change="changeTotalCfg" />
</el-form-item>
<el-form-item :label="$t('chart.aggregation')" class="form-item">
<el-select v-model="totalForm.row.calcSubTotals.aggregation" :disabled="rowNum < 2" class="form-item-select" :placeholder="$t('chart.aggregation')" size="mini" @change="changeTotalCfg('row')">
<el-option v-for="option in aggregations" :key="option.value" :label="option.name" :value="option.value" />
</el-select>
</el-form-item>
</div>
<el-divider v-if="showProperty('col')" content-position="center" class="divider-style">{{ $t('chart.col_cfg') }}</el-divider>
@ -47,6 +57,11 @@
<el-form-item :label="$t('chart.total_label')" class="form-item">
<el-input v-model="totalForm.col.label" style="width: 160px;" :placeholder="$t('chart.total_label')" size="mini" clearable @change="changeTotalCfg('col')" />
</el-form-item>
<el-form-item :label="$t('chart.aggregation')" class="form-item">
<el-select v-model="totalForm.col.calcTotals.aggregation" class="form-item-select" :placeholder="$t('chart.aggregation')" size="mini" @change="changeTotalCfg('col')">
<el-option v-for="option in aggregations" :key="option.value" :label="option.name" :value="option.value" />
</el-select>
</el-form-item>
</div>
<el-form-item v-show="showProperty('col')" :label="$t('chart.sub_total_show')" class="form-item">
@ -62,6 +77,11 @@
<el-form-item :label="$t('chart.total_label')" class="form-item">
<el-input v-model="totalForm.col.subLabel" :disabled="colNum < 2" style="width: 160px;" :placeholder="$t('chart.total_label')" size="mini" clearable @change="changeTotalCfg('col')" />
</el-form-item>
<el-form-item :label="$t('chart.aggregation')" class="form-item">
<el-select v-model="totalForm.col.calcSubTotals.aggregation" :disabled="colNum < 2" class="form-item-select" :placeholder="$t('chart.aggregation')" size="mini" @change="changeTotalCfg('col')">
<el-option v-for="option in aggregations" :key="option.value" :label="option.name" :value="option.value" />
</el-select>
</el-form-item>
</div>
</el-form>
</el-col>
@ -88,7 +108,13 @@ export default {
},
data() {
return {
totalForm: JSON.parse(JSON.stringify(DEFAULT_TOTAL))
totalForm: JSON.parse(JSON.stringify(DEFAULT_TOTAL)),
aggregations: [
{ name: this.$t('chart.sum'), value: 'SUM' },
{ name: this.$t('chart.avg'), value: 'AVG' },
{ name: this.$t('chart.max'), value: 'MAX' },
{ name: this.$t('chart.min'), value: 'MIN' }
]
}
},
computed: {
@ -190,4 +216,8 @@ span{font-size: 12px}
font-weight: 400;
padding: 0 10px;
}
.form-item-select{
width:160px!important;
}
</style>

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

@ -249,35 +249,35 @@ export default {
{ label: this.$t('dataset.text'), value: 'TEXT' },
{ label: this.$t('dataset.value'), value: 'LONG' },
{ label: this.$t('dataset.value') + '(' + this.$t('dataset.float') + ')', value: 'DOUBLE' },
// { label: this.$t('dataset.time_year'), value: 'DATETIME-YEAR' },
// { label: this.$t('dataset.time_year_month'), value: 'DATETIME-YEAR-MONTH',
// children: [{
// value: 'yyyy-MM',
// label: 'YYYY-MM'
// }, {
// value: 'yyyy/MM',
// label: 'YYYY/MM'
// }]
// },
// { label: this.$t('dataset.time_year_month_day'), value: 'DATETIME-YEAR-MONTH-DAY',
// children: [{
// value: 'yyyy-MM-dd',
// label: 'YYYY-MM-DD'
// }, {
// value: 'yyyy/MM/dd',
// label: 'YYYY/MM/DD'
// }]
// },
// { label: this.$t('dataset.time_all'), value: 'DATETIME',
// children: [{
// value: 'yyyy-MM-dd HH:mm:ss',
// label: 'YYYY-MM-DD HH:MI:SS'
// }, {
// value: 'yyyy/MM/dd HH:mm:ss',
// label: 'YYYY/MM/DD HH:MI:SS'
// }
// ]
// }
{ label: this.$t('dataset.time_year'), value: 'DATETIME-YEAR' },
{ label: this.$t('dataset.time_year_month'), value: 'DATETIME-YEAR-MONTH',
children: [{
value: 'yyyy-MM',
label: 'YYYY-MM'
}, {
value: 'yyyy/MM',
label: 'YYYY/MM'
}]
},
{ label: this.$t('dataset.time_year_month_day'), value: 'DATETIME-YEAR-MONTH-DAY',
children: [{
value: 'yyyy-MM-dd',
label: 'YYYY-MM-DD'
}, {
value: 'yyyy/MM/dd',
label: 'YYYY/MM/DD'
}]
},
{ label: this.$t('dataset.time_all'), value: 'DATETIME',
children: [{
value: 'yyyy-MM-dd HH:mm:ss',
label: 'YYYY-MM-DD HH:MI:SS'
}, {
value: 'yyyy/MM/dd HH:mm:ss',
label: 'YYYY/MM/DD HH:MI:SS'
}
]
}
],
}
},

17
frontend/src/views/dataset/form.vue Normal file
View File

@ -0,0 +1,17 @@
<template>
<div>this is dataset form</div>
</template>
<script>
export default {
name: 'DatasetForm',
data() {
return {
}
},
methods: {
}
}
</script>

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

@ -58,16 +58,16 @@
</div>
</el-form>
<div v-show="codeShow" class="code">
<el-row>
<el-row class="code-contaniner">
<plugin-com v-if="loginTypes.includes(4) && codeIndex === 4" ref="WecomQr" component-name="WecomQr" />
<plugin-com v-if="loginTypes.includes(5) && codeIndex === 5" ref="DingtalkQr" component-name="DingtalkQr" />
<plugin-com v-if="loginTypes.includes(6) && codeIndex === 6" ref="FarkQr" component-name="FarkQr" />
<plugin-com v-if="loginTypes.includes(6) && codeIndex === 6" ref="LarkQr" component-name="LarkQr" />
</el-row>
<div v-if="qrTypes.length > 1" class="login-third-items">
<span v-if="qrTypes.includes(4)" class="login-third-item login-third-wecom" @click="switchCodeIndex(4)" />
<span v-if="qrTypes.includes(5)" class="login-third-item login-third-dingtalk" @click="switchCodeIndex(5)" />
<span v-if="qrTypes.includes(6)" class="login-third-item login-third-fark" @click="switchCodeIndex(6)" />
<span v-if="qrTypes.includes(6)" class="login-third-item login-third-lark" @click="switchCodeIndex(6)" />
</div>
</div>
@ -89,7 +89,7 @@
<script>
import { encrypt } from '@/utils/rsaEncrypt'
import { ldapStatus, oidcStatus, getPublicKey, pluginLoaded, defaultLoginType, wecomStatus, dingtalkStatus, farkStatus } from '@/api/user'
import { ldapStatus, oidcStatus, getPublicKey, pluginLoaded, defaultLoginType, wecomStatus, dingtalkStatus, larkStatus } from '@/api/user'
import { getSysUI } from '@/utils/auth'
import { changeFavicon } from '@/utils/index'
import { initTheme } from '@/utils/ThemeUtil'
@ -193,7 +193,7 @@ export default {
this.setDefaultType()
})
farkStatus().then(res => {
larkStatus().then(res => {
if (res.success && res.data) {
this.loginTypes.push(6)
const arr = this.loginTypes.filter(item => item > 3)
@ -501,6 +501,9 @@ export default {
height: 150px;
padding: 10px;
}
.code-contaniner {
height: 410px;
}
}
.login-third-item {
display: inline-block;
@ -517,8 +520,8 @@ export default {
.login-third-dingtalk {
background: url(../../assets/dingding01.png) no-repeat 50%/cover;
}
.login-third-fark {
background: url(../../assets/fark.png) no-repeat 50%/cover;
.login-third-lark {
background: url(../../assets/lark.png) no-repeat 50%/cover;
}
</style>

9
frontend/src/views/panel/filter/filterDialog.vue
View File

@ -480,7 +480,14 @@ export default {
this.viewInfos = datas
this.childViews.viewInfos = datas
})
viewIds && viewIds.length > 0 && paramsWithIds(viewIds).then(res => {
var type = 'TEXT'
if(this.widgetInfo.name.indexOf('time') !== -1){
type = 'DATE'
}
if(this.widgetInfo.name === 'numberSelectWidget'){
type = 'NUM'
}
viewIds && viewIds.length > 0 && paramsWithIds(type, viewIds).then(res => {
const datas = res.data
this.childViews.datasetParams = datas

208
frontend/src/views/panel/filter/filterMain/FilterControl.vue
View File

@ -50,7 +50,8 @@
</el-checkbox>
<el-popover v-model="titlePopovervisible" placement="bottom-end" :disabled="!attrs.showTitle" width="200">
<div style="width: 100%;overflow-y: auto;overflow-x: hidden;word-break: break-all;position: relative;">
<el-input v-model="attrs.title" :placeholder="$t('panel.input_title')" type="textarea" maxlength="15" show-word-limit />
<el-input v-model="attrs.title" :placeholder="$t('panel.input_title')" type="textarea" maxlength="15"
show-word-limit/>
</div>
<i
@ -74,7 +75,7 @@
class="de-checkbox"
>
<div class="span-div">
<svg-icon :icon-class="item.type" class="chart-icon" />
<svg-icon :icon-class="item.type" class="chart-icon"/>
<span v-if="item.name && item.name.length <= 7" style="margin-left: 6px">{{ item.name }}</span>
<el-tooltip v-else class="item" effect="dark" :content="item.name" placement="left">
<span style="margin-left: 6px">{{ item.name }}</span>
@ -92,7 +93,7 @@
/>
</el-popover>
</span>
<span v-if="element.component === 'de-select'" style="padding-left: 10px;">
<span v-if="showParams" style="padding-left: 10px;">
<el-checkbox v-model="attrs.enableParameters" @change="enableParametersChange"><span>
{{ $t('panel.binding_parameters') }} </span> </el-checkbox>
@ -106,9 +107,10 @@
class="de-checkbox"
>
<div class="span-div">
<span v-if="item.variableName && item.variableName.length <= 7" style="margin-left: 6px">{{ item.variableName }}</span>
<el-tooltip v-else class="item" effect="dark" :content="item.variableName" placement="left">
<span style="margin-left: 6px">{{ item.variableName }}</span>
<span v-if="item.alias && item.alias.length <= 7"
style="margin-left: 6px">{{ item.alias }}</span>
<el-tooltip v-else class="item" effect="dark" :content="item.alias" placement="left">
<span style="margin-left: 6px">{{ item.alias }}</span>
</el-tooltip>
</div>
@ -145,7 +147,8 @@ export default {
childViews: {
type: Object,
default: () => {}
default: () => {
}
},
element: {
type: Object,
@ -154,120 +157,139 @@ export default {
},
data() {
return {
showParams: false,
attrs: null,
titlePopovervisible: false,
popovervisible: false,
parametersVisible: false,
timePopovervisible: false,
accuracyOptions: [
{ id: 'HH', name: 'HH' },
{ id: 'HH:mm', name: 'HH:mm' },
{ id: 'HH:mm:ss', name: 'HH:mm:ss' }
{id: 'HH', name: 'HH'},
{id: 'HH:mm', name: 'HH:mm'},
{id: 'HH:mm:ss', name: 'HH:mm:ss'}
]
}
},
computed: {
},
computed: {},
created() {
this.attrs = this.controlAttrs
},
methods: {
multipleChange(value) {
this.fillAttrs2Filter()
},
showTimeChange(value) {
this.attrs.accuracy = this.accuracyOptions[1].id
this.attrs.default.isDynamic = false
this.fillAttrs2Filter()
},
checkedViewsChange(values) {
this.fillAttrs2Filter()
},
enableRangeChange(value) {
if (!value) {
this.attrs.viewIds = []
}
this.fillAttrs2Filter()
},
enableParametersChange(value) {
if (!value) {
this.attrs.parameters = []
}
this.fillAttrs2Filter()
},
showTitleChange(value) {
if (!value) {
this.attrs.title = ''
this.element.style.backgroundColor = ''
}
this.fillAttrs2Filter()
},
showVisualChange(value) {
this.fillAttrs2Filter()
},
fillAttrs2Filter() {}
if ('timeYearWidget,timeMonthWidget,timeDateWidget,textSelectWidget,numberSelectWidget'.indexOf(this.widget.name) !== -1) {
this.showParams = true
}
}
,
methods: {
multipleChange(value)
{
this.fillAttrs2Filter()
}
,
showTimeChange(value)
{
this.attrs.accuracy = this.accuracyOptions[1].id
this.attrs.default.isDynamic = false
this.fillAttrs2Filter()
}
,
checkedViewsChange(values)
{
this.fillAttrs2Filter()
}
,
enableRangeChange(value)
{
if (!value) {
this.attrs.viewIds = []
}
this.fillAttrs2Filter()
}
,
enableParametersChange(value)
{
if (!value) {
this.attrs.parameters = []
}
this.fillAttrs2Filter()
}
,
showTitleChange(value)
{
if (!value) {
this.attrs.title = ''
this.element.style.backgroundColor = ''
}
this.fillAttrs2Filter()
}
,
showVisualChange(value)
{
this.fillAttrs2Filter()
}
,
fillAttrs2Filter()
{
}
}
}
</script>
<style lang="scss" scoped>
.filter-options-left {
align-items: center;
display: flex;
flex-direction: row;
justify-content: flex-start;
flex-wrap: nowrap;
height: 50px;
}
.filter-options-left {
align-items: center;
display: flex;
flex-direction: row;
justify-content: flex-start;
flex-wrap: nowrap;
height: 50px;
}
.filter-options-right {
align-items: center;
display: flex;
flex-direction: row;
justify-content: flex-end;
flex-wrap: nowrap;
height: 50px;
}
.filter-options-right {
align-items: center;
display: flex;
flex-direction: row;
justify-content: flex-end;
flex-wrap: nowrap;
height: 50px;
}
.i-filter {
text-align: center;
margin-left: 5px;
margin-top: 1px;
}
.i-filter {
text-align: center;
margin-left: 5px;
margin-top: 1px;
}
.i-filter-inactive {
color: #9ea6b2 !important;
cursor: not-allowed !important;
}
.i-filter-inactive {
color: #9ea6b2 !important;
cursor: not-allowed !important;
}
.i-filter-active {
cursor: pointer !important;
}
.i-filter-active {
cursor: pointer !important;
}
.view-container-class {
.view-container-class {
min-height: 150px;
max-height: 200px;
width: 100%;
overflow-y: auto;
overflow-x: hidden;
word-break: break-all;
position: relative;
min-height: 150px;
max-height: 200px;
width: 100%;
overflow-y: auto;
overflow-x: hidden;
word-break: break-all;
position: relative;
}
}
.span-div {
width: 135px;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
.span-div {
width: 135px;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
.de-ul li {
margin: 5px 2px;

37
frontend/src/views/system/SysParam/index.vue
View File

@ -71,6 +71,12 @@
:label="$t('dingtalk.title')"
name="twelve"
/>
<el-tab-pane
v-if="isPluginLoaded"
:lazy="true"
:label="$t('lark.title')"
name="thirteen"
/>
</el-tabs>
<div
class="tabs-container"
@ -80,34 +86,15 @@
<basic-setting v-if="activeName === 'zero'" />
<email-setting v-if="activeName === 'first'" />
<map-setting v-if="activeName === 'ten'" ref="mapSetting" />
<plugin-com
v-if="activeName === 'fourth'"
ref="DisplaySetting"
component-name="LdapSetting"
/>
<plugin-com
v-if="activeName === 'five'"
ref="DisplaySetting"
component-name="SsoSetting"
/>
<plugin-com v-if="activeName === 'fourth'" ref="DisplaySetting" component-name="LdapSetting" />
<plugin-com v-if="activeName === 'five'" ref="DisplaySetting" component-name="SsoSetting" />
<simple-mode v-if="activeName === 'six'" />
<cluster-mode v-if="activeName === 'seven'" />
<kettle-setting v-if="activeName === 'eight'" />
<plugin-com
v-if="activeName === 'nine'"
ref="CasSetting"
component-name="CasSetting"
/>
<plugin-com
v-if="activeName === 'eleven'"
ref="WecomSetting"
component-name="WecomSetting"
/>
<plugin-com
v-if="activeName === 'twelve'"
ref="DingtalkSetting"
component-name="DingtalkSetting"
/>
<plugin-com v-if="activeName === 'nine'" ref="CasSetting" component-name="CasSetting" />
<plugin-com v-if="activeName === 'eleven'" ref="WecomSetting" component-name="WecomSetting" />
<plugin-com v-if="activeName === 'twelve'" ref="DingtalkSetting" component-name="DingtalkSetting" />
<plugin-com v-if="activeName === 'thirteen'" ref="LarkSetting" component-name="LarkSetting" />
</div>
</div>
</div>

4
frontend/src/views/system/datasource/DsConfiguration.vue
View File

@ -519,7 +519,7 @@
</el-table-column>
<el-table-column prop="name" :label="$t('dataset.field_rename')">
<template slot-scope="scope">
<el-input
<el-input :disabled="scope.row.children"
size="mini"
type="text"
v-model="scope.row.name"
@ -533,7 +533,7 @@
:label="$t('dataset.field_type')"
>
<template slot-scope="scope">
<el-select
<el-select :disabled="scope.row.children"
v-model="scope.row.deExtractType"
size="mini"
style="display: inline-block; width: 120px"