@titaui/pc 1.16.43 → 1.16.44

package/lib/components/mblog/components/MblogAction.js

@@ -11,7 +11,7 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _tooltip = _interopRequireDefault(require("../../tooltip"));
 
-var _UserSelectorPop = _interopRequireDefault(require("../../../components-v1/userSelector/UserSelectorPop"));
+var _userSelector = _interopRequireDefault(require("../../user-selector"));
 
 var _style = require("../style");
 
@@ -37,18 +37,6 @@ 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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
@@ -121,6 +109,9 @@ var MblogAction = /*#__PURE__*/function (_PureComponent) {
           isSendSms: false
         });
       }
+    }, _this.onOpenAtSelector = function () {
+      _this.refs.atSelector.open(); // 输入@弹出选人组件
+
     }, _assertThisInitialized(_this)));
   }
 
@@ -131,7 +122,7 @@ var MblogAction = /*#__PURE__*/function (_PureComponent) {
 
       if (isInputAt) {
         // @ts-ignore
-        this.refs.atSelector.handleShowPop(); // 输入@弹出选人组件
+        this.refs.atSelector.open(); // 输入@弹出选人组件
       }
     } // componentWillReceiveProps(newProps: Props) {
     //   if (newProps.isInputEnterSubmit && newProps.isAllowSubmit) {
@@ -189,24 +180,32 @@ var MblogAction = /*#__PURE__*/function (_PureComponent) {
         className: "tu-icon-cus-fujian"
       }), /*#__PURE__*/_react["default"].createElement("span", {
         className: "upload_fujian_text"
-      }, this.props.attachmentText))), this.props.isShowAt && /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+      }, this.props.attachmentText))), this.props.isShowAt && /*#__PURE__*/_react["default"].createElement(_style.LeftBtn, {
+        key: this.props.atText,
+        tips: this.props.atTipText
+      }, /*#__PURE__*/_react["default"].createElement(_userSelector["default"], {
+        popupAlign: {
+          offset: [-550, -100],
+          overflow: {
+            adjustX: true,
+            adjustY: true
+          },
+          targetOffset: [0, 0]
+        },
+        ref: "atSelector",
+        multiple: true,
+        onOk: onActionsSelectedUserChange,
+        position: "centerRight",
+        autoClear: true // selectNodes={visiableLimitState || {}}
+
+      }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
         container: function container() {
           return document.body;
         },
         overlay: this.props.atTipText
-      }, /*#__PURE__*/_react["default"].createElement(_style.LeftBtn, {
-        key: this.props.atText,
-        tips: this.props.atTipText
-      }, /*#__PURE__*/_react["default"].createElement(_UserSelectorPop["default"], {
-        ref: "atSelector",
-        stopPropagation: true,
-        popExtraClassName: "pull-screen-ignore",
-        align: userSelectorPopAlign,
-        container: this.context.popContainer,
-        onSubmit: function onSubmit(users, depts) {
-          onActionsSelectedUserChange([].concat(_toConsumableArray(users), _toConsumableArray(depts)));
-        }
-      }, /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("span", {
+      }, /*#__PURE__*/_react["default"].createElement("div", {
+        onClick: this.onOpenAtSelector
+      }, /*#__PURE__*/_react["default"].createElement("span", {
         className: "btn-txt"
       }, this.props.atText))))), this.props.isShowAtAll && /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
         container: function container() {

package/lib/components/mblog/index.js

@@ -166,9 +166,14 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
       }
     };
 
