uepay-mesh 4.0.12 → 4.0.13

package/common/model/delayTip.js

@@ -0,0 +1,92 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+require("core-js/modules/web.dom.iterable.js");
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _antd = require("antd");
+
+var _ExclamationCircleOutlined = _interopRequireDefault(require("@ant-design/icons/lib/icons/ExclamationCircleOutlined"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+const {
+  warning
+} = _antd.Modal;
+
+function Empty() {}
+
+;
+/**
+ *
+ * @param title
+ * @param content
+ * @param delayTip {string} 延遲提示的信息
+ * @param delaySecond {number} 默認延遲時間 秒
+ * @param onCancel
+ * @param onComplete
+ */
+
+function delayTip(title, content) {
+  let delayTip = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '執行';
+  let delaySecond = arguments.length > 3 ? arguments[3] : undefined;
+  let onComplete = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : Empty;
+  let onCancel = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : Empty;
+
+  function handleDelayComplete() {
+    instance.destroy();
+    onComplete();
+  }
+
+  const instance = warning({
+    title: title,
+    icon: /*#__PURE__*/_react.default.createElement(_ExclamationCircleOutlined.default, null),
+    content: /*#__PURE__*/_react.default.createElement(_antd.Spin, null, /*#__PURE__*/_react.default.createElement(_antd.Alert, {
+      message: content,
+      type: "info"
+    })),
+    okText: /*#__PURE__*/_react.default.createElement(DelayBtn, {
+      delayTip: delayTip,
+      delaySecond: delaySecond,
+      onDelayComplete: handleDelayComplete
+    }),
+    okType: 'ghost',
+    onOk: onCancel
+  });
+}
+
+var _default = delayTip;
+exports.default = _default;
+
+function DelayBtn(_ref) {
+  let {
+    delayTip,
+    delaySecond,
+    onDelayComplete
+  } = _ref;
+  const [delay, setDelay] = (0, _react.useState)(delaySecond);
+  (0, _react.useEffect)(() => {
+    const idl = setInterval(() => {
+      setDelay(prev => {
+        const now = prev - 1;
+
+        if (0 === now) {
+          onDelayComplete();
+          clearInterval(idl);
+        }
+
+        return now;
+      });
+    }, 1000);
+  }, []);
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, "\u53D6\u6D88(", delay, "\u79D2\u540E", delayTip, ")");
+}

package/mesh/config/authOptions.js

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.OptValidateUtil = exports.OptTypeList = exports.OptTypeDict = exports.OptType = exports.OptCombineUtil = void 0;
 
-var _serverEnums = require("./serverEnums");
-
 /**
  * 表單、表格權限控制相關的數據和相關識別功能。
  * 所有的權限識別配置都使用2進制占位的方式實現=>1、10、100、1000、10000。位真則具備該權限。

package/mesh/config/clientEnums.js

@@ -0,0 +1,40 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.PipeType = void 0;
+
+/**
+ * 客戶端進行操作時分配的綫程類型
+ * @type {{MulitWorker: number, CoreNio: number, SingleWorker: number}}
+ */
+const PipeType = {
+  /**
+   * 非柱塞類型，服務端會盡最大能力提供綫程支持此操作
+   */
+  CoreNio: {
+    value: 0,
+    label: '核心綫程',
+    tip: '非柱塞類型，服務端會盡最大能力提供綫程支持此操作'
+  },
+
+  /**
+   * 單一工作綫程。所有該類任務都會放置到一個異步隊列中，任務等待前序任務執行完畢后才會繼續執行
+   */
+  SingleWorker: {
+    value: 1,
+    label: '單一工作綫程',
+    tip: '單一工作綫程。所有該類任務都會放置到一個異步隊列中，任務等待前序任務執行完畢后才會繼續執行, 隊列超過一定長度會拒絕服務，前端重新等待'
+  },
+
+  /**
+   * 和SingleWorker的工作機制類似，只是更加
+   */
+  MulitWorker: {
+    value: 2,
+    label: '多個工作綫程',
+    tip: 'SingleWorker的工作機制類似，只是使用多個隊列在處理'
+  }
+};
+exports.PipeType = PipeType;

package/mesh/data/request.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.updateWithId = exports.updateWithClassDes = exports.listQueryWithId = exports.listQueryWithClassDes = exports.getCollectById = exports.formWithId = exports.formWithClassDes = exports.downloadWithId = exports.downloadWithClassDes = exports.deleteWithId = exports.deleteWithClassDes = exports.batchUpdateWithId = exports.batchUpdateWithClassDes = exports.batchAddWithId = exports.batchAddWithClassDes = exports.addWithId = exports.addWithClassDes = void 0;
+exports.updateWithId = exports.updateWithClassDes = exports.listQueryWithId = exports.listQueryWithClassDes = exports.getCollectById = exports.formWithId = exports.formWithClassDes = exports.deleteWithId = exports.deleteWithClassDes = exports.batchUpdateWithId = exports.batchUpdateWithClassDes = exports.batchAddWithId = exports.batchAddWithClassDes = exports.addWithId = exports.addWithClassDes = void 0;
 
 require("core-js/modules/es6.regexp.search.js");
 
@@ -67,7 +67,8 @@ const listQueryWithId = _ref3 => {
     collectId,
     search = false,
     sorter = false,
-    page = false
+    page = false,
+    pipe = 0
   } = _ref3;
   const params = {
     collectId
@@ -77,67 +78,7 @@ const listQueryWithId = _ref3 => {
   page && (params.page = page);
   const json = JSON.stringify(params),
         encode = encodeURIComponent(json);
-  return (0, _net.get)("".concat(host, "/data/mesh/execute/query?params=").concat(encode));
-};
-/**
- *
- * @param host
- * @param collectId
- * @param search
- * @param sorter
- * @param page
- * @return {Promise<Response>}
- */
-
-
-exports.listQueryWithId = listQueryWithId;
-
-const downloadWithClassDes = _ref4 => {
-  let {
-    host,
-    collect,
-    search = false,
-    sorter = false,
-    page = false
-  } = _ref4;
-  const params = {
-    collect
-  };
-  search && (params.search = search);
-  sorter && (params.sorter = sorter);
-  page && (params.page = page);
-  return (0, _net.post)("".concat(host, "/data/mesh/execute/preview/excel/download"), params);
-};
-/**
- *
- * @param host
- * @param collectId
- * @param search
- * @param sorter
- * @param page
- * @return {Promise<Response>}
- */
-
-
-exports.downloadWithClassDes = downloadWithClassDes;
-
-const downloadWithId = _ref5 => {
-  let {
-    host,
-    collectId,
-    search = false,
-    sorter = false,
-    page = false
-  } = _ref5;
-  const params = {
-    collectId
-  };
-  search && (params.search = search);
-  sorter && (params.sorter = sorter);
-  page && (params.page = page);
-  const json = JSON.stringify(params),
-        encode = encodeURIComponent(json);
-  return (0, _net.get)("".concat(host, "/data/mesh/execute/excel/download?params=").concat(encode));
+  return (0, _net.get)("".concat(host, "/data/mesh/execute/query?params=").concat(encode, "&pipe=").concat(pipe));
 };
 /**
  * 獲取單條數據
@@ -148,14 +89,14 @@ const downloadWithId = _ref5 => {
  */
 
 
-exports.downloadWithId = downloadWithId;
+exports.listQueryWithId = listQueryWithId;
 
-const formWithClassDes = _ref6 => {
+const formWithClassDes = _ref4 => {
   let {
     host,
     collect,
     pkData
-  } = _ref6;
+  } = _ref4;
   return (0, _net.post)("".concat(host, "/data/mesh/execute/preview/form"), {
     collect,
     pkData
@@ -172,12 +113,12 @@ const formWithClassDes = _ref6 => {
 
 exports.formWithClassDes = formWithClassDes;
 
-const formWithId = _ref7 => {
+const formWithId = _ref5 => {
   let {
     host,
     collectId,
     pkData
-  } = _ref7;
+  } = _ref5;
   return (0, _net.get)("".concat(host, "/data/mesh/execute/form?params=").concat(encodeURIComponent(JSON.stringify({
     collectId,
     pkData
@@ -197,7 +138,7 @@ const formWithId = _ref7 => {
 
 exports.formWithId = formWithId;
 
-const updateWithClassDes = _ref8 => {
+const updateWithClassDes = _ref6 => {
   let {
     host,
     collect,
@@ -205,7 +146,7 @@ const updateWithClassDes = _ref8 => {
     pkValue,
     data,
     bpm = null
-  } = _ref8;
+  } = _ref6;
   const dataList = [{
     data,
     pkData,
@@ -231,7 +172,7 @@ const updateWithClassDes = _ref8 => {
 
 exports.updateWithClassDes = updateWithClassDes;
 
-const updateWithId = _ref9 => {
+const updateWithId = _ref7 => {
   let {
     host,
     collectId,
@@ -239,7 +180,7 @@ const updateWithId = _ref9 => {
     pkValue,
     data,
     bpm = null
-  } = _ref9;
+  } = _ref7;
   const dataList = [{
     data,
     pkData,
@@ -273,13 +214,13 @@ const updateWithId = _ref9 => {
 
 exports.updateWithId = updateWithId;
 
-const batchUpdateWithClassDes = _ref10 => {
+const batchUpdateWithClassDes = _ref8 => {
   let {
     host,
     collect,
     dataList,
     bpm
-  } = _ref10;
+  } = _ref8;
   return (0, _net.post)("".concat(host, "/data/mesh/execute/preview/update"), {
     collect,
     dataList,
@@ -303,13 +244,13 @@ const batchUpdateWithClassDes = _ref10 => {
 
 exports.batchUpdateWithClassDes = batchUpdateWithClassDes;
 
-const batchUpdateWithId = _ref11 => {
+const batchUpdateWithId = _ref9 => {
   let {
     host,
     collectId,
     dataList,
     bpm
-  } = _ref11;
+  } = _ref9;
   return (0, _net.post)("".concat(host, "/data/mesh/execute/update"), {
     collectId,
     dataList,
@@ -329,13 +270,13 @@ const batchUpdateWithId = _ref11 => {
 
 exports.batchUpdateWithId = batchUpdateWithId;
 
-const addWithId = _ref12 => {
+const addWithId = _ref10 => {
   let {
     host,
     collectId,
     data,
     bpm
-  } = _ref12;
+  } = _ref10;
   const dataList = [{
     data
   }];
@@ -357,13 +298,13 @@ const addWithId = _ref12 => {
 
 exports.addWithId = addWithId;
 
-const addWithClassDes = _ref13 => {
+const addWithClassDes = _ref11 => {
   let {
     host,
     collect,
     data,
     bpm
-  } = _ref13;
+  } = _ref11;
   const dataList = [{
     data
   }];
@@ -385,13 +326,13 @@ const addWithClassDes = _ref13 => {
 
 exports.addWithClassDes = addWithClassDes;
 
-const batchAddWithId = _ref14 => {
+const batchAddWithId = _ref12 => {
   let {
     host,
     collectId,
     dataList,
     bpm
-  } = _ref14;
+  } = _ref12;
   return (0, _net.post)("".concat(host, "/data/mesh/execute/add"), {
     collectId,
     dataList,
@@ -410,13 +351,13 @@ const batchAddWithId = _ref14 => {
 
 exports.batchAddWithId = batchAddWithId;
 
-const batchAddWithClassDes = _ref15 => {
+const batchAddWithClassDes = _ref13 => {
   let {
     host,
     collect,
     dataList,
     bpm
-  } = _ref15;
+  } = _ref13;
   return (0, _net.post)("".concat(host, "/data/mesh/execute/preview/add"), {
     collect,
     dataList,
@@ -436,13 +377,13 @@ const batchAddWithClassDes = _ref15 => {
 
 exports.batchAddWithClassDes = batchAddWithClassDes;
 
-const deleteWithId = _ref16 => {
+const deleteWithId = _ref14 => {
   let {
     host,
     collectId,
     bpm,
     dataList
-  } = _ref16;
+  } = _ref14;
   return (0, _net.post)("".concat(host, "/data/mesh/execute/delete"), {
     collectId,
     dataList,
@@ -462,13 +403,13 @@ const deleteWithId = _ref16 => {
 
 exports.deleteWithId = deleteWithId;
 
-const deleteWithClassDes = _ref17 => {
+const deleteWithClassDes = _ref15 => {
   let {
     host,
     collect,
     bpm,
     dataList
-  } = _ref17;
+  } = _ref15;
   return (0, _net.post)("".concat(host, "/data/mesh/execute/preview/delete"), {
     collect,
     dataList,

package/mesh/define/collect/extension.js

@@ -0,0 +1,69 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.buildExtension = buildExtension;
+exports.combineExtension = combineExtension;
+exports.default = void 0;
+
+require("core-js/modules/web.dom.iterable.js");
+
+var _clientEnums = require("../../config/clientEnums");
+
+/**
+ 數據集的擴展對象，此對象僅用於前端解析。他是一個不可變對象
+ * @param json {string|boolean} json字符串
+ * @constructor
+ */
+function Extension(json) {
+  this.pipe = _clientEnums.PipeType.CoreNio.value;
+  const obj = json ? JSON.parse(json) : {};
+  obj.pipe && (this.pipe = obj.pipe);
+}
+
+Extension.prototype.toJson = function () {
+  return JSON.stringify(this);
+};
+/**
+ *
+ * @param other {Extension}
+ * @param combine {Object}
+ */
+
+
+Extension.prototype.clone = function (other, combine) {
+  const keys = Object.keys(other);
+
+  for (let key of keys) {
+    const val = combine[key];
+    this[key] = val || other[key];
+  }
+};
+
+var _default = Extension;
+/**
+ *
+ * @param json {string|boolean}
+ * @return {Extension}
+ */
+
+exports.default = _default;
+
+function buildExtension() {
+  let json = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+  return new Extension(json);
+}
+/**
+ *
+ * @param origin
+ * @param combine
+ */
+
+
+function combineExtension(origin) {
+  let combine = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  const target = new Extension(false);
+  target.clone(origin, combine);
+  return target;
+}

package/mesh/excel/optionsAbleExcel.js

@@ -29,6 +29,8 @@ var _LoadingOutlined = _interopRequireDefault(require("@ant-design/icons/lib/ico
 
 var _ExclamationCircleOutlined = _interopRequireDefault(require("@ant-design/icons/lib/icons/ExclamationCircleOutlined"));
 
+var _delayTip = _interopRequireDefault(require("../../common/model/delayTip"));
+
 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; }
@@ -105,33 +107,38 @@ class OptionsAbleExcel extends _react.default.Component {
           from: 0,
           to: 1
         }
-      }).then(res => {
-        if (res && res.total) {
-          if (ConfirmTotal < res.total) {
-            _this.showConfirm(res.total);
-          } else {
-            _this.download(res.total);
-          }
-        } else if (res && 0 === res.total) {
-          _antd.notification.info({
-            message: '無下載數據!請修改查詢條件!'
-          });
-
-          _this.unloading();
-        } else if (res) {
-          _antd.notification.error({
-            message: res.msg || '網絡故障!請稍後再試!'
-          });
+      }).then(this.handleResult);
+    });
 
-          _this.unloading();
+    _defineProperty(this, "handleResult", res => {
+      if (res && res.total) {
+        if (ConfirmTotal < res.total) {
+          this.showConfirm(res.total);
         } else {
-          _antd.notification.error({
-            message: '網絡故障!請稍後再試!'
-          });
-
-          _this.unloading();
+          this.download(res.total);
         }
-      });
+      } else if (res && 0 === res.total) {
+        _antd.notification.info({
+          message: '無下載數據!請修改查詢條件!'
+        });
+
+        this.unloading();
+      } else if (res && -100 === res.code) {
+        (0, _delayTip.default)("查詢隊列已滿", res.msg, '重新下載', 20, this.handleDownload);
+        this.unloading();
+      } else if (res) {
+        _antd.notification.error({
+          message: res.msg || '網絡故障!請稍後再試!'
+        });
+
+        this.unloading();
+      } else {
+        _antd.notification.error({
+          message: '網絡故障!請稍後再試!'
+        });
+
+        this.unloading();
+      }
     });
 
     _defineProperty(this, "downloadProcess", (type, present, from, to) => {
@@ -324,19 +331,23 @@ class OptionsAbleExcel extends _react.default.Component {
       sorter,
       total,
       cb: (type, rows, colsOptions, rowsOptions) => {
-        const sheet = _xlsx.default.utils.aoa_to_sheet(rows);
-
-        sheet['!rows'] = rowsOptions;
-        sheet['!cols'] = colsOptions;
-        this.setState({
-          info: {
-            text: '下載進度100%',
-            icon: /*#__PURE__*/_react.default.createElement(_CheckCircleOutlined.default, null),
-            type: 'suc'
-          },
-          loading: false
-        });
-        writeFile(collect.display, sheet, ModifyName);
+        if ('complete' === type) {
+          const sheet = _xlsx.default.utils.aoa_to_sheet(rows);
+
+          sheet['!rows'] = rowsOptions;
+          sheet['!cols'] = colsOptions;
+          this.setState({
+            info: {
+              text: '下載進度100%',
+              icon: /*#__PURE__*/_react.default.createElement(_CheckCircleOutlined.default, null),
+              type: 'suc'
+            },
+            loading: false
+          });
+          writeFile(collect.display, sheet, ModifyName);
+        } else {
+          this.unloading();
+        }
       },
       processCb: this.downloadProcess
     });

package/mesh/excel/processor.js

@@ -21,6 +21,8 @@ var _cell = _interopRequireDefault(require("../cell"));
 
 var _authOptions = require("../config/authOptions");
 
+var _delayTip = _interopRequireDefault(require("../../common/model/delayTip"));
+
 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); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -188,19 +190,19 @@ const checkAliasForAdd = (fieldNameDict, field) => {
 };
 /**
  * 下載Excel數據
- * @param host
- * @param collect
- * @param collectId
- * @param search
- * @param sorter
- * @param total
- * @param cb 下載完成的回調 (type, sheet, colsOptions)=>{
+ * @param props.host
+ * @param props.collect
+ * @param props.collectId
+ * @param props.search
+ * @param props.sorter
+ * @param props.total
+ * @param props.cb 下載完成的回調 (type, sheet, colsOptions)=>{
  *     type:下載完結狀態[complete|error]
  *     sheet: excel中的sheet頁對象,
  *     colsOptions: 列數據設置,
  *     rowsOptions: 行數據設置
  * }
- * @param processCb 處理過程的回調 (type, present,from, to)=>{
+ * @param props.processCb 處理過程的回調 (type, present,from, to)=>{
  *     type:下載類型[begin|end|error] 下載開始|下載結束|出現錯誤
  *     present: 下載百分比
  *     from:下載開始位置
@@ -209,87 +211,156 @@ const checkAliasForAdd = (fieldNameDict, field) => {
  */
 
 
-const modifyAbleDownload = _ref2 => {
-  let {
-    host,
-    collect,
-    collectId,
-    search,
-    sorter,
-    total,
-    cb,
-    processCb
-  } = _ref2;
-
-  let index = 0,
-      _page,
-      _present,
-      _from,
-      _to;
-
+const modifyAbleDownload = props => {
   const {
     rows,
     colsOptions,
     rowsOptions,
     formatDict
-  } = modifyAbleHeaderRow(collect),
+  } = modifyAbleHeaderRow(props.collect),
         //生成頭列表
   labels = rows[0],
         //獲取列表Label
   {
-    page,
-    present
-  } = getPageAndPresent(total),
+    pageList,
+    presentList
+  } = getPageAndPresent(props.total),
         //生成分頁和進度信息
-  request = collectId ? _request.listQueryWithId : _request.listQueryWithClassDes,
-        //獲取後台請求方法
-  download = () => {
-    //下載功能
-    _page = page[index];
-    _from = _page.from;
-    _to = total > _page.to ? _page.to : total;
-    _present = present[index];
-    processCb('begin', _present, _from, _to);
-    request({
-      host,
-      collect,
-      collectId,
-      search,
-      sorter,
-      page: _page
-    }).then(res => {
-      if (res && 0 < res.code) {
-        for (let row of res.result) {
-          rows.push(labels.map(label => {
-            const {
-              format,
-              config
-            } = formatDict[label];
-            return format(_objectSpread({
-              value: row[label]
-            }, config));
-          }));
-        }
+  request = props.collectId ? _request.listQueryWithId : _request.listQueryWithClassDes; //獲取後台請求方法
+
+  downloadRequest(_objectSpread(_objectSpread({}, props), {}, {
+    labels,
+    pageList,
+    presentList,
+    request,
+    colsOptions,
+    rowsOptions,
+    formatDict
+  }), 0, rows);
+};
+/**
+ *
+ * @param regular {Object} 由初始方法創建，整個遞歸規程不會修改的數值
+ * //外部傳入的數據
+ * @param regular.host
+ * @param regular.collect,
+ * @param regular.collectId,
+ * @param regular.labels,
+ * @param regular.search
+ * @param regular.sorter
+ * @param regular.total
+ * @param regular.cb
+ * @param regular.processCb
+ * //modifyAbleDownload 構建的數據
+ * @param regular.labels {Object} 列表的label索引
+ * @param regular.pageList {Array} modifyAbleHeaderRow方法構建的分頁列表
+ * @param regular.presentList {Array} modifyAbleHeaderRow方法構建的百分比列表
+ * @param regular.request {Function} 向服務器發送請求的方法 listQueryWithId 或 listQueryWithClassDes
+ * @param regular.colsOptions
+ * @param regular.rowsOptions
+ * @param regular.formatDict
+ * @param index
+ * @param rows
+ */
 
-        processCb('end', _present, _from, _to);
 
-        if (++index < page.length) {
-          download();
-        } else {
-          cb('complete', rows, colsOptions, rowsOptions);
-        }
-      } else {
-        processCb('error', _present, _from, _to);
+exports.modifyAbleDownload = modifyAbleDownload;
 
-        _antd.notification.error({
-          message: res && res.msg || '網絡故障!請稍後再試!'
-        });
+function downloadRequest(regular, index, rows) {
+  const page = regular.pageList[index],
+        present = regular.presentList[index],
+        {
+    host,
+    collect,
+    collectId,
+    search,
+    sorter
+  } = regular;
+  regular.processCb('begin', present, page.from, page.to);
+  regular.request({
+    host,
+    collect,
+    collectId,
+    search,
+    sorter,
+    page
+  }).then(downloadResponse(regular, present, page, index, rows));
+}
+/**
+ *
+ * @param regular
+ * @param regular.host
+ * @param regular.collect,
+ * @param regular.collectId,
+ * @param regular.labels,
+ * @param regular.search
+ * @param regular.sorter
+ * @param regular.pageList
+ * @param regular.presentList
+ * @param regular.total
+ * @param regular.request
+ * @param regular.colsOptions,
+ * @param regular.rowsOptions,
+ * @param regular.formatDict,
+ * @param regular.cb
+ * @param regular.processCb
+ * @param present
+ * @param page
+ * @param page.from,
+ * @param page.to
+ * @param index
+ * @param rows
+ */
+
+
+function downloadResponse(regular, present, page, index, rows) {
+  const {
+    labels,
+    pageList,
+    colsOptions,
+    rowsOptions,
+    formatDict,
+    cb,
+    processCb
+  } = regular;
+  return res => {
+    if (res && 0 < res.code) {
+      for (let row of res.result) {
+        rows.push(labels.map(label => {
+          const {
+            format,
+            config
+          } = formatDict[label];
+          return format(_objectSpread({
+            value: row[label]
+          }, config));
+        }));
       }
-    });
-  };
 
-  download(); //執行
-};
+      processCb('end', present, page.from, page.to);
+
+      if (++index < pageList.length) {
+        downloadRequest(regular, index, rows);
+      } else {
+        cb('complete', rows, colsOptions, rowsOptions);
+      }
+    } else if (res && -100 === res.code) {
+      (0, _delayTip.default)("查詢隊列已滿", res.msg, '繼續下載', 20, () => {
+        downloadRequest(regular, index, rows);
+      }, () => {
+        cb('error', rows, colsOptions, rowsOptions);
+      });
+      processCb('error', present, page.from, page.to);
+    } else {
+      processCb('error', present, page.from, page.to);
+      cb('error', rows, colsOptions, rowsOptions);
+
+      _antd.notification.error({
+        message: res && res.msg || '網絡故障!請稍後再試!'
+      });
+    }
+  };
+}
 /**
  * 獲取單條頭數據信息
  * @param fieldLabelDict
@@ -297,8 +368,6 @@ const modifyAbleDownload = _ref2 => {
  */
 
 
-exports.modifyAbleDownload = modifyAbleDownload;
-
 function getExplainHeaderColumn(fieldLabelDict, field) {
   let text = "".concat(Dict[field.edit]);
 
@@ -316,34 +385,35 @@ function getExplainHeaderColumn(fieldLabelDict, field) {
 
 
 const getPageAndPresent = total => {
-  const page = [],
-        present = [],
+  const pageList = [],
+        presentList = [],
         len = Math.ceil(total / PageSize),
         presentLen = Math.ceil(100 / len);
-
   let index = 0,
       curPos = 0,
       curPresent = 0,
-      _page,
-      _present,
-      _from,
-      _to;
-
-  present.push(curPresent);
+      to;
+  presentList.push(curPresent);
 
   for (; index < len; index++) {
     curPresent += presentLen;
-    page.push({
+    to = curPos + PageSize;
+
+    if (to > total) {
+      to = total;
+    }
+
+    pageList.push({
       from: curPos,
-      to: curPos + PageSize
+      to
     });
-    present.push(curPresent);
+    presentList.push(curPresent);
     curPos += PageSize;
   }
 
   return {
-    page,
-    present
+    pageList,
+    presentList
   };
 };
 /**
@@ -365,7 +435,7 @@ const getPageAndPresent = total => {
  */
 
 
-const modify = _ref3 => {
+const modify = _ref2 => {
   let {
     host,
     collect,
@@ -373,7 +443,7 @@ const modify = _ref3 => {
     dataList,
     cb,
     processCb
-  } = _ref3;
+  } = _ref2;
   processCb('start', 0, 0, 0);
 
   const {
@@ -476,7 +546,7 @@ const modify = _ref3 => {
 
 exports.modify = modify;
 
-const add = _ref4 => {
+const add = _ref3 => {
   let {
     host,
     collect,
@@ -484,14 +554,9 @@ const add = _ref4 => {
     dataList,
     cb,
     processCb
-  } = _ref4;
+  } = _ref3;
   processCb('start', 0, 0, 0);
-  const pkValue = [],
-        total = dataList.length,
-        {
-    page,
-    present
-  } = getPageAndPresent(dataList.length);
+  const pkValue = [];
   /*
    進行數據格式轉換。將單行數據格式轉換為[{
       data:[{label:String,value:Any],
@@ -544,7 +609,7 @@ const add = _ref4 => {
 
 exports.add = add;
 
-const doSubmit = _ref5 => {
+const doSubmit = _ref4 => {
   let {
     host,
     collect,
@@ -553,7 +618,7 @@ const doSubmit = _ref5 => {
     request,
     cb,
     processCb
-  } = _ref5;
+  } = _ref4;
 
   let index = 0,
       _page,
@@ -565,14 +630,14 @@ const doSubmit = _ref5 => {
 
   const total = dataList.length,
         {
-    page,
-    present
+    pageList,
+    presentList
   } = getPageAndPresent(total),
         submit = () => {
-    _page = page[index];
+    _page = pageList[index];
     _from = _page.from;
     _to = total > _page.to ? _page.to : total;
-    _present = present[index];
+    _present = presentList[index];
     processCb('begin', _present, _from, _to);
     _dataList = dataList.splice(0, _to - _from);
     request({

package/mesh/table/queryAbleTable.js

@@ -25,6 +25,12 @@ var _serverEnums = require("../config/serverEnums");
 
 var _remove = require("../crud/remove");
 
+var _extension = _interopRequireDefault(require("../define/collect/extension"));
+
+var _errorTip = _interopRequireDefault(require("../../common/model/errorTip"));
+
+var _delayTip = _interopRequireDefault(require("../../common/model/delayTip"));
+
 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); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -113,8 +119,12 @@ class QueryAbleTable extends _react.default.Component {
     _defineProperty(this, "handleQuery", params => {
       const {
         collect,
-        collectId
+        collectId,
+        extension
       } = this,
+            {
+        pipe
+      } = extension,
             _this = this,
             {
         host,
@@ -142,45 +152,16 @@ class QueryAbleTable extends _react.default.Component {
         collectId,
         search,
         sorter,
-        page
-      }).then(this.handleResult) : (0, _request.listQueryWithClassDes)({
+        page,
+        pipe
+      }).then(this.handleResult(params)) : (0, _request.listQueryWithClassDes)({
         host,
         collect,
         search,
         sorter,
-        page
-      }).then(this.handleResult);
-    });
-
-    _defineProperty(this, "handleResult", res => {
-      const {
-        onResult
-      } = this.props;
-
-      if (res && 0 < res.code) {
-        const result = {
-          data: res.result,
-          page: res.page,
-          total: res.total,
-          search: res.search,
-          sorter: res.sorter
-        };
-        this.setState({
-          loading: false,
-          result
-        });
-        onResult && onResult(_objectSpread({
-          suc: true
-        }, result));
-      } else {
-        QueryAbleTable.errTip(res && res.msg ? res.msg : '網絡故障，請稍後再試!', '服務器請求錯誤!');
-        this.setState({
-          loading: false
-        });
-        onResult && onResult({
-          suc: false
-        });
-      }
+        page,
+        pipe
+      }).then(this.handleResult(params));
     });
 
     _defineProperty(this, "handleExcel", () => {});
@@ -256,6 +237,7 @@ class QueryAbleTable extends _react.default.Component {
       } else {
         if (_collect) {
           this.collect = _collect;
+          this.extension = new _extension.default(_collect.extension);
           this.initState = InitState.PreView;
         } else {
           this.initState = InitState.UnCollect;
@@ -296,6 +278,7 @@ class QueryAbleTable extends _react.default.Component {
           if (res && 0 < res.code) {
             if (res.data) {
               _this.collect = res.data;
+              _this.extension = new _extension.default(res.data.extension);
               _this.initState = InitState.InitComplete;
 
               _this.setState({
@@ -332,6 +315,63 @@ class QueryAbleTable extends _react.default.Component {
    */
 
 
+  /**
+   * 進行搜索
+   * @param params.search
+   * @param params.sorter
+   * @param params.page
+   */
+  handleResult(params) {
+    const _this = this;
+    /**
+     * 搜索结果
+     * @param res
+     */
+
+
+    return res => {
+      const {
+        onResult
+      } = this.props;
+
+      if (res && 0 < res.code) {
+        const result = {
+          data: res.result,
+          page: res.page,
+          total: res.total,
+          search: res.search,
+          sorter: res.sorter
+        };
+        this.setState({
+          loading: false,
+          result
+        });
+        onResult && onResult(_objectSpread({
+          suc: true
+        }, result));
+      } else if (res && -100 === res.code) {
+        this.setState({
+          loading: false
+        });
+        (0, _delayTip.default)("查詢隊列已滿", res.msg, '自動查詢', 20, () => {
+          _this.handleQuery(params);
+        });
+      } else {
+        QueryAbleTable.errTip(res && res.msg ? res.msg : '網絡故障，請稍後再試!', '服務器請求錯誤!');
+        this.setState({
+          loading: false
+        });
+        onResult && onResult({
+          suc: false
+        });
+      }
+    };
+  }
+  /**
+   * 处理点击Excel按钮
+   */
+
+
   getId() {
     return this.id;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "uepay-mesh",
-    "version": "4.0.12",
+    "version": "4.0.13",
     "description": "数据中心数据集设计工具前端",
     "main": "index.js",
     "typings": "index.d.ts",
@@ -44,6 +44,6 @@
         "node-sass": "^4.13.0",
         "react": "^16.12.0",
         "react-dom": "^16.12.0",
-        "uepay-ops2": "4.0.7"
+        "uepay-ops2": "4.0.8"
     }
 }