Просмотр исходного кода

fix: bug#5025、5023、4871、4960

xieyonghong 3 лет назад
Родитель
Сommit
3850cb0361

+ 4 - 0
src/pages/device/Instance/Save/index.tsx

@@ -37,6 +37,9 @@ const Save = (props: Props) => {
       .getProductList(
         encodeQuery({
           paging: false,
+          sorts: {
+            createTime: 'desc',
+          },
           terms: {
             state: 1,
           },
@@ -222,6 +225,7 @@ const Save = (props: Props) => {
               <Select
                 showSearch
                 options={productList}
+                disabled={props.model === 'edit'}
                 onSelect={(_: any, node: any) => {
                   form.setFieldsValue({
                     productName: node.label,

+ 3 - 0
src/pages/device/components/Metadata/Base/Edit/index.tsx

@@ -1057,6 +1057,9 @@ const Edit = observer((props: Props) => {
         }
         MetadataModel.edit = false;
         MetadataModel.item = {};
+        if (InstanceModel.detail) {
+          InstanceModel.detail.independentMetadata = true;
+        }
       }
     } else {
       onlyMessage('操作失败!', 'error');

+ 2 - 4
src/pages/home/components/Guide.tsx

@@ -1,5 +1,4 @@
 import './index.less';
-import { getMenuPathByCode } from '@/utils/menu';
 import { message } from 'antd';
 import useHistory from '@/hooks/route/useHistory';
 import Title from './Title';
@@ -26,12 +25,11 @@ interface GuideItemProps {
 }
 
 const GuideItem = (props: GuideItemProps) => {
-  const path = getMenuPathByCode(props.url);
   const history = useHistory();
 
   const jumpPage = () => {
-    if (path && props.auth) {
-      history.push(`${path}`, props.param);
+    if (props.url && props.auth) {
+      history.push(`${props.url}`, props.param);
     } else {
       message.warning('暂无权限,请联系管理员');
     }

+ 1 - 0
src/pages/home/components/index.less

@@ -26,6 +26,7 @@
   background: linear-gradient(135.62deg, #f6f7fd 22.27%, rgba(255, 255, 255, 0.86) 91.82%);
   border-radius: 2px;
   box-shadow: 0 4px 18px #efefef;
+  cursor: pointer;
 
   .item-english {
     color: #4f4f4f;

+ 3 - 0
src/pages/system/Platforms/Api/leftTree.tsx

@@ -64,6 +64,9 @@ export default (props: LeftTreeType) => {
   );
 
   const handleTreeData = (data: any) => {
+    if (data && Object.keys(data).length) {
+      return [];
+    }
     const newArr = data.tags.map((item: any) => ({ id: item.name, name: item.name, isLeaf: true }));
 
     Object.keys(data.paths).forEach((a: any) => {

+ 1 - 2
src/pages/system/Platforms/Api/swagger-ui/debugging.tsx

@@ -196,7 +196,6 @@ export default observer(() => {
             {ApiModel.swagger.method ? ApiModel.swagger.method.toUpperCase() : ''}
           </Button>
           <Input
-            allowClear
             style={{
               width: `calc(100% - ${ApiModel.swagger.method !== 'delete' ? '140px' : '150px'})`,
             }}
@@ -237,7 +236,7 @@ export default observer(() => {
       </div>
       <div className={'swagger-content-item'}>
         <TitleComponent data={'响应内容'} />
-        <div>
+        <div style={{ border: '1px solid #fefefe', borderRadius: 2 }}>
           {
             // @ts-ignore
             <ReactJson