模型范围

src/view/Manage/ModelCompare/update-task.jsx

@@ -370,6 +370,21 @@ const Range = React.forwardRef(function ({ type, task }, ref) {
     getModelTree()
   }, [])
 
+  const generateList = (data, list, ids, names) => {
+    (data||[]).forEach(node => {
+      const newIds = [...ids??[], node.value]
+      const newNames = [...names??[], node.title]
+      list.push({
+        ...node, 
+        ids: newIds, 
+        names: newNames,
+      })
+      if (node.children) {
+        generateList(node.children, list, newIds, newNames)
+      }
+    })
+  }
+
   const [modelTreeData1, modelTreeList] = React.useMemo(() => {
     if (modelTreeData) {
       const newTreeList = []
@@ -379,9 +394,11 @@ const Range = React.forwardRef(function ({ type, task }, ref) {
           g.key = g.id
           g.title = g.name
           g.value = g.id
-          g.children?.forEach((child) => {
+          g.children = []
+          for (let child of g.subCatalogs??[]) {
             setNode(child)
-          })
+            g.children.push(child)
+          }
         }
 
         for (let item of draft??[]) {
@@ -389,14 +406,11 @@ const Range = React.forwardRef(function ({ type, task }, ref) {
         }
       })
 
-      newTreeList.push(treeData)
-      generateList(treeData?.children, newTreeList)
+      generateList(newTreeData, newTreeList, [], [])
 
       return [
-        [
-          newTreeData
-        ],
-        newTreeList
+        newTreeData,
+        newTreeList,
       ] 
     }
 
@@ -441,15 +455,13 @@ const Range = React.forwardRef(function ({ type, task }, ref) {
               <Form.Item
                 label="数据模型范围"
                 name="modelCatalogId"
-                style={{ marginBottom }}
-                rules={[{ required: true, message: '请选择任务分组!' }]}
+                rules={[{ required: true, message: '请选择模型范围!' }]}
               >
                 <TreeSelect
                   loading={loadingModelTree}
                   dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}
-                  treeData={treeData1}
-                  placeholder="请选择分组"
-                  treeDefaultExpandAll
+                  treeData={modelTreeData1}
+                  placeholder="请选择模型范围"
                 />
               </Form.Item>
             </Col>