@hw-component/form 1.9.18 → 1.9.20

package/es/Form/hooks/index.js

@@ -58,7 +58,6 @@ var useInfoReq = function useInfoReq(_ref) {
   var infoControl = useRequest(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
     var reqParams,
       result,
-      setValue,
       _args2 = arguments;
     return _regeneratorRuntime.wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
@@ -76,10 +75,15 @@ var useInfoReq = function useInfoReq(_ref) {
           form === null || form === void 0 || form.setFieldsValue(result);
           return _context2.abrupt("return", result || {});
         case 8:
-          setValue = initialValues || {};
-          form === null || form === void 0 || form.setFieldsValue(setValue);
-          return _context2.abrupt("return", setValue);
-        case 11:
+          if (!(typeof initialValues === "undefined")) {
+            _context2.next = 10;
+            break;
+          }
+          return _context2.abrupt("return", {});
+        case 10:
+          form === null || form === void 0 || form.setFieldsValue(initialValues);
+          return _context2.abrupt("return", initialValues);
+        case 12:
         case "end":
           return _context2.stop();
       }

package/es/Switch/index.js

@@ -2,9 +2,9 @@
 import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
 import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
 import { jsxs, jsx } from 'react/jsx-runtime';
-import { Space, Switch } from 'antd';
+import { Switch } from 'antd';
 import { useMemo } from 'react';
-import { useMatchConfigProps } from '../hooks/index.js';
+import { useMatchConfigProps, useClassName } from '../hooks/index.js';
 import HFormConnect from '../Form/HFormConnect.js';
 
 var _excluded = ["value", "onChange", "valueMap", "children", "unCheckedChildren", "checkedChildren", "beforeText", "addFormat", "style"];
@@ -28,6 +28,8 @@ var Index = function Index(_ref) {
     }),
     _useMatchConfigProps$ = _useMatchConfigProps.valueSwitchMap,
     valueSwitchMap = _useMatchConfigProps$ === void 0 ? {} : _useMatchConfigProps$;
+  var switchClassName = useClassName("hw-switch");
+  var switchBody = useClassName("hw-switch-body");
   var swChecked = useMemo(function () {
     var open = valueSwitchMap.open;
     return value === open;
@@ -58,14 +60,20 @@ var Index = function Index(_ref) {
       }
     }
   });
