@cloudbase/weda-ui 3.30.2 → 3.31.1

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

@@ -7,26 +7,26 @@ export type FormSelectMultipleProps = CommonPropsType & DataType & {
     readOnly: boolean;
 } & EventsType;
 declare const FormSelectMultiple: React.ForwardRefExoticComponent<CommonPropsType & {
-    size: "l" | "m" | "s" | "full";
+    name: string;
+    label: string;
     format: "many-many" | "one-many";
     value: string[];
-    label: string;
-    disabled: boolean;
-    name: string;
     required: boolean;
-    viewId: string;
-    dataSourceName: string;
-    labelVisible: boolean;
+    size: "s" | "m" | "l" | "full";
+    disabled: boolean;
+    placeholder: string;
+    layout: "" | "horizontal" | "vertical";
     range: {
-        value: string;
         label: string;
+        value: string;
     }[];
+    dataSourceName: string;
+    tipBlock: string;
+    labelVisible: boolean;
     requiredFlag: boolean;
     requiredMsg: string;
-    layout: "" | "horizontal" | "vertical";
-    tipBlock: string;
+    viewId: string;
     enumName: string;
-    placeholder: string;
     primaryField: string;
 } & {
     onChange: (v: DataType['value']) => void;

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

@@ -7,15 +7,15 @@ export type FormSwitchProps = CommonPropsType & DataType & {
     readOnly: boolean;
 } & EventsType;
 declare const FormSwitch: React.ForwardRefExoticComponent<CommonPropsType & {
-    value: boolean;
-    label: string;
-    disabled: boolean;
     name: string;
+    label: string;
+    value: boolean;
     required: boolean;
+    disabled: boolean;
+    layout: "" | "horizontal" | "vertical";
     labelVisible: boolean;
     requiredFlag: boolean;
     requiredMsg: string;
-    layout: "" | "horizontal" | "vertical";
 } & {
     onChange: (v: DataType['value']) => void;
     disabled: boolean;

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

@@ -7,20 +7,20 @@ export type FormTextAreaProps = CommonPropsType & DataType & {
     readOnly: boolean;
 } & EventsType;
 declare const FormTextArea: React.ForwardRefExoticComponent<CommonPropsType & {
-    size: "l" | "m" | "s" | "full";
-    value: string;
-    label: string;
-    disabled: boolean;
     name: string;
+    label: string;
+    focus: boolean;
+    value: string;
     required: boolean;
+    size: "s" | "m" | "l" | "full";
+    disabled: boolean;
     maxLength: number;
+    placeholder: string;
+    layout: "" | "horizontal" | "vertical";
     labelVisible: boolean;
+    counterVisible: boolean;
     requiredFlag: boolean;
     requiredMsg: string;
-    layout: "" | "horizontal" | "vertical";
-    placeholder: string;
-    focus: boolean;
-    counterVisible: boolean;
 } & {
     onChange: (v: string) => void;
     disabled: boolean;

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

@@ -7,20 +7,20 @@ export type FormTimeProps = CommonPropsType & DataType & {
     readOnly: boolean;
 } & EventsType;
 declare const FormTime: React.ForwardRefExoticComponent<CommonPropsType & {
-    size: "l" | "m" | "s" | "full";
-    value: string;
-    label: string;
-    disabled: boolean;
     name: string;
+    label: string;
+    value: string;
     required: boolean;
+    size: "s" | "m" | "l" | "full";
+    disabled: boolean;
+    placeholder: string;
+    end: string;
+    start: string;
+    layout: "" | "horizontal" | "vertical";
     clearable: boolean;
     labelVisible: boolean;
     requiredFlag: boolean;
     requiredMsg: string;
-    layout: "" | "horizontal" | "vertical";
-    placeholder: string;
-    start: string;
-    end: string;
 } & {
     onChange: (v: DataType['value']) => void;
     disabled: boolean;

package/dist/web/components/form-upload-file/index.d.ts

@@ -7,22 +7,22 @@ export type FormUploadFileProps = CommonPropsType & DataType & {
     readOnly: boolean;
 } & EventsType;
 declare const FormUploadFile: React.ForwardRefExoticComponent<CommonPropsType & {
-    value: string[];
-    label: string;
-    disabled: boolean;
     name: string;
+    label: string;
+    value: string[];
     required: boolean;
-    labelVisible: boolean;
-    requiredFlag: boolean;
-    requiredMsg: string;
+    disabled: boolean;
     layout: "" | "horizontal" | "vertical";
-    acceptTypes: string[];
-    maxSize: number;
-    maxUploadCount: number;
     single: boolean;
-    disableMultiSwitch: boolean;
+    maxUploadCount: number;
+    labelVisible: boolean;
     downloadVisible: boolean;
     deleteVisible: boolean;
+    acceptTypes: string[];
+    maxSize: number;
+    requiredFlag: boolean;
+    requiredMsg: string;
+    disableMultiSwitch: boolean;
 } & {
     value: string | string[];
 } & {

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

@@ -7,20 +7,20 @@ export type PropsType = CommonPropsType & DataType & {
     readOnly: boolean;
 } & EventsType;
 declare const FormUrl: React.ForwardRefExoticComponent<CommonPropsType & {
-    size: "l" | "m" | "s" | "full";
-    value: string;
-    label: string;
-    disabled: boolean;
     name: string;
+    label: string;
+    focus: boolean;
+    value: string;
     required: boolean;
+    size: "s" | "m" | "l" | "full";
+    disabled: boolean;
     maxLength: number;
+    placeholder: string;
+    layout: "" | "horizontal" | "vertical";
     clearable: boolean;
     labelVisible: boolean;
     requiredFlag: boolean;
     requiredMsg: string;
-    layout: "" | "horizontal" | "vertical";
-    placeholder: string;
-    focus: boolean;
 } & {
     onChange: (v: string) => void;
     disabled: boolean;

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

@@ -7,23 +7,23 @@ export type FormUserTreeSelectProps = CommonPropsType & DataType & {
     readOnly: boolean;
 } & EventsType;
 declare const FormUserTreeSelect: React.ForwardRefExoticComponent<CommonPropsType & {
-    size: "l" | "m" | "s" | "full";
-    value: string;
-    label: string;
-    disabled: boolean;
     name: string;
+    label: string;
+    value: string;
     required: boolean;
+    size: "s" | "m" | "l" | "full";
+    disabled: boolean;
+    placeholder: string;
+    layout: "" | "horizontal" | "vertical";
+    multiple: boolean;
     where: any[];
     labelVisible: boolean;
+    secondDisplay: string;
+    corpScope: string[];
     requiredFlag: boolean;
     requiredMsg: string;
-    layout: "" | "horizontal" | "vertical";
-    placeholder: string;
-    defaultValueType: "noneUser" | "confirmUser" | "loginUser";
     confirmValue: string;
-    multiple: boolean;
-    secondDisplay: string;
-    corpScope: string[];
+    defaultValueType: "noneUser" | "confirmUser" | "loginUser";
 } & {
     onChange: (v: DataType['value']) => void;
     disabled: boolean;

package/dist/web/components/grid/col.d.ts

@@ -3,11 +3,11 @@ import type { CommonPropsType } from '../../types';
 import './style';
 declare const _default: React.ForwardRefExoticComponent<CommonPropsType & {
     alignSelf?: string;
-    widthType: ("auto-fill" | "fit-content" | (1 | "1") | ("2" | 2) | (3 | "3") | ("4" | 4) | ("5" | 5) | (6 | "6") | (7 | "7") | (8 | "8") | (9 | "9") | (10 | "10") | (11 | "11") | (12 | "12")) | {
+    widthType: ("fit-content" | "auto-fill" | (1 | "1") | (2 | "2") | (3 | "3") | (4 | "4") | (5 | "5") | (6 | "6") | (7 | "7") | (8 | "8") | (9 | "9") | (10 | "10") | (11 | "11") | (12 | "12")) | {
         type: string;
         value: string;
     };
-    lgWidthType: ("auto-fill" | "fit-content" | (1 | "1") | ("2" | 2) | (3 | "3") | ("4" | 4) | ("5" | 5) | (6 | "6") | (7 | "7") | (8 | "8") | (9 | "9") | (10 | "10") | (11 | "11") | (12 | "12")) | {
+    lgWidthType: ("fit-content" | "auto-fill" | (1 | "1") | (2 | "2") | (3 | "3") | (4 | "4") | (5 | "5") | (6 | "6") | (7 | "7") | (8 | "8") | (9 | "9") | (10 | "10") | (11 | "11") | (12 | "12")) | {
         type: string;
         value: string;
     };

package/dist/web/components/grid/row.d.ts

@@ -2,7 +2,7 @@ import React from 'react';
 import type { CommonPropsType } from '../../types';
 import './style';
 declare const _default: React.ForwardRefExoticComponent<CommonPropsType & {
-    alignItems?: "start" | "end" | "center";
+    alignItems?: "center" | "end" | "start";
     gutterX: string;
 } & {
     events: {

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

@@ -6,12 +6,12 @@ type TCompRef = ICompRef<{
     start: () => void;
 }>;
 declare const _default: React.ForwardRefExoticComponent<CommonPropsType & {
+    duration: number;
     prizeList: {
-        image: string;
         title: string;
+        image: string;
     }[];
     enablePrize: boolean;
-    duration: number;
     prizeResult: string;
 } & {
     events: {

package/dist/web/components/pageLayout/PageContent/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import type { CommonPropsType } from '../../../types';
 import './style';
 interface IPageContent extends CommonPropsType {

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import '../style';
 import type { CommonPropsType } from '../../types';
 import type { DataType } from '../../../configs/components/wxOpenApi/phone';

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import type { ButtonProps } from '../../components/button';
 import type { FromSchema } from 'json-schema-to-ts';
 import type CompConfig from '../../../configs/components/wxOpenApi/phoneCode';

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import '../style';
 import type { ButtonProps } from '../../components/button';
 import type { DataType } from '../../../configs/components/wxOpenApi/share';

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

@@ -4,4 +4,4 @@ import type { DataType } from '../../../configs/components/swiper';
 import './style';
 export interface SwiperPropsType extends CommonPropsType, DataType {
 }
-export default function Swiper({ children, className, style, autoplay, circular, vertical, indicatorDots, indicatorColor, indicatorActiveColor, duration, interval, current, events, id, loop, }: SwiperPropsType): JSX.Element;
+export default function Swiper({ children, className, style, autoplay, circular, vertical, indicatorDots, indicatorColor, indicatorActiveColor, duration, interval, current, events, id, loop: loopProp, circularEnabled, }: SwiperPropsType): JSX.Element;

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

@@ -8,13 +8,30 @@ import useDebouncedCallback from '../../utils/hooks/use-debounced-callback';
 import { emptyObject, noop } from '../../utils/constant';
 import './style';
 import { useSyncValue } from '../../utils/hooks/useSyncValue';
-export default function Swiper({ children, className, style, autoplay = true, circular = true, vertical = false, indicatorDots, indicatorColor = 'rgba(200, 200, 200, 0.9)', indicatorActiveColor = 'rgba(0, 0, 0, 0.9)', duration = 500, interval = 5000, current = 0, events = emptyObject, id, loop = true, }) {
+export default function Swiper({ children, className, style, autoplay = true, circular, vertical = false, indicatorDots, indicatorColor = 'rgba(200, 200, 200, 0.9)', indicatorActiveColor = 'rgba(0, 0, 0, 0.9)', duration = 500, interval = 5000, current = 0, events = emptyObject, id, loop: loopProp, circularEnabled, }) {
+    // 循环切换字段优先级（解开 loop/circular 历史死结）：
+    //   1. circularEnabled —— 新增统一字段，仅当用户在编辑器主动开启/关闭时才有值。最高优先级
+    //   2. loopProp        —— 历史 Web 字段，存量 Web 项目可能配过 loop=false
+    //   3. circular        —— 历史 MP 字段，存量 MP 项目可能配过 circular=false
+    //   4. true            —— 全部缺省时默认开启循环（保持原默认行为）
+    // 这种"新字段一旦显式有值就覆盖老字段"的模式可以彻底避免存量项目行为反转，
+    // 也能让老用户通过新字段干净地修改循环行为，无需手工清理 DSL。
+    const loop = circularEnabled !== undefined
+        ? circularEnabled
+        : loopProp !== undefined
+            ? loopProp
+            : circular !== undefined
+                ? circular
+                : true;
     const originChildrenRef = useRef(null);
     const [realChildren, setRealChildren] = useState(children);
     const itemCount = React.Children.count(realChildren);
     current = Math.max(0, Math.min(itemCount - 1, current));
     const [currentIndex, setCurrentIndex] = useSyncValue(current);
-    const [swipeStyle, setSwipeStyle] = useState(null);
+    // 初始偏移：布局为 [最后克隆] [1] [2] ... [n] [第一克隆]，第一张在索引 1，偏移 100%
+    const [swipeStyle, setSwipeStyle] = useState({
+        transform: vertical ? `translate3d(0, -${(current + 1) * 100}%, 0)` : `translate3d(-${(current + 1) * 100}%, 0, 0)`,
+    });
     const [height, setHeight] = useState(0);
     const { change = () => { } } = events;
     useEffect(() => {
@@ -67,7 +84,9 @@ export default function Swiper({ children, className, style, autoplay = true, ci
             cleanupTimeout();
             pre.index = currentIndex;
         };
-    }, [currentIndex, vertical]);
+        // loop 加入依赖：用户在编辑器热切换 circularEnabled / loop / circular 时，
+        // 需要立即按新的循环开关重算 swipeStyle，否则要等下次切换才能生效。
+    }, [currentIndex, vertical, loop]);
     const outerWrapRef = useRef();
     useEventListener(outerWrapRef, 'load', (e) => {
         setHeight(e.target.clientHeight);
@@ -82,24 +101,23 @@ export default function Swiper({ children, className, style, autoplay = true, ci
         setCurrentIndex(index);
     };
     // 设置容器样式、动画
-    // TODO fix settimeout mess
+    // 布局：[最后克隆] [1] [2] ... [n] [第一克隆]，偏移基数为 (to + 1) * 100%
+    // 与 Carousel 保持一致
     const updateSwipeStyle = (to, cur, length) => {
         if (to === cur)
             return noop;
         let timeout = null;
-        // 最后向前到最开始
+        // 最后向前到最开始（正向循环）
         if (to === 0 && cur === length - 1) {
-            circular &&
+            loop &&
                 setSwipeStyle({
                     transform: `translate3d(0, 0, 0)`,
                 });
-            // 不知道
             // eslint-disable-next-line rulesdir/no-timer
             timeout = setTimeout(() => {
                 setSwipeStyle({
-                    transform: vertical ? `translate3d(0, -0%, 0)` : `translate3d(-0%, 0, 0)`,
+                    transform: vertical ? `translate3d(0, -100%, 0)` : `translate3d(-100%, 0, 0)`,
                     transitionDuration: `${duration}ms`,
-                    transitionProperty: 'transform',
                 });
             }, 50);
             return () => {
@@ -108,16 +126,16 @@ export default function Swiper({ children, className, style, autoplay = true, ci
                 }
             };
         }
-        // 第一个后退到最后
+        // 第一个后退到最后（反向循环）
         if (to === length - 1 && cur === 0) {
-            circular &&
+            loop &&
                 setSwipeStyle({
-                    transform: vertical ? `translate3d(0, -${to * 100}%, 0)` : `translate3d(-${to * 100}%, 0, 0)`,
+                    transform: vertical ? `translate3d(0, -${(to + 2) * 100}%, 0)` : `translate3d(-${(to + 2) * 100}%, 0, 0)`,
                 });
             // eslint-disable-next-line rulesdir/no-timer
             timeout = setTimeout(() => {
                 setSwipeStyle({
-                    transform: vertical ? `translate3d(0, -${to * 100}%, 0)` : `translate3d(-${to * 100}%, 0, 0)`,
+                    transform: vertical ? `translate3d(0, -${(to + 1) * 100}%, 0)` : `translate3d(-${(to + 1) * 100}%, 0, 0)`,
                     transitionDuration: `${duration}ms`,
                 });
             }, 50);
@@ -127,8 +145,9 @@ export default function Swiper({ children, className, style, autoplay = true, ci
                 }
             };
         }
+        // 普通切换
         const style = {
-            transform: vertical ? `translate3d(0, -${to * 100}%, 0)` : `translate3d(-${to * 100}%, 0, 0)`,
+            transform: vertical ? `translate3d(0, -${(to + 1) * 100}%, 0)` : `translate3d(-${(to + 1) * 100}%, 0, 0)`,
         };
         if (to !== cur) {
             style.transitionDuration = `${duration}ms`;
@@ -154,9 +173,9 @@ export default function Swiper({ children, className, style, autoplay = true, ci
                     vertical && setIndex(currentIndex - 1);
                 }, onSwipeUp: () => {
                     vertical && setIndex(currentIndex + 1);
-                }, children: [React.Children.map(realChildren, (x, i) => {
+                }, children: [_jsx(SwiperItem, { height: height, setHeight: setHeight, currentIndex: currentIndex, index: itemCount - 1, useless: true, children: React.Children.toArray(realChildren)[itemCount - 1] }), React.Children.map(realChildren, (x, i) => {
                         return (_jsx(SwiperItem, { height: height, setHeight: setHeight, currentIndex: currentIndex, index: i, children: x }));
-                    }), _jsx(SwiperItem, { height: height, setHeight: setHeight, currentIndex: 0, index: 0, useless: true, children: React.Children.map(realChildren, (x) => x)[0] })] })) : null, indicatorDots ? (_jsx("div", { className: "g-swiper__pagination", children: React.Children.map(realChildren, (x, i) => {
+                    }), _jsx(SwiperItem, { height: height, setHeight: setHeight, currentIndex: 0, index: 0, useless: true, children: React.Children.toArray(realChildren)[0] })] })) : null, indicatorDots ? (_jsx("div", { className: "g-swiper__pagination", children: React.Children.map(realChildren, (x, i) => {
                     return (_jsx("a", { href: "#", className: "g-swiper__pagination-bulletm", style: {
                             backgroundColor: currentIndex === i ? indicatorActiveColor : indicatorColor,
                         }, onClick: (e) => {

package/dist/web/components/table/BaseTable.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './style';
 /**
  * 基础表格

package/dist/web/components/table/FieldRender.d.ts

@@ -1,10 +1,9 @@
-/// <reference types="react" />
 /**
  * 根据类型获取展示字段组件的 render 方法，用于表格/详情中的值转换
  * extra: { modelType: 'list' | 'detail' | 'update' | 'create', showTip: boolean }
  * 表格中的字符串/枚举数组，详情中的字符串数组会截断并showTip
  */
-export declare function getFieldRender(field?: any, extra?: any): (val: any) => "-" | JSX.Element;
+export declare function getFieldRender(field?: any, extra?: any): (val: any) => JSX.Element | "-";
 /**
  * object类型，展示表单组件
  */

package/dist/web/components/table/FilterFields.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export declare const FilterFieldsPanel: ({ data, getChooseList, fetchData, isH5, }: {
     data: any;
     getChooseList: any;

package/dist/web/components/table/Form/Enum.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export declare const EnumSelect: (props: any) => JSX.Element;
 export declare const formatEnum: (value: any, field: any, enumOptions: any) => any;
 export declare const EnumView: (props: any) => any;

package/dist/web/components/table/Form/Location.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './style';
 export declare const locationProperties: {
     address: {

package/dist/web/components/table/QuoteModal.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 /**
  * 引用类型显示弹窗
  * @description 使用组件方式编写，避免数据流中断

package/dist/web/components/table/UserDepartment/ViewCell.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './style';
 export declare const ViewCell: ({ data, showType, relation }: {
     data: any;

package/dist/web/components/table/UserDepartment/utils.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export declare const parentIcon: ({ expanded }: {
     expanded: any;
 }) => JSX.Element;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import '../style';
 import type { ButtonProps } from '../../components/button';
 import type { CommonPropsType } from '../../types';

package/dist/web/components/wd-calendar/MonthSelect.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export interface IMonthSelect {
     value?: any;
     onChange?: any;

package/dist/web/components/wd-code-editor/lang/index.d.ts

@@ -14,7 +14,7 @@ export declare const langs: {
     markdown: () => import("@codemirror/language").LanguageSupport;
 };
 /** Language list */
-export declare const langNames: ("jsx" | "javascript" | "typescript" | "mongodb" | "sql" | "mysql" | "json" | "markdown" | "tsx")[];
+export declare const langNames: ("json" | "javascript" | "typescript" | "mongodb" | "sql" | "mysql" | "markdown" | "jsx" | "tsx")[];
 export type LanguageName = keyof typeof langs;
 export declare function loadLanguage(name: LanguageName): import("@codemirror/language").LanguageSupport;
 export declare function format(value: any): Promise<any>;

package/dist/web/components/wd-config-provider/wd-config-context.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 export declare const DEFAULT_CLASS_PREFIX: string;
-export declare const DEFAULT_LOCALE: "en" | "zh";
+export declare const DEFAULT_LOCALE: "zh" | "en";
 export interface Config {
     /**
      * 组件类名前缀

package/dist/web/components/wd-date/elements/interface.d.ts

@@ -1,5 +1,5 @@
-/// <reference types="react" />
 /// <reference types="moment" />
+/// <reference types="react" />
 import type { DataType } from '../../../../configs/components/wd-date';
 type IDateValue = number | string | moment.Moment;
 export interface IDatePickerOptions {

package/dist/web/components/wd-department/_design/wd-department-select.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import type { CommonPropsType } from '../../../types';
 export declare const WdDepartmentSelect: () => JSX.Element;
 export interface WdDepartmentSelectProps extends CommonPropsType {

package/dist/web/components/wd-form/hooks/use-auth-value.d.ts

@@ -11,5 +11,6 @@ type BoolSetter = (val: boolean) => void;
 export declare const createSetStateForAuth: (setters: {
     setVisible: BoolSetter;
     setReadOnly: BoolSetter;
+    unregister?: () => void;
 }) => (value: 'n' | 'rw' | 'r') => "rw" | "r" | "n";
 export {};

package/dist/web/components/wd-form/hooks/use-auth-value.js

@@ -26,10 +26,12 @@ export function useAuthValue({ isDataModel, dataSourceName, }) {
     return authValue;
 }
 export const createSetStateForAuth = (setters) => {
-    const { setReadOnly, setVisible } = setters;
+    const { setReadOnly, setVisible, unregister } = setters;
     return (value) => {
         if (value === 'n') {
             setVisible === null || setVisible === void 0 ? void 0 : setVisible(false);
+            // 无权限时取消注册，从表单容器移除
+            unregister === null || unregister === void 0 ? void 0 : unregister();
         }
         else if (value === 'r') {
             setVisible === null || setVisible === void 0 ? void 0 : setVisible(true);

package/dist/web/components/wd-form/hooks/use-remote-value.js

@@ -2,6 +2,7 @@ import { useCallback, useEffect, useMemo, useState } from 'react';
 import { debug } from '../../../utils/console';
 // import { usePlatform } from '../../../utils/platform';
 // import { alertError } from '../../form/form';
+import { convertMoment } from '../../../utils/hooks/useFormLegacy';
 import { useTimeoutEffect } from '@react-hookz/web';
 import useSWR from 'swr';
 import { emptyObject } from '../../../utils/constant';
@@ -182,6 +183,21 @@ const SINGLE_SELECT_FORMATS = [
     'one-one-r',
 ];
 const MULTI_SELECT_FORMATS = ['many-many', 'one-many'];
+// 判断关联关系字段是否有有效值（排除 null, undefined, '', {}, []）
+function isValidRelationValue(value) {
+    if (value === null || value === undefined || value === '') {
+        return false;
+    }
+    // 排除空对象 {}
+    if (typeof value === 'object' && !Array.isArray(value) && Object.keys(value).length === 0) {
+        return false;
+    }
+    // 排除空数组 []
+    if (Array.isArray(value) && value.length === 0) {
+        return false;
+    }
+    return true;
+}
 export function useInitValueFromRemote(dataSourceType, dataSourceProfile, fetchedInitialValues) {
     return useSWR(() => {
         if ((dataSourceType === 'expression' || dataSourceProfile) && fetchedInitialValues) {
@@ -195,8 +211,9 @@ export function useInitValueFromRemote(dataSourceType, dataSourceProfile, fetche
             return fetchedInitialValues;
         }
         const result = Object.keys(fetchedInitialValues).reduce((acc, field) => {
-            var _a, _b, _c, _d, _e, _f, _g;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
             const format = (_c = (_b = (_a = dataSourceProfile.schema) === null || _a === void 0 ? void 0 : _a.properties) === null || _b === void 0 ? void 0 : _b[field]) === null || _c === void 0 ? void 0 : _c.format;
+            const type = (_f = (_e = (_d = dataSourceProfile.schema) === null || _d === void 0 ? void 0 : _d.properties) === null || _e === void 0 ? void 0 : _e[field]) === null || _f === void 0 ? void 0 : _f.type;
             acc[field] = fetchedInitialValues[field];
             // 统一文档型数据库和mysql数据库返回：
             // 结论如下：
@@ -204,14 +221,26 @@ export function useInitValueFromRemote(dataSourceType, dataSourceProfile, fetche
             // one-one, many-one, one-one-r 返回对象{_id:'xxx'}
             // one-many, many-many, 返回对象数组[{_id:'xxx'}]
             // 没有值 返回 null,"",或者不返回
-            if (['father-son', 'related'].includes(format) && ((_d = fetchedInitialValues[field]) === null || _d === void 0 ? void 0 : _d['_id'])) {
-                acc[field] = (_e = fetchedInitialValues[field]) === null || _e === void 0 ? void 0 : _e['_id'];
+            if (['father-son', 'related'].includes(format) && ((_g = fetchedInitialValues[field]) === null || _g === void 0 ? void 0 : _g['_id'])) {
+                acc[field] = (_h = fetchedInitialValues[field]) === null || _h === void 0 ? void 0 : _h['_id'];
             }
+            // 单选关联：正常返回 { _id } / {} / null；历史/异常情况下可能是字符串 'xxx'，透传保留
             if ([...SINGLE_SELECT_FORMATS].includes(format)) {
-                acc[field] = (_f = fetchedInitialValues[field]) === null || _f === void 0 ? void 0 : _f['_id'];
+                const v = fetchedInitialValues[field];
+                if (v && typeof v === 'object' && !Array.isArray(v)) {
+                    acc[field] = v === null || v === void 0 ? void 0 : v['_id'];
+                }
+                // 非对象（字符串/null/undefined）情况下保留 acc[field] = fetchedInitialValues[field]（已在上方赋值）
             }
             if (MULTI_SELECT_FORMATS.includes(format)) {
-                acc[field] = (_g = fetchedInitialValues[field]) === null || _g === void 0 ? void 0 : _g.map((item) => item === null || item === void 0 ? void 0 : item['_id']);
+                acc[field] = (_j = fetchedInitialValues[field]) === null || _j === void 0 ? void 0 : _j.map((item) => item === null || item === void 0 ? void 0 : item['_id']);
+            }
+            const fieldValue = fetchedInitialValues[field];
+            if (fieldValue && Object.prototype.hasOwnProperty.call(fieldValue, '$date') && type === 'number') {
+                acc[field] = (_l = (_k = convertMoment(fieldValue)) === null || _k === void 0 ? void 0 : _k.valueOf()) !== null && _l !== void 0 ? _l : null;
+            }
+            if (['date', 'datetime'].includes(format) && type === 'number') {
+                acc[field] = (_o = (_m = convertMoment(fieldValue)) === null || _m === void 0 ? void 0 : _m.valueOf()) !== null && _o !== void 0 ? _o : null;
             }
             return acc;
         }, {});
@@ -231,14 +260,16 @@ export function useRemoteParamsFromValue({ dataSourceProfile, formData, formType
         return ['useRemoteParamsFromValueParams', dataSourceProfile, formType, formData];
     }, () => {
         const data = Object.keys(formData).reduce((acc, cur) => {
-            var _a, _b, _c, _d;
+            var _a, _b, _c;
             const format = (_c = (_b = (_a = dataSourceProfile.schema) === null || _a === void 0 ? void 0 : _a.properties) === null || _b === void 0 ? void 0 : _b[cur]) === null || _c === void 0 ? void 0 : _c.format;
             acc[cur] = formData[cur];
             if (SINGLE_SELECT_FORMATS.includes(format)) {
-                acc[cur] = { _id: formData[cur] };
+                // 空值（null/undefined/''/{}）时不转换，保持 null，避免提交 { _id: null } 或 { _id: {} }
+                acc[cur] = isValidRelationValue(formData[cur]) ? { _id: formData[cur] } : null;
             }
             if (MULTI_SELECT_FORMATS.includes(format)) {
-                acc[cur] = (_d = acc[cur]) === null || _d === void 0 ? void 0 : _d.map((_id) => ({ _id }));
+                // 空值时返回 null，有值时转换为 [{ _id: 'xxx' }] 格式
+                acc[cur] = isValidRelationValue(formData[cur]) ? formData[cur].map((_id) => ({ _id })) : null;
             }
             if ('x-json' === format && typeof formData[cur] === 'string') {
                 try {