@hzab/group-user-selector 0.0.9 → 0.0.10

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+# @hzab/group-user-selector@0.0.10
+
+feat: 搜索情况下默认不展示下级
+
 # @hzab/group-user-selector@0.0.9
 
 feat: 增加一键清除 API

package/package.json

@@ -1,52 +1,57 @@
-{
-  "name": "@hzab/group-user-selector",
-  "version": "0.0.9",
-  "description": "",
-  "main": "src",
-  "scripts": {
-    "dev": "webpack serve -c ./config/webpack.config.js --env local",
-    "build": "webpack -c ./config/webpack.config.js --env production",
-    "publish-patch": "npm version patch && npm publish --access public",
-    "publish-minor": "npm version minor && npm publish --access public",
-    "publish-major": "npm version major && npm publish --access public",
-    "prepare": "husky install",
-    "mac-chmod": "chmod +x .husky && chmod +x .husky/pre-commit",
-    "docs": "typedoc"
-  },
-  "files": [
-    "src",
-    "CHANGELOG.md"
-  ],
-  "keywords": [],
-  "author": "CaiYansong",
-  "license": "ISC",
-  "devDependencies": {
-    "@hzab/permissions": "^1.0.0",
-    "@hzab/webpack-config": "^1.0.0",
-    "@types/react": "^17.0.62",
-    "@types/react-dom": "^17.0.20",
-    "antd": "^4.14.0",
-    "axios": "^1.4.0",
-    "eslint": "^8.30.0",
-    "less": "^4.1.3",
-    "mobx": "^6.7.0",
-    "mobx-react": "^7.6.0",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
-    "react-router-dom": "^6.14.1",
-    "typedoc": "^0.24.8",
-    "typescript": "^4.9.4"
-  },
-  "directories": {
-    "src": "src"
-  },
-  "lint-staged": {
-    "**.{js,jsx,ts,tsx,css,scss,less,json,html}": [
-      "prettier --write"
-    ]
-  },
-  "dependencies": {
-    "@hzab/data-model": "^1.7.0",
-    "lodash": "^4.17.21"
-  }
-}
+{
+  "name": "@hzab/group-user-selector",
+  "version": "0.0.10",
+  "description": "",
+  "main": "src",
+  "scripts": {
+    "dev": "webpack serve -c ./config/webpack.config.js --env local",
+    "build": "webpack -c ./config/webpack.config.js --env production",
+    "version:alpha": "npm version prerelease --preid=alpha",
+    "publish:alpha": "npm publish --tag alpha",
+    "version:beta": "npm version prerelease --preid=beta",
+    "publish:beta": "npm publish --tag beta",
+    "version:patch": "npm version patch",
+    "version:minior": "npm version minor",
+    "version:major": "npm version major",
+    "publish:stable": "npm publish --access public",
+    "prepare": "husky install",
+    "mac-chmod": "chmod +x .husky && chmod +x .husky/pre-commit",
+    "docs": "typedoc"
+  },
+  "files": [
+    "src",
+    "CHANGELOG.md"
+  ],
+  "keywords": [],
+  "author": "CaiYansong",
+  "license": "ISC",
+  "devDependencies": {
+    "@hzab/permissions": "^1.0.0",
+    "@hzab/webpack-config": "^1.0.0",
+    "@types/react": "^17.0.62",
+    "@types/react-dom": "^17.0.20",
+    "antd": "^4.14.0",
+    "axios": "^1.4.0",
+    "eslint": "^8.30.0",
+    "less": "^4.1.3",
+    "mobx": "^6.7.0",
+    "mobx-react": "^7.6.0",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
+    "react-router-dom": "^6.14.1",
+    "typedoc": "^0.24.8",
+    "typescript": "^4.9.4"
+  },
+  "directories": {
+    "src": "src"
+  },
+  "lint-staged": {
+    "**.{js,jsx,ts,tsx,css,scss,less,json,html}": [
+      "prettier --write"
+    ]
+  },
+  "dependencies": {
+    "@hzab/data-model": "^1.7.0",
+    "lodash": "^4.17.21"
+  }
+}

package/src/components/ItemRenter/index.jsx

