@titaui/pc 1.16.15 → 1.16.17

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

@@ -145,7 +145,8 @@ function CreateCycle(_ref) {
       startDate: selfCycle.startDate,
       endDate: selfCycle.endDate
     },
-    container: container
+    container: container,
+    popupPlacement: "top"
   }, /*#__PURE__*/_react["default"].createElement(_style.TimeSapn, null, selfCycle.startDate, /*#__PURE__*/_react["default"].createElement("i", {
     className: "tu-icon-arrow-down"
   })))), /*#__PURE__*/_react["default"].createElement(_style.DateLine, null, (0, _getLocale.getLocale)("Mod_EndDate"), "\uFF1A", /*#__PURE__*/_react["default"].createElement(_rangePickerPop["default"], {
@@ -156,7 +157,8 @@ function CreateCycle(_ref) {
       startDate: selfCycle.startDate,
       endDate: selfCycle.endDate
     },
-    container: container
+    container: container,
+    popupPlacement: "top"
   }, /*#__PURE__*/_react["default"].createElement(_style.TimeSapn, null, selfCycle.endDate, /*#__PURE__*/_react["default"].createElement("i", {
     className: "tu-icon-arrow-down"
   })))), /*#__PURE__*/_react["default"].createElement("div", {

package/lib/components/create-okr-modal/fields/okr-new-user-selector.js

@@ -11,10 +11,12 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _titaUi = require("tita-ui");
 
-var _UserSelectorPop = _interopRequireDefault(require("../../../components-v1/userSelector/UserSelectorPop"));
+var _userSelector = _interopRequireDefault(require("../../user-selector"));
 
 var _openData = require("../../../utils/open-data");
 
+var _tools = require("../../../utils/tools");
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -50,7 +52,11 @@ function NewUserSelector(_ref) {
   var spanRef = (0, _react.useRef)(document.createElement("span"));
 
   var onUserSelectorSubmitHandler = function onUserSelectorSubmitHandler(users) {
-    changeUser && changeUser(users);
+    var data = users[0].data;
+    data['UserAvatar'] = data.avatar;
+    data['id'] = data.userId;
+    var user = (0, _tools.toUpperCase)(data);
+    changeUser && changeUser([user]);
   };
 
   (0, _react.useEffect)(function () {
@@ -60,49 +66,62 @@ function NewUserSelector(_ref) {
       setWidthOverflow(false);
     }
   }, [user.Name]);
-  return /*#__PURE__*/_react["default"].createElement(_UserSelectorPop["default"], {
-    stopPropagation: true,
-    onSubmit: onUserSelectorSubmitHandler,
-    onCancel: function onCancel() {},
-    container: container.current && container.current.getRef(),
-    multi: false,
-    style: style
-  }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: "user-info"
-  }, /*#__PURE__*/_react["default"].createElement(_titaUi.Avatar, {
-    size: {
-      width: 24,
-      textNum: 1,
-      fontSize: 12
-    },
-    src: user.Medium,
-    color: user.Color // @ts-ignore
-    ,
-    name: user.Name,
-    userId: user.Id
-  }), widthOverflow ? /*#__PURE__*/_react["default"].createElement(_titaUi.Tooltip, {
-    content: /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
+  return (
+    /*#__PURE__*/
+    // <UserSelectorPop
+    //   stopPropagation
+    //   onSubmit={onUserSelectorSubmitHandler}
+    //   onCancel={() => {}}
+    //   container={container.current && container.current.getRef()}
+    //   multi={false}
+    //   style={style}
+    // >
+    _react["default"].createElement(_userSelector["default"], {
+      multiple: false,
+      position: "bottom",
+      onSelect: onUserSelectorSubmitHandler,
+      searchUserOnly: true,
+      disabledDepartSelect: true,
+      panes: {
+        depart: true
+      }
+    }, /*#__PURE__*/_react["default"].createElement("div", {
+      className: "user-info"
+    }, /*#__PURE__*/_react["default"].createElement(_titaUi.Avatar, {
+      size: {
+        width: 24,
+        textNum: 1,
+        fontSize: 12
+      },
+      src: user.Medium || user.medium,
+      color: user.Color || user.color // @ts-ignore
+      ,
+      name: user.Name,
+      userId: user.Id
+    }), widthOverflow ? /*#__PURE__*/_react["default"].createElement(_titaUi.Tooltip, {
+      content: /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
+        name: user.Name,
+        id: user.Id
+      }),
+      container: document.body
+    }, /*#__PURE__*/_react["default"].createElement("span", {
+      className: "user__name"
+    }, /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
+      name: user.Name,
+      id: user.Id
+    }))) : /*#__PURE__*/_react["default"].createElement("span", {
+      className: "user__name"
+    }, /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
+      name: user.Name,
+      id: user.Id
+    })), /*#__PURE__*/_react["default"].createElement("span", {
+      className: "user__name--hidden",
+      ref: spanRef
+    }, /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
       name: user.Name,
       id: user.Id
-    }),
-    container: document.body
-  }, /*#__PURE__*/_react["default"].createElement("span", {
-    className: "user__name"
-  }, /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
-    name: user.Name,
-    id: user.Id
-  }))) : /*#__PURE__*/_react["default"].createElement("span", {
-    className: "user__name"
-  }, /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
-    name: user.Name,
-    id: user.Id
-  })), /*#__PURE__*/_react["default"].createElement("span", {
-    className: "user__name--hidden",
-    ref: spanRef
-  }, /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
-    name: user.Name,
-    id: user.Id
-  }))));
+    }))))
+  );
 }
 
 var _default = NewUserSelector;

