@titaui/pc 1.10.4 → 1.10.6-3.beta-2

package/lib/components/dynamic/dynamic-item/dynamic-assessment/index.css

@@ -3,7 +3,60 @@
 }
 
 .titaui-dynamic-assessment-item__content {
-  margin-left: 69px;
+  margin-left: 88px;
+  height: 64px;
+  background: rgba(246, 189, 22, 0.1);
+  border-radius: 12px;
+  display: flex;
+  align-items: center;
+  padding: 8px 12px;
+  box-sizing: border-box;
+}
+
+.titaui-dynamic-assessment-item__content-info {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+}
+
+.titaui-dynamic-assessment-item__content-title {
+  display: flex;
+  margin-bottom: 4px;
+  align-items: center;
+  flex: 1;
+  word-break: keep-all;
+  white-space: nowrap;
+  overflow: hidden;
+  font-size: 16px;
+  font-weight: 600;
+  color: #3f4755;
+  line-height: 24px;
+}
+
+.titaui-dynamic-assessment-item__content-title-type {
+  border-radius: 18px;
+  background: rgba(246, 189, 22, 0.6);
+  color: #ffffff;
+  margin-right: 8px;
+  font-size: 14px;
+  line-height: 20px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 0 6px;
+  font-weight: 400;
+  height: 20px;
+}
+
+.titaui-dynamic-assessment-item__content-title-text {
+  flex: 1;
+  cursor: pointer;
+  overflow: hidden;
+}
+
+.titaui-dynamic-assessment-item__content-title-text:hover {
+  color: #2879ff;
 }
 
 .titaui-dynamic-assessment-item__infos {
@@ -12,35 +65,22 @@
   font-size: 12px;
   color: #89919f;
   line-height: 18px;
-  margin-top: 8px;
 }
 
 .titaui-dynamic-assessment-item__infos-icon {
+  font-size: 14px;
   margin-right: 4px;
 }
 
 .titaui-dynamic-assessment-item__infos-step-name {
-  margin-right: 20px;
+  margin-right: 14px;
 }
 
 .titaui-dynamic-assessment-item__operate-desc {
   font-size: 14px;
   font-weight: 400;
   color: #89919f;
-  line-height: 22px;
-  margin: 0 8px 0 4px;
+  line-height: 24px;
+  margin-left: 4px;
   overflow: hidden;
 }
-
-.titaui-dynamic-assessment-item-desc-operate-type {
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  padding: 0 6px;
-  height: 18px;
-  min-width: 40px;
-  border-radius: 10px 10px 10px 2px;
-  font-size: 12px;
-  color: #ffffff;
-  line-height: 18px;
-}

package/lib/components/dynamic/dynamic-item/dynamic-assessment/index.js

@@ -11,14 +11,18 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _title = _interopRequireDefault(require("../../components/title"));
+var _tooltip = _interopRequireDefault(require("../../../tooltip"));
 
 var _header = _interopRequireDefault(require("../components/header"));
 
-var _util = require("../../util");
+var _searchKeyHandle = _interopRequireDefault(require("../../../search-key-handle"));
 
 var _getLocale = require("../../../../utils/getLocale");
 
+var _context = require("../../context");
+
+var _tools = require("../../../../utils/tools");
+
 require("./index.css");
 
 var _excluded = ["data"];
@@ -37,32 +41,26 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 
 var prefix = "titaui-dynamic-assessment-item";
 
