@titaui/pc 1.10.50 → 1.10.51

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.
Files changed (10) hide show
  1. package/lib/components/button/default-button/index.css +10 -4
  2. package/lib/components/button/default-button/index.js +13 -2
  3. package/lib/components/menus/export-modules/manage-menus/constant.js +1 -1
  4. package/lib/components/menus/export-modules/manage-menus/index.css +3 -0
  5. package/lib/components/menus/images/okr-gongsi.svg +17 -0
  6. package/lib/components/okr-detail/components/okr-tree/tree-node/e-node/e-project.js +1 -1
  7. package/lib/components/okr-detail/components/okr-tree/tree-node/e-node/index.css +2 -1
  8. package/lib/pages/new-okr-list/index.js +1 -1
  9. package/package.json +1 -1
  10. package/yarn-error.log +0 -22184
package/lib/components/button/default-button/index.css CHANGED
@@ -17,7 +17,7 @@
17
17
  }
18
18
 
19
19
  .tita-button-primary {
20
- background: #2879FF;
20
+ background: #2879ff;
21
21
  color: #ffffff;
22
22
  border-radius: 4px;
23
23
  box-sizing: border-box;
@@ -29,13 +29,13 @@
29
29
  }
30
30
 
31
31
  .tita-button-primary:hover {
32
- background: #5C8EFF;
32
+ background: #5c8eff;
33
33
  }
34
34
 
35
35
  .tita-button-default {
36
36
  background: #ffffff;
37
37
  border-radius: 4px;
38
- border: 1px solid #2879FF;
38
+ border: 1px solid #2879ff;
39
39
  box-sizing: border-box;
40
40
  display: flex;
41
41
  align-items: center;
@@ -45,5 +45,11 @@
45
45
  }
46
46
 
47
47
  .tita-button-default:hover {
48
- background: #E9F1FF;
48
+ background: #e9f1ff;
49
+ }
50
+
51
+ .tita-button--disabled {
52
+ opacity: 0.4;
53
+ cursor: not-allowed;
54
+ user-select: none;
49
55
  }
package/lib/components/button/default-button/index.js CHANGED
@@ -13,7 +13,7 @@ var _getLocale = require("../../../utils/getLocale");
13
13
 
14
14
  require("./index.css");
15
15
 
16
- var _excluded = ["type", "children", "size", "className"];
16
+ var _excluded = ["type", "children", "size", "disable", "className"];
17
17
 
18
18
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
19
19
 
@@ -28,20 +28,31 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
28
28
  var preCls = "tita-button";
29
29
 
30
30
  var Button = function Button(_ref) {
31
+ var _classNames;
32
+
31
33
  var _ref$type = _ref.type,
32
34
  type = _ref$type === void 0 ? "default" : _ref$type,
33
35
  _ref$children = _ref.children,
34
36
  children = _ref$children === void 0 ? (0, _getLocale.getLocale)("OKR_MyO_Butt_Determine") : _ref$children,
35
37
  _ref$size = _ref.size,
36
38
  size = _ref$size === void 0 ? "middle" : _ref$size,
39
+ _ref$disable = _ref.disable,
40
+ disable = _ref$disable === void 0 ? false : _ref$disable,
37
41
  _ref$className = _ref.className,
38
42
  className = _ref$className === void 0 ? "" : _ref$className,
39
43
  restProps = _objectWithoutProperties(_ref, _excluded);
40
44
 
41
45
  return /*#__PURE__*/_react["default"].createElement("div", _extends({
42
- className: (0, _classnames["default"])(_defineProperty({}, "".concat(preCls, "-primary"), type === "primary"), _defineProperty({}, "".concat(preCls, "-default"), type === "default"), "".concat(preCls, "-").concat(size), className)
46
+ className: (0, _classnames["default"])((_classNames = {}, _defineProperty(_classNames, "".concat(preCls, "-primary"), type === "primary"), _defineProperty(_classNames, "".concat(preCls, "-default"), type === "default"), _defineProperty(_classNames, "".concat(preCls, "--disabled"), disable), _classNames), "".concat(preCls, "-").concat(size), className)
43
47
  }, restProps), children);
44
48
  };
