@hw-component/form 1.9.38 → 1.9.39

package/es/Switch/index.d.ts

@@ -2,12 +2,14 @@ import type { SwitchProps } from "antd";
 import React from "react";
 import type { ValueSwitchMapModal } from "../modal";
 import type { addFormatItemModal } from "../Form/modal";
+import { PromiseFnResult } from "../modal";
 export interface HSwitchProps extends Omit<SwitchProps, "onChange"> {
     valueMap?: ValueSwitchMapModal;
     value?: any;
     onChange?: (val: any) => void;
     beforeText?: React.ReactNode;
     addFormat?: (format: Record<string, addFormatItemModal>) => void;
+    request?: PromiseFnResult;
 }
 declare const _default: React.ForwardRefExoticComponent<import("../Form/modal").HFormItemProps & React.RefAttributes<any>>;
 export default _default;

package/es/Switch/index.js

@@ -1,13 +1,16 @@
 // welcome to hoo hoo hoo
 import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
+import _asyncToGenerator from '@babel/runtime-corejs3/helpers/asyncToGenerator';
 import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
+import _regeneratorRuntime from '@babel/runtime-corejs3/regenerator';
 import { jsxs, jsx } from 'react/jsx-runtime';
 import { Switch } from 'antd';
 import { useMemo } from 'react';
 import { useMatchConfigProps, useClassName } from '../hooks/index.js';
 import HFormConnect from '../Form/HFormConnect.js';
+import { useRequest } from 'ahooks';
 
