wargerm 0.3.7 → 0.3.10

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

@@ -10,6 +10,7 @@ declare type Props = {
     okText?: string;
     cancelText?: string;
     visible?: boolean;
+    isLoading?: boolean;
     width?: number;
     className?: string;
     style?: React.CSSProperties;

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

@@ -10,5 +10,5 @@ export interface ISelect extends SelectProps<any> {
 export declare type IWSelectComponent = React.FC<ISelect> & {
     Option?: React.FC<IOptionProps>;
 };
-declare let Index: IWSelectComponent;
-export default Index;
+declare const _default: React.NamedExoticComponent<ISelect>;
+export default _default;

package/dist/index.css

@@ -269,6 +269,7 @@
   display: flex;
   align-items: center;
   justify-content: center;
+  text-align: center;
   position: relative;
   z-index: 2;
 }
@@ -318,9 +319,10 @@
   display: flex;
   align-items: center;
   justify-content: center;
+  text-align: center;
   position: relative;
   z-index: 2;
-  height: 32px;
+  min-height: 32px;
 }
 [data-prefers-color='dark'] .container .tbody {
   overflow: auto;
@@ -330,7 +332,7 @@
 [data-prefers-color='dark'] .container .tbody .tr {
   padding-left: 6px;
   width: 100%;
-  height: 32px;
+  min-height: 32px;
   display: flex;
   margin-bottom: 17px;
   position: relative;
@@ -369,6 +371,7 @@
   display: flex;
   align-items: center;
   justify-content: center;
+  text-align: center;
   position: relative;
   z-index: 2;
 }
@@ -377,6 +380,7 @@
   display: flex;
   align-items: center;
   justify-content: center;
+  text-align: center;
   position: relative;
   z-index: 2;
 }
@@ -426,6 +430,7 @@
   display: flex;
   align-items: center;
   justify-content: center;
+  text-align: center;
   position: relative;
   z-index: 2;
   min-height: 32px;
@@ -477,6 +482,7 @@
   display: flex;
   align-items: center;
   justify-content: center;
+  text-align: center;
   position: relative;
   z-index: 2;
 }
@@ -485,6 +491,7 @@
   display: flex;
   align-items: center;
   justify-content: center;
+  text-align: center;
   position: relative;
   z-index: 2;
 }
@@ -1839,6 +1846,9 @@ button.swiper-pagination-bullet {
 .model_container-tips .model_wrap-tips .model_bottom-tips .okbtn:hover {
   border: 1px solid #276588;
 }
+.model_container-tips .model_wrap-tips .model_bottom-tips .okbtn .ant-btn-loading-icon {
+  width: auto !important;
+}
 .model_container-tips .model_wrap-tips .model_bottom-tips .concellbtn {
   background: #1487c2;
   font-size: 14px;

package/dist/index.esm.css

@@ -269,6 +269,7 @@
   display: flex;
   align-items: center;
   justify-content: center;
+  text-align: center;
   position: relative;
   z-index: 2;
 }
@@ -318,9 +319,10 @@
   display: flex;
   align-items: center;
   justify-content: center;
+  text-align: center;
   position: relative;
   z-index: 2;
-  height: 32px;
+  min-height: 32px;
 }
 [data-prefers-color='dark'] .container .tbody {
   overflow: auto;
@@ -330,7 +332,7 @@
 [data-prefers-color='dark'] .container .tbody .tr {
   padding-left: 6px;
   width: 100%;
-  height: 32px;
+  min-height: 32px;
   display: flex;
   margin-bottom: 17px;
   position: relative;
@@ -369,6 +371,7 @@
   display: flex;
   align-items: center;
   justify-content: center;
+  text-align: center;
   position: relative;
   z-index: 2;
 }
@@ -377,6 +380,7 @@
   display: flex;
   align-items: center;
   justify-content: center;
+  text-align: center;
   position: relative;
   z-index: 2;
 }
@@ -426,6 +430,7 @@
   display: flex;
   align-items: center;
   justify-content: center;
+  text-align: center;
   position: relative;
   z-index: 2;
   min-height: 32px;
@@ -477,6 +482,7 @@
   display: flex;
   align-items: center;
   justify-content: center;
+  text-align: center;
   position: relative;
   z-index: 2;
 }
@@ -485,6 +491,7 @@
   display: flex;
   align-items: center;
   justify-content: center;
+  text-align: center;
   position: relative;
   z-index: 2;
 }
