@titaui/pc 1.10.82-beta.4 → 1.10.82-beta.7

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/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/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%;

package/lib/components/okr-progress-modal/index.css

@@ -17,7 +17,7 @@
 
 .auto-update__item-progress-input {
   padding-right: 20px;
-  color: #3F4755 !important;
+  color: #3f4755 !important;
 }
 
 .auto-update__item-progress-input--error {
@@ -26,16 +26,17 @@
 }
 
 .auto-update__item-progress-input--disabled {
-  border-color: #E9ECF0 !important;
-  background: #f7f8fa !important;
+  border-color: #e9ecf0 !important;
+  background-color: #f7f8fa !important;
 }
 
 .auto-update__item-progress-input--disabled:hover {
-  border-color: #E9ECF0;
+  border-color: #e9ecf0;
 }
 
 .auto-update__item-progress-input--disabled input {
-  color: #A4ACB9 !important;
+  color: #bfc7d5 !important;
+  background-color: #f7f8fa !important;
 }
 
 .auto-update__item-progress-input__suffix {
@@ -49,7 +50,7 @@
 }
 
 .auto-update__item-progress-input__suffix--disabled {
-  color: #BFC7D5;
+  color: #bfc7d5;
   background: #f7f8fa;
 }
 
@@ -58,7 +59,7 @@
   height: 22px;
   margin-left: 10px;
   line-height: 22px;
-  color: #F6BD16;
+  color: #f6bd16;
   font-size: 13px;
 }
 
@@ -75,7 +76,7 @@
 .auto-update__recommand-tip {
   font-family: PingFangSC-Regular, PingFang SC;
   font-size: 13px;
-  color: #A4ACB9;
+  color: #a4acb9;
   margin-left: 10px;
 }
 
@@ -96,7 +97,7 @@
   width: 4px;
   height: 15px;
   border-radius: 2px;