@@ -1,46 +1,47 @@
-import {  forwardRef } from "react";
-import { Checkbox } from "antd";
-
-import defaultAvatar from "../../assets/imgs/defaultAvatar.png";
-import department from "../../assets/imgs/department.png";
-
-import "./index.less";
-
-function ItemRenter(props, ref) {
-  const {
-    labelKey = "label",
-    valueKey = "value",
-    isUserKey = "isUser",
-    imgKey = "img",
-    isCheck = false,
-    item,
-    handleClickItem,
-    handleCheckItem
-  } = props;
-
-
-  return (
-    <>
-      <div className="group-selection-list-item" key={item[valueKey]}>
-        <div className="avatar" onClick={() => handleCheckItem(item)}>
-          <Checkbox checked={isCheck} />
-          <img src={item[imgKey] ? item[imgKey] : item[isUserKey] ? defaultAvatar : department} />
-          <div className="label">{item[labelKey]}</div>
-        </div>
-        {item[isUserKey] ? null : <div
-          className={`next  ${isCheck ? "noNext" : ""}`}
-          onClick={() => {
-            if (isCheck) {
-              return;
-            }
-            handleClickItem(item);
-          }}
-        >
-          下级
-        </div>}
-      </div>
-      </>
-  );
-}
-
-export default forwardRef(ItemRenter);
+import {  forwardRef } from "react";
+import { Checkbox } from "antd";
+
+import defaultAvatar from "../../assets/imgs/defaultAvatar.png";
+import department from "../../assets/imgs/department.png";
+
+import "./index.less";
+
+function ItemRenter(props, ref) {
+  const {
+    labelKey = "label",
+    valueKey = "value",
+    isUserKey = "isUser",
+    imgKey = "img",
+    isCheck = false,
+    item,
+    handleClickItem,
+    handleCheckItem,
+    noNextLevel = false
+  } = props;
+
+
+  return (
+    <>
+      <div className="group-selection-list-item" key={item[valueKey]}>
+        <div className="avatar" onClick={() => handleCheckItem(item)}>
+          <Checkbox checked={isCheck} />
+          <img src={item[imgKey] ? item[imgKey] : item[isUserKey] ? defaultAvatar : department} />
+          <div className="label">{item[labelKey]}</div>
+        </div>
+        {(item[isUserKey] || noNextLevel) ? null : <div
+          className={`next  ${isCheck ? "noNext" : ""}`}
+          onClick={() => {
+            if (isCheck) {
+              return;
+            }
+            handleClickItem(item);
+          }}
+        >
+          下级
+        </div>}
+      </div>
+      </>
+  );
+}
+
+export default forwardRef(ItemRenter);

package/src/components/SearchRenter/index.jsx

