Merge branch 'Tencent:main' into main

Tencent · Feb 27, 2023 · b72c1ae · b72c1ae
2 parents a15d5d5 + 0c19642
commit b72c1ae
Show file tree

Hide file tree

Showing 148 changed files with 1,409 additions and 406 deletions.
diff --git a/server/cls/cls b/server/cls/cls
diff --git a/web/packages/shared/tca/util/index.ts b/web/packages/shared/tca/util/index.ts
@@ -29,7 +29,7 @@ export const getRepoName = (repoInfo: any, params: GetRepoNameParams = { onlyLas
   const repoUrl = url || scmUrl || info.scm_url;
   if (repoUrl) {
     if (params.onlyLastName) {
-      return repoUrl.substring(0, repoUrl.lastIndexOf('/') + 1);
+      return repoUrl.substring(repoUrl.lastIndexOf('/') + 1);
     }
     return getScmUrlPath(repoUrl);
   }

diff --git a/web/packages/shared/tdesign-component/modal/delete-modal/index.tsx b/web/packages/shared/tdesign-component/modal/delete-modal/index.tsx
@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2023 THL A29 Limited
+// Copyright (c) 2021-2022 THL A29 Limited
 //
 // This source code file is made available under MIT License
 // See LICENSE for details

diff --git a/web/packages/tca-analysis/src/components/code-highlight/constants.ts b/web/packages/tca-analysis/src/components/code-highlight/constants.ts
@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2023 THL A29 Limited
+// Copyright (c) 2021-2022 THL A29 Limited
 //
 // This source code file is made available under MIT License
 // See LICENSE for details

diff --git a/web/packages/tca-analysis/src/components/code-highlight/index.tsx b/web/packages/tca-analysis/src/components/code-highlight/index.tsx
@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2023 THL A29 Limited
+// Copyright (c) 2021-2022 THL A29 Limited
 //
 // This source code file is made available under MIT License
 // See LICENSE for details

diff --git a/web/packages/tca-analysis/src/components/code-highlight/worker.js b/web/packages/tca-analysis/src/components/code-highlight/worker.js
@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2023 THL A29 Limited
+// Copyright (c) 2021-2022 THL A29 Limited
 //
 // This source code file is made available under MIT License
 // See LICENSE for details

diff --git a/web/packages/tca-analysis/src/components/copy/index.tsx b/web/packages/tca-analysis/src/components/copy/index.tsx
@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2023 THL A29 Limited
+// Copyright (c) 2021-2022 THL A29 Limited
 //
 // This source code file is made available under MIT License
 // See LICENSE for details

diff --git a/web/packages/tca-analysis/src/components/delete-modal/index.tsx b/web/packages/tca-analysis/src/components/delete-modal/index.tsx
@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2023 THL A29 Limited
+// Copyright (c) 2021-2022 THL A29 Limited
 //
 // This source code file is made available under MIT License
 // See LICENSE for details

diff --git a/web/packages/tca-analysis/src/components/filter/FilterItem.tsx b/web/packages/tca-analysis/src/components/filter/FilterItem.tsx
@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2023 THL A29 Limited
+// Copyright (c) 2021-2022 THL A29 Limited
 //
 // This source code file is made available under MIT License
 // See LICENSE for details

diff --git a/web/packages/tca-analysis/src/components/filter/index.tsx b/web/packages/tca-analysis/src/components/filter/index.tsx
@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2023 THL A29 Limited
+// Copyright (c) 2021-2022 THL A29 Limited
 //
 // This source code file is made available under MIT License
 // See LICENSE for details

diff --git a/web/packages/tca-analysis/src/components/header/index.tsx b/web/packages/tca-analysis/src/components/header/index.tsx
@@ -0,0 +1,53 @@
+/**
+ * Header 组件
+ */
+
+import React from 'react';
+import { useHistory } from 'react-router-dom';
+// import { isString } from 'lodash';
+import ArrowLeft from 'coding-oa-uikit/lib/icon/ArrowLeft';
+
+import style from './style.scss';
+
+interface HeaderProps {
+  size?: string;
+  link?: string; // 路由返回链接
+  title: string | React.ReactNode; // 标题
+  description?: string;  // 标题描述
+  onBack?: () => void; // 返回
+}
+
+const Header = (props: HeaderProps) => {
+  const history = useHistory();
+  const { link, title, size, description, onBack } = props;
+
+  return (
+    <div className={style.header}>
+      {(link || onBack) && (
+        <span
+          className={style.backIcon}
+          onClick={() => (onBack ? onBack() : history.push(link))}
+        >
+          <ArrowLeft />
+        </span>
+      )}
+      <div>
+        {
+          size === 'small' ? (
+            <h4 className={style.smallTitle}>{title}</h4>
+          ) : (
+            <h2 className={style.title}>{title}</h2>
+          )
+        }
+        {
+          description && (
+            <span className={style.description}>{description}</span>
+          )
+        }
+      </div>
+
+    </div>
+  );
+};
+
+export default Header;
diff --git a/web/packages/tca-analysis/src/components/header/style.scss b/web/packages/tca-analysis/src/components/header/style.scss
@@ -0,0 +1,48 @@
+@import "@tencent/micro-frontend-shared/style/color.scss";
+
+.header {
+    display: flex;
+    align-items: flex-start;
+    // margin-bottom: 20px;
+
+    .back-icon {
+        width: 28px;
+        height: 28px;
+        color: $blue-5;
+        margin-right: 20px;
+        text-align: center;
+        background: #ffffff;
+        border-radius: 50%;
+        box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.1);
+        cursor: pointer;
+        transition: all 0.3s;
+
+        svg {
+            font-size: 18px;
+            vertical-align: middle !important;
+        }
+
+        &:hover {
+            box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.2);
+        }
+    }
+
+    .title {
+        flex: 1;
+        font-size: 18px;
+        font-weight: 500;
+        margin-bottom: 0;
+    }
+
+    .small-title {
+      flex: 1;
+      font-size: 14px;
+      font-weight: 500;
+      margin-bottom: 0;
+  }
+
+  .description {
+    color: $grey-7;
+    margin-top: 6px;
+  }
+}
diff --git a/web/packages/tca-analysis/src/components/loading/index.tsx b/web/packages/tca-analysis/src/components/loading/index.tsx
@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2023 THL A29 Limited
+// Copyright (c) 2021-2022 THL A29 Limited
 //
 // This source code file is made available under MIT License
 // See LICENSE for details

