@titaui/pc 1.16.9-beta.1 → 1.16.9-beta.2

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

@@ -72,8 +72,6 @@ var VisibilityColorMap = {
 };
 
 var Visibility = function Visibility(_ref) {
-  var _visiableLimitState$u, _visiableLimitState$u2;
-
   var visibility = _ref.visibility,
       visiableLimit = _ref.visiableLimit,
       onChangeVisiableLimit = _ref.onChangeVisiableLimit;
@@ -161,23 +159,38 @@ var Visibility = function Visibility(_ref) {
 
       if (visiableLimitState.departments && visiableLimitState.departments.length > 0) {
         visiableLimitState.departments.forEach(function (item, index) {
-          result.push(index === 0 && result.length === 0 ? '' : '、');
-          result.push( /*#__PURE__*/_react["default"].createElement(_openData.OpenDepartmentName, {
+          // result.push(index === 0 && result.length === 0 ? '' : '、')
+          result.push( /*#__PURE__*/_react["default"].createElement("span", {
+            className: "".concat(prefix, "__item"),
+            style: {
+              background: VisibilityColorMap[visibilityState]
+            }
+          }, /*#__PURE__*/_react["default"].createElement(_openData.OpenDepartmentName, {
             name: item.name,
             id: item.id
-          }));
+          })));
         });
       }
 
       if (visiableLimitState.groups && visiableLimitState.groups.length > 0) {
         visiableLimitState.groups.forEach(function (item, index) {
-          result.push(index === 0 && result.length === 0 ? '' : '、');
-          result.push(item.name);
+          // result.push(index === 0 && result.length === 0 ? '' : '、')
+          result.push( /*#__PURE__*/_react["default"].createElement("span", {
+            className: "".concat(prefix, "__item"),
+            style: {
+              background: VisibilityColorMap[visibilityState]
+            }
+          }, item.name));
         });
       }
     }
 
-    return result.length > 0 ? result : getVisibilityMapText()[visibilityState];
+    return result.length > 0 ? /*#__PURE__*/_react["default"].createElement("p", null, result) : /*#__PURE__*/_react["default"].createElement("p", {
+      className: "".concat(prefix, "__content-text"),
+      style: {
+        background: VisibilityColorMap[visibilityState]
+      }
+    }, getVisibilityMapText()[visibilityState]);
   }, [visiableLimitState, visibilityState]);
   var renderPopContent = (0, _react.useMemo)(function () {
     var list = getVisibilityList();
@@ -200,12 +213,7 @@ var Visibility = function Visibility(_ref) {
     ref: popRef
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__content")
-  }, visiableLimitState !== null && visiableLimitState !== void 0 && (_visiableLimitState$u = visiableLimitState.users) !== null && _visiableLimitState$u !== void 0 && _visiableLimitState$u.length ? /*#__PURE__*/_react["default"].createElement("p", null, renderText) : /*#__PURE__*/_react["default"].createElement("p", {
-    className: "".concat(prefix, "__content-text"),
-    style: !(visiableLimitState !== null && visiableLimitState !== void 0 && (_visiableLimitState$u2 = visiableLimitState.users) !== null && _visiableLimitState$u2 !== void 0 && _visiableLimitState$u2.length) ? {
-      background: VisibilityColorMap[visibilityState]
-    } : {}
-  }, renderText))), /*#__PURE__*/_react["default"].createElement(_index["default"], {
+  }, renderText)), /*#__PURE__*/_react["default"].createElement(_index["default"], {
     popupAlign: {
       offset: [-550, -100],
       overflow: {

package/package.json

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