easy3wui 1.5.68 → 1.5.70-beta1

package/assets/formPage.css

@@ -13,13 +13,6 @@
 .e3wFormPageWrap .e3wFormItem .ant-form-item {
   margin-bottom: 8px;
 }
-.e3wFormPageWrap .e3wFormItem input.ant-input-number-input {
-  text-align: right;
-  padding-right: 22px;
-}
-.e3wFormPageWrap .e3wFormItem .rightText {
-  text-align: right;
-}
 .e3wFormPageWrap .inputNumberFormat {
   display: -ms-flexbox;
   display: flex;
@@ -38,6 +31,13 @@
 .e3wFormPageWrap .inputNumberFormat .inputNumberBtns .e3wFootBtn {
   margin: 0;
 }
+input.ant-input-number-input {
+  text-align: right;
+  padding-right: 22px;
+}
+.rightText {
+  text-align: right;
+}
 .bf-container.read-only .bf-content {
   height: auto;
 }

package/assets/index.css

@@ -2404,13 +2404,6 @@ s {
 .e3wFormPageWrap .e3wFormItem .ant-form-item {
   margin-bottom: 8px;
 }
-.e3wFormPageWrap .e3wFormItem input.ant-input-number-input {
-  text-align: right;
-  padding-right: 22px;
-}
-.e3wFormPageWrap .e3wFormItem .rightText {
-  text-align: right;
-}
 .e3wFormPageWrap .inputNumberFormat {
   display: -ms-flexbox;
   display: flex;
@@ -2429,6 +2422,13 @@ s {
 .e3wFormPageWrap .inputNumberFormat .inputNumberBtns .e3wFootBtn {
   margin: 0;
 }
+input.ant-input-number-input {
+  text-align: right;
+  padding-right: 22px;
+}
+.rightText {
+  text-align: right;
+}
 .bf-container.read-only .bf-content {
   height: auto;
 }

package/lib/Easy3wFormPage/index.js

@@ -220,14 +220,14 @@ var _ref = _comonConfig.objEasy3wUIConfig || {},
 var _ref2 = objEasy3wFormPage || {},
     projectType = _ref2.projectType;
 
-var options = {
+var objOptions = {
   defaultRows: 3, // 默认行数
   defaultColumns: 3, // 默认列数
   withDropdown: false, // 插入表格前是否弹出下拉菜单
   columnResizable: false, // 是否允许拖动调整列宽， 默认false
   exportAttrString: 'style="border: 1"' // 指定输出HTML时附加到table标签上的属性字符串
 };
-_braftEditor2['default'].use((0, _table2['default'])(options)); // 表格
+_braftEditor2['default'].use((0, _table2['default'])(objOptions)); // 表格
 
 _moment2['default'].locale('zh-cn');
 
@@ -3450,7 +3450,8 @@ var Easy3wFormPageTight = function (_Component2) {
         onPressEnter: function onPressEnter(e) {
           return _this2.numberInputonBlur(e, item);
         },
-        rules: [{ pattern: /^\d+(\.\d+)?$/, message: '数字' }]
+        rules: [{ pattern: /^\d+(\.\d+)?$/, message: '数字' }],
+        className: (0, _classnames2['default'])(['rightText'])
       }, cmptPros, {
         size: 'small'
       }));

package/lib/Easy3wModal/index.js

@@ -6,6 +6,10 @@ var _extends2 = require('babel-runtime/helpers/extends');
 
 var _extends3 = _interopRequireDefault(_extends2);
 
+var _objectWithoutProperties2 = require('babel-runtime/helpers/objectWithoutProperties');
+
+var _objectWithoutProperties3 = _interopRequireDefault(_objectWithoutProperties2);
+
 var _notification2 = require('antd/lib/notification');
 
 var _notification3 = _interopRequireDefault(_notification2);
@@ -77,13 +81,12 @@ var Easy3wModal = function (_Component) {
       return _react2['default'].createElement(
         _button2['default'],
         {
+          type: 'primary',
+          className: (0, _classnames2['default'])(['e3wFootBtn']),
+          loading: obj.loading,
           onClick: function onClick(e) {
             return _this.onClickFunc(e, obj.func);
-          },
-          type: 'primary',
-          className: (0, _classnames2['default'])(['e3wFootBtn'])
-          // loading={obj.loading}
-          , loading: obj.loading === undefined ? _this.props.loadingFlag.global : obj.loading
+          }
         },
         obj.cName
       );
@@ -100,26 +103,124 @@ var Easy3wModal = function (_Component) {
       );
     }, _temp), (0, _possibleConstructorReturn3['default'])(_this, _ret);
   }