diff --git a/web/packages/tca-analysis/src/components/repos/index.tsx b/web/packages/tca-analysis/src/components/repos/index.tsx
@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2023 THL A29 Limited
+// Copyright (c) 2021-2022 THL A29 Limited
 //
 // This source code file is made available under MIT License
 // See LICENSE for details

diff --git a/web/packages/tca-analysis/src/components/running-icon/index.tsx b/web/packages/tca-analysis/src/components/running-icon/index.tsx
@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2023 THL A29 Limited
+// Copyright (c) 2021-2022 THL A29 Limited
 //
 // This source code file is made available under MIT License
 // See LICENSE for details

diff --git a/web/packages/tca-analysis/src/components/select-borderless/index.tsx b/web/packages/tca-analysis/src/components/select-borderless/index.tsx
@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2023 THL A29 Limited
+// Copyright (c) 2021-2022 THL A29 Limited
 //
 // This source code file is made available under MIT License
 // See LICENSE for details

diff --git a/web/packages/tca-analysis/src/components/select-dropdown/index.tsx b/web/packages/tca-analysis/src/components/select-dropdown/index.tsx
@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2023 THL A29 Limited
+// Copyright (c) 2021-2022 THL A29 Limited
 //
 // This source code file is made available under MIT License
 // See LICENSE for details

diff --git a/web/packages/tca-analysis/src/components/tips/index.tsx b/web/packages/tca-analysis/src/components/tips/index.tsx
@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2023 THL A29 Limited
+// Copyright (c) 2021-2022 THL A29 Limited
 //
 // This source code file is made available under MIT License
 // See LICENSE for details

diff --git a/web/packages/tca-analysis/src/context/constant.ts b/web/packages/tca-analysis/src/context/constant.ts
@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2023 THL A29 Limited
+// Copyright (c) 2021-2022 THL A29 Limited
 //
 // This source code file is made available under MIT License
 // See LICENSE for details

diff --git a/web/packages/tca-analysis/src/context/store.tsx b/web/packages/tca-analysis/src/context/store.tsx
@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2023 THL A29 Limited
+// Copyright (c) 2021-2022 THL A29 Limited
 //
 // This source code file is made available under MIT License
 // See LICENSE for details

diff --git a/web/packages/tca-analysis/src/modules/project-team/group/index.tsx b/web/packages/tca-analysis/src/modules/project-team/group/index.tsx
@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2023 THL A29 Limited
+// Copyright (c) 2021-2022 THL A29 Limited
 //
 // This source code file is made available under MIT License
 // See LICENSE for details

diff --git a/web/packages/tca-analysis/src/modules/project-team/overview/index.tsx b/web/packages/tca-analysis/src/modules/project-team/overview/index.tsx
@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2023 THL A29 Limited
+// Copyright (c) 2021-2022 THL A29 Limited
 //
 // This source code file is made available under MIT License
 // See LICENSE for details

diff --git a/web/packages/tca-analysis/src/modules/projects/code-tools/circle-packing.tsx b/web/packages/tca-analysis/src/modules/projects/code-tools/circle-packing.tsx
@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2023 THL A29 Limited
+// Copyright (c) 2021-2022 THL A29 Limited
 //
 // This source code file is made available under MIT License
 // See LICENSE for details

