@titaui/pc 1.10.46 → 1.10.49

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/dialog-confirm/index.css

@@ -98,7 +98,7 @@
 }
 
 .titaui-dialog-confirm__body-title {
-  display: flex;
+  display: inline-flex;
   align-items: center;
 }
 

package/lib/components/dynamic/dynamic-item/dynamic-chart/index.js

@@ -25,6 +25,8 @@ var _tools = require("../../../../utils/tools");
 
 var _header = _interopRequireDefault(require("../components/header"));
 
+var _utils = require("./utils");
+
 require("./index.css");
 
 var _excluded = ["data"];
@@ -41,47 +43,6 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
-var getChartProps = function getChartProps(chartPropsStr) {
-  var chartQuery = JSON.parse(chartPropsStr);
-
-  if (typeof chartQuery === "number") {
-    return {
-      chartId: String(chartQuery)
-    };
-  }
-
-  return {
-    chartId: chartQuery.id,
-    timeRange: chartQuery.timeRange
-  };
-};
-
-var systemPublisher = {
-  avatar: {
-    big: "https://file.tita.com/TitaImage/352728/d820ed195e204b5aa7d6d1b9bd94f215_b.png",
-    color: "#f0c75a",
-    hasAvatar: true,
-    large: "https://file.tita.com/TitaImage/352728/d820ed195e204b5aa7d6d1b9bd94f215_l.png",
-    medium: "https://file.tita.com/TitaImage/352728/d820ed195e204b5aa7d6d1b9bd94f215_m.png",
-    normal: "https://file.tita.com/TitaImage/352728/d820ed195e204b5aa7d6d1b9bd94f215_n.png",
-    original: "https://file.tita.com/TitaImage/352728/d820ed195e204b5aa7d6d1b9bd94f215_o.png",
-    small: "https://file.tita.com/TitaImage/352728/d820ed195e204b5aa7d6d1b9bd94f215_s.png"
-  },
-  blessingType: 0,
-  decorationType: 0,
-  departmentId: 0,
-  departmentName: null,
-  jobState: 0,
-  medalPosition: null,
-  medalUrl: null,
-  name: "Tita小助手",
-  postition: null,
-  praiseType: 0,
-  tag: null,
-  userId: 100000,
-  userMark: null,
-  userType: 0
-};
 var prefixCls = "titaui-dynamic-chart";
 
 var DynamicChart = function DynamicChart(_ref) {
@@ -93,7 +54,9 @@ var DynamicChart = function DynamicChart(_ref) {
   var _useContext = (0, _react.useContext)(_context.SearchKeyContext),
       searchKeyWord = _useContext.searchKeyWord;
 
-  var chartQuery = getChartProps(data.biId);
+  var chartQuery = (0, _utils.getChartProps)(data.biId); // const chartQuery = getChartProps('{"type":"diaryFeedChart","id":"43","timeRange":"2022/03/01T00:00:00 : 2022/03/05T00:00:00"}');
+  // console.log(chartQuery);
+
   (0, _react.useEffect)(function () {
     (0, _tools.highLightWord)({
       parentDom: contentRef.current,
@@ -105,7 +68,7 @@ var DynamicChart = function DynamicChart(_ref) {
   }, /*#__PURE__*/_react["default"].createElement(_header["default"], _extends({
     data: data
   }, restProps, {
-    user: systemPublisher,
+    user: _utils.systemPublisher,
     desc: /*#__PURE__*/_react["default"].createElement("div", {
       style: {
         marginLeft: "4px",
@@ -128,11 +91,11 @@ var DynamicChart = function DynamicChart(_ref) {
     alt: "right"
   }))), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefixCls, "__charts")
-  }, /*#__PURE__*/_react["default"].createElement(_supersetCharts["default"], _extends({}, chartQuery, {
-    layout: "feed-card",
+  }, /*#__PURE__*/_react["default"].createElement(_supersetCharts["default"], _extends({
     width: 800,
-    height: 400
-  }))));
+    height: 400,
+    layout: "feed-card"
+  }, chartQuery))));
 };
 
 var _default = DynamicChart;

package/lib/components/dynamic/dynamic-item/dynamic-chart/utils.js

@@ -0,0 +1,61 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.systemPublisher = exports.safeParse = exports.getChartProps = void 0;
+var systemPublisher = {
+  avatar: {
+    big: "https://file.tita.com/TitaImage/352728/d820ed195e204b5aa7d6d1b9bd94f215_b.png",
+    color: "#f0c75a",
+    hasAvatar: true,
+    large: "https://file.tita.com/TitaImage/352728/d820ed195e204b5aa7d6d1b9bd94f215_l.png",
+    medium: "https://file.tita.com/TitaImage/352728/d820ed195e204b5aa7d6d1b9bd94f215_m.png",
+    normal: "https://file.tita.com/TitaImage/352728/d820ed195e204b5aa7d6d1b9bd94f215_n.png",
+    original: "https://file.tita.com/TitaImage/352728/d820ed195e204b5aa7d6d1b9bd94f215_o.png",
+    small: "https://file.tita.com/TitaImage/352728/d820ed195e204b5aa7d6d1b9bd94f215_s.png"
+  },
+  blessingType: 0,
+  decorationType: 0,
+  departmentId: 0,
+  departmentName: null,
+  jobState: 0,
+  medalPosition: null,
+  medalUrl: null,
+  name: "Tita小助手",
+  postition: null,
+  praiseType: 0,
+  tag: null,
+  userId: 100000,
+  userMark: null,
+  userType: 0
+};
+exports.systemPublisher = systemPublisher;
+
+var safeParse = function safeParse(json) {
+  var parsed = {};
+
+  try {
+    parsed = JSON.parse(json);
+  } catch (e) {
+    throw new Error(e);
+  }
+
+  return parsed;
+};
+
+exports.safeParse = safeParse;
+
+var getChartProps = function getChartProps(json) {
+  var parsed = safeParse(json);
+
+  if (typeof parsed === "number") {
+    return {
+      id: parsed
+    };
+  }
+
+  return parsed;
+};
+
+exports.getChartProps = getChartProps;

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/superset-charts/components/chart/index.js

@@ -9,16 +9,14 @@ exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _init = require("../../init");
+var _fetchAssetsAndAppend = _interopRequireDefault(require("../../fetch-assets-and-append"));
 
-var _excluded = ["chartId"];
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -31,33 +29,25 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
-var lazyOnce = (0, _init.lazyLoad)();
+var singletonFetchAssetsAndAppend = (0, _fetchAssetsAndAppend["default"])();
 
 var Chart = function Chart(props) {
   var _window, _window$SupersetChart;
 
-  var chartId = props.chartId,
-      restProps = _objectWithoutProperties(props, _excluded);
-
-  var _useState = (0, _react.useState)(true),
+  var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
-      loading = _useState2[0],
-      setLoading = _useState2[1];
+      isInit = _useState2[0],
+      setIsInit = _useState2[1];
 
   (0, _react.useEffect)(function () {
-    lazyOnce === null || lazyOnce === void 0 ? void 0 : lazyOnce.then(function () {
-      setLoading(false);
-    });
-  }, []); // @ts-ignore
+    var _singletonFetchAssets;
 
+    (_singletonFetchAssets = singletonFetchAssetsAndAppend()) === null || _singletonFetchAssets === void 0 ? void 0 : _singletonFetchAssets.then(function () {
+      setIsInit(true);
+    });
+  }, []);
   var Chart = (_window = window) === null || _window === void 0 ? void 0 : (_window$SupersetChart = _window.SupersetChart) === null || _window$SupersetChart === void 0 ? void 0 : _window$SupersetChart.SupersetChart;
