@hw-component/form 0.0.9-beta-v2 → 0.0.9-beta-v4

package/es/CheckboxGroup/index.js

@@ -27,7 +27,8 @@ var Index = function Index(_ref) {
     disabled = _ref.disabled,
     _ref$keyInValue = _ref.keyInValue,
     keyInValue = _ref$keyInValue === void 0 ? true : _ref$keyInValue,
-    addFormat = _ref.addFormat;
+    addFormat = _ref.addFormat,
+    direction = _ref.direction;
   var _useMatchConfigProps = useMatchConfigProps({
       fieldNames: fieldNames,
       valueCheckMap: valueMap
@@ -74,6 +75,7 @@ var Index = function Index(_ref) {
     }
   });
   return jsx(Space, {
+    direction: direction,
     children: checkOptions === null || checkOptions === void 0 ? void 0 : checkOptions.map(function (item) {
       var label = item.label,
         itemVal = item.value;

package/es/CheckboxGroup/modal.d.ts

@@ -11,4 +11,5 @@ export interface HCheckboxProps extends Omit<CheckboxProps, "value" | "onChange"
     onChange?: (value: Record<string, any> | any[]) => void;
     addFormat?: (config: Record<string, addFormatItemModal>) => void;
     subParams?: (formatValue: Record<string, any>, sourceValue: any[]) => any;
+    direction?: 'horizontal' | 'vertical';
 }

package/es/Form/hooks/useHForm.js

@@ -84,7 +84,6 @@ var useHForm = (function () {
           return {};
         }
         var newValue = _objectSpread({}, value);
-        console.log(formatSourceData, "formatSourceData");
         var keys = Object.keys(formatSourceData);
         keys.forEach(function (key) {
           var _formatSourceData$key;
@@ -96,7 +95,6 @@ var useHForm = (function () {
           Reflect.deleteProperty(newValue, key);
           newValue = _objectSpread(_objectSpread({}, newValue), resultValue);
         });
-        console.log(newValue, "newVal");
         return newValue;
       },
       dispatch: function dispatch(action) {

package/es/TDPicker/index.js

@@ -13,7 +13,7 @@ import { DatePicker } from 'antd';
 import { useTimeVal, useTimeChange } from './hooks.js';
 import HFormConnect from '../Form/HFormConnect.js';
 
-var _excluded = ["value", "onChange", "showTime", "format", "disabledDate", "addFormat"];
+var _excluded = ["value", "onChange", "showTime", "format", "disabledDate", "addFormat", "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 Picker = DatePicker;
@@ -26,6 +26,10 @@ var Index = function Index(_ref) {
     format = _ref$format === void 0 ? "X" : _ref$format,
     _disabledDate = _ref.disabledDate,
     addFormat = _ref.addFormat,
+    _ref$style = _ref.style,
+    style = _ref$style === void 0 ? {
+      width: "100%"
+    } : _ref$style,
     props = _objectWithoutProperties(_ref, _excluded);
   addFormat === null || addFormat === void 0 || addFormat({});
   var timeVal = useTimeVal({
@@ -40,6 +44,7 @@ var Index = function Index(_ref) {
     value: timeVal,
     onChange: change,
     showTime: showTime,
+    style: style,
     disabledDate: function disabledDate(currentDate) {
       return !!(_disabledDate !== null && _disabledDate !== void 0 && _disabledDate(currentDate, timeVal));
     }

package/lib/CheckboxGroup/index.js

@@ -30,7 +30,8 @@ var Index = function Index(_ref) {
     disabled = _ref.disabled,
     _ref$keyInValue = _ref.keyInValue,
     keyInValue = _ref$keyInValue === void 0 ? true : _ref$keyInValue,
-    addFormat = _ref.addFormat;
+    addFormat = _ref.addFormat,
+    direction = _ref.direction;
   var _useMatchConfigProps = index.useMatchConfigProps({
       fieldNames: fieldNames,
       valueCheckMap: valueMap
@@ -77,6 +78,7 @@ var Index = function Index(_ref) {
     }
   });
   return jsxRuntime.jsx(antd.Space, {
+    direction: direction,
     children: checkOptions === null || checkOptions === void 0 ? void 0 : checkOptions.map(function (item) {
       var label = item.label,
         itemVal = item.value;

package/lib/CheckboxGroup/modal.d.ts

@@ -11,4 +11,5 @@ export interface HCheckboxProps extends Omit<CheckboxProps, "value" | "onChange"
     onChange?: (value: Record<string, any> | any[]) => void;
     addFormat?: (config: Record<string, addFormatItemModal>) => void;
     subParams?: (formatValue: Record<string, any>, sourceValue: any[]) => any;
+    direction?: 'horizontal' | 'vertical';
 }

package/lib/Form/hooks/useHForm.js

@@ -87,7 +87,6 @@ var useHForm = (function () {
           return {};
         }
         var newValue = _objectSpread({}, value);
-        console.log(formatSourceData, "formatSourceData");
         var keys = Object.keys(formatSourceData);
         keys.forEach(function (key) {
           var _formatSourceData$key;
@@ -99,7 +98,6 @@ var useHForm = (function () {
           Reflect.deleteProperty(newValue, key);
           newValue = _objectSpread(_objectSpread({}, newValue), resultValue);
         });
-        console.log(newValue, "newVal");
         return newValue;
       },
       dispatch: function dispatch(action) {

package/lib/TDPicker/index.js

@@ -16,7 +16,7 @@ var antd = require('antd');
 var hooks = require('./hooks.js');
 var HFormConnect = require('../Form/HFormConnect.js');
 
-var _excluded = ["value", "onChange", "showTime", "format", "disabledDate", "addFormat"];
+var _excluded = ["value", "onChange", "showTime", "format", "disabledDate", "addFormat", "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 Picker = antd.DatePicker;
@@ -29,6 +29,10 @@ var Index = function Index(_ref) {
     format = _ref$format === void 0 ? "X" : _ref$format,
     _disabledDate = _ref.disabledDate,
     addFormat = _ref.addFormat,
+    _ref$style = _ref.style,
+    style = _ref$style === void 0 ? {
+      width: "100%"
+    } : _ref$style,
     props = _objectWithoutProperties(_ref, _excluded);
   addFormat === null || addFormat === void 0 || addFormat({});
   var timeVal = hooks.useTimeVal({
@@ -43,6 +47,7 @@ var Index = function Index(_ref) {
     value: timeVal,
     onChange: change,
     showTime: showTime,
+    style: style,
     disabledDate: function disabledDate(currentDate) {
       return !!(_disabledDate !== null && _disabledDate !== void 0 && _disabledDate(currentDate, timeVal));
     }

package/package.json

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

package/src/components/CheckboxGroup/index.tsx

@@ -15,6 +15,7 @@ const Index = ({
   disabled,
   keyInValue = true,
   addFormat,
+                 direction
 }: HCheckboxProps) => {
   const { valueCheckMap: resultValueCheckMap, fieldNames: resultFieldNames } =
     useMatchConfigProps({ fieldNames, valueCheckMap: valueMap }); //匹配全局
@@ -59,7 +60,7 @@ const Index = ({
     },
   });
   return (
-    <Space>
+    <Space direction={direction}>
       {checkOptions?.map((item) => {
         const { label, value: itemVal } = item;
         const checked = val[itemVal];

package/src/components/CheckboxGroup/modal.ts

@@ -13,4 +13,5 @@ export interface HCheckboxProps
   onChange?: (value: Record<string, any> | any[]) => void;
   addFormat?: (config: Record<string, addFormatItemModal>) => void;
   subParams?: (formatValue: Record<string, any>, sourceValue: any[]) => any;
+  direction?:'horizontal' | 'vertical'
 }

package/src/components/Form/hooks/useHForm.ts

@@ -16,7 +16,7 @@ export default () => {
     const initDispatch: Record<string, argsFn> = {};
     let cacheValues: Record<string, any> = {};
     let isLoading = false;
-    let initSaveValue={};
+    let initSaveValue = {};
     const norAddItemDispatch = (name, manual, fn) => {
       if (manual === false && name) {
         initDispatch[name] = fn;
@@ -42,7 +42,7 @@ export default () => {
         let newValue = {};
         if (cacheValues) {
           newValue = this.formatValues(cacheValues);
-          initSaveValue=newValue;
+          initSaveValue = newValue;
           form.setFieldsValue(newValue);
         }
         const initKeys = Object.keys(initDispatch);
@@ -67,7 +67,6 @@ export default () => {
           return {};
         }
         let newValue = { ...value };
-        console.log(formatSourceData,"formatSourceData")
         const keys = Object.keys(formatSourceData);
         keys.forEach((key) => {
           const format = formatSourceData[key]?.[formatKey];
@@ -81,7 +80,6 @@ export default () => {
             ...resultValue,
           };
         });
-        console.log(newValue,"newVal")
         return newValue;
       }, //转化方法
       dispatch(action, ...args) {
@@ -163,17 +161,17 @@ export default () => {
           });
         });
       },
-      resetFieldsInitValue:()=>{
-         const oldValue=form.getFieldsValue();
-         const keys=Object.keys(oldValue);
-         const newVale={};
-         keys.forEach((key)=>{
-            newVale[key]=undefined;
-         });
-         form.setFieldsValue({
-           ...newVale,
-           ...initSaveValue,
-         });
+      resetFieldsInitValue: () => {
+        const oldValue = form.getFieldsValue();
+        const keys = Object.keys(oldValue);
+        const newVale = {};
+        keys.forEach((key) => {
+          newVale[key] = undefined;
+        });
+        form.setFieldsValue({
+          ...newVale,
+          ...initSaveValue,
+        });
       },
       clear: () => {
         form.resetFields();

package/src/components/Form/modal.ts

@@ -160,7 +160,7 @@ export interface HFormInstance extends FormInstance {
   removeDispatchListener: (action?: ActionModal, fn?: argsFn) => void;
   reload: PromiseFnResult;
   clear: VoidFunction;
-  resetFieldsInitValue:VoidFunction;
+  resetFieldsInitValue: VoidFunction;
 }
 
 export interface ConnectConfigModal {

package/src/components/TDPicker/index.tsx

@@ -11,6 +11,7 @@ const Index: React.FC<HDatePickerProps> = ({
   format = "X",
   disabledDate,
   addFormat,
+    style={width:"100%"},
   ...props
 }) => {
   addFormat?.({});
@@ -21,6 +22,7 @@ const Index: React.FC<HDatePickerProps> = ({
       value={timeVal}
       onChange={change}
       showTime={showTime}
+      style={style}
       disabledDate={(currentDate) => {
         return !!disabledDate?.(currentDate, timeVal);
       }}

package/src/pages/Form/index.tsx

@@ -1,6 +1,6 @@
 import { HForm, HFormConfigProvider, useHForm } from "../../components";
 import { useState } from "react";
-import {Button, DatePicker, Form, Input} from "antd";
+import { Button, DatePicker, Form, Input } from "antd";
 
 const formData = (options) => {
   const op = [
@@ -77,6 +77,7 @@ const formData = (options) => {
         { value: "选择1", key: "check1" },
         { value: "选择2", key: "check2" },
       ],
+      direction:"vertical"
     },
     {
       label: "开关",
@@ -241,12 +242,12 @@ const Test = (props) => {
 export default () => {
   const form = useHForm();
   const [options, setOptions] = useState([{ label: "1", value: 1 }]);
-  const [aForm]=Form.useForm();
+  const [aForm] = Form.useForm();
   return (
     <div style={{ overflow: "auto", height: "90vh" }}>
-      <Form  form={aForm} initialValues={{ttim:"132123"}}>
-        <Form.Item name="ttim" rules={[{required:true}]}>
-          <Input/>
+      <Form form={aForm} initialValues={{ ttim: "132123" }}>
+        <Form.Item name="ttim" rules={[{ required: true }]}>
+          <Input />
         </Form.Item>
       </Form>
       <HFormConfigProvider