@cloudbase/weda-ui 3.3.2 → 3.3.4

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

@@ -50,45 +50,43 @@ export default function Calendar({ className, style, initVisible, initValue, con
             });
         }
         return [yearList, monthList];
-    }, [year]);
-    // 日历单元格数据
-    const dateList = useMemo(() => {
-        // 匹配数据
-        const _dateList = (configList) => {
-            const _map = new Map();
-            const configArr = JSON.parse(JSON.stringify(configData));
-            // 补日期的零
-            configArr &&
-                configArr.length &&
-                configArr.map((item) => {
-                    if (item.matchDate === '' || item.matchDate === undefined)
-                        return;
-                    const date = item.matchDate.split('-');
-                    const day = date[2].split('');
-                    if (day.length === 1) {
-                        date[2] = `0${date[2]}`;
-                        item.matchDate = date.join('-');
-                    }
-                });
-            for (const item of configArr) {
-                _map.set(item.matchDate, item);
-            }
-            return configList.map((item) => {
-                return item.reduce((res, i) => {
-                    if (_map.has(i.formattedDate)) {
-                        const _disabled = _map.get(i.formattedDate)['disabled'];
-                        const _marked = _map.get(i.formattedDate)['marked'];
-                        i['disabled'] =
-                            _disabled !== undefined ? JSON.parse(_disabled) : false;
-                        i['marked'] = _marked;
-                    }
-                    res.push(i);
-                    return res;
-                }, []);
+    }, [year, month]);
+    // 匹配数据
+    const _dateList = (configList) => {
+        const _map = new Map();
+        const configArr = JSON.parse(JSON.stringify(configData));
+        // 补日期的零
+        configArr &&
+            configArr.length &&
+            configArr.map((item) => {
+                if (item.matchDate === '' || item.matchDate === undefined)
+                    return;
+                const date = item.matchDate.split('-');
+                const day = date[2].split('');
+                if (day.length === 1) {
+                    date[2] = `0${date[2]}`;
+                    item.matchDate = date.join('-');
+                }
             });
-        };
-        return _dateList(createDateList(year, month, firstDayOfWeek, value, format));
-    }, [year, month, value, configData]);
+        for (const item of configArr) {
+            _map.set(item.matchDate, item);
+        }
+        return configList.map((item) => {
+            return item.reduce((res, i) => {
+                if (_map.has(i.formattedDate)) {
+                    const _disabled = _map.get(i.formattedDate)['disabled'];
+                    const _marked = _map.get(i.formattedDate)['marked'];
+                    i['disabled'] =
+                        _disabled !== undefined ? JSON.parse(_disabled) : false;
+                    i['marked'] = _marked;
+                }
+                res.push(i);
+                return res;
+            }, []);
+        });
+    };
+    // 日历单元格数据
+    const dateList = useMemo(() => _dateList(createDateList(year, month, firstDayOfWeek, value, format)), [year, month, firstDayOfWeek, format, value, configData]);
     // 表头数组
     const colHeaderList = useMemo(() => {
         const weekTextArr = week;
@@ -114,7 +112,7 @@ export default function Calendar({ className, style, initVisible, initValue, con
             }
         }
         return list;
-    }, []);
+    }, [firstDayOfWeek, isShowWeekend, week]);
     // 补零
     // const fix0 = (num) => {
     //   return num < 10 ? `0${num}` : num;

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

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { useState, useEffect, useRef, useCallback } from 'react';
+import { useState, useEffect, useRef } from 'react';
 import classNames from '../../utils/classnames';
 import Swipe from 'react-easy-swipe';
 import { useDebouncedCallback, useEventListener, useResizeObserver, } from '@react-hookz/web';
