@qmlight/web-platform-components 1.0.5 → 1.0.7

package/SearchAssistanceSelect/src/SearchAssistanceComponent/api/tabList/index.js

@@ -11,7 +11,7 @@ export const getOrgsByConditions = (params) => {
   return axios.post(`${SERVER.QFC_BASE}/lowcode/getOrgsByConditions`, params);
 };
 export const recentUserPage = (params) => {
-  return axios.post(`${SERVER.FT_FLOAT}/customGroup/getCustomGroup`, params);
+  return axios.post(`${SERVER.QFC_BASE}/lowcode/getOuterCustomGroup`, params);
 };
 
 export const getUsersByConditions = (params) => {

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

@@ -18,6 +18,7 @@ const RecentlyPageIndex = React.forwardRef((props: any, ref) => {
     actionHandle,
   } = props;
   const [fetchParams, setFetchParams] = useState<any>({});
+  const [dataSource, setDataSource] = useState<any[]>([]);
   const treeData = useRef<any[]>([]);
   const searchTreeRef = useRef<any>();
   const [itemKeys, setItemKeys] = useState<any[]>([]);
@@ -33,18 +34,7 @@ const RecentlyPageIndex = React.forwardRef((props: any, ref) => {
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [selectedKeys]);
-  const onRefreshChange = (id?) => {
-    if (id) {
-      setFetchParams({ newId: id, refesh: true });
-      return;
-    }
-    setFetchParams({});
-  };
-  useImperativeHandle(ref, () => {
-    return {
-      onRefresh: onRefreshChange,
-    };
-  });
+
   const updateTreeData = (list, parentId) => {
     return list.map((node) => {
       const newNode = {
@@ -120,12 +110,13 @@ const RecentlyPageIndex = React.forwardRef((props: any, ref) => {
       )
     );
   };
-
-  const getData = async (params) => {
-    params.id = params.newId;
-    const treeList = getTreeList(treeData.current, []);
-    const { newId, refesh, ...newParams } = params;
+  useEffect(() => {
+    getData();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+  const getData = async () => {
     const res = await recentUserPage({ orgCode: 'root' });
+
     if (res.code === 200) {
       treeData.current = updateTreeData(res.data?.childVOList, 'root');
       const treeList = getTreeList(treeData.current, []);
@@ -139,19 +130,8 @@ const RecentlyPageIndex = React.forwardRef((props: any, ref) => {
             };
           })
         );
-      if (refesh) {
-        return {
-          ...res,
-          data: treeData.current,
-        };
-      }
-      return {
-        ...res,
-        data: treeData.current,
-      };
+      setDataSource(treeData.current);
     }
-    onRefreshChange(false);
-    return res;
   };
   const getTreeList = (treeData, list) => {
     treeData.forEach((item) => {
@@ -205,10 +185,11 @@ const RecentlyPageIndex = React.forwardRef((props: any, ref) => {
           showCollapse={false}
           // asyncLoad={true}
           multiple={mode === 'multiple'}
-          fetch={{
-            api: getData,
-            params: fetchParams,
-          }}
+          dataSource={dataSource}
+          // fetch={{
+          //   api: getData,
+          //   params: fetchParams,
+          // }}
           // checkStrictly={true}
           value={itemKeys}
           checkStrategy={'SHOW_CHILD'}

package/SearchAssistanceSelect/src/SearchAssistanceComponent/index.tsx

@@ -47,12 +47,13 @@ const SearchAssistanceSelectSelect: React.FC<SeachProps> = ({
   const fetchRef = useRef(0);
   const [visible, setVisible] = useState<boolean>(false);
   const dataValue = useRef<any>(mode ? [] : {});
-  const [status, setStatus] = useState(false);
+  const status = useRef(false);
   const pages = useRef<any>(0);
   const currentPage = useRef<number>(1);
   const [loading, setLoading] = useState(false);
   const [searchValue, setSearchValue] = useState('');
   const searchData = useRef([]);
+  const SelectRef = useRef<any>();
   useEffect(() => {
     setValue(data);
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -137,38 +138,39 @@ const SearchAssistanceSelectSelect: React.FC<SeachProps> = ({
     <div className="search-select-page">
       <Select
         // mode="tags"
+        ref={SelectRef}
         mode={mode}
         size="middle"
-        showSearch
+        // showSearch
         showArrow
         getPopupContainer={(trigger) => trigger}
-        searchValue={searchValue}
+        // searchValue={searchValue}
         disabled={option?.readOnly || option?.disabled || $$form?.props?.formType === 'onlyShow'}
-        onPopupScroll={(event: any) => {
-          if (type !== 'org') {
-            return;
-          }
-          const nodeClient = event.target?.firstChild?.clientHeight || 0;
-          const scrollHeight = event.target.scrollTop;
-          if (
-            nodeClient - scrollHeight - 256 < 10 &&
-            currentPage.current * 20 <= pages.current &&
-            !loading
-          ) {
-            setLoading(true);
-            currentPage.current++;
-            debounceFetcher({ name: searchValue });
-          }
-          // console.log(event.target.scrollTop);
-        }}
-        dropdownRender={(menu) => {
-          return (
-            <>
-              {menu}
-              {loading ? <Spin tip="加载中..." /> : <></>}
-            </>
-          );
-        }}
+        // onPopupScroll={(event: any) => {
+        //   if (type !== 'org') {
+        //     return;
+        //   }
+        //   const nodeClient = event.target?.firstChild?.clientHeight || 0;
+        //   const scrollHeight = event.target.scrollTop;
+        //   if (
+        //     nodeClient - scrollHeight - 256 < 10 &&
+        //     currentPage.current * 20 <= pages.current &&
+        //     !loading
+        //   ) {
+        //     setLoading(true);
+        //     currentPage.current++;
+        //     debounceFetcher({ name: searchValue });
+        //   }
+        //   // console.log(event.target.scrollTop);
+        // }}
+        // dropdownRender={(menu) => {
+        //   return (
+        //     <>
+        //       {menu}
+        //       {loading ? <Spin tip="加载中..." /> : <></>}
+        //     </>
+        //   );
+        // }}
         suffixIcon={
           <>
             {/* {!isEmpty(value) && (
@@ -211,49 +213,55 @@ const SearchAssistanceSelectSelect: React.FC<SeachProps> = ({
         // options={options}
         value={isEmpty(value) ? (mode ? [] : undefined) : value}
         loading={fetching}
-        onSelect={(value: any) => {
-          const field = options.find((item) => item.value === value?.value);
-          if (!mode) {
-            dataValue.current = field;
-            onDataChange && onDataChange(dataValue.current);
-            setValue(dataValue.current);
-            return;
-          }
-          const oldField = dataValue.current.find((item) => item.value === value.value);
-          if (!oldField && field) {
-            dataValue.current = dataValue.current.concat([field]);
-            onDataChange && onDataChange(dataValue.current);
-            setValue(dataValue.current);
-          }
-        }}
-        onDeselect={(value: any) => {
-          if (!mode) {
-            dataValue.current = {};
-            setValue(dataValue.current);
+        // onSelect={(value: any) => {
+        //   const field = options.find((item) => item.value === value?.value);
+        //   if (!mode) {
+        //     dataValue.current = field;
+        //     onDataChange && onDataChange(dataValue.current);
+        //     setValue(dataValue.current);
+        //     return;
+        //   }
+        //   const oldField = dataValue.current.find((item) => item.value === value.value);
+        //   if (!oldField && field) {
+        //     dataValue.current = dataValue.current.concat([field]);
+        //     onDataChange && onDataChange(dataValue.current);
+        //     setValue(dataValue.current);
+        //   }
+        // }}
+        // onDeselect={(value: any) => {
+        //   if (!mode) {
+        //     dataValue.current = {};
+        //     setValue(dataValue.current);
+        //     return;
+        //   }
+        //   dataValue.current = dataValue.current.filter((item) => item.value !== value.value);
+        //   onDataChange && onDataChange(dataValue.current);
+        //   setValue(dataValue.current);
+        // }}
+        onFocus={(e) => {
+          e.stopPropagation();
+          SelectRef.current.blur();
+
+          if (option?.readOnly || option?.disabled || $$form?.props?.formType === 'onlyShow') {
             return;
           }
-          dataValue.current = dataValue.current.filter((item) => item.value !== value.value);
-          onDataChange && onDataChange(dataValue.current);
-          setValue(dataValue.current);
-        }}
-        onFocus={() => {
-          setStatus(true);
+          setVisible(true);
+          status.current = true;
         }}
         onBlur={() => {
-          setStatus(false);
+          SelectRef.current.blur();
         }}
         notFoundContent={fetching ? <Spin size="small" /> : null}
-        onSearch={(value) => {
-          if (type === 'doc' || type === 'customNode') {
-            return;
-          }
-          if (type === 'org') {
-            currentPage.current = 1;
-          }
-          setSearchValue(value);
-
-          debounceFetcher({ name: value });
-        }}
+        // onSearch={(value) => {
+        //   // if (type === 'doc' || type === 'customNode') {
+        //   //   return;
+        //   // }
+        //   // if (type === 'org') {
+        //   //   currentPage.current = 1;
+        //   // }
+        //   // setSearchValue(value);
+        //   // debounceFetcher({ name: value });
+        // }}
       >
         {options.map((item) => {
           return (
@@ -286,7 +294,9 @@ const SearchAssistanceSelectSelect: React.FC<SeachProps> = ({
         items={items}
         type={type}
         onChange={onModalDataChange}
-        onClose={() => setVisible(false)}
+        onClose={() => {
+          setVisible(false);
+        }}
         visible={visible}
         title={title || '人力资源'}
         customData={customData}

package/SearchAssistanceSelect/src/SearchAssistanceComponent/searchTabs.tsx

@@ -50,8 +50,10 @@ const SearchTabs = (props) => {
 
   useEffect(() => {
     if (items?.length) {
-      setActiveKey(items[0]?.key);
-      prevActiveKey.current = items[0]?.key;
+      const { key, type } = items[0] || {};
+      setActiveKey(key);
+      prevActiveKey.current = key;
+      setType(type);
       setItemsList(items);
     }
   }, [items]);

package/SearchAssistanceSelect/src/SearchAssistanceComponent/transfer/index.tsx

@@ -65,7 +65,7 @@ const TransferIndex = ({
     console.log(list);
     console.log(transferDataSource);
     const dataList: any[] = [];
-    if (lists.length) {
+    if (lists.length && type !== 'org') {
       const newList = list.filter((item) => !lists.includes(item));
       const perList = transferDataSource.filter((item) => newList.includes(item.id));
       const newData = unionBy(data.concat(perList), 'id');

package/SearchAssistanceSelect/src/SearchAssistanceComponent/treeData/index.tsx

@@ -69,25 +69,17 @@ const TreeData = (props) => {
   };
   const getCheckAble = (item) => {
     if (type === 'default' || type === 'org') {
-      return !(targetKeys.includes(item.id) || targetKeys.includes(item.parentId));
+      return !targetKeys.includes(item.id);
     }
     if (type === 'customOrg') {
-      return (
-        !item.orgtype &&
-        item.orgtype !== 0 &&
-        !(targetKeys.includes(item.id) || targetKeys.includes(item.parentId))
-      );
+      return !item.orgtype && item.orgtype !== 0 && !targetKeys.includes(item.id);
     }
     if (type === 'doc') {
-      return !(targetKeys.includes(item.id) || targetKeys.includes(item.parentId));
+      return !targetKeys.includes(item.id);
     }
     return (
       item.orgtype === 2 &&
-      !(
-        targetKeys.includes(item.id) ||
-        targetKeys.includes(item.parentId) ||
-        targetKeys.includes(`${item.parentId}_${item.id}`)
-      )
+      !(targetKeys.includes(item.id) || targetKeys.includes(`${item.parentId}_${item.id}`))
     );
   };
 

package/package.json

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