@cloudbase/weda-ui 3.5.0 → 3.5.2

package/dist/web/components/web-view/style.d.ts

@@ -0,0 +1,2 @@
+import './index.css';
+import '../style';

package/dist/web/components/web-view/web-view.d.ts

@@ -0,0 +1,26 @@
+import React from 'react';
+import type { CommonPropsType } from '../../types';
+import type { DataType, EventsType } from '../../../configs/components/web-view';
+import './style';
+export declare const WebView: React.ForwardRefExoticComponent<CommonPropsType & import("type-fest").Simplify<{
+    link: string;
+}> & import("type-fest").Simplify<import("../../../configs/type-utils").StaticEventsType<[{
+    readonly name: "load";
+    readonly title: "网页加载成功";
+    readonly detail: import("@sinclair/typebox").TObject<{
+        src: import("@sinclair/typebox").TString;
+    }>;
+}, {
+    readonly name: "error";
+    readonly title: "网页加载失败";
+    readonly detail: import("@sinclair/typebox").TObject<{
+        src: import("@sinclair/typebox").TString;
+    }>;
+}, {
+    readonly name: "message";
+    readonly title: "接收网页消息";
+    readonly detail: import("@sinclair/typebox").TObject<{
+        data: import("@sinclair/typebox").TRecord<import("@sinclair/typebox").TString, import("@sinclair/typebox").TAny>;
+    }>;
+}]>> & React.RefAttributes<unknown>>;
+export type WdWebViewProps = CommonPropsType & DataType & EventsType;

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

@@ -6,7 +6,7 @@ import { isInIde, usePlatform } from '../../utils/platform';
 import { Bubble } from 'tea-component';
 import EmptyContent from '../statusContent';
 import './style';
