|
@@ -754,9 +754,36 @@ public class TableServiceCmdService {
|
|
|
JSONObject result = new JSONObject();
|
|
|
result.put(BUTTON_LIST, getButton(tableName));
|
|
|
result.put(SHOW_DATA, resultCols);
|
|
|
+ result.put(RULES, packRequireColumn(allColumns));
|
|
|
return AjaxResult.success(result);
|
|
|
}
|
|
|
|
|
|
+ private JSONObject packRequireColumn(List<GenTableColumn> allColumns) {
|
|
|
+ JSONObject jsonObject = new JSONObject();
|
|
|
+ String msg = "请输入正确的";
|
|
|
+ for (GenTableColumn column : allColumns) {
|
|
|
+ ArrayList<JSONObject> list = Lists.newArrayList();
|
|
|
+ if (GenTableColumn.IS_REQUIRED.equals(column.getIsRequired())) {
|
|
|
+ JSONObject inner1 = new JSONObject();
|
|
|
+ inner1.put(TRIGGER, BLUR);
|
|
|
+ inner1.put(MESSAGE, msg + column.getColumnComment());
|
|
|
+ inner1.put(REQUIRED, true);
|
|
|
+ list.add(inner1);
|
|
|
+ if (isNotEmpty(column.getRegular())) {
|
|
|
+ JSONObject inner2 = new JSONObject();
|
|
|
+ inner2.put(PATTERN, column.getRegular());
|
|
|
+ inner2.put(TRIGGER, BLUR);
|
|
|
+ inner2.put(MESSAGE, msg + column.getColumnComment());
|
|
|
+ list.add(inner2);
|
|
|
+ }
|
|
|
+
|
|
|
+ jsonObject.put(column.getColumnName(), list);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ return jsonObject;
|
|
|
+ }
|
|
|
+
|
|
|
public void packDictDataToColumns(List<GenTableColumn> columns, Predicate<String> predicate) {
|
|
|
if (isEmpty(columns)) {
|
|
|
return;
|