项目初始化

datax-modules/data-masterdata-service-parent/data-masterdata-service/src/main/java/cn/datax/service/data/masterdata/controller/ModelDataController.java

@@ -20,7 +20,7 @@ public class ModelDataController extends BaseController {
     private ModelDataService modelDataService;
 
     @GetMapping("/{id}")
-    public R getModelDataById(@PathVariable String id, @RequestBody ModelDataEntity modelDataEntity) {
+    public R getModelDataById(@PathVariable String id, ModelDataEntity modelDataEntity) {
         Map<String, Object> data = modelDataService.getModelDataById(modelDataEntity);
         return R.ok().setData(data);
     }

datax-ui/src/views/masterdata/datamanage/DataDetail.vue

@@ -113,24 +113,21 @@ export default {
   },
   created() {
     console.log('data:' + this.data)
-    getFormParam(this.data.modelId).then(response => {
-      if (response.success) {
-        const { data } = response
-        this.tableName = data.tableName
-        this.columnList = data.columnList.filter(item => item.isDetail === '1')
-      }
-    })
-  },
-  mounted() {
-    this.getData(this.data.id)
+    this.getFormData()
   },
   methods: {
     showCard() {
       this.$emit('showCard', this.showOptions)
     },
-    /** 获取详情 */
-    getData: function(id) {
-      getData({ id: id, tableName: this.tableName }).then(response => {
+    async getFormData() {
+      const data = await getFormParam(this.data.modelId).then(response => {
+        if (response.success) {
+          return response.data
+        }
+      })
+      this.tableName = data.tableName
+      this.columnList = data.columnList.filter(item => item.isDetail === '1')
+      await getData({ id: this.data.id, tableName: this.tableName }).then(response => {
         if (response.success) {
           this.form = response.data
         }

datax-ui/src/views/masterdata/datamanage/DataEdit.vue

@@ -120,24 +120,21 @@ export default {
   },
   created() {
     console.log('data:' + this.data)
-    getFormParam(this.data.modelId).then(response => {
-      if (response.success) {
-        const { data } = response
-        this.tableName = data.tableName
-        this.columnList = data.columnList.filter(item => item.isEdit === '1')
-      }
-    })
-  },
-  mounted() {
-    this.getData(this.data.id)
+    this.getFormData()
   },
   methods: {
     showCard() {
       this.$emit('showCard', this.showOptions)
     },
-    /** 获取详情 */
-    getData: function(id) {
-      getData({ id: id, tableName: this.tableName }).then(response => {
+    async getFormData() {
+      const data = await getFormParam(this.data.modelId).then(response => {
+        if (response.success) {
+          return response.data
+        }
+      })
+      this.tableName = data.tableName
+      this.columnList = data.columnList.filter(item => item.isDetail === '1')
+      await getData({ id: this.data.id, tableName: this.tableName }).then(response => {
         if (response.success) {
           this.form = response.data
         }