@cloudbase/weda-ui 3.4.10 → 3.4.11-alpha.1

package/dist/configs/components/customer-service.js

@@ -210,12 +210,15 @@ const config = defineConfig({
             'x-platforms': ['MP'],
             detail: {
                 errMsg: Type.String({
+                    title: '错误信息',
                     description: '错误信息',
                 }),
                 path: Type.String({
+                    title: '小程序消息指定的路径',
                     description: '小程序消息指定的路径',
                 }),
                 query: Type.Object({}, {
+                    title: '小程序消息指定的查询参数',
                     description: '小程序消息指定的查询参数',
                 }),
             },

package/dist/configs/components/form-user-tree-select.js

@@ -196,6 +196,19 @@ const data = Type.Object({
             selectedDataSourceName: 'sys_user',
         },
     }),
+    corpScope: Type.Array(Type.String({
+        type: 'string',
+        title: '企业id',
+        'x-category': '高级属性',
+    }), {
+        type: 'array',
+        title: '展示企业范围',
+        default: [],
+        'x-index': 88,
+        'x-category': '高级属性',
+        description: '填写企业id后，只展示这些企业下的部门和用户',
+        'x-helper-text': '支持写入企业id，用于限制组件中展示的企业列表',
+    }),
     layout: Type.StringEnum({
         enum: Tuple([
             {

package/dist/configs/components/wd-button.js

@@ -374,12 +374,15 @@ const config = defineConfig({
             'x-platforms': ['MP'],
             detail: {
                 errMsg: Type.String({
+                    title: '错误信息',
                     description: '错误信息',
                 }),
                 path: Type.String({
+                    title: '小程序消息指定的路径',
                     description: '小程序消息指定的路径',
                 }),
                 query: Type.Object({}, {
+                    title: '小程序消息指定的查询参数',
                     description: '小程序消息指定的查询参数',
                 }),
             },

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

@@ -20,7 +20,7 @@ const commonProperties = {
         'x-linkages': [
             {
                 type: 'value:state',
-                target: '*( filterFields,bindMetadata,queryCondition,orderBy,orderType,defaultPageSize)',
+                target: '*( filterFields,bindMetadata,queryCondition,orderBy,orderType,defaultPageSize,defaultPageIndex)',
                 condition: "{{$self.value !='custom-connector'}}",
                 state: {
                     display: true,
@@ -1028,14 +1028,17 @@ const config = defineConfig({
             name: 'tabTableRow',
             detail: {
                 record: Type.BasicTypeUnion({
+                    title: '选中行记录',
                     type: 'array',
                     description: '选中行记录',
                 }),
-                rowKey: Type.BasicTypeUnion({
+                rowKey: Type.String({
+                    title: '选中行记录id',
                     type: 'string',
                     description: '选中行记录id',
                 }),
-                recordIndex: Type.BasicTypeUnion({
+                recordIndex: Type.Number({
+                    title: '选中行index',
                     type: 'number',
                     description: '选中行index',
                 }),
@@ -1048,6 +1051,7 @@ const config = defineConfig({
             name: 'rowsSelect',
             detail: {
                 data: Type.BasicTypeUnion({
+                    title: '选中行记录',
                     type: 'array',
                     description: '选中行记录',
                 }),
@@ -1062,6 +1066,7 @@ const config = defineConfig({
             'x-platforms': ['MOBILEWEB', 'PCWEB'],
             detail: {
                 data: Type.BasicTypeUnion({
+                    title: '查询结果,查询条件',
                     type: 'object',
                     description: '查询结果,查询条件',
                 }),

package/dist/configs/components/web-view.js

@@ -54,6 +54,7 @@ const config = defineConfig({
             title: '网页加载成功',
             detail: {
                 src: Type.String({
+                    title: '网页链接地址',
                     description: '网页链接地址',
                 }),
             },
@@ -63,6 +64,7 @@ const config = defineConfig({
             title: '网页加载失败',
             detail: {
                 src: Type.String({
+                    title: '网页链接地址',
                     description: '网页链接地址',
                 }),
             },
@@ -72,6 +74,7 @@ const config = defineConfig({
             title: '接收网页消息',
             detail: {
                 data: Type.Object({}, {
+                    title: '接收信息内容',
                     description: '接收信息内容',
                 }),
             },

package/dist/docs/common/components/json-schema-view.js

@@ -8,7 +8,7 @@ export default function JsonSchemaView({ schema, }) {
     }
     if (properties) {
         return (_jsx("ul", { children: Object.entries(properties).map(([name, config]) => {
-                return (_jsxs("li", { children: [_jsx("b", { children: name }), ":", _jsx("code", { children: config.type }), config.description] }, name));
+                return (_jsxs("li", { children: [_jsx("b", { children: name }), ":", _jsx("code", { children: config.type }), (config === null || config === void 0 ? void 0 : config.description) || (config === null || config === void 0 ? void 0 : config.title)] }, name));
             }) }));
     }
 }

package/dist/web/actions/showMessage/index.js

@@ -1,5 +1,5 @@
 import { isH5Platform } from '../../utils/platform';
-import { message } from 'tea-component';
+import { message, setConfig } from 'tea-component';
 import './index.css';
 const iconType = {
     success: 'success',
@@ -24,6 +24,9 @@ export default function showMessage(props) {
                 });
         }
         else {
+            setConfig({
+                classPrefix: 'wedatea2td',
+            });
             const realIcon = iconType[icon];
             const isNotShowIcon = realIcon === 'none' || !realIcon;
             message[isNotShowIcon ? 'success' : icon]({

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

@@ -28,7 +28,7 @@ export default function Carousel({ className, style, autoplay, circular, vertica
             }, interval);
             return () => clearInterval(timer);
         }
-    }, [currentIndex, autoplay]);
+    }, [currentIndex, autoplay, itemCount]);
     // 触发切换
     const pre = useRef({ index: currentIndex }).current;
     useEffect(() => {

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

@@ -1,4 +1,4 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import * as React from 'react';
 import classNames from '../../../utils/classnames';
 import { usePlatform } from '../../../utils/platform';
@@ -59,14 +59,20 @@ label = '标题', labelVisible = true, name = 'formInput', defaultValue = '', pa
         e.preventDefault();
     };
     const onKeyDown = function (e) {
-        var _a;
+        var _a, _b;
         // 确认逻辑
         if (e.key === 'enter' || e.keyCode === 13) {
             (_a = events === null || events === void 0 ? void 0 : events.confirm) === null || _a === void 0 ? void 0 : _a.call(events, { value: e.target.value }, { originEvent: e });
         }
         // 数字类型的键盘, 不能输入e
-        if (inputType === 'number' && e.key === 'e') {
-            e.preventDefault();
+        if (inputType === 'number') {
+            if (e.key === 'e') {
+                e.preventDefault();
+            }
+            // 不能输入 -
+            if (e.key === '-' && ((_b = e.target.value) === null || _b === void 0 ? void 0 : _b.length) > 0) {
+                e.preventDefault();
+            }
         }
     };
     const onFocus = function (e) {
@@ -79,7 +85,7 @@ label = '标题', labelVisible = true, name = 'formInput', defaultValue = '', pa
         (_a = events === null || events === void 0 ? void 0 : events.blur) === null || _a === void 0 ? void 0 : _a.call(events, { value: e.target.value }, { originEvent: e });
         setIsFocus(false);
     };
-    const fieldEl = platform === 'h5' ? (_jsx("div", { className: subCls, children: _jsxs("div", { className: "weui-cell__bd weui-flex", children: [_jsx("input", { className: "weui-input", "data-testid": "weui-input-test", type: inputType, placeholder: placeholder, value: value, disabled: disabled, name: name, autoFocus: autoFocus, onChange: onChange, onFocus: onFocus, onBlur: onBlur, onKeyDown: onKeyDown, role: "input" }), clearable && (_jsx("button", { "data-testid": "weui-btn_input-clear-test", className: "weui-btn_reset weui-btn_icon weui-btn_input-clear", onMouseDown: onClear, children: _jsx("i", { className: "weui-icon-clear" }) }))] }) })) : (_jsx(ConfigProvider, { classPrefix: "wedatea2td", children: _jsxs("div", { className: 'weui-pc-input', children: [_jsx(TeaInput, { "data-testid": "weui-input-test-pc", className: 'pc-input', size: size, type: inputType, placeholder: placeholder, value: value, disabled: disabled, name: name, autoFocus: autoFocus, onChange: onChange, onFocus: onFocus, onBlur: onBlur, onKeyDown: onKeyDown }), showPcClear && (_jsx(Icon, { "data-testid": "weui-input-test-pc-clear", className: 'pc-clear', type: "dismiss", size: "s", onMouseDown: onClear }))] }) }));
+    const fieldEl = platform === 'h5' ? (_jsx(_Fragment, { children: _jsx("div", { className: subCls, children: _jsxs("div", { className: "weui-cell__bd weui-flex", children: [_jsx("input", { className: "weui-input", "data-testid": "weui-input-test", type: inputType, placeholder: placeholder, value: value, disabled: disabled, name: name, autoFocus: autoFocus, onChange: onChange, onFocus: onFocus, onBlur: onBlur, onKeyDown: onKeyDown, role: "input" }), clearable && (_jsx("button", { "data-testid": "weui-btn_input-clear-test", className: "weui-btn_reset weui-btn_icon weui-btn_input-clear", onMouseDown: onClear, children: _jsx("i", { className: "weui-icon-clear" }) }))] }) }) })) : (_jsx(ConfigProvider, { classPrefix: "wedatea2td", children: _jsxs("div", { className: 'weui-pc-input', children: [_jsx(TeaInput, { "data-testid": "weui-input-test-pc", className: 'pc-input', size: size, type: inputType, placeholder: placeholder, value: value, disabled: disabled, name: name, autoFocus: autoFocus, onChange: onChange, onFocus: onFocus, onBlur: onBlur, onKeyDown: onKeyDown }), showPcClear && (_jsx(Icon, { "data-testid": "weui-input-test-pc-clear", className: 'pc-clear', type: "dismiss", size: "s", onMouseDown: onClear }))] }) }));
     return renderDecorator(fieldEl, decorator)({
         id,
         className: cls,

package/dist/web/components/form/select/dropdown-select/index.js

@@ -118,7 +118,7 @@ export function PureSelect({ params, selectedValue, updateValue, placeholder, si
         const option = isSearch ? searchOptions : options;
         return platform === 'h5' ? option : transFormatTeaSelectKey(option);
     }, [isSearch, searchOptions, options, platform]);
-    useEffect(() => {
+    const handleSearch = () => {
         // 本地搜索
         if (!isTurnPages || options.length < PAGE_SIZE) {
             const searchOpt = options.filter((item) => {
@@ -145,6 +145,9 @@ export function PureSelect({ params, selectedValue, updateValue, placeholder, si
             }, 1000);
             return () => clearTimeout(timer);
         }
+    };
+    useEffect(() => {
+        handleSearch();
     }, [searchValue]);
     // 加载更多
     const loadMore = () => {
@@ -184,6 +187,9 @@ export function PureSelect({ params, selectedValue, updateValue, placeholder, si
         setSearchStatus(Status.LOADING);
         setSearchOptions([]);
         setSearchValue(value);
+        if (value == searchValue) {
+            handleSearch();
+        }
     };
     /**
      * 精确查找

package/dist/web/components/form/select/h5.js

@@ -164,7 +164,16 @@ defaultRegion, defaultMutiRegion, separator, regionType, onChange, }) {
         }
         else if (dateMode === 'day') {
             // 年月日，3 列
-            weui.datePicker({ id: String(Date.now()), ...options });
+            let defaultValue = null;
+            if (date) {
+                const dayDate = new Date(getIOSNotNaNDate(date));
+                defaultValue = [
+                    dayDate.getFullYear(),
+                    dayDate.getMonth() + 1,
+                    dayDate.getDate(),
+                ];
+            }
+            weui.datePicker({ id: String(Date.now()), ...options, defaultValue });
         }
         else {
             // 年月日时分秒，4列

package/dist/web/components/form/select/request.js

@@ -30,10 +30,22 @@ export const requestFatherRelatedOption = async (params, pageNo, type, searchVal
     let realWhere = [];
     if (searchValue) {
         if (type === RequestOptionType.SEARCH) {
-            realWhere = [{ key: primaryField, val: searchValue, rel: 'search' }];
+            realWhere = [
+                {
+                    [primaryField]: {
+                        $search: searchValue,
+                    },
+                },
+            ];
         }
         else if (type === RequestOptionType.EQUAL) {
-            realWhere = [{ key: '_id', val: searchValue, rel: 'eq' }];
+            realWhere = [
+                {
+                    _id: {
+                        $eq: searchValue,
+                    },
+                },
+            ];
         }
     }
     realWhere = [{ $and: [...getWhereList(where), ...realWhere] }];

package/dist/web/components/form/uploader/uploader.h5.js

@@ -48,23 +48,16 @@ export function ImageUploaderH5({ title: label, maxUploadCount, maxSize = 10, ac
         return maxUploadCount;
     }, [single, maxUploadCount]);
     const deleteFile = (url) => {
-        if (single) {
-            setInputValue('');
-            return;
-        }
-        setInputValue((list) => list.filter((f) => f !== url));
+        const value = single ? '' : fileIdList.filter((f) => f !== url);
+        setInputValue(value);
+        handleChange([].concat(value));
+    };
+    const handleChange = (ids) => {
+        const value = single ? ids[0] || '' : ids;
+        setInputValue(value);
+        onChange === null || onChange === void 0 ? void 0 : onChange(value);
+        events === null || events === void 0 ? void 0 : events.change({ value });
     };
-    React.useEffect(() => {
-        if (single) {
-            const file = fileIdList[0] || '';
-            onChange && onChange(file);
-            events.change && events.change({ value: file });
-        }
-        else {
-            onChange && onChange(fileIdList);
-            events.change && events.change({ value: fileIdList });
-        }
-    }, [fileIdList]);
     const onProgress = (progressEvent) => {
         let percentCompleted = 0;
         try {
@@ -74,28 +67,29 @@ export function ImageUploaderH5({ title: label, maxUploadCount, maxSize = 10, ac
         catch (e) { }
         setProgress(percentCompleted);
     };
-    const uploadToTcb = (file) => {
-        setUploading(true);
-        getCloudInstance().then(async (tcb) => {
-            try {
-                const cloudPath = `${uploadPath}/${randomStr()}-${file === null || file === void 0 ? void 0 : file.name.replace(/[%#]/g, '-')}`;
-                const { fileID } = await tcb.uploadFile({
-                    cloudPath,
-                    filePath: file,
-                    onUploadProgress: onProgress,
-                });
-                fileID && setInputValue((list) => [...list, fileID]);
-                fileID && events.success && events.success({ value: fileID, file });
-            }
-            catch (err) {
-                weui.alert('上传失败，请检查网络后重试');
-                events.error && events.error(err);
-            }
-            finally {
-                setUploading(false);
-                setProgress(0);
-            }
-        });
+    const uploadToTcb = async (file) => {
+        var _a;
+        try {
+            setUploading(true);
+            const tcb = await getCloudInstance();
+            const cloudPath = `${uploadPath}/${randomStr()}-${file === null || file === void 0 ? void 0 : file.name.replace(/[%#]/g, '-')}`;
+            const { fileID } = await tcb.uploadFile({
+                cloudPath,
+                filePath: file,
+                onUploadProgress: onProgress,
+            });
+            (_a = events.success) === null || _a === void 0 ? void 0 : _a.call(events, { value: fileID, file });
+            setUploading(false);
+            return fileID;
+        }
+        catch (err) {
+            weui.alert('上传失败，请检查网络后重试');
+            events.error && events.error(err);
+        }
+        finally {
+            setUploading(false);
+            setProgress(0);
+        }
     };
     const accepts = React.useMemo(() => {
         return acceptTypes.includes('image/*') || acceptTypes.length === 0
@@ -132,25 +126,29 @@ export function ImageUploaderH5({ title: label, maxUploadCount, maxSize = 10, ac
         }
         return fileIdList.length < maxUploadCount;
     }, [fileIdList, single, maxUploadCount, uploading]);
-    return (_jsx("div", { className: cls, id: id, style: style, children: _jsx("div", { children: _jsxs("div", { className: classNames('weui-uploader', layout), children: [_jsx("div", { className: classNames('weui-uploader__hd', layout), children: _jsx(UploaderLabel, { layout: layout, label: label, labelVisible: labelVisible, currentCount: fileIdList.length, maxCount: finalMaxImgCount, requiredFlag: requiredFlag }) }), _jsxs("div", { className: "weui-uploader__bd", children: [_jsxs("ul", { className: "weui-uploader__files", id: "uploaderFiles", children: [(fileIdList !== null && fileIdList !== void 0 ? fileIdList : []).map((f) => (_jsx(SingleImage, { src: f, deleteBySrc: deleteFile, disabled: disabled, imgTypeCls: imgTypeCls }, f))), fileIdList.length < 1 && formType === 'read' && _jsx(_Fragment, { children: "\u2014" }), uploading && (_jsx("li", { className: `weui-uploader__file weui-uploader__file_status ${imgTypeCls}`, children: _jsxs("div", { className: "weui-uploader__file-content", children: [progress, "%"] }) }))] }), showAdd && formType !== 'read' && (_jsx("div", { className: `weui-uploader__input-box ${imgTypeCls}`, children: !disabled && (_jsx("input", { "data-testid": "uploaderh5_input", id: "uploaderInput", className: "weui-uploader__input", type: "file", accept: accepts.join(','), multiple: !single && !(browserEnv().android && browserEnv().weixin), onChange: (e) => {
-                                        const files = [...e.target.files];
-                                        if (!islegalType(files, accepts))
-                                            return;
-                                        if (files.some((f) => f.size > maxSize * 1024 * 1024)) {
-                                            weui.alert('请上传不超过10M的图片');
-                                            return false;
-                                        }
-                                        if (files.length > finalMaxImgCount) {
-                                            // 防止一下子选择过多文件
-                                            weui.alert(`最多只能上传${finalMaxImgCount}张图片，请重新选择`);
-                                            return false;
-                                        }
-                                        if (fileIdList.length + files.length > finalMaxImgCount) {
-                                            weui.alert(`最多只能上传${finalMaxImgCount}张图片`);
-                                            return false;
-                                        }
-                                        files.forEach((f) => uploadToTcb(f));
-                                    } })) }))] })] }) }) }));
+    const uploadChange = async (e) => {
+        const files = [...e.target.files];
+        if (!islegalType(files, accepts))
+            return;
+        if (files.some((f) => f.size > maxSize * 1024 * 1024)) {
+            weui.alert(`请上传不超过 ${maxSize}M 的图片`);
+            return false;
+        }
+        if (files.length > finalMaxImgCount) {
+            // 防止一下子选择过多文件
+            weui.alert(`最多只能上传${finalMaxImgCount}张图片，请重新选择`);
+            return false;
+        }
+        if (fileIdList.length + files.length > finalMaxImgCount) {
+            weui.alert(`最多只能上传${finalMaxImgCount}张图片`);
+            return false;
+        }
+        const promiseAll = files.map((f) => uploadToTcb(f));
+        const result = await Promise.all(promiseAll);
+        const ids = [].concat(fileIdList, result);
+        handleChange(ids);
+    };
+    return (_jsx("div", { className: cls, id: id, style: style, children: _jsx("div", { children: _jsxs("div", { className: classNames('weui-uploader', layout), children: [_jsx("div", { className: classNames('weui-uploader__hd', layout), children: _jsx(UploaderLabel, { layout: layout, label: label, labelVisible: labelVisible, currentCount: fileIdList.length, maxCount: finalMaxImgCount, requiredFlag: requiredFlag }) }), _jsxs("div", { className: "weui-uploader__bd", children: [_jsxs("ul", { className: "weui-uploader__files", id: "uploaderFiles", children: [(fileIdList !== null && fileIdList !== void 0 ? fileIdList : []).map((f) => (_jsx(SingleImage, { src: f, deleteBySrc: deleteFile, disabled: disabled, imgTypeCls: imgTypeCls }, f))), fileIdList.length < 1 && formType === 'read' && _jsx(_Fragment, { children: "\u2014" }), uploading && (_jsx("li", { className: `weui-uploader__file weui-uploader__file_status ${imgTypeCls}`, children: _jsxs("div", { className: "weui-uploader__file-content", children: [progress, "%"] }) }))] }), showAdd && formType !== 'read' && (_jsx("div", { className: `weui-uploader__input-box ${imgTypeCls}`, children: !disabled && (_jsx("input", { "data-testid": "uploaderh5_input", id: "uploaderInput", className: "weui-uploader__input", type: "file", accept: accepts.join(','), multiple: !single && !(browserEnv().android && browserEnv().weixin), onChange: uploadChange })) }))] })] }) }) }));
 }
 function SingleImage({ src, deleteBySrc, disabled, imgTypeCls, }) {
     const cls = classNames({

package/dist/web/components/form/uploader/uploader.pc.js

@@ -36,39 +36,35 @@ export function UploaderPC({ layout, className, id, style, title, tips, ...props
 export function UploaderPCInner(props) {
     var _a;
     const { tips = '', btnTitle = '上传图片', maxUploadCount = 9, maxSize = 10, defaultValue, // 需要兼容 cloud:和https: 协议，需要兼容 字符串和字符串数组
-    acceptTypes = IMAGE_TYPES, uploadPath = 'weda-uploader', events = emptyObject, single = false, disabled = false, onChange, imgTypeCls, $node, } = props;
+    acceptTypes = IMAGE_TYPES, uploadPath = 'weda-uploader', events = emptyObject, single = false, disabled = false, onChange, imgTypeCls, $node, value, // 数据管理后台中，formily使用此字段传默认值
+     } = props;
     // 上传中
     const [uploading, setUploading] = React.useState(false);
     //上传进度
     const [progress, setProgress] = React.useState(0);
     // 文件列表
     const [fileIDList, setfileIDList] = React.useState([]);
-    const fileRef = React.useRef([]);
     const formType = ((_a = getParentForm($node)) === null || _a === void 0 ? void 0 : _a.formType) || 'create';
+    const defaultValueRef = React.useRef(null);
     React.useEffect(() => {
+        if (isObjectEqual(defaultValueRef.current, defaultValue))
+            return;
         let initialValue = []
-            .concat(defaultValue)
+            .concat(value ? value : defaultValue)
             .filter((d) => typeof d === 'string' && d !== '');
         if (single) {
             initialValue = initialValue[0] ? [initialValue[0]] : [];
         }
+        defaultValueRef.current = defaultValue;
         setfileIDList(initialValue);
     }, [defaultValue, single]);
-    // 值变化事件
-    React.useEffect(() => {
-        if (!isObjectEqual(fileRef.current, fileIDList)) {
-            if (single) {
-                const file = fileIDList[0] || '';
-                onChange && onChange(file);
-                events.change && events.change({ value: file });
-            }
-            else {
-                onChange && onChange(fileIDList);
-                events.change && events.change({ value: fileIDList });
-            }
-            fileRef.current = fileIDList;
-        }
-    });
+    const handleChange = (ids) => {
+        var _a;
+        setfileIDList(ids);
+        const value = single ? ids[0] || '' : ids;
+        onChange === null || onChange === void 0 ? void 0 : onChange(value);
+        (_a = events.change) === null || _a === void 0 ? void 0 : _a.call(events, { value });
+    };
     //验证上传文件类型是否合法
     const islegalType = (files, accepts) => {
         const illegalType = [];
@@ -113,32 +109,43 @@ export function UploaderPCInner(props) {
             catch (e) { }
             return false;
         }
-        uploadTcb(file);
+        const ids = fileList.filter((f) => !!f.id);
+        if (ids.length < fileList.length)
+            return false;
+        uploadTcbMulti(fileList);
         return false;
     };
+    // 多张上传
+    const uploadTcbMulti = async (files) => {
+        const promiseAll = files.map((f) => uploadTcb(f));
+        const result = await Promise.all(promiseAll);
+        const ids = [].concat(fileIDList, result);
+        handleChange(ids);
+    };
     // 自定义上传到 Tcb 的 COS
-    const uploadTcb = (file) => {
-        setUploading(true);
-        getCloudInstance().then(async (tcb) => {
-            try {
-                const cloudPath = `${uploadPath}/${randomStr()}-${file === null || file === void 0 ? void 0 : file.name.replace(/[%#]/g, '-')}`;
-                const { fileID } = await tcb.uploadFile({
-                    cloudPath,
-                    filePath: file,
-                    onUploadProgress: onProgress,
-                });
-                fileID && setfileIDList((list) => [...list, fileID]);
-                fileID && events.success && events.success({ value: fileID, file });
-            }
-            catch (err) {
-                message.error({ content: '上传失败，请检查网络后重试' });
-                events.error && events.error(err);
-            }
-            finally {
-                setUploading(false);
-                setProgress(0);
-            }
-        });
+    const uploadTcb = async (file) => {
+        var _a;
+        try {
+            setUploading(true);
+            const tcb = await getCloudInstance();
+            const cloudPath = `${uploadPath}/${randomStr()}-${file === null || file === void 0 ? void 0 : file.name.replace(/[%#]/g, '-')}`;
+            const { fileID } = await tcb.uploadFile({
+                cloudPath,
+                filePath: file,
+                onUploadProgress: onProgress,
+            });
+            (_a = events.success) === null || _a === void 0 ? void 0 : _a.call(events, { value: fileID, file });
+            setUploading(false);
+            return fileID;
+        }
+        catch (err) {
+            message.error({ content: '上传失败，请检查网络后重试' });
+            events.error && events.error(err);
+        }
+        finally {
+            setUploading(false);
+            setProgress(0);
+        }
     };
     // 计算上传进度
     const onProgress = (progressEvent) => {
@@ -152,7 +159,8 @@ export function UploaderPCInner(props) {
     };
     // 删除图片
     const deleteHandle = (fileID) => {
-        setfileIDList((list) => list.filter((d) => d !== fileID));
+        const ids = fileIDList.filter((d) => d !== fileID);
+        handleChange(ids);
     };
     // 转换后的属性
     const extraProps = {};

package/dist/web/components/form/uploaderFile/uploadFile.h5.js

@@ -56,22 +56,16 @@ events = emptyObject, defaultValue, uploadPath = 'weda-uploader', single = true,
         }
     }, [defaultValue]);
     React.useEffect(() => {
-        var _a, _b, _c;
+        var _a, _b;
+        if (isObjectEqual(fileRef.current, fileIDList))
+            return;
         // 外部 onChange 事件
         const pureFileIDList = fileIDList.filter((d) => isCloudFileID(d) || isHttpFileID(d));
-        if (single) {
-            const file = pureFileIDList[0] || '';
-            file && onChange && onChange(file);
-            (_a = events === null || events === void 0 ? void 0 : events.change) === null || _a === void 0 ? void 0 : _a.call(events, { value: file });
-        }
-        else {
-            onChange && onChange(pureFileIDList);
-            (_b = events === null || events === void 0 ? void 0 : events.change) === null || _b === void 0 ? void 0 : _b.call(events, { value: pureFileIDList });
-        }
-        if (!isObjectEqual(fileRef.current, fileIDList)) {
-            (_c = events === null || events === void 0 ? void 0 : events.success) === null || _c === void 0 ? void 0 : _c.call(events, { value: pureFileIDList });
-            fileRef.current = fileIDList;
-        }
+        const value = single ? pureFileIDList[0] || '' : pureFileIDList;
+        onChange === null || onChange === void 0 ? void 0 : onChange(value);
+        (_a = events === null || events === void 0 ? void 0 : events.change) === null || _a === void 0 ? void 0 : _a.call(events, { value });
+        (_b = events === null || events === void 0 ? void 0 : events.success) === null || _b === void 0 ? void 0 : _b.call(events, { value: pureFileIDList });
+        fileRef.current = fileIDList;
     }, [fileIDList]);
     // 外层组件类
     const cls = classNames({

package/dist/web/components/form/uploaderFile/uploadFile.pc.js

@@ -57,22 +57,14 @@ acceptTypes = emptyArray, downloadVisible = true, deleteVisible = true, uploadPa
         }
     }, [defaultValue]);
     React.useEffect(() => {
-        var _a, _b, _c;
+        var _a;
+        if (isObjectEqual(fileRef.current, fileIDList))
+            return;
         // 外部 onChange 事件
         const pureFileIDList = fileIDList.filter((d) => isCloudFileID(d) || isHttpFileID(d));
-        if (single) {
-            const file = pureFileIDList[0] || '';
-            onChange === null || onChange === void 0 ? void 0 : onChange(file);
-            (_a = events === null || events === void 0 ? void 0 : events.change) === null || _a === void 0 ? void 0 : _a.call(events, { value: file });
-        }
-        else {
-            onChange === null || onChange === void 0 ? void 0 : onChange(pureFileIDList);
-            (_b = events === null || events === void 0 ? void 0 : events.change) === null || _b === void 0 ? void 0 : _b.call(events, { value: pureFileIDList });
-        }
-        if (!isObjectEqual(fileRef.current, fileIDList)) {
-            (_c = events === null || events === void 0 ? void 0 : events.success) === null || _c === void 0 ? void 0 : _c.call(events, { value: pureFileIDList });
-            fileRef.current = fileIDList;
-        }
+        const value = single ? pureFileIDList[0] || '' : pureFileIDList;
+        onChange === null || onChange === void 0 ? void 0 : onChange(value);
+        (_a = events === null || events === void 0 ? void 0 : events.change) === null || _a === void 0 ? void 0 : _a.call(events, { value });
     }, [fileIDList]);
     // 外层组件类
     const cls = classNames({

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

@@ -54,6 +54,8 @@ export const fetchUserListByIds = async (selectUserIds = [], request) => {
                 UserType: 'internalUser',
                 NeedPrimaryColumn: true,
                 IsNoRelatedOrgFlag: false,
+                PageNo: index,
+                PageSize: PAGE_SIZE,
             }));
         }
         const results = await Promise.all(promises);
@@ -177,13 +179,36 @@ async function fetchUsersByOrgId(params, request) {
 /**
  *获取全量组织数据
  */
-export const DescribeOrgs = async (request) => {
+export const DescribeOrgs = async (request, params) => {
     try {
         const PAGE_SIZE = 1000;
-        const { Total = 0, DataList = [] } = await request('DescribeOrgs', {
+        // 如果传递了 params.corpScopes 参数，则只拉取这些企业下的部门展示
+        const corpScopes = params === null || params === void 0 ? void 0 : params.corpScopes;
+        const queryList = [];
+        if (corpScopes && Array.isArray(corpScopes) && corpScopes.length > 0) {
+            if (corpScopes.length === 1) {
+                queryList.push({
+                    Key: '_organizationId',
+                    Rel: 'eq',
+                    Val: corpScopes[0],
+                });
+            }
+            else {
+                queryList.push({
+                    Key: '_organizationId',
+                    Rel: 'in',
+                    Val: corpScopes,
+                });
+            }
+        }
+        const QueryWhereList = queryList.length > 0 ? queryList : undefined;
+        const result = await request('DescribeOrgs', {
             pageNo: 1,
             pageSize: PAGE_SIZE,
+            QueryWhereList,
         });
+        const Total = (result === null || result === void 0 ? void 0 : result.Total) || 0;
+        const DataList = (result === null || result === void 0 ? void 0 : result.DataList) || [];
         const total = Number(Total);
         // 一页拉取了全部数据，直接返回
         if (total <= PAGE_SIZE) {
@@ -196,11 +221,13 @@ export const DescribeOrgs = async (request) => {
             promises.push(request('DescribeOrgs', {
                 pageNo: index,
                 pageSize: PAGE_SIZE,
+                QueryWhereList,
             }));
         }
         const results = await Promise.all(promises);
         for (const res of results) {
-            if (res.DataList &&
+            if (res &&
+                res.DataList &&
                 Array.isArray(res.DataList) &&
                 res.DataList.length > 0) {
                 records.push(...res.DataList);

package/dist/web/components/form/userOrgSelect/common/utils.js

@@ -1,6 +1,7 @@
 import { callWedaApi } from '../../../../utils/tcb';
 import destr from 'destr';
 import { node } from 'prop-types';
+import { textToString } from '../../../../utils/platform';
 // 处理用户数据格式
 export const dealUserData = (data = []) => {
     return data.map((user) => {
@@ -192,14 +193,8 @@ export const displayUserInfo = (item, secondDisplay) => {
             return list[0].label;
         }
     }
-    let value;
-    if (item === null || item === void 0 ? void 0 : item[secondDisplay]) {
-        value = item === null || item === void 0 ? void 0 : item[secondDisplay];
-    }
-    else if ((_b = item === null || item === void 0 ? void 0 : item.userExtend) === null || _b === void 0 ? void 0 : _b[secondDisplay]) {
-        value = (_c = item === null || item === void 0 ? void 0 : item.userExtend) === null || _c === void 0 ? void 0 : _c[secondDisplay];
-    }
-    return value;
+    const value = (_b = item === null || item === void 0 ? void 0 : item[secondDisplay]) !== null && _b !== void 0 ? _b : (_c = item === null || item === void 0 ? void 0 : item.userExtend) === null || _c === void 0 ? void 0 : _c[secondDisplay];
+    return textToString(value);
 };
 /**
  * 前端实现部门模糊搜索

package/dist/web/components/form/userOrgSelect/component/org-tree.js

@@ -1,6 +1,6 @@
-import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
 import { Tree } from 'tea-component';
-import { LoadingStatus, ErrorStatus } from './error-tips';
+import { LoadingStatus, ErrorStatus, NullStatus } from './error-tips';
 import './index.css';
 export const OrgTree = (props) => {
     const { selectedOrgId = [], treeData, treeDataError, onActive, 
@@ -28,14 +28,24 @@ export const OrgTree = (props) => {
                 }
             }
         }
-        //}
     };
-    return (_jsx(_Fragment, { children: treeDataError ? (_jsx(ErrorStatus, { description: treeDataError || null })) : (_jsx(_Fragment, { children: treeData && treeData.length > 0 && !treeDataError ? (_jsx(Tree, { className: "depart-tree", data: treeData, fullActivable: true, activable: true, selectable: selectable, selectedIds: selectedOrgId, activeIds: selectedOrgId, defaultExpandedIds: defaultExpandedIds, selectStrictly: true, onActive: (ids, context) => {
-                    var _a;
-                    onChange(ids, context === null || context === void 0 ? void 0 : context.active, context === null || context === void 0 ? void 0 : context.nodeId, (_a = context === null || context === void 0 ? void 0 : context.data) === null || _a === void 0 ? void 0 : _a.selectable);
-                }, onSelect: (ids, context) => {
-                    onChange(ids, context === null || context === void 0 ? void 0 : context.selected, context === null || context === void 0 ? void 0 : context.nodeId, true);
-                }, 
-                // 开启虚拟滚动，优化大数据量性能！！
-                height: 320 })) : (_jsx(LoadingStatus, {})) })) }));
+    if (treeDataError) {
+        return _jsx(ErrorStatus, { description: treeDataError || null });
+    }
+    if (!treeData) {
+        return _jsx(LoadingStatus, {});
+    }
+    if (treeData.length > 0) {
+        return (_jsx(Tree, { className: "depart-tree", data: treeData, fullActivable: true, activable: true, selectable: selectable, selectedIds: selectedOrgId, activeIds: selectedOrgId, defaultExpandedIds: defaultExpandedIds, selectStrictly: true, onActive: (ids, context) => {
+                var _a;
+                onChange(ids, context === null || context === void 0 ? void 0 : context.active, context === null || context === void 0 ? void 0 : context.nodeId, (_a = context === null || context === void 0 ? void 0 : context.data) === null || _a === void 0 ? void 0 : _a.selectable);
+            }, onSelect: (ids, context) => {
+                onChange(ids, context === null || context === void 0 ? void 0 : context.selected, context === null || context === void 0 ? void 0 : context.nodeId, true);
+            }, 
+            // 开启虚拟滚动，优化大数据量性能！！
+            height: 320 }));
+    }
+    else {
+        return _jsx(NullStatus, { description: "\u6682\u65E0\u6570\u636E", size: 's' });
+    }
 };

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

@@ -13,6 +13,7 @@ import { useDepartData } from '../../hooks/use-depart-data';
 import { parseStrToArr } from '../../common/utils';
 export default function UserTreeSelect(props) {
     const { events = emptyObject, defaultValue = emptyArray, confirmValue = '', defaultValueType = 'noneUser', onChange = null, multiple = false, request = defaultRequest, where, confirmAction, closeAction, secondDisplay, // 辅助信息
+    corpScope, // 展示企业范围
     /**
      * 以下两个属性  不用在组件库，企业工作台使用该组件时支持外部定义样式
      * naked: 单纯使用该组件，而不在FormCell中使用（该组件实现默认在在）
@@ -42,7 +43,18 @@ export default function UserTreeSelect(props) {
     //组织下展示用户页大小
     const pageSize = 200;
     const { filterParams } = useViewData(where);
-    const { treeData, error } = useDepartData({ request });
+    const [corpScopes, setCorpScopes] = useState([]);
+    useEffect(() => {
+        if (!corpScope) {
+            return;
+        }
+        const corpScopes = filterStrList(parseStrToArr(corpScope));
+        setCorpScopes(corpScopes);
+    }, [corpScope]);
+    const { treeData, error } = useDepartData({
+        request,
+        params: { corpScopes },
+    });
     // 默认选中第一个部门
     useEffect(() => {
         var _a;

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

@@ -64,9 +64,9 @@ const isNoOrgList = {
     icon: Icon,
 };
 export const useDepartData = (props) => {
-    const { request } = props;
-    const { data: treeData, error } = useSWR('DescribeOrgs', async () => {
-        const tempList = await DescribeOrgs(request);
+    const { request, params } = props;
+    const { data: treeData, error } = useSWR(`${DescribeOrgs}_${JSON.stringify(params)}`, async () => {
+        const tempList = await DescribeOrgs(request, params);
         const orgsData = destr(tempList);
         const { res: tempTreeData, tempOrgList } = buildTreeData(orgsData);
         //是否展示非组织节点

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

@@ -35,13 +35,14 @@ export function useParentForm($widget) {
     return data;
 }
 export function useFormInputTrait(inputParams) {
+    var _a;
     const { value, $widget, inputRef, required, requiredMsg, rules = emptyArray, events, layout: currentLayout, setInnerHandle = noop, onChange: outerOnChange = noop, $node, } = inputParams;
     if (isNil($widget)) {
         throw new Error('$widget 没传入');
     }
     const eventsRef = useSyncedRef(events);
     const [name] = useSyncValue(inputParams.name);
-    const [disabled, setDisabled] = useSyncValue(inputParams.disabled);
+    const [disabled, setDisabled] = useSyncValue((_a = inputParams.disabled) !== null && _a !== void 0 ? _a : false);
     const [readOnly] = useSyncValue(inputParams.readOnly);
     const [validateState, setValidateState] = useState(inputParams.validateStatus);
     const [validateErrorMsg, setValidateErrorMsg] = useState('');

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

@@ -5,7 +5,7 @@ import Tips from '../form/tips';
 import { useFormInputTrait } from '../form-input-hooks';
 import { FormItemWrapper } from '../common/form-item-wrapper';
 const FormUserTreeSelect = React.forwardRef(function FormUserTreeSelect(props, inputRef) {
-    const { className, id, style, events, required, requiredFlag, label, labelVisible, confirmValue, defaultValueType, multiple, size, where, secondDisplay, ...restProps } = props;
+    const { className, id, style, events, required, requiredFlag, label, labelVisible, confirmValue, defaultValueType, multiple, size, where, secondDisplay, corpScope, ...restProps } = props;
     const { value, name, 
     // onChange,
     disabled, layout, 
@@ -19,6 +19,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 }), (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, 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 }), (validateState === 'error' || validateState === 'warn') && (_jsx(Tips, { tips: validateErrorMsg, type: "warn" }))] }));
 });
 export default FormUserTreeSelect;

package/dist/web/components/table/ImportFileModalByApi/uploadCSVFile.js

@@ -87,5 +87,5 @@ export function UploadCSVFile({ parseFile, fields, datasourceTitle, dbName, setD
                                             setDisableNext(true);
                                         }, children: "\u5220\u9664" })] }) }), children: isDragging ? ('释放鼠标') : (_jsx(Status, { className: "upload-file", icon: 'blank', size: 's', operation: _jsxs(_Fragment, { children: [_jsx("a", { onClick: open, children: "\u70B9\u51FB\u4E0A\u4F20" }), " /", ' ', _jsx(Text, { theme: "weak", children: "\u62D6\u62FD\u5230\u6B64\u533A\u57DF" })] }) })) })) }) }), _jsx("div", { className: "modal-upload-text-wrap", children: _jsxs("ul", { children: [_jsxs("li", { children: ["1\u3001\u8BF7\u4E0B\u8F7D\u4F7F\u7528", _jsx("span", { onClick: () => {
                                         getCSVTemplate(fields, datasourceTitle);
-                                    }, children: "\u00A0 \u5BFC\u5165\u6A21\u7248" }), "\uFF0C\u5E76\u6309\u7167\u793A\u4F8B\u586B\u5199\u6570\u636E\uFF0C\u4EE5\u4FDD\u8BC1\u6570\u636E\u5BFC\u5165\u987A\u5229"] }), _jsx("li", { children: "2\u3001\u652F\u6301xlsx\u7C7B\u578B\u6587\u4EF6\uFF0C\u8981\u6C42\u6587\u4EF6\u5927\u5C0F2M\u4EE5\u5185\uFF0C\u4E0D\u80FD\u8D85\u8FC710000\u884C" }), _jsxs("li", { children: [_jsx("div", { children: "3\u3001\u5BFC\u5165\u66F4\u65B0\u8BF4\u660E" }), _jsx("div", { children: "\u00A01\uFF09\u652F\u6301\u4EE5\u300C\u6570\u636E\u6807\u8BC6\u300D\u4F5C\u4E3A\u4F9D\u636E\u5B57\u6BB5\uFF0C\u5BF9\u5DF2\u6709\u6570\u636E\u8FDB\u884C\u5339\u914D\u66F4\u65B0" }), _jsx("div", { children: "\u00A02\uFF09\u5BFC\u5165\u6A21\u5F0F\u4E3A\u300C\u65B0\u589E\u6216\u66F4\u65B0\u300D\u65F6\uFF0C\u5982\u300C\u6570\u636E\u6807\u8BC6\u300D\u5217\u4E3A\u7A7A\uFF0C\u8BE5\u884C\u6570\u636E\u4F1A\u6267\u884C\u65B0\u589E\u64CD\u4F5C" })] }), _jsxs("li", { children: [_jsx("div", { children: "4\u3001\u6570\u636E\u683C\u5F0F\u8BF4\u660E" }), _jsx("div", { children: "\u00A0 1\uFF09\u679A\u4E3E\u7C7B\u578B\u6570\u636E\uFF1A\u652F\u6301\u9009\u62E9\u9009\u9879\u6807\u8BC6\u6216\u9009\u9879\u503C\u8FDB\u884C\u5BFC\u5165\uFF1A\u9009\u9879\u6807\u8BC6\u4E3A\u8868\u683C\u4E2D\u5C55\u793A\u7684\u4E1A\u52A1\u540D\u79F0\uFF1B\u9009\u9879\u503C\u4E3A\u9009\u9879\u7684\u7CFB\u7EDF\u552F\u4E00\u6807\u8BC6" }), _jsx("div", { children: "\u00A02\uFF09\u5173\u8054\u5173\u7CFB\u3001\u4E3B\u5B50\u660E\u7EC6\u7C7B\u578B\u6570\u636E\uFF1A\u652F\u6301\u9009\u62E9\u4E3B\u5217\u5B57\u6BB5\u6216\u6570\u636E\u6807\u8BC6\u8FDB\u884C\u5BFC\u5165\uFF1A\u4E3B\u5217\u5B57\u6BB5\u4E3A\u8868\u683C\u4E2D\u5C55\u793A\u7684\u5173\u8054\u6570\u636E\u4E1A\u52A1\u540D\u79F0\uFF1B\u6570\u636E\u6807\u8BC6\u4E3A\u5173\u8054\u6570\u636E\u7684\u7CFB\u7EDF\u552F\u4E00\u6807\u8BC6" }), _jsx("div", { children: "\u00A03\uFF09\u5E03\u5C14\u7C7B\u578B\u6570\u636E\uFF1A\u652F\u6301\u5BFC\u5165\u300C\u662F/\u5426\u300D\u6216\u300Ctrue/false\u300D" }), _jsx("div", { children: "\u00A04\uFF09\u56FE\u7247\u7C7B\u578B\u6570\u636E\uFF1A\u652F\u6301\u5BFC\u5165https\u6216cloud\u534F\u8BAE\u7684\u56FE\u7247\u5730\u5740" }), _jsx("div", { children: "\u00A05\uFF09\u6587\u4EF6\u7C7B\u578B\u6570\u636E\uFF1A\u652F\u6301cloud\u534F\u8BAE\u7684\u6587\u4EF6\u5730\u5740" }), _jsx("div", { children: "\u00A06\uFF09\u5730\u7406\u4F4D\u7F6E\u7C7B\u578B\u6570\u636E\uFF1A\u6570\u636E\u683C\u5F0F\u8981\u6C42\u4E3A\u5730\u70B9\u540D\u79F0(\u5750\u6807\u7ECF\u5EA6\uFF0C\u5750\u6807\u7EF4\u5EA6)" })] })] }) })] }));
+                                    }, children: "\u00A0 \u5BFC\u5165\u6A21\u7248" }), "\uFF0C\u5E76\u6309\u7167\u793A\u4F8B\u586B\u5199\u6570\u636E\uFF0C\u4EE5\u4FDD\u8BC1\u6570\u636E\u5BFC\u5165\u987A\u5229"] }), _jsx("li", { children: "2\u3001\u652F\u6301xlsx\u7C7B\u578B\u6587\u4EF6\uFF0C\u8981\u6C42\u6587\u4EF6\u5927\u5C0F2M\u4EE5\u5185\uFF0C\u4E0D\u80FD\u8D85\u8FC710000\u884C" }), _jsxs("li", { children: [_jsx("div", { children: "3\u3001\u5BFC\u5165\u66F4\u65B0\u8BF4\u660E" }), _jsx("div", { children: "\u00A01\uFF09\u652F\u6301\u9009\u62E9\u5F00\u542F\u552F\u4E00\u5C5E\u6027\u7684\u5B57\u6BB5\uFF0C\u7528\u4E8E\u5339\u914D\u5E76\u66F4\u65B0\u5DF2\u6709\u7684\u6570\u636E\u8BB0\u5F55" }), _jsx("div", { children: "\u00A02\uFF09\u5BFC\u5165\u6A21\u5F0F\u4E3A\u300C\u65B0\u589E\u6216\u66F4\u65B0\u300D\u65F6\uFF0C\u5982\u300C\u6570\u636E\u6807\u8BC6\u300D\u5217\u4E3A\u7A7A\uFF0C\u8BE5\u884C\u6570\u636E\u4F1A\u6267\u884C\u65B0\u589E\u64CD\u4F5C" })] }), _jsxs("li", { children: [_jsx("div", { children: "4\u3001\u6570\u636E\u683C\u5F0F\u8BF4\u660E" }), _jsx("div", { children: "\u00A0 1\uFF09\u679A\u4E3E\u7C7B\u578B\u6570\u636E\uFF1A\u652F\u6301\u9009\u62E9\u9009\u9879\u6807\u8BC6\u6216\u9009\u9879\u503C\u8FDB\u884C\u5BFC\u5165\uFF1A\u9009\u9879\u6807\u8BC6\u4E3A\u8868\u683C\u4E2D\u5C55\u793A\u7684\u4E1A\u52A1\u540D\u79F0\uFF1B\u9009\u9879\u503C\u4E3A\u9009\u9879\u7684\u7CFB\u7EDF\u552F\u4E00\u6807\u8BC6" }), _jsx("div", { children: "\u00A02\uFF09\u5173\u8054\u5173\u7CFB\u3001\u4E3B\u5B50\u660E\u7EC6\u7C7B\u578B\u6570\u636E\uFF1A\u652F\u6301\u9009\u62E9\u4E3B\u5217\u5B57\u6BB5\u6216\u6570\u636E\u6807\u8BC6\u8FDB\u884C\u5BFC\u5165\uFF1A\u4E3B\u5217\u5B57\u6BB5\u4E3A\u8868\u683C\u4E2D\u5C55\u793A\u7684\u5173\u8054\u6570\u636E\u4E1A\u52A1\u540D\u79F0\uFF1B\u6570\u636E\u6807\u8BC6\u4E3A\u5173\u8054\u6570\u636E\u7684\u7CFB\u7EDF\u552F\u4E00\u6807\u8BC6" }), _jsx("div", { children: "\u00A03\uFF09\u5E03\u5C14\u7C7B\u578B\u6570\u636E\uFF1A\u652F\u6301\u5BFC\u5165\u300C\u662F/\u5426\u300D\u6216\u300Ctrue/false\u300D" }), _jsx("div", { children: "\u00A04\uFF09\u56FE\u7247\u7C7B\u578B\u6570\u636E\uFF1A\u652F\u6301\u5BFC\u5165https\u6216cloud\u534F\u8BAE\u7684\u56FE\u7247\u5730\u5740" }), _jsx("div", { children: "\u00A05\uFF09\u6587\u4EF6\u7C7B\u578B\u6570\u636E\uFF1A\u652F\u6301cloud\u534F\u8BAE\u7684\u6587\u4EF6\u5730\u5740" }), _jsx("div", { children: "\u00A06\uFF09\u5730\u7406\u4F4D\u7F6E\u7C7B\u578B\u6570\u636E\uFF1A\u6570\u636E\u683C\u5F0F\u8981\u6C42\u4E3A\u5730\u70B9\u540D\u79F0(\u5750\u6807\u7ECF\u5EA6\uFF0C\u5750\u6807\u7EF4\u5EA6)" })] })] }) })] }));
 }

package/dist/web/components/wd-form/index.js

@@ -143,7 +143,8 @@ const WdForm = React.forwardRef(function WdForm(props, ref) {
             }
             else {
                 formItemMap.forEach((item) => {
-                    item.setReadOnly(item.initialDisabled);
+                    var _a;
+                    item.setReadOnly((_a = item.initialDisabled) !== null && _a !== void 0 ? _a : false);
                 });
             }
         });
@@ -176,7 +177,7 @@ const WdForm = React.forwardRef(function WdForm(props, ref) {
             setValue(fetchedInitialValues, true);
         }
     }, [fetchedInitialValues, initValueFetchError, isLoadingInitValues, setValue]);
-    const { data: dataSourceProfile } = useDataSource();
+    const { data: dataSourceProfile } = useDataSource(dataSourceName);
     const authValue = useAuthValue({
         appCloud,
         isDataModel,

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

@@ -16,6 +16,7 @@ import { QuoteModal } from './QuoteModal';
 import { TABLE_SLOT_PREFIX } from '../../../../utils/constant';
 import { getPrimaryField } from '../../../../utils/datasource';
 import { useConfig } from '../../../../utils/config-context';
+import { EnumHoc } from '../../../../utils/hooks/EnumHoc';
 import { ImagePreview } from './ImagePreview';
 const MODAL_SIZE = 'auto';
 // 文字提示框包裹组件
@@ -47,10 +48,7 @@ export function getFieldRender(field = {}, extra = {}) {
     }
     // render 方法
     const FieldRender = (val) => {
-        var _a;
-        if (isValueEmpty(val) ||
-            (type === 'array' && !(val === null || val === void 0 ? void 0 : val.length)) ||
-            (type === 'array' && (val === null || val === void 0 ? void 0 : val.length) && !((_a = Object.keys(val[0])) === null || _a === void 0 ? void 0 : _a.length))) {
+        if (isValueEmpty(val) || (type === 'array' && !(val === null || val === void 0 ? void 0 : val.length))) {
             return '-';
         }
         // fieldValue 值转换，如布尔/时间/枚举等
@@ -211,10 +209,10 @@ export const DataItemView = ({ fields, modelType, value }) => {
  * object，展示表格组件
  */
 export const DataTableView = ({ fields, value }) => {
+    var _a;
     const { classPrefix } = useConfig();
+    const rawFields = (_a = Object === null || Object === void 0 ? void 0 : Object.entries(fields.properties)) === null || _a === void 0 ? void 0 : _a.map(([name, field]) => Object.assign({}, field, { name }));
     const columns = useMemo(() => {
-        var _a;
-        const rawFields = (_a = Object === null || Object === void 0 ? void 0 : Object.entries(fields.properties)) === null || _a === void 0 ? void 0 : _a.map(([name, field]) => Object.assign({}, field, { name }));
         const rawFieldsSort = rawFields.sort((a, b) => a['x-index'] - b['x-index']);
         const baseColumns = getColumns({
             columnSets: [],
@@ -222,8 +220,8 @@ export const DataTableView = ({ fields, value }) => {
             isH5: false,
         });
         return baseColumns;
-    }, [fields]);
-    return (_jsx(ConfigProvider, { classPrefix: classPrefix, children: _jsx(Table, { className: `${classPrefix}-table-wrap`, bordered: "all", recordKey: "_id", records: [].concat(value), columns: columns }) }));
+    }, [rawFields]);
+    return (_jsx(ConfigProvider, { classPrefix: classPrefix, children: _jsx(EnumHoc, { fields: rawFields, children: _jsx(Table, { className: `${classPrefix}-table-wrap`, bordered: "all", recordKey: "_id", records: [].concat(value), columns: columns }) }) }));
 };
 /**
  * array类型，展示组件
@@ -576,6 +574,19 @@ export const getFieldValue = (name, _record) => {
     return record[name];
 };
 export const slotRender = (slot, props = {}) => typeof slot === 'function' ? slot(props) : slot;
+const TableSlotCell = ({ record, rowKey, recordIndex, column, columnIndex, slot, }) => {
+    const component = React.useMemo(() => {
+        // 计算单元格的值
+        return slotRender(slot, {
+            record,
+            rowKey,
+            recordIndex,
+            column,
+            columnIndex,
+        });
+    }, [record, rowKey, recordIndex, column, columnIndex]);
+    return _jsx(_Fragment, { children: component });
+};
 /**
  * 根据列管理，过滤表格列信息
  * columns: { key, header, width, align, render,fixed }[] Tea Table 的列
@@ -610,20 +621,7 @@ export const filterCustomColumns = ({ columns, columnSets, slots }) => {
         if (genre === 'slot') {
             // 拿到列对应的插槽
             const slot = slots[`${TABLE_SLOT_PREFIX}${(item2 === null || item2 === void 0 ? void 0 : item2.slotKey) || key}`];
-            const TableSlotCell = ({ record, rowKey, recordIndex, column, columnIndex, }) => {
-                const component = React.useMemo(() => {
-                    // 计算单元格的值
-                    return slotRender(slot, {
-                        record,
-                        rowKey,
-                        recordIndex,
-                        column,
-                        columnIndex,
-                    });
-                }, [record, rowKey, recordIndex, column, columnIndex]);
-                return _jsx(_Fragment, { children: component });
-            };
-            customColumn.render = (record, rowKey, recordIndex, column, columnIndex) => (_jsx(TableSlotCell, { record: record, rowKey: rowKey, recordIndex: recordIndex, column: column, columnIndex: columnIndex }));
+            customColumn.render = (record, rowKey, recordIndex, column, columnIndex) => (_jsx(TableSlotCell, { record: record, rowKey: rowKey, recordIndex: recordIndex, column: column, columnIndex: columnIndex, slot: slot }));
         }
         return customColumn;
     });

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

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 /* eslint-disable max-lines */
-import { useRef, useEffect, useState, useMemo, memo, useImperativeHandle, forwardRef, } from 'react';
+import { useRef, useEffect, useState, useMemo, useImperativeHandle, forwardRef, } from 'react';
 import { ConfigProvider } from 'tea-component';
 import { Table, ExportFileModal, ImportFileModal, InOrOutRecordModal, deleteRecord, importHandleByApi, exportHandleByApi, exportHandle, FilterFieldsPanel, ToolBar, } from './components';
 import classNames from '../../utils/classnames';
@@ -24,6 +24,22 @@ import Modal from '../modal';
 import { WdButton } from '../wd-button';
 const _defaultPageIndex = 1;
 const _defaultPageSize = 10;
+const TableOption = ({ record, rowKey, recordIndex, column, columnIndex, slots, classPrefix, }) => {
+    const component = useMemo(() => {
+        // 计算单元格的值
+        return slotRender(slots[CELL_CUSTOM_OPTION], {
+            record,
+            rowKey,
+            recordIndex,
+            column,
+            columnIndex,
+        });
+    }, [column, columnIndex, record, recordIndex, rowKey, slots]);
+    return (_jsx("div", { className: `${classPrefix}-pc-table-option-btn-wrap`, children: component }));
+};
+const GlobalButton = function GlobalButtonDom({ classPrefix, slots, }) {
+    return _jsx("div", { className: `${classPrefix}-global-btn`, children: slotRender(slots) });
+};
 // eslint-disable-next-line complexity
 export const WdTable = forwardRef(function TableComp({ className, style, dataSourceType, bindConnectMetadata = {
     datasource: { id: '', name: '', title: '' },
@@ -202,19 +218,6 @@ enableRefreshBtn = true, enableTableHeightSizeBtn = true, emptyText, ...props },
         });
         // 操作列
         if (enableCellCustomOption && !isH5) {
-            const TableOption = ({ record, rowKey, recordIndex, column, columnIndex, }) => {
-                const component = useMemo(() => {
-                    // 计算单元格的值
-                    return slotRender(slots[CELL_CUSTOM_OPTION], {
-                        record,
-                        rowKey,
-                        recordIndex,
-                        column,
-                        columnIndex,
-                    });
-                }, [column, columnIndex, record, recordIndex, rowKey]);
-                return (_jsx("div", { className: `${classPrefix}-pc-table-option-btn-wrap`, children: component }));
-            };
             // 展示插槽操作列
             baseColumns.push({
                 key: 'button',
@@ -222,7 +225,7 @@ enableRefreshBtn = true, enableTableHeightSizeBtn = true, emptyText, ...props },
                 width: 150,
                 align: 'left',
                 fixed: 'right',
-                render: (record, rowKey, recordIndex, column, columnIndex) => (_jsx(TableOption, { record: record, rowKey: rowKey, recordIndex: recordIndex, column: column, columnIndex: columnIndex })),
+                render: (record, rowKey, recordIndex, column, columnIndex) => (_jsx(TableOption, { slots: slots, classPrefix: classPrefix, record: record, rowKey: rowKey, recordIndex: recordIndex, column: column, columnIndex: columnIndex })),
             });
         }
         // 选择列
@@ -401,9 +404,6 @@ enableRefreshBtn = true, enableTableHeightSizeBtn = true, emptyText, ...props },
         // 仅当切换小屏的时候重新请求
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [isH5]);
-    const GlobalButton = memo(function GlobalButtonDom({ classPrefix, slots, }) {
-        return (_jsx("div", { className: `${classPrefix}-global-btn`, children: slotRender(slots) }));
-    });
     const hasFilterButton = !!filterFieldsData.length;
     const recordKey = isInIde() ? undefined : '_id';
     return (_jsx(ConfigProvider, { classPrefix: classPrefix, children: _jsx(EnumHoc, { fields: authFields, children: _jsxs("div", { className: classNames(wrapClassList, className), style: style, id: id, children: [_jsx(FilterFieldsPanel, { openMobileFilter: openMobileFilter, setOpenMobileFilter: setOpenMobileFilter, filterFields: filterFieldsData, fetchData: (searchValues = []) => {

package/dist/web/utils/datasource.js

@@ -1,5 +1,4 @@
 import { isInIde, alertErrorMessage, isSystemField } from './platform';
-import { deepClone } from './tool';
 /* **** 数据源相关方法 **** */
 const callWedaApi = (...args) => { var _a, _b; return (_b = (_a = window === null || window === void 0 ? void 0 : window.app) === null || _a === void 0 ? void 0 : _a.cloud) === null || _b === void 0 ? void 0 : _b.callWedaApi(...args); };
 export class DataSource {
@@ -350,22 +349,29 @@ export const resolveFieldsFromDatasource = async ({ dbName, enabledFieldNames, d
  * 获取主列字段标识并展示主列字段
  */
 export const getPrimaryField = (_data) => {
-    const data = deepClone(_data);
-    const keys = Object.keys(data).filter((item) => item.includes('@'));
-    keys.forEach((item) => {
-        var _a, _b, _c, _d, _e;
-        const field = item.replace('@', '');
-        const record = (_a = data[item]) === null || _a === void 0 ? void 0 : _a.v1.record;
-        const name = (_b = data[item]) === null || _b === void 0 ? void 0 : _b.v1.primaryColumn;
-        if (name) {
-            // 系统主列字段当record不存在时，默认展示最外层owner、createBy、updateBy字段，与其他列字段逻辑一致
-            if (record && record._id === data[field]) {
-                // 当record下主列字段没有值时，默认返回主列id
-                record[name]
-                    ? (data[field] = record[name])
-                    : (data[field] = ((_e = (_d = (_c = data[item]) === null || _c === void 0 ? void 0 : _c.v1) === null || _d === void 0 ? void 0 : _d.record) === null || _e === void 0 ? void 0 : _e._id) || '-');
+    let data = {};
+    try {
+        data = JSON.parse(JSON.stringify(_data));
+        const keys = Object.keys(data).filter((item) => item.includes('@'));
+        keys.forEach((item) => {
+            var _a, _b, _c, _d, _e, _f, _g;
+            const field = item.replace('@', '');
+            const record = (_b = (_a = data[item]) === null || _a === void 0 ? void 0 : _a.v1) === null || _b === void 0 ? void 0 : _b.record;
+            const name = (_d = (_c = data[item]) === null || _c === void 0 ? void 0 : _c.v1) === null || _d === void 0 ? void 0 : _d.primaryColumn;
+            if (name) {
+                // 系统主列字段当record不存在时，默认展示最外层owner、createBy、updateBy字段，与其他列字段逻辑一致
+                if (record && record._id === data[field]) {
+                    // 当record下主列字段没有值时，默认返回主列id
+                    record[name]
+                        ? (data[field] = record[name])
+                        : (data[field] = ((_g = (_f = (_e = data[item]) === null || _e === void 0 ? void 0 : _e.v1) === null || _f === void 0 ? void 0 : _f.record) === null || _g === void 0 ? void 0 : _g._id) || '-');
+                }
             }
-        }
-    });
+        });
+    }
+    catch (error) {
+        console.error('主列字段数据转换出错', error);
+        return _data;
+    }
     return data;
 };

package/dist/web/utils/date.js

@@ -73,10 +73,10 @@ export const formatDateToNumber = (dateType = 'date', t = '') => {
  */
 export const dateCalculation = ({ key, val, rel }, filterType) => {
     const dateSearchvalue = [];
-    // 1.date日期时间查询精确到秒，换算成毫秒时间戳存储，区间相隔一秒
-    // 2.datetime日期查询精确到日，日期换算成毫秒时间戳存储，区间相隔一日
+    // 1.datetime日期时间查询精确到秒，换算成毫秒时间戳存储，区间相隔一秒
+    // 2.date日期查询精确到日，日期换算成毫秒时间戳存储，区间相隔一日 86400000（未满1日，86399999）
     // 3.time时间查询精确到毫秒,换算成毫秒存储，区间相隔一秒
-    const endTime = filterType === 'date' ? 86400000 : 999;
+    const endTime = filterType === 'date' ? 86399999 : 999;
     switch (rel) {
         case 'eq':
             dateSearchvalue.push({

package/package.json

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