-  background: linear-gradient(90deg, #4E90FF 0%, #2879FF 100%);
+  background: linear-gradient(90deg, #4e90ff 0%, #2879ff 100%);
   position: absolute;
   left: 0;
   top: 6px;
@@ -109,7 +110,7 @@
 .auto-update-setting__option {
   line-height: 22px;
   cursor: pointer;
-  color: #3F4755;
+  color: #3f4755;
 }
 
 .auto-update-setting__option div {
@@ -125,7 +126,7 @@
   width: 14px;
   height: 14px;
   border-radius: 50%;
-  border: 1px solid #E9ECF0;
+  border: 1px solid #e9ecf0;
   margin-right: 4px;
   vertical-align: text-top;
   line-height: 14px;
@@ -133,11 +134,11 @@
 }
 
 .auto-update-setting__radio:hover {
-  border-color: #2879FF;
+  border-color: #2879ff;
 }
 
 .auto-update-setting__radio--selected {
-  border-color: #2879FF;
+  border-color: #2879ff;
 }
 
 .auto-update-setting__radio--selected:before {
@@ -146,7 +147,7 @@
   width: 10px;
   height: 10px;
   border-radius: 50%;
-  background: #2879FF;
+  background: #2879ff;
 }
 
 .auto-update-setting__tips {
@@ -159,7 +160,7 @@
   position: absolute;
   right: 0;
   bottom: 0;
-  color: #2879FF;
+  color: #2879ff;
   font-family: PingFangSC-Regular, PingFang SC;
   cursor: pointer;
 }

package/lib/components/okrcase-library/okrcases-components/caseLibrary-main.js

@@ -13,27 +13,29 @@ var _essayComponent = _interopRequireDefault(require("../../grid-layout/essay-co
 
 var _helpers = require("../../../utils/helpers");
 
-var _getLocale = require("../../../utils/getLocale");
+var _openData = require("../../../utils/open-data");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
+var pencil = require("../image/\u7B14.svg");
+
 function CaseLibraryMain(props) {
   var onApplyTpl = props.onApplyTpl,
       cardList = props.cardList,
       isUnlock = props.isUnlock,
-      okrCasesNum = props.okrCasesNum,
       handleShowSubmitOkrWindow = props.handleShowSubmitOkrWindow,
       handleShowPayWindow = props.handleShowPayWindow,
       isfix = props.isfix,
       isLoading = props.isLoading,
       activeNavId = props.activeNavId,
-      onClose = props.onClose,
       asideHeightRef = props.asideHeightRef,
       fixAsideTopScroll = props.fixAsideTopScroll; // @ts-ignore
 
-  var DeadLine = BSGlobal.tenantAuthentication.DeadLine; // @ts-ignore
+  var DeadLine = window.BSGlobal.tenantAuthentication.DeadLine; // @ts-ignore
 
-  var Name = BSGlobal.loginUserInfo.Name;
+  var _window$BSGlobal$logi = window.BSGlobal.loginUserInfo,
+      Name = _window$BSGlobal$logi.Name,
+      Id = _window$BSGlobal$logi.Id;
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "okr-cases-library__mainContainer"
   }, /*#__PURE__*/_react["default"].createElement(_caseLibraryCardList["default"], {
@@ -60,18 +62,22 @@ function CaseLibraryMain(props) {
       return handleShowSubmitOkrWindow(true);
     }
   }, /*#__PURE__*/_react["default"].createElement("img", {
-    src: require("../image/\u7B14.svg")
+    src: pencil,
+    alt: "pencil"
   }), "\u63D0\u4EA4\u6211\u60F3\u8981\u7684OKR\u7C7B\u578B"), /*#__PURE__*/_react["default"].createElement("div", {
     className: "okr-cases-library__aside__submitWant__libraryNum"
   }, "\u5168\u56FD\u6700\u5927 OKR \u6848\u4F8B\u5E93", /*#__PURE__*/_react["default"].createElement("span", {
     style: {
       color: "#F05E5E"
     }
-  }, " ", okrCasesNum), " ", (0, _getLocale.getLocale)("OKR_MyO_E_Mumber"))), isUnlock ? /*#__PURE__*/_react["default"].createElement("div", {
+  }, " 1000+"), " ")), isUnlock ? /*#__PURE__*/_react["default"].createElement("div", {
     className: "okr-cases-library__aside__memberInfo"
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "okr-cases-library__aside__memberInfo__name"
-  }, Name, "\u7684", /*#__PURE__*/_react["default"].createElement("b", null, " VIP "), "\u4F1A\u5458"), /*#__PURE__*/_react["default"].createElement("p", {
+  }, /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
+    name: Name,
+    id: Id
+  }), "\u7684", /*#__PURE__*/_react["default"].createElement("b", null, " VIP "), "\u4F1A\u5458"), /*#__PURE__*/_react["default"].createElement("p", {
     className: "okr-cases-library__aside__memberInfo__deadLine"
   }, "\u6709\u6548\u65E5\u671F\u81F3\uFF1A", DeadLine)) : /*#__PURE__*/_react["default"].createElement("div", {
     className: "okr-cases-library__aside__advertise",

package/lib/components/superset-charts/components/chart/index.js

@@ -1,53 +1,25 @@
 "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 _fetchAssetsAndAppend = _interopRequireDefault(require("../../fetch-assets-and-append"));
+var _react = _interopRequireDefault(require("react"));
 
 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 _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 singletonFetchAssetsAndAppend = (0, _fetchAssetsAndAppend["default"])();
-
+// const singletonFetchAssetsAndAppend = SingletonFetchAssetsAndAppend();
 var Chart = function Chart(props) {
   var _window, _window$SupersetChart;
 
-  var _useState = (0, _react.useState)(false),
-      _useState2 = _slicedToArray(_useState, 2),
-      isInit = _useState2[0],
-      setIsInit = _useState2[1];
-
-  (0, _react.useEffect)(function () {
-    var _singletonFetchAssets;
-
-    (_singletonFetchAssets = singletonFetchAssetsAndAppend()) === null || _singletonFetchAssets === void 0 ? void 0 : _singletonFetchAssets.then(function () {
-      setIsInit(true);
-    });
-  }, []);
+  // useEffect(() => {
+  //   singletonFetchAssetsAndAppend()?.then(() => {
+  //     setIsInit(true);
+  //   });
+  // }, []);
   var Chart = (_window = window) === null || _window === void 0 ? void 0 : (_window$SupersetChart = _window.SupersetChart) === null || _window$SupersetChart === void 0 ? void 0 : _window$SupersetChart.SupersetChart;
-  return /*#__PURE__*/_react["default"].createElement("div", null, Chart && isInit && /*#__PURE__*/_react["default"].createElement(Chart, props));
+  return /*#__PURE__*/_react["default"].createElement("div", null, Chart && /*#__PURE__*/_react["default"].createElement(Chart, props));
 };
 
 var _default = Chart;

package/lib/components/superset-charts/fetch-assets-and-append/get-assets-with-cache.js

@@ -47,6 +47,10 @@ var fetchAssetsVersion = function fetchAssetsVersion() {
     },
     objectName: "superset_assets_version"
   }).then(function (res) {
+    if (!res.data) {
+      return [];
+    }
+
     return transMetasToTableData(res.data.list);
   });
 };
