wargerm 0.2.11 → 0.2.15

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

@@ -51,6 +51,7 @@ export interface WFormProps extends FormProps {
     disabled?: boolean;
     disabledHideInSearch?: boolean;
     onSubmit?: (params: Record<string, any>) => void;
+    onFormChange?: (changedValues: Record<string, any>, allValues: Record<string, any>, form: any) => void;
     onReset?: () => void;
     formRef?: MutableRefObject<FormInstance>;
     search?: Isearch | false;

package/dist/index.esm.js

@@ -7532,7 +7532,7 @@ Table.defaultProps = {
   rowKey: 'key'
 };
 
-var _excluded$5 = ["columns", "extraColumns", "className", "style", "search", "disabled", "disabledHideInSearch", "onSubmit", "onReset"];
+var _excluded$5 = ["columns", "extraColumns", "className", "style", "search", "disabled", "disabledHideInSearch", "onFormChange", "onSubmit", "onReset"];
 var RangePicker$2 = Index$2.RangePicker;
 
 var WForm = function WForm(props, ref) {
@@ -7543,13 +7543,15 @@ var WForm = function WForm(props, ref) {
       search = props.search,
       disabled = props.disabled,
       disabledHideInSearch = props.disabledHideInSearch,
+      onFormChange = props.onFormChange,
       onSubmit = props.onSubmit,
       onReset = props.onReset,
       extraProps = _objectWithoutProperties(props, _excluded$5);
 
   var _Form$useForm = _Form.useForm(),
       _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
-      form = _Form$useForm2[0];
+      form = _Form$useForm2[0]; // const columnsFieldsRef = useRef<any>({});
+
 
   var _useState = useState({}),
       _useState2 = _slicedToArray(_useState, 2),
@@ -7622,6 +7624,9 @@ var WForm = function WForm(props, ref) {
           placeholder: "\u8BF7\u9009\u62E9",
           disabled: disabled,
           onLoad: function onLoad(opt) {
+            // if (columnsFieldsRef.current) {
+            //   columnsFieldsRef.current[c.dataIndex] = opt;
+            // }
             setColumnsFields(function (preColumnsFields) {
               return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, opt));
             });
@@ -7759,7 +7764,10 @@ var WForm = function WForm(props, ref) {
 
         if (c.options) {
           options = c.options;
-        }
+        } // if (columnsFieldsRef.current) {
+        //   columnsFieldsRef.current[c.dataIndex] = options;
+        // }
+
 
         setColumnsFields(function (preColumnsFields) {
           return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, options));
@@ -7805,7 +7813,10 @@ var WForm = function WForm(props, ref) {
               value: _key
             });
           }
-        }
+        } // if (columnsFieldsRef.current) {
+        //   columnsFieldsRef.current[c.dataIndex] = options;
+        // }
+
 
         setColumnsFields(function (preColumnsFields) {
           return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, _options));
@@ -7865,7 +7876,10 @@ var WForm = function WForm(props, ref) {
           _labelCol6.style = {
             width: search.labelWidth
           };
-        }
+        } // if (columnsFieldsRef.current) {
+        //   columnsFieldsRef.current[c.dataIndex] = options;
+        // }
+
 
         setColumnsFields(function (preColumnsFields) {
           return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, _options2));
@@ -7925,7 +7939,8 @@ var WForm = function WForm(props, ref) {
         var baseitem = c.renderFormItem(c, _objectSpread2(_objectSpread2({}, c), {}, {
           formItemProps: c.formItemProps,
           fieldProps: c.fieldProps,
-          columnsFields: columnsFields
+          columnsFields: columnsFields // columnsFieldsRef,
+
         }), form);
         return baseitem ? /*#__PURE__*/React.createElement(_Col, _objectSpread2(_objectSpread2({
           style: {
@@ -8022,7 +8037,7 @@ var WForm = function WForm(props, ref) {
         }, c.fieldProps))));
       }
     });