-export const WebView = forwardRef(function WebView({ link, events, className, style }, ref) {
+export const WebView = forwardRef(function WebView({ link = '', events, className, style }, ref) {
     const platform = usePlatform();
     const iframeRef = useRef(null);
     // 样式

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

@@ -0,0 +1,16 @@
+import * as React from 'react';
+import type { CommonPropsType } from '../../types';
+import './style';
+export interface VideoProps {
+    videoDataSource: string;
+    posterImage: string;
+    autoPlay: boolean;
+    loopPlay: boolean;
+    mutePlay: boolean;
+    controlBarStatus: boolean;
+    startTime: number;
+    endTime: number;
+}
+export type WedaVideoProps = Partial<CommonPropsType & VideoProps>;
+declare const WedaVideo: React.FC<WedaVideoProps>;
+export default WedaVideo;

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

@@ -42,6 +42,7 @@ const WedaVideo = ({ className, style, id, videoDataSource, posterImage, autoPla
     const playerRef = useRef(null);
     const [videoModalStatus, setVideoModalStatus] = useState(true);
     const [videoErrMsg, setVideoErrMsg] = useState('');
+    const { data: realPosterImage } = useTempUrl(posterImage);
     const { data: realSrc, error } = useTempUrl(videoDataSource);
     const videoType = useMemo(() => {
         return realSrc === null || realSrc === void 0 ? void 0 : realSrc.substring(realSrc.lastIndexOf('.') + 1).toLowerCase();
@@ -54,7 +55,7 @@ const WedaVideo = ({ className, style, id, videoDataSource, posterImage, autoPla
         const videoElement = videoRef.current;
         if (!playerRef.current) {
             const videoOptions = {
-                poster: posterImage,
+                poster: realPosterImage,
                 autoplay: autoPlay,
                 bigPlayButton: true,
                 loop: loopPlay,
@@ -123,7 +124,7 @@ const WedaVideo = ({ className, style, id, videoDataSource, posterImage, autoPla
                 setVideoModalStatus(true);
             });
         }
-    }, [videoRef]);
+    }, [videoRef, realPosterImage]);
     useEffect(() => {
         // 切换视频源
         if (playerRef.current && videoType) {

package/dist/web/components/wedaVideo/style.d.ts

@@ -0,0 +1,3 @@
+import 'video.js/dist/video-js.css';
+import './index.css';
+import '../style';

package/dist/web/index.d.ts

@@ -0,0 +1,9 @@
+export * from "./components";
+declare namespace _default {
+    export { components };
+    export { actions };
+}
+export default _default;
+import * as components from "./components";
+import * as actions from "./actions";
+export { isH5Platform, usePlatform } from "./utils/platform";

package/dist/web/index.js

@@ -1,5 +1,6 @@
 import * as components from './components';
 import * as actions from './actions';
+// eslint-disable-next-line rulesdir/no-export-all
 export * from './components';
 export { isH5Platform, usePlatform } from './utils/platform';
 export default { components, actions };

package/dist/web/utils/classnames.d.ts

@@ -0,0 +1,2 @@
+export default classNames;
+declare function classNames(...args: any[]): any;

package/dist/web/utils/config-context/index.d.ts

@@ -0,0 +1 @@
+export { useConfig } from './use-config';

package/dist/web/utils/config-context/use-config.d.ts

@@ -0,0 +1,3 @@
+export declare function useConfig(): {
+    classPrefix: string;
+};

package/dist/web/utils/console.d.ts

@@ -0,0 +1,3 @@
+type TConsoleLog = typeof console;
+export declare const debug: (label: string) => TConsoleLog;
+export {};

package/dist/web/utils/console.js

@@ -11,16 +11,42 @@ export const debug = (label) => {
             : window;
     // 防 drop console
     const globalConsoleObj = globalVar['con' + 'sole'];
-    return new Proxy(globalConsoleObj, {
-        get(_console, k) {
-            if (showLog) {
-                return (...args) => {
-                    globalConsoleObj[k](label, ...args);
-                };
-            }
-            else {
-                return noop;
-            }
-        },
+    // @ts-expect-error ignore
+    return createProxy((k) => {
+        if (showLog) {
+            return (...args) => {
+                globalConsoleObj[k](label, ...args);
+            };
+        }
+        else {
+            return noop;
+        }
     });
 };
+function createProxy(initValue) {
+    function set(key) {
+        const value = initValue(key);
+        Object.defineProperty(container, key, { value, configurable: true });
+        return value;
+    }
+    const container = {
+        __proto__: new Proxy({ __proto__: null }, {
+            get(_, key) {
+                if (typeof key === 'symbol')
+                    return undefined;
+                return set(key);
+            },
+        }),
+    };
+    return new Proxy(container, {
+        getPrototypeOf: () => null,
+        setPrototypeOf: (_, v) => v === null,
+        getOwnPropertyDescriptor: (_, key) => {
+            if (typeof key === 'symbol')
+                return undefined;
+            if (!(key in container))
+                set(key);
+            return Object.getOwnPropertyDescriptor(container, key);
+        },
+    });
+}

package/dist/web/utils/constant.d.ts

@@ -0,0 +1,77 @@
+export declare const NOT_EXISTED_VALUE: unique symbol;
+export declare const TitleType: {
+    readonly LEFT: "left";
+    readonly TOP: "top";
+    readonly NONE: "none";
+};
+export declare const LOAD_ERR_IMG_BASE64: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIzMiIgaGVpZ2h0PSIzMiIgdmlld0JveD0iMCAwIDMyIDMyIiBmaWxsPSJub25lIj4KICA8cGF0aCBkPSJNMjUuMzIgMTYuMzU5N0MyNi4wNzY0IDE2LjM1OTcgMjYuODI1NCAxNi41MDg3IDI3LjUyNDMgMTYuNzk4MUMyOC4yMjMxIDE3LjA4NzYgMjguODU4MSAxNy41MTE5IDI5LjM5MjkgMTguMDQ2OEMyOS45Mjc4IDE4LjU4MTYgMzAuMzUyMSAxOS4yMTY2IDMwLjY0MTYgMTkuOTE1NEMzMC45MzEgMjAuNjE0MyAzMS4wOCAyMS4zNjMzIDMxLjA4IDIyLjExOTdDMzEuMDggMjIuODc2MSAzMC45MzEgMjMuNjI1MSAzMC42NDE2IDI0LjMyMzlDMzAuMzUyMSAyNS4wMjI4IDI5LjkyNzggMjUuNjU3OCAyOS4zOTI5IDI2LjE5MjZDMjguODU4MSAyNi43Mjc1IDI4LjIyMzEgMjcuMTUxOCAyNy41MjQzIDI3LjQ0MTJDMjYuODI1NCAyNy43MzA3IDI2LjA3NjQgMjcuODc5NyAyNS4zMiAyNy44Nzk3QzIzLjc5MjQgMjcuODc5NyAyMi4zMjczIDI3LjI3MjggMjEuMjQ3MSAyNi4xOTI2QzIwLjE2NjkgMjUuMTEyNCAxOS41NiAyMy42NDczIDE5LjU2IDIyLjExOTdDMTkuNTYgMjAuNTkyIDIwLjE2NjkgMTkuMTI3IDIxLjI0NzEgMTguMDQ2OEMyMi4zMjczIDE2Ljk2NjUgMjMuNzkyNCAxNi4zNTk3IDI1LjMyIDE2LjM1OTdaTTI4IDMuNTU5NjlWMTQuODc2OEMyNy4xNzc3IDE0LjU4NjYgMjYuMTkyIDE0LjQzODggMjUuMzIgMTQuNDM5N0MyNC4wMzEgMTQuNDM5NyAyMi44MTU3IDE0Ljc1NzEgMjEuNzQ4OCAxNS4zMTg0TDIwLjc5NTIgMTMuMTU5N0wxNi4wMjU5IDIwLjAyNzVMOC40NDU3NiAxNi40NDFMMy41NiAyMy4zOTk3SDE3Ljc0NjJDMTcuOTg2NyAyNC44MjkgMTguNjI4MiAyNi4xNjA2IDE5LjU5NTggMjcuMjM5N0gxVjMuNTU5NjlIMjhaTTI1Ljk2IDI0LjAzOTdIMjQuNjhWMjUuMzE5N0gyNS45NlYyNC4wMzk3Wk0yNS45NiAxOC45MTk3SDI0LjY4VjIzLjM5OTdIMjUuOTZWMTguOTE5N1pNNi4xMiAxMC41OTk3QzYuMTIgMTEuOTk4MSA3LjE5OTA0IDEzLjEwODUgOC42MDc2OCAxMy4xNTg0QzEwLjAyMDggMTMuMjA3NyAxMS4yNCAxMi4wNDggMTEuMjQgMTAuNTk5N0MxMS4yNCA5LjI0NjA5IDEwLjA2NDMgOC4wODU3NyA4Ljc1MjMyIDguMDQwOTdDNy4yOTU2OCA3Ljk5MTY5IDYuMTIgOS4xNTEzNyA2LjEyIDEwLjU5OTdaIiBmaWxsPSIjQkNDNEQwIj48L3BhdGg+Cjwvc3ZnPgo=";
+export declare const RICH_TEXT_ICON_PACK: {
+    mathFormula: string;
+    leftTextAlign: string;
+    centerTextAlign: string;
+    rightTextAlign: string;
+    justifyTextAlign: string;
+    textIndent: string;
+    heading: string;
+    marginTop: string;
+    marginBottom: string;
+    marginSide: string;
+    lineSpace: string;
+    wordSpace: string;
+};
+export declare const REL_DICT: {
+    readonly equal: "eq";
+    readonly unequal: "neq";
+    readonly include: "search";
+    readonly exclude: "_exclude";
+    readonly begin_with: "_begin_with";
+    readonly greater: "gt";
+    readonly greater_or_equal: "gte";
+    readonly bigger_or_equal: "gte";
+    readonly less: "lt";
+    readonly less_or_equal: "lte";
+    readonly in: "in";
+    readonly not_in: "nin";
+    readonly uin: "nin";
+    readonly empty: "empty";
+    readonly nempty: "nempty";
+};
+export declare const emptyObject: {};
+export declare const emptyArray: readonly [];
+export declare const noop: () => void;
+export declare const SystemDefaultFields: string[];
+export declare const TABLE_BUTTONS: {
+    text: string;
+    tooltip: string;
+    type: string;
+    htmlType: string;
+    action: string;
+    show: boolean;
+    loading: boolean;
+    disabled: boolean;
+}[];
+export declare const TABLE_SETTINGS: {
+    text: string;
+    tooltip: string;
+    type: string;
+    htmlType: string;
+    action: string;
+    show: boolean;
+    loading: boolean;
+    disabled: boolean;
+}[];
+export declare const TABLE_SLOT_PREFIX = "cell_";
+export declare const CELL_CUSTOM_OPTION = "cell__custom__option";
+export declare const GLOBAL_BUTTON = "globalButton";
+export declare const FORM_MAX_LENGTH = 140;
+export declare const KEY_DOWN_CODE = 13;
+export declare const getWhitelist: () => {
+    whiteList: {
+        a: string[];
+        img: string[];
+        td: string[];
+        th: string[];
+    };
+    onTagAttr: (tag: any, name: any, value: any) => string;
+    onIgnoreTagAttr: (tag: any, name: any, value: any) => string;
+};

package/dist/web/utils/constant.js

@@ -38,7 +38,6 @@ export const REL_DICT = {
 };
 export const emptyObject = {};
 export const emptyArray = [];
-// eslint-disable-next-line @typescript-eslint/no-empty-function
 export const noop = (() => { });
 // 内置字段
 export const SystemDefaultFields = [
@@ -133,3 +132,112 @@ export const CELL_CUSTOM_OPTION = 'cell__custom__option';
 export const GLOBAL_BUTTON = 'globalButton';
 export const FORM_MAX_LENGTH = 140;
 export const KEY_DOWN_CODE = 13;
+// 获取富文本白名单
+export const getWhitelist = () => {
+    const allowedTags = [
+        'address',
+        'article',
+        'aside',
+        'footer',
+        'header',
+        'h1',
+        'h2',
+        'h3',
+        'h4',
+        'h5',
+        'h6',
+        'hgroup',
+        'main',
+        'nav',
+        'section',
+        'blockquote',
+        'dd',
+        'div',
+        'dl',
+        'dt',
+        'figcaption',
+        'figure',
+        'hr',
+        'li',
+        'main',
+        'ol',
+        'p',
+        'pre',
+        'ul',
+        'abbr',
+        'b',
+        'bdi',
+        'bdo',
+        'br',
+        'cite',
+        'code',
+        'data',
+        'dfn',
+        'em',
+        'i',
+        'kbd',
+        'mark',
+        'q',
+        'rb',
+        'rp',
+        'rt',
+        'rtc',
+        'ruby',
+        's',
+        'samp',
+        'small',
+        'span',
+        'strong',
+        'sub',
+        'sup',
+        'time',
+        'u',
+        'var',
+        'wbr',
+        'caption',
+        'col',
+        'colgroup',
+        'table',
+        'tbody',
+        'tfoot',
+        'thead',
+        'tr',
+    ];
+    const whiteList = {
+        a: ['href', 'target', 'style', 'class', 'name'],
+        img: [
+            'alt',
+            'style',
+            'width',
+            'height',
+            'src',
+            'title',
+            'class',
+            'srcset',
+            'loading',
+        ],
+        td: ['style', 'class', 'colspan', 'rowspan'],
+        th: ['style', 'class', 'colspan', 'rowspan'],
+    };
+    allowedTags.forEach((tag) => {
+        whiteList[tag] = ['style', 'class'];
+    });
+    return {
+        whiteList,
+        onTagAttr: function (tag, name, value) {
+            if (((tag === 'img' && name === 'src') ||
+                (tag === 'a' && name === 'href')) &&
+                /^((http)|(https)|(cloud)|(mailto)|(ftp)|(tel)):/.test(value)) {
+                return `${name}="${value}"`;
+            }
+            if (name === 'style') {
+                return `${name}="${value}"`;
+            }
+        },
+        onIgnoreTagAttr: function (tag, name, value) {
+            if (name.substr(0, 5) === 'data-') {
+                return `${name}="${value}"`;
+            }
+        },
+    };
+};

package/dist/web/utils/datasource.d.ts

@@ -0,0 +1,41 @@
+export class DataSource {
+    constructor(name: any);
+    dbName: any;
+    getRecord(id: any): Promise<any>;
+    getRecordList(params?: {}, { db, swr }?: {
+        db?: any;
+        swr?: {};
+    }): Promise<any>;
+    getRecordListV2(params?: {}, { db, swr }?: {
+        db?: any;
+        swr?: {};
+    }): Promise<any>;
+    createRecord(data: any): Promise<any>;
+    batchDeleteRecord(ids: any, supportManyRelated: any): Promise<any>;
+    batchCreateRecord(data: any): Promise<any>;
+    updateRecord(id: any, data: any): Promise<any>;
+    /**
+     * API方法调用
+     */
+    getConnect(method: any, params: any, swr: any): Promise<any>;
+}
+export function getDataSourceByName(dbName: string, GetColumnAuth?: boolean): Promise<object>;
+export function getDataSourceByNameCompatibleProvite(dbName: any): Promise<any>;
+export function getAuthFieldsByName(dbName: any): Promise<{}>;
+export function getDataSourceFieldsWithAuth(authList: any, resourceCheckInfos: any): any;
+export function getAuthFields(dbName: any, enabledFieldNames: any, displaySystem: any, isUseAll: boolean, isModel: boolean, connectorMethod: any): Promise<{
+    readFields: any[];
+    writeFields: any[];
+    requireNoRwFields: any[];
+    authLoading: boolean;
+    showFields: any[];
+}>;
+export function resolveFieldsFromDatasource({ dbName, enabledFieldNames, displaySystem, isUseAll, isModel, connectorMethod, }: {
+    dbName: any;
+    enabledFieldNames: any;
+    displaySystem: any;
+    isUseAll: any;
+    isModel?: boolean;
+    connectorMethod: any;
+}): Promise<any>;
+export function getPrimaryField(_data: any): any;

package/dist/web/utils/datasource.js

@@ -1,6 +1,7 @@
 import { isInIde, alertErrorMessage, isSystemField } from './platform';
+import { callDataSource, callConnector, callWedaApi } from './tcb';
+import { WdCompError } from './error';
 /* **** 数据源相关方法 **** */
-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 {
     constructor(name) {
         Object.defineProperty(this, "dbName", {
@@ -13,13 +14,13 @@ export class DataSource {
     }
     async getRecord(id) {
         try {
-            const res = await window.app.cloud.callDataSource({
+            const res = await callDataSource({
                 dataSourceName: this.dbName,
                 methodName: 'wedaGetItem',
                 params: {
                     _id: id,
                 },
-            });
+            }, true);
             return res;
         }
         catch (error) {
@@ -32,13 +33,33 @@ export class DataSource {
             return {};
         }
     }
-    async getRecordList(params = {}, db = this.dbName) {
+    async getRecordList(params = {}, { db = this.dbName, swr = {} } = {}) {
+        var _a, _b;
         try {
-            const res = await window.app.cloud.callDataSource({
+            const res = await callDataSource({
                 params,
                 dataSourceName: db,
                 methodName: 'wedaGetRecords',
+                swr,
+            }, true);
+            return res;
+        }
+        catch (error) {
+            throw new WdCompError(`${error === null || error === void 0 ? void 0 : error.message}` || '', {
+                code: (error === null || error === void 0 ? void 0 : error.code) || '',
+                requestId: (_b = (_a = error === null || error === void 0 ? void 0 : error.original) === null || _a === void 0 ? void 0 : _a.original) === null || _b === void 0 ? void 0 : _b.requestId,
+                original: error === null || error === void 0 ? void 0 : error.original,
             });
+        }
+    }
+    async getRecordListV2(params = {}, { db = this.dbName, swr = {} } = {}) {
+        try {
+            const res = await callDataSource({
+                params,
+                dataSourceName: db,
+                methodName: 'wedaGetRecordsV2',
+                swr,
+            }, true);
             return res;
         }
         catch (error) {
@@ -52,40 +73,83 @@ export class DataSource {
         }
     }
     async createRecord(data) {
-        return window.app.cloud.callDataSource({
+        return callDataSource({
             dataSourceName: this.dbName,
             methodName: 'wedaCreate',
             params: data,
         });
     }
-    async batchDeleteRecord(ids) {
+    async batchDeleteRecord(ids, supportManyRelated) {
+        var _a, _b, _c, _d, _e;
         let params = {};
         let methodName = '';
         if (ids.length === 0)
             return;
         if (ids.length === 1) {
-            params = { _id: ids[0] };
-            methodName = 'wedaDelete';
+            supportManyRelated
+                ? (params = {
+                    filter: {
+                        where: {
+                            $and: [
+                                {
+                                    _id: {
+                                        $in: [ids[0]],
+                                    },
+                                },
+                            ],
+                        },
+                    },
+                })
+                : (params = { _id: ids[0] });
+            supportManyRelated
+                ? (methodName = 'wedaDeleteV2')
+                : (methodName = 'wedaDelete');
         }
         else {
-            params = { where: [{ Key: '_id', Rel: 'in', Val: ids }] };
-            methodName = 'wedaBatchDelete';
+            supportManyRelated
+                ? (params = {
+                    filter: {
+                        where: {
+                            $and: [
+                                {
+                                    _id: {
+                                        $in: ids,
+                                    },
+                                },
+                            ],
+                        },
+                    },
+                })
+                : (params = { where: [{ Key: '_id', Rel: 'in', Val: ids }] });
+            supportManyRelated
+                ? (methodName = 'wedaBatchDeleteV2')
+                : (methodName = 'wedaBatchDelete');
+        }
+        try {
+            const res = await callDataSource({
+                dataSourceName: this.dbName,
+                methodName,
+                params,
+            }, true);
+            return res;
+        }
+        catch (error) {
+            throw new WdCompError(`${(_c = (_b = (_a = error === null || error === void 0 ? void 0 : error.original) === null || _a === void 0 ? void 0 : _a.original) === null || _b === void 0 ? void 0 : _b.result) === null || _c === void 0 ? void 0 : _c.message}`, {
+                code: error === null || error === void 0 ? void 0 : error.code,
+                requestId: (_e = (_d = error === null || error === void 0 ? void 0 : error.original) === null || _d === void 0 ? void 0 : _d.original) === null || _e === void 0 ? void 0 : _e.requestId,
+                original: error === null || error === void 0 ? void 0 : error.original,
+            });
         }
-        return window.app.cloud.callDataSource({
-            dataSourceName: this.dbName,
-            methodName,
-            params,
-        });
     }
     async batchCreateRecord(data) {
-        return window.app.cloud.callDataSource({
+        return callDataSource({
             dataSourceName: this.dbName,
             methodName: 'wedaBatchCreate',
             params: { records: data },
         });
     }
     async updateRecord(id, data) {
-        return window.app.cloud.callDataSource({
+        return callDataSource({
             dataSourceName: this.dbName,
             methodName: 'wedaUpdate',
             params: {
@@ -97,9 +161,9 @@ export class DataSource {
     /**
      * API方法调用
      */
-    async getConnect(method, params) {
+    async getConnect(method, params, swr) {
         const { where, ...newParams } = params;
-        return window.app.cloud.callConnector({
+        return callConnector({
             dataSourceName: this.dbName,
             methodName: method,
             params: Object.prototype.toString.call(params) === '[object Object]'
@@ -107,24 +171,38 @@ export class DataSource {
                     ? newParams
                     : params
                 : {},
+            swr,
         });
     }
 }
+/**
+ * Retrieves the data source with the specified name.
+ * @async
+ * @param {string} dbName - The name of the database.
+ * @param {boolean} GetColumnAuth - Whether to get the column authorization.
+ * @returns {Promise<object>} An object representing the data source.
+ */
 export const getDataSourceByName = async (dbName, GetColumnAuth = true) => {
     var _a, _b;
     try {
+        // 默认采用swr模式
+        const swrMode = true;
         // dbName 为空时
         if (!dbName)
             return;
         // 兼容私有环境，新接口不存在的情况 私有化权限接口存在两种情况 1、sdk版本getDataSourceProfileAsync方法不存在 2、getDataSourceProfileAsync方法存在但是没有返回权限字段resourceCheckInfos
         if ((window === null || window === void 0 ? void 0 : window._isPrivate) && !((_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.getDataSourceProfileAsync)) {
-            const { resourceCheckInfos } = await window.app.cloud.getDataSourceProfileAsync(GetColumnAuth ? { Name: dbName, GetColumnAuth: true } : dbName);
+            const { resourceCheckInfos } = await window.app.cloud.getDataSourceProfileAsync(GetColumnAuth
+                ? { Name: dbName, GetColumnAuth: true, swrMode }
+                : dbName);
             // 没有返回权限字段resourceCheckInfos
             if (!resourceCheckInfos) {
                 return getDataSourceByNameCompatibleProvite(dbName);
             }
         }
-        const datasource = await window.app.cloud.getDataSourceProfileAsync(GetColumnAuth ? { Name: dbName, GetColumnAuth: true } : { Name: dbName });
+        const datasource = await window.app.cloud.getDataSourceProfileAsync(GetColumnAuth
+            ? { Name: dbName, GetColumnAuth: true, swrMode }
+            : { Name: dbName, swrMode });
         return datasource;
     }
     catch (error) {
@@ -351,16 +429,15 @@ export const resolveFieldsFromDatasource = async ({ dbName, enabledFieldNames, d
 export const getPrimaryField = (_data) => {
     let data = {};
     try {
-        data = JSON.parse(JSON.stringify(_data));
-        const keys = Object.keys(data).filter((item) => item.includes('@'));
+        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;
+            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]) {
+                if (record && record._id === _data[field]) {
                     // 当record下主列字段没有值时，默认返回主列id
                     record[name]
                         ? (data[field] = record[name])
@@ -368,6 +445,7 @@ export const getPrimaryField = (_data) => {
                 }
             }
         });
+        data = { ..._data, ...data };
     }
     catch (error) {
         console.error('主列字段数据转换出错', error);