@@ -13,15 +13,6 @@ export default function Carousel({ className, style, autoplay, circular, vertica
     const [swipeStyle, setSwipeStyle] = useState(null);
     const [height, setHeight] = useState(0);
     const { change = () => { } } = events;
-    const setIndex = useCallback((index) => {
-        if (index >= itemCount) {
-            index = 0;
-        }
-        if (index < 0) {
-            index = itemCount - 1;
-        }
-        setCurrentIndex(index);
-    }, [itemCount, setCurrentIndex]);
     // 自动切换
     useEffect(() => {
         if (autoplay) {
@@ -32,60 +23,10 @@ export default function Carousel({ className, style, autoplay, circular, vertica
             }, interval);
             return () => clearInterval(timer);
         }
-    }, [currentIndex, autoplay, interval, setIndex]);
+    }, [currentIndex, autoplay]);
     // 触发切换
     const pre = useRef({ index: currentIndex }).current;
     useEffect(() => {
-        // 设置容器样式、动画
-        // TODO fix settimeout mess
-        const updateSwipeStyle = (to, cur, length) => {
-            let style = {};
-            // 最后向前到最开始
-            if (to === 0 && cur === length - 1) {
-                circular &&
-                    setSwipeStyle({
-                        transform: `translate3d(0, 0, 0)`,
-                    });
-                // eslint-disable-next-line rulesdir/no-timer
-                setTimeout(() => {
-                    setSwipeStyle({
-                        transform: vertical
-                            ? `translate3d(0, -100%, 0)`
-                            : `translate3d(-100%, 0, 0)`,
-                        transitionDuration: `${duration}ms`,
-                    });
-                }, 50);
-                return;
-            }
-            // 第一个后退到最后
-            if (to === length - 1 && cur === 0) {
-                circular &&
-                    setSwipeStyle({
-                        transform: vertical
-                            ? `translate3d(0, -${(to + 2) * 100}%, 0)`
-                            : `translate3d(-${(to + 2) * 100}%, 0, 0)`,
-                    });
-                // eslint-disable-next-line rulesdir/no-timer
-                setTimeout(() => {
-                    setSwipeStyle({
-                        transform: vertical
-                            ? `translate3d(0, -${(to + 1) * 100}%, 0)`
-                            : `translate3d(-${(to + 1) * 100}%, 0, 0)`,
-                        transitionDuration: `${duration}ms`,
-                    });
-                }, 50);
-                return;
-            }
-            style = {
-                transform: vertical
-                    ? `translate3d(0, -${(to + 1) * 100}%, 0)`
-                    : `translate3d(-${(to + 1) * 100}%, 0, 0)`,
-            };
-            if (to !== cur) {
-                style.transitionDuration = `${duration}ms`;
-            }
-            setSwipeStyle(style);
-        };
         updateSwipeStyle(currentIndex, pre.index, itemCount);
         change({
             current: currentIndex,
@@ -93,7 +34,7 @@ export default function Carousel({ className, style, autoplay, circular, vertica
         return () => {
             pre.index = currentIndex;
         };
-    }, [currentIndex, vertical, pre, change, itemCount, circular, duration]);
+    }, [currentIndex, vertical]);
     const outerWrapRef = useRef();
     useEventListener(outerWrapRef, 'load', (e) => {
         setHeight(e.target.clientHeight);
@@ -105,6 +46,65 @@ export default function Carousel({ className, style, autoplay, circular, vertica
                     width: x.width ? x.width : '100%',
                 } })));
     });
