@cloudbase/weda-ui 3.23.1 → 3.23.3

package/dist/web/components/wd-table/components/index.js

@@ -1,7 +1,7 @@
 import { Pagination } from './Pagination';
 import { BaseTable as Table } from './Table';
 import { SearchBox } from './SearchBox';
-import { ExportFileModal, exportHandle, exportHandleByApi, } from './ExportFileModalByApi';
+import { ExportFileModal, exportHandle, exportHandleByApi } from './ExportFileModalByApi';
 import { ImportFileModal, importHandleByApi } from './ImportFileModalByApi';
 import { InOrOutRecordModal } from './InOrOutRecordModal';
 import { deleteRecord } from './deleteModal';

package/dist/web/components/wd-table/hooks/useTableData.js

@@ -28,22 +28,31 @@ export const useTableData = ({ dataSourceAPI, connectorMethod, query, events, is
                     canCallQuerySuccess = false;
                     if (Object.keys(select).length !== 0) {
                         canCallQuerySuccess = true;
-                        data = await dataSourceAPI.getRecordListV2(query, { swr });
-                        data.records = data.records || [];
+                        const result = await dataSourceAPI.getRecordListV2(query, { swr });
+                        data = {
+                            ...data,
+                            total: result.total,
+                            records: result.records || [],
+                        };
                     }
                 }
                 else {
                     // 不是新添加的表格，用旧方法查询
-                    data = await dataSourceAPI.getRecordList(query, { swr });
-                    data.records = data.records || [];
+                    const result = await dataSourceAPI.getRecordList(query, { swr });
+                    data = {
+                        ...data,
+                        total: result.total,
+                        records: result.records || [],
+                    };
                 }
                 setIsError(false);
             }
             else if (connectorMethod === null || connectorMethod === void 0 ? void 0 : connectorMethod.name) {
                 data = await dataSourceAPI.getConnect(connectorMethod === null || connectorMethod === void 0 ? void 0 : connectorMethod.name, query, swr);
             }
-            // 合并多次请求结果再赋值表格
-            if (fetchVersion !== fetchRef.current.version)
+            // 分页器查询时合并多次请求结果再赋值表格
+            // H5端是滚动加载更多，不合并请求
+            if (fetchVersion !== fetchRef.current.version && !isH5)
                 return;
             const records = (data === null || data === void 0 ? void 0 : data.records) || [];
             setTotal(data === null || data === void 0 ? void 0 : data.total);

package/dist/web/components/wd-table/table-with-form.d.ts

@@ -0,0 +1,9 @@
+import React from 'react';
+import { BaseTableComProps } from './components';
+export interface TableWithFormProps extends BaseTableComProps {
+    isInformContainer?: boolean;
+}
+export declare const TableWithForm: React.ForwardRefExoticComponent<Pick<{
+    [key: string]: any;
+    initialValues?: any;
+}, string | number> & React.RefAttributes<unknown>>;

package/dist/web/components/wd-table/table-with-form.js

@@ -0,0 +1,32 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { forwardRef } from 'react';
+import { useDeepCompareEffect } from '@react-hookz/web';
+import { Table } from './components';
+// eslint-disable-next-line tree-shaking/no-side-effects-in-initialization
+import { withFormContainer } from '../wd-form/hoc/form-container-decorator';
+import { useFormField } from '../wd-form/contexts/form-field-context';
+import { useFormFieldObj } from '../wd-form/contexts/form-field-obj-context';
+import { useSetWidgetApi } from '../../utils/widget-api/use-set-widget-api';
+export const TableWithForm = withFormContainer(forwardRef(function TableComp(tableProps, ref) {
+    const { records = [] } = tableProps;
+    const formField = useFormField();
+    const { formFieldsValue = [], setFieldValue, setFormFieldsValue } = formField || {};
+    const formFieldObjsContext = useFormFieldObj();
+    useDeepCompareEffect(() => {
+        const value = [...records];
+        if (tableProps.isInformContainer) {
+            if (setFieldValue) {
+                // 在表单容器内，表格作为子表单，结合嵌套组件使用，通过顶层表单容器实现值管理
+                const parentNamePath = (formFieldObjsContext === null || formFieldObjsContext === void 0 ? void 0 : formFieldObjsContext.isChildField) ? formFieldObjsContext === null || formFieldObjsContext === void 0 ? void 0 : formFieldObjsContext.namePath : [];
+                setFieldValue({ namePath: parentNamePath, value });
+            }
+        }
+        else if (setFormFieldsValue) {
+            setFormFieldsValue(value);
+        }
+    }, [formFieldObjsContext === null || formFieldObjsContext === void 0 ? void 0 : formFieldObjsContext.namePath, records, tableProps.isInformContainer, formFieldObjsContext === null || formFieldObjsContext === void 0 ? void 0 : formFieldObjsContext.isChildField]);
+    useSetWidgetApi(() => ({
+        value: formFieldsValue,
+    }), [formFieldsValue], ref);
+    return _jsx(Table, { ...tableProps });
+}));

