@titaui/pc 1.15.42-beta.1 → 1.15.43-beta.2

package/lib/components/menus/export-modules/summary-menus/depart-menus/index.js

@@ -176,7 +176,7 @@ var _default = function _default() {
           deWeightData[item.id] = item;
         });
         var result = Object.values(deWeightData);
-        setRawTreeData([].concat(result));
+        setRawTreeData(_toConsumableArray(result));
         setTreeData((0, _utils.toTree)(rawTreeData));
         resolve(true);
       });

package/lib/components/nav-top/components/app-center/index.js

@@ -270,6 +270,14 @@ var AppCenter = function AppCenter(props) {
       e.stopPropagation();
       (_QuickEntranceDialogR = QuickEntranceDialogRef.current) === null || _QuickEntranceDialogR === void 0 ? void 0 : _QuickEntranceDialogR.showDialog();
       handleSettingGuideClose();
+
+      if (window.titaTracker) {
+        window.titaTracker('action').record({
+          actionName: '快捷入口设置',
+          actionGroup: '新菜单设置',
+          productName: '系统菜单'
+        });
+      }
     };
 
     if (app.appId === 1) {

package/lib/components/okr-excel/hooks.js

@@ -114,6 +114,10 @@ function getHide(field, currentHide) {
   var dicData = dic();
 
   switch (field) {
+    case dicData['类型']:
+      if (!_setting.showKrClassify) return true;
+      return currentHide;
+
     case dicData['信心指数']:
       if (!_setting.showKrConfidence) return true;
       return currentHide;
@@ -159,10 +163,12 @@ var defaultColumnCtlData = function defaultColumnCtlData() {
     type: 'group',
     children: [{
       label: dicData['目标（O）'],
-      value: '0,0'
+      value: '0,0',
+      disable: true
     }, {
       label: dicData['类型'],
-      value: '0,1'
+      value: '0,1',
+      visible: _setting.showKrClassify
     }, {
       label: dicData['负责人'],
       value: '0,2'

package/lib/components/okr-excel/index.css

@@ -2,6 +2,12 @@
   position: relative;
 }
 
+.tita-okr-excel__tooltip {
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+}
+
 .tita-okr-excel__column-ctl {
   position: absolute;
   background-color: #F0F4FA;
@@ -33,6 +39,11 @@
   align-items: center;
 }
 
+.tita-okr-excel__kr-weight {
+  width: 100%;
+  text-align: right;
+}
+
 .tita-okr-excel__okr-type {
   display: flex;
   align-items: center;
@@ -53,6 +64,12 @@
   cursor: pointer;
   transition: color .3s;
   flex-wrap: wrap;
+  height: 100%;
+  overflow-x: auto;
+}
+
+.tita-okr-excel__okr-name span {
+  line-height: 18px;
 }
 
 .tita-okr-excel__okr-name:hover {
@@ -70,6 +87,14 @@
   white-space: wrap;
   cursor: pointer;
   transition: color .3s;
+  display: flex;
+  width: 100%;
+}
+
+.tita-okr-excel__kr-name__title {
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
 }
 
 .tita-okr-excel__kr-name:hover {

package/lib/components/okr-excel/index.js

@@ -37,6 +37,18 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
+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."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
 var defaultColumnOption = {
   resizable: true,
   editable: false
@@ -58,6 +70,15 @@ var App = function App(_ref2) {
   var showCycle = _ref2.showCycle,
       data = _ref2.data,
       onRefresh = _ref2.onRefresh;
+
+  var _useState = (0, _react.useState)(data),
+      _useState2 = _slicedToArray(_useState, 2),
+      selfData = _useState2[0],
+      setSelfData = _useState2[1];
+
+  (0, _react.useEffect)(function () {
+    setSelfData(data);
+  }, [data]);
   var dicData = (0, _hooks.dic)();
 
   var _useOkrColumns = (0, _hooks.useOkrColumns)([_objectSpread(_objectSpread(_objectSpread({}, defaultColumnOption), defaultSpanOption), {}, {
@@ -141,6 +162,11 @@ var App = function App(_ref2) {
       columnCtlData = _useOkrColumns.columnCtlData,
       onColumnsHideOrShow = _useOkrColumns.onColumnsHideOrShow;
 
+  var getRowId = (0, _react.useMemo)(function () {
+    return function (params) {
+      return params.data.workId || params.data.feedId + params.data.Kr.mileStoneId;
+    };
+  }, []);
   var onColumnMovedHandler = (0, _react.useCallback)(function (event) {
     var moveField = event.column.colId;
     var toIndex = event.toIndex;
@@ -162,7 +188,8 @@ var App = function App(_ref2) {
     action: "click",
     mode: "checkbox",
     height: 292,
-    onChange: onColumnsHideOrShow
+    onChange: onColumnsHideOrShow,
+    autoClose: false
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(preCls, "__column-ctl")
   }, /*#__PURE__*/_react["default"].createElement("span", {
@@ -173,7 +200,8 @@ var App = function App(_ref2) {
     suppressRowTransform: true,
     enableRangeSelection: true,
     domLayout: "autoHeight",
-    rowData: data,
+    getRowId: getRowId,
+    rowData: selfData,
     columnDefs: columnDefs,
     detailRowAutoHeight: true,
     onColumnMoved: onColumnMovedHandler,

package/lib/components/okr-excel/renders.js

@@ -31,6 +31,8 @@ var _getLocale = require("../../utils/getLocale");
 
 var _okrVisibility = require("../create-okr-modal/fields/okr-visibility");
 
+var _openData2 = require("../okr-flow/open-data");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return generator._invoke = function (innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; }(innerFn, self, context), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; this._invoke = function (method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); }; } function maybeInvokeDelegate(delegate, context) { var method = delegate.iterator[context.method]; if (undefined === method) { if (context.delegate = null, "throw" === context.method) { if (delegate.iterator["return"] && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method)) return ContinueSentinel; context.method = "throw", context.arg = new TypeError("The iterator does not provide a 'throw' method"); } return ContinueSentinel; } var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) { if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; } return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, define(Gp, "constructor", GeneratorFunctionPrototype), define(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (object) { var keys = []; for (var key in object) { keys.push(key); } return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) { "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); } }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, "catch": function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
@@ -94,20 +96,21 @@ var OkrNameRenderer = function OkrNameRenderer(showCycle, onRefresh) {
       startDate: params.data.startDate,
       endDate: params.data.endDate
     };
-    return /*#__PURE__*/_react["default"].createElement("p", {
-      onClick: onOpendrawer,
+    return /*#__PURE__*/_react["default"].createElement("div", {
       className: "".concat(preCls, "__okr-name")
-    }, /*#__PURE__*/_react["default"].createElement("i", {
+    }, /*#__PURE__*/_react["default"].createElement("p", {
+      onClick: onOpendrawer
+    }, /*#__PURE__*/_react["default"].createElement("span", {
       className: "".concat(preCls, "__okr-icon tu-icon-H5-O-s")
     }), /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
-      overlay: params.value,
+      overlay: (0, _openData.parseString)(params.value),
       placement: "top"
-    }, /*#__PURE__*/_react["default"].createElement("span", null, params.value)), showCycle && /*#__PURE__*/_react["default"].createElement(_tag["default"], {
+    }, /*#__PURE__*/_react["default"].createElement("span", null, (0, _openData.parseString)(params.value))), showCycle && /*#__PURE__*/_react["default"].createElement(_tag["default"], {
       backgroundColor: "rgba(40,121,255,.16)",
       color: "#3f4755"
     }, formatCycleData(period, false)), /*#__PURE__*/_react["default"].createElement(_okrTypeIcon["default"], {
       okrClassify: params.data.okrClassify
-    }), params.data.status === 2 && /*#__PURE__*/_react["default"].createElement(_tag["default"], null, (0, _getLocale.getLocale)('OKR_MyO_Butt_Hasended')));
+    }), params.data.status === 2 && /*#__PURE__*/_react["default"].createElement(_tag["default"], null, (0, _getLocale.getLocale)('OKR_MyO_Butt_Hasended'))));
   };
 };
 
@@ -148,9 +151,11 @@ var krNameRenderer = function krNameRenderer(onRefresh) {
     }, /*#__PURE__*/_react["default"].createElement("span", {
       className: "".concat(preCls, "__kr-name__index")
     }, "KR", params.data.Kr.index + 1), ' ', /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
-      overlay: params.value,
+      overlay: (0, _openData.parseString)(params.value),
       placement: "top"
-    }, /*#__PURE__*/_react["default"].createElement("span", null, params.value)));
+    }, /*#__PURE__*/_react["default"].createElement("span", {
+      className: "".concat(preCls, "__kr-name__title")
+    }, (0, _openData.parseString)(params.value))));
   };
 };
 
@@ -217,12 +222,16 @@ exports.ConfidenceRenderer = ConfidenceRenderer;
 
 var krWeightRenderer = function krWeightRenderer(_ref6) {
   var value = _ref6.value;
-  return "".concat(value, "%");
+  return /*#__PURE__*/_react["default"].createElement("p", {
+    className: "".concat(preCls, "__kr-weight")
+  }, "".concat(value, "%"));
 };
 
 exports.krWeightRenderer = krWeightRenderer;
 
 var krUserRenderer = function krUserRenderer(_ref7) {
+  var _data$Kr$user;
+
   var value = _ref7.value,
       data = _ref7.data;
   if (!data.Kr.user) return '';
@@ -232,12 +241,17 @@ var krUserRenderer = function krUserRenderer(_ref7) {
     src: data.Kr.user.avatar.small,
     name: value,
     color: "#2879ff"
-  }), value);
+  }), /*#__PURE__*/_react["default"].createElement(_openData2.OpenUserName, {
+    name: value,
+    id: (_data$Kr$user = data.Kr.user) === null || _data$Kr$user === void 0 ? void 0 : _data$Kr$user.userId
+  }));
 };
 
 exports.krUserRenderer = krUserRenderer;
 
 var userRenderer = function userRenderer(_ref8) {
+  var _data$principalUser;
+
   var value = _ref8.value,
       data = _ref8.data;
   if (!data.principalUser || !data.workId) return '';
@@ -247,7 +261,10 @@ var userRenderer = function userRenderer(_ref8) {
     src: data.principalUser.avatar.small,
     name: value,
     color: "#2879ff"
-  }), value);
+  }), /*#__PURE__*/_react["default"].createElement(_openData2.OpenUserName, {
+    name: value,
+    id: (_data$principalUser = data.principalUser) === null || _data$principalUser === void 0 ? void 0 : _data$principalUser.userId
+  }));
 };
 
 exports.userRenderer = userRenderer;
