wargerm 0.5.27 → 0.5.28

package/dist/components/WForm/example/demo1.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="react" />
+declare const _default: () => JSX.Element;
+export default _default;

package/dist/components/WForm/example/demo2.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="react" />
+declare const _default: () => JSX.Element;
+export default _default;

package/dist/components/WForm/example/demo3.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="react" />
+declare const _default: () => JSX.Element;
+export default _default;

package/dist/components/WForm/index.d.ts

@@ -54,6 +54,7 @@ export interface WFormProps extends FormProps {
     columns: ColumnProps[];
     extraColumns?: ColumnProps[];
     disabled?: boolean;
+    deps?: any;
     disabledHideInSearch?: boolean;
     setForm?: (form: any) => void;
     onSubmit?: (params: Record<string, any>) => void;

package/dist/index.esm.js

@@ -7192,7 +7192,7 @@ var WCascader = function WCascader(props) {
   }, extraProps));
 };
 
-var _excluded$7 = ["columns", "extraColumns", "className", "style", "search", "disabled", "disabledHideInSearch", "disabledRuler", "onFormChange", "onSubmit", "onReset", "setForm"];
+var _excluded$7 = ["columns", "extraColumns", "className", "style", "search", "disabled", "disabledHideInSearch", "disabledRuler", "onFormChange", "onSubmit", "onReset", "setForm", "deps"];
 var RangePicker$2 = Index$6.RangePicker;
 
 var WForm = function WForm(props, ref) {
@@ -7208,6 +7208,7 @@ var WForm = function WForm(props, ref) {
       onSubmit = props.onSubmit,
       onReset = props.onReset,
       setForm = props.setForm,
+      deps = props.deps,
       extraProps = _objectWithoutProperties(props, _excluded$7);
 
   var _Form$useForm = _Form.useForm(),
@@ -7746,8 +7747,8 @@ var WForm = function WForm(props, ref) {
         return renderItemForm(c);
       }
     });
-  }, [changedValues, columns, disabled, JSON.stringify(columnsFields), JSON.stringify(form.getFieldsValue()) // 依赖值改变，需要重新渲染
-  ]);
+  }, [changedValues, columns, disabled].concat(_toConsumableArray(deps ? [deps] : []), [JSON.stringify(columnsFields), JSON.stringify(form.getFieldsValue()) // 依赖值改变，需要重新渲染
+  ]));
   var filterExtraColumnsForm = useMemo(function () {
     return filterExtraFormColumns.map(function (c) {
       if (c.type == 'group') {
@@ -7758,7 +7759,7 @@ var WForm = function WForm(props, ref) {
         return renderItemForm(c);
       }
     });
-  }, [changedValues, extraColumns, disabled, JSON.stringify(columnsFields), JSON.stringify(form.getFieldsValue())]);
+  }, [changedValues, extraColumns, disabled].concat(_toConsumableArray(deps ? [deps] : []), [JSON.stringify(columnsFields), JSON.stringify(form.getFieldsValue())]));
 
   var handleSearch = function handleSearch(v) {
     var searchForm = form.getFieldsValue();
@@ -10499,7 +10500,7 @@ function DragBox(_ref) {
   }, children)) : /*#__PURE__*/React.createElement(React.Fragment, null);
 }
 
-var _excluded$h = ["columns", "extraColumns", "search", "visible", "setVisible", "modalFormOpend", "disabled", "submitMethod", "onSubmitSuccess", "title", "record", "onFormChange", "formItemChild", "onCancel"];
+var _excluded$h = ["columns", "extraColumns", "search", "visible", "setVisible", "modalFormOpend", "disabled", "submitMethod", "onSubmitSuccess", "title", "record", "onFormChange", "formItemChild", "onCancel", "modalHeaderSolt", "modalFooterSolt", "formProps"];
 
 var ModalForm = function ModalForm(props, ref) {
   var columns = props.columns,
@@ -10516,6 +10517,9 @@ var ModalForm = function ModalForm(props, ref) {
       onFormChange = props.onFormChange,
       formItemChild = props.formItemChild,
       onCancel = props.onCancel,
+      modalHeaderSolt = props.modalHeaderSolt,
+      modalFooterSolt = props.modalFooterSolt,
+      formProps = props.formProps,
       extraProps = _objectWithoutProperties(props, _excluded$h);
 
   var formRef = useRef(null);
@@ -10646,7 +10650,7 @@ var ModalForm = function ModalForm(props, ref) {
     onOk: handleOk,
     confirmLoading: confirmLoading,
     onCancel: handleCancel
-  }, extraProps), /*#__PURE__*/React.createElement(WForm$1, {
+  }, extraProps), modalHeaderSolt, /*#__PURE__*/React.createElement(WForm$1, _objectSpread2({
     ref: formRef,
     disabled: disabled,
     onSubmit: onSubmit,
@@ -10656,12 +10660,12 @@ var ModalForm = function ModalForm(props, ref) {
     search: search,
     columns: columns,
     extraColumns: extraColumns
-  }), title == '查看' && formItemChild ? formItemChild() : null);
+  }, formProps || {})), title == '查看' && formItemChild ? formItemChild() : null, modalFooterSolt);
 };
 
 var ModalForm$1 = /*#__PURE__*/React.forwardRef(ModalForm);
 
