@cloudbase/weda-ui 3.22.2 → 3.23.0

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

@@ -5,6 +5,7 @@ import { dateCalculation } from '../../../../utils/date';
 import isObjectEqual from '../../../../utils/isObjectEqual';
 import { useConfig } from '../../../../utils/config-context';
 import { FilterFieldItem } from './FilterFieldItem';
+import { arrayInputType } from './Fields';
 import { filterFieldsGenerate } from './filterFieldsGenerate';
 import { WdButton } from '../../../wd-button';
 import { usePlatform } from '../../../../utils/platform';
@@ -89,7 +90,7 @@ export const FilterFieldsPanel = forwardRef(function Comp(props, ref) {
         });
         // 值筛选条件
         filterValues.forEach((i) => {
-            var _a, _b;
+            var _a, _b, _c;
             switch (i.fieldCalculation.value) {
                 case 'scope':
                     if (i.filterType === 'number') {
@@ -142,10 +143,19 @@ export const FilterFieldsPanel = forwardRef(function Comp(props, ref) {
                 default: {
                     const searchItem = {
                         key: i.name,
-                        val: i.filterType === 'string' ? (_b = i.value) === null || _b === void 0 ? void 0 : _b.trim() : i.value,
+                        val: i.value,
                         rel: i.fieldCalculation.value,
                     };
-                    if (i.filterType === 'number') {
+                    if (i.filterType === 'string') {
+                        if (arrayInputType.includes(i.fieldCalculation.value) && ((_b = searchItem === null || searchItem === void 0 ? void 0 : searchItem.val) === null || _b === void 0 ? void 0 : _b.length)) {
+                            searchValues.push(searchItem);
+                        }
+                        else {
+                            searchItem.val = (_c = i.value) === null || _c === void 0 ? void 0 : _c.trim();
+                            searchValues.push(searchItem);
+                        }
+                    }
+                    else if (i.filterType === 'number') {
                         searchItem.val = Number(i.value);
                         searchValues.push(searchItem);
                     }
@@ -183,7 +193,7 @@ export const FilterFieldsPanel = forwardRef(function Comp(props, ref) {
     };
     // 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: () => {
+    return (_jsxs(ConfigProvider, { classPrefix: "wedatea2td", children: [isH5 && (_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, supportManyRelated: supportManyRelated }, 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: resetFilter,
@@ -192,7 +202,7 @@ export const FilterFieldsPanel = forwardRef(function Comp(props, ref) {
                                                     searchHandle();
                                                     setOpenMobileFilter(false);
                                                 },
-                                            } }) })] }) })] }) }), !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: {
+                                            } }) })] }) })] }) })), !isH5 && !!filterData.length && (_jsx("form", { className: `${classPrefix}-table-wrap-filter`, onSubmit: onFormSubmit, "data-testid": "filter-form", children: _jsxs(Row, { gap: 20, verticalAlign: 'top', 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, supportManyRelated: supportManyRelated }) }, 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: resetFilter,

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

@@ -13,11 +13,14 @@ export declare const getFilter: ({ wList, searchValues, searchConfig, conditionC
     relateWhere: {};
 };
 export declare const getSearchValues: (searchValues?: any[]) => {
-    commonSearchValue: {
+    commonSearchValue: ({
+        $or: any;
+    } | {
         [x: number]: {
             [x: string]: any;
         };
-    }[];
+        $or?: undefined;
+    })[];
     relatedSearchValues: any;
 };
 export declare const orderByFieldKey: (key: any, columns: any) => any;

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

@@ -182,7 +182,18 @@ export const getSearchValues = (searchValues = []) => {
     // 普通字段的直接条件
     const commonSearchValue = searchValuesList
         .filter((i) => !NEW_RELATION_FORMATS.includes(i.format))
-        .map((item) => ({ [item.key]: { [`$${item.rel}`]: item.val } }));
+        .map((item) => {
+        if (item.format === 'string' && ['search_ci', 'nsearch_ci'].includes(item.rel)) {
+            const itemVal = Array.isArray(item.val) ? item.val : [item.val];
+            if (!itemVal.length) {
+                return null;
+            }
+            const searchCondition = itemVal === null || itemVal === void 0 ? void 0 : itemVal.map((n) => ({ [item.key]: { [`$${item.rel}`]: n } }));
+            return { $or: searchCondition };
+        }
+        return { [item.key]: { [`$${item.rel}`]: item.val } };
+    })
+        .filter(Boolean);
     return {
         commonSearchValue,
         relatedSearchValues,

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

@@ -10,29 +10,15 @@ export declare const GlobalButton: React.NamedExoticComponent<{
     classPrefix: string;
     slots: any;
 }>;
-export declare const WdTable: React.ForwardRefExoticComponent<WdTableProps & React.RefAttributes<TCompRef>>;
+export declare const WdTable: React.ForwardRefExoticComponent<Pick<{
+    [key: string]: any;
+    initialValues?: any;
+}, string | number> & React.RefAttributes<unknown>>;
 export interface WdTableProps extends CommonPropsType, DataType {
     isMock?: boolean;
     multipleSelect: boolean;
     mockEmpty?: boolean;
     row__bottom__slot?: React.ReactNode;
     __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,6 +2,7 @@ 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 classNames from '../../utils/classnames';
 import { useConfig } from '../../utils/config-context';
@@ -16,6 +17,10 @@ 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';
@@ -33,8 +38,9 @@ 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
-export const WdTable = forwardRef(function TableComp(tableProps, ref) {
+forwardRef(function TableComp(tableProps, ref) {
     const { className, style, dataSourceType = 'data-model', bindConnectMetadata = {
         datasource: { id: '', name: '', title: '' },
     }, // APImock数据
@@ -75,6 +81,9 @@ export const WdTable = 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();
@@ -355,6 +364,15 @@ export const WdTable = 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}`))) {
@@ -573,6 +591,7 @@ export const WdTable = 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
     [
@@ -599,6 +618,7 @@ export const WdTable = forwardRef(function TableComp(tableProps, ref) {
         query === null || query === void 0 ? void 0 : query.filter,
         supportManyRelated,
         filterConfig,
+        formFieldsValue,
     ], ref);
     // 表格更改上下文数据
     // 移动端和自定义APIs场景不支持导入功能，监听变化存到表格上下文中
@@ -745,4 +765,4 @@ export const WdTable = forwardRef(function TableComp(tableProps, ref) {
                                     setIsMobileOptionVisible(false);
                                 },
                             } }) }))] }) }) }));
-});
+}));

package/dist/web/components/wd-tree/utils.js

@@ -226,7 +226,7 @@ const dealCheck = (_treeNode, showData) => {
     };
     while (parent) {
         parent.checked = getChecked(parent);
-        parent = parent.parent;
+        parent = parent.parent && getTreeNode(showData, parent.parent);
     }
     if ((_a = treeNode.children) === null || _a === void 0 ? void 0 : _a.length) {
         adjust(treeNode.children, treeNode.checked);

package/dist/web/utils/hooks/useFormLegacy.js

@@ -1,6 +1,6 @@
 import { useMemo, useRef, useState, useCallback } from 'react';
 import { convertLegacyProps, convertLegacyEnum } from '../tool';
-import { WD_INPUT_SIZE, WD_INPUT_LAYOUT, WD_INPUT_LABEL_ALIGN, WD_DATE_FORMAT, } from '../../../enum';
+import { WD_INPUT_SIZE, WD_INPUT_LAYOUT, WD_INPUT_LABEL_ALIGN, WD_DATE_FORMAT } from '../../../enum';
 import isEqual from '../isObjectEqual';
 import lodashGet from 'lodash.get';
 import { usePlatform, textToString } from '../platform';
@@ -138,7 +138,7 @@ export const convertPx = (val, unit = 'px') => {
 /** 日期时间组件相关方法 start */
 // 兼容 format
 export const useDateFormat = (props) => {
-    const { mode = X_RUNTIME_DEFAULT.mode, dateFormat = X_RUNTIME_DEFAULT.dateFormat, } = props || {};
+    const { mode = X_RUNTIME_DEFAULT.mode, dateFormat = X_RUNTIME_DEFAULT.dateFormat } = props || {};
     const format = useMemo(() => {
         const formatValue = WD_DATE_FORMAT.find((item) => item.value === dateFormat);
         switch (mode) {
@@ -353,10 +353,7 @@ export const convertTimeValue = (value) => {
         const match = value.match(/(\d{2}):(\d{2}):?(\d{2})?/);
         if (match) {
             const [yes, hour = 0, minute = 0, second = 0] = match;
-            if (yes &&
-                Number(hour) < 24 &&
-                Number(minute) < 60 &&
-                Number(second) < 60) {
+            if (yes && Number(hour) < 24 && Number(minute) < 60 && Number(second) < 60) {
                 time = moment.duration(`${hour}:${minute}:${second}`).asMilliseconds();
             }
         }
@@ -397,9 +394,7 @@ export const useHandleClear = (props) => {
     const onMouseEnter = useCallback(() => setHover(true), []);
     const onMouseLeave = useCallback(() => setHover(false), []);
     const onClear = useCallback(() => onChange === null || onChange === void 0 ? void 0 : onChange(null), [onChange]);
-    const truth = !isNil(value) &&
-        value !== '' &&
-        (!Array.isArray(value) || value.length !== 0);
+    const truth = !isNil(value) && value !== '' && (!Array.isArray(value) || value.length !== 0);
     const hasClearIcon = clearable && !disabled && !readOnly && truth && (hover || isH5);
     return { onMouseEnter, onMouseLeave, onClear, hasClearIcon };
 };
@@ -413,9 +408,7 @@ export const convertAcceptTypes = (_acceptTypes = X_RUNTIME_DEFAULT._acceptTypes
     else if (Array.isArray(_acceptTypes)) {
         types = _acceptTypes;
     }
-    return types
-        .filter((d) => !!d)
-        .map((d) => (/(\*)|(\/)|(^\..+)/.test(d) ? d : `.${d}`));
+    return types.filter((d) => !!d).map((d) => (/(\*)|(\/)|(^\..+)/.test(d) ? d : `.${d}`));
 };
 // 区分不同端的前后缀图标，比如下拉选择
 export const useFixedIcon = (props) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/weda-ui",
-  "version": "3.22.2",
+  "version": "3.23.0",
   "main": "./dist/index.js",
   "module": "./dist/index",
   "miniprogram": "mpdist",
@@ -85,7 +85,7 @@
   "description": "腾讯云微搭低代码组件库模板",
   "dependencies": {
     "@antv/g6": "^4.8.5",
-    "@cloudbase/weda-client": "^1.1.33",
+    "@cloudbase/weda-client": "^1.1.35",
     "@codemirror/autocomplete": "^6.16.0",
     "@codemirror/lang-javascript": "^6.2.2",
     "@codemirror/lang-json": "^6.0.1",
@@ -147,9 +147,9 @@
     "@babel/preset-env": "^7.22.15",
     "@babel/preset-react": "^7.22.15",
     "@babel/preset-typescript": "^7.22.15",
-    "@cloudbase/cals": "^1.2.15",
-    "@cloudbase/lowcode-cli": "^0.22.3",
-    "@cloudbase/weda-cloud-sdk": "^1.0.106",
+    "@cloudbase/cals": "^1.2.17",
+    "@cloudbase/lowcode-cli": "^0.22.4",
+    "@cloudbase/weda-cloud-sdk": "^1.0.107",
     "@commitlint/cli": "^16.0.2",
     "@commitlint/config-conventional": "^17.7.0",
     "@craco/craco": "^7.1.0",