@titaui/pc 1.15.40-beta.2 → 1.15.40-beta.3

package/lib/components/menus/export-modules/summary-menus/depart-menus/index.js

@@ -176,7 +176,7 @@ var _default = function _default() {
           deWeightData[item.id] = item;
         });
         var result = Object.values(deWeightData);
-        setRawTreeData(_toConsumableArray(result));
+        setRawTreeData([].concat(result));
         setTreeData((0, _utils.toTree)(rawTreeData));
         resolve(true);
       });

package/lib/components/nav-top/components/app-center/index.js

@@ -91,7 +91,6 @@ var AppCenter = function AppCenter(props) {
       isTrial = _useState6[0];
 
   var _useState7 = (0, _react.useState)(function () {
-    console.log(apps);
     var localCurrentAppId = sessionStorage.getItem("LocalCurrentAppId_".concat(userId));
 
     if (localCurrentAppId) {
@@ -125,7 +124,6 @@ var AppCenter = function AppCenter(props) {
       return app.id === currentAppId;
     })) === null || _apps$find === void 0 ? void 0 : _apps$find.children) || [];
     var navigations = (0, _utils.getMenus)();
-    console.log(currentAppId, 'currentAppId');
     sessionStorage.setItem("LocalCurrentAppId_".concat(userId), currentAppId.toString());
     var dynamic = navigations.filter(function (item) {
       return item.code === 'dynamic';
@@ -154,7 +152,6 @@ var AppCenter = function AppCenter(props) {
       return;
     }
 
-    console.log(app, 'app');
     setCurrentAppId(app.id);
     closeAppCenter();
   };
@@ -235,7 +232,7 @@ var AppCenter = function AppCenter(props) {
         });
       }
 
-      if (!activeMenu) {
+      if (!activeMenu && newQuickMenu.length > 0) {
         var _newQuickMenu$2;
 
         window.location.href = (_newQuickMenu$2 = newQuickMenu[0]) === null || _newQuickMenu$2 === void 0 ? void 0 : _newQuickMenu$2.href;
@@ -243,15 +240,9 @@ var AppCenter = function AppCenter(props) {
     }
   };
 
-  var handleSetting = function handleSetting(e) {
-    var _QuickEntranceDialogR;
-
-    e.stopPropagation();
-    (_QuickEntranceDialogR = QuickEntranceDialogRef.current) === null || _QuickEntranceDialogR === void 0 ? void 0 : _QuickEntranceDialogR.showDialog();
-  };
-
   var RenderSettingBtn = function RenderSettingBtn(props) {
-    var app = props.app;
+    var app = props.app,
+        QuickEntranceDialogRef = props.QuickEntranceDialogRef;
 
     var _useState9 = (0, _react.useState)(false),
         _useState10 = _slicedToArray(_useState9, 2),
@@ -261,14 +252,31 @@ var AppCenter = function AppCenter(props) {
     (0, _react.useEffect)(function () {
       var cacheIsKonw = localStorage.getItem("AppCenterSettingGuide_".concat((0, _helpers.getLoginUserInfo)().Id));
       !cacheIsKonw && setSettingGuideVisible(true);
-    });
+    }, []);
 
     var handleSettingGuideClose = function handleSettingGuideClose() {
       localStorage.setItem("AppCenterSettingGuide_".concat((0, _helpers.getLoginUserInfo)().Id), (0, _helpers.getLoginUserInfo)().Id);
+      setSettingGuideVisible(false);
+    };
+
+    var onHandleClickGuideTip = function onHandleClickGuideTip(e) {
+      //用来阻止事件冒泡
+      e.stopPropagation();
+    };
+
+    var handleSetting = function handleSetting(e) {
+      var _QuickEntranceDialogR;
+
+      e.stopPropagation();
+      (_QuickEntranceDialogR = QuickEntranceDialogRef.current) === null || _QuickEntranceDialogR === void 0 ? void 0 : _QuickEntranceDialogR.showDialog();
+      handleSettingGuideClose();
     };
 
     if (app.appId === 1) {
-      return /*#__PURE__*/_react["default"].createElement(_guideTip["default"], {
+      return /*#__PURE__*/_react["default"].createElement("span", {
+        className: "".concat(precls, "__app-item-name__right-btn"),
+        onClick: onHandleClickGuideTip
+      }, /*#__PURE__*/_react["default"].createElement(_guideTip["default"], {
         visible: settingGuideVisible,
         content: /*#__PURE__*/_react["default"].createElement("div", {
           className: "".concat(precls, "__app-item-name__right-btn__guide-tip")
@@ -277,9 +285,8 @@ var AppCenter = function AppCenter(props) {
         popupPlacement: 'bottom',
         type: 'button'
       }, /*#__PURE__*/_react["default"].createElement("span", {
-        className: "".concat(precls, "__app-item-name__right-btn"),
         onClick: handleSetting
-      }, "\u8BBE\u7F6E"));
+      }, "\u8BBE\u7F6E")));
     }
 
     return /*#__PURE__*/_react["default"].createElement("span", null);
@@ -312,7 +319,8 @@ var AppCenter = function AppCenter(props) {
     }, /*#__PURE__*/_react["default"].createElement("span", {
       className: "".concat(precls, "__app-item-name")
     }, /*#__PURE__*/_react["default"].createElement("span", null, app.title), /*#__PURE__*/_react["default"].createElement(RenderSettingBtn, {
-      app: app
+      app: app,
+      QuickEntranceDialogRef: QuickEntranceDialogRef
     })), isTrial && /*#__PURE__*/_react["default"].createElement("span", {
       className: "".concat(precls, "__app-item-sub-title")
     }, app.subTitle)));

package/lib/components/okr-guide/index.js

@@ -115,7 +115,6 @@ var OkrGuide = function OkrGuide(props) {
           onthers = _objectWithoutProperties(res, _excluded);
 
       changeSetting(onthers);
-      console.log(hasSetting, 'hasSetting');
     });
   }, []);
 
