Merge pull request '合并' (#439) from dev-zw into dev-opt

react-ui/src/pages/System/Approval/components/ApprovalModal/index.tsx

@@ -153,6 +153,27 @@ function ApprovalModal({ record, onOk, ...rest }: ApprovalModalProps) {
         },
       ];
       break;
+    case ApprovalType.SKILL:
+      items = [
+        {
+          label: 'Skill 名称',
+          value: content.name,
+        },
+        {
+          label: 'Skill 描述',
+          value: content.description,
+        },
+        {
+          label: 'Skill 类型',
+          value: content.type,
+        },
+        {
+          label: '创建时间',
+          value: content.createTime,
+          format: formatDate,
+        },
+      ];
+      break;
     default:
       items = [];
       break;

react-ui/src/pages/System/Approval/index.tsx

@@ -47,6 +47,7 @@ export enum ApprovalType {
   IMAGE = 'IMAGE',
   CODE = 'CODE',
   SERVICE = 'SERVICE',
+  SKILL = 'SKILL',
 }
 
 const approvalTypeOptions = [
@@ -55,6 +56,7 @@ const approvalTypeOptions = [
   { label: '镜像', value: ApprovalType.IMAGE },
   { label: '代码配置', value: ApprovalType.CODE },
   { label: '应用', value: ApprovalType.SERVICE },
+  { label: 'Skill', value: ApprovalType.SKILL },
 ];
 
 const statusOptions = [{ label: '全部', value: '' }, ...approvalStatusOptions];