@titaui/pc 1.10.81-beta.2 → 1.10.82-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/button/rect-btn/index.css

@@ -13,7 +13,7 @@
   align-items: center;
   justify-content: center;
   min-width: 64px;
-  font-size: 14px;
+  font-size: 13px;
   padding: 0 12px;
 }
 
@@ -60,35 +60,21 @@
   background: #5c8eff;
 }
 
-.titaui-rect-btn--secondary {
-  font-size: 14px;
-  font-weight: normal;
-  color: #2879ff;
-  line-height: 28px;
-  background: rgba(40, 121, 255, 0.2);
-  margin-right: 16px;
-}
-
-.titaui-rect-btn--secondary:hover {
-  color: #fff;
-  background-color: #2879ff;
-}
-
 .titaui-rect-btn--cancel {
-  color: #6f7886;
-  border: 1px solid #dfe3ea;
-  background: #ffffff;
+  color: #6F7886;
+  border: 1px solid #DFE3EA;
+  background: #FFFFFF;
 }
 
 .titaui-rect-btn--cancel:hover {
-  color: #2879ff;
-  border: 1px solid #2879ff;
+  color: #2879FF;
+  border: 1px solid #2879FF;
 }
 
 .titaui-rect-btn--delete {
-  background: #ffffff;
-  color: #f05e5e;
-  border: 1px solid #f05e5e;
+  background: #FFFFFF;
+  color: #F05E5E;
+  border: 1px solid #F05E5E;
 }
 
 .titaui-rect-btn--delete:hover {
@@ -107,10 +93,10 @@
 }
 
 .titaui-rect-btn--primary.titaui-rect-btn--disabled {
-  background: #93bcff;
+  background: #93BCFF;
   opacity: 1;
 }
 
 .titaui-rect-btn--primary.titaui-rect-btn--disabled:hover {
-  background: #93bcff;
+  background: #93BCFF;
 }

package/lib/components/button/rect-btn/index.js

@@ -34,8 +34,7 @@ function RectBtn(props) {
       className = _props$className === void 0 ? "" : _props$className,
       _props$disabled = props.disabled,
       disabled = _props$disabled === void 0 ? false : _props$disabled,
-      style = props.style,
-      children = props.children;
+      style = props.style;
 
   var renderIcon = function renderIcon() {
     if (typeof icon === "string") {
@@ -51,19 +50,16 @@ function RectBtn(props) {
     }, icon);
   };
 
-  var onClickHandler = function onClickHandler(e) {
+  var onClickHandler = function onClickHandler() {
     if (disabled) return;
-
-    if (onClick) {
-      onClick(e);
-    }
+    onClick && onClick();
   };
 
   return /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])(precls, "".concat(precls, "--").concat(type), "".concat(precls, "--").concat(size), _defineProperty({}, "".concat(precls, "--disabled"), disabled), className),
     style: style,
     onClick: onClickHandler
-  }, icon && renderIcon(), children || text);
+  }, icon && renderIcon(), props.children || text);
 }
 
 var _default = RectBtn;

package/lib/components/drawer/index.js

@@ -25,9 +25,7 @@ require("./index.css");
 
 var _context = _interopRequireDefault(require("../drawer-manager/context"));
 