@@ -1839,6 +1846,9 @@ button.swiper-pagination-bullet {
 .model_container-tips .model_wrap-tips .model_bottom-tips .okbtn:hover {
   border: 1px solid #276588;
 }
+.model_container-tips .model_wrap-tips .model_bottom-tips .okbtn .ant-btn-loading-icon {
+  width: auto !important;
+}
 .model_container-tips .model_wrap-tips .model_bottom-tips .concellbtn {
   background: #1487c2;
   font-size: 14px;

package/dist/index.esm.js

@@ -737,7 +737,7 @@ var WSelect = function WSelect(props) {
 
     onLoad && onLoad(options);
     setValueEnumList(valueEnumNode);
-  }, [JSON.stringify(resList), request]);
+  }, [JSON.stringify(resList), JSON.stringify(request)]);
   return /*#__PURE__*/React.createElement(_Select, _objectSpread2({}, extraProps), request ? childrenNode : valueEnum ? valueEnumList : children);
 };
 
@@ -752,6 +752,7 @@ var Option = function Option(props) {
 
 var Index$4 = WSelect;
 Index$4.Option = Option;
+var Select = /*#__PURE__*/React.memo(Index$4);
 
 //! moment.js
 //! version : 2.29.1
@@ -6437,7 +6438,9 @@ var WDatePicker$1 = function WDatePicker(props) {
       defaultValue: momentValue(defaultValue),
       value: momentValue(value),
       onChange: function onChange(v) {
-        _onChange === null || _onChange === void 0 ? void 0 : _onChange(v, momentValue(v).format(format || 'YYYY-MM-DD'));
+        var _momentValue;
+
+        (_onChange === null || _onChange === void 0 ? void 0 : _onChange(v, (_momentValue = momentValue(v)) === null || _momentValue === void 0 ? void 0 : _momentValue.format(format || 'YYYY-MM-DD'))) || '';
       }
     }, extraProps)) // </ConfigProvider>
 
@@ -6460,7 +6463,9 @@ var RangePicker$1 = function RangePicker(props) {
       defaultValue: momentValue(defaultValue),
       value: momentValue(value),
       onChange: function onChange(v) {
-        _onChange2 === null || _onChange2 === void 0 ? void 0 : _onChange2(v, momentValue(v).format(format || 'YYYY-MM-DD'));
+        var _momentValue2;
+
+        (_onChange2 === null || _onChange2 === void 0 ? void 0 : _onChange2(v, (_momentValue2 = momentValue(v)) === null || _momentValue2 === void 0 ? void 0 : _momentValue2.format(format || 'YYYY-MM-DD'))) || '';
       }
     }, extraProps)) // </ConfigProvider>
 