-var _excluded = ["value", "onChange", "valueMap", "children", "unCheckedChildren", "checkedChildren", "beforeText", "addFormat", "style"];
+var _excluded = ["value", "onChange", "valueMap", "children", "unCheckedChildren", "checkedChildren", "beforeText", "addFormat", "style", "request"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Index = function Index(_ref) {
@@ -22,6 +25,7 @@ var Index = function Index(_ref) {
     beforeText = _ref.beforeText,
     addFormat = _ref.addFormat,
     style = _ref.style,
+    request = _ref.request,
     props = _objectWithoutProperties(_ref, _excluded);
   var _useMatchConfigProps = useMatchConfigProps({
       valueSwitchMap: propsValueSwitchMap
@@ -31,14 +35,38 @@ var Index = function Index(_ref) {
   var switchClassName = useClassName("hw-switch");
   var switchBefore = useClassName("hw-switch-before");
   var switchAfter = useClassName("hw-switch-after");
+  var _useRequest = useRequest(/*#__PURE__*/function () {
+      var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(val) {
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              _context.next = 2;
+              return request === null || request === void 0 ? void 0 : request(val);
+            case 2:
+              onChange === null || onChange === void 0 || onChange(val);
+            case 3:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }));
+      return function (_x) {
+        return _ref2.apply(this, arguments);
+      };
+    }(), {
+      manual: true
+    }),
+    run = _useRequest.run,
+    loading = _useRequest.loading;
   var swChecked = useMemo(function () {
     var open = valueSwitchMap.open;
     return value === open;
   }, [value]);
   var change = function change(checked) {
-    var subVal = valueSwitchMap.close;
-    if (checked) {
-      subVal = valueSwitchMap.open;
+    var subVal = checked ? valueSwitchMap.open : valueSwitchMap.close;
+    if (request) {
+      run(subVal);
+      return;
     }
     onChange === null || onChange === void 0 || onChange(subVal);
   };
@@ -69,6 +97,7 @@ var Index = function Index(_ref) {
       children: beforeText
     }), jsx(Switch, _objectSpread({
       checked: swChecked,
+      loading: loading,
       checkedChildren: checkedChildren,
       unCheckedChildren: unCheckedChildren,
       onChange: change

package/es/Upload/MediaTypeEle/TypeEle.js

@@ -31,6 +31,9 @@ var TypeEle = (function (_ref2) {
     return jsx("audio", {
       autoPlay: true,
       controls: true,
+      style: {
+        width: "100%"
+      },
       onPlay: onReady,
       onError: onError,
       children: jsx("source", {

package/lib/Switch/index.d.ts

@@ -2,12 +2,14 @@ import type { SwitchProps } from "antd";
 import React from "react";
 import type { ValueSwitchMapModal } from "../modal";
 import type { addFormatItemModal } from "../Form/modal";
+import { PromiseFnResult } from "../modal";
 export interface HSwitchProps extends Omit<SwitchProps, "onChange"> {
     valueMap?: ValueSwitchMapModal;
     value?: any;
     onChange?: (val: any) => void;
     beforeText?: React.ReactNode;
     addFormat?: (format: Record<string, addFormatItemModal>) => void;
+    request?: PromiseFnResult;
 }
 declare const _default: React.ForwardRefExoticComponent<import("../Form/modal").HFormItemProps & React.RefAttributes<any>>;
 export default _default;

package/lib/Switch/index.js

@@ -3,14 +3,17 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
+var _asyncToGenerator = require('@babel/runtime-corejs3/helpers/asyncToGenerator');
 var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWithoutProperties');
+var _regeneratorRuntime = require('@babel/runtime-corejs3/regenerator');
 var jsxRuntime = require('react/jsx-runtime');
 var antd = require('antd');
 var React = require('react');
 var index = require('../hooks/index.js');
 var HFormConnect = require('../Form/HFormConnect.js');
+var ahooks = require('ahooks');
 
-var _excluded = ["value", "onChange", "valueMap", "children", "unCheckedChildren", "checkedChildren", "beforeText", "addFormat", "style"];
+var _excluded = ["value", "onChange", "valueMap", "children", "unCheckedChildren", "checkedChildren", "beforeText", "addFormat", "style", "request"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Index = function Index(_ref) {
@@ -25,6 +28,7 @@ var Index = function Index(_ref) {
     beforeText = _ref.beforeText,
     addFormat = _ref.addFormat,
     style = _ref.style,
+    request = _ref.request,
     props = _objectWithoutProperties(_ref, _excluded);
   var _useMatchConfigProps = index.useMatchConfigProps({
       valueSwitchMap: propsValueSwitchMap
@@ -34,14 +38,38 @@ var Index = function Index(_ref) {
   var switchClassName = index.useClassName("hw-switch");
   var switchBefore = index.useClassName("hw-switch-before");
   var switchAfter = index.useClassName("hw-switch-after");
+  var _useRequest = ahooks.useRequest(/*#__PURE__*/function () {
+      var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(val) {
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              _context.next = 2;
+              return request === null || request === void 0 ? void 0 : request(val);
+            case 2:
+              onChange === null || onChange === void 0 || onChange(val);
+            case 3:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }));
+      return function (_x) {
+        return _ref2.apply(this, arguments);
+      };
+    }(), {
+      manual: true
+    }),
+    run = _useRequest.run,
+    loading = _useRequest.loading;
   var swChecked = React.useMemo(function () {
     var open = valueSwitchMap.open;
     return value === open;
   }, [value]);
   var change = function change(checked) {
-    var subVal = valueSwitchMap.close;
-    if (checked) {
-      subVal = valueSwitchMap.open;
+    var subVal = checked ? valueSwitchMap.open : valueSwitchMap.close;
+    if (request) {
+      run(subVal);
+      return;
     }
     onChange === null || onChange === void 0 || onChange(subVal);
   };
@@ -72,6 +100,7 @@ var Index = function Index(_ref) {
       children: beforeText
     }), jsxRuntime.jsx(antd.Switch, _objectSpread({
       checked: swChecked,
+      loading: loading,
       checkedChildren: checkedChildren,
       unCheckedChildren: unCheckedChildren,
       onChange: change

package/lib/Upload/MediaTypeEle/TypeEle.js

@@ -34,6 +34,9 @@ var TypeEle = (function (_ref2) {
     return jsxRuntime.jsx("audio", {
       autoPlay: true,
       controls: true,
+      style: {
+        width: "100%"
+      },
       onPlay: onReady,
       onError: onError,
       children: jsxRuntime.jsx("source", {

package/package.json

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

package/src/components/Switch/index.tsx

@@ -5,6 +5,8 @@ import { useClassName, useMatchConfigProps } from "../hooks";
 import type { ValueSwitchMapModal } from "../modal";
 import type { addFormatItemModal } from "../Form/modal";
 import HFormConnect from "../Form/HFormConnect";
+import {PromiseFnResult} from "../modal";
+import {useRequest} from "ahooks";
 
 export interface HSwitchProps extends Omit<SwitchProps, "onChange"> {
   valueMap?: ValueSwitchMapModal;
@@ -12,6 +14,7 @@ export interface HSwitchProps extends Omit<SwitchProps, "onChange"> {
   onChange?: (val: any) => void;
   beforeText?: React.ReactNode;
   addFormat?: (format: Record<string, addFormatItemModal>) => void;
+  request?:PromiseFnResult
 }
 const Index: React.FC<HSwitchProps> = ({
   value,
@@ -23,6 +26,7 @@ const Index: React.FC<HSwitchProps> = ({
   beforeText,
   addFormat,
   style,
+    request,
   ...props
 }) => {
   const { valueSwitchMap = {} } = useMatchConfigProps({
@@ -31,15 +35,19 @@ const Index: React.FC<HSwitchProps> = ({
   const switchClassName = useClassName("hw-switch");
   const switchBefore = useClassName("hw-switch-before");
   const switchAfter = useClassName("hw-switch-after");
-
+  const {run,loading}=useRequest(async (val)=>{
+        await request?.(val);
+        onChange?.(val);
+  },{manual:true});
   const swChecked = useMemo(() => {
     const { open } = valueSwitchMap;
     return value === open;
   }, [value]);
   const change = (checked) => {
-    let subVal = valueSwitchMap.close;
-    if (checked) {
-      subVal = valueSwitchMap.open;
+    const subVal = checked?valueSwitchMap.open:valueSwitchMap.close;
+    if (request){
+      run(subVal);
+      return;
     }
     onChange?.(subVal);
   };
@@ -69,6 +77,7 @@ const Index: React.FC<HSwitchProps> = ({
       {beforeText && <span className={switchBefore}>{beforeText}</span>}
       <Switch
         checked={swChecked}
+        loading={loading}
         checkedChildren={checkedChildren}
         unCheckedChildren={unCheckedChildren}
         onChange={change}

package/src/components/Upload/MediaTypeEle/TypeEle.tsx

@@ -24,7 +24,7 @@ export default ({ mediaType, url, onReady, onError }: TypeEleProps) => {
 
   if (mediaType === MediaTypeEnum.audio) {
     return (
-      <audio autoPlay controls onPlay={onReady} onError={onError}>
+      <audio autoPlay controls  style={{width:"100%"}}  onPlay={onReady} onError={onError}>
         <source src={url} />
       </audio>
     );

package/src/components/Upload/UrlUpload/index.tsx

@@ -103,7 +103,7 @@ const Index = ({
         }}
       />
       {inputHelper && <Text type={"secondary"}>{inputHelper}</Text>}
-      <Upload {...upProps} ref={ref} value={value} onChange={onChange} />
+      <Upload {...upProps} ref={ref} value={value} onChange={onChange}/>
       {load && (
         <div style={{ display: "none" }}>
           <TypeEle

package/src/pages/Form/index.tsx

@@ -82,7 +82,15 @@ const formData = (options) => {
         addonAfter: "后面",
       },
     },
-
+      {
+          label:"时间",
+          name:"time",
+          type:'datePicker',
+          itemProps: {
+              picker: 'month',
+              placeholder: '请选择月份',
+          },
+      }
   ];
 };
 function Ttta({ form }) {

package/src/pages/ModalForm/index.tsx

@@ -12,95 +12,95 @@ const Test = (props) => {
   return <HUrlUpload {...props} />;
 };
 const data = [
-  {
-    label: "输入框",
-    name: "name",
-    hideLabel: true,
-    rules: [
-      () => {
-        return {
-          required: true,
-        };
-      },
-    ],
-  },
-  {
-    label: "数字",
-    name: "sz",
-    type: "inputNumber",
-    rules: [{ required: true }],
-  },
-  {
-    label: "下拉输入框",
-    name: "selectInput",
-    type: "selectInput",
-    rules: [{ required: true }],
-    itemProps: {
-      valueName: {
-        select: "op",
-        input: "opInput",
-      },
-      selectProps: {
-        options: [{ label: "测试", value: 1 }],
-      },
-    },
-  },
-  {
-    label: "按钮输入框",
-    name: "buttonInput",
-    type: "buttonInput",
-    children: "点击",
-    rules: [{ required: true }],
-  },
-  {
-    label: "选择",
-    name: "checkboxGroup",
-    type: "checkboxGroup",
-    rules: [{ required: true }],
-    helper: "帮助我",
-    options: [
-      { label: "选择1", value: "check1" },
-      { label: "选择2", value: "check2" },
-    ],
-  },
-  {
-    label: "开关",
-    name: "switch",
-    type: "switch",
-    rules: [{ required: true }],
-  },
-  {
-    label: "时间",
-    name: "datePicker",
-    type: "datePicker",
-    hover: "时间选择",
-    helper: "帮助我",
-    rules: [{ required: true }],
-  },
-  {
-    label: "时间段",
-    name: "rangePicker",
-    type: "rangePicker",
-    helper: "帮助我",
-    rules: [{ required: true }],
-    itemProps: {
-      valueMap: {
-        start: "testStart",
-        end: "testEnd",
-      },
-    },
-  },
-  {
-    label: "时分秒",
-    name: "timePicker",
-    type: "timePicker",
-    rules: [{ required: true }],
-    itemProps: {
-      subProvider: () => {
-        console.log("fff");
-      },
-    },
-  },
+  // {
+  //   label: "输入框",
+  //   name: "name",
+  //   hideLabel: true,
+  //   rules: [
+  //     () => {
+  //       return {
+  //         required: true,
+  //       };
+  //     },
+  //   ],
+  // },
+  // {
+  //   label: "数字",
+  //   name: "sz",
+  //   type: "inputNumber",
+  //   rules: [{ required: true }],
+  // },
+  // {
+  //   label: "下拉输入框",
+  //   name: "selectInput",
+  //   type: "selectInput",
+  //   rules: [{ required: true }],
+  //   itemProps: {
+  //     valueName: {
+  //       select: "op",
+  //       input: "opInput",
+  //     },
+  //     selectProps: {
+  //       options: [{ label: "测试", value: 1 }],
+  //     },
+  //   },
+  // },
+  // {
+  //   label: "按钮输入框",
+  //   name: "buttonInput",
+  //   type: "buttonInput",
+  //   children: "点击",
+  //   rules: [{ required: true }],
+  // },
+  // {
+  //   label: "选择",
+  //   name: "checkboxGroup",
+  //   type: "checkboxGroup",
+  //   rules: [{ required: true }],
+  //   helper: "帮助我",
+  //   options: [
+  //     { label: "选择1", value: "check1" },
+  //     { label: "选择2", value: "check2" },
+  //   ],
+  // },
+  // {
+  //   label: "开关",
+  //   name: "switch",
+  //   type: "switch",
+  //   rules: [{ required: true }],
+  // },
+  // {
+  //   label: "时间",
+  //   name: "datePicker",
+  //   type: "datePicker",
+  //   hover: "时间选择",
+  //   helper: "帮助我",
+  //   rules: [{ required: true }],
+  // },
+  // {
+  //   label: "时间段",
+  //   name: "rangePicker",
+  //   type: "rangePicker",
+  //   helper: "帮助我",
+  //   rules: [{ required: true }],
+  //   itemProps: {
+  //     valueMap: {
+  //       start: "testStart",
+  //       end: "testEnd",
+  //     },
+  //   },
+  // },
+  // {
+  //   label: "时分秒",
+  //   name: "timePicker",
+  //   type: "timePicker",
+  //   rules: [{ required: true }],
+  //   itemProps: {
+  //     subProvider: () => {
+  //       console.log("fff");
+  //     },
+  //   },
+  // },
   {
     label: "文件",
     name: "upload",
@@ -110,38 +110,36 @@ const data = [
   {
     label: "地址文件",
     name: "urlUpload",
-    render: () => {
-      return <Test />;
-    },
-  },
-  {
-    label: "下拉框",
-    name: "select",
-    type: "select",
-    dispatch: {
-      fnKey: "reload",
-      dependencies: ["selectInput", "sz"],
-      manual: false,
-    },
-    itemProps: {
-      request: (params = {}, values) => {
-        const { label = "123", value = 1 } = params;
-        return Promise.resolve([{ label, value }]);
-      },
-      showSearch: true,
-    },
-    rules: [{ required: true }],
-  },
-  {
-    label: "验证码",
-    type: "verificationCodeInput",
-    name: "verificationCodeInput",
-    itemProps: {
-      request: () => {
-        return Promise.resolve({ code: 200 });
-      },
-    },
+    type: "urlUpload",
   },
+  // {
+  //   label: "下拉框",
+  //   name: "select",
+  //   type: "select",
+  //   dispatch: {
+  //     fnKey: "reload",
+  //     dependencies: ["selectInput", "sz"],
+  //     manual: false,
+  //   },
+  //   itemProps: {
+  //     request: (params = {}, values) => {
+  //       const { label = "123", value = 1 } = params;
+  //       return Promise.resolve([{ label, value }]);
+  //     },
+  //     showSearch: true,
+  //   },
+  //   rules: [{ required: true }],
+  // },
+  // {
+  //   label: "验证码",
+  //   type: "verificationCodeInput",
+  //   name: "verificationCodeInput",
+  //   itemProps: {
+  //     request: () => {
+  //       return Promise.resolve({ code: 200 });
+  //     },
+  //   },
+  // },
 ];
 let num = 0;
 const Test1 = ({ formNode }) => {
@@ -163,12 +161,6 @@ export default () => {
         onClick={() => {
           num++;
           modalForm.show({
-            params: {
-              name: num,
-            },
-            initialValues: {
-              urlUpload: "ffff",
-            },
           });
         }}
       >
@@ -200,6 +192,9 @@ export default () => {
         <HModalForm
           configData={data}
           labelWidth={88}
+          infoRequest={()=>{
+              console.log("infoRequest")
+          }}
           labelAlign={"left"}
           request={(values, params) => {
             console.log(values, params);

package/src/pages/Switch/index.tsx

@@ -1,6 +1,15 @@
 import { Space } from "antd";
 import { HSwitch } from "../../components";
+import {useState} from "react";
+const req=()=>{
+    return new Promise((resolve, reject)=>{
+        setTimeout(()=>{
+            resolve({})
+        },2000)
+    })
+}
 export default () => {
+  const [val,setVal]=useState();
   return (
     <Space size={"large"} direction={"vertical"} style={{ width: "100%" }}>
       <HSwitch
@@ -16,12 +25,11 @@ export default () => {
       </HSwitch>
 
       <HSwitch
-        value={1}
+        value={val}
         beforeText="开关"
         valueMap={{ open: 1, close: 0 }}
-        onChange={(val) => {
-          console.log(val);
-        }}
+        onChange={setVal}
+        request={req}
       >
         手机设备发送微信红包
       </HSwitch>

package/src/pages/Upload/index.tsx

@@ -21,6 +21,7 @@ export default () => {
         onChange={setFiles}
         multiple={true}
         maxCount={3}
+
         maxSize={Number.MAX_SAFE_INTEGER}
       />
       <HUpload
@@ -32,7 +33,7 @@ export default () => {
         }}
         onChange={setFiles1}
       />
-      <HUrlUpload inputHelper="测试" />
+      <HUrlUpload inputHelper="测试" mediaType={MediaTypeEnum.video} value={files} onChange={setFiles}/>
     </Space>
   );
 };