uepay-mesh 4.0.1 → 4.0.2

package/mesh/table/formQueryAbleTable.js

@@ -122,6 +122,7 @@ FormQueryAbleTable.propTypes = _objectSpread({}, _queryAbleTable.default.propTyp
 FormQueryAbleTable.defaultProps = _objectSpread(_objectSpread({}, _queryAbleTable.default.defaultProps), {}, {
   options: {
     add: true,
+    multiple: true,
     search: true,
     setting: true,
     excel: true,

package/mesh/table/queryAbleTable.js

@@ -23,6 +23,8 @@ var _queryAbleTableContext = require("./context/queryAbleTableContext");
 
 var _serverEnums = require("../config/serverEnums");
 
+var _remove = require("../crud/remove");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
@@ -171,6 +173,40 @@ class QueryAbleTable extends _react.default.Component {
 
     _defineProperty(this, "handleExcel", () => {});
 
+    _defineProperty(this, "handleBatchDelete", records => {
+      const {
+        host
+      } = this.props,
+            {
+        collect,
+        collectId
+      } = this,
+            _this = this;
+
+      _this.setState({
+        loading: true
+      });
+
+      (0, _remove.removeRecords)({
+        host,
+        collect,
+        collectId,
+        records,
+        bpm: {
+          isDraft: false
+        },
+        handle: (state, msg, sucPkList) => {
+          if ('SUC' === state) {
+            _this.flush();
+          } else {}
+
+          _this.setState({
+            loading: false
+          });
+        }
+      });
+    });
+
     _defineProperty(this, "flush", () => {
       this.tableDom.conditionSearch();
     });
@@ -351,6 +387,7 @@ class QueryAbleTable extends _react.default.Component {
           loading: loading,
           result: result,
           actionColumn: this.getActionColumn(),
+          onBatchDelete: this.handleBatchDelete,
           onAction: this.handleAction,
           pkLabel: pkName
         });

package/mesh/table/standardTable/actionColumnForm/deleteRow.js

@@ -105,6 +105,7 @@ function DeleteOptions(_ref3) {
       bpm: {
         isDraft: false
       },
+      //TODO 刪除暫時不考慮流程
       handle: handleResult
     });
   }

package/mesh/table/standardTable/tableOptions.js

@@ -25,6 +25,10 @@ var _ClearOutlined = _interopRequireDefault(require("@ant-design/icons/lib/icons
 
 var _withReduxSearch = require("../../hoc/withReduxSearch");
 
+var _OrderedListOutlined = _interopRequireDefault(require("@ant-design/icons/lib/icons/OrderedListOutlined"));
+
+var _multiOptions = _interopRequireDefault(require("./tableOptons/multiOptions"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -80,11 +84,13 @@ const initOptions = collectId => {
   return retOptions;
 };
 /**
+ * @param props.multiple
  * @param props.reduxSearch {ReduxSearch}
  * @param props.onSearch {Function}
  * @param props.deliverAuth {Number} 授权权限
  * @param props.collect {Object} 数据集对象
  * @param props.columns {Array} 已经过滤的列表显示字段
+ * @param props.onMultiple {Function} (multiVisible)=>{是否激活多选}
  * @param props.onModify {Function} (options:{tableSize, columnRelation, pageSize, excludeKeys})=>{}
  * @example options：{
  *     excel: 显示Excel操作框
@@ -159,6 +165,14 @@ class TableOptions extends _react.default.Component {
       });
     });
 
+    _defineProperty(this, "handleMultiple", () => {
+      this.props.onMultiple(true);
+    });
+
+    _defineProperty(this, "handleMultipleCancel", () => {
+      this.props.onMultiple(false);
+    });
+
     _defineProperty(this, "handleAddFile", () => {
       this.props.onAction(_serverEnums.OptionsState.ADD);
     });
@@ -184,9 +198,28 @@ class TableOptions extends _react.default.Component {
     };
   }
 
+  /**
+   * 检查是否具有新增权限
+   * @param opt
+   * @param auth
+   * @param deliverAuth
+   * @return {*|boolean}
+   */
   static checkAddAuth(opt, auth, deliverAuth) {
     return opt && deliverAuth >= _serverEnums.OptionsFlag.ADD && _serverEnums.OptionsFlag.ADD === (auth & _serverEnums.OptionsFlag.ADD);
   }
+  /**
+   * 检查是否具有删除权限
+   * @param opt
+   * @param auth
+   * @param deliverAuth
+   * @return {*|boolean}
+   */
+
+
+  static checkDeleteAuth(opt, auth, deliverAuth) {
+    return opt && deliverAuth >= _serverEnums.OptionsFlag.DEL && _serverEnums.OptionsFlag.DEL === (auth & _serverEnums.OptionsFlag.DEL);
+  }
 
   render() {
     const {
@@ -197,16 +230,26 @@ class TableOptions extends _react.default.Component {
       excludeKeys
     } = this.state,
           {
+      loading,
       collect,
       columns,
       options,
       deliverAuth,
-      reduxSearch
+      multiple,
+      reduxSearch,
+      onMultiDelete
     } = this.props;
-    return /*#__PURE__*/_react.default.createElement("span", null, /*#__PURE__*/_react.default.createElement(ButtonGroup, null, options.excel && /*#__PURE__*/_react.default.createElement(_antd.Button, {
+    return /*#__PURE__*/_react.default.createElement("span", null, multiple ? /*#__PURE__*/_react.default.createElement(_multiOptions.default, {
+      loading: loading,
+      onBatchCancel: this.handleMultipleCancel,
+      onBatchDelete: onMultiDelete
+    }) : /*#__PURE__*/_react.default.createElement(ButtonGroup, null, options.excel && /*#__PURE__*/_react.default.createElement(_antd.Button, {
       icon: /*#__PURE__*/_react.default.createElement(_icons.FileExcelOutlined, null),
       onClick: this.props.onExcel
-    }, "Excel"), TableOptions.checkAddAuth(options.add, collect.options, deliverAuth) && /*#__PURE__*/_react.default.createElement(_antd.Button, {
+    }, "Excel"), TableOptions.checkDeleteAuth(options.multiple, collect.options, deliverAuth) && /*#__PURE__*/_react.default.createElement(_antd.Button, {
+      icon: /*#__PURE__*/_react.default.createElement(_OrderedListOutlined.default, null),
+      onClick: this.handleMultiple
+    }, "\u591A\u9078"), TableOptions.checkAddAuth(options.add, collect.options, deliverAuth) && /*#__PURE__*/_react.default.createElement(_antd.Button, {
       icon: /*#__PURE__*/_react.default.createElement(_icons.PlusOutlined, null),
       onClick: this.handleAddFile
     }, "\u65B0\u589E"), options.search && /*#__PURE__*/_react.default.createElement(_antd.Button, {
@@ -260,8 +303,12 @@ class TableOptions extends _react.default.Component {
 }
 
 TableOptions.propTypes = {
+  loading: _propTypes.default.bool,
   collect: _propTypes.default.object.isRequired,
   options: _propTypes.default.object.isRequired,
+  multiple: _propTypes.default.bool.isRequired,
+  onMultiDelete: _propTypes.default.func.isRequired,
+  onMultiple: _propTypes.default.func.isRequired,
   onSearch: _propTypes.default.func.isRequired,
   onModify: _propTypes.default.func.isRequired,
   onExcel: _propTypes.default.func,

package/mesh/table/standardTable/tableOptons/multiOptions.js

@@ -0,0 +1,42 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _antd = require("antd");
+
+var _DeleteOutlined = _interopRequireDefault(require("@ant-design/icons/lib/icons/DeleteOutlined"));
+
+var _RollbackOutlined = _interopRequireDefault(require("@ant-design/icons/lib/icons/RollbackOutlined"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const ButtonGroup = _antd.Button.Group;
+
+function MultiOptions(_ref) {
+  let {
+    loading,
+    onBatchDelete,
+    onBatchCancel
+  } = _ref;
+  return /*#__PURE__*/_react.default.createElement(ButtonGroup, null, /*#__PURE__*/_react.default.createElement(_antd.Popconfirm, {
+    title: "\u5220\u9664\u540E\u6570\u636E\u5C07\u7121\u6CD5\u6062\u5FA9\uFF0C\u78BA\u8A8D\u522A\u9664?",
+    onConfirm: onBatchDelete
+  }, /*#__PURE__*/_react.default.createElement(_antd.Button, {
+    loading: loading,
+    icon: /*#__PURE__*/_react.default.createElement(_DeleteOutlined.default, null)
+  }, "\u522A\u9664")), /*#__PURE__*/_react.default.createElement(_antd.Popconfirm, {
+    title: "\u4FEE\u6539\u6578\u64DA\u5C1A\u672A\u63D0\u4EA4\uFF0C\u78BA\u8A8D\u53D6\u6D88?",
+    onConfirm: onBatchCancel
+  }, /*#__PURE__*/_react.default.createElement(_antd.Button, {
+    loading: loading,
+    icon: /*#__PURE__*/_react.default.createElement(_RollbackOutlined.default, null)
+  }, "\u53D6\u6D88")));
+}
+
+var _default = MultiOptions;
+exports.default = _default;

package/mesh/table/standardTable.js

@@ -179,6 +179,17 @@ class StandardTable extends _react.default.Component {
       })();
     });
 
+    _defineProperty(this, "handleMultipleChange", multiVisible => {
+      this.multiRows = [];
+      this.setState({
+        multiVisible
+      });
+    });
+
+    _defineProperty(this, "handleBatchDelete", () => {
+      this.props.onBatchDelete(this.multiRows);
+    });
+
     _defineProperty(this, "handleTableChange", (pagination, filters, inputSorter, _ref2) => {
       let {
         currentDataSource,
@@ -234,7 +245,9 @@ class StandardTable extends _react.default.Component {
 
     this.state = {
       excludeKeys: _excludeKeys,
-      tableSize: _tableSize
+      tableSize: _tableSize,
+      multiVisible: false //支持table列表的多选操作，目前仅支持删除项。是否激活
+
     };
     this.page = {
       size: _pageSize,
@@ -242,6 +255,17 @@ class StandardTable extends _react.default.Component {
       to: 0 + _pageSize
     };
     this.columnRelation = _columnRelation; //字段並列信息
+
+    this.multiRows = [];
+
+    const _this2 = this;
+
+    this.rowSelection = {
+      type: "checkbox",
+      onChange: function onChange(keys, rows) {
+        _this2.multiRows = rows;
+      }
+    };
   }
   /**
    * 處理列表數據
@@ -312,7 +336,8 @@ class StandardTable extends _react.default.Component {
       showSizeChanger: false,
       showQuickJumper: true
     } : false;
-  }
+  } //操作选项变更
+
 
   handleRowClass() {
     return 'uepay-row';
@@ -463,7 +488,8 @@ class StandardTable extends _react.default.Component {
     } = result,
           {
       tableSize,
-      excludeKeys
+      excludeKeys,
+      multiVisible
     } = this.state,
           {
       onRow,
@@ -493,7 +519,11 @@ class StandardTable extends _react.default.Component {
     })), /*#__PURE__*/_react.default.createElement("div", {
       className: "default-opt"
     }, /*#__PURE__*/_react.default.createElement(_tableOptions.default, {
+      loading: loading,
       options: options,
+      multiple: multiVisible,
+      onMultiple: this.handleMultipleChange,
+      onMultiDelete: this.handleBatchDelete,
       collect: collect,
       columns: this.columns,
       deliverAuth: deliverAuth,
@@ -503,6 +533,7 @@ class StandardTable extends _react.default.Component {
       onExcel: this.handleExcel,
       onAction: onAction
     }))), /*#__PURE__*/_react.default.createElement(_antd.Table, _extends({
+      rowSelection: multiVisible ? this.rowSelection : false,
       size: size || tableSize,
       dataSource: dataSource,
       onChange: this.handleTableChange,
@@ -542,6 +573,7 @@ StandardTable.propTypes = {
   //查询结果信息
   onQuery: _propTypes.default.func.isRequired,
   onExcel: _propTypes.default.func,
+  onBatchDelete: _propTypes.default.func,
   size: _propTypes.default.oneOfType([_propTypes.default.bool, _propTypes.default.string]),
   pageOptions: _propTypes.default.oneOfType([_propTypes.default.bool, _propTypes.default.object]),
   pageSize: _propTypes.default.number,
@@ -552,6 +584,7 @@ StandardTable.defaultProps = {
   options: {
     add: true,
     //添加新行按钮
+    multiple: true,
     search: true,
     //添加搜索按钮
     setting: true,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "uepay-mesh",
-    "version": "4.0.1",
+    "version": "4.0.2",
     "description": "数据中心数据集设计工具前端",
     "main": "index.js",
     "typings": "index.d.ts",
@@ -31,7 +31,7 @@
         "@ant-design/icons": "^4.2.1",
         "@zeit/next-css": "^1.0.1",
         "@zeit/next-sass": "^1.0.1",
-        "antd": "^4.16.11",
+        "antd": "^4.17.4",
         "babel-plugin-import": "^1.12.2",
         "classnames": "^2.2.6",
         "core-js": "^2.6.11",
@@ -44,7 +44,7 @@
         "node-sass": "^4.13.0",
         "react": "^16.12.0",
         "react-dom": "^16.12.0",
-        "uepay-mesh": "4.0.1",
+        "uepay-mesh": "4.0.2",
         "uepay-ops2": "4.0.1"
     }
 }