wargerm 0.6.14 → 0.6.16

package/dist/index.js

@@ -990,8 +990,6 @@ function getSessionId() {
 
 refreshSession(); // 初始化
 
-var version = "0.6.14";
-
 var pageId = uuid(); // 与一般业务上理解的sessionId做区分,此session与业务无关,单纯就是浏览器端和后端直接的联系
 
 var sessionId = getSessionId();
@@ -1004,7 +1002,7 @@ var timer = null; // 定时发送定时器
 var base = _objectSpread2(_objectSpread2({}, device), {}, {
   pageId: pageId,
   sessionId: sessionId,
-  sdkVersion: version
+  sdkVersion: '0.01'
 });
 /**
  * 初始化基础数据
@@ -4138,6 +4136,7 @@ var WForm = function WForm(props, ref) {
       form: form,
       columnsFields: columnsFields,
       handleSubmit: form.submit,
+      handleSearch: handleSearch,
       handleRest: handleRest,
       resetFields: handleRest,
       setFieldsValue: setFieldsValue,
@@ -4789,7 +4788,85 @@ Table.defaultProps = {
 };
 var index$1 = /*#__PURE__*/React.memo(Table);
 
-var _excluded$b = ["height", "width", "count", "style", "numberStyle"],
+var _excluded$b = ["value", "renderDom", "onLoad", "params", "onChange", "request"];
+
+function Index$8(props, ref) {
+  var value = props.value,
+      renderDom = props.renderDom,
+      onLoad = props.onLoad,
+      params = props.params,
+      onChange = props.onChange,
+      request = props.request,
+      rest = _objectWithoutProperties(props, _excluded$b);
+
+  var _useState = React.useState(''),
+      _useState2 = _slicedToArray(_useState, 2),
+      areaValue = _useState2[0],
+      setAreaValue = _useState2[1];
+
+  var _useState3 = React.useState(null),
+      _useState4 = _slicedToArray(_useState3, 2),
+      resList = _useState4[0],
+      setResList = _useState4[1];
+
+  React.useEffect(function () {
+    setAreaValue(value);
+  }, [value]);
+  React.useEffect(function () {
+    var isUnmount = false;
+
+    _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+      var res;
+      return regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              if (!request) {
+                _context.next = 8;
+                break;
+              }
+
+              _context.next = 3;
+              return request();
+
+            case 3:
+              res = _context.sent;
+
+              if (!isUnmount) {
+                _context.next = 6;
+                break;
+              }
+
+              return _context.abrupt("return");
+
+            case 6:
+              setResList(res);
+              onLoad && onLoad(res);
+
+            case 8:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }))();
+
+    return function () {
+      isUnmount = true;
+    };
+  }, [JSON.stringify(params || {})]);
+  React.useImperativeHandle(ref, function () {
+    return {
+      areaValue: areaValue,
+      resList: resList
+    };
+  });
+  return /*#__PURE__*/React__default['default'].createElement("div", _objectSpread2({}, rest), renderDom(resList));
+}
+
+var index$2 = /*#__PURE__*/React__default['default'].forwardRef(Index$8);
+
+var _excluded$c = ["height", "width", "count", "style", "numberStyle"],
     _excluded2$2 = ["count", "numberCount", "width", "height", "marginRight"];
 
 var Number = function Number(_ref) {
@@ -4799,7 +4876,7 @@ var Number = function Number(_ref) {
       count = _ref$count === void 0 ? 0 : _ref$count,
       style = _ref.style,
       numberStyle = _ref.numberStyle,
-      props = _objectWithoutProperties(_ref, _excluded$b);
+      props = _objectWithoutProperties(_ref, _excluded$c);
 
   // 上次的值
   var _useState = React.useState(0),
@@ -4919,7 +4996,7 @@ Number.defaultProps = {
   height: 40
 };
 
-var Index$8 = function Index(props) {
+var Index$9 = function Index(props) {
   var count = props.count,
       _props$numberCount = props.numberCount,
       numberCount = _props$numberCount === void 0 ? 5 : _props$numberCount,
@@ -4963,13 +5040,13 @@ var Index$8 = function Index(props) {
   }));
 };
 
-var _excluded$c = ["duration", "className"];
+var _excluded$d = ["duration", "className"];
 
-var Index$9 = function Index(props) {
+var Index$a = function Index(props) {
   var _props$duration = props.duration,
       duration = _props$duration === void 0 ? 2.75 : _props$duration,
       className = props.className,
-      extraProps = _objectWithoutProperties(props, _excluded$c);
+      extraProps = _objectWithoutProperties(props, _excluded$d);
   return /*#__PURE__*/React__default['default'].createElement(CountUp__default['default'], _objectSpread2(_objectSpread2({
     duration: duration
   }, extraProps), {}, {
@@ -4977,9 +5054,9 @@ var Index$9 = function Index(props) {
   }));
 };
 
-Index$9.defaultProps = {};
+Index$a.defaultProps = {};
 
-var _excluded$d = ["list", "render", "none", "partSize"];
+var _excluded$e = ["list", "render", "none", "partSize"];
 
 function AutoScroll(props) {
   var inner1 = React.useRef();
@@ -5058,13 +5135,13 @@ function AutoScroll(props) {
   }));
 }
 
-var Index$a = function Index(_ref) {
+var Index$b = function Index(_ref) {
   var list = _ref.list,
       render = _ref.render,
       none = _ref.none,
       _ref$partSize = _ref.partSize,
       partSize = _ref$partSize === void 0 ? 4 : _ref$partSize,
-      otherProps = _objectWithoutProperties(_ref, _excluded$d);
+      otherProps = _objectWithoutProperties(_ref, _excluded$e);
 
   var _useState = React.useState([]),
       _useState2 = _slicedToArray(_useState, 2),
@@ -5147,11 +5224,11 @@ var Index$a = function Index(_ref) {
   }, none || '暂无数据');
 };
 
-var _excluded$e = ["data", "onClick", "slidesPerView", "rowKey", "onSwiperChange", "renderItem"];
+var _excluded$f = ["data", "onClick", "slidesPerView", "rowKey", "onSwiperChange", "renderItem"];
 
 SwiperCore__default['default'].use([SwiperCore.Pagination, SwiperCore.Navigation, SwiperCore.Autoplay, SwiperCore.Virtual]);
 
-var Index$b = function Index(props) {
+var Index$c = function Index(props) {
   var data = props.data,
       _onClick = props.onClick,
       _props$slidesPerView = props.slidesPerView,
@@ -5159,7 +5236,7 @@ var Index$b = function Index(props) {
       rowKey = props.rowKey,
       onSwiperChange = props.onSwiperChange,
       renderItem = props.renderItem,
-      extraProps = _objectWithoutProperties(props, _excluded$e);
+      extraProps = _objectWithoutProperties(props, _excluded$f);
 
   var _useState = React.useState(null),
       _useState2 = _slicedToArray(_useState, 2),
@@ -5214,7 +5291,7 @@ var Index$b = function Index(props) {
   }));
 };
 
-Index$b.defaultProps = {};
+Index$c.defaultProps = {};
 
 function _extends$1() {
   _extends$1 = Object.assign || function (target) {
@@ -5810,7 +5887,7 @@ function createBrowserHistory(props) {
   return history;
 }
 
-var _excluded$f = ["routes", "className"];
+var _excluded$g = ["routes", "className"];
 var history = createBrowserHistory();
 
 function itemRender(route, params, routes, paths) {
@@ -5825,10 +5902,10 @@ function itemRender(route, params, routes, paths) {
   }, route.breadcrumbName);
 }
 
-var Index$c = function Index(_ref) {
+var Index$d = function Index(_ref) {
   var routes = _ref.routes,
       className = _ref.className,
-      props = _objectWithoutProperties(_ref, _excluded$f);
+      props = _objectWithoutProperties(_ref, _excluded$g);
 
   return /*#__PURE__*/React__default['default'].createElement(_Breadcrumb__default['default'], _objectSpread2({
     className: className || 'default',
@@ -5838,9 +5915,9 @@ var Index$c = function Index(_ref) {
   }, props));
 };
 
-var _excluded$g = ["title", "className", "headerTail", "headerCenter", "sliderTabs"];
+var _excluded$h = ["title", "className", "headerTail", "headerCenter", "sliderTabs"];
 
-var Index$d = function Index(_ref, ref) {
+var Index$e = function Index(_ref, ref) {
   var _classNames, _sliderTabs$component, _sliderTabs$tabs;
 
   var title = _ref.title,
@@ -5849,7 +5926,7 @@ var Index$d = function Index(_ref, ref) {
       headerTail = _ref.headerTail,
       headerCenter = _ref.headerCenter,
       sliderTabs = _ref.sliderTabs,
-      props = _objectWithoutProperties(_ref, _excluded$g);
+      props = _objectWithoutProperties(_ref, _excluded$h);
 
   React.useImperativeHandle(ref, function () {
     return {
@@ -5891,7 +5968,7 @@ var Index$d = function Index(_ref, ref) {
   }))));
 };
 
-var index$2 = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(Index$d));
+var index$3 = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(Index$e));
 
 var controlShow = function controlShow(f1, f2, value, timer) {
   f1(value);
@@ -6093,7 +6170,7 @@ function DialogModel(props, ref) {
 
 var Dialog = /*#__PURE__*/React__default['default'].forwardRef(DialogModel);
 
-var _excluded$h = ["visible", "width", "closeCb", "onClose", "className", "style"],
+var _excluded$i = ["visible", "width", "closeCb", "onClose", "className", "style"],
     _excluded2$3 = ["visible"];
 
 var Modal = /*#__PURE__*/function (_React$PureComponent) {
@@ -6211,7 +6288,7 @@ var Modal = /*#__PURE__*/function (_React$PureComponent) {
           onClose = _this$props4.onClose,
           className = _this$props4.className,
           style = _this$props4.style,
-          other = _objectWithoutProperties(_this$props4, _excluded$h);
+          other = _objectWithoutProperties(_this$props4, _excluded$i);
 
       return /*#__PURE__*/React__default['default'].createElement(Dialog, _objectSpread2({
         ref: this.containerRef,
@@ -6394,7 +6471,7 @@ function DialogModel$1(props) {
   return renderChildren;
 }
 
-var _excluded$i = ["visible"];
+var _excluded$j = ["visible"];
 
 var Modal$1 = /*#__PURE__*/function (_React$PureComponent) {
   _inherits(Modal, _React$PureComponent);
@@ -6535,7 +6612,7 @@ Modal$1.show = function (config) {
     manager.setShow = setShow;
 
     var visible = props.visible,
-        trueProps = _objectWithoutProperties(props, _excluded$i);
+        trueProps = _objectWithoutProperties(props, _excluded$j);
 
     React.useEffect(function () {
       manager.mounted = true;
@@ -6735,7 +6812,7 @@ function DragBox(_ref) {
   }, children)) : /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null);
 }
 
-var _excluded$j = ["columns", "extraColumns", "search", "visible", "setVisible", "modalFormOpend", "disabled", "submitMethod", "onSubmitSuccess", "title", "record", "onFormChange", "formItemChild", "onCancel", "modalHeaderSolt", "modalFooterSolt", "formProps"];
+var _excluded$k = ["columns", "extraColumns", "search", "visible", "setVisible", "modalFormOpend", "disabled", "submitMethod", "onSubmitSuccess", "title", "record", "onFormChange", "formItemChild", "onCancel", "modalHeaderSolt", "modalFooterSolt", "formProps"];
 
 var ModalForm = function ModalForm(props, ref) {
   var columns = props.columns,
@@ -6755,7 +6832,7 @@ var ModalForm = function ModalForm(props, ref) {
       modalHeaderSolt = props.modalHeaderSolt,
       modalFooterSolt = props.modalFooterSolt,
       formProps = props.formProps,
-      extraProps = _objectWithoutProperties(props, _excluded$j);
+      extraProps = _objectWithoutProperties(props, _excluded$k);
 
   var formRef = React.useRef(null);
 
@@ -6902,7 +6979,7 @@ var ModalForm = function ModalForm(props, ref) {
 
 var ModalForm$1 = /*#__PURE__*/React__default['default'].forwardRef(ModalForm);
 
-var _excluded$k = ["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", "className", "style", "onFormChange", "modalConfig", "searchFormConfig", "optionColumnConfig", "pagination", "noBordered"];
 
 var TabelCard = function TabelCard(props, ref) {
   var columns = props.columns,
@@ -6921,7 +6998,7 @@ var TabelCard = function TabelCard(props, ref) {
       optionColumnConfig = props.optionColumnConfig,
       pagination = props.pagination,
       noBordered = props.noBordered,
-      extraProps = _objectWithoutProperties(props, _excluded$k);
+      extraProps = _objectWithoutProperties(props, _excluded$l);
 
   var actionRef = React.useRef();
   var modalFormRef = React.useRef(null);
@@ -7354,9 +7431,10 @@ var TabelCard = function TabelCard(props, ref) {
     var _searchFormRef$curren, _searchFormRef$curren2;
 
     if ((_searchFormRef$curren = searchFormRef.current) === null || _searchFormRef$curren === void 0 ? void 0 : (_searchFormRef$curren2 = _searchFormRef$curren.form) === null || _searchFormRef$curren2 === void 0 ? void 0 : _searchFormRef$curren2.getFieldsValue) {
-      var _searchFormRef$curren3, _searchFormRef$curren4;
+      var _searchFormRef$curren3;
 
-      var obj = filterObj((_searchFormRef$curren3 = searchFormRef.current) === null || _searchFormRef$curren3 === void 0 ? void 0 : (_searchFormRef$curren4 = _searchFormRef$curren3.form) === null || _searchFormRef$curren4 === void 0 ? void 0 : _searchFormRef$curren4.getFieldsValue()) || {};
+      var obj = // filterObj(searchFormRef.current?.form?.getFieldsValue()) || {};
+      filterObj((_searchFormRef$curren3 = searchFormRef.current) === null || _searchFormRef$curren3 === void 0 ? void 0 : _searchFormRef$curren3.handleSearch()) || {};
       (columns || []).filter(function (c) {
         return c.notInitialValueInSearch;
       }).forEach(function (item) {
@@ -7581,7 +7659,7 @@ var TabelCard = function TabelCard(props, ref) {
   }, extraProps)));
 };
 
-var index$3 = /*#__PURE__*/React__default['default'].forwardRef(TabelCard);
+var index$4 = /*#__PURE__*/React__default['default'].forwardRef(TabelCard);
 
 var YEAER_MONTH_FORMAT_EN = 'YYYY-MM';
 
@@ -7954,7 +8032,7 @@ function Calendar(_ref, ref) {
   })))));
 }
 
-var index$4 = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(Calendar));
+var index$5 = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(Calendar));
 
 var WebsocketHeart = /*#__PURE__*/_createClass(function WebsocketHeart(_ref) {
   var _this = this;
@@ -8405,16 +8483,16 @@ function VideoPlayer(_ref, ref) {
   })) : null));
 }
 
-var index$5 = /*#__PURE__*/React.forwardRef(VideoPlayer);
+var index$6 = /*#__PURE__*/React.forwardRef(VideoPlayer);
 
-var _excluded$l = ["id", "videoUrls", "definitionList", "isLoop", "muted", "currentIndex", "setCurrentIndex", "className", "style", "visible", "autoplay", "videoInit", "enableMemory", "lastPlayTimeHideDelay"];
+var _excluded$m = ["id", "videoUrls", "definitionList", "isLoop", "muted", "currentIndex", "setCurrentIndex", "className", "style", "visible", "autoplay", "videoInit", "enableMemory", "lastPlayTimeHideDelay"];
 
 var DEFAULT_PLAY_BACK_RATE = [0.5, 0.75, 1, 1.5, 2]; // 默认记忆提示文字展示时长(s)
 
 var DEFAULT_LAST_PLAY_TIME_DELAY = 5; // 默认音量大小
 
 var DEFAULT_VOLUME = 0.6;
-var index$6 = (function (_ref) {
+var index$7 = (function (_ref) {
   var id = _ref.id,
       _ref$videoUrls = _ref.videoUrls,
       videoUrls = _ref$videoUrls === void 0 ? [] : _ref$videoUrls,
@@ -8438,7 +8516,7 @@ var index$6 = (function (_ref) {
       enableMemory = _ref$enableMemory === void 0 ? false : _ref$enableMemory,
       _ref$lastPlayTimeHide = _ref.lastPlayTimeHideDelay,
       lastPlayTimeHideDelay = _ref$lastPlayTimeHide === void 0 ? DEFAULT_LAST_PLAY_TIME_DELAY : _ref$lastPlayTimeHide,
-      props = _objectWithoutProperties(_ref, _excluded$l);
+      props = _objectWithoutProperties(_ref, _excluded$m);
 
   var player = React.useRef();
   var currentPlayerIndex = React.useRef(0); // 内置的 index 状态管理
@@ -8637,7 +8715,7 @@ var index$6 = (function (_ref) {
   });
 });
 
-var _excluded$m = ["className", "frameStyle", "style", "direction", "children"];
+var _excluded$n = ["className", "frameStyle", "style", "direction", "children"];
 function FrameBox$1(_ref) {
   var _classnames;
 
@@ -8647,7 +8725,7 @@ function FrameBox$1(_ref) {
       _ref$direction = _ref.direction,
       direction = _ref$direction === void 0 ? 'in' : _ref$direction,
       children = _ref.children,
-      props = _objectWithoutProperties(_ref, _excluded$m);
+      props = _objectWithoutProperties(_ref, _excluded$n);
 
   return /*#__PURE__*/React__default['default'].createElement("div", _objectSpread2({
     className: classnames__default['default']((_classnames = {}, _defineProperty(_classnames, 'frame', true), _defineProperty(_classnames, className || '', true), _classnames)),
@@ -8675,7 +8753,7 @@ function FrameBox$1(_ref) {
   }), children);
 }
 
-var _excluded$n = ["columns", "dataSource", "request", "onLoad", "params", "onSubmit", "rowKey", "onRow", "className", "rowClassName", "rowSelection", "style", "tbodyStyle", "thStyle", "border", "scroll", "pagination", "search", "frameBoxTable", "frameBoxDirection", "formRef", "none"];
+var _excluded$o = ["columns", "dataSource", "request", "onLoad", "params", "onSubmit", "rowKey", "onRow", "className", "rowClassName", "rowSelection", "style", "tbodyStyle", "thStyle", "border", "scroll", "pagination", "search", "frameBoxTable", "frameBoxDirection", "formRef", "none"];
 
 function NtTable(_ref) {
   var _formSearchRef$curren4, _classnames2, _columns$, _columns$2;
@@ -8708,7 +8786,7 @@ function NtTable(_ref) {
       frameBoxDirection = _ref$frameBoxDirectio === void 0 ? 'out' : _ref$frameBoxDirectio,
       formRef = _ref.formRef,
       none = _ref.none,
-      props = _objectWithoutProperties(_ref, _excluded$n);
+      props = _objectWithoutProperties(_ref, _excluded$o);
 
   var _useState = React.useState(_toConsumableArray((rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRowKeys) || [])),
       _useState2 = _slicedToArray(_useState, 2),
@@ -9247,7 +9325,7 @@ function NtTable(_ref) {
 NtTable.defaultProps = {
   rowKey: 'key'
 };
-var index$7 = /*#__PURE__*/React.memo(NtTable);
+var index$8 = /*#__PURE__*/React.memo(NtTable);
 
 /*
  * @Author: lijin
@@ -10031,7 +10109,7 @@ function WaterLevelCharts(config) {
 /*
  * @Author: lijin
  * @Date: 2021-09-09 11:02:54
- * @LastEditTime: 2022-12-13 19:29:01
+ * @LastEditTime: 2022-12-15 17:52:15
  * @LastEditors: lijin
  * @Description:
  * @FilePath: \wargerm-components\src\index.ts
@@ -10044,14 +10122,14 @@ if (REACT_APP_ENV == 'development') {
   document.documentElement.setAttribute(COLOR_ATTR_NAME, 'nt');
 }
 
-exports.AutoScroll = Index$a;
-exports.Breadcrumb = Index$c;
+exports.AutoScroll = Index$b;
+exports.Breadcrumb = Index$d;
 exports.Button = WButton;
-exports.Calendar = index$4;
-exports.Card = index$2;
+exports.Calendar = index$5;
+exports.Card = index$3;
 exports.Cascader = WCascader;
 exports.Checkbox = Index$4;
-exports.CountUp = Index$9;
+exports.CountUp = Index$a;
 exports.DatePicker = Index$2;
 exports.DragBox = DragBox;
 exports.IconFont = index;
@@ -10061,19 +10139,20 @@ exports.LineEcharts = LineEcharts;
 exports.Modal = Modal;
 exports.ModalForm = ModalForm$1;
 exports.ModalTips = Modal$1;
-exports.NtTable = index$7;
-exports.Number = Index$8;
+exports.NtTable = index$8;
+exports.Number = Index$9;
 exports.NumericInput = NumericInput;
 exports.Radio = Index$3;
+exports.RequestRenderDom = index$2;
 exports.Select = Select;
-exports.Swiper = Index$b;
+exports.Swiper = Index$c;
 exports.Switch = WSwitch;
-exports.TabelCard = index$3;
+exports.TabelCard = index$4;
 exports.Table = index$1;
 exports.TreeSelect = Index$7;
 exports.Upload = Upload;
-exports.Video = index$6;
-exports.VideoPlayer = index$5;
+exports.Video = index$7;
+exports.VideoPlayer = index$6;
 exports.WDatePicker = Index$6;
 exports.WForm = WForm$1;
 exports.WaterLevelCharts = WaterLevelCharts;

package/package.json

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