@qmlight/web-platform-components 1.0.6 → 1.0.8

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) && (
@@ -208,7 +210,7 @@ const SearchAssistanceSelectSelect: React.FC<SeachProps> = ({
         //   console.log(dataValue.current);
         //   setStatus(!isEmpty(values));
         // }}
-        // options={options}
+        options={options}
         value={isEmpty(value) ? (mode ? [] : undefined) : value}
         loading={fetching}
         onSelect={(value: any) => {
@@ -236,24 +238,30 @@ const SearchAssistanceSelectSelect: React.FC<SeachProps> = ({
           onDataChange && onDataChange(dataValue.current);
           setValue(dataValue.current);
         }}
-        onFocus={() => {
-          setStatus(true);
+        onFocus={(e) => {
+          e.stopPropagation();
+          SelectRef.current.blur();
+
+          if (option?.readOnly || option?.disabled || $$form?.props?.formType === 'onlyShow') {
+            return;
+          }
+          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/searchModal.tsx

@@ -33,6 +33,7 @@ const SearchAssistanceModel: React.FC<ModalProps> = (props) => {
   };
   useEffect(() => {
     if (isEmpty(data)) {
+      setNewData(mode ? [] : {});
       return;
     }
     if (mode === 'multiple') {

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.6",
+  "version": "1.0.8",
   "description": "A platform components for React",
   "keywords": [
     "React",