@lingxiteam/ebe-utils 0.2.3 → 0.2.5

package/lib/h5public/src/components/factory/src/DformSelect/index.tsx

@@ -27,143 +27,107 @@ export interface MyDformSelectProps extends UseFormItemProps {
   ellipsis?: boolean;
 }
 
-const MyDformSelect = LingxiForwardRef<any, MyDformSelectProps>(
-  (props, ref) => {
-    const { getEngineApis, defaultValue, title, ellipsis, ...restProps } =
-      props;
+const MyDformSelect = LingxiForwardRef<any, MyDformSelectProps>((props, ref) => {
+  const { getEngineApis, defaultValue, title, ellipsis, ...restProps } = props;
 
-    const findObjectsByValue = (data: any[], values: string[]) => {
-      const result: any[] = [];
-      const traverse = (
-        node: { [x: string]: any; value?: any; children: any },
-        remainingValues: string | any[],
-      ) => {
-        const currentValue = remainingValues[0];
-        const nextValues = remainingValues.slice(1);
-        if (node.value === currentValue) {
-          const { children, ...res } = node;
-          result.push(res);
-          if (children) {
-            children?.forEach(
-              (child: { [x: string]: any; value?: any; children: any }) => {
-                traverse(child, nextValues);
-              },
-            );
-          }
+  const findObjectsByValue = (data: any[], values: string[]) => {
+    const result: any[] = [];
+    const traverse = (node: { [x: string]: any; value?: any; children: any }, remainingValues: string | any[]) => {
+      const currentValue = remainingValues[0];
+      const nextValues = remainingValues.slice(1);
+      if (node.value === currentValue) {
+        const { children, ...res } = node;
+        result.push(res);
+        if (children) {
+          children?.forEach((child: { [x: string]: any; value?: any; children: any }) => {
+            traverse(child, nextValues);
+          });
         }
-      };
-      if (values?.length > 0) {
-        data?.forEach((node) => {
-          if (result.length === values.length) return;
-          traverse(node, JSON.parse(JSON.stringify(values)));
-        });
       }
-      return result;
     };
+    if (values?.length > 0) {
+      data?.forEach(node => {
+        if (result.length === values.length) return;
+        traverse(node, JSON.parse(JSON.stringify(values)));
+      });
+    }
+    return result;
+  };
 
-    const {
-      disabled,
-      val,
-      getRules,
-      onInputChange,
-      required,
-      readOnly,
-      visible,
-    } = useFormItem(
-      ref,
-      {
-        ...props,
-        defaultValue: useDefaultValue(defaultValue),
+  const { disabled, val, getRules, onInputChange, required, readOnly, visible } = useFormItem(
+    ref,
+    {
+      ...props,
+      defaultValue: useDefaultValue(defaultValue),
+    },
+    {
+      setDataWithLabelAndValue: (params: reloadSelectDataType) => {
+        setData(initData(params.dataSource, params.labelKey, params.valueKey, params.childrenKey));
       },
-      {
-        setDataWithLabelAndValue: (params: reloadSelectDataType) => {
-          setData(
-            initData(
-              params.dataSource,
-              params.labelKey,
-              params.valueKey,
-              params.childrenKey,
-            ),
-          );
-        },
-        valueInfo() {
-          return findObjectsByValue(data, this.value);
-        },
+      valueInfo() {
+        return findObjectsByValue(data, this.value);
       },
-    );
-    const { getLocale } = getEngineApis?.() || {};
-    const [data, setData] = useState<any[]>([]);
+    }
+  );
+  const { getLocale } = getEngineApis?.() || {};
+  const [data, setData] = useState<any[]>([]);
 
-    // 初始化数据源
-    const initData = (
-      arr: any[],
-      labelKey1 = 'label',
-      valueKey1 = 'value',
-      childrenKey1 = 'children',
-    ) => {
-      // 存在labelKey1 || valueKey1 || childrenKey1 为空字符串情况
-      const labelKey = labelKey1 || 'label';
-      const valueKey = valueKey1 || 'value';
-      const childrenKey = childrenKey1 || 'children';
-      const mArr: any[] = [];
-      arr.forEach((row: any) => {
-        if (Array.isArray(row)) {
-          row.forEach((val) => {
-            val.label = val[labelKey];
-            val.value = val[valueKey];
-          });
-          mArr.push(row);
-        } else if (row instanceof Object) {
-          const children = row[childrenKey];
-          const pushItem = { ...row };
-          if (row[labelKey] || row.title) {
-            pushItem.label = row[labelKey] || row.title;
-            pushItem.value = row[valueKey];
-          }
-          if (children && children.length) {
-            pushItem.children = initData(
-              children,
-              labelKey,
-              valueKey,
-              childrenKey,
-            );
-          }
-          mArr.push(pushItem);
+  // 初始化数据源
+  const initData = (arr: any[], labelKey1 = 'label', valueKey1 = 'value', childrenKey1 = 'children') => {
+    // 存在labelKey1 || valueKey1 || childrenKey1 为空字符串情况
+    const labelKey = labelKey1 || 'label';
+    const valueKey = valueKey1 || 'value';
+    const childrenKey = childrenKey1 || 'children';
+    const mArr: any[] = [];
+    arr.forEach((row: any) => {
+      if (Array.isArray(row)) {
+        row.forEach(val => {
+          val.label = val[labelKey];
+          val.value = val[valueKey];
+        });
+        mArr.push(row);
+      } else if (row instanceof Object) {
+        const children = row[childrenKey];
+        const pushItem = { ...row };
+        if (row[labelKey] || row.title) {
+          pushItem.label = row[labelKey] || row.title;
+          pushItem.value = row[valueKey];
         }
-      });
-      return mArr;
-    };
+        if (children && children.length) {
+          pushItem.children = initData(children, labelKey, valueKey, childrenKey);
+        }
+        mArr.push(pushItem);
+      }
+    });
+    return mArr;
+  };
 
-    useEffect(() => {
-      setData(initData(props.data));
-    }, [JSON.stringify(props.data)]);
+  useEffect(() => {
+    setData(initData(props.data));
+  }, [JSON.stringify(props.data)]);
 
-    return (
-      <FormItem>
-        <DFormWrapper visible={visible} getEngineApis={props.getEngineApis}>
-          <DformSelect
-            {...restProps}
-            ellipsis={ellipsis}
-            defaultValue={val}
-            rules={getRules()}
-            data={data || []}
-            required={required}
-            title={title}
-            disabled={disabled}
-            onChange={(v: any) => onInputChange(v, true)}
-            readonly={readOnly}
-            getLocale={(
-              t: string,
-              tempValue: Record<string, any> | undefined,
-            ) => {
-              return getLocale(`DformSelect.${t}`, '', tempValue);
-            }}
-          />
-        </DFormWrapper>
-      </FormItem>
-    );
-  },
-);
+  return (
+    <FormItem>
+      <DFormWrapper visible={visible} getEngineApis={props.getEngineApis}>
+        <DformSelect
+          {...restProps}
+          ellipsis={ellipsis}
+          defaultValue={val}
+          rules={getRules()}
+          data={data || []}
+          required={required}
+          title={title}
+          disabled={disabled}
+          onChange={(v: any) => onInputChange(v, true)}
+          readonly={readOnly}
+          getLocale={(t: string, tempValue: Record<string, any> | undefined) => {
+            return getLocale(`DformSelect.${t}`, '', tempValue);
+          }}
+        />
+      </DFormWrapper>
+    </FormItem>
+  );
+});
 
 MyDformSelect.displayName = 'dformSelect';
 

package/lib/h5public/src/components/factory/src/DformSwitch/index.tsx

@@ -11,65 +11,35 @@ export interface MyDformSwitchProps extends UseFormItemProps {
   openIcon: any;
   closeIcon: any;
 }
-const MyDformSwitch = LingxiForwardRef<any, MyDformSwitchProps>(
-  (props, ref) => {
-    const {
-      defaultValue,
-      onChange,
-      openIcon,
-      closeIcon,
-      style = {},
-      getEngineApis,
-      ...restProps
-    } = props;
-    const {
-      disabled,
-      val,
-      getRules,
-      onInputChange,
-      required,
-      visible,
-      readOnly,
-    } = useFormItem(ref, props);
+const MyDformSwitch = LingxiForwardRef<any, MyDformSwitchProps>((props, ref) => {
+  const { defaultValue, onChange, openIcon, closeIcon, style = {}, getEngineApis, ...restProps } = props;
+  const { disabled, val, getRules, onInputChange, required, visible, readOnly } = useFormItem(ref, props);
 
-    const otherProps = {
-      ...restProps,
-      style,
-    };
+  const otherProps = {
+    ...restProps,
+    style,
+  };
 
-    return (
-      <FormItem>
-        <DFormWrapper visible={visible} getEngineApis={getEngineApis}>
-          <DformSwitch
-            {...otherProps}
-            required={required}
-            defaultValue={val}
-            rules={getRules()}
-            disabled={disabled}
-            // @ts-ignore
-            openIcon={
-              <Icon
-                icon={openIcon}
-                style={{ fontSize: '12px', width: '12px', height: '12px' }}
-                getEngineApis={getEngineApis}
-              />
-            }
-            // @ts-ignore
-            closeIcon={
-              <Icon
-                icon={closeIcon}
-                style={{ fontSize: '12px', width: '12px', height: '12px' }}
-                getEngineApis={getEngineApis}
-              />
-            }
-            onChange={(v: boolean) => onInputChange(v)}
-            readonly={readOnly}
-          />
-        </DFormWrapper>
-      </FormItem>
-    );
-  },
-);
+  return (
+    <FormItem>
+      <DFormWrapper visible={visible} getEngineApis={getEngineApis}>
+        <DformSwitch
+          {...otherProps}
+          required={required}
+          defaultValue={val}
+          rules={getRules()}
+          disabled={disabled}
+          // @ts-ignore
+          openIcon={<Icon icon={openIcon} style={{ fontSize: '12px', width: '12px', height: '12px' }} getEngineApis={getEngineApis} />}
+          // @ts-ignore
+          closeIcon={<Icon icon={closeIcon} style={{ fontSize: '12px', width: '12px', height: '12px' }} getEngineApis={getEngineApis} />}
+          onChange={(v: boolean) => onInputChange(v)}
+          readonly={readOnly}
+        />
+      </DFormWrapper>
+    </FormItem>
+  );
+});
 
 MyDformSwitch.displayName = 'dformSwitch';
 export default withTransformProps(MyDformSwitch, transformProps);

package/lib/h5public/src/components/factory/src/DformTextArea/index.tsx

@@ -10,57 +10,46 @@ export interface MyDformTextAreaProps extends UseFormItemProps {
   maxLength: number;
 }
 
-const MyDformTextArea = LingxiForwardRef<any, MyDformTextAreaProps>(
-  (props, ref) => {
-    const { defaultValue, maxLength, onChange, getEngineApis, ...restProps } =
-      props;
-    const changeVal = (v: any) => {
-      if (typeof v === 'string') {
-        return v;
-      }
-      if (typeof v === 'number') {
-        return `${v}`;
-      }
-      return '';
-    };
+const MyDformTextArea = LingxiForwardRef<any, MyDformTextAreaProps>((props, ref) => {
+  const { defaultValue, maxLength, onChange, getEngineApis, ...restProps } = props;
+  const changeVal = (v: any) => {
+    if (typeof v === 'string') {
+      return v;
+    }
+    if (typeof v === 'number') {
+      return `${v}`;
+    }
+    return '';
+  };
 
-    const {
-      visible,
-      disabled,
-      val,
-      getRules,
-      onInputChange,
-      required,
-      readOnly,
-    } = useFormItem(ref, { ...props, defaultValue: changeVal(defaultValue) });
+  const { visible, disabled, val, getRules, onInputChange, required, readOnly } = useFormItem(ref, {
+    ...props,
+    defaultValue: changeVal(defaultValue),
+  });
 
-    const { getLocale } = getEngineApis?.() || {};
-    return (
-      <FormItem>
-        <DFormWrapper visible={visible} getEngineApis={getEngineApis}>
-          <DformTextArea
-            {...restProps}
-            defaultValue={val}
-            value={val}
-            required={required}
-            rules={getRules()}
-            disabled={disabled}
-            onChange={(v: any) => onInputChange(v)}
-            readonly={readOnly}
-            maxLength={maxLength}
-            getLocale={(
-              t: string,
-              tempValue: Record<string, any> | undefined,
-            ) => {
-              return getLocale(`DformTextArea.${t}`, '', tempValue);
-            }}
-            validateTrigger="inputOnBlur"
-          />
-        </DFormWrapper>
-      </FormItem>
-    );
-  },
-);
+  const { getLocale } = getEngineApis?.() || {};
+  return (
+    <FormItem>
+      <DFormWrapper visible={visible} getEngineApis={getEngineApis}>
+        <DformTextArea
+          {...restProps}
+          defaultValue={val}
+          value={val}
+          required={required}
+          rules={getRules()}
+          disabled={disabled}
+          onChange={(v: any) => onInputChange(v)}
+          readonly={readOnly}
+          maxLength={maxLength}
+          getLocale={(t: string, tempValue: Record<string, any> | undefined) => {
+            return getLocale(`DformTextArea.${t}`, '', tempValue);
+          }}
+          validateTrigger="inputOnBlur"
+        />
+      </DFormWrapper>
+    </FormItem>
+  );
+});
 
 MyDformTextArea.displayName = 'dformTextArea';
 

package/lib/h5public/src/components/factory/src/Divider/LxDashed/index.tsx

@@ -14,7 +14,7 @@ interface MyDashedProps {
   className?: string;
 }
 
-const LxDashed: React.FC<MyDashedProps> = (props) => {
+const LxDashed: React.FC<MyDashedProps> = props => {
   const {
     showTitle,
     dividerText,
@@ -29,8 +29,7 @@ const LxDashed: React.FC<MyDashedProps> = (props) => {
   } = props;
   const backgroundStyle: React.CSSProperties = useMemo(() => {
     const bWidth = dashedWidth + dashedMargin;
-    const color =
-      style?.borderColor || customStyle?.borderColor || 'rgba(0, 0, 0, 0.06)'; // customStyle 旧数据
+    const color = style?.borderColor || customStyle?.borderColor || 'rgba(0, 0, 0, 0.06)'; // customStyle 旧数据
     const widthPercent = `${((dashedWidth / bWidth) as any).toFixed(6) * 100}%`;
     const height = style?.height || '1px';
     const curStyle = {
@@ -40,13 +39,7 @@ const LxDashed: React.FC<MyDashedProps> = (props) => {
       backgroundRepeat: 'repeat-x',
     };
     return curStyle;
-  }, [
-    dashedMargin,
-    dashedWidth,
-    customStyle?.borderColor,
-    style?.borderColor,
-    style?.height,
-  ]);
+  }, [dashedMargin, dashedWidth, customStyle?.borderColor, style?.borderColor, style?.height]);
   if (showTitle && dividerText) {
     // 显示标题
     let leftWidth = '50%';
@@ -68,11 +61,7 @@ const LxDashed: React.FC<MyDashedProps> = (props) => {
         break;
     }
     return (
-      <div
-        style={{ width: style?.width || 'auto', ...style }}
-        {...restProps}
-        className={classnames(styles.dashedDivider, className)}
-      >
+      <div style={{ width: style?.width || 'auto', ...style }} {...restProps} className={classnames(styles.dashedDivider, className)}>
         <div style={{ ...backgroundStyle, width: leftWidth }} />
         <div className={styles.dividerText} style={titleStyle}>
           {dividerText}
@@ -81,12 +70,6 @@ const LxDashed: React.FC<MyDashedProps> = (props) => {
       </div>
     );
   }
-  return (
-    <div
-      {...restProps}
-      style={{ ...backgroundStyle, ...style }}
-      className={className}
-    />
-  );
+  return <div {...restProps} style={{ ...backgroundStyle, ...style }} className={className} />;
 };
 export default LxDashed;

package/lib/h5public/src/components/factory/src/Divider/LxSolid/index.tsx

@@ -12,18 +12,8 @@ interface LxSolidProps {
   titleStyle?: React.CSSProperties;
   className?: string;
 }
-const LxSolid: React.FC<LxSolidProps> = (props) => {
-  const {
-    type,
-    dividerText,
-    showTitle,
-    style,
-    customStyle,
-    orientation,
-    titleStyle,
-    className,
-    ...restProps
-  } = props;
+const LxSolid: React.FC<LxSolidProps> = props => {
+  const { type, dividerText, showTitle, style, customStyle, orientation, titleStyle, className, ...restProps } = props;
   const borderColor = useMemo(() => {
     if (style?.borderColor || customStyle?.borderColor) {
       return style?.borderColor || customStyle?.borderColor;
@@ -53,11 +43,7 @@ const LxSolid: React.FC<LxSolidProps> = (props) => {
         break;
     }
     return (
-      <div
-        {...restProps}
-        style={{ ...style, ...customStyle }}
-        className={classnames(styles.solidDivider, className)}
-      >
+      <div {...restProps} style={{ ...style, ...customStyle }} className={classnames(styles.solidDivider, className)}>
         <div
           style={{
             width: leftWidth,
@@ -79,12 +65,6 @@ const LxSolid: React.FC<LxSolidProps> = (props) => {
     );
   }
 
-  return (
-    <div
-      style={{ backgroundColor: borderColor, ...style }}
-      {...restProps}
-      className={className}
-    />
-  );
+  return <div style={{ backgroundColor: borderColor, ...style }} {...restProps} className={className} />;
 };
 export default LxSolid;

package/lib/h5public/src/components/factory/src/Divider/index.tsx

@@ -74,16 +74,7 @@ const MyDivider = LingxiForwardRef<any, MyDividerProps>((props, ref) => {
       />
     );
   }
-  return (
-    <LxSolid
-      showTitle={showTitle}
-      dividerText={dividerText}
-      style={dividerStyle()}
-      type={type}
-      titleStyle={titleStyle()}
-      {...restProps}
-    />
-  );
+  return <LxSolid showTitle={showTitle} dividerText={dividerText} style={dividerStyle()} type={type} titleStyle={titleStyle()} {...restProps} />;
 });
 
 MyDivider.displayName = 'MyDivider';