@cloudbase/weda-ui 3.8.1 → 3.9.0

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

@@ -1,5 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import React, { useCallback, useImperativeHandle, useState, useRef, } from 'react';
+import React, { useCallback, useState, useRef } from 'react';
+import { useSetWidgetApi } from '../../utils/widget-api/use-set-widget-api';
 import ListView from '../listView';
 import { useLoopRenderDetect } from '../common/use-loop-render-detect';
 /**
@@ -16,10 +17,11 @@ export default React.forwardRef(function DataView(props, ref) {
     }, []);
     const refresh = useCallback(() => { var _a, _b; return (_b = (_a = listViewRef.current) === null || _a === void 0 ? void 0 : _a.refresh) === null || _b === void 0 ? void 0 : _b.call(_a); }, [listViewRef.current]);
     const deleteOne = useCallback((params) => { var _a, _b; return (_b = (_a = listViewRef.current) === null || _a === void 0 ? void 0 : _a.deleteOne) === null || _b === void 0 ? void 0 : _b.call(_a, params); }, [listViewRef.current]);
-    useImperativeHandle(ref, () => ({ record, refresh, deleteOne }), [
+    useSetWidgetApi(() => ({
         record,
         refresh,
         deleteOne,
-    ]);
+        dataSourceVersion: props.supportManyRelated ? 'v2' : 'v1',
+    }), [record, refresh, deleteOne, props.supportManyRelated], ref);
     return (_jsx(ListView, { ...props, ref: listViewRef, isRecords: false, orderBy: undefined, orderType: undefined, template: "none", pageSize: 1, pagination: "none", beforeDataChange: beforeDataChange, refType: "dataView", dataSourceData: [].concat(props.dataSourceData) }));
 });

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

@@ -128,6 +128,7 @@ export { default as WdMenPlantLayout } from "./wd-menu-plant-layout";
 export { default as WdMenuVerticalLayout } from "./wd-menu-vertical-layout";
 export { default as WdMenuTabLayout } from "./wd-menu-tab-layout";
 export { default as WdMenuNavLayout } from "./wd-menu-nav-layout";
+export { default as WdMenuNavTabLayout } from "./wd-menu-nav-tab-layout";
 export { default as WdMenuList } from "./wd-menu-list";
 export { default as WdCard } from "./wd-card";
 export { default as WdLayout } from "./wd-layout";
@@ -142,6 +143,7 @@ export const WdCodeEditor: any;
 export const WdMember: any;
 export const WdLocation: any;
 export const WdRichText: any;
+export const WdMarkdown: any;
 export { default as WdCanvas } from "./wd-canvas";
 export { default as WdAudio } from "./wd-audio";
 export { default as WdFormObj } from "./wd-form-obj";

package/dist/web/components/index.js

@@ -177,6 +177,7 @@ export { default as WdMenPlantLayout } from './wd-menu-plant-layout';
 export { default as WdMenuVerticalLayout } from './wd-menu-vertical-layout';
 export { default as WdMenuTabLayout } from './wd-menu-tab-layout';
 export { default as WdMenuNavLayout } from './wd-menu-nav-layout';
+export { default as WdMenuNavTabLayout } from './wd-menu-nav-tab-layout';
 export { default as WdMenuList } from './wd-menu-list';
 // export { default as WdLoading } from './wd-loading';
 export { default as WdCard } from './wd-card';
@@ -201,6 +202,9 @@ export const WdLocation = loadable(() => import('./wd-location'), {
 export const WdRichText = loadable(() => import('./wd-rich-text'), {
     fallback,
 });
+export const WdMarkdown = loadable(() => import('./wd-markdown'), {
+    fallback,
+});
 export { default as WdCanvas } from './wd-canvas';
 export { default as WdAudio } from './wd-audio';
 export { default as WdFormObj } from './wd-form-obj';

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

@@ -12,6 +12,7 @@ import { useLoopRenderDetect } from '../common/use-loop-render-detect';
 import { getModelParams } from '../../utils/getModelParams';
 import { WdCompError } from '../../utils/error';
 import { useSetWidgetApi } from '../../utils/widget-api/use-set-widget-api';
+import { useQueryParams } from './useQueryParams';
 const BLOCK_NAME = 'weda-list-view';
 const LISTVIEW_MESSAGE = {
     methods_no_support: '当前组件绑定了APIs，暂不支持进行数据删除',
@@ -25,6 +26,17 @@ const getIdeMockData = (length = 3) => Array.from({ length }).map(() => Object.c
 const getStringValue = (v) => (typeof v === 'string' ? v : '');
 const defaultCloudbase = { callDataSource, isInIde };
 const defaultBeforeDataChange = (v) => v;
+const getQueryParams = (isV2protocol, params) => {
+    if (isV2protocol) {
+        params.getCount = true;
+        params.pageNumber = params.pageNo;
+        if (params.orderBy && ['asc', 'desc'].includes(params.orderType)) {
+            params.orderBy = [{ [params.orderBy]: params.orderType }];
+        }
+        params.compatibleWithV1 = true;
+    }
+    return params;
+};
 /**
  * 数据容器-列表视图
  */