-var _excluded$i = ["columns", "extraColumns", "request", "modalFormSearch", "search", "tableAction", "fliterAction", "renderTableBar", "className", "style", "onFormChange", "modalConfig", "optionColumnConfig", "pagination", "noBordered"];
+var _excluded$i = ["columns", "extraColumns", "request", "modalFormSearch", "search", "tableAction", "fliterAction", "renderTableBar", "className", "style", "onFormChange", "modalConfig", "searchFormConfig", "optionColumnConfig", "pagination", "noBordered"];
 
 var TabelCard = function TabelCard(props, ref) {
   var columns = props.columns,
@@ -10676,6 +10680,7 @@ var TabelCard = function TabelCard(props, ref) {
       style = props.style,
       onFormChange = props.onFormChange,
       modalConfig = props.modalConfig,
+      searchFormConfig = props.searchFormConfig,
       optionColumnConfig = props.optionColumnConfig,
       pagination = props.pagination,
       noBordered = props.noBordered,
@@ -11122,7 +11127,7 @@ var TabelCard = function TabelCard(props, ref) {
 
       return true;
     })
-  })), /*#__PURE__*/React.createElement(WForm$1, {
+  })), /*#__PURE__*/React.createElement(WForm$1, _objectSpread2({
     ref: searchFormRef,
     disabledRuler: true,
     search: search == false ? {
@@ -11146,7 +11151,7 @@ var TabelCard = function TabelCard(props, ref) {
         return [].concat(_toConsumableArray(pre), [column]);
       }
     }, [])
-  }), /*#__PURE__*/React.createElement(ProTable, _objectSpread2(_objectSpread2({
+  }, searchFormConfig || {})), /*#__PURE__*/React.createElement(ProTable, _objectSpread2(_objectSpread2({
     actionRef: actionRef,
     rowKey: "id",
     bordered: !noBordered,

package/dist/index.js

@@ -7253,7 +7253,7 @@ var WCascader = function WCascader(props) {
   }, extraProps));
 };
 
-var _excluded$7 = ["columns", "extraColumns", "className", "style", "search", "disabled", "disabledHideInSearch", "disabledRuler", "onFormChange", "onSubmit", "onReset", "setForm"];
+var _excluded$7 = ["columns", "extraColumns", "className", "style", "search", "disabled", "disabledHideInSearch", "disabledRuler", "onFormChange", "onSubmit", "onReset", "setForm", "deps"];
 var RangePicker$2 = Index$6.RangePicker;
 
 var WForm = function WForm(props, ref) {
@@ -7269,6 +7269,7 @@ var WForm = function WForm(props, ref) {
       onSubmit = props.onSubmit,
       onReset = props.onReset,
       setForm = props.setForm,
+      deps = props.deps,
       extraProps = _objectWithoutProperties(props, _excluded$7);
 
   var _Form$useForm = _Form__default['default'].useForm(),
@@ -7807,8 +7808,8 @@ var WForm = function WForm(props, ref) {
         return renderItemForm(c);
       }
     });
-  }, [changedValues, columns, disabled, JSON.stringify(columnsFields), JSON.stringify(form.getFieldsValue()) // 依赖值改变，需要重新渲染
-  ]);
+  }, [changedValues, columns, disabled].concat(_toConsumableArray(deps ? [deps] : []), [JSON.stringify(columnsFields), JSON.stringify(form.getFieldsValue()) // 依赖值改变，需要重新渲染
+  ]));
   var filterExtraColumnsForm = React.useMemo(function () {
     return filterExtraFormColumns.map(function (c) {
       if (c.type == 'group') {
@@ -7819,7 +7820,7 @@ var WForm = function WForm(props, ref) {
         return renderItemForm(c);
       }
     });
-  }, [changedValues, extraColumns, disabled, JSON.stringify(columnsFields), JSON.stringify(form.getFieldsValue())]);
+  }, [changedValues, extraColumns, disabled].concat(_toConsumableArray(deps ? [deps] : []), [JSON.stringify(columnsFields), JSON.stringify(form.getFieldsValue())]));
 
   var handleSearch = function handleSearch(v) {
     var searchForm = form.getFieldsValue();
@@ -10560,7 +10561,7 @@ function DragBox(_ref) {
   }, children)) : /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null);
 }
 