-    _this.onActionsSelectedUserChange = function (users) {
+    _this.onActionsSelectedUserChange = function (_ref3, _ref4, _ref5) {
+      var departments = _ref3.departments,
+          groups = _ref3.groups,
+          users = _ref3.users;
+      var isWechat = _ref4.isWechat;
+      var selectNodes = _ref5.selectNodes;
       var editorRef = _this.refs.textEditor.refs.editorRef;
-      editorRef.append((0, _editor["default"])(users), {
+      editorRef.append((0, _editor.appendUserSelectorData)(selectNodes), {
         insertPos: true
       });
       editorRef.focus(); // @ts-ignore
@@ -518,20 +523,12 @@ var MBlog = /*#__PURE__*/function (_PureComponent) {
         submitStatus: submitStatus,
         localStroageKey: localStroageKey,
         disableRangeSelect: disableRangeSelect || isAtAll,
-        onActionsTextChange: function onActionsTextChange(actionValue) {
-          _this2.onActionsTextChange(actionValue);
-        },
+        onActionsTextChange: this.onActionsTextChange,
         onActionsAllMembersChange: this.onActionsAllMembersChange,
         onActionsEmotionChange: this.onActionsEmotionChange,
-        onActionsSelectedUserChange: function onActionsSelectedUserChange(users) {
-          return _this2.onActionsSelectedUserChange(users);
-        },
-        onActionsAttachmentChange: function onActionsAttachmentChange(uploadSuccessFilesPath) {
-          return _this2.handlerDealAttachemntData(uploadSuccessFilesPath);
-        },
-        onActionSubmit: function onActionSubmit(submitType) {
-          _this2.onActionSubmit(submitType);
-        }
+        onActionsSelectedUserChange: this.onActionsSelectedUserChange,
+        onActionsAttachmentChange: this.handlerDealAttachemntData,
+        onActionSubmit: this.onActionSubmit
       }), /*#__PURE__*/_react["default"].createElement(_style.PreviewBox, {
         id: this.previewid
       }), !(0, _platform.isPlatform)('wx') && isShowDragMask && /*#__PURE__*/_react["default"].createElement(_style.DragEffect, {

package/lib/components/menus/export-modules/survey-menu/menus.js

@@ -50,7 +50,7 @@ var surveyMenus = /*#__PURE__*/function () {
       label: (0, _getLocale.getLocale)('Per_Menu_Title_Label_BasicSettings'),
       key: "other",
       type: _index.GROUP_NAME_NODE,
-      href: "",
+      href: "#/",
       isShow: props.isShowSurveyManage
     }, {
       icon: 'setting',

package/lib/components/menus/export-modules/survey-menu/survey-front-menus.js

@@ -95,7 +95,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     var firstMenuHref = menus[0].data.href;
     if (firstMenuHref.split('#')[1] === pathname) return; //当前路由与二级菜单第一项相同时直接return
 
-    var menusHrefArr = ['/survey/manage', '/survey/my-involved'];
+    var menusHrefArr = ['/survey/manage', '/survey/my-involved', '/survey/assess-settings'];
     var isIncludeMenu = menusHrefArr.find(function (item) {
       //表示当前路由是否是左侧二级菜单的选项
       return item.includes(pathname);
@@ -109,7 +109,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
     if (!isShowMenuItem) {
       //如果当前路由没有权限展示的话，则跳转到有权限二级路由的第一项
-      window.location.href = firstMenuHref;
+      window.location.href = '#/survey/my-involved';
     }
   }, [history.location.pathname, history.location.search]);
 

package/lib/components/user-selector/export-modules/field-tree-selector/index.js

@@ -118,7 +118,8 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   } : _props$popupAlign,
       _props$enableDimissio = props.enableDimissionSwitch,
       enableDimissionSwitch = _props$enableDimissio === void 0 ? false : _props$enableDimissio,
-      staffStatusDefault = props.staffStatusDefault;
+      staffStatusDefault = props.staffStatusDefault,
+      autoClear = props.autoClear;
 
   var _useState = (0, _react.useState)([]),
       _useState2 = _slicedToArray(_useState, 2),
@@ -234,7 +235,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   });
 
   var onOkHandler = function onOkHandler(selectNodes, e) {
-    setSelected(selectNodes);
+    if (autoClear) setSelected([]);else setSelected(selectNodes);
     var texts = [];
     var users = [];
     var groups = [];
@@ -281,7 +282,9 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         users: users,
         departments: departments,
         groups: groups
-      }, wechartOpts);
+      }, wechartOpts, {
+        selectNodes: selectNodes
+      });
     } else {
       onSelect(selectNodes, wechartOpts, e);
     }