-var DynamicShare = function DynamicShare(_ref) {
+var DynamicAssessment = function DynamicAssessment(_ref) {
   var data = _ref.data,
       restProps = _objectWithoutProperties(_ref, _excluded);
 
+  var _useContext = (0, _react.useContext)(_context.SearchKeyContext),
+      searchKeyWord = _useContext.searchKeyWord;
+
   var currentStep = JSON.parse(data.step).find(function (item) {
     return item.status === 2;
   });
 
-  var _getFeedTypeAndTypeCo = (0, _util.getFeedTypeAndTypeColor)(data.feedType),
-      feedTypeText = _getFeedTypeAndTypeCo.feedTypeText,
-      feedTypeColor = _getFeedTypeAndTypeCo.feedTypeColor;
-
   var handleClickTitle = function handleClickTitle() {
     var assessId = data.url.split("assessId=")[1];
-    window.open(window.location.href.replace(location.hash, "#performance?reactRouterName=detail&formId=".concat(assessId)));
+    window.open(window.location.href.replace(window.location.hash, "#performance?reactRouterName=detail&formId=".concat(assessId)));
   };
 
   var renderDesc = (0, _react.useMemo)(function () {
-    return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("span", {
+    return /*#__PURE__*/_react["default"].createElement("span", {
       className: "".concat(prefix, "__operate-desc")
-    }, (0, _getLocale.getLocale)("Mod_sassessment")), /*#__PURE__*/_react["default"].createElement("span", {
-      className: "".concat(prefix, "-desc-operate-type"),
-      style: {
-        background: feedTypeColor
-      }
-    }, feedTypeText));
+    }, (0, _getLocale.getLocale)("Mod_sassessment"));
   }, []);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: prefix
@@ -73,10 +71,22 @@ var DynamicShare = function DynamicShare(_ref) {
     user: data.principalUser
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__content")
-  }, /*#__PURE__*/_react["default"].createElement(_title["default"], {
-    content: "".concat((0, _getLocale.getLocale)("Mod_Performance"), "\uFF1A").concat(data.assessName),
-    onClickTitle: handleClickTitle
-  }), /*#__PURE__*/_react["default"].createElement("div", {
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(prefix, "__content-info")
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(prefix, "__content-title")
+  }, /*#__PURE__*/_react["default"].createElement("span", {
+    className: "".concat(prefix, "__content-title-type")
+  }, (0, _getLocale.getLocale)("Mod_Performance")), /*#__PURE__*/_react["default"].createElement("span", {
+    className: "".concat(prefix, "__content-title-text"),
+    onClick: handleClickTitle
+  }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"].Text, {
+    text: /*#__PURE__*/_react["default"].createElement(_searchKeyHandle["default"], {
+      str: (0, _tools.htmlDecodeByRegExp)(data.assessName),
+      keyWord: searchKeyWord
+    }),
+    isPercent: true
+  }))), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__infos")
   }, /*#__PURE__*/_react["default"].createElement("i", {
     className: (0, _classnames["default"])("tu-icon-jixiaojieduan", "".concat(prefix, "__infos-icon"))
@@ -84,8 +94,8 @@ var DynamicShare = function DynamicShare(_ref) {
     className: "".concat(prefix, "__infos-step-name")
   }, currentStep.stepName), /*#__PURE__*/_react["default"].createElement("i", {
     className: (0, _classnames["default"])("tu-icon-deferred", "".concat(prefix, "__infos-icon"))
-  }), /*#__PURE__*/_react["default"].createElement("span", null, "".concat(data.startDate, "-").concat(data.deadline)))));
+  }), /*#__PURE__*/_react["default"].createElement("span", null, "".concat(data.startDate, "-").concat(data.deadline))))));
 };
 
-var _default = DynamicShare;
+var _default = DynamicAssessment;
 exports["default"] = _default;

package/lib/components/dynamic/dynamic-item/dynamic-chart/index.css

@@ -0,0 +1,4 @@
+.titaui-dynamic-chart__content, .titaui-dynamic-chart__charts {
+  display: flex;
+  margin-left: 88px;
+}

package/lib/components/dynamic/dynamic-item/dynamic-chart/index.js

