@titaui/pc 1.12.9-beta.3 → 1.12.11

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

@@ -43,7 +43,7 @@ function WorkNode(props) {
       checked = _props$checked === void 0 ? false : _props$checked,
       _props$disabled = props.disabled,
       disabled = _props$disabled === void 0 ? false : _props$disabled;
-  var principalUser = data.principalUser;
+  var PrincipalUser = data.PrincipalUser;
 
   var _useContext = (0, _react.useContext)(_context.Context),
       multiple = _useContext.multiple,
@@ -58,13 +58,13 @@ function WorkNode(props) {
     if (checked) {
       addSelected({
         type: "work",
-        workId: data.workId,
+        workId: data.WorkId,
         krId: 0,
-        id: data.workId,
-        name: data.workName
+        id: data.WorkId,
+        name: data.WorkName
       });
     } else {
-      removeSelected(data.workId);
+      removeSelected(data.WorkId);
     }
   };
 
@@ -87,7 +87,7 @@ function WorkNode(props) {
     className: "".concat(precls, "__checkbox")
   }, /*#__PURE__*/_react["default"].createElement(_radio["default"], {
     onChange: onCheckHandler,
-    id: data.workId,
+    id: data.WorkId,
     checked: checked
   })), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(precls, "__name")
@@ -95,16 +95,16 @@ function WorkNode(props) {
     className: (0, _classnames["default"])("tu-icon-project-s", "".concat(precls, "__name-icon"))
   }), /*#__PURE__*/_react["default"].createElement("span", {
     onClick: gotoWorkDetail
-  }, (0, _tools.htmlDecodeByHtmlRegExp)(data.workName))), /*#__PURE__*/_react["default"].createElement("span", {
+  }, (0, _tools.htmlDecodeByHtmlRegExp)(data.WorkName))), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(precls, "__status")
-  }, statusMap[data.status]), /*#__PURE__*/_react["default"].createElement("span", {
+  }, statusMap[data.Status]), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(precls, "__principle")
   }, /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
-    name: principalUser.name,
-    id: principalUser.userId
+    name: PrincipalUser.Name,
+    id: PrincipalUser.UserId
   })), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(precls, "__time")
