@ztocwst/rc-pro-materials 0.2.21 → 0.2.23

package/lib/components/z-templates-data-common/components/link-renderer/index.js

@@ -6,8 +6,8 @@ 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");
@@ -16,7 +16,11 @@ var _moment = _interopRequireDefault(require("moment"));
 var _dataCommon = require("../../data-common.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;
@@ -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, _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];
+        }
+      });
+    }
+    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: _dataCommon.defaultSort
+          });
+        }
+      }
+    }
+    var queryParams = (0, _dataCommon.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, _dataCommon.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) {
@@ -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(_dataCommon.separator)) || [],
+      dataSetName = _ref7[0],
+      index = _ref7[1];
     var currentState = linkPage[index];
     var stateData = (0, _extends2["default"])({}, linkState, currentState, {
       dataSetName: dataSetName,
@@ -342,7 +395,51 @@ var LinkRenderer = function LinkRenderer(props) {
         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,
+      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,

package/lib/components/z-templates-data-common/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-templates-data-common/components/table-renderer/index.js

@@ -15,7 +15,7 @@ var _dataCommon = require("../../data-common.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; }
@@ -227,7 +227,7 @@ var TableRenderer = function TableRenderer(props) {
         }
       });
     }
-
+    var orderBys = [];
     /** 维度收集 */
     var dim = [];
     for (var _iterator = _createForOfIteratorHelperLoose(dimensionSource), _step; !(_step = _iterator()).done;) {
@@ -237,6 +237,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: _dataCommon.defaultSort
+          });
+        }
       }
     }
 
@@ -248,18 +254,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: _dataCommon.defaultSort
+          });
+        }
       }
     }
     var queryParams = (0, _dataCommon.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
@@ -418,7 +447,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 +463,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
                         });

package/lib/components/z-templates-data-common/components/table-renderer/table-renderer.helper.d.ts

