Merge branch 'features/multi-branch' into develop

.env.development

@@ -8,6 +8,7 @@ VITE_APP_CLIENTID="Iv1.6d9972fa6afd1c02"
 # 建国本地
 # VITE_BASE_API="http://172.16.8.29:9898/api"
 VITE_BASE_API="https://develop.hamster.newtouch.com/api"
+# VITE_BASE_API="http://127.0.0.1:8080/api"
 
 VITE_WS_API="ws://61.172.179.6:30302/api"
 

src/apis/projects.ts

@@ -479,12 +479,12 @@ export function apiCreateProjects(params: AddProjectsParams) {
 }
 
 // 创建获取项目分支信息
-export function apiGetProjectBranch(id: string) {
-  return httpRequest({
-    url: `/api/projects/${id}/branch`,
-    method: "get",
-  });
-}
+// export function apiGetProjectBranch(id: string) {
+//   return httpRequest({
+//     url: `/api/projects/${id}/branch`,
+//     method: "get",
+//   });
+// }
 
 export function apiUpdateProjectsBranch(id: string, branch: string) {
   return httpRequest({

src/components/DeployVersionInfomation.vue

@@ -19,7 +19,7 @@
     <div class="mt-[10px] text-[14px]">
       <img src="@/assets/images/info.png" class="h-[17px] mr-[10px] hidden dark:inline-block" />
       <img src="@/assets/images/info-white.png" class="h-[17px] mr-[10px] dark:hidden" />
-      {{info.codeInfo}}
+      {{info.branch}} | {{info.commitId}} | {{info.commitInfo}}
     </div>
 
   </div>
@@ -76,4 +76,4 @@ onMounted(()=>{
 
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped></style>

src/views/chainLink/oracle/mySubscription/chainApi/linkTokenApi.ts

@@ -13,11 +13,13 @@ export class LinkTokenApi {
 
     const contractABI = abis.linkToken;
 
-    const contractAddress = this.getLinkToken(network)
+    if(networkConfig[network]){
+      const contractAddress = this.getLinkToken(network)
 
-    this.contractApi = createContractApi(contractAddress, contractABI, provider);
+      this.contractApi = createContractApi(contractAddress, contractABI, provider);
 
-    this.contract = this.contractApi.getContract();
+      this.contract = this.contractApi.getContract();
+    }
   }
 
   private getLinkToken(network: string): string {

src/views/chainLink/oracle/mySubscription/chainApi/registryApi.ts

@@ -13,11 +13,12 @@ export class RegistryApi {
 
     const contractABI = abis.functionsBillingRegistryProxy;
 
-    const contractAddress = this.getRegistry(network)
+    if(networkConfig[network]){
+      const contractAddress = this.getRegistry(network)
 
-    this.contractApi = createContractApi(contractAddress, contractABI, provider);
-
-    this.contract = this.contractApi.getContract();
+      this.contractApi = createContractApi(contractAddress, contractABI, provider);
+      this.contract = this.contractApi.getContract();
+    }
   }
 
   private getRegistry(network: string): string {

src/views/projects/components/data.ts

@@ -34,7 +34,8 @@ export interface ViewInfoItem {
   recentBuild: RecentBuildItem,
   recentCheck: RecentCheckItem,
   recentDeploy:RecentDeployItem,
-  labelDisplay:string | undefined
+  labelDisplay:string | undefined,
+  allBranch: string[],
 }
 
 interface AbiInfoDataInputsItem {
@@ -56,4 +57,4 @@ export interface AbiInfoDataItem {
   type: string,
   outputs: AbiInfoDataOutputsItem,
   anonymous: boolean,
-}
+}

src/views/projects/projectDashboardExplorer/components/ContractBase.vue

@@ -19,11 +19,12 @@
         <img src="@/assets/images/link.png" class="h-[17px] mr-[10px] hidden dark:inline-block" />
         <img src="@/assets/images/link-white.png" class="h-[17px] mr-[10px] dark:hidden" />
         {{baseInfo.url}}
+
       </div>
       <div class="mt-[10px] text-[14px]">
         <img src="@/assets/images/info.png" class="h-[17px] mr-[10px] hidden dark:inline-block" />
         <img src="@/assets/images/info-white.png" class="h-[17px] mr-[10px] dark:hidden" />
-        {{baseInfo.codeInfo}}
+        {{baseInfo.branch}} | {{baseInfo.commitId}} | {{baseInfo.commitInfo}}
       </div>
     </div>
   </div>
@@ -46,4 +47,4 @@ const { baseInfo } = toRefs(props)
 .svg-color{
   color: #E2B578;
 }
-</style>
+</style>