@titaui/pc 1.9.17 → 1.9.21

package/src/components/okr-detail/components/okr-tree/tree-node/o-parent-node/index.scss

@@ -6,7 +6,7 @@ $font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-ser
   height: 22px;
   font-size: 14px;
   font-family: $font-family;
-  font-weight: 500;
+  font-weight: 600;
   color: #3f4755;
   line-height: 22px;
 }

package/src/components/okr-detail/detail-footer/index.scss

@@ -21,7 +21,7 @@
 .okr-detail-drawer-bottom-mblog-wrapper {
   background: #FFFFFF;
   box-shadow: 0px -2px 8px 0px rgba(127, 145, 180, 0.15);
-  padding: 18px 32px 3px;
+  padding: 18px 32px 20px;
   z-index: 11;
   .okr-detail-reply-to-user {
   //   height: ${(p: any) => p.height};

package/src/components/okr-detail/e-list/search-form/fields/index.scss

@@ -8,6 +8,7 @@
 
     &-text {
       display: inline-block;
+      margin-right: 20px;
     }
 
     &-o {

package/src/components/okr-detail/okr-list/index.scss

@@ -4,7 +4,7 @@ $font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-ser
   height: 22px;
   font-size: 14px;
   font-family: $font-family;
-  font-weight: 500;
+  font-weight: 600;
   color: #a4acb9;
   line-height: 22px;
 }

package/src/components/okr-detail/request-apis.ts

@@ -414,3 +414,10 @@ export const updateChildOkrWeight = (data: { OkrId: number, Weight: number }[])
     "transformRequest": qs.stringify,
   })
 }
+
+export const updateOScore = (score,workId) => {
+  return rpost('v2')('work/score', {
+    manualScore: score,
+    workId:workId
+  })
+}

package/src/components/okr-progress-modal/helper.js

