feffery_antd_components 0.3.15 → 0.4.0-rc5

package/src/lib/fragments/dataEntry/AntdRate.react.js

@@ -5,6 +5,7 @@ import { Rate } from 'antd';
 // 辅助库
 import { isString, isUndefined } from 'lodash';
 import { pickBy } from 'ramda';
+import { useLoading } from '../../components/utils';
 // 自定义hooks
 import useCss from '../../hooks/useCss';
 // 上下文
@@ -25,6 +26,7 @@ const AntdRate = (props) => {
         style,
         key,
         name,
+        enableBatchControl,
         allowClear,
         allowHalf,
         count,
@@ -34,11 +36,11 @@ const AntdRate = (props) => {
         defaultValue,
         value,
         setProps,
-        loading_state,
         persistence,
         persisted_props,
         persistence_type,
-        batchPropsNames
+        batchPropsNames,
+        ...others
     } = props;
 
     // 批属性监听
@@ -67,7 +69,7 @@ const AntdRate = (props) => {
     useEffect(() => {
         return () => {
             // 若上文中存在有效表单id
-            if (formId && (name || id)) {
+            if (formId && (name || id) && enableBatchControl) {
                 // 表单值更新
                 deleteItemValue(formId, name || id)
             }
@@ -85,7 +87,7 @@ const AntdRate = (props) => {
     // 监听change事件
     const onChange = e => {
         // AntdForm表单批量控制
-        if (formId && (name || id)) {
+        if (formId && (name || id) && enableBatchControl) {
             // 表单值更新
             updateItemValue(formId, name || id, e)
         }
@@ -95,7 +97,7 @@ const AntdRate = (props) => {
     return (
         <Rate
             // 提取具有data-*或aria-*通配格式的属性
-            {...pickBy((_, k) => k.startsWith('data-') || k.startsWith('aria-'), props)}
+            {...pickBy((_, k) => k.startsWith('data-') || k.startsWith('aria-'), others)}
             id={id}
             className={
                 isString(className) ?
@@ -115,7 +117,7 @@ const AntdRate = (props) => {
             autoFocus={autoFocus}
             tooltips={tooltips}
             value={
-                formId && (name || id) ?
+                formId && (name || id) && enableBatchControl ?
                     currentFormValue :
                     value
             }
@@ -123,9 +125,7 @@ const AntdRate = (props) => {
             persistence={persistence}
             persisted_props={persisted_props}
             persistence_type={persistence_type}
-            data-dash-is-loading={
-                (loading_state && loading_state.is_loading) || undefined
-            } />
+            data-dash-is-loading={useLoading()} />
     );
 }
 

package/src/lib/fragments/dataEntry/AntdSegmentedColoring.react.js

@@ -5,6 +5,7 @@ import { InputNumber, Space, message, Typography } from 'antd';
 // 辅助库
 import { isString, isUndefined } from 'lodash';
 import { pickBy } from 'ramda';
+import { useLoading } from '../../components/utils';
 // 自定义hooks
 import useCss from '../../hooks/useCss';
 // 上下文
@@ -48,9 +49,9 @@ const AntdSegmentedColoring = (props) => {
         colorBlockPosition,
         colorBlockStyle,
         pureLegendLabelStyle,
-        loading_state,
         setProps,
-        batchPropsNames
+        batchPropsNames,
+        ...others
     } = props;
 
     // 批属性监听
@@ -83,7 +84,7 @@ const AntdSegmentedColoring = (props) => {
     return (
         <Space
             // 提取具有data-*或aria-*通配格式的属性
-            {...pickBy((_, k) => k.startsWith('data-') || k.startsWith('aria-'), props)}
+            {...pickBy((_, k) => k.startsWith('data-') || k.startsWith('aria-'), others)}
             id={id}
             key={key}
             style={{
@@ -97,9 +98,7 @@ const AntdSegmentedColoring = (props) => {
                     (className ? useCss(className) : undefined)
             }
             direction={"vertical"}
-            data-dash-is-loading={
-                (loading_state && loading_state.is_loading) || undefined
-            }
+            data-dash-is-loading={useLoading()}
         >
             {breakpoints.slice(0, breakpoints.length - 1).map((v, i) => {
                 return (

package/src/lib/fragments/dataEntry/AntdSelect.react.js

@@ -7,6 +7,7 @@ import { useRequest } from 'ahooks';
 import { isUndefined, isString, isNumber } from 'lodash';
 import { pickBy } from 'ramda';
 import { str2Locale } from '../../components/locales.react';
+import { useLoading } from '../../components/utils';
 // 自定义hooks
 import useCss from '../../hooks/useCss';
 // 上下文
@@ -30,6 +31,7 @@ const AntdSelect = (props) => {
         popupClassName,
         key,
         name,
+        enableBatchControl,
         locale,
         setProps,
         placeholder,
@@ -64,11 +66,11 @@ const AntdSelect = (props) => {
         readOnly,
         maxCount,
         popupMatchSelectWidth,
-        loading_state,
         persistence,
         persisted_props,
         persistence_type,
-        batchPropsNames
+        batchPropsNames,
+        ...others
     } = props;
 
     // 批属性监听
@@ -99,7 +101,7 @@ const AntdSelect = (props) => {
     useEffect(() => {
         return () => {
             // 若上文中存在有效表单id
-            if (formId && (name || id)) {
+            if (formId && (name || id) && enableBatchControl) {
                 // 表单值更新
                 deleteItemValue(formId, name || id)
             }
@@ -117,7 +119,7 @@ const AntdSelect = (props) => {
     // 用于获取用户已选择值的回调函数
     const updateSelectedValue = (e) => {
         // AntdForm表单批量控制
-        if (formId && (name || id)) {
+        if (formId && (name || id) && enableBatchControl) {
             // 表单值更新
             updateItemValue(formId, name || id, e)
         }
@@ -236,11 +238,13 @@ const AntdSelect = (props) => {
         optionFilterProp = 'children'
     }
 
+    const component_loading = useLoading();
+
     return (
         <ConfigProvider locale={str2Locale.get(locale)}>
             <Select
                 // 提取具有data-*或aria-*通配格式的属性
-                {...pickBy((_, k) => k.startsWith('data-') || k.startsWith('aria-'), props)}
+                {...pickBy((_, k) => k.startsWith('data-') || k.startsWith('aria-'), others)}
                 id={id}
                 className={
                     isString(className) ?
@@ -265,12 +269,12 @@ const AntdSelect = (props) => {
                         variant
                 )}
                 defaultValue={
-                    formId && (name || id) ?
+                    formId && (name || id) && enableBatchControl ?
                         undefined :
                         defaultValue
                 }
                 value={
-                    formId && (name || id) ?
+                    formId && (name || id) && enableBatchControl ?
                         currentFormValue :
                         value
                 }
@@ -320,9 +324,9 @@ const AntdSelect = (props) => {
                     onSearch(e)
                     onDebounceSearch(e)
                 }}
-                loading={autoSpin && loading_state.is_loading}
+                loading={autoSpin && component_loading}
                 notFoundContent={
-                    autoSpin && loading_state.is_loading ?
+                    autoSpin && component_loading ?
                         (
                             loadingEmptyContent ||
                             (
@@ -350,9 +354,7 @@ const AntdSelect = (props) => {
                 persistence={persistence}
                 persisted_props={persisted_props}
                 persistence_type={persistence_type}
-                data-dash-is-loading={
-                    (loading_state && loading_state.is_loading) || undefined
-                }
+                data-dash-is-loading={component_loading}
                 getPopupContainer={
                     popupContainer === 'parent' ?
                         (triggerNode) => triggerNode.parentNode :

package/src/lib/fragments/dataEntry/AntdSlider.react.js

@@ -5,6 +5,7 @@ import { Slider } from 'antd';
 // 辅助库
 import { isString, isUndefined } from 'lodash';
 import { pickBy } from 'ramda';
+import { useLoading } from '../../components/utils';
 // 自定义hooks
 import useCss from '../../hooks/useCss';
 // 上下文
@@ -24,10 +25,10 @@ const AntdSlider = (props) => {
         name,
         className,
         style,
-        railStyle,
         styles,
         classNames,
         key,
+        enableBatchControl,
         value,
         defaultValue,
         disabled,
@@ -43,12 +44,12 @@ const AntdSlider = (props) => {
         tooltipSuffix,
         popupContainer,
         readOnly,
-        loading_state,
         setProps,
         persistence,
         persisted_props,
         persistence_type,
-        batchPropsNames
+        batchPropsNames,
+        ...others
     } = props;
 
     // 批属性监听
@@ -77,7 +78,7 @@ const AntdSlider = (props) => {
     useEffect(() => {
         return () => {
             // 若上文中存在有效表单id
-            if (formId && (name || id)) {
+            if (formId && (name || id) && enableBatchControl) {
                 // 表单值更新
                 deleteItemValue(formId, name || id)
             }
@@ -114,7 +115,7 @@ const AntdSlider = (props) => {
     const onChange = (e) => {
         if (!readOnly) {
             // AntdForm表单批量控制
-            if (formId && (name || id)) {
+            if (formId && (name || id) && enableBatchControl) {
                 // 表单值更新
                 updateItemValue(formId, name || id, e)
             }
@@ -125,7 +126,7 @@ const AntdSlider = (props) => {
     return (
         <Slider
             // 提取具有data-*或aria-*通配格式的属性
-            {...pickBy((_, k) => k.startsWith('data-') || k.startsWith('aria-'), props)}
+            {...pickBy((_, k) => k.startsWith('data-') || k.startsWith('aria-'), others)}
             id={id}
             className={
                 isString(className) ?
@@ -133,17 +134,16 @@ const AntdSlider = (props) => {
                     (className ? useCss(className) : undefined)
             }
             style={style}
-            railStyle={railStyle}
             styles={styles}
             classNames={classNames}
             key={key}
             defaultValue={
-                formId && (name || id) ?
+                formId && (name || id) && enableBatchControl ?
                     undefined :
                     defaultValue
             }
             value={
-                formId && (name || id) ?
+                formId && (name || id) && enableBatchControl ?
                     currentFormValue :
                     value
             }
@@ -170,9 +170,7 @@ const AntdSlider = (props) => {
             persistence={persistence}
             persisted_props={persisted_props}
             persistence_type={persistence_type}
-            data-dash-is-loading={
-                (loading_state && loading_state.is_loading) || undefined
-            }
+            data-dash-is-loading={useLoading()}
         />
     );
 }

package/src/lib/fragments/dataEntry/AntdSwitch.react.js

@@ -5,6 +5,7 @@ import { Switch } from 'antd';
 // 辅助库
 import { isUndefined, isString } from 'lodash';
 import { pickBy } from 'ramda';
+import { useLoading } from '../../components/utils';
 // 自定义hooks
 import useCss from '../../hooks/useCss';
 // 上下文
@@ -25,6 +26,7 @@ const AntdSwitch = (props) => {
         className,
         key,
         name,
+        enableBatchControl,
         disabled,
         autoFocus,
         checked,
@@ -37,8 +39,8 @@ const AntdSwitch = (props) => {
         persistence,
         persisted_props,
         persistence_type,
-        loading_state,
-        batchPropsNames
+        batchPropsNames,
+        ...others
     } = props;
 
     // 批属性监听
@@ -67,7 +69,7 @@ const AntdSwitch = (props) => {
     useEffect(() => {
         return () => {
             // 若上文中存在有效表单id
-            if (formId && (name || id)) {
+            if (formId && (name || id) && enableBatchControl) {
                 // 表单值更新
                 deleteItemValue(formId, name || id)
             }
@@ -83,7 +85,7 @@ const AntdSwitch = (props) => {
     const onChange = e => {
         if (!readOnly) {
             // AntdForm表单批量控制
-            if (formId && (name || id)) {
+            if (formId && (name || id) && enableBatchControl) {
                 // 表单值更新
                 updateItemValue(formId, name || id, e)
             }
@@ -94,7 +96,7 @@ const AntdSwitch = (props) => {
     return (
         <Switch
             // 提取具有data-*或aria-*通配格式的属性
-            {...pickBy((_, k) => k.startsWith('data-') || k.startsWith('aria-'), props)}
+            {...pickBy((_, k) => k.startsWith('data-') || k.startsWith('aria-'), others)}
             id={id}
             className={
                 isString(className) ?
@@ -112,7 +114,7 @@ const AntdSwitch = (props) => {
             autoFocus={autoFocus}
             checkedChildren={checkedChildren}
             checked={
-                formId && (name || id) ?
+                formId && (name || id) && enableBatchControl ?
                     currentFormValue :
                     checked
             }
@@ -123,9 +125,7 @@ const AntdSwitch = (props) => {
             persistence={persistence}
             persisted_props={persisted_props}
             persistence_type={persistence_type}
-            data-dash-is-loading={
-                (loading_state && loading_state.is_loading) || undefined
-            }
+            data-dash-is-loading={useLoading()}
         />
     );
 }

package/src/lib/fragments/dataEntry/AntdTimePicker.react.js

@@ -7,6 +7,7 @@ import dayjs from 'dayjs';
 import { isString, isUndefined } from 'lodash';
 import { pickBy } from 'ramda';
 import { str2Locale } from '../../components/locales.react';
+import { useLoading } from '../../components/utils';
 // 自定义hooks
 import useCss from '../../hooks/useCss';
 // 上下文
@@ -28,6 +29,7 @@ const AntdTimePicker = (props) => {
         popupClassName,
         key,
         name,
+        enableBatchControl,
         locale,
         setProps,
         disabled,
@@ -55,9 +57,9 @@ const AntdTimePicker = (props) => {
         persistence,
         persisted_props,
         persistence_type,
-        loading_state,
         batchPropsNames,
-        needConfirm
+        needConfirm,
+        ...others
     } = props;
 
     // 批属性监听
@@ -88,7 +90,7 @@ const AntdTimePicker = (props) => {
     useEffect(() => {
         return () => {
             // 若上文中存在有效表单id
-            if (formId && (name || id)) {
+            if (formId && (name || id) && enableBatchControl) {
                 // 表单值更新
                 deleteItemValue(formId, name || id)
             }
@@ -106,7 +108,7 @@ const AntdTimePicker = (props) => {
     const onChange = (time, timeString) => {
         if (isString(timeString)) {
             // AntdForm表单批量控制
-            if (formId && (name || id)) {
+            if (formId && (name || id) && enableBatchControl) {
                 // 表单值更新
                 updateItemValue(formId, name || id, timeString)
             }
@@ -119,7 +121,7 @@ const AntdTimePicker = (props) => {
             <ConfigProvider locale={str2Locale.get(locale)}>
                 <TimePicker
                     // 提取具有data-*或aria-*通配格式的属性
-                    {...pickBy((_, k) => k.startsWith('data-') || k.startsWith('aria-'), props)}
+                    {...pickBy((_, k) => k.startsWith('data-') || k.startsWith('aria-'), others)}
                     id={id}
                     className={
                         isString(className) ?
@@ -152,12 +154,12 @@ const AntdTimePicker = (props) => {
                     secondStep={secondStep}
                     format={format}
                     defaultValue={
-                        formId && (name || id) ?
+                        formId && (name || id) && enableBatchControl ?
                             undefined :
                             (defaultValue ? dayjs(defaultValue, format) : undefined)
                     }
                     value={
-                        formId && (name || id) ?
+                        formId && (name || id) && enableBatchControl ?
                             (currentFormValue ? dayjs(currentFormValue, format) : undefined) :
                             (value ? dayjs(value, format) : undefined)
                     }
@@ -173,9 +175,7 @@ const AntdTimePicker = (props) => {
                     persistence={persistence}
                     persisted_props={persisted_props}
                     persistence_type={persistence_type}
-                    data-dash-is-loading={
-                        (loading_state && loading_state.is_loading) || undefined
-                    }
+                    data-dash-is-loading={useLoading()}
                     getPopupContainer={
                         popupContainer === 'parent' ?
                             (triggerNode) => triggerNode.parentNode :

package/src/lib/fragments/dataEntry/AntdTimeRangePicker.react.js

@@ -7,6 +7,7 @@ import dayjs from 'dayjs';
 import { isUndefined, isString } from 'lodash';
 import { pickBy } from 'ramda';
 import { str2Locale } from '../../components/locales.react';
+import { useLoading } from '../../components/utils';
 // 自定义hooks
 import useCss from '../../hooks/useCss';
 // 上下文
@@ -30,6 +31,7 @@ const AntdTimeRangePicker = (props) => {
         popupClassName,
         key,
         name,
+        enableBatchControl,
         locale,
         setProps,
         value,
@@ -57,9 +59,9 @@ const AntdTimeRangePicker = (props) => {
         persistence,
         persisted_props,
         persistence_type,
-        loading_state,
         batchPropsNames,
-        needConfirm
+        needConfirm,
+        ...others
     } = props;
 
     // 批属性监听
@@ -90,7 +92,7 @@ const AntdTimeRangePicker = (props) => {
     useEffect(() => {
         return () => {
             // 若上文中存在有效表单id
-            if (formId && (name || id)) {
+            if (formId && (name || id) && enableBatchControl) {
                 // 表单值更新
                 deleteItemValue(formId, name || id)
             }
@@ -107,7 +109,7 @@ const AntdTimeRangePicker = (props) => {
 
     const onChange = (time, timeString) => {
         // AntdForm表单批量控制
-        if (formId && (name || id)) {
+        if (formId && (name || id) && enableBatchControl) {
             // 表单值更新
             if (timeString[0] !== '' && timeString[1] !== '') {
                 updateItemValue(formId, name || id, [timeString[0], timeString[1]])
@@ -127,7 +129,7 @@ const AntdTimeRangePicker = (props) => {
             <ConfigProvider locale={str2Locale.get(locale)}>
                 <RangePicker
                     // 提取具有data-*或aria-*通配格式的属性
-                    {...pickBy((_, k) => k.startsWith('data-') || k.startsWith('aria-'), props)}
+                    {...pickBy((_, k) => k.startsWith('data-') || k.startsWith('aria-'), others)}
                     id={id}
                     className={
                         isString(className) ?
@@ -166,7 +168,7 @@ const AntdTimeRangePicker = (props) => {
                     allowClear={isUndefined(readOnly) ? allowClear : !readOnly}
                     autoFocus={autoFocus}
                     defaultValue={
-                        formId && (name || id) ?
+                        formId && (name || id) && enableBatchControl ?
                             undefined :
                             (defaultValue && defaultValue.length === 2) ?
                                 [defaultValue[0] !== '' ? dayjs(defaultValue[0], format) : undefined,
@@ -174,7 +176,7 @@ const AntdTimeRangePicker = (props) => {
                                 undefined
                     }
                     value={
-                        formId && (name || id) ?
+                        formId && (name || id) && enableBatchControl ?
                             (
                                 (currentFormValue && currentFormValue.length === 2) ?
                                     [currentFormValue[0] !== '' ? dayjs(currentFormValue[0], format) : undefined,
@@ -192,9 +194,7 @@ const AntdTimeRangePicker = (props) => {
                     persistence={persistence}
                     persisted_props={persisted_props}
                     persistence_type={persistence_type}
-                    data-dash-is-loading={
-                        (loading_state && loading_state.is_loading) || undefined
-                    }
+                    data-dash-is-loading={useLoading()}
                     prefix={prefix}
                     suffixIcon={suffixIcon}
                     getPopupContainer={

package/src/lib/fragments/dataEntry/AntdTransfer.react.js

@@ -6,6 +6,7 @@ import { Transfer, ConfigProvider } from 'antd';
 import { str2Locale, locale2text } from '../../components/locales.react';
 import { isString, isUndefined } from 'lodash';
 import { pickBy } from 'ramda';
+import { useLoading } from '../../components/utils';
 // 自定义hooks
 import useCss from '../../hooks/useCss';
 // 上下文
@@ -26,6 +27,7 @@ const AntdTransfer = (props) => {
         style,
         key,
         name,
+        enableBatchControl,
         locale,
         setProps,
         dataSource,
@@ -45,8 +47,8 @@ const AntdTransfer = (props) => {
         persistence,
         persisted_props,
         persistence_type,
-        loading_state,
-        batchPropsNames
+        batchPropsNames,
+        ...others
     } = props;
 
     // 批属性监听
@@ -77,7 +79,7 @@ const AntdTransfer = (props) => {
     useEffect(() => {
         return () => {
             // 若上文中存在有效表单id
-            if (formId && (name || id)) {
+            if (formId && (name || id) && enableBatchControl) {
                 // 表单值更新
                 deleteItemValue(formId, name || id)
             }
@@ -92,7 +94,7 @@ const AntdTransfer = (props) => {
     const listenMove = (nextTargetKeys, moveDirection, moveKeys) => {
         if (!readOnly) {
             // AntdForm表单批量控制
-            if (formId && (name || id)) {
+            if (formId && (name || id) && enableBatchControl) {
                 // 表单值更新
                 updateItemValue(formId, name || id, nextTargetKeys)
             }
@@ -108,7 +110,7 @@ const AntdTransfer = (props) => {
         <ConfigProvider locale={str2Locale.get(locale)}>
             <Transfer
                 // 提取具有data-*或aria-*通配格式的属性
-                {...pickBy((_, k) => k.startsWith('data-') || k.startsWith('aria-'), props)}
+                {...pickBy((_, k) => k.startsWith('data-') || k.startsWith('aria-'), others)}
                 id={id}
                 style={style}
                 className={
@@ -120,7 +122,7 @@ const AntdTransfer = (props) => {
                 dataSource={dataSource}
                 selectionsIcon={selectionsIcon}
                 targetKeys={
-                    formId && (name || id) ?
+                    formId && (name || id) && enableBatchControl ?
                         currentFormValue :
                         targetKeys
                 }
@@ -173,9 +175,7 @@ const AntdTransfer = (props) => {
                     height: height,
                     width: '100%'
                 }}
-                data-dash-is-loading={
-                    (loading_state && loading_state.is_loading) || undefined
-                }
+                data-dash-is-loading={useLoading()}
             />
         </ConfigProvider>
     );