+    const setIndex = (index) => {
+        if (index >= itemCount) {
+            index = 0;
+        }
+        if (index < 0) {
+            index = itemCount - 1;
+        }
+        setCurrentIndex(index);
+    };
+    // 设置容器样式、动画
+    // TODO fix settimeout mess
+    const updateSwipeStyle = (to, cur, length) => {
+        let style = {};
+        // 最后向前到最开始
+        if (to === 0 && cur === length - 1) {
+            circular &&
+                setSwipeStyle({
+                    transform: `translate3d(0, 0, 0)`,
+                });
+            // eslint-disable-next-line rulesdir/no-timer
+            setTimeout(() => {
+                setSwipeStyle({
+                    transform: vertical
+                        ? `translate3d(0, -100%, 0)`
+                        : `translate3d(-100%, 0, 0)`,
+                    transitionDuration: `${duration}ms`,
+                });
+            }, 50);
+            return;
+        }
+        // 第一个后退到最后
+        if (to === length - 1 && cur === 0) {
+            circular &&
+                setSwipeStyle({
+                    transform: vertical
+                        ? `translate3d(0, -${(to + 2) * 100}%, 0)`
+                        : `translate3d(-${(to + 2) * 100}%, 0, 0)`,
+                });
+            // eslint-disable-next-line rulesdir/no-timer
+            setTimeout(() => {
+                setSwipeStyle({
+                    transform: vertical
+                        ? `translate3d(0, -${(to + 1) * 100}%, 0)`
+                        : `translate3d(-${(to + 1) * 100}%, 0, 0)`,
+                    transitionDuration: `${duration}ms`,
+                });
+            }, 50);
+            return;
+        }
+        style = {
+            transform: vertical
+                ? `translate3d(0, -${(to + 1) * 100}%, 0)`
+                : `translate3d(-${(to + 1) * 100}%, 0, 0)`,
+        };
+        if (to !== cur) {
+            style.transitionDuration = `${duration}ms`;
+        }
+        setSwipeStyle(style);
+    };
     return (React.createElement("div", { className: classNames('g-swiper weda-ui g-carousel', className, {
             vertical: vertical,
         }), style: { height: height ? height : 'auto', ...style }, ref: outerWrapRef, id: id, "data-testid": "carousel" },

package/dist/web/components/chart/bar/index.js

@@ -5,10 +5,7 @@ import { Chart } from '../common/Chart';
 import { emptyArray } from '../../../utils/constant';
 import { ChartCustomConnector } from '../common/chart-custom-connector';
 import { CommonErrorBoundary } from '../../common/error-boundary';
-import { debug } from '../../../utils/console';
-const logger = debug('bar:impl');
 function BarImpl(props) {
-    logger.log(props, checkIsNewData(props));
     if (props.dataSourceType === 'data-model') {
         if (checkIsNewData(props)) {
             props.dataSource = {
@@ -24,7 +21,6 @@ function BarImpl(props) {
         oldBarProps['connectorMethod'] = undefined;
         oldBarProps['connectorParams'] = undefined;
         oldBarProps['connector'] = undefined;
-        debug('bar:old').log('OldBar', oldBarProps);
         return React.createElement(OldBar, { ...oldBarProps });
     }
     else if (props.dataSourceType === 'variable') {

package/dist/web/components/chart/common/Chart.d.ts

@@ -3,7 +3,6 @@ import type { CommonPropsType } from '../../../types';
 import type { ECOption } from './echarts';
 interface IChartProps extends CommonPropsType {
     chartOptions: ECOption;
-    showLoading?: boolean;
     ['data-testid']: string;
 }
 export declare function Chart(props: IChartProps): JSX.Element;

package/dist/web/components/chart/common/Chart.js

@@ -2,7 +2,7 @@ import React, { useEffect, useRef } from 'react';
 import classNames from '../../../utils/classnames';
 import { useChart } from './useChart';
 export function Chart(props) {
-    const { id, style, className, chartOptions, showLoading, 'data-testid': dataTestId, } = props;
+    const { id, style, className, chartOptions, 'data-testid': dataTestId, } = props;
     const inlineStyle = {
         height: '380px',
         width: '100%',
@@ -15,14 +15,6 @@ export function Chart(props) {
         var _a;
         (_a = chart === null || chart === void 0 ? void 0 : chart.setOption) === null || _a === void 0 ? void 0 : _a.call(chart, chartOptions);
     }, [chart, chartOptions]);
-    useEffect(() => {
-        if (showLoading === true) {
-            chart === null || chart === void 0 ? void 0 : chart.showLoading();
-        }
-        else {
-            chart === null || chart === void 0 ? void 0 : chart.hideLoading();
-        }
-    }, [showLoading, chart]);
     return (React.createElement("div", { id: id, "data-testid": dataTestId, ref: ref, style: inlineStyle, className: classNames({
             'echart-wrapper-canvas': true,
             'echart-dark-body': true,

package/dist/web/components/chart/common/chart-custom-connector.js

@@ -21,7 +21,7 @@ export const ChartCustomConnector = (props) => {
     }, []);
     useEffect(() => {
         actions.execute();
-    }, [connector, connectorMethod, connectorParams, actions]);
+    }, [connector, connectorMethod, connectorParams]);
     if (state.error) {
         throw state.error;
     }

package/dist/web/components/chart/common/core/eChartBase.js

@@ -19,7 +19,7 @@ class EchartBase extends AbstractEchartBaseModal {
         });
         this.config = getConfig();
     }
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars, @typescript-eslint/no-empty-function
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     async setOptions(_options) { }
     /** 获取所有配置好的图表数据 */
     getOptions() {

package/dist/web/components/chart/common/data-transform.js

@@ -175,7 +175,7 @@ export function transform(chartType, dataInput, chartInput) {
             });
         });
     }
-    logger.log(dataInput, chartInput);
+    logger.log(dataInput, chartInput, 'TRANSFORM');
     if (chartType === 'bar' || chartType === 'line') {
         const xAxis = {
             name: chartInput.isXaxisName ? chartInput.xAxisName : '',

package/dist/web/components/chart/common/useChart.js

@@ -32,7 +32,6 @@ export function useWedaChart(domRef, ModalClass, options) {
     const getOptions = async () => {
         const chartModal = new ModalClass();
         let finalOptions = await chartModal.setOptions(options);
-        logger.log(options, finalOptions);
         if (!finalOptions) {
             finalOptions = chartModal.getOptions();
         }
@@ -50,16 +49,8 @@ export function useWedaChart(domRef, ModalClass, options) {
         actions,
     ]);
     useEffect(() => {
-        if (state.status === 'loading' || state.status === 'not-executed') {
-            chart === null || chart === void 0 ? void 0 : chart.showLoading();
-            return;
-        }
-        chart === null || chart === void 0 ? void 0 : chart.hideLoading();
-    }, [chart, state.status]);
-    useEffect(() => {
-        logger.log(state, state.result);
         if (state.status === 'success' && chart) {
-            logger.log(options, state.result, window.location.href);
+            logger.log(ModalClass.name, options, state.result, window.location.href);
             chart.setOption(state.result, true // noMerge 全刷
             );
         }
@@ -68,5 +59,5 @@ export function useWedaChart(domRef, ModalClass, options) {
                 console.error(state.error);
             }
         }
-    }, [state, chart, options]);
+    }, [chart, state]);
 }

package/dist/web/components/common/use-loop-render-detect.d.ts

@@ -1,10 +1,10 @@
 export declare const useRenderCount: () => [number, () => void];
-declare type ILoopRenderDetectOptions = Readonly<{
+declare type ILoopRenderDetectOptions = {
     limit?: number;
     throwError?: boolean;
     message?: string;
     timeWindowMs?: number;
-}>;
+};
 export declare class DetectedRenderLoppError extends Error {
 }
 export declare const useLoopRenderDetect: (inputOptions?: ILoopRenderDetectOptions) => boolean;

package/dist/web/components/common/use-loop-render-detect.js

@@ -1,6 +1,5 @@
 import { useSyncedRef } from '@react-hookz/web';
 import { useCallback, useEffect, useRef } from 'react';
-import { debug } from '../../utils/console';
 export const useRenderCount = () => {
     const countRef = useRef(0);
     const syncedRef = useSyncedRef(++countRef.current);
@@ -83,7 +82,6 @@ const defaultOptions = {
     message: '组件控制逻辑出现死循环，请检查并修改相关配置',
     timeWindowMs: 6 * 1000,
 };
-const logger = debug('useLoopRenderDetect');
 export class DetectedRenderLoppError extends Error {
 }
 export const useLoopRenderDetect = (inputOptions = defaultOptions) => {
@@ -104,14 +102,14 @@ export const useLoopRenderDetect = (inputOptions = defaultOptions) => {
                 clearTimeout(id);
             }
         };
-    }, [options.timeWindowMs, reset]);
+    }, []);
     const fps = useFps();
-    logger.log({
-        timeWindowMs: options.timeWindowMs,
-        fps,
-        renderCount,
-        limit: options.limit,
-    });
+    // console.log({
+    //   timeWindow: options.timeWindowMs,
+    //   fps,
+    //   renderCount,
+    //   limit: options.limit,
+    // });
     if ((renderCount > options.limit && fps < 1) ||
         renderCount > options.limit * 3) {
         reset();

package/dist/web/components/form/checkbox/index.js

@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { Checkbox as TeaCheckbox, ConfigProvider } from 'tea-component';
 import classNames from '../../../utils/classnames';
 import getLocalCounter from '../../../utils/getLocalCounter';
@@ -39,8 +39,33 @@ name = 'formCheckbox', label = '标题', labelVisible = true, format = '', enumN
             prevRangeRef.current = JSON.parse(JSON.stringify(option));
             setCheckedItems(fromEntries(option.map(({ value, checked }) => [value, !!checked])));
         }
-    }, [option]);
-    const fetchData = useCallback(async (param) => {
+    });
+    useEffect(() => {
+        // 如果绑定字段类型为枚举，且传入自定义选项集的名称则默认使用自定义选项集的内容作为选项
+        if (format === 'x-enum' && enumName) {
+            fetchData({ OptNameList: [enumName], PageIndex: 1, PageSize: 10 });
+        }
+    }, []);
+    useEffect(() => {
+        if (format === 'x-enum') {
+            const opt = enumOptions &&
+                enumOptions.map((item) => {
+                    const checked = controlValue && controlValue.find((val) => val === item.value);
+                    return {
+                        value: item.value,
+                        label: item.label,
+                        checked: !!checked,
+                    };
+                });
+            setOption(opt);
+        }
+    }, [controlValue]);
+    useEffect(() => {
+        if (format !== 'x-enum') {
+            setOption(range);
+        }
+    }, [range]);
+    const fetchData = async (param) => {
         var _a, _b, _c;
         const data = await callWedaApi({
             action: 'DescribeGeneralOptionsDetailList',
@@ -66,32 +91,7 @@ name = 'formCheckbox', label = '标题', labelVisible = true, format = '', enumN
                 };
             });
         setOption(opt);
