@titaui/pc 1.10.46 → 1.10.47

package/lib/components/checkbox/index.css

@@ -11,6 +11,7 @@
 
 .titaui-checkbox--checked {
   background: url(./checked.svg) transparent no-repeat 50% 50%;
+  border: none;
 }
 
 .titaui-checkbox--disabled {

package/lib/components/dialog/index.css

@@ -28,7 +28,10 @@
 }
 
 .titaui-dialog .rc-dialog-close {
-  top: 16px;
+  padding: 0;
+  font-size: 20px;
+  right: 30px;
+  top: 20px;
   cursor: pointer;
   opacity: 1 !important;
   z-index: 2;

package/lib/components/dialog/index.js

@@ -108,7 +108,7 @@ function _default(props) {
     visible: visible,
     className: (0, _classnames["default"])(preCls, _toConsumableArray(extraClass), (_classNames2 = {}, _defineProperty(_classNames2, "".concat(preCls, "-no-head-line"), noHeadLine), _defineProperty(_classNames2, "".concat(preCls, "-no-footer-line"), noFooterLine), _defineProperty(_classNames2, "".concat(preCls, "-no-close"), noCloseIcon), _defineProperty(_classNames2, "".concat(preCls, "-no-footer"), noFooter), _classNames2)),
     closeIcon: /*#__PURE__*/_react["default"].createElement("span", {
-      className: "tu-icon-close"
+      className: "tu-icon-canceled"
     }),
     animation: "slide-fade",
     maskAnimation: "fade",

package/lib/components/mblog/index.js

@@ -169,17 +169,23 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
     };
 
     _this.handlerDealAttachemntData = function (uploadSuccessFilesPath) {
+      var _this$refs$textEditor2;
+
       var successFilesPath = uploadSuccessFilesPath.filter(function (item) {
         return item !== "";
       });
       var successFilesPathLen = successFilesPath.length; // @ts-ignore
 
-      var textareaInput = _this.refs.textEditor.refs.textareaInput;
+      var _this$refs$textEditor = (_this$refs$textEditor2 = _this.refs.textEditor) === null || _this$refs$textEditor2 === void 0 ? void 0 : _this$refs$textEditor2.refs,
+          textareaInput = _this$refs$textEditor.textareaInput;
+
       var textareaValue = _this.state.textareaValue; // textareaValue = dealWithLoadedFileTips(textareaValue, successFilesPathLen); // 更新输入框内容
 
       localStorage.setItem(_this.state.localStroageKey, textareaValue); // 将输入框内容进行本地缓存
 
-      textareaInput.focus();
+      if (textareaInput) {
+        textareaInput.focus();
+      }
 
       _this.setState({
         textareaValue: textareaValue,
@@ -192,9 +198,12 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
     _this.focus = function () {
       // @ts-ignore
       var textareaInput = _this.refs.textEditor.refs.textareaInput;
-      setTimeout(function () {
-        textareaInput.focus();
-      }, 300);
+
+      if (textareaInput) {
+        setTimeout(function () {
+          textareaInput.focus();
+        }, 300);
+      }
     };
 
     _this.allowSubmit = function (content) {

package/lib/components/okr-detail/components/okr-tree/tree-node/e-node/e-project.js

@@ -120,6 +120,9 @@ function _default(props) {
     window.open(window.location.href.replace(location.hash, "#work?iTalentNavCode=tita-work&work_id=".concat(data.id)));
   };
 
+  var workApplyType = data.workApplyType,
+      workApplyStatus = data.workApplyStatus;
+  var isCreate = (workApplyStatus === 1 || workApplyStatus === 3 || workApplyStatus === 4) && workApplyType === 48;
   return /*#__PURE__*/_react["default"].createElement("div", {
     key: index,
     className: (0, _classnames["default"])("".concat(_precls["default"], "__e-project-node"))
@@ -130,10 +133,14 @@ function _default(props) {
   })), /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__e-project-node-title ")),
     onClick: openProjectDetail
+  }, /*#__PURE__*/_react["default"].createElement("span", {
+    className: (0, _classnames["default"])("".concat(_precls["default"], "__e-project-node-title-name "))
   }, /*#__PURE__*/_react["default"].createElement(_tooltipText["default"], {
     text: (0, _helpers.escapeHtml)(title),
     isPercent: true
-  })), /*#__PURE__*/_react["default"].createElement("div", {
+  })), isCreate && /*#__PURE__*/_react["default"].createElement("span", {
+    className: (0, _classnames["default"])("".concat(_precls["default"], "__e-project-node-title-approvaling"))
+  }, "\u7ACB\u9879\u4E2D")), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__e-project-node-actions"))
   }, /*#__PURE__*/_react["default"].createElement("span", {
     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

@@ -147,7 +147,7 @@
 }
 
 .tita-okrdt-tree__e-project-node-title {
-  display: inline-block;
+  display: inline-flex;
   font-size: 14px;
   font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
   color: #3f4755;
@@ -158,6 +158,24 @@
   flex: 1;
 }
 
+.tita-okrdt-tree__e-project-node-title-name {
+  overflow: hidden;
+}
+
+.tita-okrdt-tree__e-project-node-title-approvaling {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  min-width: 48px;
+  height: 20px;
+  font-size: 12px;
+  font-weight: 400;
+  color: #F05E5E;
+  background: rgba(240, 94, 94, 0.1);
+  border-radius: 10px;
+  margin-left: 8px;
+}
+
 .tita-okrdt-tree__e-project-node-gray {
   color: #BFC7D5 !important;
 }

package/lib/components/okr-share/common-painter/openDataPainter.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = _default;
+exports["default"] = void 0;
 
 var _openData = require("../../../utils/open-data");
 
@@ -13,12 +13,38 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 
-function _default(_x, _x2, _x3) {
-  return _ref.apply(this, arguments);
+var getOpenData = function getOpenData(_ref) {
+  var id = _ref.id,
+      name = _ref.name,
+      type = _ref.type;
+  var openId = (0, _openData.getOpenId)(id, type);
+  if (!window.WWOpenData || !openId) return Promise.resolve(name);
+  return new Promise(function (resolve, reject) {
+    window.WWOpenData.prefetch({
+      items: [{
+        id: openId,
+        type: type
+      }]
+    }, function (err, data) {
+      if (err) {
+        return reject(err);
+      }
+
+      if (data && data.items[0]) {
+        resolve(data.items[0].data);
+      } else {
+        resolve(name);
+      }
+    });
+  });
+};
+
+function openDataPainter(_x, _x2, _x3) {
+  return _openDataPainter.apply(this, arguments);
 }
 
-function _ref() {
-  _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(ctx, openDataParams, lineHeight) {
+function _openDataPainter() {
+  _openDataPainter = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(ctx, openDataParams, lineHeight) {
     var maxWidth,
         name,
         _ctx$measureText,
@@ -69,27 +95,8 @@ function _ref() {
       }
     }, _callee);
   }));
-  return _ref.apply(this, arguments);
+  return _openDataPainter.apply(this, arguments);
 }
 
-var getOpenData = function getOpenData(_ref2) {
-  var id = _ref2.id,
-      name = _ref2.name,
-      type = _ref2.type;
-  var openId = (0, _openData.getOpenId)(id, type);
-  if (!window.WWOpenData || !openId) return Promise.resolve(name);
-  return new Promise(function (resolve, reject) {
-    window.WWOpenData.prefetch({
-      items: [{
-        id: openId,
-        type: type
-      }]
-    }, function (err, data) {
-      if (err) {
-        return reject(err);
-      }
-
-      resolve(data.items[0].data);
-    });
-  });
-};
+var _default = openDataPainter;
+exports["default"] = _default;

package/lib/components/open-data-painter/index.js

@@ -90,7 +90,11 @@ var getOpenData = function getOpenData(_ref2) {
         return reject(err);
       }
 
-      resolve(data.items[0].data);
+      if (data && data.items[0]) {
+        resolve(data.items[0].data);
+      } else {
+        resolve(name);
+      }
     });
   });
 };

