@titaui/pc 1.12.71 → 1.12.74-beta.1

package/lib/components/dynamic/dynamic-item/components/summary-header/index.css

@@ -156,6 +156,28 @@
   box-sizing: border-box;
 }
 
+.titaui-dynamic-new-summary-header__edit {
+  opacity: 0;
+  transition: all 0.2s;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  height: 28px;
+  background: rgba(40, 121, 255, 0.1);
+  border-radius: 18px;
+  font-size: 12px;
+  color: #2879FF;
+  line-height: 18px;
+  padding: 5px 16px;
+  margin-right: 12px;
+  box-sizing: border-box;
+  cursor: pointer;
+}
+
+.titaui-dynamic-new-summary-header__edit-icon {
+  margin-right: 4px;
+}
+
 .titaui-dynamic-new-summary__operate .drawer-content-wrapper {
   width: 372px !important;
 }

package/lib/components/dynamic/dynamic-item/components/summary-header/index.js

@@ -355,7 +355,12 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
     src: _evalute["default"],
     className: "".concat(prefix, "__evalute-img"),
     alt: "\u8BC4\u4EF7"
-  }), (0, _getLocale.getLocale)('Per_MyRe_button_Toevaluate')), /*#__PURE__*/_react["default"].createElement("div", {
+  }), (0, _getLocale.getLocale)('Per_MyRe_button_Toevaluate')), showEdit && data.isEdit && /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(prefix, "__edit"),
+    onClick: handleClickEdit
+  }, /*#__PURE__*/_react["default"].createElement("i", {
+    className: (0, _classnames["default"])('tu-icon-bianji3', "".concat(prefix, "__edit-icon"))
+  }), "\u7F16\u8F91"), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__more-operate")
   }, /*#__PURE__*/_react["default"].createElement(_dropSelector["default"], {
     popupPlacement: "bottomRight",
@@ -372,15 +377,6 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
       onClick: handleShowDropSelector
     })
   }, /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