package/dist/web/components/wd-table/wd-table.d.ts

@@ -10,10 +10,7 @@ export declare const GlobalButton: React.NamedExoticComponent<{
     classPrefix: string;
     slots: any;
 }>;
-export declare const WdTable: React.ForwardRefExoticComponent<Pick<{
-    [key: string]: any;
-    initialValues?: any;
-}, string | number> & React.RefAttributes<unknown>>;
+export declare const WdTable: React.ForwardRefExoticComponent<WdTableProps & React.RefAttributes<TCompRef>>;
 export interface WdTableProps extends CommonPropsType, DataType {
     isMock?: boolean;
     multipleSelect: boolean;
@@ -22,3 +19,21 @@ export interface WdTableProps extends CommonPropsType, DataType {
     __innerSlot?: React.ReactNode;
     initialValues?: [];
 }
+type TCompRef = {
+    import: () => void;
+    exportOptionalMode: () => void;
+    export: () => void;
+    deleteSelected: () => void;
+    refresh: () => void;
+    refreshKeepPage: () => void;
+    deleteOne: (params: {
+        id: string;
+    }) => void;
+    openOperationDialog: () => void;
+    records?: any[];
+    total: number;
+    pageNo: number;
+    pageSize: number;
+    selectedRecords: any[];
+};
+export {};

package/dist/web/components/wd-table/wd-table.js

@@ -2,25 +2,21 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 /* eslint-disable max-lines */
 import { useRef, useEffect, useState, useMemo, forwardRef, memo } from 'react';
 import { ConfigProvider } from 'tea-component';
-import { useDeepCompareEffect } from '@react-hookz/web';
-import { Table, ExportFileModal, ImportFileModal, InOrOutRecordModal, deleteRecord, importHandleByApi, exportHandleByApi, exportHandle, FilterFieldsPanel, ToolBar, } from './components';
+import { ExportFileModal, ImportFileModal, InOrOutRecordModal, deleteRecord, importHandleByApi, exportHandleByApi, exportHandle, FilterFieldsPanel, ToolBar, } from './components';
+import { TableWithForm } from './table-with-form';
 import classNames from '../../utils/classnames';
 import { useConfig } from '../../utils/config-context';
 import { DataSource } from '../../utils/datasource';
 import { CELL_CUSTOM_OPTION, emptyArray } from '../../utils/constant';
 import { useEnumContext } from '../../utils/hooks/context';
 import { EnumHoc } from '../../utils/hooks/EnumHoc';
-import { usePlatform, isInIde } from '../../utils/platform';
+import { usePlatform } from '../../utils/platform';
 import { convertWhere } from '../../utils/getModelParams';
 import isObjectEqual from '../../utils/isObjectEqual';
 import { useAuthFields } from './hooks/useAuthFields';
 import { useTableData } from './hooks/useTableData';
 import { useViewFields } from './hooks/useViewFields';
 import { useQueryParams } from './hooks/useQueryParams';
-// eslint-disable-next-line tree-shaking/no-side-effects-in-initialization
-import { withFormContainer } from '../wd-form/hoc/form-container-decorator';
-import { useFormField } from '../wd-form/contexts/form-field-context';
-import { useFormFieldObj } from '../wd-form/contexts/form-field-obj-context';
 import { WdCompError } from '../../utils/error';
 import { getSlots, getFilterFields, getSelectedView, getSortColumns, mapTableDataWithView, checkSupport, DataSourceType, getRecordKey, getCurrentPageData, } from './utils';
 import { Mock } from './mock';
@@ -38,9 +34,8 @@ export const TableOption = function TableOption({ slots, ...props }) {
 export const GlobalButton = memo(function GlobalButtonDom({ classPrefix, slots }) {
     return _jsx("div", { className: `${classPrefix}-global-btn`, children: slotRender(slots) });
 });
-export const WdTable = withFormContainer(
 // eslint-disable-next-line complexity
-forwardRef(function TableComp(tableProps, ref) {
+export const WdTable = forwardRef(function TableComp(tableProps, ref) {
     const { className, style, dataSourceType = 'data-model', bindConnectMetadata = {
         datasource: { id: '', name: '', title: '' },
     }, // APImock数据
@@ -81,9 +76,6 @@ forwardRef(function TableComp(tableProps, ref) {
     sorter, // 排序规则
     __innerSlot, enableRelationTag = true, // 关联关系字段是否开启关联标签
     enableBottomTipSlot = false, row__bottom__slot, ...props } = tableProps;
-    const formField = useFormField();
-    const { formFieldsValue = [], setFieldValue, setFormFieldsValue } = formField || {};
-    const formFieldObjsContext = useFormFieldObj();
     const wList = convertWhere(props, supportManyRelated); // 查询参数
     const { classPrefix } = useConfig();
     const platform = usePlatform();
@@ -209,7 +201,7 @@ forwardRef(function TableComp(tableProps, ref) {
         setColumns([]);
     }, [columnSets]);
     const columns = useMemo(() => {
-        if (isMock || (isInIde() && isNoDataSourceBind)) {
+        if (isMock) {
             return Mock.columns;
         }
         if (isNoDataSourceBind || (!isExpression && fieldsLoading)) {
@@ -341,7 +333,7 @@ forwardRef(function TableComp(tableProps, ref) {
     const isTableLoading = getLoadingStatus();
     // 表格数据
     const mapTableData = () => {
-        if (isMock || (isInIde() && isNoDataSourceBind)) {
+        if (isMock) {
             return Mock.records;
         }
         // 绑定表达式则直接返回表达式的值
@@ -364,15 +356,6 @@ forwardRef(function TableComp(tableProps, ref) {
         return tableData;
     };
     const tableRecords = mapTableData();
-    useDeepCompareEffect(() => {
-        const value = [...tableRecords];
-        if (setFieldValue && (formFieldObjsContext === null || formFieldObjsContext === void 0 ? void 0 : formFieldObjsContext.namePath)) {
-            setFieldValue({ namePath: formFieldObjsContext === null || formFieldObjsContext === void 0 ? void 0 : formFieldObjsContext.namePath, value });
-        }
-        else if (setFormFieldsValue) {
-            setFormFieldsValue(value);
-        }
-    }, [formFieldObjsContext === null || formFieldObjsContext === void 0 ? void 0 : formFieldObjsContext.namePath, tableRecords]);
     // 总数
     let total = isExpression ? tableRecords === null || tableRecords === void 0 ? void 0 : tableRecords.length : tableTotal;
     if (enableTotal && isExpression && !isNaN(parseInt(`${_total}`))) {
@@ -591,7 +574,6 @@ forwardRef(function TableComp(tableProps, ref) {
         filter: supportManyRelated ? query.filter : query === null || query === void 0 ? void 0 : query.where,
         dataSourceVersion: supportManyRelated ? 'v2' : 'v1',
         filterConfig,
-        value: formFieldsValue,
     }), 
     // eslint-disable-next-line react-hooks/exhaustive-deps
     [
@@ -618,7 +600,6 @@ forwardRef(function TableComp(tableProps, ref) {
         query === null || query === void 0 ? void 0 : query.filter,
         supportManyRelated,
         filterConfig,
-        formFieldsValue,
     ], ref);
     // 表格更改上下文数据
     // 移动端和自定义APIs场景不支持导入功能，监听变化存到表格上下文中
@@ -756,7 +737,7 @@ forwardRef(function TableComp(tableProps, ref) {
                                                 setOpenMobileFilter(true);
                                             }, enableRefreshBtn: enableRefreshBtn, enableTableHeightSizeBtn: enableTableHeightSizeBtn, enablePagination: enablePagination }) }))] })), isH5 && (enablePagination || enableRefreshBtn || enableTableHeightSizeBtn || hasFilterButton) && (_jsx(ToolBar, { hasFilterButton: hasFilterButton, total: total, refreshTable: onRefreshBtnClick, setTableHightSize: setTableHightSize, currentSize: tableHightSize, setOpenMobileFilter: () => {
                                     setOpenMobileFilter(true);
-                                }, enableRefreshBtn: enableRefreshBtn, enableTableHeightSizeBtn: enableTableHeightSizeBtn, enablePagination: enablePagination })), _jsx(Table, { events: events, emptyText: emptyText, isH5: isH5, isNoDataSourceBind: isNoDataSourceBind, className: tableClassList, recordKey: recordKey, currentSize: tableHightSize, defaultPageIndex: defaultPageIndex, defaultPageSize: defaultPageSize, sortColumns: sortColumns, enablePagination: !isH5 && enablePagination, columnSelectType: columnSelectType, columns: visibleColumns, setColumns: setColumns, records: tableRecords, sort: queryParams.sort, selectedKeys: selectedKeys, onSelectChange: onSelectChange, isLoading: isTableLoading, rowColor: rowColor, queryParams: queryParams, total: total, onQueryChange: onQueryChange, rowClick: rowClick, cellClick: cellClick, isError: errorStatus, errorObj: errorMsg, __innerSlot: __innerSlot, bottomTip: row__bottom__slot, enableBottomTipSlot: enableBottomTipSlot }), isH5 && enableGlobalButton && !isNoDataSourceBind && (_jsx("div", { className: `${classPrefix}-h5-table-wrap-footer`, children: _jsx(GlobalButton, { classPrefix: classPrefix, slots: slots === null || slots === void 0 ? void 0 : slots.globalButton }) }))] }), _jsx(ImportFileModal, { columnSets: columnSets, dbName: dbName, datasourceTitle: datasourceTitle, fields: fields, setIsImportFileModalByApiVisible: setIsImportFileModalByApiVisible, isImportFileModalByApiVisible: isImportFileModalByApiVisible, setIsInOrOutRecordModalVisible: setIsInOrOutRecordModalVisible, refresh: refreshTable, supportManyRelated: supportManyRelated }), _jsx(ExportFileModal, { whereList: wList, fields: fields, columns: mapColumKey(columns), isExportFileModalByApiVisible: isExportFileModalByApiVisible, selectedKeys: selectedKeys, dbName: dbName, query: query, setIsExportFileModalByApiVisible: setIsExportFileModalByApiVisible, setIsInOrOutRecordModalVisible: setIsInOrOutRecordModalVisible, supportManyRelated: supportManyRelated }), _jsx(InOrOutRecordModal, { dbName: dbName, isInOrOutRecordModalVisible: isInOrOutRecordModalVisible, setIsImportFileModalByApiVisible: setIsImportFileModalByApiVisible, setIsExportFileModalByApiVisible: setIsExportFileModalByApiVisible, setIsInOrOutRecordModalVisible: setIsInOrOutRecordModalVisible }), isH5 && (_jsx(Modal, { overlayClassName: `${classPrefix}-h5-table-overlay`, className: `${classPrefix}-h5-table-option-modal-wrap`, disableCloseIcon: true, title: "\u64CD\u4F5C", visible: isMobileOptionVisible, outerRef: modalRef, events: {
+                                }, enableRefreshBtn: enableRefreshBtn, enableTableHeightSizeBtn: enableTableHeightSizeBtn, enablePagination: enablePagination })), _jsx(TableWithForm, { ref: ref, events: events, emptyText: emptyText, isH5: isH5, isNoDataSourceBind: isNoDataSourceBind, className: tableClassList, recordKey: recordKey, currentSize: tableHightSize, defaultPageIndex: defaultPageIndex, defaultPageSize: defaultPageSize, sortColumns: sortColumns, enablePagination: !isH5 && enablePagination, columnSelectType: columnSelectType, columns: visibleColumns, setColumns: setColumns, records: tableRecords, sort: queryParams.sort, selectedKeys: selectedKeys, onSelectChange: onSelectChange, isLoading: isTableLoading, rowColor: rowColor, queryParams: queryParams, total: total, onQueryChange: onQueryChange, rowClick: rowClick, cellClick: cellClick, isError: errorStatus, errorObj: errorMsg, __innerSlot: __innerSlot, bottomTip: row__bottom__slot, enableBottomTipSlot: enableBottomTipSlot }), isH5 && enableGlobalButton && !isNoDataSourceBind && (_jsx("div", { className: `${classPrefix}-h5-table-wrap-footer`, children: _jsx(GlobalButton, { classPrefix: classPrefix, slots: slots === null || slots === void 0 ? void 0 : slots.globalButton }) }))] }), _jsx(ImportFileModal, { columnSets: columnSets, dbName: dbName, datasourceTitle: datasourceTitle, fields: fields, setIsImportFileModalByApiVisible: setIsImportFileModalByApiVisible, isImportFileModalByApiVisible: isImportFileModalByApiVisible, setIsInOrOutRecordModalVisible: setIsInOrOutRecordModalVisible, refresh: refreshTable, supportManyRelated: supportManyRelated }), _jsx(ExportFileModal, { whereList: wList, fields: fields, columns: mapColumKey(columns), isExportFileModalByApiVisible: isExportFileModalByApiVisible, selectedKeys: selectedKeys, dbName: dbName, query: query, setIsExportFileModalByApiVisible: setIsExportFileModalByApiVisible, setIsInOrOutRecordModalVisible: setIsInOrOutRecordModalVisible, supportManyRelated: supportManyRelated }), _jsx(InOrOutRecordModal, { dbName: dbName, isInOrOutRecordModalVisible: isInOrOutRecordModalVisible, setIsImportFileModalByApiVisible: setIsImportFileModalByApiVisible, setIsExportFileModalByApiVisible: setIsExportFileModalByApiVisible, setIsInOrOutRecordModalVisible: setIsInOrOutRecordModalVisible }), isH5 && (_jsx(Modal, { overlayClassName: `${classPrefix}-h5-table-overlay`, className: `${classPrefix}-h5-table-option-modal-wrap`, disableCloseIcon: true, title: "\u64CD\u4F5C", visible: isMobileOptionVisible, outerRef: modalRef, events: {
                             close: () => {
                                 setIsMobileOptionVisible(false);
                             },
@@ -765,4 +746,4 @@ forwardRef(function TableComp(tableProps, ref) {
                                     setIsMobileOptionVisible(false);
                                 },
                             } }) }))] }) }) }));
