Merge remote-tracking branch 'origin/master'

ant-design-vue-jeecg/src/views/fieldx/FieldxList.vue

@@ -123,6 +123,8 @@
     data () {
       return {
         description: '字段管理管理页面',
+        loadRouteType:false,
+        tableId:'',
         // 表头
         columns: [
           {
@@ -244,6 +246,7 @@
     },
     created() {
     this.getSuperFieldList();
+    this.loadParameter();
     },
     computed: {
       importExcelUrl: function(){
@@ -253,6 +256,14 @@
     methods: {
       initDictConfig(){
       },
+      //加载传递参数
+      loadParameter() {
+        if (this.loadRouteType == false) {
+          this.tableId = this.$route.query.id;
+          console.log(this.tableId)
+          this.loadRouteType = true;
+        }
+      },
       getSuperFieldList(){
         let fieldList=[];
         fieldList.push({type:'string',value:'tableId',text:'对应实体id',dictCode:'tablex,table_name,id'})

ant-design-vue-jeecg/src/views/tablex/TablexList.vue

@@ -89,6 +89,9 @@
         </template>
 
         <span slot="action" slot-scope="text, record">
+          <a @click="tablemanage(record.id)">实体管理</a>
+          <a-divider type="vertical" />
+
           <a @click="handleEdit(record)">编辑</a>
 
           <a-divider type="vertical" />
@@ -229,6 +232,12 @@
       },
     },
     methods: {
+      tablemanage(id) {
+        this.$router.push({
+          path: '/fieldx/FieldxList',
+          query: {id: id}
+        })
+      },
       initDictConfig(){
       },
       getSuperFieldList(){

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/fieldx/controller/FieldxController.java

@@ -131,8 +131,8 @@ public class FieldxController extends JeecgController<Fieldx, IFieldxService> {
 	@ApiOperation(value="字段管理-通过id删除", notes="字段管理-通过id删除")
 	@DeleteMapping(value = "/delete")
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
-		fieldxService.removeById(id);
 		Fieldx fieldx = fieldxService.getById(id);
+		fieldxService.removeById(id);
 		tablexService.updateSql(fieldx.getTableId(),createSql(fieldx.getTableId()));
 		return Result.OK("删除成功!");
 	}