@devops-flow/devops-flow-pipeline-detail 0.0.37

package/es/components/common/teambition/flow-job-btn/batch-conflict-merge-btn/index.js

@@ -0,0 +1,178 @@
+import React from 'react';
+import { Button, Balloon, Dialog, Message } from '@teamix/ui';
+import { YunxiaoIcon, YunxiaoTable } from '@alife/devops-ui';
+import intl from "../../../../../locale";
+import fetch from "../../flow-engine/fetch";
+import "./index.scss";
+var ResolverDialog = function ResolverDialog(props) {
+  var getRelativePath = function getRelativePath(url) {
+    if (!url.startsWith('http')) {
+      return url;
+    }
+    var obj = new URL(url);
+    return "" + obj.pathname + obj.search;
+  };
+  var _JSON$parse = JSON.parse(props.data || '{"versions": []}'),
+    versions = _JSON$parse.versions;
+  var instances = versions === null || versions === void 0 ? void 0 : versions.map(function (i) {
+    return i.entity;
+  });
+  var onExecuteClick = function onExecuteClick(resolve_item) {
+    var relativePath = getRelativePath(props.url);
+    fetch({
+      url: relativePath,
+      method: props.method,
+      data: {
+        params: JSON.stringify({
+          RESOLVE_CONFLICT_DEPLOYMENT: resolve_item
+        })
+      }
+    }).then(function (res) {
+      if (res.successful) {
+        Message.success({
+          title: intl.get({
+            id: 'rdc-tb-cd-assets.flow-job-btn.batch-conflict-merge-btn.ExecutionSucceeded',
+            defaultMessage: '执行成功'
+          })
+        });
+        props.onClose();
+      } else {
+        Message.error({
+          title: intl.get({
+            id: 'rdc-tb-cd-assets.flow-job-btn.batch-conflict-merge-btn.ExecutionFailed',
+            defaultMessage: '执行失败'
+          })
+        });
+      }
+    });
+  };
+  return /*#__PURE__*/React.createElement("div", {
+    className: "conflict-info"
+  }, /*#__PURE__*/React.createElement("h3", null, intl.get({
+    id: 'rdc-tb-cd-assets.flow-job-btn.batch-conflict-merge-btn.ConflictResolution',
+    defaultMessage: '解决冲突'
+  })), /*#__PURE__*/React.createElement("p", null, intl.get({
+    id: 'rdc-tb-cd-assets.flow-job-btn.batch-conflict-merge-btn.TheCurrentServiceIsAssociated',
+    defaultMessage: '当前服务关联了多个应用工作负载，请选择保留其中一个版本的实例，并移除其它所有版本'
+  })), /*#__PURE__*/React.createElement(Message, {
+    type: "warning",
+    title: intl.get({
+      id: 'rdc-tb-cd-assets.flow-job-btn.batch-conflict-merge-btn.Cue',
+      defaultMessage: '提示'
+    })
+  }, intl.get({
+    id: 'rdc-tb-cd-assets.flow-job-btn.batch-conflict-merge-btn.BeforeBatchPublishingTheCurrently',
+    defaultMessage: '执行分批发布前，要求当前发布的服务有且只有一个唯一的应用工作负载实例，当存在多个版本的应用工作负载实例时云效将认为当前服务处于不稳定状态'
+  })), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement(YunxiaoTable, {
+    dataSource: instances,
+    hasBorder: true,
+    maxBodyHeight: "unset"
+  }, /*#__PURE__*/React.createElement(YunxiaoTable.Column, {
+    title: intl.get({
+      id: 'rdc-tb-cd-assets.flow-job-btn.batch-conflict-merge-btn.Namespace',
+      defaultMessage: '命名空间'
+    }),
+    cell: function cell(v, _, item) {
+      return "" + item.metadata.namespace;
+    }
+  }), /*#__PURE__*/React.createElement(YunxiaoTable.Column, {
+    title: intl.get({
+      id: 'rdc-tb-cd-assets.flow-job-btn.batch-conflict-merge-btn.Name',
+      defaultMessage: '名称'
+    }),
+    cell: function cell(v, _, item) {
+      return item.metadata.name;
+    }
+  }), /*#__PURE__*/React.createElement(YunxiaoTable.Column, {
+    title: intl.get({
+      id: 'rdc-tb-cd-assets.flow-job-btn.batch-conflict-merge-btn.Container',
+      defaultMessage: '容器'
+    }),
+    cell: function cell(v, _, item) {
+      var _item$spec$template$s = item.spec.template.spec.containers,
+        containers = _item$spec$template$s === void 0 ? [] : _item$spec$template$s;
+      var ops = containers.map(function (c) {
+        return /*#__PURE__*/React.createElement(Balloon.Tooltip, {
+          type: "primary",
+          align: "t",
+          trigger: /*#__PURE__*/React.createElement(Button, {
+            name: "meta",
+            text: true
+          }, /*#__PURE__*/React.createElement(YunxiaoIcon, {
+            type: "particle-line"
+          }), c.name)
+        }, c.image);
+      });
+      return /*#__PURE__*/React.createElement(React.Fragment, null, ops);
+    }
+  }), /*#__PURE__*/React.createElement(YunxiaoTable.Column, {
+    title: intl.get({
+      id: 'rdc-tb-cd-assets.flow-job-btn.batch-conflict-merge-btn.CreationTime',
+      defaultMessage: '创建时间'
+    }),
+    cell: function cell(v, _, item) {
+      return item.metadata.creationTimestamp;
+    }
+  }), /*#__PURE__*/React.createElement(YunxiaoTable.Column, {
+    title: intl.get({
+      id: 'rdc-tb-cd-assets.flow-job-btn.batch-conflict-merge-btn.Operation',
+      defaultMessage: '操作'
+    }),
+    cell: function cell(v, _, item) {
+      return /*#__PURE__*/React.createElement(Button, {
+        text: true,
+        type: "primary",
+        onClick: function onClick() {
+          var dialog = Dialog.alert({
+            messageProps: {
+              type: 'warning'
+            },
+            title: intl.get({
+              id: 'rdc-tb-cd-assets.flow-job-btn.batch-conflict-merge-btn.ConfirmTheOperation',
+              defaultMessage: '请确认操作'
+            }),
+            content: intl.get({
+              id: 'rdc-tb-cd-assets.flow-job-btn.batch-conflict-merge-btn.TheCurrentOperationUsesItemmetadataname',
+              defaultMessage: '当前操作将使用{itemMetadataName}接管所有流量，并移除其它工作负载实例'
+            }, {
+              itemMetadataName: item.metadata.name
+            }),
+            onOk: function onOk() {
+              dialog.update && dialog.update({
+                loading: true
+              });
+              onExecuteClick(item.metadata.name);
+              setTimeout(function () {
+                dialog.hide();
+              }, 1000);
+              return false;
+            }
+          });
+        }
+      }, intl.get({
+        id: 'rdc-tb-cd-assets.flow-job-btn.batch-conflict-merge-btn.RetainTheCurrentInstance',
+        defaultMessage: '保留当前实例'
+      }));
+    }
+  })));
+};
+var ConflictMergeButton = function ConflictMergeButton(_ref) {
+  var _onClick = _ref.onClick,
+    id = _ref.id;
+  return /*#__PURE__*/React.createElement(Button, {
+    text: true,
+    key: id,
+    type: "primary",
+    onClick: function onClick() {
+      _onClick('CONFLICT_MERGE_BATCH');
+    }
+  }, /*#__PURE__*/React.createElement(YunxiaoIcon, {
+    type: "warning-fill"
+  }), intl.get({
+    id: 'rdc-tb-cd-assets.flow-job-btn.batch-conflict-merge-btn.ConflictResolution',
+    defaultMessage: '解决冲突'
+  }));
+};
+ConflictMergeButton.Button = ConflictMergeButton;
+ConflictMergeButton.View = ResolverDialog;
+export default ConflictMergeButton;

