@cloud-app-dev/vidc 1.0.43 → 1.0.44

package/.umirc.ts

@@ -2,7 +2,7 @@ import { defineConfig } from 'dumi';
 import path from 'path';
 
 const token =
-  'eyJhbGciOiJIUzI1NiJ9.eyJvcmdhbml6YXRpb25JZCI6IjEwMDEwMTAwMDQ0NiIsImV4dCI6MTYzNzgwNjQ5ODI3OSwidWlkIjoiMTAxMDAwMDAwMjQ5IiwidmFsaWRTdGF0ZSI6MTA0NDA2LCJyb2xlSWQiOlsxMDAwMDAxMTAzODddLCJ2YWxpZFRpbWUiOm51bGwsIm9wdENlbnRlcklkIjoiMTAwMTAwMDAwMjMzIiwidXNlclR5cGUiOjEwMDcwMiwiaWF0IjoxNjM3NTQ3Mjk4Mjc5fQ.FX6-kuuaituBjzuBxY0s51V_V_tVRVMuiWp8fIZI6YQ';
+  'eyJhbGciOiJIUzI1NiJ9.eyJvcmdhbml6YXRpb25JZCI6IjEwMDEwMTAwMDQ0NiIsImV4dCI6MTYzODA3ODM3NjE0NSwidWlkIjoiMTAxMDAwMDAwMjQ5IiwidmFsaWRTdGF0ZSI6MTA0NDA2LCJyb2xlSWQiOlsxMDAwMDAxMTAzODddLCJ2YWxpZFRpbWUiOm51bGwsIm9wdENlbnRlcklkIjoiMTAwMTAwMDAwMjMzIiwidXNlclR5cGUiOjEwMDcwMiwiaWF0IjoxNjM3ODE5MTc2MTQ1fQ.x9o6vi8T5YW7P05AkeQh1Sse8sp6tGs7zxUWgB_rxtk';
 
 export default defineConfig({
   title: '云应用-业务组件库',

package/es/Api/index.d.ts

@@ -3,7 +3,7 @@ import { UserInfo } from '@cloud-app-dev/basic-components/es/Store/app';
 import { BzTreeItemType, PostItemType } from '../core';
 declare class Api {
     getOrgs(): Promise<OrgItemType[]>;
-    getUsers(organizationId: string): Promise<UserInfo[]>;
+    getUsers(organizationId: string, params?: any): Promise<UserInfo[]>;
     getPosts(orgId: string): Promise<PostItemType[]>;
     getDeviceBzTree(): Promise<BzTreeItemType[]>;
     getCustomDeviceGroup(): Promise<BzTreeItemType[]>;

package/es/Api/index.js

@@ -49,6 +49,7 @@ var Api = /*#__PURE__*/function () {
   }, {
     key: "getUsers",
     value: function getUsers(organizationId) {
+      var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       return __awaiter(this, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
         var res;
         return regeneratorRuntime.wrap(function _callee2$(_context2) {
@@ -61,13 +62,13 @@ var Api = /*#__PURE__*/function () {
                   method: 'post',
                   requestId: 'queryUsers',
                   headers: getHeader(),
-                  data: {
+                  data: Object.assign({
                     containSubOrganization: 1,
                     limit: 10000,
                     offset: 0,
                     organizationId: organizationId,
                     validState: ['104406']
-                  }
+                  }, params)
                 });
 
               case 2:

package/es/TreeTitle/index.css

@@ -18,6 +18,7 @@
   height: 28px;
   position: relative;
   top: -1px;
+  max-width: 200px;
 }
 .lm-c-tree-title-part .input-keword input {
   font-size: var(--fs-small);

package/es/UserSelect/index.d.ts

@@ -5,6 +5,10 @@ interface IUserSelectProps {
     selectUsers: UserInfo[];
     onChange?: (users: UserInfo[]) => void;
     className?: string;
+    /**
+     * @description  getUser其他参数
+     */
+    userParams?: any;
 }
 declare const _default: React.ForwardRefExoticComponent<IUserSelectProps & React.RefAttributes<any>>;
 export default _default;

package/es/UserSelect/index.js

@@ -33,7 +33,8 @@ function UserSelect(_ref, ref) {
   var selectUsers = _ref.selectUsers,
       onChange = _ref.onChange,
       _ref$className = _ref.className,
-      className = _ref$className === void 0 ? '' : _ref$className;
+      className = _ref$className === void 0 ? '' : _ref$className,
+      userParams = _ref.userParams;
 
   var _useState = useState({
     keyword1: '',
@@ -61,12 +62,12 @@ function UserSelect(_ref, ref) {
     return state.orgId ? state.orgId : treeData[0] ? treeData[0].id : undefined;
   }, [treeData, state.orgId]);
 
-  var _useHttp3 = _useHttp2(['QueryUserList', selectId], function (_ref2) {
+  var _useHttp3 = _useHttp2(['QueryUserList', selectId, userParams], function (_ref2) {
     var _ref3 = _slicedToArray(_ref2, 2),
         _ = _ref3[0],
         id = _ref3[1];
 
-    return id ? api.getUsers(id) : Promise.resolve();
+    return id ? api.getUsers(id, userParams) : Promise.resolve();
   }),
       _useHttp3$data = _useHttp3.data,
       userList = _useHttp3$data === void 0 ? [] : _useHttp3$data;
@@ -118,6 +119,16 @@ function UserSelect(_ref, ref) {
     }));
   }, [state.selectUsers, state.selectIds]);
 
+  var renderList1 = useMemo(function () {
+    return userList.filter(function (v) {
+      return !state.keyword1 || v.realName.includes(state.keyword1);
+    });
+  }, [userList, state.keyword1]);
+  var renderList2 = useMemo(function () {
+    return state.selectUsers.filter(function (v) {
+      return !state.keyword2 || v.realName.includes(state.keyword2);
+    });
+  }, [state.selectUsers, state.keyword2]);
   return /*#__PURE__*/React.createElement("div", {
     className: "user-select-modal-content ".concat(className)
   }, /*#__PURE__*/React.createElement(TreeMode, {
@@ -134,13 +145,13 @@ function UserSelect(_ref, ref) {
     selectedKeys: [selectId]
   }), /*#__PURE__*/React.createElement(List, {
     onChecked: onUserChecked1,
-    list: userList,
+    list: renderList1,
     key: userList.length,
     checkedKeys: list1CheckedKeys,
     itemKey: "id",
     itemNameKey: "realName",
     className: "user-source-list",
-    title: "\u4EBA\u5458",
+    title: "\u4EBA\u5458\u5217\u8868",
     onKeywordChange: function onKeywordChange(v) {
       return setState(function (old) {
         return Object.assign(Object.assign({}, old), {
@@ -150,12 +161,12 @@ function UserSelect(_ref, ref) {
     },
     keywords: state.keyword1
   }), /*#__PURE__*/React.createElement(List, {
-    list: state.selectUsers,
+    list: renderList2,
     itemKey: "id",
     itemNameKey: "realName",
     checkedKeys: state.selectIds,
     className: "user-select-list",
-    title: "\u5DF2\u6DFB\u52A0",
+    title: "\u5DF2\u9009\u62E9\u4EBA\u5458",
     onKeywordChange: function onKeywordChange(v) {
       return setState(function (old) {
         return Object.assign(Object.assign({}, old), {

package/package.json

@@ -2,7 +2,7 @@
   "private": false,
   "name": "@cloud-app-dev/vidc",
   "description": "Video Image Data Componennts",
-  "version": "1.0.43",
+  "version": "1.0.44",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",