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

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

@@ -66,6 +66,8 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       selectNodes = _props$selectNodes === void 0 ? defauleSelectNodes : _props$selectNodes,
       sourceFrom = props.sourceFrom,
       departOnly = props.departOnly,
+      searchUserOnly = props.searchUserOnly,
+      isVerify = props.isVerify,
       _props$departId = props.departId,
       departId = _props$departId === void 0 ? "-1" : _props$departId,
       _props$auth = props.auth,
@@ -307,6 +309,8 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     value: {
       sourceFrom: sourceFrom,
       departOnly: departOnly,
+      searchUserOnly: searchUserOnly,
+      isVerify: isVerify,
       auth: auth,
       departId: departId,
       authType: authType,

package/lib/components/user-selector/request-apis.js

@@ -159,13 +159,28 @@ exports.getSubordinateData = getSubordinateData;
 var search = function search(_ref4) {
   var searchKey = _ref4.searchKey,
       departOnly = _ref4.departOnly,
-      sourceFrom = _ref4.sourceFrom;
+      searchUserOnly = _ref4.searchUserOnly,
+      sourceFrom = _ref4.sourceFrom,
+      _ref4$isVerify = _ref4.isVerify,
+      isVerify = _ref4$isVerify === void 0 ? false : _ref4$isVerify;
   var args = [];
-  if (departOnly) args.push("isGetUser=false");
-  if (sourceFrom) args.push("sourceFrom=".concat(sourceFrom)); // 追加来源，用于企业微信搜索
 
-  args.push("source=".concat((0, _openData.getSource)()));
-  return _axios["default"].get("".concat(requestDomain(), "/api/v2/").concat(tenantId, "/").concat(userId, "/search/searchAll?keyWork=").concat(searchKey).concat(args.length ? "&".concat(args.join("&")) : "")).then(function (searchRes) {
+  if (departOnly) {
+    args.push("isGetUser=false&isGetDep=true&isGetGroup=false");
+  } else if (searchUserOnly) {
+    args.push("isGetUser=true&isGetDep=false&isGetGroup=false");
+  } else {
+    args.push("isGetUser=true&isGetDep=true&isGetGroup=true");
+  }
+
+  ;
+
+  if (!!sourceFrom) {
+    // 这个是遗留的管控群组的，后面逐步替换掉
+    isVerify = true;
+  }
+
+  return _axios["default"].get("".concat(requestDomain(), "/api/v2/").concat(tenantId, "/").concat(userId, "/search/searchAll?keyWord=").concat(searchKey, "&isVerify=").concat(isVerify, "&").concat(args[0])).then(function (searchRes) {
     return searchRes.data;
   });
 };

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

@@ -59,7 +59,9 @@ function _default(props) {
 
   var _useContext = (0, _react.useContext)(_context.CommonContext),
       departOnly = _useContext.departOnly,
+      searchUserOnly = _useContext.searchUserOnly,
       sourceFrom = _useContext.sourceFrom,
+      isVerify = _useContext.isVerify,
       _useContext$panes = _useContext.panes,
       panes = _useContext$panes === void 0 ? {
     depart: true,
@@ -97,7 +99,9 @@ function _default(props) {
     (0, _requestApis.search)({
       searchKey: searchKey,
       departOnly: departOnly,
-      sourceFrom: sourceFrom
+      searchUserOnly: searchUserOnly,
+      sourceFrom: sourceFrom,
+      isVerify: isVerify
     }).then(function (res) {
       var Code = res.Code,
           Data = res.Data;

package/package.json

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