@cloudbase/weda-ui 3.24.0 → 3.25.0

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数据
@@ -80,10 +75,7 @@ forwardRef(function TableComp(tableProps, ref) {
     isSupportMultipleSort = false, // 是否支持多字段排序
     sorter, // 排序规则
     __innerSlot, enableRelationTag = true, // 关联关系字段是否开启关联标签
-    enableBottomTipSlot = false, row__bottom__slot, rowDisabled, ...props } = tableProps;
-    const formField = useFormField();
-    const { formFieldsValue = [], setFieldValue, setFormFieldsValue } = formField || {};
-    const formFieldObjsContext = useFormFieldObj();
+    enableBottomTipSlot = false, row__bottom__slot, ...props } = tableProps;
     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}`))) {
@@ -569,7 +552,16 @@ forwardRef(function TableComp(tableProps, ref) {
         },
         // 设置选中项
         setSelectedKeys: (params) => {
-            setSelectedKeys(params.selectedKeys);
+            var _a, _b;
+            if (!(params === null || params === void 0 ? void 0 : params.selectedKeys) || params.selectedKeys.length === 0) {
+                onSelectChange([], {}, true);
+                return;
+            }
+            const recordsMap = new Map(dataRef.current.tableRecords.map((item) => [item[recordKey], item]));
+            const records = (_b = (_a = params === null || params === void 0 ? void 0 : params.selectedKeys) === null || _a === void 0 ? void 0 : _a.map((key) => recordsMap.get(key))) === null || _b === void 0 ? void 0 : _b.filter(Boolean);
+            const context = { record: records, selectedRecords: records };
+            const validSelectedKeys = (records === null || records === void 0 ? void 0 : records.map((record) => record[recordKey])) || [];
+            onSelectChange(validSelectedKeys, context, false);
         },
         // 当前页数据
         records: isExpression && !enableTotal && enablePagination
@@ -591,7 +583,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 +609,6 @@ forwardRef(function TableComp(tableProps, ref) {
         query === null || query === void 0 ? void 0 : query.filter,
         supportManyRelated,
         filterConfig,
-        formFieldsValue,
     ], ref);
     // 表格更改上下文数据
     // 移动端和自定义APIs场景不支持导入功能，监听变化存到表格上下文中
@@ -701,6 +691,7 @@ forwardRef(function TableComp(tableProps, ref) {
     const onSelectChange = (keys, context, empty = false) => {
         if (empty) {
             setSelectedKeys([]);
+            setSelectedRecords([]);
             return;
         }
         setSelectedKeys([].concat(keys));
@@ -747,7 +738,7 @@ forwardRef(function TableComp(tableProps, ref) {
                 pageIndex: 1,
             }));
         }
-        events === null || events === void 0 ? void 0 : events.onFilterChange({ searchValues, filterConfig });
+        events === null || events === void 0 ? void 0 : events.onFilterChange({ searchValues });
     };
     const errorStatus = isError || fieldsError;
     const errorMsg = isError ? errorObj : fieldsError;
@@ -756,7 +747,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, { componentId: id, 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, rowDisabled: rowDisabled }), 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, componentType: "table" }), 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 +756,4 @@ forwardRef(function TableComp(tableProps, ref) {
                                     setIsMobileOptionVisible(false);
                                 },
                             } }) }))] }) }) }));
-}));
+});

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

@@ -15,5 +15,5 @@ export function useCanPreview() {
             dispose();
         };
     }, [dispose]);
-    return (((_b = (_a = window.$w) === null || _a === void 0 ? void 0 : _a.wedaContext) === null || _b === void 0 ? void 0 : _b.isEditorMode) || (editorPlatforms === null || editorPlatforms === void 0 ? void 0 : editorPlatforms.includes('MP')));
+    return ((_b = (_a = window.$w) === null || _a === void 0 ? void 0 : _a.wedaContext) === null || _b === void 0 ? void 0 : _b.isEditorMode) || (editorPlatforms === null || editorPlatforms === void 0 ? void 0 : editorPlatforms.includes('MP'));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/weda-ui",
-  "version": "3.24.0",
+  "version": "3.25.0",
   "main": "./dist/index.js",
   "module": "./dist/index",
   "miniprogram": "mpdist",
@@ -72,8 +72,9 @@
     "postpack": "pinst --enable",
     "test:icon": "node tools/publish-icon/test.mjs",
     "sync-icon": "node tools/publish-icon/sync-icon.mjs",
-    "deploy": "node scripts/deploy.mjs && npm run release",
-    "release": "node scripts/release.mjs"
+    "deploy": "npm run use-node18 && node scripts/deploy.mjs && npm run release",
+    "release": "node scripts/release.mjs",
+    "use-node18": "node scripts/use-node18.mjs && hash -r && node -v"
   },
   "keywords": [
     "weda",