-var _dom = require("./utils/dom");
-
-var _excluded = ["visible", "placement", "children", "mask", "width", "className", "contentWrapperStyle", "onClose", "style", "afterVisibleChange", "destroyOnClose", "bodyStyle", "zIndex", "autoClosable"];
+var _excluded = ["visible", "placement", "children", "mask", "width", "className", "contentWrapperStyle", "onClose", "style", "afterVisibleChange", "destroyOnClose", "bodyStyle", "zIndex"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -56,7 +54,7 @@ var Drawer = function Drawer(props) {
 
   var visible = props.visible,
       _props$placement = props.placement,
-      placement = _props$placement === void 0 ? 'right' : _props$placement,
+      placement = _props$placement === void 0 ? "right" : _props$placement,
       children = props.children,
       _props$mask = props.mask,
       mask = _props$mask === void 0 ? false : _props$mask,
@@ -72,8 +70,6 @@ var Drawer = function Drawer(props) {
       bodyStyle = props.bodyStyle,
       _props$zIndex = props.zIndex,
       zIndex = _props$zIndex === void 0 ? 1200 : _props$zIndex,
-      _props$autoClosable = props.autoClosable,
-      autoClosable = _props$autoClosable === void 0 ? false : _props$autoClosable,
       rest = _objectWithoutProperties(props, _excluded);
 
   var handleAfterVisibleChange = (0, _react.useCallback)(function (opened) {
@@ -93,20 +89,6 @@ var Drawer = function Drawer(props) {
     return children;
   }
 
-  var autoClose = function autoClose(e) {
-    if ((0, _dom.hasAncestorElement)(e.target, 'document-mouse-event-ignore,rc-tooltip,titaui-popup,rc-dialog-root,common-modal,in-modal,task-hot-add')) return;
-    onClose();
-  };
-
-  (0, _react.useEffect)(function () {
-    if (autoClosable) {
-      document.addEventListener('mousedown', autoClose);
-    }
-
-    return function () {
-      document.removeEventListener('mousedown', autoClose);
-    };
-  }, []);
   return /*#__PURE__*/_react["default"].createElement(DrawerContext.Provider, {
     value: {
       close: function close() {
@@ -114,7 +96,7 @@ var Drawer = function Drawer(props) {
       }
     }
   }, /*#__PURE__*/_react["default"].createElement(_rcDrawer["default"], _extends({
-    className: (0, _classnames["default"])('titaui-drawer', 'document-mouse-event-ignore', className),
+    className: (0, _classnames["default"])("titaui-drawer", "document-mouse-event-ignore", className),
     style: _objectSpread(_objectSpread({}, style), {}, {
       zIndex: zIndex
     })
@@ -140,7 +122,8 @@ function DrawerHeader(_ref) {
       actionMaxCount = _ref$actionMaxCount === void 0 ? 4 : _ref$actionMaxCount,
       content = _ref.content,
       style = _ref.style,
-      onClose = _ref.onClose;
+      onClose = _ref.onClose,
+      actionComponent = _ref.actionComponent;
   var drawer = (0, _react.useContext)(DrawerContext);
   var manager = (0, _react.useContext)(_context["default"]);
   var showClose = closable && (!!onClose || !!drawer);
@@ -163,16 +146,16 @@ function DrawerHeader(_ref) {
     onClick: manager && manager.goBack
   }, /*#__PURE__*/_react["default"].createElement("i", {
     className: "tu-icon-fanhui"
-  }), (0, _getLocale.getLocale)('Mod_Back')), showBackBtn && hasContent && /*#__PURE__*/_react["default"].createElement("div", {
+  }), (0, _getLocale.getLocale)("Mod_Back")), showBackBtn && hasContent && /*#__PURE__*/_react["default"].createElement("div", {
     className: "titaui-drawer-header-divider"
   }), hasContent && content, /*#__PURE__*/_react["default"].createElement("div", {
     style: {
       flex: 1
     }
-  }), displayActions.map(function (action) {
+  }), /*#__PURE__*/_react["default"].createElement("div", null, actionComponent), displayActions.map(function (action) {
     return /*#__PURE__*/_react["default"].createElement(_headerAction["default"], action);
   }), !!collapsedActions.length && /*#__PURE__*/_react["default"].createElement(_headerAction["default"], {
-    title: (0, _getLocale.getLocale)('Mod_MoreOperate'),
+    title: (0, _getLocale.getLocale)("Mod_MoreOperate"),
     icon: "tu-icon-10",
     children: collapsedActions
   }), showClose && /*#__PURE__*/_react["default"].createElement("div", {

package/lib/components/drawer-manager/index.js

@@ -25,45 +25,42 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 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 _objectDestructuringEmpty(obj) { if (obj == null) throw new TypeError("Cannot destructure undefined"); }
-
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 
-var typeMap = {};
-
 var DrawerManager = /*#__PURE__*/function () {
   function DrawerManager() {
     var _this = this;
 
-    var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-
-    _objectDestructuringEmpty(_ref);
-
     _classCallCheck(this, DrawerManager);
 
     this.history = [];
     this.uid = 0;
+    this.typeMap = {};
 
     this.open = function (type) {
       var props = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var drawerProps = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-      if (!type) throw "need provide drawer type";
-      var Component = typeMap[type];
-      if (!Component) throw "the type is not regisited";
-      window.titaTracker && window.titaTracker("action").record({
-        actionName: type,
-        actionGroup: "打开推屏",
-        productName: "OKR"
-      });
+      if (!type) throw new Error("need provide drawer type");
+      var Component = typeof type === "string" ? _this.typeMap[type] : type;
+      if (!Component) throw new Error("the type is not regisited");
+
+      if (window.titaTracker) {
+        window.titaTracker("action").record({
+          actionName: type,
+          actionGroup: "打开推屏",
+          productName: "OKR"
+        });
+      }
+
       return new Promise(function (resolve) {
         clearTimeout(_this.timer);
         _this.timer = setTimeout(function () {
           var uid = _this.uid;
-          _this.uid++;
+          _this.uid += 1;
           var extendedDrawerProps = drawerProps;
 
           if (_this.history.length > 0) {
@@ -82,7 +79,7 @@ var DrawerManager = /*#__PURE__*/function () {
             key: uid
           }, props)), extendedDrawerProps);
 
-          if (_this.history.length == 1) {
+          if (_this.history.length === 1) {
             document.addEventListener("mousedown", _this.autoClose);
           }
         }, 200);
@@ -109,14 +106,16 @@ var DrawerManager = /*#__PURE__*/function () {
     };
 
     this.close = function () {
-      _this.history.reverse().forEach(function (_ref2) {
-        var resolve = _ref2.resolve;
+      _this.history.reverse().forEach(function (_ref) {
+        var resolve = _ref.resolve;
         return resolve();
       });
 
       _this.history = [];
 
       _this.drawer.close();
+
+      document.removeEventListener("mousedown", _this.autoClose);
     };
 
     this.autoClose = function (e) {
@@ -125,20 +124,19 @@ var DrawerManager = /*#__PURE__*/function () {
         return;
       }
 
-      if ((0, _dom.hasAncestorElement)(e.target, "document-mouse-event-ignore,rc-tooltip,titaui-popup,rc-dialog-root,common-modal,in-modal,task-hot-add")) return;
+      if ((0, _dom.hasAncestorElement)(e.target, "document-mouse-event-ignore,rc-tooltip,titaui-popup,rc-dialog-root,common-modal,in-modal,task-hot-add")) {
+        return;
+      }
 
       _this.close();
+    };
 
-      document.removeEventListener("mousedown", _this.autoClose);
+    this.regist = function (type, component) {
+      _this.typeMap[type] = component;
     };
   }
 
   _createClass(DrawerManager, [{
-    key: "regist",
-    value: function regist(type, component) {
-      typeMap[type] = component;
-    }
-  }, {
     key: "drawer",
     get: function get() {
       var _this2 = this;

package/lib/components/dynamic/dynamic-item/dynamic-ai-dialy/index.js

@@ -13,15 +13,24 @@ var _utils = require("../dynamic-chart/utils");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": 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); }
+
 var prefixCls = "titaui-dynamic-item";
 
 var DynamicAIDialy = function DynamicAIDialy(_ref) {
   var data = _ref.data;
-  var chartQuery = (0, _utils.getChartProps)(data.biId);
+
+  var chartQuery = _react["default"].useMemo(function () {
+    return (0, _utils.getChartProps)(data.biId);
+  }, [data.biId]);
+
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: prefixCls
-  }, /*#__PURE__*/_react["default"].createElement(_supersetCharts["default"], chartQuery));
+  }, /*#__PURE__*/_react["default"].createElement(_supersetCharts["default"], _extends({
+    feedData: data
+  }, chartQuery)));
 };
 
-var _default = DynamicAIDialy;
+var _default = /*#__PURE__*/_react["default"].memo(DynamicAIDialy);
+
 exports["default"] = _default;

package/lib/components/dynamic/online-broadcast/data.js

@@ -19,16 +19,16 @@ exports.onlineBroadcastData = exports["default"] = void 0;
 // }
 var onlineBroadcastData = [{
   hasOnline: true,
-  preContent: "「OKR 工作法」体验优化 ",
-  preHref: "https://wiki.tita.com/x/jIOeAQ",
+  preContent: "「考核」OKR 维度支持按 KR 评分啦",
+  preHref: "https://wiki.tita.com/x/JYOeAQ",
   isNew: true,
-  date: "3/29"
+  date: "4/11"
 }, {
   hasOnline: true,
-  preContent: "新增「同步钉钉待办」，工作实时掌握",
-  preHref: "https://wiki.tita.com/x/DIOeAQ",
-  isNew: true,
-  date: "3/18"
+  preContent: "「OKR 工作法」体验优化 ",
+  preHref: "https://wiki.tita.com/x/jIOeAQ",
+  isNew: false,
+  date: "3/29"
 }, {
   hasOnline: true,
   preContent: "「考核」支持建立企业指标库",

package/lib/components/img-viewer/index.css

@@ -80,6 +80,12 @@
 
 .titaui-img-viewer__body-img {
   max-width: 800px;
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  margin: auto;
 }
 
 .titaui-img-viewer__body-operate-btn {

package/lib/components/img-viewer/index.js

@@ -85,7 +85,18 @@ var ImgViewer = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
       isLoading = _useState12[0],
       setIsLoading = _useState12[1];
 
+  var _useState13 = (0, _react.useState)(0),
+      _useState14 = _slicedToArray(_useState13, 2),
+      moveX = _useState14[0],
+      setMoveX = _useState14[1];
+
+  var _useState15 = (0, _react.useState)(0),
+      _useState16 = _slicedToArray(_useState15, 2),
+      moveY = _useState16[0],
+      setMoveY = _useState16[1];
+
   var imgRef = (0, _react.useRef)(document.createElement("img"));
+  var DragRef = (0, _react.useRef)(document.createElement("div"));
 
   var showPreview = function showPreview() {
     var index = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
@@ -120,6 +131,31 @@ var ImgViewer = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     setCurrentRotateDeg(currentRotateDeg - 90);
   };
 
+  var handleMouseDownImg = function handleMouseDownImg(e) {
+    e.preventDefault();
+    var downX = e.clientX;
+    var downY = e.clientY; // 因为这个moveX不闭包的话在拖动的时候他就 一直累加
+
+    var beforeX = moveX;
+    var beforeY = moveY;
+
+    DragRef.current.onmousemove = function (e1) {
+      //获取x和y
+      var nx = e1.clientX;
+      var ny = e1.clientY; // //计算移动后的左偏移量和顶部的偏移量
+
+      var nl = nx - downX + beforeX;
+      var nt = ny - downY + beforeY;
+      setMoveX(nl);
+      setMoveY(nt);
+    };
+  };
+
+  var handleMouseUpImg = function handleMouseUpImg(e) {
+    e.preventDefault();
+    DragRef.current.onmousemove = null;
+  };
+
   var handleRightRotate = function handleRightRotate() {
     setCurrentRotateDeg(currentRotateDeg + 90);
   };
@@ -170,7 +206,10 @@ var ImgViewer = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
       className: (0, _classnames["default"])("tu-icon-close", "".concat(prefix, "__header-close")),
       onClick: hidePreview
     }))), /*#__PURE__*/_react["default"].createElement("div", {
-      className: "".concat(prefix, "__body")
+      className: "".concat(prefix, "__body"),
+      ref: DragRef,
+      onMouseDown: handleMouseDownImg,
+      onMouseUp: handleMouseUpImg
     }, /*#__PURE__*/_react["default"].createElement("span", {
       className: (0, _classnames["default"])("".concat(prefix, "__body-operate-btn"), "".concat(prefix, "__body-operate-btn--left"), _defineProperty({}, "".concat(prefix, "__body-operate-btn--disable"), currentIndex === 0)),
       onClick: handlePreImgClick
@@ -184,17 +223,17 @@ var ImgViewer = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     })), isLoading && /*#__PURE__*/_react["default"].createElement("div", {
       className: "".concat(prefix, "__body--loading")
     }, /*#__PURE__*/_react["default"].createElement("img", {
-      src: _loading["default"]
-    })), /*#__PURE__*/_react["default"].createElement("div", {
-      style: {
-        transform: "rotate(".concat(currentRotateDeg, "deg)")
-      }
-    }, /*#__PURE__*/_react["default"].createElement("img", {
+      src: _loading["default"],
+      alt: ""
+    })), /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("img", {
       className: "".concat(prefix, "__body-img"),
       ref: imgRef,
+      alt: "",
       src: (currentImgData === null || currentImgData === void 0 ? void 0 : currentImgData.previewUrl) || (currentImgData === null || currentImgData === void 0 ? void 0 : currentImgData.bigImageUrl),
       style: {
-        transform: "scale(".concat(currentScale, ")")
+        transform: "scale(".concat(currentScale, ") rotate(").concat(currentRotateDeg, "deg) "),
+        left: "".concat(moveX, "px"),
+        top: "".concat(moveY, "px")
       }
     }))), /*#__PURE__*/_react["default"].createElement("div", {
       className: "".concat(prefix, "__footer")

package/lib/components/menus/export-modules/demo-menus/menus.js

@@ -109,29 +109,7 @@ var DemoMenuData = /*#__PURE__*/function () {
         key: PAGE_DUEDATE_ORDER,
         href: "#/demofree/recharge/order",
         isShow: this.isManager === EManagerType.ReCharge || this.isManager === EManagerType.Manager
-      } // {
-      //   icon: "",
-      //   label: "续费状态",
-      //   key: PAGE_RECHARGE_STATUS,
-      //   href: "#/demofree/recharge/status",
-      //   isShow: this.isManager === EManagerType.ReCharge || this.isManager === EManagerType.Manager,
-      // },
-      // {
-      //   icon: "",
-      //   label: "数据统计",
-      //   key: PAGE_RECHARGE_STATISTICS,
-      //   href: "#/demofree/recharge/statistics",
-      //   isShow: this.isManager === EManagerType.ReCharge || this.isManager === EManagerType.Manager,
-      // },
-      ]
-    }, {
-      icon: "KH-help",
-      label: "预约演示报表",
-      key: "charts",
-      href: "#/demofree/charts",
-      isShow: this.isManager === EManagerType.Manager,
-      children: [],
-      type: _index.MENU_ITEM_NOE
+      }]
     }];
   }
 

package/lib/components/menus/export-modules/okr-menus/menu-highlight.js

@@ -31,6 +31,8 @@ var _default = /*#__PURE__*/function () {
           cb(_menus.PAGE_MY_PART_OKR);
         } else if (this.isMyTargetOkr()) {
           cb(_menus.PAGE_MY_TARGET_OKR);
+        } else if (this.isTargetUser()) {
+          return null;
         } else {
           cb(_menus.PAGE_MY_OWNER_OKR);
         }
@@ -43,6 +45,8 @@ var _default = /*#__PURE__*/function () {
       } else if (this.isOkrCases()) {
         cb(_menus.PAGE_OKR_CASES);
       }
+
+      return null;
     }
   }, {
     key: "isMyOkr",
@@ -62,6 +66,12 @@ var _default = /*#__PURE__*/function () {
       var search = this.history.location.search;
       return !!search.match(/relation[\s]*?=[\s]*?3/);
     }
+  }, {
+    key: "isTargetUser",
+    value: function isTargetUser() {
+      var search = this.history.location.search;
+      return !!search.match(/toUserId[\s]*?=[\d]+/);
+    }
   }, {
     key: "isOkr",
     value: function isOkr() {

package/lib/components/nav-top/index.js

@@ -15,8 +15,6 @@ var _bsGlobal = require("../../utils/bs-global");
 
 var _userOwnMenu = _interopRequireDefault(require("./components/user-own-menu"));
 
-var _useGlobalValue = _interopRequireDefault(require("./useGlobalValue"));
-
 var _menu = _interopRequireDefault(require("./components/menu"));
 
 var _userMessage = _interopRequireDefault(require("./components/user-message"));
@@ -172,7 +170,5 @@ var NavTop = function NavTop() {
   }, /*#__PURE__*/_react["default"].createElement(_userOwnMenu["default"], null)));
 };
 
-var _default = NavTop; // @ts-ignore
-
-exports["default"] = _default;
-NavTop.useGlobalValue = _useGlobalValue["default"];
+var _default = NavTop;
+exports["default"] = _default;

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

@@ -54,7 +54,7 @@
 }
 
 .tita-okrdt-tree__o-child-node-prefix::before {
-  content: "";
+  content: '';
   width: 9px;
   height: 12px;
   background: url(../../images/O.svg) transparent no-repeat 50% 50%;
@@ -73,11 +73,12 @@
 
 .child-okrs-weight__content {
   padding: 10px 32px 8px;
+  max-height: 300px;
   min-height: 90px;
+  overflow: auto;
   box-sizing: border-box;
   display: flex;
   flex-direction: column;
-  justify-content: center;
 }
 
 .child-okrs-weight__item {
@@ -105,7 +106,7 @@
 }
 
 .child-okrs-weight__item-precls:before {
-  content: "";
+  content: '';
   width: 10px;
   height: 8px;
   border-radius: 50%;