@titaui/pc 1.16.61-beta.1 → 1.16.61-beta.3

package/lib/components/magnet/index.js

@@ -17,6 +17,8 @@ var _ahooks = require("ahooks");
 
 require("./index.css");
 
+var _excluded = ["className", "style", "children", "cacheKey"];
+
 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; }
@@ -41,6 +43,10 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
+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 preCls = 'titaui-magnet';
 
 var getCacheKey = function getCacheKey(key) {
@@ -53,7 +59,9 @@ var Magnet = function Magnet(_ref) {
   var className = _ref.className,
       style = _ref.style,
       children = _ref.children,
-      cacheKey = _ref.cacheKey;
+      cacheKey = _ref.cacheKey,
+      otherPorps = _objectWithoutProperties(_ref, _excluded);
+
   var cacheY = parseInt(cacheKey && localStorage.getItem(getCacheKey(cacheKey)) || '0');
 
   var _useState = (0, _react.useState)({
@@ -92,6 +100,7 @@ var Magnet = function Magnet(_ref) {
       });
     }
   }, [dragItemRef, dragItemSize]);
+  var isMove = (0, _react.useRef)(false);
   var touchBind = (0, _react2.useDrag)(function (_ref2) {
     var _ref2$movement = _slicedToArray(_ref2.movement, 2),
         mx = _ref2$movement[0],
@@ -107,6 +116,7 @@ var Magnet = function Magnet(_ref) {
 
     if (newY < boundary.top) newY = boundary.top;
     if (newY > boundary.bottom) newY = boundary.bottom;
+    isMove.current = Math.abs(mx) > 5 || Math.abs(my) > 5;
 
     if (!active) {
       api.start({
@@ -130,15 +140,27 @@ var Magnet = function Magnet(_ref) {
     e.stopPropagation();
     e.preventDefault();
   }, []);
+
+  var onClickHandler = function onClickHandler(e) {
+    // 移动后禁止点击事件
+    if (isMove.current) {
+      isMove.current = false;
+      e.stopPropagation();
+    }
+  };
+
   return /*#__PURE__*/_react["default"].createElement(_web.animated.div, _extends({
-    ref: dragItemRef,
+    ref: dragItemRef
+  }, otherPorps, {
     onDragStart: stopPop,
     className: "".concat(preCls, " ").concat(className),
     style: _objectSpread(_objectSpread({}, style), {}, {
       x: x,
       y: y
     })
-  }, touchBind()), children);
+  }, touchBind()), /*#__PURE__*/_react["default"].createElement("div", {
+    onClickCapture: onClickHandler
+  }, children));
 };
 
 var _default = /*#__PURE__*/_react["default"].memo(Magnet);

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

@@ -181,7 +181,7 @@ var okrMenus = /*#__PURE__*/function () {
   _createClass(okrMenus, [{
     key: "checkConcernExist",
     value: function checkConcernExist(user) {
-      var concerns = this.menus[2].children;
+      var concerns = this.menus[3].children;
 
       for (var i = 0; i < concerns.length; i++) {
         var it = concerns[i];
@@ -196,10 +196,10 @@ var okrMenus = /*#__PURE__*/function () {
   }, {
     key: "setConcernLoading",
     value: function setConcernLoading(loading) {
-      this.menus[2].children = [];
+      this.menus[3].children = [];
 
       if (loading) {
-        this.menus[2].children.push({
+        this.menus[3].children.push({
           icon: '',
           label: 'loading',
           key: 'loading-concern',
@@ -296,15 +296,15 @@ var okrMenus = /*#__PURE__*/function () {
         });
       }
 
-      this.menus[2].children = this.menus[2].children.concat(treeNodeUsers);
+      this.menus[3].children = this.menus[3].children.concat(treeNodeUsers);
     }
   }, {
     key: "setEmptyConcerners",
     value: function setEmptyConcerners(empty) {
-      this.menus[2].children = [];
+      this.menus[3].children = [];
 
       if (empty) {
-        this.menus[2].children.push({
+        this.menus[3].children.push({
           icon: '',
           label: 'empty-concerners',
           key: 'empty-concerners',
@@ -317,11 +317,11 @@ var okrMenus = /*#__PURE__*/function () {
   }, {
     key: "addConcerner",
     value: function addConcerner(user) {
-      if (this.menus[2].children.length && this.menus[2].children[0].key == 'empty-concerners') {
-        this.menus[2].children = [];
+      if (this.menus[3].children.length && this.menus[3].children[0].key == 'empty-concerners') {
+        this.menus[3].children = [];
       }
 
-      this.menus[2].children.push({
+      this.menus[3].children.push({
         icon: '',
         label: user.name,
         key: "concern-".concat(user.userId),
@@ -333,14 +333,14 @@ var okrMenus = /*#__PURE__*/function () {
   }, {
     key: "removeConcerner",
     value: function removeConcerner(user) {
-      var newChildren = _toConsumableArray(this.menus[2].children).filter(function (it) {
+      var newChildren = _toConsumableArray(this.menus[3].children).filter(function (it) {
         return it.key != "concern-".concat(user.userId);
       });
 
       if (!newChildren.length) {
         this.setEmptyConcerners(true);
       } else {
-        this.menus[2].children = newChildren;
+        this.menus[3].children = newChildren;
       }
     }
   }, {

package/lib/components/order-have-award/index.js

@@ -35,18 +35,6 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 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 _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."); }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
-function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
 var preCls = 'order-have-award';
 var isPerformance = ((_getTenantInfo = (0, _helpers.getTenantInfo)()) === null || _getTenantInfo === void 0 ? void 0 : _getTenantInfo.tenantType) == 2;
 var noshowChangeVersion = (0, _platform.isFeishu)(true) && isPerformance;
@@ -68,23 +56,9 @@ var OrderAward = function OrderAward() {
     }
 
     return _bookDemo["default"].DemoType.UniversalBookDemo;
-  }; // 记录点击位置，在鼠标抬起时判断是否移动过
-  // 如果移动了则阻止点击事件
-
-
-  var _useState = (0, _react.useState)({
-    x: 0,
-    y: 0
-  }),
-      _useState2 = _slicedToArray(_useState, 2),
-      downPosition = _useState2[0],
-      setDownPosition = _useState2[1];
+  };
 
   var handlePoint = function handlePoint(e) {
-    var clientX = e.clientX,
-        clientY = e.clientY;
-    if (Math.abs(downPosition.x - clientX) > 5 || Math.abs(downPosition.y - clientY) > 5) return;
-
     if (bookDemoRef.current) {
       bookDemoRef.current.show();
     }
@@ -99,20 +73,9 @@ var OrderAward = function OrderAward() {
   };
 
   if (noshowChangeVersion) return null;
-
-  var onMouseDownHandler = function onMouseDownHandler(e) {
-    var clientX = e.clientX,
-        clientY = e.clientY;
-    setDownPosition({
-      x: clientX,
-      y: clientY
-    });
-  };
-
   return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])('order-have-award'),
-    onMouseDown: onMouseDownHandler,
-    onMouseUp: handlePoint
+    onClick: handlePoint
   }, /*#__PURE__*/_react["default"].createElement("img", {
     className: (0, _classnames["default"])("".concat(preCls, "__img")),
     src: _award["default"],

package/lib/pages/aha2021/index.js

@@ -133,13 +133,19 @@ function PageLayout(props) {
   }, children), !isTencentHr && isTrial && /*#__PURE__*/_react["default"].createElement(_magnet["default"], {
     cacheKey: "award",
     className: (0, _classnames["default"])("".concat(preCls, "__award"))
-  }, /*#__PURE__*/_react["default"].createElement(_orderHaveAward["default"], null)), /*#__PURE__*/_react["default"].createElement(_newMenuSwitcher["default"], {
+  }, /*#__PURE__*/_react["default"].createElement(_orderHaveAward["default"], null)), /*#__PURE__*/_react["default"].createElement(_magnet["default"], {
+    cacheKey: "trial"
+  }, /*#__PURE__*/_react["default"].createElement(_newMenuSwitcher["default"], {
     isTrial: isTrial
-  }), isTrial && !isTencentHr && /*#__PURE__*/_react["default"].createElement("div", {
+  })), isTrial && !isTencentHr && /*#__PURE__*/_react["default"].createElement(_magnet["default"], {
+    cacheKey: "invite",
     className: "".concat(preCls, "__invite")
-  }, /*#__PURE__*/_react["default"].createElement(_invitePeople["default"], null)), !isTencentHr && /*#__PURE__*/_react["default"].createElement("div", {
+  }, /*#__PURE__*/_react["default"].createElement(_invitePeople["default"], null)), !isTencentHr && /*#__PURE__*/_react["default"].createElement(_magnet["default"], {
+    cacheKey: "help",
     className: (0, _classnames["default"])("".concat(preCls, "__help"))
-  }, /*#__PURE__*/_react["default"].createElement(_helpCard["default"], null)), isTencentHr && /*#__PURE__*/_react["default"].createElement(_hrMessage["default"], null), /*#__PURE__*/_react["default"].createElement(_errorBoundary["default"], {
+  }, /*#__PURE__*/_react["default"].createElement(_helpCard["default"], null)), isTencentHr && /*#__PURE__*/_react["default"].createElement(_magnet["default"], {
+    cacheKey: "message"
+  }, /*#__PURE__*/_react["default"].createElement(_hrMessage["default"], null)), /*#__PURE__*/_react["default"].createElement(_errorBoundary["default"], {
     errorLevel: _errorLevel["default"].P0,
     errorTag: "\u7533\u8BF7\u9884\u7EA6\u6F14\u793A\u5F02\u5E38"
   }, /*#__PURE__*/_react["default"].createElement(_bookDemo["default"].BookDemoPC, {

package/package.json

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