@cloudbase/weda-ui 3.5.1 → 3.5.2

package/dist/web/components/form/userOrgSelect/common/fetch-data-service.js

@@ -14,10 +14,26 @@ export const defaultRequest = async (action, params) => {
         throw errorHandle(error, action);
     }
 };
-export const getUserListByIds = async (porps) => {
-    const { selectUserIds, request } = porps;
+function sortUserList(userIds, userList) {
+    // 将userList转换为Map，key为userId，value为对应的user对象
+    const userMap = userList.reduce((map, user) => {
+        map[user.UserId] = user;
+        return map;
+    }, {});
+    // 按照userIds的顺序构建排序后的userList
+    const sortedUserList = userIds.reduce((result, userId) => {
+        if (userMap[userId]) {
+            result.push(userMap[userId]);
+        }
+        return result;
+    }, []);
+    return sortedUserList;
+}
+export const getUserListByIds = async (params) => {
+    const { selectUserIds, request } = params;
     const userList = await fetchUserListByIds(selectUserIds, request);
-    return dealUserData(userList);
+    const sortedUserList = sortUserList(selectUserIds, userList);
+    return dealUserData(sortedUserList);
 };
 /**
  * 统一接口错误处理

package/dist/web/components/form/userOrgSelect/common/types.d.ts

@@ -1,6 +1,6 @@
-/// <reference types="react" />
 import type { ICompRef } from '../../../../types';
 import type { CommonFormPropsType } from '../../types';
+import type * as React from 'react';
 export interface IUserTreeSelect extends CommonFormPropsType {
     defaultValue?: Readonly<string | string[]>;
     confirmValue?: string;
@@ -69,6 +69,7 @@ export interface IUserTreeSelect extends CommonFormPropsType {
     /** 是否展示未关联部门用户 */
     displayUncategorizedUsers?: boolean;
     readOnly?: boolean;
+    formType?: string;
 }
 type TCompRef = ICompRef<{
     open: () => void;

package/dist/web/components/form/userOrgSelect/component/depart-select/index.js

@@ -14,9 +14,7 @@ import { useDepartData } from '../../hooks/use-depart-data';
 import './style';
 export default function DepartTreeSelect(props) {
     const { events = emptyObject, defaultValue = emptyArray, //默认值，支持数组
-    confirmValue = '', defaultValueType = 'noneDepart', multiple = false, onChange = null, 
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    request = defaultRequest, departmentScope, } = props;
+    confirmValue = '', defaultValueType = 'noneDepart', multiple = false, onChange = null, request = defaultRequest, departmentScope, } = props;
     const platform = usePlatform();
     // 两次默认值不同, 需要刷新
     const prevDefaultRef = React.useRef(null);

package/dist/web/components/form/userOrgSelect/component/user-select-pc/user-select-pc.d.ts

@@ -5,4 +5,4 @@ export declare const UserOrgContext: React.Context<any>;
 export declare function UserSelectPC({ id, className, style, label, labelVisible, //标题显隐
 placeholder, disabled, layout, requiredFlag, size, multiple, //多选
 outerRef, request, //接口请求
-decorator, onCancel, onConfirm, errInfo, open, setOpen, selectedOrgId, setSelectedOrgId, selectedUserList, setSelectedUserList, confirmUserList, setConfirmUserList, selectedUserIds, setSelectedUserIds, pageNo, setPageNo, pageSize, filterParams, treeData, error, onConfirmSelectUser, secondDisplay, naked, containerClass, triggerElement, readOnly, }: IUserTreeSelect): JSX.Element;
+decorator, onCancel, onConfirm, errInfo, open, setOpen, selectedOrgId, setSelectedOrgId, selectedUserList, setSelectedUserList, confirmUserList, setConfirmUserList, selectedUserIds, setSelectedUserIds, pageNo, setPageNo, pageSize, filterParams, treeData, error, onConfirmSelectUser, secondDisplay, naked, containerClass, triggerElement, readOnly, formType, }: IUserTreeSelect): JSX.Element;

package/dist/web/components/form/userOrgSelect/component/user-select-pc/user-select-pc.js

