@qmlight/web-platform-components 1.0.1 → 1.0.3

package/SearchAssistanceSelect/src/SearchAssistanceComponent/component/customOrg/index.tsx

@@ -1,17 +1,17 @@
-import React, { useState, useEffect, useRef, useLayoutEffect } from 'react';
-import { DcpButton, DcpModal, Collapse, Spin } from 'dcp-design-react';
-import { PlusOutlined } from '@/icons';
+import React, { useState, useEffect, useRef, useLayoutEffect } from "react";
+import { DcpButton, DcpModal, Collapse, Spin } from "dcp-design-react";
+import { PlusOutlined } from "@/icons";
 import {
   getAllCustomGroups,
   createCustomGroups,
   deleteCustomGroup,
   getUsersByCustomGroup,
-} from '../../api/tabList';
-import TabList from '../tabList';
-import './style.less';
-import { Message } from '@/utils';
-import CustomModal from './customModal';
-import { EditOutlined, DeleteOutlined } from '@/icons';
+} from "../../api/tabList";
+import TabList from "../tabList";
+import "./style.less";
+import { Message } from "@/utils";
+import CustomModal from "./customModal";
+import { EditOutlined, DeleteOutlined } from "@/icons";
 const { Panel } = Collapse;
 const CustomOrg = (props) => {
   const {
@@ -26,7 +26,7 @@ const CustomOrg = (props) => {
   const [dataSource, setData] = useState<any>([]);
   const [itemKeys, setItemKeys] = useState<any[]>([]);
   const [actionInfo, setAcitonInfo] = useState<any>({
-    type: 'add',
+    type: "add",
     visible: false,
   });
   const [fetchParams, setFetchParams] = useState({});
@@ -36,7 +36,7 @@ const CustomOrg = (props) => {
   const userList = React.useRef<any[]>([]);
   const dataList = React.useRef<any>([]);
   const [loading, setLoading] = useState(false);
-  const [loaingChild, setLoadingChild] = useState('');
+  const [loaingChild, setLoadingChild] = useState("");
   const getData = async (flag?) => {
     setLoading(true);
     const res = await getAllCustomGroups({}).finally(() => {
@@ -47,18 +47,21 @@ const CustomOrg = (props) => {
         return {
           ...item,
           key: item.id,
-          orgtype: 'customOrg',
+          orgtype: "customOrg",
         };
       });
 
       if (mode) {
         userList.current = list;
+        setData(list);
+        dataList.current = list;
         onDataChange && onDataChange(list);
         return;
       }
       if (flag) {
         dataList.current = list.map((item) => {
-          const field = dataList.current.find((items) => items.id === item.id) || {};
+          const field =
+            dataList.current.find((items) => items.id === item.id) || {};
           return {
             ...item,
             ...field,
@@ -67,8 +70,6 @@ const CustomOrg = (props) => {
         setData(dataList.current);
         return;
       } else {
-        setData(list);
-        dataList.current = list;
       }
 
       const firstId = list.find((_, index) => index === 0).id;
@@ -119,18 +120,19 @@ const CustomOrg = (props) => {
     setItemKeys(selectedKeys || []);
   }, [selectedKeys]);
   const itemSelect = (value, checked) => {
-    if (mode === 'multiple') {
+    if (mode === "multiple") {
       onItemSelect && onItemSelect(value, checked);
       return;
     }
     setItemKeys([value]);
     const field = userList.current.find((item) => item.id === value);
-    onValueChange && onValueChange({ ...field, value: field.id, label: field.title });
+    onValueChange &&
+      onValueChange({ ...field, value: field.id, label: field.title });
   };
   const onItemAction = async (act, item) => {
-    if (act === 'edit') {
+    if (act === "edit") {
       setAcitonInfo({
-        type: 'edit',
+        type: "edit",
         data: {
           id: item.id,
           title: item.title,
@@ -140,10 +142,10 @@ const CustomOrg = (props) => {
       });
       return;
     }
-    if (act === 'del') {
+    if (act === "del") {
       const res = await deleteCustomGroup({ id: item.id });
       if (res.code === 200) {
-        Message('删除成功', 'success');
+        Message("删除成功", "success");
 
         getData(true);
       }
@@ -152,7 +154,7 @@ const CustomOrg = (props) => {
 
   const onClose = (id?) => {
     setAcitonInfo({
-      type: 'add',
+      type: "add",
       visible: false,
     });
     if (!mode && id) {
@@ -163,12 +165,12 @@ const CustomOrg = (props) => {
   };
   const actionHandle = (e, flag, info) => {
     e.stopPropagation();
-    if (flag === 'edit') {
-      onItemAction('edit', info);
+    if (flag === "edit") {
+      onItemAction("edit", info);
       return;
     }
-    if (flag === 'del') {
-      onItemAction('del', info);
+    if (flag === "del") {
+      onItemAction("del", info);
     }
   };
 
@@ -181,7 +183,7 @@ const CustomOrg = (props) => {
             icon={<PlusOutlined />}
             onClick={() => {
               setAcitonInfo({
-                type: 'add',
+                type: "add",
                 visible: true,
               });
             }}
@@ -197,7 +199,9 @@ const CustomOrg = (props) => {
                 setActiveKeys(val);
                 if (val.length) {
                   const newId = val[val.length - 1];
-                  const userFlag = dataList.current.find((item) => item.id === newId)?.userList;
+                  const userFlag = dataList.current.find(
+                    (item) => item.id === newId,
+                  )?.userList;
                   if (!userFlag) {
                     getUserData(newId);
                   }
@@ -212,11 +216,11 @@ const CustomOrg = (props) => {
                     extra={
                       <div className="item-action">
                         <EditOutlined
-                          onClick={(e) => actionHandle(e, 'edit', item)}
+                          onClick={(e) => actionHandle(e, "edit", item)}
                           style={{ marginRight: 8, fontSize: 14 }}
                         />
                         <DeleteOutlined
-                          onClick={(e) => actionHandle(e, 'del', item)}
+                          onClick={(e) => actionHandle(e, "del", item)}
                           style={{ marginRight: 8, fontSize: 14 }}
                         />
                       </div>
@@ -227,7 +231,9 @@ const CustomOrg = (props) => {
                       onItemSelect={itemSelect}
                       selectedKeys={itemKeys}
                       // loading={item.id === loaingChild}
-                      dataSource={item.userList?.filter((items) => !targetKeys.includes(items.id))}
+                      dataSource={item.userList?.filter(
+                        (items) => !targetKeys.includes(items.id),
+                      )}
                     />
                   </Panel>
                 );
@@ -235,15 +241,17 @@ const CustomOrg = (props) => {
             </Collapse>
           </div>
         )}
-        {mode === 'multiple' && (
+        {mode === "multiple" && (
           <div className="custom-org-page-list">
             <TabList
               onDoubleClickChange={onDoubleClickChange}
               onItemSelect={itemSelect}
               selectedKeys={itemKeys}
-              type={'edit'}
+              type={"edit"}
               onItemAction={onItemAction}
-              dataSource={dataSource.filter((item) => !targetKeys.includes(item.id))}
+              dataSource={dataSource.filter(
+                (item) => !targetKeys.includes(item.id),
+              )}
             />
           </div>
         )}
@@ -254,11 +262,11 @@ const CustomOrg = (props) => {
           visible={actionInfo.visible}
           onClose={() =>
             setAcitonInfo({
-              type: 'add',
+              type: "add",
               visible: false,
             })
           }
-          wrapClassName={'search-assistance-modal'}
+          wrapClassName={"search-assistance-modal"}
         >
           <CustomModal
             actionInfo={actionInfo}

package/SearchAssistanceSelect/src/SearchAssistanceComponent/component/search/index.tsx

@@ -1,7 +1,7 @@
-import React, { useEffect, useRef, useState } from 'react';
-import TabList from '../tabList';
-import { getUsersByConditions, getOrgsByConditions } from '../../api/tabList';
-import { Pagination } from 'dcp-design-react';
+import React, { useEffect, useRef, useState } from "react";
+import TabList from "../tabList";
+import { getUsersByConditions, getOrgsByConditions } from "../../api/tabList";
+import { Pagination } from "dcp-design-react";
 
 const SearchPageIndex = (props) => {
   const {
@@ -27,16 +27,17 @@ const SearchPageIndex = (props) => {
     setItemKeys(selectedKeys || []);
   }, [selectedKeys]);
   const itemSelect = (value, checked) => {
-    if (mode === 'multiple') {
+    if (mode === "multiple") {
       onItemSelect && onItemSelect(value, checked);
       return;
     }
     setItemKeys([value]);
     const field = dataSource.find((item) => item.id === value);
-    onValueChange && onValueChange({ ...field, value: field.id, label: field.userName });
+    onValueChange &&
+      onValueChange({ ...field, value: field.id, label: field.userName });
   };
   const fetchHandleApi = async (params) => {
-    if (type !== 'org') {
+    if (type !== "org") {
       return getUsersByConditions(params);
     }
     return getOrgsByConditions(params);
@@ -74,7 +75,7 @@ const SearchPageIndex = (props) => {
   useEffect(() => {
     if (fetchParams.currentPage) {
       if (fetchParams.name) {
-        getData({ ...fetchParams, systemId: 'OPERATION-001' });
+        getData({ ...fetchParams });
       }
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qmlight/web-platform-components",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "A platform components for React",
   "keywords": [
     "React",