45
49
 
50
+ Button.defaultProps = {
51
+ type: "default",
52
+ children: (0, _getLocale.getLocale)("OKR_MyO_Butt_Determine"),
53
+ size: "middle",
54
+ disable: false,
55
+ className: ""
56
+ };
46
57
  var _default = Button;
47
58
  exports["default"] = _default;
package/lib/components/menus/export-modules/manage-menus/constant.js CHANGED
@@ -8,7 +8,7 @@ exports.menus = void 0;
8
8
  var _i18n = require("../../i18n");
9
9
 
10
10
  var menus = [{
11
- icon: "okr",
11
+ icon: "enterprise",
12
12
  label: _i18n.locale.menu_regulation_enterprise,
13
13
  key: "enterprise",
14
14
  href: "",
package/lib/components/menus/export-modules/manage-menus/index.css CHANGED
@@ -0,0 +1,3 @@
1
+ .titaui-menus-tree__parent-menu-node-icon.enterprise {
2
+ background-image: url("../../images/okr-gongsi.svg");
3
+ }
package/lib/components/menus/images/okr-gongsi.svg ADDED
@@ -0,0 +1,17 @@
1
+ <?xml version="1.0" encoding="UTF-8"?>
2
+ <svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
3
+ <title>OKR-gongsi</title>
4
+ <g id="新" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
5
+ <g id="OKR-gongsi">
6
+ <rect id="矩形" fill-opacity="0" fill="#FFFFFF" x="0" y="0" width="18" height="18"></rect>
7
+ <g id="编组" transform="translate(3.000000, 1.875000)" fill="#141C28">
8
+ <path d="M4.10139571,0.207109154 C5.30548811,-0.332079068 6.71387503,0.21781894 7.24711594,1.43534073 C7.38177811,1.74280798 7.45134383,2.07535848 7.45134383,2.41162737 L7.45134383,2.41162737 L7.45134383,4.57179909 L8.31469627,5.11190194 C8.50972555,5.210975 8.64355884,5.41510258 8.64355884,5.65083722 C8.64355884,5.98373015 8.37667242,6.25359319 8.04745134,6.25359319 C7.93433435,6.25359319 7.82857621,6.22173481 7.73847398,6.16640762 L7.737,6.169 L6.54112363,5.41956638 C6.39501401,5.32796807 6.29659069,5.17813983 6.26784152,5.01002569 L6.25912882,4.90728246 L6.25912882,2.41162737 C6.25912882,2.24349293 6.22434596,2.07721768 6.15701487,1.92348405 L6.15701487,1.92348405 L6.14681255,1.9008124 C5.87280554,1.30793451 5.17867538,1.04314408 4.58415476,1.30936826 L4.58415476,1.30936826 L1.90167098,2.5105748 C1.47035103,2.70371832 1.19221501,3.13584938 1.19221501,3.61283391 L1.19221501,3.61283391 L1.19221501,11.8389761 C1.19221501,12.504762 1.72598786,13.0445078 2.38443003,13.0445078 L2.38443003,13.0445078 L7.995,13.044 L8.04745134,14.2401098 L9.74192999,14.2409586 C9.68587029,14.2458533 9.62924586,14.2488023 9.57212243,14.249738 L9.57212243,14.249738 L9.5377201,14.25 L2.38443003,14.25 C1.06754569,14.25 0,13.1705478 0,11.8389761 L0,11.8389761 L0,3.61283391 C0,2.65886485 0.556272039,1.79460272 1.41891194,1.4083157 L1.41891194,1.4083157 Z" id="形状结合" fill-rule="nonzero"></path>
9
+ <rect id="矩形" x="3.15" y="3.26067444" width="1.2" height="4.8" rx="0.6"></rect>
10
+ </g>
11
+ <g id="编组" transform="translate(7.275000, 8.775000)">
12
+ <path d="M2.65951382,0.134116403 L1.38451382,0.868914715 C0.643634524,1.29589264 0.1875,2.08321551 0.1875,2.93505159 L0.1875,4.41494841 C0.1875,5.26678449 0.643634524,6.05410736 1.38451382,6.48108529 L2.65951382,7.2158836 C3.40359267,7.64470547 4.32140733,7.64470547 5.06548618,7.2158836 L6.34048618,6.48108529 C7.08136548,6.05410736 7.5375,5.26678449 7.5375,4.41494841 L7.5375,2.93505159 C7.5375,2.08321551 7.08136548,1.29589264 6.34048618,0.868914715 L5.06548618,0.134116403 C4.32140733,-0.294705468 3.40359267,-0.294705468 2.65951382,0.134116403 Z M4.46399309,1.16718484 L5.73899309,1.90198315 C6.10943274,2.11547211 6.3375,2.50913355 6.3375,2.93505159 L6.3375,4.41494841 C6.3375,4.84086645 6.10943274,5.23452789 5.73899309,5.44801685 L4.46399309,6.18281516 C4.09195366,6.3972261 3.63304634,6.3972261 3.26100691,6.18281516 L1.98600691,5.44801685 C1.61556726,5.23452789 1.3875,4.84086645 1.3875,4.41494841 L1.3875,2.93505159 C1.3875,2.50913355 1.61556726,2.11547211 1.98600691,1.90198315 L3.26100691,1.16718484 C3.63304634,0.952773904 4.09195366,0.952773904 4.46399309,1.16718484 Z" id="多边形" fill="#141C28" fill-rule="nonzero" transform="translate(3.862500, 3.675000) rotate(-90.000000) translate(-3.862500, -3.675000) "></path>
13
+ <circle id="椭圆形" stroke="#2879FF" stroke-width="1.05" cx="3.8625" cy="3.675" r="1.0875"></circle>
14
+ </g>
15
+ </g>
16
+ </g>
17
+ </svg>
package/lib/components/okr-detail/components/okr-tree/tree-node/e-node/e-project.js CHANGED
@@ -140,7 +140,7 @@ function _default(props) {
140
140
  isPercent: true
141
141
  })), isCreate && /*#__PURE__*/_react["default"].createElement("span", {
142
142
  className: (0, _classnames["default"])("".concat(_precls["default"], "__e-project-node-title-approvaling"))
143
- }, "\u7ACB\u9879\u4E2D")), /*#__PURE__*/_react["default"].createElement("div", {
143
+ }, (0, _getLocale.getLocale)('Pro_MyS_Establishment'))), /*#__PURE__*/_react["default"].createElement("div", {
144
144
  className: (0, _classnames["default"])("".concat(_precls["default"], "__e-project-node-actions"))
145
145
  }, /*#__PURE__*/_react["default"].createElement("span", {
146
146
  className: (0, _classnames["default"])("".concat(_precls["default"], "__e-project-node-actions-user"))
package/lib/components/okr-detail/components/okr-tree/tree-node/e-node/index.css CHANGED
@@ -166,7 +166,8 @@
166
166
  display: inline-flex;
167
167
  align-items: center;
168
168
  justify-content: center;
169
- min-width: 48px;
169
+ min-width: 36px;
170
+ padding: 0 6px;
170
171
  height: 20px;
171
172
  font-size: 12px;
172
173
  font-weight: 400;
package/lib/pages/new-okr-list/index.js CHANGED
@@ -205,7 +205,7 @@ var NewOkrList = function NewOkrList(props) {
205
205
  params.Searchpage = 2;
206
206
  }
207
207
 
208
- if (departmentId !== 0) {
208
+ if (departmentId !== 0 && departmentId !== "0") {
209
209
  params.keyWords = "";
210
210
  }
211
211
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@titaui/pc",
3
- "version": "1.10.50",
3
+ "version": "1.10.51",
4
4
  "nameCN": "",
5
5
  "description": "",
6
6
  "main": "lib/index.js",