@cloudbase/weda-ui 3.26.0 → 3.26.1

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

@@ -12,7 +12,6 @@ import { WD_DRAWER_PLACEMENT } from '../../../enum';
 const DEFAULT_DURATION = 300;
 const DEFAULT_Z_INDEX = 1000;
 const MASK_Z_INDEX_OFFSET = 1;
-const DEFAULT_DELAY = 100;
 // 默认样式对象
 const DEFAULT_STYLE = {};
 const WdDrawer = forwardRef(function WdDrawer(props, ref) {
@@ -60,29 +59,6 @@ const WdDrawer = forwardRef(function WdDrawer(props, ref) {
             document.removeEventListener('keydown', handleKeyDown);
         };
     }, [close, escClosable, platform, visible]);
-    // 点击外部关闭
-    useEffect(() => {
-        const handleDocumentClick = (e) => {
-            // 只有在允许点击关闭时才处理
-            if (maskClosable && visible && drawerRef.current) {
-                // 检查点击目标是否在抽屉内部
-                if (!drawerRef.current.contains(e.target)) {
-                    close();
-                }
-            }
-        };
-        if (visible && maskClosable) {
-            // 延迟添加事件监听器，避免立即触发
-            // eslint-disable-next-line rulesdir/no-timer
-            const timer = setTimeout(() => {
-                document.addEventListener('click', handleDocumentClick);
-            }, DEFAULT_DELAY);
-            return () => {
-                clearTimeout(timer);
-                document.removeEventListener('click', handleDocumentClick);
-            };
-        }
-    }, [close, maskClosable, visible]);
     // 遮罩层点击关闭
     const handleMaskClick = (e) => {
         if (maskClosable && e.target === maskRef.current) {

package/dist/web/components/wd-select/hooks/useChooseList.js

@@ -1,6 +1,5 @@
 import { useState, useEffect, useCallback } from 'react';
 import { useSelectContext } from '../contexts/selectContext';
-const defaultPage = 1;
 const getUniqueOption = (option) => {
     var _a;
     const optionMap = option.reduce((acc, item) => {

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

@@ -6,8 +6,9 @@ import { LoadingTip } from 'tea-component';
 import { SelectUI as Select } from '../select/selectUI';
 import { WdIcon } from '../../wd-icon';
 import { getTableColumns } from '../../wd-table/components/FieldRender';
+import { EnumView } from '../../wd-table/components/FieldRender/Form/Enum';
 import { useAuthFields } from '../../wd-table/hooks/useAuthFields';
-import { usePlatform } from '../../../utils/platform';
+import { usePlatform, textToString } from '../../../utils/platform';
 import { DataSource } from '../../../utils/datasource';
 import { useSyncValue } from '../../../utils/hooks/useSyncValue';
 import isObjectEqual from '../../../utils/isObjectEqual';
@@ -15,7 +16,14 @@ import { deepClone } from '../../../utils/tool';
 import { useChooseList } from '../hooks/useChooseList';
 import { getDefaultQuery } from './queryParams';
 import { EnumHoc } from '../../../utils/hooks/EnumHoc';
-const OptionText = ({ mode, option, selectFields, authFields, onChange, onRelationOptionJump, enableRelationOptionJump, }) => {
+const OptionTextTitle = ({ field, values }) => {
+    if (field.format === 'x-enum') {
+        return _jsx(EnumView, { field: field, values: values, showRelationWithTag: false });
+    }
+    return _jsx("span", { title: textToString(values), children: textToString(values) });
+};
+const OptionText = ({ mode, option, selectFields, authFields, onChange, onRelationOptionJump, enableRelationOptionJump, showLabelField, }) => {
+    var _a;
     const platform = usePlatform();
     const columns = useMemo(() => {
         return getTableColumns({
@@ -44,7 +52,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", 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: () => {
+        }, 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: _jsx(OptionTextTitle, { field: showLabelField, values: (_a = option === null || option === void 0 ? void 0 : option.label) !== null && _a !== void 0 ? _a : 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 === null || columns === void 0 ? void 0 : 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 === null || columns === void 0 ? void 0 : 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))) })] })] }));
 };
@@ -99,12 +107,23 @@ export function RelationSelect(props) {
     const [isLoading, setIsLoading] = useSyncValue(isValidating, isObjectEqual);
     // 下拉选项数据
     const customOptions = useMemo(() => {
-        return isRelationSelectOption
-            ? options === null || options === void 0 ? void 0 : options.map((i) => ({
+        const showLabelField = authFields.find((i) => i.name === showLabel);
+        if (isRelationSelectOption) {
+            return options === null || options === void 0 ? void 0 : options.map((i) => ({
                 ...i,
-                text: (_jsx(OptionText, { mode: mode, option: i, selectFields: selectFields, authFields: authFields, onChange: onChange, onRelationOptionJump: onRelationOptionJump, enableRelationOptionJump: enableRelationOptionJump })),
-            }))
-            : options;
+                text: (_jsx(OptionText, { mode: mode, option: i, selectFields: selectFields, authFields: authFields, onChange: onChange, onRelationOptionJump: onRelationOptionJump, enableRelationOptionJump: enableRelationOptionJump, showLabelField: showLabelField })),
+            }));
+        }
+        else if ((showLabelField === null || showLabelField === void 0 ? void 0 : showLabelField.format) === 'x-enum') {
+            return options === null || options === void 0 ? void 0 : options.map((i) => {
+                var _a;
+                return ({
+                    ...i,
+                    text: _jsx(OptionTextTitle, { field: showLabelField, values: (_a = i.label) !== null && _a !== void 0 ? _a : i.value }),
+                });
+            });
+        }
+        return options;
     }, [
         authFields,
         enableRelationOptionJump,
@@ -114,6 +133,7 @@ export function RelationSelect(props) {
         onRelationOptionJump,
         options,
         selectFields,
+        showLabel,
     ]);
     const searchOptionListWithWhere = useDebouncedCallback((filter = defaultQuery === null || defaultQuery === void 0 ? void 0 : defaultQuery.filter) => {
         empty();

package/dist/web/components/wd-table/components/FieldRender/Form/Enum.js

@@ -37,8 +37,9 @@ export const formatEnum = (value, field, enumOptions, showRelationWithTag = true
         const optionName = field['x-option-name'];
         const isMulti = field['x-multi-select'];
         const options = (enumOptions === null || enumOptions === void 0 ? void 0 : enumOptions[optionName]) || [];
+        const optionsMap = new Map(options.map((item) => [item.value, item.text]));
         let val = '-';
-        const getTextByValue = (value) => { var _a; return ((_a = options === null || options === void 0 ? void 0 : options.find((item) => (item === null || item === void 0 ? void 0 : item.value) === value)) === null || _a === void 0 ? void 0 : _a.text) || value; };
+        const getTextByValue = (value) => optionsMap.get(value) || value;
         if (isMulti) {
             val = (_a = []
                 .concat(value)
@@ -48,7 +49,7 @@ export const formatEnum = (value, field, enumOptions, showRelationWithTag = true
             val = getTextByValue(value);
         }
         if (!showRelationWithTag) {
-            return _jsx("span", { title: val, children: val });
+            return (_jsx("span", { style: { display: 'inline-block' }, title: val, children: val }));
         }
         return (_jsx(WdTag, { range: val === null || val === void 0 ? void 0 : val.split(',').map((i) => ({
                 label: i,

package/package.json

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