@titaui/pc 1.11.48-beta.1 → 1.11.48-beta.2

package/lib/components/form/form-fields/radios/index.css

@@ -28,3 +28,7 @@
   line-height: 22px;
   color: #3f4755;
 }
+
+.form-field-radio__radios-item {
+  display: flex;
+}

package/lib/components/form/form-fields/radios/index.js

@@ -33,17 +33,18 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-var prefixCls = "form-field-radio";
+var prefixCls = 'form-field-radio';
 
 var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var _props$className = props.className,
-      className = _props$className === void 0 ? "" : _props$className,
+      className = _props$className === void 0 ? '' : _props$className,
       label = props.label,
       onChange = props.onChange,
       radios = props.radios,
       require = props.require,
       value = props.value,
-      radioClass = props.radioClass;
+      _props$radioClass = props.radioClass,
+      radioClass = _props$radioClass === void 0 ? '' : _props$radioClass;
 
   var _useState = (0, _react.useState)(value),
       _useState2 = _slicedToArray(_useState, 2),

package/lib/components/okr-detail/detail-header/delete-confirm/index.css

@@ -6,7 +6,7 @@
 
 .okr-detail-delete-confirm__option-text {
   font-size: 14px;
-  color: #3F4755;
+  color: #3f4755;
   line-height: 22px;
 }
 
@@ -23,7 +23,7 @@
 }
 
 .okr-detail-delete-confirm__icon.tu-icon-singlebox-have {
-  color: #BFC7D5;
+  color: #bfc7d5;
 }
 
 .okr-detail-delete-confirm__icon.tu-icon-wiki {
@@ -38,13 +38,17 @@
   margin-top: 10px;
 }
 
+.okr-detail-delete-confirm .tita-radio:hover .tita-radio-inner {
+  color: #2879ff;
+}
+
 .isApprovalDisabled {
   margin-bottom: 0;
   padding: 5px 24px;
   font-size: 14px;
   line-height: 22px;
-  transition: all .3s ease-in;
-  color: #BFC7D5;
+  transition: all 0.3s ease-in;
+  color: #bfc7d5;
   cursor: pointer;
   display: flex;
   align-items: center;
@@ -54,6 +58,6 @@
 .isApprovalDisabled .options-icon {
   margin-right: 12px;
   font-size: 14px;
-  transition: all .3s ease-in;
+  transition: all 0.3s ease-in;
   color: #89919f;
 }

package/lib/components/radio/index.css

@@ -30,7 +30,7 @@
 }
 
 .titaui-radio-wrapper .titaui-radio:hover > .titaui-radio-inner {
-  border: 1px solid #96d0fa;
+  border: 1px solid #2879ff;
 }
 
 .titaui-radio-wrapper .titaui-radio .titaui-radio-input {
@@ -59,14 +59,14 @@
   height: 10px;
   min-height: 10px;
   border-radius: 50%;
-  background-color: #1687d9;
+  background-color: #2879ff;
   transform: scale(0);
   opacity: 0;
   transition: all 0.3s cubic-bezier(0.78, 0.14, 0.15, 0.86);
 }
 
 .titaui-radio-wrapper .titaui-radio .titaui-radio-input:checked + .titaui-radio-inner {
-  border-color: #1687d9;
+  border-color: #2879ff;
 }
 
 .titaui-radio-wrapper .titaui-radio .titaui-radio-input:checked + .titaui-radio-inner:after {

package/lib/components/task-relation-modal/okr-relation/relation-task-model/index.css

@@ -5,3 +5,14 @@
 .relation-task__content-tree {
   margin-top: 16px;
 }
+
+.relation-task__content-empty {
+  height: 382px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.relation-task__content-empty > img {
+  width: 60px;
+}

package/lib/components/task-relation-modal/okr-relation/relation-task-model/index.js

@@ -23,6 +23,8 @@ var _helper = require("../../helper");
 
 var _requestApi = require("../request-api");
 
+var _loading = _interopRequireDefault(require("../../image/loading.gif"));
+
 var _getLocale = require("../../../../utils/getLocale");
 
 require("./index.css");
@@ -119,7 +121,12 @@ function OkrRelationTaskModal(props) {
   var _useState15 = (0, _react.useState)(1),
       _useState16 = _slicedToArray(_useState15, 2),
       pageNum = _useState16[0],
-      setPageNum = _useState16[1]; // useEffect(() => {
+      setPageNum = _useState16[1];
+
+  var _useState17 = (0, _react.useState)(false),
+      _useState18 = _slicedToArray(_useState17, 2),
+      isloading = _useState18[0],
+      setIsLoading = _useState18[1]; // useEffect(() => {
   //   // const roots = selected.reduce((res, cur) => [...res, cur.workId], []);
   //   // setSelectedRoots(roots);
   //   console.log(selected)
@@ -146,7 +153,10 @@ function OkrRelationTaskModal(props) {
   };
 
   var getTaskData = function getTaskData() {
+    setIsLoading(true);
     (0, _requestApi.planTableTask)(krId, query, pageNum, pageSize).then(function (res) {
+      setIsLoading(false);
+
       if (res) {
         var tasks = res.tasks,
             _total = res.total;
@@ -218,7 +228,12 @@ function OkrRelationTaskModal(props) {
     }
   }, /*#__PURE__*/_react["default"].createElement(_searchForm["default"], {
     onChange: onQueryChangeHandler
-  }), /*#__PURE__*/_react["default"].createElement("div", {
+  }), isloading ? /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(preCls, "__content-empty")
+  }, /*#__PURE__*/_react["default"].createElement("img", {
+    src: _loading["default"],
+    alt: ""
+  })) : /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(preCls, "__content-tree")
   }, /*#__PURE__*/_react["default"].createElement(_taskTree.TaskTree, {
     selected: selected,
@@ -234,7 +249,7 @@ function OkrRelationTaskModal(props) {
     onChange: onPageChangeHandler,
     current: pageNum,
     pageSize: pageSize
-  }))));
+  })))));
 }
 
 var _default = OkrRelationTaskModal;