package/lib/components/rich-editor/plugins/inline/color/index.js

@@ -19,6 +19,10 @@ var _selector = _interopRequireDefault(require("./selector"));
 
 var _getLocale = require("../../../../../utils/getLocale");
 
+var _util = require("./util");
+
+var _consts = require("./consts");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -50,10 +54,11 @@ var colorReg = /^\s*(rgba\([^)]+\)|rgb\([^)]+\)|#[\d|a-f]{3,6})|\w*/i;
 
 var getColorAttrs = function getColorAttrs(style) {
   var color = style;
+  var key = (0, _util.findColor)(color, _consts.FontColor);
 
-  if (color) {
+  if (key) {
     return {
-      color: color
+      color: _consts.FontColor[key]
     };
   }
 
@@ -107,10 +112,11 @@ var getBgAttrs = function getBgAttrs(style) {
   var colorMatch = style.match(colorReg);
   if (!colorMatch) return false;
   var background = colorMatch[0];
+  var key = (0, _util.findColor)(background, _consts.BackgroundColor);
 
-  if (background) {
+  if (key) {
     return {
-      color: background
+      color: _consts.BackgroundColor[key]
     };
   }
 

package/lib/components/rich-editor/plugins/inline/color/util.js

@@ -0,0 +1,25 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.findColor = findColor;
+exports.isColorEqual = isColorEqual;
+
+var _color = _interopRequireDefault(require("color"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+function findColor(color, colorEnum) {
+  for (var key in colorEnum) {
+    if (isColorEqual(colorEnum[key], color)) {
+      return key;
+    }
+  }
+
+  return null;
+}
+
+function isColorEqual(a, b) {
+  return new _color["default"](a).contrast(new _color["default"](b)) === 1;
+}

package/lib/components/rich-editor/ui/normal-toolbar/index.css

@@ -1,6 +1,7 @@
 .tita-rich-editor-normal-toolbar {
   display: flex;
   align-items: center;
+  padding: 12px 0;
 }
 
 .tita-rich-editor-normal-toolbar-item {

package/lib/components/weekly-report/common-painter/openDataPainter.js

@@ -89,7 +89,11 @@ var getOpenData = function getOpenData(_ref2) {
         return reject(err);
       }
 
-      resolve(data.items[0].data);
+      if (data && data.items[0]) {
+        resolve(data.items[0].data);
+      } else {
+        resolve(name);
+      }
     });
   });
 };

package/lib/pages/new-okr-list/index.js

@@ -205,8 +205,8 @@ var NewOkrList = function NewOkrList(props) {
       params.Searchpage = 2;
     }
 
-    if (departmentId != 0) {
-      params.keyWords = '';
+    if (departmentId !== 0) {
+      params.keyWords = "";
     }
 
     var request;
@@ -363,7 +363,7 @@ var NewOkrList = function NewOkrList(props) {
     className: "okr-list__check-filter-btn",
     onClick: triggerAnimation
   }, (0, _getLocale.getLocale)("OKR_MyO_Text_Check")), (0, _getLocale.getLocale)("OKR_MyO_Text_Topfiltercriteria")), /*#__PURE__*/_react["default"].createElement(_dialog["default"], {
-    zIndex: 99999,
+    zIndex: 1200,
     noHeadLine: true,
     visible: casesVisible,
     onClose: onCasesCloseHandler,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.10.46",
+  "version": "1.10.47",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",
@@ -22,6 +22,7 @@
     "@babel/core": "^7.11.1",
     "@babel/plugin-proposal-class-properties": "^7.10.4",
     "@babel/plugin-proposal-decorators": "^7.10.5",
+    "@babel/plugin-proposal-numeric-separator": "^7.16.7",
     "@babel/plugin-proposal-object-rest-spread": "^7.11.0",
     "@babel/plugin-transform-modules-commonjs": "^7.10.4",
     "@babel/plugin-transform-runtime": "^7.11.0",