diff --git a/web/packages/tca-analysis/src/modules/projects/code-tools/index.tsx b/web/packages/tca-analysis/src/modules/projects/code-tools/index.tsx
@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2023 THL A29 Limited
+// Copyright (c) 2021-2022 THL A29 Limited
 //
 // This source code file is made available under MIT License
 // See LICENSE for details

diff --git a/web/packages/tca-analysis/src/modules/projects/code-tools/modal.tsx b/web/packages/tca-analysis/src/modules/projects/code-tools/modal.tsx
@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2023 THL A29 Limited
+// Copyright (c) 2021-2022 THL A29 Limited
 //
 // This source code file is made available under MIT License
 // See LICENSE for details

diff --git a/web/packages/tca-analysis/src/modules/projects/code-tools/scans.tsx b/web/packages/tca-analysis/src/modules/projects/code-tools/scans.tsx
@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2023 THL A29 Limited
+// Copyright (c) 2021-2022 THL A29 Limited
 //
 // This source code file is made available under MIT License
 // See LICENSE for details

diff --git a/web/packages/tca-analysis/src/modules/projects/index.tsx b/web/packages/tca-analysis/src/modules/projects/index.tsx
@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2023 THL A29 Limited
+// Copyright (c) 2021-2022 THL A29 Limited
 //
 // This source code file is made available under MIT License
 // See LICENSE for details
