wargerm 0.6.18 → 0.6.20

package/dist/index.esm.js

@@ -464,11 +464,12 @@ var EventEmitter = /*#__PURE__*/_createClass(function EventEmitter() {
 
   this.subscriptions = new Map();
 
-  this.useSubscription = function (event, listener) {
+  this.useSubscription = function (event, listener, deps) {
     var callbackRef = useRef();
     useEffect(function () {
       callbackRef.current = listener;
-
+    }, [deps]);
+    useEffect(function () {
       function subscription(val) {
         if (callbackRef.current) {
           callbackRef.current(val);
@@ -4102,8 +4103,8 @@ var WForm = function WForm(props, ref) {
       setchangedValues(changedValues);
     },
     form: form
-  }, extraProps), /*#__PURE__*/React.createElement(_Row, null, filterForm, filterExtraColumnsForm, search && search.hideSubmit ? null : /*#__PURE__*/React.createElement(_Col, _objectSpread2({
-    className: "pl20 pr20"
+  }, extraProps), /*#__PURE__*/React.createElement(_Row, null, filterForm, filterExtraColumnsForm, search && search.hideSubmit ? null : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Col, _objectSpread2({
+    className: "pl20"
   }, search ? search === null || search === void 0 ? void 0 : search.searchButtonConfig : {}), /*#__PURE__*/React.createElement(_Form.Item, null, /*#__PURE__*/React.createElement("div", {
     style: {
       display: 'flex'
@@ -4147,7 +4148,11 @@ var WForm = function WForm(props, ref) {
     className: "mr20",
     icon: /*#__PURE__*/React.createElement(ReloadOutlined, null),
     onClick: handleRest
-  }, search && search.resetText ? search.resetText : '重置')) : null, search && (search === null || search === void 0 ? void 0 : search.tableBarDom))))));
+  }, search && search.resetText ? search.resetText : '重置')) : null))), search && (search === null || search === void 0 ? void 0 : search.tableBarDom) && (search === null || search === void 0 ? void 0 : search.tableBarDom.map(function (dom) {
+    return /*#__PURE__*/React.createElement(_Col, _objectSpread2({
+      className: "pr20"
+    }, search ? search === null || search === void 0 ? void 0 : search.searchButtonConfig : {}), /*#__PURE__*/React.createElement(_Form.Item, null, dom));
+  })))));
 };
 
 var WForm$1 = /*#__PURE__*/React.forwardRef(WForm);
@@ -6916,7 +6921,7 @@ var ModalForm = function ModalForm(props, ref) {
 
 var ModalForm$1 = /*#__PURE__*/React.forwardRef(ModalForm);
 
-var _excluded$l = ["columns", "extraColumns", "request", "modalFormSearch", "search", "tableAction", "fliterAction", "renderTableBar", "className", "style", "onFormChange", "modalConfig", "searchFormConfig", "optionColumnConfig", "pagination", "noBordered"];
+var _excluded$l = ["columns", "extraColumns", "request", "modalFormSearch", "search", "tableAction", "fliterAction", "renderTableBar", "renderTableBarDeps", "className", "style", "onFormChange", "modalConfig", "searchFormConfig", "optionColumnConfig", "pagination", "noBordered"];
 
 var TabelCard = function TabelCard(props, ref) {
   var columns = props.columns,
@@ -6927,6 +6932,7 @@ var TabelCard = function TabelCard(props, ref) {
       tableAction = props.tableAction,
       fliterAction = props.fliterAction,
       renderTableBar = props.renderTableBar,
+      renderTableBarDeps = props.renderTableBarDeps,
       className = props.className,
       style = props.style,
       onFormChange = props.onFormChange,
@@ -7346,7 +7352,7 @@ var TabelCard = function TabelCard(props, ref) {
         });
       }
     });
