@titaui/pc 1.9.9 → 1.9.13

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.9.9",
+  "version": "1.9.13",
   "nameCN": "",
   "description": "",
   "main": "src/index.js",

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

@@ -7,7 +7,6 @@
     }
     .form-field-input__border{
       margin-left: 16px;
-      border: 1px solid #DFE3EA;
       flex: 1;
     }
   }

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

@@ -21,7 +21,7 @@ interface Props {
   name: string;
   getContainer?: Function;
   disabled?: boolean;
-  layout?: 'clomn'|'row';
+  layout?: 'column'|'row';
   className?:string;
 }
 interface Error {

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

@@ -19,8 +19,9 @@ interface Props {
   require?: boolean;
   name: string;
   getContainer?: Function;
-  resizeType: 'none' | 'vertical';//不能修改宽度
+  resizeType?: 'none' | 'vertical';//不能修改宽度
   areaHeight: number;
+  layout?:'column'|'row'
 }
 
 interface Error {

package/src/components/grid-layout/words-cloud/index.tsx

@@ -7,7 +7,6 @@ import lvMask from '../image/lv'
 import couldMask from '../image/could'
 import titaMask from '../image/tita-mask'
 import { getLocale } from "../../../utils/getLocale";
-import { getBSGlobal } from "../../../utils/bs-global";
 
 const ComponentId = 'Enterprise-Focus-Hotspots'
 
@@ -15,7 +14,6 @@ const ComponentId = 'Enterprise-Focus-Hotspots'
 
 export default function WordCloudComponent() {
 
-  const versionInfo = getBSGlobal("tenantAuthentication");
   const [wordsData, setWordsData] = useState<WordsData>([])
 
   useEffect(() => {
@@ -42,7 +40,7 @@ export default function WordCloudComponent() {
         iconUrl={require('../image/Collaboration.png')}
         tips={getLocale('HP_Theenterprise')}
       >
-        {versionInfo.Version === 1 && wordsData.length === 0 && (
+        {wordsData.length === 0 && (
           <Advice
             styles={{ float: 'right' }}
             link="https://wpa1.qq.com/o6X4XD1n?_type=wpa&qidian=true"

package/src/components/okr-detail/components/header/index.js

@@ -7,7 +7,7 @@ import OAvatar from "./o-avatar";
 import OType from "../okr-type";
 import OCycle from "./o-cycle";
 import EditNameCmp from "./edit-name";
-import Score from "../score";
+import Score from "./o-score";
 import Progress from "../../../progress";
 import { OkrRiskMapping } from "../../../progress/utils";
 
@@ -115,6 +115,7 @@ const Header = (props) => {
       </span>
     );
   };
+
   return (
     <div className={precls} draggable={false}>
       <div className={`${precls}__avatar`}>
@@ -148,7 +149,7 @@ const Header = (props) => {
               <OCycle editable={editable} okrId={okrInfo.workId} />
             </span>
             <span className={`${precls}__action-item`}>
-              {showOkrEvalute && <Score score={okrInfo.evaluateValue} />}
+              {showOkrEvalute && <Score editable={editable} okrId={okrInfo.workId} score={okrInfo.evaluateValue} />}
             </span>
           </span>
           <OProgressUpdate okrInfo={okrInfo} renderContent={renderContent} />

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

@@ -163,3 +163,8 @@ $lignt-color: #2879ff;
     width: auto!important;
   }
 }
+.okr-detail-o-score{
+  &__form{
+    padding: 10px 32px 8px;
+  }
+}

package/src/components/okr-detail/components/header/o-score.tsx

@@ -0,0 +1,111 @@
+import React,{Fragment,useState,useRef,useContext} from "react";
+import { CommonContext, GeneralDataContext } from "../../context";
+import classNames from "classnames";
+import Score from "../score";
+import Toast from "../../../toast"
+import Dialog from "../../../dialog"
+import Form from "../../../form"
+import { updateOScore } from "../../request-apis"
+import { getLocale } from "../../../../utils/getLocale";
+import './index.scss'
+
+const FormFields = Form.Fields;
+const preCls = "okr-detail-o-score"
+
+
+interface IOScoreProps {
+  score:number;
+  okrId:string | number;
+
+}
+interface FormFields {
+  score: string | number;
+  describe: string;
+}
+const OScore = (props: IOScoreProps) => {
+  const { score,okrId, ...restProps } = props;
+  const [visible,setVisible] = useState(false)
+  const { refreshAll } = useContext(CommonContext)
+  const [formFiedlsValue, setFormFiedlsValue] = useState<FormFields>({
+    score: score,
+    describe : "",
+  });
+  const formContainerRef = useRef<any>();
+  const formRef = useRef<any>();
+  const changeOScore = () =>{
+    setVisible(true)
+  }
+
+  const handleCancel = () =>{
+    setVisible(false)
+  }
+
+  const handleOk = () =>{
+    updateOScore(formFiedlsValue.score,okrId).then(res=>{
+      if(!!res.Code){
+        Toast.Success('修改成功')
+        handleCancel()
+        refreshAll()
+      }else{
+        Toast.Error(res.Message||'操作失败')
+      }
+    }).catch(err=>{
+      console.log(err)
+      Toast.Error('操作失败')
+    })
+  }
+
+  const onFieldsChangeHandler = (fields) => {
+    const newFields = { ...fields };
+    setFormFiedlsValue(newFields);
+  };
+
+  return (
+    <Fragment>
+      <Score score={score} onClick={changeOScore} {...restProps} />
+      <Dialog
+          title={`O 评分`}
+          visible={visible}
+          animation="slide-fade"
+          maskAnimation="fade"
+          destroyOnClose={true}
+          width={538}
+          onClose={handleCancel}
+          onOk={handleOk}
+          onCancel={handleCancel}
+          noHeadLine
+          noFooterLine
+        >
+          <div ref={formContainerRef} className={`${preCls}__form`}>
+            <Form
+              ref={formRef}
+              getFormContainer={() => formContainerRef.current}
+              onFieldsChange={onFieldsChangeHandler}
+            >
+              <FormFields.Input
+                name="score"
+                label={`评分`}
+                className={`${preCls}__form-item`}
+                placeholder={`请输入评分`}
+                value={formFiedlsValue.score}
+                require={true}
+                layout="row"
+                verifies={
+                  [{
+                    tip: `评分不能为空`,
+                    test: /^[\s\S]+$/,
+                  },
+                  {
+                    tip: `请输入0-1间的数字，支持小数点后两位`,
+                    test: /^(1|0(\.\d{1,2})?)$/,
+                  },
+                  ]
+                }
+              />
+            </Form>
+          </div>
+        </Dialog>
+    </Fragment>
+  );
+};
+export default OScore;

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/index.tsx

@@ -11,7 +11,7 @@ import { getLocale } from '../../utils/getLocale';
 import './index.scss';
 
 const ProgressModal: React.FC<IProgressModalProps> = props => {
-  const { maxLength, okrInfo, onClose, onOk, title = window.getLocale('OKR_MyO_Prog_Butt_Update'), visible, isKr } = props;
+  const { maxLength, okrInfo, onClose, onOk, title, visible, isKr } = props;
 
   const configure = isKr ? getKR_SETTING() : getO_SETTING();
 
@@ -70,7 +70,7 @@ const ProgressModal: React.FC<IProgressModalProps> = props => {
       <span
         className='auto-update__item-label'
         style={{ alignSelf: 'flex-start', marginTop: '10px' }}
-      >{getLocale('OKR_MyO_Pop_Upd_Progress')}</span>
+      >{getLocale('Feed_Tab_Title_Progress')}</span>
       <Textarea
         hasError={errorRemark}
         placeholder={getLocale('OKR_MyO_Pop_Upd_Pleprogress')}
@@ -126,7 +126,7 @@ const ProgressModal: React.FC<IProgressModalProps> = props => {
     >
       <List>
         <Item>
-          <span className='auto-update__item-label'>{getLocale('OKR_MyO_Pop_Upd_Progresss1')}</span>
+          <span className='auto-update__item-label'>{getLocale('OKR_MyO_Pop_Upd_Progress')}</span>
           <div className='auto-update__item-progress'>
             <Input
               type='number'
@@ -222,6 +222,7 @@ const ProgressModal: React.FC<IProgressModalProps> = props => {
 };
 
 ProgressModal.defaultProps = {
+  title: getLocale('OKR_MyO_Prog_Butt_Update'),
   maxLength: 500,
 };
 

package/src/components/upload-photo-modal/constant.ts

@@ -2,20 +2,20 @@
 export const List = [
 	{
 		id: 'person',
-		accept: '.jpg,.jpeg,.gif,.png',
+		accept: '.jpg,.jpeg,.png',
 		autoCropArea: 1,
 		initialAspectRatio: 1,
-		tips: '仅支持 jpg、jpeg、gif、png 格式 建议图片最小尺寸 150*150px',
+		tips: '仅支持 jpg、jpeg、png 格式 建议图片最小尺寸 150*150px',
 		previewTitle: '预览',
     minCropBoxHeight: 60,
     minCropBoxWidth: 60,
 	},
   {
 		id: 'enterprise',
-		accept: '.jpg,.jpeg,.gif,.png',
+		accept: '.jpg,.jpeg,.png',
 		autoCropArea: 1,
 		initialAspectRatio: 5,
-		tips: '建议 logo 尺寸 400*80 logo 最佳适配颜色为白色 仅支持 jpg、jpeg、gif、png 格式',
+		tips: '建议 logo 尺寸 400*80 logo 最佳适配颜色为白色 仅支持 jpg、jpeg、png 格式',
 		previewTitle: 'logo 预览',
     minCropBoxHeight: 20,
     minCropBoxWidth: 20,

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

@@ -61,32 +61,12 @@
       }
     }
   }
-  .form-field-input__label {
-    margin-bottom: 4px;
-  }
-  .form-field-input__border {
-    padding: 0;
-    border: none;
-    background-color: #fff;
-  }
-  .form-field-input__label-text {
-    font-weight: 600;
-  }
-  .form-field-input__input {
-    font-size: 12px;
-    line-height: 18px;
-    background-color: #fff;
-  }
-  .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;
+      font-weight: 600;
       color: #141C28;
       line-height: 22px;
       margin-bottom: 6px;

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

@@ -8,7 +8,7 @@ import "./index.scss";
 const prefix = "titaui-personal-info-base-info";
 
 const BaseInfo: FC = () => {
-  const [userInfo, setUserInfo] = useState({ name: "", email: "", mobile: "", id: '' });
+  const [userInfo, setUserInfo] = useState({ name: "", email: "", mobile: "", userId: '' });
   const [visible, setVisible] = useState(false);
 
   const handleClickEdit = () => {
@@ -25,7 +25,7 @@ const BaseInfo: FC = () => {
 
   useEffect(() => {
 		getUserInfoFun().then((resp) => {
-			if (resp.Code === 1 && resp.Data) {
+			if (resp.Code === 1 && resp.Data) {        
 				setUserInfo({ ...resp.Data, position: resp.Data.positionCode });
 			}
 		});
@@ -44,7 +44,7 @@ const BaseInfo: FC = () => {
       </div>
       <div className={`${prefix}__form`}>
         <div className={`${prefix}__form-title`}>姓名</div>
-        <span className={`${prefix}__form-value`}><OpenUserName id={userInfo.id} name={userInfo.name} /></span>
+        <span className={`${prefix}__form-value`}><OpenUserName id={userInfo.userId} name={userInfo.name} /></span>
       </div>
       <div className={`${prefix}__form`}>
         <div className={`${prefix}__form-title`}>手机号码</div>

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