@@ -73,7 +73,7 @@ const Projects = () => {
         <Route
           exact
           path={`${BASE_ROUTE_PREFIX}/code-analysis/(project)?/repos/:repoId?/projects`}
-          render={() => <ProjectList templates={templates} schemes={schemes} />}
+          render={() => <ProjectList templates={templates} schemes={schemes}/>}
         />
         <Route
           path={`${PROJECT_ROUTE_PREFIX}/:tabs`}

diff --git a/web/packages/tca-analysis/src/modules/projects/issues/detail-right.tsx b/web/packages/tca-analysis/src/modules/projects/issues/detail-right.tsx
@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2023 THL A29 Limited
+// Copyright (c) 2021-2022 THL A29 Limited
 //
 // This source code file is made available under MIT License
 // See LICENSE for details
@@ -173,7 +173,7 @@ const DetailRight = (props: DetailRightProps) => {
           <a onClick={() => {
             openDetail(data.checkrule_gid);
           }}>
-            {data.checkrule_display_name}
+            {data.checkrule_real_name}
           </a>
         </div>
         <div className={style.item}>

diff --git a/web/packages/tca-analysis/src/modules/projects/issues/detail.tsx b/web/packages/tca-analysis/src/modules/projects/issues/detail.tsx
@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2023 THL A29 Limited
+// Copyright (c) 2021-2022 THL A29 Limited
 //
 // This source code file is made available under MIT License
 // See LICENSE for details

diff --git a/web/packages/tca-analysis/src/modules/projects/issues/handle-issue-modal.tsx b/web/packages/tca-analysis/src/modules/projects/issues/handle-issue-modal.tsx
@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2023 THL A29 Limited
+// Copyright (c) 2021-2022 THL A29 Limited
 //
 // This source code file is made available under MIT License
 // See LICENSE for details

diff --git a/web/packages/tca-analysis/src/modules/projects/issues/index.tsx b/web/packages/tca-analysis/src/modules/projects/issues/index.tsx
@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2023 THL A29 Limited
+// Copyright (c) 2021-2022 THL A29 Limited
 //
 // This source code file is made available under MIT License
 // See LICENSE for details

diff --git a/web/packages/tca-analysis/src/modules/projects/issues/issue-popover.tsx b/web/packages/tca-analysis/src/modules/projects/issues/issue-popover.tsx
@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2023 THL A29 Limited
+// Copyright (c) 2021-2022 THL A29 Limited
 //
 // This source code file is made available under MIT License
 // See LICENSE for details

diff --git a/web/packages/tca-analysis/src/modules/projects/issues/rule-detail.tsx b/web/packages/tca-analysis/src/modules/projects/issues/rule-detail.tsx
@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2023 THL A29 Limited
+// Copyright (c) 2021-2022 THL A29 Limited
 //
 // This source code file is made available under MIT License
 // See LICENSE for details

diff --git a/web/packages/tca-analysis/src/modules/projects/issues/search.tsx b/web/packages/tca-analysis/src/modules/projects/issues/search.tsx
@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2023 THL A29 Limited
+// Copyright (c) 2021-2022 THL A29 Limited
 //
 // This source code file is made available under MIT License
 // See LICENSE for details
@@ -58,7 +58,7 @@ const Search = (props: SearchProps) => {
         file_path: path,
         ci_time_gte: gte,
         ci_time_lte: lte,
-        checkrule_display_name: name,
+        checkrule_real_name: name,
         checkpackage,
       } = initialValues;
 

diff --git a/web/packages/tca-analysis/src/modules/projects/metric/ccfiles/detail.tsx b/web/packages/tca-analysis/src/modules/projects/metric/ccfiles/detail.tsx
@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2023 THL A29 Limited
+// Copyright (c) 2021-2022 THL A29 Limited
 //
 // This source code file is made available under MIT License
 // See LICENSE for details

diff --git a/web/packages/tca-analysis/src/modules/projects/metric/ccfiles/index.tsx b/web/packages/tca-analysis/src/modules/projects/metric/ccfiles/index.tsx
@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2023 THL A29 Limited
+// Copyright (c) 2021-2022 THL A29 Limited
 //
 // This source code file is made available under MIT License
 // See LICENSE for details

diff --git a/web/packages/tca-analysis/src/modules/projects/metric/ccfiles/search.tsx b/web/packages/tca-analysis/src/modules/projects/metric/ccfiles/search.tsx
@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2023 THL A29 Limited
+// Copyright (c) 2021-2022 THL A29 Limited
 //
 // This source code file is made available under MIT License
 // See LICENSE for details

diff --git a/web/packages/tca-analysis/src/modules/projects/metric/ccissues/detail.tsx b/web/packages/tca-analysis/src/modules/projects/metric/ccissues/detail.tsx
@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2023 THL A29 Limited
+// Copyright (c) 2021-2022 THL A29 Limited
 //
 // This source code file is made available under MIT License
 // See LICENSE for details

diff --git a/web/packages/tca-analysis/src/modules/projects/metric/ccissues/index.tsx b/web/packages/tca-analysis/src/modules/projects/metric/ccissues/index.tsx
@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2023 THL A29 Limited
+// Copyright (c) 2021-2022 THL A29 Limited
 //
 // This source code file is made available under MIT License
 // See LICENSE for details

diff --git a/web/packages/tca-analysis/src/modules/projects/metric/ccissues/issue-modal.tsx b/web/packages/tca-analysis/src/modules/projects/metric/ccissues/issue-modal.tsx
@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2023 THL A29 Limited
+// Copyright (c) 2021-2022 THL A29 Limited
 //
 // This source code file is made available under MIT License
 // See LICENSE for details

diff --git a/web/packages/tca-analysis/src/modules/projects/metric/ccissues/search.tsx b/web/packages/tca-analysis/src/modules/projects/metric/ccissues/search.tsx
@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2023 THL A29 Limited
+// Copyright (c) 2021-2022 THL A29 Limited
 //
 // This source code file is made available under MIT License
 // See LICENSE for details

diff --git a/web/packages/tca-analysis/src/modules/projects/metric/clocs/index.tsx b/web/packages/tca-analysis/src/modules/projects/metric/clocs/index.tsx
@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2023 THL A29 Limited
+// Copyright (c) 2021-2022 THL A29 Limited
 //
 // This source code file is made available under MIT License
 // See LICENSE for details

diff --git a/web/packages/tca-analysis/src/modules/projects/metric/constants.ts b/web/packages/tca-analysis/src/modules/projects/metric/constants.ts
@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2023 THL A29 Limited
+// Copyright (c) 2021-2022 THL A29 Limited
 //
 // This source code file is made available under MIT License
 // See LICENSE for details

diff --git a/web/packages/tca-analysis/src/modules/projects/metric/dupfiles/detail.tsx b/web/packages/tca-analysis/src/modules/projects/metric/dupfiles/detail.tsx
@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2023 THL A29 Limited
+// Copyright (c) 2021-2022 THL A29 Limited
 //
 // This source code file is made available under MIT License
 // See LICENSE for details

diff --git a/web/packages/tca-analysis/src/modules/projects/metric/dupfiles/index.tsx b/web/packages/tca-analysis/src/modules/projects/metric/dupfiles/index.tsx
@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2023 THL A29 Limited
+// Copyright (c) 2021-2022 THL A29 Limited
 //
 // This source code file is made available under MIT License
 // See LICENSE for details

diff --git a/web/packages/tca-analysis/src/modules/projects/metric/dupfiles/search.tsx b/web/packages/tca-analysis/src/modules/projects/metric/dupfiles/search.tsx
@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2023 THL A29 Limited
+// Copyright (c) 2021-2022 THL A29 Limited
 //
 // This source code file is made available under MIT License
 // See LICENSE for details

diff --git a/web/packages/tca-analysis/src/modules/projects/metric/index.tsx b/web/packages/tca-analysis/src/modules/projects/metric/index.tsx
@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2023 THL A29 Limited
+// Copyright (c) 2021-2022 THL A29 Limited
 //
 // This source code file is made available under MIT License
 // See LICENSE for details