@@ -1,108 +1,108 @@
-import { useEffect, useState, forwardRef } from "react";
-import { Input, message, Pagination } from "antd";
-
-import "./index.less";
-
-function SearchRenter(props, ref) {
-  const {
-    searchModel,
-    searchQueryKey = "search",
-    searchPlaceholder = "搜索成员",
-    hasSearchPagination = true,
-    hasSearch = true,
-    ItemRenter,
-    setLoading = () => {},
-  } = props;
-
-  const [search, setSearch] = useState("");
-  const [searchList, setSearchList] = useState([]);
-  const [total, setTotal] = useState(0);
-  const [pageData, setPageData] = useState(
-    hasSearchPagination
-      ? {
-          pageSize: 10,
-          pageNum: 1,
-        }
-      : {},
-  );
-
-  const handleSearch = (data) => {
-    setLoading && setLoading(true);
-    searchModel &&
-      searchModel
-        .getList({ ...data })
-        .then((res) => {
-          setSearchList(res?.list || res || []);
-          setTotal(res?.pagination?.total || res?.total || 0);
-        })
-        .catch((err) => {
-          message.error(err._message || "未知错误");
-        })
-        .finally(() => {
-          setLoading && setLoading(false);
-        });
-  };
-
-  const handleChangePage = (pageNum, pageSize) => {
-    const pages = {
-      pageNum: pageSize !== pageData?.pageSize ? 1 : pageNum,
-      pageSize,
-    };
-    setPageData({
-      ...pages,
-    });
-    handleSearch({
-      [searchQueryKey]: search,
-      ...pages,
-    });
-  };
-
-  const onSearch = (value) => {
-    setSearch(value);
-    if (!value) {
-      setPageData({
-        pageSize: 10,
-        pageNum: 1,
-      });
-      return;
-    }
-    const data = {
-      pageSize: pageData?.pageSize || 10,
-      pageNum: 1,
-    };
-    setPageData(data);
-    handleSearch({
-      [searchQueryKey]: value,
-      ...data,
-    });
-  };
-
-  return (
-    <>
-      {hasSearch ? <Input.Search onSearch={onSearch} enterButton placeholder={searchPlaceholder} allowClear /> : null}
-      {search ? (
-        <div className="group-selection-search-view">
-          <div className="group-selection-search-list">
-            {searchList.map((item, index) => {
-              return ItemRenter(item);
-            })}
-          </div>
-
-          {hasSearchPagination ? (
-            <div className="group-selection-search-pagination">
-              <Pagination
-                current={pageData?.pageNum}
-                total={total}
-                pageSize={pageData?.pageSize}
-                onChange={handleChangePage}
-                size="small"
-              />
-            </div>
-          ) : null}
-        </div>
-      ) : null}
-    </>
-  );
-}
-
-export default forwardRef(SearchRenter);
+import { useEffect, useState, forwardRef } from "react";
+import { Input, message, Pagination } from "antd";
+
+import "./index.less";
+
+function SearchRenter(props, ref) {
+  const {
+    searchModel,
+    searchQueryKey = "search",
+    searchPlaceholder = "搜索成员",
+    hasSearchPagination = true,
+    hasSearch = true,
+    ItemRenter,
+    setLoading = () => {},
+  } = props;
+
+  const [search, setSearch] = useState("");
+  const [searchList, setSearchList] = useState([]);
+  const [total, setTotal] = useState(0);
+  const [pageData, setPageData] = useState(
+    hasSearchPagination
+      ? {
+          pageSize: 10,
+          pageNum: 1,
+        }
+      : {},
+  );
+
+  const handleSearch = (data) => {
+    setLoading && setLoading(true);
+    searchModel &&
+      searchModel
+        .getList({ ...data })
+        .then((res) => {
+          setSearchList(res?.list || res || []);
+          setTotal(res?.pagination?.total || res?.total || 0);
+        })
+        .catch((err) => {
+          message.error(err._message || "未知错误");
+        })
+        .finally(() => {
+          setLoading && setLoading(false);
+        });
+  };
+
+  const handleChangePage = (pageNum, pageSize) => {
+    const pages = {
+      pageNum: pageSize !== pageData?.pageSize ? 1 : pageNum,
+      pageSize,
+    };
+    setPageData({
+      ...pages,
+    });
+    handleSearch({
+      [searchQueryKey]: search,
+      ...pages,
+    });
+  };
+
+  const onSearch = (value) => {
+    setSearch(value);
+    if (!value) {
+      setPageData({
+        pageSize: 10,
+        pageNum: 1,
+      });
+      return;
+    }
+    const data = {
+      pageSize: pageData?.pageSize || 10,
+      pageNum: 1,
+    };
+    setPageData(data);
+    handleSearch({
+      [searchQueryKey]: value,
+      ...data,
+    });
+  };
+
+  return (
+    <>
+      {hasSearch ? <Input.Search onSearch={onSearch} enterButton placeholder={searchPlaceholder} allowClear /> : null}
+      {search ? (
+        <div className="group-selection-search-view">
+          <div className="group-selection-search-list">
+            {searchList.map((item, index) => {
+              return ItemRenter(item, true);
+            })}
+          </div>
+
+          {hasSearchPagination ? (
+            <div className="group-selection-search-pagination">
+              <Pagination
+                current={pageData?.pageNum}
+                total={total}
+                pageSize={pageData?.pageSize}
+                onChange={handleChangePage}
+                size="small"
+              />
+            </div>
+          ) : null}
+        </div>
+      ) : null}
+    </>
+  );
+}
+
+export default forwardRef(SearchRenter);

package/src/index.tsx

@@ -149,7 +149,7 @@ function GroupSelection(props, ref) {
     return is;
   };
 
-  const Renter = (item) => {
+  const Renter = (item, noNextLevel) => {
     const isCheck = handleCheck(item);
     return (
       <ItemRenter
@@ -159,6 +159,7 @@ function GroupSelection(props, ref) {
         handleCheckItem={handleCheckItem}
         handleCheckDelete={handleCheckDelete}
         handleClickItem={handleClickItem}
+        noNextLevel={noNextLevel}
       />
     );
   };
@@ -191,7 +192,7 @@ function GroupSelection(props, ref) {
           </div>
           <div className="group-selection-list-view">
             {selectList.map((item, index) => {
-              return Renter(item);
+              return Renter(item, false);
             })}
           </div>
           {hasPagination ? (