-  return jsxs(Space, {
+  return jsxs("div", {
     style: style,
-    children: [beforeText, jsx(Switch, _objectSpread({
-      checked: swChecked,
-      checkedChildren: checkedChildren,
-      unCheckedChildren: unCheckedChildren,
-      onChange: change
-    }, props)), jsx("span", {
+    className: switchClassName,
+    children: [jsx("span", {
+      children: beforeText
+    }), jsx("div", {
+      className: switchBody,
+      children: jsx(Switch, _objectSpread({
+        checked: swChecked,
+        checkedChildren: checkedChildren,
+        unCheckedChildren: unCheckedChildren,
+        onChange: change
+      }, props))
+    }), jsx("span", {
       children: children
     })]
   });

package/es/index.css

@@ -212,3 +212,22 @@
 .ant-hw-color-input-picker {
   box-shadow: 0 0 0 0 !important;
 }
+.ant-hw-switch {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-orient: horizontal;
+  -webkit-box-direction: normal;
+  -webkit-flex-direction: row;
+      -ms-flex-direction: row;
+          flex-direction: row;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+      -ms-flex-align: center;
+          align-items: center;
+}
+.ant-hw-switch .ant-hw-switch-body {
+  margin-left: 4px;
+  margin-right: 4px;
+}

package/lib/Form/hooks/index.js

@@ -59,7 +59,6 @@ var useInfoReq = function useInfoReq(_ref) {
   var infoControl = ahooks.useRequest(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
     var reqParams,
       result,
-      setValue,
       _args2 = arguments;
     return _regeneratorRuntime.wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
@@ -77,10 +76,15 @@ var useInfoReq = function useInfoReq(_ref) {
           form === null || form === void 0 || form.setFieldsValue(result);
           return _context2.abrupt("return", result || {});
         case 8:
-          setValue = initialValues || {};
-          form === null || form === void 0 || form.setFieldsValue(setValue);
-          return _context2.abrupt("return", setValue);
-        case 11:
+          if (!(typeof initialValues === "undefined")) {
+            _context2.next = 10;
+            break;
+          }
+          return _context2.abrupt("return", {});
+        case 10:
+          form === null || form === void 0 || form.setFieldsValue(initialValues);
+          return _context2.abrupt("return", initialValues);
+        case 12:
         case "end":
           return _context2.stop();
       }

package/lib/Switch/index.js

@@ -31,6 +31,8 @@ var Index = function Index(_ref) {
     }),
     _useMatchConfigProps$ = _useMatchConfigProps.valueSwitchMap,
     valueSwitchMap = _useMatchConfigProps$ === void 0 ? {} : _useMatchConfigProps$;
+  var switchClassName = index.useClassName("hw-switch");
+  var switchBody = index.useClassName("hw-switch-body");
   var swChecked = React.useMemo(function () {
     var open = valueSwitchMap.open;
     return value === open;
@@ -61,14 +63,20 @@ var Index = function Index(_ref) {
       }
     }
   });
-  return jsxRuntime.jsxs(antd.Space, {
+  return jsxRuntime.jsxs("div", {
     style: style,
-    children: [beforeText, jsxRuntime.jsx(antd.Switch, _objectSpread({
-      checked: swChecked,
-      checkedChildren: checkedChildren,
-      unCheckedChildren: unCheckedChildren,
-      onChange: change
-    }, props)), jsxRuntime.jsx("span", {
+    className: switchClassName,
+    children: [jsxRuntime.jsx("span", {
+      children: beforeText
+    }), jsxRuntime.jsx("div", {
+      className: switchBody,
+      children: jsxRuntime.jsx(antd.Switch, _objectSpread({
+        checked: swChecked,
+        checkedChildren: checkedChildren,
+        unCheckedChildren: unCheckedChildren,
+        onChange: change
+      }, props))
+    }), jsxRuntime.jsx("span", {
       children: children
     })]
   });

package/lib/index.css

@@ -212,3 +212,22 @@
 .ant-hw-color-input-picker {
   box-shadow: 0 0 0 0 !important;
 }
+.ant-hw-switch {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-orient: horizontal;
+  -webkit-box-direction: normal;
+  -webkit-flex-direction: row;
+      -ms-flex-direction: row;
+          flex-direction: row;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+      -ms-flex-align: center;
+          align-items: center;
+}
+.ant-hw-switch .ant-hw-switch-body {
+  margin-left: 4px;
+  margin-right: 4px;
+}

package/package.json

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

package/src/components/DialogForm/hooks.ts

@@ -17,6 +17,7 @@ export const useModifyProps = ({
   title,
   onCancel,
   autoClear,
+
 }: ModifyPropsModal) => {
   const [modalVisible, setModalVisible] = useState(visible);
   const [modalFormData, setModalFormData] = useState(configData);

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

@@ -51,9 +51,11 @@ export const useInfoReq = ({
       form?.setFieldsValue(result);
       return result || {};
     }
-    const setValue = initialValues || {};
-    form?.setFieldsValue(setValue);
-    return setValue;
+    if (typeof initialValues==="undefined"){
+      return  {};
+    }
+    form?.setFieldsValue(initialValues);
+    return initialValues;
   });
   const { run, mutate } = infoControl;
   useEffect(() => {

package/src/components/Switch/index.less

@@ -0,0 +1,11 @@
+@import "../styles/local.less";
+
+.@{ant-prefix}-hw-switch {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  .@{ant-prefix}-hw-switch-body{
+     margin-left: 4px;
+     margin-right: 4px;
+  }
+}

package/src/components/Switch/index.tsx

@@ -1,7 +1,7 @@
 import type { SwitchProps } from "antd";
 import { Space, Switch } from "antd";
 import React, { useMemo } from "react";
-import { useMatchConfigProps } from "../hooks";
+import {useClassName, useMatchConfigProps} from "../hooks";
 import type { ValueSwitchMapModal } from "../modal";
 import type { addFormatItemModal } from "../Form/modal";
 import HFormConnect from "../Form/HFormConnect";
@@ -28,6 +28,8 @@ const Index: React.FC<HSwitchProps> = ({
   const { valueSwitchMap = {} } = useMatchConfigProps({
     valueSwitchMap: propsValueSwitchMap,
   });
+  const switchClassName=useClassName("hw-switch");
+  const switchBody=useClassName("hw-switch-body")
   const swChecked = useMemo(() => {
     const { open } = valueSwitchMap;
     return value === open;
@@ -61,17 +63,21 @@ const Index: React.FC<HSwitchProps> = ({
     },
   });
   return (
-    <Space style={style}>
-      {beforeText}
-      <Switch
-        checked={swChecked}
-        checkedChildren={checkedChildren}
-        unCheckedChildren={unCheckedChildren}
-        onChange={change}
-        {...props}
-      />
+    <div style={style} className={switchClassName}>
+      <span>
+        {beforeText}
+      </span>
+     <div className={switchBody}>
+       <Switch
+           checked={swChecked}
+           checkedChildren={checkedChildren}
+           unCheckedChildren={unCheckedChildren}
+           onChange={change}
+           {...props}
+       />
+     </div>
       <span>{children}</span>
-    </Space>
+    </div>
   );
 };
 

package/src/components/styles/index.less

@@ -1,3 +1,4 @@
 @import "../Select/index.less";
 @import "../Form/index.less";
 @import "../Input/index.less";
+@import "../Switch/index.less";

package/src/pages/Switch/index.tsx

@@ -13,6 +13,18 @@ export default () => {
       >
         打开
       </HSwitch>
+
+
+        <HSwitch
+            value={1}
+            beforeText="开关"
+            valueMap={{ open: 1, close: 0 }}
+            onChange={(val) => {
+                console.log(val);
+            }}
+        >
+            手机设备发送微信红包
+        </HSwitch>
     </Space>
   );
 };