@cloudbase/weda-ui 3.3.1 → 3.3.3

package/dist/{src/web → 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/{src/web → 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/{src/web → 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/{src/web → 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/{src/web → 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/{src/web → 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/{src/web → 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/{src/web → 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/{src/web → 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]);
 }