🎨 文件风险提示

Faberiii · Faberiii · commit 8df208d817ed · 2022-09-16T17:14:36.000+08:00
diff --git a/web/packages/shared/component/authority/index.tsx b/web/packages/shared/component/authority/index.tsx
@@ -29,16 +29,17 @@ interface AuthorityProps {
   selectStyle?: any;
   placeholder?: string;
   required?: boolean;
+  allowClear?: boolean;
 }
 
 const Authority = (props: AuthorityProps) => {
-  const { form, name, label, initAuth, getAuthList, selectStyle = {}, placeholder, required } = props;
+  const { form, name, label, initAuth, getAuthList, selectStyle = {}, placeholder, required, allowClear } = props;
   const [sshAuthList, setSshAuthList] = useState<any>([]);
   const [httpAuthList, setHttpAuthList] = useState<any>([]);
   const [oauthAuthList, setOauthAuthList] = useState<any>([]);
   const [authLoading, setAuthLoading] = useState(false);
 
-  const setCurAuth = (sshList = sshAuthList, httpList = httpAuthList) => {
+  const setCurAuth = (sshList = sshAuthList, httpList = httpAuthList, oauthList = oauthAuthList) => {
     // 设置初始值
     if (initAuth[SCM_MAP[initAuth.auth_type]]?.id) {
       form.setFieldsValue({ [name]: `${initAuth.auth_type}#${initAuth[SCM_MAP[initAuth.auth_type]]?.id}` });
@@ -59,6 +60,13 @@ const Authority = (props: AuthorityProps) => {
     ) {
       setHttpAuthList([initAuth.scm_account, ...httpList]);
     }
+    if (
+      initAuth.scm_oauth
+      && initAuth.auth_type === AUTH_TYPE.OAUTH
+      && !find(oauthAuthList, { id: initAuth.scm_oauth?.id })
+    ) {
+      setOauthAuthList([initAuth.scm_oauth, ...oauthList]);
+    }
   };
 
   const getAuth = () => {
@@ -104,6 +112,7 @@ const Authority = (props: AuthorityProps) => {
           placeholder={placeholder}
           getPopupContainer={() => document.body}
           optionLabelProp="label"
+          allowClear={allowClear}
         >
           {!isEmpty(oauthAuthList) && (
             <OptGroup label={AUTH_TYPE_TXT.OAUTH}>
diff --git a/web/packages/shared/component/search/index.tsx b/web/packages/shared/component/search/index.tsx
@@ -103,6 +103,7 @@ const Search = ({
     Object.keys(searchParams).forEach((key) => {
       params[key] = '';
     });
+    form.setFieldsValue(params);
     onRouteHandle(params);
     callback?.(params);
   };
diff --git a/web/packages/tca-layout/src/constant/index.ts b/web/packages/tca-layout/src/constant/index.ts
@@ -20,7 +20,8 @@ export const DEFAULT_TEAM_PAGER = {
 
 export enum RepoTypeEnum {
   GIT = 'git',
-  SVN = 'svn'
+  SVN = 'svn',
+  ZIP = 'link'
 }
 
 export const REPO_TYPE_CHOICES = {
@@ -29,3 +30,11 @@ export const REPO_TYPE_CHOICES = {
 };
 
 export const REPO_TYPE_OPTIONS = generateOptions(REPO_TYPE_CHOICES);
+
+export const TOOLLIB_REPO_TYPE_CHOICES = {
+  [RepoTypeEnum.GIT]: 'GIT',
+  [RepoTypeEnum.SVN]: 'SVN',
+  [RepoTypeEnum.ZIP]: 'ZIP',
+};
+
+export const TOOLLIB_REPO_TYPE_OPTIONS = generateOptions(TOOLLIB_REPO_TYPE_CHOICES);
diff --git a/web/packages/tca-layout/src/modules/nodes/node-tasks-modal.tsx b/web/packages/tca-layout/src/modules/nodes/node-tasks-modal.tsx
@@ -100,6 +100,11 @@ const NodeTaskModal = ({ visible, nodeId, onCancel }: NodeTaskModalProps) => {
           title={t('子任务')}
           dataIndex="task_name"
           width={100}
+          render={(taskName: string) => (
+            <EllipsisTemplate maxWidth={100}>
+              {taskName}
+            </EllipsisTemplate>
+          )}
         />
         <Column
           title={t('执行状态')}
diff --git a/web/packages/tca-layout/src/modules/tool-libs/create-libs.tsx b/web/packages/tca-layout/src/modules/tool-libs/create-libs.tsx
@@ -6,11 +6,12 @@ import { isEmpty, fromPairs, toPairs, get } from 'lodash';
 import { Modal, Form, Input, Select, Tooltip, Button, message, Space } from 'coding-oa-uikit';
 import TrashIcon from 'coding-oa-uikit/lib/icon/Trash';
 import QuestionCircle from 'coding-oa-uikit/lib/icon/QuestionCircle';
+import AttentionIcon from 'coding-oa-uikit/lib/icon/AttentionRed';
 import Authority from '@tencent/micro-frontend-shared/component/authority';
 import { UserAPI } from '@plat/api';
 
 import { addToolLib, getLibDetail, updateToolLib } from '@src/services/tools';
-import { REPO_TYPE_OPTIONS, RepoTypeEnum, SCM_MAP, LIB_ENV, LIB_TYPE } from '@src/constant';
+import { TOOLLIB_REPO_TYPE_OPTIONS, RepoTypeEnum, SCM_MAP, LIB_ENV, LIB_TYPE } from '@src/constant';
 
 import style from './style.scss';
 
@@ -35,18 +36,20 @@ const CreateToollibs = (props: CreateToollibsProps) => {
   const { orgSid, visible, libId, isSuperuser, onClose, callback } = props;
   const [form] = Form.useForm();
   const [detail, setDetail] = useState<any>({});
+  const [zipWarningVisible, setZipWarningVisible] = useState<boolean>(false);
   const isEdit = !!libId;
 
   useEffect(() => {
     if (visible && libId) {
-      getLibDetail(orgSid, libId).then((res) => {
+      getLibDetail(orgSid, libId).then((res: any) => {
         setDetail(res);
+        setZipWarningVisible(res?.scm_type === RepoTypeEnum.ZIP);
         form.resetFields();
       });
-    }
-
-    if (visible) {
+    } else if (visible) {
       form.resetFields();
+      setDetail({});
+      setZipWarningVisible(false);
     }
   }, [visible]);
 
@@ -184,16 +187,15 @@ const CreateToollibs = (props: CreateToollibsProps) => {
           label="依赖仓库地址"
           name="scm_url"
           required
+          help={zipWarningVisible && <span style={{ color: '#eb333f' }}><AttentionIcon />请勿使用不明来源的文件链接，避免潜在的安全风险。</span>}
         >
           <Input.Group compact>
             <Form.Item name='scm_type' noStyle>
-              <Select style={{ width: '15%' }}>
-                {REPO_TYPE_OPTIONS.map((item: any, index: number) => (
-                  <Option key={index} value={item.value}>
-                    {item.label}
-                  </Option>
-                ))}
-              </Select>
+              <Select
+                style={{ width: '16%' }}
+                onChange={(value: RepoTypeEnum) => setZipWarningVisible(value === RepoTypeEnum.ZIP)}
+                options={TOOLLIB_REPO_TYPE_OPTIONS}
+              />
             </Form.Item>
             <Form.Item
               name='scm_url'
@@ -202,32 +204,40 @@ const CreateToollibs = (props: CreateToollibsProps) => {
                 { required: true, message: '依赖仓库地址' },
               ]}
             >
-              <Input style={{ width: '85%' }} />
+              <Input style={{ width: '84%' }} />
             </Form.Item>
           </Input.Group>
         </Form.Item>
-        <Authority
-          form={form}
-          name='scm'
-          label={(
-            <span>
-              凭证
-              <Tooltip
-                getPopupContainer={() => document.body}
-                title='拉取依赖仓库所需的凭证，如果是github公开仓库，可以不提供凭证。'
-              ><QuestionCircle className={style.questionIcon} /></Tooltip>
-            </span>
-          )}
-          getAuthList={[
-            UserAPI.authSSH().get,
-            UserAPI.authAccount().get,
-            UserAPI.getOAuthInfos,
-            UserAPI.getPlatformStatus,
-          ]}
-          initAuth={detail.scm_auth}
-          selectStyle={{ width: 360 }}
-          placeholder='github公开仓库可不提供凭证'
-        />
+        <Form.Item
+          noStyle
+          shouldUpdate={(prevValues: any, currentValues: any) => prevValues.scm_type !== currentValues.scm_type
+          }
+        >
+          {({ getFieldValue }: { getFieldValue: any }) => (getFieldValue('scm_type') !== RepoTypeEnum.ZIP && (
+            <Authority
+              form={form}
+              name='scm'
+              label={(
+                <span>
+                  凭证
+                  <Tooltip
+                    getPopupContainer={() => document.body}
+                    title='拉取依赖仓库所需的凭证，如果是github公开仓库，可以不提供凭证。'
+                  ><QuestionCircle className={style.questionIcon} /></Tooltip>
+                </span>
+              )}
+              getAuthList={[
+                UserAPI.authSSH().get,
+                UserAPI.authAccount().get,
+                UserAPI.getOAuthInfos,
+                UserAPI.getPlatformStatus,
+              ]}
+              initAuth={detail.scm_auth}
+              selectStyle={{ width: 360 }}
+              placeholder='github公开仓库可不提供凭证'
+            />
+          ))}
+        </Form.Item>
         <Form.Item
           name="envs"
           label={(
diff --git a/web/packages/tca-layout/src/modules/tool-libs/index.tsx b/web/packages/tca-layout/src/modules/tool-libs/index.tsx
@@ -134,7 +134,7 @@ export const ToolLibs = () => {
         <Column
           title='依赖系统'
           dataIndex='lib_os'
-          render={(os: string) => os.split(';').map((item: string) => (
+          render={(os: string) => os?.split(';').map((item: string) => (
             <Tag key={item}>{get(LIB_ENV, item, item)}</Tag>
           ))}
         />
diff --git a/web/packages/tca-layout/src/modules/tools/create-tool.tsx b/web/packages/tca-layout/src/modules/tools/create-tool.tsx
@@ -93,7 +93,7 @@ const CreateToolModal = ({ orgId, visible, onClose }: CreateToolModalProps) => {
         >
           <Input.Group compact>
             <Form.Item name='scm_type' noStyle>
-              <Select style={{ width: '15%' }} options={REPO_TYPE_OPTIONS} />
+              <Select style={{ width: '16%' }} options={REPO_TYPE_OPTIONS} />
             </Form.Item>
             <Form.Item
               name='scm_url'
@@ -102,7 +102,7 @@ const CreateToolModal = ({ orgId, visible, onClose }: CreateToolModalProps) => {
                 { required: true, message: t('请输入工具仓库地址') },
               ]}
             >
-              <Input style={{ width: '85%' }} />
+              <Input style={{ width: '84%' }} />
             </Form.Item>
           </Input.Group>
         </Form.Item>
diff --git a/web/packages/tca-layout/src/modules/tools/detail-components/baseinfo/index.tsx b/web/packages/tca-layout/src/modules/tools/detail-components/baseinfo/index.tsx
@@ -4,7 +4,7 @@
 import React, { useState, useEffect, useRef } from 'react';
 import { useTranslation } from 'react-i18next';
 import cn from 'classnames';
-import { get } from 'lodash';
+import { get, isEmpty } from 'lodash';
 import { Form, Button, Input, Checkbox, Select, message, Tag, Modal, Radio } from 'coding-oa-uikit';
 import EditIcon from 'coding-oa-uikit/lib/icon/Edit';
 import { formatDateTime } from '@tencent/micro-frontend-shared/util';
@@ -122,7 +122,7 @@ const BaseInfo = ({ orgSid, data, editable, getDetail }: BaseInfoProps) => {
         initialValues={{
           ...data,
           status: ToolStatusEnum.NORMAL,
-          scm_auth_id: `${data.scm_auth?.auth_type}#${get(data, ['scm_auth', get(SCM_MAP, data.scm_auth?.auth_type), 'id'])}`,
+          scm_auth_id: !isEmpty(data.scm_auth) && `${data.scm_auth?.auth_type}#${get(data, ['scm_auth', get(SCM_MAP, data.scm_auth?.auth_type), 'id'])}`,
         }}
         onFinish={isEdit ? onFinish : undefined}
       >
@@ -197,7 +197,7 @@ const BaseInfo = ({ orgSid, data, editable, getDetail }: BaseInfoProps) => {
                 getComponent(
                   <Input.Group compact>
                     <Form.Item name='scm_type' noStyle>
-                      <Select style={{ width: '15%' }} options={REPO_TYPE_OPTIONS} />
+                      <Select style={{ width: '16%' }} options={REPO_TYPE_OPTIONS} />
                     </Form.Item>
                     <Form.Item
                       name='scm_url'
@@ -206,7 +206,7 @@ const BaseInfo = ({ orgSid, data, editable, getDetail }: BaseInfoProps) => {
                         { required: true, message: t('请输入工具仓库地址') },
                       ]}
                     >
-                      <Input style={{ width: '85%' }} />
+                      <Input style={{ width: '84%' }} />
                     </Form.Item>
                   </Input.Group>,
                   data.scm_url,
@@ -216,25 +216,23 @@ const BaseInfo = ({ orgSid, data, editable, getDetail }: BaseInfoProps) => {
           )
         }
         {
-          data.scm_auth && (
-            getComponent(
-              <Authority
-                form={form}
-                name='scm_auth_id'
-                label={t('凭证')}
-                getAuthList={[
-                  UserAPI.authSSH().get,
-                  UserAPI.authAccount().get,
-                  UserAPI.getOAuthInfos,
-                  UserAPI.getPlatformStatus,
-                ]}
-                selectStyle={{ width: 360 }}
-                required={isEdit}
-              />,
-              <Form.Item label={t('凭证')}>
-                {getAuthDisplay(data.scm_auth)}
-              </Form.Item>,
-            )
+          getComponent(
+            <Authority
+              form={form}
+              name='scm_auth_id'
+              label={t('凭证')}
+              getAuthList={[
+                UserAPI.authSSH().get,
+                UserAPI.authAccount().get,
+                UserAPI.getOAuthInfos,
+                UserAPI.getPlatformStatus,
+              ]}
+              selectStyle={{ width: 360 }}
+              allowClear
+            />,
+            data.scm_auth && (<Form.Item label={t('凭证')}>
+              {getAuthDisplay(data.scm_auth)}
+            </Form.Item>),
           )
         }
         {