-  // constructor(props) {
-  //   super(props);
-  //   this.state = {
-  //     notificationKey: 'easy3w_processing_notice',
-  //   };
-  // }
-
-  // componentWillReceiveProps(prevProps) {
-  //   const { notificationKey } = this.state;
-  //   if (prevProps.loadingFlag.global) {
-  //     notification.warning({
-  //       key: notificationKey,
-  //       message: '温馨提示',
-  //       description: '正在后台处理，请稍后！',
-  //       duration: 0, // 不自动关闭
-  //     });
-  //   } else {
-  //     notification.close(notificationKey);
-  //   }
-  // }
+  // 获取loading状态
+
+
+  // 供脚手架index存store
+  Easy3wModal.setGetLoading = function setGetLoading(fn) {
+    Easy3wModal.getLoading = fn;
+  };
+  // 统一的 loading 检查
+
+
+  Easy3wModal.checkLoadingAndRun = function checkLoadingAndRun(callback) {
+    var loadingFlag = Easy3wModal.getLoading();
+    if (loadingFlag) {
+      _notification3['default'].warning({
+        message: '温馨提示',
+        description: '操作正在进行中，请稍后！',
+        duration: 3
+      });
+      return;
+    }
+    if (typeof callback === 'function') {
+      return callback();
+    }
+  };
+  // confirm
+
+
+  Easy3wModal.confirm = function confirm() {
+    var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    var _onOk = props.onOk,
+        restProps = (0, _objectWithoutProperties3['default'])(props, ['onOk']);
+
+    return _modal2['default'].confirm((0, _extends3['default'])({}, restProps, {
+      onOk: function onOk() {
+        var loadingFlag = Easy3wModal.getLoading();
+        if (loadingFlag) {
+          _notification3['default'].warning({
+            message: '温馨提示',
+            description: '操作正在进行中，请稍后！',
+            duration: 3
+          });
+          return Promise.reject(); // 阻止 Modal 自动关闭
+        }
+        if (typeof _onOk === 'function') {
+          return _onOk();
+        }
+        return true;
+      }
+    }));
+  };
+  // info
+
+
+  Easy3wModal.info = function info() {
+    var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+
+    // 判断类型
+    var options = typeof props === 'string' || typeof props === 'number' ? { content: props } : props;
+    var _onOk2 = options.onOk,
+        restProps = (0, _objectWithoutProperties3['default'])(options, ['onOk']);
+
+    return _modal2['default'].info((0, _extends3['default'])({}, restProps, {
+      onOk: function onOk() {
+        return Easy3wModal.checkLoadingAndRun(_onOk2);
+      }
+    }));
+  };
+  // success
+
+
+  Easy3wModal.success = function success() {
+    var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+
+    // 判断类型
+    var options = typeof props === 'string' || typeof props === 'number' ? { content: props } : props;
+    var _onOk3 = options.onOk,
+        restProps = (0, _objectWithoutProperties3['default'])(options, ['onOk']);
+
+    return _modal2['default'].success((0, _extends3['default'])({}, restProps, {
+      onOk: function onOk() {
+        return Easy3wModal.checkLoadingAndRun(_onOk3);
+      }
+    }));
+  };
+  // error
+
+
+  Easy3wModal.error = function error() {
+    var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+
+    // 判断类型
+    var options = typeof props === 'string' || typeof props === 'number' ? { content: props } : props;
+    var _onOk4 = options.onOk,
+        restProps = (0, _objectWithoutProperties3['default'])(options, ['onOk']);
+
+    return _modal2['default'].error((0, _extends3['default'])({}, restProps, {
+      onOk: function onOk() {
+        return Easy3wModal.checkLoadingAndRun(_onOk4);
+      }
+    }));
+  };
+  // warning
+
+
+  Easy3wModal.warning = function warning() {
+    var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+
+    // 判断类型
+    var options = typeof props === 'string' || typeof props === 'number' ? { content: props } : props;
+    var _onOk5 = options.onOk,
+        restProps = (0, _objectWithoutProperties3['default'])(options, ['onOk']);
+
+    return _modal2['default'].warning((0, _extends3['default'])({}, restProps, {
+      onOk: function onOk() {
+        return Easy3wModal.checkLoadingAndRun(_onOk5);
+      }
+    }));
+  };
 
   Easy3wModal.prototype.render = function render() {
     var _props = this.props,
@@ -144,7 +245,7 @@ var Easy3wModal = function (_Component) {
         width: width,
         destroyOnClose: true,
         maskClosable: false,
-        style: { top: 20 }
+        style: { top: 20, zIndex: 99998 }
       }, this.props, {
         afterClose: function afterClose() {
           document.body.style.overflow = '';
@@ -157,6 +258,10 @@ var Easy3wModal = function (_Component) {
   return Easy3wModal;
 }(_react.Component);
 
+Easy3wModal.getLoading = function () {
+  return false;
+};
+
 exports['default'] = (0, _dva.connect)(function (state) {
   return {
     loadingFlag: state.loading

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy3wui",
-  "version": "1.5.68",
+  "version": "1.5.70-beta1",
   "description": "easy3wui components for react",
   "keywords": [
     "react",