@titaui/pc 1.8.4 → 1.8.61

package/src/components/form/form-fields/input-verification-code/index.tsx

@@ -1,9 +1,15 @@
-import React, { useState, useRef, useEffect, forwardRef, useImperativeHandle } from 'react';
-import classNames from 'classnames';
-import ToolTip from '../../../tooltip/error-tip';
-import './index.scss';
+import React, {
+  useState,
+  useRef,
+  useEffect,
+  forwardRef,
+  useImperativeHandle,
+} from "react";
+import classNames from "classnames";
+import ToolTip from "../../../tooltip/error-tip";
+import "./index.scss";
 
-const preCls = 'verification-code-input';
+const preCls = "verification-code-input";
 
 interface verify {
   tip: string;
@@ -20,9 +26,10 @@ interface Props {
   name: string;
   getContainer?: Function;
   disabled?: boolean;
-  layout?: 'clomn'|'row';
+  layout?: "clomn" | "row";
   btnClick?: Function;
   className?: string;
+  beforeSend?: Function;
 }
 interface Error {
   name: string;
@@ -30,11 +37,11 @@ interface Error {
 }
 
 const OverlayInner = ({ hasError, hasActive, tip }) => {
-  if (hasActive) return <span style={{ 'color': '#3F4755' }}>{tip}</span>;
-  if (hasError) return <span style={{ 'color': '#F05E5E' }}>{tip}</span>;
+  if (hasActive) return <span style={{ color: "#3F4755" }}>{tip}</span>;
+  if (hasError) return <span style={{ color: "#F05E5E" }}>{tip}</span>;
 
   return <span />;
-}
+};
 
 export default forwardRef((props: Props, ref) => {
   const {
@@ -48,21 +55,22 @@ export default forwardRef((props: Props, ref) => {
     disabled,
     getContainer,
     layout,
-    className="",
-    btnClick=()=>{},
+    className = "",
+    btnClick = () => {},
+    beforeSend,
   } = props;
 
   const inputRef = useRef<any>();
   const [hasError, setHasError] = useState<boolean>(false);
   const [hasActive, setHasActive] = useState<boolean>(false);
-  const [btn_info, setBtn_info] = useState<any>('获取验证码')
-  const [btnCanClick, setBtnCanClick] = useState<any>(true)
-  const [tip, setTip] = useState<string>('');
-  const [value, setValue] = useState<string>(props.value || '');
+  const [btn_info, setBtn_info] = useState<any>("获取验证码");
+  const [btnCanClick, setBtnCanClick] = useState<any>(true);
+  const [tip, setTip] = useState<string>("");
+  const [value, setValue] = useState<string>(props.value || "");
 
   useEffect(() => {
     setValue(props.value);
-  }, [props.value])
+  }, [props.value]);
 
   const verifing = (): Error[] => {
     const value = inputRef.current && inputRef.current.value;
@@ -76,16 +84,16 @@ export default forwardRef((props: Props, ref) => {
       }
     }
     return errors;
-  }
+  };
 
   const onInputFocusHandler = () => {
     setHasActive(true);
     inputRef.current.setSelectionRange(9999999, 9999999);
-  }
+  };
 
   const onBlurHandler = () => {
     setHasActive(false);
-  }
+  };
 
   const onChangeHandler = () => {
     const value = inputRef.current && inputRef.current.value;
@@ -97,32 +105,35 @@ export default forwardRef((props: Props, ref) => {
       setTip(errors[0].tip);
     } else {
       setHasError(false);
-      setTip('');
+      setTip("");
     }
-  }
+  };
 
-  const HandlerCode = () =>{
-    const errors = verifing();
-    if (errors.length) return
-    if(!btnCanClick || hasError) return
-    btnClick&&btnClick()
-    let time = 60
-    setBtn_info(`${time}s重新发送`)
-    setBtnCanClick(false)
+  const HandlerCode = () => {
+    if (beforeSend) {
+      const result = beforeSend();
+      if (!result) return;
+    }
+    if (!btnCanClick) return;
+
+    btnClick && btnClick();
+    let time = 60;
+    setBtn_info(`${time}s重新发送`);
+    setBtnCanClick(false);
     let timer = setInterval(() => {
       if (time === 0) {
-        clearInterval(timer)
-        setBtn_info('获取验证码')
-        setBtnCanClick(true)
+        clearInterval(timer);
+        setBtn_info("获取验证码");
+        setBtnCanClick(true);
       } else {
-        setBtn_info(`${time}s重新发送`)
+        setBtn_info(`${time}s重新发送`);
         time--;
       }
     }, 1000);
-  }
+  };
 
   useImperativeHandle(ref, () => ({
-    'verifing': (): Error[] => {
+    verifing: (): Error[] => {
       const errors = verifing();
       if (errors.length) {
         setHasError(true);
@@ -130,42 +141,61 @@ export default forwardRef((props: Props, ref) => {
         inputRef.current.focus();
       }
       return errors;
-    }
-  }))
+    },
+  }));
 