@@ -308,7 +311,8 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   };
 
   var popup = /*#__PURE__*/_react["default"].createElement(_selectorGenerater["default"], {
-    multiple: multiple // key={staffStatus}
+    multiple: multiple,
+    autoClear: autoClear // key={staffStatus}
     ,
     onCancel: onCancelHandler,
     onOk: onOkHandler,

package/lib/components/user-selector/export-modules/field-tree-selector/multiple-selector/index.js

@@ -64,7 +64,9 @@ function _default(props) {
       onOk = _props$onOk === void 0 ? function () {} : _props$onOk,
       _props$onStaffStatusC = props.onStaffStatusChange,
       onStaffStatusChange = _props$onStaffStatusC === void 0 ? function () {} : _props$onStaffStatusC,
-      staffStatus = props.staffStatus;
+      staffStatus = props.staffStatus,
+      _props$autoClear = props.autoClear,
+      autoClear = _props$autoClear === void 0 ? false : _props$autoClear;
 
   var _useContext = (0, _react.useContext)(_context.CommonContext),
       enableDimissionSwitch = _useContext.enableDimissionSwitch;
@@ -105,7 +107,9 @@ function _default(props) {
   };
 
   var onOkHandler = function onOkHandler(e) {
-    return onOk(selected, e);
+    onOk(selected, e); // autoClear 开启，提交后自动清除
+
+    if (autoClear) setSelected([]);
   };
 
   var wrapperClickHandler = function wrapperClickHandler(e) {

package/lib/utils/editor.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.usersTypeToNumber = exports["default"] = exports.appendUsers = exports.appendImgs = exports.UserTypeNumberEnum = void 0;
+exports.usersTypeToNumber = exports["default"] = exports.appendUsers = exports.appendUserSelectorData = exports.appendImgs = exports.UserTypeNumberEnum = void 0;
 
 var _flatten = _interopRequireDefault(require("lodash/flatten"));
 
@@ -23,6 +23,7 @@ exports.UserTypeNumberEnum = UserTypeNumberEnum;
   UserTypeNumberEnum[UserTypeNumberEnum["AllMembers"] = 2] = "AllMembers";
   UserTypeNumberEnum[UserTypeNumberEnum["ProjectOrTarget"] = 4] = "ProjectOrTarget";
   UserTypeNumberEnum[UserTypeNumberEnum["Department"] = 15] = "Department";
+  UserTypeNumberEnum[UserTypeNumberEnum["Group"] = 78] = "Group";
 })(UserTypeNumberEnum || (exports.UserTypeNumberEnum = UserTypeNumberEnum = {}));
 
 var appendUsers = function appendUsers(users) {
@@ -48,6 +49,35 @@ var appendUsers = function appendUsers(users) {
 
 exports.appendUsers = appendUsers;
 
+var userSelectTypeToEditorType = function userSelectTypeToEditorType(type) {
+  return {
+    person: 'user',
+    depart: 'department',
+    group: 'group'
+  }[type];
+};
+
+var appendUserSelectorData = function appendUserSelectorData(selectNodes) {
+  return (0, _flatten["default"])(selectNodes.map(function (_ref2) {
+    var nodeType = _ref2.nodeType,
+        title = _ref2.title,
+        id = _ref2.id;
+    return [{
+      type: 'mention',
+      attrs: {
+        mentionId: id,
+        mentionName: title,
+        mentionType: userSelectTypeToEditorType(nodeType)
+      }
+    }, {
+      type: 'text',
+      text: ' '
+    }];
+  }));
+};
+
+exports.appendUserSelectorData = appendUserSelectorData;
+
 var appendImgs = function appendImgs(src, name) {
   return [{
     type: 'image',

package/package.json

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