@@ -0,0 +1,102 @@
+"use strict";
+
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _classnames = _interopRequireDefault(require("classnames"));
+
+var _supersetCharts = _interopRequireDefault(require("../../../superset-charts"));
+
+var _dynamicLeftQuoto = _interopRequireDefault(require("../../img/dynamic-left-quoto.svg"));
+
+var _dynamicRightQuoto = _interopRequireDefault(require("../../img/dynamic-right-quoto.svg"));
+
+var _dangerousHtml = _interopRequireDefault(require("../../../dangerous-html"));
+
+var _context = require("../../context");
+
+var _tools = require("../../../../utils/tools");
+
+var _header = _interopRequireDefault(require("../components/header"));
+
+var _utils = require("./utils");
+
+require("./index.css");
+
+var _excluded = ["data"];
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+
+var prefixCls = "titaui-dynamic-chart";
+
+var DynamicChart = function DynamicChart(_ref) {
+  var data = _ref.data,
+      restProps = _objectWithoutProperties(_ref, _excluded);
+
+  var contentRef = (0, _react.useRef)();
+
+  var _useContext = (0, _react.useContext)(_context.SearchKeyContext),
+      searchKeyWord = _useContext.searchKeyWord;
+
+  var chartQuery = (0, _utils.getChartProps)(data.biId); // const chartQuery = getChartProps('{"type":"diaryFeedChart","id":"43","timeRange":"2022/03/01T00:00:00 : 2022/03/05T00:00:00"}');
+  // console.log(chartQuery);
+
+  (0, _react.useEffect)(function () {
+    (0, _tools.highLightWord)({
+      parentDom: contentRef.current,
+      keyWord: searchKeyWord
+    });
+  }, [data, searchKeyWord]);
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    className: (0, _classnames["default"])(prefixCls)
+  }, /*#__PURE__*/_react["default"].createElement(_header["default"], _extends({
+    data: data
+  }, restProps, {
+    user: _utils.systemPublisher,
+    desc: /*#__PURE__*/_react["default"].createElement("div", {
+      style: {
+        marginLeft: "4px",
+        color: "#89919f"
+      }
+    }, "\u63A8\u9001\u4E86\u6D88\u606F")
+  })), /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(prefixCls, "__content")
+  }, /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("img", {
+    className: (0, _classnames["default"])("".concat(prefixCls, "__content-quoto"), "".concat(prefixCls, "__content-quoto--left")),
+    src: _dynamicLeftQuoto["default"],
+    alt: "left"
+  })), /*#__PURE__*/_react["default"].createElement("div", {
+    ref: contentRef
+  }, /*#__PURE__*/_react["default"].createElement(_dangerousHtml["default"], {
+    htmlText: data.content
+  }), /*#__PURE__*/_react["default"].createElement("img", {
+    className: (0, _classnames["default"])("".concat(prefixCls, "__content-quoto"), "".concat(prefixCls, "__content-quoto--right")),
+    src: _dynamicRightQuoto["default"],
+    alt: "right"
+  }))), /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(prefixCls, "__charts")
+  }, /*#__PURE__*/_react["default"].createElement(_supersetCharts["default"], _extends({
+    width: 800,
+    height: 400,
+    layout: "feed-card"
+  }, chartQuery))));
+};
+
+var _default = DynamicChart;
+exports["default"] = _default;

package/lib/components/dynamic/dynamic-item/dynamic-chart/utils.js

@@ -0,0 +1,61 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.systemPublisher = exports.safeParse = exports.getChartProps = void 0;
+var systemPublisher = {
+  avatar: {
+    big: "https://file.tita.com/TitaImage/352728/d820ed195e204b5aa7d6d1b9bd94f215_b.png",
+    color: "#f0c75a",
+    hasAvatar: true,
+    large: "https://file.tita.com/TitaImage/352728/d820ed195e204b5aa7d6d1b9bd94f215_l.png",
+    medium: "https://file.tita.com/TitaImage/352728/d820ed195e204b5aa7d6d1b9bd94f215_m.png",
+    normal: "https://file.tita.com/TitaImage/352728/d820ed195e204b5aa7d6d1b9bd94f215_n.png",
+    original: "https://file.tita.com/TitaImage/352728/d820ed195e204b5aa7d6d1b9bd94f215_o.png",
+    small: "https://file.tita.com/TitaImage/352728/d820ed195e204b5aa7d6d1b9bd94f215_s.png"
+  },
+  blessingType: 0,
+  decorationType: 0,
+  departmentId: 0,
+  departmentName: null,
+  jobState: 0,
+  medalPosition: null,
+  medalUrl: null,
+  name: "Tita小助手",
+  postition: null,
+  praiseType: 0,
+  tag: null,
+  userId: 100000,
+  userMark: null,
+  userType: 0
+};
+exports.systemPublisher = systemPublisher;
+
+var safeParse = function safeParse(json) {
+  var parsed = {};
+
+  try {
+    parsed = JSON.parse(json);
+  } catch (e) {
+    throw new Error(e);
+  }
+
+  return parsed;
+};
+
+exports.safeParse = safeParse;
+
+var getChartProps = function getChartProps(json) {
+  var parsed = safeParse(json);
+
+  if (typeof parsed === "number") {
+    return {
+      id: parsed
+    };
+  }
+
+  return parsed;
+};
+
+exports.getChartProps = getChartProps;

