@titaui/pc 1.9.2 → 1.9.6

package/src/components/form/form-fields/password/index.scss

@@ -29,6 +29,7 @@
   }
 
   &__border {
+    position: relative;
     padding: 6px 12px;
     border-radius: 8px;
     transition: all 0.2s;
@@ -77,4 +78,13 @@
       font-weight: unset;
     }
   }
+  &__hide-icon {
+    position: absolute;
+    right: 3px;
+    top: 10px;
+    width: 16px;
+    height: 16px;
+    background: url('./yincang-s.svg') no-repeat;
+    background-size: contain;
+  }
 }

package/src/components/form/form-fields/password/index.tsx

@@ -158,7 +158,7 @@ export default forwardRef((props: Props, ref) => {
               onChange={onChangeHandler}
               autoComplete="off"
             />
-            <span className="tu-icon-yincang" onClick={onTypeChangeHandler} />
+            <span className={`${preCls}__hide-icon`} onClick={onTypeChangeHandler} />
           </>
         </ToolTip>
       </div>

package/src/components/form/form-fields/password/yincang-s.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="240px" height="240px" viewBox="0 0 240 240" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>yincang-s</title>
+    <g id="yincang-s" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M49.9966052,38.3431458 L201.317456,189.663997 C204.441651,192.788191 204.441651,197.853511 201.317456,200.977705 C198.193262,204.1019 193.127942,204.1019 190.003748,200.977705 L38.6828967,49.6568542 C35.5587024,46.5326599 35.5587024,41.4673401 38.6828967,38.3431458 C41.8070911,35.2189514 46.8724109,35.2189514 49.9966052,38.3431458 Z M47.896855,71.5984171 L59.1982317,82.899565 C52.0192864,89.9733747 44.9844916,98.3915814 38.0913697,108.17152 L37.3238844,109.266893 L34.3951766,113.567426 L33.6721766,114.826426 L33.6427788,114.890829 C32.6856003,117.04518 32.8013596,119.497387 33.9639451,121.568337 L34.1147186,121.825171 L34.269966,122.068107 C60.714404,161.810173 89.2455848,181.160426 120.000177,181.160426 C130.484503,181.160426 140.707806,178.91344 150.675728,174.379987 L162.629993,186.333413 C149.036193,193.528164 134.822003,197.160426 120.000177,197.160426 C83.1600197,197.160426 50.0975347,174.736978 20.9493895,130.931642 C16.3805416,124.065342 15.7456228,115.402709 19.2019996,107.996955 L19.3945877,107.59427 L19.5107579,107.35714 L20.8252444,105.069447 L24.1465761,100.19213 C31.7979041,89.2071425 39.7158114,79.6696257 47.896855,71.5984171 Z M120.000177,38.6604256 C156.840333,38.6604256 189.902818,61.0838734 219.050964,104.889209 C223.619811,111.75551 224.25473,120.418143 220.798354,127.823896 L220.605765,128.226581 L220.489595,128.463711 L219.175109,130.751404 L215.853777,135.628721 C207.650049,147.406788 199.13986,157.520833 190.327454,165.94764 L179.023789,154.643279 C186.820275,147.226135 194.447626,138.23548 201.908983,127.649332 L202.676469,126.553958 L205.604177,122.252426 L206.327177,120.993426 L206.357574,120.930022 C207.314753,118.775671 207.198994,116.323464 206.036408,114.252514 L205.885634,113.99568 L205.730387,113.752744 C179.285949,74.0106784 150.754768,54.6604256 120.000177,54.6604256 C108.680998,54.6604256 97.6660684,57.2795069 86.9482864,62.5673546 L75.1045551,50.722859 C89.3825439,42.7086009 104.352753,38.6604256 120.000177,38.6604256 Z M80.8135056,104.515517 L96.6775751,120.380804 C97.0509985,132.694912 106.965514,142.609427 119.279621,142.98285 L135.144909,158.84692 C130.446538,160.66399 125.339634,161.660426 120,161.660426 C96.8040405,161.660426 78,142.856385 78,119.660426 C78,114.320792 78.9964361,109.213888 80.8135056,104.515517 Z M120,77.6604256 C143.195959,77.6604256 162,96.4644661 162,119.660426 C162,125.000059 161.003564,130.106963 159.186494,134.805334 L143.322455,118.941044 C142.949527,106.626142 133.034283,96.7108991 120.719382,96.3379705 L104.854088,80.4743194 C109.552735,78.6570036 114.659986,77.6604256 120,77.6604256 Z" id="形状结合" fill="#A4ACB9" fill-rule="nonzero"></path>
+    </g>
+</svg>

package/src/components/menus/components/menu-tree/tree-node/follower/index.tsx

@@ -6,6 +6,7 @@ import Tooltip from '../../../../../tooltip';
 import { OkrMenusContext } from '../../../../context';
 import Avatar from '../avatar';
 import preCls from "../../precls";
+import { getLocale } from "../../../../../../utils/getLocale";
 
 import "./index.scss";
 
@@ -35,7 +36,7 @@ export default (props) => {
 
     <span className={classNames(`${preCls}__follower-node-cancel`)} onClick={onCancelFollowHandler}>
       <Tooltip
-        overlay={<span>{locale.unsubscribe}</span>}
+        overlay={<span>{getLocale(locale.unsubscribe)}</span>}
         placement="top"
         align={{ 'offset': [0, 5] }}
       >

package/src/components/okrcase-library/okrcases-components/submitOkr-dialog.tsx

@@ -44,7 +44,7 @@ export const SubmitDialog = (props: Props1) => {
 
 
   return (
-    <Dialog visible={isShowSubmitOkrWindow} noFooter width="480px" destroyOnClose noCloseIcon getContainer={() => allViewAreaRef.current}>
+    <Dialog visible={isShowSubmitOkrWindow} noFooter width="480px" destroyOnClose noCloseIcon getContainer={() => document.body}>
       <div className="okr-cases-library__submitWindow">
         <img src={require('../image/submit小驴.svg')} />
         <div className="tu-icon-canceled" onClick={() => handleShowSubmitOkrWindow(false)} />

package/src/components/upload-photo-modal/index.scss

@@ -220,7 +220,6 @@
       &--show {
         display: block;
         opacity: 0;
-        cursor: pointer;
         width: 56px;
         height: 22px;
         position: absolute;
@@ -235,14 +234,13 @@
       color: #bfc7d5;
       line-height: 22px;
       &--show {
-        cursor: pointer;
         color: #2879ff;
         &:hover {
-          color: #DFE3EA;
+          color: #5C8EFF;
         }
       }
       &--hover {
-        color: #DFE3EA;
+        color: #5C8EFF;
       }
     }
     &-preview {

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

@@ -2,14 +2,14 @@
   background: #ffffff;
   box-shadow: 0px 0px 8px 0px rgba(127, 145, 180, 0.1);
   border-radius: 12px;
-  padding: 20px 32px 30px 36px;
+  padding: 20px 32px 20px 36px;
   font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica,
     sans-serif, PingFang SC, Microsoft YaHei;
   &__header {
     display: flex;
     align-items: center;
     justify-content: space-between;
-    margin-bottom: 20px;
+    margin-bottom: 10px;
     &-title {
       font-size: 16px;
       font-weight: 600;
@@ -34,7 +34,7 @@
       font-size: 14px;
       font-weight: normal;
       color: #2879FF;
-      line-height: 26px;
+      line-height: 28px;
       background: rgba(40, 121, 255, 0.2);
       &:hover {
         color: #fff;
@@ -61,13 +61,6 @@
       }
     }
   }
-  &__form {
-    width: 342px;
-    .form-field-input__border--disabled input:disabled {
-      color: #6F7886;
-      cursor: default;
-    }
-  }
   .form-field-input__label {
     margin-bottom: 4px;
   }
@@ -87,4 +80,22 @@
   .form-field-input__border--disabled input:disabled {
     background-color: #fff;
   }
+  &__form {
+    height: 66px;
+    box-sizing: border-box;
+    padding: 10px 0;
+    &-title {
+      font-size: 14px;
+      font-weight: normal;
+      color: #141C28;
+      line-height: 22px;
+      margin-bottom: 6px;
+    }
+    &-value {
+      font-size: 12px;
+      font-weight: normal;
+      color: #6F7886;
+      line-height: 18px;
+    }
+  }
 }

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

@@ -1,17 +1,14 @@
-import React, { FC, useState, useRef, useEffect } from "react";
-import Form from "../../../../components/form";
-import { getUserInfoFun } from "../../request-api";
-import { getLocale } from "../../../../utils/getLocale";
-import EditModle from '../edit-base-info'
+import React, { FC, useState, useEffect } from "react";
+import { getUserInfoFun } from '../../request-api';
 import { RectBtn } from "../../../../components/button";
+import EditModle from '../edit-base-info';
+import {OpenUserName} from '../../../../utils/open-data'
 import "./index.scss";
 
-const {Fields} = Form
 const prefix = "titaui-personal-info-base-info";
 
 const BaseInfo: FC = () => {
-  const formRef = useRef<any>();
-  const [userInfo, setUserInfo] = useState({ name: "", email: "", mobile: "" });
+  const [userInfo, setUserInfo] = useState({ name: "", email: "", mobile: "", id: '' });
   const [visible, setVisible] = useState(false);
 
   const handleClickEdit = () => {
@@ -46,35 +43,16 @@ const BaseInfo: FC = () => {
         <EditModle visible={visible} onCancel={handleCancelEdit} handleSuccessEditBaseInfo={handleSuccessEditBaseInfo}/>
       </div>
       <div className={`${prefix}__form`}>
-        <Form ref={formRef}>
-          <Fields.Input
-            name="name"
-            label={getLocale('Mod_UserName')}
-            placeholder={"未设置"}
-            type="text"
-            verifies={[]}
-            value={userInfo.name}
-            disabled
-          />
-          <Fields.Input
-            name="phone"
-            type="text"
-            label={"手机号码"}
-            placeholder={"未设置"}
-            value={userInfo.mobile}
-            verifies={[]}
-            disabled
-          />
-          <Fields.Input
-            name="email"
-            type="text"
-            label={"电子邮箱"}
-            value={userInfo.email}
-            placeholder={"未设置"}
-            verifies={[]}
-            disabled
-          />
-        </Form>
+        <div className={`${prefix}__form-title`}>姓名</div>
+        <span className={`${prefix}__form-value`}><OpenUserName id={userInfo.id} 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>
+      </div>
+      <div className={`${prefix}__form`}>
+        <div className={`${prefix}__form-title`}>电子邮箱</div>
+        <span className={`${prefix}__form-value`}>{userInfo.email ? userInfo.email : "未设置"}</span>
       </div>
     </div>
   );

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

@@ -55,7 +55,7 @@ const EditBaseInfo = (props) => {
 	};
 
 	const handleSaveUserInfo = () => {
-		if (!userInfo.email || !userInfo.mobile || !userInfo.name || userInfo.name.length > 50) {
+		if (!userInfo.mobile || !userInfo.name || userInfo.name.length > 50) {
       setIsDisable(true);
 			return;
 		} else {

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