liu.tao3 пре 1 година
родитељ
комит
6c6e1d805d

+ 1 - 0
data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue

@@ -803,6 +803,7 @@ export default {
       getTableFieldList(this.dataForm.sourceId, this.dataForm.tableName).then((data) => {
         const fieldDescMap = {}
         this.fieldList = data.map(field => {
+          field.columnName="`"+field.columnName+"`"
           fieldDescMap[field.columnName] = field.columnComment
           field.isCheck = false
           if (this.dataForm.fieldInfo.includes(field.columnName)) {

+ 8 - 2
data-room-ui/packages/DataSetManagement/src/TypeTree.vue

@@ -158,7 +158,7 @@ import 'ztree/js/jquery.ztree.exhide'
 import 'data-room-ui/assets/style/zTree/metroStyle.css'
 import 'data-room-ui/assets/style/zTree/zTree.scss'
 import 'data-room-ui/assets/style/zTree/zTreeSelect.scss'
-import { getCategoryTree, categoryRemove } from 'data-room-ui/js/utils/datasetConfigService'
+import { getCategoryTree, categoryRemove,categoryDele } from 'data-room-ui/js/utils/datasetConfigService'
 import CategroyEditForm from './CategroyEditForm.vue'
 export default {
   name: 'DatasetTypeTreeIndex',
@@ -373,7 +373,13 @@ export default {
     menuClick (editType) {
       // 删除节点
       if (editType === this.editTypeConstant.deleteOrg) {
-        this.deleteOrg(this.rightClickForm.org)
+         categoryDele(this.rightClickForm.org.id).then((res)=>{
+          if(res==0){
+            this.deleteOrg(this.rightClickForm.org)
+          }else{
+            this.$message.error('当前节点下存在已定义数据集,无法删除')
+          }
+        })
         return
       }
       // 编辑节点

+ 10 - 1
data-room-ui/packages/js/utils/datasetConfigService.js

@@ -17,7 +17,15 @@ const datasetPage = (params = {}, flag = false) => Vue.prototype.$dataRoomAxios.
  * @param flag
  * @returns {*}
  */
-const datasetCheck = (id='-1', flag = false) => Vue.prototype.$dataRoomAxios.post(`/dataset/deleteCheck/${id}`, {}, flag)
+const datasetCheck = (id = '-1', flag = false) => Vue.prototype.$dataRoomAxios.post(`/dataset/deleteCheck/${id}`, {}, flag)
+
+/**
+ * 验证节点是否可删除
+ * @param params
+ * @param flag
+ * @returns {*}
+ */
+const categoryDele = (id = '-1', flag = false) => Vue.prototype.$dataRoomAxios.get(`/dataset/getCountByType/${id}`, {}, flag)
 
 
 /**
@@ -118,6 +126,7 @@ export {
   nameCheckRepeat,
   datasetExecuteTest,
   getDataset,
+  categoryDele,
 
   getCategoryTree,
   categoryAdd,