Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/fix-udf-bug' into fix-udf-bug
Browse files Browse the repository at this point in the history
  • Loading branch information
Zzm0809 committed Nov 6, 2023
2 parents d22d38b + 3d77a4f commit a3edd9a
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ import ClassList from '@/pages/RegCenter/GitProject/components/BuildSteps/JarSho
import { CodeTree } from '@/pages/RegCenter/GitProject/components/CodeTree';
import ProjectModal from '@/pages/RegCenter/GitProject/components/ProjectModal';
import {
GIT_PROJECT_BUILD_STEP_JAVA_ENUM, GIT_PROJECT_BUILD_STEP_PYTHON_ENUM,
GIT_PROJECT_BUILD_STEP_JAVA_ENUM,
GIT_PROJECT_BUILD_STEP_PYTHON_ENUM,
GIT_PROJECT_CODE_TYPE,
GIT_PROJECT_CODE_TYPE_ENUM,
GIT_PROJECT_STATUS,
Expand Down Expand Up @@ -227,7 +228,8 @@ const ProjectProTable: React.FC = () => {
dataIndex: 'buildStep',
hideInSearch: true,
// filters: GIT_PROJECT_BUILD_STEP,
valueEnum: (row) => row.codeType === 1 ? GIT_PROJECT_BUILD_STEP_JAVA_ENUM : GIT_PROJECT_BUILD_STEP_PYTHON_ENUM,
valueEnum: (row) =>
row.codeType === 1 ? GIT_PROJECT_BUILD_STEP_JAVA_ENUM : GIT_PROJECT_BUILD_STEP_PYTHON_ENUM
},
{
title: l('rc.gp.buildState'),
Expand Down
29 changes: 14 additions & 15 deletions dinky-web/src/pages/RegCenter/GitProject/constans.tsx
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
/*
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/

Expand Down Expand Up @@ -159,8 +159,8 @@ const GIT_PROJECT_BUILD_STEP_BASE = {
title: l('rc.gp.build.step.1'),
text: l('rc.gp.build.step.1'),
status: 'default'
},
}
}
};
/**
* git project build step enum
*/
Expand Down Expand Up @@ -217,7 +217,6 @@ export const GIT_PROJECT_BUILD_STEP_PYTHON_ENUM = {
}
};


/**
* git project build step filter
*/
Expand Down

0 comments on commit a3edd9a

Please sign in to comment.