package/es/components/common/teambition/flow-job-btn/batch-conflict-merge-btn/index.scss

@@ -0,0 +1,20 @@
+.conflict-info {
+  width: 100%;
+  display: inline-block;
+  overflow-y: auto;
+  padding: 0 20px 20px 20px;
+  pre {
+    white-space: normal;
+    line-height: 2;
+  }
+  .item {
+    margin-bottom: 30px;
+    .title {
+      display: flex;
+      align-items: center;
+      .next-btn {
+        margin-left: 6px;
+      }
+    }
+  }
+}

package/es/components/common/teambition/flow-job-btn/cardsMap.d.ts

@@ -0,0 +1,13 @@
+export declare const ExecuteableButtons: string[];
+export declare const buildButtonComponentWrapper: ({ displayType, mode, isAdmin, ...props }: {
+    [x: string]: any;
+    displayType: any;
+    mode: any;
+    isAdmin?: boolean;
+}) => (restProps: any) => any;
+declare const wrapper: ({ displayType, type, ...props }: {
+    [x: string]: any;
+    displayType: any;
+    type: any;
+}) => any;
+export default wrapper;

package/es/components/common/teambition/flow-job-btn/cardsMap.js

@@ -0,0 +1,215 @@
+import _extends from "@babel/runtime/helpers/extends";
+import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
+var _excluded = ["displayType", "mode", "isAdmin"],
+  _excluded2 = ["displayType", "type"];
+import React from 'react';
+import ExecuteButton from "./execute-button";
+import LogButton from "./log-btn";
+import AuiTestSummaryButton from "./aui-test-summary";
+import PackageLink from "./package-download";
+import StateInfoButton from "./state-info";
+import EmasArtifact from "./emas-artifact";
+import LinkWithQRCode from "./link-with-qrcode";
+import SummaryInfoButton from "./summary-info";
+import StateInfoWithRedline from "./state-info-with-redline-new";
+import DeployOrderButton from "./deploy-order";
+import AppDeployOrderButton from "./app-deploy-order";
+import LinkButton from "./link";
+import ViewButton from "./view";
+import ConflictMergeButton from "./conflict-merge-btn";
+import IstioConflictMergeButton from "./istio-conflict-merge-btn";
+import BatchConflictMergeButton from "./batch-conflict-merge-btn";
+import ReleaseBranchButton from "./release-branch";
+import DebugButton from "./debug-button";
+import ReleaseOrderButton from "./release-order";
+import ChangeInfoButton from "./change-info-btn";
+import { getFeature } from "../../../../utils";
+export var ExecuteableButtons = ['EXECUTE'];
+export var buildButtonComponentWrapper = function buildButtonComponentWrapper(_ref) {
+  var displayType = _ref.displayType,
+    mode = _ref.mode,
+    _ref$isAdmin = _ref.isAdmin,
+    isAdmin = _ref$isAdmin === void 0 ? false : _ref$isAdmin,
+    props = _objectWithoutPropertiesLoose(_ref, _excluded);
+  if (!displayType) {
+    return function () {
+      return null;
+    };
+  }
+  switch (displayType.toUpperCase()) {
+    case 'EXECUTE':
+      return function (restProps) {
+        var Button = ExecuteButton[mode];
+        return Button ? /*#__PURE__*/React.createElement(Button, _extends({}, props, restProps, {
+          id: restProps.key
+        })) : null;
+      };
+    case 'LOG':
+    case 'LOGPIPELINEJOBRUN':
+      return function (restProps) {
+        var Button = LogButton[mode];
+        return Button ? /*#__PURE__*/React.createElement(Button, _extends({}, props, restProps, {
+          id: restProps.key
+        })) : null;
+      };
+    case 'AUI_TEST_SUMMARY':
+      return function (restProps) {
+        var Button = AuiTestSummaryButton[mode];
+        return Button ? /*#__PURE__*/React.createElement(Button, _extends({}, props, restProps, {
+          id: restProps.key
+        })) : null;
+      };
+    case 'BUILD_VERSION_INFO':
+      return function (restProps) {
+        var Button = PackageLink[mode];
+        return Button ? /*#__PURE__*/React.createElement(Button, _extends({}, props, restProps, {
+          id: restProps.key
+        })) : null;
+      };
+    case 'SUMMARY_INFO':
+      return function (restProps) {
+        var Button = SummaryInfoButton[mode];
+        return Button ? /*#__PURE__*/React.createElement(Button, _extends({}, props, restProps, {
+          id: restProps.key
+        })) : null;
+      };
+    case 'STAT_INFO':
+      return function (restProps) {
+        var button = StateInfoButton[mode];
+        // 这个 Button 返回数组，不能当成 react 组件用
+        return button ? button(_extends({}, props, restProps, {
+          id: restProps.key
+        })) : null;
+      };
+    case 'STAT_INFO_WITH_REDLINES':
+      return function (restProps) {
+        var button = StateInfoWithRedline[mode];
+        return button ? button(_extends({}, props, restProps, {
+          id: restProps.key
+        })) : null;
+      };
+    case 'DEPLOY_ORDER':
+      if (JSON.parse(props.data).engineVersion) {
+        return function (restProps) {
+          var Button = AppDeployOrderButton[mode];
+          return Button ? /*#__PURE__*/React.createElement(Button, _extends({}, props, restProps, {
+            id: restProps.key
+          })) : null;
+        };
+      }
+      return function (restProps) {
+        var Button = DeployOrderButton[mode];
+        return Button ? /*#__PURE__*/React.createElement(Button, _extends({}, props, restProps, {
+          id: restProps.key
+        })) : null;
+      };
+    case 'LINK':
+      return function (restProps) {
+        var Button = LinkButton[mode];
+        return Button ? /*#__PURE__*/React.createElement(Button, _extends({}, props, restProps, {
+          text: true,
+          id: restProps.key
+        })) : null;
+      };
+    case 'VIEW':
+      return function (restProps) {
+        var Button = ViewButton[mode];
+        return Button ? /*#__PURE__*/React.createElement(Button, _extends({}, props, restProps, {
+          text: true,
+          id: restProps.key
+        })) : null;
+      };
+    case 'CONFLICT_MERGE':
+      return function (restProps) {
+        var Button = ConflictMergeButton[mode];
+        return Button ? /*#__PURE__*/React.createElement(Button, _extends({}, props, restProps, {
+          text: true,
+          id: restProps.key
+        })) : null;
+      };
+    case 'CONFLICT_MERGE_ISTIO':
+      return function (restProps) {
+        var Button = IstioConflictMergeButton[mode];
+        return Button ? /*#__PURE__*/React.createElement(Button, _extends({}, props, restProps, {
+          text: true,
+          id: restProps.key
+        })) : null;
+      };
+    case 'CONFLICT_MERGE_BATCH':
+      return function (restProps) {
+        var Button = BatchConflictMergeButton[mode];
+        return Button ? /*#__PURE__*/React.createElement(Button, _extends({}, props, restProps, {
+          text: true,
+          id: restProps.key
+        })) : null;
+      };
+    case 'BRANCH_INFO':
+      return function (restProps) {
+        var Button = ReleaseBranchButton[mode];
+        return Button ? /*#__PURE__*/React.createElement(Button, _extends({}, props, restProps, {
+          text: true,
+          id: restProps.key
+        })) : null;
+      };
+    case 'EMAS_ARTIFACT':
+      return function (restProps) {
+        var Button = EmasArtifact[mode];
+        return Button ? /*#__PURE__*/React.createElement(Button, _extends({}, props, restProps, {
+          text: true,
+          id: restProps.key
+        })) : null;
+      };
+    case 'LINK_WITH_QR_CODE':
+      return function (restProps) {
+        var Button = LinkWithQRCode[mode];
+        return Button ? /*#__PURE__*/React.createElement(Button, _extends({}, props, restProps, {
+          text: true,
+          id: restProps.key
+        })) : null;
+      };
+    case 'DEBUG_BUTTON':
+      return function (restProps) {
+        if (!isAdmin) {
+          return null;
+        }
+        if (!getFeature('pipeline.btn.debug')) {
+          return null;
+        }
+        var Button = DebugButton[mode];
+        return Button ? /*#__PURE__*/React.createElement(Button, _extends({}, props, restProps, {
+          text: true,
+          id: restProps.key
+        })) : null;
+      };
+    case 'RELEASE':
+      return function (restProps) {
+        var Button = ReleaseOrderButton[mode];
+        return Button ? /*#__PURE__*/React.createElement(Button, _extends({}, props, restProps, {
+          text: true,
+          id: restProps.key
+        })) : null;
+      };
+    case 'APPSTACK_ACCESS_CHECKPOINT_INFO':
+      return function (restProps) {
+        var Button = ChangeInfoButton[mode];
+        return Button ? /*#__PURE__*/React.createElement(Button, _extends({}, props, restProps, {
+          text: true,
+          id: restProps.key
+        })) : null;
+      };
+    default:
+      return function () {
+        return null;
+      };
+  }
+};
+var wrapper = function wrapper(_ref2) {
+  var displayType = _ref2.displayType,
+    type = _ref2.type,
+    props = _objectWithoutPropertiesLoose(_ref2, _excluded2);
+  return buildButtonComponentWrapper(_extends({
+    displayType: displayType,
+    type: type.toUpperCase()
+  }, props))();
+};
+export default wrapper;

