easy3wui 1.5.85-beta.4 → 1.5.85-beta.6

package/assets/index.css

@@ -2713,3 +2713,6 @@ input.ant-input-number-input {
   width: calc(88%);
   margin: 0 6px;
 }
+:global .ant-skeleton {
+  background: #fff;
+}

package/assets/skeleton.css

@@ -0,0 +1,3 @@
+:global .ant-skeleton {
+  background: #fff;
+}

package/lib/Easy3wEditBigTable/index.js

@@ -44,6 +44,8 @@ var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
 
+var _dva = require('dva');
+
 var _antd = require('antd');
 
 var _reactDataGrid = require('react-data-grid');
@@ -64,11 +66,14 @@ var _Easy3wEditBigTableForm = require('./Easy3wEditBigTableForm');
 
 var _Easy3wEditBigTableForm2 = _interopRequireDefault(_Easy3wEditBigTableForm);
 
+var _Easy3wSpin = require('../Easy3wSpin');
+
+var _Easy3wSpin2 = _interopRequireDefault(_Easy3wSpin);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
-var Selectors = _reactDataGridAddons.Data.Selectors;
 // import XLSX from 'xlsx';
-/* eslint-disable no-alert */
+var Selectors = _reactDataGridAddons.Data.Selectors; /* eslint-disable no-alert */
 
 var Easy3wEditBigTable = function (_React$Component) {
   (0, _inherits3['default'])(Easy3wEditBigTable, _React$Component);
@@ -239,6 +244,9 @@ var Easy3wEditBigTable = function (_React$Component) {
   // 校验数据
 
   // #endregion 校验数据
+  // #region 获取loading状态
+
+  // #endregion 获取loading状态
   // 转换数字
 
   // 变量 num 是一个有效的数字，即非空、不为 NaN 且是有限值
@@ -258,58 +266,63 @@ var Easy3wEditBigTable = function (_React$Component) {
     var objReactDataGridProps = this.getReactDataGridProps();
     var columns = this.createColumns(); // 表头
     var objTotal = totalFlag ? this.touchLoopData() : {}; // 循环数据获取
+    var spinLoading = this.getLoading();
     return _react2['default'].createElement(
-      'div',
-      { className: (0, _classnames2['default'])(['Easy3wEditBigTable']) },
+      _Easy3wSpin2['default'],
+      { noStyle: true, spinLoading: spinLoading },
       _react2['default'].createElement(
-        'style',
-        null,
-        strReactDataGridStyle || (strAddReactDataGridStyle || '') + '\n              .custom-edit-cell {\n                background-color: #f6ffed;\n              }\n            '
-      ),
-      _react2['default'].createElement(_reactDataGrid2['default'], (0, _extends3['default'])({}, this.props, {
-        ref: this.ReactDataGridRef,
-        columns: columns // 表头
-        // rows={rows}
-        , rowGetter: this.rowGetter // 获取行数据
-        , rowsCount: this.getSize() // 行数
-        , onGridSort: this.onGridSort
-      }, objReactDataGridProps, objOtherProps)),
-      totalFlag ? _react2['default'].createElement(
         'div',
-        null,
-        objTotal && Object.keys(objTotal).map(function (key, index) {
-          return _react2['default'].createElement(
-            'span',
-            { key: key },
-            index === 0 ? '' : '；',
-            _react2['default'].createElement(
-              'span',
-              null,
-              objTotal[key].name,
-              '\uFF1A'
-            ),
-            _react2['default'].createElement(
-              'span',
-              null,
-              ' ',
-              objTotal[key].numberFormat ? _this2.touchFormatNum(objTotal[key].value) : objTotal[key].value,
-              ' ',
-              objTotal[key].unit || ''
-            )
-          );
-        })
-      ) : '',
-      visible ? _react2['default'].createElement(_Easy3wEditBigTableForm2['default'] // 批量录入Modal
-      , { visible: visible // 是否显示
-        , objOtherParameters: (0, _extends3['default'])({}, objToolbarProps, { // 工具栏属性
+        { className: (0, _classnames2['default'])(['Easy3wEditBigTable']) },
+        _react2['default'].createElement(
+          'style',
+          null,
+          strReactDataGridStyle || (strAddReactDataGridStyle || '') + '\n                .custom-edit-cell {\n                  background-color: #f6ffed;\n                }\n              '
+        ),
+        _react2['default'].createElement(_reactDataGrid2['default'], (0, _extends3['default'])({}, this.props, {
+          ref: this.ReactDataGridRef,
           columns: columns // 表头
-        }) // 其他参数
-        , bidPureComponent: function bidPureComponent(that) {
-          return _this2.bidPureComponent('Easy3wEditBigTableForm', that);
-        } // 绑定组件
-        , confirmCallback: this.confirmCallbackBatchEditBigTable,
-        hideModal: this.hideModalBatchEditBigTable
-      }) : ''
+          // rows={rows}
+          , rowGetter: this.rowGetter // 获取行数据
+          , rowsCount: this.getSize() // 行数
+          , onGridSort: this.onGridSort
+        }, objReactDataGridProps, objOtherProps)),
+        totalFlag ? _react2['default'].createElement(
+          'div',
+          null,
+          objTotal && Object.keys(objTotal).map(function (key, index) {
+            return _react2['default'].createElement(
+              'span',
+              { key: key },
+              index === 0 ? '' : '；',
+              _react2['default'].createElement(
+                'span',
+                null,
+                objTotal[key].name,
+                '\uFF1A'
+              ),
+              _react2['default'].createElement(
+                'span',
+                null,
+                ' ',
+                objTotal[key].numberFormat ? _this2.touchFormatNum(objTotal[key].value) : objTotal[key].value,
+                ' ',
+                objTotal[key].unit || ''
+              )
+            );
+          })
+        ) : '',
+        visible ? _react2['default'].createElement(_Easy3wEditBigTableForm2['default'] // 批量录入Modal
+        , { visible: visible // 是否显示
+          , objOtherParameters: (0, _extends3['default'])({}, objToolbarProps, { // 工具栏属性
+            columns: columns // 表头
+          }) // 其他参数
+          , bidPureComponent: function bidPureComponent(that) {
+            return _this2.bidPureComponent('Easy3wEditBigTableForm', that);
+          } // 绑定组件
+          , confirmCallback: this.confirmCallbackBatchEditBigTable,
+          hideModal: this.hideModalBatchEditBigTable
+        }) : ''
+      )
     );
   };
 
@@ -1309,6 +1322,25 @@ var _initialiseProps = function _initialiseProps() {
     return { arrRequiredMessage: arrRequiredMessage, strCheckFailRows: strCheckFailRows };
   };
 
+  this.getLoading = function () {
+    var spinLoading = false;
+    var queryApi = _this3.props.queryApi;
+    var globalFetch = _this3.props.loading.globalFetch;
+
+    if (queryApi && typeof queryApi === 'string') {
+      spinLoading = globalFetch[queryApi];
+    } else if (queryApi && queryApi instanceof Array && queryApi.length) {
+      queryApi.map(function (str) {
+        var spinLoadingC = globalFetch[str];
+        if (spinLoadingC) {
+          spinLoading = spinLoadingC;
+        }
+        return str;
+      });
+    }
+    return spinLoading;
+  };
+
   this.touchFormatNum = function (num) {
     return _this3.checkNum(num) ? (0, _numeral2['default'])(num).format('0,0.00') : num || '';
   };
@@ -1319,5 +1351,9 @@ var _initialiseProps = function _initialiseProps() {
   };
 };
 
