wargerm 0.3.2 → 0.3.6

package/dist/index.css

@@ -208,6 +208,7 @@
   display: flex;
   align-items: center;
   justify-content: center;
+  text-align: center;
   position: relative;
   z-index: 2;
   min-height: 32px;
@@ -259,6 +260,7 @@
   display: flex;
   align-items: center;
   justify-content: center;
+  text-align: center;
   position: relative;
   z-index: 2;
 }
@@ -1765,7 +1767,7 @@ button.swiper-pagination-bullet {
 }
 .model_container-tips {
   position: absolute;
-  z-index: 1000;
+  z-index: 2000;
   top: 0;
   left: 0;
   right: 0;
@@ -1819,7 +1821,7 @@ button.swiper-pagination-bullet {
   position: absolute;
   width: 100%;
   height: calc(100% - 50px);
-  background: rgba(22, 28, 38, 0.7);
+  background: rgba(10, 16, 27, 0.7);
 }
 .model_container-tips .model_wrap-tips .model_bottom-tips {
   z-index: 100;

package/dist/index.esm.css

@@ -208,6 +208,7 @@
   display: flex;
   align-items: center;
   justify-content: center;
+  text-align: center;
   position: relative;
   z-index: 2;
   min-height: 32px;
@@ -259,6 +260,7 @@
   display: flex;
   align-items: center;
   justify-content: center;
+  text-align: center;
   position: relative;
   z-index: 2;
 }
@@ -1765,7 +1767,7 @@ button.swiper-pagination-bullet {
 }
 .model_container-tips {
   position: absolute;
-  z-index: 1000;
+  z-index: 2000;
   top: 0;
   left: 0;
   right: 0;
@@ -1819,7 +1821,7 @@ button.swiper-pagination-bullet {
   position: absolute;
   width: 100%;
   height: calc(100% - 50px);
-  background: rgba(22, 28, 38, 0.7);
+  background: rgba(10, 16, 27, 0.7);
 }
 .model_container-tips .model_wrap-tips .model_bottom-tips {
   z-index: 100;

package/dist/index.esm.js

@@ -737,7 +737,7 @@ var WSelect = function WSelect(props) {
 
     onLoad && onLoad(options);
     setValueEnumList(valueEnumNode);
-  }, [JSON.stringify(resList)]);
+  }, [JSON.stringify(resList), request]);
   return /*#__PURE__*/React.createElement(_Select, _objectSpread2({}, extraProps), request ? childrenNode : valueEnum ? valueEnumList : children);
 };
 
@@ -7891,7 +7891,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", "none"];
 function Table(_ref) {
-  var _formSearchRef$curren3, _classnames2;
+  var _formSearchRef$curren4, _classnames2;
 
   var columns = _ref.columns,
       tableList = _ref.dataSource,
@@ -7973,13 +7973,15 @@ function Table(_ref) {
     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)]);
+
+    if ((formSearchRef === null || formSearchRef === void 0 ? void 0 : formSearchRef.current) && formRef) {
+      var _formSearchRef$curren3;
+
+      formRef.current = formSearchRef === null || formSearchRef === void 0 ? void 0 : (_formSearchRef$curren3 = formSearchRef.current) === null || _formSearchRef$curren3 === void 0 ? void 0 : _formSearchRef$curren3.form;
+    }
+  }, [JSON.stringify(formSearchRef === null || formSearchRef === void 0 ? void 0 : (_formSearchRef$curren4 = formSearchRef.current) === null || _formSearchRef$curren4 === void 0 ? void 0 : _formSearchRef$curren4.columnsFields), formRef, formSearchRef]);
 
   var flattenColumns = function flattenColumns(columns) {
     var arr = columns.reduce(function (pre, cur) {
@@ -7992,12 +7994,16 @@ function Table(_ref) {
     return arr;
   };
 
-  var filterFormColumns = flattenColumns(columns).filter(function (c) {
-    return !c.hideInSearch;
-  });
-  var filterColumns = flattenColumns(columns).filter(function (c) {
-    return !c.hideInTable;
-  });
+  var filterFormColumns = useMemo(function () {
+    return flattenColumns(columns).filter(function (c) {
+      return !c.hideInSearch;
+    });
+  }, [columns]);
+  var filterColumns = useMemo(function () {
+    return flattenColumns(columns).filter(function (c) {
+      return !c.hideInTable;
+    });
+  }, [columns]);
   var renderTh = useMemo(function () {
     var renderThFc = function renderThFc(columns, parentHeight, isChild) {
       var showColumns = columns.filter(function (c) {

package/dist/index.js

@@ -771,7 +771,7 @@ var WSelect = function WSelect(props) {
 
     onLoad && onLoad(options);
     setValueEnumList(valueEnumNode);
-  }, [JSON.stringify(resList)]);
+  }, [JSON.stringify(resList), request]);
   return /*#__PURE__*/React__default['default'].createElement(_Select__default['default'], _objectSpread2({}, extraProps), request ? childrenNode : valueEnum ? valueEnumList : children);
 };
 
@@ -7925,7 +7925,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", "none"];
 function Table(_ref) {
-  var _formSearchRef$curren3, _classnames2;
+  var _formSearchRef$curren4, _classnames2;
 
   var columns = _ref.columns,
       tableList = _ref.dataSource,
@@ -8007,13 +8007,15 @@ function Table(_ref) {
     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)]);
+
+    if ((formSearchRef === null || formSearchRef === void 0 ? void 0 : formSearchRef.current) && formRef) {
+      var _formSearchRef$curren3;
+
+      formRef.current = formSearchRef === null || formSearchRef === void 0 ? void 0 : (_formSearchRef$curren3 = formSearchRef.current) === null || _formSearchRef$curren3 === void 0 ? void 0 : _formSearchRef$curren3.form;
+    }
+  }, [JSON.stringify(formSearchRef === null || formSearchRef === void 0 ? void 0 : (_formSearchRef$curren4 = formSearchRef.current) === null || _formSearchRef$curren4 === void 0 ? void 0 : _formSearchRef$curren4.columnsFields), formRef, formSearchRef]);
 
   var flattenColumns = function flattenColumns(columns) {
     var arr = columns.reduce(function (pre, cur) {
@@ -8026,12 +8028,16 @@ function Table(_ref) {
     return arr;
   };
 
-  var filterFormColumns = flattenColumns(columns).filter(function (c) {
-    return !c.hideInSearch;
-  });
-  var filterColumns = flattenColumns(columns).filter(function (c) {
-    return !c.hideInTable;
-  });
+  var filterFormColumns = React.useMemo(function () {
+    return flattenColumns(columns).filter(function (c) {
+      return !c.hideInSearch;
+    });
+  }, [columns]);
+  var filterColumns = React.useMemo(function () {
+    return flattenColumns(columns).filter(function (c) {
+      return !c.hideInTable;
+    });
+  }, [columns]);
   var renderTh = React.useMemo(function () {
     var renderThFc = function renderThFc(columns, parentHeight, isChild) {
       var showColumns = columns.filter(function (c) {

package/package.json

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