Merge pull request #612 from nickcdon/main

🎨 issue列表展示msg信息

Author: freyaLo

.github/workflows/docs.yml

@@ -24,11 +24,11 @@ jobs:
       - name: Checkout Repo
         uses: actions/checkout@v3
 
-      - name: Setup Node 14
+      - name: Setup Node 16
         uses: actions/setup-node@v3
         with:
           # 选择要使用的 node 版本
-          node-version: "14"
+          node-version: "16"
           cache: "yarn"
           cache-dependency-path: "doc/yarn.lock"
 
@@ -39,8 +39,8 @@ jobs:
         with:
           path: doc/node_modules
           key: ${{ runner.os }}-yarn-${{ hashFiles('doc/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
+          # restore-keys: |
+          #   ${{ runner.os }}-yarn-
 
       # 如果缓存没有命中，安装依赖
       - if: ${{ steps.yarn-cache.outputs.cache-hit == false }}

doc/.vuepress/config.ts

@@ -1,7 +1,7 @@
 import { defineUserConfig } from '@vuepress/cli'
 import { defaultTheme } from '@vuepress/theme-default'
+import { searchPlugin } from '@vuepress/plugin-search'
 import { navbar, sidebar } from './configs'
-const { searchPlugin } = require('@vuepress/plugin-search')
 
 const isProd = process.env.NODE_ENV === 'production'
 

doc/package.json

@@ -6,14 +6,15 @@
     "tca",
     "document"
   ],
+  "type": "module",
   "license": "MIT",
   "scripts": {
     "dev": "vuepress dev",
     "build:comment": "echo '构建帮助文档，默认base前缀为document，可根据部署需要进行相应调整'",
     "build": "BASE=${BASE:-CodeAnalysis} vuepress build -d ./dist"
   },
   "devDependencies": {
-    "@vuepress/plugin-search": "^2.0.0-beta.43",
-    "vuepress": "^2.0.0-beta.42"
+    "@vuepress/plugin-search": "2.0.0-beta.51",
+    "vuepress": "2.0.0-beta.51"
   }
-}
+}

doc/yarn.lock

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 # 用于管道命令 只要一个子命令失败，整个管道命令就失败，脚本就会终止执行
 set -eo pipefail
@@ -13,9 +13,19 @@ function warning() {
   echo -e "\033[33m >>> $*\033[0;39m"
 }
 
+# 当前脚本执行目录
+CURRENT_PATH=$(
+  cd "$(dirname "${BASH_SOURCE[0]}")"
+  pwd
+)
+
+# web目录
+ROOT_PATH=$CURRENT_PATH
+
+cd "$ROOT_PATH"
+
 # git 版本
 GIT_REVISION=$(git rev-parse HEAD)
-ROOT_PATH=$(pwd)
 CONF_PATH="${ROOT_PATH}/tca-deploy-source/conf/"
 BUILD_ZIP_PATH="${ROOT_PATH}/tca-deploy-source/build_zip/"
 

web/build-source.sh