@@ -58,6 +58,7 @@ export declare const handleColumns: (option: DimTargetChangeOptionType & Pick<Ty
     title: import("antd/es/checkbox/Group").CheckboxValueType;
     dataIndex: string;
     ellipsis: boolean;
+    defaultSortOrder: string;
     sorter: any;
     width: any;
     fixed: any;

package/lib/components/z-templates-data-common/components/table-renderer/table-renderer.helper.js

@@ -184,37 +184,47 @@ exports.handleValueFormat = handleValueFormat;
  */
 var handleColumns = function handleColumns(option, expressions, linkPage, onLink) {
   var _option$actionJson;
+  var isFirst = true;
   var dimTarget = [].concat(option.dimension, option.index);
   var columns = dimTarget.map(function (title) {
-    var _config3, _config3$link, _config4, _config5, _config6, _title$toString, _config7, _config8, _config9;
+    var _config5, _config5$link, _config6, _config7, _config8, _title$toString, _config9, _config10, _config11;
     var config;
     var dataIndex;
+    var defaultSortOrder;
     var condition;
     if (!config) {
-      var _option$dimensionSour, _config;
+      var _option$dimensionSour, _config, _config2;
       /* 通过别名或名称 查找当前维度的配置 */
       config = (_option$dimensionSour = option.dimensionSource) === null || _option$dimensionSour === void 0 ? void 0 : _option$dimensionSour.find(function (item) {
         return item.alias === title || item.description === title;
       });
       dataIndex = (_config = config) === null || _config === void 0 ? void 0 : _config.description;
+      if ((_config2 = config) !== null && _config2 !== void 0 && _config2.sorted && isFirst) {
+        isFirst = false;
+        defaultSortOrder = _dataCommon.defaultSort + "end";
+      }
     }
     if (!config) {
-      var _option$indexSource, _config2;
+      var _option$indexSource, _config3, _config4;
       /* 通过别名或名称 查找当前指标的配置 */
       config = (_option$indexSource = option.indexSource) === null || _option$indexSource === void 0 ? void 0 : _option$indexSource.find(function (item) {
         return item.alias === title || item.name === title;
       });
-      dataIndex = (_config2 = config) === null || _config2 === void 0 ? void 0 : _config2.name;
+      dataIndex = (_config3 = config) === null || _config3 === void 0 ? void 0 : _config3.name;
+      if ((_config4 = config) !== null && _config4 !== void 0 && _config4.sorted && isFirst) {
+        isFirst = false;
+        defaultSortOrder = _dataCommon.defaultSort + "end";
+      }
     }
     /* 条件格式设置 */
     // if (expressions?.length) {
     //   condition = expressions?.filter((item) => item?.index?.includes(config?.name));
     // }
 
-    var _ref4 = ((_config3 = config) === null || _config3 === void 0 ? void 0 : (_config3$link = _config3.link) === null || _config3$link === void 0 ? void 0 : _config3$link.split(_dataCommon.separator)) || [],
+    var _ref4 = ((_config5 = config) === null || _config5 === void 0 ? void 0 : (_config5$link = _config5.link) === null || _config5$link === void 0 ? void 0 : _config5$link.split(_dataCommon.separator)) || [],
       dataSetName = _ref4[0];
     var index;
-    if ((_config4 = config) !== null && _config4 !== void 0 && _config4.link && linkPage !== null && linkPage !== void 0 && linkPage.length) {
+    if ((_config6 = config) !== null && _config6 !== void 0 && _config6.link && linkPage !== null && linkPage !== void 0 && linkPage.length) {
       index = linkPage.findIndex(function (link) {
         return "" + link.dataSetName + _dataCommon.separator + link.title === config.link;
       });
@@ -223,12 +233,13 @@ var handleColumns = function handleColumns(option, expressions, linkPage, onLink
       title: title,
       dataIndex: dataIndex,
       ellipsis: true,
-      sorter: (_config5 = config) === null || _config5 === void 0 ? void 0 : _config5.sorted,
-      width: ((_config6 = config) === null || _config6 === void 0 ? void 0 : _config6.width) || (0, _dataCommon.computeWidth)(title === null || title === void 0 ? void 0 : (_title$toString = title.toString()) === null || _title$toString === void 0 ? void 0 : _title$toString.length),
-      fixed: (_config7 = config) !== null && _config7 !== void 0 && _config7.isFixed ? ((_config8 = config) === null || _config8 === void 0 ? void 0 : _config8.fixed) || ((_config9 = config) === null || _config9 === void 0 ? void 0 : _config9.isFixed) : false,
+      defaultSortOrder: defaultSortOrder,
+      sorter: (_config7 = config) === null || _config7 === void 0 ? void 0 : _config7.sorted,
+      width: ((_config8 = config) === null || _config8 === void 0 ? void 0 : _config8.width) || (0, _dataCommon.computeWidth)(title === null || title === void 0 ? void 0 : (_title$toString = title.toString()) === null || _title$toString === void 0 ? void 0 : _title$toString.length),
+      fixed: (_config9 = config) !== null && _config9 !== void 0 && _config9.isFixed ? ((_config10 = config) === null || _config10 === void 0 ? void 0 : _config10.fixed) || ((_config11 = config) === null || _config11 === void 0 ? void 0 : _config11.isFixed) : false,
       render: function render(value, record) {
-        var _config$render, _config10;
-        return config.custom ? (_config$render = (_config10 = config).render) === null || _config$render === void 0 ? void 0 : _config$render.call(_config10, value, record, config, condition) : handleValueFormat(value, record, config, condition, function () {
+        var _config$render, _config12;
+        return config.custom ? (_config$render = (_config12 = config).render) === null || _config$render === void 0 ? void 0 : _config$render.call(_config12, value, record, config, condition) : handleValueFormat(value, record, config, condition, function () {
           return onLink({
             dataSetName: dataSetName,
             index: index,

package/lib/components/z-templates-data-common/data-common.helper.d.ts

@@ -14,6 +14,8 @@ export declare const separator = "***";
 export declare const timeUnit: number;
 /** 介于 前闭后开 */
 export declare const BETWEEN = "<=,<";
+/** 默认排序 */
+export declare const defaultSort = "asc";
 /** 数据类型 */
 export type valueType = number | string | null | undefined;
 /**

package/lib/components/z-templates-data-common/data-common.helper.js

@@ -2,7 +2,7 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 exports.__esModule = true;
-exports.timeUnit = exports.tableConfigDefault = exports.separator = exports.saveDimTarget = exports.handleThousand = exports.handleQueryParams = exports.handlePercent = exports.handleLink = exports.handleDecimal = exports.handleCondition = exports.getType = exports.getReportData = exports.getMaxWidth = exports.getDimTarget = exports.dateStart = exports.computeWidth = exports.BETWEEN = void 0;
+exports.timeUnit = exports.tableConfigDefault = exports.separator = exports.saveDimTarget = exports.handleThousand = exports.handleQueryParams = exports.handlePercent = exports.handleLink = exports.handleDecimal = exports.handleCondition = exports.getType = exports.getReportData = exports.getMaxWidth = exports.getDimTarget = exports.defaultSort = exports.dateStart = exports.computeWidth = exports.BETWEEN = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
@@ -34,8 +34,12 @@ var timeUnit = 60 * 1000;
 exports.timeUnit = timeUnit;
 var BETWEEN = '<=,<';
 
-/** 数据类型 */
+/** 默认排序 */
 exports.BETWEEN = BETWEEN;
+var defaultSort = 'asc';
+
+/** 数据类型 */
+exports.defaultSort = defaultSort;
 /**
  * 获取数据类型
  * @param {any} value
@@ -189,7 +193,7 @@ var handleCondition = function handleCondition(value, handledValue, conditions)
 
 // mock
 exports.handleCondition = handleCondition;
-var token = 'scm:tenant:token:2:104:DB0D80CD71B76AF4A8858729478BA945';
+var token = 'scm:tenant:token:2:104:4EE94781916163519F3A5744296BAD40';
 
 /** 获取维度指标 */
 var getDimTarget = /*#__PURE__*/function () {

package/lib/components/z-templates-data-common/data-common.js

@@ -103,6 +103,7 @@ var ZTemplatesDataCommon = /*#__PURE__*/_react["default"].forwardRef(function (p
   };
   (0, _react.useImperativeHandle)(ref, function () {
     return {
+      formRef: formRef,
       onLink: onLink,
       onQueryValues: onQueryValues,
       onQueryFormatValues: onQueryFormatValues

package/lib/utils/props/tpl.d.ts

@@ -148,6 +148,8 @@ export declare const processTplProps: (props: RcPageProps, extra?: {
         };
     };
     key?: string;
+    className?: string;
+    style?: React.CSSProperties;
     tab?: React.ReactNode;
     onBillSuccess?: (res: any) => void;
     onBillError?: (res: any) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ztocwst/rc-pro-materials",
-  "version": "0.2.21",
+  "version": "0.2.23",
   "description": "@ztocwst/rc-pro-materials",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -71,7 +71,7 @@
     "@alifd/next": "^1.25.27",
     "@alilc/build-plugin-alt": "^1.3.3",
     "@types/antd": "^1.0.0",
-    "@ztocwst/rc-pro": "^0.4.64",
+    "@ztocwst/rc-pro": "^0.4.66",
     "antd": "4.22.3",
     "moment": "latest",
     "prop-types": "^15.5.8",
@@ -86,9 +86,9 @@
   },
   "componentConfig": {
     "isComponentLibrary": true,
-    "materialSchema": "https://npm.ztocwst.com/@ztocwst/rc-pro-materials@0.2.21/build/lowcode/assets-prod.json"
+    "materialSchema": "https://npm.ztocwst.com/@ztocwst/rc-pro-materials@0.2.23/build/lowcode/assets-prod.json"
   },
-  "homepage": "https://unpkg.com/@ztocwst/rc-pro-materials@0.2.21/build/index.html",
+  "homepage": "https://unpkg.com/@ztocwst/rc-pro-materials@0.2.23/build/index.html",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"