-  }, [changedValues, columns, disabled, JSON.stringify(form.getFieldsValue())]);
+  }, [changedValues, columns, disabled, JSON.stringify(columnsFields), JSON.stringify(form.getFieldsValue())]);
   var filterExtraColumnsForm = useMemo(function () {
     return filterExtraFormColumns.map(function (c) {
       var colProps = {};
@@ -8072,6 +8087,9 @@ var WForm = function WForm(props, ref) {
           placeholder: "\u8BF7\u9009\u62E9",
           disabled: disabled,
           onLoad: function onLoad(opt) {
+            // if (columnsFieldsRef.current) {
+            //   columnsFieldsRef.current[c.dataIndex] = opt;
+            // }
             setColumnsFields(function (preColumnsFields) {
               return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, opt));
             });
@@ -8209,7 +8227,10 @@ var WForm = function WForm(props, ref) {
 
         if (c.options) {
           options = c.options;
-        }
+        } // if (columnsFieldsRef.current) {
+        //   columnsFieldsRef.current[c.dataIndex] = options;
+        // }
+
 
         setColumnsFields(function (preColumnsFields) {
           return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, options));
@@ -8255,7 +8276,10 @@ var WForm = function WForm(props, ref) {
               value: _key3
             });
           }
-        }
+        } // if (columnsFieldsRef.current) {
+        //   columnsFieldsRef.current[c.dataIndex] = options;
+        // }
+
 
         setColumnsFields(function (preColumnsFields) {
           return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, _options3));
@@ -8315,7 +8339,10 @@ var WForm = function WForm(props, ref) {
           _labelCol17.style = {
             width: search.labelWidth
           };
-        }
+        } // if (columnsFieldsRef.current) {
+        //   columnsFieldsRef.current[c.dataIndex] = options;
+        // }
+
 
         setColumnsFields(function (preColumnsFields) {
           return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, _options4));
@@ -8375,7 +8402,8 @@ var WForm = function WForm(props, ref) {
         var baseitem = c.renderFormItem(c, _objectSpread2(_objectSpread2({}, c), {}, {
           formItemProps: c.formItemProps,
           fieldProps: c.fieldProps,
-          columnsFields: columnsFields
+          columnsFields: columnsFields // columnsFieldsRef,
+
         }), form);
         return baseitem ? /*#__PURE__*/React.createElement(_Col, _objectSpread2(_objectSpread2({
           style: {
@@ -8472,14 +8500,19 @@ var WForm = function WForm(props, ref) {
         }, c.fieldProps))));
       }
     });