package/es/components/common/teambition/flow-job-btn/change-info-btn/index.d.ts

@@ -0,0 +1,6 @@
+/// <reference types="react" />
+declare const elementMap: {
+    Button: (props: any) => JSX.Element;
+    View: any;
+};
+export default elementMap;

package/es/components/common/teambition/flow-job-btn/change-info-btn/index.js

@@ -0,0 +1,48 @@
+import React, { useState } from 'react';
+import { Button } from '@teamix/ui';
+import IconFont from "../../icon-font";
+import ReleaseInfoDialog from "../../change-info-dialog";
+import intl from "../../../../../locale";
+var ChangeInfoButton = function ChangeInfoButton(props) {
+  var id = props.id,
+    name = props.name,
+    data = props.data;
+  var _useState = useState(false),
+    visible = _useState[0],
+    setVisible = _useState[1];
+  var _useState2 = useState([]),
+    changeInfoList = _useState2[0],
+    setChangeInfoList = _useState2[1];
+  var onClick = function onClick() {
+    var _JSON$parse;
+    setChangeInfoList(((_JSON$parse = JSON.parse(data || '{}')) === null || _JSON$parse === void 0 ? void 0 : _JSON$parse.unsatisfiedChangeRequests) || []);
+    setVisible(true);
+  };
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Button, {
+    text: true,
+    onClick: onClick,
+    key: id
+  }, /*#__PURE__*/React.createElement(IconFont, {
+    type: "gengxinrizhi",
+    style: {
+      transform: 'rotateX(180deg)'
+    }
+  }), name), visible && /*#__PURE__*/React.createElement(ReleaseInfoDialog, {
+    changeInfoList: changeInfoList,
+    title: intl.get({
+      id: 'rdc-tb-cd-assets.flow-job-btn.change-info-btn.DetailsOfAdmissionVerificationFailure',
+      defaultMessage: '准入校验失败详情'
+    }),
+    visible: visible,
+    onClose: function onClose() {
+      return setVisible(false);
+    }
+  }));
+};
+var elementMap = {
+  Button: function Button(props) {
+    return /*#__PURE__*/React.createElement(ChangeInfoButton, props);
+  },
+  View: null
+};
+export default elementMap;