package/lib/components/task-relation-modal/okr-relation/tree/task-tree/index.css

@@ -1,5 +1,5 @@
 .okr-relation-tree__empty {
-  height: 400px;
+  height: 382px;
   display: flex;
   align-items: center;
   justify-content: center;
@@ -49,7 +49,7 @@
 .okr-relation-tree__content {
   margin-right: -32px;
   margin-left: -4px;
-  height: 350px;
+  height: 315px;
   font-size: 14px;
   font-weight: 400;
   line-height: 22px;

package/lib/components/task-relation-modal/search/task-status-select.js

@@ -69,9 +69,6 @@ function TaskStatusSelect(props) {
   }, {
     label: (0, _getLocale.getLocale)('OKR_MyO_E_From_NotStarted'),
     value: 0
-  }, {
-    label: '过期完成',
-    value: 7
   }];
   return /*#__PURE__*/_react["default"].createElement(_selectLayer["default"], {
     onChangeSelect: onChangeHandler,

package/lib/components/task-relation-modal/search/work-status-select.js

@@ -11,6 +11,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _selectLayer = _interopRequireDefault(require("../../select-layer"));
 
+var _getLocale = require("../../../utils/getLocale");
+
 require("./search-dropdown/index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -35,7 +37,7 @@ function TaskStatusSelect(props) {
   var onChange = props.onChange,
       initValue = props.initValue;
 
-  var _useState = (0, _react.useState)('全部状态'),
+  var _useState = (0, _react.useState)((0, _getLocale.getLocale)('OKR_MyO_E_From_AllStates')),
       _useState2 = _slicedToArray(_useState, 2),
       selectText = _useState2[0],
       setSelectText = _useState2[1];
@@ -46,13 +48,13 @@ function TaskStatusSelect(props) {
   };
 
   var selectOptions = [{
-    label: '全部状态',
+    label: (0, _getLocale.getLocale)('OKR_MyO_E_From_AllStates'),
     value: 0
   }, {
-    label: '已完成',
+    label: (0, _getLocale.getLocale)('Pro_page_Sta_Completed'),
     value: 2
   }, {
-    label: '进行中',
+    label: (0, _getLocale.getLocale)('Per_MyRe_text_Inprogress'),
     value: 1
   }];
   return /*#__PURE__*/_react["default"].createElement(_selectLayer["default"], {

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

@@ -23,6 +23,8 @@ var _principal = _interopRequireDefault(require("../../search/principal"));
 
 var _relation = _interopRequireDefault(require("../../search/relation"));
 
+var _helpers = require("../../../../utils/helpers");
+
 var _getLocale = require("../../../../utils/getLocale");
 
 require("./index.css");
@@ -52,6 +54,17 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 function SearchForm(props) {
+  var _loginUser$UserAvatar;
+
+  var loginUser = (0, _helpers.getLoginUserInfo)();
+  var user = {
+    userId: loginUser.Id,
+    name: loginUser.Name,
+    avatar: {
+      original: loginUser === null || loginUser === void 0 ? void 0 : (_loginUser$UserAvatar = loginUser.UserAvatar) === null || _loginUser$UserAvatar === void 0 ? void 0 : _loginUser$UserAvatar.Original,
+      color: '#bc97eb'
+    }
+  };
   var onChange = props.onChange;
 
   var _useState = (0, _react.useState)({
@@ -69,7 +82,7 @@ function SearchForm(props) {
       okrType = _useState4[0],
       setOkrType = _useState4[1];
 
-  var _useState5 = (0, _react.useState)([]),
+  var _useState5 = (0, _react.useState)([user]),
       _useState6 = _slicedToArray(_useState5, 2),
       users = _useState6[0],
       setUsers = _useState6[1];
@@ -117,7 +130,7 @@ function SearchForm(props) {
     className: "rel-okr-tree__search-item"
   }, /*#__PURE__*/_react["default"].createElement(_principal["default"], {
     onChange: setUsers,
-    initValue: [],
+    initValue: users,
     setRelation: setRelation
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: "rel-okr-tree__search-item"

package/lib/components/task-relation-modal/tree/work-list/index.css

@@ -0,0 +1,14 @@
+.relation-work__content-tree {
+  margin-top: 16px;
+}
+
+.relation-work__content-empty {
+  height: 382px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.relation-work__content-empty > img {
+  width: 60px;
+}

package/lib/components/task-relation-modal/tree/work-list/index.js

@@ -17,6 +17,8 @@ var _searchForm = _interopRequireDefault(require("./search-form"));
 
 var _taskTree = require("../../okr-relation/tree/task-tree");
 
+var _loading = _interopRequireDefault(require("../../image/loading.gif"));
+
 var _requestApi = require("../../request-api");
 
 require("./index.css");
@@ -51,7 +53,7 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
-var preCls = 'relation-task';
+var preCls = 'relation-work';
 
 function WorkList(props) {
   var selected = props.selected,
@@ -91,7 +93,7 @@ function WorkList(props) {
       isQuery = _useState12[0],
       setIsQuery = _useState12[1];
 
-  var _useState13 = (0, _react.useState)(),
+  var _useState13 = (0, _react.useState)(false),
       _useState14 = _slicedToArray(_useState13, 2),
       lodaing = _useState14[0],
       setLoading = _useState14[1];
@@ -118,7 +120,10 @@ function WorkList(props) {
   };
 
   var getWorkData = function getWorkData() {
+    setLoading(true);
     (0, _requestApi.workData)(query, pageNum, pageSize).then(function (res) {
+      setLoading(false);
+
       if (!!res.Code) {
         var _res$Data = res.Data,
             works = _res$Data.works,
@@ -142,7 +147,12 @@ function WorkList(props) {
 
   return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_searchForm["default"], {
     onChange: onQueryChangeHandler
-  }), /*#__PURE__*/_react["default"].createElement("div", {
+  }), lodaing ? /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(preCls, "__content-empty")
+  }, /*#__PURE__*/_react["default"].createElement("img", {
+    src: _loading["default"],
+    alt: ""
+  })) : /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(preCls, "__content-tree")
   }, /*#__PURE__*/_react["default"].createElement(_taskTree.TaskTree, {
     selected: selected,
@@ -159,7 +169,7 @@ function WorkList(props) {
     onChange: onPageChangeHandler,
     current: pageNum,
     pageSize: pageSize
-  })));
+  }))));
 }
 
 var _default = WorkList;

package/lib/components/task-relation-modal/tree/work-list/search-form.js

@@ -42,6 +42,17 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 function SearchForm(props) {
+  var _loginUser$UserAvatar;
+
+  var loginUser = (0, _helpers.getLoginUserInfo)();
+  var user = {
+    userId: loginUser.Id,
+    name: loginUser.Name,
+    avatar: {
+      original: loginUser === null || loginUser === void 0 ? void 0 : (_loginUser$UserAvatar = loginUser.UserAvatar) === null || _loginUser$UserAvatar === void 0 ? void 0 : _loginUser$UserAvatar.Original,
+      color: '#bc97eb'
+    }
+  };
   var onChange = props.onChange;
 
   var _useState = (0, _react.useState)(0),
@@ -49,10 +60,7 @@ function SearchForm(props) {
       status = _useState2[0],
       setStatus = _useState2[1];
 
-  var _useState3 = (0, _react.useState)([{
-    userId: (0, _helpers.getLoginUserInfo)().Id,
-    name: (0, _helpers.getLoginUserInfo)().Name
-  }]),
+  var _useState3 = (0, _react.useState)([user]),
       _useState4 = _slicedToArray(_useState3, 2),
       users = _useState4[0],
       setUsers = _useState4[1];
@@ -67,10 +75,7 @@ function SearchForm(props) {
       relation = _useState8[0],
       setRelation = _useState8[1];
 
-  var _useState9 = (0, _react.useState)([{
-    userId: (0, _helpers.getLoginUserInfo)().Id,
-    name: (0, _helpers.getLoginUserInfo)().Name
-  }]),
+  var _useState9 = (0, _react.useState)([user]),
       _useState10 = _slicedToArray(_useState9, 1),
       initPerson = _useState10[0];
 
@@ -83,7 +88,7 @@ function SearchForm(props) {
       }, ""),
       relation: relation
     });
-  }, [status, keyWords, relation]);
+  }, [status, keyWords, relation, users]);
   return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("div", {
     className: "rel-work-tree__search-item"
   }, /*#__PURE__*/_react["default"].createElement(_okrStatusSelect["default"], {

package/lib/components/user-selector/select-tree/tree-nodes/tree-person-node/index.js

@@ -24,6 +24,8 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 function _default(props) {
+  var _data$avatar, _data$avatar2, _data$avatar3, _data$avatar4;
+
   var data = props.data,
       isSelectedPanel = props.isSelectedPanel,
       onRemove = props.onRemove;
@@ -41,9 +43,9 @@ function _default(props) {
     })
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "perspm-person__avatar"
-  }, data.avatar.original ? /*#__PURE__*/_react["default"].createElement("img", {
+  }, data !== null && data !== void 0 && (_data$avatar = data.avatar) !== null && _data$avatar !== void 0 && _data$avatar.original || data !== null && data !== void 0 && (_data$avatar2 = data.avatar) !== null && _data$avatar2 !== void 0 && _data$avatar2.small ? /*#__PURE__*/_react["default"].createElement("img", {
     key: data.userId,
-    src: data.avatar.original,
+    src: (data === null || data === void 0 ? void 0 : (_data$avatar3 = data.avatar) === null || _data$avatar3 === void 0 ? void 0 : _data$avatar3.original) || (data === null || data === void 0 ? void 0 : (_data$avatar4 = data.avatar) === null || _data$avatar4 === void 0 ? void 0 : _data$avatar4.small),
     style: {
       width: "100%",
       height: "100%",

package/lib/components-v1/radio/radio.js

@@ -43,7 +43,7 @@ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.g
 
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 
-var RadioWrapper = _styledComponents["default"].label(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  cursor: pointer;\n  color: #36434d;\n  margin-right: 15px;\n  box-sizing: border-box;\n  display: flex;\n\n  .label {\n    position: relative;\n    user-select: none;\n    top: -2px;\n  }\n"])));
+var RadioWrapper = _styledComponents["default"].label(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  cursor: pointer;\n  color: #36434d;\n  margin-right: 15px;\n  box-sizing: border-box;\n  display: inline-flex;\n\n  .label {\n    position: relative;\n    user-select: none;\n    top: -2px;\n  }\n"])));
 
 var Radio = /*#__PURE__*/function (_Component) {
   _inherits(Radio, _Component);

package/lib/pages/new-okr-list/header/index.css

@@ -65,7 +65,7 @@
   align-items: center;
   padding: 5px 8px;
   box-sizing: border-box;
-  font-size: 14px;
+  font-size: 16px;
   color: #3f4755;
   line-height: 22px;
   cursor: pointer;

package/package.json

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