@hw-component/form 1.9.99 → 1.10.1

package/es/Form/Basic.d.ts

@@ -1,3 +1,3 @@
 import type { HFormProps } from "./modal";
-declare const _default: ({ configData, gutter, dismissOnPressEnter, itemSpan, labelWidth, formItemStyle, flexBox: formFlexBox, }: HFormProps) => JSX.Element;
+declare const _default: ({ configData, gutter, dismissOnPressEnter, itemSpan, labelWidth, formItemStyle, flexBox: formFlexBox, requiredMode, }: HFormProps) => JSX.Element;
 export default _default;

package/es/Form/Basic.js

@@ -17,7 +17,8 @@ var Basic = (function (_ref) {
     itemSpan = _ref.itemSpan,
     labelWidth = _ref.labelWidth,
     formItemStyle = _ref.formItemStyle,
-    formFlexBox = _ref.flexBox;
+    formFlexBox = _ref.flexBox,
+    requiredMode = _ref.requiredMode;
   var _useFormContext = useFormContext(),
     form = _useFormContext.form,
     formItemProps = _useFormContext.itemProps,
@@ -37,11 +38,15 @@ var Basic = (function (_ref) {
     form.submit();
   };
   var globalItemSpan = itemSpan || formItemSpan;
+  var boxStyle = requiredMode ? {
+    paddingLeft: 10,
+    width: "100%"
+  } : {
+    width: "100%"
+  };
   return jsx(Row, {
     gutter: gutter,
-    style: {
-      width: "100%"
-    },
+    style: boxStyle,
     children: newConfigData.map(function (itemData, index) {
       var _itemData$labelWidth = itemData.labelWidth,
         itemLabelWidth = _itemData$labelWidth === void 0 ? labelWidth : _itemData$labelWidth,

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/Form/Basic.d.ts

@@ -1,3 +1,3 @@
 import type { HFormProps } from "./modal";
-declare const _default: ({ configData, gutter, dismissOnPressEnter, itemSpan, labelWidth, formItemStyle, flexBox: formFlexBox, }: HFormProps) => JSX.Element;
+declare const _default: ({ configData, gutter, dismissOnPressEnter, itemSpan, labelWidth, formItemStyle, flexBox: formFlexBox, requiredMode, }: HFormProps) => JSX.Element;
 export default _default;

package/lib/Form/Basic.js

@@ -20,7 +20,8 @@ var Basic = (function (_ref) {
     itemSpan = _ref.itemSpan,
     labelWidth = _ref.labelWidth,
     formItemStyle = _ref.formItemStyle,
-    formFlexBox = _ref.flexBox;
+    formFlexBox = _ref.flexBox,
+    requiredMode = _ref.requiredMode;
   var _useFormContext = index.useFormContext(),
     form = _useFormContext.form,
     formItemProps = _useFormContext.itemProps,
@@ -40,11 +41,15 @@ var Basic = (function (_ref) {
     form.submit();
   };
   var globalItemSpan = itemSpan || formItemSpan;
+  var boxStyle = requiredMode ? {
+    paddingLeft: 10,
+    width: "100%"
+  } : {
+    width: "100%"
+  };
   return jsxRuntime.jsx(antd.Row, {
     gutter: gutter,
-    style: {
-      width: "100%"
-    },
+    style: boxStyle,
     children: newConfigData.map(function (itemData, index) {
       var _itemData$labelWidth = itemData.labelWidth,
         itemLabelWidth = _itemData$labelWidth === void 0 ? labelWidth : _itemData$labelWidth,

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.9.99",
+  "version": "1.10.1",
   "description": "基于antd二次开发",
   "repository": {
     "type": "git",

package/src/components/Form/Basic.tsx

@@ -13,6 +13,7 @@ export default ({
   labelWidth,
   formItemStyle,
   flexBox: formFlexBox,
+                  requiredMode,
 }: HFormProps) => {
   const {
     form,
@@ -32,8 +33,9 @@ export default ({
     form.submit();
   };
   const globalItemSpan = itemSpan || formItemSpan;
+  const boxStyle= requiredMode?{paddingLeft:10,width: "100%"}:{width: "100%"}
   return (
-    <Row gutter={gutter} style={{ width: "100%" }}>
+    <Row gutter={gutter} style={boxStyle}>
       {newConfigData.map((itemData: HItemProps, index) => {
         const {
           labelWidth: itemLabelWidth = labelWidth,

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) => {