-    condition: showEdit && data.isEdit
-  }, /*#__PURE__*/_react["default"].createElement(_dropSelector.Item, {
-    name: "edit",
-    onClick: handleClickEdit
-  }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: "".concat(prefix, "__more-operate-selection")
-  }, /*#__PURE__*/_react["default"].createElement("i", {
-    className: (0, _classnames["default"])('tu-icon-bianji3', "".concat(prefix, "__more-operate-selection-icon"))
-  }), (0, _getLocale.getLocale)('Mod_Editor')))), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
     condition: showDelete && data.isEdit
   }, /*#__PURE__*/_react["default"].createElement(_dropSelector.Item, {
     name: "delete",

package/lib/components/dynamic/dynamic-item/dynamic-new-report/index.css

@@ -2,6 +2,11 @@
   font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
 }
 
+.titaui-dynamic-new-report-item:hover .titaui-dynamic-new-summary-header__edit {
+  opacity: 1;
+  transition: all 0.2s;
+}
+
 .titaui-dynamic-new-report-item .titaui-dynamic-title__content-text {
   cursor: default;
 }

package/lib/components/import-modal/tree/okr-tree/search-form.js

@@ -108,6 +108,14 @@ function SearchForm(props) {
 
   var dilagRef = (0, _react.useRef)(document.createElement("div"));
   (0, _react.useEffect)(function () {
+    var relations = [];
+
+    if (Number(relation) === 0) {
+      relations.push.apply(relations, [1, 2]);
+    } else {
+      relations.push(Number(relation));
+    }
+
     onChange(_objectSpread({
       okrType: okrType,
       status: 0,
@@ -115,7 +123,8 @@ function SearchForm(props) {
         return "".concat(res).concat(index === 0 ? "" : ",").concat(cur.userId);
       }, ""),
       keyWords: keyWords,
-      relation: relation,
+      relation: 0,
+      relations: relations,
       okrClassify: classify
     }, cycle));
   }, [okrType, users, keyWords, cycle, relation, classify]);

package/lib/components/menus/export-modules/interview-menus/menus.js

@@ -71,8 +71,7 @@ var InterviewMenus = /*#__PURE__*/function () {
       label: (0, _getLocale.getLocale)('Ooo_Ddb_Dashboard'),
       key: 'dashboard',
       href: '#/interview?reactRouterName=dashboard',
-      isShow: false // mamagementAuthority,
-
+      isShow: mamagementAuthority
     }];
     this.newMenus = {
       myInterview: [{

package/lib/components/menus/export-modules/summary-menus/depart-menus/index.js

@@ -100,7 +100,7 @@ var _default = function _default() {
   var showCompanyAll = baseAuth.isBoss() || baseAuth.isAssistant() || baseAuth.isPlanDailyManager();
   (0, _react.useEffect)(function () {
     if (showCompanyAll) {
-      window.location.href = '#/summary/manage?departmentName=公司全部&departmentId=0&modeType=date';
+      window.location.href = '#/summary/depart?departmentName=公司全部&departmentId=0&modeType=date';
 
       var allDepartmentText = window.getLocale && window.getLocale(_i18n.locale.menu_alldeparment) || _i18n.locale.menu_alldeparment;
 
@@ -140,11 +140,11 @@ var _default = function _default() {
         };
 
         if (rawTreeData.length > 1) {
-          location.href = "#/summary/manage?departmentName=".concat(res.Data.departments[0].name, "&departmentId=-1&modeType=date");
+          location.href = "#/summary/depart?departmentName=".concat(res.Data.departments[0].name, "&departmentId=-1&modeType=date");
           rawTreeData.unshift(rootNode);
           setSelectedMenuKeys([-1]);
         } else {
-          location.href = "#/summary/manage?departmentName=".concat(res.Data.departments[0].name, "&departmentId=").concat(res.Data.departments[0].id, "&modeType=date");
+          location.href = "#/summary/depart?departmentName=".concat(res.Data.departments[0].name, "&departmentId=").concat(res.Data.departments[0].id, "&modeType=date");
           setSelectedMenuKeys([rawTreeData[0].id]);
         }
 
@@ -193,7 +193,7 @@ var _default = function _default() {
     if (nodeType == _index.USER_NODE) {
       location.href = "#/summary/manage?toUserId=".concat(data.userId);
     } else if (nodeType == _index.DEPART_NODE) {
-      location.href = "#/summary/manage?departmentName=".concat(data.name, "&departmentId=").concat(data.id);
+      location.href = "#/summary/depart?departmentName=".concat(data.name, "&departmentId=").concat(data.id);
     }
 
     setSelectedMenuKeys(selectedKyes);

package/lib/components/menus/export-modules/summary-menus/menus.js

@@ -37,7 +37,7 @@ var PAGE_SUMMARY_SHARE = "share";
 exports.PAGE_SUMMARY_SHARE = PAGE_SUMMARY_SHARE;
 var PAGE_SUMMARY_DEPART = "depart";
 exports.PAGE_SUMMARY_DEPART = PAGE_SUMMARY_DEPART;
-var PAGE_SUMMARY_ROLE = "role";
+var PAGE_SUMMARY_ROLE = "roles";
 exports.PAGE_SUMMARY_ROLE = PAGE_SUMMARY_ROLE;
 var PAGE_SUMMARY_CHART = "chart";
 exports.PAGE_SUMMARY_CHART = PAGE_SUMMARY_CHART;

package/lib/components/menus/export-modules/summary-menus/summary-front-menus.js

@@ -121,7 +121,14 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
     onSelect(node); // 处理菜单选中
 
-    if (!selectedKyes.length) return; // setSelectedMenuKeys(selectedKyes) // 为了点总结管理规定的时候不高亮这个菜单，这个菜单新页面打开的，自测没影响，有影响了再说
+    if (!selectedKyes.length) {
+      return;
+    } else if (selectedKyes[0] === 'roles') {
+      // 为了点总结管理规定的时候不高亮这个菜单，这个菜单新页面打开的
+      return;
+    } else {
+      setSelectedMenuKeys(selectedKyes);
+    }
   }; // 获取下属数据列表
 
 

package/lib/components/okr-flow/export-modules/okr-search-panel/index.js

@@ -131,6 +131,9 @@ function OkrSearchPanel(props, ref) {
                 annualNum: annualNum,
                 userIds: searchType == 'user' ? rootId : '',
                 departmentIds: searchType == 'depart' ? rootId : '',
+                haveSubDept: false,
+                onlyThisDept: true,
+                // 地图中不显示子部门
                 groupIds: searchType == 'group' ? rootId : '',
                 orderType: 2,
                 // 排序

package/lib/components/rich-editor-at/components/index.css

@@ -30,8 +30,8 @@
 
 .titaui-rich-editor-at-avatar__delete-wrapper {
   position: absolute;
-  top: -4px;
-  right: 0;
+  top: -2px;
+  right: -2px;
   z-index: 1;
   width: 20px;
   height: 20px;
@@ -46,7 +46,7 @@
 
 .titaui-rich-editor-at-avatar__delete-wrapper:hover {
   cursor: pointer;
-  color: #f05e5e;
+  color: #fff;
 }
 
 .titaui-rich-editor-at-avatar--enter {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.12.71",
+  "version": "1.12.74-beta.1",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",