@titaui/pc 1.10.6-3.beta-10 → 1.10.6-3.beta-11

package/.husky/pre-commit

@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-# npm run lint-staged
+npm run lint-staged

package/lib/components/okr-detail/components/okr-tree/tree-node/e-kr-node/index.css

@@ -5,6 +5,18 @@
   display: flex;
 }
 
+.tita-okrdt-tree__e-kr-node:hover .tita-okrdt-tree__e-kr-node-actions {
+  opacity: 1;
+  transition: all 0.2s linear;
+}
+
+.tita-okrdt-tree__e-kr-node-preicon {
+  display: inline-block;
+  line-height: 22px;
+  color: #6f7886;
+  font-size: 16px;
+}
+
 .tita-okrdt-tree__e-kr-node-prefix {
   display: inline-block;
   height: 22px;
@@ -27,8 +39,10 @@
 
 .tita-okrdt-tree__e-kr-node-actions {
   display: inline-block;
+  opacity: 0;
   position: absolute;
   right: 0;
+  transition: all 0.2s linear;
 }
 
 .tita-okrdt-tree__e-kr-node-actions-create {
@@ -43,7 +57,7 @@
 }
 
 .tita-okrdt-tree__e-kr-node-actions-create:hover {
-  color: #5C8EFF;
+  color: #5c8eff;
 }
 
 .tita-okrdt-tree__e-kr-node-actions-create .tu-icon-add1 {
@@ -63,11 +77,11 @@
 }
 
 .tita-okrdt-tree__e-kr-node-actions-connect:hover {
-  color: #5C8EFF;
+  color: #5c8eff;
 }
 
 .e-kr-node-layer-icon {
-  color: #89919F;
+  color: #89919f;
 }
 
 .e-kr-node__guanlian-icon {

package/lib/components/okr-detail/components/okr-tree/tree-node/e-kr-node/index.js

@@ -172,7 +172,9 @@ var EKrNode = function EKrNode(props) {
   return /*#__PURE__*/_react["default"].createElement("div", {
     key: index,
     className: (0, _classnames["default"])("".concat(_precls["default"], "__e-kr-node"))
-  }, isOTask ? null : /*#__PURE__*/_react["default"].createElement("span", {
+  }, isOTask ? /*#__PURE__*/_react["default"].createElement("span", {
+    className: (0, _classnames["default"])("tu-icon-O ".concat(_precls["default"], "__e-kr-node-preicon"))
+  }) : /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__e-kr-node-prefix"))
   }, "KR", index + 1), /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__e-kr-node-title")),

package/lib/components/okr-detail/components/okr-tree/tree-node/e-node/index.css

@@ -84,13 +84,13 @@
   line-height: 18px;
   display: inline-flex;
   align-items: center;
+  justify-content: flex-end;
   box-sizing: border-box;
   width: 78px;
   height: 26px;
   padding: 4px;
   text-align: left;
   line-height: 26px;
-  margin-left: 16px;
 }
 
 .tita-okrdt-tree__e-task-node-actions-date > span {
@@ -103,7 +103,7 @@
   color: #89919f;
   cursor: auto;
   width: 64px;
-  margin-left: 4px;
+  margin-left: 16px;
   margin-right: 4px;
 }
 
@@ -171,14 +171,14 @@
   height: 20px;
   font-size: 12px;
   font-weight: 400;
-  color: #F05E5E;
+  color: #f05e5e;
   background: rgba(240, 94, 94, 0.1);
   border-radius: 10px;
   margin-left: 8px;
 }
 
 .tita-okrdt-tree__e-project-node-gray {
-  color: #BFC7D5 !important;
+  color: #bfc7d5 !important;
 }
 
 .tita-okrdt-tree__e-project-node-priority {
@@ -235,13 +235,13 @@
   line-height: 18px;
   display: inline-flex;
   align-items: center;
+  justify-content: flex-end;
   box-sizing: border-box;
   width: 78px;
   height: 26px;
   padding: 4px;
   text-align: left;
   line-height: 26px;
-  margin-left: 16px;
 }
 
 .tita-okrdt-tree__e-project-node-actions-date > span {
@@ -254,7 +254,7 @@
   color: #89919f;
   cursor: auto;
   width: 64px;
-  margin-left: 4px;
+  margin-left: 16px;
   margin-right: 4px;
 }
 
@@ -357,13 +357,13 @@
   line-height: 18px;
   display: inline-flex;
   align-items: center;
+  justify-content: flex-end;
   box-sizing: border-box;
   width: 78px;
   height: 26px;
   padding: 4px;
   text-align: left;
   line-height: 26px;
-  margin-left: 16px;
 }
 
 .tita-okrdt-tree__e-task-level2-node-actions-date > span {
@@ -376,7 +376,7 @@
   color: #89919f;
   cursor: auto;
   width: 64px;
-  margin-left: 4px;
+  margin-left: 16px;
   margin-right: 4px;
 }
 
@@ -398,7 +398,7 @@
 .tita-okrdt-tree__e-empty-node {
   font-size: 12px;
   font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
-  color: #A4ACB9;
+  color: #a4acb9;
   line-height: 18px;
   padding-left: 12px;
 }
@@ -408,5 +408,5 @@
 }
 
 .e-node-status-icon {
-  color: #89919F;
+  color: #89919f;
 }

package/lib/components/okr-detail/e-list/index.js

@@ -183,13 +183,6 @@ function Elist(props, ref) {
     setTotalDataNum(totalLength);
     setIsEmpty && setIsEmpty(!totalLength);
   }, [krList, oEList]);
-  var krsTree = (0, _react.useCallback)(function (kr) {
-    return /*#__PURE__*/_react["default"].createElement(_okrTree["default"], {
-      key: Math.random(),
-      data: [kr],
-      defaultExpandedKeys: expandedKrEs
-    });
-  }, [expandedKrEs, krList]);
   return /*#__PURE__*/_react["default"].createElement(_context.EListContext.Provider, {
     value: {
       refreshEList: function refreshEList() {
@@ -214,7 +207,11 @@ function Elist(props, ref) {
   }, krList.map(function (kr, index) {
     return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_paddingLayout["default"], {
       padding: layoutPadding
-    }, krsTree(kr)), // kr左后一个节点 && 没有 OE 时，不显示横线
+    }, /*#__PURE__*/_react["default"].createElement(_okrTree["default"], {
+      key: Math.random(),
+      data: [kr],
+      defaultExpandedKeys: expandedKrEs
+    })), // kr左后一个节点 && 没有 OE 时，不显示横线
     !(index + 1 == krList.length && oEList.length == 0) && hasdivider && /*#__PURE__*/_react["default"].createElement("div", {
       className: "e__divider"
     }));

package/lib/pages/new-okr-list/index.js

@@ -214,8 +214,7 @@ var NewOkrList = function NewOkrList(props) {
     if (!relation) {
       request = (0, _requestApi.okrSearch)(params);
     } else {
-      // request = okrList(params);
-      request = (0, _requestApi.okrSearch)(params);
+      request = (0, _requestApi.okrList)(params);
     }
 
     setLoading(true);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.10.63.beta-10",
+  "version": "1.10.63.beta-11",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",