项目初始化

datax-modules/data-metadata-service-parent/data-metadata-service/src/main/java/cn/datax/service/data/metadata/controller/MetadataColumnController.java

@@ -155,10 +155,13 @@ public class MetadataColumnController extends BaseController {
      * @return
      */
     @ApiOperation(value = "获取层级树", notes = "根据url的层级来获取树对象")
-    @ApiImplicitParam(name = "level", value = "层级", required = true, dataType = "String", paramType = "path")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "level", value = "层级", required = true, dataType = "String", paramType = "path"),
+            @ApiImplicitParam(name = "metadataColumnQuery", value = "查询实体metadataColumnQuery", required = false, dataType = "MetadataColumnQuery")
+    })
     @GetMapping("/tree/{level}")
-    public R getDataMetadataTree(@PathVariable String level) {
-        List<MetadataTreeVo> list = metadataColumnService.getDataMetadataTree(level);
+    public R getDataMetadataTree(@PathVariable String level, MetadataColumnQuery metadataColumnQuery) {
+        List<MetadataTreeVo> list = metadataColumnService.getDataMetadataTree(level, metadataColumnQuery);
         return R.ok().setData(list);
     }
 }

datax-modules/data-metadata-service-parent/data-metadata-service/src/main/java/cn/datax/service/data/metadata/service/MetadataColumnService.java

@@ -3,6 +3,7 @@ package cn.datax.service.data.metadata.service;
 import cn.datax.service.data.metadata.api.dto.MetadataColumnDto;
 import cn.datax.common.base.BaseService;
 import cn.datax.service.data.metadata.api.entity.MetadataColumnEntity;
+import cn.datax.service.data.metadata.api.query.MetadataColumnQuery;
 import cn.datax.service.data.metadata.api.vo.MetadataTreeVo;
 
 import java.util.List;
@@ -27,5 +28,5 @@ public interface MetadataColumnService extends BaseService<MetadataColumnEntity>
 
     void deleteMetadataColumnBatch(List<String> ids);
 
-    List<MetadataTreeVo> getDataMetadataTree(String level);
+    List<MetadataTreeVo> getDataMetadataTree(String level, MetadataColumnQuery metadataColumnQuery);
 }

datax-modules/data-metadata-service-parent/data-metadata-service/src/main/java/cn/datax/service/data/metadata/service/impl/MetadataColumnServiceImpl.java

@@ -6,6 +6,7 @@ import cn.datax.service.data.metadata.api.entity.MetadataColumnEntity;
 import cn.datax.service.data.metadata.api.entity.MetadataSourceEntity;
 import cn.datax.service.data.metadata.api.entity.MetadataTableEntity;
 import cn.datax.service.data.metadata.api.enums.DataLevel;
+import cn.datax.service.data.metadata.api.query.MetadataColumnQuery;
 import cn.datax.service.data.metadata.api.vo.MetadataTreeVo;
 import cn.datax.service.data.metadata.dao.MetadataSourceDao;
 import cn.datax.service.data.metadata.dao.MetadataTableDao;
@@ -83,9 +84,11 @@ public class MetadataColumnServiceImpl extends BaseServiceImpl<MetadataColumnDao
     }
 
     @Override
-    public List<MetadataTreeVo> getDataMetadataTree(String level) {
-        List<MetadataSourceEntity> sourceList = metadataSourceDao.selectList(Wrappers.emptyWrapper());
-        List<MetadataTableEntity> tableList = metadataTableDao.selectList(Wrappers.emptyWrapper());
+    public List<MetadataTreeVo> getDataMetadataTree(String level, MetadataColumnQuery metadataColumnQuery) {
+        List<MetadataSourceEntity> sourceList = metadataSourceDao.selectList(Wrappers.<MetadataSourceEntity>lambdaQuery()
+                .eq(StrUtil.isNotBlank(metadataColumnQuery.getSourceId()), MetadataSourceEntity::getId, metadataColumnQuery.getSourceId()));
+        List<MetadataTableEntity> tableList = metadataTableDao.selectList(Wrappers.<MetadataTableEntity>lambdaQuery()
+                .eq(StrUtil.isNotBlank(metadataColumnQuery.getTableId()), MetadataTableEntity::getId, metadataColumnQuery.getTableId()));
         List<MetadataColumnEntity> columnList = metadataColumnDao.selectList(Wrappers.emptyWrapper());
         List<MetadataTreeVo> list = sourceList.stream().filter(s -> DataConstant.EnableState.ENABLE.getKey().equals(s.getStatus()))
                 .map(m -> {

datax-ui/src/api/metadata/datacolumn.js

@@ -53,9 +53,10 @@ export function updateDataColumn (data) {
   })
 }
 
-export function getDataMetadataTree (level) {
+export function getDataMetadataTree (level, data) {
   return request({
     url: '/data/metadata/columns/tree/' + level,
-    method: 'get'
+    method: 'get',
+    params: data
   })
 }

datax-ui/src/views/market/dataapi/DataApiEdit.vue

@@ -521,11 +521,11 @@ export default {
         }
       }) || {}
       this.form2 = this.form1.executeConfig
-      this.form2.table = {id: this.form2.tableId}
+      this.form2.table = { id: this.form2.tableId }
       this.form3.reqParams = this.form1.reqParams
       this.form3.resParams = this.form1.resParams
       if (this.form2.configType === '1') {
-        this.tableOptions = await listDataTable({sourceId: this.form2.sourceId}).then(response => {
+        this.tableOptions = await listDataTable({ sourceId: this.form2.sourceId }).then(response => {
           if (response.success) {
             return response.data
           }

datax-ui/src/views/metadata/datacolumn/DataColumnList.vue

@@ -222,8 +222,7 @@ export default {
     },
     /** 查询树结构 */
     getTree () {
-      let level = 'table'
-      getDataMetadataTree(level).then(response => {
+      getDataMetadataTree('table', {}).then(response => {
         if (response.success) {
           const { data } = response
           this.treeOptions = data

datax-ui/src/views/metadata/datasearch/index.vue

@@ -11,7 +11,7 @@
                   <el-option label="数据表" value="2"></el-option>
                   <el-option label="数据元" value="3"></el-option>
                 </el-select>
-                <el-button slot="append" icon="el-icon-search"></el-button>
+                <el-button slot="append" :disabled="btnEnable" icon="el-icon-search"></el-button>
               </el-input>
             </el-col>
           </el-row>
@@ -32,7 +32,7 @@
                 <el-option label="数据表" value="2"></el-option>
                 <el-option label="数据元" value="3"></el-option>
               </el-select>
-              <el-button slot="append" icon="el-icon-search" @click="search"></el-button>
+              <el-button slot="append" icon="el-icon-search" :disabled="btnEnable" @click="search"></el-button>
             </el-input>
           </div>
         </div>
@@ -51,14 +51,30 @@ export default {
         height: document.body.offsetHeight - 170 + 'px'
       },
       searchExecuting: false,
+      type: '',
       keyword: '',
-      type: ''
+      btnEnable: true
     }
   },
   methods: {
     search () {
       this.searchExecuting = true
     }
+  },
+  computed: {
+    listenChange () {
+      const { type, keyword } = this
+      return { type, keyword }
+    }
+  },
+  watch: {
+    listenChange (val) {
+      if (val.type && val.keyword) {
+        this.btnEnable = false
+      } else {
+        this.btnEnable = true
+      }
+    }
   }
 }
 </script>