-  return /*#__PURE__*/_react["default"].createElement("div", null, Chart && !loading && chartId && /*#__PURE__*/_react["default"].createElement(Chart, _extends({
-    id: chartId
-  }, restProps)));
+  return /*#__PURE__*/_react["default"].createElement("div", null, Chart && isInit && /*#__PURE__*/_react["default"].createElement(Chart, props));
 };
 
 var _default = Chart;

package/lib/components/superset-charts/{init/insert-assets.js → fetch-assets-and-append/append-assets.js}

@@ -11,7 +11,7 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 
-var generateScript = function generateScript(assets) {
+var appendJs = function appendJs(assets) {
   return new Promise(function (resolve, reject) {
     var script = document.createElement("script");
     var r = false;
@@ -37,65 +37,70 @@ var generateScript = function generateScript(assets) {
   });
 };
 
-var generateStyle = function generateStyle(assets) {
+var appendCss = function appendCss(assets) {
   var el = document.createElement("link");
   el.href = assets.uri;
   return el;
 };
 
-var InsertAssetsList = /*#__PURE__*/function () {
-  function InsertAssetsList() {
+var AppendAssetsList = /*#__PURE__*/function () {
+  function AppendAssetsList() {
     var _this = this;
 
-    _classCallCheck(this, InsertAssetsList);
-
-    this.generateAssets = function (assets) {
-      var _this$strategy$type, _this$strategy;
+    _classCallCheck(this, AppendAssetsList);
 
+    this.appendAssets = function (assets) {
       var type = assets.type;
-      return (_this$strategy$type = (_this$strategy = _this.strategy)[type]) === null || _this$strategy$type === void 0 ? void 0 : _this$strategy$type.call(_this$strategy, assets);
+      return _this.strategy[type](assets);
     };
 
-    this.insertAssetsList = function () {
+    this.appendAssetsList = function () {
       if (!_this.assetsList.length) return undefined;
 
       if (!_this.init) {
         _this.init = true;
         var fragment = document.createDocumentFragment();
 
-        _this.assetsList.filter(function (element) {
-          return element.type === "css";
-        }).forEach(function (element) {
-          var el = generateStyle(element);
+        _this.assetsList.filter(function (assets) {
+          return assets.type !== "js";
+        }).forEach(function (assets) {
+          if (!assets.type || !_this.strategy[assets.type]) {
+            // eslint-disable-next-line no-console
+            console.error("assets type is not expected");
+            return;
+          }
+
+          var el = _this.appendAssets(assets);
+
           fragment.appendChild(el);
         });
 
-        return Promise.all(_this.assetsList.filter(function (element) {
-          return element.type === "js";
-        }).map(function (element) {
-          return generateScript(element);
+        return Promise.all(_this.assetsList.filter(function (assets) {
+          return assets.type === "js";
+        }).map(function (assets) {
+          return appendJs(assets);
         }));
       }
 
-      return Promise.resolve(1);
+      return Promise.resolve();
     };
 
     this.init = false;
     this.strategy = {
-      js: generateScript,
-      css: generateStyle
+      js: appendJs,
+      css: appendCss
     };
   }
 
-  _createClass(InsertAssetsList, [{
+  _createClass(AppendAssetsList, [{
     key: "setAssets",
     value: function setAssets(assets) {
       this.assetsList = assets;
     }
   }]);
 
-  return InsertAssetsList;
+  return AppendAssetsList;
 }();
 
-var _default = InsertAssetsList;
+var _default = AppendAssetsList;
 exports["default"] = _default;

package/lib/components/superset-charts/{init/use-get-assets.js → fetch-assets-and-append/get-assets-with-cache.js}

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.transMetasToTableData = exports.getAssetsVersion = exports.getAssetsUri = exports.getAssets = exports.domain = void 0;
+exports.transMetasToTableData = exports.fetchAssetsVersion = exports.fetchAssetsUri = exports.domain = exports["default"] = void 0;
 
 var _axios = _interopRequireDefault(require("../utils/axios"));
 
@@ -34,7 +34,7 @@ var transMetasToTableData = function transMetasToTableData() {
 exports.transMetasToTableData = transMetasToTableData;
 var storageKey = "DEMO_CHART_URI_";
 
-var getAssetsVersion = function getAssetsVersion() {
+var fetchAssetsVersion = function fetchAssetsVersion() {
   return _axios["default"].post("".concat(domain, "/api/v1/metas/list"), {
     filter: {
       fields: [],
@@ -50,9 +50,9 @@ var getAssetsVersion = function getAssetsVersion() {
   });
 };
 
-exports.getAssetsVersion = getAssetsVersion;
+exports.fetchAssetsVersion = fetchAssetsVersion;
 
-var getAssetsUri = function getAssetsUri(version) {
+var fetchAssetsUri = function fetchAssetsUri(version) {
   return _axios["default"].post("".concat(domain, "/api/v1/metas/list"), {
     filter: {
       fields: [{
@@ -74,42 +74,47 @@ var getAssetsUri = function getAssetsUri(version) {
   });
 };
 
-exports.getAssetsUri = getAssetsUri;
+exports.fetchAssetsUri = fetchAssetsUri;
 
-var getAssets = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
-    var _JSON$parse$;
+var hasCachedAssets = function hasCachedAssets(resVersion) {
+  var _JSON$parse$;
+
+  var cacheAssets = localStorage.getItem("".concat(storageKey, "version"));
+  var cacheVersion = cacheAssets && ((_JSON$parse$ = JSON.parse(cacheAssets)[0]) === null || _JSON$parse$ === void 0 ? void 0 : _JSON$parse$.version);
+  return cacheAssets !== null && cacheVersion === resVersion;
+};
 
-    var res, cacheAssets, cacheVersion, resVersion, assetsUri;
+var getAssetsWithCache = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+    var res, cacheAssets, resVersion, assetsUri;
     return regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
             _context.next = 2;
-            return getAssetsVersion();
+            return fetchAssetsVersion();
 
           case 2:
             res = _context.sent;
             cacheAssets = localStorage.getItem("".concat(storageKey, "version"));
-            cacheVersion = cacheAssets && ((_JSON$parse$ = JSON.parse(cacheAssets)[0]) === null || _JSON$parse$ === void 0 ? void 0 : _JSON$parse$.version);
             resVersion = res[0].version;
 
-            if (!(cacheAssets !== null && cacheVersion === resVersion)) {
-              _context.next = 8;
+            if (!hasCachedAssets(resVersion)) {
+              _context.next = 7;
               break;
             }
 
             return _context.abrupt("return", JSON.parse(cacheAssets));
 
-          case 8:
-            _context.next = 10;
-            return getAssetsUri(resVersion);
+          case 7:
+            _context.next = 9;
+            return fetchAssetsUri(resVersion);
 
-          case 10:
+          case 9:
             assetsUri = _context.sent;
             return _context.abrupt("return", assetsUri);
 
-          case 12:
+          case 11:
           case "end":
             return _context.stop();
         }
@@ -117,9 +122,10 @@ var getAssets = /*#__PURE__*/function () {
     }, _callee);
   }));
 
-  return function getAssets() {
+  return function getAssetsWithCache() {
     return _ref.apply(this, arguments);
   };
 }();
 
-exports.getAssets = getAssets;
+var _default = getAssetsWithCache;
+exports["default"] = _default;

package/lib/components/superset-charts/fetch-assets-and-append/index.js

@@ -0,0 +1,79 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = exports.SingletonFetchAssetsAndAppend = void 0;
+
+var _appendAssets = _interopRequireDefault(require("./append-assets"));
+
+var _getAssetsWithCache = _interopRequireDefault(require("./get-assets-with-cache"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+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); }); }; }
+
+var getAssetsAndAppend = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+    var assets, execute;
+    return regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return (0, _getAssetsWithCache["default"])();
+
+          case 2:
+            assets = _context.sent;
+            execute = new _appendAssets["default"]();
+            execute.setAssets(assets);
+            return _context.abrupt("return", execute.appendAssetsList());
+
+          case 6:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+
+  return function getAssetsAndAppend() {
+    return _ref.apply(this, arguments);
+  };
+}();
+
+var SingletonFetchAssetsAndAppend = function SingletonFetchAssetsAndAppend() {
+  var instance;
+  return /*#__PURE__*/function () {
+    var _Singlenton = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
+      return regeneratorRuntime.wrap(function _callee2$(_context2) {
+        while (1) {
+          switch (_context2.prev = _context2.next) {
+            case 0:
+              if (!instance) {
+                instance = getAssetsAndAppend();
+              }
+
+              return _context2.abrupt("return", instance);
+
+            case 2:
+            case "end":
+              return _context2.stop();
+          }
+        }
+      }, _callee2);
+    }));
+
+    function Singlenton() {
+      return _Singlenton.apply(this, arguments);
+    }
+
+    return Singlenton;
+  }();
+};
+
+exports.SingletonFetchAssetsAndAppend = SingletonFetchAssetsAndAppend;
+var _default = SingletonFetchAssetsAndAppend;
+exports["default"] = _default;

package/lib/components/superset-charts/utils/axios.js

@@ -38,8 +38,12 @@ function setToken(token) {
 
 var getJwtToken = function getJwtToken() {
   return _axios["default"].get("".concat(requestDomain(), "/api/v1/").concat(tenantId, "/").concat(userId, "/const/skynetToken")).then(function (res) {
-    setToken(JSON.parse(res.data.Data.obj).token);
-    return JSON.parse(res.data.Data.obj).token;
+    if (res.data.Data) {
+      setToken(JSON.parse(res.data.Data.obj).token);
+      return JSON.parse(res.data.Data.obj).token;
+    }
+
+    return "";
   });
 };
 

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.49",
   "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",

package/lib/components/superset-charts/init/index.js

@@ -1,61 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.SingleInsert = SingleInsert;
-exports.lazyLoad = void 0;
-
-var _insertAssets = _interopRequireDefault(require("./insert-assets"));
-
-var _useGetAssets = require("./use-get-assets");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-
-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 SingleInsert() {
-  var instance;
-  return function insert(assets) {
-    if (!instance) {
-      var _insert = new _insertAssets["default"]();
-
-      _insert.setAssets(assets);
-
-      instance = _insert.insertAssetsList();
-    }
-
-    return instance;
-  };
-}
-
-var lazyLoad = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
-    var assets;
-    return regeneratorRuntime.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            _context.next = 2;
-            return (0, _useGetAssets.getAssets)();
-
-          case 2:
-            assets = _context.sent;
-            return _context.abrupt("return", SingleInsert()(assets));
-
-          case 4:
-          case "end":
-            return _context.stop();
-        }
-      }
-    }, _callee);
-  }));
-
-  return function lazyLoad() {
-    return _ref.apply(this, arguments);
-  };
-}();
-
-exports.lazyLoad = lazyLoad;