-exports['default'] = Easy3wEditBigTable;
+exports['default'] = (0, _dva.connect)(function (state) {
+  return {
+    loading: state.loading
+  };
+})(Easy3wEditBigTable);
 module.exports = exports['default'];

package/lib/Easy3wFormPage/indexM.js

@@ -215,20 +215,23 @@ var _easy3wui = require('easy3wui');
 
 var _comonConfig = require('comonConfigPath/comonConfig');
 
+var _Easy3wSpin = require('../Easy3wSpin');
+
+var _Easy3wSpin2 = _interopRequireDefault(_Easy3wSpin);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
-// 引入富文本表格功能
+// import TagSelect from '../Easy3wTagSelect/index.js';
+// import Easy3wUpload from '../../Easy3wUpload';
+// import Easy3wUploadB from '../../Easy3wUploadB';
+// import Easy3wUploadM from '../../Easy3wUploadM';
 var objOptions = {
   defaultRows: 3, // 默认行数
   defaultColumns: 3, // 默认列数
   withDropdown: false, // 插入表格前是否弹出下拉菜单
   columnResizable: false, // 是否允许拖动调整列宽， 默认false
   exportAttrString: 'style="border: 1"' // 指定输出HTML时附加到table标签上的属性字符串
-};
-// import TagSelect from '../Easy3wTagSelect/index.js';
-// import Easy3wUpload from '../../Easy3wUpload';
-// import Easy3wUploadB from '../../Easy3wUploadB';
-// import Easy3wUploadM from '../../Easy3wUploadM';
+}; // 引入富文本表格功能
 
 _braftEditor2['default'].use((0, _table2['default'])(objOptions)); // 表格
 
