@titaui/pc 1.9.78 → 1.9.80

package/src/components/okr-progress-modal/index.tsx

@@ -1,11 +1,11 @@
-import React, { useEffect, useState } from "react";
+import React, { useEffect, useState, FC } from "react";
 import { Input, Modal, Tooltip } from "tita-ui";
 import classNames from "classnames";
 import { getKrRecommandProgress, getORecommandProgress } from "./request-apis";
 import Switch from "../switch";
 import Textarea from "./textarea";
 import {
-  getO_SETTING, getKR_SETTING, transProgress, getKrOptions, getOptions,
+  getOSetting, getKrSetting, transProgress, getKrOptions, getOptions,
 } from "./helper";
 import {
   ErrorTip, List, Item, Icon, Options, OptionsWrapper,
@@ -15,12 +15,12 @@ import { getLocale } from "../../utils/getLocale";
 import { inputWordTrans } from "../../utils/i18n-front-translate";
 import "./index.scss";
 
-const ProgressModal: React.FC<IProgressModalProps> = (props) => {
+const ProgressModal: FC<IProgressModalProps> = (props:IProgressModalProps) => {
   const {
     maxLength, okrInfo, onClose, onOk, title = window.getLocale("OKR_MyO_Prog_Butt_Update"), visible, isKr,
   } = props;
 
-  const configure = isKr ? getKR_SETTING() : getO_SETTING();
+  const configure = isKr ? getKrSetting() : getOSetting();
 
   const reg = /^[0-9]*[1-9][0-9]*$/;
   const [errorProgress, setErrorProgress] = useState(false);
@@ -34,10 +34,7 @@ const ProgressModal: React.FC<IProgressModalProps> = (props) => {
   const [selected, setSelected] = useState<number>(
     isKr ? okrInfo.riskLevel : okrInfo.manualRiskLevel,
   );
-  const [ShowKrProgress] = useState(() =>
-    // @ts-ignore
-    window.BSGlobal.OkrAdvancedSetting.KRSetting.ShowKrProgress);
-
+  const [ShowKrProgress] = useState(window?.BSGlobal?.OkrAdvancedSetting?.KRSetting?.ShowKrProgress);
   const [autoUpdate, setUpdate] = useState(true); // 设置自动更新
   const [updateWay, setUpdateWay] = useState(0); // 自动更新方式 0: 关闭， 1: 根据关见成果， 2: 子目标
   const [settingFolded, setSettingFold] = useState(false);
@@ -46,11 +43,11 @@ const ProgressModal: React.FC<IProgressModalProps> = (props) => {
   const getRecommendProgress = async () => {
     const getRecommandHandler = isKr ? getKrRecommandProgress : getORecommandProgress;
     const data = await getRecommandHandler(isKr ? okrInfo.mileStoneId : okrInfo.workId);
-    if (data.Code == 1) {
+    if (data.Code === 1) {
       const { UpdateProgressWay, Progress } = data.Data;
       setRecommandProgressObj(data.Data);
-      setUpdate(UpdateProgressWay != 0);
-      setUpdateWay(UpdateProgressWay == 0 ? 1 : UpdateProgressWay);
+      setUpdate(UpdateProgressWay !== 0);
+      setUpdateWay(UpdateProgressWay === 0 ? 1 : UpdateProgressWay);
       setProgress(Progress);
     }
   };
@@ -66,9 +63,12 @@ const ProgressModal: React.FC<IProgressModalProps> = (props) => {
   useEffect(() => {
     if (!autoUpdate) return;
     const { childOkrProgress, childkrProgress, childEProgress } = recommandProgressObj;
-    updateWay == 1
-      && setProgress(isKr ? transProgress(childEProgress) : transProgress(childkrProgress));
-    updateWay == 2 && setProgress(transProgress(childOkrProgress));
+    if (updateWay === 1) {
+      setProgress(isKr ? transProgress(childEProgress) : transProgress(childkrProgress));
+    }
+    if (updateWay === 2) {
+      setProgress(transProgress(childOkrProgress));
+    }
   }, [updateWay, autoUpdate, recommandProgressObj]);
 
   let descriptionText = (
@@ -131,6 +131,7 @@ const ProgressModal: React.FC<IProgressModalProps> = (props) => {
       title={title}
       visible={visible}
       width={600}
+      zIndex={2400}
     >
       <List>
         <Item>
@@ -165,7 +166,7 @@ const ProgressModal: React.FC<IProgressModalProps> = (props) => {
                 <Icon
                   color={option.color}
                   className={
-                    selected == option.id ? "tu-icon-singlebox-avtive" : "tu-icon-singlebox-have"
+                    selected === option.id ? "tu-icon-singlebox-avtive" : "tu-icon-singlebox-have"
                   }
                 />
                 <p>{option.text}</p>
@@ -195,7 +196,7 @@ const ProgressModal: React.FC<IProgressModalProps> = (props) => {
                       <span
                         className={classNames(
                           "auto-update-setting__radio",
-                          `auto-update-setting__radio${updateWay == option.key ? "--selected" : ""
+                          `auto-update-setting__radio${updateWay === option.key ? "--selected" : ""
                           }`,
                         )}
                       />

package/src/components/okr-share/index.tsx

@@ -11,7 +11,7 @@ interface Props {
   data: any;
 }
 
-const ShareContent = function ({ closeModal, getModalRef, data }: Props) {
+const ShareContent = ({ closeModal, getModalRef, data }: Props) => {
   const [shareImg, setShareImg] = useState<string>();
   const [showPublish, setShowPublish] = useState(false);
   return (
@@ -43,12 +43,14 @@ const ShareContent = function ({ closeModal, getModalRef, data }: Props) {
 };
 
 interface ShareProps {
-  shareComponent
   data: any;
   visible:boolean;
+  zIndex?: number;
   onClose: () => void
 }
-const OkrShare: React.FC<ShareProps> = ({ data, visible, onClose }) => {
+const OkrShare: React.FC<ShareProps> = ({
+  data, visible, onClose, zIndex,
+}) => {
   const modalRef = useRef<any>();
 
   return (
@@ -60,6 +62,7 @@ const OkrShare: React.FC<ShareProps> = ({ data, visible, onClose }) => {
         // maskClosable
       onCancel={() => onClose()}
       ref={modalRef}
+      zIndex={zIndex}
     >
       {visible ? (
         <ShareContent
@@ -71,5 +74,7 @@ const OkrShare: React.FC<ShareProps> = ({ data, visible, onClose }) => {
     </Modal>
   );
 };
-
+OkrShare.defaultProps = {
+  zIndex: 1300,
+};
 export default OkrShare;

package/yarn-error.log

@@ -0,0 +1,103 @@
+Arguments: 
+  /usr/local/bin/node /usr/local/bin/yarn
+
+PATH: 
+  /opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin:/opt/homebrew/bin:/opt/homebrew/sbin
+
+Yarn version: 
+  1.22.10
+
+Node version: 
+  12.22.1
+
+Platform: 
+  darwin x64
+
+Trace: 
+  SyntaxError: /Users/yang/tita/titaui-pc/package.json: Unexpected token < in JSON at position 26
+      at JSON.parse (<anonymous>)
+      at /usr/local/lib/node_modules/yarn/lib/cli.js:1625:59
+      at Generator.next (<anonymous>)
+      at step (/usr/local/lib/node_modules/yarn/lib/cli.js:310:30)
+      at /usr/local/lib/node_modules/yarn/lib/cli.js:321:13
+
+npm manifest: 
+  {
+    "name": "@titaui/pc",
+  <<<<<<< HEAD
+    "version": "1.2.22",
+  =======
+    "version": "1.2.13",
+  >>>>>>> master
+    "nameCN": "",
+    "description": "",
+    "main": "src/index.js",
+    "scripts": {
+      "storybook": "start-storybook -p 6006 --no-dll",
+      "start": "dev_server=on webpack-dev-server --disableHostCheck=true --progress --colors  --config webpack-stories.config.js",
+      "build-storybook": "build-storybook --docs --no-dll",
+      "build:es": "babel src -d es --ignore **/__tests__",
+      "build:lib": "cross-env OUTPUT_MODULE=commonjs babel src -d lib --ignore **/__tests__",
+      "build:umd": "webpack --config ./.scripts/webpack.umd.js",
+      "build": "npm run build:lib && npm run build:es && npm run build:umd"
+    },
+    "author": "",
+    "license": "ISC",
+    "devDependencies": {
+      "del": "^6.0.0",
+      "gulp": "^3.x",
+      "gulp-autoprefixer": "^7.0.1",
+      "gulp-babel": "^8.0.0",
+      "gulp-concat": "^2.6.1",
+      "gulp-cssbeautify": "^3.0.0",
+      "gulp-cssnano": "^2.1.3",
+      "gulp-filesize": "0.0.6",
+      "gulp-postcss": "^9.0.0",
+      "gulp-rename": "^2.0.0",
+      "gulp-replace": "^1.0.0",
+      "gulp-sass": "^4.1.0",
+      "gulp-sourcemaps": "^2.6.5",
+      "sass-resources-loader": "^2.2.1"
+    },
+    "dependencies": {
+      "@titaui/dagre": "^0.8.8-pre",
+      "@titaui/rc-tree2": "^4.1.15",
+      "@titaui/rc-trigger": "^5.2.5",
+      "@titaui/react-flow-renderer": "9.5.4",
+      "@titaui/toast": "^1.0.0",
+      "axios": "^0.21.1",
+      "classnames": "^2.2.6",
+      "clone-deep": "^4.0.1",
+      "d3-cloud": "^1.2.5",
+      "dayjs": "^1.10.4",
+      "html2canvas": "^1.0.0-rc.7",
+      "moment": "^2.29.1",
+      "qs": "^6.10.1",
+      "rc-checkbox": "^2.3.2",
+      "rc-dialog": "8.5.2",
+      "rc-drawer": "^4.3.1",
+      "rc-input-number": "^5.0.0",
+      "rc-pagination": "^3.1.6",
+      "rc-queue-anim": "1.4.1",
+      "rc-select": "^12.1.7",
+      "rc-switch": "^3.2.2",
+      "rc-table": "^7.13.2",
+      "rc-tabs": "^11.7.3",
+      "rc-tooltip": "^5.1.1",
+      "rc-tree": "^4.1.5",
+      "rc-trigger": "^5.2.3",
+      "rc-upload": "^4.2.0-alpha.0",
+      "rc-util": "^5.13.1",
+      "react-collapse": "^5.1.0",
+      "react-perfect-scrollbar": "^1.5.2",
+      "url-parse": "^1.5.1",
+      "uuid": "^3.1.0",
+      "wordcloud": "^1.2.2"
+    }
+  }
+
+yarn manifest: 
+  No manifest
+
+Lockfile: 
+  No lockfile