@hw-component/form 0.0.8-beta-v8 → 0.0.9-beta-v1

package/es/CheckboxGroup/modal.d.ts

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

package/es/DialogForm/hooks.js

@@ -46,12 +46,16 @@ var useModifyProps = function useModifyProps(_ref) {
     _useState10 = _slicedToArray(_useState9, 2),
     modalTitle = _useState10[0],
     setModalTitle = _useState10[1];
+  var saveOldParamsObj = useMemo(function () {
+    return {
+      old: {}
+    };
+  }, []);
   var onAfterClose = function onAfterClose() {
     onCancel === null || onCancel === void 0 || onCancel();
+    saveOldParamsObj.old = dialogForm.outputValues();
     setTimeout(function () {
-      if (autoClear) {
-        dialogForm.clear();
-      }
+      dialogForm.clear();
       afterClose === null || afterClose === void 0 || afterClose();
     }, 100);
   };
@@ -86,14 +90,15 @@ var useModifyProps = function useModifyProps(_ref) {
       if (!!changeTitle) {
         setModalTitle(changeTitle);
       }
-      setInitValue(changeInitialValues);
+      var relChangeInitVal = autoClear ? changeInitialValues : _objectSpread(_objectSpread({}, saveOldParamsObj.old), changeInitialValues);
+      setInitValue(relChangeInitVal);
       setModalVisible(true);
     };
     dialogForm.hide = function () {
       setModalVisible(false);
       onAfterClose();
     };
-  }, [afterClose]);
+  }, [afterClose, autoClear]);
   return {
     modalFormData: modalFormData,
     modalVisible: modalVisible,

package/es/Form/config.d.ts

@@ -22,7 +22,7 @@ declare const componentConfig: {
     input: ({ copy, value, addonAfter, ...props }: import("../Input/modal").HInputProps<any>) => JSX.Element;
     upload: import("react").ForwardRefExoticComponent<import("./modal").HFormItemProps & import("react").RefAttributes<any>>;
     urlUpload: ({ placeholder, value, onChange, mediaType, ...props }: import("../Upload/modal").IUrlUploadProps) => JSX.Element;
-    submit: ({ text, type, form, loading, position, reset, ...props }: import("../Submit").ISubmitProps) => JSX.Element;
+    submit: ({ position, reset, extraList, ...props }: import("../Submit").ISubmitProps) => JSX.Element;
     textArea: ({ autoSize, ...props }: import("antd/es/input").TextAreaProps) => JSX.Element;
     colorInput: ({ value, onChange, defaultColor, ...props }: import("../Input/modal").HInputProps<any>) => JSX.Element;
     cascader: ({ request, options, fieldNames: propsFieldNames, ...props }: import("../Cascader").HCascaderProps) => JSX.Element;

package/es/Form/hooks/useHForm.js

@@ -174,6 +174,7 @@ var useHForm = (function () {
           cacheValues = values;
           return;
         }
+        console.log("setFieldsValue");
         var newValue = this.formatValues(values);
         form.setFieldsValue(newValue);
       },

package/es/Input/modal.d.ts

@@ -22,6 +22,7 @@ export interface HSelectInputProps extends Omit<HInputProps, "value" | "onChange
     valueName?: ValueNameModal;
     addFormat?: (config: Record<string, addFormatItemModal>) => void;
     addDispatchListener?: AddDispatchListenerFn;
+    subParams?: (formatValue: Record<string, any>) => any;
 }
 export interface HButtonProps extends Omit<ButtonProps, "onClick"> {
     onClick: (value: string | readonly string[] | number | undefined, onChange?: (val: any) => void) => void;

package/es/Submit/components.d.ts

@@ -0,0 +1,6 @@
+import type { ISubmitProps, SubmitBarExtraType } from "@/components/Submit/index";
+interface ControlFooterProps extends ISubmitProps {
+    action: SubmitBarExtraType;
+}
+export declare const ControlFooter: ({ action, ...props }: ControlFooterProps) => JSX.Element;
+export {};

package/es/Submit/components.js

@@ -0,0 +1,70 @@
+// welcome to hoo hoo hoo
+import 'core-js/modules/es.object.keys.js';
+import 'core-js/modules/es.symbol.js';
+import 'core-js/modules/es.array.filter.js';
+import 'core-js/modules/es.object.to-string.js';
+import 'core-js/modules/es.object.get-own-property-descriptor.js';
+import 'core-js/modules/web.dom-collections.for-each.js';
+import 'core-js/modules/es.object.get-own-property-descriptors.js';
+import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
+import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
+import { jsx, Fragment } from 'react/jsx-runtime';
+import { Button } from 'antd';
+import { useFormContext } from '../Form/Context/index.js';
+import React from 'react';
+
+var _excluded = ["form"],
+  _excluded2 = ["type", "form", "text", "loading"],
+  _excluded3 = ["action"];
+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; }
+function ResetBtn(_ref) {
+  var form = _ref.form,
+    props = _objectWithoutProperties(_ref, _excluded);
+  return jsx(Button, _objectSpread(_objectSpread({}, props), {}, {
+    onClick: function onClick() {
+      form.resetFields();
+    },
+    children: "\u91CD\u7F6E"
+  }));
+}
+function SubBtn(_ref2) {
+  var _ref2$type = _ref2.type,
+    type = _ref2$type === void 0 ? "primary" : _ref2$type,
+    form = _ref2.form,
+    _ref2$text = _ref2.text,
+    text = _ref2$text === void 0 ? "提交" : _ref2$text,
+    loading = _ref2.loading,
+    props = _objectWithoutProperties(_ref2, _excluded2);
+  var _useFormContext = useFormContext(),
+    _useFormContext$loadi = _useFormContext.loading,
+    formSubLoading = _useFormContext$loadi === void 0 ? loading : _useFormContext$loadi;
+  return jsx(Button, _objectSpread(_objectSpread({}, props), {}, {
+    type: type,
+    onClick: form.submit,
+    loading: formSubLoading,
+    children: text
+  }));
+}
+var ControlFooter = function ControlFooter(_ref3) {
+  var action = _ref3.action,
+    props = _objectWithoutProperties(_ref3, _excluded3);
+  var form = props.form;
+  if (action === "reset") {
+    return jsx(ResetBtn, _objectSpread({}, props));
+  }
+  if (action === "submit") {
+    return jsx(SubBtn, _objectSpread({}, props));
+  }
+  if (typeof action === "string") {
+    return jsx(Fragment, {
+      children: action
+    });
+  }
+  return /*#__PURE__*/React.cloneElement(action, {
+    form: form
+  });
+};
+
+export { ControlFooter };
+// powered by hdj

package/es/Submit/hooks.d.ts

@@ -0,0 +1,5 @@
+import type { ISubmitProps, SubmitBarExtraType } from "@/components/Submit/index";
+export declare const useBarSortList: (props: Pick<ISubmitProps, "reset" | "extraList">) => {
+    action: SubmitBarExtraType;
+    key: string;
+}[];

package/es/Submit/hooks.js

@@ -0,0 +1,28 @@
+// welcome to hoo hoo hoo
+import 'core-js/modules/es.array.map.js';
+import { useMemo } from 'react';
+
+var getBarComKeyList = function getBarComKeyList(extraList) {
+  return extraList.map(function (item, index) {
+    return {
+      action: item,
+      key: "".concat(index)
+    };
+  });
+};
+var useBarSortList = function useBarSortList(props) {
+  var extraList = props.extraList,
+    _props$reset = props.reset,
+    reset = _props$reset === void 0 ? false : _props$reset;
+  var list = useMemo(function () {
+    if (!extraList) {
+      var defaultList = reset ? ["reset", "submit"] : ["submit"];
+      return getBarComKeyList(defaultList);
+    }
+    return getBarComKeyList(extraList);
+  }, [extraList, reset]);
+  return list;
+};
+
+export { useBarSortList };
+// powered by hdj

package/es/Submit/index.d.ts

@@ -1,9 +1,12 @@
+import React from "react";
 import type { ButtonProps, FormInstance } from "antd/es";
+export type SubmitBarExtraType = "submit" | "reset" | React.ReactDOM;
 export interface ISubmitProps extends Omit<ButtonProps, "form"> {
     text?: string;
     form: FormInstance;
     reset?: boolean;
     position?: "start" | "end";
+    extraList?: SubmitBarExtraType[];
 }
-declare const _default: ({ text, type, form, loading, position, reset, ...props }: ISubmitProps) => JSX.Element;
+declare const _default: ({ position, reset, extraList, ...props }: ISubmitProps) => JSX.Element;
 export default _default;

package/es/Submit/index.js

@@ -1,4 +1,7 @@
 // welcome to hoo hoo hoo
+import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
+import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
+import 'core-js/modules/es.array.map.js';
 import 'core-js/modules/es.object.keys.js';
 import 'core-js/modules/es.symbol.js';
 import 'core-js/modules/es.array.filter.js';
@@ -6,46 +9,39 @@ import 'core-js/modules/es.object.to-string.js';
 import 'core-js/modules/es.object.get-own-property-descriptor.js';
 import 'core-js/modules/web.dom-collections.for-each.js';
 import 'core-js/modules/es.object.get-own-property-descriptors.js';
-import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
-import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
-import { jsx, jsxs } from 'react/jsx-runtime';
-import { Row, Space, Button } from 'antd';
-import { useFormContext } from '../Form/Context/index.js';
+import { jsx } from 'react/jsx-runtime';
+import { createElement } from 'react';
+import { Row, Space } from 'antd';
+import { useBarSortList } from './hooks.js';
+import { ControlFooter } from './components.js';
 
-var _excluded = ["text", "type", "form", "loading", "position", "reset"];
+var _excluded = ["position", "reset", "extraList"];
 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 HSubmit = (function (_ref) {
-  var _ref$text = _ref.text,
-    text = _ref$text === void 0 ? "提交" : _ref$text,
-    _ref$type = _ref.type,
-    type = _ref$type === void 0 ? "primary" : _ref$type,
-    form = _ref.form,
-    loading = _ref.loading,
-    _ref$position = _ref.position,
+  var _ref$position = _ref.position,
     position = _ref$position === void 0 ? "start" : _ref$position,
     reset = _ref.reset,
+    extraList = _ref.extraList,
     props = _objectWithoutProperties(_ref, _excluded);
-  var _useFormContext = useFormContext(),
-    _useFormContext$loadi = _useFormContext.loading,
-    formSubLoading = _useFormContext$loadi === void 0 ? loading : _useFormContext$loadi;
+  var barList = useBarSortList({
+    reset: reset,
+    extraList: extraList
+  });
   return jsx(Row, {
     justify: position,
     style: {
       width: "100%"
     },
-    children: jsxs(Space, {
-      children: [reset && jsx(Button, _objectSpread(_objectSpread({}, props), {}, {
-        onClick: function onClick() {
-          form.resetFields();
-        },
-        children: "\u91CD\u7F6E"
-      })), jsx(Button, _objectSpread(_objectSpread({}, props), {}, {
-        type: type,
-        onClick: form.submit,
-        loading: formSubLoading,
-        children: text
-      }))]
+    children: jsx(Space, {
+      children: barList === null || barList === void 0 ? void 0 : barList.map(function (_ref2) {
+        var action = _ref2.action,
+          key = _ref2.key;
+        return /*#__PURE__*/createElement(ControlFooter, _objectSpread(_objectSpread({}, props), {}, {
+          key: key,
+          action: action
+        }));
+      })
     })
   });
 });

package/lib/CheckboxGroup/modal.d.ts

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

package/lib/DialogForm/hooks.js

@@ -47,12 +47,16 @@ var useModifyProps = function useModifyProps(_ref) {
     _useState10 = _slicedToArray(_useState9, 2),
     modalTitle = _useState10[0],
     setModalTitle = _useState10[1];
+  var saveOldParamsObj = React.useMemo(function () {
+    return {
+      old: {}
+    };
+  }, []);
   var onAfterClose = function onAfterClose() {
     onCancel === null || onCancel === void 0 || onCancel();
+    saveOldParamsObj.old = dialogForm.outputValues();
     setTimeout(function () {
-      if (autoClear) {
-        dialogForm.clear();
-      }
+      dialogForm.clear();
       afterClose === null || afterClose === void 0 || afterClose();
     }, 100);
   };
@@ -87,14 +91,15 @@ var useModifyProps = function useModifyProps(_ref) {
       if (!!changeTitle) {
         setModalTitle(changeTitle);
       }
-      setInitValue(changeInitialValues);
+      var relChangeInitVal = autoClear ? changeInitialValues : _objectSpread(_objectSpread({}, saveOldParamsObj.old), changeInitialValues);
+      setInitValue(relChangeInitVal);
       setModalVisible(true);
     };
     dialogForm.hide = function () {
       setModalVisible(false);
       onAfterClose();
     };
-  }, [afterClose]);
+  }, [afterClose, autoClear]);
   return {
     modalFormData: modalFormData,
     modalVisible: modalVisible,

package/lib/Form/config.d.ts

@@ -22,7 +22,7 @@ declare const componentConfig: {
     input: ({ copy, value, addonAfter, ...props }: import("../Input/modal").HInputProps<any>) => JSX.Element;
     upload: import("react").ForwardRefExoticComponent<import("./modal").HFormItemProps & import("react").RefAttributes<any>>;
     urlUpload: ({ placeholder, value, onChange, mediaType, ...props }: import("../Upload/modal").IUrlUploadProps) => JSX.Element;
-    submit: ({ text, type, form, loading, position, reset, ...props }: import("../Submit").ISubmitProps) => JSX.Element;
+    submit: ({ position, reset, extraList, ...props }: import("../Submit").ISubmitProps) => JSX.Element;
     textArea: ({ autoSize, ...props }: import("antd/es/input").TextAreaProps) => JSX.Element;
     colorInput: ({ value, onChange, defaultColor, ...props }: import("../Input/modal").HInputProps<any>) => JSX.Element;
     cascader: ({ request, options, fieldNames: propsFieldNames, ...props }: import("../Cascader").HCascaderProps) => JSX.Element;

package/lib/Form/hooks/useHForm.js

@@ -177,6 +177,7 @@ var useHForm = (function () {
           cacheValues = values;
           return;
         }
+        console.log("setFieldsValue");
         var newValue = this.formatValues(values);
         form.setFieldsValue(newValue);
       },

package/lib/Input/modal.d.ts

@@ -22,6 +22,7 @@ export interface HSelectInputProps extends Omit<HInputProps, "value" | "onChange
     valueName?: ValueNameModal;
     addFormat?: (config: Record<string, addFormatItemModal>) => void;
     addDispatchListener?: AddDispatchListenerFn;
+    subParams?: (formatValue: Record<string, any>) => any;
 }
 export interface HButtonProps extends Omit<ButtonProps, "onClick"> {
     onClick: (value: string | readonly string[] | number | undefined, onChange?: (val: any) => void) => void;

package/lib/Submit/components.d.ts

@@ -0,0 +1,6 @@
+import type { ISubmitProps, SubmitBarExtraType } from "@/components/Submit/index";
+interface ControlFooterProps extends ISubmitProps {
+    action: SubmitBarExtraType;
+}
+export declare const ControlFooter: ({ action, ...props }: ControlFooterProps) => JSX.Element;
+export {};

package/lib/Submit/components.js

@@ -0,0 +1,71 @@
+'use strict';
+
+require('core-js/modules/es.object.keys.js');
+require('core-js/modules/es.symbol.js');
+require('core-js/modules/es.array.filter.js');
+require('core-js/modules/es.object.to-string.js');
+require('core-js/modules/es.object.get-own-property-descriptor.js');
+require('core-js/modules/web.dom-collections.for-each.js');
+require('core-js/modules/es.object.get-own-property-descriptors.js');
+var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
+var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWithoutProperties');
+var jsxRuntime = require('react/jsx-runtime');
+var antd = require('antd');
+var index = require('../Form/Context/index.js');
+var React = require('react');
+
+var _excluded = ["form"],
+  _excluded2 = ["type", "form", "text", "loading"],
+  _excluded3 = ["action"];
+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; }
+function ResetBtn(_ref) {
+  var form = _ref.form,
+    props = _objectWithoutProperties(_ref, _excluded);
+  return jsxRuntime.jsx(antd.Button, _objectSpread(_objectSpread({}, props), {}, {
+    onClick: function onClick() {
+      form.resetFields();
+    },
+    children: "\u91CD\u7F6E"
+  }));
+}
+function SubBtn(_ref2) {
+  var _ref2$type = _ref2.type,
+    type = _ref2$type === void 0 ? "primary" : _ref2$type,
+    form = _ref2.form,
+    _ref2$text = _ref2.text,
+    text = _ref2$text === void 0 ? "提交" : _ref2$text,
+    loading = _ref2.loading,
+    props = _objectWithoutProperties(_ref2, _excluded2);
+  var _useFormContext = index.useFormContext(),
+    _useFormContext$loadi = _useFormContext.loading,
+    formSubLoading = _useFormContext$loadi === void 0 ? loading : _useFormContext$loadi;
+  return jsxRuntime.jsx(antd.Button, _objectSpread(_objectSpread({}, props), {}, {
+    type: type,
+    onClick: form.submit,
+    loading: formSubLoading,
+    children: text
+  }));
+}
+var ControlFooter = function ControlFooter(_ref3) {
+  var action = _ref3.action,
+    props = _objectWithoutProperties(_ref3, _excluded3);
+  var form = props.form;
+  if (action === "reset") {
+    return jsxRuntime.jsx(ResetBtn, _objectSpread({}, props));
+  }
+  if (action === "submit") {
+    return jsxRuntime.jsx(SubBtn, _objectSpread({}, props));
+  }
+  if (typeof action === "string") {
+    return jsxRuntime.jsx(jsxRuntime.Fragment, {
+      children: action
+    });
+  }
+  return /*#__PURE__*/React.cloneElement(action, {
+    form: form
+  });
+};
+
+exports.ControlFooter = ControlFooter;
+// powered by h

package/lib/Submit/hooks.d.ts

@@ -0,0 +1,5 @@
+import type { ISubmitProps, SubmitBarExtraType } from "@/components/Submit/index";
+export declare const useBarSortList: (props: Pick<ISubmitProps, "reset" | "extraList">) => {
+    action: SubmitBarExtraType;
+    key: string;
+}[];

package/lib/Submit/hooks.js

@@ -0,0 +1,29 @@
+'use strict';
+
+require('core-js/modules/es.array.map.js');
+var React = require('react');
+
+var getBarComKeyList = function getBarComKeyList(extraList) {
+  return extraList.map(function (item, index) {
+    return {
+      action: item,
+      key: "".concat(index)
+    };
+  });
+};
+var useBarSortList = function useBarSortList(props) {
+  var extraList = props.extraList,
+    _props$reset = props.reset,
+    reset = _props$reset === void 0 ? false : _props$reset;
+  var list = React.useMemo(function () {
+    if (!extraList) {
+      var defaultList = reset ? ["reset", "submit"] : ["submit"];
+      return getBarComKeyList(defaultList);
+    }
+    return getBarComKeyList(extraList);
+  }, [extraList, reset]);
+  return list;
+};
+
+exports.useBarSortList = useBarSortList;
+// powered by h

package/lib/Submit/index.d.ts

@@ -1,9 +1,12 @@
+import React from "react";
 import type { ButtonProps, FormInstance } from "antd/es";
+export type SubmitBarExtraType = "submit" | "reset" | React.ReactDOM;
 export interface ISubmitProps extends Omit<ButtonProps, "form"> {
     text?: string;
     form: FormInstance;
     reset?: boolean;
     position?: "start" | "end";
+    extraList?: SubmitBarExtraType[];
 }
-declare const _default: ({ text, type, form, loading, position, reset, ...props }: ISubmitProps) => JSX.Element;
+declare const _default: ({ position, reset, extraList, ...props }: ISubmitProps) => JSX.Element;
 export default _default;

package/lib/Submit/index.js

@@ -2,6 +2,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
+var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWithoutProperties');
+require('core-js/modules/es.array.map.js');
 require('core-js/modules/es.object.keys.js');
 require('core-js/modules/es.symbol.js');
 require('core-js/modules/es.array.filter.js');
@@ -9,46 +12,39 @@ require('core-js/modules/es.object.to-string.js');
 require('core-js/modules/es.object.get-own-property-descriptor.js');
 require('core-js/modules/web.dom-collections.for-each.js');
 require('core-js/modules/es.object.get-own-property-descriptors.js');
-var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
-var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWithoutProperties');
 var jsxRuntime = require('react/jsx-runtime');
+var React = require('react');
 var antd = require('antd');
-var index = require('../Form/Context/index.js');
+var hooks = require('./hooks.js');
+var components = require('./components.js');
 
-var _excluded = ["text", "type", "form", "loading", "position", "reset"];
+var _excluded = ["position", "reset", "extraList"];
 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 HSubmit = (function (_ref) {
-  var _ref$text = _ref.text,
-    text = _ref$text === void 0 ? "提交" : _ref$text,
-    _ref$type = _ref.type,
-    type = _ref$type === void 0 ? "primary" : _ref$type,
-    form = _ref.form,
-    loading = _ref.loading,
-    _ref$position = _ref.position,
+  var _ref$position = _ref.position,
     position = _ref$position === void 0 ? "start" : _ref$position,
     reset = _ref.reset,
+    extraList = _ref.extraList,
     props = _objectWithoutProperties(_ref, _excluded);
-  var _useFormContext = index.useFormContext(),
-    _useFormContext$loadi = _useFormContext.loading,
-    formSubLoading = _useFormContext$loadi === void 0 ? loading : _useFormContext$loadi;
+  var barList = hooks.useBarSortList({
+    reset: reset,
+    extraList: extraList
+  });
   return jsxRuntime.jsx(antd.Row, {
     justify: position,
     style: {
       width: "100%"
     },
-    children: jsxRuntime.jsxs(antd.Space, {
-      children: [reset && jsxRuntime.jsx(antd.Button, _objectSpread(_objectSpread({}, props), {}, {
-        onClick: function onClick() {
-          form.resetFields();
-        },
-        children: "\u91CD\u7F6E"
-      })), jsxRuntime.jsx(antd.Button, _objectSpread(_objectSpread({}, props), {}, {
-        type: type,
-        onClick: form.submit,
-        loading: formSubLoading,
-        children: text
-      }))]
+    children: jsxRuntime.jsx(antd.Space, {
+      children: barList === null || barList === void 0 ? void 0 : barList.map(function (_ref2) {
+        var action = _ref2.action,
+          key = _ref2.key;
+        return /*#__PURE__*/React.createElement(components.ControlFooter, _objectSpread(_objectSpread({}, props), {}, {
+          key: key,
+          action: action
+        }));
+      })
     })
   });
 });

package/package.json

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

package/src/components/CheckboxGroup/modal.ts

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

package/src/components/DialogForm/hooks.ts

@@ -23,12 +23,16 @@ export const useModifyProps = ({
   const [initValue, setInitValue] = useState(initialValues);
   const [formParams, setFormParams] = useState(params);
   const [modalTitle, setModalTitle] = useState(title);
+  const saveOldParamsObj=useMemo(()=>{
+      return {
+        old:{}
+      }
+  },[]);
   const onAfterClose = () => {
     onCancel?.();
+    saveOldParamsObj.old=dialogForm.outputValues();
     setTimeout(() => {
-      if (autoClear) {
-        dialogForm.clear();
-      }
+      dialogForm.clear();
       afterClose?.();
     }, 100);
   };
@@ -64,14 +68,15 @@ export const useModifyProps = ({
       if (!!changeTitle) {
         setModalTitle(changeTitle);
       }
-      setInitValue(changeInitialValues);
+      const relChangeInitVal=autoClear?changeInitialValues:{...saveOldParamsObj.old,...changeInitialValues};
+      setInitValue(relChangeInitVal);
       setModalVisible(true);
     };
     dialogForm.hide = () => {
       setModalVisible(false);
       onAfterClose();
     };
-  }, [afterClose]);
+  }, [afterClose,autoClear]);
   return {
     modalFormData,
     modalVisible,

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

@@ -149,6 +149,7 @@ export default () => {
           cacheValues = values;
           return;
         }
+        console.log("setFieldsValue")
         const newValue = this.formatValues(values);
         form.setFieldsValue(newValue);
       },

package/src/components/Input/modal.ts

@@ -26,6 +26,7 @@ export interface HSelectInputProps
   valueName?: ValueNameModal;
   addFormat?: (config: Record<string, addFormatItemModal>) => void;
   addDispatchListener?: AddDispatchListenerFn;
+  subParams?: (formatValue: Record<string, any>) => any;
 }
 export interface HButtonProps extends Omit<ButtonProps, "onClick"> {
   onClick: (

package/src/components/Submit/components.tsx

@@ -0,0 +1,57 @@
+import { Button } from "antd";
+import { useFormContext } from "../Form/Context";
+import React from "react";
+import type {
+  ISubmitProps,
+  SubmitBarExtraType,
+} from "@/components/Submit/index";
+interface ControlFooterProps extends ISubmitProps {
+  action: SubmitBarExtraType;
+}
+function ResetBtn({ form, ...props }) {
+  return (
+    <Button
+      {...props}
+      onClick={() => {
+        form.resetFields();
+      }}
+    >
+      重置
+    </Button>
+  );
+}
+
+function SubBtn({
+  type = "primary",
+  form,
+  text = "提交",
+  loading,
+  ...props
+}: ISubmitProps) {
+  const { loading: formSubLoading = loading } = useFormContext();
+
+  return (
+    <Button
+      {...props}
+      type={type as any}
+      onClick={form.submit}
+      loading={formSubLoading}
+    >
+      {text}
+    </Button>
+  );
+}
+
+export const ControlFooter = ({ action, ...props }: ControlFooterProps) => {
+  const { form } = props;
+  if (action === "reset") {
+    return <ResetBtn {...props} />;
+  }
+  if (action === "submit") {
+    return <SubBtn {...props} />;
+  }
+  if (typeof action === "string") {
+    return <>{action}</>;
+  }
+  return React.cloneElement(action as any, { form });
+};

package/src/components/Submit/hooks.ts

@@ -0,0 +1,31 @@
+import type {
+  ISubmitProps,
+  SubmitBarExtraType,
+} from "@/components/Submit/index";
+import { useMemo } from "react";
+
+const getBarComKeyList = (extraList: SubmitBarExtraType[]) => {
+  return extraList.map((item, index) => {
+    return {
+      action: item,
+      key: `${index}`,
+    };
+  });
+};
+
+export const useBarSortList = (
+  props: Pick<ISubmitProps, "reset" | "extraList">
+) => {
+  const { extraList, reset = false } = props;
+  const list = useMemo(() => {
+    if (!extraList) {
+      const defaultList: SubmitBarExtraType[] = reset
+        ? ["reset", "submit"]
+        : ["submit"];
+      return getBarComKeyList(defaultList);
+    }
+    return getBarComKeyList(extraList);
+  }, [extraList, reset]);
+
+  return list;
+};

package/src/components/Submit/index.tsx

@@ -1,45 +1,32 @@
-import { Button, Row, Space } from "antd";
+import { Row, Space } from "antd";
 import React from "react";
-import { useFormContext } from "../Form/Context";
 import type { ButtonProps, FormInstance } from "antd/es";
+import { useBarSortList } from "./hooks";
+import { ControlFooter } from "./components";
+
+export type SubmitBarExtraType = "submit" | "reset" | React.ReactDOM;
 
 export interface ISubmitProps extends Omit<ButtonProps, "form"> {
   text?: string;
   form: FormInstance;
   reset?: boolean;
   position?: "start" | "end";
+  extraList?: SubmitBarExtraType[];
 }
 export default ({
-  text = "提交",
-  type = "primary",
-  form,
-  loading,
   position = "start",
   reset,
+  extraList,
   ...props
 }: ISubmitProps) => {
-  const { loading: formSubLoading = loading } = useFormContext();
+  const barList = useBarSortList({ reset, extraList });
+
   return (
     <Row justify={position} style={{ width: "100%" }}>
       <Space>
-        {reset && (
-          <Button
-            {...props}
-            onClick={() => {
-              form.resetFields();
-            }}
-          >
-            重置
-          </Button>
-        )}
-        <Button
-          {...props}
-          type={type}
-          onClick={form.submit}
-          loading={formSubLoading}
-        >
-          {text}
-        </Button>
+        {barList?.map(({ action, key }) => {
+          return <ControlFooter {...props} key={key} action={action} />;
+        })}
       </Space>
     </Row>
   );

package/src/pages/DrawerForm/index.tsx

@@ -107,19 +107,19 @@ const data = [
     },
   },
 ];
+let num=0
 export default () => {
   const modalForm = useHDialogForm();
   return (
     <>
       <Button
         onClick={() => {
+          num++
           modalForm.show({
             initialValues: {
               check1: 1,
-              testStart: "1694747960",
-              testEnd: "1693538359",
               op: 1,
-              opInput: "12121",
+              opInput:num,
             },
           });
         }}

package/src/pages/Form/index.tsx

@@ -1,5 +1,6 @@
 import { HForm, HFormConfigProvider, useHForm } from "../../components";
 import { useState } from "react";
+import { Button } from "antd";
 
 const formData = (options) => {
   const op = [
@@ -189,8 +190,57 @@ const formData = (options) => {
     {
       type: "submit",
     },
+    {
+      type: "submit",
+      itemProps: {
+        extraList: [
+          <Button
+            key="wh"
+            onClick={() => {
+              console.log("起飞");
+            }}
+          >
+            芜湖
+          </Button>,
+          "666",
+          "reset",
+        ],
+      },
+    },
+    {
+      type: "submit",
+      itemProps: {
+        extraList: [
+          <Button
+            key="wh"
+            onClick={() => {
+              console.log("起飞");
+            }}
+          >
+            芜湖
+          </Button>,
+          <Ttta key="aa" />,
+          "666",
+          "submit",
+          "reset",
+        ],
+      },
+    },
   ];
 };
+function Ttta({ form }) {
+  return (
+    <div
+      onClick={() => {
+        console.log("form", form);
+        form.setFieldsValue({ switch: 1 });
+      }}
+    >
+      ttta
+    </div>
+  );
+}
+
 const Test = (props) => {
   return <div>ffff</div>;
 };

package/src/pages/ModalForm/index.tsx

@@ -165,7 +165,6 @@ export default () => {
       <HFormConfigProvider
         uploadProps={{
           request: () => {
-            console.log("request,request,request,request");
             return Promise.resolve({
               url: "https://gw.alicdn.com/imgextra/i2/O1CN01MYuwJQ1GXVBWryCFJ_!!6000000000632-2-tps-1125-570.png_468x468q75.jpg_.webp",
             });
@@ -175,7 +174,6 @@ export default () => {
         <HModalForm
           configData={data}
           labelWidth={88}
-          autoClear={false}
           contentRender={(node, form) => {
             return (
               <div>
@@ -184,9 +182,6 @@ export default () => {
               </div>
             );
           }}
-          request={(val, params) => {
-            console.log(val, params);
-          }}
           dialogForm={modalForm}
           title="测试"
         />