-  }, [changedValues, extraColumns, disabled, JSON.stringify(form.getFieldsValue())]);
+  }, [changedValues, extraColumns, disabled, JSON.stringify(columnsFields), JSON.stringify(form.getFieldsValue())]);
 
   var handleSearch = function handleSearch(v) {
     var searchForm = form.getFieldsValue();
     filterFormColumns.forEach(function (c) {
       if (c.search && c.search.transform) {
-        searchForm = _objectSpread2(_objectSpread2({}, searchForm), c.search.transform(searchForm[c.dataIndex]));
-        delete searchForm[c.dataIndex];
+        var transformObj = c.search.transform(searchForm[c.dataIndex]);
+        searchForm = _objectSpread2(_objectSpread2({}, searchForm), transformObj);
+
+        if (!transformObj[c.dataIndex]) {
+          delete searchForm[c.dataIndex];
+        }
+
         return false;
       }
 
@@ -8541,6 +8574,7 @@ var WForm = function WForm(props, ref) {
     },
     onFinish: handleSearch,
     onValuesChange: function onValuesChange(changedValues, allValues) {
+      onFormChange && onFormChange(changedValues, allValues, form);
       setchangedValues(changedValues);
     },
     form: form
@@ -9872,7 +9906,7 @@ Modal.hidden = function () {
   ModalContainer[modelSysbol] && ModalContainer[modelSysbol].hidden();
 };
 
-var _excluded$d = ["columns", "extraColumns", "search", "visible", "setVisible", "disabled", "submitMethod", "onSubmitSuccess", "title", "record"];
+var _excluded$d = ["columns", "extraColumns", "search", "visible", "setVisible", "disabled", "submitMethod", "onSubmitSuccess", "title", "record", "onFormChange"];
 
 var ModalForm = function ModalForm(props, ref) {
   var columns = props.columns,
@@ -9885,6 +9919,7 @@ var ModalForm = function ModalForm(props, ref) {
       onSubmitSuccess = props.onSubmitSuccess,
       title = props.title,
       record = props.record,
+      onFormChange = props.onFormChange,
       extraProps = _objectWithoutProperties(props, _excluded$d);
 
   var formRef = useRef(null);
@@ -10006,6 +10041,7 @@ var ModalForm = function ModalForm(props, ref) {
     ref: formRef,
     disabled: disabled,
     onSubmit: onSubmit,
+    onFormChange: onFormChange,
     disabledHideInSearch: true,
     search: search,
     columns: columns,
@@ -10015,16 +10051,18 @@ var ModalForm = function ModalForm(props, ref) {
 
 var ModalForm$1 = /*#__PURE__*/React.forwardRef(ModalForm);
 
-var _excluded$e = ["columns", "request", "modalFormSearch", "tableAction", "renderTableBar", "className", "style", "modalConfig", "optionColumnConfig"];
+var _excluded$e = ["columns", "extraColumns", "request", "modalFormSearch", "tableAction", "renderTableBar", "className", "style", "onFormChange", "modalConfig", "optionColumnConfig"];
 
 var TabelCard = function TabelCard(props, ref) {
   var columns = props.columns,
+      extraColumns = props.extraColumns,
       request = props.request,
       modalFormSearch = props.modalFormSearch,
       tableAction = props.tableAction,
       renderTableBar = props.renderTableBar,
       className = props.className,
       style = props.style,
+      onFormChange = props.onFormChange,
       modalConfig = props.modalConfig,
       optionColumnConfig = props.optionColumnConfig,
       extraProps = _objectWithoutProperties(props, _excluded$e);
@@ -10314,6 +10352,8 @@ var TabelCard = function TabelCard(props, ref) {
     }(),
     search: modalFormSearch
   }, modalConfig), {}, {
+    onFormChange: onFormChange,
+    extraColumns: extraColumns || [],
     columns: (columns || []).filter(function (item) {
       return !item.hiddenInModalForm;
     })

package/dist/index.js

@@ -7565,7 +7565,7 @@ Table.defaultProps = {
   rowKey: 'key'
 };
 
-var _excluded$5 = ["columns", "extraColumns", "className", "style", "search", "disabled", "disabledHideInSearch", "onSubmit", "onReset"];
+var _excluded$5 = ["columns", "extraColumns", "className", "style", "search", "disabled", "disabledHideInSearch", "onFormChange", "onSubmit", "onReset"];
 var RangePicker$2 = Index$2.RangePicker;
 
 var WForm = function WForm(props, ref) {
@@ -7576,13 +7576,15 @@ var WForm = function WForm(props, ref) {
       search = props.search,
       disabled = props.disabled,
       disabledHideInSearch = props.disabledHideInSearch,
+      onFormChange = props.onFormChange,
       onSubmit = props.onSubmit,
       onReset = props.onReset,
       extraProps = _objectWithoutProperties(props, _excluded$5);
 
   var _Form$useForm = _Form__default['default'].useForm(),
       _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
-      form = _Form$useForm2[0];
+      form = _Form$useForm2[0]; // const columnsFieldsRef = useRef<any>({});
+
 
   var _useState = React.useState({}),
       _useState2 = _slicedToArray(_useState, 2),
@@ -7655,6 +7657,9 @@ var WForm = function WForm(props, ref) {
           placeholder: "\u8BF7\u9009\u62E9",
           disabled: disabled,
           onLoad: function onLoad(opt) {
+            // if (columnsFieldsRef.current) {
+            //   columnsFieldsRef.current[c.dataIndex] = opt;
+            // }
             setColumnsFields(function (preColumnsFields) {
               return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, opt));
             });
@@ -7792,7 +7797,10 @@ var WForm = function WForm(props, ref) {
 
         if (c.options) {
           options = c.options;
-        }
+        } // if (columnsFieldsRef.current) {
+        //   columnsFieldsRef.current[c.dataIndex] = options;
+        // }
+
 
         setColumnsFields(function (preColumnsFields) {
           return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, options));
@@ -7838,7 +7846,10 @@ var WForm = function WForm(props, ref) {
               value: _key
             });
           }
-        }
+        } // if (columnsFieldsRef.current) {
+        //   columnsFieldsRef.current[c.dataIndex] = options;
+        // }
+
 
         setColumnsFields(function (preColumnsFields) {
           return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, _options));
@@ -7898,7 +7909,10 @@ var WForm = function WForm(props, ref) {
           _labelCol6.style = {
             width: search.labelWidth
           };
-        }
+        } // if (columnsFieldsRef.current) {
+        //   columnsFieldsRef.current[c.dataIndex] = options;
+        // }
+
 
         setColumnsFields(function (preColumnsFields) {
           return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, _options2));
@@ -7958,7 +7972,8 @@ var WForm = function WForm(props, ref) {
         var baseitem = c.renderFormItem(c, _objectSpread2(_objectSpread2({}, c), {}, {
           formItemProps: c.formItemProps,
           fieldProps: c.fieldProps,
-          columnsFields: columnsFields
+          columnsFields: columnsFields // columnsFieldsRef,
+
         }), form);
         return baseitem ? /*#__PURE__*/React__default['default'].createElement(_Col__default['default'], _objectSpread2(_objectSpread2({
           style: {
@@ -8055,7 +8070,7 @@ var WForm = function WForm(props, ref) {
         }, c.fieldProps))));
       }
     });
-  }, [changedValues, columns, disabled, JSON.stringify(form.getFieldsValue())]);
+  }, [changedValues, columns, disabled, JSON.stringify(columnsFields), JSON.stringify(form.getFieldsValue())]);
   var filterExtraColumnsForm = React.useMemo(function () {
     return filterExtraFormColumns.map(function (c) {
       var colProps = {};
@@ -8105,6 +8120,9 @@ var WForm = function WForm(props, ref) {
           placeholder: "\u8BF7\u9009\u62E9",
           disabled: disabled,
           onLoad: function onLoad(opt) {
+            // if (columnsFieldsRef.current) {
+            //   columnsFieldsRef.current[c.dataIndex] = opt;
+            // }
             setColumnsFields(function (preColumnsFields) {
               return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, opt));
             });
@@ -8242,7 +8260,10 @@ var WForm = function WForm(props, ref) {
 
         if (c.options) {
           options = c.options;
-        }
+        } // if (columnsFieldsRef.current) {
+        //   columnsFieldsRef.current[c.dataIndex] = options;
+        // }
+
 
         setColumnsFields(function (preColumnsFields) {
           return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, options));
@@ -8288,7 +8309,10 @@ var WForm = function WForm(props, ref) {
               value: _key3
             });
           }
-        }
+        } // if (columnsFieldsRef.current) {
+        //   columnsFieldsRef.current[c.dataIndex] = options;
+        // }
+
 
         setColumnsFields(function (preColumnsFields) {
           return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, _options3));