@@ -173,8 +172,6 @@ var OkrGuide = function OkrGuide(props) {
   };
 
   var handleSubmit = function handleSubmit() {
-    console.log(isOpenCount, 'count');
-
     if (isOpenCount > 3) {
       _toast["default"].Warning('周期最多选择 3 项');
 
@@ -185,7 +182,6 @@ var OkrGuide = function OkrGuide(props) {
         others = _objectWithoutProperties(setting, _excluded2);
 
     (0, _requestApi.addCycleSetting)(_objectSpread({}, others)).then(function () {
-      console.log('then');
       handlerOnclickCreatOkr();
     });
   };

package/lib/components/okrcase-library/index.js

@@ -298,6 +298,7 @@ function OKRCases(props) {
 
   var handleSecondNavItemClick = function handleSecondNavItemClick(num) {
     if (isUnlock) {
+      var work = navList[activeNavId];
       setIsTouchBottom(false);
       pageNumberRef.current = 1;
       setIsNextPageEmpty(false);
@@ -305,7 +306,7 @@ function OKRCases(props) {
       setSecondActiveNavId(num);
       (0, _network.postForCases)({
         pageNumber: 1,
-        labelId: activeNavId,
+        labelId: work.id,
         subLabelId: num,
         key: ""
       }).then(function (res) {

package/lib/components/quick-entrance/index.js

@@ -23,6 +23,8 @@ var _requestApi = require("./request-api");
 
 var _checkbox = _interopRequireDefault(require("../checkbox"));
 
+var _toast = _interopRequireDefault(require("../toast"));
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -165,6 +167,12 @@ var QuickEntranceDialog = /*#__PURE__*/(0, _react.forwardRef)(function (props, r
   var handleClickDelete = function handleClickDelete(id) {
     var newEntrancelist = _toConsumableArray(entrancelist);
 
+    if (newEntrancelist.length < 2) {
+      _toast["default"].Warning("请至少选择一个");
+
+      return;
+    }
+
     var filterNewEntranceList = newEntrancelist.filter(function (item) {
       if (item.id === id) {
         return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.15.40-beta.2",
+  "version": "1.15.40-beta.3",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",
@@ -155,6 +155,7 @@
     "react-spring": "9.2.4",
     "react-transition-group": "4.4.2",
     "resize-observer-polyfill": "1.5.1",
+    "sortablejs": "^1.12.0",
     "slick-carousel": "1.8.1",
     "tita-ui": "1.2.56",
     "url-parse": "1.5.1",