@qmlight/web-platform-components 1.0.2 → 1.0.5

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

@@ -24,7 +24,15 @@ const TreeData = (props) => {
   const [itemKeys, setItemKeys] = useState<any[]>([]);
   const timer = useRef<any>(null);
   useEffect(() => {
-    setItemKeys(selectedKeys || []);
+    if (selectedKeys) {
+      const treeList = getTreeList(treeData.current, []);
+      const newList = treeList
+        .filter((item) => selectedKeys.includes(item.id))
+        .map((item) => item.newId);
+      setItemKeys(newList || []);
+    }
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [selectedKeys]);
   const updateTreeData = (list, key, children) =>
     list.map((node) => {
@@ -90,10 +98,16 @@ const TreeData = (props) => {
       hasChildren: true,
     };
     const { newId, ...newParams } = params;
-    console.log(newParams);
-    const res = await (field.hasChildren
-      ? getTreeDataList({ ...fetchParams, ...newParams })
-      : getOrgPerson({ id: params.id }));
+    const res = await getTreeDataList({ ...fetchParams, ...newParams });
+    const resPer: any = await (type === 'default' && params.id
+      ? getOrgPerson({ id: params.id })
+      : new Promise((resolve) => {
+          resolve({
+            code: 200,
+            data: [],
+            message: '',
+          });
+        }));
 
     if (res.code === 200) {
       if (!params['id']) {
@@ -103,7 +117,9 @@ const TreeData = (props) => {
             ...item,
             checkable: getCheckAble(item),
             parentId: params.id,
+
             newId: item.id,
+
             isLeaf: getIsLeft(field.hasChildren, item.hasChildren),
           };
         });
@@ -125,22 +141,15 @@ const TreeData = (props) => {
           data: list,
         };
       } else {
-        const resPer: any = await (type === 'default' && field.hasChildren
-          ? getOrgPerson({ id: params.id })
-          : new Promise((resolve) => {
-              resolve({
-                code: 200,
-                data: [],
-                message: '',
-              });
-            }));
         const person = resPer?.data?.map((item) => {
           return {
             ...item,
             isLeaf: true,
+            id: item.code,
             parentId: params.id,
-            newId: `${params.id}_${item.id}`,
-            checkable: getCheckAble(item),
+            oldId: item.id,
+            newId: `${params.id}_${item.code}`,
+            checkable: getCheckAble({ ...item, id: item.code }),
           };
         });
 
@@ -149,7 +158,7 @@ const TreeData = (props) => {
             ...item,
             isLeaf: getIsLeft(field.hasChildren, item.hasChildren),
             parentId: params.id,
-            newId: field.hasChildren ? item.id : `${params.id}_${item.id}`,
+            newId: field.hasChildren ? item.id : `${params.id}_${item.code}`,
             checkable: getCheckAble(item),
           };
         });
@@ -215,9 +224,7 @@ const TreeData = (props) => {
   };
   useEffect(() => {
     if (searchTreeRef.current) {
-      console.log(targetKeys);
       const treeList = getTreeList(treeData.current, []);
-      console.log(treeList);
       treeList.forEach((item) => {
         if (item.orgtype === 0) {
           searchTreeRef.current.UPDATE_RECORD(item.id, {
@@ -314,7 +321,7 @@ const TreeData = (props) => {
           }}
           // checkStrictly={true}
           value={itemKeys}
-          checkStrategy={'SHOW_PARENT'}
+          checkStrategy={type === 'default' ? 'SHOW_CHILD' : 'SHOW_PARENT'}
           onCheckChange={(node: any) => {
             clearTimeout(timer.current);
             timer.current = setTimeout(async () => {

package/SearchAssistanceSelect/src/index.tsx

@@ -4,9 +4,32 @@ import {
   getUsersByConditions,
   getOrgsByConditions,
 } from '../../SearchAssistanceSelect/src/SearchAssistanceComponent/api/tabList';
+const items = [
+  {
+    label: '常用组',
+    key: '1',
+  },
+  // {
+  //   label: '同部门',
+  //   key: '2',
+  // },
+  // {
+  //   label: '我的下属',
+  //   key: '3',
+  // },
+  {
+    label: '组织结构',
+    key: '4',
+    type: 'default',
+  },
+  {
+    label: '自定义组',
+    key: '7',
+    type: 'customOrg',
+  },
+];
 const SearchAssistanceSelect = (props) => {
-  const { value, onChange, option, $$form, modalVisible, type, mode, items, title, customData } =
-    props;
+  const { value, onChange, option, $$form, modalVisible, type, mode, title, customData } = props;
   const getTypeCondtions = (type) => {
     switch (type) {
       case 'org':
@@ -28,7 +51,7 @@ const SearchAssistanceSelect = (props) => {
           },
           {
             label: '按列表',
-            key: '5',
+            key: '9',
             type: 'org',
           },
         ];

package/package.json

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