@@ -11,7 +11,7 @@ export const UserOrgContext = React.createContext(null);
 export function UserSelectPC({ id, className, style, label = '人员选择', labelVisible = true, //标题显隐
 placeholder = '请选择人员', disabled = false, layout = 'horizontal', requiredFlag = false, size = 'l', multiple = false, //多选
 outerRef, request = defaultRequest, //接口请求
-decorator, onCancel, onConfirm, errInfo, open, setOpen, selectedOrgId, setSelectedOrgId, selectedUserList, setSelectedUserList, confirmUserList, setConfirmUserList, selectedUserIds, setSelectedUserIds, pageNo, setPageNo, pageSize, filterParams, treeData, error, onConfirmSelectUser, secondDisplay, naked, containerClass, triggerElement, readOnly, }) {
+decorator, onCancel, onConfirm, errInfo, open, setOpen, selectedOrgId, setSelectedOrgId, selectedUserList, setSelectedUserList, confirmUserList, setConfirmUserList, selectedUserIds, setSelectedUserIds, pageNo, setPageNo, pageSize, filterParams, treeData, error, onConfirmSelectUser, secondDisplay, naked, containerClass, triggerElement, readOnly, formType, }) {
     // 外层组件类
     const cls = classNames({
         'weda-ui': true,
@@ -44,7 +44,7 @@ decorator, onCancel, onConfirm, errInfo, open, setOpen, selectedOrgId, setSelect
                 pageNo,
                 setPageNo,
                 pageSize,
-            }, children: readOnly ? (_jsx(InputTags, { tagsList: confirmUserList, placeholder: placeholder, multiple: multiple, errInfo: errInfo, disabled: disabled, readOnly: readOnly, onClose: (e, item) => {
+            }, children: readOnly && formType !== 'read' ? (_jsx(InputTags, { tagsList: confirmUserList, placeholder: placeholder, multiple: multiple, errInfo: errInfo, disabled: disabled, readOnly: readOnly, onClose: (e, item) => {
                     const currentConfirmUserList = confirmUserList.filter((l) => (l === null || l === void 0 ? void 0 : l.id) !== (item === null || item === void 0 ? void 0 : item.id));
                     setConfirmUserList(currentConfirmUserList);
                     onConfirmSelectUser(currentConfirmUserList);

package/dist/web/components/form/userOrgSelect/hooks/use-depart-data.js

@@ -51,7 +51,6 @@ const getChildren = (all, item) => {
             disableSelect: i.disableSelect,
         };
     });
-    // eslint-disable-next-line no-param-reassign
     if (children.length > 0)
         item.children = children;
     children.forEach((n) => {

package/dist/web/components/form-date/index.d.ts

@@ -10,8 +10,8 @@ declare const FormDate: React.ForwardRefExoticComponent<CommonPropsType & import
     label: string;
     name: string;
     value: string;
-    size: "s" | "m" | "l" | "full";
     required: boolean;
+    size: "s" | "m" | "l" | "full";
     disabled: boolean;
     placeholder: string;
     end: string;

package/dist/web/components/form-depart-tree-select/index.d.ts

@@ -10,8 +10,8 @@ declare const FormDepartTreeSelect: React.ForwardRefExoticComponent<CommonPropsT
     label: string;
     name: string;
     value: string;
-    size: "s" | "m" | "l" | "full";
     required: boolean;
+    size: "s" | "m" | "l" | "full";
     disabled: boolean;
     placeholder: string;
     layout: "" | "vertical" | "horizontal";

package/dist/web/components/form-email/index.d.ts

@@ -10,10 +10,10 @@ declare const FormEmail: React.ForwardRefExoticComponent<CommonPropsType & impor
     label: string;
     name: string;
     value: string;
-    size: "s" | "m" | "l" | "full";
     required: boolean;
-    maxLength: number;
+    size: "s" | "m" | "l" | "full";
     disabled: boolean;
+    maxLength: number;
     placeholder: string;
     layout: "" | "vertical" | "horizontal";
     focus: boolean;

package/dist/web/components/form-input/index.d.ts

@@ -11,10 +11,10 @@ declare const WdInput: React.ForwardRefExoticComponent<CommonPropsType & import(
     name: string;
     type: "number" | "text" | "idcard" | "digit";
     value: string;
-    size: "s" | "m" | "l" | "full";
     required: boolean;
-    maxLength: number;
+    size: "s" | "m" | "l" | "full";
     disabled: boolean;
+    maxLength: number;
     placeholder: string;
     layout: "" | "vertical" | "horizontal";
     focus: boolean;

package/dist/web/components/form-input-hooks/index.js

@@ -52,7 +52,7 @@ export function useFormInputTrait(inputParams) {
     const [visible, setVisible] = useState(true);
     const forceUpdate = useRerender();
     const form = useParentForm($widget);
-    logger.debug(inputParams, 'WdFormItem');
+    logger.debug('WdFormItem', form, name, inputParams);
     const layout = useMemo(() => {
         let finalLayout;
         if (form && (!currentLayout || currentLayout === 'auto')) {
@@ -62,21 +62,20 @@ export function useFormInputTrait(inputParams) {
             finalLayout = currentLayout;
         }
         return finalLayout;
-    }, [form, currentLayout]);
+        // eslint-disable-next-line react-hooks/exhaustive-deps --- add form.layout as dependencies
+    }, [form, currentLayout, form === null || form === void 0 ? void 0 : form.layout]);
     const [syncValue, _setSyncedValue] = useSyncValue(value, isObjectEqual);
     const setSyncedValue = useCallback((newVal) => {
         var _a;
         logger.debug('updateFormContext', newVal);
         _setSyncedValue(newVal);
-        if (typeof $node === 'object' && $node !== null) {
-            $node.value = newVal;
-        }
-        (_a = form === null || form === void 0 ? void 0 : form.updateFormContext) === null || _a === void 0 ? void 0 : _a.call(form, name, newVal);
-    }, [_setSyncedValue, $node, form, name]);
-    // const [syncValue] = useSetValueWithFormContextUpdate(value, form, name);
+        // 发现富文本中有时序问题，form 还是拿到旧值的闭包，所以再找一次
+        const f = form !== null && form !== void 0 ? form : getParentForm($widget);
+        (_a = f === null || f === void 0 ? void 0 : f.updateFormContext) === null || _a === void 0 ? void 0 : _a.call(f, name, newVal);
+    }, [$widget, _setSyncedValue, form, name]);
     useEffect(() => {
-        logger.debug('Form', form);
-    }, [form]);
+        logger.debug('Form', form, name);
+    }, [form, name]);
     useEffect(() => {
         // 未匹配任何规则时，清空错误提示
         if (!rules)
@@ -96,7 +95,7 @@ export function useFormInputTrait(inputParams) {
         setValidateErrorMsg('');
         setValidateState(undefined);
     }, [setValidateErrorMsg, setValidateState]);
-    // 挂在setValue方法到 $widget上
+    // 挂在 setValue 方法到 $widget 上
     React.useImperativeHandle(inputRef, () => {
         logger.debug('useImperativeHandle', { name, syncValue });
         const result = {
@@ -107,7 +106,7 @@ export function useFormInputTrait(inputParams) {
             setVisible(val) {
                 const value = convertMethodParam(val);
                 if (typeof value !== 'boolean') {
-                    console.warn('参数需要为boolean');
+                    console.warn('参数需要为 boolean');
                     return;
                 }
                 setVisible(value);
@@ -302,7 +301,7 @@ export function useFormInputTrait(inputParams) {
     });
     // const runOnceRef = useRef(false);
     // useEffect(() => {
-    //   // 双保险，向上取initialValues
+    //   // 双保险，向上取 initialValues
     //   if (runOnceRef.current) {
     //     return;
     //   }

package/dist/web/components/form-multi-region/index.d.ts

@@ -10,8 +10,8 @@ declare const FormMultiRegion: React.ForwardRefExoticComponent<CommonPropsType &
     label: string;
     name: string;
     value: string;
-    size: "s" | "m" | "l" | "full";
     required: boolean;
+    size: "s" | "m" | "l" | "full";
     disabled: boolean;
     placeholder: string;
     layout: "" | "vertical" | "horizontal";

package/dist/web/components/form-phone/index.d.ts

@@ -10,8 +10,8 @@ declare const FormPhone: React.ForwardRefExoticComponent<CommonPropsType & impor
     label: string;
     name: string;
     value: string;
-    size: "s" | "m" | "l" | "full";
     required: boolean;
+    size: "s" | "m" | "l" | "full";
     disabled: boolean;
     placeholder: string;
     layout: "" | "vertical" | "horizontal";

package/dist/web/components/form-region/index.d.ts

@@ -10,8 +10,8 @@ declare const FormRegion: React.ForwardRefExoticComponent<CommonPropsType & impo
     label: string;
     name: string;
     value: string[];
-    size: "s" | "m" | "l" | "full";
     required: boolean;
+    size: "s" | "m" | "l" | "full";
     disabled: boolean;
     placeholder: string;
     separator: string;

package/dist/web/components/form-select/index.d.ts

@@ -11,8 +11,8 @@ declare const FormSelect: React.ForwardRefExoticComponent<CommonPropsType & impo
     name: string;
     format: "x-enum" | "related" | "father-son" | "many-one";
     value: string;
-    size: "s" | "m" | "l" | "full";
     required: boolean;
+    size: "s" | "m" | "l" | "full";
     disabled: boolean;
     placeholder: string;
     layout: "" | "vertical" | "horizontal";

package/dist/web/components/form-select-multiple/index.d.ts

@@ -11,8 +11,8 @@ declare const FormSelectMultiple: React.ForwardRefExoticComponent<CommonPropsTyp
     name: string;
     format: "many-many" | "one-many";
     value: string[];
-    size: "s" | "m" | "l" | "full";
     required: boolean;
+    size: "s" | "m" | "l" | "full";
     disabled: boolean;
     placeholder: string;
     layout: "" | "vertical" | "horizontal";

package/dist/web/components/form-text-area/index.d.ts

@@ -10,10 +10,10 @@ declare const FormTextArea: React.ForwardRefExoticComponent<CommonPropsType & im
     label: string;
     name: string;
     value: string;
-    size: "s" | "m" | "l" | "full";
     required: boolean;
-    maxLength: number;
+    size: "s" | "m" | "l" | "full";
     disabled: boolean;
+    maxLength: number;
     placeholder: string;
     layout: "" | "vertical" | "horizontal";
     focus: boolean;

package/dist/web/components/form-time/index.d.ts

@@ -10,8 +10,8 @@ declare const FormTime: React.ForwardRefExoticComponent<CommonPropsType & import
     label: string;
     name: string;
     value: string;
-    size: "s" | "m" | "l" | "full";
     required: boolean;
+    size: "s" | "m" | "l" | "full";
     disabled: boolean;
     placeholder: string;
     end: string;

package/dist/web/components/form-url/index.d.ts

@@ -10,10 +10,10 @@ declare const FormUrl: React.ForwardRefExoticComponent<CommonPropsType & import(
     label: string;
     name: string;
     value: string;
-    size: "s" | "m" | "l" | "full";
     required: boolean;
-    maxLength: number;
+    size: "s" | "m" | "l" | "full";
     disabled: boolean;
+    maxLength: number;
     placeholder: string;
     layout: "" | "vertical" | "horizontal";
     focus: boolean;

package/dist/web/components/form-user-tree-select/index.d.ts

@@ -10,8 +10,8 @@ declare const FormUserTreeSelect: React.ForwardRefExoticComponent<CommonPropsTyp
     label: string;
     name: string;
     value: string;
-    size: "s" | "m" | "l" | "full";
     required: boolean;
+    size: "s" | "m" | "l" | "full";
     disabled: boolean;
     placeholder: string;
     layout: "" | "vertical" | "horizontal";

package/dist/web/components/form-user-tree-select/index.js

@@ -2,9 +2,10 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
 import { UserTreeSelect } from '../../components';
 import Tips from '../form/tips';
-import { useFormInputTrait } from '../form-input-hooks';
+import { useFormInputTrait, useParentForm } from '../form-input-hooks';
 import { FormItemWrapper } from '../common/form-item-wrapper';
 const FormUserTreeSelect = React.forwardRef(function FormUserTreeSelect(props, inputRef) {
+    const parent = useParentForm(props.$widget);
     const { className, id, style, events, required, requiredFlag, label, labelVisible, confirmValue, defaultValueType, multiple, size, where, secondDisplay, corpScope, ...restProps } = props;
     const { value, name, onChange, disabled, layout, readOnly, validateErrorMsg, validateState, visible, } = useFormInputTrait({
         name: restProps.name,
@@ -16,6 +17,6 @@ const FormUserTreeSelect = React.forwardRef(function FormUserTreeSelect(props, i
     if (!visible) {
         return null;
     }
-    return (_jsxs(FormItemWrapper, { children: [_jsx(UserTreeSelect, { id: id, style: style, className: className, events: events, name: name, checked: value, disabled: disabled, label: label, labelVisible: labelVisible, layout: layout, requiredFlag: required && requiredFlag, confirmValue: confirmValue, defaultValueType: defaultValueType, defaultValue: value, size: size, multiple: multiple, where: where, secondDisplay: secondDisplay, corpScope: corpScope, readOnly: readOnly, onChange: onChange }), (validateState === 'error' || validateState === 'warn') && (_jsx(Tips, { tips: validateErrorMsg, type: "warn" }))] }));
+    return (_jsxs(FormItemWrapper, { children: [_jsx(UserTreeSelect, { id: id, style: style, className: className, events: events, name: name, onChange: onChange, checked: value, disabled: disabled, label: label, labelVisible: labelVisible, layout: layout, requiredFlag: required && requiredFlag, confirmValue: confirmValue, defaultValueType: defaultValueType, defaultValue: value, size: size, multiple: multiple, where: where, secondDisplay: secondDisplay, corpScope: corpScope, readOnly: readOnly, formType: parent === null || parent === void 0 ? void 0 : parent.formType }), (validateState === 'error' || validateState === 'warn') && (_jsx(Tips, { tips: validateErrorMsg, type: "warn" }))] }));
 });
 export default FormUserTreeSelect;

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

@@ -24,12 +24,16 @@ const getIdeMockData = (length = 3) => Array.from({ length }).map(() => Object.c
 const getStringValue = (v) => (typeof v === 'string' ? v : '');
 const defaultCloudbase = { callDataSource, isInIde };
 const defaultBeforeDataChange = (v) => v;
+const getCurrentPageData = (data = [], pageNo, pageSize) => {
+    const records = [].concat(data);
+    return (records === null || records === void 0 ? void 0 : records.slice((pageNo - 1) * pageSize, pageNo * pageSize)) || []; // 当前页的数据
+};
 /**
  * 数据容器-列表视图
  */
 export default React.forwardRef(function ListView(props, ref) {
     var _a, _b, _c;
-    const { dataSourceType, bindConnectMetadata, connectorMethod, connectorParams: rawConnectorParams, datasource, template, pageSize = 5, pagination, events, className, children, isRecords = true, //是否展示回调recoreds字段
+    const { dataSourceType, bindConnectMetadata, connectorMethod, connectorParams: rawConnectorParams, datasource, dataSourceData: _dataSourceData = [], template, enableTotal, total: _total, pageSize = 5, pagination, events, className, children, isRecords = true, //是否展示回调recoreds字段
     isSetStatus = false, //是否开启加载状态
     emptyText, //空状态时的文案
     loadCompletedText = '', // 加载到底提示
@@ -38,7 +42,7 @@ export default React.forwardRef(function ListView(props, ref) {
     const isH5 = platform === 'h5';
     const modelParams = getModelParams(props); // 包括 where 和 order
     const connectorParams = rawConnectorParams && JSON.parse(JSON.stringify(rawConnectorParams));
-    const isModel = dataSourceType !== 'custom-connector';
+    const isModel = dataSourceType === 'data-model';
     const methodName = getStringValue(isModel
         ? ((_a = datasource === null || datasource === void 0 ? void 0 : datasource.extra) === null || _a === void 0 ? void 0 : _a.methodName) || 'wedaGetRecords'
         : connectorMethod === null || connectorMethod === void 0 ? void 0 : connectorMethod.name);
@@ -46,12 +50,14 @@ export default React.forwardRef(function ListView(props, ref) {
     useLoopRenderDetect({ limit: 600 });
     const [entry, setEntry] = useState(null); // 触底的observer对象
     const [status, setStatus] = useState(''); // 查询状态
+    const [pageParam, setPageParam] = useState({ pageNo: 1, pageSize });
     const paramRef = useRef({
         dataSourceName,
         methodName,
-        params: { pageNo: 1, pageSize, connectorParams, modelParams },
+        params: { ...pageParam, connectorParams, modelParams },
         pagination,
     }); // 最新请求参数
+    const [dataSourceData, setDataSourceData] = useState(_dataSourceData || []);
     const dataRef = useRef({ total: 0, records: [] }); // 最新数据列表
     const observeRef = useRef(null); // 当前监听对象
     const delayRef = useRef({
@@ -97,7 +103,10 @@ export default React.forwardRef(function ListView(props, ref) {
                     pageSize,
                 },
                 pagination,
-            }, { isInitData: true });
+            }, {
+                isInitData: true,
+                dataSourceData,
+            });
         }
         else {
             (_b = events === null || events === void 0 ? void 0 : events.onDataChange) === null || _b === void 0 ? void 0 : _b.call(events, {
@@ -105,7 +114,7 @@ export default React.forwardRef(function ListView(props, ref) {
                 state: getContextState(),
             });
         }
-    }, [methodName, dataSourceName, pageSize, pagination, isModel]);
+    }, [methodName, dataSourceName, pageSize, pagination, isModel, enableTotal]);
     // props 对象类型监听，需重新分页
     useEffect(() => {
         var _a, _b, _c, _d;
@@ -117,7 +126,7 @@ export default React.forwardRef(function ListView(props, ref) {
                 }, { isInitData: true });
             }
         }
-        else {
+        else if (['custom-connector', 'connector'].includes(dataSourceType)) {
             if (!isequal((_d = (_c = paramRef.current) === null || _c === void 0 ? void 0 : _c.params) === null || _d === void 0 ? void 0 : _d.connectorParams, connectorParams)) {
                 clearDelay();
                 fetchData({
@@ -126,6 +135,20 @@ export default React.forwardRef(function ListView(props, ref) {
             }
         }
     });
+    useEffect(() => {
+        if (dataSourceType === 'expression') {
+            if (Array.isArray(_dataSourceData) &&
+                !isequal(dataSourceData, _dataSourceData)) {
+                setDataSourceData(_dataSourceData);
+                // 绑定表达式且开启动态分页的时候，列表展示依赖请求结果，因此不做清空处理。（滚动分页需保留上次的结果）
+                fetchData({
+                    params: {
+                        pageNo: enableTotal ? (pageParam === null || pageParam === void 0 ? void 0 : pageParam.pageNo) || 1 : 1,
+                    },
+                }, { isInitData: !enableTotal, dataSourceData: _dataSourceData });
+            }
+        }
+    }, [_dataSourceData, dataSourceType]);
     // 监听触底加载事件
     useEffect(() => {
         var _a, _b;
@@ -158,8 +181,7 @@ export default React.forwardRef(function ListView(props, ref) {
     }, []);
     // 能否点击下一页
     const hasNextPage = () => {
-        var _a;
-        const { pageNo = 1, pageSize = 5 } = ((_a = paramRef.current) === null || _a === void 0 ? void 0 : _a.params) || {};
+        const { pageNo = 1, pageSize = 5 } = pageParam || {};
         const { total = 0 } = dataRef.current || {};
         return pageNo * pageSize < total;
     };
@@ -195,8 +217,16 @@ export default React.forwardRef(function ListView(props, ref) {
     const onEvents = useCallback((data, datasource) => {
         var _a, _b;
         const isDataViewApis = !isRecords && !isModel;
-        const fetchRecords = [].concat(isDataViewApis ? data : (data === null || data === void 0 ? void 0 : data.records) || []);
-        const total = isDataViewApis ? 0 : Number(data === null || data === void 0 ? void 0 : data.total) || 0;
+        let fetchRecords = [].concat(isDataViewApis ? data : (data === null || data === void 0 ? void 0 : data.records) || []);
+        let total = isDataViewApis ? 0 : Number(data === null || data === void 0 ? void 0 : data.total) || 0;
+        // 支持绑定表达式和动态分页
+        if (datasource.dataSourceType === 'expression') {
+            total = Array.isArray(_dataSourceData) ? _dataSourceData === null || _dataSourceData === void 0 ? void 0 : _dataSourceData.length : 0;
+            if (enableTotal && !isNaN(parseInt(`${_total}`))) {
+                total = parseInt(`${_total}`);
+            }
+            fetchRecords = [].concat(data);
+        }
         if (['loadMoreButton', 'bottomLoad'].includes(paramRef.current.pagination)) {
             dataRef.current = {
                 total,
@@ -239,7 +269,16 @@ export default React.forwardRef(function ListView(props, ref) {
         else {
             successCb();
         }
-    }, [beforeDataChange, events, isModel, isRecords, pagination]);
+    }, [
+        _total,
+        beforeDataChange,
+        enableTotal,
+        events,
+        isModel,
+        isRecords,
+        pagination,
+        _dataSourceData === null || _dataSourceData === void 0 ? void 0 : _dataSourceData.length,
+    ]);
     /**
      * 列表视图拉取数据
      * 方法仅依赖入参和paramRef的参数
@@ -247,18 +286,43 @@ export default React.forwardRef(function ListView(props, ref) {
      */
     const fetchData = useCallback(async (param, options) => {
         var _a, _b, _c, _d, _e;
-        const fetchVersion = (delayRef.current.version = getUuid());
-        const { isInitData, isFetchCurrent } = options || {};
+        const { isInitData, isFetchCurrent, dataSourceData } = options || {};
         // 合并参数并保存，useEffect 中需要比对
         paramRef.current = {
             ...paramRef.current,
             ...param,
             params: { ...paramRef.current.params, ...param === null || param === void 0 ? void 0 : param.params },
         };
+        const query = {
+            pageNo: paramRef.current.params.pageNo,
+            pageSize: paramRef.current.params.pageSize,
+        };
+        setPageParam(query);
+        // 分页变化事件
+        if (events === null || events === void 0 ? void 0 : events.onPagingChange) {
+            events.onPagingChange({
+                query,
+            });
+        }
         const { dataSourceName, methodName, params } = paramRef.current;
         const { pageNo, pageSize, modelParams, connectorParams } = params || {};
+        if (dataSourceType === 'expression') {
+            isInitData && (dataRef.current = { total: 0, records: [] });
+            if (!dataSourceData && enableTotal) {
+                // 动态分页的情况下，只改变页码，不主动更改records,等待请求回来更新records
+                return;
+            }
+            // 绑定表达式时触发
+            const records = enableTotal
+                ? [].concat(dataSourceData || _dataSourceData)
+                : getCurrentPageData(dataSourceData || _dataSourceData, pageNo, pageSize);
+            onEvents(records, { dataSourceType });
+            return;
+        }
+        // 模型/apis请求
         if (!(dataSourceName && methodName))
             return;
+        const fetchVersion = (delayRef.current.version = getUuid());
         setStatus('loading');
         let tcbParams = {};
         // tcb分页参数
@@ -324,11 +388,14 @@ export default React.forwardRef(function ListView(props, ref) {
         appCloud,
         bindConnectMetadata,
         connectorMethod,
+        dataSourceType,
         datasource,
+        enableTotal,
         events,
         fetchDataLoop,
         isModel,
         onEvents,
+        refType,
     ]);
     /**
      * 计算上下文对象数据
@@ -336,7 +403,7 @@ export default React.forwardRef(function ListView(props, ref) {
     const getContextState = (state = {}) => {
         var _a, _b;
         const total = (_b = (_a = dataRef.current) === null || _a === void 0 ? void 0 : _a.total) !== null && _b !== void 0 ? _b : 0;
-        const { pageNo, pageSize } = paramRef.current.params;
+        const { pageNo, pageSize } = pageParam;
         return { total, pageNo, pageSize, ...state };
     };
     /**

package/dist/web/components/listView/interface.d.ts

@@ -6,7 +6,7 @@ export interface IDataContainer {
     /**
      * 数据源
      */
-    dataSourceType: 'data-model' | 'connector' | 'custom-connector';
+    dataSourceType: 'data-model' | 'connector' | 'custom-connector' | 'expression';
     /**
      * API
      */
@@ -62,6 +62,12 @@ export interface IDataContainer {
      * 容器事件
      */
     events?: {
+        onPagingChange?: (arg0: {
+            query: {
+                pageNo: number;
+                pageSize: number;
+            };
+        }) => void;
         queryEmpty?: any;
         querySuccess?: any;
         queryFail?: any;

package/dist/web/components/lottery/index.d.ts

@@ -1,22 +1,30 @@
 import React from 'react';
 import type { CommonPropsType, ICompRef } from '../../types';
+import type { DataType, EventsType } from '../../../configs/components/lottery';
 import './style';
 type TCompRef = ICompRef<{
     start: () => void;
 }>;
-declare const _default: React.ForwardRefExoticComponent<PropsType & React.RefAttributes<TCompRef>>;
-export default _default;
-export interface PropsType extends CommonPropsType {
-    /**
-     * 奖品列表
-     */
-    prizeList: any;
-    /**
-     * 启动抽奖
-     */
+declare const _default: React.ForwardRefExoticComponent<CommonPropsType & import("type-fest").Simplify<{
+    prizeList: {
+        title: string;
+        image: string;
+    }[];
     enablePrize: boolean;
-    /**
-     * 抽奖结果
-     */
     prizeResult: string;
-}
+}> & import("type-fest").Simplify<import("../../../configs/type-utils").StaticEventsType<[{
+    readonly name: "clickLotteryButton";
+    readonly title: "点击开始抽奖按钮";
+}, {
+    readonly name: "finishLottery";
+    readonly title: "开奖";
+    readonly detail: import("@sinclair/typebox").TObject<{
+        prize: import("@sinclair/typebox").TString;
+        result: import("@sinclair/typebox").TObject<{
+            desc: import("@sinclair/typebox").TString;
+            idx: import("@sinclair/typebox").TNumber;
+        }>;
+    }>;
+}]>> & React.RefAttributes<TCompRef>>;
+export default _default;
+export type PropsType = CommonPropsType & DataType & EventsType & {};

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

@@ -1,5 +1,4 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
-/* eslint-disable react/jsx-key */
 import React, { useState, useEffect, useCallback, useImperativeHandle, useMemo, } from 'react';
 import { usePlatform } from '../../utils/platform';
 import classNames from '../../utils/classnames';
@@ -65,9 +64,9 @@ export default React.forwardRef(function Lottery(props, ref) {
     const startLottery = useCallback(() => {
         setLotteryList(lotteryListDefault());
         setBtnActived(true);
+        events === null || events === void 0 ? void 0 : events.clickLotteryButton({});
         if (lotteryAction.isStart)
             return;
-        events === null || events === void 0 ? void 0 : events.clickLotteryButton();
         setIsStartLottery(true);
     }, [
         lotteryAction.isStart,

package/dist/web/components/navigationBar/horizontalMenu.js

@@ -1,5 +1,4 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
-/* eslint-disable react/jsx-key */
 import { useState, useRef, useEffect, useCallback } from 'react';
 import { NavMenu, List, Dropdown } from 'tea-component';
 import { usePlatform } from '../../utils/platform';