Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit402b2cd

Browse files
author
dragonpoo
authored
Merge pull request#1685 from iamfaran/gid-column-for-envs
Add gid columns for objects
2 parents2ec863a +2d13400 commit402b2cd

File tree

8 files changed

+49
-6
lines changed

8 files changed

+49
-6
lines changed

‎client/packages/lowcoder/src/pages/setting/environments/WorkspaceDetail.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,9 @@ const WorkspaceDetail: React.FC = () => {
112112
<Texttype="secondary"style={{marginRight:"16px"}}>
113113
ID:{workspace.id}
114114
</Text>
115+
<Texttype="secondary"style={{marginRight:"16px"}}>
116+
GID:{workspace.gid||'N/A'}
117+
</Text>
115118
<Tagcolor={workspace.managed ?"green" :"default"}>
116119
{workspace.managed ?"Managed" :"Unmanaged"}
117120
</Tag>

‎client/packages/lowcoder/src/pages/setting/environments/config/apps.config.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ import {
1616
createManagedColumn,
1717
createDeployColumn,
1818
createAuditColumn,
19-
createIdColumn
19+
createIdColumn,
20+
createApplicationGidColumn
2021
}from'../utils/columnFactories';
2122

2223
// Define AppStats interface if not already defined
@@ -73,6 +74,7 @@ export const appsConfig: DeployableItemConfig<App, AppStats> = {
7374
getColumns:({ environment, refreshing, onToggleManaged, openDeployModal, additionalParams})=>{
7475
constcolumns=[
7576
createIdColumn<App>(),
77+
createApplicationGidColumn<App>(),
7678
createNameColumn<App>(),
7779
createPublishedColumn<App>(),
7880
];

‎client/packages/lowcoder/src/pages/setting/environments/config/data-sources.config.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ import {
1414
createDatasourceStatusColumn,
1515
createManagedColumn,
1616
createDeployColumn,
17-
createAuditColumn
17+
createAuditColumn,
18+
createGidColumn
1819
}from'../utils/columnFactories';
1920

2021

@@ -123,6 +124,7 @@ export const dataSourcesConfig: DeployableItemConfig<DataSource, DataSourceStats
123124
getColumns:({ environment, refreshing, onToggleManaged, openDeployModal, additionalParams})=>{
124125
constcolumns=[
125126
createNameColumn<DataSource>(),
127+
createGidColumn<DataSource>(),
126128
createTypeColumn<DataSource>(),
127129
createDatabaseColumn<DataSource>(),
128130
createDatasourceStatusColumn<DataSource>(),

‎client/packages/lowcoder/src/pages/setting/environments/config/query.config.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ import {
1515
createQueryTypeColumn,
1616
createManagedColumn,
1717
createDeployColumn,
18-
createAuditColumn
18+
createAuditColumn,
19+
createGidColumn
1920
}from'../utils/columnFactories';
2021

2122
// Define QueryStats interface
@@ -100,6 +101,7 @@ export const queryConfig: DeployableItemConfig<Query, QueryStats> = {
100101
getColumns:({ environment, refreshing, onToggleManaged, openDeployModal, additionalParams})=>{
101102
constcolumns=[
102103
createNameColumn<Query>(),
104+
createGidColumn<Query>(),
103105
createCreatorColumn<Query>(),
104106
createDateColumn<Query>('createTime','Creation Date'),
105107
createQueryTypeColumn<Query>(),

‎client/packages/lowcoder/src/pages/setting/environments/config/workspace.config.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ import {
1414
createDateColumn,
1515
createStatusColumn,
1616
createManagedColumn,
17-
createAuditColumn
17+
createAuditColumn,
18+
createGidColumn
1819
}from'../utils/columnFactories';
1920

2021
exportconstworkspaceConfig:DeployableItemConfig<Workspace,WorkspaceStats>={
@@ -101,6 +102,7 @@ export const workspaceConfig: DeployableItemConfig<Workspace, WorkspaceStats> =
101102
getColumns:({ environment, refreshing, onToggleManaged, additionalParams})=>{
102103
constcolumns=[
103104
createIdColumn<Workspace>(),
105+
createGidColumn<Workspace>(),
104106
createNameColumn<Workspace>(),
105107
createRoleColumn<Workspace>(),
106108
createManagedColumn<Workspace>(),

‎client/packages/lowcoder/src/pages/setting/environments/services/datasources.service.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,14 @@ export async function getMergedWorkspaceDataSources(
152152
// Function to deploy a data source to another environment
153153
exportasyncfunctiondeployDataSource(params:DeployDataSourceParams):Promise<boolean>{
154154
try{
155-
constresponse=awaitaxios.post('/api/plugins/enterprise/datasource/deploy',params);
155+
constresponse=awaitaxios.post('/api/plugins/enterprise/datasource/deploy',null,{
156+
params:{
157+
envId:params.envId,
158+
targetEnvId:params.targetEnvId,
159+
datasourceId:params.datasourceId,
160+
updateDependenciesIfNeeded:params.updateDependenciesIfNeeded??false
161+
}
162+
});
156163
returnresponse.status===200;
157164
}catch(error){
158165
console.error('Error deploying data source:',error);

‎client/packages/lowcoder/src/pages/setting/environments/services/query.service.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,14 @@ export interface MergedQueriesResult {
7878

7979
exportasyncfunctiondeployQuery(params:DeployQueryParams):Promise<boolean>{
8080
try{
81-
constresponse=awaitaxios.post('/api/plugins/enterprise/qlQuery/deploy',params);
81+
constresponse=awaitaxios.post('/api/plugins/enterprise/qlQuery/deploy',null,{
82+
params:{
83+
envId:params.envId,
84+
targetEnvId:params.targetEnvId,
85+
queryId:params.queryId,
86+
updateDependenciesIfNeeded:params.updateDependenciesIfNeeded??false
87+
}
88+
});
8289
returnresponse.status===200;
8390
}catch(error){
8491
console.error('Error deploying query:',error);

‎client/packages/lowcoder/src/pages/setting/environments/utils/columnFactories.tsx

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,24 @@ export function createIdColumn<T extends { id: string }>(): ColumnType<T> {
2424
};
2525
}
2626

27+
exportfunctioncreateGidColumn<Textends{gid?:string}>():ColumnType<T>{
28+
return{
29+
title:'GID',
30+
dataIndex:'gid',
31+
key:'gid',
32+
ellipsis:true,
33+
};
34+
}
35+
36+
exportfunctioncreateApplicationGidColumn<Textends{applicationGid?:string}>():ColumnType<T>{
37+
return{
38+
title:'GID',
39+
dataIndex:'applicationGid',
40+
key:'applicationGid',
41+
ellipsis:true,
42+
};
43+
}
44+
2745
exportfunctioncreateRoleColumn<Textends{role?:string}>():ColumnType<T>{
2846
return{
2947
title:'Role',

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp