@titaui/pc 1.16.30-beta.1 → 1.16.30-beta.2

package/lib/components/change-okr-modal/index.js

@@ -577,8 +577,7 @@ var _initialiseProps = function _initialiseProps() {
                   data: isRefresh ? resData : [].concat(_toConsumableArray(data), _toConsumableArray(resData)),
                   isEnd: res.Data.nextPage === 0
                 }, function () {
-                  console.log(_this4.state.data);
-
+                  // console.log(this.state.data)
                   if (isRefresh) {
                     _this4.scollListToTop();
                   }

package/lib/components/create-okr-modal/index.js

@@ -219,7 +219,13 @@ function CreateOkrModal(_ref, ref) {
       setOkrClassify = _useState20[1]; // 目标类别
 
 
-  var _useState21 = (0, _react.useState)(2),
+  var _useState21 = (0, _react.useState)(function () {
+    if (window.BSGlobal.tenantInfo.isOpenInfo) {
+      return 1;
+    } else {
+      return 2;
+    }
+  }),
       _useState22 = _slicedToArray(_useState21, 2),
       visibility = _useState22[0],
       setVisibility = _useState22[1]; // 可见性
@@ -678,7 +684,13 @@ function CreateOkrModal(_ref, ref) {
       });
       setCycle(cycle);
       setOkrClassify(undefined);
-      setVisibility(2);
+
+      if (window.BSGlobal.tenantInfo.isOpenInfo) {
+        setVisibility(1);
+      } else {
+        setVisibility(2);
+      }
+
       setParent({
         parentWorkId: 0,
         parentWorkName: '',
@@ -855,7 +867,7 @@ function CreateOkrModal(_ref, ref) {
     if (!isVisible) return; // @ts-ignore
 
     (0, _requestApi.getImageBase64ByUrl)(user.id).then(function (data) {
-      console.log(data);
+      // console.log(data)
       setUserAvatarBase64Url(data.Data.obj);
     })["catch"](function (err) {
       _toast["default"].Error(err);

package/lib/components/keyword-search/index.css

@@ -4,7 +4,7 @@
   padding: 8px;
   border-radius: 18px;
   box-shadow: 0px 0px 8px 0px rgba(127, 145, 180, 0.1);
-  transition: all 0.3s cubic-bezier(0.17, 0.63, 0.32, 1.27);
+  transition: all 0.4s cubic-bezier(0.17, 0.63, 0.32, 1.27);
   background-color: #ffffff;
   box-sizing: border-box;
   display: flex;
@@ -12,13 +12,13 @@
   position: relative;
 }
 
-.titaui-keyword-search--active {
+.titaui-keyword-search--activated {
   width: 190px;
   border: none;
   box-shadow: 0px 0px 8px 0px rgba(127, 145, 180, 0.1);
 }
 
-.titaui-keyword-search--active .titaui-keyword-search__input {
+.titaui-keyword-search--activated .titaui-keyword-search__input {
   opacity: 1;
   visibility: visible;
 }

package/lib/components/keyword-search/index.js

@@ -39,13 +39,15 @@ var precls = 'titaui-keyword-search';
 
 function KeywordSearch(props) {
   var onSearch = props.onSearch,
+      _props$placeholder = props.placeholder,
+      placeholder = _props$placeholder === void 0 ? (0, _getLocale.getLocale)('Mod_Enterkeywords') : _props$placeholder,
       _props$value = props.value,
       value = _props$value === void 0 ? '' : _props$value;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
-      active = _useState2[0],
-      setActive = _useState2[1];
+      activated = _useState2[0],
+      setActivated = _useState2[1];
 
   var _useState3 = (0, _react.useState)(''),
       _useState4 = _slicedToArray(_useState3, 2),
@@ -54,80 +56,87 @@ function KeywordSearch(props) {
 
   var _useState5 = (0, _react.useState)(false),
       _useState6 = _slicedToArray(_useState5, 2),
-      searched = _useState6[0],
-      setSearched = _useState6[1];
+      searchWhenClear = _useState6[0],
+      setSearchWhenClear = _useState6[1];
 
   var inputRef = (0, _react.useRef)();
   var timerRef = (0, _react.useRef)();
 
+  var focus = function focus() {
+    clearTimeout(timerRef.current);
+    timerRef.current = setTimeout(function () {
+      var _inputRef$current;
+
+      inputRef === null || inputRef === void 0 ? void 0 : (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : _inputRef$current.focus();
+    });
+  };
+
   var handleSearch = function handleSearch() {
-    setSearched(true);
+    setSearchWhenClear(!!keyword);
     onSearch === null || onSearch === void 0 ? void 0 : onSearch({
       keyWords: keyword
     });
   };
 
-  var handleSearchClick = function handleSearchClick() {
-    if (!active) {
-      setActive(true);
-      timerRef.current = setTimeout(function () {
-        var _inputRef$current;
+  var handleClearKeyword = function handleClearKeyword() {
+    focus();
+    setKeyword('');
 
-        clearTimeout(timerRef.current);
-        inputRef === null || inputRef === void 0 ? void 0 : (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : _inputRef$current.focus();
+    if (searchWhenClear || value) {
+      onSearch === null || onSearch === void 0 ? void 0 : onSearch({
+        keyWords: ''
       });
-    } else {
-      handleSearch();
+      setSearchWhenClear(false);
     }
   };
 
-  var handleOnBlur = function handleOnBlur() {
-    if (!keyword.length) setActive(false);
-    clearTimeout(timerRef.current);
-  };
-
-  var changeValue = function changeValue(e) {
-    return setKeyword(e.target.value);
-  };
+  var handleSearchClick = function handleSearchClick() {
+    setActivated(true);
+    focus();
 
-  var handleOnKeyDown = function handleOnKeyDown(e) {
-    if (e.keyCode === 13) {
+    if (activated && keyword || searchWhenClear) {
       handleSearch();
     }
   };
 
-  var clearKeyword = function clearKeyword() {
-    var _inputRef$current2;
+  var onBlurHandler = function onBlurHandler() {
+    if (keyword.length) return;
+    clearTimeout(timerRef.current);
+    timerRef.current = setTimeout(function () {
+      setActivated(false);
+    }, 300);
+  };
 
-    setKeyword('');
-    inputRef === null || inputRef === void 0 ? void 0 : (_inputRef$current2 = inputRef.current) === null || _inputRef$current2 === void 0 ? void 0 : _inputRef$current2.focus();
+  var onChangeHandler = function onChangeHandler(e) {
+    return setKeyword(e.target.value);
+  };
 
-    if (searched || value) {
-      onSearch === null || onSearch === void 0 ? void 0 : onSearch({
-        keyWords: ''
-      });
-      setSearched(false);
-    }
+  var onKeyDownHandler = function onKeyDownHandler(e) {
+    if (e.keyCode !== 13) return;
+    handleSearch();
   };
 
   (0, _react.useEffect)(function () {
     setKeyword(value);
-    setActive(!!value);
-  }, [value]);
+    setActivated(!!value);
+    return function () {
+      return clearTimeout(timerRef.current);
+    };
+  }, []);
   return /*#__PURE__*/_react["default"].createElement("div", {
-    className: (0, _classnames3["default"])(precls, _defineProperty({}, "".concat(precls, "--active"), active))
+    className: (0, _classnames3["default"])(precls, _defineProperty({}, "".concat(precls, "--activated"), activated))
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(precls, "__input")
   }, /*#__PURE__*/_react["default"].createElement("input", {
-    onBlur: handleOnBlur,
-    onChange: changeValue,
-    onKeyUp: handleOnKeyDown,
-    placeholder: (0, _getLocale.getLocale)('Mod_Enterkeywords'),
+    onBlur: onBlurHandler,
+    onChange: onChangeHandler,
+    onKeyUp: onKeyDownHandler,
+    placeholder: placeholder,
     ref: inputRef,
     value: keyword
   })), /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames3["default"])('tu-icon-cross', "".concat(precls, "__del-icon"), _defineProperty({}, "".concat(precls, "__del-icon--visible"), !!keyword)),
-    onClick: clearKeyword
+    onClick: handleClearKeyword
   }), /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames3["default"])('tu-icon-search', "".concat(precls, "__search-icon")),
     onClick: handleSearchClick

package/lib/components/menus/export-modules/skynet-dashboard-menu/index.js

@@ -48,7 +48,9 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function SurveyMenus(props) {
   var _props$onSelect = props.onSelect,
       onSelect = _props$onSelect === void 0 ? function () {} : _props$onSelect,
-      history = props.history;
+      history = props.history,
+      _props$defaultMenus = props.defaultMenus,
+      defaultMenus = _props$defaultMenus === void 0 ? [] : _props$defaultMenus;
 
   var _useState = (0, _react.useState)({}),
       _useState2 = _slicedToArray(_useState, 2),
@@ -108,7 +110,8 @@ function SurveyMenus(props) {
   }, /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_surveyFrontMenus["default"], {
     ref: surveyFrontMenu,
     onSelect: onSelect,
-    history: history
+    history: history,
+    defaultMenus: defaultMenus
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("tita-bootstrap__scrollbar")
   }))));

package/lib/components/menus/export-modules/skynet-dashboard-menu/menus.js

@@ -29,14 +29,19 @@ var surveyMenus = /*#__PURE__*/function () {
   function surveyMenus(props) {
     _classCallCheck(this, surveyMenus);
 
-    this.menus = [{
-      icon: 'survey-involved',
-      label: '活跃度统计',
-      key: PAGE_SURVEY_MY_INVOLVED,
-      type: _index.MENU_ITEM_NOE,
-      href: '#/skynet-dashboard',
-      isShow: true
-    }];
+    // this.menus = [
+    //   {
+    //     icon: 'survey-involved',
+    //     label: '活跃度统计',
+    //     key: PAGE_SURVEY_MY_INVOLVED,
+    //     type: MENU_ITEM_NOE,
+    //     href: '#/skynet-dashboard',
+    //     isShow: true,
+    //   },
+    // ]
+    var _props$defaultMenus = props.defaultMenus,
+        defaultMenus = _props$defaultMenus === void 0 ? [] : _props$defaultMenus;
+    this.menus = defaultMenus;
   }
 
   _createClass(surveyMenus, [{

package/lib/components/menus/export-modules/skynet-dashboard-menu/survey-front-menus.js

@@ -19,8 +19,6 @@ var _menus = _interopRequireWildcard(require("./menus"));
 
 var _menuHighlight = _interopRequireDefault(require("./menu-highlight"));
 
-var _auth = require("../../../../utils/auth");
-
 require("../../index.css");
 
 require("./index.css");
@@ -48,9 +46,9 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var _props$onSelect = props.onSelect,
       onSelect = _props$onSelect === void 0 ? function () {} : _props$onSelect,
-      history = props.history;
-  var baseAuth = new _auth.BaseAuth();
-  var isShowSurveyManage = baseAuth.isBoss() || baseAuth.isSurveyManager();
+      history = props.history,
+      _props$defaultMenus = props.defaultMenus,
+      defaultMenus = _props$defaultMenus === void 0 ? [] : _props$defaultMenus;
 
   var _useState = (0, _react.useState)(function () {
     return document.body.offsetHeight - 198;
@@ -77,7 +75,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
   var _useState7 = (0, _react.useState)(function () {
     surveyMenusData.current = new _menus["default"]({
-      isShowSurveyManage: isShowSurveyManage
+      defaultMenus: defaultMenus
     });
     return surveyMenusData.current.getMenus();
   }),
@@ -93,22 +91,24 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     });
     var pathname = history.location.pathname;
     var firstMenuHref = menus[0].data.href;
-    if (firstMenuHref.split('#')[1] === pathname) return; //当前路由与二级菜单第一项相同时直接return
+    if (firstMenuHref.split('#')[1] === pathname) return; // 当前路由与二级菜单第一项相同时直接return
 
     var menusHrefArr = ['/survey/manage', '/survey/my-involved'];
     var isIncludeMenu = menusHrefArr.find(function (item) {
-      //表示当前路由是否是左侧二级菜单的选项
-      return item.includes(pathname);
+      return (// 表示当前路由是否是左侧二级菜单的选项
+        item.includes(pathname)
+      );
     });
-    if (!isIncludeMenu) return; //如果不是二级菜单选项直接return
+    if (!isIncludeMenu) return; // 如果不是二级菜单选项直接return
 
     var isShowMenuItem = menus.find(function (item) {
-      //判断当前路由是否有权限被展示
-      return item.data.href.split('#')[1].includes(pathname);
+      return (// 判断当前路由是否有权限被展示
+        item.data.href.split('#')[1].includes(pathname)
+      );
     });
 
     if (!isShowMenuItem) {
-      //如果当前路由没有权限展示的话，则跳转到有权限二级路由的第一项
+      // 如果当前路由没有权限展示的话，则跳转到有权限二级路由的第一项
       window.location.href = firstMenuHref;
     }
   }, [history.location.pathname, history.location.search]);
@@ -122,9 +122,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     var node = _ref.node;
     onSelect(node); // 处理菜单选中
 
-    if (!selectedKyes.length) {
-      return;
-    } else {
+    if (!selectedKyes.length) {} else {
       setSelectedMenuKeys(selectedKyes);
     }
   };

package/lib/components/okr-detail/e-list/search-form/fields/e-status.js

@@ -89,7 +89,7 @@ function _default(props) {
     name: "doing"
   }, (0, _getLocale.getLocale)("Per_MyRe_text_Inprogress")), /*#__PURE__*/_react["default"].createElement(_dropSelector.Item, {
     name: "finish"
-  }, (0, _getLocale.getLocale)("OKR_MyO_Butt_Hasended")), /*#__PURE__*/_react["default"].createElement(_dropSelector.Item, {
+  }, (0, _getLocale.getLocale)("OKR_MyO_E_From_Completed")), /*#__PURE__*/_react["default"].createElement(_dropSelector.Item, {
     name: "delay"
   }, (0, _getLocale.getLocale)("OKR_MyO_E_From_Delayed")), /*#__PURE__*/_react["default"].createElement(_dropSelector.Item, {
     name: "cancel"

package/lib/components/okr-review/ReviewPop/components/ReviewBody/index.js

@@ -269,9 +269,8 @@ var ReviewBody = /*#__PURE__*/function (_PureComponent) {
     };
 
     _this._handlerStandardModeProblemChange = function (value) {
-      var data = _objectSpread({}, _this.state.data);
+      var data = _objectSpread({}, _this.state.data); // console.log(htmlEncodeByRegExp(value))
 
-      console.log((0, _mblog.htmlEncodeByRegExp)(value));
 
       _this._updateReviewData(data, "Drawback", value);
     };
@@ -603,8 +602,8 @@ var ReviewBody = /*#__PURE__*/function (_PureComponent) {
       var screenHeight = window.screen.height;
       var _this$props2 = this.props,
           ObjData = _this$props2.ObjData,
-          EditType = _this$props2.EditType;
-      console.log(ObjData);
+          EditType = _this$props2.EditType; // console.log(ObjData);
+
       var _this$state = this.state,
           data = _this$state.data,
           popContainer = _this$state.popContainer;

package/lib/components/okr-review/components/ReviewItem/index.js

@@ -61,7 +61,7 @@ var ReviewItem = /*#__PURE__*/function (_PureComponent) {
           editReview = _this$props.editReview,
           reviewItemData = _this$props.reviewItemData,
           editAble = _this$props.editAble;
-      var href = "".concat(location.pathname, "#okr/reviewDetail?okrId=8077&back=").concat(location.hash, "&replayId=").concat(reviewItemData.replayId, "&feedId=").concat(feedId, "&krIndex=").concat(krIndex, "&editAble=").concat(editAble);
+      var href = "".concat(location.pathname, "#okr/reviewDetail?okrId=8077&back=''&replayId=").concat(reviewItemData.replayId, "&feedId=").concat(feedId, "&krIndex=").concat(krIndex, "&editAble=").concat(editAble);
       return /*#__PURE__*/_react["default"].createElement(_style.ReviewItemContainer, {
         className: className,
         mode: isCompactMode ? 0 : 1

package/lib/components/okr-review/index.js

@@ -210,7 +210,7 @@ var Review = /*#__PURE__*/function (_PureComponent) {
         mode: isCompactMode ? 0 : 1
       }), /*#__PURE__*/_react["default"].createElement("span", null, (0, _getLocale.getLocale)("OKR_MyO_KRP_Pop_Understandt"))))) : /*#__PURE__*/_react["default"].createElement(_style.ReviewList, null, reviewList.map(function (item, index) {
         return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, {
-          key: index
+          key: feedId
         }, /*#__PURE__*/_react["default"].createElement(_ReviewItem["default"], {
           isCompactMode: isCompactMode,
           feedId: feedId,

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

@@ -80,8 +80,6 @@ function PeriodSelector(_ref) {
       buttonClass = _ref$buttonClass === void 0 ? '' : _ref$buttonClass,
       _ref$noBorder = _ref.noBorder,
       noBorder = _ref$noBorder === void 0 ? false : _ref$noBorder,
-      _ref$needInitPeriod = _ref.needInitPeriod,
-      needInitPeriod = _ref$needInitPeriod === void 0 ? true : _ref$needInitPeriod,
       onPopupVisibleChange = _ref.onPopupVisibleChange;
 
   var _useState = (0, _react.useState)({
@@ -148,7 +146,7 @@ function PeriodSelector(_ref) {
       });
     } else if (selected) {
       setSelectedPeriod(selected);
-    } else if (needInitPeriod) {
+    } else {
       setSelectedPeriod((0, _common.getDefalutCycle)(cycleSetting));
       onChange === null || onChange === void 0 ? void 0 : onChange((0, _common.getDefalutCycle)(cycleSetting));
     }

package/lib/components/search-input/index.js

@@ -51,8 +51,8 @@ var SearchInput = function SearchInput(props) {
 
   var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
-      searched = _useState2[0],
-      setSearched = _useState2[1];
+      searchWhenClear = _useState2[0],
+      setSearchWhenClear = _useState2[1];
 
   var _useState3 = (0, _react.useState)(''),
       _useState4 = _slicedToArray(_useState3, 2),
@@ -77,8 +77,9 @@ var SearchInput = function SearchInput(props) {
   };
 
   var handleSearch = function handleSearch() {
-    setSearched(true);
-    onSearch === null || onSearch === void 0 ? void 0 : onSearch(value === null || value === void 0 ? void 0 : value.trim());
+    var searchKey = value === null || value === void 0 ? void 0 : value.trim();
+    setSearchWhenClear(!!searchKey);
+    onSearch === null || onSearch === void 0 ? void 0 : onSearch(searchKey);
   };
 
   var handleKeyPress = function handleKeyPress(e) {
@@ -92,7 +93,7 @@ var SearchInput = function SearchInput(props) {
     setSearchKey === null || setSearchKey === void 0 ? void 0 : setSearchKey('');
     inputRef.current.focus();
 
-    if (propsValue || searched) {
+    if (propsValue || searchWhenClear) {
       onSearch === null || onSearch === void 0 ? void 0 : onSearch('');
     }
   };

package/lib/components-v1/textarea/index.js

@@ -11,8 +11,6 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _i18nFrontTranslate = require("../../utils/i18n-front-translate");
 
-var _mblog = require("../../utils/mblog");
-
 var _style = require("./style");
 
 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); }
@@ -149,7 +147,6 @@ var TextareaView = /*#__PURE__*/function (_PureComponent) {
           isFocus = _this$state.isFocus,
           isHasPlaceholder = _this$state.isHasPlaceholder;
       var valueLen = value.length;
-      console.log(123, (0, _mblog.htmlDecodeByRegExp)(value));
       return /*#__PURE__*/_react["default"].createElement(_style.TextareaWrapper, {
         className: className,
         style: style

package/package.json

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