@@ -311,7 +328,9 @@ var tooltipRenderer = function tooltipRenderer(params) {
   return /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
     overlay: params.value,
     placement: "top"
-  }, /*#__PURE__*/_react["default"].createElement("p", null, params.value));
+  }, /*#__PURE__*/_react["default"].createElement("p", {
+    className: "".concat(preCls, "__tooltip")
+  }, params.value));
 };
 
 exports.tooltipRenderer = tooltipRenderer;

package/lib/components/okr-excel/setting.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.showKrWeight = exports.showKrProgress = exports.showKrConfidence = void 0;
+exports.showKrWeight = exports.showKrProgress = exports.showKrConfidence = exports.showKrClassify = void 0;
 
 var _config = require("../okr-flow/utils/config");
 
@@ -15,4 +15,7 @@ var showKrProgress = (0, _config.getBSGlobal)('OkrAdvancedSetting').KRSetting.Sh
 exports.showKrProgress = showKrProgress;
 var showKrWeight = (0, _config.getBSGlobal)('OkrAdvancedSetting').KRSetting.KrWeight; // KR权重开关
 
-exports.showKrWeight = showKrWeight;
+exports.showKrWeight = showKrWeight;
+var showKrClassify = (0, _config.getBSGlobal)('OkrAdvancedSetting').KRSetting.OkrClassify; // 类型
+
+exports.showKrClassify = showKrClassify;