package/lib/components/dynamic/dynamic-item/dynamic-create-o/index.css

@@ -4,12 +4,50 @@
 
 .titaui-dynamic-create-o-item__content {
   display: flex;
-  flex-direction: column;
-  margin-left: 69px;
+  margin-left: 88px;
+  background: rgba(40, 121, 255, 0.06);
+  border-radius: 18px;
+  padding: 16px;
 }
 
-.titaui-dynamic-create-o-item__infos-wrapper {
-  margin-top: 12px;
+.titaui-dynamic-create-o-item__content-progress-text {
+  position: absolute;
+  transform: translate(-50%, -50%);
+  left: 50%;
+  top: 50%;
+}
+
+.titaui-dynamic-create-o-item__content-right {
+  flex: 1;
+  overflow: hidden;
+  margin-left: 12px;
+}
+
+.titaui-dynamic-create-o-item__content-right-title {
+  display: flex;
+  overflow: hidden;
+  box-sizing: border-box;
+  word-break: keep-all;
+  white-space: nowrap;
+  font-size: 14px;
+  line-height: 22px;
+  color: #3f4755;
+  font-weight: 600;
+  z-index: 2;
+}
+
+.titaui-dynamic-create-o-item__content-right-title-text {
+  flex: 1;
+  overflow: hidden;
+  cursor: pointer;
+}
+
+.titaui-dynamic-create-o-item__content-right-title-text:hover {
+  color: #2879ff !important;
+}
+
+.titaui-dynamic-create-o-item__content-right-infos-wrapper {
+  margin-top: 6px;
 }
 
 .titaui-dynamic-create-o-item__okr {
@@ -20,30 +58,31 @@
   line-height: 18px;
 }
 
-.titaui-dynamic-create-o-item__okr-type-icon, .titaui-dynamic-create-o-item__okr-cycle-icon {
-  margin-right: 4px;
-}
-
-.titaui-dynamic-create-o-item__okr-cycle-icon {
-  margin-left: 20px;
+.titaui-dynamic-create-o-item__okr-type::after {
+  content: '';
+  width: 1px;
+  height: 14px;
+  background: linear-gradient(180deg, rgba(191, 199, 213, 0) 0%, #bfc7d5 50%, rgba(240, 242, 245, 0) 100%);
+  display: inline-block;
+  margin: 0 8px;
+  vertical-align: text-top;
 }
 
 .titaui-dynamic-create-o-item__okr-krs {
-  margin-top: 4px;
+  margin-top: 12px;
 }
 
 .titaui-dynamic-create-o-item__kr {
   display: flex;
-  align-items: center;
-  margin-top: 8px;
+  margin-top: 6px;
 }
 
 .titaui-dynamic-create-o-item__kr-order {
   font-size: 12px;
-  color: #2879ff;
+  color: #89919f;
   line-height: 18px;
   margin-right: 4px;
-  margin-top: 1px;
+  margin-top: 3px;
   word-break: keep-all;
 }
 
@@ -58,38 +97,11 @@
   cursor: pointer;
 }
 
-.titaui-dynamic-create-o-item__classify {
-  display: flex;
-  width: 18px;
-  margin-left: 8px;
-}
-
-.titaui-dynamic-create-o-item__classify--desire {
-  background: url("../../img/dynamic-desire.svg") no-repeat;
-}
-
-.titaui-dynamic-create-o-item__classify--promise {
-  background: url("../../img/dynamic-promise.svg") no-repeat;
-}
-
 .titaui-dynamic-create-o-item__operate-desc {
   font-size: 14px;
   font-weight: 400;
   color: #89919f;
-  line-height: 22px;
-  margin: 0 8px 0 4px;
+  line-height: 24px;
+  margin-left: 4px;
   overflow: hidden;
 }
-
-.titaui-dynamic-create-o-item-desc-operate-type {
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  padding: 0 6px;
-  height: 18px;
-  min-width: 40px;
-  border-radius: 10px 10px 10px 2px;
-  font-size: 12px;
-  color: #ffffff;
-  line-height: 18px;
-}

package/lib/components/dynamic/dynamic-item/dynamic-create-o/index.js

@@ -15,7 +15,7 @@ var _searchKeyHandle = _interopRequireDefault(require("../../../search-key-handl
 
 var _header = _interopRequireDefault(require("../components/header"));
 
-var _title = _interopRequireDefault(require("../../components/title"));
+var _tooltip = _interopRequireDefault(require("../../../tooltip"));
 
 var _drawerManager = _interopRequireDefault(require("../../../drawer-manager"));
 
@@ -23,9 +23,13 @@ var _openData = require("../../../../utils/open-data");
 
 var _context = require("../../context");
 
+var _getLocale = require("../../../../utils/getLocale");
+
+var _progress = _interopRequireDefault(require("../../../progress"));
+
 var _util = require("../../util");
 
-var _getLocale = require("../../../../utils/getLocale");
+var _tools = require("../../../../utils/tools");
 
 require("./index.css");
 
@@ -39,8 +43,6 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
@@ -58,16 +60,17 @@ var DynamicCreateO = function DynamicCreateO(_ref) {
       cycleName = data.cycleName,
       okrTypeName = data.okrTypeName,
       okrTypeId = data.okrTypeId,
-      classify = data.classify,
-      principalUser = data.principalUser;
+      principalUser = data.principalUser,
+      _data$riskLevel = data.riskLevel,
+      riskLevel = _data$riskLevel === void 0 ? 1 : _data$riskLevel,
+      _data$okrStatus = data.okrStatus,
+      okrStatus = _data$okrStatus === void 0 ? 1 : _data$okrStatus,
+      _data$okrProgress = data.okrProgress,
+      okrProgress = _data$okrProgress === void 0 ? 0 : _data$okrProgress;
 
   var _useContext = (0, _react.useContext)(_context.SearchKeyContext),
       searchKeyWord = _useContext.searchKeyWord;
 
-  var _getFeedTypeAndTypeCo = (0, _util.getFeedTypeAndTypeColor)(data.feedType),
-      feedTypeText = _getFeedTypeAndTypeCo.feedTypeText,
-      feedTypeColor = _getFeedTypeAndTypeCo.feedTypeColor;
-
   var handleClickOTitle = function handleClickOTitle() {
     _drawerManager["default"].open("okrDetail", {
       okrId: okrId
@@ -88,8 +91,7 @@ var DynamicCreateO = function DynamicCreateO(_ref) {
     // 个人
     2: {
       icon: "tu-icon-liebiao-xiashu",
-      text: // @ts-ignore
-      "departmentId" == -1 ? "默认部门" : /*#__PURE__*/_react["default"].createElement(_openData.OpenDepartmentName, {
+      text: okrTypeId === -1 ? "默认部门" : /*#__PURE__*/_react["default"].createElement(_openData.OpenDepartmentName, {
         id: okrTypeId,
         name: okrTypeName
       })
@@ -115,26 +117,10 @@ var DynamicCreateO = function DynamicCreateO(_ref) {
     };
   }
 
-  var Classify = (0, _react.useMemo)(function () {
-    var _classNames;
-
-    if (+classify == 0) {
-      return;
-    }
-
-    return /*#__PURE__*/_react["default"].createElement("span", {
-      className: (0, _classnames["default"])("".concat(prefix, "__classify"), (_classNames = {}, _defineProperty(_classNames, "".concat(prefix, "__classify--desire"), classify == 2), _defineProperty(_classNames, "".concat(prefix, "__classify--promise"), classify == 1), _classNames))
-    });
-  }, [classify]);
   var renderDesc = (0, _react.useMemo)(function () {
-    return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("span", {
+    return /*#__PURE__*/_react["default"].createElement("span", {
       className: "".concat(prefix, "__operate-desc")
-    }, (0, _getLocale.getLocale)("Mod_InChargeof"), (0, _getLocale.getLocale)("Mod_Objective")), /*#__PURE__*/_react["default"].createElement("span", {
-      className: "".concat(prefix, "-desc-operate-type"),
-      style: {
-        background: feedTypeColor
-      }
-    }, feedTypeText));
+    }, (0, _getLocale.getLocale)("Mod_InChargeof"), (0, _getLocale.getLocale)("Mod_Objective"));
   }, []);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: prefix
@@ -145,19 +131,41 @@ var DynamicCreateO = function DynamicCreateO(_ref) {
     user: principalUser
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__content")
-  }, /*#__PURE__*/_react["default"].createElement(_title["default"], {
-    content: "O\uFF1A".concat(okrName),
-    onClickTitle: handleClickOTitle,
-    suffixContent: Classify
-  }), /*#__PURE__*/_react["default"].createElement("div", {
-    className: "".concat(prefix, "__infos-wrapper")
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(prefix, "__content-left")
+  }, /*#__PURE__*/_react["default"].createElement(_progress["default"].Circle, {
+    linear: true,
+    linearId: data.feedId,
+    linearStartColor: (0, _util.getProcessColor)(okrStatus, riskLevel, "linearStartColor"),
+    linearEndColor: (0, _util.getProcessColor)(okrStatus, riskLevel, "linearEndColor"),
+    backgroundColor: (0, _util.getProcessColor)(okrStatus, riskLevel, "backgroundColor"),
+    percent: Number.parseInt(okrProgress || 0, 10),
+    showTextContent: true,
+    size: 48,
+    width: 5,
+    textClass: "".concat(prefix, "__content-progress-text")
+  })), /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(prefix, "__content-right")
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(prefix, "__content-right-title")
+  }, /*#__PURE__*/_react["default"].createElement("span", {
+    className: "".concat(prefix, "__content-right-title-text"),
+    onClick: handleClickOTitle
+  }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"].Text, {
+    text: /*#__PURE__*/_react["default"].createElement(_searchKeyHandle["default"], {
+      str: (0, _tools.htmlDecodeByRegExp)(okrName),
+      keyWord: searchKeyWord
+    }),
+    isPercent: true
+  }))), /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(prefix, "__content-right-infos-wrapper")
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__okr")
-  }, /*#__PURE__*/_react["default"].createElement("i", {
-    className: (0, _classnames["default"])(okrTypeInfo.icon, "".concat(prefix, "__okr-type-icon"))
-  }), okrTypeInfo.text, /*#__PURE__*/_react["default"].createElement("i", {
-    className: (0, _classnames["default"])("tu-icon-deferred", "".concat(prefix, "__okr-cycle-icon"))
-  }), cycleName), krs && krs.length > 0 && /*#__PURE__*/_react["default"].createElement("div", {
+  }, /*#__PURE__*/_react["default"].createElement("span", {
+    className: "".concat(prefix, "__okr-type")
+  }, okrTypeInfo.text), /*#__PURE__*/_react["default"].createElement("span", {
+    className: "".concat(prefix, "__okr-cycle")
+  }, cycleName)), krs && krs.length > 0 && /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__okr-krs")
   }, krs.map(function (kr, index) {
     return /*#__PURE__*/_react["default"].createElement("div", {
@@ -166,15 +174,15 @@ var DynamicCreateO = function DynamicCreateO(_ref) {
     }, /*#__PURE__*/_react["default"].createElement("span", {
       className: "".concat(prefix, "__kr-order")
     }, "KR", index + 1), /*#__PURE__*/_react["default"].createElement("span", {
-      className: "".concat(prefix, "__kr-name"),
+      className: (0, _classnames["default"])("".concat(prefix, "__kr-name")),
       onClick: function onClick() {
         handleClickKrTitle(kr.krId);
       }
     }, /*#__PURE__*/_react["default"].createElement(_searchKeyHandle["default"], {
-      str: kr.krName,
+      str: (0, _tools.htmlDecodeByRegExp)(kr.krName),
       keyWord: searchKeyWord
     })));
-  })))));
+  }))))));
 };
 
 var _default = DynamicCreateO;