-  return <div className={classNames(preCls,{[`${preCls}-row`]:layout==='row'},className)}>
-    <div className={classNames(`${preCls}__label`)}>
-      <span className={classNames(`${preCls}__label-text`)}>{label}</span>
-      {require && <span className={classNames(`${preCls}__label-require`)}>*</span>}
-    </div>
-    <div className={classNames(`${preCls}__border`, {
-      [`${preCls}__border--error`]: hasError,
-      [`${preCls}__border--active`]: hasActive,
-      [`${preCls}__border--disabled`]: disabled
-    })}>
-      <ToolTip
-        placement={'topLeft'}
-        destroyTooltipOnHide={true}
-        visible={(hasActive || hasError) && tip}
-        overlay={<OverlayInner hasActive={hasActive} hasError={hasError} tip={tip} />}
-        getTooltipContainer={getContainer}
+  return (
+    <div
+      className={classNames(
+        preCls,
+        { [`${preCls}-row`]: layout === "row" },
+        className
+      )}
+    >
+      <div className={classNames(`${preCls}__label`)}>
+        <span className={classNames(`${preCls}__label-text`)}>{label}</span>
+        {require && (
+          <span className={classNames(`${preCls}__label-require`)}>*</span>
+        )}
+      </div>
+      <div
+        className={classNames(`${preCls}__border`, {
+          [`${preCls}__border--error`]: hasError,
+          [`${preCls}__border--active`]: hasActive,
+          [`${preCls}__border--disabled`]: disabled,
+        })}
       >
-        <input
-          ref={inputRef}
-          type={type}
-          disabled={disabled}
-          className={classNames(`${preCls}__input`)}
-          value={value}
-          placeholder={placeholder}
-          onFocus={onInputFocusHandler}
-          onBlur={onBlurHandler}
-          onChange={onChangeHandler}
-          autoComplete='off'
-        />
-      </ToolTip>
-      <div  className={classNames(`${preCls}__btn`,{[`${preCls}__btn--not`]:!btnCanClick})} onClick={HandlerCode}>
-        {btn_info}
+        <ToolTip
+          placement={"topLeft"}
+          destroyTooltipOnHide={true}
+          visible={(hasActive || hasError) && tip}
+          overlay={
+            <OverlayInner hasActive={hasActive} hasError={hasError} tip={tip} />
+          }
+          getTooltipContainer={getContainer}
+        >
+          <input
+            ref={inputRef}
+            type={type}
+            disabled={disabled}
+            className={classNames(`${preCls}__input`)}
+            value={value}
+            placeholder={placeholder}
+            onFocus={onInputFocusHandler}
+            onBlur={onBlurHandler}
+            onChange={onChangeHandler}
+            autoComplete="off"
+          />
+        </ToolTip>
+        <div
+          className={classNames(`${preCls}__btn`, {
+            [`${preCls}__btn--not`]: !btnCanClick,
+          })}
+          onClick={HandlerCode}
+        >
+          {btn_info}
+        </div>
       </div>
     </div>
-  </div>
-})
+  );
+});

package/src/components/form/form-fields/password/index.scss

