feffery_antd_components 0.4.4 → 0.4.5

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

@@ -16,7 +16,10 @@ import FormContext from '../../contexts/FormContext';
 // 状态管理
 import useFormStore from '../../store/formStore';
 // 参数类型
-import { propTypes, defaultProps } from '../../components/dataEntry/AntdCalendar.react';
+import {
+    propTypes,
+    defaultProps,
+} from '../../components/dataEntry/AntdCalendar.react';
 
 /**
  * 日历组件AntdCalendar
@@ -44,16 +47,18 @@ const AntdCalendar = (props) => {
 
     const [mode, setMode] = useState('month');
 
-    const context = useContext(PropsContext)
-    const formId = useContext(FormContext)
+    const context = useContext(PropsContext);
+    const formId = useContext(FormContext);
 
-    const updateItemValue = useFormStore((state) => state.updateItemValue)
-    const deleteItemValue = useFormStore((state) => state.deleteItemValue)
+    const updateItemValue = useFormStore((state) => state.updateItemValue);
+    const deleteItemValue = useFormStore((state) => state.deleteItemValue);
 
-    locale = (context && context.locale) || locale
+    locale = (context && context.locale) || locale;
 
     // 收集当前组件相关表单值
-    const currentFormValue = useFormStore(state => state.values?.[formId]?.[name || id])
+    const currentFormValue = useFormStore(
+        (state) => state.values?.[formId]?.[name || id]
+    );
 
     // 处理组件卸载后，对应表单项值的清除
     useEffect(() => {
@@ -61,18 +66,18 @@ const AntdCalendar = (props) => {
             // 若上文中存在有效表单id
             if (formId && (name || id) && enableBatchControl) {
                 // 表单值更新
-                deleteItemValue(formId, name || id)
+                deleteItemValue(formId, name || id);
             }
-        }
-    }, [name, id])
+        };
+    }, [name, id]);
 
     useEffect(() => {
         // 初始化value
         if (defaultValue && !value) {
             // 当defaultValue不为空且value为空时，为value初始化defaultValue对应的value值
-            setProps({ value: defaultValue })
+            setProps({ value: defaultValue });
         }
-    }, [])
+    }, []);
 
     const onPanelChange = (newValue, _mode) => {
         setMode(_mode);
@@ -82,18 +87,21 @@ const AntdCalendar = (props) => {
         // AntdForm表单批量控制
         if (formId && (name || id) && enableBatchControl) {
             // 表单值更新
-            updateItemValue(formId, name || id, e.format(format))
+            updateItemValue(formId, name || id, e.format(format));
         }
         setProps({
-            value: e.format(format)
-        })
-        if ((mode === 'month' && ['date', 'customize'].includes(source)) || (mode === 'year' && ['month', 'customize'].includes(source))) {
+            value: e.format(format),
+        });
+        if (
+            (mode === 'month' && ['date', 'customize'].includes(source)) ||
+            (mode === 'year' && ['month', 'customize'].includes(source))
+        ) {
             setProps({
                 cellClickEvent: {
                     type: source,
-                    timestamp: new Date().getTime()
-                }
-            })
+                    timestamp: new Date().getTime(),
+                },
+            });
         }
     };
 
@@ -101,79 +109,100 @@ const AntdCalendar = (props) => {
         <ConfigProvider locale={str2Locale.get(locale)}>
             <Calendar
                 // 提取具有data-*或aria-*通配格式的属性
-                {...pickBy((_, k) => k.startsWith('data-') || k.startsWith('aria-'), others)}
+                {...pickBy(
+                    (_, k) => k.startsWith('data-') || k.startsWith('aria-'),
+                    others
+                )}
                 id={id}
                 className={
-                    isString(className) ?
-                        className :
-                        (className ? useCss(className) : undefined)
+                    isString(className)
+                        ? className
+                        : className
+                          ? useCss(className)
+                          : undefined
                 }
                 style={style}
                 key={key}
                 defaultValue={
-                    formId && (name || id) && enableBatchControl ?
-                        undefined :
-                        defaultValue && dayjs(defaultValue, format)
+                    formId && (name || id) && enableBatchControl
+                        ? undefined
+                        : defaultValue && dayjs(defaultValue, format)
                 }
                 value={
-                    formId && (name || id) && enableBatchControl ?
-                        currentFormValue && dayjs(currentFormValue, format) :
-                        value && dayjs(value, format)
+                    formId && (name || id) && enableBatchControl
+                        ? currentFormValue && dayjs(currentFormValue, format)
+                        : value && dayjs(value, format)
                 }
                 onPanelChange={onPanelChange}
                 onSelect={onSelect}
                 fullscreen={size !== 'default'}
                 cellRender={
-                    customCells ?
-                        (current, info) => {
-                            // 尝试搜索命中项
-                            let matchCell;
-                            if (info.type === 'date') {
-                                matchCell = customCells.filter(item => {
-                                    // 初始化基础条件
-                                    let conditions = item.type === 'date'
-                                    // 若具有明确年份
-                                    if (item.year) {
-                                        conditions = conditions && item.year === current.year()
-                                    }
-                                    // 若具有明确月份
-                                    if (item.month) {
-                                        conditions = conditions && item.month === current.month() + 1
-                                    }
-                                    // 若具有明确日期
-                                    if (item.date) {
-                                        conditions = conditions && item.date === current.date()
-                                    }
-                                    return conditions;
-                                });
-                            } else if (info.type === 'month') {
-                                matchCell = customCells.filter(item => {
-                                    // 初始化基础条件
-                                    let conditions = item.type === 'month'
-                                    // 若具有明确年份
-                                    if (item.year) {
-                                        conditions = conditions && item.year === current.year()
-                                    }
-                                    // 若具有明确月份
-                                    if (item.month) {
-                                        conditions = conditions && item.month === current.month() + 1
-                                    }
-                                    return conditions;
-                                });
-                            }
-                            if (matchCell.length > 0) {
-                                return matchCell[0].content;
-                            }
-                            return info.type === 'month' || info.type === 'date' ? null : info.originNode;
-                        } :
-                        undefined
+                    customCells
+                        ? (current, info) => {
+                              // 尝试搜索命中项
+                              let matchCell;
+                              if (info.type === 'date') {
+                                  matchCell = customCells.filter((item) => {
+                                      // 初始化基础条件
+                                      let conditions = item.type === 'date';
+                                      // 若具有明确年份
+                                      if (item.year) {
+                                          conditions =
+                                              conditions &&
+                                              item.year === current.year();
+                                      }
+                                      // 若具有明确月份
+                                      if (item.month) {
+                                          conditions =
+                                              conditions &&
+                                              item.month ===
+                                                  current.month() + 1;
+                                      }
+                                      // 若具有明确日期
+                                      if (item.date) {
+                                          conditions =
+                                              conditions &&
+                                              item.date === current.date();
+                                      }
+                                      return conditions;
+                                  });
+                              } else if (info.type === 'month') {
+                                  matchCell = customCells.filter((item) => {
+                                      // 初始化基础条件
+                                      let conditions = item.type === 'month';
+                                      // 若具有明确年份
+                                      if (item.year) {
+                                          conditions =
+                                              conditions &&
+                                              item.year === current.year();
+                                      }
+                                      // 若具有明确月份
+                                      if (item.month) {
+                                          conditions =
+                                              conditions &&
+                                              item.month ===
+                                                  current.month() + 1;
+                                      }
+                                      return conditions;
+                                  });
+                              }
+                              if (matchCell.length > 0) {
+                                  return matchCell[0].content;
+                              }
+                              return info.type === 'month' ||
+                                  info.type === 'date'
+                                  ? null
+                                  : info.originNode;
+                          }
+                        : undefined
                 }
-                data-dash-is-loading={useLoading()} />
+                data-dash-is-loading={useLoading()}
+            />
         </ConfigProvider>
     );
-}
+};
 
 export default AntdCalendar;
 
 AntdCalendar.defaultProps = defaultProps;
-AntdCalendar.propTypes = propTypes;
+AntdCalendar.propTypes = propTypes;

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

@@ -15,14 +15,17 @@ import FormContext from '../../contexts/FormContext';
 // 状态管理
 import useFormStore from '../../store/formStore';
 // 参数类型
-import { propTypes, defaultProps } from '../../components/dataEntry/AntdCascader.react';
+import {
+    propTypes,
+    defaultProps,
+} from '../../components/dataEntry/AntdCascader.react';
 
 const { SHOW_CHILD, SHOW_PARENT } = Cascader;
 
 const str2ShowCheckedStrategy = new Map([
     ['show-child', SHOW_CHILD],
-    ['show-parent', SHOW_PARENT]
-])
+    ['show-parent', SHOW_PARENT],
+]);
 
 // 递归替换originOptions中节点的label为optionsNodeKeyToLabel中对应的值
 const replaceNodeLabel = (originOptions, optionsNodeKeyToLabel) => {
@@ -31,7 +34,10 @@ const replaceNodeLabel = (originOptions, optionsNodeKeyToLabel) => {
         // 遍历originOptions
         for (let i = 0; i < originOptions.length; i++) {
             // 递归替换originOptions中节点的label为optionsNodeKeyToLabel中对应的值
-            originOptions[i] = replaceNodeLabel(originOptions[i], optionsNodeKeyToLabel);
+            originOptions[i] = replaceNodeLabel(
+                originOptions[i],
+                optionsNodeKeyToLabel
+            );
         }
     } else {
         // 否则针对当前节点对象，当optionsNodeKeyToLabel中存在对应key时，替换label
@@ -41,12 +47,15 @@ const replaceNodeLabel = (originOptions, optionsNodeKeyToLabel) => {
         // 若当前节点对象存在children属性
         if (originOptions.children) {
             // 递归替换originOptions中节点的label为optionsNodeKeyToLabel中对应的值
-            originOptions.children = replaceNodeLabel(originOptions.children, optionsNodeKeyToLabel);
+            originOptions.children = replaceNodeLabel(
+                originOptions.children,
+                optionsNodeKeyToLabel
+            );
         }
     }
     // 返回处理后的originOptions
     return originOptions;
-}
+};
 
 /**
  * 级联选择组件AntdCascader
@@ -97,26 +106,28 @@ const AntdCascader = (props) => {
     // 批属性监听
     useEffect(() => {
         if (batchPropsNames && batchPropsNames.length !== 0) {
-            let _batchPropsValues = {};
-            for (let propName of batchPropsNames) {
+            const _batchPropsValues = {};
+            for (const propName of batchPropsNames) {
                 _batchPropsValues[propName] = props[propName];
             }
             setProps({
-                batchPropsValues: _batchPropsValues
-            })
+                batchPropsValues: _batchPropsValues,
+            });
         }
-    })
+    });
 
-    const context = useContext(PropsContext)
-    const formId = useContext(FormContext)
+    const context = useContext(PropsContext);
+    const formId = useContext(FormContext);
 
-    const updateItemValue = useFormStore((state) => state.updateItemValue)
-    const deleteItemValue = useFormStore((state) => state.deleteItemValue)
+    const updateItemValue = useFormStore((state) => state.updateItemValue);
+    const deleteItemValue = useFormStore((state) => state.deleteItemValue);
 
-    locale = (context && context.locale) || locale
+    locale = (context && context.locale) || locale;
 
     // 收集当前组件相关表单值
-    const currentFormValue = useFormStore(state => state.values?.[formId]?.[name || id])
+    const currentFormValue = useFormStore(
+        (state) => state.values?.[formId]?.[name || id]
+    );
 
     // 处理组件卸载后，对应表单项值的清除
     useEffect(() => {
@@ -124,86 +135,104 @@ const AntdCascader = (props) => {
             // 若上文中存在有效表单id
             if (formId && (name || id) && enableBatchControl) {
                 // 表单值更新
-                deleteItemValue(formId, name || id)
+                deleteItemValue(formId, name || id);
             }
-        }
-    }, [name, id])
+        };
+    }, [name, id]);
 
     useEffect(() => {
         if (defaultValue && !value) {
-            setProps({ value: defaultValue })
+            setProps({ value: defaultValue });
         }
-    }, [])
+    }, []);
 
     const flatToTreeOptions = useMemo(() => {
         return flatToTree(options);
-    }, [options])
+    }, [options]);
 
     // 根据optionsMode对options进行预处理
     if (optionsMode === 'flat') {
-        options = flatToTreeOptions
+        options = flatToTreeOptions;
     }
 
     // 搜索函数
     const filter = (inputValue, path) => {
         // 若以value字段为搜索目标
         if (optionFilterProp === 'value') {
-            return path.some(option => option.value?.toLowerCase().indexOf(inputValue.toLowerCase()) > -1);
+            return path.some(
+                (option) =>
+                    option.value
+                        ?.toLowerCase()
+                        .indexOf(inputValue.toLowerCase()) > -1
+            );
         }
-        return path.some(option => option.label.toLowerCase().indexOf(inputValue.toLowerCase()) > -1);
-    }
+        return path.some(
+            (option) =>
+                option.label.toLowerCase().indexOf(inputValue.toLowerCase()) >
+                -1
+        );
+    };
 
     const onSelect = (e) => {
         // AntdForm表单批量控制
         if (formId && (name || id) && enableBatchControl) {
             // 表单值更新
-            updateItemValue(formId, name || id, e)
+            updateItemValue(formId, name || id, e);
         }
-        setProps({ value: e })
-    }
+        setProps({ value: e });
+    };
 
     if (panelMode) {
         return (
             <ConfigProvider locale={str2Locale.get(locale)}>
                 <Cascader.Panel
                     // 提取具有data-*或aria-*通配格式的属性
-                    {...pickBy((_, k) => k.startsWith('data-') || k.startsWith('aria-'), others)}
+                    {...pickBy(
+                        (_, k) =>
+                            k.startsWith('data-') || k.startsWith('aria-'),
+                        others
+                    )}
                     id={id}
                     className={
-                        isString(className) ?
-                            className :
-                            (className ? useCss(className) : undefined)
+                        isString(className)
+                            ? className
+                            : className
+                              ? useCss(className)
+                              : undefined
                     }
                     style={style}
                     popupClassName={popupClassName}
                     key={key}
                     options={
-                        optionsNodeKeyToLabel ?
-                            replaceNodeLabel(cloneDeep(options), optionsNodeKeyToLabel) :
-                            options
+                        optionsNodeKeyToLabel
+                            ? replaceNodeLabel(
+                                  cloneDeep(options),
+                                  optionsNodeKeyToLabel
+                              )
+                            : options
                     }
                     changeOnSelect={changeOnSelect}
                     size={
-                        context && !isUndefined(context.componentSize) ?
-                            context.componentSize :
-                            size
+                        context && !isUndefined(context.componentSize)
+                            ? context.componentSize
+                            : size
                     }
                     bordered={bordered}
                     disabled={
-                        context && !isUndefined(context.componentDisabled) ?
-                            context.componentDisabled :
-                            disabled
+                        context && !isUndefined(context.componentDisabled)
+                            ? context.componentDisabled
+                            : disabled
                     }
                     placeholder={placeholder}
                     defaultValue={
-                        formId && (name || id) && enableBatchControl ?
-                            undefined :
-                            defaultValue
+                        formId && (name || id) && enableBatchControl
+                            ? undefined
+                            : defaultValue
                     }
                     value={
-                        formId && (name || id) && enableBatchControl ?
-                            currentFormValue :
-                            value
+                        formId && (name || id) && enableBatchControl
+                            ? currentFormValue
+                            : value
                     }
                     placement={placement}
                     maxTagCount={maxTagCount}
@@ -212,25 +241,28 @@ const AntdCascader = (props) => {
                     status={status}
                     allowClear={isUndefined(readOnly) ? allowClear : !readOnly}
                     autoFocus={autoFocus}
-                    showCheckedStrategy={str2ShowCheckedStrategy.get(showCheckedStrategy) || undefined}
+                    showCheckedStrategy={
+                        str2ShowCheckedStrategy.get(showCheckedStrategy) ||
+                        undefined
+                    }
                     displayRender={
-                        (multiple || !showCheckedStrategy) ?
-                            undefined :
-                            (
-                                showCheckedStrategy === 'show-child' ?
-                                    (label) => label[label.length - 1] :
-                                    (label) => label[0]
-                            )
+                        multiple || !showCheckedStrategy
+                            ? undefined
+                            : showCheckedStrategy === 'show-child'
+                              ? (label) => label[label.length - 1]
+                              : (label) => label[0]
                     }
                     showSearch={readOnly ? undefined : { filter }}
                     onChange={readOnly ? undefined : onSelect}
                     data-dash-is-loading={useLoading()}
                     getPopupContainer={
-                        popupContainer === 'parent' ?
-                            (triggerNode) => triggerNode.parentNode :
-                            undefined
+                        popupContainer === 'parent'
+                            ? (triggerNode) => triggerNode.parentNode
+                            : undefined
+                    }
+                    open={
+                        isUndefined(readOnly) || !readOnly ? undefined : false
                     }
-                    open={isUndefined(readOnly) || !readOnly ? undefined : false}
                 />
             </ConfigProvider>
         );
@@ -239,47 +271,53 @@ const AntdCascader = (props) => {
         <ConfigProvider locale={str2Locale.get(locale)}>
             <Cascader
                 // 提取具有data-*或aria-*通配格式的属性
-                {...pickBy((_, k) => k.startsWith('data-') || k.startsWith('aria-'), others)}
+                {...pickBy(
+                    (_, k) => k.startsWith('data-') || k.startsWith('aria-'),
+                    others
+                )}
                 id={id}
                 className={
-                    isString(className) ?
-                        className :
-                        (className ? useCss(className) : undefined)
+                    isString(className)
+                        ? className
+                        : className
+                          ? useCss(className)
+                          : undefined
                 }
                 style={style}
                 popupClassName={popupClassName}
                 key={key}
                 options={
-                    optionsNodeKeyToLabel ?
-                        replaceNodeLabel(cloneDeep(options), optionsNodeKeyToLabel) :
-                        options
+                    optionsNodeKeyToLabel
+                        ? replaceNodeLabel(
+                              cloneDeep(options),
+                              optionsNodeKeyToLabel
+                          )
+                        : options
                 }
                 changeOnSelect={changeOnSelect}
                 size={
-                    context && !isUndefined(context.componentSize) ?
-                        context.componentSize :
-                        size
+                    context && !isUndefined(context.componentSize)
+                        ? context.componentSize
+                        : size
+                }
+                variant={
+                    !variant ? (bordered ? 'outlined' : 'borderless') : variant
                 }
-                variant={(
-                    !variant ?
-                        (bordered ? 'outlined' : 'borderless') :
-                        variant
-                )}
                 disabled={
-                    context && !isUndefined(context.componentDisabled) ?
-                        context.componentDisabled :
-                        disabled
+                    context && !isUndefined(context.componentDisabled)
+                        ? context.componentDisabled
+                        : disabled
                 }
                 placeholder={placeholder}
                 defaultValue={
-                    formId && (name || id) && enableBatchControl ?
-                        undefined :
-                        defaultValue
+                    formId && (name || id) && enableBatchControl
+                        ? undefined
+                        : defaultValue
                 }
                 value={
-                    formId && (name || id) && enableBatchControl ?
-                        currentFormValue :
-                        value
+                    formId && (name || id) && enableBatchControl
+                        ? currentFormValue
+                        : value
                 }
                 placement={placement}
                 maxTagCount={maxTagCount}
@@ -288,15 +326,16 @@ const AntdCascader = (props) => {
                 status={status}
                 allowClear={isUndefined(readOnly) ? allowClear : !readOnly}
                 autoFocus={autoFocus}
-                showCheckedStrategy={str2ShowCheckedStrategy.get(showCheckedStrategy) || undefined}
+                showCheckedStrategy={
+                    str2ShowCheckedStrategy.get(showCheckedStrategy) ||
+                    undefined
+                }
                 displayRender={
-                    (multiple || !showCheckedStrategy) ?
-                        undefined :
-                        (
-                            showCheckedStrategy === 'show-child' ?
-                                (label) => label[label.length - 1] :
-                                (label) => label[0]
-                        )
+                    multiple || !showCheckedStrategy
+                        ? undefined
+                        : showCheckedStrategy === 'show-child'
+                          ? (label) => label[label.length - 1]
+                          : (label) => label[0]
                 }
                 prefix={prefix}
                 suffixIcon={suffixIcon}
@@ -304,17 +343,17 @@ const AntdCascader = (props) => {
                 onChange={readOnly ? undefined : onSelect}
                 data-dash-is-loading={useLoading()}
                 getPopupContainer={
-                    popupContainer === 'parent' ?
-                        (triggerNode) => triggerNode.parentNode :
-                        undefined
+                    popupContainer === 'parent'
+                        ? (triggerNode) => triggerNode.parentNode
+                        : undefined
                 }
                 open={isUndefined(readOnly) || !readOnly ? undefined : false}
             />
         </ConfigProvider>
     );
-}
+};
 
 export default AntdCascader;
 
 AntdCascader.defaultProps = defaultProps;
-AntdCascader.propTypes = propTypes;
+AntdCascader.propTypes = propTypes;