|
|
|
|
@ -17,15 +17,15 @@ import apelet.common.generator.model.OnlFormHead;
@@ -17,15 +17,15 @@ import apelet.common.generator.model.OnlFormHead;
|
|
|
|
|
import apelet.common.generator.service.IOnlFormFieldService; |
|
|
|
|
import apelet.common.generator.service.IOnlFormHeadService; |
|
|
|
|
import apelet.common.generator.utils.CustomUtil; |
|
|
|
|
import apelet.common.online.util.WidgetFieldTypeMapping; |
|
|
|
|
import apelet.common.log.annotation.OperationLog; |
|
|
|
|
import apelet.common.log.model.constant.SysOperationLogType; |
|
|
|
|
import apelet.common.online.config.OnlineProperties; |
|
|
|
|
import apelet.common.online.dto.*; |
|
|
|
|
import apelet.common.online.dto.OnlineEventPluginExecuteDto; |
|
|
|
|
import apelet.common.online.dto.OnlineFormDto; |
|
|
|
|
import apelet.common.online.model.*; |
|
|
|
|
import apelet.common.online.service.*; |
|
|
|
|
import apelet.common.online.util.OnlineRedisKeyUtil; |
|
|
|
|
import apelet.common.online.util.WidgetFieldTypeMapping; |
|
|
|
|
import apelet.common.online.vo.OnlineFormVo; |
|
|
|
|
import cn.hutool.core.collection.CollUtil; |
|
|
|
|
import cn.hutool.core.map.MapUtil; |
|
|
|
|
@ -51,7 +51,6 @@ import org.springframework.web.bind.annotation.*;
@@ -51,7 +51,6 @@ import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
|
|
|
|
import javax.annotation.Resource; |
|
|
|
|
import javax.validation.groups.Default; |
|
|
|
|
import java.lang.reflect.Method; |
|
|
|
|
import java.util.*; |
|
|
|
|
import java.util.function.Consumer; |
|
|
|
|
import java.util.stream.Collectors; |
|
|
|
|
@ -771,6 +770,10 @@ public class OnlineFormController {
@@ -771,6 +770,10 @@ public class OnlineFormController {
|
|
|
|
|
if (bindData != null && bindData.containsKey("columnComment")) { |
|
|
|
|
field.setFieldRemark(bindData.getString("columnComment")); |
|
|
|
|
} |
|
|
|
|
String showName = widget.getString("showName"); |
|
|
|
|
if (StringUtils.isNotBlank(showName) && (StringUtils.isBlank(field.getFieldRemark()) || StringUtils.equals("null", field.getFieldRemark()))) { |
|
|
|
|
field.setFieldRemark(showName); |
|
|
|
|
} |
|
|
|
|
onlFormFieldService.save(field); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|