@titaui/pc 1.15.40-beta.13 → 1.15.40-beta.16

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

@@ -31,12 +31,32 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 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 +78,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 +170,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;
@@ -153,7 +187,17 @@ var App = function App(_ref2) {
     onColumnResized(colId, actualWidth);
   }, {
     wait: 200
-  });
+  }); // console.log('selfData', selfData)
+
+  var onAddData = (0, _react.useCallback)(function () {
+    var workId = Math.random() * 10000;
+    setSelfData([].concat(_toConsumableArray(selfData), [{
+      workId: workId,
+      feedId: workId,
+      workName: workId + '测试数据',
+      Kr: {}
+    }]));
+  }, [selfData]);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "ag-theme-material ".concat(preCls)
   }, /*#__PURE__*/_react["default"].createElement(_popupSelect["default"], {
@@ -162,7 +206,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 +218,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

@@ -94,20 +94,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'))));
   };
 };
 
@@ -150,7 +151,9 @@ var krNameRenderer = function krNameRenderer(onRefresh) {
     }, "KR", params.data.Kr.index + 1), ' ', /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
       overlay: params.value,
       placement: "top"
-    }, /*#__PURE__*/_react["default"].createElement("span", null, params.value)));
+    }, /*#__PURE__*/_react["default"].createElement("span", {
+      className: "".concat(preCls, "__kr-name__title")
+    }, params.value)));
   };
 };
 
@@ -217,7 +220,9 @@ 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;
@@ -311,7 +316,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/pages/new-okr-list/header/index.js

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

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.40-beta.13",
+  "version": "1.15.40-beta.16",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",