package/es/components/common/teambition/flow-job-btn/conflict-merge-btn/index.d.ts

@@ -0,0 +1,12 @@
+/// <reference types="react" />
+import './index.scss';
+declare const ConflictMergeButton: {
+    ({ onClick, id, disable }: {
+        onClick: any;
+        id: any;
+        disable: any;
+    }): JSX.Element;
+    Button: any;
+    View: (props: any) => JSX.Element;
+};
+export default ConflictMergeButton;

package/es/components/common/teambition/flow-job-btn/conflict-merge-btn/index.js

@@ -0,0 +1,151 @@
+import React, { useState } from 'react';
+import { Button, Message } from '@teamix/ui';
+import SyntaxHighlighter from "../../../../SyntaxHighlighter";
+import fetch from "../../flow-engine/fetch";
+import { CopyToClipboard } from 'react-copy-to-clipboard';
+import { YunxiaoIcon } from '@alife/devops-ui';
+import intl from "../../../../../locale";
+import "./index.scss";
+var HelpDialog = function HelpDialog(props) {
+  var _useState = useState(false),
+    loading = _useState[0],
+    setLoading = _useState[1];
+  var _useState2 = useState(false),
+    disabled = _useState2[0],
+    setDisabled = _useState2[1];
+  var data = props.data ? JSON.parse(props.data) : {};
+  var checkoutCmd = "git fetch origin; git checkout -b " + data.releaseBranch + " origin/" + data.releaseBranch;
+  var mergeCmd = "git merge --no-ff " + data.featureBranchCommitId;
+  var pushCmd = "git push origin " + data.releaseBranch;
+  var getRelativePath = function getRelativePath(url) {
+    if (!url.startsWith('http')) {
+      return url;
+    }
+    var obj = new URL(url);
+    return "" + obj.pathname + obj.search;
+  };
+  var onExecuteClick = function onExecuteClick() {
+    setLoading(true);
+    setDisabled(true);
+    var relativePath = getRelativePath(props.url);
+    fetch({
+      url: relativePath,
+      method: props.method
+    }).then(function (res) {
+      if (res.successful) {
+        Message.success({
+          title: intl.get({
+            id: 'rdc-tb-cd-assets.flow-job-btn.conflict-merge-btn.ExecutionSucceeded',
+            defaultMessage: '执行成功'
+          })
+        });
+        props.onClose();
+      } else {
+        Message.error({
+          title: intl.get({
+            id: 'rdc-tb-cd-assets.flow-job-btn.conflict-merge-btn.ExecutionFailed',
+            defaultMessage: '执行失败'
+          })
+        });
+      }
+      setTimeout(function () {
+        setLoading(false);
+        setDisabled(false);
+      }, 1000);
+    })["catch"](function () {
+      setLoading(false);
+      setDisabled(false);
+    });
+  };
+  var copyCode = function copyCode(code) {
+    var copyToast = function copyToast() {
+      Message.success({
+        title: intl.get({
+          id: 'rdc-tb-cd-assets.flow-job-btn.conflict-merge-btn.CopiedToClipboard',
+          defaultMessage: '成功复制到剪贴板'
+        })
+      });
+    };
+    return /*#__PURE__*/React.createElement(CopyToClipboard, {
+      text: code,
+      onCopy: copyToast
+    }, /*#__PURE__*/React.createElement(Button, {
+      text: true,
+      type: "primary"
+    }, intl.get({
+      id: 'rdc-tb-cd-assets.flow-job-btn.conflict-merge-btn.CopyCode',
+      defaultMessage: '复制代码'
+    })));
+  };
+  return /*#__PURE__*/React.createElement("div", {
+    className: "conflict-info"
+  }, /*#__PURE__*/React.createElement("h3", null, intl.get({
+    id: 'rdc-tb-cd-assets.flow-job-btn.conflict-merge-btn.ConflictResolution',
+    defaultMessage: '冲突解决方案'
+  })), /*#__PURE__*/React.createElement("div", {
+    className: "item"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "title"
+  }, intl.get({
+    id: 'rdc-tb-cd-assets.flow-job-btn.conflict-merge-btn.StepPerformTheFetchOperation',
+    defaultMessage: '步骤1. 执行fetch操作，并将合并的目标分支检出到本地'
+  }), copyCode(checkoutCmd)), /*#__PURE__*/React.createElement(SyntaxHighlighter, {
+    language: "bash"
+  }, checkoutCmd)), /*#__PURE__*/React.createElement("div", {
+    className: "item"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "title"
+  }, intl.get({
+    id: 'rdc-tb-cd-assets.flow-job-btn.conflict-merge-btn.StepUseTheVersionNumber',
+    defaultMessage: '步骤2. 使用版本号进行合并，将出现的冲突解决掉，并进行commit'
+  }), copyCode(mergeCmd)), /*#__PURE__*/React.createElement(SyntaxHighlighter, {
+    language: "bash"
+  }, mergeCmd)), /*#__PURE__*/React.createElement("div", {
+    className: "item"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "title"
+  }, intl.get({
+    id: 'rdc-tb-cd-assets.flow-job-btn.conflict-merge-btn.StepPushTheReleaseBranch',
+    defaultMessage: '步骤3：将release分支push到远端仓库中'
+  }), copyCode(pushCmd)), /*#__PURE__*/React.createElement(SyntaxHighlighter, {
+    language: "bash"
+  }, pushCmd)), /*#__PURE__*/React.createElement("div", {
+    className: "item"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "title"
+  }, intl.get({
+    id: 'rdc-tb-cd-assets.flow-job-btn.conflict-merge-btn.StepClickTheIHave',
+    defaultMessage: '步骤4：点击我已解决完冲突按钮，流水线会自动继续进行后续操作'
+  })), /*#__PURE__*/React.createElement(Button, {
+    loading: loading,
+    disabled: disabled,
+    style: {
+      marginTop: '0.5em'
+    },
+    onClick: onExecuteClick
+  }, intl.get({
+    id: 'rdc-tb-cd-assets.flow-job-btn.conflict-merge-btn.IHaveResolvedTheConflict',
+    defaultMessage: '我已解决完冲突'
+  }))));
+};
+var ConflictMergeButton = function ConflictMergeButton(_ref) {
+  var _onClick = _ref.onClick,
+    id = _ref.id,
+    disable = _ref.disable;
+  return disable ? null : /*#__PURE__*/React.createElement(Button, {
+    text: true,
+    key: id,
+    type: "primary",
+    onClick: function onClick() {
+      _onClick('CONFLICT_MERGE');
+    }
+  }, /*#__PURE__*/React.createElement(YunxiaoIcon, {
+    type: "col-before-line"
+  }), intl.get({
+    id: 'rdc-tb-cd-assets.flow-job-btn.conflict-merge-btn.ConflictResolution.1',
+    defaultMessage: '解决冲突'
+  }));
+};
+ConflictMergeButton.Button = ConflictMergeButton;
+ConflictMergeButton.View = HelpDialog;
+export default ConflictMergeButton;

package/es/components/common/teambition/flow-job-btn/conflict-merge-btn/index.scss

@@ -0,0 +1,20 @@
+.conflict-info {
+  width: 100%;
+  display: inline-block;
+  overflow-y: auto;
+  padding: 0 20px 20px 20px;
+  pre {
+    white-space: normal;
+    line-height: 2;
+  }
+  .item {
+    margin-bottom: 30px;
+    .title {
+      display: flex;
+      align-items: center;
+      .next-btn {
+        margin-left: 6px;
+      }
+    }
+  }
+}

package/es/components/common/teambition/flow-job-btn/debug-button/index.d.ts

@@ -0,0 +1,15 @@
+/// <reference types="react" />
+import './index.scss';
+/**
+ * 按钮实现模板
+ */
+declare const DebugButton: {
+    (props: any): JSX.Element;
+    Button({ id, onClick }: {
+        id: any;
+        onClick: any;
+    }): JSX.Element;
+    View: any;
+    Card: any;
+};
+export default DebugButton;