@cloudbase/weda-ui 3.4.9-alpha.1024 → 3.4.9

package/dist/web/components/form/select/request.js

@@ -27,16 +27,16 @@ export const requestFatherRelatedOption = async (params, pageNo, type, searchVal
     if (isEmpty(dataSourceName) || isEmpty(viewId)) {
         return empty;
     }
-    let realWhere;
-    if (type === RequestOptionType.SEARCH) {
-        realWhere = [{ key: primaryField, val: searchValue, rel: 'search' }];
-    }
-    else if (type === RequestOptionType.EQUAL) {
-        realWhere = [{ key: '_id', val: searchValue, rel: 'eq' }];
-    }
-    else {
-        realWhere = [].concat(getWhereList(where));
+    let realWhere = [];
+    if (searchValue) {
+        if (type === RequestOptionType.SEARCH) {
+            realWhere = [{ key: primaryField, val: searchValue, rel: 'search' }];
+        }
+        else if (type === RequestOptionType.EQUAL) {
+            realWhere = [{ key: '_id', val: searchValue, rel: 'eq' }];
+        }
     }
+    realWhere = [{ $and: [...getWhereList(where), ...realWhere] }];
     const data = await callDataSource({
         dataSourceName: dataSourceName,
         viewId: viewId,

package/dist/web/components/form/userOrgSelect/common/fetch-data-service.js

@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
 import { dealUserData, dealOrgData, parseStrToArr } from './utils';
 import { callWedaApi } from '../../../../utils/tcb';
 import { filterStrList } from '../../../../utils/platform';
@@ -43,23 +42,26 @@ export const errorHandle = (error, action) => {
  */
 export const fetchUserListByIds = async (selectUserIds = [], request) => {
     try {
-        let pageNo = 1;
-        const pageSize = 50;
-        let records = [];
-        let total = 9999;
-        for (let index = 0; index < Math.floor(total / pageSize) + 1; index++) {
-            const data = await request('DescribeWedaUsersRuntime', {
-                pageNo: pageNo,
-                pageSize: pageSize,
-                UserIds: selectUserIds || [],
+        const PAGE_SIZE = 50;
+        const total = selectUserIds.length;
+        const records = [];
+        const promises = [];
+        for (let index = 1; index <= Math.ceil(total / PAGE_SIZE); index++) {
+            const start = (index - 1) * PAGE_SIZE;
+            const end = start + PAGE_SIZE;
+            promises.push(request('DescribeWedaUsersRuntime', {
+                UserIds: selectUserIds.slice(start, end),
                 UserType: 'internalUser',
                 NeedPrimaryColumn: true,
                 IsNoRelatedOrgFlag: false,
-            });
-            pageNo = pageNo + 1;
-            if (data === null || data === void 0 ? void 0 : data.UserList) {
-                total = (data === null || data === void 0 ? void 0 : data.Total) || 0;
-                records = records.concat(data === null || data === void 0 ? void 0 : data.UserList);
+            }));
+        }
+        const results = await Promise.all(promises);
+        for (const res of results) {
+            if (res.UserList &&
+                Array.isArray(res.UserList) &&
+                res.UserList.length > 0) {
+                records.push(...res.UserList);
             }
         }
         return records;
@@ -172,70 +174,38 @@ async function fetchUsersByOrgId(params, request) {
         throw errorHandle(error, 'LazyDescribeOrgs');
     }
 }
-/**
- * 获取当前组织列表总数
- */
-// export const fetchOrgTotal = async (request) => {
-//   try {
-//     return await request('DescribeOrgs', {
-//       pageNo: 1,
-//       pageSize: 1,
-//     }).then((data) => {
-//       return data?.Total || 0;
-//     });
-//   } catch (error) {
-//     console.error('错误', error);
-//     throw errorHandle(error, 'fetchOrgTotal');
-//   }
-// };
-/**
- *获取全量组织数据
- */
-// export const DescribeOrgs = async (request) => {
-//   try {
-//     const total = await fetchOrgTotal(request);
-//     let records = [];
-//     if (total > 0) {
-//       const resultPromise = [];
-//       for (let index = 1; index <= Math.ceil(total / 1000); index++) {
-//         const DescribeOrgsByPage =
-//           request('DescribeOrgs', {
-//             pageNo: index,
-//             pageSize: 1000,
-//           }) || {};
-//         resultPromise.push(DescribeOrgsByPage);
-//       }
-//       await Promise.all(resultPromise).then((data) => {
-//         (data || []).map((item) => {
-//           records = records.concat(item?.DataList);
-//         });
-//       });
-//     }
-//     return records;
-//   } catch (error) {
-//     console.error('错误', error);
-//     throw errorHandle(error, 'DescribeOrgs');
-//   }
-// };
 /**
  *获取全量组织数据
  */
 export const DescribeOrgs = async (request) => {
     try {
-        const records = await parallelFetchAll({
-            request,
-            actionName: 'DescribeOrgs',
-            pageNumberParamKey: 'pageNo',
-            pageSizeParamKey: 'pageSize',
-            responseAdapter: (data) => {
-                const { Total, DataList, ...rest } = data;
-                return {
-                    total: Total,
-                    data: DataList,
-                    ...rest,
-                };
-            },
+        const PAGE_SIZE = 1000;
+        const { Total = 0, DataList = [] } = await request('DescribeOrgs', {
+            pageNo: 1,
+            pageSize: PAGE_SIZE,
         });
+        const total = Number(Total);
+        // 一页拉取了全部数据，直接返回
+        if (total <= PAGE_SIZE) {
+            return DataList;
+        }
+        const records = [...DataList];
+        const promises = [];
+        // 从第二页开始，并发拉取所有
+        for (let index = 2; index <= Math.ceil(total / PAGE_SIZE); index++) {
+            promises.push(request('DescribeOrgs', {
+                pageNo: index,
+                pageSize: PAGE_SIZE,
+            }));
+        }
+        const results = await Promise.all(promises);
+        for (const res of results) {
+            if (res.DataList &&
+                Array.isArray(res.DataList) &&
+                res.DataList.length > 0) {
+                records.push(...res.DataList);
+            }
+        }
         return records;
     }
     catch (error) {
@@ -282,422 +252,6 @@ export const fetchViewList = async () => {
     }
     catch (error) {
         console.error('错误', error);
-        throw errorHandle(error, 'DescribeOrgs');
-    }
-};
-const parallelFetchAll = async (params) => {
-    const { request, actionName, data: postData = {}, pageNumberParamKey = 'page_number', pageSizeParamKey = 'page_size', pageSize: PAGE_SIZE = 1000, responseAdapter = (data) => data, } = params;
-    const result = await request(`${actionName}`, {
-        [pageNumberParamKey]: 1,
-        [pageSizeParamKey]: PAGE_SIZE,
-        ...postData,
-    });
-    const { total, data } = responseAdapter(result);
-    const totalCount = Number(total);
-    // 一页拉取了全部数据，直接返回
-    if (totalCount <= PAGE_SIZE) {
-        return data;
-    }
-    const records = [...data];
-    const promises = [];
-    // 从第二页开始，并发拉取所有
-    for (let index = 2; index <= Math.ceil(totalCount / PAGE_SIZE); index++) {
-        promises.push(request(`${actionName}`, {
-            [pageNumberParamKey]: index,
-            [pageSizeParamKey]: PAGE_SIZE,
-            ...postData,
-        }));
-    }
-    const results = await Promise.all(promises);
-    for (const res of results) {
-        if (res.data || res.data.length > 0) {
-            records.push(...res.data);
-        }
-    }
-    return records;
-};
-/**
- * 拉取互联企业列表时，后端不会返回当前的企业，需要前端展示为【本企业】，
- * 前端设置一个特殊的id来标识
- */
-export const CURRENT_CORP = {
-    id: '__current_corp__',
-    name: '本企业',
-};
-export const fetchAllCorps = async (request) => {
-    try {
-        // 注意：GetCorps 接口返回的只有互联企业，前端展示当前企业需要自己显示“本企业”
-        const associatedCorpList = await parallelFetchAll({
-            request,
-            actionName: 'GetCorps',
-        });
-        // Mock
-        // const associatedCorpList = [
-        //   {
-        //     id: 'wwd51f6cad24517ee1',
-        //     name: '微搭学校',
-        //   },
-        //   {
-        //     id: 'ww614741a1d5169bc7',
-        //     name: '微搭教育测试号',
-        //   },
-        // ];
-        // const associatedCorpList = Array(600)
-        //   .fill(1)
-        //   .map((_, index) => ({
-        //     id: `corp_${index}`,
-        //     name: `企业-${index}`,
-        //   }));
-        const allCorpList = [CURRENT_CORP, ...associatedCorpList];
-        return allCorpList.map(({ id, name }) => ({
-            id,
-            name,
-            code: id,
-            parentCode: undefined,
-            corpId: undefined,
-            type: 'corp',
-            selectable: false, // 企业节点不能选择
-        }));
-    }
-    catch (error) {
-        console.error('错误', error);
-        throw errorHandle(error, 'GetCorps');
-    }
-};
-export const fetchAllDepartmentsByParentId = async ({ request, corpId, departmentId, }) => {
-    try {
-        const departList = await parallelFetchAll({
-            request,
-            actionName: 'GetDepartments',
-            data: {
-                corp_id: corpId || undefined,
-                department_id: departmentId || undefined,
-            },
-        });
-        // const departList = [
-        //   {
-        //     id: 'wwd51f6cad24517ee1.1',
-        //     code: 'wwd51f6cad24517ee1.1',
-        //     name: '微搭学校',
-        //     corp_id: 'wwd51f6cad24517ee1',
-        //     parent_code: '!!ROOT',
-        //   },
-        //   {
-        //     id: 'wwd51f6cad24517ee1.2',
-        //     code: 'wwd51f6cad24517ee1.2',
-        //     name: '学工处',
-        //     corp_id: 'wwd51f6cad24517ee1',
-        //     parent_code: 'wwd51f6cad24517ee1.1',
-        //   },
-        //   {
-        //     id: 'wwd51f6cad24517ee1.3',
-        //     code: 'wwd51f6cad24517ee1.3',
-        //     name: '高中部',
-        //     corp_id: 'wwd51f6cad24517ee1',
-        //     parent_code: 'wwd51f6cad24517ee1.1',
-        //   },
-        //   {
-        //     id: 'wwd51f6cad24517ee1.4',
-        //     code: 'wwd51f6cad24517ee1.4',
-        //     name: '初中部',
-        //     corp_id: 'wwd51f6cad24517ee1',
-        //     parent_code: 'wwd51f6cad24517ee1.1',
-        //   },
-        //   {
-        //     id: 'ww614741a1d5169bc7.1',
-        //     code: 'ww614741a1d5169bc7.1',
-        //     name: '微搭教育测试号',
-        //     corp_id: 'ww614741a1d5169bc7',
-        //     parent_code: '!!ROOT',
-        //   },
-        //   {
-        //     id: 'wwd51f6cad24517ee1.-1',
-        //     code: 'wwd51f6cad24517ee1.-1',
-        //     name: '未知部门',
-        //     corp_id: 'wwd51f6cad24517ee1',
-        //     parent_code: 'wwd51f6cad24517ee1.1',
-        //   },
-        //   {
-        //     id: '1',
-        //     code: '1',
-        //     name: '微搭教育局测试',
-        //     corp_id: 'ww1172107f1b5f810f',
-        //     parent_code: '!!ROOT',
-        //   },
-        //   {
-        //     id: '2',
-        //     code: '2',
-        //     name: 'bg1',
-        //     corp_id: 'ww1172107f1b5f810f',
-        //     parent_code: '1',
-        //   },
-        //   {
-        //     id: '3',
-        //     code: '3',
-        //     name: 'dep1',
-        //     corp_id: 'ww1172107f1b5f810f',
-        //     parent_code: '2',
-        //   },
-        //   {
-        //     id: '4',
-        //     code: '4',
-        //     name: 'bg2',
-        //     corp_id: 'ww1172107f1b5f810f',
-        //     parent_code: '1',
-        //   },
-        //   {
-        //     id: '5',
-        //     code: '5',
-        //     name: 'dep2',
-        //     corp_id: 'ww1172107f1b5f810f',
-        //     parent_code: '4',
-        //   },
-        //   {
-        //     id: '6',
-        //     code: '6',
-        //     name: 'ce1',
-        //     corp_id: 'ww1172107f1b5f810f',
-        //     parent_code: '3',
-        //   },
-        //   {
-        //     id: '7',
-        //     code: '7',
-        //     name: 'ce2',
-        //     corp_id: 'ww1172107f1b5f810f',
-        //     parent_code: '5',
-        //   },
-        //   {
-        //     id: '8aac26e7643698ee000b33c3623f7229',
-        //     code: 'csig_gt95',
-        //     name: 'csig',
-        //     parent_code: '!!ROOT',
-        //   },
-        //   {
-        //     id: '27d2eb90643698f6001b7cbb3f1be579',
-        //     code: 'pcg_nv87',
-        //     name: 'pcg',
-        //     parent_code: '!!ROOT',
-        //   },
-        //   {
-        //     id: '27d2eb90643698fb001b7d034ed9c24d',
-        //     code: 'wxg_jnps',
-        //     name: 'wxg',
-        //     parent_code: '!!ROOT',
-        //   },
-        //   {
-        //     id: 'e981bc4764369a0c000511673ed277f2',
-        //     code: 'yun1_uihp',
-        //     name: 'yun-1',
-        //     parent_code: 'csig_gt95',
-        //   },
-        //   {
-        //     id: '5f9d834564369a25000d0337005f16d9',
-        //     code: 'tcbcenter_jucx',
-        //     name: 'tcb-center',
-        //     parent_code: 'yun1_uihp',
-        //   },
-        //   {
-        //     id: 'fc8e646564369a32084690da3915cd0c',
-        //     code: 'weda_rbyy',
-        //     name: 'weda',
-        //     parent_code: 'tcbcenter_jucx',
-        //   },
-        //   {
-        //     id: '34117fc064369a3f0019d82650f6864c',
-        //     code: 'dev1_qej3',
-        //     name: 'dev-1',
-        //     parent_code: 'weda_rbyy',
-        //   },
-        //   {
-        //     id: '0122a58764369a4c0851676d4ee05fdf',
-        //     code: 'dev2_sqpc',
-        //     name: 'dev-2',
-        //     parent_code: 'weda_rbyy',
-        //   },
-        //   {
-        //     id: '73bf2b5f64369a5e0015d78e2d2ad526',
-        //     code: 'news_s39j',
-        //     name: 'news',
-        //     parent_code: 'pcg_nv87',
-        //   },
-        //   {
-        //     id: '37e984a764369a690017cef22413bcb4',
-        //     code: 'yun2_laq4',
-        //     name: 'yun-2',
-        //     parent_code: 'csig_gt95',
-        //   },
-        //   {
-        //     id: '34117fc064369a710019dbfa1750a118',
-        //     code: 'yun3_kw9v',
-        //     name: 'yun-3',
-        //     parent_code: 'csig_gt95',
-        //   },
-        //   {
-        //     id: '2cc84e2664369a82085575d367329143',
-        //     code: 'bigdata_i9ee',
-        //     name: 'bigdata',
-        //     parent_code: 'yun2_laq4',
-        //   },
-        // ];
-        return departList.map(({ id, name, code, parent_code, corp_id }) => ({
-            id,
-            name,
-            code,
-            parentCode: parent_code,
-            corpId: corp_id,
-            type: 'department',
-            selectable: true,
-        }));
-    }
-    catch (error) {
-        console.error('错误', error);
-        throw errorHandle(error, 'GetDepartments');
-    }
-};
-/**
- * 拉取所有部门列表
- * @returns
- */
-export const fetchAllDepartments = async (request) => {
-    try {
-        const departmentList = await fetchAllDepartmentsByParentId({
-            request,
-            // 两个参数都不传，拉取所有的部门列表
-            corpId: undefined,
-            departmentId: undefined,
-        });
-        return departmentList;
-    }
-    catch (error) {
-        console.error('错误', error);
-        throw errorHandle(error, 'GetDepartments');
-    }
-};
-export const fetchUsersByParentId = async ({ request = defaultRequest, corpId, departmentId, pageNumber, pageSize, }) => {
-    try {
-        const { total, data: userList } = await request('GetUsers', {
-            corp_id: corpId,
-            department_id: departmentId,
-            page_number: pageNumber,
-            page_size: pageSize,
-        });
-        // await delay(300);
-        // const userList = [
-        //   {
-        //     id: '1640262947716259842',
-        //     name: 'administrator',
-        //   },
-        //   {
-        //     id: '1645759252615413760',
-        //     name: 'HuangXin',
-        //     department_id: 'ww614741a1d5169bc7.1',
-        //   },
-        //   {
-        //     id: '1645759254695788544',
-        //     name: 'WangQian',
-        //     department_id: 'ww614741a1d5169bc7.1',
-        //   },
-        //   {
-        //     id: '1645759256725831680',
-        //     name: 'ZhaoXiuWen',
-        //     department_id: 'ww614741a1d5169bc7.1',
-        //   },
-        //   {
-        //     id: '1645759258776846336',
-        //     name: 'LinHaoJie',
-        //     department_id: 'ww614741a1d5169bc7.1',
-        //   },
-        //   {
-        //     id: '1646032139150704640',
-        //     name: 'HuMing',
-        //     department_id: '1',
-        //   },
-        //   {
-        //     id: '1646032158993956864',
-        //     name: 'LinHaoJie',
-        //     department_id: '1',
-        //   },
-        //   {
-        //     id: '1646032162441674752',
-        //     name: 'XiaoXiaoZhi',
-        //     department_id: '1',
-        //   },
-        //   {
-        //     id: '1646032165851643904',
-        //     name: 'GuoGuoGuoGuo',
-        //     department_id: '1',
-        //   },
-        //   {
-        //     id: '1646032172134711296',
-        //     name: 'LiNanXi',
-        //     department_id: '1',
-        //   },
-        //   {
-        //     id: '1646032175997665280',
-        //     name: 'myprincessd',
-        //     department_id: '1',
-        //   },
-        //   {
-        //     id: '1646032447440437248',
-        //     name: 'LiNanXi',
-        //     department_id: 'wwd51f6cad24517ee1.1',
-        //   },
-        //   {
-        //     id: '1646032449545977856',
-        //     name: 'LvQiWen',
-        //     department_id: 'wwd51f6cad24517ee1.1',
-        //   },
-        //   {
-        //     id: '1646032451626352640',
-        //     name: 'LeiChao',
-        //     department_id: 'wwd51f6cad24517ee1.1',
-        //   },
-        //   {
-        //     id: '1646032453547343872',
-        //     name: 'LinHaoJie',
-        //     department_id: 'wwd51f6cad24517ee1.1',
-        //   },
-        //   {
-        //     id: '1646062670064140288',
-        //     name: 'LiuGuoWei',
-        //     department_id: 'wwd51f6cad24517ee1.1',
-        //   },
-        //   {
-        //     id: '1646062673885151232',
-        //     name: 'charlessliu',
-        //     department_id: 'wwd51f6cad24517ee1.1',
-        //   },
-        //   {
-        //     id: '1646063286429696000',
-        //     name: 'JiaZhiPeng',
-        //     corp_id: 'wwd51f6cad24517ee1',
-        //     department_id: 'wwd51f6cad24517ee1.1',
-        //   },
-        //   {
-        //     id: '1646063496270725120',
-        //     name: 'HuangXin',
-        //     corp_id: 'wwd51f6cad24517ee1',
-        //     department_id: 'wwd51f6cad24517ee1.1',
-        //   },
-        // ];
-        if (!userList || !Array.isArray(userList) || userList.length <= 0) {
-            return {
-                dataList: [],
-                total: 0,
-            };
-        }
-        const records = userList.map((user) => ({
-            ...user,
-            content: user.name,
-            userId: user.id,
-        }));
-        return {
-            dataList: records,
-            total,
-        };
-    }
-    catch (error) {
-        console.error('错误', error);
-        throw errorHandle(error, 'GetUsers');
+        throw errorHandle(error, 'fetchViewList');
     }
 };