@titaui/pc 1.7.60 → 1.7.61

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

@@ -1,4 +1,5 @@
-$font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
+$font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica,
+  sans-serif, PingFang SC, Microsoft YaHei;
 
 @mixin node-title {
   display: inline-block;
@@ -49,7 +50,6 @@ $font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-ser
 }
 
 .tita-okrdt-tree {
-
   &__o-child-node {
     position: relative;
     width: 100%;
@@ -57,15 +57,15 @@ $font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-ser
     padding-top: 15px;
     border-bottom: 1px solid #e9ecf0;
 
-    
     &-right {
       display: flex;
       float: right;
     }
-
-    &-progress {
+    &-weight {
+      margin-right: 16px;
+      width: 60px;
     }
-    
+
     &-h1 {
       .okr-drawer-header__classify {
         vertical-align: sub;
@@ -84,3 +84,76 @@ $font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-ser
     }
   }
 }
+.child-okrs-weight {
+  &__content {
+    padding: 10px 32px 8px;
+    min-height: 90px;
+    box-sizing: border-box;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+  }
+  &__item {
+    margin-bottom: 18px;
+    display: flex;
+    &:last-child {
+      margin-bottom: 0;
+    }
+
+    &-precls {
+      height: 24px;
+      width: 24px;
+      padding: 6px;
+      box-sizing: border-box;
+      background: rgba(40, 121, 255, 0.1);
+      border-radius: 12px;
+      display: inline-flex;
+      justify-content: center;
+      align-items: center;
+      margin-right: 8px;
+      cursor: pointer;
+      position: relative;
+      &:before {
+        content: "";
+        width: 10px;
+        height: 8px;
+        border-radius: 50%;
+        border: 2px solid #2879ff;
+      }
+    }
+
+    &-name {
+      width: 360px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      color: #3f4755;
+      margin-right: 26px;
+    }
+
+    &-weight {
+      display: flex;
+      flex: 1;
+      &-label {
+        color: #89919f;
+        margin-right: 10px;
+      }
+      &-content {
+        display: flex;
+        flex: 1;
+        border-bottom: 1px solid #e9ecf0;
+        &--error {
+          border-color: #f05e5e;
+        }
+      }
+      &-input {
+        flex: 1;
+        width: 50px;
+        border: none;
+      }
+      &-suffix {
+        color: #89919f;
+      }
+    }
+  }
+}

package/src/components/okr-detail/components/okr-tree/tree-node/o-child-node/weight-input.tsx

@@ -0,0 +1,59 @@
+import classNames from "classnames";
+import React, { useState } from "react";
+import Tooltip from "../../../../../tooltip";
+import "./index.scss";
+
+const precls = "child-okrs-weight";
+interface IProps {
+  value: number;
+  onChange: Function;
+  workId: number;
+}
+
+const WeightInput = (props: IProps) => {
+  const { value, onChange, workId } = props;
+  const [isError, setIsError] = useState(false);
+
+  const onChangeHandler = (e) => {
+    const currentValue = e.currentTarget.value;
+    setIsError(!/^(\d{1,2}(\.\d{1})?|100)$/g.test(currentValue));
+    onChange({ workId, value: currentValue, isError });
+  };
+
+  const onBlurHandler = (e) => {
+    const currentValue = e.currentTarget.value;
+    if (currentValue == "") {
+      onChange({ workId, value: 0, isError: false });
+      setIsError(false);
+    }
+  };
+
+  return (
+    <div
+      className={classNames(`${precls}__item-weight-content`, {
+        [`${precls}__item-weight-content--error`]: isError,
+      })}
+    >
+      <Tooltip.Error
+        overlay={
+          <span style={{ color: "#F05E5E" }}>
+            仅允许输入 0-100 的数字，仅支持一位小数
+          </span>
+        }
+        placement="top"
+        visible={isError}
+      >
+        <input
+          className={`${precls}__item-weight-input`}
+          type="number"
+          value={value}
+          onChange={onChangeHandler}
+          onBlur={onBlurHandler}
+        />
+      </Tooltip.Error>
+      <span className={`${precls}__item-weight-suffix`}>%</span>
+    </div>
+  );
+};
+
+export default WeightInput;

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

@@ -130,10 +130,9 @@ export const getFeedById = (feedId, commentCount) => {
   );
 };
 
-export const updateParentId = async function(params) {
+export const updateParentId = async function (params) {
   return rpost("v1")(
-    `okr/updateParentId?okrId=${params.okrId}&parentId=${
-      params.parentId
+    `okr/updateParentId?okrId=${params.okrId}&parentId=${params.parentId
     }&parentType=${params.parentId != 0 ? params.parentType : 0}`
   );
 };
@@ -405,3 +404,12 @@ export const getRelProgress = (workId: number) => {
 export const getRelWorks = (okrId: number) => {
   return rget("v1")(`okr/detail/relWorks?okrId=${okrId}`);
 };
+
+export const updateChildOkrWeight = (data: { OkrId: number, Weight: number }[]) => {
+  return rpost('v1')('okr/weight/save', {
+    OkrWeights: [...data]
+  }, {
+    // "headers": { "Content-Type": "application/x-www-form-urlencoded" },
+    "transformRequest": qs.stringify,
+  })
+}

package/src/components/upload/index.tsx

@@ -8,7 +8,7 @@ import UploadedPreview from './components/uploadedPreview';
 import { UploadResultObj, UploadFilesObj, _dealAttachmentType } from './type';
 import { UploadFormContainer } from './style';
 import ImgViewer from '../img-viewer';
-import { getPreviewImgs } from './util';
+import { getPreviewImgs, isImg } from './util';
 
 interface Props {
   action?: string;
@@ -275,6 +275,17 @@ export default class Upload extends PureComponent<Props, State> {
     });
   };
 
+  getImgIndex = (index) => {
+    let newIndex = 0;
+    const { uploadSuccessFiles } = this.state;
+    for (let i = 0; i < index; i++) {
+      if (isImg(uploadSuccessFiles[i].FileType)) {
+        newIndex++;
+      }
+    }
+    return newIndex;
+  }
+
   // 预览、删除附件
   handlerUploadPreviewOptions = (index: number, options: string) => {
     const { onSubmit, onDelete } = this.props;
@@ -297,7 +308,8 @@ export default class Upload extends PureComponent<Props, State> {
         uploadSuccessFiles: uploadResultFiles,
       });
     } else if (options === 'preview') {
-      (this.refs.imgViewerRef as any).show(index);
+      const imgIndex = this.getImgIndex(index);
+      (this.refs.imgViewerRef as any).show(imgIndex);
     } else if (options === 'reupload') {
       const reUploadFileInfo = this.state.uploadSuccessFiles[index];
       const reUploadFile = this.state.selectFiles[reUploadFileInfo.FileName];

package/src/utils/auth.js

@@ -137,3 +137,24 @@ export const DynamicManagerAuth = class extends BaseAuth {
     return !this.isBoss() && !this.isManager() && !this.isDynamicManager && this.isLeader;
   }
 };
+
+export const ChildAuth = class extends BaseAuth {
+  constructor(props) {
+    super(props);
+    let { principalUser } = props;
+    this.userId = this.loginUserInfor.Id;
+    this.principalUser = principalUser;
+  }
+
+  isPrincipalUser() {
+    return this.userId == this.principalUser.userId;
+  }
+
+  // 超管、助理、目标管理员以及目标负责人可以修改此目标下对齐子目标的权重；
+  hasAuth() {
+    return (
+      this.isManager() ||
+      this.isPrincipalUser()
+    )
+  }
+}