Merge branch 'master' into 'virtual'

# Conflicts:
#   src/index.less

package.json

@@ -7,7 +7,7 @@
     "@antv/chart-node-g6": "^0.0.4",
     "@antv/g2": "^4.1.12",
     "@antv/g6": "^4.2.1",
-    "@craco/craco": "^6.1.2",
+    "@craco/craco": "^6.4.3",
     "@testing-library/jest-dom": "^5.11.4",
     "@testing-library/react": "^11.1.0",
     "@testing-library/user-event": "^12.1.10",
@@ -23,6 +23,7 @@
     "craco-less": "^2.0.0",
     "crypto-js": "^4.0.0",
     "echarts": "^5.3.1",
+    "eslint-config-react-app": "^7.0.1",
     "immutability-helper": "^3.1.1",
     "insert-css": "^2.0.0",
     "less": "^4.1.1",

src/model/assetmanage.js

@@ -78,6 +78,9 @@ export function* addOrUpdateDirectory(payload) {
 export function* deleteDirectory(payload) {
   return yield call(service.deleteDirectory, payload);
 }
+export function* deletePersonalCustomDirectory(payload) {
+  return yield call(service.deletePersonalCustomDirectory, payload);
+}
 export function* existDataAsset(payload) {
   return yield call(service.existDataAsset, payload);
 }

src/service/dataassetmanager.js

@@ -108,6 +108,10 @@ export function deleteDirectory(payload) {
   return PostJSON("/dataassetmanager/directoryApi/deleteDirectory", payload);
 }
 
+export function deletePersonalCustomDirectory(payload) {
+  return PostJSON("/dataassetmanager/directoryApi/deletePersonalCustomDirectory", payload);
+}
+
 export function existDataAsset(payload) {
   return GetJSON("/dataassetmanager/directoryApi/existDataAsset", payload);
 }

src/view/Manage/AssetManage/Component/AssetManageTree.jsx

@@ -311,7 +311,11 @@ const AssetManageTree = (props) => {
     }
    
     for (let i = 0; i < treeData.length; i++) {
-      const node = treeData[i];
+
+      const channelTreeData = treeData[i];
+      if (channelTreeData.children) {
+        for (let j =0; j < channelTreeData.children.length; j++) {
+          const node = channelTreeData.children[j];
           const { nodeId } = node;
     
           const groupItem = [nodeId];
@@ -321,6 +325,8 @@ const AssetManageTree = (props) => {
     
           list.push(groupItem);
         }
+      }
+    }
 
   };
 

src/view/Manage/AssetManage/Component/AssetTree.jsx

@@ -351,7 +351,7 @@ const AssetTree = (props) => {
         content: '节点下可能包含资产信息，删除后将把资产从该目录上移除，确定继续吗?',
         onOk: () => {
           dispatch({
-            type: 'assetmanage.deleteDirectory',
+            type: 'assetmanage.deletePersonalCustomDirectory',
             payload: {data: [ currentRightClickDir.nodeId ]},
             callback: () => {
               showMessage("success","删除成功");

src/view/Manage/Model/Component/ImportActionHeader.jsx

@@ -707,7 +707,7 @@ const ImportActionHeader = (props) => {
               <Descriptions.Item label={<div style={{ textAlign: 'right', width: 85 }}>数据情况</div>} >{highlightSearchContentByTerms(modelerData.dataCircumstances||'', terms)}</Descriptions.Item>
               <Descriptions.Item label={<div style={{ textAlign: 'right', width: 85 }}>分布键</div>} >{highlightSearchContentByTerms(distributionDescription||'', terms)}</Descriptions.Item>
               <Descriptions.Item label={<div style={{ textAlign: 'right', width: 85 }}>分区键</div>} >{highlightSearchContentByTerms(partitionsDescription||'', terms)}</Descriptions.Item>
-              <Descriptions.Item label={<div style={{ textAlign: 'right', width: 85 }}>主键</div>} >{highlightSearchContentByTerms(primaryDescription||'', terms)}</Descriptions.Item>
+              <Descriptions.Item label={<div style={{ textAlign: 'right', width: 85 }}>技术主键</div>} >{highlightSearchContentByTerms(primaryDescription||'', terms)}</Descriptions.Item>
               <Descriptions.Item label={<div style={{ textAlign: 'right', width: 85 }}>类主键</div>} >{highlightSearchContentByTerms(semiPrimaryDescription||'', terms)}</Descriptions.Item>
               <Descriptions.Item label={<div style={{ textAlign: 'right', width: 85 }}>加载方式</div>} >{highlightSearchContentByTerms(modelerData.dataLoadingStrategy||'', terms)}</Descriptions.Item>
               <Descriptions.Item label={<div style={{ textAlign: 'right', width: 85 }}>更新时间</div>} >{highlightSearchContentByTerms(modelerData.dataUpdatingTiming||'', terms)}</Descriptions.Item>