wargerm 0.2.12 → 0.2.13

package/dist/index.esm.js

@@ -4,7 +4,7 @@ import 'antd/es/dropdown/style';
 import _Dropdown from 'antd/es/dropdown';
 import 'antd/es/menu/style';
 import _Menu from 'antd/es/menu';
-import React, { useState, useEffect, useMemo, useImperativeHandle, useRef } from 'react';
+import React, { useState, useEffect, useMemo, useRef, useImperativeHandle } from 'react';
 import { createFromIconfontCN, SearchOutlined, ReloadOutlined, CloseCircleOutlined, PlusOutlined, EditOutlined, EyeOutlined, ExclamationCircleOutlined, DeleteOutlined } from '@ant-design/icons';
 import 'antd/es/input/style';
 import _Input from 'antd/es/input';
@@ -7552,6 +7552,8 @@ var WForm = function WForm(props, ref) {
       _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
       form = _Form$useForm2[0];
 
+  var columnsFieldsRef = useRef({});
+
   var _useState = useState({}),
       _useState2 = _slicedToArray(_useState, 2),
       changedValues = _useState2[0],
@@ -7623,6 +7625,10 @@ 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));
             });
@@ -7762,6 +7768,10 @@ var WForm = function WForm(props, ref) {
           options = c.options;
         }
 
+        if (columnsFieldsRef.current) {
+          columnsFieldsRef.current[c.dataIndex] = options;
+        }
+
         setColumnsFields(function (preColumnsFields) {
           return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, options));
         });
@@ -7808,6 +7818,10 @@ var WForm = function WForm(props, ref) {
           }
         }
 
+        if (columnsFieldsRef.current) {
+          columnsFieldsRef.current[c.dataIndex] = _options;
+        }
+
         setColumnsFields(function (preColumnsFields) {
           return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, _options));
         });
@@ -7868,6 +7882,10 @@ var WForm = function WForm(props, ref) {
           };
         }
 
+        if (columnsFieldsRef.current) {
+          columnsFieldsRef.current[c.dataIndex] = _options2;
+        }
+
         setColumnsFields(function (preColumnsFields) {
           return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, _options2));
         });
@@ -7926,7 +7944,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: columnsFieldsRef
         }), form);
         return baseitem ? /*#__PURE__*/React.createElement(_Col, _objectSpread2(_objectSpread2({
           style: {
@@ -8023,7 +8042,7 @@ var WForm = function WForm(props, ref) {
         }, c.fieldProps))));
       }
     });
-  }, [changedValues, columns, disabled, JSON.stringify(form.getFieldsValue())]);
+  }, [changedValues, columns, disabled, columnsFieldsRef, JSON.stringify(form.getFieldsValue())]);
   var filterExtraColumnsForm = useMemo(function () {
     return filterExtraFormColumns.map(function (c) {
       var colProps = {};
@@ -8073,6 +8092,10 @@ 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));
             });
@@ -8212,6 +8235,10 @@ var WForm = function WForm(props, ref) {
           options = c.options;
         }
 
+        if (columnsFieldsRef.current) {
+          columnsFieldsRef.current[c.dataIndex] = options;
+        }
+
         setColumnsFields(function (preColumnsFields) {
           return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, options));
         });
@@ -8258,6 +8285,10 @@ var WForm = function WForm(props, ref) {
           }
         }
 
+        if (columnsFieldsRef.current) {
+          columnsFieldsRef.current[c.dataIndex] = _options3;
+        }
+
         setColumnsFields(function (preColumnsFields) {
           return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, _options3));
         });
@@ -8318,6 +8349,10 @@ var WForm = function WForm(props, ref) {
           };
         }
 
+        if (columnsFieldsRef.current) {
+          columnsFieldsRef.current[c.dataIndex] = _options4;
+        }
+
         setColumnsFields(function (preColumnsFields) {
           return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, _options4));
         });
@@ -8376,7 +8411,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: columnsFieldsRef
         }), form);
         return baseitem ? /*#__PURE__*/React.createElement(_Col, _objectSpread2(_objectSpread2({
           style: {
@@ -8473,7 +8509,7 @@ var WForm = function WForm(props, ref) {
         }, c.fieldProps))));
       }
     });