@@ -1,9 +1,21 @@
 .form-field-input {
+  &-row {
+    display: flex;
+    align-items: center;
+    .form-field-input__label {
+      margin-bottom: unset;
+    }
+    .form-field-input__border {
+      margin-left: 16px;
+      flex: 1;
+    }
+  }
   &__label {
     height: 22px;
     font-size: 14px;
     margin-bottom: 5px;
-    font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
+    font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica,
+      sans-serif, PingFang SC, Microsoft YaHei;
     font-weight: 400;
     line-height: 22px;
 
@@ -22,10 +34,13 @@
     transition: all 0.2s;
     border: 1px solid #e9ecf0;
     box-sizing: border-box;
+    .tu-icon-yincang {
+      cursor: pointer;
+    }
   }
   &__border--error {
-    box-shadow: inset 0px 0px 4px 0px rgba(240, 94, 94, 0.3) ;
-    border: 1px solid #f05e5e ;
+    box-shadow: inset 0px 0px 4px 0px rgba(240, 94, 94, 0.3);
+    border: 1px solid #f05e5e;
   }
   &__border--active {
     box-shadow: inset 0px 0px 4px 0px rgba(40, 121, 255, 0.3);
@@ -37,7 +52,8 @@
     padding: 0;
     width: calc(100% - 12px);
     font-size: 14px;
-    font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
+    font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica,
+      sans-serif, PingFang SC, Microsoft YaHei;
     font-weight: 400;
     color: #3f4755;
     height: 22px;

package/src/components/form/form-fields/password/index.tsx

@@ -1,9 +1,15 @@
-import React, { useState, useRef, useEffect, forwardRef, useImperativeHandle } from 'react';
-import classNames from 'classnames';
-import ToolTip from '../../../tooltip/error-tip';
-import './index.scss';
+import React, {
+  useState,
+  useRef,
+  useEffect,
+  forwardRef,
+  useImperativeHandle,
+} from "react";
+import classNames from "classnames";
+import ToolTip from "../../../tooltip/error-tip";
+import "./index.scss";
 
-const preCls = 'form-field-input';
+const preCls = "form-field-input";
 
 interface verify {
   tip: string;
@@ -16,9 +22,9 @@ interface Props {
   onChange?: Function;
   value?: any;
   require?: boolean;
-  type?: string;
   name: string;
   getContainer?: Function;
+  layout?: "clomn" | "row";
 }
 interface Error {
   name: string;
@@ -26,10 +32,10 @@ interface Error {
 }
 
 const OverlayInner = ({ hasError, hasActive, tip }) => {
-  if (hasError) return <span style={{ 'color': '#F05E5E' }}>{tip}</span>;
-  if (hasActive) return <span style={{ 'color': '#3F4755' }}>{tip}</span>;
+  if (hasError) return <span style={{ color: "#F05E5E" }}>{tip}</span>;
+  if (hasActive) return <span style={{ color: "#3F4755" }}>{tip}</span>;
   return <span />;
-}
+};
 
 export default forwardRef((props: Props, ref) => {
   const {
@@ -38,20 +44,21 @@ export default forwardRef((props: Props, ref) => {
     placeholder,
     onChange,
     require,
-    type,
     name,
-    getContainer
+    getContainer,
+    layout,
   } = props;
 
   const inputRef = useRef<any>();
   const [hasError, setHasError] = useState<boolean>(false);
   const [hasActive, setHasActive] = useState<boolean>(false);
-  const [tip, setTip] = useState<string>('');
-  const [value, setValue] = useState<string>(props.value || '');
+  const [showPwd, setShowPwd] = useState(false);
+  const [tip, setTip] = useState<string>("");
+  const [value, setValue] = useState<string>(props.value || "");
 
   useEffect(() => {
     setValue(props.value);
-  }, [props.value])
+  }, [props.value]);
 
   const verifing = (): Error[] => {
     const value = inputRef.current && inputRef.current.value;
@@ -65,16 +72,16 @@ export default forwardRef((props: Props, ref) => {
       }
     }
     return errors;
-  }
+  };
 
   const onInputFocusHandler = () => {
     setHasActive(true);
     inputRef.current.setSelectionRange(9999999, 9999999);
-  }
+  };
 
   const onBlurHandler = () => {
     setHasActive(false);
-  }
+  };
 
   const onChangeHandler = () => {
     const value = inputRef.current && inputRef.current.value;
@@ -86,12 +93,12 @@ export default forwardRef((props: Props, ref) => {
       setTip(errors[0].tip);
     } else {
       setHasError(false);
-      setTip('');
+      setTip("");
     }
-  }
+  };
 
   useImperativeHandle(ref, () => ({
-    'verifing': (): Error[] => {
+    verifing: (): Error[] => {
       const errors = verifing();
       if (errors.length) {
         setHasError(true);
@@ -99,37 +106,52 @@ export default forwardRef((props: Props, ref) => {
         inputRef.current.focus();
       }
       return errors;
-    }
-  }))
+    },
+  }));
 
-  return <div className={classNames(preCls)}>
-    <div className={classNames(`${preCls}__label`)}>
-      <span className={classNames(`${preCls}__label-text`)}>{label}</span>
-      {require && <span className={classNames(`${preCls}__label-require`)}>*</span>}
-    </div>
-    <div className={classNames(`${preCls}__border`, {
-      [`${preCls}__border--error`]: hasError,
-      [`${preCls}__border--active`]: hasActive
-    })}>
-      <ToolTip
-        placement={'topLeft'}
-        destroyTooltipOnHide={true}
-        visible={(hasActive || hasError) && tip}
-        overlay={<OverlayInner hasActive={hasActive} hasError={hasError} tip={tip} />}
-        getTooltipContainer={getContainer}
+  const onTypeChangeHandler = () => setShowPwd(!showPwd);
+
+  return (
+    <div
+      className={classNames(preCls, { [`${preCls}-row`]: layout === "row" })}
+    >
+      <div className={classNames(`${preCls}__label`)}>
+        <span className={classNames(`${preCls}__label-text`)}>{label}</span>
+        {require && (
+          <span className={classNames(`${preCls}__label-require`)}>*</span>
+        )}
+      </div>
+      <div
+        className={classNames(`${preCls}__border`, {
+          [`${preCls}__border--error`]: hasError,
+          [`${preCls}__border--active`]: hasActive,
+        })}
       >
-        <input
-          ref={inputRef}
-          type={type}
-          className={classNames(`${preCls}__input`)}
-          value={value}
-          placeholder={placeholder}
-          onFocus={onInputFocusHandler}
-          onBlur={onBlurHandler}
-          onChange={onChangeHandler}
-          autoComplete='off'
-        />
-      </ToolTip>
+        <ToolTip
+          placement={"topLeft"}
+          destroyTooltipOnHide={true}
+          visible={(hasActive || hasError) && tip}
+          overlay={
+            <OverlayInner hasActive={hasActive} hasError={hasError} tip={tip} />
+          }
+          getTooltipContainer={getContainer}
+        >
+          <>
+            <input
+              ref={inputRef}
+              type={showPwd ? "text" : "password"}
+              className={classNames(`${preCls}__input`)}
+              value={value}
+              placeholder={placeholder}
+              onFocus={onInputFocusHandler}
+              onBlur={onBlurHandler}
+              onChange={onChangeHandler}
+              autoComplete="off"
+            />
+            <span className="tu-icon-yincang" onClick={onTypeChangeHandler} />
+          </>
+        </ToolTip>
+      </div>
     </div>
-  </div>
-})
+  );
+});