@@ -2398,6 +2401,23 @@ var Easy3wFormPageM = exports.Easy3wFormPageM = function (_Component) {
         },
         cName
       );
+    }, _this.getFormLoading = function () {
+      var spinLoading = false;
+      var queryApi = _this.props.queryApi;
+      var globalFetch = _this.props.loadingFlag.globalFetch;
+
+      if (queryApi && typeof queryApi === 'string') {
+        spinLoading = globalFetch[queryApi];
+      } else if (queryApi && queryApi instanceof Array && queryApi.length) {
+        queryApi.map(function (str) {
+          var spinLoadingC = globalFetch[str];
+          if (spinLoadingC) {
+            spinLoading = spinLoadingC;
+          }
+          return str;
+        });
+      }
+      return spinLoading;
     }, _temp), (0, _possibleConstructorReturn3['default'])(_this, _ret);
   }
   // #region 获取字段配置
@@ -2581,14 +2601,20 @@ var Easy3wFormPageM = exports.Easy3wFormPageM = function (_Component) {
 
   /** strHandler start */
 
-
   /** strHandler end */
+  // 获取表单loading状态
+
 
   Easy3wFormPageM.prototype.render = function render() {
+    var spinLoading = this.getFormLoading();
     return _react2['default'].createElement(
-      'div',
-      { className: (0, _classnames2['default'])(['e3wFormPageWrap']) },
-      this.getAllForms()
+      _Easy3wSpin2['default'],
+      { noStyle: true, spinLoading: spinLoading },
+      _react2['default'].createElement(
+        'div',
+        { className: (0, _classnames2['default'])(['e3wFormPageWrap']) },
+        this.getAllForms()
+      )
     );
   };
 
@@ -4278,6 +4304,23 @@ var Easy3wFormPageTightM = exports.Easy3wFormPageTightM = function (_Component2)
         },
         cName
       );
+    }, _this2.getFormLoading = function () {
+      var spinLoading = false;
+      var queryApi = _this2.props.queryApi;
+      var globalFetch = _this2.props.loadingFlag.globalFetch;
+
+      if (queryApi && typeof queryApi === 'string') {
+        spinLoading = globalFetch[queryApi];
+      } else if (queryApi && queryApi instanceof Array && queryApi.length) {
+        queryApi.map(function (str) {
+          var spinLoadingC = globalFetch[str];
+          if (spinLoadingC) {
+            spinLoading = spinLoadingC;
+          }
+          return str;
+        });
+      }
+      return spinLoading;
     }, _temp2), (0, _possibleConstructorReturn3['default'])(_this2, _ret2);
   }
 
@@ -4436,10 +4479,12 @@ var Easy3wFormPageTightM = exports.Easy3wFormPageTightM = function (_Component2)
 
   /** strHandler start */
 
-
   /** strHandler end */
