@titaui/pc 1.10.6-3.beta-14 → 1.10.6-3.beta-15

package/lib/components/dynamic/dynamic-item/dynamic-ai-dialy/index.js

@@ -13,8 +13,6 @@ var _utils = require("../dynamic-chart/utils");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-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); }
-
 var prefixCls = "titaui-dynamic-item";
 
 var DynamicAIDialy = function DynamicAIDialy(_ref) {
@@ -22,9 +20,7 @@ var DynamicAIDialy = function DynamicAIDialy(_ref) {
   var chartQuery = (0, _utils.getChartProps)(data.biId);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: prefixCls
-  }, /*#__PURE__*/_react["default"].createElement(_supersetCharts["default"], _extends({
-    layout: "feed-card"
-  }, chartQuery)));
+  }, /*#__PURE__*/_react["default"].createElement(_supersetCharts["default"], chartQuery));
 };
 
 var _default = DynamicAIDialy;

package/lib/components/dynamic/dynamic-list/index.js

@@ -73,7 +73,7 @@ var DynamicList = function DynamicList(_ref) {
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "".concat(prefix, "__item-wrapper"),
       key: item.feedId
-    }, item.shareType === _constant.EShareType.BiShare && item.biId && ((_JSON$parse = JSON.parse(item.biId)) === null || _JSON$parse === void 0 ? void 0 : _JSON$parse.type) === "AIDialyFeed" ? /*#__PURE__*/_react["default"].createElement(_dynamicAiDialy["default"], {
+    }, item.shareType === _constant.EShareType.BiShare && item.biId && ((_JSON$parse = JSON.parse(item.biId)) === null || _JSON$parse === void 0 ? void 0 : _JSON$parse.type) === "titaPlanReport" ? /*#__PURE__*/_react["default"].createElement(_dynamicAiDialy["default"], {
       data: item
     }) : /*#__PURE__*/_react["default"].createElement(_dynamicItem["default"], {
       data: item,

package/lib/components/dynamic/dynamic.js

@@ -221,7 +221,10 @@ var Dynamic = function Dynamic() {
         setNoMoreData(resp.Data.isEnd);
 
         if (needResetValue) {
-          setDynamicData(resp.Data.feeds);
+          setDynamicData([]);
+          setTimeout(function () {
+            setDynamicData(resp.Data.feeds);
+          }, 0);
         } else {
           setDynamicData(JSON.parse(JSON.stringify([].concat(_toConsumableArray(dynamicData), _toConsumableArray(resp.Data.feeds)))));
         }

package/lib/components/dynamic/online-broadcast/data.js

@@ -18,10 +18,22 @@ exports.onlineBroadcastData = exports["default"] = void 0;
 //   href = "https://wiki.tita.com/pages/viewpage.action?pageId=15697741";
 // }
 var onlineBroadcastData = [{
+  hasOnline: true,
+  preContent: "「OKR 工作法」体验优化 ",
+  preHref: "https://wiki.tita.com/x/jIOeAQ",
+  isNew: true,
+  date: "3/29"
+}, {
+  hasOnline: true,
+  preContent: "新增「同步钉钉待办」，工作实时掌握",
+  preHref: "https://wiki.tita.com/x/DIOeAQ",
+  isNew: true,
+  date: "3/18"
+}, {
   hasOnline: true,
   preContent: "「考核」支持建立企业指标库",
   preHref: "https://wiki.tita.com/x/vYGeAQ",
-  isNew: true,
+  isNew: false,
   date: "2/17"
 }, {
   hasOnline: true,

package/lib/components/menus/export-modules/okr-menus/subordinate-menus/index.js

@@ -105,12 +105,21 @@ function _default(props) {
   }, []);
 
   var loadNodes = function loadNodes(nodeId) {
-    return (// 钻去隔级的直接下级
-      (0, _requestApis.getSubordinates)({
-        toUserId: nodeId,
-        relationIds: "1"
-      })
-    );
+    // 钻去隔级的直接下级
+    return (0, _requestApis.getSubordinates)({
+      toUserId: nodeId,
+      relationIds: "1"
+    });
+  };
+
+  var filterData = function filterData(childNode, grandNode) {
+    var mark = {};
+    childNode.forEach(function (item) {
+      mark[item.id] = true;
+    });
+    return grandNode.filter(function (item) {
+      !mark[item.userId];
+    });
   };
 
   var onLoadTreeNodeDataHandler = function onLoadTreeNodeDataHandler(treeNode) {
@@ -119,6 +128,12 @@ function _default(props) {
       var promise = loadNodes(treeNode.id);
       if (!promise) return resolve(true);
       promise.then(function (nodes) {
+        var _treeNode$children;
+
+        if (treeNode !== null && treeNode !== void 0 && (_treeNode$children = treeNode.children) !== null && _treeNode$children !== void 0 && _treeNode$children.length) {
+          nodes = filterData(treeNode.children, nodes);
+        }
+
         if (!nodes.length) return null;
         (0, _helper.transToTreeNode)(nodes).forEach(function (it) {
           return rawTreeData.push(it);

package/lib/components/okr-detail/components/header/o-name.js

@@ -11,6 +11,8 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _getLocale = require("../../../../utils/getLocale");
 
+var _tools = require("../../../../utils/tools");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function OName(props) {
@@ -19,16 +21,21 @@ function OName(props) {
       setIsEdit = props.setIsEdit,
       okrStatus = props.okrStatus,
       children = props.children;
+
+  var handleEditClick = function handleEditClick() {
+    if (editable) {
+      setIsEdit(true);
+    }
+  };
+
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("okr-drawer-header__title", {
       "okr-drawer-header__title--editable": editable
     })
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "okr-drawer-header__name",
-    onClick: function onClick() {
-      editable && setIsEdit(true);
-    }
-  }, okrName), children, okrStatus == 2 && /*#__PURE__*/_react["default"].createElement("span", {
+    onClick: handleEditClick
+  }, (0, _tools.htmlDecodeByRegExp)(okrName)), children, Number(okrStatus) === 2 && /*#__PURE__*/_react["default"].createElement("span", {
     className: "okr-drawer-header__over-tag"
   }, (0, _getLocale.getLocale)("OKR_MyO_Butt_Hasended")));
 }

package/lib/components/okr-detail/components/okr-tree/tree-node/e-kr-node/index.css

@@ -12,28 +12,28 @@
 
 .tita-okrdt-tree__e-kr-node-preicon {
   display: inline-block;
-  line-height: 22px;
-  color: #6f7886;
+  line-height: 18px;
+  color: #2879ff;
   font-size: 16px;
 }
 
 .tita-okrdt-tree__e-kr-node-prefix {
   display: inline-block;
-  height: 22px;
-  font-size: 14px;
+  height: 18px;
+  font-size: 12px;
   font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
   color: #2879ff;
-  line-height: 22px;
+  line-height: 18px;
 }
 
 .tita-okrdt-tree__e-kr-node-title {
   display: inline-block;
   margin-left: 4px;
-  height: 22px;
-  font-size: 14px;
+  height: 18px;
+  font-size: 12px;
   font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
   color: #89919f;
-  line-height: 22px;
+  line-height: 18px;
   width: 100%;
 }
 
@@ -47,7 +47,7 @@
 
 .tita-okrdt-tree__e-kr-node-actions-create {
   height: 18px;
-  font-size: 13px;
+  font-size: 12px;
   font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
   color: #2879ff;
   line-height: 18px;
@@ -66,7 +66,7 @@
 
 .tita-okrdt-tree__e-kr-node-actions-connect {
   height: 18px;
-  font-size: 13px;
+  font-size: 12px;
   font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
   color: #2879ff;
   line-height: 18px;

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

@@ -176,7 +176,7 @@ var EKrNode = function EKrNode(props) {
     className: (0, _classnames["default"])("tu-icon-O ".concat(_precls["default"], "__e-kr-node-preicon"))
   }) : /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__e-kr-node-prefix"))
-  }, "KR", index + 1), /*#__PURE__*/_react["default"].createElement("span", {
+  }, "KR", data.SortNum ? data.SortNum + 1 : index + 1), /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__e-kr-node-title")),
     onClick: function onClick() {
       if (data.mileStoneId) {

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

@@ -71,7 +71,9 @@ function _default(props) {
       _props$hasProgress = props.hasProgress,
       hasProgress = _props$hasProgress === void 0 ? true : _props$hasProgress,
       _props$hasRelation = props.hasRelation,
-      hasRelation = _props$hasRelation === void 0 ? true : _props$hasRelation;
+      hasRelation = _props$hasRelation === void 0 ? true : _props$hasRelation,
+      _props$hasPrinciple = props.hasPrinciple,
+      hasPrinciple = _props$hasPrinciple === void 0 ? true : _props$hasPrinciple;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -146,7 +148,7 @@ function _default(props) {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__e-project-node-title-approvaling"))
   }, (0, _getLocale.getLocale)('Pro_MyS_Establishment'))), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__e-project-node-actions"))
-  }, /*#__PURE__*/_react["default"].createElement("span", {
+  }, hasPrinciple && /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__e-project-node-actions-user"))
   }, /*#__PURE__*/_react["default"].createElement(_avatar["default"].Text, {
     name: data === null || data === void 0 ? void 0 : (_data$principalUser = data.principalUser) === null || _data$principalUser === void 0 ? void 0 : _data$principalUser.name,

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

@@ -95,7 +95,9 @@ function ETaskNode(props) {
       _props$hasRelation = props.hasRelation,
       hasRelation = _props$hasRelation === void 0 ? true : _props$hasRelation,
       _props$isPushScreen = props.isPushScreen,
-      isPushScreen = _props$isPushScreen === void 0 ? false : _props$isPushScreen;
+      isPushScreen = _props$isPushScreen === void 0 ? false : _props$isPushScreen,
+      _props$hasPrinciple = props.hasPrinciple,
+      hasPrinciple = _props$hasPrinciple === void 0 ? true : _props$hasPrinciple;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -370,7 +372,7 @@ function ETaskNode(props) {
     isPercent: true
   })), /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__e-task-node-actions"))
-  }, /*#__PURE__*/_react["default"].createElement("span", {
+  }, hasPrinciple && /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__e-task-node-actions-user"))
   }, /*#__PURE__*/_react["default"].createElement(_avatar["default"].Text, {
     name: user === null || user === void 0 ? void 0 : user.name,

package/lib/components/okr-detail/components/okr-tree/tree-node/kr-node/index.js

@@ -332,7 +332,7 @@ function _default(props) {
     editable: krCanEdit,
     onEditUser: onEditUserHandler,
     nameTips: function nameTips(name) {
-      return /*#__PURE__*/_react["default"].createElement("span", null, "\u8D1F\u8D23\u4EBA\uFF1A");
+      return /*#__PURE__*/_react["default"].createElement("span", null, "\u8D1F\u8D23\u4EBA\uFF1A", name);
     }
   })), showKrWeight && /*#__PURE__*/_react["default"].createElement(OkrRowColumn, {
     width: 60,

package/lib/components/okr-detail/e-list/index.js

@@ -215,7 +215,7 @@ function Elist(props, ref) {
     !(index + 1 == krList.length && oEList.length == 0) && hasdivider && /*#__PURE__*/_react["default"].createElement("div", {
       className: "e__divider"
     }));
-  }), oEList.map(function (kr) {
+  }), !!oEList && !!oEList.length && oEList.map(function (kr) {
     return /*#__PURE__*/_react["default"].createElement(_paddingLayout["default"], {
       padding: layoutPadding
     }, /*#__PURE__*/_react["default"].createElement(_okrTree["default"], {

package/lib/components/okr-flow/root-node/index.js

@@ -102,7 +102,20 @@ function RootNode(props) {
         style: {
           backgroundColor: color
         }
-      }, rootName[0]);
+      }, /*#__PURE__*/_react["default"].createElement("div", {
+        style: {
+          height: '24px',
+          width: '12px',
+          overflow: 'hidden',
+          margin: '0px auto'
+        }
+      }, /*#__PURE__*/_react["default"].createElement("img", {
+        src: whiteRootImg,
+        style: {
+          maxWidth: 268
+        },
+        width: imgWidth
+      })));
     }
 
     if (searchType == "depart") {

package/lib/components/superset-charts/fetch-assets-and-append/get-assets-with-cache.js

@@ -13,7 +13,8 @@ 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); }); }; }
 
-var domain = "https://tracker.tita.com";
+var domain = "https://skynet-apis.tita.cloud"; // const domain = 'http://127.0.0.1:8080'
+
 exports.domain = domain;
 
 var transMetasToTableData = function transMetasToTableData() {
@@ -40,7 +41,7 @@ var fetchAssetsVersion = function fetchAssetsVersion() {
       fields: [],
       order: {
         name: "create_time_unix",
-        operator: "desc"
+        orderBy: "desc"
       },
       limit: 1
     },
@@ -63,13 +64,13 @@ var fetchAssetsUri = function fetchAssetsUri(version) {
       }],
       order: {
         name: "create_time_unix",
-        operator: "desc"
+        orderBy: "desc"
       },
       limit: 20
     },
     objectName: "superset_assets"
   }).then(function (res) {
-    localStorage.setItem("".concat(storageKey, "version"), JSON.stringify(transMetasToTableData(res.data.list)));
+    sessionStorage.setItem("".concat(storageKey, "version"), JSON.stringify(transMetasToTableData(res.data.list)));
     return transMetasToTableData(res.data.list);
   });
 };
@@ -79,13 +80,15 @@ exports.fetchAssetsUri = fetchAssetsUri;
 var hasCachedAssets = function hasCachedAssets(resVersion) {
   var _JSON$parse$;
 
-  var cacheAssets = localStorage.getItem("".concat(storageKey, "version"));
+  var cacheAssets = sessionStorage.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 getAssetsWithCache = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+    var _res$;
+
     var res, cacheAssets, resVersion, assetsUri;
     return regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
@@ -96,25 +99,33 @@ var getAssetsWithCache = /*#__PURE__*/function () {
 
           case 2:
             res = _context.sent;
-            cacheAssets = localStorage.getItem("".concat(storageKey, "version"));
-            resVersion = res[0].version;
+            cacheAssets = sessionStorage.getItem("".concat(storageKey, "version"));
+            resVersion = res === null || res === void 0 ? void 0 : (_res$ = res[0]) === null || _res$ === void 0 ? void 0 : _res$.version;
 
-            if (!hasCachedAssets(resVersion)) {
+            if (resVersion) {
               _context.next = 7;
               break;
             }
 
-            return _context.abrupt("return", JSON.parse(cacheAssets));
+            return _context.abrupt("return", []);
 
           case 7:
-            _context.next = 9;
-            return fetchAssetsUri(resVersion);
+            if (!hasCachedAssets(resVersion)) {
+              _context.next = 9;
+              break;
+            }
+
+            return _context.abrupt("return", JSON.parse(cacheAssets));
 
           case 9:
+            _context.next = 11;
+            return fetchAssetsUri(resVersion);
+
+          case 11:
             assetsUri = _context.sent;
             return _context.abrupt("return", assetsUri);
 
-          case 11:
+          case 13:
           case "end":
             return _context.stop();
         }

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

@@ -25,15 +25,15 @@ var tenantId = window.BSGlobal && window.BSGlobal.tenantInfo.Id || 0;
 var userId = window.BSGlobal && window.BSGlobal.loginUserInfo.Id || 0;
 
 function getToken() {
-  return localStorage.getItem("DEMOFREE_TOKEN") || "";
+  return sessionStorage.getItem("DEMOFREE_TOKEN") || "";
 }
 
 function clearToken() {
-  localStorage.removeItem("DEMOFREE_TOKEN");
+  sessionStorage.removeItem("DEMOFREE_TOKEN");
 }
 
 function setToken(token) {
-  localStorage.setItem("DEMOFREE_TOKEN", token);
+  sessionStorage.setItem("DEMOFREE_TOKEN", token);
 }
 
 var getJwtToken = function getJwtToken() {

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

@@ -178,7 +178,12 @@ var NewOkrList = function NewOkrList(props) {
 
   (0, _react.useEffect)(function () {
     setPageNum(1);
-  }, [relation, toUserId, departmentId, query]); // 记录访问者数据
+  }, [relation, toUserId, departmentId, query]);
+  (0, _react.useEffect)(function () {
+    handleOnSearch({
+      keyWords: ""
+    });
+  }, [relation, toUserId, departmentId]); // 记录访问者数据
 
   var recordVisitUser = function recordVisitUser() {
     if (toUserId) {
@@ -209,17 +214,9 @@ var NewOkrList = function NewOkrList(props) {
       params.keyWords = "";
     }
 
-    var request;
-
-    if (!relation) {
-      request = (0, _requestApi.okrSearch)(params);
-    } else {
-      request = (0, _requestApi.okrList)(params);
-    }
-
     setLoading(true);
     recordVisitUser();
-    request.then(function (res) {
+    (0, _requestApi.okrSearch)(params).then(function (res) {
       setOkrs(res.works || []);
       setTotal(res.total);
       setLoading(false);

package/lib/utils/auth.js

@@ -92,8 +92,10 @@ var OAuth = /*#__PURE__*/function (_BaseAuth) {
   }, {
     key: "isPrincipalUser",
     value: function isPrincipalUser() {
+      var _this$principalUser;
+
       // console.log('o isp', this.userId, this.principalUser.userId)
-      return this.userId == this.principalUser.userId;
+      return this.userId == ((_this$principalUser = this.principalUser) === null || _this$principalUser === void 0 ? void 0 : _this$principalUser.userId);
     } // 有操作OKR的權限
 
   }, {
@@ -139,8 +141,10 @@ var KRAuth = /*#__PURE__*/function (_BaseAuth2) {
   }, {
     key: "isPrincipalUser",
     value: function isPrincipalUser() {
+      var _this$user;
+
       // console.log('kr isp', this.userId, this.user.userId)
-      return this.userId == this.user.userId;
+      return this.userId == ((_this$user = this.user) === null || _this$user === void 0 ? void 0 : _this$user.userId);
     } // 有操作KR的權限
 
   }, {
@@ -178,15 +182,19 @@ var EAuth = /*#__PURE__*/function (_BaseAuth3) {
   _createClass(EAuth, [{
     key: "isCreater",
     value: function isCreater() {
+      var _this$user2;
+
       // console.log('e iscreater', this.userId, this.user.userId)
-      return this.userId == this.user.userId;
+      return this.userId == ((_this$user2 = this.user) === null || _this$user2 === void 0 ? void 0 : _this$user2.userId);
     } // 負責人
 
   }, {
     key: "isPrincipalUser",
     value: function isPrincipalUser() {
+      var _this$principalUser2;
+
       // console.log('e isp', this.userId, this.principalUser.userId)
-      return this.userId == this.principalUser.userId;
+      return this.userId == ((_this$principalUser2 = this.principalUser) === null || _this$principalUser2 === void 0 ? void 0 : _this$principalUser2.userId);
     } // 有操作KR的權限
 
   }, {
@@ -268,7 +276,9 @@ var ChildAuth = /*#__PURE__*/function (_BaseAuth5) {
   _createClass(ChildAuth, [{
     key: "isPrincipalUser",
     value: function isPrincipalUser() {
-      return this.userId == this.principalUser.userId;
+      var _this$principalUser3;
+
+      return this.userId == ((_this$principalUser3 = this.principalUser) === null || _this$principalUser3 === void 0 ? void 0 : _this$principalUser3.userId);
     } // 超管、助理、目标管理员以及目标负责人可以修改此目标下对齐子目标的权重；
 
   }, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.10.63.beta-14",
+  "version": "1.10.63.beta-15",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",