@cloudbase/weda-ui 3.4.4 → 3.4.6

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

@@ -8,7 +8,7 @@ import { SelectedList } from '../selected-list';
 import { fetchSearchUser } from '../../common/fetch-data-service';
 import debounce from '../../../../../utils/debounce';
 import '../index.css';
-export const UserModel = ({ open, setOpen, onCancel, onConfirm, treeData, treeDataError, filterParams, }) => {
+export const UserModel = ({ open, onCancel, onConfirm, treeData, treeDataError, filterParams, }) => {
     var _a;
     const { selectedUserList, setSelectedUserIds, request, selectedUserIds, setSelectedUserList, multiple, setPageNo, confirmUserList, } = React.useContext(UserOrgContext) || {};
     const [selectedOrgId, setSelectedOrgId] = useState(null);
@@ -49,7 +49,7 @@ export const UserModel = ({ open, setOpen, onCancel, onConfirm, treeData, treeDa
             setErrInfo({ errorStatus: true, errorMessage: e });
         }
     }, 500);
-    return (React.createElement(Modal, { visible: open, caption: "\u9009\u62E9\u6210\u5458", onClose: () => setOpen(false), className: "weda-ui weda-ui-user-select-modal" },
+    return (React.createElement(Modal, { visible: open, caption: "\u9009\u62E9\u6210\u5458", onClose: () => onCancel(null), className: "weda-ui weda-ui-user-select-modal" },
         React.createElement(Modal.Body, null,
             React.createElement("div", { className: "weda-ui-user-select-container" },
                 React.createElement(ModalSearch, { searchList: searchUserList, errInfo: errInfo, loading: loading, keyWords: keyWords, selectedList: selectedUserList, multiple: multiple, setSelectedList: setSelectedUserList, selectedIds: selectedUserIds, filterParams: filterParams, onSearch: (key) => onSearch(key), onReset: () => setSearchUserList([]) }),

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

@@ -10,7 +10,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, selectedUserList, setSelectedUserList, confirmUserList, setConfirmUserList, selectedUserIds, setSelectedUserIds, pageNo, setPageNo, pageSize, filterParams, treeData, error, }) {
+decorator, onCancel, onConfirm, errInfo, open, setOpen, selectedUserList, setSelectedUserList, confirmUserList, setConfirmUserList, selectedUserIds, setSelectedUserIds, pageNo, setPageNo, pageSize, filterParams, treeData, error, onConfirmSelectUser, }) {
     // 外层组件类
     const cls = classNames({
         'weda-ui': true,
@@ -48,7 +48,9 @@ decorator, onCancel, onConfirm, errInfo, open, setOpen, selectedUserList, setSel
                         setSelectedUserList(confirmUserList);
                     setOpen(open);
                 }, appearance: 'button', button: React.createElement(InputTags, { tagsList: confirmUserList, placeholder: placeholder, multiple: multiple, errInfo: errInfo, disabled: disabled, onClose: (e, item) => {
-                        setConfirmUserList(confirmUserList.filter((l) => (l === null || l === void 0 ? void 0 : l.id) !== (item === null || item === void 0 ? void 0 : item.id)));
+                        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);
                         e.stopPropagation();
                     } }), overlayClassName: 'weda-ui-user-selected-overlay-hidden', style: { width: '100%' } },
                 React.createElement(UserModel, { open: open, setOpen: setOpen, onConfirm: onConfirm, onCancel: onCancel, treeData: treeData || [], treeDataError: error, filterParams: filterParams })))))({

package/dist/web/components/grid/col.js

@@ -1,33 +1,96 @@
 import React, { useMemo } from 'react';
 import classNames from '../../utils/classnames';
+import { usePlatform } from '../../utils/platform';
 import './_utils.css';
+// 和编辑器对应
+const manualCheckedType = {
+    twelveAdjust: 'twelve-adjust',
+    exactAdjust: 'exact-adjust',
+};
 const numberRegex = /^\d{1,2}$/;
 export default function Col(props) {
     const { className: userClassName, id, style, alignSelf, widthType, lgWidthType, children, events, } = props;
-    const className = useMemo(() => {
+    const platform = usePlatform();
+    const classNameStyle = useMemo(() => {
         const clsxObj = {
             'wd-grid-col': true,
             [`wd-g-align-self-${alignSelf}`]: alignSelf,
             [userClassName]: userClassName,
         };
-        if (widthType === 'fit-content') {
-            clsxObj['wd-grid-col-auto'] = true;
-        }
-        else if (typeof widthType === 'number' ||
-            (typeof widthType === 'string' && numberRegex.test(widthType))) {
-            clsxObj[`wd-grid-col-${widthType}`] = true;
-        }
-        if (lgWidthType === 'fit-content') {
-            clsxObj['wd-grid-col-lg-auto'] = true;
-        }
-        else if (typeof lgWidthType === 'number' ||
-            (typeof lgWidthType === 'string' && numberRegex.test(lgWidthType))) {
-            clsxObj[`wd-grid-col-lg-${lgWidthType}`] = true;
+        let exactStyle = style;
+        if (platform === 'h5') {
+            // 移动端是否是12列手动调节
+            let isTwelveAdjust = true;
+            let twelveAdjustWidthType = widthType;
+            if (typeof widthType == 'object') {
+                twelveAdjustWidthType = widthType.value;
+                isTwelveAdjust = widthType.type === manualCheckedType.twelveAdjust;
+            }
+            if (isTwelveAdjust) {
+                clsxObj['wd-grid-col'] = true;
+                if (twelveAdjustWidthType === 'fit-content') {
+                    // 适应内容
+                    clsxObj['wd-grid-col-auto'] = true;
+                }
+                else if (twelveAdjustWidthType === 'auto-fill' && (style === null || style === void 0 ? void 0 : style.width)) {
+                    // 自动填充，如果有宽，则设置宽生效
+                    clsxObj['wd-grid-col'] = false;
+                    exactStyle = style;
+                }
+                else if (
+                // 12列调节
+                typeof twelveAdjustWidthType === 'number' ||
+                    (typeof twelveAdjustWidthType === 'string' &&
+                        numberRegex.test(twelveAdjustWidthType))) {
+                    clsxObj[`wd-grid-col-${twelveAdjustWidthType}`] = true;
+                }
+            }
+            else {
+                // 像素精确调节
+                clsxObj['wd-grid-col'] = false;
+                exactStyle = { ...style, width: twelveAdjustWidthType };
+            }
         }
         else {
-            clsxObj['wd-grid-col-lg'] = true;
+            // pc 端是否是12列手动调节
+            let isTwelveAdjustLg = true;
+            let twelveAdjustWidthTypeLg = lgWidthType;
+            if (typeof lgWidthType == 'object') {
+                twelveAdjustWidthTypeLg = lgWidthType.value;
+                isTwelveAdjustLg = lgWidthType.type === manualCheckedType.twelveAdjust;
+            }
+            if (isTwelveAdjustLg) {
+                clsxObj['wd-grid-col'] = true;
+                if (twelveAdjustWidthTypeLg === 'fit-content') {
+                    // 适应内容
+                    clsxObj['wd-grid-col-lg-auto'] = true;
+                }
+                else if (twelveAdjustWidthTypeLg === 'auto-fill' && (style === null || style === void 0 ? void 0 : style.width)) {
+                    // 自动填充，如果有宽，则设置宽生效
+                    clsxObj['wd-grid-col'] = false;
+                    exactStyle = style;
+                }
+                else if (
+                // 12列调节
+                typeof twelveAdjustWidthTypeLg === 'number' ||
+                    (typeof twelveAdjustWidthTypeLg === 'string' &&
+                        numberRegex.test(twelveAdjustWidthTypeLg))) {
+                    clsxObj[`wd-grid-col-lg-${twelveAdjustWidthTypeLg}`] = true;
+                }
+                else {
+                    clsxObj['wd-grid-col-lg'] = true;
+                }
+            }
+            else {
+                // 像素精确调节
+                clsxObj['wd-grid-col'] = false;
+                exactStyle = { ...style, width: twelveAdjustWidthTypeLg };
+            }
         }
-        return classNames(clsxObj);
-    }, [alignSelf, lgWidthType, userClassName, widthType]);
-    return (React.createElement("div", { className: className, id: id, style: style, onClick: (e) => { var _a; return (_a = events === null || events === void 0 ? void 0 : events.tap) === null || _a === void 0 ? void 0 : _a.call(events, {}, { originEvent: e }); }, "data-role": "wd-col" }, children));
+        return {
+            className: classNames(clsxObj),
+            style: exactStyle,
+        };
+    }, [alignSelf, lgWidthType, userClassName, widthType, style, platform]);
+    return (React.createElement("div", { className: classNameStyle.className, id: id, style: classNameStyle.style, onClick: (e) => { var _a; return (_a = events === null || events === void 0 ? void 0 : events.tap) === null || _a === void 0 ? void 0 : _a.call(events, {}, { originEvent: e }); }, "data-role": "wd-col" }, children));
 }

package/dist/web/components/grid/grid.js

@@ -10,7 +10,7 @@ export default function Grid(props) {
             'wd-grid': true,
             [`wd-grid-gx-${gutterX}`]: !isNil(gutterX),
             // 产品要求gutterX 同时间决定row一个换行的间距和 row之间的间距
-            [`wd-grid-gy-${gutterY}`]: !isNil(gutterY),
+            // [`wd-grid-gy-${gutterY}`]: !isNil(gutterY),
             [`wd-grid-grb-${gutterY}`]: !isNil(gutterY),
             [userClassName]: userClassName,
         });

package/dist/web/components/grid/row.js

@@ -1,14 +1,16 @@
 import React, { useMemo } from 'react';
 import classNames from '../../utils/classnames';
+import { isNil } from '../../utils/lodash';
 import './_utils.css';
 export default function Row(props) {
-    const { className: userClassName, id, style, children, events, alignItems, } = props;
+    const { className: userClassName, id, style, children, events, alignItems, gutterX, } = props;
     const className = useMemo(() => {
         return classNames({
             'wd-grid-row': true,
+            [`wd-grid-gx-${gutterX}`]: gutterX != -1 && !isNil(gutterX),
             [`wd-g-align-items-${alignItems}`]: alignItems,
             [userClassName]: userClassName,
         });
-    }, [alignItems, userClassName]);
+    }, [alignItems, userClassName, gutterX]);
     return (React.createElement("div", { className: className, id: id, style: style, onClick: (e) => { var _a; return (_a = events === null || events === void 0 ? void 0 : events.tap) === null || _a === void 0 ? void 0 : _a.call(events, {}, { originEvent: e }); }, "data-role": "wd-row" }, children));
 }

