@titaui/pc 1.11.27-beta.5 → 1.11.27-beta.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -39,7 +39,7 @@
39
39
 
40
40
  .titaui-dialog-confirm__btn-cancel:hover {
41
41
  color: #2879ff;
42
- border: 1px solid #2879ff;
42
+ border: 1px solid #2879ff !important;
43
43
  }
44
44
 
45
45
  .titaui-dialog-confirm__btn-cancel-text {
@@ -83,7 +83,7 @@ var getApprovalIsShow = function getApprovalIsShow(approvalSetting, type, applyS
83
83
  exports.getApprovalIsShow = getApprovalIsShow;
84
84
 
85
85
  var getApproval = function getApproval(approvalSetting, type, applyState, isCreate) {
86
- return !(!(approvalSetting !== null && approvalSetting !== void 0 && approvalSetting[type]) && applyState === EApproveStatus.UnderApproval && isCreate) || (approvalSetting === null || approvalSetting === void 0 ? void 0 : approvalSetting[type]) && applyState !== EApproveStatus.UnderApproval;
86
+ return !(!(approvalSetting !== null && approvalSetting !== void 0 && approvalSetting[type]) && applyState === EApproveStatus.UnderApproval && isCreate || approvalSetting !== null && approvalSetting !== void 0 && approvalSetting[type] && applyState !== EApproveStatus.UnderApproval);
87
87
  };
88
88
 
89
89
  exports.getApproval = getApproval;
@@ -91,7 +91,7 @@ exports.getApproval = getApproval;
91
91
  var getApprovalOkr = function getApprovalOkr(approvalSetting, type, applyState) {
92
92
  var okrType = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
93
93
  var okrCreate = okrType === null || okrType === void 0 ? void 0 : okrType.includes(EApprovalTypes.CreateOkr);
94
- getApproval(approvalSetting, type, applyState, okrCreate);
94
+ return getApproval(approvalSetting, type, applyState, okrCreate);
95
95
  };
96
96
 
97
97
  exports.getApprovalOkr = getApprovalOkr;
@@ -102,7 +102,7 @@ var getApprovalKr = function getApprovalKr(approvalSetting, type, applyState) {
102
102
  var okrCreate = okrType === null || okrType === void 0 ? void 0 : okrType.includes(EApprovalTypes.CreateOkr);
103
103
  var krCreate = krType === null || krType === void 0 ? void 0 : krType.includes(EApprovalKrTypes.Createkr);
104
104
  var isCreate = okrCreate || krCreate;
105
- getApproval(approvalSetting, type, applyState, isCreate);
105
+ return getApproval(approvalSetting, type, applyState, isCreate);
106
106
  };
107
107
 
108
108
  exports.getApprovalKr = getApprovalKr;
@@ -103,7 +103,7 @@ var OperateRecord = function OperateRecord(props) {
103
103
  offset: [0, 4]
104
104
  }
105
105
  }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
106
- overlay: (0, _getLocale.getLocale)('Per_details_OperationRecord'),
106
+ overlay: (0, _getLocale.getLocale)('Feed_Set_Pop_Butt_More'),
107
107
  placement: "top"
108
108
  }, /*#__PURE__*/_react["default"].createElement("span", {
109
109
  className: "".concat(_precls.precls, "__header-record")
@@ -11,7 +11,7 @@ var _react = _interopRequireWildcard(require("react"));
11
11
 
12
12
  var _classnames = _interopRequireDefault(require("classnames"));
13
13
 
14
- var _importOkrFlow = _interopRequireDefault(require("&/components/import-okr-flow"));
14
+ var _okrFlow = _interopRequireDefault(require("../../../components/okr-flow"));
15
15
 
16
16
  require("./index.css");
17
17
 
@@ -61,10 +61,8 @@ function _default(props) {
61
61
  isIE && setIsIE(true);
62
62
  setLoading(false);
63
63
  } else {
64
- (0, _importOkrFlow["default"])().then(function (okrmap) {
65
- okrMapCmp.current = okrmap.OkrSearchPanel;
66
- setLoading(false);
67
- });
64
+ okrMapCmp.current = _okrFlow["default"];
65
+ setLoading(false);
68
66
  }
69
67
  }, []);
70
68
  if (loading) return /*#__PURE__*/_react["default"].createElement("span", null);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@titaui/pc",
3
- "version": "1.11.27-beta.5",
3
+ "version": "1.11.27-beta.8",
4
4
  "nameCN": "",
5
5
  "description": "",
6
6
  "main": "lib/index.js",