-  }, [changedValues, extraColumns, disabled, JSON.stringify(form.getFieldsValue())]);
+  }, [changedValues, extraColumns, disabled, columnsFieldsRef, JSON.stringify(form.getFieldsValue())]);
 
   var handleSearch = function handleSearch(v) {
     var searchForm = form.getFieldsValue();

package/dist/index.js

@@ -7585,6 +7585,8 @@ var WForm = function WForm(props, ref) {
       _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
       form = _Form$useForm2[0];
 
+  var columnsFieldsRef = React.useRef({});
+
   var _useState = React.useState({}),
       _useState2 = _slicedToArray(_useState, 2),
       changedValues = _useState2[0],
@@ -7656,6 +7658,10 @@ 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));
             });
@@ -7795,6 +7801,10 @@ var WForm = function WForm(props, ref) {
           options = c.options;
         }
 
+        if (columnsFieldsRef.current) {
+          columnsFieldsRef.current[c.dataIndex] = options;
+        }
+
         setColumnsFields(function (preColumnsFields) {
           return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, options));
         });
@@ -7841,6 +7851,10 @@ var WForm = function WForm(props, ref) {
           }
         }
 
+        if (columnsFieldsRef.current) {
+          columnsFieldsRef.current[c.dataIndex] = _options;
+        }
+
         setColumnsFields(function (preColumnsFields) {
           return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, _options));
         });
@@ -7901,6 +7915,10 @@ var WForm = function WForm(props, ref) {
           };
         }
 
+        if (columnsFieldsRef.current) {
+          columnsFieldsRef.current[c.dataIndex] = _options2;
+        }
+
         setColumnsFields(function (preColumnsFields) {
           return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, _options2));
         });
@@ -7959,7 +7977,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: columnsFieldsRef
         }), form);
         return baseitem ? /*#__PURE__*/React__default['default'].createElement(_Col__default['default'], _objectSpread2(_objectSpread2({
           style: {
@@ -8056,7 +8075,7 @@ var WForm = function WForm(props, ref) {
         }, c.fieldProps))));
       }
     });
-  }, [changedValues, columns, disabled, JSON.stringify(form.getFieldsValue())]);
+  }, [changedValues, columns, disabled, columnsFieldsRef, JSON.stringify(form.getFieldsValue())]);
   var filterExtraColumnsForm = React.useMemo(function () {
     return filterExtraFormColumns.map(function (c) {
       var colProps = {};
@@ -8106,6 +8125,10 @@ 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));
             });
@@ -8245,6 +8268,10 @@ var WForm = function WForm(props, ref) {
           options = c.options;
         }
 
+        if (columnsFieldsRef.current) {
+          columnsFieldsRef.current[c.dataIndex] = options;
+        }
+
         setColumnsFields(function (preColumnsFields) {
           return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, options));
         });
@@ -8291,6 +8318,10 @@ var WForm = function WForm(props, ref) {
           }
         }
 
+        if (columnsFieldsRef.current) {
+          columnsFieldsRef.current[c.dataIndex] = _options3;
+        }
+
         setColumnsFields(function (preColumnsFields) {
           return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, _options3));
         });
@@ -8351,6 +8382,10 @@ var WForm = function WForm(props, ref) {
           };
         }
 
+        if (columnsFieldsRef.current) {
+          columnsFieldsRef.current[c.dataIndex] = _options4;
+        }
+
         setColumnsFields(function (preColumnsFields) {
           return _objectSpread2(_objectSpread2({}, preColumnsFields), {}, _defineProperty({}, c.dataIndex, _options4));
         });
@@ -8409,7 +8444,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: columnsFieldsRef
         }), form);
         return baseitem ? /*#__PURE__*/React__default['default'].createElement(_Col__default['default'], _objectSpread2(_objectSpread2({
           style: {
@@ -8506,7 +8542,7 @@ var WForm = function WForm(props, ref) {
         }, c.fieldProps))));
       }
     });
-  }, [changedValues, extraColumns, disabled, JSON.stringify(form.getFieldsValue())]);
+  }, [changedValues, extraColumns, disabled, columnsFieldsRef, JSON.stringify(form.getFieldsValue())]);
 
   var handleSearch = function handleSearch(v) {
     var searchForm = form.getFieldsValue();

package/package.json

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