@@ -70,6 +74,10 @@ var fetchAssetsUri = function fetchAssetsUri(version) {
     },
     objectName: "superset_assets"
   }).then(function (res) {
+    if (!res.data) {
+      return [];
+    }
+
     sessionStorage.setItem("".concat(storageKey, "version"), JSON.stringify(transMetasToTableData(res.data.list)));
     return transMetasToTableData(res.data.list);
   });

package/lib/components/task-relation-modal/index.css

@@ -59,7 +59,7 @@
   width: 16px;
   height: 16px;
   border-radius: 8px;
-  border: 1px solid #e9ecf0;
+  border: 1px solid #bfc7d5;
   cursor: pointer;
 }
 
@@ -69,7 +69,7 @@
 }
 
 .titaui-task-relation__radio--checked:before {
-  content: "";
+  content: '';
   position: absolute;
   left: 50%;
   top: 50%;

package/lib/components/task-relation-modal/tree-node/category-node/index.css

@@ -40,3 +40,7 @@
 .rel-category-tree .rc-tree-treenode {
   overflow: unset !important;
 }
+
+.rel-category-tree .titaui-checkbox {
+  border: 1px solid #bfc7d5;
+}

package/lib/components/task-relation-modal/tree-node/kr-node/index.css

@@ -13,6 +13,10 @@
   top: 4px;
 }
 
+.rel-kr-node__checkbox .titaui-checkbox {
+  border: 1px solid #bfc7d5;
+}
+
 .rel-kr-node__pointer {
   position: absolute;
   top: -26px;

package/lib/components/task-relation-modal/tree-node/milestone-node/index.css

@@ -13,6 +13,10 @@
   top: 4px;
 }
 
+.rel-milestone-node__checkbox .titaui-checkbox {
+  border: 1px solid #bfc7d5;
+}
+
 .rel-milestone-node__pointer {
   position: absolute;
   top: -26px;

package/lib/components/task-relation-modal/tree-node/o-node/index.css

@@ -12,6 +12,10 @@
   top: 4px;
 }
 
+.rel-okr-node__checkbox .titaui-checkbox {
+  border: 1px solid #bfc7d5;
+}
+
 .rel-okr-node__name {
   flex: 1;
   cursor: pointer;

package/lib/components/task-relation-modal/tree-node/work-node/index.css

@@ -11,6 +11,10 @@
   top: 4px;
 }
 
