修改cad修改antd前缀

src/app.tsx

@@ -1,6 +1,6 @@
 // 运行时配置
 import { RunTimeLayoutConfig, RequestConfig } from '@umijs/max';
-import { message } from 'antd';
+import { ConfigProvider, message } from 'antd';
 import UserDropdown from '@/components/UserDropdown';
 import { getToken } from '@/utils/utils';
 import { history } from 'umi';
@@ -9,6 +9,7 @@ import { useModel } from '@umijs/max';
 import { queryCurrentV2 } from './services/user';
 import dayjs from 'dayjs';
 import 'dayjs/locale/zh-cn';
+import React from 'react';
 
 dayjs.locale('zh-cn');
 
@@ -61,7 +62,9 @@ export const layout: RunTimeLayoutConfig = (initialState) => {
     logo: logo,
   };
 };
-
+export function rootContainer(container) {
+  return React.createElement(ConfigProvider, { prefixCls: 'antd5' }, container);
+}
 // axios配置
 export const request: RequestConfig = {
   errorConfig: {

src/components/Flow/node/control-map-service/components/style.less

@@ -92,7 +92,7 @@
     grid-gap: 8px;
   }
 
-  .ant-input-number {
+  .antd5-input-number {
     width: 100%;
   }
 }

src/components/InputSelect/index.less

@@ -1,33 +1,31 @@
-.noData{
+.noData {
   position: relative;
   text-align: center;
   color: #fff;
   font-size: 24px;
-  .noDataText{
+  .noDataText {
     position: absolute;
     left: 50%;
     bottom: 15px;
     transform: translateX(-50%);
   }
-  .noDataImg{
+  .noDataImg {
     display: block;
     margin: auto;
   }
 }
-.down{
+.down {
   :global {
-    .ant-input-group-addon{
+    .antd5-input-group-addon {
       padding: 0;
       font-size: 18px;
     }
-    
   }
 }
-.main{
+.main {
   position: relative;
-  
 }
-.downUl{
+.downUl {
   width: 100%;
   height: 300px;
   overflow-y: scroll;
@@ -39,11 +37,11 @@
   border: 1px solid #eee;
   border-radius: 5px;
   padding: 4px 0 4px 10px;
-  & >li{
+  & > li {
     cursor: pointer;
     padding: 4px 0;
   }
-  & >li:hover{
+  & > li:hover {
     background-color: #eee;
   }
 }

src/components/ModuleTitle/index.less

@@ -1,56 +1,56 @@
-.icon{
+.icon {
   float: left;
   width: 8px;
   height: 22px;
-  background-color: #366CDA;
+  background-color: #366cda;
 }
-.title{
+.title {
   font-size: 16px;
   padding-left: 14px;
 }
-.right{
-  color: #366CDA;
+.right {
+  color: #366cda;
   float: right;
   font-size: 20px;
   cursor: default;
 }
 
-.leftArrow{
-  border: solid 20px ;
-  border-color: transparent #366CDA transparent  transparent ;
+.leftArrow {
+  border: solid 20px;
+  border-color: transparent #366cda transparent transparent;
 }
-.rightArrow{
-  border: solid 20px ;
-  border-color: transparent transparent  transparent #366CDA ;
+.rightArrow {
+  border: solid 20px;
+  border-color: transparent transparent transparent #366cda;
 }
-.typeList{
+.typeList {
   flex-grow: 1;
   display: flex;
 }
 
-.content{
+.content {
   height: 100%;
-  :global{
-    .ant-tabs-nav-wrap{
+  :global {
+    .antd5-tabs-nav-wrap {
       background: none;
     }
-    .ant-tabs-nav .ant-tabs-tab{
+    .antd5-tabs-nav .antd5-tabs-tab {
       padding: 2px 16px;
       background-color: #2196f330;
       border: none;
       margin: 0 6px;
     }
-    .ant-tabs-tab-active{
+    .antd5-tabs-tab-active {
       color: #fff !important;
-      background-color: #366CDA !important;
+      background-color: #366cda !important;
     }
-    .ant-tabs-tab:hover{
+    .antd5-tabs-tab:hover {
       color: #fff !important;
     }
-    .ant-tabs-bar{
+    .antd5-tabs-bar {
       margin: 0;
     }
-    // .ant-tabs-tab-prev-icon{
+    // .antd5-tabs-tab-prev-icon{
     //   border: solid 20px ;
     //   border-color: transparent #366CDA transparent  transparent ;
     //   i{
@@ -59,4 +59,4 @@
     //   }
     // }
   }
-}
+}

src/components/UserDropdown/index.less

@@ -53,7 +53,7 @@
   }
   .root {
     :global {
-      .ant-dropdown {
+      .antd5-dropdown {
         padding-left: 14px;
         min-width: 102px;
       }

src/global.less

@@ -101,7 +101,7 @@ input[type='reset'] {
   width: 100% !important;
   height: unset !important;
 }
-.ant-pro-global-header {
+.antd5-pro-global-header {
   background: transparent;
   background-image: url(@/assets/header.png);
   background-size: cover;
@@ -109,80 +109,80 @@ input[type='reset'] {
   margin-inline: 0;
   height: 79px;
 }
-.ant-pro-layout .ant-layout-header.ant-pro-layout-header {
+.antd5-pro-layout .antd5-layout-header.antd5-pro-layout-header {
   background-color: transparent;
   height: 79px;
 }
-.ant-layout .ant-layout-header {
+.antd5-layout .antd5-layout-header {
   height: 79px !important;
   line-height: 79px !important;
 }
-.ant-pro-global-header-logo img {
+.antd5-pro-global-header-logo img {
   height: 40px;
 }
-.ant-pro-global-header-logo-mix {
+.antd5-pro-global-header-logo-mix {
   margin-left: 62px;
 }
 
-.ant-layout-sider {
+.antd5-layout-sider {
   height: calc(100% - 79px) !important;
   inset-block-start: 79px !important;
   background-size: 132% 100% !important;
   background-image: url(@/assets/SideMenu/background.png) !important;
 }
 
-.ant-menu-title-content {
+.antd5-menu-title-content {
   font-size: 18px;
   color: #e8f7fc;
 }
 
-.ant-pro-base-menu-icon {
+.antd5-pro-base-menu-icon {
   height: 20px;
   width: 20px;
 }
-.ant-pro-base-menu-item-icon {
+.antd5-pro-base-menu-item-icon {
   margin-right: 10px;
 }
 
-.ant-menu-item,
-.ant-menu-submenu {
+.antd5-menu-item,
+.antd5-menu-submenu {
   margin-top: 15px !important;
   margin-bottom: 15px !important;
 }
 
-.ant-menu-item,
-.ant-menu-submenu-title {
+.antd5-menu-item,
+.antd5-menu-submenu-title {
   border-bottom: 1px solid !important;
   border-image: linear-gradient(#3e6ab4, #5bbdfa) 2 2 2 2 !important;
 }
 
-.ant-menu-sub {
+.antd5-menu-sub {
   margin-left: 32px !important;
-  .ant-menu-item {
+  .antd5-menu-item {
     margin-top: 10px !important;
     margin-bottom: 10px !important;
   }
-  .ant-menu-title-content {
+  .antd5-menu-title-content {
     font-size: 16px;
     color: #e8f7fc;
   }
 }
 
-.ant-menu-submenu-arrow {
+.antd5-menu-submenu-arrow {
   color: #e8f7fc !important;
 }
 
-.ant-menu-item-selected,
-.ant-pro-base-menu-collapsed
-  .ant-menu-submenu-selected
-  > .ant-menu-submenu-title,
-.ant-menu-item:active {
+.antd5-menu-item-selected,
+.antd5-pro-base-menu-collapsed
+  .antd5-menu-submenu-selected
+  > .antd5-menu-submenu-title,
+.antd5-menu-item:active {
   background-image: url(@/assets/SideMenu/selectedBackground.png);
   background-color: transparent !important;
 }
 
-.ant-menu-submenu-popup {
-  .ant-menu {
+.antd5-menu-submenu-popup {
+  .antd5-menu {
     background-color: #1b366f !important;
   }
 }

src/pages/Cad/components/CreateModal.js

@@ -12,6 +12,7 @@ import {
   Steps,
   Row,
   Col,
+  Cascader,
 } from 'antd';
 import { useEffect, useState } from 'react';
 import styles from './index.less';
@@ -38,14 +39,21 @@ const formItemValues = [
   // },
 ];
 
-const CreateModal = ({ loading, projectList, open, onOk, handleCancel }) => {
+const CreateModal = ({
+  loading,
+  projectList,
+  dirList,
+  open,
+  onOk,
+  handleCancel,
+}) => {
   const { userList, run: userListRun } = useModel('userList');
   const [form] = Form.useForm();
   const layout = {
     labelCol: { span: 6 },
     wrapperCol: { span: 16 },
   };
-
+  console.log('-[-------------------', dirList);
   const [upLoading, setUpLoading] = useState([]);
   const [auditCheck, setAuditCheck] = useState([]);
   const [approvalProcess, setApprovalProcess] = useState([]);
@@ -102,8 +110,6 @@ const CreateModal = ({ loading, projectList, open, onOk, handleCancel }) => {
   }
 
   const handleOk = () => {
-    // const audit_list = auditList.map((item) => item.value);
-
     let audit_list = [];
     let cc_list = [];
     approvalProcess?.forEach((item, index) => {
@@ -122,10 +128,8 @@ const CreateModal = ({ loading, projectList, open, onOk, handleCancel }) => {
         values.project_name = projectList.find(
           (item) => (item.value = values.project_id),
         )?.label;
-      if (values.dir_id)
-        values.dir_name = projectList.find(
-          (item) => (item.value = values.dir_id),
-        )?.label;
+      if (values.dir_id) values.dir_name = values.dir_id.join(',');
+      values.dir_id = 0;
       if (!values.cad_path) values.cad_path = 'test';
       console.log(values, audit_list);
       onOk(values, { audit_list: audit_list.flat(), cc_list: cc_list.flat() });
@@ -163,7 +167,15 @@ const CreateModal = ({ loading, projectList, open, onOk, handleCancel }) => {
               label="归档目录："
               rules={[{ required: true }]}
             >
-              <Select
+              <Cascader
+                options={dirList}
+                fieldNames={{
+                  label: 'value',
+                  value: 'value',
+                  children: 'children',
+                }}
+              />
+              {/* <Select
                 options={[
                   {
                     label: '工艺',
@@ -174,7 +186,7 @@ const CreateModal = ({ loading, projectList, open, onOk, handleCancel }) => {
                     value: 2,
                   },
                 ]}
-              />
+              /> */}
             </Form.Item>
             <Form.Item
               name="pic_type"
@@ -215,7 +227,7 @@ const CreateModal = ({ loading, projectList, open, onOk, handleCancel }) => {
             <Form.Item name="doc" label="备注：">
               <Input.TextArea />
             </Form.Item>
-          </Form>{' '}
+          </Form>
         </Col>
         <Col span={8}>
           <ApprovalProcess

src/pages/Cad/detail.js

@@ -15,11 +15,11 @@ const CadDeTail = () => {
     window.ZwCloud2D.ZwEditor.ZwInit(content);
 
     ZwCloud2D.ZwDataProcessor.ZwSetConnectUrl(
-      'http://47.111.24.13:9080',
+      'http://47.111.24.13:5121',
       'http://47.111.24.13:5121',
       'ws://47.111.24.13:5121',
     );
-    ZwCloud2D.ZwDataProcessor.ZwSetLoadDwg(path);
+    ZwCloud2D.ZwDataProcessor.ZwSetLoadDwg('SDK-TC-001x.dwg');
     window.ZwCloud2D.ZwDataProcessor.ZwLoad();
   }, []);
   return (

src/pages/Cad/index.js

@@ -1,6 +1,11 @@
 import { useRef, useEffect, useState } from 'react';
 import PageContent from '@/components/PageContent';
-import { queryCadList, queryCreateCad, queryProject } from '@/services/cad';
+import {
+  queryCadDirList,
+  queryCadList,
+  queryCreateCad,
+  queryProject,
+} from '@/services/cad';
 import { useRequest, useNavigate } from '@umijs/max';
 import { Table, Button, message, Space, Select, Input } from 'antd';
 import CreateModal from './components/CreateModal';
@@ -90,6 +95,16 @@ const CadDemo = () => {
     },
   });
 
+  //请求归档目录
+  const { data: dirList } = useRequest(queryCadDirList, {
+    formatResult: (res) => {
+      return res.data;
+      // return res?.data?.list?.map((item) => {
+      //   return { label: item.Name, value: item.ID };
+      // });
+    },
+  });
+
   //请求列表
   const { data, run, loading } = useRequest(queryCadList, {
     defaultParams: [params],
@@ -140,9 +155,9 @@ const CadDemo = () => {
 
   useEffect(() => {
     ZwCloud2D.ZwDataProcessor.ZwSetConnectUrl(
-      'http://222.130.26.205:9080', //47.111.24.13
-      'http://222.130.26.205:5121',
-      'ws://222.130.26.205:5121',
+      'http://172.16.69.195:9080', //47.111.24.13
+      'http://172.16.69.195:5121',
+      'ws://172.16.69.195:5121',
     );
   }, []);
 
@@ -195,6 +210,7 @@ const CadDemo = () => {
       />
       <CreateModal
         loading={createLoading}
+        dirList={dirList}
         projectList={projectList}
         open={visible}
         onOk={handleCreate}

src/pages/FileManagement/index.js

@@ -550,6 +550,9 @@ function FileManagement(props) {
     } else if (node.id == 7) {
       //合同归档走合同接口
       runContract(req);
+    } else if (node.dir_type == 3) {
+      //图纸文件走 部门文件 接口
+      run({ ...req, dir_id: node.id });
     } else if (node.is_limit) {
       //其他受控文件走classify_id
       runOA({ ...req, classify_id: node.classify_id });

src/pages/Flow/Audit.less

@@ -9,7 +9,7 @@
   align-items: center;
   margin-bottom: 20px;
   :global {
-    .ant-btn {
+    .antd5-btn {
       margin-right: 20px;
     }
   }

src/pages/Home/index.less

@@ -15,7 +15,7 @@
 
   // align-items: flex-start;
   :global {
-    .ant-popover-inner {
+    .antd5-popover-inner {
       background: #0d1a2b;
     }
   }

src/services/cad.js

@@ -27,3 +27,9 @@ export async function queryCadInfo(data) {
     data,
   });
 }
+export async function queryCadDirList(data) {
+  return request(`/api/archive/v1/cad/dir-list`, {
+    method: 'POST',
+    data,
+  });
+}