@@ -33,13 +45,14 @@ export default React.forwardRef(function ListView(props, ref) {
     const { dataSourceType, bindConnectMetadata, connectorMethod, connectorParams: rawConnectorParams, datasource, dataSourceData: rawDataSourceData, // 表达式: 值
     template, enableTotal, // 表达式: 启用动态分页
     total: rawTotal, // 表达式: 总页数
-    pageSize = 5, pagination, events, className, children, isRecords = true, //是否展示回调recoreds字段
+    pageSize = 5, pageIndex: _pageNo = 1, pagination, events, className, children, isRecords = true, //是否展示回调records字段
     isSetStatus: rawIsSetStatus = false, //是否开启异常状态
     isSetLoading: rawIsSetLoading = true, // 是否开启加载状态
     loading = false, // 数据加载状态，仅表达式生效
     emptyText, //空状态时的文案
     loadCompletedText = '', // 加载到底提示
-    appCloud = defaultCloudbase, beforeDataChange = defaultBeforeDataChange, refType = 'listView', loadButtonText, ...rest } = props;
+    appCloud = defaultCloudbase, beforeDataChange = defaultBeforeDataChange, refType = 'listView', loadButtonText, selectFieldType = 'main', // 查询字段范围类型
+    ...rest } = props;
     const platform = usePlatform();
     const isH5 = platform === 'h5';
     const isSetStatus = dataSourceType !== 'expression' ? rawIsSetStatus : false;
@@ -50,6 +63,7 @@ export default React.forwardRef(function ListView(props, ref) {
     const methodName = getStringValue(dataSourceType === 'data-model'
         ? ((_a = datasource === null || datasource === void 0 ? void 0 : datasource.extra) === null || _a === void 0 ? void 0 : _a.methodName) || 'wedaGetRecords'
         : connectorMethod === null || connectorMethod === void 0 ? void 0 : connectorMethod.name);
+    const isV2protocol = methodName === 'wedaGetRecordsV2';
     const dataSourceName = getStringValue(dataSourceType === 'data-model'
         ? datasource === null || datasource === void 0 ? void 0 : datasource.name
         : (_b = bindConnectMetadata === null || bindConnectMetadata === void 0 ? void 0 : bindConnectMetadata.datasource) === null || _b === void 0 ? void 0 : _b.name);
@@ -66,7 +80,7 @@ export default React.forwardRef(function ListView(props, ref) {
     const paramRef = useRef({
         dataSourceName,
         methodName,
-        params: { pageNo: 1, pageSize, connectorParams, modelParams },
+        params: { pageNo: _pageNo, pageSize, connectorParams, modelParams },
         pagination,
     }); // 最新请求参数
     const exprRef = useRef({ total: 0, dataSourceData: [], enableTotal }); // 对比表达式变化
@@ -90,6 +104,13 @@ export default React.forwardRef(function ListView(props, ref) {
         message: '',
         requestId: '',
     });
+    const isReadyToGetAuthField = dataSourceType === 'data-model' && isV2protocol && !!dataSourceName;
+    const { queryParams, fieldsLoading } = useQueryParams({
+        dataSourceName,
+        isReadyToGetAuthField,
+        selectFieldType,
+        modelParams,
+    });
     // 组件卸载时触发
     useEffect(() => {
         clearContext();
@@ -109,13 +130,18 @@ export default React.forwardRef(function ListView(props, ref) {
         var _a, _b;
         clearDelay();
         if (!isIdeMockData) {
+            // authFields 加载中，不触发请求
+            if (isV2protocol && fieldsLoading) {
+                return;
+            }
             fetchData({
                 dataSourceName,
                 methodName,
                 params: {
                     ...(_a = paramRef.current) === null || _a === void 0 ? void 0 : _a.params,
-                    pageNo: 1,
+                    pageNo: _pageNo,
                     pageSize,
+                    modelParams: queryParams,
                 },
                 pagination,
             }, {
@@ -128,15 +154,15 @@ export default React.forwardRef(function ListView(props, ref) {
                 state: getContextState(),
             });
         }
-    }, [methodName, dataSourceName, pageSize, pagination, dataSourceType]);
+    }, [methodName, dataSourceName, pageSize, _pageNo, pagination, dataSourceType, isV2protocol, isIdeMockData, fieldsLoading]);
     // props 对象类型监听，需重新分页
     useEffect(() => {
         var _a, _b, _c, _d;
         if (dataSourceType === 'data-model') {
-            if (!isequal((_b = (_a = paramRef.current) === null || _a === void 0 ? void 0 : _a.params) === null || _b === void 0 ? void 0 : _b.modelParams, modelParams)) {
+            if (!isequal((_b = (_a = paramRef.current) === null || _a === void 0 ? void 0 : _a.params) === null || _b === void 0 ? void 0 : _b.modelParams, queryParams)) {
                 clearDelay();
                 fetchData({
-                    params: { pageNo: 1, modelParams },
+                    params: { pageNo: _pageNo, modelParams: queryParams },
                 }, { isInitData: true });
             }
         }
@@ -205,7 +231,7 @@ export default React.forwardRef(function ListView(props, ref) {
                 const temp = await (appCloud === null || appCloud === void 0 ? void 0 : appCloud.callDataSource({
                     dataSourceName,
                     methodName,
-                    params: tcbParams,
+                    params: getQueryParams(isV2protocol, tcbParams),
                     swr: param.swr,
                 }, true));
                 records = records.concat(temp.records || []);
@@ -216,7 +242,7 @@ export default React.forwardRef(function ListView(props, ref) {
             console.error('fetchDataLoop: ', e);
         }
         return { records: records.slice(0, count), total };
-    }, [appCloud]);
+    }, [appCloud, isV2protocol]);
     // 加载成功(包含为空)事件
     const onSuccessCb = useCallback(({ records, total, isTriggerEmpty, datasource }) => {
         var _a, _b;
@@ -317,7 +343,7 @@ export default React.forwardRef(function ListView(props, ref) {
      * isInitData: 是否初始化数据默认否, isFetchCurrent: 是否拉取当前所有数据默认否
      */
     const fetchData = useCallback(async (param, options) => {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         const { isInitData, isFetchCurrent } = options || {};
         // 合并参数并保存，useEffect 中需要比对
         paramRef.current = {
@@ -330,8 +356,13 @@ export default React.forwardRef(function ListView(props, ref) {
         // 不触发请求
         if (!(dataSourceName && methodName) && dataSourceType !== 'expression')
             return;
+        // select为空时，不触发请求
+        if (isV2protocol && !((_a = Object.keys(modelParams === null || modelParams === void 0 ? void 0 : modelParams.select)) === null || _a === void 0 ? void 0 : _a.length)) {
+            setStatus('loading');
+            return;
+        }
         // 分页变化事件
-        (_a = events === null || events === void 0 ? void 0 : events.onPagingChange) === null || _a === void 0 ? void 0 : _a.call(events, { query: { pageNo, pageSize } });
+        (_b = events === null || events === void 0 ? void 0 : events.onPagingChange) === null || _b === void 0 ? void 0 : _b.call(events, { query: { pageNo, pageSize } });
         setStatus('loading');
         // 前端分页时，应该触发表达式
         if (dataSourceType === 'expression') {
@@ -365,7 +396,7 @@ export default React.forwardRef(function ListView(props, ref) {
                 data = await (appCloud === null || appCloud === void 0 ? void 0 : appCloud.callDataSource({
                     dataSourceName,
                     methodName,
-                    params: tcbParams,
+                    params: getQueryParams(isV2protocol, tcbParams),
                     swr: param.swr,
                 }, true));
             }
@@ -400,7 +431,7 @@ export default React.forwardRef(function ListView(props, ref) {
                     : refType === 'dataView'
                         ? 'WdDataView.QueryError'
                         : 'WdListView.QueryError',
-                requestId: (_c = (_b = e === null || e === void 0 ? void 0 : e.original) === null || _b === void 0 ? void 0 : _b.original) === null || _c === void 0 ? void 0 : _c.requestId,
+                requestId: (_d = (_c = e === null || e === void 0 ? void 0 : e.original) === null || _c === void 0 ? void 0 : _c.original) === null || _d === void 0 ? void 0 : _d.requestId,
                 original: e === null || e === void 0 ? void 0 : e.original,
             });
         }
@@ -418,6 +449,8 @@ export default React.forwardRef(function ListView(props, ref) {
         events,
         enableTotal,
         setExpression,
+        isV2protocol,
+        fieldsLoading,
     ]);
     // 计算上下文对象数据
     const getContextState = (state = {}) => {
@@ -515,6 +548,7 @@ export default React.forwardRef(function ListView(props, ref) {
             total,
             pageNo,
             pageSize: statePageSize,
+            dataSourceVersion: isV2protocol ? 'v2' : 'v1',
             // 组件方法
             deleteOne: async (_id) => {
                 try {
@@ -558,6 +592,7 @@ export default React.forwardRef(function ListView(props, ref) {
         methodRefresh,
         dataRef.current.records,
         err,
+        isV2protocol,
     ], ref);
     /**
      * 分页，加载更多

package/dist/web/components/listView/interface.d.ts

@@ -113,6 +113,10 @@ export interface IListView extends IDataContainer {
      * 显示行数
      */
     pageSize?: number;
+    /**
+     * 页码
+     */
+    pageNo?: number;
     /**
      * 分页类型，加载更多|底部刷新｜分页器
      */

package/dist/web/components/listView/useQueryParams.d.ts

@@ -0,0 +1,11 @@
+interface QueryParams {
+    fieldsLoading: boolean;
+    queryParams: any;
+}
+export declare const useQueryParams: ({ dataSourceName, isReadyToGetAuthField, selectFieldType, modelParams, }: {
+    dataSourceName: any;
+    isReadyToGetAuthField: any;
+    selectFieldType: any;
+    modelParams: any;
+}) => QueryParams;
+export {};

package/dist/web/components/listView/useQueryParams.js

@@ -0,0 +1,23 @@
+import { useMemo } from 'react';
+import { useDataSource } from '../../utils/hooks/useDataSource';
+export const useQueryParams = ({ dataSourceName, isReadyToGetAuthField, selectFieldType, modelParams, }) => {
+    const needQueryFields = selectFieldType === 'all';
+    const { data: dataSource, error } = useDataSource(isReadyToGetAuthField && needQueryFields ? dataSourceName : '');
+    const queryParams = useMemo(() => {
+        var _a;
+        const result = {
+            fieldsLoading: needQueryFields,
+            queryParams: modelParams,
+        };
+        if (selectFieldType === 'all') {
+            const select = {};
+            Object.keys(((_a = dataSource === null || dataSource === void 0 ? void 0 : dataSource.schema) === null || _a === void 0 ? void 0 : _a.properties) || {}).forEach((name) => {
+                select[name] = true;
+            });
+            result.queryParams.select = select;
+            result.fieldsLoading = !error && !dataSource;
+        }
+        return result;
+    }, [dataSource, error, modelParams, needQueryFields, selectFieldType]);
+    return queryParams;
+};

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

@@ -1,9 +1,9 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { useEffect, useRef, useState } from 'react';
+import { useEffect, useRef } from 'react';
 import classNames from '../../utils/classnames';
-import { getTempFileURL } from '../../utils/tcb';
-import { LOAD_ERR_IMG_BASE64, getWhitelist } from '../../utils/constant';
+import { getWhitelist } from '../../utils/constant';
 import { getOnClick } from '../wd-unified-link/utils';
+import { useImgTransform } from './useImgTransform';
 import destr from 'destr';
 import './style';
 import xss from 'xss';
@@ -14,41 +14,7 @@ export default function RichTextView({ value = '', className, style, id, }) {
         'weda-RichTextView': true,
         [className]: className,
     });
-    const [displayValue, setDisplayValue] = useState('');
-    const regex = new RegExp(/<img [^>]*src=\\*"([^"]*?)\\*"/g);
-    const iferror = `javascript:this.width='80';this.src='${LOAD_ERR_IMG_BASE64}';this.onerror=null`;
-    let tempValue = (parseValue || '')
-        .toString()
-        .replace(/<img style="/g, `<img style="max-width:100%;`)
-        .replace(/<img /g, `<img onerror=${iferror} `);
-    const getSrc = async (img) => {
-        const url = img.replace(regex, '$1');
-        if (img.includes('cloud://')) {
-            const newURL = await getTempFileURL(url);
-            if (newURL) {
-                tempValue = tempValue.replace(new RegExp(url, 'g'), newURL);
-            }
-        }
-    };
-    useEffect(() => {
-        try {
-            const imgs = parseValue.match(regex);
-            if (imgs && imgs.length > 0) {
-                (async () => {
-                    await Promise.all(imgs.map(async (img) => {
-                        await getSrc(img);
-                    }));
-                    setDisplayValue(tempValue);
-                })();
-            }
-            else {
-                setDisplayValue(tempValue);
-            }
-        }
-        catch (e) {
-            setDisplayValue(tempValue);
-        }
-    }, [value]);
+    const displayValue = useImgTransform(parseValue);
     const richTextRef = useRef(null);
     useEffect(() => {
         if (richTextRef.current) {

package/dist/web/components/richTextView/useImgTransform.d.ts

@@ -0,0 +1 @@
+export declare const useImgTransform: (value: string) => string;

package/dist/web/components/richTextView/useImgTransform.js

@@ -0,0 +1,47 @@
+import { useEffect, useState } from 'react';
+import { getTempFileURL } from '../../utils/tcb';
+import { LOAD_ERR_IMG_BASE64 } from '../../utils/constant';
+const regex = new RegExp(/<img [^>]*src=\\*"([^"]*?)\\*"/g);
+const iferror = `javascript:this.width='80';this.src='${LOAD_ERR_IMG_BASE64}';this.onerror=null`;
+const transformImag = (value) => {
+    return (value || '')
+        .toString()
+        .replace(/<img style="/g, `<img style="max-width:100%;`)
+        .replace(/<img /g, `<img onerror=${iferror} `);
+};
+const getSrc = async (img) => {
+    const url = img.replace(regex, '$1');
+    if (img.includes('cloud://')) {
+        return await getTempFileURL(url);
+    }
+};
+export const useImgTransform = (value) => {
+    const [displayValue, setDisplayValue] = useState('');
+    useEffect(() => {
+        let tempValue = transformImag(value);
+        try {
+            const imgs = value.match(regex);
+            if (imgs && imgs.length > 0) {
+                (async () => {
+                    const imgRes = await Promise.all(imgs.map(async (img) => {
+                        return await getSrc(img);
+                    }));
+                    imgs.forEach((img, index) => {
+                        const url = img.replace(regex, '$1');
+                        if (imgRes[index]) {
+                            tempValue = tempValue.replace(new RegExp(url, 'g'), imgRes[index]);
+                        }
+                    });
+                    setDisplayValue(tempValue);
+                })();
+            }
+            else {
+                setDisplayValue(tempValue);
+            }
+        }
+        catch (e) {
+            setDisplayValue(tempValue);
+        }
+    }, [value]);
+    return displayValue;
+};

package/dist/web/components/wd-input-number/wd-input-number.js

@@ -322,6 +322,7 @@ export const WdInputNumber = forwardRef(function WdInputNumber(props, ref) {
     const onChange = (e) => {
         const value = typeof e === 'string' ? e : e.target.value;
         setShowValue(value);
+        onRealChange(e, '', { needSetData: false, value });
     };
     /**
      * 真实值变化
@@ -329,22 +330,28 @@ export const WdInputNumber = forwardRef(function WdInputNumber(props, ref) {
      * @param type
      * @returns
      */
-    const onRealChange = (e, type = '') => {
-        var _a, _b;
+    const onRealChange = (e, type = '', { needSetData = true, value = '' } = {}) => {
+        var _a, _b, _c, _d;
         if (editDisabled)
             return realValue;
         if (['plus', 'minus'].includes(type)) {
             if (!isNumber(props.step) ||
                 (type === 'plus' && stepPlusDisabled) ||
-                (type === 'minus' && stepMinusDisabled))
-                return Number(showValue);
+                (type === 'minus' && stepMinusDisabled)) {
+                return Number(value || showValue);
+            }
         }
-        const toShow = getShowValue(filterDigit(showValue), type);
+        const toShow = getShowValue(filterDigit(value || showValue), type);
         const toReal = getRealValue(toShow);
-        setShowValue(toShow);
-        setRealValue(toReal);
-        changeForm(toReal);
-        (_b = (_a = props.events) === null || _a === void 0 ? void 0 : _a.change) === null || _b === void 0 ? void 0 : _b.call(_a, { value: toReal }, { originEvent: e });
+        if (needSetData) {
+            setShowValue(toShow);
+            setRealValue(toReal);
+            changeForm(toReal);
+            (_b = (_a = props.events) === null || _a === void 0 ? void 0 : _a.change) === null || _b === void 0 ? void 0 : _b.call(_a, { value: toReal }, { originEvent: e });
+        }
+        else {
+            (_d = (_c = props.events) === null || _c === void 0 ? void 0 : _c.input) === null || _d === void 0 ? void 0 : _d.call(_c, { value: toReal }, { originEvent: e });
+        }
         return toReal;
     };
     const onClear = (e) => {