+.rel-work-node__checkbox .titaui-checkbox {
+  border: 1px solid #bfc7d5;
+}
+
 .rel-work-node__name {
   flex: 1;
   cursor: pointer;

package/lib/components/wechat-btn/index.js

@@ -46,7 +46,8 @@ var preCls = 'titaui-wechat-btn';
 var WeChatBtn = function WeChatBtn(props) {
   var id = props.id,
       objType = props.objType,
-      name = props.name;
+      name = props.name,
+      principalUserId = props.principalUserId;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -83,7 +84,7 @@ var WeChatBtn = function WeChatBtn(props) {
       tooltip = _useState14[0],
       setTooltip = _useState14[1];
 
-  var _useState15 = (0, _react.useState)("目标"),
+  var _useState15 = (0, _react.useState)('目标'),
       _useState16 = _slicedToArray(_useState15, 2),
       apply = _useState16[0],
       setApply = _useState16[1];
@@ -93,7 +94,23 @@ var WeChatBtn = function WeChatBtn(props) {
       isHasGroup = _useState18[0],
       setIsHasGroup = _useState18[1];
 
+  var _useState19 = (0, _react.useState)(false),
+      _useState20 = _slicedToArray(_useState19, 2),
+      macWarnModalVisible = _useState20[0],
+      setMacWarnModalVisible = _useState20[1];
+
+  var _useState21 = (0, _react.useState)(false),
+      _useState22 = _slicedToArray(_useState21, 2),
+      principalUserModalVisible = _useState22[0],
+      setPrincipalUserModalVisible = _useState22[1];
+
+  var _useState23 = (0, _react.useState)(false),
+      _useState24 = _slicedToArray(_useState23, 2),
+      memberVisible = _useState24[0],
+      setMemberVisible = _useState24[1];
+
   var isWx = navigator.userAgent.match(/wxwork/);
+  var isMac = navigator.userAgent.match(/Mac/);
 
   var handleClickWechatBtn = function handleClickWechatBtn() {
     if (isWx) {
@@ -103,10 +120,24 @@ var WeChatBtn = function WeChatBtn(props) {
           chatId: chatId
         }, function (res) {
           if (res.err_msg === 'openExistedChatWithMsg:fail_fail_Invalid_chatId') {
-            wx.invoke('updateEnterpriseChat', {
-              chatId: chatId,
-              userIdsToAdd: loginUserOpenId
-            });
+            if (isMac) {
+              setMacWarnModalVisible(true);
+            } else {
+              wx.invoke('updateEnterpriseChat', {
+                chatId: chatId,
+                userIdsToAdd: loginUserOpenId
+              }, function (res) {
+                if (res.err_msg == 'updateEnterpriseChat:ok') {
+                  console.log('加入成功');
+                } else {
+                  if (loginUserOpenId == principalUserId) {
+                    setPrincipalUserModalVisible(true);
+                  } else {
+                    setMemberVisible(true);
+                  }
+                }
+              });
+            }
           }
         });
       } else {
@@ -148,6 +179,18 @@ var WeChatBtn = function WeChatBtn(props) {
       }
     });
     setCreateWechatVisible(false);
+  };
+
+  var handleKnowMacWarn = function handleKnowMacWarn() {
+    setMacWarnModalVisible(false);
+  };
+
+  var closeprincipalUserModal = function closeprincipalUserModal() {
+    setPrincipalUserModalVisible(false);
+  };
+
+  var handleMemberVisible = function handleMemberVisible() {
+    setMemberVisible(false);
   }; //chatId 为null表示未创建群聊 chatId为默认值chatId表示不是企业微信工作台，可能是其他浏览器等 chatId有值，表示创建了群聊
 
 
@@ -199,16 +242,16 @@ var WeChatBtn = function WeChatBtn(props) {
   }, [chatId, isShowWeChat]);
   (0, _react.useEffect)(function () {
     if (objType === 62) {
-      setApply("目标");
+      setApply('目标');
     } else {
-      setApply("任务");
+      setApply('任务');
     }
   }, []);
   return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
     overlay: tooltip,
     placement: "bottom"
   }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: (0, _classnames["default"])(preCls, 'tu-icon-qw-chat', _defineProperty({}, "".concat(preCls, "__chat"), isHasGroup)),
+    className: (0, _classnames["default"])(preCls, _defineProperty({}, "".concat(preCls, "__chat"), isHasGroup), _defineProperty({}, 'tu-icon-qw-chat', isShowWeChat)),
     onMouseDown: handleClickWechatBtn
   })), /*#__PURE__*/_react["default"].createElement(_dialogConfirm["default"], {
     zIndex: 1200,
@@ -224,7 +267,43 @@ var WeChatBtn = function WeChatBtn(props) {
   }, "\u53D6\u6D88"), /*#__PURE__*/_react["default"].createElement(_dialogConfirm.SureButton, {
     type: "button",
     onClick: handleCreateGroupChat
-  }, "\u53D1\u8D77\u7FA4\u804A")));
+  }, "\u53D1\u8D77\u7FA4\u804A")), /*#__PURE__*/_react["default"].createElement(_dialogConfirm["default"], {
+    zIndex: 1200,
+    visible: macWarnModalVisible,
+    type: "warning"
+  }, /*#__PURE__*/_react["default"].createElement("span", {
+    type: "title"
+  }, "\u8BF7\u6CE8\u610F"), /*#__PURE__*/_react["default"].createElement("span", {
+    type: "content"
+  }, "\u8BE5\u4F01\u4E1A\u5FAE\u4FE1\u7248\u672C\u4E0D\u652F\u6301\u81EA\u52A8\u52A0\u5165\uFF0C\u8BF7\u8054\u7CFB".concat(apply, "\u8D1F\u8D23\u4EBA\u624B\u52A8\u52A0\u4F60\u5165\u7FA4")), /*#__PURE__*/_react["default"].createElement(_dialogConfirm.SureButton, {
+    type: "button",
+    onClick: handleKnowMacWarn
+  }, "\u6211\u77E5\u9053\u4E86")), /*#__PURE__*/_react["default"].createElement(_dialogConfirm["default"], {
+    zIndex: 1200,
+    visible: principalUserModalVisible,
+    type: "warning"
+  }, /*#__PURE__*/_react["default"].createElement("span", {
+    type: "title"
+  }, "\u8BF7\u6CE8\u610F"), /*#__PURE__*/_react["default"].createElement("span", {
+    type: "content"
+  }, "\u4F60\u5DF2\u9000\u7FA4\u6216\u8BE5\u7FA4\u5DF2\u89E3\u6563\u3002\u53EF\u4EE5\u8054\u7CFB".concat(apply, "\u6210\u5458\u62C9\u4F60\u5165\u7FA4\u3002\u4F60\u4E5F\u53EF\u4EE5\u91CD\u65B0\u5EFA\u7FA4\u3002")), /*#__PURE__*/_react["default"].createElement(_dialogConfirm.CancelButton, {
+    type: "button",
+    onClick: closeprincipalUserModal
+  }, "\u53D6\u6D88"), /*#__PURE__*/_react["default"].createElement(_dialogConfirm.SureButton, {
+    type: "button",
+    onClick: handleCreateGroupChat
+  }, "\u53D1\u8D77\u7FA4\u804A")), /*#__PURE__*/_react["default"].createElement(_dialogConfirm["default"], {
+    zIndex: 1200,
+    visible: memberVisible,
+    type: "warning"
+  }, /*#__PURE__*/_react["default"].createElement("span", {
+    type: "title"
+  }, "\u8BF7\u6CE8\u610F"), /*#__PURE__*/_react["default"].createElement("span", {
+    type: "content"
+  }, "\u4F60\u5DF2\u9000\u7FA4\u6216\u8BE5\u7FA4\u5DF2\u89E3\u6563\u3002\u53EF\u4EE5\u8054\u7CFB".concat(apply, "\u6210\u5458\u62C9\u4F60\u5165\u7FA4\u3002")), /*#__PURE__*/_react["default"].createElement(_dialogConfirm.SureButton, {
+    type: "button",
+    onClick: handleMemberVisible
+  }, "\u6211\u77E5\u9053\u4E86")));
 };
 
 var _default = WeChatBtn;

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

