@titaui/pc 1.11.12 → 1.11.13-beta.1

package/lib/components/okr-flow/export-modules/okr-search-panel/index.js

@@ -87,6 +87,8 @@ function OkrSearchPanel(props, ref) {
       showkr = _props$showkr === void 0 ? true : _props$showkr,
       _props$darkTheme = props.darkTheme,
       darkTheme = _props$darkTheme === void 0 ? false : _props$darkTheme,
+      _props$showCardKr = props.showCardKr,
+      showCardKr = _props$showCardKr === void 0 ? false : _props$showCardKr,
       onNodeClick = props.onNodeClick;
 
   var _useState = (0, _react.useState)(true),
@@ -111,7 +113,7 @@ function OkrSearchPanel(props, ref) {
 
 
   var getSearchData = (0, _react.useRef)((0, _helper.debounce)( /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(searchType, rootId, rootName, avatar, cycleType, yqmNum, annualNum, okrType, openLevel, showkr) {
+    var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(searchType, rootId, rootName, avatar, cycleType, yqmNum, annualNum, okrType, openLevel, showkr, showCardKr) {
       var _yield$searchOkrs, works, okrIds, nodes, allNodes, subTreeNodes;
 
       return regeneratorRuntime.wrap(function _callee$(_context) {
@@ -155,7 +157,8 @@ function OkrSearchPanel(props, ref) {
               return (0, _requestApis.expandNodesByLevel)({
                 okrIds: okrIds,
                 level: openLevel - 1,
-                showKr: showkr ? 0 : 1
+                showKr: showkr ? 1 : 0,
+                showCardKr: showCardKr ? 1 : 0
               });
 
             case 13:
@@ -188,19 +191,19 @@ function OkrSearchPanel(props, ref) {
       }, _callee);
     }));
 
-    return function (_x, _x2, _x3, _x4, _x5, _x6, _x7, _x8, _x9, _x10) {
+    return function (_x, _x2, _x3, _x4, _x5, _x6, _x7, _x8, _x9, _x10, _x11) {
       return _ref.apply(this, arguments);
     };
   }(), 500)).current;
   var okrFlow = (0, _react.useRef)();
   (0, _react.useEffect)(function () {
     if (!annualNum) return;
-    getSearchData(searchType, rootId, rootName, avatar, cycleType, yqmNum, annualNum, okrType, openLevel, showkr);
-  }, [searchType, rootId, rootName, cycleType, yqmNum, annualNum, okrType, openLevel, showkr]);
+    getSearchData(searchType, rootId, rootName, avatar, cycleType, yqmNum, annualNum, okrType, openLevel, showkr, showCardKr);
+  }, [searchType, rootId, rootName, cycleType, yqmNum, annualNum, okrType, openLevel, showkr, showCardKr]);
   (0, _react.useEffect)(function () {
     var data = (0, _treeHandler.transToMapData)(treeNodes, showkr);
     setDataSource(data.length > 1 ? data : []);
-  }, [treeNodes, showkr]);
+  }, [treeNodes, showkr, showCardKr]);
 
   var handleParentExpand = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(node) {
@@ -216,7 +219,8 @@ function OkrSearchPanel(props, ref) {
                 krId: modelType == "kr" ? id : 0,
                 okrId: modelType == "kr" ? data.workId : id,
                 okrIdParent: modelType == "work" ? data.parentId : data.workId,
-                childRoot: false
+                childRoot: false,
+                showCardKr: showCardKr ? 1 : 0
               });
 
             case 3:
@@ -249,7 +253,7 @@ function OkrSearchPanel(props, ref) {
       }, _callee2);
     }));
 
-    return function handleParentExpand(_x11) {
+    return function handleParentExpand(_x12) {
       return _ref2.apply(this, arguments);
     };
   }();
@@ -268,6 +272,7 @@ function OkrSearchPanel(props, ref) {
                 okrId: modelType == "work" ? id : data.workId,
                 okrIdParent: 0,
                 childRoot: true,
+                showCardKr: showCardKr ? 1 : 0,
                 currentOkrRole: modelType == "kr" ? data.mapkrVisible : data.MapOkrVisible
               });
 
