@titaui/pc 1.9.16 → 1.9.20

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/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