@@ -25,7 +25,7 @@ export const getO_SETTING = () => {
         const { childOkrProgress, childkrProgress } = recommandProgressObj;
         const textArr = [];
         childkrProgress !== -1 && textArr.push(`${getLocale('OKR_MyO_Pop_Upd_KRCom')}${childkrProgress}${getLocale('OKR_MyO_Pop_Upd_Percentage')}`);
-        childOkrProgress !== -1 && textArr.push(`子目标完成度${childOkrProgress}${getLocale('OKR_MyO_Pop_Upd_Percentage')}`);
+        childOkrProgress !== -1 && textArr.push(`${getLocale('OKR_MyO_Ew_SubobjCom')}${childOkrProgress}${getLocale('OKR_MyO_Pop_Upd_Percentage')}`);
         if (textArr.length == 0) return '';
         return (
           <Fragment>
@@ -62,7 +62,7 @@ export const getKR_SETTING = () => {
         const { childOkrProgress, childEProgress } = recommandProgressObj;
         const textArr = [];
         childEProgress !== -1 && textArr.push(`${getLocale('OKR_MyO_Ecompletion')}${childEProgress}${getLocale('OKR_MyO_Pop_Upd_Percentage')}`);
-        childOkrProgress !== -1 && textArr.push(`子目标完成度${childOkrProgress}${getLocale('OKR_MyO_Pop_Upd_Percentage')}`);
+        childOkrProgress !== -1 && textArr.push(`${getLocale('OKR_MyO_Ew_SubobjCom')}${childOkrProgress}${getLocale('OKR_MyO_Pop_Upd_Percentage')}`);
         if (textArr.length == 0) return '';
         return (
           <Fragment>

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

@@ -5,7 +5,7 @@
       margin-bottom: 0;
       margin-right: 16px;
       font-size: 14px;
-      font-weight: 500;
+      font-weight: 600;
       line-height: 20px;
       color: #3f4755;
       text-align: right;
@@ -28,7 +28,7 @@
             border-color: #E9ECF0;
           }
           input {
-            color: #BFC7D5 !important;
+            color: #A4ACB9 !important;
           }
         }
         &__suffix {

package/src/components/okrcase-library/index.scss

@@ -559,7 +559,7 @@
     &__head {
       margin-top: 46px;
       font-size: 26px;
-      font-weight: 500;
+      font-weight: 600;
       color: #141c28;
     }
     &__detail {

package/src/components/pagination/select.scss

@@ -279,7 +279,7 @@
     left: unset !important;
     height: 22px;
     font-size: 16px;
-    font-weight: 500;
+    font-weight: 600;
     line-height: 22px;
     color: #3f4755;
   }

package/src/components/search-dropdown/index.scss

@@ -42,7 +42,7 @@
       left: unset !important;
       height: 22px;
       font-size: 16px;
-      font-weight: 500;
+      font-weight: 600;
       line-height: 22px;
       color: #3f4755;
     }

package/src/components/switch/index.scss

@@ -5,7 +5,7 @@
     vertical-align: bottom;
     margin-right: 8px;
     font-size: 16px;
-    font-weight: 500;
+    font-weight: 600;
     color: #3F4755;
     line-height: 22px;
   }

package/src/components/tabs/index.scss

@@ -4,7 +4,7 @@
   &--big {
     div.rc-tabs-tab-btn {
       font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
-      font-weight: 500;
+      font-weight: 600;
       color: #89919f;
       margin-bottom: 8px;
     }

package/src/components/tita-chart/charts/pie.tsx

@@ -1,5 +1,6 @@
 import React from 'react';
 import PieChart from '../plots/pie';
+import { getLocale } from '../../../utils/getLocale';
 
 interface Props {
   size?: React.CSSProperties;//容器样式
@@ -71,7 +72,7 @@ export default function TitaPieChart(props: Props) {
           fontSize: '12px'
         },
         offsetY: -10,
-        content: '目标数'
+        content: getLocale('HP_Onumber')
       },
       content: {
         style: {

package/src/components/tooltip/tooltip-text/index.tsx

@@ -4,6 +4,7 @@ import "./index.scss";
 
 interface ITooltipTextProps {
   text: any;
+  overlayText?: any;
   maxWidth?: number;
   exClass?: string;
   isPercent?: boolean;
@@ -14,12 +15,14 @@ interface ITooltipTextProps {
 
 const TooltipText: FC<ITooltipTextProps> = ({
   text,
+  overlayText = "",
   maxWidth = 0,
   exClass,
   isPercent = false,
   minusWidth = 0,
   overlayClassName = "",
   mouseEnterDelay = 0,
+  children,
 }) => {
   const [hasTooltip, setHasTooltip] = useState(false);
   const domRef = useRef<any>();
@@ -56,7 +59,7 @@ const TooltipText: FC<ITooltipTextProps> = ({
       {hasTooltip && (
         <Tooltip
           overlayClassName={overlayClassName}
-          overlay={text}
+          overlay={overlayText ? overlayText : text}
           placement="top"
           mouseEnterDelay={mouseEnterDelay}
         >
@@ -66,18 +69,20 @@ const TooltipText: FC<ITooltipTextProps> = ({
               maxWidth: isPercent ? `calc(100% - ${minusWidth}px)` : maxWidth,
             }}
           >
-            {text}
+            {children ? children : text}
           </span>
         </Tooltip>
       )}
       {!hasTooltip && (
-        <span className={`tooltip-text-wrapper ${exClass}`}>{text}</span>
+        <span className={`tooltip-text-wrapper ${exClass}`}>
+          {children ? children : text}
+        </span>
       )}
       <span
         className={`tooltip-text-wrapper tooltip-text-wrapper--hidden ${exClass}`}
         ref={domRef}
       >
-        {text}
+        {children ? children : text}
       </span>
       {isPercent && (
         <span

package/src/components/user-selector/export-modules/duties-selector/index.tsx

@@ -1,15 +1,17 @@
-import React, { useState, forwardRef, useImperativeHandle } from 'react';
-import classNames from 'classnames';
+import React, { useState, forwardRef, useImperativeHandle, useEffect } from 'react';
 import ChooseTree from '../../select-tree/choose-tree';
 import Popup from '../../../popup';
 import { TreeNodeContext } from '../../context';
 import { CommonContext } from '../../context';
-import { getDuties } from '../../request-apis';
+import Loading from '../../loading';
+import { SinglePersonalLayout } from '../../layout';
+import SelectorInput from '../../../selector-input';
+import { getDuties,searchDuties } from '../../request-apis';
 
 import '../../index.scss';
 import './index.scss';
 
-const preCls = 'perspm-duties-selector';
+// const preCls = 'perspm-duties-selector';
 
 interface Props {
   onSelect?: Function;
@@ -37,6 +39,39 @@ export default forwardRef((props: Props, ref) => {
   } = props;
 
   const [visible, setVisible] = useState(false);
+  const [searchKey, setSearchKey] = useState('');
+  const [loading, setLoading] = useState(false);
+  const [dutiesData,setDutiesData] = useState([])
+
+    // 获取数据的API
+  const searchTreeData = () => {
+
+    return searchDuties({
+      searchKey,
+    }).then(res => {
+      if(!!res.Code){
+        let data = res.Data.map(it => {
+          return {
+            'key': `${it.code}`,
+            'id': `${it.id}`,
+            'pid': `-1`,
+            'nodeType': 'duties',
+            'isLeaf': true,
+            'data': { ...it }
+          };
+        })
+        setDutiesData(data)
+      }
+    }).catch(err=>{
+      console.log(err)
+    });
+  }
+
+  useEffect(() => {
+    if (!searchKey) return;
+    setLoading(true);
+    searchTreeData().then(() => setLoading(false));
+  }, [searchKey]);
 
   const onGetTreeData = () => {
     return getDuties().then(duties => {
@@ -63,20 +98,45 @@ export default forwardRef((props: Props, ref) => {
     setVisible(false);
   }
 
-  const popup = <div className={classNames(preCls)}>
-    <div className={classNames(`${preCls}__inner`)}>
-      <TreeNodeContext.Provider value={{}}>
-        <ChooseTree
-          onSelect={onSelectHandler}
-          asyncData={true}
-          multiple={false}
-          getTreeData={onGetTreeData}
-          itemHeight={itemHeight}
-          height={height}
-          virtual={true}
-        />
-      </TreeNodeContext.Provider>
-    </div>
+  const onSearchChangeHandler = val => {
+    setSearchKey(val);
+  };
+
+
+  const popup = <div>
+      <SinglePersonalLayout>
+        <SelectorInput onChange={onSearchChangeHandler} />
+        {!!searchKey ? (
+          loading ? (
+            <Loading />
+          ) : (
+          <div>
+            <TreeNodeContext.Provider value={{}}>
+            <ChooseTree
+              multiple={false}
+              treeData={dutiesData}
+              asyncData={false}
+              onSelect={onSelectHandler}
+              virtual={true}
+              height={height-44}
+            />
+          </TreeNodeContext.Provider>
+          </div>
+          )
+        ) : (
+          <TreeNodeContext.Provider value={{}}>
+            <ChooseTree
+              onSelect={onSelectHandler}
+              asyncData={true}
+              multiple={false}
+              getTreeData={onGetTreeData}
+              itemHeight={itemHeight}
+              height={height-44}
+              virtual={true}
+            />
+          </TreeNodeContext.Provider>
+        )}
+      </SinglePersonalLayout>
   </div>;
 
   return <CommonContext.Provider value={{}}>

package/src/components/user-selector/request-apis.js

@@ -124,4 +124,11 @@ export const getDuties = () => {
     .then(res => {
       return res.data;
     })
+}
+
+export const searchDuties = ({searchKey}) => {
+  return axios.get(`${requestDomain()}/api/v1/${tenantId}/${userId}/position/search?status=1&pageNum=1&pageSize=100&filter=${searchKey}`)
+    .then(res => {
+      return res.data;
+    })
 }

package/src/components/version-change-modal/index.scss

@@ -79,7 +79,7 @@
     align-items: center;
     justify-content: center;
     font-size: 18px;
-    font-weight: 500;
+    font-weight: 600;
     color: #ffffff;
     margin-bottom: 8px;
     flex-direction: column;

package/src/components/weekly-report/index.scss

@@ -96,7 +96,7 @@
     position: relative;
     z-index: 1;
     font-size: 18px;
-    font-weight: 500;
+    font-weight: 600;
     color: #2879FF;
     line-height: 26px;
     margin: 28px 0;

package/src/components-v1/confirm/index.tsx

@@ -7,7 +7,6 @@ import { getLocale } from '../../utils/getLocale';
 const ConfirmWrapper = styled.div`
   /* TODO padding 可动态调整 */
   width: 300px;
-  max-height: 100px;
   border-radius: 5px;
   box-shadow: 0 3px 10px 0 rgba(0, 0, 0, 0.15);
   padding: 15px 12px;

package/src/components-v1/dropDownSelector/styles/index.tsx

@@ -1,6 +1,6 @@
 import styled from 'styled-components';
 export const DropDownContainer = styled.span`
-  width: 100%;
+  flex: 1;
   /* margin: 0 0 15px; */
   padding: 5px 3px 0 0;
   font-size: 12px;

package/src/pages/appointment-demo/index.scss

@@ -331,7 +331,7 @@ $baseFontSize: 37.5;//默认基准font-size
         &-title{
             margin: px2rem(8) 0;
             font-size: px2rem(24);
-            font-weight: 500;
+            font-weight: 600;
             color: #141C28;
             line-height: px2rem(26);
         }

package/src/pages/group-management/page-view/importGroupStaff/index.scss

@@ -4,7 +4,7 @@
         &-download{
             &-template{
                 font-size: 14px;
-                font-weight: 500;
+                font-weight: 600;
                 color: #3F4755;
                 display: flex;
                 justify-content: space-between;
@@ -17,7 +17,7 @@
                     border-radius: 3px;
                     border: 1px solid #2879FF;
                     font-size: 12px;
-                    font-weight: 500;
+                    font-weight: 600;
                     color: #2879FF;
                     line-height: 26px;
                     &:hover{

package/src/pages/okr-map/export-modules/okr-map/header/index.scss

@@ -38,7 +38,7 @@ $font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-ser
         top: 26px;
         left: 25px;
         font-size: 20px;
-        font-weight: 500;
+        font-weight: 600;
         color: #1f2329;
         line-height: 28px;
       }

package/src/pages/okr-map/export-modules/share-okr-page/header/index.scss

@@ -19,7 +19,7 @@ $font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-ser
     box-sizing: border-box;
     font-size: 20px;
     font-family: $font-family;
-    font-weight: 500;
+    font-weight: 600;
     color: #141c28;
     line-height: 28px;
 

package/src/pages/personal-info/components/base-info/index.tsx

@@ -1,58 +1,79 @@
 import React, { FC, useState, useEffect } from "react";
-import { getUserInfoFun } from '../../request-api';
+import { getUserInfoFun } from "../../request-api";
 import { RectBtn } from "../../../../components/button";
-import EditModle from '../edit-base-info';
-import {OpenUserName} from '../../../../utils/open-data'
+import EditModle from "../edit-base-info";
+import { OpenUserName } from "../../../../utils/open-data";
+import { getLocale } from "../../../../utils/getLocale";
 import "./index.scss";
 
 const prefix = "titaui-personal-info-base-info";
 
 const BaseInfo: FC = () => {
-  const [userInfo, setUserInfo] = useState({ name: "", email: "", mobile: "", userId: '' });
+  const [userInfo, setUserInfo] = useState({
+    name: "",
+    email: "",
+    mobile: "",
+    userId: "",
+  });
   const [visible, setVisible] = useState(false);
 
   const handleClickEdit = () => {
     setVisible(true);
-  }
+  };
 
   const handleCancelEdit = () => {
     setVisible(false);
-  }
+  };
 
   const handleSuccessEditBaseInfo = (userInfo) => {
-    setUserInfo({...userInfo});
-  }
+    setUserInfo({ ...userInfo });
+  };
 
   useEffect(() => {
-		getUserInfoFun().then((resp) => {
-			if (resp.Code === 1 && resp.Data) {        
-				setUserInfo({ ...resp.Data, position: resp.Data.positionCode });
-			}
-		});
-	}, []);
+    getUserInfoFun().then((resp) => {
+      if (resp.Code === 1 && resp.Data) {
+        setUserInfo({ ...resp.Data, position: resp.Data.positionCode });
+      }
+    });
+  }, []);
 
   return (
     <div className={prefix}>
       <div className={`${prefix}__header`}>
-        <span className={`${prefix}__header-title`}>{getLocale('Per_Ass_New_title_text_BasicIn')}</span>
+        <span className={`${prefix}__header-title`}>
+          {getLocale("Per_Ass_New_title_text_BasicIn")}
+        </span>
         <RectBtn
           type={"primary"}
-          text={getLocale('Mod_Editor')}
+          text={getLocale("Mod_Editor")}
           onClick={handleClickEdit}
         />
-        <EditModle visible={visible} onCancel={handleCancelEdit} handleSuccessEditBaseInfo={handleSuccessEditBaseInfo} info={userInfo}/>
+        <EditModle
+          visible={visible}
+          onCancel={handleCancelEdit}
+          handleSuccessEditBaseInfo={handleSuccessEditBaseInfo}
+          info={userInfo}
+        />
       </div>
       <div className={`${prefix}__form`}>
-        <div className={`${prefix}__form-title`}>姓名</div>
-        <span className={`${prefix}__form-value`}><OpenUserName id={userInfo.userId} name={userInfo.name} /></span>
+        <div className={`${prefix}__form-title`}>
+          {getLocale("Mod_UserName")}
+        </div>
+        <span className={`${prefix}__form-value`}>
+          <OpenUserName id={userInfo.userId} name={userInfo.name} />
+        </span>
       </div>
       <div className={`${prefix}__form`}>
         <div className={`${prefix}__form-title`}>手机号码</div>
-        <span className={`${prefix}__form-value`}>{userInfo.mobile ? userInfo.mobile : "未设置"}</span>
+        <span className={`${prefix}__form-value`}>
+          {userInfo.mobile ? userInfo.mobile : getLocale('Data_Notset')}
+        </span>
       </div>
       <div className={`${prefix}__form`}>
         <div className={`${prefix}__form-title`}>电子邮箱</div>
-        <span className={`${prefix}__form-value`}>{userInfo.email ? userInfo.email : "未设置"}</span>
+        <span className={`${prefix}__form-value`}>
+          {userInfo.email ? userInfo.email : getLocale('Data_Notset')}
+        </span>
       </div>
     </div>
   );