@hw-component/form 1.0.1 → 1.0.3

package/es/Form/FormItem/BasicItem.js

@@ -20,7 +20,7 @@ import { useDefaultRender } from '../hooks/useDefaultRender.js';
 import { useDefaultComponents } from '../hooks/index.js';
 import { useFormConfigContext } from '../Context/FormConfigProvider.js';
 
-var _excluded = ["hover", "labelWidth", "required", "colon", "label", "itemProps", "children", "helper", "hide", "render", "itemSpan", "hideLabel", "labelAlign", "style", "className"],
+var _excluded = ["hover", "labelWidth", "required", "colon", "label", "itemProps", "children", "helper", "hide", "render", "itemSpan", "hideLabel", "labelAlign", "style", "className", "noStyle"],
   _excluded2 = ["labelAlign", "itemProps"];
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -69,6 +69,8 @@ var Index = function Index(props) {
     props.labelAlign;
     var style = props.style,
     colClassName = props.className,
+    _props$noStyle = props.noStyle,
+    noStyle = _props$noStyle === void 0 ? false : _props$noStyle,
     oProps = _objectWithoutProperties(props, _excluded);
   var _props$labelAlign = props.labelAlign,
     align = _props$labelAlign === void 0 ? "right" : _props$labelAlign,
@@ -106,7 +108,8 @@ var Index = function Index(props) {
       style: style || formItemStyle,
       colon: false,
       required: false,
-      children: jsx(Content, {
+      noStyle: noStyle,
+      children: noStyle ? defaultRender(form) : jsx(Content, {
         helper: helper,
         children: defaultRender(form)
       })

package/es/TDPicker/RangePicker.js

@@ -18,7 +18,7 @@ import { useMemo } from 'react';
 import { useMatchConfigProps } from '../hooks/index.js';
 import HFormConnect from '../Form/HFormConnect.js';
 
-var _excluded = ["value", "onChange", "showTime", "format", "valueMap", "ranges", "name", "addFormat", "disabledDate"];
+var _excluded = ["value", "onChange", "showTime", "format", "valueMap", "ranges", "name", "addFormat", "disabledDate", "style"];
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var RangePicker = DatePicker.RangePicker;
@@ -35,6 +35,8 @@ var HRangePicker = function HRangePicker(_ref) {
     name = _ref.name,
     addFormat = _ref.addFormat,
     _disabledDate = _ref.disabledDate,
+    _ref$style = _ref.style,
+    style = _ref$style === void 0 ? {} : _ref$style,
     props = _objectWithoutProperties(_ref, _excluded);
   var _useMatchConfigProps = useMatchConfigProps({
       valueRangePickerValueMap: valueMap,
@@ -87,18 +89,31 @@ var HRangePicker = function HRangePicker(_ref) {
       }
     }
   });
+  var formatShowTimeDate = function formatShowTimeDate(date, format, key) {
+    if (!date) {
+      return null;
+    }
+    if (showTime) {
+      return date.format(format);
+    }
+    return date[key]("days").format(format);
+  };
   var change = function change(val) {
     if (!format || !val) {
       onChange === null || onChange === void 0 || onChange(val);
       return;
     }
-    var subVal = val.map(function (item) {
-      return (item === null || item === void 0 ? void 0 : item.format(format)) || null;
+    var keyArray = ["startOf", "endOf"];
+    var subVal = val.map(function (item, index) {
+      return formatShowTimeDate(item, format, keyArray[index]);
     });
     onChange === null || onChange === void 0 || onChange(paramsProvider(subVal));
   };
   return jsx(RangePicker, _objectSpread({
     value: timeVal,
+    style: _objectSpread({
+      width: "100%"
+    }, style),
     onChange: change,
     showTime: showTime,
     onCalendarChange: change,

package/lib/Form/FormItem/BasicItem.js

@@ -23,7 +23,7 @@ var useDefaultRender = require('../hooks/useDefaultRender.js');
 var index$1 = require('../hooks/index.js');
 var FormConfigProvider = require('../Context/FormConfigProvider.js');
 
-var _excluded = ["hover", "labelWidth", "required", "colon", "label", "itemProps", "children", "helper", "hide", "render", "itemSpan", "hideLabel", "labelAlign", "style", "className"],
+var _excluded = ["hover", "labelWidth", "required", "colon", "label", "itemProps", "children", "helper", "hide", "render", "itemSpan", "hideLabel", "labelAlign", "style", "className", "noStyle"],
   _excluded2 = ["labelAlign", "itemProps"];
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -72,6 +72,8 @@ var Index = function Index(props) {
     props.labelAlign;
     var style = props.style,
     colClassName = props.className,
+    _props$noStyle = props.noStyle,
+    noStyle = _props$noStyle === void 0 ? false : _props$noStyle,
     oProps = _objectWithoutProperties(props, _excluded);
   var _props$labelAlign = props.labelAlign,
     align = _props$labelAlign === void 0 ? "right" : _props$labelAlign,
@@ -109,7 +111,8 @@ var Index = function Index(props) {
       style: style || formItemStyle,
       colon: false,
       required: false,
-      children: jsxRuntime.jsx(Content, {
+      noStyle: noStyle,
+      children: noStyle ? defaultRender(form) : jsxRuntime.jsx(Content, {
         helper: helper,
         children: defaultRender(form)
       })

package/lib/TDPicker/RangePicker.js

@@ -21,7 +21,7 @@ var React = require('react');
 var index = require('../hooks/index.js');
 var HFormConnect = require('../Form/HFormConnect.js');
 
-var _excluded = ["value", "onChange", "showTime", "format", "valueMap", "ranges", "name", "addFormat", "disabledDate"];
+var _excluded = ["value", "onChange", "showTime", "format", "valueMap", "ranges", "name", "addFormat", "disabledDate", "style"];
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var RangePicker = antd.DatePicker.RangePicker;
@@ -38,6 +38,8 @@ var HRangePicker = function HRangePicker(_ref) {
     name = _ref.name,
     addFormat = _ref.addFormat,
     _disabledDate = _ref.disabledDate,
+    _ref$style = _ref.style,
+    style = _ref$style === void 0 ? {} : _ref$style,
     props = _objectWithoutProperties(_ref, _excluded);
   var _useMatchConfigProps = index.useMatchConfigProps({
       valueRangePickerValueMap: valueMap,
@@ -90,18 +92,31 @@ var HRangePicker = function HRangePicker(_ref) {
       }
     }
   });
+  var formatShowTimeDate = function formatShowTimeDate(date, format, key) {
+    if (!date) {
+      return null;
+    }
+    if (showTime) {
+      return date.format(format);
+    }
+    return date[key]("days").format(format);
+  };
   var change = function change(val) {
     if (!format || !val) {
       onChange === null || onChange === void 0 || onChange(val);
       return;
     }
-    var subVal = val.map(function (item) {
-      return (item === null || item === void 0 ? void 0 : item.format(format)) || null;
+    var keyArray = ["startOf", "endOf"];
+    var subVal = val.map(function (item, index) {
+      return formatShowTimeDate(item, format, keyArray[index]);
     });
     onChange === null || onChange === void 0 || onChange(paramsProvider(subVal));
   };
   return jsxRuntime.jsx(RangePicker, _objectSpread({
     value: timeVal,
+    style: _objectSpread({
+      width: "100%"
+    }, style),
     onChange: change,
     showTime: showTime,
     onCalendarChange: change,

package/package.json

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

package/src/components/Form/FormItem/BasicItem.tsx

@@ -48,6 +48,7 @@ const Index: React.FC<HFormItemProps> = (props) => {
     labelAlign,
     style,
     className: colClassName,
+    noStyle=false,
     ...oProps
   } = props;
   const { labelAlign: align = "right", itemProps, ...inProps } = props;
@@ -88,8 +89,9 @@ const Index: React.FC<HFormItemProps> = (props) => {
         style={style || formItemStyle}
         colon={false}
         required={false}
+        noStyle={noStyle}
       >
-        <Content helper={helper}>{defaultRender(form)}</Content>
+        {noStyle?defaultRender(form): <Content helper={helper}>{defaultRender(form)}</Content>}
       </Form.Item>
     </Col>
   );

package/src/components/TDPicker/RangePicker.tsx

@@ -10,6 +10,7 @@ import type { RangePickerProps } from "antd/es/date-picker";
 import { useMatchConfigProps } from "../hooks";
 import type { HItemProps } from "../Form/modal";
 import HFormConnect from "../Form/HFormConnect";
+import {Moment} from "moment";
 
 const RangePicker = DatePicker.RangePicker as any;
 
@@ -23,6 +24,7 @@ const HRangePicker: React.FC<HRangePickerProps> = ({
   name,
   addFormat,
   disabledDate,
+    style={},
   ...props
 }) => {
   const { valueRangePickerValueMap = {}, dateRanges } = useMatchConfigProps({
@@ -72,20 +74,30 @@ const HRangePicker: React.FC<HRangePickerProps> = ({
       },
     },
   });
-
+  const formatShowTimeDate=(date:Moment,format:string,key:string)=>{
+      if (!date){
+        return  null;
+      }
+      if (showTime){
+         return date.format(format);
+      }
+      return  date[key]("days").format(format);
+  }
   const change = (val) => {
     if (!format || !val) {
       onChange?.(val);
       return;
     }
-    const subVal = val.map((item) => {
-      return item?.format(format) || null;
+    const keyArray=["startOf","endOf"];
+    const subVal = val.map((item,index) => {
+      return formatShowTimeDate(item,format,keyArray[index]);
     });
     onChange?.(paramsProvider(subVal));
   };
   return (
     <RangePicker
       value={timeVal}
+      style={{width:"100%",...style}}
       onChange={change}
       showTime={showTime}
       onCalendarChange={change}

package/src/pages/Form/index.tsx

@@ -26,10 +26,19 @@ const formData = (options) => {
       label: "测试1",
       type: "inputNumber",
     },
+    {
+      noStyle:true,
+      render:()=>{
+        return <div>你好a</div>
+      }
+    },
     {
       label: "时间",
-      type: "datePicker",
-      name: "datePicker",
+      type: "rangePicker",
+      name: "rangePicker",
+      itemProps: {
+
+      }
     },
     {
       label: "选择",