@titaui/pc 1.9.63 → 1.9.64

package/lib/utils/open-data.js

@@ -1,6 +1,6 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -15,9 +15,9 @@ 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 ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 

package/lib/utils/request-v1.js

@@ -10,9 +10,9 @@ exports.taker = taker;
 
 var _bsGlobal = require("./bs-global");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 

package/lib/utils/roundWeight.js

@@ -8,9 +8,9 @@ exports.AccMul = AccMul;
 exports.ReCalibratePrecision = ReCalibratePrecision;
 exports.RoundWeight = RoundWeight;
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 

package/lib/utils/tools.js

@@ -14,9 +14,9 @@ var _platform = require("./platform");
 
 var _openData = require("./open-data");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.9.63",
+  "version": "1.9.64",
   "nameCN": "",
   "description": "",
   "main": "src/index.js",
@@ -116,7 +116,6 @@
     "react-cropper": "^2.1.8",
     "react-custom-scrollbars": "^4.2.1",
     "react-grid-layout": "^1.2.5",
-    "react-perfect-scrollbar": "^1.5.8",
     "react-sizeme": "^3.0.1",
     "react-slick": "^0.28.1",
     "react-spring": "^9.2.4",

package/src/components/okr-detail/base-info/other-infos/visibility/index.tsx

@@ -8,19 +8,19 @@ import Tooltip from "../../../../tooltip";
 import { OpenDepartmentName, OpenUserName } from "../../../../../utils/open-data";
 import { getLocale } from "../../../../../utils/getLocale";
 