@@ -294,7 +299,7 @@ function OkrSearchPanel(props, ref) {
       }, _callee3);
     }));
 
-    return function handleChildExpand(_x12) {
+    return function handleChildExpand(_x13) {
       return _ref3.apply(this, arguments);
     };
   }();

package/lib/components/okr-flow/okr-map/index.js

@@ -11,6 +11,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _reactFlowRenderer = _interopRequireWildcard(require("@titaui/react-flow-renderer"));
 
+var _lodash = _interopRequireDefault(require("lodash"));
+
 var _classnames = _interopRequireDefault(require("classnames"));
 
 var _html2canvas = _interopRequireDefault(require("html2canvas"));
@@ -39,6 +41,14 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -68,16 +78,12 @@ var OkrMap = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       onChildClose = _props$onChildClose === void 0 ? function () {} : _props$onChildClose,
       _props$dataSource = props.dataSource,
       dataSource = _props$dataSource === void 0 ? [] : _props$dataSource;
+  var virtualElements = (0, _react.useRef)([]);
 
-  var _useState = (0, _react.useState)([]),
+  var _useState = (0, _react.useState)(),
       _useState2 = _slicedToArray(_useState, 2),
-      elements = _useState2[0],
-      setElements = _useState2[1];
-
-  var _useState3 = (0, _react.useState)(),
-      _useState4 = _slicedToArray(_useState3, 2),
-      flowInstance = _useState4[0],
-      setFlowInstance = _useState4[1];
+      flowInstance = _useState2[0],
+      setFlowInstance = _useState2[1];
 
   var isMoving = (0, _react.useRef)(false);
 
@@ -89,12 +95,10 @@ var OkrMap = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     onNodeClick & onNodeClick(data);
   };
 
-  var layoutedElements = (0, _utils.getLayoutedElements)(dataSource, direction);
-
   var getDefaultPos = function getDefaultPos() {
     var containerHeight = document.body.clientHeight - 200 - 96;
     var containerWidth = document.body.clientWidth - 180 - 320;
-    var rootNode = layoutedElements[0];
+    var rootNode = virtualElements[0];
 
     if (direction == "horizontal") {
       var targetY = containerHeight / 2;
@@ -102,13 +106,27 @@ var OkrMap = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     }
 
     var targetX = containerWidth / 2;
-    return [targetX - rootNode.position.x, -48];
+    return [targetX - rootNode.position.x, -48]; // debugger
+    // return [0, 0]
   };
 
   var onLoad = function onLoad(reactFlowInstance) {
     setFlowInstance(reactFlowInstance);
   };
 