-    }, [controlValue]);
-    useEffect(() => {
-        // 如果绑定字段类型为枚举，且传入自定义选项集的名称则默认使用自定义选项集的内容作为选项
-        if (format === 'x-enum' && enumName) {
-            fetchData({ OptNameList: [enumName], PageIndex: 1, PageSize: 10 });
-        }
-    }, [enumName, fetchData, format]);
-    useEffect(() => {
-        if (format === 'x-enum') {
-            const opt = enumOptions &&
-                enumOptions.map((item) => {
-                    const checked = controlValue && controlValue.find((val) => val === item.value);
-                    return {
-                        value: item.value,
-                        label: item.label,
-                        checked: !!checked,
-                    };
-                });
-            setOption(opt);
-        }
-    }, [controlValue, enumOptions, format]);
-    useEffect(() => {
-        if (format !== 'x-enum') {
-            setOption(range);
-        }
-    }, [format, range]);
+    };
     /**
      * 在ios h5端, label和input的绑定不生效
      * 导致 onChange 事件触发有问题, 所以改为监听 onClick 事件

package/dist/web/components/form/enumSelect/MultipleSelect.d.ts

@@ -26,7 +26,7 @@ declare function MultipleSelect({ id, style, className, events, label, labelVisi
 declare namespace MultipleSelect {
     const propTypes: {
         events: import("prop-types").Requireable<object>;
-        defaultValue: import("prop-types").Requireable<NonNullable<string | number>>;
+        defaultValue: import("prop-types").Requireable<string | number>;
         name: import("prop-types").Requireable<string>;
         placeholder: import("prop-types").Requireable<string>;
         disabled: import("prop-types").Requireable<boolean>;
@@ -39,7 +39,7 @@ declare namespace MultipleSelect {
         virtual: import("prop-types").Requireable<boolean>;
         searchable: import("prop-types").Requireable<boolean>;
         size: import("prop-types").Requireable<string>;
-        value: import("prop-types").Requireable<NonNullable<string | any[]>>;
+        value: import("prop-types").Requireable<string | any[]>;
         enumType: import("prop-types").Requireable<string>;
         customEnum: import("prop-types").Requireable<any[]>;
         optionId: import("prop-types").Requireable<string>;

package/dist/web/components/form/enumSelect/NormalSelect.d.ts

@@ -25,7 +25,7 @@ declare const NormalSelect: {
     }): JSX.Element;
     propTypes: {
         events: import("prop-types").Requireable<object>;
-        defaultValue: import("prop-types").Requireable<NonNullable<string | number>>;
+        defaultValue: import("prop-types").Requireable<string | number>;
         name: import("prop-types").Requireable<string>;
         placeholder: import("prop-types").Requireable<string>;
         disabled: import("prop-types").Requireable<boolean>;
@@ -38,7 +38,7 @@ declare const NormalSelect: {
         virtual: import("prop-types").Requireable<boolean>;
         searchable: import("prop-types").Requireable<boolean>;
         size: import("prop-types").Requireable<string>;
-        value: import("prop-types").Requireable<NonNullable<string | any[]>>;
+        value: import("prop-types").Requireable<string | any[]>;
         enumType: import("prop-types").Requireable<string>;
         customEnum: import("prop-types").Requireable<any[]>;
         optionId: import("prop-types").Requireable<string>;

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

@@ -25,7 +25,7 @@ declare const EnumSelect: {
     }): JSX.Element;
     propTypes: {
         events: import("prop-types").Requireable<object>;
-        defaultValue: import("prop-types").Requireable<NonNullable<string | number>>;
+        defaultValue: import("prop-types").Requireable<string | number>;
         name: import("prop-types").Requireable<string>;
         placeholder: import("prop-types").Requireable<string>;
         disabled: import("prop-types").Requireable<boolean>;
@@ -38,7 +38,7 @@ declare const EnumSelect: {
         virtual: import("prop-types").Requireable<boolean>;
         searchable: import("prop-types").Requireable<boolean>;
         size: import("prop-types").Requireable<string>;
-        value: import("prop-types").Requireable<NonNullable<string | any[]>>;
+        value: import("prop-types").Requireable<string | any[]>;
         enumType: import("prop-types").Requireable<string>;
         customEnum: import("prop-types").Requireable<any[]>;
         optionId: import("prop-types").Requireable<string>;

package/dist/web/components/form/enumSelect/props/propsTypes.d.ts

@@ -1,6 +1,6 @@
 export namespace propTypes {
     const events: PropTypes.Requireable<object>;
-    const defaultValue: PropTypes.Requireable<NonNullable<string | number>>;
+    const defaultValue: PropTypes.Requireable<string | number>;
     const name: PropTypes.Requireable<string>;
     const placeholder: PropTypes.Requireable<string>;
     const disabled: PropTypes.Requireable<boolean>;
@@ -13,7 +13,7 @@ export namespace propTypes {
     const virtual: PropTypes.Requireable<boolean>;
     const searchable: PropTypes.Requireable<boolean>;
     const size: PropTypes.Requireable<string>;
-    const value: PropTypes.Requireable<NonNullable<string | any[]>>;
+    const value: PropTypes.Requireable<string | any[]>;
     const enumType: PropTypes.Requireable<string>;
     const customEnum: PropTypes.Requireable<any[]>;
     const optionId: PropTypes.Requireable<string>;

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

@@ -80,8 +80,6 @@ export default function Form({ className, contentSlot, style, id, layout, formTy
         platform,
         methodGetItem,
         paramGetItem,
-        appCloud,
-        events,
     ]);
     React.useEffect(() => {
         // 因编辑器render时序问题暂不上线
@@ -126,7 +124,7 @@ export default function Form({ className, contentSlot, style, id, layout, formTy
         //   // 在表单容器里面的表单元素 if 默认是 false，需要通过onInitDataSourceFieldsWithAuth设置为true
         //   events?.onInitDataSourceFieldsWithAuth?.({ isDataModel });
         // }
-    }, [formType, isDataModel, platform, dataSourceName, events]);
+    }, [formType, isDataModel, platform, dataSourceName]);
     // pc 渲染
     const renderPc = () => {
         return (React.createElement(ConfigProvider, { classPrefix: "wedatea2td" },