@@ -360,9 +360,17 @@ const Issues = (props: IssuesProps) => {
             sorter
             sortOrder={sort.key === 'checkrule_real_name' ? sort.order : undefined}
             render={(name: any, item: any) => (
-              <Tooltip title={item.msg}>
-                <span>{name}</span>
-              </Tooltip>
+              <>
+              <p>{name}</p>
+              {
+                item.msg && item.msg?.length > 120
+                  ? (
+                    <Tooltip title={item.msg}>
+                      <p className={style.path}>错误信息：{item?.msg?.substring(0, 120)}...</p>
+                    </Tooltip>
+                  ) : <p className={style.path}>错误信息：{item.msg}</p>
+              }
+            </>
             )}
           />
           <Column

web/packages/tca-analysis/src/modules/projects/issues/index.tsx

@@ -27,7 +27,6 @@ interface RuleDetailProps {
 const RuleDetail = (props: RuleDetailProps) => {
   const { data, visible, onClose } = props;
   const { orgSid } = useParams<any>();
-  console.log(data);
 
   return (
     <Drawer

web/packages/tca-analysis/src/modules/projects/issues/rule-detail.tsx

@@ -41,7 +41,7 @@
 
   .path {
     font-size: 12px;
-    color: $grey-7;
+    color: $grey-6;
     max-width: 400px;
     word-break: break-all;
   }

web/packages/tca-analysis/src/modules/projects/issues/style.scss

@@ -5,26 +5,27 @@
 // ==============================================================================
 
 import React, { useEffect } from 'react';
-import { toNumber, isString, isEmpty, isArray, cloneDeep } from 'lodash';
-import { Input, Form, Button } from 'coding-oa-uikit';
+import { toNumber, isString, isEmpty, isArray, cloneDeep, find } from 'lodash';
+import { Input, Form, Button, Select } from 'coding-oa-uikit';
 
 import SelectBorderless from '@src/components/select-borderless';
 import Filter from '@src/components/filter';
 import { SEVERITY, CATEGORY } from '../constants';
 
-const numberParams = ['checkpackage', 'severity', 'category', 'checktool'];
+const numberParams = ['checkpackage', 'severity', 'category'];
 const arrayParams = ['language'];
 
 interface SearchProps {
   filters: any;
   searchParams: any;
   loading: boolean;
+  addToolsRules: (toolId: number) => void;  // 一键添加工具所有规则
   callback: (params: any) => void;
 }
 
 const Search = (props: SearchProps) => {
   const [form] = Form.useForm();
-  const { searchParams, loading, filters, callback } = props;
+  const { searchParams, loading, filters, addToolsRules, callback } = props;
   const { allPkgs = [], languages = [], checkTools = [] }: any = filters;
 
   const initialValues = cloneDeep(searchParams);
@@ -36,6 +37,10 @@ const Search = (props: SearchProps) => {
         .map((item: string) => toNumber(item));
     }
 
+    if (initialValues.checktool) {
+      initialValues.checktool = toNumber(initialValues.checktool);
+    }
+
     if (arrayParams.includes(key) && isString(value)) {
       initialValues[key] = value.split(',');
     }
@@ -104,46 +109,70 @@ const Search = (props: SearchProps) => {
           }
         />
       </Filter.Item>
-      <Filter.Item label="所属工具" name="checktool">
+      <Filter.Item label="适用语言" name="language">
         <SelectBorderless
           multiple
           allowClear
           placeholder="全部"
-          data={checkTools?.map((item: any) => ({
-            value: item.id,
+          data={languages?.map((item: any) => ({
+            value: item.name,
             text: item.display_name,
           }))}
-          onChange={(value: any) => value && onChange('checktool', value.join(','))
+          onChange={(value: any) => value && onChange('language', value.join(','))
           }
         />
       </Filter.Item>
-      <Filter.Item label="适用语言" name="language">
-        <SelectBorderless
-          multiple
+      <Filter.Item label="所属工具" name="checktool">
+        <Select
+          showSearch
+          allowClear
+          size='middle'
+          placeholder='全部工具'
+          style={{ minWidth: '150px' }}
+          optionFilterProp='children'
+          dropdownMatchSelectWidth={false}
+          onChange={(value: any) => onChange('checktool', value)}
+        >
+          {
+            checkTools.map((item: any) => (
+              <Select.Option key={item.id} value={item.id}>{item.display_name}</Select.Option>
+            ))
+          }
+        </Select>
+        {/* <SelectBorderless
           allowClear
           placeholder="全部"
-          data={languages?.map((item: any) => ({
-            value: item.name,
+          data={checkTools?.map((item: any) => ({
+            value: item.id,
             text: item.display_name,
           }))}
-          onChange={(value: any) => value && onChange('language', value.join(','))
+          onChange={(value: any) => value && onChange('checktool', value.join(','))
           }
-        />
+        /> */}
       </Filter.Item>
+
       <Filter.Item label="" name="real_name">
         <Input.Search
           size="middle"
           placeholder="规则名称"
+          style={{ minWidth: '150px' }}
           onSearch={value => onChange('real_name', value)}
         />
       </Filter.Item>
       {Object.keys(searchParams).some((key: string) => (isArray(searchParams[key])
         ? !isEmpty(searchParams[key])
         : searchParams[key])) && (
-        <Button type="link" onClick={onClear} style={{ height: '36px' }}>
+        <Button type="link" onClick={onClear} style={{ height: '36px', marginRight: 10 }}>
           清空过滤
         </Button>
       )}
+      {
+        find(checkTools, { id: initialValues.checktool }) && (
+          <Button type="link" style={{ height: '36px' }} onClick={() => addToolsRules(initialValues.checktool)}>
+            一键添加 {find(checkTools, { id: initialValues.checktool })?.display_name} 工具的所有规则
+          </Button>
+        )
+      }
     </Filter>
   );
 };

web/packages/tca-analysis/src/modules/schemes/code-lint/all-rules-search.tsx

@@ -129,6 +129,19 @@ const AllRules = () => {
     });
   };
 
+  /**
+   * 一键添加指定工具所有规则
+   * @param toolId
+   */
+  const addToolsRules = (toolId: number) => {
+    addRule(orgSid, teamName, repoId, schemeId, {
+      checktool: toolId,
+    }).then(() => {
+      message.success('批量添加成功');
+      getListData(pageStart, pageSize);
+    });
+  };
+
   const openRuleDetail = async (ruleId: number) => {
     setRuleDetailVsb(true);
     const res = await getRuleDetail(orgSid, teamName, repoId, schemeId, ruleId);
@@ -163,6 +176,7 @@ const AllRules = () => {
         }}
         searchParams={cloneDeep(searchParams)}
         loading={loading}
+        addToolsRules={addToolsRules}
         callback={(params: any) => {
           getListData(DEFAULT_PAGER.pageStart, pageSize, params);
         }}
@@ -212,7 +226,7 @@ const AllRules = () => {
           <Column title="规则概要" dataIndex="rule_title" />
           <Column title="所属工具" dataIndex={['checktool', 'display_name']} />
           <Column title="分类" dataIndex="category_name" />
-          <Column title="问题级别" dataIndex="severity_name" />
+          <Column title="问题级别" dataIndex="severity_name" width={80}/>
         </Table>
       </div>
       <RuleDetail