package/lib/components/toast/index.js

@@ -90,7 +90,11 @@ var Toast = /*#__PURE__*/function () {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                options = _args.length > 1 && _args[1] !== undefined ? _args[1] : {};
+                options = _args.length > 1 && _args[1] !== undefined ? _args[1] : {
+                  style: {
+                    right: 'unset'
+                  }
+                };
                 key = (0, _uuid["default"])();
                 _context.next = 4;
                 return getInstance();
@@ -132,7 +136,11 @@ var Toast = /*#__PURE__*/function () {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
-                options = _args2.length > 1 && _args2[1] !== undefined ? _args2[1] : {};
+                options = _args2.length > 1 && _args2[1] !== undefined ? _args2[1] : {
+                  style: {
+                    right: 'unset'
+                  }
+                };
                 key = (0, _uuid["default"])();
                 _context2.next = 4;
                 return getInstance();
@@ -174,7 +182,11 @@ var Toast = /*#__PURE__*/function () {
           while (1) {
             switch (_context3.prev = _context3.next) {
               case 0:
-                options = _args3.length > 1 && _args3[1] !== undefined ? _args3[1] : {};
+                options = _args3.length > 1 && _args3[1] !== undefined ? _args3[1] : {
+                  style: {
+                    right: 'unset'
+                  }
+                };
                 key = (0, _uuid["default"])();
                 _context3.next = 4;
                 return getInstance();

package/lib/utils/tools.js

@@ -12,12 +12,16 @@ exports.htmlEncodeByRegExp = htmlEncodeByRegExp;
 exports.htmlEncodeToHtmlByRegExp = htmlEncodeToHtmlByRegExp;
 exports.openPage = exports.htmlToText = void 0;
 exports.openUrl = openUrl;
-exports.unHighLight = void 0;
+exports.unHighLight = exports.toUpperCase = void 0;
 
 var _platform = require("./platform");
 
 var _openData = require("./open-data");
 
+var _cloneDeep = _interopRequireDefault(require("clone-deep"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -293,4 +297,30 @@ var htmlToText = function htmlToText(text) {
   return newtext;
 };
 
-exports.htmlToText = htmlToText;
+exports.htmlToText = htmlToText;
+
+var toUpperCase = function toUpperCase(obj) {
+  var newObj = (0, _cloneDeep["default"])(obj);
+
+  if (Object.prototype.toString.call(newObj) === '[object Object]') {
+    for (var key in newObj) {
+      var pre = key.substring(0, 1);
+      var upPre = pre.toUpperCase();
+      var word = key.substring(1);
+
+      if (Object.prototype.toString.call(newObj[key]) === '[object Object]') {
+        newObj[upPre + word] = toUpperCase(newObj[key]);
+      } else {
+        newObj[upPre + word] = newObj[key];
+      }
+
+      if (pre !== upPre) {
+        delete newObj[key];
+      }
+    }
+  }
+
+  return newObj;
+};
+
+exports.toUpperCase = toUpperCase;

package/package.json

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