+  var NodeDebug = function NodeDebug() {
+    var elements = (0, _reactFlowRenderer.useStoreState)(function (state) {
+      return [].concat(_toConsumableArray(state.nodes), _toConsumableArray(state.edges));
+    }, _lodash["default"].isEqual);
+    var setElements = (0, _reactFlowRenderer.useStoreActions)(function (actions) {
+      return actions.setElements;
+    });
+    var newElements = (0, _utils.getLayoutedElements)(elements, direction);
+    virtualElements = newElements;
+    setElements(newElements);
+    return null;
+  };
+
   (0, _react.useEffect)(function () {
     if (flowInstance) {
       var _getDefaultPos = getDefaultPos(),
@@ -174,7 +192,7 @@ var OkrMap = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
   }, /*#__PURE__*/_react["default"].createElement(_reactFlowRenderer.ReactFlowProvider, null, dataSource.length == 0 ? /*#__PURE__*/_react["default"].createElement(_empty["default"], null) : /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_reactFlowRenderer["default"], {
     onLoad: onLoad,
-    elements: layoutedElements,
+    elements: dataSource,
     nodesDraggable: false,
     nodesConnectable: false,
     nodeTypes: _utils.nodeTypes,
@@ -182,7 +200,7 @@ var OkrMap = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     minZoom: 0.25,
     maxZoom: 1.5,
     panOnScroll: true
-  }), /*#__PURE__*/_react["default"].createElement(_miniMap["default"], {
+  }, /*#__PURE__*/_react["default"].createElement(NodeDebug, null)), /*#__PURE__*/_react["default"].createElement(_miniMap["default"], {
     onMoveStart: function onMoveStart() {
       return isMoving.current = true;
     }

package/lib/components/okr-flow/request-apis.js

@@ -78,7 +78,9 @@ var expandNode = function expandNode(params) {
       _params$okrIdParent = params.okrIdParent,
       okrIdParent = _params$okrIdParent === void 0 ? 0 : _params$okrIdParent,
       _params$currentOkrRol = params.currentOkrRole,
-      currentOkrRole = _params$currentOkrRol === void 0 ? true : _params$currentOkrRol;
+      currentOkrRole = _params$currentOkrRol === void 0 ? true : _params$currentOkrRol,
+      _params$showCardKr = params.showCardKr,
+      showCardKr = _params$showCardKr === void 0 ? 1 : _params$showCardKr;
   return _axios["default"].get("".concat(requestDomain(), "/api/v1/").concat(tenantId, "/").concat(userId, "/okr/map/expand"), {
     params: {
       okrId: okrId,
@@ -87,7 +89,9 @@ var expandNode = function expandNode(params) {
       // true: 展开子节点, false: 展开父节点
       okrIdParent: okrIdParent,
       //  当前选中okr 或 当前选中kr 的okrId（kr的父节点是所属okr）
-      currentOkrRole: currentOkrRole // 查看权限
+      currentOkrRole: currentOkrRole,
+      // 查看权限
+      showCardKr: showCardKr // o带上kr
 
     }
   }).then(function (res) {
@@ -103,12 +107,15 @@ var expandNodesByLevel = function expandNodesByLevel(_ref2) {
       _ref2$okrIds = _ref2.okrIds,
       okrIds = _ref2$okrIds === void 0 ? [] : _ref2$okrIds,
       _ref2$showKr = _ref2.showKr,
-      showKr = _ref2$showKr === void 0 ? 0 : _ref2$showKr;
+      showKr = _ref2$showKr === void 0 ? 0 : _ref2$showKr,
+      _ref2$showCardKr = _ref2.showCardKr,
+      showCardKr = _ref2$showCardKr === void 0 ? 0 : _ref2$showCardKr;
   return (// const queryStr = qs.stringify({ okrIds, level }, { arrayFormat: 'repeat' });
     _axios["default"].post("".concat(requestDomain(), "/api/v1/").concat(tenantId, "/").concat(userId, "/okr/map/generalview"), {
       okrIds: okrIds,
       level: level,
-      showKr: showKr
+      showKr: showKr,
+      showCardKr: showCardKr
     }).then(function (res) {
       return res.data.Data;
     })

package/lib/components/okr-flow/root-node/index.css

@@ -1,6 +1,6 @@
 .titaui-okr-flow--root-node {
-  padding: 5px 12px;
-  background: #f0f2f5;
+  padding: 4px 12px;
+  background: rgba(255, 255, 255, 0.6);
   border-radius: 16px;
   color: #89919f;
 }

package/lib/components/okr-flow/utils/index.js

@@ -15,6 +15,12 @@ var _rootNode = _interopRequireDefault(require("../root-node"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+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; }
+
 var nodeTypes = {
   ChildNode: _childNode["default"],
   RootNode: _rootNode["default"]
@@ -24,42 +30,53 @@ exports.nodeTypes = nodeTypes;
 var getLayoutedElements = function getLayoutedElements(elements) {
   var direction = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "horizontal";
   var isHorizontal = direction === "horizontal";
-  var nodeWidth = 320;
-  var nodeHeight = 96;
-  var dagreGraph = new _dagre["default"].graphlib.Graph();
-  dagreGraph.setDefaultEdgeLabel(function () {
-    return {};
+  var g = new _dagre["default"].graphlib.Graph({
+    compound: true
   });
-  dagreGraph.setGraph({
+  g.setGraph({
     rankdir: isHorizontal ? "LR" : "TB",
-    ranksep: 80,
-    nodesep: 12
+    nodesep: 12,
+    ranksep: 80
   });
-  elements.forEach(function (el) {
-    if ((0, _reactFlowRenderer.isNode)(el)) {
-      dagreGraph.setNode(el.id, {
-        width: nodeWidth,
-        height: nodeHeight
+  g.setDefaultEdgeLabel(function () {
+    return {};
+  });
+  elements.forEach(function (element) {
+    if ((0, _reactFlowRenderer.isNode)(element)) {
+      var _element$__rf, _element$__rf2;
+
+      // const { data,id } = element
+      // if(id!=="0"){
+      //   const {parentId} = data
+      //   if(parentId===0||parentId){
+      //     g.setParent(id, parentId+"");
+      //   }
+      // }
+      g.setNode(element.id, {
+        width: (_element$__rf = element.__rf) === null || _element$__rf === void 0 ? void 0 : _element$__rf.width,
+        height: (_element$__rf2 = element.__rf) === null || _element$__rf2 === void 0 ? void 0 : _element$__rf2.height
       });
     } else {
-      dagreGraph.setEdge(el.source, el.target);
+      g.setEdge(element.source, element.target);
     }
   });
 
-  _dagre["default"].layout(dagreGraph);
-
-  return elements.map(function (el) {
-    if ((0, _reactFlowRenderer.isNode)(el)) {
-      var nodeWithPosition = dagreGraph.node(el.id);
-      el.targetPosition = isHorizontal ? "left" : "top";
-      el.sourcePosition = isHorizontal ? "right" : "bottom";
-      el.position = {
-        x: nodeWithPosition.x,
-        y: nodeWithPosition.y
-      };
+  _dagre["default"].layout(g);
+
+  return elements.map(function (element) {
+    if ((0, _reactFlowRenderer.isNode)(element)) {
+      var node = g.node(element.id);
+      return _objectSpread(_objectSpread({}, element), {}, {
+        targetPosition: isHorizontal ? "left" : "top",
+        sourcePosition: isHorizontal ? "right" : "bottom",
+        position: {
+          x: node.x - node.width / 2,
+          y: node.y - node.height / 2
+        }
+      });
     }
 
-    return el;
+    return element;
   });
 };
 

package/lib/components/okr-flow/utils/tree-handler.js

@@ -130,6 +130,7 @@ exports.formatNodes = formatNodes;
 
 var flatTree = function flatTree(current, elements, showkr) {
   var isParentExpand = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
+  var parentId = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
   if (!current) return;
   var id = current.id,
       data = current.data,
@@ -142,7 +143,12 @@ var flatTree = function flatTree(current, elements, showkr) {
     elements.push({
       id: "".concat(id),
       type: "RootNode",
-      data: data
+      data: data,
+      isParent: true,
+      position: {
+        x: 0,
+        y: 0
+      }
     });
   } else {
     var isChildExpand = false;
@@ -164,11 +170,16 @@ var flatTree = function flatTree(current, elements, showkr) {
     elements.push({
       id: "".concat(id),
       type: "ChildNode",
+      position: {
+        x: 0,
+        y: 0
+      },
       data: {
         id: id,
         data: data,
         isParentExpand: isParentExpand,
         isChildExpand: isChildExpand,
+        parentId: parentId,
         modelType: modelType,
         isSearchRes: isSearchRes
       }
@@ -191,7 +202,7 @@ var flatTree = function flatTree(current, elements, showkr) {
               source: "".concat(id),
               target: "".concat(sub.id)
             });
-            flatTree(sub, elements, showkr, current.modelType != "root");
+            flatTree(sub, elements, showkr, current.modelType != "root", id);
           });
         }
       } else {
@@ -200,7 +211,7 @@ var flatTree = function flatTree(current, elements, showkr) {
           source: "".concat(id),
           target: "".concat(child.id)
         });
-        flatTree(child, elements, showkr, current.modelType != "root");
+        flatTree(child, elements, showkr, current.modelType != "root", id);
       }
     });
   }

package/lib/components/okrcase-library/okrcases-components/submitOkr-dialog.js

@@ -303,6 +303,7 @@ function PayDialog(props) {
     if (payCode === "wxPay") {
       e.preventDefault();
       var path = window.location.href.split("#")[0];
+      path = path.replace(/eLearningHome/, "Home");
       var encode = encodeURIComponent("orderId=".concat(orderId, "&payCode=").concat(payCode, "&payName=").concat(payName));
       window.open("".concat(path, "#/pay?").concat(encode), "_blank"); // postWxPayOrder({
       //   order_id: orderId,

package/lib/components/period-selector/index.js

@@ -73,6 +73,8 @@ function PeriodSelector(_ref) {
       wrapperStyle = _ref.wrapperStyle,
       popClass = _ref.popClass,
       style = _ref.style,
+      _ref$buttonClass = _ref.buttonClass,
+      buttonClass = _ref$buttonClass === void 0 ? "" : _ref$buttonClass,
       _ref$noBorder = _ref.noBorder,
       noBorder = _ref$noBorder === void 0 ? false : _ref$noBorder;
 
@@ -174,6 +176,7 @@ function PeriodSelector(_ref) {
     className: className
   }, children || /*#__PURE__*/_react["default"].createElement(_button["default"], {
     type: "default",
+    className: buttonClass,
     style: noBorder ? {
       padding: "0",
       border: "none"

package/lib/components/textarea/index.css

@@ -0,0 +1,120 @@
+.titaui-textArea {
+  box-sizing: border-box;
+  position: relative;
+  min-height: 36px;
+  background: #ffffff;
+  cursor: text;
+  border-radius: 4px;
+  display: flex;
+  align-items: center;
+  padding: 7px 0;
+  transition: border 0.2s ease 0.2s, box-shadow 0.2s ease 0.2s;
+}
+
+.titaui-textArea.has-error {
+  border: 1px solid #f05e5e !important;
+}
+
+.titaui-textArea:hover {
+  border: 1px solid #2879ff;
+}
+
+.titaui-textArea > input {
+  flex-grow: 1;
+  border: none;
+  padding: 0 12px;
+  margin: 0;
+  outline: none;
+  width: 0;
+  box-sizing: border-box;
+  background-color: transparent;
+  color: #3f4755;
+}
+
+.titaui-textArea > input ::-webkit-input-placeholder {
+  color: #bfc7d5;
+}
+
+.titaui-textArea > input :-ms-input-placeholder {
+  color: #bfc7d5;
+}
+
+.titaui-textArea > input :-moz-input-placeholder {
+  color: #bfc7d5;
+}
+
+.titaui-textArea textarea {
+  flex: 1;
+  line-height: 20px;
+  min-height: 20px;
+  border: none;
+  padding: 0;
+  margin: 0;
+  outline: none;
+  resize: none;
+  padding: 0 12px;
+  width: 100%;
+  box-sizing: border-box;
+  background-color: transparent;
+  color: #3f4755;
+  word-break: break-all;
+}
+
+.titaui-textArea textarea ::-webkit-input-placeholder {
+  color: #bfc7d5;
+}
+
+.titaui-textArea textarea :-ms-input-placeholder {
+  color: #bfc7d5;
+}
+
+.titaui-textArea textarea :-moz-input-placeholder {
+  color: #bfc7d5;
+}
+
+.titaui-textArea.disabled {
+  background-color: rgba(240, 242, 245, 0.4);
+  border-color: #f0f2f5;
+  color: #bfc7d5;
+  cursor: default;
+}
+
+.titaui-textArea.disabled > input,
+    .titaui-textArea.disabled textarea,
+    .titaui-textArea.disabled .tail-wrapper {
+  color: #bfc7d5;
+}
+
+.titaui-textArea.disabled:hover {
+  border-color: #f0f2f5;
+}
+
+.area-error {
+  border: 1px solid #f05e5e !important;
+  box-shadow: 0px 0px 6px 0px rgba(240, 94, 94, 0.3);
+}
+
+.area-focus {
+  border: 1px solid #2879ff !important;
+  box-shadow: 0px 0px 6px 0px rgba(40, 121, 255, 0.3);
+}
+
+.area-normal {
+  border: 1px solid #e9ecf0 !important;
+  box-shadow: none;
+}
+
+.inner {
+  overflow: auto;
+  display: flex;
+  flex: 1;
+  width: 0;
+}
+
+.err-color {
+  font-size: 12px;
+  font-weight: 400;
+  color: #f05e5e;
+  line-height: 18px;
+  padding-left: 12px;
+}