@titaui/pc 1.15.89-beta.4 → 1.15.89-beta.5

package/lib/components/okr-excel-create/components-new/kr-confidence/index.css

@@ -2,12 +2,10 @@
   display: flex;
   align-items: center;
   cursor: pointer;
-  position: absolute;
   left: 0;
   top: 0;
   width: 100%;
   height: 100%;
-  padding: 0 12px;
   box-sizing: border-box;
 }
 
@@ -15,4 +13,5 @@
   width: 100%;
   display: flex;
   align-items: center;
+  justify-content: center;
 }

package/lib/components/okr-excel-create/components-new/kr-weight/index.js

@@ -144,7 +144,7 @@ var krWeightRenderer = function krWeightRenderer(update) {
       }, 0);
       console.log('totalWeight', totalWeight); // 自动计算最后一个 kr 的权重
 
-      rootDataRef.current.krs[lastIndex] = _objectSpread(_objectSpread({}, rootDataRef.current.krs[lastIndex].krWeight), {}, {
+      rootDataRef.current.krs[lastIndex] = _objectSpread(_objectSpread({}, rootDataRef.current.krs[lastIndex]), {}, {
         krWeight: (100 - totalWeight).toFixed(1)
       });
       update({
@@ -165,7 +165,7 @@ var krWeightRenderer = function krWeightRenderer(update) {
       return totalWeight <= 100;
     }, [rootData, rowIdx]);
     return /*#__PURE__*/_react["default"].createElement(KRWeight, {
-      value: data.krWeight.toFixed(1),
+      value: data.krWeight,
       onChange: handleEditKRWeight,
       disabled: isLast,
       onChangeBefore: onChangeBefore

package/lib/components/okr-excel-create/components-new/okr-name/index.css

@@ -54,9 +54,16 @@
   border: 0;
 }
 
+.tita-okr-excel-create-okr-name--isO .tita-rich-editor p {
+  font-weight: 500 !important;
+}
+
 .tita-okr-excel-create-okr-name .tita-rich-editor p {
   padding: 0;
   font-size: 14px;
+  font-weight: 400;
+  color: #141C28;
+  line-height: 22px;
   white-space: pre-wrap;
 }
 

package/lib/components/okr-excel-create/components-new/okr-name/index.js

@@ -19,6 +19,10 @@ var _utils = require("../../utils");
 
 require("./index.css");
 
+var _classnames = _interopRequireDefault(require("classnames"));
+
+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; }
@@ -172,7 +176,7 @@ var OkrNameRenderer = function OkrNameRenderer(update, isO) {
     };
 
     return /*#__PURE__*/_react["default"].createElement("div", {
-      className: "".concat(preCls)
+      className: (0, _classnames["default"])("".concat(preCls), _defineProperty({}, "".concat(preCls, "--isO"), isO))
     }, /*#__PURE__*/_react["default"].createElement("span", {
       className: "".concat(preCls, "__icon")
     }, isO ? 'O:' : "KR".concat(rowIdx + 1, ":")), /*#__PURE__*/_react["default"].createElement("span", {

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

@@ -166,14 +166,15 @@ var OKRExcelCreate = function OKRExcelCreate(_ref) {
       title: dicData['KR 负责人'],
       dataIndex: 'user.name',
       key: 'kr.user.name',
-      width: 100,
+      width: 160,
       level: 2,
       render: (0, _okrPrincipal["default"])(update, false)
     }, {
       title: dicData['KR 权重'],
       dataIndex: 'krWeight',
       key: 'krWeight',
-      width: 80,
+      width: 160,
+      align: 'center',
       level: 2,
       renderFill: true,
       render: (0, _krWeight["default"])(update)
@@ -181,7 +182,8 @@ var OKRExcelCreate = function OKRExcelCreate(_ref) {
       title: dicData['信心指数'],
       dataIndex: 'confidenceIndex',
       key: 'confidenceIndex',
-      width: 80,
+      width: 160,
+      align: 'center',
       level: 2,
       render: (0, _krConfidence["default"])(update)
     }];

package/lib/components/table-excel-v2/index.css

@@ -32,6 +32,18 @@
   transition: background-color .3s;
 }
 
+.titaui-table-excel-v2__header__item--aligin-left {
+  justify-content: flex-start;
+}
+
+.titaui-table-excel-v2__header__item--aligin-center {
+  justify-content: center;
+}
+
+.titaui-table-excel-v2__header__item--aligin-right {
+  justify-content: flex-end;
+}
+
 .titaui-table-excel-v2__header__item:hover {
   background-color: #f2f2f2;
 }
@@ -67,3 +79,15 @@
   min-height: 30px;
   box-sizing: border-box;
 }
+
+.titaui-table-excel-v2__box-content--aligin-left {
+  justify-content: flex-start;
+}
+
+.titaui-table-excel-v2__box-content--aligin-center {
+  justify-content: center;
+}
+
+.titaui-table-excel-v2__box-content--aligin-right {
+  justify-content: flex-end;
+}

package/lib/components/table-excel-v2/index.js

@@ -21,6 +21,8 @@ var _array = require("../../utils/array");
 
 require("./index.css");
 
+var _classnames = _interopRequireDefault(require("classnames"));
+
 var _excluded = ["render"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -421,7 +423,9 @@ var TableExcelV2 = function TableExcelV2(_ref6) {
     return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, renderColumns[currentLevel - 1].map(function (columnOption, colIdx) {
       var render = columnOption.render,
           dataIndex = columnOption.dataIndex,
-          renderFill = columnOption.renderFill;
+          renderFill = columnOption.renderFill,
+          _columnOption$align = columnOption.align,
+          align = _columnOption$align === void 0 ? 'left' : _columnOption$align;
 
       var content = /*#__PURE__*/_react["default"].createElement(MemoRender, {
         render: render,
@@ -442,7 +446,7 @@ var TableExcelV2 = function TableExcelV2(_ref6) {
           borderLeft: moveInfo.colIdx === index && moveInfo.down && '1px solid #e2e2e2' || undefined
         }, positions[index])
       }, renderFill && content, !renderFill && /*#__PURE__*/_react["default"].createElement("div", {
-        className: "".concat(preCls, "__box-content")
+        className: (0, _classnames["default"])("".concat(preCls, "__box-content"), "".concat(preCls, "__box-content--aligin-").concat(align))
       }, content));
     }), renderColumns[currentLevel] && /*#__PURE__*/_react["default"].createElement("div", {
       className: "".concat(preCls, "__childs")
@@ -462,10 +466,12 @@ var TableExcelV2 = function TableExcelV2(_ref6) {
     className: "".concat(preCls, "__header")
   }, _columns.map(function (_ref13, i) {
     var title = _ref13.title,
+        _ref13$align = _ref13.align,
+        align = _ref13$align === void 0 ? 'left' : _ref13$align,
         key = _ref13.key;
     return /*#__PURE__*/_react["default"].createElement(_web.animated.div, {
       key: key,
-      className: "".concat(preCls, "__header__item") // {...moveColBind({ colIndex: i })}
+      className: (0, _classnames["default"])("".concat(preCls, "__header__item"), "".concat(preCls, "__header__item--aligin-").concat(align)) // {...moveColBind({ colIndex: i })}
       ,
       style: {
         width: colSizes[i].width,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.15.89-beta.4",
+  "version": "1.15.89-beta.5",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",