package/dist/web/components/index.js

@@ -103,7 +103,7 @@ export const ModelFlowChart = loadable(() => import('./flow/modules/chart'), {
 export const ModelFlow = loadable(() => import('./flow/modules/combination'), {
     fallback,
 });
-export const ModelFlowControl = loadable(() => import('./flow/modules/control'), { fallback });
+export const ModelFlowControl = loadable(() => import('./flow/modules/operations'), { fallback });
 export const ModelFlowBasic = loadable(() => import('./flow/modules/basic'), {
     fallback,
 });

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

@@ -123,13 +123,6 @@ export default React.forwardRef(function ListView(props, ref) {
             });
         }
     }, [shouldBottomLoad]);
-    // 组件方法
-    useImperativeHandle(ref, () => ({
-        methods: {
-            deleteOne: methodDeleteOne,
-            refresh: methodRefresh,
-        },
-    }));
     // 清除延迟状态
     const clearDelay = () => {
         clearTimeout(delayRef.current.statusTimer);
@@ -158,76 +151,10 @@ export default React.forwardRef(function ListView(props, ref) {
         const { total = 0 } = dataRef.current || {};
         return pageNo * pageSize < total;
     };
-    /**
-     * 列表视图拉取数据
-     * 方法仅依赖入参和paramRef的参数
-     * isInitData: 是否初始化数据默认否, isFetchCurrent: 是否拉取当前所有数据默认否
-     */
-    const fetchData = async (param, options) => {
-        var _a;
-        const fetchVersion = (delayRef.current.version = getUuid());
-        const { isInitData, isFetchCurrent } = options || {};
-        // 合并参数并保存，useEffect 中需要比对
-        paramRef.current = {
-            ...paramRef.current,
-            ...param,
-            params: { ...paramRef.current.params, ...param === null || param === void 0 ? void 0 : param.params },
-        };
-        const { dataSourceName, methodName, params } = paramRef.current;
-        const { orderBy, orderType, pageNo, pageSize, where, connectorParams } = params || {};
-        if (!(dataSourceName && methodName))
-            return;
-        setStatus('loading');
-        let tcbParams = {};
-        // tcb分页参数
-        if (!isNil(pageNo) && !isNil(pageSize)) {
-            tcbParams['pageNo'] = pageNo;
-            tcbParams['pageSize'] = pageSize;
-        }
-        if (isModel) {
-            // tcb排序参数
-            if (orderBy && ORDERTYPE.includes(orderType)) {
-                tcbParams['orderBy'] = orderBy;
-                tcbParams['orderType'] = orderType;
-            }
-            // tcb过滤参数
-            const whereEffected = [].concat(getWhereList(where));
-            whereEffected.length > 0 && (tcbParams['where'] = whereEffected);
-        }
-        else {
-            // 内部分页参数覆盖查询入参
-            tcbParams = Object.assign({}, connectorParams, tcbParams);
-        }
-        // tcb结果和事件
-        let data = {};
-        const eventDatasource = isModel
-            ? datasource
-            : { ...bindConnectMetadata, ...connectorMethod };
-        try {
-            if (isFetchCurrent) {
-                data = await fetchDataLoop({ dataSourceName, methodName, params: tcbParams }, dataRef.current.records.length);
-            }
-            else {
-                data = await (appCloud === null || appCloud === void 0 ? void 0 : appCloud.callDataSource({
-                    dataSourceName,
-                    methodName,
-                    params: tcbParams,
-                }, true));
-            }
-            if (fetchVersion !== delayRef.current.version)
-                return;
-            isInitData && (dataRef.current = { total: 0, records: [] });
-            onEvents(data, eventDatasource);
-        }
-        catch (e) {
-            setStatus('fail');
-            (_a = events === null || events === void 0 ? void 0 : events.queryFail) === null || _a === void 0 ? void 0 : _a.call(events, { datasource: eventDatasource, data: null });
-        }
-    };
     /**
      * 循环调用接口获取当前已加载的数据
      */
-    const fetchDataLoop = async (param = {}, count = 0) => {
+    const fetchDataLoop = useCallback(async (param = {}, count = 0) => {
         let [records, total] = [[], 0];
         try {
             const { dataSourceName, methodName, params } = param || {};
@@ -248,14 +175,15 @@ export default React.forwardRef(function ListView(props, ref) {
             console.error('fetchDataLoop: ', e);
         }
         return { records: records.slice(0, count), total };
-    };
+    }, [appCloud]);
     /**
      * 根据fetchData方法返回值，回调给外部事件
      */
-    const onEvents = (data, datasource) => {
+    const onEvents = useCallback((data, datasource) => {
         var _a, _b;
-        const fetchRecords = [].concat(!isRecords && !isModel ? data : (data === null || data === void 0 ? void 0 : data.records) || []);
-        const total = Number(data === null || data === void 0 ? void 0 : data.total) || 0;
+        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;
         if (['loadMoreButton', 'bottomLoad'].includes(paramRef.current.pagination)) {
             dataRef.current = {
                 total,
@@ -269,7 +197,7 @@ export default React.forwardRef(function ListView(props, ref) {
             data: beforeDataChange(dataRef.current.records || []),
             state: getContextState(),
         });
-        if (total === 0) {
+        if (total === 0 && !isDataViewApis) {
             setStatus('empty');
             (_b = events === null || events === void 0 ? void 0 : events.queryEmpty) === null || _b === void 0 ? void 0 : _b.call(events, {
                 datasource,
@@ -298,7 +226,82 @@ export default React.forwardRef(function ListView(props, ref) {
         else {
             successCb();
         }
-    };
+    }, [beforeDataChange, events, isModel, isRecords, pagination]);
+    /**
+     * 列表视图拉取数据
+     * 方法仅依赖入参和paramRef的参数
+     * isInitData: 是否初始化数据默认否, isFetchCurrent: 是否拉取当前所有数据默认否
+     */
+    const fetchData = useCallback(async (param, options) => {
+        var _a;
+        const fetchVersion = (delayRef.current.version = getUuid());
+        const { isInitData, isFetchCurrent } = options || {};
+        // 合并参数并保存，useEffect 中需要比对
+        paramRef.current = {
+            ...paramRef.current,
+            ...param,
+            params: { ...paramRef.current.params, ...param === null || param === void 0 ? void 0 : param.params },
+        };
+        const { dataSourceName, methodName, params } = paramRef.current;
+        const { orderBy, orderType, pageNo, pageSize, where, connectorParams } = params || {};
+        if (!(dataSourceName && methodName))
+            return;
+        setStatus('loading');
+        let tcbParams = {};
+        // tcb分页参数
+        if (!isNil(pageNo) && !isNil(pageSize)) {
+            tcbParams['pageNo'] = pageNo;
+            tcbParams['pageSize'] = pageSize;
+        }
+        if (isModel) {
+            // tcb排序参数
+            if (orderBy && ORDERTYPE.includes(orderType)) {
+                tcbParams['orderBy'] = orderBy;
+                tcbParams['orderType'] = orderType;
+            }
+            // tcb过滤参数
+            const whereEffected = [].concat(getWhereList(where));
+            whereEffected.length > 0 && (tcbParams['where'] = whereEffected);
+        }
+        else {
+            // 内部分页参数覆盖查询入参
+            tcbParams = Object.assign({}, connectorParams, tcbParams);
+        }
+        // tcb结果和事件
+        let data = {};
+        const eventDatasource = isModel
+            ? datasource
+            : { ...bindConnectMetadata, ...connectorMethod };
+        try {
+            if (isFetchCurrent) {
+                data = await fetchDataLoop({ dataSourceName, methodName, params: tcbParams }, dataRef.current.records.length);
+            }
+            else {
+                data = await (appCloud === null || appCloud === void 0 ? void 0 : appCloud.callDataSource({
+                    dataSourceName,
+                    methodName,
+                    params: tcbParams,
+                }, true));
+            }
+            if (fetchVersion !== delayRef.current.version)
+                return;
+            isInitData && (dataRef.current = { total: 0, records: [] });
+            onEvents(data, eventDatasource);
+        }
+        catch (e) {
+            setStatus('fail');
+            (_a = events === null || events === void 0 ? void 0 : events.queryFail) === null || _a === void 0 ? void 0 : _a.call(events, { datasource: eventDatasource, data: null });
+        }
+    }, [
+        appCloud,
+        bindConnectMetadata,
+        connectorMethod,
+        datasource,
+        events,
+        fetchDataLoop,
+        isModel,
+        onEvents,
+    ]);
     /**
      * 计算上下文对象数据
      */
@@ -311,23 +314,19 @@ export default React.forwardRef(function ListView(props, ref) {
     /**
      * 组件刷新方法，重新初始化
      */
-    const methodRefreshFromStart = async () => {
+    const methodRefreshFromStart = useCallback(async () => {
         try {
             clearDelay();
             await fetchData({ params: { pageNo: 1 } }, { isInitData: true });
-            alertErrorMessage({
-                message: LISTVIEW_MESSAGE.refresh_success,
-                icon: 'success',
-            });
         }
         catch (e) {
             alertErrorMessage({ message: LISTVIEW_MESSAGE.refresh_fail });
         }
-    };
+    }, [fetchData]);
     /**
      * 组件刷新当前方法，保持当前已加载的数据列表状态
      */
-    const methodRefreshKeepPage = async () => {
+    const methodRefreshKeepPage = useCallback(async () => {
         try {
             clearDelay();
             const { pageNo, pageSize } = paramRef.current.params;
@@ -342,30 +341,26 @@ export default React.forwardRef(function ListView(props, ref) {
             else {
                 await methodRefreshFromStart();
             }
-            alertErrorMessage({
-                message: LISTVIEW_MESSAGE.refresh_success,
-                icon: 'success',
-            });
         }
         catch (e) {
             alertErrorMessage({ message: LISTVIEW_MESSAGE.refresh_fail });
         }
-    };
+    }, [fetchData, methodRefreshFromStart, pagination]);
     /**
      * 组件刷新方法，通过类别区分
      */
-    const methodRefresh = (params) => {
+    const methodRefresh = useCallback((params) => {
         if (typeof params === 'object' && (params === null || params === void 0 ? void 0 : params.type) === 'refreshKeepPage') {
             methodRefreshKeepPage();
         }
         else {
             methodRefreshFromStart();
         }
-    };
+    }, [methodRefreshFromStart, methodRefreshKeepPage]);
     /**
      * 组件删除单条方法
      */
-    const methodDeleteOne = async (params) => {
+    const methodDeleteOne = useCallback(async (params) => {
         try {
             if (!isModel) {
                 return alertErrorMessage({
@@ -385,15 +380,18 @@ export default React.forwardRef(function ListView(props, ref) {
                 params: { _id },
             }));
             await methodRefreshKeepPage();
-            alertErrorMessage({
-                message: LISTVIEW_MESSAGE.deleteOne_success,
-                icon: 'success',
-            });
         }
         catch (e) {
             alertErrorMessage({ message: LISTVIEW_MESSAGE.deleteOne_fail });
         }
-    };
+    }, [appCloud, isModel, methodRefreshKeepPage]);
+    // 组件方法
+    useImperativeHandle(ref, () => ({
+        methods: {
+            deleteOne: methodDeleteOne,
+            refresh: methodRefresh,
+        },
+    }), [methodDeleteOne, methodRefresh]);
     /**
      * 分页，加载更多
      */