wargerm 0.2.40 → 0.2.41

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

@@ -1,6 +1,6 @@
-import React, { MutableRefObject } from 'react';
+import React from 'react';
 import { ReactNode } from 'react';
-import { FormInstance, FormProps } from 'antd';
+import { FormProps } from 'antd';
 interface ColumnProps {
     title: string;
     dataIndex: string;
@@ -96,7 +96,7 @@ declare type Props = {
     rowSelection?: IRowSelection;
     scroll?: Iscroll;
     pagination?: false | Record<string, any>;
-    formRef?: MutableRefObject<FormInstance>;
+    formRef?: any;
     children?: ReactNode;
     form?: FormProps;
     search?: Isearch | false;

package/dist/index.esm.js

@@ -7809,6 +7809,7 @@ var WForm = function WForm(props, ref) {
   useImperativeHandle(ref, function () {
     return {
       form: form,
+      columnsFields: columnsFields,
       handleSubmit: form.submit,
       handleRest: handleRest,
       resetFields: handleRest,
@@ -7884,7 +7885,7 @@ var WForm$1 = /*#__PURE__*/React.forwardRef(WForm);
 
 var _excluded$7 = ["columns", "dataSource", "request", "onLoad", "params", "onSubmit", "rowKey", "onRow", "className", "rowClassName", "rowSelection", "style", "tbodyStyle", "thStyle", "border", "scroll", "pagination", "search", "frameBoxTable", "frameBoxDirection", "formRef"];
 function Table(_ref) {
-  var _classnames2;
+  var _formSearchRef$curren3, _classnames2;
 
   var columns = _ref.columns,
       tableList = _ref.dataSource,
@@ -7958,6 +7959,21 @@ function Table(_ref) {
       formSearch = _useState8[0],
       setFormSearch = _useState8[1];
 
+  var formSearchRef = useRef(null);
+  useEffect(function () {
+    var _formSearchRef$curren;
+
+    if (formSearchRef === null || formSearchRef === void 0 ? void 0 : (_formSearchRef$curren = formSearchRef.current) === null || _formSearchRef$curren === void 0 ? void 0 : _formSearchRef$curren.columnsFields) {
+      var _formSearchRef$curren2;
+
+      if (formRef === null || formRef === void 0 ? void 0 : formRef.current) {
+        formRef.current = formSearchRef === null || formSearchRef === void 0 ? void 0 : formSearchRef.current;
+      }
+
+      setColumnsFields(formSearchRef === null || formSearchRef === void 0 ? void 0 : (_formSearchRef$curren2 = formSearchRef.current) === null || _formSearchRef$curren2 === void 0 ? void 0 : _formSearchRef$curren2.columnsFields);
+    }
+  }, [JSON.stringify(formSearchRef === null || formSearchRef === void 0 ? void 0 : (_formSearchRef$curren3 = formSearchRef.current) === null || _formSearchRef$curren3 === void 0 ? void 0 : _formSearchRef$curren3.columnsFields)]);
+
   var flattenColumns = function flattenColumns(columns) {
     var arr = columns.reduce(function (pre, cur) {
       if (cur.children) {
@@ -8291,7 +8307,7 @@ function Table(_ref) {
   }, /*#__PURE__*/React.createElement("div", {
     className: "form"
   }, search !== false && /*#__PURE__*/React.createElement(WForm$1, {
-    ref: formRef,
+    ref: formSearchRef,
     search: _objectSpread2(_objectSpread2({
       labelWidth: 'auto',
       searchText: '查询',

package/dist/index.js

@@ -7843,6 +7843,7 @@ var WForm = function WForm(props, ref) {
   React.useImperativeHandle(ref, function () {
     return {
       form: form,
+      columnsFields: columnsFields,
       handleSubmit: form.submit,
       handleRest: handleRest,
       resetFields: handleRest,
@@ -7918,7 +7919,7 @@ var WForm$1 = /*#__PURE__*/React__default['default'].forwardRef(WForm);
 
 var _excluded$7 = ["columns", "dataSource", "request", "onLoad", "params", "onSubmit", "rowKey", "onRow", "className", "rowClassName", "rowSelection", "style", "tbodyStyle", "thStyle", "border", "scroll", "pagination", "search", "frameBoxTable", "frameBoxDirection", "formRef"];
 function Table(_ref) {
-  var _classnames2;
+  var _formSearchRef$curren3, _classnames2;
 
   var columns = _ref.columns,
       tableList = _ref.dataSource,
@@ -7992,6 +7993,21 @@ function Table(_ref) {
       formSearch = _useState8[0],
       setFormSearch = _useState8[1];
 
+  var formSearchRef = React.useRef(null);
+  React.useEffect(function () {
+    var _formSearchRef$curren;
+
+    if (formSearchRef === null || formSearchRef === void 0 ? void 0 : (_formSearchRef$curren = formSearchRef.current) === null || _formSearchRef$curren === void 0 ? void 0 : _formSearchRef$curren.columnsFields) {
+      var _formSearchRef$curren2;
+
+      if (formRef === null || formRef === void 0 ? void 0 : formRef.current) {
+        formRef.current = formSearchRef === null || formSearchRef === void 0 ? void 0 : formSearchRef.current;
+      }
+
+      setColumnsFields(formSearchRef === null || formSearchRef === void 0 ? void 0 : (_formSearchRef$curren2 = formSearchRef.current) === null || _formSearchRef$curren2 === void 0 ? void 0 : _formSearchRef$curren2.columnsFields);
+    }
+  }, [JSON.stringify(formSearchRef === null || formSearchRef === void 0 ? void 0 : (_formSearchRef$curren3 = formSearchRef.current) === null || _formSearchRef$curren3 === void 0 ? void 0 : _formSearchRef$curren3.columnsFields)]);
+
   var flattenColumns = function flattenColumns(columns) {
     var arr = columns.reduce(function (pre, cur) {
       if (cur.children) {
@@ -8325,7 +8341,7 @@ function Table(_ref) {
   }, /*#__PURE__*/React__default['default'].createElement("div", {
     className: "form"
   }, search !== false && /*#__PURE__*/React__default['default'].createElement(WForm$1, {
-    ref: formRef,
+    ref: formSearchRef,
     search: _objectSpread2(_objectSpread2({
       labelWidth: 'auto',
       searchText: '查询',

package/package.json

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