@ztocwst/rc-pro-materials 0.2.22 → 0.2.24

package/lib/components/{z-templates-data-common → z-data-table}/components/link-renderer/index.js

@@ -6,17 +6,21 @@ exports["default"] = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _spin = _interopRequireDefault(require("antd/lib/spin"));
 var _radio = _interopRequireDefault(require("antd/lib/radio"));
-var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _react = require("react");
 var _rcPro = require("@ztocwst/rc-pro");
 var _icons = require("@ant-design/icons");
 var _moment = _interopRequireDefault(require("moment"));
-var _dataCommon = require("../../data-common.helper");
+var _dataTable = require("../../data-table.helper");
 var _tableRenderer = require("../table-renderer/table-renderer.helper");
 require("./index.less");
-var _excluded = ["pageNum", "pageSize"];
+var _excluded = ["queryBind", "formatter"],
+  _excluded2 = ["pageNum", "pageSize", "orderBy"];
+function _createForOfIteratorHelperLoose(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (it) return (it = it.call(o)).next.bind(it); if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; return function () { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 var linkStateDefault = {
   custom: false,
   dataSetName: '',
@@ -33,6 +37,7 @@ var LinkRenderer = function LinkRenderer(props) {
     onBack = props.onBack;
   var rcProContext = (0, _react.useContext)(_rcPro.RcConfigContext);
   var _ref = rcProContext || {},
+    BASE_URL = _ref.BASE_URL,
     _ref$tableOptions = _ref.tableOptions,
     tableOptions = _ref$tableOptions === void 0 ? {} : _ref$tableOptions;
   var defaultPageSize = (tableOptions === null || tableOptions === void 0 ? void 0 : (_tableOptions$paginat = tableOptions.pagination) === null || _tableOptions$paginat === void 0 ? void 0 : _tableOptions$paginat.defaultPageSize) || 20;
@@ -72,7 +77,7 @@ var LinkRenderer = function LinkRenderer(props) {
           handleClearInterval();
           timer = window.setInterval(function () {
             return onConfirm === null || onConfirm === void 0 ? void 0 : onConfirm();
-          }, refreshRate * _dataCommon.timeUnit);
+          }, refreshRate * _dataTable.timeUnit);
         } else {
           onConfirm === null || onConfirm === void 0 ? void 0 : onConfirm();
         }
@@ -107,106 +112,154 @@ var LinkRenderer = function LinkRenderer(props) {
     // 更新表头
     (_tableRef$current = tableRef.current) === null || _tableRef$current === void 0 ? void 0 : (_tableRef$current$upd = _tableRef$current.updateColumns) === null || _tableRef$current$upd === void 0 ? void 0 : _tableRef$current$upd.call(_tableRef$current, columns);
   };
+  var getBigDataBody = function getBigDataBody(params) {
+    var _dimJson$data, _targets$indexSource;
+    if (params === void 0) {
+      params = {};
+    }
+    var dataSetName = linkState.dataSetName,
+      index = linkState.index,
+      dimension = linkState.dimension,
+      record = linkState.record;
+    var columns = handleGetColumns((0, _extends2["default"])({}, linkState));
+
+    /** 查看queryBind是否有 当前查询条件和当前数据源参数（paraJson）建立绑定关系；有的话替换成绑定关系中的"键"，没有则是默认查询配置的"键"，上一级数据源的维度 "值" 或 当前查询条件的"值"入参 */
+    var _linkPage$index = linkPage[index],
+      queryBind = _linkPage$index.queryBind,
+      formatter = _linkPage$index.formatter,
+      find = (0, _objectWithoutPropertiesLoose2["default"])(_linkPage$index, _excluded);
+    var _ref3 = (0, _tableRenderer.handleDimTargetFormat)(find) || {},
+      targets = _ref3.targets;
+    var queryCache = queryCacheRef.current || {};
+    var query = {};
+    var queryKeys = Object.keys(queryCache);
+    if (queryKeys !== null && queryKeys !== void 0 && queryKeys.length) {
+      queryKeys.forEach(function (k) {
+        // 查看是否有绑定关联关系 有取绑定的入参"键" 没有则取默认的"键"
+        var queryBindFilter = queryBind === null || queryBind === void 0 ? void 0 : queryBind.filter(function (item) {
+          return (item === null || item === void 0 ? void 0 : item.currentQueryKey) === k;
+        });
+        // "键"（有建立绑定关系 取当前数据源参数（paraJson）的"键"，没有则是默认查询配置的"键"）
+        if (queryBindFilter !== null && queryBindFilter !== void 0 && queryBindFilter.length) {
+          // 参数为时间时会出现多个绑定关系
+          queryBindFilter.forEach(function (item) {
+            var key = item.sourceQueryKey;
+            // "值"（当前查询条件的"值"）
+            var value = queryCache[k];
+            if (key) {
+              // 类型为时间时 处理
+              if ((0, _dataTable.getType)(value) === 'array' && value.length === 2 && value.some(function (d) {
+                return (0, _moment["default"])(d).isValid();
+              })) {
+                var i = key.includes(_dataTable.dateStart) ? 0 : 1;
+                query[key] = value[i];
+              } else {
+                query[key] = value;
+              }
+            }
+          });
+        } else {
+          // "值"（当前查询条件的"值"）
+          query[k] = queryCache[k];
+        }
+      });
+    }
+    var recordKeys = Object.keys(record || {});
+    if (recordKeys.length) {
+      recordKeys.forEach(function (k) {
+        // 查看是否有绑定关联关系
+        var queryBindFilter = queryBind === null || queryBind === void 0 ? void 0 : queryBind.filter(function (item) {
+          return (item === null || item === void 0 ? void 0 : item.parentDimKey) === k;
+        });
+        // 参数为时间时会出现多个绑定关系
+        if (queryBindFilter !== null && queryBindFilter !== void 0 && queryBindFilter.length) {
+          queryBindFilter.forEach(function (item) {
+            var key = item.sourceQueryKey;
+            if (key) {
+              // "值"（有建立绑定关系 取上一级数据源的维度的"值"）
+              query[key] = record[k];
+            }
+          });
+        }
+      });
+    }
+    var dim;
+    if (dimJson !== null && dimJson !== void 0 && (_dimJson$data = dimJson.data) !== null && _dimJson$data !== void 0 && _dimJson$data.length) {
+      dim = dimension === null || dimension === void 0 ? void 0 : dimension.map(function (description) {
+        var _dimJson$data2, _dimJson$data2$find;
+        return {
+          description: description,
+          name: (_dimJson$data2 = dimJson.data) === null || _dimJson$data2 === void 0 ? void 0 : (_dimJson$data2$find = _dimJson$data2.find(function (item) {
+            return item.description === description;
+          })) === null || _dimJson$data2$find === void 0 ? void 0 : _dimJson$data2$find.name
+        };
+      });
+    }
+    var orderBys = [];
+    if (targets !== null && targets !== void 0 && (_targets$indexSource = targets.indexSource) !== null && _targets$indexSource !== void 0 && _targets$indexSource.length) {
+      for (var _iterator = _createForOfIteratorHelperLoose(targets.indexSource), _step; !(_step = _iterator()).done;) {
+        var cur = _step.value;
+        if (cur !== null && cur !== void 0 && cur.sorted) {
+          orderBys.push({
+            name: cur.name,
+            sort: _dataTable.defaultSort
+          });
+        }
+      }
+    }
+    var queryParams = (0, _dataTable.handleQueryParams)(query);
+    var _params = params,
+      pageNum = _params.pageNum,
+      pageSize = _params.pageSize,
+      orderBy = _params.orderBy,
+      other = (0, _objectWithoutPropertiesLoose2["default"])(_params, _excluded2);
+    if (orderBy !== null && orderBy !== void 0 && orderBy.length) {
+      var _loop = function _loop() {
+        var item = _step2.value;
+        var i = orderBys.findIndex(function (e) {
+          return e.name === item.name;
+        });
+        if (i > -1) {
+          orderBys.splice(i, 1);
+        }
+        orderBys.unshift((0, _extends2["default"])({}, item));
+      };
+      for (var _iterator2 = _createForOfIteratorHelperLoose(orderBy), _step2; !(_step2 = _iterator2()).done;) {
+        _loop();
+      }
+    }
+    var data = (0, _extends2["default"])({}, other, {
+      queryParams: queryParams,
+      dim: dim,
+      target: columns.map(function (item) {
+        return {
+          description: item.dataIndex
+        };
+      }),
+      orderBy: orderBys !== null && orderBys !== void 0 && orderBys.length ? orderBys : undefined,
+      pageNum: pageNum || 1,
+      pageSize: pageSize || defaultPageSize,
+      dataSetName: dataSetName
+    });
+    return formatter ? formatter === null || formatter === void 0 ? void 0 : formatter(data) : data;
+  };
   var getDataSource = /*#__PURE__*/function () {
-    var _ref3 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(params) {
-      var _dimJson$data;
-      var dataSetName, index, dimension, record, columns, _linkPage$index, queryBind, formatter, queryCache, query, queryKeys, recordKeys, dim, queryParams, _params, pageNum, pageSize, other, data, queryData;
+    var _ref4 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(params) {
+      var queryData;
       return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             if (params === void 0) {
               params = {};
             }
-            dataSetName = linkState.dataSetName, index = linkState.index, dimension = linkState.dimension, record = linkState.record;
-            columns = handleGetColumns((0, _extends2["default"])({}, linkState));
-            /** 查看queryBind是否有 当前查询条件和当前数据源参数（paraJson）建立绑定关系；有的话替换成绑定关系中的"键"，没有则是默认查询配置的"键"，上一级数据源的维度 "值" 或 当前查询条件的"值"入参 */
-            _linkPage$index = linkPage[index], queryBind = _linkPage$index.queryBind, formatter = _linkPage$index.formatter;
-            queryCache = queryCacheRef.current;
-            query = {};
-            queryKeys = Object.keys(queryCache);
-            if (queryKeys !== null && queryKeys !== void 0 && queryKeys.length) {
-              queryKeys.forEach(function (k) {
-                // 查看是否有绑定关联关系 有取绑定的入参"键" 没有则取默认的"键"
-                var queryBindFilter = queryBind === null || queryBind === void 0 ? void 0 : queryBind.filter(function (item) {
-                  return (item === null || item === void 0 ? void 0 : item.currentQueryKey) === k;
-                });
-                // "键"（有建立绑定关系 取当前数据源参数（paraJson）的"键"，没有则是默认查询配置的"键"）
-                if (queryBindFilter !== null && queryBindFilter !== void 0 && queryBindFilter.length) {
-                  // 参数为时间时会出现多个绑定关系
-                  queryBindFilter.forEach(function (item) {
-                    var key = item.sourceQueryKey;
-                    // "值"（当前查询条件的"值"）
-                    var value = queryCache[k];
-                    if (key) {
-                      // 类型为时间时 处理
-                      if ((0, _dataCommon.getType)(value) === 'array' && value.length === 2 && value.some(function (d) {
-                        return (0, _moment["default"])(d).isValid();
-                      })) {
-                        var i = key.includes(_dataCommon.dateStart) ? 0 : 1;
-                        query[key] = value[i];
-                      } else {
-                        query[key] = value;
-                      }
-                    }
-                  });
-                } else {
-                  // "值"（当前查询条件的"值"）
-                  query[k] = queryCache[k];
-                }
-              });
-            }
-            recordKeys = Object.keys(record || {});
-            if (recordKeys.length) {
-              recordKeys.forEach(function (k) {
-                // 查看是否有绑定关联关系
-                var queryBindFilter = queryBind === null || queryBind === void 0 ? void 0 : queryBind.filter(function (item) {
-                  return (item === null || item === void 0 ? void 0 : item.parentDimKey) === k;
-                });
-                // 参数为时间时会出现多个绑定关系
-                if (queryBindFilter !== null && queryBindFilter !== void 0 && queryBindFilter.length) {
-                  queryBindFilter.forEach(function (item) {
-                    var key = item.sourceQueryKey;
-                    if (key) {
-                      // "值"（有建立绑定关系 取上一级数据源的维度的"值"）
-                      query[key] = record[k];
-                    }
-                  });
-                }
-              });
-            }
-            if (dimJson !== null && dimJson !== void 0 && (_dimJson$data = dimJson.data) !== null && _dimJson$data !== void 0 && _dimJson$data.length) {
-              dim = dimension === null || dimension === void 0 ? void 0 : dimension.map(function (description) {
-                var _dimJson$data2, _dimJson$data2$find;
-                return {
-                  description: description,
-                  name: (_dimJson$data2 = dimJson.data) === null || _dimJson$data2 === void 0 ? void 0 : (_dimJson$data2$find = _dimJson$data2.find(function (item) {
-                    return item.description === description;
-                  })) === null || _dimJson$data2$find === void 0 ? void 0 : _dimJson$data2$find.name
-                };
-              });
-            }
-            queryParams = (0, _dataCommon.handleQueryParams)(query);
-            _params = params, pageNum = _params.pageNum, pageSize = _params.pageSize, other = (0, _objectWithoutPropertiesLoose2["default"])(_params, _excluded);
-            data = (0, _extends2["default"])({}, other, {
-              pageNum: pageNum || 1,
-              pageSize: pageSize || defaultPageSize,
-              queryParams: queryParams,
-              dim: dim,
-              target: columns.map(function (item) {
-                return {
-                  description: item.dataIndex
-                };
-              }),
-              dataSetName: dataSetName
-            });
-            queryData = formatter ? formatter === null || formatter === void 0 ? void 0 : formatter(data) : data;
+            queryData = getBigDataBody(params);
             if (linkState.custom) {
               setLoading(true);
             }
-            return _context.abrupt("return", (0, _dataCommon.getReportData)(rcProContext, queryData).then(function (_ref4) {
-              var success = _ref4.success,
-                _ref4$result = _ref4.result,
-                result = _ref4$result === void 0 ? {} : _ref4$result;
+            return _context.abrupt("return", (0, _dataTable.getReportData)(rcProContext, queryData).then(function (_ref5) {
+              var success = _ref5.success,
+                _ref5$result = _ref5.result,
+                result = _ref5$result === void 0 ? {} : _ref5$result;
               if (linkState.custom) {
                 setLoading(false);
                 if (success) {
@@ -223,21 +276,21 @@ var LinkRenderer = function LinkRenderer(props) {
                 setResult(null);
               }
             }));
-          case 17:
+          case 4:
           case "end":
             return _context.stop();
         }
       }, _callee);
     }));
     return function getDataSource(_x) {
-      return _ref3.apply(this, arguments);
+      return _ref4.apply(this, arguments);
     };
   }();
 
   /** 初始linkState  */
   var initial = function initial(paramsState) {
-    var _ref5 = paramsState || {},
-      dataSetName = _ref5.dataSetName;
+    var _ref6 = paramsState || {},
+      dataSetName = _ref6.dataSetName;
     /** 二级页未配置 或 自定义dataSetName配错 直接返回 */
     var Length = linkPage === null || linkPage === void 0 ? void 0 : linkPage.length;
     var isHave = linkPage === null || linkPage === void 0 ? void 0 : linkPage.some(function (item) {
@@ -259,7 +312,7 @@ var LinkRenderer = function LinkRenderer(props) {
         linkTitle.push(item.title);
       }
     }
-    var width = (0, _dataCommon.getMaxWidth)(linkTitle);
+    var width = (0, _dataTable.getMaxWidth)(linkTitle);
 
     /** 二级页出现重复相同的时候 索引未配置正确 取dataSetName 出现最近一次下标 防止报错 */
     if (!isNumber || isNumber && (index < 0 || index >= Length)) {
@@ -277,7 +330,7 @@ var LinkRenderer = function LinkRenderer(props) {
       index: index
     });
     /** 当前进入与上次进入link页不同时需要清空数据 */
-    var isSource = "" + paramsState.dataSetName + _dataCommon.separator + index === "" + linkState.dataSetName + _dataCommon.separator + (linkState === null || linkState === void 0 ? void 0 : linkState.index);
+    var isSource = "" + paramsState.dataSetName + _dataTable.separator + index === "" + linkState.dataSetName + _dataTable.separator + (linkState === null || linkState === void 0 ? void 0 : linkState.index);
     var isSame = JSON.stringify(paramsState === null || paramsState === void 0 ? void 0 : paramsState.record) === JSON.stringify(linkState === null || linkState === void 0 ? void 0 : linkState.record);
     if (!currentState.custom && (!isSource || !isSame)) {
       var _tableRef$current2, _tableRef$current2$up;
@@ -310,9 +363,9 @@ var LinkRenderer = function LinkRenderer(props) {
   var handleLinkChange = function handleLinkChange(event) {
     var value = event.target.value;
     // dataSetName 可能会重复配置 所以使用 dataSetName + 分隔符 + index
-    var _ref6 = (value === null || value === void 0 ? void 0 : value.split(_dataCommon.separator)) || [],
-      dataSetName = _ref6[0],
-      index = _ref6[1];
+    var _ref7 = (value === null || value === void 0 ? void 0 : value.split(_dataTable.separator)) || [],
+      dataSetName = _ref7[0],
+      index = _ref7[1];
     var currentState = linkPage[index];
     var stateData = (0, _extends2["default"])({}, linkState, currentState, {
       dataSetName: dataSetName,
@@ -330,23 +383,70 @@ var LinkRenderer = function LinkRenderer(props) {
   }), /*#__PURE__*/React.createElement("span", null, linkState.chartTitle || linkPageTitle)), (linkPage === null || linkPage === void 0 ? void 0 : (_linkPage$filter = linkPage.filter(function (field) {
     return (field === null || field === void 0 ? void 0 : field.dataSetName) === linkState.dataSetName && (field === null || field === void 0 ? void 0 : field.chartTitle) === linkState.chartTitle;
   })) === null || _linkPage$filter === void 0 ? void 0 : _linkPage$filter.length) <= 1 ? null : /*#__PURE__*/React.createElement(_radio["default"].Group, {
-    value: "" + (linkState === null || linkState === void 0 ? void 0 : linkState.dataSetName) + _dataCommon.separator + linkState.index,
+    value: "" + (linkState === null || linkState === void 0 ? void 0 : linkState.dataSetName) + _dataTable.separator + linkState.index,
     onChange: handleLinkChange
   }, linkPage === null || linkPage === void 0 ? void 0 : linkPage.map(function (field, index) {
     return (field === null || field === void 0 ? void 0 : field.dataSetName) === linkState.dataSetName && (field === null || field === void 0 ? void 0 : field.chartTitle) === linkState.chartTitle ? /*#__PURE__*/React.createElement(_radio["default"].Button, {
-      value: "" + (field === null || field === void 0 ? void 0 : field.dataSetName) + _dataCommon.separator + index.toString(),
-      key: "" + (field === null || field === void 0 ? void 0 : field.dataSetName) + _dataCommon.separator + index.toString()
+      value: "" + (field === null || field === void 0 ? void 0 : field.dataSetName) + _dataTable.separator + index.toString(),
+      key: "" + (field === null || field === void 0 ? void 0 : field.dataSetName) + _dataTable.separator + index.toString()
     }, /*#__PURE__*/React.createElement("div", {
       style: {
         textAlign: 'center',
         width: linkState.width
       }
     }, field === null || field === void 0 ? void 0 : field.title)) : null;
-  }))), linkState.custom ? /*#__PURE__*/React.createElement(_spin["default"], {
+  })), linkState.exporter ? /*#__PURE__*/React.createElement("div", {
+    className: "link-export"
+  }, /*#__PURE__*/React.createElement(_rcPro.ProButton, {
+    items: [{
+      action: 'btn',
+      name: linkState === null || linkState === void 0 ? void 0 : linkState.exportConfig.name,
+      props: {
+        disabled: !queryCacheRef.current
+      },
+      fileConfig: {
+        type: 'export',
+        params: {
+          menuId: linkState === null || linkState === void 0 ? void 0 : linkState.exportConfig.menuId,
+          operateType: 'EXPORT'
+        },
+        request: {
+          submit: {
+            url: BASE_URL + "/data/forward/v1/bigdata/report/" + (linkState === null || linkState === void 0 ? void 0 : linkState.dataSetName) + "/export",
+            method: 'POST',
+            formatter: function () {
+              var _formatter = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(values) {
+                var bigDataBody, _ref8, _ref8$temp, temp;
+                return _regenerator["default"].wrap(function _callee2$(_context2) {
+                  while (1) switch (_context2.prev = _context2.next) {
+                    case 0:
+                      bigDataBody = getBigDataBody();
+                      _ref8 = values || {}, _ref8$temp = _ref8.temp, temp = _ref8$temp === void 0 ? {} : _ref8$temp;
+                      return _context2.abrupt("return", {
+                        buttonCode: linkState === null || linkState === void 0 ? void 0 : linkState.exportConfig.code,
+                        templateId: temp === null || temp === void 0 ? void 0 : temp.value,
+                        bigDataBody: bigDataBody
+                      });
+                    case 3:
+                    case "end":
+                      return _context2.stop();
+                  }
+                }, _callee2);
+              }));
+              function formatter(_x2) {
+                return _formatter.apply(this, arguments);
+              }
+              return formatter;
+            }()
+          }
+        }
+      }
+    }]
+  })) : null), linkState.custom ? /*#__PURE__*/React.createElement(_spin["default"], {
     spinning: loading
   }, (_linkState$child = linkState.child) === null || _linkState$child === void 0 ? void 0 : _linkState$child.call(linkState, result)) : /*#__PURE__*/React.createElement(_rcPro.ProTable, {
     ref: tableRef,
-    config: (0, _extends2["default"])({}, _dataCommon.tableConfigDefault, {
+    config: (0, _extends2["default"])({}, _dataTable.tableConfigDefault, {
       pagination: {
         showSizeChanger: true,
         defaultPageSize: defaultPageSize

package/lib/components/{z-templates-data-common → z-data-table}/components/link-renderer/index.less

@@ -30,4 +30,8 @@
     transition: all 0.3s ease-in;
     color: var(--ant-primary-color, @primary-color);
   }
+
+  .link-export {
+    margin-left: 12px;
+  }
 }

package/lib/components/z-data-table/components/table-renderer/index.d.ts

@@ -0,0 +1,4 @@
+/// <reference types="react" />
+import type { TypeZDataTableProps } from '../../data-table';
+declare const TableRenderer: (props: TypeZDataTableProps) => import("react").JSX.Element;
+export default TableRenderer;

package/lib/components/{z-templates-data-common → z-data-table}/components/table-renderer/index.js

@@ -11,17 +11,17 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _react = require("react");
 var _rcPro = require("@ztocwst/rc-pro");
 var _moment = _interopRequireDefault(require("moment"));
-var _dataCommon = require("../../data-common.helper");
+var _dataTable = require("../../data-table.helper");
 var _tableRenderer = require("./table-renderer.helper");
 var _dimTarget = _interopRequireDefault(require("../dim-target"));
 var _linkRenderer = _interopRequireDefault(require("../link-renderer"));
-var _excluded = ["pageNum", "pageSize"];
+var _excluded = ["pageNum", "pageSize", "orderBy"];
 function _createForOfIteratorHelperLoose(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (it) return (it = it.call(o)).next.bind(it); if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; return function () { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 var TableRenderer = function TableRenderer(props) {
   var _tableOptions$paginat;
-  var activeKey = props.activeKey,
+  var currentKey = props.currentKey,
     autoLoad = props.autoLoad,
     refreshRate = props.refreshRate,
     dataSetName = props.dataSetName,
@@ -44,7 +44,7 @@ var TableRenderer = function TableRenderer(props) {
   var _useState = (0, _react.useState)(false),
     loading = _useState[0],
     setLoading = _useState[1];
-  var _useState2 = (0, _react.useState)(_dataCommon.tableConfigDefault),
+  var _useState2 = (0, _react.useState)(_dataTable.tableConfigDefault),
     config = _useState2[0],
     setConfig = _useState2[1];
   /** 维度指标初始数据 */
@@ -83,6 +83,9 @@ var TableRenderer = function TableRenderer(props) {
   }, exporter ? {
     action: 'btn',
     name: exportConfig === null || exportConfig === void 0 ? void 0 : exportConfig.name,
+    props: {
+      disabled: !queryCacheRef.current
+    },
     fileConfig: {
       type: 'export',
       params: {
@@ -193,7 +196,7 @@ var TableRenderer = function TableRenderer(props) {
       indexSource = _getDimTargetValues3$4 === void 0 ? [] : _getDimTargetValues3$4;
 
     /** 通过 queryBind查看是否有绑定关系 有的话替换成绑定关系中的key 没有则是默认配置的key */
-    var queryCache = queryCacheRef.current;
+    var queryCache = queryCacheRef.current || {};
     var query = {};
     var queryKeys = Object.keys(queryCache);
     if (queryKeys !== null && queryKeys !== void 0 && queryKeys.length) {
@@ -211,10 +214,10 @@ var TableRenderer = function TableRenderer(props) {
             var value = queryCache[k];
             if (key) {
               // 类型为时间时 处理
-              if ((0, _dataCommon.getType)(value) === 'array' && value.length === 2 && value.some(function (d) {
+              if ((0, _dataTable.getType)(value) === 'array' && value.length === 2 && value.some(function (d) {
                 return (0, _moment["default"])(d).isValid();
               })) {
-                var i = key.includes(_dataCommon.dateStart) ? 0 : 1;
+                var i = key.includes(_dataTable.dateStart) ? 0 : 1;
                 query[key] = value[i];
               } else {
                 query[key] = value;
@@ -227,7 +230,7 @@ var TableRenderer = function TableRenderer(props) {
         }
       });
     }
-
+    var orderBys = [];
     /** 维度收集 */
     var dim = [];
     for (var _iterator = _createForOfIteratorHelperLoose(dimensionSource), _step; !(_step = _iterator()).done;) {
@@ -237,6 +240,12 @@ var TableRenderer = function TableRenderer(props) {
           name: cur.name,
           description: cur.description
         });
+        if (cur !== null && cur !== void 0 && cur.sorted) {
+          orderBys.push({
+            name: cur.description,
+            sort: _dataTable.defaultSort
+          });
+        }
       }
     }
 
@@ -248,18 +257,41 @@ var TableRenderer = function TableRenderer(props) {
         target.push({
           description: _cur.name
         });
+        if (_cur !== null && _cur !== void 0 && _cur.sorted) {
+          orderBys.push({
+            name: _cur.name,
+            sort: _dataTable.defaultSort
+          });
+        }
       }
     }
-    var queryParams = (0, _dataCommon.handleQueryParams)(query);
+    var queryParams = (0, _dataTable.handleQueryParams)(query);
     var _params = params,
       pageNum = _params.pageNum,
       pageSize = _params.pageSize,
+      orderBy = _params.orderBy,
       other = (0, _objectWithoutPropertiesLoose2["default"])(_params, _excluded);
+    if (orderBy !== null && orderBy !== void 0 && orderBy.length) {
+      var _loop = function _loop() {
+        var item = _step3.value;
+        var i = orderBys.findIndex(function (e) {
+          return e.name === item.name;
+        });
+        if (i > -1) {
+          orderBys.splice(i, 1);
+        }
+        orderBys.unshift((0, _extends2["default"])({}, item));
+      };
+      for (var _iterator3 = _createForOfIteratorHelperLoose(orderBy), _step3; !(_step3 = _iterator3()).done;) {
+        _loop();
+      }
+    }
     var data = (0, _extends2["default"])({
-      queryParams: queryParams,
-      dim: dim,
-      target: target
+      queryParams: queryParams
     }, other, {
+      dim: dim,
+      target: target,
+      orderBy: orderBys !== null && orderBys !== void 0 && orderBys.length ? orderBys : undefined,
       pageNum: pageNum || 1,
       pageSize: pageSize || defaultPageSize,
       dataSetName: dataSetName
@@ -287,7 +319,7 @@ var TableRenderer = function TableRenderer(props) {
             data = getBigDataBody(params);
             setLoading(true);
             _context3.next = 8;
-            return (0, _dataCommon.getReportData)(rcProContext, data);
+            return (0, _dataTable.getReportData)(rcProContext, data);
           case 8:
             _yield$getReportData = _context3.sent;
             success = _yield$getReportData.success;
@@ -338,7 +370,7 @@ var TableRenderer = function TableRenderer(props) {
               };
               handleUpdateColumns(option);
               setDimTargetValue(result);
-              setConfig((0, _extends2["default"])({}, _dataCommon.tableConfigDefault, {
+              setConfig((0, _extends2["default"])({}, _dataTable.tableConfigDefault, {
                 pagination: {
                   showSizeChanger: true,
                   defaultPageSize: defaultPageSize
@@ -385,27 +417,36 @@ var TableRenderer = function TableRenderer(props) {
       timer = null;
     }
   };
-  (0, _react.useEffect)(function () {
-    var _ref6 = (activeKey === null || activeKey === void 0 ? void 0 : activeKey.split(_dataCommon.separator)) || [],
-      currentKey = _ref6[0];
-    if (currentKey === dataSetName) {
-      if (autoLoad) {
-        if (refreshRate) {
-          handleClearInterval();
-          timer = window.setInterval(function () {
-            return onConfirm === null || onConfirm === void 0 ? void 0 : onConfirm();
-          }, refreshRate * _dataCommon.timeUnit);
-        } else {
-          onConfirm === null || onConfirm === void 0 ? void 0 : onConfirm();
-        }
+  var onload = function onload() {
+    if (autoLoad) {
+      if (refreshRate) {
+        handleClearInterval();
+        timer = window.setInterval(function () {
+          return onConfirm === null || onConfirm === void 0 ? void 0 : onConfirm();
+        }, refreshRate * _dataTable.timeUnit);
+      } else {
+        onConfirm === null || onConfirm === void 0 ? void 0 : onConfirm();
       }
     } else {
       handleClearInterval();
     }
+  };
+  (0, _react.useEffect)(function () {
+    if (currentKey) {
+      var _ref6 = currentKey.split(_dataTable.separator) || [],
+        curDataSetName = _ref6[0];
+      if (curDataSetName === dataSetName) {
+        onload();
+      } else {
+        handleClearInterval();
+      }
+    } else {
+      onload();
+    }
     return function () {
       handleClearInterval();
     };
-  }, [activeKey, autoLoad]);
+  }, [currentKey, autoLoad]);
   var queryChart = /*#__PURE__*/function () {
     var _ref7 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6(value) {
       var _linkChartRef$current3;
@@ -418,7 +459,7 @@ var TableRenderer = function TableRenderer(props) {
               queryCacheRef.current = value[dataSetName] || value;
               setTimeout( /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5() {
                 var _tableRef$current2;
-                var _getDimTargetValues4, _getDimTargetValues4$, indexSource, indexAmounted, target, _iterator3, _step3, cur, _ref9, success, _ref9$result, result, _result$data, _result$data$, data;
+                var _getDimTargetValues4, _getDimTargetValues4$, indexSource, indexAmounted, target, _iterator4, _step4, cur, _ref9, success, _ref9$result, result, _result$data, _result$data$, data;
                 return _regenerator["default"].wrap(function _callee5$(_context5) {
                   while (1) switch (_context5.prev = _context5.next) {
                     case 0:
@@ -434,8 +475,8 @@ var TableRenderer = function TableRenderer(props) {
                         break;
                       }
                       target = [];
-                      for (_iterator3 = _createForOfIteratorHelperLoose(indexAmounted); !(_step3 = _iterator3()).done;) {
-                        cur = _step3.value;
+                      for (_iterator4 = _createForOfIteratorHelperLoose(indexAmounted); !(_step4 = _iterator4()).done;) {
+                        cur = _step4.value;
                         target.push({
                           description: cur.name
                         });