@titaui/pc 1.11.14 → 1.11.17

package/lib/pages/okr-map/export-modules/okr-map/okr-map.js

@@ -27,7 +27,7 @@ var _level2Search = _interopRequireDefault(require("../../level2-search"));
 
 var _requestApis = require("../../request-apis");
 
-var _useStorage13 = _interopRequireDefault(require("../../hooks/useStorage"));
+var _useStorage15 = _interopRequireDefault(require("../../hooks/useStorage"));
 
 var _drawerManager = _interopRequireDefault(require("../../../../components/drawer-manager"));
 
@@ -75,7 +75,7 @@ function _default(props) {
   _objectDestructuringEmpty(props); // 使用存储的State
 
 
-  var _useStorage = (0, _useStorage13["default"])("period", {
+  var _useStorage = (0, _useStorage15["default"])("period", {
     annualNum: "".concat(new Date().getFullYear()),
     cycleType: "2",
     yqmNum: "".concat((0, _dayjs["default"])().quarter())
@@ -84,30 +84,35 @@ function _default(props) {
       period = _useStorage2[0],
       setPeriod = _useStorage2[1];
 
-  var _useStorage3 = (0, _useStorage13["default"])("showkr", false),
+  var _useStorage3 = (0, _useStorage15["default"])("showkr", false),
       _useStorage4 = _slicedToArray(_useStorage3, 2),
       showkr = _useStorage4[0],
       setShowKr = _useStorage4[1];
 
-  var _useStorage5 = (0, _useStorage13["default"])("searchType", "company"),
+  var _useStorage5 = (0, _useStorage15["default"])("showCardKr", false),
       _useStorage6 = _slicedToArray(_useStorage5, 2),
-      searchType = _useStorage6[0],
-      setSearchType = _useStorage6[1];
+      showCardKr = _useStorage6[0],
+      setShowCardKr = _useStorage6[1];
 
-  var _useStorage7 = (0, _useStorage13["default"])("level2Selected", {}),
+  var _useStorage7 = (0, _useStorage15["default"])("searchType", "company"),
       _useStorage8 = _slicedToArray(_useStorage7, 2),
-      level2Selected = _useStorage8[0],
-      setLevel2Selected = _useStorage8[1];
+      searchType = _useStorage8[0],
+      setSearchType = _useStorage8[1];
 
-  var _useStorage9 = (0, _useStorage13["default"])("rootNode", {
+  var _useStorage9 = (0, _useStorage15["default"])("level2Selected", {}),
+      _useStorage10 = _slicedToArray(_useStorage9, 2),
+      level2Selected = _useStorage10[0],
+      setLevel2Selected = _useStorage10[1];
+
+  var _useStorage11 = (0, _useStorage15["default"])("rootNode", {
     rootId: 0,
     rootName: ""
   }, {
     noLocal: true
   }),
-      _useStorage10 = _slicedToArray(_useStorage9, 2),
-      rootNode = _useStorage10[0],
-      setRootNode = _useStorage10[1];
+      _useStorage12 = _slicedToArray(_useStorage11, 2),
+      rootNode = _useStorage12[0],
+      setRootNode = _useStorage12[1];
 
   var _useState = (0, _react.useState)(true),
       _useState2 = _slicedToArray(_useState, 2),
@@ -152,10 +157,10 @@ function _default(props) {
       showMask = _useState16[0],
       setShowMask = _useState16[1];
 
-  var _useStorage11 = (0, _useStorage13["default"])("openLevel", 2),
-      _useStorage12 = _slicedToArray(_useStorage11, 2),
-      openLevel = _useStorage12[0],
-      setOpenLevel = _useStorage12[1];
+  var _useStorage13 = (0, _useStorage15["default"])("openLevel", 2),
+      _useStorage14 = _slicedToArray(_useStorage13, 2),
+      openLevel = _useStorage14[0],
+      setOpenLevel = _useStorage14[1];
 
   var _useState17 = (0, _react.useState)(false),
       _useState18 = _slicedToArray(_useState17, 2),
@@ -202,11 +207,23 @@ function _default(props) {
 
       case "fullscreen":
         // 全屏
+        var cardFlat = document.querySelector('.titaui-menus__menu-card');
+
+        if (cardFlat) {
+          cardFlat.style.display = 'none';
+        }
+
         setFullScreen(true);
         break;
 
       case "quit-fullscreen":
         // 退出全屏
+        var cardFlat = document.querySelector('.titaui-menus__menu-card');
+
+        if (cardFlat) {
+          cardFlat.style.display = 'flex';
+        }
+
         setFullScreen(false);
         break;
 
@@ -277,7 +294,8 @@ function _default(props) {
         var userAvatar = {
           color: UserAvatar.Color,
           small: UserAvatar.Small,
-          hasAvatar: UserAvatar.HasAvatar
+          hasAvatar: UserAvatar.HasAvatar,
+          big: UserAvatar.Original || UserAvatar.original || UserAvatar.Big || UserAvatar.Large
         };
         setLevel2Selected({
           id: Id,
@@ -430,6 +448,9 @@ function _default(props) {
       onShowKrClick: function onShowKrClick(val) {
         return setShowKr(val);
       },
+      onShowCardKr: function onShowCardKr(val) {
+        return setShowCardKr(val);
+      },
       onSearchChange: onSearchChangeHandler,
       onPeriodChange: function onPeriodChange(period) {
         return setPeriod(period);
@@ -446,6 +467,7 @@ function _default(props) {
       darkTheme: darkTheme,
       direction: direction,
       showkr: showkr,
+      showCardKr: showCardKr,
       period: period
     }), /*#__PURE__*/_react["default"].createElement("div", {
       className: (0, _classnames["default"])("".concat(_precls["default"], "__content"))
@@ -469,6 +491,7 @@ function _default(props) {
         return /*#__PURE__*/_react["default"].createElement(OkrSearchPanel, _extends({
           ref: okrMapRef,
           showkr: showkr,
+          showCardKr: showCardKr,
           direction: direction,
           darkTheme: darkTheme,
           openLevel: openLevel,

package/lib/pages/okr-map/export-modules/share-okr-page/header/index.js

@@ -37,12 +37,17 @@ function _default(props) {
       direction = props.direction;
   var period = {};
   var iconButtons = [{
-    icon: "export",
-    overlay: (0, _getLocale.getLocale)("Mod_Export")
+    icon: "daochu",
+    overlay: (0, _getLocale.getLocale)("Mod_Export"),
+    type: 'export'
   }, {
-    icon: direction == "horizontal" ? "vertical" : "horizontal",
-    overlay: direction == "horizontal" ? "".concat((0, _getLocale.getLocale)("OKR_Ali_Butt_Toggleportrait")) : "".concat((0, _getLocale.getLocale)("OKR_Ali_Butt_Togglelandscape"))
-  }]; // 获取地图数据
+    icon: direction == "horizontal" ? "yangshi-ditu" : "yangshi-ditu",
+    overlay: direction == "horizontal" ? "".concat((0, _getLocale.getLocale)("OKR_Ali_Butt_Toggleportrait")) : "".concat((0, _getLocale.getLocale)("OKR_Ali_Butt_Togglelandscape")),
+    placement: "topRight",
+    rotate: direction == "horizontal" ? 0 : -90,
+    type: direction == "horizontal" ? "vertical" : "horizontal"
+  } // { icon: direction == "horizontal" ? "vertical" : "horizontal", overlay: direction == "horizontal" ? `${getLocale("OKR_Ali_Butt_Toggleportrait")}` : `${getLocale("OKR_Ali_Butt_Togglelandscape")}` },
+  ]; // 获取地图数据
 
   (0, _react.useEffect)(function () {// ...
   }, []);

package/lib/pages/okr-map/number-select/index.css

@@ -2,7 +2,6 @@
   font-size: 14px;
   font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
   color: #3F4755;
-  width: 136px;
   position: relative;
 }
 
@@ -39,6 +38,10 @@
   user-select: none;
 }
 
+.titaui-number-select--action-icon-right {
+  line-height: 12px;
+}
+
 .titaui-number-select--action-icon:hover {
   background: #2879FF;
 }

package/lib/pages/okr-map/number-select/index.js

@@ -72,7 +72,7 @@ function NumberSelect(props) {
   }, "-"), /*#__PURE__*/React.createElement("span", {
     className: (0, _classnames["default"])("".concat(preCls, "--value"))
   }, num), /*#__PURE__*/React.createElement("span", {
-    className: (0, _classnames["default"])("".concat(preCls, "--action-icon"), _defineProperty({}, "".concat(preCls, "--action-icon__disable"), num == max)),
+    className: (0, _classnames["default"])("".concat(preCls, "--action-icon"), "".concat(preCls, "--action-icon-right"), _defineProperty({}, "".concat(preCls, "--action-icon__disable"), num == max)),
     onClick: addHandler
   }, "+")));
 }

package/package.json

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