+  // 获取表单loading状态
+
 
   Easy3wFormPageTightM.prototype.render = function render() {
+    var spinLoading = this.getFormLoading();
     var getAllForms = this.getAllForms();
     var borderFlag = this.props.borderFlag;
     // noLabelFlag 布尔值
@@ -4451,12 +4496,16 @@ var Easy3wFormPageTightM = exports.Easy3wFormPageTightM = function (_Component2)
       noBorderFlag = _comonConfig.noBorderFlag;
     }
     return _react2['default'].createElement(
-      'div',
-      { className: (0, _classnames2['default'])(['e3wFormPageWrapTight']) },
+      _Easy3wSpin2['default'],
+      { noStyle: true, spinLoading: spinLoading },
       _react2['default'].createElement(
         'div',
-        { className: (0, _classnames2['default'])(noBorderFlag ? ['e3wFormPageNoBorder'] : ['e3wFormPage']) },
-        getAllForms
+        { className: (0, _classnames2['default'])(['e3wFormPageWrapTight']) },
+        _react2['default'].createElement(
+          'div',
+          { className: (0, _classnames2['default'])(noBorderFlag ? ['e3wFormPageNoBorder'] : ['e3wFormPage']) },
+          getAllForms
+        )
       )
     );
     // if (noBorderFlag) {

package/lib/Easy3wFormPage/indexPC.js

@@ -215,20 +215,23 @@ var _easy3wui = require('easy3wui');
 
 var _comonConfig = require('comonConfigPath/comonConfig');
 
+var _Easy3wSpin = require('../Easy3wSpin');
+
+var _Easy3wSpin2 = _interopRequireDefault(_Easy3wSpin);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
-// 引入富文本表格功能
+// import TagSelect from '../Easy3wTagSelect/index.js';
+// import Easy3wUpload from '../../Easy3wUpload';
+// import Easy3wUploadB from '../../Easy3wUploadB';
+// import Easy3wUploadM from '../../Easy3wUploadM';
 var objOptions = {
   defaultRows: 3, // 默认行数
   defaultColumns: 3, // 默认列数
   withDropdown: false, // 插入表格前是否弹出下拉菜单
   columnResizable: false, // 是否允许拖动调整列宽， 默认false
   exportAttrString: 'style="border: 1"' // 指定输出HTML时附加到table标签上的属性字符串
-};
-// import TagSelect from '../Easy3wTagSelect/index.js';
-// import Easy3wUpload from '../../Easy3wUpload';
-// import Easy3wUploadB from '../../Easy3wUploadB';
-// import Easy3wUploadM from '../../Easy3wUploadM';
+}; // 引入富文本表格功能
 
 _braftEditor2['default'].use((0, _table2['default'])(objOptions)); // 表格
 
@@ -2249,6 +2252,23 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
         },
         cName
       );
+    }, _this.getFormLoading = function () {
+      var spinLoading = false;
+      var queryApi = _this.props.queryApi;
+      var globalFetch = _this.props.loadingFlag.globalFetch;
+
+      if (queryApi && typeof queryApi === 'string') {
+        spinLoading = globalFetch[queryApi];
+      } else if (queryApi && queryApi instanceof Array && queryApi.length) {
+        queryApi.map(function (str) {
+          var spinLoadingC = globalFetch[str];
+          if (spinLoadingC) {
+            spinLoading = spinLoadingC;
+          }
+          return str;
+        });
+      }
+      return spinLoading;
     }, _temp), (0, _possibleConstructorReturn3['default'])(_this, _ret);
   }
   // #region 获取字段配置
@@ -2427,14 +2447,22 @@ var Easy3wFormPagePC = exports.Easy3wFormPagePC = function (_Component) {
 
   /** strHandler start */
 
-
   /** strHandler end */
+  // #region 获取表单loading状态
+
+
+  // #endregion 获取表单loading状态
 
   Easy3wFormPagePC.prototype.render = function render() {
+    var spinLoading = this.getFormLoading();
     return _react2['default'].createElement(
-      'div',
-      { className: (0, _classnames2['default'])(['e3wFormPageWrap']) },
-      this.getAllForms()
+      _Easy3wSpin2['default'],
+      { noStyle: true, spinLoading: spinLoading },
+      _react2['default'].createElement(
+        'div',
+        { className: (0, _classnames2['default'])(['e3wFormPageWrap']) },
+        this.getAllForms()
+      )
     );
   };
 
@@ -4013,6 +4041,23 @@ var Easy3wFormPageTightPC = exports.Easy3wFormPageTightPC = function (_Component
         },
         cName
       );