@@ -8348,7 +8372,10 @@ var WForm = function WForm(props, ref) {
           _labelCol17.style = {
             width: search.labelWidth
           };
-        }
+        } // if (columnsFieldsRef.current) {
+        //   columnsFieldsRef.current[c.dataIndex] = options;
+        // }
+
 
         setColumnsFields(function (preColumnsFields) {
           return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, _options4));
@@ -8408,7 +8435,8 @@ var WForm = function WForm(props, ref) {
         var baseitem = c.renderFormItem(c, _objectSpread2(_objectSpread2({}, c), {}, {
           formItemProps: c.formItemProps,
           fieldProps: c.fieldProps,
-          columnsFields: columnsFields
+          columnsFields: columnsFields // columnsFieldsRef,
+
         }), form);
         return baseitem ? /*#__PURE__*/React__default['default'].createElement(_Col__default['default'], _objectSpread2(_objectSpread2({
           style: {
@@ -8505,14 +8533,19 @@ var WForm = function WForm(props, ref) {
         }, c.fieldProps))));
       }
     });
-  }, [changedValues, extraColumns, disabled, JSON.stringify(form.getFieldsValue())]);
+  }, [changedValues, extraColumns, disabled, JSON.stringify(columnsFields), JSON.stringify(form.getFieldsValue())]);
 
   var handleSearch = function handleSearch(v) {
     var searchForm = form.getFieldsValue();
     filterFormColumns.forEach(function (c) {
       if (c.search && c.search.transform) {
-        searchForm = _objectSpread2(_objectSpread2({}, searchForm), c.search.transform(searchForm[c.dataIndex]));
-        delete searchForm[c.dataIndex];
+        var transformObj = c.search.transform(searchForm[c.dataIndex]);
+        searchForm = _objectSpread2(_objectSpread2({}, searchForm), transformObj);
+
+        if (!transformObj[c.dataIndex]) {
+          delete searchForm[c.dataIndex];
+        }
+
         return false;
       }
 
@@ -8574,6 +8607,7 @@ var WForm = function WForm(props, ref) {
     },
     onFinish: handleSearch,
     onValuesChange: function onValuesChange(changedValues, allValues) {
+      onFormChange && onFormChange(changedValues, allValues, form);
       setchangedValues(changedValues);
     },
     form: form
@@ -9905,7 +9939,7 @@ Modal.hidden = function () {
   ModalContainer[modelSysbol] && ModalContainer[modelSysbol].hidden();
 };
 
-var _excluded$d = ["columns", "extraColumns", "search", "visible", "setVisible", "disabled", "submitMethod", "onSubmitSuccess", "title", "record"];
+var _excluded$d = ["columns", "extraColumns", "search", "visible", "setVisible", "disabled", "submitMethod", "onSubmitSuccess", "title", "record", "onFormChange"];
 
 var ModalForm = function ModalForm(props, ref) {
   var columns = props.columns,
@@ -9918,6 +9952,7 @@ var ModalForm = function ModalForm(props, ref) {
       onSubmitSuccess = props.onSubmitSuccess,
       title = props.title,
       record = props.record,
+      onFormChange = props.onFormChange,
       extraProps = _objectWithoutProperties(props, _excluded$d);
 
   var formRef = React.useRef(null);
@@ -10039,6 +10074,7 @@ var ModalForm = function ModalForm(props, ref) {
     ref: formRef,
     disabled: disabled,
     onSubmit: onSubmit,
+    onFormChange: onFormChange,
     disabledHideInSearch: true,
     search: search,
     columns: columns,
@@ -10048,16 +10084,18 @@ var ModalForm = function ModalForm(props, ref) {
 
 var ModalForm$1 = /*#__PURE__*/React__default['default'].forwardRef(ModalForm);
 
-var _excluded$e = ["columns", "request", "modalFormSearch", "tableAction", "renderTableBar", "className", "style", "modalConfig", "optionColumnConfig"];
+var _excluded$e = ["columns", "extraColumns", "request", "modalFormSearch", "tableAction", "renderTableBar", "className", "style", "onFormChange", "modalConfig", "optionColumnConfig"];
 
 var TabelCard = function TabelCard(props, ref) {
   var columns = props.columns,
+      extraColumns = props.extraColumns,
       request = props.request,
       modalFormSearch = props.modalFormSearch,
       tableAction = props.tableAction,
       renderTableBar = props.renderTableBar,
       className = props.className,
       style = props.style,
+      onFormChange = props.onFormChange,
       modalConfig = props.modalConfig,
       optionColumnConfig = props.optionColumnConfig,
       extraProps = _objectWithoutProperties(props, _excluded$e);
@@ -10347,6 +10385,8 @@ var TabelCard = function TabelCard(props, ref) {
     }(),
     search: modalFormSearch
   }, modalConfig), {}, {
+    onFormChange: onFormChange,
+    extraColumns: extraColumns || [],
     columns: (columns || []).filter(function (item) {
       return !item.hiddenInModalForm;
     })

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "wargerm",
-  "version": "0.2.11",
+  "version": "0.2.15",
   "scripts": {
     "dev": "dumi dev",
     "docs:build": "dumi build",