@@ -6779,7 +6784,7 @@ var WForm = function WForm(props, ref) {
           name: c.dataIndex,
           label: c.title,
           labelCol: labelCol
-        }), /*#__PURE__*/React.createElement(Index$4, _objectSpread2(_objectSpread2({
+        }), /*#__PURE__*/React.createElement(Select, _objectSpread2(_objectSpread2({
           placeholder: "\u8BF7\u9009\u62E9",
           disabled: disabled,
           onLoad: function onLoad(opt) {
@@ -7279,7 +7284,7 @@ var WForm = function WForm(props, ref) {
           name: c.dataIndex,
           label: c.title,
           labelCol: labelCol
-        }), /*#__PURE__*/React.createElement(Index$4, _objectSpread2(_objectSpread2({
+        }), /*#__PURE__*/React.createElement(Select, _objectSpread2(_objectSpread2({
           placeholder: "\u8BF7\u9009\u62E9",
           disabled: disabled,
           onLoad: function onLoad(opt) {
@@ -7784,11 +7789,15 @@ var WForm = function WForm(props, ref) {
   };
 
   var handleRest = function handleRest() {
+    var _form$resetFields;
+
     onReset && onReset();
-    form.resetFields();
+    form === null || form === void 0 ? void 0 : (_form$resetFields = form.resetFields) === null || _form$resetFields === void 0 ? void 0 : _form$resetFields.call(form);
   };
 
   var setFieldsValue = function setFieldsValue(record) {
+    var _form$setFieldsValue;
+
     var setFieldsValues = _objectSpread2({}, record);
 
     filterFormColumns.forEach(function (c) {
@@ -7803,7 +7812,7 @@ var WForm = function WForm(props, ref) {
         return false;
       }
     });
-    form.setFieldsValue(setFieldsValues);
+    form === null || form === void 0 ? void 0 : (_form$setFieldsValue = form.setFieldsValue) === null || _form$setFieldsValue === void 0 ? void 0 : _form$setFieldsValue.call(form, setFieldsValues);
   };
 
   useImperativeHandle(ref, function () {
@@ -9837,7 +9846,8 @@ var Modal$1 = /*#__PURE__*/function (_React$PureComponent) {
           onCancel = _this$props.onCancel,
           cancelText = _this$props.cancelText,
           okText = _this$props.okText,
-          footer = _this$props.footer;
+          footer = _this$props.footer,
+          isLoading = _this$props.isLoading;
       if (footer && /*#__PURE__*/React.isValidElement(footer)) return footer;
       if (footer === false) return null;
       return /*#__PURE__*/React.createElement("div", {
@@ -9849,14 +9859,15 @@ var Modal$1 = /*#__PURE__*/function (_React$PureComponent) {
         }
       }, /*#__PURE__*/React.createElement(WButton, {
         className: "concellbtn",
+        style: {
+          marginRight: '10px'
+        },
         onClick: function onClick(e) {
           onCancel && onCancel(e);
         }
       }, cancelText || '取消'), /*#__PURE__*/React.createElement(WButton, {
         className: "okbtn",
-        style: {
-          marginLeft: '10px'
-        },
+        loading: isLoading || false,
         onClick: function onClick(e) {
           onOk && onOk(e);
         }
@@ -10784,4 +10795,4 @@ var WebsocketHeart = /*#__PURE__*/_createClass(function WebsocketHeart(_ref) {
   this.heartCheck = null;
 });
 
-export { Index$9 as AutoScroll, Index$b as Breadcrumb, WButton as Button, Index$c as Card, WCascader as Cascader, Index$3 as Checkbox, Index$8 as CountUp, Index$1 as DatePicker, index as IconFont, Index as Input, WInputNumber as InputNumber, Modal, ModalForm$1 as ModalForm, Modal$1 as ModalTips, Index$7 as Number, NumericInput, Index$2 as Radio, Index$4 as Select, Index$a as Swiper, WSwitch as Switch, index$1 as TabelCard, Table, Index$6 as TreeSelect, Index$5 as WDatePicker, WForm$1 as WForm, WebsocketHeart };
+export { Index$9 as AutoScroll, Index$b as Breadcrumb, WButton as Button, Index$c as Card, WCascader as Cascader, Index$3 as Checkbox, Index$8 as CountUp, Index$1 as DatePicker, index as IconFont, Index as Input, WInputNumber as InputNumber, Modal, ModalForm$1 as ModalForm, Modal$1 as ModalTips, Index$7 as Number, NumericInput, Index$2 as Radio, Select, Index$a as Swiper, WSwitch as Switch, index$1 as TabelCard, Table, Index$6 as TreeSelect, Index$5 as WDatePicker, WForm$1 as WForm, WebsocketHeart };

package/dist/index.js

@@ -771,7 +771,7 @@ var WSelect = function WSelect(props) {
 
     onLoad && onLoad(options);
     setValueEnumList(valueEnumNode);
-  }, [JSON.stringify(resList), request]);
+  }, [JSON.stringify(resList), JSON.stringify(request)]);
   return /*#__PURE__*/React__default['default'].createElement(_Select__default['default'], _objectSpread2({}, extraProps), request ? childrenNode : valueEnum ? valueEnumList : children);
 };
 
@@ -786,6 +786,7 @@ var Option = function Option(props) {
 
 var Index$4 = WSelect;
 Index$4.Option = Option;
+var Select = /*#__PURE__*/React__default['default'].memo(Index$4);
 
 //! moment.js
 //! version : 2.29.1
@@ -6471,7 +6472,9 @@ var WDatePicker$1 = function WDatePicker(props) {
       defaultValue: momentValue(defaultValue),
       value: momentValue(value),
       onChange: function onChange(v) {
-        _onChange === null || _onChange === void 0 ? void 0 : _onChange(v, momentValue(v).format(format || 'YYYY-MM-DD'));
+        var _momentValue;
+
+        (_onChange === null || _onChange === void 0 ? void 0 : _onChange(v, (_momentValue = momentValue(v)) === null || _momentValue === void 0 ? void 0 : _momentValue.format(format || 'YYYY-MM-DD'))) || '';
       }
     }, extraProps)) // </ConfigProvider>
 
@@ -6494,7 +6497,9 @@ var RangePicker$1 = function RangePicker(props) {
       defaultValue: momentValue(defaultValue),
       value: momentValue(value),
       onChange: function onChange(v) {
-        _onChange2 === null || _onChange2 === void 0 ? void 0 : _onChange2(v, momentValue(v).format(format || 'YYYY-MM-DD'));
+        var _momentValue2;
+
+        (_onChange2 === null || _onChange2 === void 0 ? void 0 : _onChange2(v, (_momentValue2 = momentValue(v)) === null || _momentValue2 === void 0 ? void 0 : _momentValue2.format(format || 'YYYY-MM-DD'))) || '';
       }
     }, extraProps)) // </ConfigProvider>
 
@@ -6813,7 +6818,7 @@ var WForm = function WForm(props, ref) {
           name: c.dataIndex,
           label: c.title,
           labelCol: labelCol
-        }), /*#__PURE__*/React__default['default'].createElement(Index$4, _objectSpread2(_objectSpread2({
+        }), /*#__PURE__*/React__default['default'].createElement(Select, _objectSpread2(_objectSpread2({
           placeholder: "\u8BF7\u9009\u62E9",
           disabled: disabled,
           onLoad: function onLoad(opt) {
@@ -7313,7 +7318,7 @@ var WForm = function WForm(props, ref) {
           name: c.dataIndex,
           label: c.title,
           labelCol: labelCol
-        }), /*#__PURE__*/React__default['default'].createElement(Index$4, _objectSpread2(_objectSpread2({
+        }), /*#__PURE__*/React__default['default'].createElement(Select, _objectSpread2(_objectSpread2({
           placeholder: "\u8BF7\u9009\u62E9",
           disabled: disabled,
           onLoad: function onLoad(opt) {
@@ -7818,11 +7823,15 @@ var WForm = function WForm(props, ref) {
   };
 
   var handleRest = function handleRest() {
+    var _form$resetFields;
+
     onReset && onReset();
-    form.resetFields();
+    form === null || form === void 0 ? void 0 : (_form$resetFields = form.resetFields) === null || _form$resetFields === void 0 ? void 0 : _form$resetFields.call(form);
   };
 
   var setFieldsValue = function setFieldsValue(record) {
+    var _form$setFieldsValue;
+
     var setFieldsValues = _objectSpread2({}, record);
 
     filterFormColumns.forEach(function (c) {
@@ -7837,7 +7846,7 @@ var WForm = function WForm(props, ref) {
         return false;
       }
     });
-    form.setFieldsValue(setFieldsValues);
+    form === null || form === void 0 ? void 0 : (_form$setFieldsValue = form.setFieldsValue) === null || _form$setFieldsValue === void 0 ? void 0 : _form$setFieldsValue.call(form, setFieldsValues);
   };
 
   React.useImperativeHandle(ref, function () {
@@ -9871,7 +9880,8 @@ var Modal$1 = /*#__PURE__*/function (_React$PureComponent) {
           onCancel = _this$props.onCancel,
           cancelText = _this$props.cancelText,
           okText = _this$props.okText,
-          footer = _this$props.footer;
+          footer = _this$props.footer,
+          isLoading = _this$props.isLoading;
       if (footer && /*#__PURE__*/React__default['default'].isValidElement(footer)) return footer;
       if (footer === false) return null;
       return /*#__PURE__*/React__default['default'].createElement("div", {
@@ -9883,14 +9893,15 @@ var Modal$1 = /*#__PURE__*/function (_React$PureComponent) {
         }
       }, /*#__PURE__*/React__default['default'].createElement(WButton, {
         className: "concellbtn",
+        style: {
+          marginRight: '10px'
+        },
         onClick: function onClick(e) {
           onCancel && onCancel(e);
         }
       }, cancelText || '取消'), /*#__PURE__*/React__default['default'].createElement(WButton, {
         className: "okbtn",
-        style: {
-          marginLeft: '10px'
-        },
+        loading: isLoading || false,
         onClick: function onClick(e) {
           onOk && onOk(e);
         }
@@ -10835,7 +10846,7 @@ exports.ModalTips = Modal$1;
 exports.Number = Index$7;
 exports.NumericInput = NumericInput;
 exports.Radio = Index$2;
-exports.Select = Index$4;
+exports.Select = Select;
 exports.Swiper = Index$a;
 exports.Switch = WSwitch;
 exports.TabelCard = index$1;

package/package.json

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