+    }, _this2.getFormLoading = function () {
+      var spinLoading = false;
+      var queryApi = _this2.props.queryApi;
+      var globalFetch = _this2.props.loadingFlag.globalFetch;
+
+      if (queryApi && typeof queryApi === 'string') {
+        spinLoading = globalFetch[queryApi];
+      } else if (queryApi && queryApi instanceof Array && queryApi.length) {
+        queryApi.map(function (str) {
+          var spinLoadingC = globalFetch[str];
+          if (spinLoadingC) {
+            spinLoading = spinLoadingC;
+          }
+          return str;
+        });
+      }
+      return spinLoading;
     }, _temp2), (0, _possibleConstructorReturn3['default'])(_this2, _ret2);
   }
   /** 使用何种表单域 */
@@ -4168,10 +4213,14 @@ var Easy3wFormPageTightPC = exports.Easy3wFormPageTightPC = function (_Component
 
   /** strHandler start */
 
-
   /** strHandler end */
+  // #region 获取表单loading状态
+
+
+  // #endregion 获取表单loading状态
 
   Easy3wFormPageTightPC.prototype.render = function render() {
+    var spinLoading = this.getFormLoading();
     var getAllForms = this.getAllForms();
     var borderFlag = this.props.borderFlag;
     // noLabelFlag 布尔值
@@ -4183,12 +4232,16 @@ var Easy3wFormPageTightPC = exports.Easy3wFormPageTightPC = function (_Component
       noBorderFlag = _comonConfig.noBorderFlag;
     }
     return _react2['default'].createElement(
-      'div',
-      { className: (0, _classnames2['default'])(['e3wFormPageWrapTight']) },
+      _Easy3wSpin2['default'],
+      { noStyle: true, spinLoading: spinLoading },
       _react2['default'].createElement(
         'div',
-        { className: (0, _classnames2['default'])(noBorderFlag ? ['e3wFormPageNoBorder'] : ['e3wFormPage']) },
-        getAllForms
+        { className: (0, _classnames2['default'])(['e3wFormPageWrapTight']) },
+        _react2['default'].createElement(
+          'div',
+          { className: (0, _classnames2['default'])(noBorderFlag ? ['e3wFormPageNoBorder'] : ['e3wFormPage']) },
+          getAllForms
+        )
       )
     );
     // if (noBorderFlag) {

package/lib/Easy3wGridPage/index.js

@@ -17,7 +17,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'd
 var isMobile = window.matchMedia('(max-width: 768px)').matches;
 exports['default'] = (0, _dva.connect)(function (state) {
   return {
-    globalData: state.globalData
+    globalData: state.globalData,
+    loading: state.loading
   };
 })(isMobile ? _indexM2['default'] : _indexPC2['default']);
 module.exports = exports['default'];

package/lib/Easy3wGridPage/indexM.js

@@ -130,8 +130,11 @@ var Easy3wGridPageM = function (_Component) {
   };
   // #region 获取表头
 
-
   // #endregion 获取表头
+  // #region 获取loading状态
+
+
+  // #endregion 获取loading状态
   Easy3wGridPageM.prototype.render = function render() {
     var _this2 = this;
 
@@ -139,7 +142,6 @@ var Easy3wGridPageM = function (_Component) {
         columns = _props.columns,
         totalResult = _props.totalResult,
         dataList = _props.dataList,
-        loading = _props.loading,
         getCheckboxProps = _props.getCheckboxProps,
         needPaginationFlag = _props.needPaginationFlag,
         autoAddNumber = _props.autoAddNumber,
@@ -339,7 +341,7 @@ var Easy3wGridPageM = function (_Component) {
           '\u6E05\u7A7A'
         )
       ), type: 'info' });
-
+    var spinLoading = this.getLoading();
     // console.log('父级是否有 .e3wFormPageWrap:', hasParentClass);
     return _react2['default'].createElement(
       _react2['default'].Fragment,
@@ -355,7 +357,7 @@ var Easy3wGridPageM = function (_Component) {
             columns: myColumns,
             dataSource: dataList,
             pagination: paginationProps,
-            loading: loading,
+            loading: spinLoading,
             rowKey: rowKey,
             rowSelection: rowSelection,
             bordered: bordered,
@@ -876,6 +878,25 @@ var _initialiseProps = function _initialiseProps() {
     });
     return myColumns;
   };
+
+  this.getLoading = function () {
+    var spinLoading = false;
+    var queryApi = _this3.props.queryApi;
+    var globalFetch = _this3.props.loading.globalFetch;
+
+    if (queryApi && typeof queryApi === 'string') {
+      spinLoading = globalFetch[queryApi];
+    } else if (queryApi && queryApi instanceof Array && queryApi.length) {
+      queryApi.map(function (str) {
+        var spinLoadingC = globalFetch[str];
+        if (spinLoadingC) {
+          spinLoading = spinLoadingC;
+        }
+        return str;
+      });
+    }
+    return spinLoading;
+  };
 };
 
 exports['default'] = Easy3wGridPageM;

