fix: change name to displayName (#164 #170)

bestchains · Apr 17, 2023 · 762a9c0 · 762a9c0
1 parent 174a9cf
commit 762a9c0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/bff-sdk/sdk.ts b/bff-sdk/sdk.ts
@@ -974,6 +974,7 @@ export type GetChaincodebuildQuery = {
       epolicy?: Array<{
         __typename?: 'Epolicy';
         name: string;
+        displayName?: string | null;
         value: string;
       }> | null;
     }> | null;
@@ -1036,6 +1037,7 @@ export type GetChannelQuery = {
     epolicy?: Array<{
       __typename?: 'Epolicy';
       name: string;
+      displayName?: string | null;
       description?: string | null;
       creationTimestamp?: string | null;
     }> | null;
@@ -1884,6 +1886,7 @@ export const GetChaincodebuildDocument = gql`
         displayName
         epolicy {
           name
+          displayName
           value
         }
       }
@@ -1941,6 +1944,7 @@ export const GetChannelDocument = gql`
       creationTimestamp
       epolicy {
         name
+        displayName
         description
         creationTimestamp
       }

diff --git a/src/pages/NetworkChannelDetail/index.jsx b/src/pages/NetworkChannelDetail/index.jsx
@@ -18,7 +18,7 @@ import {
 
 import { useLocation, matchPath } from '@umijs/max';
 import DataProvider from '../../components/DataProvider';
-import * as qs from 'querystring';
+import qs from 'query-string';
 import { getUnifiedHistory } from '@tenx-ui/utils/es/UnifiedLink/index.prod';
 
 import utils, { RefsManager } from '../../utils/__utils';
@@ -718,7 +718,7 @@ class NetworkChannelDetail$$Page extends React.Component {
                     __component_name="Table"
                     columns={[
                       {
-                        dataIndex: 'name',
+                        dataIndex: 'displayName',
                         key: 'name',
                         title: this.i18n('i18n-87kp314f') /* 策略名称 */,
                       },
@@ -760,7 +760,7 @@ class NetworkChannelDetail$$Page extends React.Component {
                     )}
                     loading={__$$eval(() => this.props.useGetChannel?.loading)}
                     pagination={false}
-                    rowKey="id"
+                    rowKey="name"
                     scroll={{ scrollToFirstRowOnChange: false, y: 130 }}
                     showHeader={true}
                     size="small"

diff --git a/src/pages/NetworkContractDetail/index.jsx b/src/pages/NetworkContractDetail/index.jsx
@@ -17,7 +17,7 @@ import {
 
 import { useLocation, matchPath } from '@umijs/max';
 import DataProvider from '../../components/DataProvider';
-import * as qs from 'querystring';
+import qs from 'query-string';
 import { getUnifiedHistory } from '@tenx-ui/utils/es/UnifiedLink/index.prod';
 
 import utils from '../../utils/__utils';
@@ -605,7 +605,7 @@ class NetworkContractDetail$$Page extends React.Component {
                         __component_name="Table"
                         columns={[
                           {
-                            dataIndex: 'name',
+                            dataIndex: 'displayName',
                             key: 'name',
                             title: this.i18n('i18n-4wgfgnn6') /* 通道 */,
                           },
@@ -624,7 +624,7 @@ class NetworkContractDetail$$Page extends React.Component {
                                   {__$$eval(
                                     () =>
                                       record?.epolicy
-                                        ?.map((item) => item?.name)
+                                        ?.map((item) => item?.displayName)
                                         ?.join(',') || '-'
                                   )}
                                 </Typography.Text>
@@ -647,7 +647,7 @@ class NetworkContractDetail$$Page extends React.Component {
                           () => this.props.useGetChaincodebuild?.loading
                         )}
                         pagination={false}
-                        rowKey="id"
+                        rowKey="name"
                         scroll={{ scrollToFirstRowOnChange: false, y: 180 }}
                         showHeader={true}
                         size="small"