drew il y a 5 ans
Parent
commit
5319d49d31

+ 10 - 0
src/main/java/com/izouma/awesomeAdmin/domain/AuditedEntity.java

@@ -38,6 +38,8 @@ public abstract class AuditedEntity {
     @LastModifiedDate
     private LocalDateTime modifiedAt;
 
+    private boolean del;
+
     public String getCreatedBy() {
         return createdBy;
     }
@@ -70,4 +72,12 @@ public abstract class AuditedEntity {
     public void setModifiedAt(LocalDateTime modifiedAt) {
         this.modifiedAt = modifiedAt;
     }
+
+    public boolean isDel() {
+        return del;
+    }
+
+    public void setDel(boolean del) {
+        this.del = del;
+    }
 }

+ 10 - 0
src/main/java/com/izouma/awesomeAdmin/domain/BaseEntity.java

@@ -40,6 +40,8 @@ public abstract class BaseEntity {
     @LastModifiedDate
     private LocalDateTime modifiedAt;
 
+    private boolean del;
+
     public Long getId() {
         return id;
     }
@@ -80,4 +82,12 @@ public abstract class BaseEntity {
     public void setModifiedAt(LocalDateTime modifiedAt) {
         this.modifiedAt = modifiedAt;
     }
+
+    public boolean isDel() {
+        return del;
+    }
+
+    public void setDel(boolean del) {
+        this.del = del;
+    }
 }

+ 1 - 8
src/main/java/com/izouma/awesomeAdmin/service/GenCodeService.java

@@ -169,13 +169,6 @@ public class GenCodeService {
     }
 
     private boolean canSoftDelete(GenCode model) {
-        try {
-            Field field = Class.forName(model.getTablePackage()).getDeclaredField("del");
-            if (field.getType().equals(Boolean.class) || field.getType().equals(boolean.class)) {
-                return true;
-            }
-        } catch (NoSuchFieldException | ClassNotFoundException ignored) {
-        }
-        return false;
+        return true;
     }
 }

+ 1 - 1
src/main/resources/templates/EditViewTemplate.ftl

@@ -120,7 +120,7 @@
             }
             <#list model.fields as field>
                 <#if (field.formType == 'select' || field.formType == 'multiSelect') && field.apiFlag == '2'>
-            this.$http.get('${field.optionsMethod}').then(res => {
+            this.$http.get('${field.optionsMethod}', { size: 1000, query: { del: false } }).then(res => {
                 if (res.content.length > 0) {
                 res.content.forEach(item => {
                         this.${field.modelName}Options.push({

+ 2 - 0
src/main/vue/.prettierrc.js

@@ -2,6 +2,8 @@ module.exports = {
     printWidth: 120,
     singleQuote: true,
     tabWidth: 4,
+    arrowParens: 'avoid',
+    trailingComma: 'none',
     overrides: [
         {
             files: '*.html',

+ 3 - 5
src/main/vue/src/views/GenCodeEdit.vue

@@ -1,6 +1,6 @@
 <template>
-    <div v-loading="loading" element-loading-text="拼命加载中">
-        <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="mini">
+    <div v-loading="loading" element-loading-text="拼命加载中" class="edit-view">
+        <el-form :model="formData" :rules="rules" ref="form" label-width="50px" label-position="right" size="mini">
             <el-form-item prop="tableName" label="表名">
                 <el-select
                     placeholder="表名"
@@ -578,9 +578,7 @@ export default {
                 })
                 .catch(e => {
                     this.loading = false;
-                    if ('cancel' === e) {
-                        this.$message.info('生成取消');
-                    } else {
+                    if ('cancel' !== e) {
                         this.$message.error(eval);
                     }
                 });