diff --git a/public/icons/treeLine.svg b/public/icons/treeLine.svg new file mode 100644 index 0000000..1557447 --- /dev/null +++ b/public/icons/treeLine.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/components/Tree/src/baseTree.css b/src/components/Tree/src/baseTree.css index 7fde57d..ae161b4 100644 --- a/src/components/Tree/src/baseTree.css +++ b/src/components/Tree/src/baseTree.css @@ -52,3 +52,32 @@ .base_tree_wrap .tree_search_form .ant-form-item { margin: 0; } +/* 节点树优化 */ +.base_tree_wrap .ant-tree-treenode:not(.tree_node_0) { + padding-top: 0; + padding-bottom: 0; + line-height: 32px; +} +.base_tree_wrap .ant-tree-treenode:not(.tree_node_0) .ant-tree-switcher, +.base_tree_wrap .ant-tree-treenode:not(.tree_node_0) .ant-tree-node-content-wrapper { + line-height: 32px; +} +.base_tree_wrap .ant-tree.ant-tree-show-line .ant-tree-indent-unit:before, +.base_tree_wrap .ant-tree .ant-tree-switcher-leaf-line:before { + border-inline-end: 1px solid #154ddd; +} +.base_tree_wrap .ant-tree .ant-tree-switcher-leaf-line:after { + border-bottom: 1px solid #154ddd; +} +.base_tree_wrap .ant-tree .ant-tree-treenode { + padding-left: 17px; + width: 100%; +} +.ant-tree-indent-unit:before { + position: absolute; + top: 0; + bottom: -4px; + content: ''; + inset-inline-end: 12px; + border-inline-end: 1px solid red; +} diff --git a/src/components/Tree/src/baseTree.less b/src/components/Tree/src/baseTree.less index 41ca04c..9d4925f 100644 --- a/src/components/Tree/src/baseTree.less +++ b/src/components/Tree/src/baseTree.less @@ -61,3 +61,47 @@ } } } + +/* 节点树优化 */ +.base_tree_wrap { + .ant-tree-treenode:not(.tree_node_0) { + padding-top: 0; + padding-bottom: 0; + line-height: 32px; + .ant-tree-switcher, + .ant-tree-node-content-wrapper { + line-height: 32px; + } + } + .ant-tree { + &.ant-tree-show-line .ant-tree-indent-unit:before, + .ant-tree-switcher-leaf-line:before { + border-inline-end: 1px solid #154ddd; + } + .ant-tree-switcher-leaf-line:after { + border-bottom: 1px solid #154ddd; + } + + .ant-tree-treenode { + width: 100%; + padding-left: 17px; + } + + // &.ant-tree-show-line { + // .tree_node_1 { + // .ant-tree-indent-unit:before { + // border-inline-end: 1px solid transparent; + // } + // } + // } + } +} + +.ant-tree-indent-unit:before { + position: absolute; + top: 0; + bottom: -4px; + content: ''; + inset-inline-end: 12px; + border-inline-end: 1px solid red; +} diff --git a/src/components/Tree/src/baseTree.tsx b/src/components/Tree/src/baseTree.tsx index 9785278..9c20172 100644 --- a/src/components/Tree/src/baseTree.tsx +++ b/src/components/Tree/src/baseTree.tsx @@ -168,7 +168,7 @@ const BaseTree: React.FC = (props) => { const renderTreeItem = (node) => { return (
- {node.title} + {node.title} {!props?.hideInDelete ? ( = (props) => { )}
{ diff --git a/src/components/Tree/src/deviceGroupTree.tsx b/src/components/Tree/src/deviceGroupTree.tsx index 8de3fa7..a579e94 100644 --- a/src/components/Tree/src/deviceGroupTree.tsx +++ b/src/components/Tree/src/deviceGroupTree.tsx @@ -2,7 +2,7 @@ * @Author: donghao donghao@supervision.ltd * @Date: 2024-04-26 11:11:05 * @LastEditors: donghao donghao@supervision.ltd - * @LastEditTime: 2024-05-29 14:19:24 + * @LastEditTime: 2024-06-26 14:41:15 * @FilePath: \general-ai-manage\src\components\Tree\src\deviceGroupTree.tsx * @Description: 设备节点树 * @交互说明 @@ -52,6 +52,7 @@ const DeviceGroupTree: React.FC = (props) => { e.stopPropagation(); handleAdd(node); }} + className={node?.key ? '' : 'pl-[5px]'} style={{ color: token.colorPrimary }} key={node?.key || 'add'} > diff --git a/src/components/UploadFile/src/formUploadDraggerToken.tsx b/src/components/UploadFile/src/formUploadDraggerToken.tsx index dd1d574..1b0ab7c 100644 --- a/src/components/UploadFile/src/formUploadDraggerToken.tsx +++ b/src/components/UploadFile/src/formUploadDraggerToken.tsx @@ -2,7 +2,7 @@ * @Author: donghao donghao@supervision.ltd * @Date: 2024-06-04 15:14:27 * @LastEditors: donghao donghao@supervision.ltd - * @LastEditTime: 2024-06-17 14:23:18 + * @LastEditTime: 2024-06-26 15:16:52 * @FilePath: \general-ai-platform-web\src\components\UploadFile\src\FormUploadDraggerToken.tsx * @Description: 手动文件上传、删除 * // TODO 需要支持多文件上传 @@ -84,7 +84,7 @@ const FormUploadDraggerToken: React.FC = (props) => const onRemoveFile = async (file: UploadFile>) => { console.log(file, 'onRemoveFile_file', fileList); const currFile = fileList.find((item) => item.uid === file.uid); - const resp = await apiFileDelete({ file_md5: currFile?.fileId }); + const resp = await apiFileDelete({ file_md5: currFile?.fileId || file?.uid }); console.log(resp, 'apiFileDelete_resp'); props.afterRemoveFile(resp, file); setPreviewFile(null); diff --git a/src/pages/Model/ModelDetail/index.tsx b/src/pages/Model/ModelDetail/index.tsx index bdefd6d..9e3e6d7 100644 --- a/src/pages/Model/ModelDetail/index.tsx +++ b/src/pages/Model/ModelDetail/index.tsx @@ -2,7 +2,7 @@ * @Author: donghao donghao@supervision.ltd * @Date: 2024-04-08 10:36:06 * @LastEditors: donghao donghao@supervision.ltd - * @LastEditTime: 2024-06-25 14:32:10 + * @LastEditTime: 2024-06-26 09:16:11 * @FilePath: \general-ai-manage\src\pages\Model\ModelDetail\index.tsx * @Description: 模型详情（基础信息展示、模型版本列表） * @交互说明 @@ -321,7 +321,7 @@ const ModelDetail: React.FC = () => { search={false} options={{ fullScreen: false, setting: false, density: false, reload: false }} actionRef={actionRef} - rowKey="id" + rowKey="version_id" onDataSourceChange={(data) => { console.log(data, 'onDataSourceChange_data'); // let CategoryFkIdIds: any = data.map((v) => {