-var _excluded$h = ["columns", "extraColumns", "search", "visible", "setVisible", "modalFormOpend", "disabled", "submitMethod", "onSubmitSuccess", "title", "record", "onFormChange", "formItemChild", "onCancel"];
+var _excluded$h = ["columns", "extraColumns", "search", "visible", "setVisible", "modalFormOpend", "disabled", "submitMethod", "onSubmitSuccess", "title", "record", "onFormChange", "formItemChild", "onCancel", "modalHeaderSolt", "modalFooterSolt", "formProps"];
 
 var ModalForm = function ModalForm(props, ref) {
   var columns = props.columns,
@@ -10577,6 +10578,9 @@ var ModalForm = function ModalForm(props, ref) {
       onFormChange = props.onFormChange,
       formItemChild = props.formItemChild,
       onCancel = props.onCancel,
+      modalHeaderSolt = props.modalHeaderSolt,
+      modalFooterSolt = props.modalFooterSolt,
+      formProps = props.formProps,
       extraProps = _objectWithoutProperties(props, _excluded$h);
 
   var formRef = React.useRef(null);
@@ -10707,7 +10711,7 @@ var ModalForm = function ModalForm(props, ref) {
     onOk: handleOk,
     confirmLoading: confirmLoading,
     onCancel: handleCancel
-  }, extraProps), /*#__PURE__*/React__default['default'].createElement(WForm$1, {
+  }, extraProps), modalHeaderSolt, /*#__PURE__*/React__default['default'].createElement(WForm$1, _objectSpread2({
     ref: formRef,
     disabled: disabled,
     onSubmit: onSubmit,
@@ -10717,12 +10721,12 @@ var ModalForm = function ModalForm(props, ref) {
     search: search,
     columns: columns,
     extraColumns: extraColumns
-  }), title == '查看' && formItemChild ? formItemChild() : null);
+  }, formProps || {})), title == '查看' && formItemChild ? formItemChild() : null, modalFooterSolt);
 };
 
 var ModalForm$1 = /*#__PURE__*/React__default['default'].forwardRef(ModalForm);
 
-var _excluded$i = ["columns", "extraColumns", "request", "modalFormSearch", "search", "tableAction", "fliterAction", "renderTableBar", "className", "style", "onFormChange", "modalConfig", "optionColumnConfig", "pagination", "noBordered"];
+var _excluded$i = ["columns", "extraColumns", "request", "modalFormSearch", "search", "tableAction", "fliterAction", "renderTableBar", "className", "style", "onFormChange", "modalConfig", "searchFormConfig", "optionColumnConfig", "pagination", "noBordered"];
 
 var TabelCard = function TabelCard(props, ref) {
   var columns = props.columns,
@@ -10737,6 +10741,7 @@ var TabelCard = function TabelCard(props, ref) {
       style = props.style,
       onFormChange = props.onFormChange,
       modalConfig = props.modalConfig,
+      searchFormConfig = props.searchFormConfig,
       optionColumnConfig = props.optionColumnConfig,
       pagination = props.pagination,
       noBordered = props.noBordered,
@@ -11183,7 +11188,7 @@ var TabelCard = function TabelCard(props, ref) {
 
       return true;
     })
-  })), /*#__PURE__*/React__default['default'].createElement(WForm$1, {
+  })), /*#__PURE__*/React__default['default'].createElement(WForm$1, _objectSpread2({
     ref: searchFormRef,
     disabledRuler: true,
     search: search == false ? {
@@ -11207,7 +11212,7 @@ var TabelCard = function TabelCard(props, ref) {
         return [].concat(_toConsumableArray(pre), [column]);
       }
     }, [])
-  }), /*#__PURE__*/React__default['default'].createElement(ProTable__default['default'], _objectSpread2(_objectSpread2({
+  }, searchFormConfig || {})), /*#__PURE__*/React__default['default'].createElement(ProTable__default['default'], _objectSpread2(_objectSpread2({
     actionRef: actionRef,
     rowKey: "id",
     bordered: !noBordered,

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "wargerm",
-  "version": "0.5.27",
+  "version": "0.5.28",
   "scripts": {
     "dev": "dumi dev",
     "docs:build": "dumi build",
@@ -85,4 +85,4 @@
     "react": "^16.12.0",
     "yorkie": "^2.0.0"
   }
-}
+}