Release

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kne-components/components-admin",
-  "version": "1.1.40",
+  "version": "1.1.41",
   "description": "用于实现一个后台管理系统的必要组件",
   "scripts": {
     "init": "husky",
@@ -93,10 +93,12 @@
     "@kne/react-icon": "^0.1.4",
     "@kne/react-intl": "^0.1.9",
     "@kne/react-org-chart": "^0.1.6",
+    "@kne/timeline": "^1.0.2",
     "@kne/token-storage": "^1.0.0",
     "@kne/use-control-value": "^0.1.9",
     "@kne/use-ref-callback": "^0.1.2",
     "@kne/use-refer-navigate": "^1.0.0",
-    "md5": "^2.3.0"
+    "md5": "^2.3.0",
+    "xlsx": "^0.18.5"
   }
 }

src/components/Apis/getApis.js

@@ -235,6 +235,10 @@ const getApis = options => {
         url: `${prefix}/tenant/admin/org-remove`,
         method: 'POST'
       },
+      orgBatchImport: {
+        url: `${prefix}/tenant/admin/org-batch-import`,
+        method: 'POST'
+      },
       userList: {
         url: `${prefix}/tenant/admin/user-list`,
         method: 'GET'
@@ -321,6 +325,28 @@ const getApis = options => {
           method: 'POST'
         }
       },
+      sharedGroup: {
+        list: {
+          url: `${prefix}/tenant/admin/shared-group/list`,
+          method: 'GET'
+        },
+        create: {
+          url: `${prefix}/tenant/admin/shared-group/create`,
+          method: 'POST'
+        },
+        save: {
+          url: `${prefix}/tenant/admin/shared-group/save`,
+          method: 'POST'
+        },
+        setStatus: {
+          url: `${prefix}/tenant/admin/shared-group/set-status`,
+          method: 'POST'
+        },
+        remove: {
+          url: `${prefix}/tenant/admin/shared-group/remove`,
+          method: 'POST'
+        }
+      },
       permission: {
         list: {
           url: `${prefix}/tenant/admin/permission/list`,
@@ -377,6 +403,10 @@ const getApis = options => {
         url: `${prefix}/tenant/org-remove`,
         method: 'POST'
       },
+      orgBatchImport: {
+        url: `${prefix}/tenant/org-batch-import`,
+        method: 'POST'
+      },
       userList: {
         url: `${prefix}/tenant/user-list`,
         method: 'GET'
@@ -439,6 +469,28 @@ const getApis = options => {
           method: 'POST'
         }
       },
+      sharedGroup: {
+        list: {
+          url: `${prefix}/tenant/shared-group/list`,
+          method: 'GET'
+        },
+        create: {
+          url: `${prefix}/tenant/shared-group/create`,
+          method: 'POST'
+        },
+        save: {
+          url: `${prefix}/tenant/shared-group/save`,
+          method: 'POST'
+        },
+        setStatus: {
+          url: `${prefix}/tenant/shared-group/set-status`,
+          method: 'POST'
+        },
+        remove: {
+          url: `${prefix}/tenant/shared-group/remove`,
+          method: 'POST'
+        }
+      },
       permission: {
         list: {
           url: `${prefix}/tenant/permission/list`,

src/components/BizUnit/index.js

@@ -1,5 +1,5 @@
 import { createWithRemoteLoader } from '@kne/remote-loader';
-import { useRef, useState, useEffect } from 'react';
+import { useRef, useState, useEffect, useMemo } from 'react';
 import { Flex } from 'antd';
 import useRefCallback from '@kne/use-ref-callback';
 import merge from 'lodash/merge';
@@ -41,6 +41,7 @@ const BizUnit = createWithRemoteLoader({
           },
           keywordFilterName: 'keyword',
           keywordFilterLabel: formatMessage({ id: 'Keyword' }),
+          mapFilterValue: null,
           getFilterValue: filterValue => ({
             params: {
               filter: filterValue
@@ -53,7 +54,9 @@ const BizUnit = createWithRemoteLoader({
       const ref = useRef();
       const { SearchInput, getFilterValue } = Filter;
       const [filter, setFilter] = useState([]);
-      const filterValue = getFilterValue(filter);
+      const filterValue = options.mapFilterValue ? options.mapFilterValue(filter, getFilterValue) : getFilterValue(filter);
+      const filterParamsKey = useMemo(() => JSON.stringify(filterValue), [filterValue]);
+      const isFirstFilterEffect = useRef(true);
       const topOptions = (
         <Flex gap={8}>
           {allowKeywordSearch && <SearchInput size={topOptionsSize} name={options.keywordFilterName} label={options.keywordFilterLabel} />}
@@ -104,12 +107,26 @@ const BizUnit = createWithRemoteLoader({
       });
 
       const handlerMount = useRefCallback(() => {
-        onMount && onMount({ filter: { value: filter, onChange: setFilter }, topOptions, tableOptions });
+        onMount &&
+          onMount({
+            filter: { value: filter, onChange: setFilter },
+            filterList,
+            topOptions,
+            tableOptions
+          });
       });
 
       useEffect(() => {
         handlerMount();
-      }, [handlerMount]);
+      }, [handlerMount, filter]);
+
+      useEffect(() => {
+        if (isFirstFilterEffect.current) {
+          isFirstFilterEffect.current = false;
+          return;
+        }
+        ref.current?.reload?.();
+      }, [filterParamsKey]);
       if (typeof children === 'function') {
         return children({
           filter: { value: filter, onChange: setFilter, list: filterList },