From 5e9d0052127f13db416d737f7cb86148c77cbbf1 Mon Sep 17 00:00:00 2001
From: liu2592603532 <2592603532@qq.com>
Date: Mon, 29 Apr 2024 08:40:21 +0800
Subject: [PATCH] merge

---
 react-ui/config/defaultSettings.ts          |  2 +-
 react-ui/src/global.less                    |  8 ++++++--
 react-ui/src/pages/Dataset/datasetIntro.jsx |  1 +
 react-ui/src/pages/Dataset/index.jsx        | 20 ++++++++++++++++++--
 react-ui/src/pages/Dataset/index.less       |  4 ++++
 react-ui/src/pages/Dataset/personalData.jsx |  1 +
 react-ui/src/pages/Model/index.jsx          | 20 ++++++++++++++++++--
 react-ui/src/pages/Model/index.less         |  4 ++++
 react-ui/src/pages/Model/modelIntro.jsx     |  2 +-
 react-ui/src/pages/Model/personalData.jsx   |  2 +-
 react-ui/src/services/session.ts            | 10 ++++++++++
 11 files changed, 65 insertions(+), 9 deletions(-)

diff --git a/react-ui/config/defaultSettings.ts b/react-ui/config/defaultSettings.ts
index 18889073..e2ef641a 100644
--- a/react-ui/config/defaultSettings.ts
+++ b/react-ui/config/defaultSettings.ts
@@ -19,7 +19,7 @@ const Settings: ProLayoutProps & {
   title: '智能软件开发平台',
   pwa: true,
   logo: '/assets/images/left-top-logo.png',
-  iconfontUrl: '//at.alicdn.com/t/c/font_4511326_ndnvm4elll.js',
+  iconfontUrl: '//at.alicdn.com/t/c/font_4511326_2511riex401.js',
   token: {
     // 参见ts声明，demo 见文档，通过token 修改样式
     //https://procomponents.ant.design/components/layout#%E9%80%9A%E8%BF%87-token-%E4%BF%AE%E6%94%B9%E6%A0%B7%E5%BC%8F
diff --git a/react-ui/src/global.less b/react-ui/src/global.less
index 126b9e52..69161adc 100644
--- a/react-ui/src/global.less
+++ b/react-ui/src/global.less
@@ -151,14 +151,18 @@ body {
   height: 46px;
   padding: 1px 11px;
 }
-
+.ant-input-textarea-affix-wrapper.ant-input-affix-wrapper{
+  padding: 0;
+}
 .ant-modal .ant-select-single {
   height: 46px;
 }
 .ant-modal .ant-select-single .ant-select-selector .ant-select-selection-placeholder {
   line-height: 46px;
 }
-
+.ant-menu-light.ant-menu-inline .ant-menu-item{
+  color:#575757;
+}
 .ant-modal .ant-modal-close-x {
   width: 26px;
   height: 26px;
diff --git a/react-ui/src/pages/Dataset/datasetIntro.jsx b/react-ui/src/pages/Dataset/datasetIntro.jsx
index d83e067c..91aee652 100644
--- a/react-ui/src/pages/Dataset/datasetIntro.jsx
+++ b/react-ui/src/pages/Dataset/datasetIntro.jsx
@@ -389,6 +389,7 @@ const Dataset = () => {
               >
                 上传文件
               </Button>
+              <div className={Styles.tipContent}>只允许上传.zip,.tgz格式文件</div>
             </Upload>
           </Form.Item>
         </Form>
diff --git a/react-ui/src/pages/Dataset/index.jsx b/react-ui/src/pages/Dataset/index.jsx
index 9bd15abf..297e6d81 100644
--- a/react-ui/src/pages/Dataset/index.jsx
+++ b/react-ui/src/pages/Dataset/index.jsx
@@ -60,10 +60,26 @@ const Dataset = () => {
       <div className={Styles.datasetTopBox}></div>
       <div className={Styles.datasetAllBox}>
         <Tabs defaultActiveKey="1">
-          <TabPane tab="数据广场" key="1">
+          <TabPane
+            tab="数据广场"
+            key="1"
+            icon={
+              <svg className="icon" style={{ width: '14px', height: '14px' }} aria-hidden="true">
+                <use xlinkHref="#icon-shujujiguangchang"></use>
+              </svg>
+            }
+          >
             <PublicData />
           </TabPane>
-          <TabPane tab="个人数据" key="2">
+          <TabPane
+            tab="个人数据"
+            key="2"
+            icon={
+              <svg className="icon" style={{ width: '14px', height: '14px' }} aria-hidden="true">
+                <use xlinkHref="#icon-gerenshujuji"></use>
+              </svg>
+            }
+          >
             <PersonalData />
           </TabPane>
         </Tabs>
diff --git a/react-ui/src/pages/Dataset/index.less b/react-ui/src/pages/Dataset/index.less
index c1d7a116..d270f560 100644
--- a/react-ui/src/pages/Dataset/index.less
+++ b/react-ui/src/pages/Dataset/index.less
@@ -291,6 +291,10 @@
     }
   }
 }
+.tipContent{
+  color: #c73131;
+  margin-top: 5px;
+}
 .modal {
   :global {
     .ant-modal-content {
diff --git a/react-ui/src/pages/Dataset/personalData.jsx b/react-ui/src/pages/Dataset/personalData.jsx
index 87f1c2c8..0dd09739 100644
--- a/react-ui/src/pages/Dataset/personalData.jsx
+++ b/react-ui/src/pages/Dataset/personalData.jsx
@@ -468,6 +468,7 @@ const PublicData = (React.FC = () => {
               >
                 上传文件
               </Button>
+              <div className={Styles.tipContent}>只允许上传.zip,.tgz格式文件</div>
             </Upload>
           </Form.Item>
         </Form>
diff --git a/react-ui/src/pages/Model/index.jsx b/react-ui/src/pages/Model/index.jsx
index 2e926b87..12396a66 100644
--- a/react-ui/src/pages/Model/index.jsx
+++ b/react-ui/src/pages/Model/index.jsx
@@ -59,10 +59,26 @@ const Dataset = () => {
       <div className={Styles.datasetTopBox}></div>
       <div className={Styles.datasetAllBox}>
         <Tabs defaultActiveKey="1">
-          <TabPane tab="模型广场" key="1">
+          <TabPane
+            tab="模型广场"
+            key="1"
+            icon={
+              <svg className="icon" style={{ width: '14px', height: '14px' }} aria-hidden="true">
+                <use xlinkHref="#icon-shujujiguangchang"></use>
+              </svg>
+            }
+          >
             <PublicData />
           </TabPane>
-          <TabPane tab="个人模型" key="2">
+          <TabPane
+            tab="个人模型"
+            key="2"
+            icon={
+              <svg className="icon" style={{ width: '14px', height: '14px' }} aria-hidden="true">
+                <use xlinkHref="#icon-gerenshujuji"></use>
+              </svg>
+            }
+          >
             <PersonalData />
           </TabPane>
         </Tabs>
diff --git a/react-ui/src/pages/Model/index.less b/react-ui/src/pages/Model/index.less
index db39e6b0..defa446f 100644
--- a/react-ui/src/pages/Model/index.less
+++ b/react-ui/src/pages/Model/index.less
@@ -281,6 +281,10 @@
     }
   }
 }
+.tipContent{
+  color: #c73131;
+  margin-top: 5px;
+}
 .modal {
   :global {
     .ant-modal-content {
diff --git a/react-ui/src/pages/Model/modelIntro.jsx b/react-ui/src/pages/Model/modelIntro.jsx
index b9f4f87d..5cc9477d 100644
--- a/react-ui/src/pages/Model/modelIntro.jsx
+++ b/react-ui/src/pages/Model/modelIntro.jsx
@@ -375,7 +375,7 @@ const Dataset = () => {
               },
             ]}
           >
-            <Upload {...props} data={{ uuid: uuid }} accept=".zip,.tgz">
+            <Upload {...props} data={{ uuid: uuid }}>
               <Button
                 style={{
                   fontSize: '14px',
diff --git a/react-ui/src/pages/Model/personalData.jsx b/react-ui/src/pages/Model/personalData.jsx
index 9595c6f1..34ff8f2a 100644
--- a/react-ui/src/pages/Model/personalData.jsx
+++ b/react-ui/src/pages/Model/personalData.jsx
@@ -503,7 +503,7 @@ const PublicData = () => {
             />
           </Form.Item>
           <Form.Item label="模型文件" name="models_version_vos">
-            <Upload {...props} data={{ uuid: uuid }} accept=".zip,.tgz">
+            <Upload {...props} data={{ uuid: uuid }}>
               <Button
                 style={{
                   fontSize: '14px',
diff --git a/react-ui/src/services/session.ts b/react-ui/src/services/session.ts
index 44861d39..1d50df99 100644
--- a/react-ui/src/services/session.ts
+++ b/react-ui/src/services/session.ts
@@ -61,6 +61,8 @@ function patchRouteItems(route: any, menu: any, parentPath: string) {
         element: React.createElement(lazy(() => import('@/pages/' + path))),
         path: parentPath + menuItem.path,
       };
+      console.log(newRoute);
+      
       route.children.push(newRoute);
       route.routes.push(newRoute);
     }
@@ -73,7 +75,10 @@ export function patchRouteWithRemoteMenus(routes: any) {
   }
   let proLayout = null;
   for (const routeItem of routes) {
+
     if (routeItem.id === 'ant-design-pro-layout') {
+      
+      
       proLayout = routeItem;
       break;
     }
@@ -97,6 +102,7 @@ export async function refreshToken() {
 }
 
 export function convertCompatRouters(childrens: API.RoutersMenuItem[]): any[] {
+
   return childrens.map((item: API.RoutersMenuItem) => {
     return {
       path: item.path,
@@ -130,6 +136,7 @@ export function getMatchMenuItem(
 ): MenuDataItem[] {
   if (!menuData) return [];
   let items: MenuDataItem[] = [];
+
   menuData.forEach((item) => {
     if (item.path) {
       if (item.path === path) {
@@ -143,9 +150,12 @@ export function getMatchMenuItem(
             const subpath = path.substr(item.path.length + 1);
             const subItem: MenuDataItem[] = getMatchMenuItem(subpath, item.routes);
             items = items.concat(subItem);
+
           } else {
             const paths = path.split('/');
             if (paths.length >= 2 && paths[0] === item.path && paths[1] === 'index') {
+              console.log(item);
+              
               items.push(item);
             }
           }