@titaui/pc 1.12.8 → 1.12.9-beta.1

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

@@ -57,7 +57,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-var precls = "rel-work-tree";
+var precls = 'rel-work-tree';
 
 function WorkTree() {
   var _useContext = (0, _react.useContext)(_context2.Context),
@@ -105,7 +105,7 @@ function WorkTree() {
       isScorll = _useState16[0],
       setIsScorll = _useState16[1];
 
-  var contentRef = (0, _react.useRef)(document.createElement("div"));
+  var contentRef = (0, _react.useRef)(document.createElement('div'));
   var timer = null;
 
   var setScorll = function setScorll(e) {
@@ -119,11 +119,11 @@ function WorkTree() {
 
   (0, _react.useEffect)(function () {
     if (contentRef.current) {
-      contentRef.current.addEventListener("scroll", setScorll, true);
+      contentRef.current.addEventListener('scroll', setScorll, true);
     }
 
     return function () {
-      contentRef.current && contentRef.current.removeEventListener("scroll", setScorll, true);
+      contentRef.current && contentRef.current.removeEventListener('scroll', setScorll, true);
     };
   }, [treeNodes]);
 
@@ -132,12 +132,12 @@ function WorkTree() {
       var checked = !!selected.find(function (i) {
         return i.id == "mileStoneId-".concat(item.mileStoneId);
       });
-      item.workName = work.WorkName;
+      item.workName = work.workName;
       return {
         key: "mileStoneId-".concat(item.mileStoneId),
-        nodeType: "milestone",
+        nodeType: 'milestone',
         data: item,
-        title: "",
+        title: '',
         checked: checked,
         index: key + 1,
         disabled: !checked && selectedRoots.includes(item.workId)
@@ -147,47 +147,43 @@ function WorkTree() {
 
   var transToTreeNode = function transToTreeNode(arr) {
     return arr.map(function (item, _key) {
-      var _item$mileStones = item.mileStones,
-          mileStones = _item$mileStones === void 0 ? [] : _item$mileStones;
+      var _item$workMileStones = item.workMileStones,
+          workMileStones = _item$workMileStones === void 0 ? [] : _item$workMileStones;
       var checked = !!selected.find(function (i) {
-        return i.id == item.WorkId;
+        return i.id == item.workId;
       });
       return {
-        key: item.WorkId,
-        nodeType: "work-node",
-        title: "",
-        children: formatKrNodes(mileStones || [], item),
+        key: item.workId,
+        nodeType: 'work-node',
+        title: '',
+        children: formatKrNodes(workMileStones || [], item),
         data: item,
         checked: checked,
-        disabled: !checked && selectedRoots.includes(item.WorkId)
+        disabled: !checked && selectedRoots.includes(item.workId)
       };
     });
   };
 
   var getTreeNodes = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _yield$getWorks, _yield$getWorks$works, works, _yield$getWorks$total, total;
+      var res, _res$Data, _res$Data$works, works, _res$Data$total, total;
 
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
               _context.next = 2;
-              return (0, _requestApi.getWorks)(_objectSpread({
-                pageNum: pageNum,
-                pageSize: pageSize
-              }, query));
+              return (0, _requestApi.workData)(_objectSpread({
+                isGetMilestone: true
+              }, query), pageNum, pageSize);
 
             case 2:
-              _yield$getWorks = _context.sent;
-              _yield$getWorks$works = _yield$getWorks.works;
-              works = _yield$getWorks$works === void 0 ? [] : _yield$getWorks$works;
-              _yield$getWorks$total = _yield$getWorks.total;
-              total = _yield$getWorks$total === void 0 ? 0 : _yield$getWorks$total;
+              res = _context.sent;
+              _res$Data = res.Data, _res$Data$works = _res$Data.works, works = _res$Data$works === void 0 ? [] : _res$Data$works, _res$Data$total = _res$Data.total, total = _res$Data$total === void 0 ? 0 : _res$Data$total;
               setWorks(works || []);
               setTotal(total);
 
-            case 9:
+            case 6:
             case "end":
               return _context.stop();
           }
@@ -224,17 +220,17 @@ function WorkTree() {
     onChange: onQueryChangeHandler
   }), treeNodes.length == 0 && /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(precls, "__empty")
-  }, (0, _getLocale.getLocale)("Tasks_Tab_MyS_Noprojectilable")), treeNodes.length > 0 && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
+  }, (0, _getLocale.getLocale)('Tasks_Tab_MyS_Noprojectilable')), treeNodes.length > 0 && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(precls, "__header")
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(precls, "__header-obj")
-  }, (0, _getLocale.getLocale)("Pro_detail_AssociatedObject")), /*#__PURE__*/_react["default"].createElement("span", {
+  }, (0, _getLocale.getLocale)('Pro_detail_AssociatedObject')), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(precls, "__header-status")
-  }, (0, _getLocale.getLocale)("Mod_States")), /*#__PURE__*/_react["default"].createElement("span", {
+  }, (0, _getLocale.getLocale)('Mod_States')), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(precls, "__header-principle")
-  }, (0, _getLocale.getLocale)("Mod_Owner")), /*#__PURE__*/_react["default"].createElement("span", {
+  }, (0, _getLocale.getLocale)('Mod_Owner')), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(precls, "__header-time")
-  }, (0, _getLocale.getLocale)("Mod_Startendtime"))), /*#__PURE__*/_react["default"].createElement("div", {
+  }, (0, _getLocale.getLocale)('Mod_Startendtime'))), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(precls, "__content"),
     ref: contentRef
   }, /*#__PURE__*/_react["default"].createElement(_tree["default"], {

package/lib/components/task-relation-modal/tree/work-tree/search-form.js

@@ -17,10 +17,14 @@ var _okrStatusSelect = _interopRequireDefault(require("../../search/okr-status-s
 
 var _principal = _interopRequireDefault(require("../../search/principal"));
 
-var _relation = _interopRequireDefault(require("../../search/relation"));
+var _helpers = require("../../../../utils/helpers");
+
+var _workRelation = _interopRequireDefault(require("../../search/work-relation"));
 
 require("./index.css");
 
+var _loginUser$UserAvatar;
+
 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); }
@@ -39,6 +43,16 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
+var loginUser = (0, _helpers.getLoginUserInfo)();
+var user = {
+  userId: loginUser.Id,
+  name: loginUser.Name,
+  avatar: {
+    original: loginUser === null || loginUser === void 0 ? void 0 : (_loginUser$UserAvatar = loginUser.UserAvatar) === null || _loginUser$UserAvatar === void 0 ? void 0 : _loginUser$UserAvatar.Original,
+    color: '#bc97eb'
+  }
+};
+
 function SearchForm(props) {
   var onChange = props.onChange;
 
@@ -62,6 +76,10 @@ function SearchForm(props) {
       relation = _useState8[0],
       setRelation = _useState8[1];
 
+  var _useState9 = (0, _react.useState)([user]),
+      _useState10 = _slicedToArray(_useState9, 1),
+      initPerson = _useState10[0];
+
   (0, _react.useEffect)(function () {
     onChange({
       status: okrStatus,
@@ -80,13 +98,14 @@ function SearchForm(props) {
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: "rel-work-tree__search-item"
   }, /*#__PURE__*/_react["default"].createElement(_principal["default"], {
+    multiple: false,
     onChange: setUsers,
     position: "bottomLeft",
-    initValue: [],
+    initValue: initPerson,
     setRelation: setRelation
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: "rel-okr-tree__search-item"
-  }, /*#__PURE__*/_react["default"].createElement(_relation["default"], {
+  }, /*#__PURE__*/_react["default"].createElement(_workRelation["default"], {
     onChange: setRelation,
     initValue: relation
   })), /*#__PURE__*/_react["default"].createElement("div", {

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,10 +18,15 @@ 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 _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"

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;

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,8 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       selectNodes = _props$selectNodes === void 0 ? defauleSelectNodes : _props$selectNodes,
       sourceFrom = props.sourceFrom,
       departOnly = props.departOnly,
+      _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 +283,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 +296,19 @@ 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,
       auth: auth,
+      departId: departId,
       authType: authType,
       isGetRoot: isGetRoot,
       disabledDepartSelect: disabledDepartSelect,
@@ -319,9 +335,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

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

package/package.json

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