@cloudbase/weda-ui 3.5.2 → 3.6.0

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

@@ -2,12 +2,11 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { useState, useEffect } from 'react';
 import { Input, Select } from 'tea-component';
 import { DatePickerField, TimePickerField, InputField, NumberField, SelectMultipleField, SelectField, SelectSearch, } from './Fields';
-import { fieldCalculations } from './filterFieldsGenerate';
 import { InputAdornment } from './InputAdornment';
 import { usePlatform } from '../../../../utils/platform';
 import { useConfig } from '../../../../utils/config-context';
 // 计算方式下拉选框
-const CalculationSelect = ({ arg, cb, isDate = false }) => {
+const CalculationSelect = ({ arg, cb, isDate = false, fieldCalculationOption, }) => {
     const { classPrefix } = useConfig();
     const isH5 = usePlatform() === 'h5'; // 响应式判定
     const [value, setValue] = useState(arg.value);
@@ -28,16 +27,18 @@ const CalculationSelect = ({ arg, cb, isDate = false }) => {
         setValue(arg.value);
     }, [arg]);
     const options = isDate
-        ? fieldCalculations[arg.type].filter((i) => i.value !== 'neq')
-        : fieldCalculations[arg.type];
-    return isH5 ? (_jsx("div", { className: `${classPrefix}-space`, children: options.map((i) => (_jsx("div", { className: `${classPrefix}-space-item`, children: _jsx("div", { className: `${classPrefix}-table-wrap-filter__tag ${i.value === value ? 'is-selected ' : ''}`, onClick: () => {
+        ? fieldCalculationOption.filter((i) => i.value !== 'neq')
+        : fieldCalculationOption;
+    // eslint-disable-next-line @typescript-eslint/no-magic-numbers
+    const visible = (fieldCalculationOption === null || fieldCalculationOption === void 0 ? void 0 : fieldCalculationOption.length) === 1;
+    return isH5 ? (_jsx("div", { className: `${classPrefix}-space ${visible ? 'hidden' : ''}`, children: options.map((i) => (_jsx("div", { className: `${classPrefix}-space-item`, children: _jsx("div", { className: `${classPrefix}-table-wrap-filter__tag ${i.value === value ? 'is-selected ' : ''}`, onClick: () => {
                     calculation(i.value);
-                }, children: i.text }) }, i.value))) })) : (_jsx(Select, { size: "auto", options: options, value: value, onChange: (value) => calculation(value) }));
+                }, children: i.text }) }, i.value))) })) : (_jsx(Select, { className: `${visible ? 'hidden' : ''}`, size: "auto", options: options, value: value, onChange: (value) => calculation(value) }));
 };
 // 筛选项
 export const FilterFieldItem = ({ updateFilterData, ...filterFieldItemConfig }) => {
     const [disabled, setDisabled] = useState(false);
-    const { filterType, isRange, label, options, fieldCalculation, value } = filterFieldItemConfig;
+    const { filterType, isRange, label, options, fieldCalculation, value, fieldCalculationOption, } = filterFieldItemConfig;
     const updateFilterConfig = (value) => {
         const lastFilterConfig = { ...filterFieldItemConfig, ...value };
         // 选择为空不为空，则清空数据
@@ -57,17 +58,17 @@ export const FilterFieldItem = ({ updateFilterData, ...filterFieldItemConfig })
     const renderFieldItem = () => {
         switch (filterType) {
             case 'datetime':
-                return (_jsx(InputAdornment, { label: label, before: _jsx(CalculationSelect, { arg: fieldCalculation, cb: updateFilterConfig, isDate: true }), children: _jsx(DatePickerField, { disabled: disabled, showTime: true, isRange: isRange, updateValue: updateFilterConfig, value: value }) }));
+                return (_jsx(InputAdornment, { label: label, before: _jsx(CalculationSelect, { fieldCalculationOption: fieldCalculationOption, arg: fieldCalculation, cb: updateFilterConfig, isDate: true }), children: _jsx(DatePickerField, { disabled: disabled, showTime: true, isRange: isRange, updateValue: updateFilterConfig, value: value }) }));
             case 'date':
-                return (_jsx(InputAdornment, { label: label, before: _jsx(CalculationSelect, { arg: fieldCalculation, cb: updateFilterConfig, isDate: true }), children: _jsx(DatePickerField, { disabled: disabled, value: value, isRange: isRange, updateValue: updateFilterConfig }) }));
+                return (_jsx(InputAdornment, { label: label, before: _jsx(CalculationSelect, { fieldCalculationOption: fieldCalculationOption, arg: fieldCalculation, cb: updateFilterConfig, isDate: true }), children: _jsx(DatePickerField, { disabled: disabled, value: value, isRange: isRange, updateValue: updateFilterConfig }) }));
             case 'time':
-                return (_jsx(InputAdornment, { label: label, before: _jsx(CalculationSelect, { arg: fieldCalculation, cb: updateFilterConfig, isDate: true }), children: _jsx(TimePickerField, { disabled: disabled, value: value, isRange: isRange, updateValue: updateFilterConfig }) }));
+                return (_jsx(InputAdornment, { label: label, before: _jsx(CalculationSelect, { fieldCalculationOption: fieldCalculationOption, arg: fieldCalculation, cb: updateFilterConfig, isDate: true }), children: _jsx(TimePickerField, { disabled: disabled, value: value, isRange: isRange, updateValue: updateFilterConfig }) }));
             case 'string':
-                return (_jsx(InputAdornment, { label: label, before: _jsx(CalculationSelect, { arg: fieldCalculation, cb: updateFilterConfig }), children: _jsx(InputField, { updateValue: updateFilterConfig, value: value, disabled: disabled }) }));
+                return (_jsx(InputAdornment, { label: label, before: _jsx(CalculationSelect, { fieldCalculationOption: fieldCalculationOption, arg: fieldCalculation, cb: updateFilterConfig }), children: _jsx(InputField, { updateValue: updateFilterConfig, value: value, disabled: disabled }) }));
             case 'number':
-                return (_jsx(InputAdornment, { label: label, before: _jsx(CalculationSelect, { arg: fieldCalculation, cb: updateFilterConfig }), children: _jsx(NumberField, { updateValue: updateFilterConfig, value: value, isRange: isRange, disabled: disabled }) }));
+                return (_jsx(InputAdornment, { label: label, before: _jsx(CalculationSelect, { fieldCalculationOption: fieldCalculationOption, arg: fieldCalculation, cb: updateFilterConfig }), children: _jsx(NumberField, { updateValue: updateFilterConfig, value: value, isRange: isRange, disabled: disabled }) }));
             case 'boolean':
-                return (_jsx(InputAdornment, { label: label, before: _jsx(CalculationSelect, { arg: fieldCalculation, cb: updateFilterConfig }), children: _jsx(SelectMultipleField, { options: options || [], updateValue: updateFilterConfig, value: value, disabled: disabled }) }));
+                return (_jsx(InputAdornment, { label: label, before: _jsx(CalculationSelect, { fieldCalculationOption: fieldCalculationOption, arg: fieldCalculation, cb: updateFilterConfig }), children: _jsx(SelectMultipleField, { options: options || [], updateValue: updateFilterConfig, value: value, disabled: disabled }) }));
             case 'x-enumObj':
                 return (_jsx(SelectMultipleField
                 // @ts-ignore 不存在的属性
@@ -76,12 +77,12 @@ export const FilterFieldItem = ({ updateFilterData, ...filterFieldItemConfig })
                     options: options || [], updateValue: updateFilterConfig, value: value, disabled: disabled }));
             case 'x-enum':
                 if (filterFieldItemConfig.xMultiSelect) {
-                    return (_jsx(InputAdornment, { label: label, before: _jsx(CalculationSelect, { arg: fieldCalculation, cb: updateFilterConfig }), children: _jsx(SelectMultipleField, { optionName: filterFieldItemConfig.xOptionName, updateValue: updateFilterConfig, value: value, disabled: disabled }) }));
+                    return (_jsx(InputAdornment, { label: label, before: _jsx(CalculationSelect, { fieldCalculationOption: fieldCalculationOption, arg: fieldCalculation, cb: updateFilterConfig }), children: _jsx(SelectMultipleField, { optionName: filterFieldItemConfig.xOptionName, updateValue: updateFilterConfig, value: value, disabled: disabled }) }));
                 }
-                return (_jsx(InputAdornment, { label: label, before: _jsx(CalculationSelect, { arg: fieldCalculation, cb: updateFilterConfig }), children: _jsx(SelectField, { optionName: filterFieldItemConfig.xOptionName, updateValue: updateFilterConfig, value: value, disabled: disabled }) }));
+                return (_jsx(InputAdornment, { label: label, before: _jsx(CalculationSelect, { fieldCalculationOption: fieldCalculationOption, arg: fieldCalculation, cb: updateFilterConfig }), children: _jsx(SelectField, { optionName: filterFieldItemConfig.xOptionName, updateValue: updateFilterConfig, value: value, disabled: disabled }) }));
             case 'father-son':
             case 'related':
-                return (_jsx(InputAdornment, { label: label, before: _jsx(CalculationSelect, { arg: fieldCalculation, cb: updateFilterConfig }), children: _jsx(SelectSearch, { fields: filterFieldItemConfig.fields, format: filterType, childDbName: filterFieldItemConfig.childDbName, value: value, updateValue: updateFilterConfig, dbName: filterFieldItemConfig.dbName, disabled: disabled }) }));
+                return (_jsx(InputAdornment, { label: label, before: _jsx(CalculationSelect, { fieldCalculationOption: fieldCalculationOption, arg: fieldCalculation, cb: updateFilterConfig }), children: _jsx(SelectSearch, { fields: filterFieldItemConfig.fields, format: filterType, childDbName: filterFieldItemConfig.childDbName, value: value, updateValue: updateFilterConfig, dbName: filterFieldItemConfig.dbName, disabled: disabled }) }));
             default:
                 return (_jsx(Input, { size: "full", disabled: true, defaultValue: '该类型暂不支持表单筛选器' }));
         }

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export declare const InputAdornment: ({ label, before, children }: {
     label: any;
     before: any;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export declare const SelectSearch: ({ value, updateValue, format, childDbName, dbName, fields, disabled, }: {
     value: any;
     updateValue: any;

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

@@ -21,6 +21,7 @@ export const SelectSearch = ({ value, updateValue, format, childDbName, dbName,
         childDbName,
         queryParams: query,
         primaryColumn: primaryColumn,
+        value,
     });
     return (_jsx(Select, { disabled: disabled, size: "full", clearable: true, searchable: true, matchButtonWidth: true, appearance: "button", autoClearSearchValue: true, options: result, value: value, bottomTips: isValidating ? _jsx(LoadingTip, {}) : '', onChange: (value) => {
             updateValue({ value });

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

@@ -20,7 +20,7 @@ export declare const fieldCalculations: {
  * 生成筛选配置
  * 1、过滤不支持搜索的字段
  * 2、生成配置
- * 3、枚举/数字需要特殊处理
+ * 3、枚举/数字需要特殊处理(即format,用于处理查询数据转换)
  * { filterType: 'datetime' | 'date' | 'time' | 'string' |'number' | 'x-enumObj' , isRange: boolean }
  */
 export declare const filterFieldsGenerate: (fields: any) => any;

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

@@ -37,7 +37,7 @@ export const fieldCalculations = {
  * 生成筛选配置
  * 1、过滤不支持搜索的字段
  * 2、生成配置
- * 3、枚举/数字需要特殊处理
+ * 3、枚举/数字需要特殊处理(即format,用于处理查询数据转换)
  * { filterType: 'datetime' | 'date' | 'time' | 'string' |'number' | 'x-enumObj' , isRange: boolean }
  */
 export const filterFieldsGenerate = (fields) => {
@@ -55,7 +55,7 @@ export const filterFieldsGenerate = (fields) => {
             return false;
         return true;
     })) === null || _a === void 0 ? void 0 : _a.map((i) => {
-        var _a, _b;
+        var _a, _b, _c;
         // 生成计算方式
         const fieldCalculation = ['string', 'number'].includes(i.type)
             ? { type: i.type, value: fieldCalculations[i.type][0].value }
@@ -64,7 +64,7 @@ export const filterFieldsGenerate = (fields) => {
             id: i['x-id'],
             name: i.name,
             value: '',
-            isRange: true,
+            isRange: typeof i.isRange === 'boolean' ? i.isRange : true,
             filterType: i.type,
             label: i.title,
             fieldCalculation,
@@ -108,6 +108,26 @@ export const filterFieldsGenerate = (fields) => {
             filterFieldItemConfig.fieldCalculation.type = 'radio';
             filterFieldItemConfig.fieldCalculation.value = 'eq';
         }
+        const fieldCalculationOption = fieldCalculations[filterFieldItemConfig.fieldCalculation.type];
+        filterFieldItemConfig.fieldCalculationOption = fieldCalculationOption;
+        // 用户自定义配置
+        if (i === null || i === void 0 ? void 0 : i.filterConfig) {
+            filterFieldItemConfig.value = ((_c = i.filterConfig) === null || _c === void 0 ? void 0 : _c.value) || '';
+            // 默认计算方式
+            const customFieldCalculation = fieldCalculationOption === null || fieldCalculationOption === void 0 ? void 0 : fieldCalculationOption.find((option) => { var _a; return option.value === ((_a = i.filterConfig) === null || _a === void 0 ? void 0 : _a.filterType); });
+            filterFieldItemConfig.fieldCalculation =
+                customFieldCalculation || filterFieldItemConfig.fieldCalculation;
+            // 支持的运算类型
+            const customFieldCalculationOptions = fieldCalculationOption === null || fieldCalculationOption === void 0 ? void 0 : fieldCalculationOption.filter((option) => {
+                var _a;
+                const filterTypeOption = [].concat((_a = i.filterConfig) === null || _a === void 0 ? void 0 : _a.filterTypeOption);
+                return filterTypeOption === null || filterTypeOption === void 0 ? void 0 : filterTypeOption.find((j) => (option === null || option === void 0 ? void 0 : option.value) === j);
+            });
+            filterFieldItemConfig.fieldCalculationOption =
+                (customFieldCalculationOptions === null || customFieldCalculationOptions === void 0 ? void 0 : customFieldCalculationOptions.length)
+                    ? customFieldCalculationOptions
+                    : fieldCalculationOption;
+        }
         return filterFieldItemConfig;
     });
 };

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

@@ -1,7 +1,2 @@
-/// <reference types="react" />
-export declare const FilterFieldsPanel: ({ filterFields, fetchData, openMobileFilter, setOpenMobileFilter, }: {
-    filterFields: any;
-    fetchData: any;
-    openMobileFilter: any;
-    setOpenMobileFilter: any;
-}) => JSX.Element;
+import React from 'react';
+export declare const FilterFieldsPanel: React.ForwardRefExoticComponent<Pick<any, string | number | symbol> & React.RefAttributes<any>>;

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

@@ -1,5 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { useState, useEffect } from 'react';
+import { useState, useEffect, forwardRef } from 'react';
 import { Row, Col, ConfigProvider, Drawer } from 'tea-component';
 import { formatDateToNumber, dateCalculation } from '../../../../utils/date';
 import isObjectEqual from '../../../../utils/isObjectEqual';
@@ -8,8 +8,19 @@ import { FilterFieldItem } from './FilterFieldItem';
 import { filterFieldsGenerate } from './filterFieldsGenerate';
 import { WdButton } from '../../../wd-button';
 import { usePlatform } from '../../../../utils/platform';
+import { useSetWidgetApi } from '../../../../utils/widget-api/use-set-widget-api';
+const getFilterConfig = (data) => data.map(({ name, label, value, fieldCalculationOption = [], fieldCalculation, }) => ({
+    name,
+    label,
+    value,
+    filterType: fieldCalculation === null || fieldCalculation === void 0 ? void 0 : fieldCalculation.value,
+    filterTypeOption: fieldCalculationOption === null || fieldCalculationOption === void 0 ? void 0 : fieldCalculationOption.map((i) => i === null || i === void 0 ? void 0 : i.value),
+}));
 // 筛选表单
-export const FilterFieldsPanel = ({ filterFields, fetchData, openMobileFilter, setOpenMobileFilter, }) => {
+export const FilterFieldsPanel = forwardRef(function Comp(props, ref) {
+    const { filterFields, fetchData, openMobileFilter, setOpenMobileFilter, setFilterConfig, } = props;
+    const num = 2;
+    const maxlength = 3;
     const { classPrefix } = useConfig();
     const isH5 = usePlatform() === 'h5'; // 响应式判定
     const [collapse, setCollapse] = useState(true);
@@ -18,20 +29,31 @@ export const FilterFieldsPanel = ({ filterFields, fetchData, openMobileFilter, s
     const updateFilterData = (filterFieldItemConfig) => {
         const newData = filterData.map((i) => i.id === filterFieldItemConfig.id ? filterFieldItemConfig : i);
         setFilterData(newData);
+        setFilterConfig(getFilterConfig(newData));
     };
     useEffect(() => {
+        var _a;
         const result = filterFieldsGenerate(filterFields);
         // 筛选字段改变，重新初始化筛选面板
         if (!isObjectEqual(result, initFilterData)) {
             const initFilterData = JSON.parse(JSON.stringify(result));
             setInitFilterData(initFilterData);
             setFilterData(initFilterData);
+            setFilterConfig(getFilterConfig(initFilterData));
+            // 如果配置有值则执行查询
+            if (initFilterData.some((i) => i.value)) {
+                searchHandle(initFilterData);
+            }
+            // 如果折叠的查询条件中有值，则展开面板
+            if ((_a = initFilterData === null || initFilterData === void 0 ? void 0 : initFilterData.filter((i, index) => index >= maxlength)) === null || _a === void 0 ? void 0 : _a.some((j) => j.value)) {
+                setCollapse(false);
+            }
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [filterFields]);
-    const searchHandle = () => {
+    const searchHandle = (searchData = filterData) => {
         let searchValues = [];
-        const filterValues = filterData.filter((i) => {
+        const filterValues = searchData.filter((i) => {
             if (Array.isArray(i.value) &&
                 i.filterType === 'number' &&
                 i.fieldCalculation.value === 'scope') {
@@ -41,7 +63,7 @@ export const FilterFieldsPanel = ({ filterFields, fetchData, openMobileFilter, s
             return !!(i.value && i.value.length);
         });
         // 为空不为空筛选条件
-        filterData.forEach((i) => {
+        searchData.forEach((i) => {
             var _a, _b;
             if (['$empty', '$nempty'].includes((_a = i === null || i === void 0 ? void 0 : i.fieldCalculation) === null || _a === void 0 ? void 0 : _a.value)) {
                 const $and = searchValues.find((i) => i.$and);
@@ -135,35 +157,41 @@ export const FilterFieldsPanel = ({ filterFields, fetchData, openMobileFilter, s
         });
         fetchData(searchValues);
     };
-    const num = 2;
-    const maxlength = 3;
+    const onFormSubmit = (e) => {
+        e.preventDefault();
+        searchHandle();
+    };
+    const resetFilter = () => {
+        const result = initFilterData.map((i) => ({ ...i, value: '' }));
+        setFilterData(result);
+        setFilterConfig(getFilterConfig(result));
+        fetchData();
+        if (isH5) {
+            setOpenMobileFilter(false);
+        }
+    };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    useSetWidgetApi(() => ({ resetFilter }), [initFilterData], ref);
     return (_jsxs(ConfigProvider, { classPrefix: "wedatea2td", children: [_jsx(Drawer, { className: `${classPrefix}-table-mobile-filter-drawer ${classPrefix}-table-wrap-filter ${classPrefix}-h5-table-wrap-filter`, title: "\u7B5B\u9009\u5668", visible: isH5 && openMobileFilter, onClose: () => {
                     setOpenMobileFilter(false);
                 }, children: _jsxs("div", { children: [_jsx("div", { className: `${classPrefix}-table-wrap-filter__body`, children: filterData === null || filterData === void 0 ? void 0 : filterData.map((i) => (_jsx(FilterFieldItem, { ...i, updateFilterData: updateFilterData, fields: filterFields }, i.id))) }), _jsx("div", { className: `${classPrefix}-table-wrap-filter__footer`, children: _jsxs("div", { className: `${classPrefix}-table-wrap-filter__btn`, children: [_jsx("div", { className: `${classPrefix}-table-wrap-filter__btn-item`, children: _jsx(WdButton, { theme: "primary", variant: "outline", size: "lg", text: "\u91CD\u7F6E", events: {
-                                                tap: () => {
-                                                    setFilterData(initFilterData);
-                                                    fetchData();
-                                                    setOpenMobileFilter(false);
-                                                },
+                                                tap: resetFilter,
                                             } }) }), _jsx("div", { className: `${classPrefix}-table-wrap-filter__btn-item`, children: _jsx(WdButton, { theme: "primary", size: "lg", text: "\u786E\u5B9A", events: {
                                                 tap: () => {
                                                     searchHandle();
                                                     setOpenMobileFilter(false);
                                                 },
-                                            } }) })] }) })] }) }), !isH5 && !!filterData.length && (_jsx("div", { className: `${classPrefix}-table-wrap-filter`, children: _jsxs(Row, { gap: 20, verticalAlign: 'bottom', style: { justifyContent: 'space-between' }, children: [_jsx(_Fragment, { children: filterData === null || filterData === void 0 ? void 0 : filterData.map((i, index) => (_jsx(Col, { span: 6, style: {
+                                            } }) })] }) })] }) }), !isH5 && !!filterData.length && (_jsx("form", { className: `${classPrefix}-table-wrap-filter`, onSubmit: onFormSubmit, children: _jsxs(Row, { gap: 20, verticalAlign: 'bottom', style: { justifyContent: 'space-between' }, children: [_jsx(_Fragment, { children: filterData === null || filterData === void 0 ? void 0 : filterData.map((i, index) => (_jsx(Col, { span: 6, style: {
                                     display: `${index > num && collapse ? 'none' : 'block'}`,
                                 }, children: _jsx(FilterFieldItem, { ...i, updateFilterData: updateFilterData, fields: filterFields }) }, i.id))) }), _jsx(Col, { span: 24, style: { flex: '1', textAlign: 'right' }, children: _jsxs("div", { className: `${classPrefix}-space`, children: [_jsx("div", { className: `${classPrefix}-space-item`, children: _jsx(WdButton, { size: "md", theme: "secondary", text: "\u91CD\u7F6E", events: {
-                                                tap: () => {
-                                                    setFilterData(initFilterData);
-                                                    fetchData();
-                                                },
-                                            } }) }), _jsx("div", { className: `${classPrefix}-space-item`, children: _jsx(WdButton, { size: "md", theme: "primary", text: "\u67E5\u8BE2", events: {
-                                                tap: () => {
-                                                    searchHandle();
-                                                },
-                                            } }) }), filterData.length > maxlength && (_jsx("div", { className: `${classPrefix}-space-item`, children: _jsx(WdButton, { icon: collapse ? 'td:chevron-down' : 'td:chevron-up', iconType: "icon-only", theme: "secondary", variant: "text", size: "md", events: {
+                                                tap: resetFilter,
+                                            } }) }), _jsxs("div", { className: `${classPrefix}-space-item`, children: [_jsx("input", { type: "submit", style: { display: 'none' } }), _jsx(WdButton, { size: "md", theme: "primary", text: "\u67E5\u8BE2", events: {
+                                                    tap: () => {
+                                                        searchHandle();
+                                                    },
+                                                } })] }), filterData.length > maxlength && (_jsx("div", { className: `${classPrefix}-space-item`, children: _jsx(WdButton, { icon: collapse ? 'td:chevron-down' : 'td:chevron-up', iconType: "icon-only", theme: "secondary", variant: "text", size: "md", events: {
                                                 tap: () => {
                                                     setCollapse(!collapse);
                                                 },
                                             } }) }))] }) }, "search-button")] }) }))] }));
-};
+});

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

@@ -1,8 +1,7 @@
-/// <reference types="react" />
 /**
  * 后端导入弹窗
  */
-export declare const ImportFileModal: ({ fields, isImportFileModalByApiVisible, datasourceTitle, dbName, setIsImportFileModalByApiVisible, setIsInOrOutRecordModalVisible, refresh, supportManyRelated, }: {
+export declare const ImportFileModal: ({ fields, isImportFileModalByApiVisible, datasourceTitle, dbName, setIsImportFileModalByApiVisible, setIsInOrOutRecordModalVisible, refresh, supportManyRelated, columnSets, }: {
     fields: any;
     isImportFileModalByApiVisible: any;
     datasourceTitle: any;
@@ -11,6 +10,7 @@ export declare const ImportFileModal: ({ fields, isImportFileModalByApiVisible,
     setIsInOrOutRecordModalVisible: any;
     refresh: any;
     supportManyRelated: any;
+    columnSets: any;
 }) => JSX.Element;
 /**
  * 后端表格导入方法

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

@@ -1,14 +1,21 @@
 import { jsx as _jsx } from "react/jsx-runtime";
+import React from 'react';
 import { ImportFileModalByApi as ImportFileModalByApiFromTable } from '../../../table/ImportFileModalByApi';
 import { alertErrorMessage } from '../../../../utils/platform';
+import { isObjHasProp } from '../../../../utils/tool';
 import { ConfigProvider } from 'tea-component';
 /**
  * 后端导入弹窗
  */
-export const ImportFileModal = ({ fields, isImportFileModalByApiVisible, datasourceTitle, dbName, setIsImportFileModalByApiVisible, setIsInOrOutRecordModalVisible, refresh, supportManyRelated, }) => {
-    var _a;
-    const supportFields = (_a = fields
-        .filter((field) => {
+export const ImportFileModal = ({ fields, isImportFileModalByApiVisible, datasourceTitle, dbName, setIsImportFileModalByApiVisible, setIsInOrOutRecordModalVisible, refresh, supportManyRelated, columnSets, }) => {
+    const keys = React.useMemo(() => {
+        if (!Array.isArray(columnSets))
+            return [];
+        return columnSets
+            .filter((item) => isObjHasProp(item, 'key'))
+            .map((item) => item.key);
+    }, [columnSets]);
+    let supportFields = fields.filter((field) => {
         // 不支持上传的类型
         if (!field)
             return false;
@@ -27,7 +34,16 @@ export const ImportFileModal = ({ fields, isImportFileModalByApiVisible, datasou
             return false;
         }
         return true;
-    })) === null || _a === void 0 ? void 0 : _a.sort((a, b) => (a === null || a === void 0 ? void 0 : a['x-index']) - (b === null || b === void 0 ? void 0 : b['x-index']));
+    });
+    supportFields = supportFields.sort((a, b) => {
+        const aIndex = keys.indexOf(a === null || a === void 0 ? void 0 : a.name);
+        const bIndex = keys.indexOf(b === null || b === void 0 ? void 0 : b.name);
+        // eslint-disable-next-line @typescript-eslint/no-magic-numbers
+        if (aIndex > -1 && bIndex > -1) {
+            return aIndex - bIndex;
+        }
+        return (a === null || a === void 0 ? void 0 : a['x-index']) - (b === null || b === void 0 ? void 0 : b['x-index']);
+    });
     return (isImportFileModalByApiVisible && (_jsx(ConfigProvider, { classPrefix: "wedatea2td", children: _jsx(ImportFileModalByApiFromTable, { fields: supportFields, visible: isImportFileModalByApiVisible, datasourceTitle: datasourceTitle, dbName: dbName, onCancel: () => {
                 setIsImportFileModalByApiVisible(false);
             }, handleInOrOutRecordModealVisible: setIsInOrOutRecordModalVisible, refresh: refresh, supportManyRelated: supportManyRelated }) })));

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export declare const InOrOutRecordModal: ({ isInOrOutRecordModalVisible, dbName, setIsImportFileModalByApiVisible, setIsExportFileModalByApiVisible, setIsInOrOutRecordModalVisible, }: {
     isInOrOutRecordModalVisible: any;
     dbName: any;

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

@@ -30,7 +30,7 @@ orderType, // 排序方式
 fixedFront = '', // 冻结首列至本列
 fixedEnd = '', // 冻结本列至尾列
 enableGlobalButton, // 是否显示插槽全局按钮
-enablePagination = true, columnSelectType = 'select', defaultPageIndex = _defaultPageIndex, defaultPageSize = _defaultPageSize, emptyText, }, ref) {
+enablePagination = true, columnSelectType = 'select', defaultPageIndex = _defaultPageIndex, defaultPageSize = _defaultPageSize, emptyText, selectFieldType, selectFields, }, ref) {
     const { classPrefix } = useConfig();
     const platform = usePlatform();
     const isH5 = platform === 'h5'; // 响应式判定
@@ -68,8 +68,17 @@ enablePagination = true, columnSelectType = 'select', defaultPageIndex = _defaul
     });
     // 数据源名称
     const datasourceTitle = dbName;
+    const columnSetsKey = columnSets === null || columnSets === void 0 ? void 0 : columnSets.map((i) => i.key);
     // 过滤权限字段
-    const { authFields, fieldsLoading } = useAuthFields(dbName, dbFieldNames, isNewData, isModel, connectorMethod, isNoDataSourceBind);
+    const { authFields, fieldsLoading } = useAuthFields({
+        dbName,
+        dbFieldNames,
+        isNewData,
+        isModel,
+        connectorMethod,
+        isNoDataSourceBind,
+        columnSetsKey,
+    });
     const fields = authFields;
     // 可排序字段
     const sortColumns = getSortColumns({ fields, columnSets });
@@ -85,6 +94,8 @@ enablePagination = true, columnSelectType = 'select', defaultPageIndex = _defaul
         columns: undefined,
         authFields,
         supportManyRelated: true,
+        selectFieldType,
+        selectFields,
     });
     // 查询数据
     const { tableData, tableTotal: total, tableLoading, getNewList, errorObj, } = useTableData({

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export declare const Pagination: ({ total, pageIndex, pageSize, onPagingChange, }: {
     total?: number;
     pageIndex: any;

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

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useConfig } from '../../../../utils/config-context';
-import WdIcon from '../../../wd-icon';
+import { WdIcon } from '../../../wd-icon';
 const defaultTotal = 0;
 export const Pagination = ({ total = defaultTotal, pageIndex, pageSize, onPagingChange, }) => {
     const pagingChangeHandle = () => {

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export declare const SearchBox: ({ searchValues, fields, columnSets, fetchData, refresh, }: {
     searchValues: any;
     fields: any;

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

@@ -1,7 +1,8 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { Button, TagSearchBox, useClassNames, ConfigProvider, } from 'tea-component';
+import { TagSearchBox, useClassNames, ConfigProvider } from 'tea-component';
 import { alertErrorMessage } from '../../../../utils/platform';
 import { getSearchAttributes, filterCustomFields } from '../FieldRender';
+import { WdButton } from '../../../wd-button';
 export const SearchBox = ({ searchValues, fields, columnSets, fetchData, refresh, }) => {
     const { Margin } = useClassNames();
     // 搜索框字段按列管理过滤
@@ -41,5 +42,5 @@ export const SearchBox = ({ searchValues, fields, columnSets, fetchData, refresh
                         })
                             .filter((item) => item);
                         fetchData({ searchValues });
-                    } }), _jsx(Button, { className: Margin.Left['2n'], icon: "refresh", title: "\u5237\u65B0", onClick: refresh })] }) }));
+                    } }), _jsx(WdButton, { className: Margin.Left['2n'], icon: "refresh", text: "\u5237\u65B0", events: { tap: refresh } })] }) }));
 };

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

@@ -1,5 +1,5 @@
 import React from 'react';
-export declare const BaseTableCom: ({ events, recordKey, className, columns, setColumns, records, sortColumns, sort, onSelectChange, selectedKeys, rowColor, isError, errorObj, isLoading, queryParams, total, onQueryChange, enablePagination, columnSelectType, defaultPageSize, defaultPageIndex, rowClick, currentSize, isNoDataSourceBind, isH5, emptyText: _emptyText, }: {
+export declare const BaseTableCom: ({ events, recordKey, className, columns, setColumns, records, sortColumns, sort, onSelectChange, selectedKeys, rowColor, isError, errorObj, isLoading, queryParams, total, onQueryChange, enablePagination, columnSelectType, defaultPageSize, defaultPageIndex, rowClick, currentSize, isNoDataSourceBind, isH5, emptyText: _emptyText, __innerSlot, }: {
     events: any;
     recordKey: any;
     className: any;
@@ -26,8 +26,9 @@ export declare const BaseTableCom: ({ events, recordKey, className, columns, set
     isNoDataSourceBind: any;
     isH5: any;
     emptyText: any;
+    __innerSlot?: React.ReactNode;
 }) => JSX.Element;
-export declare const BaseTable: React.MemoExoticComponent<({ events, recordKey, className, columns, setColumns, records, sortColumns, sort, onSelectChange, selectedKeys, rowColor, isError, errorObj, isLoading, queryParams, total, onQueryChange, enablePagination, columnSelectType, defaultPageSize, defaultPageIndex, rowClick, currentSize, isNoDataSourceBind, isH5, emptyText: _emptyText, }: {
+export declare const BaseTable: React.MemoExoticComponent<({ events, recordKey, className, columns, setColumns, records, sortColumns, sort, onSelectChange, selectedKeys, rowColor, isError, errorObj, isLoading, queryParams, total, onQueryChange, enablePagination, columnSelectType, defaultPageSize, defaultPageIndex, rowClick, currentSize, isNoDataSourceBind, isH5, emptyText: _emptyText, __innerSlot, }: {
     events: any;
     recordKey: any;
     className: any;
@@ -54,4 +55,5 @@ export declare const BaseTable: React.MemoExoticComponent<({ events, recordKey,
     isNoDataSourceBind: any;
     isH5: any;
     emptyText: any;
+    __innerSlot?: React.ReactNode;
 }) => JSX.Element>;

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

@@ -1,4 +1,4 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 /* eslint max-lines: [error, 350] */
 import React, { useRef, useEffect } from 'react';
 import { Icon, Table, StatusTip, ConfigProvider } from 'tea-component';
@@ -16,19 +16,26 @@ const miniPageSize = 10;
 // h5 端表格高度
 const tableHeight = { sm: 500, md: 580, lg: 880 };
 const tableHeaderHeight = 51;
-const renderStatus = ({ isH5, status, isNoDataSourceBind, _emptyText, errorObj, }) => {
+const renderStatus = ({ isH5, status, isNoDataSourceBind, _emptyText, errorObj, __innerSlot, }) => {
+    var _a, _b;
     const text = {
         loading: '数据加载中,请稍候...',
         error: '数据加载失败',
         empty: isNoDataSourceBind ? '请绑定数据源' : _emptyText,
     };
+    if (isNoDataSourceBind && ((_b = (_a = window.$w) === null || _a === void 0 ? void 0 : _a.wedaContext) === null || _b === void 0 ? void 0 : _b.isEditorMode)) {
+        return (_jsx(_Fragment, { children: _jsx("div", { className: `wd-status-content`, children: _jsx("div", { className: `wd-status-content__content ${classNames({
+                        isH5: isH5,
+                    }, 'wd-status-content__content-grey', 'table')}`, children: __innerSlot }) }) }));
+    }
     return (_jsx(StatusContent, { emptyText: text[`${status}`], component: "table", icon: status, errorObj: errorObj, isH5: isH5 }));
 };
 // eslint-disable-next-line complexity
 export const BaseTableCom = ({ events, recordKey, className, columns, setColumns, records, sortColumns, sort, onSelectChange, selectedKeys, rowColor, isError, errorObj, isLoading, queryParams, total = defaultTotal, 
 // refreshTable,
-onQueryChange, enablePagination, columnSelectType, defaultPageSize, defaultPageIndex, rowClick, currentSize, isNoDataSourceBind, isH5, emptyText: _emptyText, }) => {
+onQueryChange, enablePagination, columnSelectType, defaultPageSize, defaultPageIndex, rowClick, currentSize, isNoDataSourceBind, isH5, emptyText: _emptyText, __innerSlot = (_jsx(_Fragment, {})), }) => {
     var _a;
+    const inEditor = isInIde();
     const tableRef = useRef(null);
     const { classPrefix } = useConfig();
     // 是否展示全局loading
@@ -87,7 +94,7 @@ onQueryChange, enablePagination, columnSelectType, defaultPageSize, defaultPageI
         }),
     ];
     // 仅运行态可编辑
-    if (!isInIde()) {
+    if (!inEditor) {
         tableAddons.push(columnsResizable({
             onResizeEnd: (columns) => {
                 setColumns(columns);
@@ -120,6 +127,8 @@ onQueryChange, enablePagination, columnSelectType, defaultPageSize, defaultPageI
             pageSize: queryParams.pageSize || defaultPageSize,
             recordCount: total,
             onPagingChange: (query) => {
+                // 暂时不支持翻页勾选，清空翻页勾选状态
+                onSelectChange(null, null, true);
                 onQueryChange(query);
                 events === null || events === void 0 ? void 0 : events.onPagingChange({ query });
             },
@@ -192,7 +201,7 @@ onQueryChange, enablePagination, columnSelectType, defaultPageSize, defaultPageI
             !isLoading &&
             isH5 &&
             total > miniPageSize &&
-            !isInIde()) {
+            !inEditor) {
             onQueryChange({ pageIndex: queryParams.pageIndex + pageIndexSpan });
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -205,6 +214,7 @@ onQueryChange, enablePagination, columnSelectType, defaultPageSize, defaultPageI
                     isNoDataSourceBind,
                     _emptyText,
                     errorObj,
+                    __innerSlot,
                 })] }));
 };
 export const BaseTable = React.memo(BaseTableCom);

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

@@ -1,4 +1,14 @@
-export declare const useAuthFields: (dbName: any, dbFieldNames: any, isNewData: any, isModel: any, connectorMethod: any, isNoDataSourceBind: any, isExpression?: boolean, isApis?: boolean) => {
+export declare const useAuthFields: ({ dbName, dbFieldNames, isNewData, isModel, connectorMethod, isNoDataSourceBind, isExpression, isApis, columnSetsKey, }: {
+    dbName: any;
+    dbFieldNames: any;
+    isNewData: any;
+    isModel: any;
+    connectorMethod: any;
+    isNoDataSourceBind: any;
+    isExpression?: boolean;
+    isApis?: boolean;
+    columnSetsKey: any;
+}) => {
     authFields: any[];
     isError: any;
     fieldsLoading: boolean;

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

@@ -1,6 +1,6 @@
 import useSWR from 'swr';
 import { getAuthFields } from '../../../utils/datasource';
-export const useAuthFields = (dbName, dbFieldNames, isNewData, isModel, connectorMethod, isNoDataSourceBind, isExpression = false, isApis = false) => {
+export const useAuthFields = ({ dbName, dbFieldNames, isNewData, isModel, connectorMethod, isNoDataSourceBind, isExpression = false, isApis = false, columnSetsKey, }) => {
     const { data, error } = useSWR(() => {
         if (isNoDataSourceBind || isExpression) {
             return null;
@@ -11,9 +11,9 @@ export const useAuthFields = (dbName, dbFieldNames, isNewData, isModel, connecto
         if (isApis && !(connectorMethod === null || connectorMethod === void 0 ? void 0 : connectorMethod.name)) {
             return null;
         }
-        return [isModel, dbName, connectorMethod === null || connectorMethod === void 0 ? void 0 : connectorMethod.name];
+        return [isModel, dbName, connectorMethod === null || connectorMethod === void 0 ? void 0 : connectorMethod.name, columnSetsKey];
     }, async () => {
-        const { showFields } = await getAuthFields(dbName, dbFieldNames, true, !!isNewData, isModel, connectorMethod);
+        const { showFields } = await getAuthFields(dbName, dbFieldNames, true, !!isNewData, isModel, connectorMethod, false);
         if (!(showFields === null || showFields === void 0 ? void 0 : showFields.length)) {
             throw {
                 message: '数据源字段返回异常',

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

@@ -1,10 +1,11 @@
 export declare const getDataBaseInfo: (fields: any, format: any, childDbName: any) => any;
-export declare const mapResult: (data: any, primaryColumn: any) => any;
-export declare const useChooseList: ({ dataSourceAPI, queryParams, childDbName, primaryColumn, }: {
+export declare const mapResult: (records: any, primaryColumn: any) => any;
+export declare const useChooseList: ({ dataSourceAPI, queryParams, childDbName, primaryColumn, value, }: {
     dataSourceAPI: any;
     queryParams: any;
     childDbName: any;
     primaryColumn: any;
+    value: any;
 }) => {
     result: any[];
     total: number;