-}));
+});

package/dist/web/components/wd-tabs/tabs-h5.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 import { WdTabsProps } from './tabs';
 export declare const WdTabsH5: ({ isMultipleSlot, tabsDatas, selectedIndex, ...restProps }: WdTabsProps) => JSX.Element;

package/dist/web/components/wd-tabs/tabs-pc.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 import { WdTabsProps } from './tabs';
 export declare const WdTabsPc: ({ isMultipleSlot, tabsDatas, selectedIndex, ...restProps }: WdTabsProps) => JSX.Element;

package/dist/web/components/wd-tabs/tabs.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import type { CommonPropsType } from '../../types';
 export declare const WdTabs: (props: WdTabsProps) => JSX.Element;
 export interface WdTabsProps extends CommonPropsType {

package/dist/web/components/wd-tag/_design.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import type { CommonPropsType } from '../../types';
 import type { DataType } from '../../../configs/components/wd-layout';
 export interface WdTagProps extends CommonPropsType, DataType {

package/dist/web/components/wd-tree/utils.d.ts

@@ -102,18 +102,18 @@ declare const initData: ({ data, parent, showIcon, expendIcon, foldIcon, leafIco
     parent?: TreeNode;
     iconShow?: string;
     pos?: string;
+    value: string;
     label: string;
+    disabled: boolean;
     children: {
-        label: string;
-        children: any[];
         value: string;
+        label: string;
         disabled: boolean;
+        children: any[];
         foldIcon: string;
         expendIcon: string;
         leafIcon: string;
     }[];
-    value: string;
-    disabled: boolean;
     foldIcon: string;
     expendIcon: string;
     leafIcon: string;
@@ -146,37 +146,36 @@ declare const getTreeInfo: (params: IFindNodeParams, checkable: boolean) => {
     checkedState?: boolean;
     selectedState?: boolean;
     expandedtate?: boolean;
-    expanded: string[];
     event: string;
-    checked: string[];
-    selected: string[];
     currentNode: {
         data?: {
-            label: string;
-            children: any[];
             value: string;
+            label: string;
             disabled: boolean;
+            children: any[];
             foldIcon: string;
             expendIcon: string;
             leafIcon: string;
         }[];
     };
+    selected: string[];
     selectedPositions: string[];
     selectedNodes: {
-        label: string;
-        children: any[];
         value: string;
+        label: string;
         disabled: boolean;
+        children: any[];
         foldIcon: string;
         expendIcon: string;
         leafIcon: string;
     }[];
+    expanded: string[];
     expandedPositions: string[];
     expandedNodes: {
-        label: string;
-        children: any[];
         value: string;
+        label: string;
         disabled: boolean;
+        children: any[];
         foldIcon: string;
         expendIcon: string;
         leafIcon: string;
@@ -184,20 +183,21 @@ declare const getTreeInfo: (params: IFindNodeParams, checkable: boolean) => {
     searched: string[];
     searchedPositions: string[];
     searchedNodes: {
-        label: string;
-        children: any[];
         value: string;
+        label: string;
         disabled: boolean;
+        children: any[];
         foldIcon: string;
         expendIcon: string;
         leafIcon: string;
     }[];
+    checked: string[];
     checkedPositions: string[];
     checkedNodes: {
-        label: string;
-        children: any[];
         value: string;
+        label: string;
         disabled: boolean;
+        children: any[];
         foldIcon: string;
         expendIcon: string;
         leafIcon: string;
@@ -205,10 +205,10 @@ declare const getTreeInfo: (params: IFindNodeParams, checkable: boolean) => {
     childChecked: string[];
     childCheckedPositions: string[];
     childCheckedNodes: {
-        label: string;
-        children: any[];
         value: string;
+        label: string;
         disabled: boolean;
+        children: any[];
         foldIcon: string;
         expendIcon: string;
         leafIcon: string;

package/dist/web/components/wd-upload-file/_design/wd-upload-file.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import type { CommonPropsType } from '../../../types';
 export declare const WdUploadFile: ({ isReadOnly }: {
     isReadOnly?: boolean;

package/dist/web/components/wd-upload-image/_design/wd-upload-image.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import type { CommonPropsType } from '../../../types';
 export declare const WdUploadImage: () => JSX.Element;
 export type WdUploadImageProps = CommonPropsType;

package/dist/web/utils/getPageQuery.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 /**
  * 获取 query 参数
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/weda-ui",
-  "version": "3.23.1",
+  "version": "3.23.3",
   "main": "./dist/index.js",
   "module": "./dist/index",
   "miniprogram": "mpdist",