npm - @cloudbase/weda-ui - Versions diffs - 3.13.1 → 3.13.3 - Mend

@cloudbase/weda-ui 3.13.1 → 3.13.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (22) hide show

package/dist/web/components/echart/echart.js CHANGED Viewed

@@ -1,5 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { useRef, forwardRef, useImperativeHandle, useState, useCallback, useEffect, } from 'react';
+import { useRef, forwardRef, useImperativeHandle, useState, useCallback, useEffect } from 'react';
 import { useEventListener, useResizeObserver } from '@react-hookz/web';
 import classNames from '../../utils/classnames';
 import { useConfig } from '../../utils/config-context';
@@ -9,8 +9,7 @@ let Echarts = null;
 const getEchartInstance = async () => {
     if (ReactEcharts && Echarts)
         return ReactEcharts;
-    const { default: _ } = await import(
-    /* webpackChunkName: "echarts-for-react" */ 'echarts-for-react');
+    const { default: _ } = await import(/* webpackChunkName: "echarts-for-react" */ 'echarts-for-react');
     Echarts = await import(/* webpackChunkName: "echarts" */ 'echarts');
     ReactEcharts = _;
 };
@@ -102,5 +101,5 @@ export const Echart = forwardRef(function Echart(props, ref) {
         click,
         dblclick,
     };
-    return (_jsx("div", { id: id, style: { width: '100%', ...style }, ref: domRef, "data-testid": "wd-chart-test", children: init && (_jsx(ReactEcharts, { style: style, className: classNames(classes, className), option: props.option || {}, theme: themeState || (props.dark ? 'dark' : 'auto'), opts: props.opts, onChartReady: onChartReadyCallback, onEvents: onEvents })) }));
+    return (_jsx("div", { id: id, className: classNames(classes, className), style: { width: '100%', ...style }, ref: domRef, "data-testid": "wd-chart-test", children: init && (_jsx(ReactEcharts, { option: props.option || {}, theme: themeState || (props.dark ? 'dark' : 'auto'), opts: props.opts, onChartReady: onChartReadyCallback, onEvents: onEvents })) }));
 });

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