package/lib/components/popup-select/index.css

@@ -30,7 +30,16 @@
   transition: background-color .3s, color .3s;
 }
 
-.titaui-popup-select__menu-list__item:hover {
+.titaui-popup-select__menu-list__item--disable {
+  opacity: .8;
+  cursor: not-allowed;
+}
+
+.titaui-popup-select__menu-list__item--disable .titaui-popup-select__checkbox-icon--checked {
+  color: #6F7886 !important;
+}
+
+.titaui-popup-select__menu-list__item:hover:not(.titaui-popup-select__menu-list__item--disable) {
   background: #F7F8FA;
 }
 

package/lib/components/popup-select/index.js

@@ -15,7 +15,7 @@ var _popup = _interopRequireDefault(require("../popup"));
 
 require("./index.css");
 
-var _excluded = ["className", "style", "children", "menuData", "onChange", "visible", "action", "onVisableChange", "mode", "height"];
+var _excluded = ["className", "style", "children", "menuData", "onChange", "visible", "action", "onVisableChange", "mode", "height", "autoClose"];
 
 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); }
 
@@ -75,6 +75,8 @@ var PopupSelect = function PopupSelect(_ref) {
       _ref$mode = _ref.mode,
       mode = _ref$mode === void 0 ? 'list' : _ref$mode,
       height = _ref.height,
+      _ref$autoClose = _ref.autoClose,
+      autoClose = _ref$autoClose === void 0 ? true : _ref$autoClose,
       restProps = _objectWithoutProperties(_ref, _excluded);
 
   var _useState = (0, _react.useState)(visible),
@@ -87,7 +89,9 @@ var PopupSelect = function PopupSelect(_ref) {
   }, [visible]);
   var menuList = (0, _react.useMemo)(function () {
     var onSelectItem = function onSelectItem(value, item, idx) {
+      if (item.disable) return;
       if (onChange) onChange(value, item, idx);
+      if (autoClose) setSelfVisable(false);
     };
 
     var getLi = function getLi(item, idx) {
@@ -99,7 +103,7 @@ var PopupSelect = function PopupSelect(_ref) {
         return /*#__PURE__*/_react["default"].createElement("li", {
           key: item.value,
           onClick: onSelectItem.bind(null, item.value, item, idx),
-          className: "".concat(preCls, "__menu-list__item")
+          className: (0, _classnames["default"])("".concat(preCls, "__menu-list__item"), _defineProperty({}, "".concat(preCls, "__menu-list__item--disable"), item.disable))
         }, getItem(item, mode));
       }
 
@@ -119,7 +123,7 @@ var PopupSelect = function PopupSelect(_ref) {
         height: height
       }
     }, menuData.map(getLi));
-  }, [menuData, onChange]);
+  }, [menuData, onChange, autoClose]);
   var onPopupVisableChange = (0, _react.useCallback)(function (visible) {
     setSelfVisable(visible);
     if (onVisableChange) onVisableChange(visible);

package/lib/components/quick-entrance/index.js

@@ -120,6 +120,15 @@ var QuickEntranceDialog = /*#__PURE__*/(0, _react.forwardRef)(function (props, r
         handleOkQuickMenu && handleOkQuickMenu(newQuickMenu);
       }
     });
+
+    if (window.titaTracker) {
+      window.titaTracker('action').record({
+        actionName: '快捷入口设置',
+        actionGroup: '新菜单设置',
+        productName: '系统菜单'
+      });
+    }
+
     hideDialog();
   };
 

