KH/kh-device-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【添加】model修复完毕

Browse Source
This commit is contained in:
zer0Black
2021-03-12 15:37:47 +08:00
parent 93bc376622
commit 393018b2dd
12 changed files with 66 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/controller/OnlCgformApiController.java
+9 -8
View File
@@ -47,10 +47,11 @@ import org.jeecg.modules.online.cgform.converter.ConvertUtil;
import org.jeecg.modules.online.cgform.entity.OnlCgformEnhanceJs; import org.jeecg.modules.online.cgform.entity.OnlCgformEnhanceJs;
import org.jeecg.modules.online.cgform.entity.OnlCgformField; import org.jeecg.modules.online.cgform.entity.OnlCgformField;
import org.jeecg.modules.online.cgform.entity.OnlCgformHead; import org.jeecg.modules.online.cgform.entity.OnlCgformHead;
import org.jeecg.modules.online.cgform.model.OnlCgformModel;
import org.jeecg.modules.online.cgform.model.OnlGenerateModel; import org.jeecg.modules.online.cgform.model.OnlGenerateModel;
import org.jeecg.modules.online.cgform.model.TreeModel; import org.jeecg.modules.online.cgform.model.TreeModel;
import org.jeecg.modules.online.cgform.model.b; import org.jeecg.modules.online.cgform.model.OnlComplexModel;
import org.jeecg.modules.online.cgform.model.e; import org.jeecg.modules.online.cgform.model.TreeSelectColumn;
import org.jeecg.modules.online.cgform.service.IOnlCgformFieldService; import org.jeecg.modules.online.cgform.service.IOnlCgformFieldService;
import org.jeecg.modules.online.cgform.service.IOnlCgformHeadService; import org.jeecg.modules.online.cgform.service.IOnlCgformHeadService;
import org.jeecg.modules.online.cgform.service.IOnlCgformSqlService; import org.jeecg.modules.online.cgform.service.IOnlCgformSqlService;
@@ -108,7 +109,7 @@ public class OnlCgformApiController {
} }
@PostMapping({"/addAll"}) @PostMapping({"/addAll"})
public Result<?> a(@RequestBody org.jeecg.modules.online.cgform.model.a var1) { public Result<?> a(@RequestBody OnlCgformModel var1) {
try { try {
String var2 = var1.getHead().getTableName(); String var2 = var1.getHead().getTableName();
return d.a(var2) ? Result.error("数据库表[" + var2 + "]已存在,请从数据库导入表单") : this.onlCgformHeadService.addAll(var1); return d.a(var2) ? Result.error("数据库表[" + var2 + "]已存在,请从数据库导入表单") : this.onlCgformHeadService.addAll(var1);
@@ -119,7 +120,7 @@ public class OnlCgformApiController {
} }
@PutMapping({"/editAll"}) @PutMapping({"/editAll"})
public Result<?> b(@RequestBody org.jeecg.modules.online.cgform.model.a var1) { public Result<?> b(@RequestBody OnlCgformModel var1) {
try { try {
return this.onlCgformHeadService.editAll(var1); return this.onlCgformHeadService.editAll(var1);
} catch (Exception var3) { } catch (Exception var3) {
@@ -135,14 +136,14 @@ public class OnlCgformApiController {
) )
@OnlineAuth("getColumns") @OnlineAuth("getColumns")
@GetMapping({"/getColumns/{code}"}) @GetMapping({"/getColumns/{code}"})
public Result<b> a(@PathVariable("code") String var1) { public Result<OnlComplexModel> a(@PathVariable("code") String var1) {
Result var2 = new Result(); Result var2 = new Result();
OnlCgformHead var3 = (OnlCgformHead)this.onlCgformHeadService.getById(var1); OnlCgformHead var3 = (OnlCgformHead)this.onlCgformHeadService.getById(var1);
if (var3 == null) { if (var3 == null) {
var2.error500("实体不存在"); var2.error500("实体不存在");
return var2; return var2;
} else { } else {
b var4 = this.onlineService.queryOnlineConfig(var3); OnlComplexModel var4 = this.onlineService.queryOnlineConfig(var3);
var4.setIsDesForm(var3.getIsDesForm()); var4.setIsDesForm(var3.getIsDesForm());
var4.setDesFormCode(var3.getDesFormCode()); var4.setDesFormCode(var3.getDesFormCode());
var2.setResult(var4); var2.setResult(var4);
@@ -241,7 +242,7 @@ public class OnlCgformApiController {
JSONObject var19 = new JSONObject(); JSONObject var19 = new JSONObject();
List var20 = this.onlAuthPageService.queryFormDisabledCode(var17.getId()); List var20 = this.onlAuthPageService.queryFormDisabledCode(var17.getId());
if (1 == var17.getRelationType()) { if (1 == var17.getRelationType()) {
var19 = org.jeecg.modules.online.cgform.util.b.a(var18, var20, (e)null); var19 = org.jeecg.modules.online.cgform.util.b.a(var18, var20, (TreeSelectColumn)null);
} else { } else {
var19.put("columns", org.jeecg.modules.online.cgform.util.b.a(var18, var20)); var19.put("columns", org.jeecg.modules.online.cgform.util.b.a(var18, var20));
List var15 = this.onlAuthPageService.queryListHideButton((String)null, var17.getId()); List var15 = this.onlAuthPageService.queryListHideButton((String)null, var17.getId());
@@ -1178,7 +1179,7 @@ public class OnlCgformApiController {
return var2; return var2;
} else { } else {
HashMap var4 = new HashMap(); HashMap var4 = new HashMap();
b var5 = this.onlineService.queryOnlineConfig(var3); OnlComplexModel var5 = this.onlineService.queryOnlineConfig(var3);
var4.put("main", var5); var4.put("main", var5);
if ("erp".equals(var3.getThemeTemplate()) && var3.getTableType() == 2) { if ("erp".equals(var3.getThemeTemplate()) && var3.getTableType() == 2) {
String var6 = var3.getSubTableStr(); String var6 = var3.getSubTableStr();
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/model/a.java → jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/model/OnlCgformModel.java
+2 -2
View File
@@ -6,14 +6,14 @@ import org.jeecg.modules.online.cgform.entity.OnlCgformField;
import org.jeecg.modules.online.cgform.entity.OnlCgformHead; import org.jeecg.modules.online.cgform.entity.OnlCgformHead;
import org.jeecg.modules.online.cgform.entity.OnlCgformIndex; import org.jeecg.modules.online.cgform.entity.OnlCgformIndex;
public class a { public class OnlCgformModel {
private OnlCgformHead a; private OnlCgformHead a;
private List<OnlCgformField> b; private List<OnlCgformField> b;
private List<String> c; private List<String> c;
private List<OnlCgformIndex> d; private List<OnlCgformIndex> d;
private List<String> e; private List<String> e;
public a() { public OnlCgformModel() {
} }
public OnlCgformHead getHead() { public OnlCgformHead getHead() {
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/model/OnlColumn.java
+6 -6
View File
@@ -6,7 +6,7 @@ public class OnlColumn {
private String dataIndex; private String dataIndex;
private String align; private String align;
private String customRender; private String customRender;
private d scopedSlots; private ScopedSlots scopedSlots;
private String hrefSlotName; private String hrefSlotName;
private int showLength; private int showLength;
private boolean sorter = false; private boolean sorter = false;
@@ -36,7 +36,7 @@ public class OnlColumn {
return this.customRender; return this.customRender;
} }
public d getScopedSlots() { public ScopedSlots getScopedSlots() {
return this.scopedSlots; return this.scopedSlots;
} }
@@ -68,7 +68,7 @@ public class OnlColumn {
this.customRender = customRender; this.customRender = customRender;
} }
public void setScopedSlots(d scopedSlots) { public void setScopedSlots(ScopedSlots scopedSlots) {
this.scopedSlots = scopedSlots; this.scopedSlots = scopedSlots;
} }
@@ -150,8 +150,8 @@ public class OnlColumn {
return false; return false;
} }
d var11 = this.getScopedSlots(); ScopedSlots var11 = this.getScopedSlots();
d var12 = var2.getScopedSlots(); ScopedSlots var12 = var2.getScopedSlots();
if (var11 == null) { if (var11 == null) {
if (var12 != null) { if (var12 != null) {
return false; return false;
@@ -192,7 +192,7 @@ public class OnlColumn {
var9 = var9 * 59 + (var5 == null ? 43 : var5.hashCode()); var9 = var9 * 59 + (var5 == null ? 43 : var5.hashCode());
String var6 = this.getCustomRender(); String var6 = this.getCustomRender();
var9 = var9 * 59 + (var6 == null ? 43 : var6.hashCode()); var9 = var9 * 59 + (var6 == null ? 43 : var6.hashCode());
d var7 = this.getScopedSlots(); ScopedSlots var7 = this.getScopedSlots();
var9 = var9 * 59 + (var7 == null ? 43 : var7.hashCode()); var9 = var9 * 59 + (var7 == null ? 43 : var7.hashCode());
String var8 = this.getHrefSlotName(); String var8 = this.getHrefSlotName();
var9 = var9 * 59 + (var8 == null ? 43 : var8.hashCode()); var9 = var9 * 59 + (var8 == null ? 43 : var8.hashCode());
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/model/b.java → jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/model/OnlComplexModel.java
+8 -8
View File
@@ -7,7 +7,7 @@ import java.util.Map;
import com.jero.common.system.vo.DictModel; import com.jero.common.system.vo.DictModel;
import org.jeecg.modules.online.cgform.entity.OnlCgformButton; import org.jeecg.modules.online.cgform.entity.OnlCgformButton;
public class b { public class OnlComplexModel {
private String b; private String b;
private String c; private String c;
private String d; private String d;
@@ -22,7 +22,7 @@ public class b {
private List<OnlCgformButton> m; private List<OnlCgformButton> m;
List<HrefSlots> a; List<HrefSlots> a;
private String n; private String n;
private List<c> o; private List<OnlForeignKey> o;
private String p; private String p;
private String q; private String q;
private String r; private String r;
@@ -30,7 +30,7 @@ public class b {
private String t; private String t;
private Integer u; private Integer u;
public b() { public OnlComplexModel() {
} }
public String getCode() { public String getCode() {
@@ -89,7 +89,7 @@ public class b {
return this.n; return this.n;
} }
public List<c> getForeignKeys() { public List<OnlForeignKey> getForeignKeys() {
return this.o; return this.o;
} }
@@ -173,7 +173,7 @@ public class b {
this.n = enhanceJs; this.n = enhanceJs;
} }
public void setForeignKeys(List<c> foreignKeys) { public void setForeignKeys(List<OnlForeignKey> foreignKeys) {
this.o = foreignKeys; this.o = foreignKeys;
} }
@@ -204,10 +204,10 @@ public class b {
public boolean equals(Object o) { public boolean equals(Object o) {
if (o == this) { if (o == this) {
return true; return true;
} else if (!(o instanceof b)) { } else if (!(o instanceof OnlComplexModel)) {
return false; return false;
} else { } else {
b var2 = (b)o; OnlComplexModel var2 = (OnlComplexModel)o;
if (!var2.a(this)) { if (!var2.a(this)) {
return false; return false;
} else { } else {
@@ -467,7 +467,7 @@ public class b {
} }
protected boolean a(Object var1) { protected boolean a(Object var1) {
return var1 instanceof b; return var1 instanceof OnlComplexModel;
} }
public int hashCode() { public int hashCode() {
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/model/c.java → jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/model/OnlForeignKey.java
+6 -6
View File
@@ -1,15 +1,15 @@
package org.jeecg.modules.online.cgform.model; package org.jeecg.modules.online.cgform.model;
public class c { public class OnlForeignKey {
private String a; private String a;
private String b; private String b;
private String c; private String c;
public c() { public OnlForeignKey() {
} }
public c(String var1, String var2) { public OnlForeignKey(String var1, String var2) {
this.c = var2; this.c = var2;
this.a = var1; this.a = var1;
} }
@@ -41,10 +41,10 @@ public class c {
public boolean equals(Object o) { public boolean equals(Object o) {
if (o == this) { if (o == this) {
return true; return true;
} else if (!(o instanceof c)) { } else if (!(o instanceof OnlForeignKey)) {
return false; return false;
} else { } else {
c var2 = (c)o; OnlForeignKey var2 = (OnlForeignKey)o;
if (!var2.a(this)) { if (!var2.a(this)) {
return false; return false;
} else { } else {
@@ -88,7 +88,7 @@ public class c {
} }
protected boolean a(Object var1) { protected boolean a(Object var1) {
return var1 instanceof c; return var1 instanceof OnlForeignKey;
} }
public int hashCode() { public int hashCode() {
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/model/d.java → jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/model/ScopedSlots.java
+6 -6
View File
@@ -1,13 +1,13 @@
package org.jeecg.modules.online.cgform.model; package org.jeecg.modules.online.cgform.model;
public class d { public class ScopedSlots {
private String a; private String a;
public d() { public ScopedSlots() {
} }
public d(String var1) { public ScopedSlots(String var1) {
this.a = var1; this.a = var1;
} }
@@ -22,10 +22,10 @@ public class d {
public boolean equals(Object o) { public boolean equals(Object o) {
if (o == this) { if (o == this) {
return true; return true;
} else if (!(o instanceof d)) { } else if (!(o instanceof ScopedSlots)) {
return false; return false;
} else { } else {
d var2 = (d)o; ScopedSlots var2 = (ScopedSlots)o;
if (!var2.a(this)) { if (!var2.a(this)) {
return false; return false;
} else { } else {
@@ -45,7 +45,7 @@ public class d {
} }
protected boolean a(Object var1) { protected boolean a(Object var1) {
return var1 instanceof d; return var1 instanceof ScopedSlots;
} }
public int hashCode() { public int hashCode() {
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/model/e.java → jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/model/TreeSelectColumn.java
+2 -2
View File
@@ -1,7 +1,7 @@
package org.jeecg.modules.online.cgform.model; package org.jeecg.modules.online.cgform.model;
public class e { public class TreeSelectColumn {
private String a; private String a;
private String b; private String b;
private String c; private String c;
@@ -10,7 +10,7 @@ public class e {
private String f; private String f;
private String g; private String g;
public e() { public TreeSelectColumn() {
} }
public String getFieldName() { public String getFieldName() {
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/IOnlCgformHeadService.java
+3 -3
View File
@@ -16,15 +16,15 @@ import org.jeecg.modules.online.cgform.entity.OnlCgformEnhanceJava;
import org.jeecg.modules.online.cgform.entity.OnlCgformEnhanceJs; import org.jeecg.modules.online.cgform.entity.OnlCgformEnhanceJs;
import org.jeecg.modules.online.cgform.entity.OnlCgformEnhanceSql; import org.jeecg.modules.online.cgform.entity.OnlCgformEnhanceSql;
import org.jeecg.modules.online.cgform.entity.OnlCgformHead; import org.jeecg.modules.online.cgform.entity.OnlCgformHead;
import org.jeecg.modules.online.cgform.model.OnlCgformModel;
import org.jeecg.modules.online.cgform.model.OnlGenerateModel; import org.jeecg.modules.online.cgform.model.OnlGenerateModel;
import org.jeecg.modules.online.cgform.model.a;
import org.jeecg.modules.online.config.exception.BusinessException; import org.jeecg.modules.online.config.exception.BusinessException;
import org.jeecg.modules.online.config.exception.DBException; import org.jeecg.modules.online.config.exception.DBException;
public interface IOnlCgformHeadService extends IService<OnlCgformHead> { public interface IOnlCgformHeadService extends IService<OnlCgformHead> {
Result<?> addAll(a var1); Result<?> addAll(OnlCgformModel var1);
Result<?> editAll(a var1); Result<?> editAll(OnlCgformModel var1);
void doDbSynch(String var1, String var2) throws HibernateException, IOException, TemplateException, SQLException, DBException; void doDbSynch(String var1, String var2) throws HibernateException, IOException, TemplateException, SQLException, DBException;
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/IOnlineService.java
+2 -2
View File
@@ -6,10 +6,10 @@ import java.util.List;
import org.jeecg.modules.online.cgform.entity.OnlCgformButton; import org.jeecg.modules.online.cgform.entity.OnlCgformButton;
import org.jeecg.modules.online.cgform.entity.OnlCgformEnhanceJs; import org.jeecg.modules.online.cgform.entity.OnlCgformEnhanceJs;
import org.jeecg.modules.online.cgform.entity.OnlCgformHead; import org.jeecg.modules.online.cgform.entity.OnlCgformHead;
import org.jeecg.modules.online.cgform.model.b; import org.jeecg.modules.online.cgform.model.OnlComplexModel;
public interface IOnlineService { public interface IOnlineService {
b queryOnlineConfig(OnlCgformHead var1); OnlComplexModel queryOnlineConfig(OnlCgformHead var1);
JSONObject queryOnlineFormObj(OnlCgformHead var1, OnlCgformEnhanceJs var2); JSONObject queryOnlineFormObj(OnlCgformHead var1, OnlCgformEnhanceJs var2);
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/e.java
+6 -5
View File
@@ -44,8 +44,9 @@ import org.jeecg.modules.online.cgform.mapper.OnlCgformEnhanceJavaMapper;
import org.jeecg.modules.online.cgform.mapper.OnlCgformEnhanceJsMapper; import org.jeecg.modules.online.cgform.mapper.OnlCgformEnhanceJsMapper;
import org.jeecg.modules.online.cgform.mapper.OnlCgformEnhanceSqlMapper; import org.jeecg.modules.online.cgform.mapper.OnlCgformEnhanceSqlMapper;
import org.jeecg.modules.online.cgform.mapper.OnlCgformHeadMapper; import org.jeecg.modules.online.cgform.mapper.OnlCgformHeadMapper;
import org.jeecg.modules.online.cgform.model.OnlCgformModel;
import org.jeecg.modules.online.cgform.model.OnlGenerateModel; import org.jeecg.modules.online.cgform.model.OnlGenerateModel;
import org.jeecg.modules.online.cgform.model.a; import org.jeecg.modules.online.cgform.model.TreeSelectColumn;
import org.jeecg.modules.online.cgform.service.IOnlCgformFieldService; import org.jeecg.modules.online.cgform.service.IOnlCgformFieldService;
import org.jeecg.modules.online.cgform.service.IOnlCgformHeadService; import org.jeecg.modules.online.cgform.service.IOnlCgformHeadService;
import org.jeecg.modules.online.cgform.service.IOnlCgformIndexService; import org.jeecg.modules.online.cgform.service.IOnlCgformIndexService;
@@ -97,7 +98,7 @@ public class e extends ServiceImpl<OnlCgformHeadMapper, OnlCgformHead> implement
@Transactional( @Transactional(
rollbackFor = {Exception.class} rollbackFor = {Exception.class}
) )
public Result<?> addAll(a model) { public Result<?> addAll(OnlCgformModel model) {
String var2 = UUID.randomUUID().toString().replace("-", ""); String var2 = UUID.randomUUID().toString().replace("-", "");
OnlCgformHead var3 = model.getHead(); OnlCgformHead var3 = model.getHead();
List var4 = model.getFields(); List var4 = model.getFields();
@@ -141,7 +142,7 @@ public class e extends ServiceImpl<OnlCgformHeadMapper, OnlCgformHead> implement
@Transactional( @Transactional(
rollbackFor = {Exception.class} rollbackFor = {Exception.class}
) )
public Result<?> editAll(a model) { public Result<?> editAll(OnlCgformModel model) {
OnlCgformHead var2 = model.getHead(); OnlCgformHead var2 = model.getHead();
OnlCgformHead var3 = (OnlCgformHead)super.getById(var2.getId()); OnlCgformHead var3 = (OnlCgformHead)super.getById(var2.getId());
if (var3 == null) { if (var3 == null) {
@@ -1135,7 +1136,7 @@ public class e extends ServiceImpl<OnlCgformHeadMapper, OnlCgformHead> implement
} }
} }
JSONObject var14 = org.jeecg.modules.online.cgform.util.b.a(var2, var3, (org.jeecg.modules.online.cgform.model.e)null); JSONObject var14 = org.jeecg.modules.online.cgform.util.b.a(var2, var3, (TreeSelectColumn)null);
if (head.getTableType() == 2) { if (head.getTableType() == 2) {
String var5 = head.getSubTableStr(); String var5 = head.getSubTableStr();
if (oConvertUtils.isNotEmpty(var5)) { if (oConvertUtils.isNotEmpty(var5)) {
@@ -1157,7 +1158,7 @@ public class e extends ServiceImpl<OnlCgformHeadMapper, OnlCgformHead> implement
JSONObject var13 = new JSONObject(); JSONObject var13 = new JSONObject();
if (1 == var10.getRelationType()) { if (1 == var10.getRelationType()) {
var13 = org.jeecg.modules.online.cgform.util.b.a(var11, var12, (org.jeecg.modules.online.cgform.model.e)null); var13 = org.jeecg.modules.online.cgform.util.b.a(var11, var12, (TreeSelectColumn)null);
} else { } else {
var13.put("columns", org.jeecg.modules.online.cgform.util.b.a(var11, var12)); var13.put("columns", org.jeecg.modules.online.cgform.util.b.a(var11, var12));
} }
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/service/impl/i.java
+14 -14
View File
@@ -22,10 +22,10 @@ import org.jeecg.modules.online.cgform.entity.OnlCgformField;
import org.jeecg.modules.online.cgform.entity.OnlCgformHead; import org.jeecg.modules.online.cgform.entity.OnlCgformHead;
import org.jeecg.modules.online.cgform.model.HrefSlots; import org.jeecg.modules.online.cgform.model.HrefSlots;
import org.jeecg.modules.online.cgform.model.OnlColumn; import org.jeecg.modules.online.cgform.model.OnlColumn;
import org.jeecg.modules.online.cgform.model.b; import org.jeecg.modules.online.cgform.model.OnlComplexModel;
import org.jeecg.modules.online.cgform.model.c; import org.jeecg.modules.online.cgform.model.OnlForeignKey;
import org.jeecg.modules.online.cgform.model.d; import org.jeecg.modules.online.cgform.model.ScopedSlots;
import org.jeecg.modules.online.cgform.model.e; import org.jeecg.modules.online.cgform.model.TreeSelectColumn;
import org.jeecg.modules.online.cgform.service.IOnlCgformFieldService; import org.jeecg.modules.online.cgform.service.IOnlCgformFieldService;
import org.jeecg.modules.online.cgform.service.IOnlCgformHeadService; import org.jeecg.modules.online.cgform.service.IOnlCgformHeadService;
import org.jeecg.modules.online.cgform.service.IOnlineService; import org.jeecg.modules.online.cgform.service.IOnlineService;
@@ -47,7 +47,7 @@ public class i implements IOnlineService {
public i() { public i() {
} }
public b queryOnlineConfig(OnlCgformHead head) { public OnlComplexModel queryOnlineConfig(OnlCgformHead head) {
String var2 = head.getId(); String var2 = head.getId();
List var3 = this.a(var2); List var3 = this.a(var2);
List var4 = this.onlAuthPageService.queryHideCode(var2, true); List var4 = this.onlAuthPageService.queryHideCode(var2, true);
@@ -65,7 +65,7 @@ public class i implements IOnlineService {
String var13 = var11.getMainTable(); String var13 = var11.getMainTable();
var14 = var11.getMainField(); var14 = var11.getMainField();
if (oConvertUtils.isNotEmpty(var14) && oConvertUtils.isNotEmpty(var13)) { if (oConvertUtils.isNotEmpty(var14) && oConvertUtils.isNotEmpty(var13)) {
c var15 = new c(var12, var14); OnlForeignKey var15 = new OnlForeignKey(var12, var14);
var8.add(var15); var8.add(var15);
} }
@@ -137,15 +137,15 @@ public class i implements IOnlineService {
} }
if (var17.indexOf("file") >= 0) { if (var17.indexOf("file") >= 0) {
var28.setScopedSlots(new d("fileSlot")); var28.setScopedSlots(new ScopedSlots("fileSlot"));
} else if (var17.indexOf("image") >= 0) { } else if (var17.indexOf("image") >= 0) {
var28.setScopedSlots(new d("imgSlot")); var28.setScopedSlots(new ScopedSlots("imgSlot"));
} else if (var17.indexOf("editor") >= 0) { } else if (var17.indexOf("editor") >= 0) {
var28.setScopedSlots(new d("htmlSlot")); var28.setScopedSlots(new ScopedSlots("htmlSlot"));
} else if (var17.equals("date")) { } else if (var17.equals("date")) {
var28.setScopedSlots(new d("dateSlot")); var28.setScopedSlots(new ScopedSlots("dateSlot"));
} else if (var17.equals("pca")) { } else if (var17.equals("pca")) {
var28.setScopedSlots(new d("pcaSlot")); var28.setScopedSlots(new ScopedSlots("pcaSlot"));
} }
if (StringUtils.isNotBlank(var11.getFieldHref())) { if (StringUtils.isNotBlank(var11.getFieldHref())) {
@@ -172,7 +172,7 @@ public class i implements IOnlineService {
} }
} }
b var22 = new b(); OnlComplexModel var22 = new OnlComplexModel();
var22.setCode(var2); var22.setCode(var2);
var22.setTableType(head.getTableType()); var22.setTableType(head.getTableType());
var22.setFormTemplate(head.getFormTemplate()); var22.setFormTemplate(head.getFormTemplate());
@@ -246,9 +246,9 @@ public class i implements IOnlineService {
List var5 = this.onlCgformFieldService.queryAvailableFields(head.getId(), head.getTableName(), (String)null, false); List var5 = this.onlCgformFieldService.queryAvailableFields(head.getId(), head.getTableName(), (String)null, false);
List var6 = this.onlAuthPageService.queryFormDisabledCode(var4); List var6 = this.onlAuthPageService.queryFormDisabledCode(var4);
EnhanceJsUtil.a(onlCgformEnhanceJs, head.getTableName(), var5); EnhanceJsUtil.a(onlCgformEnhanceJs, head.getTableName(), var5);
e var7 = null; TreeSelectColumn var7 = null;
if ("Y".equals(head.getIsTree())) { if ("Y".equals(head.getIsTree())) {
var7 = new e(); var7 = new TreeSelectColumn();
var7.setCodeField("id"); var7.setCodeField("id");
var7.setFieldName(head.getTreeParentIdField()); var7.setFieldName(head.getTreeParentIdField());
var7.setPidField(head.getTreeParentIdField()); var7.setPidField(head.getTreeParentIdField());
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/org/jeecg/modules/online/cgform/util/b.java
+2 -3
View File
@@ -62,9 +62,8 @@ import org.jeecg.modules.online.cgform.entity.OnlCgformHead;
import org.jeecg.modules.online.cgform.entity.OnlCgformIndex; import org.jeecg.modules.online.cgform.entity.OnlCgformIndex;
import org.jeecg.modules.online.cgform.enums.CgformValidPatternEnum; import org.jeecg.modules.online.cgform.enums.CgformValidPatternEnum;
import org.jeecg.modules.online.cgform.mapper.OnlCgformHeadMapper; import org.jeecg.modules.online.cgform.mapper.OnlCgformHeadMapper;
import org.jeecg.modules.online.cgform.model.e; import org.jeecg.modules.online.cgform.model.TreeSelectColumn;
import org.jeecg.modules.online.cgform.service.IOnlCgformFieldService; import org.jeecg.modules.online.cgform.service.IOnlCgformFieldService;
import org.jeecg.modules.online.config.b.d;
import org.jeecg.modules.online.config.exception.DBException; import org.jeecg.modules.online.config.exception.DBException;
import org.jeecgframework.poi.excel.entity.params.ExcelExportEntity; import org.jeecgframework.poi.excel.entity.params.ExcelExportEntity;
import org.slf4j.Logger; import org.slf4j.Logger;
@@ -540,7 +539,7 @@ public class b {
return true; return true;
} }
public static JSONObject a(List<OnlCgformField> var0, List<String> var1, e var2) { public static JSONObject a(List<OnlCgformField> var0, List<String> var1, TreeSelectColumn var2) {
new JSONObject(); new JSONObject();
ArrayList var4 = new ArrayList(); ArrayList var4 = new ArrayList();
ArrayList var5 = new ArrayList(); ArrayList var5 = new ArrayList();