@hw-component/form 1.10.12 → 1.10.18

package/es/TDPicker/hooks.js

@@ -5,7 +5,8 @@ import moment from 'moment';
 
 var useTimeVal = function useTimeVal(_ref) {
   var value = _ref.value,
-    format = _ref.format;
+    _ref$format = _ref.format,
+    format = _ref$format === void 0 ? "X" : _ref$format;
   return useMemo(function () {
     if (!value || !format) {
       return value;
@@ -40,7 +41,8 @@ var timeProvider = function timeProvider(value, showTime, showSecond) {
   return value;
 };
 var useTimeChange = function useTimeChange(_ref3) {
-  var format = _ref3.format,
+  var _ref3$format = _ref3.format,
+    format = _ref3$format === void 0 ? "X" : _ref3$format,
     onChange = _ref3.onChange,
     showTime = _ref3.showTime,
     _ref3$showSecond = _ref3.showSecond,

package/es/TDPicker/index.js

@@ -17,8 +17,7 @@ var Index = function Index(_ref) {
     onChange = _ref.onChange,
     _ref$showTime = _ref.showTime,
     showTime = _ref$showTime === void 0 ? true : _ref$showTime,
-    _ref$format = _ref.format,
-    format = _ref$format === void 0 ? "X" : _ref$format,
+    format = _ref.format,
     _disabledDate = _ref.disabledDate,
     addFormat = _ref.addFormat,
     _ref$style = _ref.style,
@@ -84,7 +83,7 @@ var Index = function Index(_ref) {
       value: timeVal,
       onChange: change,
       showTime: propsShowTime,
-      format: pickerFormat,
+      format: format || pickerFormat,
       style: {
         flex: 1
       },

package/es/index.css

@@ -313,6 +313,10 @@
 .ant-hw-input-group-no-addon .ant-hw-input-group-number-body {
   border-radius: 2px;
 }
+.ant-form-item-has-error .ant-hw-addon {
+  color: #ff4d4f;
+  border-color: #ff4d4f;
+}
 .ant-hw-rich-editor {
   box-sizing: border-box;
   width: 100%;

package/lib/TDPicker/hooks.js

@@ -6,7 +6,8 @@ var moment = require('moment');
 
 var useTimeVal = function useTimeVal(_ref) {
   var value = _ref.value,
-    format = _ref.format;
+    _ref$format = _ref.format,
+    format = _ref$format === void 0 ? "X" : _ref$format;
   return React.useMemo(function () {
     if (!value || !format) {
       return value;
@@ -41,7 +42,8 @@ var timeProvider = function timeProvider(value, showTime, showSecond) {
   return value;
 };
 var useTimeChange = function useTimeChange(_ref3) {
-  var format = _ref3.format,
+  var _ref3$format = _ref3.format,
+    format = _ref3$format === void 0 ? "X" : _ref3$format,
     onChange = _ref3.onChange,
     showTime = _ref3.showTime,
     _ref3$showSecond = _ref3.showSecond,

package/lib/TDPicker/index.js

@@ -20,8 +20,7 @@ var Index = function Index(_ref) {
     onChange = _ref.onChange,
     _ref$showTime = _ref.showTime,
     showTime = _ref$showTime === void 0 ? true : _ref$showTime,
-    _ref$format = _ref.format,
-    format = _ref$format === void 0 ? "X" : _ref$format,
+    format = _ref.format,
     _disabledDate = _ref.disabledDate,
     addFormat = _ref.addFormat,
     _ref$style = _ref.style,
@@ -87,7 +86,7 @@ var Index = function Index(_ref) {
       value: timeVal,
       onChange: change,
       showTime: propsShowTime,
-      format: pickerFormat,
+      format: format || pickerFormat,
       style: {
         flex: 1
       },

package/lib/index.css

@@ -313,6 +313,10 @@
 .ant-hw-input-group-no-addon .ant-hw-input-group-number-body {
   border-radius: 2px;
 }
+.ant-form-item-has-error .ant-hw-addon {
+  color: #ff4d4f;
+  border-color: #ff4d4f;
+}
 .ant-hw-rich-editor {
   box-sizing: border-box;
   width: 100%;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hw-component/form",
-  "version": "1.10.12",
+  "version": "1.10.18",
   "description": "基于antd二次开发",
   "repository": {
     "type": "git",

package/src/components/InputGroup/index.less

@@ -43,3 +43,9 @@
     border-radius: @border-radius-base;
   }
 }
+.@{ant-prefix}-form-item-has-error{
+  .@{ant-prefix}-hw-addon{
+    color: #ff4d4f;
+    border-color: #ff4d4f;
+  }
+}

package/src/components/TDPicker/hooks.ts

@@ -22,7 +22,7 @@ interface UseTimeChangeParams {
   showTime?: HDatePickerProps["showTime"];
   showSecond?: boolean;
 }
-export const useTimeVal = ({ value, format }: UseTimeValParams) => {
+export const useTimeVal = ({ value, format="X" }: UseTimeValParams) => {
   return useMemo(() => {
     if (!value || !format) {
       return value;
@@ -60,7 +60,7 @@ const timeProvider = (
   return value;
 };
 export const useTimeChange = ({
-  format,
+  format="X",
   onChange,
   showTime,
   showSecond = true,

package/src/components/TDPicker/index.tsx

@@ -9,7 +9,7 @@ const Index: React.FC<HDatePickerProps> = ({
   value,
   onChange,
   showTime = true,
-  format = "X",
+  format,
   disabledDate,
   addFormat,
   style = { width: "100%" },
@@ -44,13 +44,13 @@ const Index: React.FC<HDatePickerProps> = ({
     }
   }, [showSecond, showTime]);
   return (
-   <Input.Group compact style={{display:"flex",...style}}>
+   <Input.Group compact style={{display:"flex",...style}} >
      {addonBefore? <div className={addonClassName}>{addonBefore}</div>:null}
      <Picker
          value={timeVal}
          onChange={change}
          showTime={propsShowTime}
-         format={pickerFormat}
+         format={format||pickerFormat}
          style={{flex:1}}
          showSecond={showSecond}
          disabledDate={(currentDate) => {

package/src/pages/DatePicker/index.tsx

@@ -1,4 +1,4 @@
-import { Space } from "antd";
+import { Space ,DatePicker} from "antd";
 import {HDatePicker, HRangePicker, HTimePicker, HTimeRangePicker} from "../../components";
 import { useState } from "react";
 export default () => {
@@ -12,9 +12,8 @@ export default () => {
        <Space size={"large"} direction={"vertical"} style={{ width: "100%" }}>
            <HDatePicker
                value={timeVal1}
-               showTime
+               showTime={false}
                addonBefore="你好"
-               addonAfter="我很好"
                onChange={(val) => {
                    console.log(val);
                    setTimeVal1(val);

package/src/pages/Form/index.tsx

@@ -101,9 +101,11 @@ export default () => {
               {
                 label: "文字1",
                 name: "wz1",
-                type:"timeRangePicker",
+                type:"datePicker",
+                  rules:[{required:true}],
                   itemProps:{
-                      format:"HH:mm"
+                      format:"HH:mm",
+                      addonAfter:"测试"
                   }
               },
               // {

package/src/pages/Upload/index.tsx

@@ -4,12 +4,15 @@ import React, { useState } from "react";
 import { MediaTypeEnum } from "../../components/Upload/enums";
 
 export default () => {
-  const [files, setFiles] = useState([]);
+  const [files, setFiles] = useState([{}]);
   const [files1, setFiles1] = useState([]);
   return (
     <Space size={"large"} direction={"vertical"} style={{ width: "100%" }}>
       <HUpload
         value={files}
+        exFiles={["MP4"]}
+        thumbUrl={"https://inews.gtimg.com/om_bt/OGlQWfsaAoKkuCcMZ2o9IVEPqd-72DQy5EAN02XBHUwfYAA/641"}
+        onPreview={null}
         request={() => {
           return {
             url: "https://inews.gtimg.com/om_bt/OGlQWfsaAoKkuCcMZ2o9IVEPqd-72DQy5EAN02XBHUwfYAA/641",
@@ -24,13 +27,8 @@ export default () => {
       />
       <HUpload
         value={files1}
-        hideAddBtn={false}
+        thumbUrl={"https://inews.gtimg.com/om_bt/OGlQWfsaAoKkuCcMZ2o9IVEPqd-72DQy5EAN02XBHUwfYAA/641"}
         mediaType={MediaTypeEnum.file}
-        listType={null}
-        onPreview={false}
-        showUploadList={{
-          showPreviewIcon: false,
-        }}
         onChange={setFiles1}
       >
         <Button>按钮</Button>