-  }, [actionRef]);
+  }, [actionRef, renderTableBarDeps]);
 
   var onSubmit = function onSubmit(values) {
     var _actionRef$current6;

package/dist/index.js

@@ -529,11 +529,12 @@ var EventEmitter = /*#__PURE__*/_createClass(function EventEmitter() {
 
   this.subscriptions = new Map();
 
-  this.useSubscription = function (event, listener) {
+  this.useSubscription = function (event, listener, deps) {
     var callbackRef = React.useRef();
     React.useEffect(function () {
       callbackRef.current = listener;
-
+    }, [deps]);
+    React.useEffect(function () {
       function subscription(val) {
         if (callbackRef.current) {
           callbackRef.current(val);
@@ -4167,8 +4168,8 @@ var WForm = function WForm(props, ref) {
       setchangedValues(changedValues);
     },
     form: form
-  }, extraProps), /*#__PURE__*/React__default['default'].createElement(_Row__default['default'], null, filterForm, filterExtraColumnsForm, search && search.hideSubmit ? null : /*#__PURE__*/React__default['default'].createElement(_Col__default['default'], _objectSpread2({
-    className: "pl20 pr20"
+  }, extraProps), /*#__PURE__*/React__default['default'].createElement(_Row__default['default'], null, filterForm, filterExtraColumnsForm, search && search.hideSubmit ? null : /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(_Col__default['default'], _objectSpread2({
+    className: "pl20"
   }, search ? search === null || search === void 0 ? void 0 : search.searchButtonConfig : {}), /*#__PURE__*/React__default['default'].createElement(_Form__default['default'].Item, null, /*#__PURE__*/React__default['default'].createElement("div", {
     style: {
       display: 'flex'
@@ -4212,7 +4213,11 @@ var WForm = function WForm(props, ref) {
     className: "mr20",
     icon: /*#__PURE__*/React__default['default'].createElement(icons.ReloadOutlined, null),
     onClick: handleRest
-  }, search && search.resetText ? search.resetText : '重置')) : null, search && (search === null || search === void 0 ? void 0 : search.tableBarDom))))));
+  }, search && search.resetText ? search.resetText : '重置')) : null))), search && (search === null || search === void 0 ? void 0 : search.tableBarDom) && (search === null || search === void 0 ? void 0 : search.tableBarDom.map(function (dom) {
+    return /*#__PURE__*/React__default['default'].createElement(_Col__default['default'], _objectSpread2({
+      className: "pr20"
+    }, search ? search === null || search === void 0 ? void 0 : search.searchButtonConfig : {}), /*#__PURE__*/React__default['default'].createElement(_Form__default['default'].Item, null, dom));
+  })))));
 };
 
 var WForm$1 = /*#__PURE__*/React__default['default'].forwardRef(WForm);
@@ -6981,7 +6986,7 @@ var ModalForm = function ModalForm(props, ref) {
 
 var ModalForm$1 = /*#__PURE__*/React__default['default'].forwardRef(ModalForm);
 
-var _excluded$l = ["columns", "extraColumns", "request", "modalFormSearch", "search", "tableAction", "fliterAction", "renderTableBar", "className", "style", "onFormChange", "modalConfig", "searchFormConfig", "optionColumnConfig", "pagination", "noBordered"];
+var _excluded$l = ["columns", "extraColumns", "request", "modalFormSearch", "search", "tableAction", "fliterAction", "renderTableBar", "renderTableBarDeps", "className", "style", "onFormChange", "modalConfig", "searchFormConfig", "optionColumnConfig", "pagination", "noBordered"];
 
 var TabelCard = function TabelCard(props, ref) {
   var columns = props.columns,
@@ -6992,6 +6997,7 @@ var TabelCard = function TabelCard(props, ref) {
       tableAction = props.tableAction,
       fliterAction = props.fliterAction,
       renderTableBar = props.renderTableBar,
+      renderTableBarDeps = props.renderTableBarDeps,
       className = props.className,
       style = props.style,
       onFormChange = props.onFormChange,
@@ -7411,7 +7417,7 @@ var TabelCard = function TabelCard(props, ref) {
         });
       }
     });
-  }, [actionRef]);
+  }, [actionRef, renderTableBarDeps]);
 
   var onSubmit = function onSubmit(values) {
     var _actionRef$current6;

package/dist/utils/event.d.ts

@@ -6,7 +6,7 @@ declare type Subscription<T> = ({ params, event }: SubscriptionParams<T>) => voi
 declare class EventEmitter<T> {
     private subscriptions;
     constructor();
-    useSubscription: (event: string, listener?: Subscription<T> | undefined) => void;
+    useSubscription: (event: string, listener?: Subscription<T> | undefined, deps?: any) => void;
     emit: (event: string | number, ...args: T extends any[] ? any[] : any) => void;
     removeListener: (event: string) => void;
     clear: () => void;

package/package.json

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