Parcourir la source

fix(网络组件): 修改网络组件详情

xieyonghong il y a 3 ans
Parent
commit
58c064b489

+ 1 - 1
src/components/RadioCard/index.less

@@ -1,4 +1,4 @@
-@import '~antd/lib/style/themes/variable';
+@import '~antd/es/style/themes/default.less';
 
 @border: 1px solid @border-color-base;
 

+ 5 - 2
src/pages/link/AccessConfig/Detail/Access/index.tsx

@@ -19,6 +19,7 @@ import styles from './index.less';
 import { service } from '@/pages/link/AccessConfig';
 import encodeQuery from '@/utils/encodeQuery';
 import { useHistory, useLocation } from 'umi';
+import { getMenuPathByCode, MENUS_CODE } from '@/utils/menu';
 
 interface Props {
   change: () => void;
@@ -304,7 +305,8 @@ const Access = (props: Props) => {
               <Button
                 type="primary"
                 onClick={() => {
-                  const tab: any = window.open(`${origin}/#/link/Type/Save/:id`);
+                  const url = getMenuPathByCode(MENUS_CODE['link/Type/Detail']);
+                  const tab: any = window.open(`${origin}/#${url}`);
                   tab!.onTabSaveSuccess = (value: any) => {
                     if (value.status === 200) {
                       queryNetworkList(props.data?.id || access?.provider);
@@ -360,7 +362,8 @@ const Access = (props: Props) => {
                     暂无数据
                     <a
                       onClick={() => {
-                        const tab: any = window.open(`${origin}/#/link/Type/Save/:id`);
+                        const url = getMenuPathByCode(MENUS_CODE['link/Type/Detail']);
+                        const tab: any = window.open(`${origin}/#${url}`);
                         tab!.onTabSaveSuccess = (value: any) => {
                           if (value.status === 200) {
                             queryNetworkList(props.data?.id || access?.provider);

src/pages/link/Type/Save/index.less → src/pages/link/Type/Detail/index.less


+ 1 - 1
src/pages/link/Type/Save/index.tsx

@@ -21,7 +21,7 @@ import { createForm, onFieldValueChange } from '@formily/core';
 import { Button, Card, message } from 'antd';
 import styles from './index.less';
 import { useAsyncDataSource } from '@/utils/util';
-import { service } from '..';
+import { service } from '../index';
 import _ from 'lodash';
 import FAutoComplete from '@/components/FAutoComplete';
 import { Store } from 'jetlinks-store';

+ 1 - 1
src/pages/link/Type/index.tsx

@@ -26,7 +26,7 @@ export const service = new Service('network/config');
  */
 const pageJump = (id?: string) => {
   // 跳转详情
-  history.push(`${getMenuPathByParams(MENUS_CODE['link/Type/Save'], id)}`);
+  history.push(`${getMenuPathByParams(MENUS_CODE['link/Type/Detail'], id)}`);
 };
 
 const Network = () => {

+ 4 - 1
src/utils/menu/index.ts

@@ -156,7 +156,10 @@ export const getMenuPathByCode = (code: string): string => {
  */
 export const getMenuPathByParams = (code: string, id?: string, regStr: string = ':id') => {
   const menusData = getMenuPathByCode(code);
-  return id ? menusData.replace(regStr, id) : menusData;
+  if (!menusData) {
+    console.warn('menusData is', menusData);
+  }
+  return id && menusData ? menusData.replace(regStr, id) : menusData;
 };
 
 export default getRoutes;

+ 1 - 1
src/utils/menu/router.ts

@@ -38,7 +38,7 @@ export const MENUS_CODE = {
   'link/Protocol/Debug': 'link/Protocol/Debug',
   'link/Protocol': 'link/Protocol',
   'link/Type': 'link/Type',
-  'link/Type/Save': 'link/Type/Save',
+  'link/Type/Detail': 'link/Type/Detail',
   'link/AccessConfig': 'link/AccessConfig',
   'log/Access': 'log/Access',
   'log/System': 'log/System',