@cloudbase/weda-ui 3.7.11 → 3.7.13

package/dist/web/components/listView/index.js

@@ -58,8 +58,8 @@ export default React.forwardRef(function ListView(props, ref) {
     const [_status, setStatus] = useState(''); // 查询状态
     const status = useMemo(() => {
         let s = _status;
-        if (dataSourceType === 'expression') {
-            s = loading ? 'loading' : '';
+        if (dataSourceType === 'expression' && loading) {
+            s = 'loading';
         }
         return s;
     }, [dataSourceType, loading, _status]); // 表达式强制使用 loading 展示加载

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

@@ -91,8 +91,10 @@ export const WdCascader = forwardRef(function WdCascader(props, ref) {
         debouncedTriggerSearchEvent(v);
     }, [debouncedTriggerSearchEvent]);
     const handleChange = (v, { options }) => {
+        var _a;
         setSelectedOptions(options);
         onChange === null || onChange === void 0 ? void 0 : onChange(v);
+        (_a = delayEvents === null || delayEvents === void 0 ? void 0 : delayEvents.change) === null || _a === void 0 ? void 0 : _a.call(delayEvents, { value: v });
     };
     if (!visible)
         return null;

package/dist/web/components/wd-form-obj/base-form-obj.js

@@ -138,9 +138,13 @@ export const BaseFormObj = forwardRef(function BaseFormObj(props, ref) {
         return value;
     };
     const dealObjChange = (params, objValue) => {
-        var _a;
+        var _a, _b;
+        // 如果设置的是空对象，则认为是覆盖更新
+        if (!((_a = Object.keys(params.value)) === null || _a === void 0 ? void 0 : _a.length)) {
+            return params.value;
+        }
         let value;
-        if ((_a = Object.keys(objValue || {})) === null || _a === void 0 ? void 0 : _a.length) {
+        if ((_b = Object.keys(objValue || {})) === null || _b === void 0 ? void 0 : _b.length) {
             value = deepClone({ ...objValue, ...params.value });
         }
         return value;
@@ -204,7 +208,7 @@ export const BaseFormObj = forwardRef(function BaseFormObj(props, ref) {
     ]);
     const changeDebounce = useDebouncedCallback(useCallback((value, option) => {
         change(value, option);
-    }, [change]), 500);
+    }, [change]), 300);
     /**
      * 子组件默认值变更，触发嵌套表单值更新
      */

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

@@ -46,3 +46,4 @@ export declare const getRecordKey: ({ dataSourceType, dataSourceData, key }: {
 export declare const getWhereParam: (relatedKey: any, rowId: any) => {
     relateWhere: {};
 };
+export declare const getCurrentPageData: (data: any[], pageNo: any, pageSize: any) => any[];

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

@@ -602,3 +602,8 @@ export const getWhereParam = (relatedKey, rowId) => {
     };
     return whereList;
 };
+export const getCurrentPageData = (data = [], pageNo, pageSize) => {
+    const records = [].concat(deepClone(data));
+    // eslint-disable-next-line @typescript-eslint/no-magic-numbers
+    return records.slice((pageNo - 1) * pageSize, pageNo * pageSize) || []; // 当前页的数据
+};

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

@@ -17,7 +17,7 @@ import { useTableData } from './hooks/useTableData';
 import { useViewFields } from './hooks/useViewFields';
 import { useQueryParams } from './hooks/useQueryParams';
 import { WdCompError } from '../../utils/error';
-import { getSlots, getFilterFields, getSelectedView, getSortColumns, mapTableDataWithView, checkSupport, DataSourceType, getRecordKey, } from './utils';
+import { getSlots, getFilterFields, getSelectedView, getSortColumns, mapTableDataWithView, checkSupport, DataSourceType, getRecordKey, getCurrentPageData, } from './utils';
 import { Mock } from './mock';
 import { getTableColumns, slotRender, mapColumKey, } from './components/FieldRender';
 import Modal from '../modal';
@@ -548,7 +548,9 @@ export const WdTable = forwardRef(function TableComp(tableProps, ref) {
             }
         },
         // 当前页数据
-        records: dataRef.current.tableRecords,
+        records: isExpression && !enableTotal
+            ? getCurrentPageData(dataRef.current.tableRecords, query.pageNo, query.pageSize)
+            : dataRef.current.tableRecords,
         // 当前总数
         total: total,
         pageNo: query.pageNo,

package/package.json

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