package/lib/components/wechat-btn/index.js

@@ -166,6 +166,14 @@ var WeChatBtn = function WeChatBtn(props) {
         setCreateWechatVisible(true);
       }
     }
+
+    if (window.titaTracker) {
+      window.titaTracker("action").record({
+        productName: "企业微信群聊",
+        actionGroup: "".concat(objType === 62 ? '目标' : '任务', "-\u70B9\u51FB\u4F01\u4E1A\u5FAE\u4FE1\u7FA4\u804A\u56FE\u6807"),
+        actionName: "".concat(objType === 62 ? '目标' : '任务', "-\u70B9\u51FB\u4F01\u4E1A\u5FAE\u4FE1\u7FA4\u804A\u56FE\u6807")
+      });
+    }
   };
 
   var closeCreateWeChatModal = function closeCreateWeChatModal() {

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

@@ -86,7 +86,9 @@ var viewConfig = function viewConfig() {
 };
 
 var isSelfTenant = function isSelfTenant() {
-  return ['352728', '564003', '511477'].includes((0, _bsGlobal.getBSGlobal)('tenantInfo').Id);
+  return ['352728', '564003', '511477', // 正式环境
+  '500019', '500017', '500011', '500036' // 测试环境
+  ].includes(String((0, _bsGlobal.getBSGlobal)('tenantInfo').Id));
 };
 
 function Header(props, ref) {

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

@@ -263,8 +263,8 @@ var NewOkrList = function NewOkrList(props) {
     setLoading(true);
     recordVisitUser();
     (0, _requestApi.okrSearch)(params).then(function (res) {
-      setOkrs(res.works || []);
-      setTotal(res.total);
+      setOkrs(res && res.works || []);
+      setTotal(res && res.total || 0);
       setLoading(false);
     });
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.15.42-beta.1",
+  "version": "1.15.43-beta.2",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",