-  }, (0, _helper.formatDateStr)(data.startDate), "-", (0, _helper.formatDateStr)(data.endDate)));
+  }, (0, _helper.formatDateStr)(data.startDate), "-", (0, _helper.formatDateStr)(data.EndDate)));
 }
 
 WorkNode.defaultProps = {

package/lib/components/tooltip/tooltip.js

@@ -18,15 +18,10 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
 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); }
 
 function _default(props) {
-  var align = props.align,
-      placement = props.placement;
-
-  if (placement === "top" && !align) {
-    align = {
-      offset: [0, 5]
-    };
-  }
-
+  var _props$align = props.align,
+      align = _props$align === void 0 ? {
+    offset: [0, 5]
+  } : _props$align;
   return /*#__PURE__*/_react["default"].createElement(_rcTooltip["default"], _extends({}, props, {
     align: align,
     transitionName: props.transitionName || "tita-common-fade"

package/lib/components/user-selector/category-selector-panel/depart-tree.js

@@ -31,8 +31,6 @@ function _default(props) {
       height = props.height;
 
   var _useContext = (0, _react.useContext)(_context.CommonContext),
-      _useContext$departId = _useContext.departId,
-      departId = _useContext$departId === void 0 ? "-1" : _useContext$departId,
       departOnly = _useContext.departOnly,
       sourceFrom = _useContext.sourceFrom,
       auth = _useContext.auth,
@@ -41,7 +39,7 @@ function _default(props) {
       disabledDepartSelect = _useContext.disabledDepartSelect;
 
   var onGetDepartTreeData = function onGetDepartTreeData() {
-    return (0, _requestApis.getTreeData)(departId, {
+    return (0, _requestApis.getTreeData)("-1", {
       departOnly: departOnly,
       auth: auth,
       authType: authType,

package/lib/components/user-selector/category-selector-panel/index.js

@@ -80,6 +80,7 @@ function _default(props) {
           tabPane: true
         }
       }, Object.keys(panes).map(function (panelKey) {
+        if (!panes[panelKey]) return;
         var _getPanesConfig$panel = (0, _constant.getPanesConfig)()[panelKey],
             label = _getPanesConfig$panel.label,
             Component = _getPanesConfig$panel.Component;

package/lib/components/user-selector/export-modules/field-tree-selector/index.css

@@ -1,11 +1,10 @@
 .persel-selector-field {
   display: inline-block;
-  max-width: 100%;
   min-width: 120px;
   height: 36px;
   line-height: 36px;
   background: #ffffff;
-  border-radius: 18px !important;
+  border-radius: 3px;
   border: 1px solid #e9ecf0;
   padding: 8px 12px;
   box-sizing: border-box;

package/lib/components/user-selector/export-modules/field-tree-selector/index.js

@@ -51,8 +51,6 @@ var defauleSelectNodes = {
 
 var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var multiple = props.multiple,
-      _props$disabled = props.disabled,
-      disabled = _props$disabled === void 0 ? false : _props$disabled,
       trigger = props.trigger,
       children = props.children,
       _props$onOk = props.onOk,
@@ -66,10 +64,6 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       selectNodes = _props$selectNodes === void 0 ? defauleSelectNodes : _props$selectNodes,
       sourceFrom = props.sourceFrom,
       departOnly = props.departOnly,
-      searchUserOnly = props.searchUserOnly,
-      isVerify = props.isVerify,
-      _props$departId = props.departId,
-      departId = _props$departId === void 0 ? "-1" : _props$departId,
       _props$auth = props.auth,
       auth = _props$auth === void 0 ? false : _props$auth,
       _props$placeholder = props.placeholder,
@@ -285,10 +279,6 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     onCancel && onCancel();
   };
 
-  var onChangeVisible = function onChangeVisible() {
-    setVisible(!visible);
-  };
-
   var popup = /*#__PURE__*/_react["default"].createElement(_selectorGenerater["default"], {
     multiple: multiple,
     onCancel: onCancelHandler,
@@ -298,21 +288,11 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     showSearchInput: showSearchInput
   });
 
-  if (disabled) return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("span", {
-    className: "persel-selector-field"
-  }, /*#__PURE__*/_react["default"].createElement("span", {
-    className: "persel-selector-field__text"
-  }, (0, _openData.isWechat)() ? jsxDomValues : selectedText || /*#__PURE__*/_react["default"].createElement("span", {
-    className: "persel-selector-field__text-holder"
-  }, placeholder))));
   return /*#__PURE__*/_react["default"].createElement(_context.CommonContext.Provider, {
     value: {
       sourceFrom: sourceFrom,
       departOnly: departOnly,
-      searchUserOnly: searchUserOnly,
-      isVerify: isVerify,
       auth: auth,
-      departId: departId,
       authType: authType,
       isGetRoot: isGetRoot,
       disabledDepartSelect: disabledDepartSelect,
@@ -339,7 +319,9 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     }
   }, children || trigger) : /*#__PURE__*/_react["default"].createElement("span", {
     className: "persel-selector-field",
-    onClick: onChangeVisible
+    onClick: function onClick() {
+      return setVisible(!visible);
+    }
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "persel-selector-field__text"
   }, (0, _openData.isWechat)() ? jsxDomValues : selectedText || /*#__PURE__*/_react["default"].createElement("span", {

package/lib/components/user-selector/export-modules/multiple-user-selector--bak/index.css

@@ -4,7 +4,7 @@
   height: 36px;
   line-height: 36px;
   background: #FFFFFF;
-  border-radius: 18px;
+  border-radius: 3px;
   border: 1px solid #E9ECF0;
   padding: 8px 12px;
   box-sizing: border-box;

package/lib/components/user-selector/request-apis.js

@@ -159,28 +159,13 @@ exports.getSubordinateData = getSubordinateData;
 var search = function search(_ref4) {
   var searchKey = _ref4.searchKey,
       departOnly = _ref4.departOnly,
-      searchUserOnly = _ref4.searchUserOnly,
-      sourceFrom = _ref4.sourceFrom,
-      _ref4$isVerify = _ref4.isVerify,
-      isVerify = _ref4$isVerify === void 0 ? false : _ref4$isVerify;
+      sourceFrom = _ref4.sourceFrom;
   var args = [];
+  if (departOnly) args.push("isGetUser=false");
+  if (sourceFrom) args.push("sourceFrom=".concat(sourceFrom)); // 追加来源，用于企业微信搜索
 
-  if (departOnly) {
-    args.push("isGetUser=false&isGetDep=true&isGetGroup=false");
-  } else if (searchUserOnly) {
-    args.push("isGetUser=true&isGetDep=false&isGetGroup=false");
-  } else {
-    args.push("isGetUser=true&isGetDep=true&isGetGroup=true");
-  }
-
-  ;
-
-  if (!!sourceFrom) {
-    // 这个是遗留的管控群组的，后面逐步替换掉
-    isVerify = true;
-  }
-
-  return _axios["default"].get("".concat(requestDomain(), "/api/v2/").concat(tenantId, "/").concat(userId, "/search/searchAll?keyWord=").concat(searchKey, "&isVerify=").concat(isVerify, "&").concat(args[0])).then(function (searchRes) {
+  args.push("source=".concat((0, _openData.getSource)()));
+  return _axios["default"].get("".concat(requestDomain(), "/api/v2/").concat(tenantId, "/").concat(userId, "/search/searchAll?keyWork=").concat(searchKey).concat(args.length ? "&".concat(args.join("&")) : "")).then(function (searchRes) {
     return searchRes.data;
   });
 };

package/lib/components/user-selector/searched-panel/index.js

@@ -59,9 +59,7 @@ function _default(props) {
 
   var _useContext = (0, _react.useContext)(_context.CommonContext),
       departOnly = _useContext.departOnly,
-      searchUserOnly = _useContext.searchUserOnly,
       sourceFrom = _useContext.sourceFrom,
-      isVerify = _useContext.isVerify,
       _useContext$panes = _useContext.panes,
       panes = _useContext$panes === void 0 ? {
     depart: true,
@@ -99,9 +97,7 @@ function _default(props) {
     (0, _requestApis.search)({
       searchKey: searchKey,
       departOnly: departOnly,
-      searchUserOnly: searchUserOnly,
-      sourceFrom: sourceFrom,
-      isVerify: isVerify
+      sourceFrom: sourceFrom
     }).then(function (res) {
       var Code = res.Code,
           Data = res.Data;

package/lib/pages/aha2021/index.js

@@ -11,6 +11,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _contactKefu = _interopRequireDefault(require("../../components/contact-kefu"));
+
 var _navTop = _interopRequireDefault(require("../../components/nav-top"));
 
 var _followerVisitor = _interopRequireDefault(require("../../components/follower-visitor"));
@@ -35,12 +37,10 @@ var _errorBoundary = _interopRequireDefault(require("../../components/error-boun
 
 var _errorLevel = _interopRequireDefault(require("../../utils/error-level"));
 
-var _hooks = _interopRequireDefault(require("../../utils/hooks"));
-
-var _newMenuSwitcher = _interopRequireDefault(require("./new-menu-switcher"));
-
 require("./index.css");
 
+var _hooks = _interopRequireDefault(require("../../utils/hooks"));
+
 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); }
@@ -103,7 +103,7 @@ function PageLayout(props) {
     }
   }, children), !isTencentHr && /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__help"))
-  }, /*#__PURE__*/_react["default"].createElement(_helpCard["default"], null)), /*#__PURE__*/_react["default"].createElement(_newMenuSwitcher["default"], null), isTrial && !isTencentHr && /*#__PURE__*/_react["default"].createElement("div", {
+  }, /*#__PURE__*/_react["default"].createElement(_helpCard["default"], null)), !isTencentHr && !(0, _helpers.isDingDing)() && !(0, _helpers.isFeishu)() && /*#__PURE__*/_react["default"].createElement(_contactKefu["default"], null), isTrial && !isTencentHr && /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(preCls, "__invite")
   }, /*#__PURE__*/_react["default"].createElement(_invitePeople["default"], null)), isTencentHr && /*#__PURE__*/_react["default"].createElement(_hrMessage["default"], null), /*#__PURE__*/_react["default"].createElement(_errorBoundary["default"], {
     errorLevel: _errorLevel["default"].P0,