@@ -40,9 +40,7 @@ export function ImageUploaderH5(props) {
         (_a = events === null || events === void 0 ? void 0 : events.change) === null || _a === void 0 ? void 0 : _a.call(events, { value, isDelete });
     };
     const accepts = React.useMemo(() => {
-        return acceptTypes.length === 0
-            ? IMAGE_TYPES
-            : Array.from(new Set(acceptTypes));
+        return acceptTypes.length === 0 ? IMAGE_TYPES : Array.from(new Set(acceptTypes));
     }, [acceptTypes]);
     const showAdd = React.useMemo(() => {
         if (single) {
@@ -92,8 +90,7 @@ export function ImageUploaderH5(props) {
                 if (typeof ret === 'boolean') {
                     shouldUploadToCos = ret;
                 }
-                else if (Array.isArray(ret) &&
-                    ret.every((item) => item instanceof File)) {
+                else if (Array.isArray(ret) && ret.every((item) => item instanceof File)) {
                     files = ret;
                 }
                 else if (!isNil(ret)) {
@@ -114,15 +111,15 @@ export function ImageUploaderH5(props) {
         const allFile = await upload(files);
         handleChange(allFile);
     };
-    return (_jsx("div", { className: cls, id: id, style: style, children: _jsxs("div", { className: classNames('weui-uploader weui-cells weui-cells_form weda-formcells', layout, layoutCls), children: [_jsx("div", { className: classNames('weui-uploader__hd', layout), children: _jsx(UploaderLabel, { layout: layout, label: label, labelVisible: labelVisible, currentCount: tempFile.length, maxCount: finalMaxImgCount, requiredFlag: requiredFlag }) }), _jsxs("div", { className: "weui-uploader__bd", children: [_jsxs("ul", { className: "weui-uploader__files", id: "uploaderFiles", children: [(_a = (tempFile !== null && tempFile !== void 0 ? tempFile : [])) === null || _a === void 0 ? void 0 : _a.map((f) => (_jsx(SingleImage, { tempFile: f, deleteBySrc: deleteFile, disabled: disabled || readOnly || sourceType === 'album', imgTypeCls: imgTypeCls }, f === null || f === void 0 ? void 0 : f.key))), tempFile.length < 1 && readOnly && _jsx(_Fragment, { children: "-" })] }), showAdd && !readOnly && (_jsx("div", { className: `weui-uploader__input-box ${imgTypeCls}`, children: !disabled &&
-                                sourceType !== 'album' &&
-                                (sourceType === 'camera' ? (_jsx("input", { ref: inputRef, onClick: () => {
-                                        inputRef.current && (inputRef.current.value = '');
-                                    }, "data-testid": "uploaderh5_input", id: "uploaderInput", className: "weui-uploader__input", type: "file", accept: accepts.join(','), multiple: !single && !(browserEnv().android && browserEnv().weixin), capture: true, onChange: uploadChange })) : (_jsx("input", { ref: inputRef, onClick: () => {
-                                        inputRef.current && (inputRef.current.value = '');
-                                    }, "data-testid": "uploaderh5_input", id: "uploaderInput", className: "weui-uploader__input", type: "file", accept: accepts.join(','), multiple: !single && !(browserEnv().android && browserEnv().weixin), onChange: uploadChange }))) }))] })] }) }));
+    return (_jsx("div", { className: cls, id: id, style: style, children: _jsxs("div", { className: classNames('weui-uploader weui-cells weui-cells_form weda-formcells', layout, layoutCls), children: [_jsx("div", { className: classNames('weui-uploader__hd', layout), children: _jsx(UploaderLabel, { layout: layout, label: label, labelVisible: labelVisible, currentCount: tempFile.length, maxCount: finalMaxImgCount, requiredFlag: requiredFlag }) }), _jsx("div", { className: "weui-uploader__bd", children: _jsxs("ul", { className: "weui-uploader__files", id: "uploaderFiles", children: [(_a = (tempFile !== null && tempFile !== void 0 ? tempFile : [])) === null || _a === void 0 ? void 0 : _a.map((f) => (_jsx(SingleImage, { tempFile: f, deleteBySrc: deleteFile, disabled: disabled || readOnly || sourceType === 'album', imgTypeCls: imgTypeCls }, f === null || f === void 0 ? void 0 : f.key))), tempFile.length < 1 && readOnly && _jsx(_Fragment, { children: "-" }), showAdd && !readOnly && (_jsx("li", { className: `weui-uploader__input-box ${imgTypeCls}`, children: !disabled &&
+                                    sourceType !== 'album' &&
+                                    (sourceType === 'camera' ? (_jsx("input", { ref: inputRef, onClick: () => {
+                                            inputRef.current && (inputRef.current.value = '');
+                                        }, "data-testid": "uploaderh5_input", id: "uploaderInput", className: "weui-uploader__input", type: "file", accept: accepts.join(','), multiple: !single && !(browserEnv().android && browserEnv().weixin), capture: true, onChange: uploadChange })) : (_jsx("input", { ref: inputRef, onClick: () => {
+                                            inputRef.current && (inputRef.current.value = '');
+                                        }, "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({ deleteBySrc, disabled, imgTypeCls, tempFile, }) {
+function SingleImage({ deleteBySrc, disabled, imgTypeCls, tempFile }) {
     const { progress, loading, realUrl, tempUrl } = tempFile;
     const cls = classNames({
         'weui-uploader__file': true,
@@ -149,11 +146,11 @@ function SingleImage({ deleteBySrc, disabled, imgTypeCls, tempFile, }) {
             },
         });
     };
-    return (_jsxs("li", { className: `${cls} ${imgTypeCls}`, style: imgStyle, onClick: showGallery, "data-testid": "uploaderh5_imgStyle", children: [error || status ? (_jsx("div", { className: "weui-uploader__file-content", children: error ? (_jsx("i", { role: "img", "aria-label": "\u9519\u8BEF", className: "weui-icon-warn" })) : (_jsx("i", { className: `weui-loading ${imgTypeCls}`, style: { width: 30, height: 30 } })) })) : (false), loading && (_jsxs("div", { className: "weui-uploader__file-progress", children: [progress, "%"] }))] }));
+    return (_jsxs("li", { className: `${cls} ${imgTypeCls}`, style: imgStyle, onClick: showGallery, "data-testid": "uploaderh5_imgStyle", children: [error || status ? (_jsx("div", { className: "weui-uploader__file-content", children: error ? (_jsx("i", { role: "img", "aria-label": "\u9519\u8BEF", className: "weui-icon-warn" })) : (_jsx("i", { className: `weui-loading ${imgTypeCls}`, style: { width: 30, height: 30 } })) })) : (false), loading && _jsxs("div", { className: "weui-uploader__file-progress", children: [progress, "%"] })] }));
 }
-const UploaderLabel = ({ layout, label, currentCount, maxCount, requiredFlag, labelVisible, }) => {
+const UploaderLabel = ({ layout, label, currentCount, maxCount, requiredFlag, labelVisible }) => {
     if (layout === 'horizontal') {
-        return (_jsx(React.Fragment, { children: _jsx(_Fragment, { children: labelVisible && (_jsx("div", { className: "weda-formcells__label weui-cell", children: _jsxs("div", { children: [requiredFlag && (_jsx("label", { className: "weda-formcells__flag", children: "*" })), _jsx("p", { className: "weui-uploader__title", children: label }), _jsxs("div", { className: "weui-uploader__info", children: [_jsx("span", { id: "uploadCount", children: currentCount }), "/", maxCount] })] }) })) }) }));
+        return (_jsx(React.Fragment, { children: _jsx(_Fragment, { children: labelVisible && (_jsx("div", { className: "weda-formcells__label weui-cell", children: _jsxs("div", { children: [requiredFlag && _jsx("label", { className: "weda-formcells__flag", children: "*" }), _jsx("p", { className: "weui-uploader__title", children: label }), _jsxs("div", { className: "weui-uploader__info", children: [_jsx("span", { id: "uploadCount", children: currentCount }), "/", maxCount] })] }) })) }) }));
     }
-    return (_jsx(React.Fragment, { children: _jsx(_Fragment, { children: labelVisible && (_jsxs("div", { className: "weda-formcells__label weui-cell", children: [_jsxs("div", { className: "weui-uploader__label", children: [requiredFlag && (_jsx("label", { className: "weda-formcells__flag", children: "*" })), _jsx("p", { className: "weui-uploader__title", children: label })] }), _jsxs("div", { className: "weui-uploader__info", children: [_jsx("span", { id: "uploadCount", children: currentCount }), "/", maxCount] })] })) }) }));
+    return (_jsx(React.Fragment, { children: _jsx(_Fragment, { children: labelVisible && (_jsxs("div", { className: "weda-formcells__label weui-cell", children: [_jsxs("div", { className: "weui-uploader__label", children: [requiredFlag && _jsx("label", { className: "weda-formcells__flag", children: "*" }), _jsx("p", { className: "weui-uploader__title", children: label })] }), _jsxs("div", { className: "weui-uploader__info", children: [_jsx("span", { id: "uploadCount", children: currentCount }), "/", maxCount] })] })) }) }));
 };

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

@@ -118,16 +118,16 @@ export function UploaderPCInner(props) {
     tips && (extraProps['title'] = tips);
     maxSize && (extraProps['maxSize'] = maxSize * 1024 * 1024);
     const hasActions = !uploading && !readOnly && !(disabled || sourceType === 'camera');
-    return (_jsx(ConfigProvider, { classPrefix: "wedatea2td", children: _jsxs("div", { className: "_weda-fn-upload-result", children: [tempFile === null || tempFile === void 0 ? void 0 : tempFile.map((d, index) => (_jsx("div", { className: `_weda-fn-upload-result__item ${imgTypeCls}`, children: _jsx(TcbImage, { index: index, allFile: tempFile, tempFile: d, imgTypeCls: imgTypeCls, isZoom: true, previewIcon: "td:browse", portalContainer: portalContainer, actions: hasActions && (_jsx(WdIcon, { className: `${CLASS_PREFIX}__image-actions-delete`, name: "td:delete", onClick: () => deleteHandle(d), size: "sm" })) }) }, d.key))), _jsxs("div", { className: `${CLASS_PREFIX}__input-box`, children: [readOnly && tempFile.length < 1 && _jsx("div", { children: "-" }), sourceType === 'camera' || (disabled && !readOnly) ? (_jsx("li", { className: `_weda-fn-upload-result__item wedatea2td-disabled ${imgTypeCls}`, children: _jsxs("div", { className: "_weda-fn-upload-result__status", children: [_jsx("i", { className: "wedatea2td-icon wedatea2td-icon-plus", role: "img", "aria-label": "plus" }), _jsx("span", { className: "wedatea2td-mt-1n wedatea2td-text-label wedatea2td-fz-reset", children: btnTitle })] }) })) : (((!single && tempFile.length < maxUploadCount) || (single && tempFile.length < 1 && !uploading)) &&
+    return (_jsx(ConfigProvider, { classPrefix: "wedatea2td", children: _jsxs("div", { className: "_weda-fn-upload-result", children: [tempFile === null || tempFile === void 0 ? void 0 : tempFile.map((d, index) => (_jsx("div", { className: `_weda-fn-upload-result__item ${imgTypeCls}`, children: _jsx(TcbImage, { index: index, allFile: tempFile, tempFile: d, imgTypeCls: imgTypeCls, isZoom: true, previewIcon: "td:browse", portalContainer: portalContainer, actions: hasActions && (_jsx(WdIcon, { className: `${CLASS_PREFIX}__image-actions-delete`, name: "td:delete", onClick: () => deleteHandle(d), size: "sm" })) }) }, d.key))), _jsxs("div", { className: `${CLASS_PREFIX}__input-box`, children: [readOnly && tempFile.length < 1 && _jsx("div", { children: "-" }), sourceType === 'camera' || (disabled && !readOnly) ? (_jsx("div", { className: `_weda-fn-upload-result__item wedatea2td-disabled weda-uploader-btn__box ${imgTypeCls}`, children: _jsxs("div", { className: "_weda-fn-upload-result__status", children: [_jsx("i", { className: "wedatea2td-icon wedatea2td-icon-plus", role: "img", "aria-label": "plus" }), _jsx("span", { className: "wedatea2td-mt-1n wedatea2td-text-label wedatea2td-fz-reset", children: btnTitle })] }) })) : (((!single && tempFile.length < maxUploadCount) || (single && tempFile.length < 1 && !uploading)) &&
                             !readOnly && (
                         // single 模式时，当数组为空且不在上传文件过程中时显示
-                        _jsx(Upload, { ...extraProps, beforeUpload: beforeHandle, children: _jsxs("li", {
+                        _jsx(Upload, { ...extraProps, beforeUpload: beforeHandle, children: _jsxs("div", {
                                 // className={"_weda-fn-upload-result__item _weda-fn-upload-result__item--upload" imgTypeCls}
                                 // className={classNames(
                                 //   `_weda-fn-upload-result__item _weda-fn-upload-result__item--upload`,
                                 //   imgTypeCls
                                 // )}
-                                className: `_weda-fn-upload-result__item _weda-fn-upload-result__item--upload ${imgTypeCls}`, children: [imgTypeCls, _jsxs("div", { className: "_weda-fn-upload-result__status", children: [_jsx("i", { className: "wedatea2td-icon wedatea2td-icon-plus", role: "img", "aria-label": "plus" }), _jsx("span", { className: "wedatea2td-mt-1n wedatea2td-text-label wedatea2td-fz-reset", children: btnTitle })] })] }) })))] })] }) }));
+                                className: `_weda-fn-upload-result__item weda-uploader-btn__box _weda-fn-upload-result__item--upload ${imgTypeCls}`, children: [imgTypeCls, _jsxs("div", { className: "_weda-fn-upload-result__status", children: [_jsx("i", { className: "wedatea2td-icon wedatea2td-icon-plus", role: "img", "aria-label": "plus" }), _jsx("span", { className: "wedatea2td-mt-1n wedatea2td-text-label wedatea2td-fz-reset", children: btnTitle })] })] }) })))] })] }) }));
 }
 export const TcbImage = (props) => {
     const { fileID, tempFile = { progress: 100, loading: false, realUrl: null, tempUrl: null }, isZoom, imgTypeCls, previewIcon, actions, allFile = [], index, portalContainer, ...rest } = props;

package/dist/web/components/wd-location/wd-location.css CHANGED Viewed

@@ -23,9 +23,7 @@
   width: 100% !important;
 }
-.wd-form-item.wd-pc-location-root
-  ._weda-fn-map
-  .weda-fn-map__local_loc_btn_left {
+.wd-form-item.wd-pc-location-root ._weda-fn-map .weda-fn-map__local_loc_btn_left {
   margin: 0;
   line-height: 1;
 }
@@ -36,15 +34,10 @@
   margin-top: 0;
 }
-.wd-form-item.wd-pc-location-root
-  ._weda-fn-map
-  .wedatea2td-justify-grid__col--right {
+.wd-form-item.wd-pc-location-root ._weda-fn-map .wedatea2td-justify-grid__col--right {
   position: unset;
 }
-.wd-form-item.wd-pc-location-root
-  ._weda-fn-map
-  .wedatea2td-justify-grid__col--right
-  input {
+.wd-form-item.wd-pc-location-root ._weda-fn-map .wedatea2td-justify-grid__col--right input {
   width: 75px;
 }
@@ -55,3 +48,7 @@
 .form-location-con__text.wd-btn--link:hover:not(.is-disabled) {
   text-decoration: none;
 }
+.wd-form-item.showMap .wd-form-input-wrap.size-height-md {
+  height: auto;
+}

package/dist/web/components/wd-location/wd-location.js CHANGED Viewed

@@ -3,6 +3,7 @@ import { forwardRef, useCallback, useMemo, useState } from 'react';
 import { useHandleClear } from '../../utils/hooks/useFormLegacy';
 import { useFormInputTrait } from '../../components/form-input-hooks';
 import { WdFormItem, WdInputGroup, WdInputWrap } from '../wd-form-item';
+import classNames from '../../utils/classnames';
 import Location from '../form/location';
 import { emptyObject } from '../../utils/constant';
 import { X_RUNTIME_DEFAULT } from '../../../configs/type-utils/x-runtime-default';
@@ -39,6 +40,9 @@ export const WdLocation = forwardRef(function WdLocation(props, ref) {
         readValue,
         // eslint-disable-next-line @typescript-eslint/no-magic-numbers
         readOnly: locationType === 2 ? readOnly && isInit : readOnly,
+        className: classNames(props.className, {
+            showMap: showMap,
+        }),
     };
     const inputGroupProps = { ...props, classRoot };
     const inputWrapProps = { ...props, classRoot, disabled, ...clearProps };

package/dist/web/components/wd-select/relationSelect/relationSelect.js CHANGED Viewed

@@ -44,7 +44,7 @@ const OptionText = ({ mode, option, selectFields, authFields, onChange, onRelati
                     option,
                 });
             }
-        }, children: [_jsxs("div", { className: "wd-relation-select-header", children: [_jsx("p", { className: "wd-relation-select-header-text", children: (option === null || option === void 0 ? void 0 : option.label) || (option === null || option === void 0 ? void 0 : option.value) }), enableRelationOptionJump && (_jsx("span", { onClick: () => {
+        }, children: [_jsxs("div", { className: "wd-relation-select-header", children: [_jsx("p", { className: "wd-relation-select-header-text", title: (option === null || option === void 0 ? void 0 : option.label) || (option === null || option === void 0 ? void 0 : option.value), children: (option === null || option === void 0 ? void 0 : option.label) || (option === null || option === void 0 ? void 0 : option.value) }), enableRelationOptionJump && (_jsx("span", { onClick: () => {
                             onRelationOptionJump({ item: option });
                         }, children: _jsx(WdIcon, { name: "td:jump", size: "s", type: "inner" }) }))] }), _jsxs("div", { className: "wd-relation-select-option-group", children: [_jsx("div", { className: "wd-relation-select-option-header", children: columns.map((i) => (_jsx("div", { className: "wd-relation-select-option-text", style: { width: columns.length > 1 ? i.width : 'auto' }, children: i.header }, i.key))) }), _jsx("div", { className: "wd-relation-select-option-content", children: columns.map((i) => (_jsx("div", { className: "wd-relation-select-option-text", style: { width: columns.length > 1 ? i.width : 'auto' }, children: i.render(option === null || option === void 0 ? void 0 : option.extra) }, i.key))) })] })] }));
 };
@@ -80,13 +80,15 @@ export function RelationSelect(props) {
         pageSize: defaultSize,
         where: whereList,
     }, isObjectEqual);
-    const { result: options, total, isValidating: isLoading, empty, getRelationOptions, } = useChooseList({
+    const { result: options, total, isValidating, empty, getRelationOptions, } = useChooseList({
         dataSourceAPI,
         childDbName: dataSourceName,
         queryParams: query,
         primaryColumn: primaryField,
         value,
+        isInsertSelectedValue: true,
     });
+    const [isLoading, setIsLoading] = useSyncValue(isValidating, isObjectEqual);
     // 下拉选项数据
     const customOptions = useMemo(() => {
         return isRelationSelectOption
@@ -128,6 +130,8 @@ export function RelationSelect(props) {
         };
     }, [getRelationOptions, query.pageNo, searchOptionListWithWhere, setRefreshStatus]);
     const searchHandle = (keyword) => {
+        empty();
+        setIsLoading(true);
         let where = whereList;
         if (keyword === null || keyword === void 0 ? void 0 : keyword.length) {
             // 筛选面板的查询条件与数据过滤的查询条件是且的关系
@@ -138,7 +142,7 @@ export function RelationSelect(props) {
         searchOptionListWithWhere(where);
         onSearch(keyword);
     };
-    return (_jsx(EnumHoc, { fields: authFields, children: _jsx(Select, { ...props, overlayClassName: isRelationSelectOption ? 'wd-relation-select-overlay' : '', searchable: true, listWidth: listWidth, listHeight: _listHeight, matchButtonWidth: _matchButtonWidth, placeholder: placeholder, appearance: 'button', filter: () => true, size: size, disabled: disabled, autoClearSearchValue: true, options: customOptions, value: value, onChange: onChange, onSearch: searchHandle, tips: isLoading ? '' : undefined, bottomTips: isLoading ? _jsx(LoadingTip, {}) : undefined, onScrollBottom: () => {
+    return (_jsx(EnumHoc, { fields: authFields, children: _jsx(Select, { ...props, overlayClassName: isRelationSelectOption ? 'wd-relation-select-overlay' : '', searchable: true, listWidth: listWidth, listHeight: _listHeight, matchButtonWidth: _matchButtonWidth, placeholder: placeholder, appearance: 'button', filter: () => true, size: size, disabled: disabled, autoClearSearchValue: true, options: customOptions, value: value, onChange: onChange, onSearch: searchHandle, bottomTips: isLoading ? _jsx(LoadingTip, {}) : undefined, onScrollBottom: () => {
                 if (!isLoading && customOptions.length < total) {
                     setQuery((query) => ({
                         ...query,
@@ -146,6 +150,7 @@ export function RelationSelect(props) {
                     }));
                 }
             }, onOpen: () => {
+                setIsLoading(true);
                 searchOptionListWithWhere();
             }, footer: addRelationButton, mode: mode }) }));
 }

package/dist/web/components/wd-select/select/selectUI.js CHANGED Viewed

@@ -157,7 +157,7 @@ export function SelectUI(props) {
                 .join(',');
         }
         else {
-            return textToString((_a = selectedItem[0]) === null || _a === void 0 ? void 0 : _a.label) || textToString((_b = selectedItem[0]) === null || _b === void 0 ? void 0 : _b.value) || '';
+            return textToString((_a = selectedItem[0]) === null || _a === void 0 ? void 0 : _a.label) || textToString((_b = selectedItem[0]) === null || _b === void 0 ? void 0 : _b.value) || value;
         }
     }, [isMultiple, options, value]);
     const render = () => {

package/dist/web/components/wd-select/wd-select.css CHANGED Viewed

@@ -41,8 +41,7 @@
   padding-right: 0;
 }
-.wd-form-item.wd-pc-select-root
-  .wedatea2td-dropdown-btn.wedatea2td-dropdown__header {
+.wd-form-item.wd-pc-select-root .wedatea2td-dropdown-btn.wedatea2td-dropdown__header {
   border: none;
   padding: 0;
   display: flex;
@@ -58,16 +57,13 @@
   color: var(--wd-color-text-placeholder) !important;
 }
-.wd-form--vertical-left
-  .wd-h5-select-root
-  .wd-form-select-relational-setting--wrap {
+.wd-form--vertical-left .wd-h5-select-root .wd-form-select-relational-setting--wrap {
   top: 16px;
 }
 .wd-form-select-relational-setting--wrap {
   display: flex;
 }
-.wd-form.wd-pc-form
-  .wd-form-input-group.wd-form-select-relational-setting--group,
+.wd-form.wd-pc-form .wd-form-input-group.wd-form-select-relational-setting--group,
 .wd-form-input-group.wd-form-select-relational-setting--group {
   width: auto;
 }
@@ -80,9 +76,7 @@
 .wd-form-select-relational-setting--group .wd-link {
   display: flex;
 }
-.wd-select-select
-  .wd-form-input-wrap__content
-  > .weda-ui-custom-picker__status {
+.wd-select-select .wd-form-input-wrap__content > .weda-ui-custom-picker__status {
   padding-left: 5px;
 }
@@ -125,6 +119,10 @@
 }
 .wd-relation-select-header-text {
   font-size: 16px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  max-width: 300px;
 }
 .wd-relation-select-header .wd-icon {
   color: var(--wd-color-brand, #0052d9);
@@ -159,18 +157,12 @@
   display: block;
   white-space: nowrap;
 }
-.wd-relation-select-overlay
-  .wedatea2td-dropdown-box
-  .wedatea2td-list--option
-  > li {
+.wd-relation-select-overlay .wedatea2td-dropdown-box .wedatea2td-list--option > li {
   width: auto !important;
   min-width: 100%;
   padding: 0;
 }
-.wd-relation-select-overlay
-  .wedatea2td-dropdown-box
-  .wedatea2td-list--option
-  .wedatea2td-list__status {
+.wd-relation-select-overlay .wedatea2td-dropdown-box .wedatea2td-list--option .wedatea2td-list__status {
   padding: 6px 8px;
 }
 /* h5端关联下拉样式 */
@@ -184,13 +176,11 @@
 .weda-ui-custom-picker__cloumns.wd-relation-select-overlay {
   overflow: auto;
 }
-.weda-ui-custom-picker__cloumns.wd-relation-select-overlay
-  .weda-ui-custom-picker__cloumn {
+.weda-ui-custom-picker__cloumns.wd-relation-select-overlay .weda-ui-custom-picker__cloumn {
   width: auto;
   min-width: 100%;
 }
-.weda-ui-custom-picker__cloumns.wd-relation-select-overlay
-  .weda-ui-custom-picker__cloumn-item.is-selected {
+.weda-ui-custom-picker__cloumns.wd-relation-select-overlay .weda-ui-custom-picker__cloumn-item.is-selected {
   background-color: var(--wd-color-brand-light, #ecf2fe);
   border-radius: 3px;
 }

package/dist/web/components/wd-table/components/FieldRender/index.d.ts CHANGED Viewed

@@ -56,7 +56,7 @@ export declare const formatNumberFix: (val: any, field: any, setZero?: boolean)
  * 根据 fields 信息生成 column
  * h5 和 pc 部分参数不同
  */
-export declare const getColumns: ({ columnSets, fields, isH5, supportManyRelated, showRelationWithTag, }: {
+export declare const getColumns: ({ columnSets, fields, isH5, supportManyRelated, showRelationWithTag }: {
     columnSets?: any[];
     fields: any;
     isH5?: boolean;
@@ -123,7 +123,7 @@ export declare const filterCustomColumns: ({ columns, columnSets, slots, fields,
  * 过滤字段列表
  * 导出/搜索框，不展示自定义列
  */
-export declare const filterCustomFields: ({ fields, columnSets, isFilterGenre, }: {
+export declare const filterCustomFields: ({ fields, columnSets, isFilterGenre }: {
     fields: any;
     columnSets: any;
     isFilterGenre?: boolean;
@@ -131,7 +131,7 @@ export declare const filterCustomFields: ({ fields, columnSets, isFilterGenre, }
 /**
  * 列管理加入冻结属性
  */
-export declare const getFixedColumnSets: ({ fixedFront, fixedEnd, columnSets, }: {
+export declare const getFixedColumnSets: ({ fixedFront, fixedEnd, columnSets }: {
     fixedFront?: string;
     fixedEnd?: string;
     columnSets: any;

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

@@ -39,7 +39,7 @@ export const TextWrap = React.memo(function TextWrapComp(props) {
 export function getFieldRender(field = {}, extra = {}) {
     var _a;
     const { type, format, items, properties, title, parentDatasource } = field;
-    const { modelType, showTip = true, detailText = '详情', isH5, showRelationWithTag = true, } = extra;
+    const { modelType, showTip = true, detailText = '详情', isH5, showRelationWithTag = true } = extra;
     const textProps = { showTip };
     // 枚举-旧，新版 TODO
     if ((_a = field['x-enumObj']) === null || _a === void 0 ? void 0 : _a.length) {
@@ -81,7 +81,7 @@ export function getFieldRender(field = {}, extra = {}) {
                         properties: locationProperties,
                     },
                 };
-                return (_jsx(ArrayComponent, { isH5: isH5, value: value, modelType: modelType, field: locationField, items: items }));
+                return _jsx(ArrayComponent, { isH5: isH5, value: value, modelType: modelType, field: locationField, items: items });
             }
             if (modelType === 'table') {
                 const content = (_a = formatLocationData(val)) === null || _a === void 0 ? void 0 : _a.flatContent;
@@ -115,10 +115,9 @@ export function getFieldRender(field = {}, extra = {}) {
             }
             else if (format === 'x-file') {
                 // 文件
-                return (_jsx(UploaderFileView, { value: fieldValue, single: (extra === null || extra === void 0 ? void 0 : extra.modelType) !== 'detail' }));
+                return _jsx(UploaderFileView, { value: fieldValue, single: (extra === null || extra === void 0 ? void 0 : extra.modelType) !== 'detail' });
             }
-            else if (!(extra === null || extra === void 0 ? void 0 : extra.supportManyRelated) &&
-                isShowOrgsView(field, modelType)) {
+            else if (!(extra === null || extra === void 0 ? void 0 : extra.supportManyRelated) && isShowOrgsView(field, modelType)) {
                 return (_jsx(ViewCell, { data: fieldValue, showType: modelType,
                     // type={field['x-parent']?.parentDataSourceName === 'sys_department' ? 'org' : 'user'}
                     relation: extra === null || extra === void 0 ? void 0 : extra.relation }));
@@ -131,15 +130,14 @@ export function getFieldRender(field = {}, extra = {}) {
                 // 网址
                 return (_jsx("a", { className: "wd-table__a", target: "_blank", href: fieldValue, rel: "noreferrer", children: _jsx(TextWrap, { ...textProps, children: fieldValue }) }));
             }
-            else if ((extra === null || extra === void 0 ? void 0 : extra.supportManyRelated) &&
-                (format === 'father-son' || format === 'related')) {
+            else if ((extra === null || extra === void 0 ? void 0 : extra.supportManyRelated) && (format === 'father-son' || format === 'related')) {
                 const primaryField = ((_b = (_a = field === null || field === void 0 ? void 0 : field.parentDatasource) === null || _a === void 0 ? void 0 : _a.schema) === null || _b === void 0 ? void 0 : _b['x-primary-column']) || '';
                 const relatedField = (_c = extra === null || extra === void 0 ? void 0 : extra.columnSet) === null || _c === void 0 ? void 0 : _c.relatedField;
                 if (!showRelationWithTag) {
                     if (typeof fieldValue === 'string') {
                         return _jsx(TextWrap, { ...textProps, children: fieldValue });
                     }
-                    return (_jsx(TextWrap, { ...textProps, children: fieldValue[relatedField] || fieldValue[primaryField] || '-' }));
+                    return _jsx(TextWrap, { ...textProps, children: fieldValue[relatedField] || fieldValue[primaryField] || '-' });
                 }
                 if (typeof fieldValue === 'string') {
                     return fieldValue && fieldValue !== '-' ? (_jsx(WdTag, { range: fieldValue === null || fieldValue === void 0 ? void 0 : fieldValue.split(',').map((i) => ({
@@ -167,6 +165,10 @@ export function getFieldRender(field = {}, extra = {}) {
         }
         else if (type === 'number') {
             fieldValue = formatNumber(val, field);
+            if (Object.prototype.hasOwnProperty.call(val, '$date')) {
+                field.format = 'datetime';
+                fieldValue = formatNumber(val.$date, field);
+            }
             return _jsx(TextWrap, { children: fieldValue });
         }
         else if (type === 'boolean') {
@@ -176,7 +178,7 @@ export function getFieldRender(field = {}, extra = {}) {
         else if (type === 'object') {
             const objectRender = ({ value, modelType, fields }) => {
                 if (typeof val === 'object') {
-                    return (_jsx(DataItemView, { value: value, modelType: modelType, fields: fields, isH5: isH5 }));
+                    return _jsx(DataItemView, { value: value, modelType: modelType, fields: fields, isH5: isH5 });
                 }
                 return _jsx(TextWrap, { ...textProps, children: value });
             };
@@ -194,14 +196,12 @@ export function getFieldRender(field = {}, extra = {}) {
                     fields: properties,
                 });
             }
-            else if (format === 'many-one' ||
-                format === 'one-one' ||
-                format === 'one-one-r') {
+            else if (format === 'many-one' || format === 'one-one' || format === 'one-one-r') {
                 const primaryField = ((_e = (_d = field === null || field === void 0 ? void 0 : field.parentDatasource) === null || _d === void 0 ? void 0 : _d.schema) === null || _e === void 0 ? void 0 : _e['x-primary-column']) || '';
                 const relatedField = (_f = extra === null || extra === void 0 ? void 0 : extra.columnSet) === null || _f === void 0 ? void 0 : _f.relatedField;
                 const _readValue = fieldValue[relatedField] || fieldValue[primaryField];
                 if (!showRelationWithTag) {
-                    return (_jsx(TextWrap, { ...textProps, children: fieldValue[relatedField] || fieldValue[primaryField] }));
+                    return _jsx(TextWrap, { ...textProps, children: fieldValue[relatedField] || fieldValue[primaryField] });
                 }
                 return _readValue ? (_jsx(WdTag, { range: _readValue === null || _readValue === void 0 ? void 0 : _readValue.split(',').map((i) => ({
                         label: i,
@@ -219,8 +219,7 @@ export function getFieldRender(field = {}, extra = {}) {
             }
         }
         else if (type === 'array') {
-            if (field.name === '_departmentList' &&
-                ['table', 'detail'].includes(modelType)) {
+            if (field.name === '_departmentList' && ['table', 'detail'].includes(modelType)) {
                 return _jsx(TextWrap, { ...textProps, children: val || '-' });
             }
             if (format === 'x-enum') {
@@ -243,8 +242,7 @@ export function getFieldRender(field = {}, extra = {}) {
                 // 文件数组，在详情页和表格页展示不同
                 return _jsx(UploaderFileView, { value: fieldValue, single: false });
             }
-            else if ((extra === null || extra === void 0 ? void 0 : extra.supportManyRelated) &&
-                (format === 'one-many' || format === 'many-many')) {
+            else if ((extra === null || extra === void 0 ? void 0 : extra.supportManyRelated) && (format === 'one-many' || format === 'many-many')) {
                 const primaryField = ((_h = (_g = field === null || field === void 0 ? void 0 : field.parentDatasource) === null || _g === void 0 ? void 0 : _g.schema) === null || _h === void 0 ? void 0 : _h['x-primary-column']) || '';
                 const relatedField = (_j = extra === null || extra === void 0 ? void 0 : extra.columnSet) === null || _j === void 0 ? void 0 : _j.relatedField;
                 const rowId = extra === null || extra === void 0 ? void 0 : extra.rowId;
@@ -252,8 +250,7 @@ export function getFieldRender(field = {}, extra = {}) {
                 const propertyArr = Object.keys(properties);
                 const relatedKey = propertyArr.find((item) => {
                     var _a;
-                    if (properties[item].format === 'many-one' ||
-                        properties[item].format === 'many-many') {
+                    if (properties[item].format === 'many-one' || properties[item].format === 'many-many') {
                         return ((_a = properties[item]['x-parent']) === null || _a === void 0 ? void 0 : _a.parentFieldKey) === field.name;
                     }
                     else {
@@ -287,7 +284,7 @@ export function getFieldRender(field = {}, extra = {}) {
             }
             else {
                 fieldValue = safeJsonParse(val);
-                return (_jsx(ArrayComponent, { isH5: isH5, value: fieldValue, field: field, modelType: modelType, items: items }));
+                return _jsx(ArrayComponent, { isH5: isH5, value: fieldValue, field: field, modelType: modelType, items: items });
             }
         }
         return _jsx("span", { children: JSON.stringify(fieldValue) });
@@ -368,8 +365,7 @@ const ArrayComponent = ({ items, modelType, value, field, isH5 }) => {
 export const formatNumber = (value, field) => {
     let newValue = value;
     try {
-        if (['date', 'time', 'datetime'].includes(field === null || field === void 0 ? void 0 : field.format) &&
-            typeof value === 'number') {
+        if (['date', 'time', 'datetime'].includes(field === null || field === void 0 ? void 0 : field.format) && typeof value === 'number') {
             newValue = formatTimeByType(field === null || field === void 0 ? void 0 : field.format, value, field);
         }
         else {
@@ -433,8 +429,8 @@ export const formatNumberFix = (val, field, setZero = false) => {
  * 根据 fields 信息生成 column
  * h5 和 pc 部分参数不同
  */
-export const getColumns = ({ columnSets = [], fields, isH5 = false, supportManyRelated, showRelationWithTag, }) => fields === null || fields === void 0 ? void 0 : fields.map((item) => formatFieldToColumn(item, isH5, columnSets, supportManyRelated, showRelationWithTag));
-const TableCell = ({ record, field, isH5, supportManyRelated, showRelationWithTag, }) => {
+export const getColumns = ({ columnSets = [], fields, isH5 = false, supportManyRelated, showRelationWithTag }) => fields === null || fields === void 0 ? void 0 : fields.map((item) => formatFieldToColumn(item, isH5, columnSets, supportManyRelated, showRelationWithTag));
+const TableCell = ({ record, field, isH5, supportManyRelated, showRelationWithTag }) => {
     const component = React.useMemo(() => {
         const { name } = field;
         const value = getFieldValue(name, record);
@@ -457,7 +453,7 @@ const TableCell = ({ record, field, isH5, supportManyRelated, showRelationWithTa
         return getFieldRender(field, extra)(value);
     }, [record, field, isH5]);
     // 处理渲染错误
-    return (_jsx(ErrorBoundary, { FallbackComponent: () => _jsx("span", { className: "", children: "\u274C \u6570\u636E\u5F02\u5E38" }), children: component }));
+    return _jsx(ErrorBoundary, { FallbackComponent: () => _jsx("span", { className: "", children: "\u274C \u6570\u636E\u5F02\u5E38" }), children: component });
 };
 /**
  * 根据 field 属性，生成 column 配置
@@ -470,9 +466,7 @@ export const formatFieldToColumn = (field, isH5, columnSets, supportManyRelated,
     const item = columnSets === null || columnSets === void 0 ? void 0 : columnSets.find((i) => i.key === name);
     const isIllegalWidth = typeof (item === null || item === void 0 ? void 0 : item.width) !== 'number';
     return {
-        width: !item || (item === null || item === void 0 ? void 0 : item.widthType) === 'auto' || isIllegalWidth
-            ? width
-            : item === null || item === void 0 ? void 0 : item.width,
+        width: !item || (item === null || item === void 0 ? void 0 : item.widthType) === 'auto' || isIllegalWidth ? width : item === null || item === void 0 ? void 0 : item.width,
         render: (record) => (_jsx(TableCell, { record: record, field: field, isH5: isH5, supportManyRelated: supportManyRelated, showRelationWithTag: showRelationWithTag })),
         key: name,
         slotKey: (item === null || item === void 0 ? void 0 : item.slotKey) || name,
@@ -515,9 +509,7 @@ export const getFieldWidth = (field) => {
     // 按类型列宽度
     const typeWidth = ((_a = TypeFormatWidthMap === null || TypeFormatWidthMap === void 0 ? void 0 : TypeFormatWidthMap[type]) === null || _a === void 0 ? void 0 : _a[format || (items === null || items === void 0 ? void 0 : items.format) || 'default']) || 0;
     // 最终宽度
-    const width = typeWidth
-        ? Math.max(nameWidth, typeWidth)
-        : Math.max(nameWidth, 120);
+    const width = typeWidth ? Math.max(nameWidth, typeWidth) : Math.max(nameWidth, 120);
     return width;
 };
 /**
@@ -595,9 +587,7 @@ export const formatDataToExport = (datas, fields, enumOptions = {}) => {
                             newDatas[zhTitle] = formatDataToExport([].concat(data), Object.values(((_d = field === null || field === void 0 ? void 0 : field.items) === null || _d === void 0 ? void 0 : _d.properties) || {}));
                         }
                         else if (((_e = field === null || field === void 0 ? void 0 : field.items) === null || _e === void 0 ? void 0 : _e.type) === 'number') {
-                            newDatas[zhTitle] = []
-                                .concat(data)
-                                .map((d) => formatNumber(d, field === null || field === void 0 ? void 0 : field.items));
+                            newDatas[zhTitle] = [].concat(data).map((d) => formatNumber(d, field === null || field === void 0 ? void 0 : field.items));
                         }
                         else if (((_f = field === null || field === void 0 ? void 0 : field.items) === null || _f === void 0 ? void 0 : _f.type) === 'boolean') {
                             newDatas[zhTitle] = [].concat(data).map((d) => formatBoolean(d));
@@ -732,7 +722,7 @@ export const slotRender = (Slot, props = {}) => {
     }
     return Slot !== null && Slot !== void 0 ? Slot : null;
 };
-const TableSlotCell = ({ record, rowKey, recordIndex, column, columnIndex, slot, }) => {
+const TableSlotCell = ({ record, rowKey, recordIndex, column, columnIndex, slot }) => {
     return slotRender(slot, {
         record,
         rowKey,
@@ -810,12 +800,11 @@ export const filterCustomColumns = ({ columns, columnSets, slots, fields, isH5,
                 };
             const value = getFieldValue(key, record, relatedField, isMany(_oriField));
             const component = getFieldRender(field, extra)(value);
-            return (_jsx(ErrorBoundary, { FallbackComponent: () => _jsx("span", { className: "", children: "\u274C \u6570\u636E\u5F02\u5E38" }), children: component }));
+            return _jsx(ErrorBoundary, { FallbackComponent: () => _jsx("span", { className: "", children: "\u274C \u6570\u636E\u5F02\u5E38" }), children: component });
         };
         const _oriWidth = getFieldWidth(field) + 10;
         const isIllegalWidth = typeof (item2 === null || item2 === void 0 ? void 0 : item2.width) !== 'number';
-        item2.width =
-            (item2 === null || item2 === void 0 ? void 0 : item2.widthType) === 'auto' || isIllegalWidth ? _oriWidth : item2 === null || item2 === void 0 ? void 0 : item2.width;
+        item2.width = (item2 === null || item2 === void 0 ? void 0 : item2.widthType) === 'auto' || isIllegalWidth ? _oriWidth : item2 === null || item2 === void 0 ? void 0 : item2.width;
         // 拿到自定义列属性值
         const customColumn = {
             ...columnsMap[key],
@@ -882,22 +871,20 @@ const getCustomField = (_field, columnSet) => {
  * 过滤字段列表
  * 导出/搜索框，不展示自定义列
  */
-export const filterCustomFields = ({ fields, columnSets, isFilterGenre = false, }) => {
+export const filterCustomFields = ({ fields, columnSets, isFilterGenre = false }) => {
     if (!Array.isArray(fields))
         return [];
     if (!Array.isArray(columnSets))
         return fields;
     const fieldsMap = fromEntries(fields.map((item) => [item.name, item]));
     return columnSets
-        .filter((item1) => (item1 === null || item1 === void 0 ? void 0 : item1.key) &&
-        fieldsMap[item1.key] &&
-        ((item1 === null || item1 === void 0 ? void 0 : item1.genre) !== 'slot' || isFilterGenre))
+        .filter((item1) => (item1 === null || item1 === void 0 ? void 0 : item1.key) && fieldsMap[item1.key] && ((item1 === null || item1 === void 0 ? void 0 : item1.genre) !== 'slot' || isFilterGenre))
         .map((item2) => ({ ...fieldsMap[item2.key], title: item2.header }));
 };
 /**
  * 列管理加入冻结属性
  */
-export const getFixedColumnSets = ({ fixedFront = '', fixedEnd = '', columnSets, }) => {
+export const getFixedColumnSets = ({ fixedFront = '', fixedEnd = '', columnSets }) => {
     if (!Array.isArray(columnSets))
         return columnSets;
     const fixedFrontIndex = columnSets.findIndex((item) => (item === null || item === void 0 ? void 0 : item.key) && item.key.length > 0 && item.key === fixedFront);
@@ -905,9 +892,7 @@ export const getFixedColumnSets = ({ fixedFront = '', fixedEnd = '', columnSets,
     return Array.isArray(columnSets)
         ? columnSets.map((item, index) => {
             // 当冻结尾列在冻结前列之后时，冻结尾列属性才生效
-            if (fixedEndIndex >= 0 &&
-                fixedEndIndex > fixedFrontIndex &&
-                index >= fixedEndIndex) {
+            if (fixedEndIndex >= 0 && fixedEndIndex > fixedFrontIndex && index >= fixedEndIndex) {
                 return { ...item, fixed: 'right' };
             }
             else if (fixedFrontIndex >= 0 && index <= fixedFrontIndex) {

package/dist/web/components/wd-table/hooks/useChooseList.d.ts CHANGED Viewed

@@ -1,11 +1,12 @@
 export declare const getDataBaseInfo: (fields: any, format: any, childDbName: any) => any;
 export declare const mapResult: (records: any, primaryColumn: any) => any;
-export declare const useChooseList: ({ dataSourceAPI, queryParams, childDbName, primaryColumn, value }: {
+export declare const useChooseList: ({ dataSourceAPI, queryParams, childDbName, primaryColumn, value, isInsertSelectedValue, }: {
     dataSourceAPI: any;
     queryParams: any;
     childDbName: any;
     primaryColumn: any;
     value: any;
+    isInsertSelectedValue?: boolean;
 }) => {
     result: any[];
     total: number;