package/lib/Easy3wGridPage/indexPC.js

@@ -76,6 +76,10 @@ var _easy3wui = require('easy3wui');
 
 var _comonConfig = require('comonConfigPath/comonConfig');
 
+var _Easy3wSpin = require('../Easy3wSpin');
+
+var _Easy3wSpin2 = _interopRequireDefault(_Easy3wSpin);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
 var Easy3wGridPagePC = function (_Component) {
@@ -130,8 +134,11 @@ var Easy3wGridPagePC = function (_Component) {
   };
   // #region 获取表头
 
-
   // #endregion 获取表头
+  // #region 获取loading状态
+
+
+  // #endregion 获取loading状态
   Easy3wGridPagePC.prototype.render = function render() {
     var _this2 = this;
 
@@ -139,7 +146,6 @@ var Easy3wGridPagePC = function (_Component) {
         columns = _props.columns,
         totalResult = _props.totalResult,
         dataList = _props.dataList,
-        loading = _props.loading,
         getCheckboxProps = _props.getCheckboxProps,
         needPaginationFlag = _props.needPaginationFlag,
         autoAddNumber = _props.autoAddNumber,
@@ -320,7 +326,7 @@ var Easy3wGridPagePC = function (_Component) {
           '\u6E05\u7A7A'
         )
       ), type: 'info' });
-
+    var spinLoading = this.getLoading();
     // console.log('父级是否有 .e3wFormPageWrap:', hasParentClass);
     return _react2['default'].createElement(
       'div',
@@ -330,7 +336,7 @@ var Easy3wGridPagePC = function (_Component) {
         columns: myColumns,
         dataSource: dataList,
         pagination: paginationProps,
-        loading: loading,
+        loading: spinLoading,
         rowKey: rowKey,
         rowSelection: rowSelection,
         bordered: bordered,
@@ -849,6 +855,25 @@ var _initialiseProps = function _initialiseProps() {
     });
     return myColumns;
   };
+
+  this.getLoading = function () {
+    var spinLoading = false;
+    var queryApi = _this3.props.queryApi;
+    var globalFetch = _this3.props.loading.globalFetch;
+
+    if (queryApi && typeof queryApi === 'string') {
+      spinLoading = globalFetch[queryApi];
+    } else if (queryApi && queryApi instanceof Array && queryApi.length) {
+      queryApi.map(function (str) {
+        var spinLoadingC = globalFetch[str];
+        if (spinLoadingC) {
+          spinLoading = spinLoadingC;
+        }
+        return str;
+      });
+    }
+    return spinLoading;
+  };
 };
 
 exports['default'] = Easy3wGridPagePC;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy3wui",
-  "version": "1.5.85-beta.4",
+  "version": "1.5.85-beta.6",
   "description": "easy3wui components for react",
   "keywords": [
     "react",