@titaui/pc 1.12.14 → 1.12.17-beta.1

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

@@ -35,7 +35,7 @@ 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; }
 
-var precls = "rel-work-node";
+var precls = 'rel-work-node';
 
 function WorkNode(props) {
   var data = props.data,
@@ -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,
@@ -57,20 +57,20 @@ function WorkNode(props) {
   var onCheckHandler = function onCheckHandler(checked) {
     if (checked) {
       addSelected({
-        type: "work",
-        workId: data.WorkId,
+        type: 'work',
+        workId: data.workId,
         krId: 0,
-        id: data.WorkId,
-        name: data.WorkName
+        id: data.workId,
+        name: data.workName
       });
     } else {
-      removeSelected(data.WorkId);
+      removeSelected(data.workId);
     }
   };
 
   var statusMap = {
-    1: (0, _getLocale.getLocale)("Per_MyRe_text_Inprogress"),
-    2: (0, _getLocale.getLocale)("OKR_MyO_E_From_Completed")
+    1: (0, _getLocale.getLocale)('Per_MyRe_text_Inprogress'),
+    2: (0, _getLocale.getLocale)('OKR_MyO_E_From_Completed')
   };
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: precls,
@@ -87,24 +87,24 @@ 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")
   }, /*#__PURE__*/_react["default"].createElement("span", {
-    className: (0, _classnames["default"])("tu-icon-project-s", "".concat(precls, "__name-icon"))
+    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/textarea/index.js

@@ -13,7 +13,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 require("./index.css");
 
-var _excluded = ["disabled", "onFocus", "onBlur", "inputRef", "onChange", "className", "value", "placeholder", "maxLine", "isShowApproval", "maxLength", "initValue", "onErrorChange", "validator", "onKeyDown"];
+var _excluded = ["disabled", "onFocus", "onBlur", "inputRef", "onChange", "className", "value", "placeholder", "maxLine", "line", "changeEditStatus", "maxLength", "initValue", "onErrorChange", "validator", "onKeyDown"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -50,7 +50,8 @@ var Textarea = function Textarea(p) {
       placeholder = p.placeholder,
       _p$maxLine = p.maxLine,
       maxLine = _p$maxLine === void 0 ? 4 : _p$maxLine,
-      isShowApproval = p.isShowApproval,
+      line = p.line,
+      changeEditStatus = p.changeEditStatus,
       maxLength = p.maxLength,
       initValue = p.initValue,
       onErrorChange = p.onErrorChange,
@@ -97,7 +98,7 @@ var Textarea = function Textarea(p) {
       isTrue = _useState12[0],
       setIsTrue = _useState12[1];
 
-  var _useState13 = (0, _react.useState)(1),
+  var _useState13 = (0, _react.useState)(line || 1),
       _useState14 = _slicedToArray(_useState13, 2),
       textAreaRows = _useState14[0],
       setTextAreaRows = _useState14[1];
@@ -192,7 +193,7 @@ var Textarea = function Textarea(p) {
   }, [realValue]);
   (0, _react.useEffect)(function () {
     resetTextareaHeight();
-  }, [isShowApproval]);
+  }, [changeEditStatus]);
   return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
     className: "\n          ".concat(prefixCls, "\n          ").concat(areaError, "\n          ").concat(disabled ? " disabled" : "", "\n        "),
     onFocus: function onFocus() {},
@@ -215,7 +216,8 @@ var Textarea = function Textarea(p) {
     disabled: disabled,
     ref: realInputRef,
     value: realValue,
-    rows: textAreaRows,
+    rows: textAreaRows // rows={4}
+    ,
     placeholder: placeholder,
     onScroll: handleShadowVisible,
     onChange: function onChange(e) {

package/lib/components/tooltip/tooltip.js

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

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

@@ -31,6 +31,8 @@ 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,
@@ -39,7 +41,7 @@ function _default(props) {
       disabledDepartSelect = _useContext.disabledDepartSelect;
 
   var onGetDepartTreeData = function onGetDepartTreeData() {
-    return (0, _requestApis.getTreeData)("-1", {
+    return (0, _requestApis.getTreeData)(departId, {
       departOnly: departOnly,
       auth: auth,
       authType: authType,

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

@@ -1,10 +1,11 @@
 .persel-selector-field {
   display: inline-block;
+  max-width: 100%;
   min-width: 120px;
   height: 36px;
   line-height: 36px;
   background: #ffffff;
-  border-radius: 3px;
+  border-radius: 18px !important;
   border: 1px solid #e9ecf0;
   padding: 8px 12px;
   box-sizing: border-box;
@@ -16,6 +17,15 @@
   border-color: #2879ff;
 }
 
+.persel-selector-field--disabled {
+  cursor: not-allowed !important;
+}
+
+.persel-selector-field--disabled:hover {
+  color: unset !important;
+  border-color: #e9ecf0 !important;
+}
+
 .persel-selector-field__text {
   display: inline-block;
   height: 18px;

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

@@ -51,6 +51,8 @@ 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,
@@ -64,6 +66,10 @@ 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,
@@ -279,6 +285,10 @@ 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,
@@ -288,11 +298,21 @@ 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 persel-selector-field--disabled"
+  }, /*#__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,
@@ -319,9 +339,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     }
   }, children || trigger) : /*#__PURE__*/_react["default"].createElement("span", {
     className: "persel-selector-field",
-    onClick: function onClick() {
-      return setVisible(!visible);
-    }
+    onClick: onChangeVisible
   }, /*#__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

@@ -3,9 +3,9 @@
   min-width: 120px;
   height: 36px;
   line-height: 36px;
-  background: #FFFFFF;
-  border-radius: 3px;
-  border: 1px solid #E9ECF0;
+  background: #ffffff;
+  border-radius: 18px;
+  border: 1px solid #e9ecf0;
   padding: 8px 12px;
   box-sizing: border-box;
   cursor: pointer;
@@ -27,7 +27,7 @@
   box-sizing: border-box;
   font-size: 14px;
   font-weight: 400;
-  color: #3F4755;
+  color: #3f4755;
   line-height: 20px;
   vertical-align: top;
   border: none;

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

@@ -29,7 +29,7 @@ var tenantId = BSGlobal && BSGlobal.tenantInfo.Id || 0;
 var userId = BSGlobal && BSGlobal.loginUserInfo.Id || 0;
 
 var requestDomain = function requestDomain() {
-  if (!window.location.hostname.match(/dev/)) return "";
+  if (!window.location.hostname.match(/dev/)) return '';
   return "".concat(location.protocol, "//www.tita.gift");
 };
 
@@ -44,16 +44,16 @@ var getDepartments = function getDepartments(_ref) {
       isLoadNodes = _ref.isLoadNodes;
   // 根据权限类型使用不同的objtype
   var authTypeId;
-  if (auth && !authType) authType = "okr";
-  if (authType == "okr") authTypeId = "62";
-  if (authType == "performance") authTypeId = "31";
-  if (authType == "total") authTypeId = "0"; // 获取根节点
+  if (auth && !authType) authType = 'okr';
+  if (authType == 'okr') authTypeId = '62';
+  if (authType == 'performance') authTypeId = '31';
+  if (authType == 'total') authTypeId = '0'; // 获取根节点
   // 第一次获取根部门 nodeId == -1
 
   var isGetRootNode = isGetRoot && !isLoadNodes;
   var prevPath = "".concat(requestDomain(), "/api/v2/").concat(tenantId, "/").concat(userId, "/department/sub"); // 请求参数
 
-  var urlParams = "departmentId=".concat(nodeId, "&isGetUser=").concat(isGetUser).concat(isGetRootNode ? "&isRoot=true" : "");
+  var urlParams = "departmentId=".concat(nodeId, "&isGetUser=").concat(isGetUser).concat(isGetRootNode ? '&isRoot=true' : '');
   return _axios["default"].get(auth ? "".concat(prevPath, "/depsAndUsersByPrivilege?").concat(urlParams, "&objtype=").concat(authTypeId) : "".concat(prevPath, "/depsAndUsers?").concat(urlParams)).then(function (departs) {
     if (isGetRootNode) {
       // 第一次获取根节点
@@ -67,7 +67,7 @@ var getDepartments = function getDepartments(_ref) {
       for (var i = 0; i < departments.length; i++) {
         var it = departments[i];
 
-        if (it.id == "-1") {
+        if (it.id == '-1') {
           hasGetRootNode = true;
           firstRootNodes.push(it);
           break;
@@ -89,7 +89,7 @@ var getDepartments = function getDepartments(_ref) {
 
 var getGourps = function getGourps(_ref2) {
   var _ref2$sourceFrom = _ref2.sourceFrom,
-      sourceFrom = _ref2$sourceFrom === void 0 ? "" : _ref2$sourceFrom,
+      sourceFrom = _ref2$sourceFrom === void 0 ? '' : _ref2$sourceFrom,
       getUsedGroups = _ref2.getUsedGroups;
 
   // 获取有OKR的群组
@@ -99,7 +99,7 @@ var getGourps = function getGourps(_ref2) {
     });
   }
 
-  return _axios["default"].get("".concat(requestDomain(), "/api/v1/").concat(tenantId, "/").concat(userId, "/Group/getAll").concat(sourceFrom ? "?sourceFrom=".concat(sourceFrom) : "")).then(function (groups) {
+  return _axios["default"].get("".concat(requestDomain(), "/api/v1/").concat(tenantId, "/").concat(userId, "/Group/getAll").concat(sourceFrom ? "?sourceFrom=".concat(sourceFrom) : '')).then(function (groups) {
     return groups.data;
   });
 };
@@ -141,13 +141,17 @@ var getSubordinateData = function getSubordinateData(_ref3) {
   var auth = _ref3.auth,
       authType = _ref3.authType;
   var authTypeId;
-  if (auth && !authType) authType = "okr";
-  if (authType == "okr") authTypeId = "62";
-  if (authType == "performance") authTypeId = "31";
-  if (authType == "total") authTypeId = "0";
-  return _axios["default"].get("".concat(requestDomain(), "/api/v1/").concat(tenantId, "/").concat(userId, "/org/GetDepartmentSubordinates?objtype=").concat(authTypeId)).then(function (res) {
-    var _res$data$Data$users = res.data.Data.users,
-        users = _res$data$Data$users === void 0 ? [] : _res$data$Data$users;
+  if (auth && !authType) authType = 'okr';
+  if (authType == 'okr') authTypeId = '62';
+  if (authType == 'performance') authTypeId = '31';
+  if (authType == 'total') authTypeId = '0';
+  return _axios["default"].get("".concat(requestDomain(), "/api/v2/").concat(tenantId, "/").concat(userId, "/org/subordinate?to_userId=").concat(userId)).then(function (res) {
+    // const { users = [] } = res.data.Data;
+    var data = res.data.Data;
+    var users = [];
+    data.forEach(function (ele) {
+      users.push(ele.user);
+    });
     var transUsers = (0, _utils.translateUsersToTreeNode)(users || []); // resolve && resolve([...transUsers]);
 
     return _toConsumableArray(transUsers);
@@ -159,13 +163,39 @@ exports.getSubordinateData = getSubordinateData;
 var search = function search(_ref4) {
   var searchKey = _ref4.searchKey,
       departOnly = _ref4.departOnly,
-      sourceFrom = _ref4.sourceFrom;
-  var args = [];
-  if (departOnly) args.push("isGetUser=false");
-  if (sourceFrom) args.push("sourceFrom=".concat(sourceFrom)); // 追加来源，用于企业微信搜索
+      searchUserOnly = _ref4.searchUserOnly,
+      panes = _ref4.panes,
+      _ref4$auth = _ref4.auth,
+      auth = _ref4$auth === void 0 ? false : _ref4$auth,
+      _ref4$isVerify = _ref4.isVerify,
+      isVerify = _ref4$isVerify === void 0 ? false : _ref4$isVerify;
+  var isGetUser = true;
+  var isGetDep = true;
+  var isGetGroup = false;
+
+  if (panes) {
+    var depart = panes.depart,
+        group = panes.group;
+
+    if (depart) {
+      isGetDep = true;
+    }
+
+    if (group) {
+      isGetGroup = true;
+    }
+  }
+
+  if (departOnly) {
+    isGetUser = false;
+  }
+
+  if (searchUserOnly) {
+    isGetDep = false;
+    isGetGroup = false;
+  }
 
-  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 _axios["default"].get("".concat(requestDomain(), "/api/v2/").concat(tenantId, "/").concat(userId, "/search/searchAll?keyWord=").concat(searchKey, "&isVerify=").concat(isVerify, "&isGetUser=").concat(isGetUser, "&isGetDep=").concat(isGetDep, "&isGetGroup=").concat(isGetGroup)).then(function (searchRes) {
     return searchRes.data;
   });
 };

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

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

package/lib/components/write-summary-modal/index.css

@@ -0,0 +1,79 @@
+.tita-ui-write-summary-modal {
+  background: #ffffff;
+  height: 522px;
+  overflow: auto;
+  overflow: overlay;
+  display: grid;
+  grid-template-columns: repeat(3, 1fr);
+  border-radius: 24px;
+  padding: 10px 32px;
+  box-sizing: border-box;
+}
+
+.tita-ui-write-summary-modal__content-item {
+  width: 248px;
+  height: 232px;
+  border-radius: 12px;
+  padding: 24px 24px 0 24px;
+  box-sizing: border-box;
+  background: #ffffff;
+  border: 1px solid #e9ecf0;
+  position: relative;
+  cursor: pointer;
+}
+
+.tita-ui-write-summary-modal__content-item:hover {
+  border: 1px solid #2879ff;
+}
+
+.tita-ui-write-summary-modal__content-item-title {
+  display: flex;
+}
+
+.tita-ui-write-summary-modal__content-item-title-avatar {
+  width: 32px;
+  height: 32px;
+  border-radius: 50%;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  color: #ffffff;
+  font-size: 14px;
+}
+
+.tita-ui-write-summary-modal__content-item-title-name {
+  font-size: 20px;
+  font-weight: 600;
+  margin-left: 8px;
+  color: #141c28;
+  line-height: 30px;
+}
+
+.tita-ui-write-summary-modal__content-item-desc {
+  margin-top: 23px;
+}
+
+.tita-ui-write-summary-modal__content-item-desc-text {
+  font-size: 12px;
+  font-weight: normal;
+  color: #6f7886;
+  line-height: 18px;
+  margin-top: 12px;
+}
+
+.tita-ui-write-summary-modal__content-item-desc-block {
+  width: 196px;
+  height: 12px;
+  border-radius: 4px;
+  margin-top: 6px;
+}
+
+.tita-ui-write-summary-modal__content-item::after {
+  content: '';
+  position: absolute;
+  height: 36px;
+  width: 100%;
+  bottom: 16px;
+  left: 0;
+  background: linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, #ffffff 100%);
+}