-const getVisibilityList = () => [
+const visibilityList = [
   { value: 1, label: getLocale("OKR_MyO_Pop_Public") },
   { value: 2, label: getLocale("OKR_MyO_From_Associatedmem") },
   { value: 3, label: getLocale("OKR_MyO_Pop_Directrep") },
   { value: 4, label: getLocale("OKR_MyO_Pop_Specified") },
 ];
 
-const getVisibilityMapText = () => ({
+const visibilityMapText = {
   1: getLocale("OKR_MyO_Pop_Public"),
   2: getLocale("OKR_MyO_From_Associatedmem"),
   3: getLocale("OKR_MyO_Pop_Directrep"),
   4: getLocale("OKR_MyO_Pop_Specified"),
-});
+};
 
 interface IVisibilityProps {
   visibility: any;
@@ -41,59 +41,43 @@ const Visibility: FC<IVisibilityProps> = ({
     const { departments, groups, users } = selectNodes;
     if (departments.length === 0 && groups.length === 0 && users.length === 0) {
       setVisibilityState(oldSelect.current);
-      if (selectorRef.current) {
-        // @ts-ignore
-        selectorRef.current.close();
-      }
-      return;
-    }
-    if (onChangeVisiableLimit) {
-      onChangeVisiableLimit(4, selectNodes);
-    }
-    if (selectorRef.current) {
       // @ts-ignore
-      selectorRef.current.close();
+      selectorRef.current && selectorRef.current.close();
+      return;
     }
+    onChangeVisiableLimit && onChangeVisiableLimit(4, selectNodes);
+    // @ts-ignore
+    selectorRef.current && selectorRef.current.close();
   }, [onChangeVisiableLimit]);
 
   const handleChangeVisibility = useCallback((data) => {
     setVisibilityState(data.value);
     if (data.value === 4) {
-      if (selectorRef.current) {
-        // @ts-ignore
-        selectorRef.current.open();
-      }
+      // @ts-ignore
+      selectorRef.current && selectorRef.current.open();
     } else {
       oldSelect.current = data.value;
-      if (onChangeVisiableLimit) {
-        onChangeVisiableLimit(data.value);
-      }
+      onChangeVisiableLimit && onChangeVisiableLimit(data.value);
     }
   }, [onChangeVisiableLimit]);
 
   const renderText = useMemo(() => {
     const result = [];
     if (visiableLimit) {
-      if (visiableLimit.users && visiableLimit.users.length > 0) {
-        visiableLimit.users.forEach((item, index) => {
-          if (index !== 0) { result.push("、"); }
-          result.push(<OpenUserName name={item.name} id={item.userId} />);
-        });
-      }
-      if (visiableLimit.departments && visiableLimit.departments.length > 0) {
-        visiableLimit.departments.forEach((item, index) => {
-          result.push(index === 0 && result.length === 0 ? "" : "、");
-          result.push(<OpenDepartmentName name={item.name} id={item.id} />);
-        });
-      }
-      if (visiableLimit.groups && visiableLimit.groups.length > 0) {
-        visiableLimit.groups.forEach((item, index) => {
-          result.push(index === 0 && result.length === 0 ? "" : "、");
-          result.push(item.name);
-        });
-      }
+      visiableLimit.users && visiableLimit.users.length > 0 && visiableLimit.users.forEach((item, index) => {
+        if (index !== 0) { result.push("、"); }
+        result.push(<OpenUserName name={item.name} id={item.userId} />);
+      });
+      visiableLimit.departments && visiableLimit.departments.length > 0 ? visiableLimit.departments.forEach((item, index) => {
+        result.push(index === 0 && result.length === 0 ? "" : "、");
+        result.push(<OpenDepartmentName name={item.name} id={item.id} />);
+      }) : "";
+      visiableLimit.groups && visiableLimit.groups.length > 0 ? visiableLimit.groups.forEach((item, index) => {
+        result.push(index === 0 && result.length === 0 ? "" : "、");
+        result.push(item.name);
+      }) : "";
     }
-    return result.length > 0 ? result : getVisibilityMapText()[visibilityState];
+    return result.length > 0 ? result : visibilityMapText[visibilityState];
   }, [visiableLimit, visibilityState]);
 
   useEffect(() => {
@@ -128,7 +112,7 @@ const Visibility: FC<IVisibilityProps> = ({
         textClass="base-info-other-infos__visibility-select-text"
         forceRenderText={visibility === 4}
         initText={renderText as any}
-        items={getVisibilityList()}
+        items={visibilityList}
         initValue={visibilityState}
         onChangeSelect={handleChangeVisibility}
       />
@@ -147,8 +131,4 @@ const Visibility: FC<IVisibilityProps> = ({
   );
 };
 
-Visibility.defaultProps = {
-  canEdit: false,
-};
-
 export default Visibility;

package/src/components-v1/userSelector/components/MultiMode/index.tsx

@@ -29,21 +29,6 @@ interface Props {
 export default class MutiMode extends PureComponent<Props> {
   tab: any;
 
-  componentDidUpdate(prevProps: Props) {
-    const { searchTxt } = this.props;
-    if (prevProps.searchTxt !== searchTxt) {
-      if (searchTxt) {
-        this.tab.changeTab("common");
-      }
-    }
-  }
-
-  handleDepartment = (d: Dept) => {
-    const { selectedDept, onSelectDept } = this.props;
-    if (selectedDept.findIndex((sd) => sd.Id === d.Id) !== -1) return;
-    onSelectDept(d);
-  };
-
   handleSelectUser = (users: User[]) => {
     const { selectedUser, onSelectUser } = this.props;
     const m = {};
@@ -53,16 +38,23 @@ export default class MutiMode extends PureComponent<Props> {
     onSelectUser(filterdUsers);
   };
 
+  handleDepartment = (d: Dept) => {
+    const { selectedDept, onSelectDept } = this.props;
+    if (selectedDept.findIndex((sd) => sd.Id == d.Id) != -1) return;
+    onSelectDept(d);
+  };
+
+  componentDidUpdate(prevProps: Props) {
+    if (prevProps.searchTxt != this.props.searchTxt) {
+      if (this.props.searchTxt) {
+        this.tab.changeTab("common");
+      }
+    }
+  }
+
   render() {
     const {
-      selectedUser,
-      selectedDept,
-      onDeleteUser,
-      onDeleteDept,
-      onClear,
-      deptSelectable,
-      rootSelectable,
-      searchTxt,
+      selectedUser, selectedDept, onDeleteUser, onDeleteDept, onClear, deptSelectable, rootSelectable,
     } = this.props;
     const deptIsSelected = selectedDept.length > 0;
     const userIsSelected = selectedUser.length > 0;
@@ -70,10 +62,7 @@ export default class MutiMode extends PureComponent<Props> {
       {
         title: getLocale("OKR_MyO_Butt_Commonlyused"),
         name: "common",
-        component: <CommonList
-          searchTxt={searchTxt}
-          onSelect={(u: User[]) => this.handleSelectUser(u)}
-        />,
+        component: <CommonList searchTxt={this.props.searchTxt} onSelect={(u: User[]) => this.handleSelectUser(u)} />,
       },
       {
         title: getLocale("OKR_MyO_Butt_Subordinate"),
@@ -85,11 +74,7 @@ export default class MutiMode extends PureComponent<Props> {
     tabOptions.push({
       title: getLocale("Mod_Department"),
       name: "department",
-      component: <DepartmentList
-        rootSelectable={rootSelectable}
-        onSelectUser={(u: User[]) => this.handleSelectUser(u)}
-        onSelectDept={deptSelectable ? (d: Dept) => this.handleDepartment(d) : undefined}
-      />,
+      component: <DepartmentList rootSelectable={rootSelectable} onSelectUser={(u: User[]) => this.handleSelectUser(u)} onSelectDept={deptSelectable ? (d: Dept) => this.handleDepartment(d) : undefined} />,
     });
     // }
     return (
@@ -102,7 +87,7 @@ export default class MutiMode extends PureComponent<Props> {
             <span>
               {getLocale("Mod_Selecperson")}
               {selectedUser.length + getLocale("Mod_Number")}
-              {deptIsSelected && `,${getLocale("Mod_departments").replace("XX", `${selectedDept.length}`)}`}
+              {deptIsSelected && `,组${selectedDept.length}个`}
             </span>
             <ClearBtn active={deptIsSelected || userIsSelected} onMouseDown={() => onClear()}>
               {getLocale("OKR_MyO_Pop_Clearselected")}

package/src/pages/aha2021/index.tsx

@@ -51,6 +51,7 @@ function PageLayout(props: {
 }) {
   const { children } = props;
   const [topCardVisible, setTopCardVisible] = useState(() => {
+    if (getTenantInfo().Source === 964) return false;
     const stopTaking: any = storage.getItem("topGlobalCard");
     if (stopTaking?.date) {
       const oldDate = new Date(stopTaking?.date).getDate();