@titaui/pc 1.7.16 → 1.7.20

package/lib/components/create-okr-modal/index.js

@@ -106,8 +106,8 @@ function CreateOkrModal(_ref, ref) {
   var initCycle = _ref.initCycle,
       userInfo = _ref.userInfo,
       onSuccess = _ref.onSuccess,
-      _ref$isPerformance = _ref.isPerformance,
-      isPerformance = _ref$isPerformance === void 0 ? false : _ref$isPerformance,
+      _ref$isHiddenCreatedC = _ref.isHiddenCreatedCard,
+      isHiddenCreatedCard = _ref$isHiddenCreatedC === void 0 ? false : _ref$isHiddenCreatedC,
       _ref$handleCreatedClo = _ref.handleCreatedClose,
       handleCreatedClose = _ref$handleCreatedClo === void 0 ? function () {} : _ref$handleCreatedClo,
       _ref$visible = _ref.visible,
@@ -355,7 +355,7 @@ function CreateOkrModal(_ref, ref) {
     data.userAvatarBase64Url = userAvatarBase64Url;
     setCreatedSuccessInfo(data);
 
-    if (!localStorage.getItem("dontShowValue".concat(userId)) && !isPerformance && !isApplyTpl) {
+    if (!localStorage.getItem("dontShowValue".concat(userId)) && !isHiddenCreatedCard && !isApplyTpl) {
       setShowCreatedSuccessInfo(true);
       setTipIndex(Math.floor(Math.random() * 6));
     } else {
@@ -514,7 +514,7 @@ function CreateOkrModal(_ref, ref) {
             case 28:
               hideCreateOkrModal();
 
-              if (onSuccess || !isPerformance) {
+              if (onSuccess || !isHiddenCreatedCard) {
                 // 带上超过创建okr人数的计算值
                 krNum = krDatas.length;
                 krTotalLength = 0;
@@ -903,14 +903,14 @@ function CreateOkrModal(_ref, ref) {
     className: "teach-suggest teach-suggest__kr",
     src: _hand["default"],
     onClick: handleShowKrSuggest
-  })))), !isApplyTpl && !isPerformance && showCreatedSuccessInfo ? /*#__PURE__*/_react["default"].createElement(_createSuccessCmpWrapper["default"], null, /*#__PURE__*/_react["default"].createElement(_createSuccessCmp["default"], {
+  })))), !isApplyTpl && !isHiddenCreatedCard && showCreatedSuccessInfo ? /*#__PURE__*/_react["default"].createElement(_createSuccessCmpWrapper["default"], null, /*#__PURE__*/_react["default"].createElement(_createSuccessCmp["default"], {
     tipIndex: tipIndex,
     createdSuccessInfo: createdSuccessInfo,
     isDownload: false,
     onCloseModel: handleCloseShowSuccessInfo,
     onShowDetail: handleCloseAndShowDetail,
     downLoadRef: downloadDomRef
-  })) : null, !isApplyTpl && !isPerformance && showCreatedSuccessInfo ? /*#__PURE__*/_react["default"].createElement("div", {
+  })) : null, !isApplyTpl && !isHiddenCreatedCard && showCreatedSuccessInfo ? /*#__PURE__*/_react["default"].createElement("div", {
     className: "download-dom--hidden"
   }, /*#__PURE__*/_react["default"].createElement(_createSuccessCmp["default"], {
     tipIndex: tipIndex,

package/lib/components/drop-selector/index.js

@@ -175,5 +175,6 @@ var DropSelector = function DropSelector(props) {
 };
 
 DropSelector.IconItem = IconItem;
+DropSelector.Item = Item;
 var _default = DropSelector;
 exports["default"] = _default;

package/lib/components/nav-top/components/user-own-menu/utils.js

@@ -38,7 +38,7 @@ var getOwnSet = function getOwnSet() {
     id: "role",
     url: "tu-icon-gongsi",
     title: "企业管理规定",
-    objUrl: "".concat(apiServer, "/u/").concat(userId, "/Home#setting?id=").concat(isTestCompanyManageRule ? "15709" : "12437")
+    objUrl: "".concat(apiServer, "/u/").concat(userId, "/Home#/enterprise/manage")
   }];
   var exit = [{
     id: "Logout",

package/lib/components/nav-top/index.js

@@ -108,11 +108,11 @@ var NavTop = function NavTop() {
   }, []);
 
   var handleHashChange = function handleHashChange() {
-    var hash = location.hash || "";
+    var hash = location.hash.split('?')[0] || "";
 
     if (hash) {
       var activeMenu = menu.find(function (item) {
-        return hash.includes(item.href.split("#")[1]);
+        return hash.includes(item.href.split("#")[1].split('?')[0]);
       });
 
       if (hash.includes('homepage')) {

package/lib/components/okr-detail/e-list/index.css

@@ -4,6 +4,24 @@
 
 .okr-detail-e .e__divider {
   height: 8px;
-  background: #F0F2F5;
+  background: #f0f2f5;
   margin: 10px 32px;
 }
+
+.okr-detail-e__empty {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  padding-top: 117px;
+  font-size: 14px;
+}
+
+.okr-detail-e__empty-img {
+  width: 128px;
+}
+
+.okr-detail-e__empty-text {
+  color: #3f4755;
+  line-height: 22px;
+  margin-top: 20px;
+}

package/lib/components/okr-detail/e-list/index.js

@@ -25,6 +25,10 @@ var _loading = _interopRequireDefault(require("../loading"));
 
 var _bsGlobal = require("../../../utils/bs-global");
 
+var _conditionRender = _interopRequireDefault(require("../../condition-render"));
+
+var _eListEmpty = _interopRequireDefault(require("./images/e-list-empty.png"));
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -45,7 +49,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-var preCls = 'okr-detail-e';
+var preCls = "okr-detail-e";
 
 var _default = function _default(props) {
   var okrId = props.okrId;
@@ -67,7 +71,7 @@ var _default = function _default(props) {
       selectUsers = _useState6[0],
       setSelectUsers = _useState6[1];
 
-  var _useState7 = (0, _react.useState)(hasCondition ? localStorage.getItem("okrDrawerESelectName".concat(loginUser)) : 'orderBySystem'),
+  var _useState7 = (0, _react.useState)(hasCondition ? localStorage.getItem("okrDrawerESelectName".concat(loginUser)) : "orderBySystem"),
       _useState8 = _slicedToArray(_useState7, 2),
       selectName = _useState8[0],
       setSelectName = _useState8[1];
@@ -102,20 +106,25 @@ var _default = function _default(props) {
       loading = _useState20[0],
       setLoading = _useState20[1];
 
+  var _useState21 = (0, _react.useState)(0),
+      _useState22 = _slicedToArray(_useState21, 2),
+      totalDataNum = _useState22[0],
+      setTotalDataNum = _useState22[1];
+
   var getKrEsData = function getKrEsData() {
     setLoading(true);
     (0, _requestApis.getKrsByCondition)({
       okrId: okrId,
-      'condition': (0, _util.formatCondition)({
+      "condition": (0, _util.formatCondition)({
         okrId: okrId,
         noteOrder: noteOrder,
         selectName: selectName,
         checkedStatus: checkedStatus,
         users: selectUsers,
-        'keyWord': searchKey
+        "keyWord": searchKey
       })
     }).then(function (krs) {
-      var formatKrs = (0, _util.formatEListDataToSelectTree)(krs, okrId);
+      var formatKrs = (0, _util.formatEListDataToSelectTree)(krs, okrId, (0, _util.getIfInitCondition)(selectName, checkedStatus, selectUsers, searchKey));
       var expandedKrEs = (formatKrs.krsEList || []).map(function (it) {
         return it.key;
       });
@@ -133,9 +142,13 @@ var _default = function _default(props) {
   (0, _react.useEffect)(function () {
     getKrEsData();
   }, [noteOrder, searchKey, selectName, checkedStatus, selectUsers]);
+  (0, _react.useEffect)(function () {
+    var oElistLength = oEList[0] && oEList[0].length || 0;
+    setTotalDataNum(krList.length + oElistLength);
+  }, [krList, oEList]);
   return /*#__PURE__*/_react["default"].createElement(_context.EListContext.Provider, {
     value: {
-      'refreshEList': getKrEsData
+      "refreshEList": getKrEsData
     }
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: preCls
@@ -150,7 +163,9 @@ var _default = function _default(props) {
     selectUsers: selectUsers,
     setSelectUsers: setSelectUsers,
     okrId: okrId
-  })), !loading ? /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, krList.map(function (kr, index) {
+  })), !loading ? /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
+    condition: totalDataNum !== 0
+  }, krList.map(function (kr, index) {
     return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_paddingLayout["default"], {
       padding: "0 32px 0 18px"
     }, /*#__PURE__*/_react["default"].createElement(_okrTree["default"], {
@@ -167,7 +182,16 @@ var _default = function _default(props) {
       data: kr,
       defaultExpandedKeys: expandedOEs
     }));
-  })) : /*#__PURE__*/_react["default"].createElement(_loading["default"], {
+  })), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
+    condition: totalDataNum === 0
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(preCls, "__empty")
+  }, /*#__PURE__*/_react["default"].createElement("img", {
+    className: "".concat(preCls, "__empty-img"),
+    src: _eListEmpty["default"]
+  }), /*#__PURE__*/_react["default"].createElement("span", {
+    className: "".concat(preCls, "__empty-text")
+  }, "\u6CA1\u6709\u641C\u7D22\u5230\u7B26\u5408\u6761\u4EF6\u7684E-\u6267\u884C")))) : /*#__PURE__*/_react["default"].createElement(_loading["default"], {
     type: "panel"
   })));
 };

package/lib/components/okr-detail/e-list/util.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.toTree = exports.getETreeNode = exports.formatTreeDataToNode = exports.formatEListDataToSelectTree = exports.formatCondition = void 0;
+exports.toTree = exports.getIfInitCondition = exports.getETreeNode = exports.formatTreeDataToNode = exports.formatEListDataToSelectTree = exports.formatCondition = void 0;
 
 var _cloneDeep = _interopRequireDefault(require("clone-deep"));
 
@@ -75,24 +75,43 @@ var getETreeNode = function getETreeNode(tasks, isFirstLevel, createUserId, krUs
 
 exports.getETreeNode = getETreeNode;
 
-var formatTreeDataToNode = function formatTreeDataToNode(tree) {
-  return tree.map(function (item, index) {
-    return {
-      'key': item.mileStoneId,
-      'index': index,
-      'title': item.mileStoneId !== 0 ? item.mileStoneName : '目标下的其他执行',
-      'nodeType': 'e-kr',
-      'isLeaf': false,
-      'children': getETreeNode(item.tasks, true, item.createUserId, item.user),
-      'data': _objectSpread({}, item),
-      'isOTask': item.mileStoneId === 0
-    };
-  });
+var formatTreeDataToNode = function formatTreeDataToNode(tree, isInitCondition) {
+  if (isInitCondition) {
+    return tree.map(function (item, index) {
+      return {
+        'key': item.mileStoneId,
+        'index': index,
+        'title': item.mileStoneId !== 0 ? item.mileStoneName : '目标下的其他执行',
+        'nodeType': 'e-kr',
+        'isLeaf': false,
+        'children': getETreeNode(item.tasks, true, item.createUserId, item.user),
+        'data': _objectSpread({}, item),
+        'isOTask': item.mileStoneId === 0
+      };
+    });
+  } else {
+    var result = [];
+    tree.forEach(function (item, index) {
+      if (item.tasks && item.tasks.length > 0) {
+        result.push({
+          'key': item.mileStoneId,
+          'index': index,
+          'title': item.mileStoneId !== 0 ? item.mileStoneName : '目标下的其他执行',
+          'nodeType': 'e-kr',
+          'isLeaf': false,
+          'children': getETreeNode(item.tasks, true, item.createUserId, item.user),
+          'data': _objectSpread({}, item),
+          'isOTask': item.mileStoneId === 0
+        });
+      }
+    });
+    return result;
+  }
 };
 
 exports.formatTreeDataToNode = formatTreeDataToNode;
 
-var formatEListDataToSelectTree = function formatEListDataToSelectTree(data, workId) {
+var formatEListDataToSelectTree = function formatEListDataToSelectTree(data, workId, isInitCondition) {
   var tree = data.map(function (item) {
     return _objectSpread(_objectSpread({}, item), {}, {
       'tasks': toTree(item.tasks)
@@ -100,15 +119,13 @@ var formatEListDataToSelectTree = function formatEListDataToSelectTree(data, wor
   });
   var formatKrsTreeDataToNode = formatTreeDataToNode(tree.filter(function (d) {
     return d.mileStoneId !== 0;
-  }));
+  }), isInitCondition);
   var formatOTreeDataToNode = formatTreeDataToNode(tree.filter(function (d) {
     return d.mileStoneId === 0;
-  }));
+  }), isInitCondition);
   var result = {
     'krsEList': formatKrsTreeDataToNode,
-    'oEList': formatOTreeDataToNode.length > 0 ? [formatTreeDataToNode(tree.filter(function (d) {
-      return d.mileStoneId === 0;
-    }))] : [[{
+    'oEList': isInitCondition && formatOTreeDataToNode.length === 0 ? [[{
       'key': 0,
       'index': 0,
       'title': '目标下的其他执行',
@@ -128,7 +145,7 @@ var formatEListDataToSelectTree = function formatEListDataToSelectTree(data, wor
         mileStoneId: 0
       },
       'isOTask': true
-    }]]
+    }]] : [formatOTreeDataToNode]
   };
   return result;
 };
@@ -182,4 +199,14 @@ var formatCondition = function formatCondition(_ref) {
   };
 };
 
-exports.formatCondition = formatCondition;
+exports.formatCondition = formatCondition;
+
+var getIfInitCondition = function getIfInitCondition(selectName, checkedStatus, users, keyWord) {
+  if (keyWord || selectName !== 'orderBySystem' || checkedStatus.length !== 0 || users.length !== 0) {
+    return false;
+  }
+
+  return true;
+};
+
+exports.getIfInitCondition = getIfInitCondition;

package/lib/components/select-tags/index.css

@@ -50,6 +50,13 @@
   margin-bottom: 7px;
 }
 
+.rc-select-multiple .rc-select-selector .rc-select-selection-placeholder {
+  line-height: 1;
+  margin-bottom: 7px;
+  position: relative;
+  top: -2px;
+}
+
 .rc-select-selection-item-content {
   margin-right: 8px;
 }

package/lib/components/user-selector/index.js

@@ -17,7 +17,7 @@ var _singleSelector = _interopRequireDefault(require("./export-modules/single-se
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-_fieldTreeSelector["default"].single = _singleSelector["default"];
+_fieldTreeSelector["default"].Single = _singleSelector["default"];
 _fieldTreeSelector["default"].Group = _groupSelector["default"];
 _fieldTreeSelector["default"].Depart = _departSearchSelector["default"];
 _fieldTreeSelector["default"].Duties = _dutiesSelector["default"];

package/package.json

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

package/src/components/create-okr-modal/index.tsx

@@ -67,7 +67,7 @@ interface Props {
   userInfo?: UserInfoObj;
   onSuccess?: Function;
   onClose?: Function;
-  isPerformance?: boolean;
+  isHiddenCreatedCard?: boolean;
   handleCreatedClose?:Function;
   visible?: boolean;
 }
@@ -80,7 +80,7 @@ const initOCheckResult = OCheckTarget.map((item) => {
 });
 
 function CreateOkrModal(
-  { initCycle, userInfo, onSuccess, isPerformance = false, handleCreatedClose = () => {}, visible = false,onClose = () => {}}: Props,
+  { initCycle, userInfo, onSuccess, isHiddenCreatedCard = false, handleCreatedClose = () => {}, visible = false,onClose = () => {}}: Props,
   ref: Ref<CreateOkrRefObject>
 ) {
   const [isVisible, setVisible] = useState(visible);
@@ -199,7 +199,7 @@ function CreateOkrModal(
     setCreatedSuccessInfo(data);
     if (
       !localStorage.getItem(`dontShowValue${userId}`) &&
-      !isPerformance &&
+      !isHiddenCreatedCard &&
       !isApplyTpl
     ) {
       setShowCreatedSuccessInfo(true);
@@ -278,7 +278,7 @@ function CreateOkrModal(
       return;
     }
     hideCreateOkrModal();
-    if (onSuccess || !isPerformance) {
+    if (onSuccess || !isHiddenCreatedCard) {
       // 带上超过创建okr人数的计算值
       const krNum = krDatas.length;
       let krTotalLength = 0;
@@ -692,7 +692,7 @@ function CreateOkrModal(
           </Wrapper>
         </Modal>
       </div>
-      {!isApplyTpl && !isPerformance && showCreatedSuccessInfo ? (
+      {!isApplyTpl && !isHiddenCreatedCard && showCreatedSuccessInfo ? (
         <CreateSuccessCmpWrapper>
           <CreateSuccessCmp
             tipIndex={tipIndex}
@@ -705,7 +705,7 @@ function CreateOkrModal(
         </CreateSuccessCmpWrapper>
       ) : null}
       {/* 如果 isVisible 是 hidden，则因为无法获取到样式截取不到图片导致下载下来白图*/}
-      {!isApplyTpl && !isPerformance && showCreatedSuccessInfo ? (
+      {!isApplyTpl && !isHiddenCreatedCard && showCreatedSuccessInfo ? (
         <div className="download-dom--hidden">
           <CreateSuccessCmp
             tipIndex={tipIndex}

package/src/components/drop-selector/index.js

@@ -117,5 +117,6 @@ const DropSelector = props => {
 }
 
 DropSelector.IconItem = IconItem
+DropSelector.Item = Item
 
 export default DropSelector

package/src/components/nav-top/components/user-own-menu/utils.ts

@@ -40,9 +40,7 @@ export const getOwnSet = () => {
       id: "role",
       url: "tu-icon-gongsi",
       title: "企业管理规定",
-      objUrl: `${apiServer}/u/${userId}/Home#setting?id=${
-        isTestCompanyManageRule ? "15709" : "12437"
-      }`,
+      objUrl: `${apiServer}/u/${userId}/Home#/enterprise/manage`,
     },
   ];
 

package/src/components/nav-top/index.tsx

@@ -62,10 +62,10 @@ const NavTop: FC = () => {
   }, []);
 
   const handleHashChange = () => {
-    const hash = location.hash || "";
+    const hash = location.hash.split('?')[0] || "";
     if (hash) {
       const activeMenu = menu.find((item) =>
-        hash.includes(item.href.split("#")[1])
+        hash.includes(item.href.split("#")[1].split('?')[0])
       );
       if (hash.includes('homepage')) {
         setActiveMenuId(99999);

package/src/components/okr-detail/e-list/index.js

@@ -1,104 +1,155 @@
-import React, { useState, useEffect } from 'react';
-import SearchForm from './search-form';
-import OkrTree from '../components/okr-tree';
-import { getKrsByCondition } from '../request-apis';
-import { formatEListDataToSelectTree, formatCondition } from './util';
-import { EListContext } from '../context';
-import PaddingLayout from '../components/padding-layout';
-import Loading from '../loading';
-import { getUserInfo } from '../../../utils/bs-global';
-import './index.scss';
+import React, { useState, useEffect } from "react";
+import SearchForm from "./search-form";
+import OkrTree from "../components/okr-tree";
+import { getKrsByCondition } from "../request-apis";
+import {
+  formatEListDataToSelectTree,
+  formatCondition,
+  getIfInitCondition,
+} from "./util";
+import { EListContext } from "../context";
+import PaddingLayout from "../components/padding-layout";
+import Loading from "../loading";
+import { getUserInfo } from "../../../utils/bs-global";
+import ConditionRender from "../../condition-render";
+import EmptyPng from './images/e-list-empty.png';
+import "./index.scss";
 
-const preCls = 'okr-detail-e';
+const preCls = "okr-detail-e";
 
-export default props => {
+export default (props) => {
   const { okrId } = props;
 
   const loginUser = getUserInfo().Id;
   const hasCondition = localStorage.getItem(`hasRememberCondition${loginUser}`);
 
-  const [krList, setKrList] = useState([])
-  const [checkedStatus, setCheckedStatus] = useState(hasCondition ? JSON.parse(localStorage.getItem(`okrDrawerECheckedStatus${loginUser}`)) : []);
-  const [selectUsers, setSelectUsers] = useState(hasCondition ? JSON.parse(localStorage.getItem(`okrDrawerESelectUsers${loginUser}`)) : []);
-  const [selectName, setSelectName] = useState(hasCondition ? localStorage.getItem(`okrDrawerESelectName${loginUser}`) : 'orderBySystem');
-  const [noteOrder, setNoteOrder] = useState(hasCondition ? localStorage.getItem(`okrDrawerENoteOrder${loginUser}`) : null);
+  const [krList, setKrList] = useState([]);
+  const [checkedStatus, setCheckedStatus] = useState(
+    hasCondition
+      ? JSON.parse(localStorage.getItem(`okrDrawerECheckedStatus${loginUser}`))
+      : []
+  );
+  const [selectUsers, setSelectUsers] = useState(
+    hasCondition
+      ? JSON.parse(localStorage.getItem(`okrDrawerESelectUsers${loginUser}`))
+      : []
+  );
+  const [selectName, setSelectName] = useState(
+    hasCondition
+      ? localStorage.getItem(`okrDrawerESelectName${loginUser}`)
+      : "orderBySystem"
+  );
+  const [noteOrder, setNoteOrder] = useState(
+    hasCondition
+      ? localStorage.getItem(`okrDrawerENoteOrder${loginUser}`)
+      : null
+  );
   const [searchKey, setSearchKey] = useState();
   const [oEList, setOEList] = useState([]);
   const [expandedKrEs, setExpandedKrEs] = useState([]);
   const [expandedOEs, setExpandedOEs] = useState([]);
   const [loading, setLoading] = useState(true);
+  const [totalDataNum, setTotalDataNum] = useState(0);
 
   const getKrEsData = () => {
     setLoading(true);
     getKrsByCondition({
       okrId,
-      'condition': formatCondition({
+      "condition": formatCondition({
         okrId,
         noteOrder,
         selectName,
         checkedStatus,
         users: selectUsers,
-        'keyWord': searchKey
-      })
-    }).then(krs => {
-      const formatKrs = formatEListDataToSelectTree(krs, okrId);
-      const expandedKrEs = (formatKrs.krsEList || []).map(it => it.key);
-      const expandedOEs = (formatKrs.oEList[0] || []).map(it => it.key);
+        "keyWord": searchKey,
+      }),
+    }).then((krs) => {
+      const formatKrs = formatEListDataToSelectTree(
+        krs,
+        okrId,
+        getIfInitCondition(selectName, checkedStatus, selectUsers, searchKey)
+      );
+      const expandedKrEs = (formatKrs.krsEList || []).map((it) => it.key);
+      const expandedOEs = (formatKrs.oEList[0] || []).map((it) => it.key);
       setExpandedKrEs(expandedKrEs);
       setExpandedOEs(expandedOEs);
       setKrList(formatKrs.krsEList);
       setOEList(formatKrs.oEList);
       setLoading(false);
-    })
-  }
+    });
+  };
 
   useEffect(() => {
     getKrEsData();
   }, [noteOrder, searchKey, selectName, checkedStatus, selectUsers]);
 
-  return <EListContext.Provider
-    value={{
-      'refreshEList': getKrEsData
-    }}
-  >
-    <div className={preCls}>
-      <PaddingLayout>
-        <SearchForm
-          checkedStatus={checkedStatus}
-          setCheckedStatus={setCheckedStatus}
-          selectName={selectName}
-          setSelectName={setSelectName}
-          noteOrder={noteOrder}
-          setNoteOrder={setNoteOrder}
-          setSearchKey={setSearchKey}
-          selectUsers={selectUsers}
-          setSelectUsers={setSelectUsers}
-          okrId={okrId}
-        />
-      </PaddingLayout>
+  useEffect(() => {
+    const oElistLength = oEList[0] && oEList[0].length || 0;
+    setTotalDataNum(krList.length + oElistLength);
+  }, [krList, oEList]);
+
+  return (
+    <EListContext.Provider
+      value={{
+        "refreshEList": getKrEsData,
+      }}
+    >
+      <div className={preCls}>
+        <PaddingLayout>
+          <SearchForm
+            checkedStatus={checkedStatus}
+            setCheckedStatus={setCheckedStatus}
+            selectName={selectName}
+            setSelectName={setSelectName}
+            noteOrder={noteOrder}
+            setNoteOrder={setNoteOrder}
+            setSearchKey={setSearchKey}
+            selectUsers={selectUsers}
+            setSelectUsers={setSelectUsers}
+            okrId={okrId}
+          />
+        </PaddingLayout>
 
-      {!loading ?
-        <React.Fragment>
-          {krList.map((kr, index) => {
-            return <React.Fragment>
-              <PaddingLayout padding={`0 32px 0 18px`}>
-                <OkrTree data={[kr]} defaultExpandedKeys={expandedKrEs} />
-              </PaddingLayout>
-              {
-                // kr左后一个节点 && 没有 OE 时，不显示横线
-                !((index + 1 == krList.length) && oEList.length == 0) &&
-                <div className="e__divider"></div>
-              }
-            </React.Fragment>
-          })}
+        {!loading ? (
+          <React.Fragment>
+            <ConditionRender condition={totalDataNum !== 0}>
+              {krList.map((kr, index) => {
+                return (
+                  <React.Fragment>
+                    <PaddingLayout padding={`0 32px 0 18px`}>
+                      <OkrTree data={[kr]} defaultExpandedKeys={expandedKrEs} />
+                    </PaddingLayout>
+                    {
+                      // kr左后一个节点 && 没有 OE 时，不显示横线
+                      !(index + 1 == krList.length && oEList.length == 0) && (
+                        <div className="e__divider"></div>
+                      )
+                    }
+                  </React.Fragment>
+                );
+              })}
 
-          {oEList.map((kr) => {
-            return <PaddingLayout padding={`0 32px 0 18px`}>
-              <OkrTree data={kr} defaultExpandedKeys={expandedOEs} />
-            </PaddingLayout>
-          })}
-        </React.Fragment>
-        : <Loading type="panel" />}
-    </div>
-  </EListContext.Provider>
-}
+              {oEList.map((kr) => {
+                return (
+                  <PaddingLayout padding={`0 32px 0 18px`}>
+                    <OkrTree data={kr} defaultExpandedKeys={expandedOEs} />
+                  </PaddingLayout>
+                );
+              })}
+            </ConditionRender>
+            <ConditionRender condition={totalDataNum === 0}>
+              <div className={`${preCls}__empty`}>
+                <img className={`${preCls}__empty-img`} src={EmptyPng}/>
+                <span className={`${preCls}__empty-text`}>
+                  没有搜索到符合条件的E-执行
+                </span>
+              </div>
+            </ConditionRender>
+          </React.Fragment>
+        ) : (
+          <Loading type="panel" />
+        )}
+      </div>
+    </EListContext.Provider>
+  );
+};

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

@@ -2,7 +2,22 @@
   padding-bottom: 60px;
   .e__divider {
     height: 8px;
-    background: #F0F2F5;
+    background: #f0f2f5;
     margin: 10px 32px;
   }
-}
+  &__empty {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    padding-top: 117px;
+    font-size: 14px;
+    &-img {
+      width: 128px;
+    }
+    &-text {
+      color: #3f4755;
+      line-height: 22px;
+      margin-top: 20px;
+    }
+  }
+}

package/src/components/okr-detail/e-list/util.ts

@@ -51,33 +51,52 @@ export const getETreeNode = (tasks, isFirstLevel, createUserId,krUser) => {
   })
 }
 
-export const formatTreeDataToNode = (tree) => {
-  return tree.map((item, index) => {
-    return {
-      'key': item.mileStoneId,
-      'index': index,
-      'title': item.mileStoneId !== 0 ? item.mileStoneName : '目标下的其他执行',
-      'nodeType': 'e-kr',
-      'isLeaf': false,
-      'children': getETreeNode(item.tasks, true, item.createUserId,item.user),
-      'data': { ...item },
-      'isOTask': item.mileStoneId === 0
-    }
-  })
+export const formatTreeDataToNode = (tree, isInitCondition) => {
+  if(isInitCondition) {
+    return tree.map((item, index) => {
+      return {
+        'key': item.mileStoneId,
+        'index': index,
+        'title': item.mileStoneId !== 0 ? item.mileStoneName : '目标下的其他执行',
+        'nodeType': 'e-kr',
+        'isLeaf': false,
+        'children': getETreeNode(item.tasks, true, item.createUserId,item.user),
+        'data': { ...item },
+        'isOTask': item.mileStoneId === 0
+      }
+    })
+  } else {
+    const result: any = [];
+    tree.forEach((item, index) => {
+      if (item.tasks && item.tasks.length > 0) {
+        result.push({
+          'key': item.mileStoneId,
+          'index': index,
+          'title': item.mileStoneId !== 0 ? item.mileStoneName : '目标下的其他执行',
+          'nodeType': 'e-kr',
+          'isLeaf': false,
+          'children': getETreeNode(item.tasks, true, item.createUserId,item.user),
+          'data': { ...item },
+          'isOTask': item.mileStoneId === 0
+        })
+      }
+    })
+    return result;
+  }
 }
 
-export const formatEListDataToSelectTree = (data, workId) => {
+export const formatEListDataToSelectTree = (data, workId, isInitCondition) => {
   const tree = data.map(item => {
     return {
       ...item,
       'tasks': toTree(item.tasks)
     }
   })
-  const formatKrsTreeDataToNode = formatTreeDataToNode(tree.filter(d => d.mileStoneId !== 0));
-  const formatOTreeDataToNode = formatTreeDataToNode(tree.filter(d => d.mileStoneId === 0));
+  const formatKrsTreeDataToNode = formatTreeDataToNode(tree.filter(d => d.mileStoneId !== 0), isInitCondition);
+  const formatOTreeDataToNode = formatTreeDataToNode(tree.filter(d => d.mileStoneId === 0), isInitCondition);
   const result =  {
     'krsEList': formatKrsTreeDataToNode,
-    'oEList': formatOTreeDataToNode.length > 0 ? [formatTreeDataToNode(tree.filter(d => d.mileStoneId === 0))] : [[{
+    'oEList': isInitCondition && formatOTreeDataToNode.length === 0 ? [[{
       'key': 0,
       'index': 0,
       'title': '目标下的其他执行',
@@ -99,7 +118,7 @@ export const formatEListDataToSelectTree = (data, workId) => {
         mileStoneId: 0
       },
       'isOTask': true
-    }]]
+    }]] : [formatOTreeDataToNode]
   }
   return result;
 }
@@ -142,4 +161,11 @@ export const formatCondition = ({okrId, noteOrder, selectName, checkedStatus, us
     }))
   }
 
+}
+
+export const getIfInitCondition = (selectName, checkedStatus, users, keyWord) => {
+  if (keyWord || selectName !== 'orderBySystem' || checkedStatus.length !== 0 || users.length !== 0) {
+    return false;
+  }
+  return true;
 }

package/src/components/select-tags/index.scss

@@ -47,6 +47,12 @@
   align-items: center;
   margin-bottom: 7px;
 }
+.rc-select-multiple .rc-select-selector .rc-select-selection-placeholder{
+  line-height: 1;
+  margin-bottom: 7px;
+  position: relative;
+  top: -2px;
+}
 
 .rc-select-selection-item-content{
   margin-right: 8px;

package/src/components/user-selector/index.js

@@ -6,7 +6,7 @@ import SingleSelectorCmp from './export-modules/single-selector';
 
 
 
-FieldPersonSelectorComp.single = SingleSelectorCmp
+FieldPersonSelectorComp.Single = SingleSelectorCmp
 FieldPersonSelectorComp.Group = GroupSelectorComp
 FieldPersonSelectorComp.Depart = DepartSearchSelectorComp
 FieldPersonSelectorComp.Duties = DutiesSelectorComp