package/src/components/form/index.tsx

@@ -8,7 +8,8 @@ import _FormFieldTextarea from "./form-fields/textarea";
 import _FormFieldRadios from "./form-fields/radios";
 import _FormFieldDropDown from "./form-fields/dropdown";
 import _FormFieldGroup from "./form-fields/group";
-import _FormFieldVerificationCode from "./form-fields/input-verification-code"
+import _FormFieldVerificationCode from "./form-fields/input-verification-code";
+import _Password from './form-fields/password';
 import { SingleLayout } from "./layout";
 import "./index.scss";
 
@@ -102,6 +103,7 @@ const FormFields = {
   DropDown:_FormFieldDropDown,
   GroupFields:_FormFieldGroup,
   VerificationInput:_FormFieldVerificationCode,
+  Password: _Password
 };
 //@ts-ignore
 Form.Fields = FormFields

package/src/components/table/index.scss

@@ -9,6 +9,7 @@
   &__table {
     width: 100%;
     overflow: auto;
+    min-height: 200px;
     &-pagination {
       padding: 10px 0 0 0;
       display: flex;

package/src/components/upload-photo-modal/constant.ts

@@ -3,10 +3,12 @@ export const List = [
 	{
 		id: 'person',
 		accept: '.jpg,.jpeg,.gif,.png',
-		autoCropArea: 0.5,
+		autoCropArea: 1,
 		initialAspectRatio: 1,
 		tips: '仅支持 jpg、jpeg、gif、png 格式 建议图片最小尺寸 150*150px',
 		previewTitle: '预览',
+    minCropBoxHeight: 60,
+    minCropBoxWidth: 60,
 	},
   {
 		id: 'enterprise',
@@ -15,6 +17,8 @@ export const List = [
 		initialAspectRatio: 5,
 		tips: '建议 logo 尺寸 400*80 logo 最佳适配颜色为白色 仅支持 jpg、jpeg、gif、png 格式',
 		previewTitle: 'logo 预览',
+    minCropBoxHeight: 20,
+    minCropBoxWidth: 20,
 	},
   {
 		id: 'browser',
@@ -23,5 +27,7 @@ export const List = [
 		initialAspectRatio: 1,
 		tips: '图标尺寸 18*18，超过将被浏览器压缩',
 		previewTitle: '浏览器图标预览',
+    minCropBoxHeight: 20,
+    minCropBoxWidth: 20,
 	}
 ];

package/src/components/upload-photo-modal/index.scss

@@ -161,8 +161,7 @@
       &-img {
         position: absolute;
         top: 1px;
-        right: 45px;
-        width: 70px;
+        min-width: 70px;
         height: 28px;
       }
       &-title {