@ztocwst/rc-pro-materials 0.2.25 → 0.2.27

package/es/components/z-data-table/components/custom-renderer/index.js

@@ -40,80 +40,110 @@ var CustomRenderer = function CustomRenderer(props) {
     setIsLink(true);
     (_linkChartRef$current = linkChartRef.current) === null || _linkChartRef$current === void 0 ? void 0 : (_linkChartRef$current2 = _linkChartRef$current.initial) === null || _linkChartRef$current2 === void 0 ? void 0 : _linkChartRef$current2.call(_linkChartRef$current, _extends({}, values));
   };
+  var getBigDataBody = function getBigDataBody(params) {
+    var _indexJson$data;
+    if (params === void 0) {
+      params = {};
+    }
+    var target = [];
+    if (indexJson !== null && indexJson !== void 0 && (_indexJson$data = indexJson.data) !== null && _indexJson$data !== void 0 && _indexJson$data.length) {
+      for (var _iterator = _createForOfIteratorHelperLoose(indexJson.data), _step; !(_step = _iterator()).done;) {
+        var item = _step.value;
+        target.push({
+          description: item.name
+        });
+      }
+    }
+    var queryParams = handleQueryParams(params);
+    var data = {
+      target: target,
+      queryParams: queryParams,
+      dataSetName: dataSetName
+    };
+    return formatter ? formatter === null || formatter === void 0 ? void 0 : formatter(data) : data;
+  };
 
   // 获取数据源
   var getDataSource = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(query) {
-      var _indexJson$data, target, _iterator, _step, item, queryParams, data, res;
+      var data, _ref3, success, _ref3$result, _result;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             if (query === void 0) {
               query = {};
             }
-            _context.prev = 1;
-            target = [];
-            if (indexJson !== null && indexJson !== void 0 && (_indexJson$data = indexJson.data) !== null && _indexJson$data !== void 0 && _indexJson$data.length) {
-              for (_iterator = _createForOfIteratorHelperLoose(indexJson.data); !(_step = _iterator()).done;) {
-                item = _step.value;
-                target.push({
-                  description: item.name
-                });
-              }
+            if (!loading) {
+              _context.next = 3;
+              break;
             }
-            queryParams = handleQueryParams(query);
-            data = {
-              target: target,
-              queryParams: queryParams,
-              dataSetName: dataSetName
-            };
+            return _context.abrupt("return");
+          case 3:
+            _context.prev = 3;
+            data = getBigDataBody(query);
             setLoading(true);
-            _context.next = 9;
-            return getReportData(rcProContext, formatter ? formatter === null || formatter === void 0 ? void 0 : formatter(data) : data);
-          case 9:
-            res = _context.sent;
+            _context.next = 8;
+            return getReportData(rcProContext, data);
+          case 8:
+            _context.t0 = _context.sent;
+            if (_context.t0) {
+              _context.next = 11;
+              break;
+            }
+            _context.t0 = {};
+          case 11:
+            _ref3 = _context.t0;
+            success = _ref3.success;
+            _ref3$result = _ref3.result;
+            _result = _ref3$result === void 0 ? {} : _ref3$result;
             setLoading(false);
-            if (res !== null && res !== void 0 && res.success) {
-              setResult(res === null || res === void 0 ? void 0 : res.result);
+            if (success) {
+              setResult(_result);
+            } else {
+              setResult(null);
             }
-            _context.next = 19;
+            _context.next = 24;
             break;
-          case 14:
-            _context.prev = 14;
-            _context.t0 = _context["catch"](1);
+          case 19:
+            _context.prev = 19;
+            _context.t1 = _context["catch"](3);
             setLoading(false);
             setResult(null);
-            console.error(_context.t0);
-          case 19:
+            console.error(_context.t1);
+          case 24:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[1, 14]]);
+      }, _callee, null, [[3, 19]]);
     }));
     return function getDataSource(_x) {
       return _ref2.apply(this, arguments);
     };
   }();
   var queryChart = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(value) {
-      var queryParams, _linkChartRef$current3;
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(value) {
+      var _value;
+      var queryParams, _linkChartRef$current3, _linkChartRef$current4;
       return _regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            queryParams = value[dataSetName] || value;
+            if (value === void 0) {
+              value = {};
+            }
+            queryParams = ((_value = value) === null || _value === void 0 ? void 0 : _value[dataSetName]) || value;
             if (isLink) {
-              (_linkChartRef$current3 = linkChartRef.current) === null || _linkChartRef$current3 === void 0 ? void 0 : _linkChartRef$current3.queryChart(queryParams);
+              (_linkChartRef$current3 = linkChartRef.current) === null || _linkChartRef$current3 === void 0 ? void 0 : (_linkChartRef$current4 = _linkChartRef$current3.queryChart) === null || _linkChartRef$current4 === void 0 ? void 0 : _linkChartRef$current4.call(_linkChartRef$current3, queryParams);
             } else {
               getDataSource(queryParams);
             }
-          case 2:
+          case 3:
           case "end":
             return _context2.stop();
         }
       }, _callee2);
     }));
     return function queryChart(_x2) {
-      return _ref3.apply(this, arguments);
+      return _ref4.apply(this, arguments);
     };
   }();
   var handleClearInterval = function handleClearInterval() {
@@ -138,8 +168,8 @@ var CustomRenderer = function CustomRenderer(props) {
   };
   useEffect(function () {
     if (currentKey) {
-      var _ref4 = currentKey.split(separator) || [],
-        curDataSetName = _ref4[0];
+      var _ref5 = currentKey.split(separator) || [],
+        curDataSetName = _ref5[0];
       if (curDataSetName === dataSetName) {
         onload();
       } else {

package/es/components/z-data-table/components/link-renderer/index.js

@@ -195,9 +195,10 @@ var LinkRenderer = function LinkRenderer(props) {
       for (var _iterator = _createForOfIteratorHelperLoose(targets.indexSource), _step; !(_step = _iterator()).done;) {
         var cur = _step.value;
         if (cur !== null && cur !== void 0 && cur.sorted) {
+          var _cur$defaultSorted;
           orderBys.push({
             name: cur.name,
-            sort: defaultSort
+            sort: cur.defaultSorted ? (_cur$defaultSorted = cur.defaultSorted) === null || _cur$defaultSorted === void 0 ? void 0 : _cur$defaultSorted.slice(0, -3) : defaultSort
           });
         }
       }
@@ -240,42 +241,57 @@ var LinkRenderer = function LinkRenderer(props) {
   };
   var getDataSource = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(params) {
-      var queryData;
+      var data, _ref5, success, _ref5$result, _result;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             if (params === void 0) {
               params = {};
             }
-            queryData = getBigDataBody(params);
+            if (!loading) {
+              _context.next = 3;
+              break;
+            }
+            return _context.abrupt("return");
+          case 3:
+            _context.prev = 3;
+            data = getBigDataBody(params); // 自定义、非自定义都打开 loading 拦截重复请求
+            setLoading(true);
+            _context.next = 8;
+            return getReportData(rcProContext, data);
+          case 8:
+            _context.t0 = _context.sent;
+            if (_context.t0) {
+              _context.next = 11;
+              break;
+            }
+            _context.t0 = {};
+          case 11:
+            _ref5 = _context.t0;
+            success = _ref5.success;
+            _ref5$result = _ref5.result;
+            _result = _ref5$result === void 0 ? {} : _ref5$result;
+            setLoading(false);
             if (linkState.custom) {
-              setLoading(true);
+              setResult(_result);
             }
-            return _context.abrupt("return", 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) {
-                  setResult(result);
-                }
-              }
-              return {
-                success: success,
-                result: result
-              };
-            })["catch"](function () {
-              if (linkState.custom) {
-                setLoading(false);
-                setResult(null);
-              }
-            }));
-          case 4:
+            return _context.abrupt("return", {
+              success: success,
+              result: _result
+            });
+          case 20:
+            _context.prev = 20;
+            _context.t1 = _context["catch"](3);
+            setLoading(false);
+            if (linkState.custom) {
+              setResult(null);
+            }
+            console.error(_context.t1);
+          case 25:
           case "end":
             return _context.stop();
         }
-      }, _callee);
+      }, _callee, null, [[3, 20]]);
     }));
     return function getDataSource(_x) {
       return _ref4.apply(this, arguments);
@@ -334,6 +350,9 @@ var LinkRenderer = function LinkRenderer(props) {
     setLinkState(stateData);
   };
   var queryChart = function queryChart(value) {
+    if (value === void 0) {
+      value = {};
+    }
     queryCacheRef.current = value;
     if (linkState.custom) {
       getDataSource({

package/es/components/z-data-table/components/table-renderer/index.js

@@ -27,7 +27,6 @@ var TableRenderer = function TableRenderer(props) {
     dimJson = props.dimJson,
     indexJson = props.indexJson,
     actionJson = props.actionJson,
-    expressions = props.expressions,
     linkPageTitle = props.linkPageTitle,
     linkPage = props.linkPage,
     queryBind = props.queryBind,
@@ -40,13 +39,10 @@ var TableRenderer = function TableRenderer(props) {
   var _useState = useState(false),
     loading = _useState[0],
     setLoading = _useState[1];
-  var _useState2 = useState(tableConfigDefault),
-    config = _useState2[0],
-    setConfig = _useState2[1];
   /** 维度指标初始数据 */
-  var _useState3 = useState(),
-    dimTargetValue = _useState3[0],
-    setDimTargetValue = _useState3[1];
+  var _useState2 = useState(),
+    dimTargetValue = _useState2[0],
+    setDimTargetValue = _useState2[1];
   /** 合计 数据 */
   var amounted = useRef({});
   var rcProContext = useContext(RcConfigContext);
@@ -55,11 +51,12 @@ var TableRenderer = function TableRenderer(props) {
     _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;
-  var _useState4 = useState(false),
-    isLink = _useState4[0],
-    setIsLink = _useState4[1];
+  var _useState3 = useState(false),
+    isLink = _useState3[0],
+    setIsLink = _useState3[1];
   var linkChartRef = useRef();
   var timer = null;
+  var timeout = null;
   var getDimTargetValues = function getDimTargetValues() {
     var _dimTargetRef$current;
     return (dimTargetRef === null || dimTargetRef === void 0 ? void 0 : (_dimTargetRef$current = dimTargetRef.current) === null || _dimTargetRef$current === void 0 ? void 0 : _dimTargetRef$current.getDimTargetValues()) || {};
@@ -162,7 +159,7 @@ var TableRenderer = function TableRenderer(props) {
     var _tableRef$current;
     var columns = handleColumns(_extends({}, option, {
       actionJson: actionJson
-    }), expressions, linkPage, onLink);
+    }), linkPage, onLink);
     (_tableRef$current = tableRef.current) === null || _tableRef$current === void 0 ? void 0 : _tableRef$current.updateColumns(columns);
   };
   var getBigDataBody = function getBigDataBody(params) {
@@ -225,9 +222,10 @@ var TableRenderer = function TableRenderer(props) {
           description: cur.description
         });
         if (cur !== null && cur !== void 0 && cur.sorted) {
+          var _cur$defaultSorted;
           orderBys.push({
             name: cur.description,
-            sort: defaultSort
+            sort: cur.defaultSorted ? (_cur$defaultSorted = cur.defaultSorted) === null || _cur$defaultSorted === void 0 ? void 0 : _cur$defaultSorted.slice(0, -3) : defaultSort
           });
         }
       }
@@ -242,9 +240,10 @@ var TableRenderer = function TableRenderer(props) {
           description: _cur.name
         });
         if (_cur !== null && _cur !== void 0 && _cur.sorted) {
+          var _cur$defaultSorted2;
           orderBys.push({
             name: _cur.name,
-            sort: defaultSort
+            sort: _cur.defaultSorted ? (_cur$defaultSorted2 = _cur.defaultSorted) === null || _cur$defaultSorted2 === void 0 ? void 0 : _cur$defaultSorted2.slice(0, -3) : defaultSort
           });
         }
       }
@@ -286,7 +285,7 @@ var TableRenderer = function TableRenderer(props) {
   // 获取数据源
   var getDataSource = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(params) {
-      var data, _yield$getReportData, success, _yield$getReportData$, result;
+      var data, _ref4, success, _ref4$result, result;
       return _regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -305,32 +304,39 @@ var TableRenderer = function TableRenderer(props) {
             _context2.next = 8;
             return getReportData(rcProContext, data);
           case 8:
-            _yield$getReportData = _context2.sent;
-            success = _yield$getReportData.success;
-            _yield$getReportData$ = _yield$getReportData.result;
-            result = _yield$getReportData$ === void 0 ? {} : _yield$getReportData$;
+            _context2.t0 = _context2.sent;
+            if (_context2.t0) {
+              _context2.next = 11;
+              break;
+            }
+            _context2.t0 = {};
+          case 11:
+            _ref4 = _context2.t0;
+            success = _ref4.success;
+            _ref4$result = _ref4.result;
+            result = _ref4$result === void 0 ? {} : _ref4$result;
             setLoading(false);
             return _context2.abrupt("return", {
               success: success,
               result: result
             });
-          case 16:
-            _context2.prev = 16;
-            _context2.t0 = _context2["catch"](3);
+          case 19:
+            _context2.prev = 19;
+            _context2.t1 = _context2["catch"](3);
             setLoading(false);
-            console.error(_context2.t0);
-          case 20:
+            console.error(_context2.t1);
+          case 23:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[3, 16]]);
+      }, _callee2, null, [[3, 19]]);
     }));
     return function getDataSource(_x2) {
       return _ref3.apply(this, arguments);
     };
   }();
   var initial = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(params) {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(params) {
       var result, dims, targets, option;
       return _regeneratorRuntime.wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
@@ -354,31 +360,6 @@ var TableRenderer = function TableRenderer(props) {
               };
               handleUpdateColumns(option);
               setDimTargetValue(result);
-              setConfig(_extends({}, tableConfigDefault, {
-                pagination: {
-                  showSizeChanger: true,
-                  defaultPageSize: defaultPageSize
-                },
-                summary: summary,
-                request: function request(data) {
-                  var _data$pagination, _data$pagination2, _data$sorter;
-                  var pagination = {
-                    pageNum: (_data$pagination = data.pagination) === null || _data$pagination === void 0 ? void 0 : _data$pagination.current,
-                    pageSize: (_data$pagination2 = data.pagination) === null || _data$pagination2 === void 0 ? void 0 : _data$pagination2.pageSize
-                  };
-                  var orderBy = [];
-                  if ((_data$sorter = data.sorter) !== null && _data$sorter !== void 0 && _data$sorter.order) {
-                    var _data$sorter2, _data$sorter3, _data$sorter3$order;
-                    orderBy.push({
-                      name: (_data$sorter2 = data.sorter) === null || _data$sorter2 === void 0 ? void 0 : _data$sorter2.field,
-                      sort: (_data$sorter3 = data.sorter) === null || _data$sorter3 === void 0 ? void 0 : (_data$sorter3$order = _data$sorter3.order) === null || _data$sorter3$order === void 0 ? void 0 : _data$sorter3$order.slice(0, -3)
-                    });
-                  }
-                  return getDataSource(_extends({}, pagination, {
-                    orderBy: orderBy
-                  }));
-                }
-              }));
             }
           case 4:
           case "end":
@@ -387,7 +368,7 @@ var TableRenderer = function TableRenderer(props) {
       }, _callee3);
     }));
     return function initial(_x3) {
-      return _ref4.apply(this, arguments);
+      return _ref5.apply(this, arguments);
     };
   }();
   useEffect(function () {
@@ -401,6 +382,12 @@ var TableRenderer = function TableRenderer(props) {
       timer = null;
     }
   };
+  var handleClearTimeout = function handleClearTimeout() {
+    if (timeout) {
+      clearTimeout(timeout);
+      timeout = null;
+    }
+  };
   var onload = function onload() {
     if (autoLoad) {
       if (refreshRate) {
@@ -417,8 +404,8 @@ var TableRenderer = function TableRenderer(props) {
   };
   useEffect(function () {
     if (currentKey) {
-      var _ref5 = currentKey.split(separator) || [],
-        curDataSetName = _ref5[0];
+      var _ref6 = currentKey.split(separator) || [],
+        curDataSetName = _ref6[0];
       if (curDataSetName === dataSetName) {
         onload();
       } else {
@@ -432,18 +419,21 @@ var TableRenderer = function TableRenderer(props) {
     };
   }, [currentKey, autoLoad]);
   var queryChart = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(value) {
-      var _linkChartRef$current3;
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(value) {
+      var _linkChartRef$current3, _value;
       return _regeneratorRuntime.wrap(function _callee5$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
+            if (value === void 0) {
+              value = {};
+            }
             if (isLink) {
               (_linkChartRef$current3 = linkChartRef.current) === null || _linkChartRef$current3 === void 0 ? void 0 : _linkChartRef$current3.queryChart(value);
             } else {
-              queryCacheRef.current = value[dataSetName] || value;
-              setTimeout( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
+              queryCacheRef.current = ((_value = value) === null || _value === void 0 ? void 0 : _value[dataSetName]) || value;
+              timeout = window.setTimeout( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
                 var _tableRef$current2;
-                var _getDimTargetValues4, _getDimTargetValues4$, indexSource, indexAmounted, target, _iterator4, _step4, cur, _ref8, success, _ref8$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 _regeneratorRuntime.wrap(function _callee4$(_context4) {
                   while (1) switch (_context4.prev = _context4.next) {
                     case 0:
@@ -478,29 +468,31 @@ var TableRenderer = function TableRenderer(props) {
                       }
                       _context4.t0 = {};
                     case 11:
-                      _ref8 = _context4.t0;
-                      success = _ref8.success;
-                      _ref8$result = _ref8.result;
-                      result = _ref8$result === void 0 ? {} : _ref8$result;
+                      _ref9 = _context4.t0;
+                      success = _ref9.success;
+                      _ref9$result = _ref9.result;
+                      result = _ref9$result === void 0 ? {} : _ref9$result;
                       if (success) {
                         _result$data = result === null || result === void 0 ? void 0 : result.data, _result$data$ = _result$data[0], data = _result$data$ === void 0 ? {} : _result$data$;
                         amounted.current = data;
                       }
                     case 16:
+                      handleClearTimeout();
+                    case 17:
                     case "end":
                       return _context4.stop();
                   }
                 }, _callee4);
               })), 200);
             }
-          case 1:
+          case 2:
           case "end":
             return _context5.stop();
         }
       }, _callee5);
     }));
     return function queryChart(_x4) {
-      return _ref6.apply(this, arguments);
+      return _ref7.apply(this, arguments);
     };
   }();
   useImperativeHandle(chartRef, function () {
@@ -523,7 +515,31 @@ var TableRenderer = function TableRenderer(props) {
     })
   }), /*#__PURE__*/React.createElement(ProTable, {
     ref: tableRef,
-    config: config
+    config: _extends({}, tableConfigDefault, {
+      pagination: {
+        showSizeChanger: true,
+        defaultPageSize: defaultPageSize
+      },
+      summary: summary,
+      request: function request(data) {
+        var _data$pagination, _data$pagination2, _data$sorter;
+        var pagination = {
+          pageNum: (_data$pagination = data.pagination) === null || _data$pagination === void 0 ? void 0 : _data$pagination.current,
+          pageSize: (_data$pagination2 = data.pagination) === null || _data$pagination2 === void 0 ? void 0 : _data$pagination2.pageSize
+        };
+        var orderBy = [];
+        if ((_data$sorter = data.sorter) !== null && _data$sorter !== void 0 && _data$sorter.order) {
+          var _data$sorter2, _data$sorter3, _data$sorter3$order;
+          orderBy.push({
+            name: (_data$sorter2 = data.sorter) === null || _data$sorter2 === void 0 ? void 0 : _data$sorter2.field,
+            sort: (_data$sorter3 = data.sorter) === null || _data$sorter3 === void 0 ? void 0 : (_data$sorter3$order = _data$sorter3.order) === null || _data$sorter3$order === void 0 ? void 0 : _data$sorter3$order.slice(0, -3)
+          });
+        }
+        return getDataSource(_extends({}, pagination, {
+          orderBy: orderBy
+        }));
+      }
+    })
   })), /*#__PURE__*/React.createElement("div", {
     style: {
       display: isLink ? 'block' : 'none'

package/es/components/z-data-table/components/table-renderer/table-renderer.helper.d.ts

@@ -47,20 +47,7 @@ export declare const getDimTargetData: (rcProContext: any, params: Record<string
  * 数据渲染格式处理
  */
 export declare const handleValueFormat: (value: valueType, record: Record<string, any>, config?: Record<string, any>, condition?: any[], onLink?: () => void) => any;
-/**
- * 条件格式
- */
-export type ExpressionsType = any[] | [];
 /**
  * 根据维度指标获取表格列
  */
-export declare const handleColumns: (option: DimTargetChangeOptionType & Pick<TypeZDataTableProps, 'actionJson'>, expressions?: ExpressionsType, linkPage?: TypeZDataTableProps[], onLink?: (v: linkParamsType) => void) => {
-    title: import("antd/es/checkbox/Group").CheckboxValueType;
-    dataIndex: string;
-    ellipsis: boolean;
-    defaultSortOrder: string;
-    sorter: any;
-    width: any;
-    fixed: any;
-    render: (value: valueType, record: Record<string, any>) => any;
-}[];
+export declare const handleColumns: (option: DimTargetChangeOptionType & Pick<TypeZDataTableProps, 'actionJson'>, linkPage?: TypeZDataTableProps[], onLink?: (v: linkParamsType) => void) => any[];