@hw-component/form 1.10.0 → 1.10.2

package/es/TDPicker/TimePicker.js

@@ -3,7 +3,7 @@ import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
 import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
 import { jsxs, jsx } from 'react/jsx-runtime';
 import { Input, TimePicker } from 'antd';
-import { useTimePickerValue, useTimePickerChange } from './hooks.js';
+import { useTimePickerValue, usePropsFormat, useTimePickerChange } from './hooks.js';
 import HFormConnect from '../Form/HFormConnect.js';
 import { useClassName } from '../hooks/index.js';
 
@@ -26,6 +26,9 @@ var Index = function Index(_ref) {
     value: value,
     format: format
   });
+  var propsFormat = usePropsFormat({
+    format: format
+  });
   var change = useTimePickerChange({
     value: value,
     format: format,
@@ -48,7 +51,8 @@ var Index = function Index(_ref) {
       },
       style: {
         flex: 1
-      }
+      },
+      format: propsFormat
     }, props)), addonAfter ? jsx("div", {
       className: addonClassName,
       children: addonAfter

package/es/TDPicker/hooks.d.ts

@@ -27,6 +27,7 @@ export declare const useGetTimeKey: ({ valueMap, name, }: HRangePickerProps) =>
     end: string;
 };
 export declare const useTimeChange: ({ format, onChange, showTime, showSecond, }: UseTimeChangeParams) => (value: any) => void;
+export declare const usePropsFormat: ({ format }: UseTimePickerValParams) => string | undefined;
 export declare const useTimePickerValue: ({ value, format, }: UseTimePickerValParams) => any;
 export declare const useTimePickerChange: ({ value, format, onChange, }: UseTimeChangeParams) => (val: any) => void;
 export declare const useRangeValueProvider: ({ valueMap }: HRangePickerProps) => (val: any[]) => any[] | {

package/es/TDPicker/hooks.js

@@ -59,9 +59,16 @@ var formatMap = {
   X: "s",
   x: "ms"
 };
-var useTimePickerValue = function useTimePickerValue(_ref4) {
-  var value = _ref4.value,
-    format = _ref4.format;
+var usePropsFormat = function usePropsFormat(_ref4) {
+  var format = _ref4.format;
+  if (!format) {
+    return format;
+  }
+  return formatMap[format] ? undefined : format;
+};
+var useTimePickerValue = function useTimePickerValue(_ref5) {
+  var value = _ref5.value,
+    format = _ref5.format;
   return useMemo(function () {
     var valStr = value === null || value === void 0 ? void 0 : value.toString();
     if (!valStr || !format) {
@@ -74,10 +81,10 @@ var useTimePickerValue = function useTimePickerValue(_ref4) {
     return moment(value, format);
   }, [value, format]);
 };
-var useTimePickerChange = function useTimePickerChange(_ref5) {
-  var value = _ref5.value,
-    format = _ref5.format,
-    onChange = _ref5.onChange;
+var useTimePickerChange = function useTimePickerChange(_ref6) {
+  var value = _ref6.value,
+    format = _ref6.format,
+    onChange = _ref6.onChange;
   return useCallback(function (val) {
     if (!format || !val) {
       onChange === null || onChange === void 0 || onChange(val);
@@ -93,9 +100,9 @@ var useTimePickerChange = function useTimePickerChange(_ref5) {
     onChange === null || onChange === void 0 || onChange(subVal);
   }, [format, onChange, value]);
 };
-var useRangeValueProvider = function useRangeValueProvider(_ref6) {
-  var _ref6$valueMap = _ref6.valueMap,
-    valueMap = _ref6$valueMap === void 0 ? {} : _ref6$valueMap;
+var useRangeValueProvider = function useRangeValueProvider(_ref7) {
+  var _ref7$valueMap = _ref7.valueMap,
+    valueMap = _ref7$valueMap === void 0 ? {} : _ref7$valueMap;
   return function (val) {
     var start = valueMap.start,
       end = valueMap.end;
@@ -105,11 +112,11 @@ var useRangeValueProvider = function useRangeValueProvider(_ref6) {
     return _defineProperty(_defineProperty({}, start, val[0]), end, val[1]);
   };
 };
-var useRangePickerTimeVal = function useRangePickerTimeVal(_ref8) {
-  var value = _ref8.value,
-    format = _ref8.format,
-    _ref8$valueMap = _ref8.valueMap,
-    valueMap = _ref8$valueMap === void 0 ? {} : _ref8$valueMap;
+var useRangePickerTimeVal = function useRangePickerTimeVal(_ref9) {
+  var value = _ref9.value,
+    format = _ref9.format,
+    _ref9$valueMap = _ref9.valueMap,
+    valueMap = _ref9$valueMap === void 0 ? {} : _ref9$valueMap;
   return useMemo(function () {
     if (!value || !format) {
       return value;
@@ -138,5 +145,5 @@ var useRangePickerTimeVal = function useRangePickerTimeVal(_ref8) {
   }, [value, format, valueMap]);
 };
 
-export { useGetTimeKey, useRangePickerTimeVal, useRangeValueProvider, useTimeChange, useTimePickerChange, useTimePickerValue, useTimeVal };
+export { useGetTimeKey, usePropsFormat, useRangePickerTimeVal, useRangeValueProvider, useTimeChange, useTimePickerChange, useTimePickerValue, useTimeVal };
 // powered by hdj

package/es/TDPicker/index.js

@@ -42,15 +42,36 @@ var Index = function Index(_ref) {
     showTime: showTime,
     showSecond: showSecond
   });
-  var pickerFormat = useMemo(function () {
-    if (!showTime) {
-      return "YYYY-MM-DD";
-    }
-    if (showSecond) {
-      return "YYYY-MM-DD HH:mm:ss";
-    }
-    return "YYYY-MM-DD HH:mm";
-  }, [showSecond, showTime]);
+  var _useMemo = useMemo(function () {
+      if (!showTime) {
+        return {
+          format: "YYYY-MM-DD",
+          showTime: showTime
+        };
+      }
+      if (showSecond) {
+        var _propsShowTime = typeof showTime === "boolean" ? {
+          format: 'HH:mm:ss'
+        } : _objectSpread({
+          format: 'HH:mm:ss'
+        }, showTime);
+        return {
+          format: "YYYY-MM-DD HH:mm:ss",
+          showTime: _propsShowTime
+        };
+      }
+      var propsShowTime = typeof showTime === "boolean" ? {
+        format: 'HH:mm'
+      } : _objectSpread({
+        format: 'HH:mm'
+      }, showTime);
+      return {
+        format: "YYYY-MM-DD HH:mm",
+        showTime: propsShowTime
+      };
+    }, [showSecond, showTime]),
+    pickerFormat = _useMemo.format,
+    propsShowTime = _useMemo.showTime;
   return jsxs(Input.Group, {
     compact: true,
     style: _objectSpread({
@@ -62,7 +83,7 @@ var Index = function Index(_ref) {
     }) : null, jsx(Picker, _objectSpread({
       value: timeVal,
       onChange: change,
-      showTime: showTime,
+      showTime: propsShowTime,
       format: pickerFormat,
       style: {
         flex: 1

package/lib/TDPicker/TimePicker.js

@@ -29,6 +29,9 @@ var Index = function Index(_ref) {
     value: value,
     format: format
   });
+  var propsFormat = hooks.usePropsFormat({
+    format: format
+  });
   var change = hooks.useTimePickerChange({
     value: value,
     format: format,
@@ -51,7 +54,8 @@ var Index = function Index(_ref) {
       },
       style: {
         flex: 1
-      }
+      },
+      format: propsFormat
     }, props)), addonAfter ? jsxRuntime.jsx("div", {
       className: addonClassName,
       children: addonAfter

package/lib/TDPicker/hooks.d.ts

@@ -27,6 +27,7 @@ export declare const useGetTimeKey: ({ valueMap, name, }: HRangePickerProps) =>
     end: string;
 };
 export declare const useTimeChange: ({ format, onChange, showTime, showSecond, }: UseTimeChangeParams) => (value: any) => void;
+export declare const usePropsFormat: ({ format }: UseTimePickerValParams) => string | undefined;
 export declare const useTimePickerValue: ({ value, format, }: UseTimePickerValParams) => any;
 export declare const useTimePickerChange: ({ value, format, onChange, }: UseTimeChangeParams) => (val: any) => void;
 export declare const useRangeValueProvider: ({ valueMap }: HRangePickerProps) => (val: any[]) => any[] | {

package/lib/TDPicker/hooks.js

@@ -60,9 +60,16 @@ var formatMap = {
   X: "s",
   x: "ms"
 };
-var useTimePickerValue = function useTimePickerValue(_ref4) {
-  var value = _ref4.value,
-    format = _ref4.format;
+var usePropsFormat = function usePropsFormat(_ref4) {
+  var format = _ref4.format;
+  if (!format) {
+    return format;
+  }
+  return formatMap[format] ? undefined : format;
+};
+var useTimePickerValue = function useTimePickerValue(_ref5) {
+  var value = _ref5.value,
+    format = _ref5.format;
   return React.useMemo(function () {
     var valStr = value === null || value === void 0 ? void 0 : value.toString();
     if (!valStr || !format) {
@@ -75,10 +82,10 @@ var useTimePickerValue = function useTimePickerValue(_ref4) {
     return moment(value, format);
   }, [value, format]);
 };
-var useTimePickerChange = function useTimePickerChange(_ref5) {
-  var value = _ref5.value,
-    format = _ref5.format,
-    onChange = _ref5.onChange;
+var useTimePickerChange = function useTimePickerChange(_ref6) {
+  var value = _ref6.value,
+    format = _ref6.format,
+    onChange = _ref6.onChange;
   return React.useCallback(function (val) {
     if (!format || !val) {
       onChange === null || onChange === void 0 || onChange(val);
@@ -94,9 +101,9 @@ var useTimePickerChange = function useTimePickerChange(_ref5) {
     onChange === null || onChange === void 0 || onChange(subVal);
   }, [format, onChange, value]);
 };
-var useRangeValueProvider = function useRangeValueProvider(_ref6) {
-  var _ref6$valueMap = _ref6.valueMap,
-    valueMap = _ref6$valueMap === void 0 ? {} : _ref6$valueMap;
+var useRangeValueProvider = function useRangeValueProvider(_ref7) {
+  var _ref7$valueMap = _ref7.valueMap,
+    valueMap = _ref7$valueMap === void 0 ? {} : _ref7$valueMap;
   return function (val) {
     var start = valueMap.start,
       end = valueMap.end;
@@ -106,11 +113,11 @@ var useRangeValueProvider = function useRangeValueProvider(_ref6) {
     return _defineProperty(_defineProperty({}, start, val[0]), end, val[1]);
   };
 };
-var useRangePickerTimeVal = function useRangePickerTimeVal(_ref8) {
-  var value = _ref8.value,
-    format = _ref8.format,
-    _ref8$valueMap = _ref8.valueMap,
-    valueMap = _ref8$valueMap === void 0 ? {} : _ref8$valueMap;
+var useRangePickerTimeVal = function useRangePickerTimeVal(_ref9) {
+  var value = _ref9.value,
+    format = _ref9.format,
+    _ref9$valueMap = _ref9.valueMap,
+    valueMap = _ref9$valueMap === void 0 ? {} : _ref9$valueMap;
   return React.useMemo(function () {
     if (!value || !format) {
       return value;
@@ -140,6 +147,7 @@ var useRangePickerTimeVal = function useRangePickerTimeVal(_ref8) {
 };
 
 exports.useGetTimeKey = useGetTimeKey;
+exports.usePropsFormat = usePropsFormat;
 exports.useRangePickerTimeVal = useRangePickerTimeVal;
 exports.useRangeValueProvider = useRangeValueProvider;
 exports.useTimeChange = useTimeChange;

package/lib/TDPicker/index.js

@@ -45,15 +45,36 @@ var Index = function Index(_ref) {
     showTime: showTime,
     showSecond: showSecond
   });
-  var pickerFormat = React.useMemo(function () {
-    if (!showTime) {
-      return "YYYY-MM-DD";
-    }
-    if (showSecond) {
-      return "YYYY-MM-DD HH:mm:ss";
-    }
-    return "YYYY-MM-DD HH:mm";
-  }, [showSecond, showTime]);
+  var _useMemo = React.useMemo(function () {
+      if (!showTime) {
+        return {
+          format: "YYYY-MM-DD",
+          showTime: showTime
+        };
+      }
+      if (showSecond) {
+        var _propsShowTime = typeof showTime === "boolean" ? {
+          format: 'HH:mm:ss'
+        } : _objectSpread({
+          format: 'HH:mm:ss'
+        }, showTime);
+        return {
+          format: "YYYY-MM-DD HH:mm:ss",
+          showTime: _propsShowTime
+        };
+      }
+      var propsShowTime = typeof showTime === "boolean" ? {
+        format: 'HH:mm'
+      } : _objectSpread({
+        format: 'HH:mm'
+      }, showTime);
+      return {
+        format: "YYYY-MM-DD HH:mm",
+        showTime: propsShowTime
+      };
+    }, [showSecond, showTime]),
+    pickerFormat = _useMemo.format,
+    propsShowTime = _useMemo.showTime;
   return jsxRuntime.jsxs(antd.Input.Group, {
     compact: true,
     style: _objectSpread({
@@ -65,7 +86,7 @@ var Index = function Index(_ref) {
     }) : null, jsxRuntime.jsx(Picker, _objectSpread({
       value: timeVal,
       onChange: change,
-      showTime: showTime,
+      showTime: propsShowTime,
       format: pickerFormat,
       style: {
         flex: 1

package/package.json

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

package/src/components/TDPicker/TimePicker.tsx

@@ -1,6 +1,6 @@
 import { TimePicker ,Input} from "antd";
 import type { HTimePickerProps } from "./modal";
-import { useTimePickerChange, useTimePickerValue } from "./hooks";
+import {usePropsFormat, useTimePickerChange, useTimePickerValue} from "./hooks";
 import HFormConnect from "../Form/HFormConnect";
 import React from "react";
 import {useClassName} from "@/components/hooks";
@@ -11,13 +11,14 @@ const Index = ({
   onChange,
   addFormat,
   disabledDate,
-                 addonBefore,
-                 style,
-                 addonAfter,
+  addonBefore,
+  style,
+  addonAfter,
   ...props
 }: HTimePickerProps) => {
   addFormat?.({});
   const timeVal = useTimePickerValue({ value, format });
+  const propsFormat=usePropsFormat({format})
   const change = useTimePickerChange({ value, format, onChange });
   const addonClassName=useClassName("hw-addon")
   return (
@@ -32,6 +33,7 @@ const Index = ({
       style={{
         flex:1
       }}
+      format={propsFormat}
       {...props}
     />
         {addonAfter? <div className={addonClassName}>{addonAfter}</div>:null}

package/src/components/TDPicker/hooks.ts

@@ -83,6 +83,12 @@ const formatMap = {
   X: "s",
   x: "ms",
 };
+export const usePropsFormat=({format}:UseTimePickerValParams)=>{
+   if (!format){
+     return  format;
+   }
+   return formatMap[format]?undefined:format;
+}
 export const useTimePickerValue = ({
   value,
   format,

package/src/components/TDPicker/index.tsx

@@ -22,14 +22,26 @@ const Index: React.FC<HDatePickerProps> = ({
   const timeVal = useTimeVal({ value, format });
   const addonClassName=useClassName("hw-addon")
   const change = useTimeChange({ format, onChange, showTime, showSecond });
-  const pickerFormat = useMemo(() => {
+  const {format:pickerFormat,showTime:propsShowTime} = useMemo(() => {
     if (!showTime) {
-      return "YYYY-MM-DD";
+      return {
+        format:"YYYY-MM-DD",
+        showTime
+      }
     }
     if (showSecond) {
-      return "YYYY-MM-DD HH:mm:ss";
+      const propsShowTime=typeof showTime==="boolean"?{ format: 'HH:mm:ss' }:{format: 'HH:mm:ss' ,...showTime };
+
+      return {
+        format: "YYYY-MM-DD HH:mm:ss",
+        showTime:propsShowTime
+      }
+    }
+    const propsShowTime=typeof showTime==="boolean"?{ format: 'HH:mm' }:{format: 'HH:mm' ,...showTime };
+    return {
+      format: "YYYY-MM-DD HH:mm",
+      showTime:propsShowTime
     }
-    return "YYYY-MM-DD HH:mm";
   }, [showSecond, showTime]);
   return (
    <Input.Group compact style={{display:"flex",...style}}>
@@ -37,7 +49,7 @@ const Index: React.FC<HDatePickerProps> = ({
      <Picker
          value={timeVal}
          onChange={change}
-         showTime={showTime}
+         showTime={propsShowTime}
          format={pickerFormat}
          style={{flex:1}}
          showSecond={showSecond}

package/src/pages/DatePicker/index.tsx

@@ -12,7 +12,7 @@ export default () => {
        <Space size={"large"} direction={"vertical"} style={{ width: "100%" }}>
            <HDatePicker
                value={timeVal1}
-               showTime={false}
+               showTime
                addonBefore="你好"
                addonAfter="我很好"
                onChange={(val) => {