@titaui/pc 1.16.20 → 1.16.21

package/lib/components/create-okr-modal/fields/okr-visibility-detail.js

@@ -54,9 +54,6 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 var visibilityList = [{
-  value: 1,
-  lable: (0, _getLocale.getLocale)("OKR_MyO_Pop_Public")
-}, {
   value: 2,
   lable: (0, _getLocale.getLocale)("OKR_MyO_From_Associatedmem")
 }, {
@@ -67,12 +64,19 @@ var visibilityList = [{
   lable: (0, _getLocale.getLocale)("OKR_MyO_Pop_Specified")
 }];
 
+if (window.BSGlobal.tenantInfo.isOpenInfo) {
+  visibilityList.unshift({
+    value: 1,
+    lable: (0, _getLocale.getLocale)("OKR_MyO_Pop_Public")
+  });
+}
+
 function _default(_ref) {
   var _ref$canEdit = _ref.canEdit,
       canEdit = _ref$canEdit === void 0 ? false : _ref$canEdit,
       workId = _ref.workId,
       _ref$visibilityProp = _ref.visibilityProp,
-      visibilityProp = _ref$visibilityProp === void 0 ? 1 : _ref$visibilityProp,
+      visibilityProp = _ref$visibilityProp === void 0 ? 2 : _ref$visibilityProp,
       _ref$visiableScopePro = _ref.visiableScopeProp,
       visiableScopeProp = _ref$visiableScopePro === void 0 ? {} : _ref$visiableScopePro,
       onSave = _ref.onSave;

package/lib/components/create-okr-modal/fields/okr-visibility.js

@@ -29,10 +29,7 @@ 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; }
 
 var visibilityList = function visibilityList() {
-  return [{
-    value: 1,
-    lable: (0, _getLocale.getLocale)("OKR_MyO_Pop_Public")
-  }, {
+  var visibility = [{
     value: 2,
     lable: (0, _getLocale.getLocale)("OKR_MyO_From_Associatedmem")
   }, {
@@ -42,6 +39,15 @@ var visibilityList = function visibilityList() {
     value: 4,
     lable: (0, _getLocale.getLocale)("OKR_MyO_Pop_Specified")
   }];
+
+  if (window.BSGlobal.tenantInfo.isOpenInfo) {
+    visibility.unshift({
+      value: 1,
+      lable: (0, _getLocale.getLocale)("OKR_MyO_Pop_Public")
+    });
+  }
+
+  return visibility;
 };
 
 var visibilityMapText = function visibilityMapText() {

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

@@ -221,7 +221,7 @@ function CreateOkrModal(_ref, ref) {
       setOkrClassify = _useState20[1]; // 目标类别
 
 
-  var _useState21 = (0, _react.useState)(1),
+  var _useState21 = (0, _react.useState)(2),
       _useState22 = _slicedToArray(_useState21, 2),
       visibility = _useState22[0],
       setVisibility = _useState22[1]; // 可见性
@@ -680,7 +680,7 @@ function CreateOkrModal(_ref, ref) {
       });
       setCycle(cycle);
       setOkrClassify(undefined);
-      setVisibility(1);
+      setVisibility(2);
       setParent({
         parentWorkId: 0,
         parentWorkName: '',

package/lib/components/dynamic/dynamic-item/components/summary-header/index.js

@@ -365,9 +365,13 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
       }); // 暂时用title
 
       if (typeof (mindData === null || mindData === void 0 ? void 0 : mindData.content) === 'string' && (mindData === null || mindData === void 0 ? void 0 : mindData.content) !== '') {
-        setMindImg(_constant.Motion.find(function (item) {
-          return item.id === JSON.parse(mindData.content || '{}').SelectedValues[0];
-        }).img);
+        var _Motion$find;
+
+        setMindImg(((_Motion$find = _constant.Motion.find(function (item) {
+          var _JSON$parse$SelectedV;
+
+          return item.id === ((_JSON$parse$SelectedV = JSON.parse(mindData.content || '{}').SelectedValues) === null || _JSON$parse$SelectedV === void 0 ? void 0 : _JSON$parse$SelectedV[0]) || 0;
+        })) === null || _Motion$find === void 0 ? void 0 : _Motion$find.img) || '');
       }
     }
   }, [dailyContent]);

package/lib/components/okr-detail/base-info/other-infos/visibility/index.js

@@ -40,10 +40,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 var getVisibilityList = function getVisibilityList() {
-  return [{
-    value: 1,
-    label: (0, _getLocale.getLocale)("OKR_MyO_Pop_Public")
-  }, {
+  var visibility = [{
     value: 2,
     label: (0, _getLocale.getLocale)("OKR_MyO_From_Associatedmem")
   }, {
@@ -53,6 +50,15 @@ var getVisibilityList = function getVisibilityList() {
     value: 4,
     label: (0, _getLocale.getLocale)("OKR_MyO_Pop_Specified")
   }];
+
+  if (window.BSGlobal.tenantInfo.isOpenInfo) {
+    visibility.unshift({
+      value: 1,
+      label: (0, _getLocale.getLocale)("OKR_MyO_Pop_Public")
+    });
+  }
+
+  return visibility;
 };
 
 var getVisibilityMapText = function getVisibilityMapText() {

package/lib/components/okr-detail/detail-header/actions.js

@@ -34,11 +34,6 @@ var addVisibilityButton = function addVisibilityButton(_ref2, actions) {
       detailInfo = _ref2.detailInfo,
       changeVisiblilty = _ref2.changeVisiblilty;
   var children = [{
-    title: (0, _getLocale.getLocale)('OKR_MyO_Pop_Public'),
-    onClick: function onClick() {
-      return changeVisiblilty(1);
-    }
-  }, {
     title: (0, _getLocale.getLocale)('OKR_MyO_From_Associatedmem'),
     onClick: function onClick() {
       return changeVisiblilty(2);
@@ -55,11 +50,27 @@ var addVisibilityButton = function addVisibilityButton(_ref2, actions) {
     }
   }];
 
+  if (window.BSGlobal.tenantInfo.isOpenInfo) {
+    children.unshift({
+      title: (0, _getLocale.getLocale)('OKR_MyO_Pop_Public'),
+      onClick: function onClick() {
+        return changeVisiblilty(1);
+      }
+    });
+  }
+
+  var getVisibilityMapText = {
+    1: (0, _getLocale.getLocale)('OKR_MyO_Pop_Public'),
+    2: (0, _getLocale.getLocale)('OKR_MyO_From_Associatedmem'),
+    3: (0, _getLocale.getLocale)('OKR_MyO_Pop_Directrep'),
+    4: (0, _getLocale.getLocale)('OKR_MyO_Pop_Specified')
+  };
+
   var editable = auth.hasAuth() && detailInfo.status === _enums.OkrStatus.inProgress;
 
   actions.push({
     icon: visibility !== 1 ? 'tu-icon-simi-icon' : 'tu-icon-gongkai',
-    title: children[visibility - 1].title + (0, _getLocale.getLocale)('OKR_MyO_Text_Visible'),
+    title: getVisibilityMapText[visibility] + (0, _getLocale.getLocale)('OKR_MyO_Text_Visible'),
     children: editable ? children : null
   });
 };

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

@@ -40,19 +40,25 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var prefix = 'tita-okr-excel-create-visibility';
 
 var getVisibilityList = function getVisibilityList() {
-  return [{
-    value: 1,
-    label: (0, _getLocale.getLocale)('OKR_MyO_Pop_Public')
-  }, {
+  var visibility = [{
     value: 2,
-    label: (0, _getLocale.getLocale)('OKR_MyO_From_Associatedmem')
+    label: (0, _getLocale.getLocale)("OKR_MyO_From_Associatedmem")
   }, {
     value: 3,
-    label: (0, _getLocale.getLocale)('OKR_MyO_Pop_Directrep')
+    label: (0, _getLocale.getLocale)("OKR_MyO_Pop_Directrep")
   }, {
     value: 4,
-    label: (0, _getLocale.getLocale)('OKR_MyO_Pop_Specified')
+    label: (0, _getLocale.getLocale)("OKR_MyO_Pop_Specified")
   }];
+
+  if (window.BSGlobal.tenantInfo.isOpenInfo) {
+    visibility.unshift({
+      value: 1,
+      label: (0, _getLocale.getLocale)("OKR_MyO_Pop_Public")
+    });
+  }
+
+  return visibility;
 };
 
 var getVisibilityMapText = function getVisibilityMapText() {

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

@@ -40,19 +40,25 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var prefix = 'tita-okr-excel-create-visibility';
 
 var getVisibilityList = function getVisibilityList() {
-  return [{
-    value: 1,
-    label: (0, _getLocale.getLocale)('OKR_MyO_Pop_Public')
-  }, {
+  var visibility = [{
     value: 2,
-    label: (0, _getLocale.getLocale)('OKR_MyO_From_Associatedmem')
+    label: (0, _getLocale.getLocale)("OKR_MyO_From_Associatedmem")
   }, {
     value: 3,
-    label: (0, _getLocale.getLocale)('OKR_MyO_Pop_Directrep')
+    label: (0, _getLocale.getLocale)("OKR_MyO_Pop_Directrep")
   }, {
     value: 4,
-    label: (0, _getLocale.getLocale)('OKR_MyO_Pop_Specified')
+    label: (0, _getLocale.getLocale)("OKR_MyO_Pop_Specified")
   }];
+
+  if (window.BSGlobal.tenantInfo.isOpenInfo) {
+    visibility.unshift({
+      value: 1,
+      label: (0, _getLocale.getLocale)("OKR_MyO_Pop_Public")
+    });
+  }
+
+  return visibility;
 };
 
 var getVisibilityMapText = function getVisibilityMapText() {

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

@@ -114,7 +114,7 @@ var getIitData = function getIitData(_ref) {
     workName: '',
     isSaved: false,
     workNameRichText: '',
-    visibility: 1,
+    visibility: 2,
     visibilityScope: undefined,
     departmentId: loginUser.DepartmentId,
     departmentName: loginUser.Department,

package/lib/components/okr-flow/utils/tree-handler.js

@@ -139,9 +139,9 @@ var flatTree = function flatTree(current, elements, showkr) {
       children = _current$children === void 0 ? [] : _current$children,
       isSearchRes = current.isSearchRes;
 
-  if (modelType == 'root') {
+  if (modelType === 'root') {
     elements.push({
-      id: "".concat(id),
+      id: modelType + id,
       type: 'RootNode',
       data: data,
       isParent: true,
@@ -168,7 +168,7 @@ var flatTree = function flatTree(current, elements, showkr) {
     }
 
     elements.push({
-      id: "".concat(id),
+      id: "".concat(modelType).concat(id),
       type: 'ChildNode',
       position: {
         x: 0,
@@ -189,29 +189,26 @@ var flatTree = function flatTree(current, elements, showkr) {
   if (children.length) {
     children.forEach(function (child) {
       if (!child) return;
-      var modelType = child.modelType,
-          _child$children = child.children,
-          children = _child$children === void 0 ? [] : _child$children;
 
-      if (!showkr && modelType == 'kr') {
+      if (!showkr && child.modelType === 'kr') {
         if (children.length > 0) {
           children.forEach(function (sub) {
             if (!sub) return;
             elements.push({
-              id: "e".concat(id, "-").concat(sub.id),
-              source: "".concat(id),
-              target: "".concat(sub.id)
+              id: "e".concat(modelType).concat(id, "-").concat(sub.modelType).concat(sub.id),
+              source: modelType + id,
+              target: "kr".concat(sub.id)
             });
             flatTree(sub, elements, showkr, current.modelType != 'root', id);
           });
         }
       } else {
         elements.push({
-          id: "e".concat(id, "-").concat(child.id),
-          source: "".concat(id),
-          target: "".concat(child.id)
+          id: "e".concat(modelType).concat(id, "-").concat(child.modelType).concat(child.id),
+          source: modelType + id,
+          target: child.modelType + child.id
         });
-        flatTree(child, elements, showkr, current.modelType != 'root', id);
+        flatTree(child, elements, showkr, current.modelType !== 'root', id);
       }
     });
   }

package/lib/components/search-input/index.js

@@ -36,9 +36,12 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _default(props) {
   var onSearch = props.onSearch,
       placeholder = props.placeholder,
-      setSearchKey = props.setSearchKey;
+      setSearchKey = props.setSearchKey,
+      propsValue = props.value,
+      _props$style = props.style,
+      style = _props$style === void 0 ? {} : _props$style;
 
-  var _useState = (0, _react.useState)(""),
+  var _useState = (0, _react.useState)(''),
       _useState2 = _slicedToArray(_useState, 2),
       value = _useState2[0],
       setValue = _useState2[1];
@@ -56,23 +59,23 @@ function _default(props) {
   var defaultStyle = _objectSpread({
     width: 230,
     height: 30
-  }, props.style);
+  }, style);
 
   (0, _react.useEffect)(function () {
-    setValue(props.value);
-    if (!props.value) setClearIconState(false);
-  }, [props.value]);
-  var inputClassName = focus ? "search-input-focus" : "";
-  var iconClassName = focus ? "search-input-icon-focus" : "";
+    setValue(propsValue);
+    if (!propsValue) setClearIconState(false);
+  }, [propsValue]);
+  var inputClassName = focus ? 'search-input-focus' : '';
+  var iconClassName = focus ? 'search-input-icon-focus' : '';
   var clearIconStyle = {
-    display: clearIconState ? "inline" : "none"
+    display: clearIconState ? 'inline' : 'none'
   };
 
   var handleInputChange = function handleInputChange(e) {
     var evalue = e.target.value;
     setValue(evalue);
-    setSearchKey && setSearchKey(evalue);
-    setClearIconState(evalue != "");
+    setSearchKey === null || setSearchKey === void 0 ? void 0 : setSearchKey(evalue);
+    setClearIconState(evalue != '');
   };
 
   var handleFocusBlur = function handleFocusBlur(e) {
@@ -80,18 +83,18 @@ function _default(props) {
   };
 
   var handleKeyPress = function handleKeyPress(e) {
-    if (e.key === "Enter") {
+    if (e.key === 'Enter') {
       handleSearch();
     }
   };
 
   var handleSearch = function handleSearch() {
-    onSearch && onSearch(value.trim());
+    onSearch === null || onSearch === void 0 ? void 0 : onSearch(value === null || value === void 0 ? void 0 : value.trim());
   };
 
   var clearValue = function clearValue(e) {
-    setValue("");
-    setSearchKey && setSearchKey("");
+    setValue('');
+    setSearchKey === null || setSearchKey === void 0 ? void 0 : setSearchKey('');
 
     if (onSearch) {
       onSearch('');

package/package.json

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