@@ -156,12 +156,18 @@ var NewOkrList = function NewOkrList(props) {
       setQuery = _useState12[1];
 
   var okrsRef = (0, _react.useRef)(okrs);
-  var headerRef = (0, _react.useRef)();
 
   var _useState13 = (0, _react.useState)(false),
       _useState14 = _slicedToArray(_useState13, 2),
-      casesVisible = _useState14[0],
-      setCasesVisible = _useState14[1];
+      isInit = _useState14[0],
+      setIsInit = _useState14[1];
+
+  var headerRef = (0, _react.useRef)();
+
+  var _useState15 = (0, _react.useState)(false),
+      _useState16 = _slicedToArray(_useState15, 2),
+      casesVisible = _useState16[0],
+      setCasesVisible = _useState16[1];
 
   var routerData = (0, _tools.getQueryString)();
   var departmentName = routerData.departmentName,
@@ -179,11 +185,22 @@ var NewOkrList = function NewOkrList(props) {
   (0, _react.useEffect)(function () {
     setPageNum(1);
   }, [relation, toUserId, departmentId, query]);
+
+  var handleOnSearch = function handleOnSearch(params) {
+    setQuery(_objectSpread(_objectSpread({}, query), params));
+    setPageNum(1);
+  };
+
   (0, _react.useEffect)(function () {
-    handleOnSearch({
-      keyWords: ""
-    });
-  }, [relation, toUserId, departmentId]); // 记录访问者数据
+    if (isInit) {
+      handleOnSearch({
+        keyWords: ""
+      });
+    }
+  }, [relation, toUserId, departmentId]);
+  (0, _react.useEffect)(function () {
+    setIsInit(true);
+  }, []); // 记录访问者数据
 
   var recordVisitUser = function recordVisitUser() {
     if (toUserId) {
@@ -232,12 +249,6 @@ var NewOkrList = function NewOkrList(props) {
     setPageSize(nowPageSize);
   };
 
-  var handleOnSearch = function handleOnSearch(params) {
-    setQuery(_objectSpread(_objectSpread(_objectSpread({}, query), params), {}, {
-      pageNum: 1
-    }));
-  };
-
   var onFrontAddOKR = function onFrontAddOKR(data) {
     setOkrs([data].concat(_toConsumableArray(okrsRef.current || [])));
   };
@@ -301,7 +312,7 @@ var NewOkrList = function NewOkrList(props) {
 
   (0, _react.useEffect)(function () {
     getOkrs();
-  }, [pageNum, pageSize, query, relation, toUserId, departmentId]);
+  }, [pageNum, pageSize, query]);
   return /*#__PURE__*/_react["default"].createElement(_context.Context.Provider, {
     value: _objectSpread({
       OkrCommunicationPush: OkrCommunicationPush,

package/package.json

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