@titaui/pc 1.16.93-beta.2 → 1.16.93-beta.4

package/lib/components/menus/components/menu-tree/tree-node/assess-manage.js

@@ -8,9 +8,9 @@ var _react = _interopRequireDefault(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _bsGlobal = require("../../../../../utils/bs-global");
 var _guideTip = _interopRequireDefault(require("../../../../guide-tip"));
+var _useLocalStorage3 = _interopRequireDefault(require("../../../../../hooks/useLocalStorage"));
 var _precls = _interopRequireDefault(require("../precls"));
 require("./index.css");
-var _useLocalStorage3 = _interopRequireDefault(require("&/hooks/useLocalStorage"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 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."); }

package/lib/components/menus/components/search-colleague/index.css

@@ -19,7 +19,7 @@
 }
 
 .titaui-menus__search-input-inner--active {
-  border-color: #2879FF;
+  border-color: #2879ff;
 }
 
 .titaui-menus__search-input-inner .tu-icon-search {
@@ -57,3 +57,23 @@
         /* Internet Explorer 10+ */
   color: #bfc7d5;
 }
+
+.titaui-menus__search-user {
+  display: inline-block;
+  vertical-align: middle;
+  width: calc(100% - 8px);
+  height: 22px;
+  line-height: 24px;
+  text-align: left;
+}
+
+.titaui-menus__search-user > span {
+  width: 100%;
+  overflow: hidden;
+}
+
+.titaui-menus__search-user-tips {
+  display: inline-block;
+  width: 100%;
+  color: #bfc7d5;
+}

package/lib/components/menus/components/search-colleague/index.js

@@ -10,12 +10,12 @@ var _classnames = _interopRequireDefault(require("classnames"));
 var Bowser = _interopRequireWildcard(require("bowser"));
 var _i18n = require("../../i18n");
 var _userSelector = _interopRequireDefault(require("../../../user-selector"));
+var _openData = require("../../../../utils/open-data");
 var _precls = _interopRequireDefault(require("../../precls"));
 require("./index.css");
 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 _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 _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); }
@@ -27,22 +27,18 @@ function _default(props) {
     placeholder = _props$placeholder === void 0 ? window.getLocale && window.getLocale(_i18n.locale.input_search_user) || _i18n.locale.input_search_user : _props$placeholder,
     onSelect = props.onSelect;
   var selectorRef = (0, _react.useRef)();
-  var _useState = (0, _react.useState)(""),
+  var _useState = (0, _react.useState)(),
     _useState2 = _slicedToArray(_useState, 2),
-    searchVal = _useState2[0],
-    setSearchVal = _useState2[1];
-  var _useState3 = (0, _react.useState)(false),
-    _useState4 = _slicedToArray(_useState3, 2),
-    isActive = _useState4[0],
-    setIsActive = _useState4[1];
-  var _useState5 = (0, _react.useState)(function () {
+    selectUser = _useState2[0],
+    setSelectUser = _useState2[1];
+  var _useState3 = (0, _react.useState)(function () {
       try {
         var browser = Bowser.getParser(window.navigator.userAgent);
         var browserInfo = browser.getBrowser();
         var name = browserInfo.name;
         if (
         // safari 浏览器上兼容选人组件下拉的位置
-        (name || "").toLowerCase() == "wechat" || (name || "").toLowerCase() == "safari") {
+        (name || '').toLowerCase() == 'wechat' || (name || '').toLowerCase() == 'safari') {
           return [140, 2];
         }
         return [62, 2];
@@ -51,57 +47,44 @@ function _default(props) {
         return [62, 2];
       }
     }),
-    _useState6 = _slicedToArray(_useState5, 1),
-    userSelectOffset = _useState6[0];
-  var handleInputChange = function handleInputChange(e) {
-    setSearchVal(e.target.value);
-    selectorRef.current && selectorRef.current.open();
-  };
+    _useState4 = _slicedToArray(_useState3, 1),
+    userSelectOffset = _useState4[0];
   var handleSelected = function handleSelected(_ref) {
     var _ref2 = _slicedToArray(_ref, 1),
       user = _ref2[0];
-    setSearchVal(user.title);
+    setSelectUser(user.data);
     onSelect(user);
   };
-  var onInputFocusHandler = function onInputFocusHandler(e) {
-    e.stopPropagation();
-    setIsActive(true);
-  };
-  var onInputBlurHandler = function onInputBlurHandler(e) {
-    e.stopPropagation();
-    setIsActive(false);
-  };
   return /*#__PURE__*/_react["default"].createElement("div", {
-    className: (0, _classnames["default"])("".concat(_precls["default"], "__search-input"), "noselect")
+    className: (0, _classnames["default"])("".concat(_precls["default"], "__search-input"), 'noselect')
   }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: (0, _classnames["default"])("".concat(_precls["default"], "__search-input-inner"), _defineProperty({}, "".concat(_precls["default"], "__search-input-inner--active"), isActive))
+    className: "".concat(_precls["default"], "__search-input-inner")
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "tu-icon-search"
-  }), /*#__PURE__*/_react["default"].createElement("input", {
-    placeholder: placeholder,
-    onChange: handleInputChange,
-    onFocus: onInputFocusHandler,
-    onBlur: onInputBlurHandler,
-    value: searchVal
-  })), /*#__PURE__*/_react["default"].createElement(_userSelector["default"], {
+  }), /*#__PURE__*/_react["default"].createElement("span", {
+    className: "".concat(_precls["default"], "__search-user")
+  }, /*#__PURE__*/_react["default"].createElement(_userSelector["default"], {
     ref: selectorRef,
     multiple: false,
     position: "bottom",
     onSelect: handleSelected,
     disabledDepartSelect: true,
-    showSearchInput: false,
+    panes: {
+      depart: true
+    },
     searchedPanes: {
       user: true,
       depart: false,
       group: false
     },
-    searchWord: searchVal,
-    trigger: /*#__PURE__*/_react["default"].createElement("span", null),
-    panes: {
-      depart: true
-    },
+    trigger: /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, selectUser && /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
+      name: selectUser.name,
+      id: selectUser.userId
+    }), !selectUser && /*#__PURE__*/_react["default"].createElement("span", {
+      className: "".concat(_precls["default"], "__search-user-tips")
+    }, placeholder)),
     popupAlign: {
       offset: userSelectOffset
     }
-  }));
+  }))));
 }

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

@@ -48,9 +48,13 @@ var UnchainOkrModal = function UnchainOkrModal(props, ref) {
           surveyId = _res$data.surveyId,
           userIsFirstAccess = _res$data.userIsFirstAccess,
           userIsFirstAccessDate = _res$data.userIsFirstAccessDate;
+        console.table({
+          userIsFirstAccess: userIsFirstAccess,
+          isTry: isTry
+        });
         var researchUrl = "https:".concat((0, _bsGlobal.getBSGlobal)('domain'), "/surveyRoute?surveyId=").concat(surveyId);
         setOkrResearchUrl(researchUrl);
-        if (userIsFirstAccess && (0, _bsGlobal.isWx)() && isOkr && isTry) {
+        if (userIsFirstAccess && isTry) {
           setTimeout(function () {
             setVisible(true);
           }, 30 * 1000);

package/package.json

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